diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index b41188a920..a84f4dfd3b 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -24,8 +24,7 @@ body:
 
         ### Do the release
 
-        - [ ] Make sure `develop` and `main` are up to date (git pull)
-        - [ ] Checkout develop and create a release with gitflow, branch name `release/1.2.3`
+        - [ ] Make sure `develop` and `main` are up to date and create a release with gitflow: `git checkout main; git pull; git checkout develop; git pull; git flow release start '1.2.3'`
         - [ ] Check the crashes from the PlayStore
         - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
         - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
@@ -34,12 +33,12 @@ body:
         - [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
         - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
         - [ ] (optional) Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes.
-        - [ ] Finish release with gitflow, delete the draft PR (if created)
-        - [ ] Push `main` and the new tag `v1.2.3` to origin
-        - [ ] Checkout `develop`
+        - [ ] Finish release with gitflow, delete the draft PR (if created): `git flow release finish '1.2.3'`
+        - [ ] Push `main` and the new tag `v1.2.3` to origin: `git push origin main; git push origin 'v1.2.3'`
+        - [ ] Checkout `develop`: `git checkout develop`
         - [ ] Increase version (versionPatch + 2) in `./vector/build.gradle`
         - [ ] Change the value of SDK_VERSION in the file `./matrix-sdk-android/build.gradle`
-        - [ ] Commit and push `develop`
+        - [ ] Commit and push `develop`: `git commit -m 'version++'; git push origin develop`
         - [ ] Wait for [Buildkite](https://buildkite.com/matrix-dot-org/element-android/builds?branch=main) to build the `main` branch.
         - [ ] Run the script `~/scripts/releaseElement.sh`. It will download the APKs from Buildkite check them and sign them.
         - [ ] Install the APK on your phone to check that the upgrade went well (no init sync, etc.)
diff --git a/CHANGES.md b/CHANGES.md
index 18bb2480c3..442d3641dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,43 @@
+Changes in Element v1.5.8 (2022-11-17)
+======================================
+
+Features ✨
+----------
+ - [Session manager] Multi-session signout ([#7418](https://github.com/vector-im/element-android/issues/7418))
+ - Rich text editor: add full screen mode. ([#7436](https://github.com/vector-im/element-android/issues/7436))
+ - [Rich text editor] Add plain text mode ([#7452](https://github.com/vector-im/element-android/issues/7452))
+ - Move TypingView inside the timeline items. ([#7496](https://github.com/vector-im/element-android/issues/7496))
+ - Push notifications toggle: align implementation for current session ([#7512](https://github.com/vector-im/element-android/issues/7512))
+ - Voice messages - Persist the playback position across different screens ([#7582](https://github.com/vector-im/element-android/issues/7582))
+
+Bugfixes 🐛
+----------
+ - [Voice Broadcast] Do not display the recorder view for a live broadcast started from another session ([#7431](https://github.com/vector-im/element-android/issues/7431))
+ - [Session manager] Hide push notification toggle when there is no server support ([#7457](https://github.com/vector-im/element-android/issues/7457))
+ - Fix rich text editor textfield not growing to fill parent on full screen. ([#7491](https://github.com/vector-im/element-android/issues/7491))
+ - Fix duplicated mention pills in some cases ([#7501](https://github.com/vector-im/element-android/issues/7501))
+ - Voice Broadcast - Fix duplicated voice messages in the internal playlist ([#7502](https://github.com/vector-im/element-android/issues/7502))
+ - When joining a room, the message composer is displayed once the room is loaded. ([#7509](https://github.com/vector-im/element-android/issues/7509))
+ - Voice Broadcast - Fix error on voice messages in unencrypted rooms ([#7519](https://github.com/vector-im/element-android/issues/7519))
+ - Fix description of verified sessions ([#7533](https://github.com/vector-im/element-android/issues/7533))
+
+In development 🚧
+----------------
+ - [Voice Broadcast] Improve timeline items factory and handle bad recording state display ([#7448](https://github.com/vector-im/element-android/issues/7448))
+ - [Voice Broadcast] Stop recording when opening the room after an app restart ([#7450](https://github.com/vector-im/element-android/issues/7450))
+ - [Voice Broadcast] Improve playlist fetching and player codebase ([#7478](https://github.com/vector-im/element-android/issues/7478))
+ - [Voice Broadcast] Display an error dialog if the user fails to start a voice broadcast ([#7485](https://github.com/vector-im/element-android/issues/7485))
+ - [Voice Broadcast] Add seekbar in listening tile ([#7496](https://github.com/vector-im/element-android/issues/7496))
+ - [Voice Broadcast] Improve the live indicator icon rendering in the timeline ([#7579](https://github.com/vector-im/element-android/issues/7579))
+ - Voice Broadcast - Add maximum length ([#7588](https://github.com/vector-im/element-android/issues/7588))
+
+SDK API changes ⚠️
+------------------
+ - [Metrics] Add `SpannableMetricPlugin` to support spans within transactions. ([#7514](https://github.com/vector-im/element-android/issues/7514))
+ - Fix a bug that caused messages with no formatted text to be quoted as "null". ([#7530](https://github.com/vector-im/element-android/issues/7530))
+ - If message content has no `formattedBody`, default to `body` when editing. ([#7574](https://github.com/vector-im/element-android/issues/7574))
+
+
 Changes in Element v1.5.7 (2022-11-07)
 ======================================
 
diff --git a/changelog.d/7418.feature b/changelog.d/7418.feature
deleted file mode 100644
index b68ef700da..0000000000
--- a/changelog.d/7418.feature
+++ /dev/null
@@ -1 +0,0 @@
-[Session manager] Multi-session signout
diff --git a/changelog.d/7431.bugfix b/changelog.d/7431.bugfix
deleted file mode 100644
index 681a1e9aa5..0000000000
--- a/changelog.d/7431.bugfix
+++ /dev/null
@@ -1 +0,0 @@
- [Voice Broadcast] Do not display the recorder view for a live broadcast started from another session
\ No newline at end of file
diff --git a/changelog.d/7436.feature b/changelog.d/7436.feature
deleted file mode 100644
index b038c975e1..0000000000
--- a/changelog.d/7436.feature
+++ /dev/null
@@ -1 +0,0 @@
-Rich text editor: add full screen mode.
diff --git a/changelog.d/7448.wip b/changelog.d/7448.wip
deleted file mode 100644
index a99e5bbcfa..0000000000
--- a/changelog.d/7448.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Improve timeline items factory and handle bad recording state display
diff --git a/changelog.d/7450.wip b/changelog.d/7450.wip
deleted file mode 100644
index de4d3dc5e1..0000000000
--- a/changelog.d/7450.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Stop recording when opening the room after an app restart
diff --git a/changelog.d/7452.feature b/changelog.d/7452.feature
deleted file mode 100644
index a811f87c84..0000000000
--- a/changelog.d/7452.feature
+++ /dev/null
@@ -1 +0,0 @@
-[Rich text editor] Add plain text mode
diff --git a/changelog.d/7457.bugfix b/changelog.d/7457.bugfix
deleted file mode 100644
index 9dfbc53329..0000000000
--- a/changelog.d/7457.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-[Session manager] Hide push notification toggle when there is no server support
diff --git a/changelog.d/7478.wip b/changelog.d/7478.wip
deleted file mode 100644
index 2e6602b16d..0000000000
--- a/changelog.d/7478.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Improve playlist fetching and player codebase
diff --git a/changelog.d/7485.wip b/changelog.d/7485.wip
deleted file mode 100644
index 30cab45d9c..0000000000
--- a/changelog.d/7485.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Display an error dialog if the user fails to start a voice broadcast
diff --git a/changelog.d/7491.bugfix b/changelog.d/7491.bugfix
deleted file mode 100644
index 1a87bd03bd..0000000000
--- a/changelog.d/7491.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix rich text editor textfield not growing to fill parent on full screen.
diff --git a/changelog.d/7496.feature b/changelog.d/7496.feature
deleted file mode 100644
index 721164ee06..0000000000
--- a/changelog.d/7496.feature
+++ /dev/null
@@ -1 +0,0 @@
-Move TypingView inside the timeline items.
diff --git a/changelog.d/7496.wip b/changelog.d/7496.wip
deleted file mode 100644
index 49d15d084f..0000000000
--- a/changelog.d/7496.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Add seekbar in listening tile
diff --git a/changelog.d/7501.bugfix b/changelog.d/7501.bugfix
deleted file mode 100644
index b86258d427..0000000000
--- a/changelog.d/7501.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix duplicated mention pills in some cases
diff --git a/changelog.d/7502.bugfix b/changelog.d/7502.bugfix
deleted file mode 100644
index 8785310498..0000000000
--- a/changelog.d/7502.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Fix duplicated voice messages in the internal playlist
diff --git a/changelog.d/7509.bugfix b/changelog.d/7509.bugfix
deleted file mode 100644
index 93ec812e0e..0000000000
--- a/changelog.d/7509.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-When joining a room, the message composer is displayed once the room is loaded.
diff --git a/changelog.d/7512.feature b/changelog.d/7512.feature
deleted file mode 100644
index 00411a75ad..0000000000
--- a/changelog.d/7512.feature
+++ /dev/null
@@ -1 +0,0 @@
-Push notifications toggle: align implementation for current session
diff --git a/changelog.d/7514.sdk b/changelog.d/7514.sdk
deleted file mode 100644
index f335156a49..0000000000
--- a/changelog.d/7514.sdk
+++ /dev/null
@@ -1 +0,0 @@
-[Metrics] Add `SpannableMetricPlugin` to support spans within transactions.
diff --git a/changelog.d/7519.bugfix b/changelog.d/7519.bugfix
deleted file mode 100644
index c687bded49..0000000000
--- a/changelog.d/7519.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Fix error on voice messages in unencrypted rooms
diff --git a/changelog.d/7530.sdk b/changelog.d/7530.sdk
deleted file mode 100644
index 4cea35f44b..0000000000
--- a/changelog.d/7530.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug that caused messages with no formatted text to be quoted as "null".
diff --git a/changelog.d/7533.bugfix b/changelog.d/7533.bugfix
deleted file mode 100644
index 5e603ece22..0000000000
--- a/changelog.d/7533.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix description of verified sessions
diff --git a/changelog.d/7574.sdk b/changelog.d/7574.sdk
deleted file mode 100644
index 3757334138..0000000000
--- a/changelog.d/7574.sdk
+++ /dev/null
@@ -1 +0,0 @@
-If message content has no `formattedBody`, default to `body` when editing.
diff --git a/changelog.d/7579.wip b/changelog.d/7579.wip
deleted file mode 100644
index 08e6c2cdca..0000000000
--- a/changelog.d/7579.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Improve the live indicator icon rendering in the timeline
diff --git a/changelog.d/7582.feature b/changelog.d/7582.feature
deleted file mode 100644
index 3aae4759ee..0000000000
--- a/changelog.d/7582.feature
+++ /dev/null
@@ -1 +0,0 @@
-Voice messages - Persist the playback position across different screens
diff --git a/changelog.d/7588.wip b/changelog.d/7588.wip
deleted file mode 100644
index b3fdda55fc..0000000000
--- a/changelog.d/7588.wip
+++ /dev/null
@@ -1 +0,0 @@
-Voice Broadcast - Add maximum length
diff --git a/fastlane/metadata/android/en-US/changelogs/40105080.txt b/fastlane/metadata/android/en-US/changelogs/40105080.txt
new file mode 100644
index 0000000000..f9ca8cdd7c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105080.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 1f16041b54..6ae585a273 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -53,7 +53,7 @@ inline fun <reified T> Content?.toModel(catchError: Boolean = true): T? {
     val moshiAdapter = moshi.adapter(T::class.java)
     return try {
         moshiAdapter.fromJsonValue(this)
-    } catch (e: Exception) {
+    } catch (e: Throwable) {
         if (catchError) {
             Timber.e(e, "To model failed : $e")
             null