diff --git a/CHANGES.md b/CHANGES.md
index 640d56a9fd..352c48585c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,53 @@
+Changes in Element v1.2.1 (2021-09-08)
+======================================
+
+Features ✨
+----------
+ - Support Android 11 Conversation features ([#1809](https://github.com/vector-im/element-android/issues/1809))
+ - Introduces AutoAcceptInvites which can be enabled at compile time. ([#3531](https://github.com/vector-im/element-android/issues/3531))
+ - New call designs ([#3599](https://github.com/vector-im/element-android/issues/3599))
+ - Restricted Join Rule | Inform admins of new option ([#3631](https://github.com/vector-im/element-android/issues/3631))
+ - Mention and Keyword Notification Settings: Turn on/off keyword notifications and edit keywords. ([#3650](https://github.com/vector-im/element-android/issues/3650))
+ - Support accept 3pid invite when email is not bound to account ([#3691](https://github.com/vector-im/element-android/issues/3691))
+ - Space summary pagination ([#3693](https://github.com/vector-im/element-android/issues/3693))
+ - Update Email invite to be aware of spaces ([#3695](https://github.com/vector-im/element-android/issues/3695))
+ - M11.12 Spaces | Default to 'Home' in settings ([#3754](https://github.com/vector-im/element-android/issues/3754))
+ - Call: show dialog for some ended reasons. ([#3853](https://github.com/vector-im/element-android/issues/3853))
+ - Add expired account error code in the matrix SDK ([#3900](https://github.com/vector-im/element-android/issues/3900))
+ - Add password errors in the matrix SDK ([#3927](https://github.com/vector-im/element-android/issues/3927))
+ - Upgrade AGP to 7.0.2.
+  When compiling using command line, make sure to use the JDK 11 by adding for instance `-Dorg.gradle.java.home=/Applications/Android\ Studio\ Preview.app/Contents/jre/Contents/Home` or by setting JAVA_HOME. ([#3954](https://github.com/vector-im/element-android/issues/3954))
+ - Check power level before displaying actions in the room details' timeline ([#3959](https://github.com/vector-im/element-android/issues/3959))
+
+Bugfixes 🐛
+----------
+ - Add mxid to autocomplete suggestion if more than one user in a room has the same displayname ([#1823](https://github.com/vector-im/element-android/issues/1823))
+ - Use WebView cache for widgets to avoid excessive data use ([#2648](https://github.com/vector-im/element-android/issues/2648))
+ - Jitsi-hosted jitsi conferences not loading ([#2846](https://github.com/vector-im/element-android/issues/2846))
+ - Space Explore Rooms no feedback on failed to join ([#3207](https://github.com/vector-im/element-android/issues/3207))
+ - Notifications - Fix missing sound on notifications. ([#3243](https://github.com/vector-im/element-android/issues/3243))
+ - the element-based domain permalinks (e.g. https://app.element.io/#/user/@chagai95:matrix.org) don't have the mxid in the first param (like matrix.to does - https://matrix.to/#/@chagai95:matrix.org) but rather in the second after /user/ so /user/mxid ([#3735](https://github.com/vector-im/element-android/issues/3735))
+ - Update the AccountData with the users' matrix Id instead of their email for those invited by email in a direct chat ([#3743](https://github.com/vector-im/element-android/issues/3743))
+ - Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId} ([#3789](https://github.com/vector-im/element-android/issues/3789))
+ - Fix order in which the items of the attachement menu appear ([#3793](https://github.com/vector-im/element-android/issues/3793))
+ - Authenticated Jitsi not working in release ([#3841](https://github.com/vector-im/element-android/issues/3841))
+ - Home: Dial pad lost entry when config changes ([#3845](https://github.com/vector-im/element-android/issues/3845))
+ - Message edition is not rendered in e2e rooms after pagination ([#3887](https://github.com/vector-im/element-android/issues/3887))
+ - Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message ([#3897](https://github.com/vector-im/element-android/issues/3897))
+ - Fix a crash at start-up if translated string is empty ([#3910](https://github.com/vector-im/element-android/issues/3910))
+ - PushRule enabling request is not following the spec ([#3911](https://github.com/vector-im/element-android/issues/3911))
+ - Enable image preview in Android's share sheet (Android 11+) ([#3965](https://github.com/vector-im/element-android/issues/3965))
+ - Voice Message - Cannot render voice message if the waveform data is corrupted ([#3983](https://github.com/vector-im/element-android/issues/3983))
+ - Fix memory leak on RoomDetailFragment (ValueAnimator) ([#3990](https://github.com/vector-im/element-android/issues/3990))
+
+Other changes
+-------------
+ - VoIP: Merge virtual room timeline in corresponding native room (call events only). ([#3520](https://github.com/vector-im/element-android/issues/3520))
+ - Issue templates: modernise and sync with element-web ([#3883](https://github.com/vector-im/element-android/issues/3883))
+ - Issue templates: modernise SDK and release checklists, and add homeserver question for bugs ([#3889](https://github.com/vector-im/element-android/issues/3889))
+ - Issue templates: merge expected and actual results ([#3960](https://github.com/vector-im/element-android/issues/3960))
+
+
 Changes in Element v1.2.0 (2021-08-12)
 ======================================
 
diff --git a/changelog.d/1809.feature b/changelog.d/1809.feature
deleted file mode 100644
index b037ffa6d3..0000000000
--- a/changelog.d/1809.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support Android 11 Conversation features
\ No newline at end of file
diff --git a/changelog.d/1823.bugfix b/changelog.d/1823.bugfix
deleted file mode 100644
index 8252e1826f..0000000000
--- a/changelog.d/1823.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-- Add mxid to autocomplete suggestion if more than one user in a room has the same displayname
diff --git a/changelog.d/2648.bugfix b/changelog.d/2648.bugfix
deleted file mode 100644
index 24853af1bc..0000000000
--- a/changelog.d/2648.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use WebView cache for widgets to avoid excessive data use
\ No newline at end of file
diff --git a/changelog.d/2846.bugfix b/changelog.d/2846.bugfix
deleted file mode 100644
index 1669ea1cf9..0000000000
--- a/changelog.d/2846.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Jitsi-hosted jitsi conferences not loading
\ No newline at end of file
diff --git a/changelog.d/3207.bugfix b/changelog.d/3207.bugfix
deleted file mode 100644
index 162485907b..0000000000
--- a/changelog.d/3207.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Space Explore Rooms no feedback on failed to join
\ No newline at end of file
diff --git a/changelog.d/3243.bugfix b/changelog.d/3243.bugfix
deleted file mode 100644
index 8c912a5c13..0000000000
--- a/changelog.d/3243.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Notifications - Fix missing sound on notifications.
\ No newline at end of file
diff --git a/changelog.d/3520.misc b/changelog.d/3520.misc
deleted file mode 100644
index d015c3e03d..0000000000
--- a/changelog.d/3520.misc
+++ /dev/null
@@ -1 +0,0 @@
-VoIP: Merge virtual room timeline in corresponding native room (call events only).
\ No newline at end of file
diff --git a/changelog.d/3531.feature b/changelog.d/3531.feature
deleted file mode 100644
index e8b63584e3..0000000000
--- a/changelog.d/3531.feature
+++ /dev/null
@@ -1 +0,0 @@
-Introduces AutoAcceptInvites which can be enabled at compile time.
\ No newline at end of file
diff --git a/changelog.d/3599.feature b/changelog.d/3599.feature
deleted file mode 100644
index 7f09477f9c..0000000000
--- a/changelog.d/3599.feature
+++ /dev/null
@@ -1 +0,0 @@
-New call designs
\ No newline at end of file
diff --git a/changelog.d/3631.feature b/changelog.d/3631.feature
deleted file mode 100644
index 01e1ee28cc..0000000000
--- a/changelog.d/3631.feature
+++ /dev/null
@@ -1 +0,0 @@
-Restricted Join Rule | Inform admins of new option
\ No newline at end of file
diff --git a/changelog.d/3650.feature b/changelog.d/3650.feature
deleted file mode 100644
index 4ae065701f..0000000000
--- a/changelog.d/3650.feature
+++ /dev/null
@@ -1 +0,0 @@
-Mention and Keyword Notification Settings: Turn on/off keyword notifications and edit keywords.
\ No newline at end of file
diff --git a/changelog.d/3691.feature b/changelog.d/3691.feature
deleted file mode 100644
index ae139681b0..0000000000
--- a/changelog.d/3691.feature
+++ /dev/null
@@ -1 +0,0 @@
- Support accept 3pid invite when email is not bound to account
\ No newline at end of file
diff --git a/changelog.d/3693.feature b/changelog.d/3693.feature
deleted file mode 100644
index 6351ded522..0000000000
--- a/changelog.d/3693.feature
+++ /dev/null
@@ -1 +0,0 @@
-Space summary pagination
\ No newline at end of file
diff --git a/changelog.d/3695.feature b/changelog.d/3695.feature
deleted file mode 100644
index bd5934529d..0000000000
--- a/changelog.d/3695.feature
+++ /dev/null
@@ -1 +0,0 @@
-Update Email invite to be aware of spaces
\ No newline at end of file
diff --git a/changelog.d/3735.bugfix b/changelog.d/3735.bugfix
deleted file mode 100644
index 8262af627b..0000000000
--- a/changelog.d/3735.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-the element-based domain permalinks (e.g. https://app.element.io/#/user/@chagai95:matrix.org) don't have the mxid in the first param (like matrix.to does - https://matrix.to/#/@chagai95:matrix.org) but rather in the second after /user/ so /user/mxid
\ No newline at end of file
diff --git a/changelog.d/3743.bugfix b/changelog.d/3743.bugfix
deleted file mode 100644
index 87baf62834..0000000000
--- a/changelog.d/3743.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Update the AccountData with the users' matrix Id instead of their email for those invited by email in a direct chat
\ No newline at end of file
diff --git a/changelog.d/3754.feature b/changelog.d/3754.feature
deleted file mode 100644
index e997ac370d..0000000000
--- a/changelog.d/3754.feature
+++ /dev/null
@@ -1 +0,0 @@
-M11.12 Spaces | Default to 'Home' in settings
\ No newline at end of file
diff --git a/changelog.d/3789.bugfix b/changelog.d/3789.bugfix
deleted file mode 100644
index fc3402e029..0000000000
--- a/changelog.d/3789.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Send an empty body for POST rooms/{roomId}/receipt/{receiptType}/{eventId}
\ No newline at end of file
diff --git a/changelog.d/3793.bugfix b/changelog.d/3793.bugfix
deleted file mode 100644
index 8f81229262..0000000000
--- a/changelog.d/3793.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix order in which the items of the attachement menu appear
diff --git a/changelog.d/3841.bugfix b/changelog.d/3841.bugfix
deleted file mode 100644
index d0e84757dc..0000000000
--- a/changelog.d/3841.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Authenticated Jitsi not working in release
\ No newline at end of file
diff --git a/changelog.d/3845.bugfix b/changelog.d/3845.bugfix
deleted file mode 100644
index ce820738fe..0000000000
--- a/changelog.d/3845.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Home: Dial pad lost entry when config changes
\ No newline at end of file
diff --git a/changelog.d/3853.feature b/changelog.d/3853.feature
deleted file mode 100644
index 86c19d2c22..0000000000
--- a/changelog.d/3853.feature
+++ /dev/null
@@ -1 +0,0 @@
-Call: show dialog for some ended reasons.
\ No newline at end of file
diff --git a/changelog.d/3883.misc b/changelog.d/3883.misc
deleted file mode 100644
index 468e5e4927..0000000000
--- a/changelog.d/3883.misc
+++ /dev/null
@@ -1 +0,0 @@
-Issue templates: modernise and sync with element-web
diff --git a/changelog.d/3887.bugfix b/changelog.d/3887.bugfix
deleted file mode 100644
index eecd2cea19..0000000000
--- a/changelog.d/3887.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Message edition is not rendered in e2e rooms after pagination
\ No newline at end of file
diff --git a/changelog.d/3889.misc b/changelog.d/3889.misc
deleted file mode 100644
index 361bd6419b..0000000000
--- a/changelog.d/3889.misc
+++ /dev/null
@@ -1 +0,0 @@
-Issue templates: modernise SDK and release checklists, and add homeserver question for bugs
diff --git a/changelog.d/3897.bugfix b/changelog.d/3897.bugfix
deleted file mode 100644
index cad8560ca4..0000000000
--- a/changelog.d/3897.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message
\ No newline at end of file
diff --git a/changelog.d/3900.feature b/changelog.d/3900.feature
deleted file mode 100644
index 765f51f054..0000000000
--- a/changelog.d/3900.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add expired account error code in the matrix SDK
\ No newline at end of file
diff --git a/changelog.d/3910.bugfix b/changelog.d/3910.bugfix
deleted file mode 100644
index 3bca598e45..0000000000
--- a/changelog.d/3910.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a crash at start-up if translated string is empty
\ No newline at end of file
diff --git a/changelog.d/3911.bugfix b/changelog.d/3911.bugfix
deleted file mode 100644
index 4cd40bdd7d..0000000000
--- a/changelog.d/3911.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-PushRule enabling request is not following the spec
\ No newline at end of file
diff --git a/changelog.d/3927.feature b/changelog.d/3927.feature
deleted file mode 100644
index 86091b6422..0000000000
--- a/changelog.d/3927.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add password errors in the matrix SDK
\ No newline at end of file
diff --git a/changelog.d/3954.feature b/changelog.d/3954.feature
deleted file mode 100644
index 132277032c..0000000000
--- a/changelog.d/3954.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-Upgrade AGP to 7.0.2.
-When compiling using command line, make sure to use the JDK 11 by adding for instance `-Dorg.gradle.java.home=/Applications/Android\ Studio\ Preview.app/Contents/jre/Contents/Home` or by setting JAVA_HOME.
\ No newline at end of file
diff --git a/changelog.d/3959.feature b/changelog.d/3959.feature
deleted file mode 100644
index ac1116dad9..0000000000
--- a/changelog.d/3959.feature
+++ /dev/null
@@ -1 +0,0 @@
-Check power level before displaying actions in the room details' timeline
\ No newline at end of file
diff --git a/changelog.d/3960.misc b/changelog.d/3960.misc
deleted file mode 100644
index d37fcc9459..0000000000
--- a/changelog.d/3960.misc
+++ /dev/null
@@ -1 +0,0 @@
-Issue templates: merge expected and actual results
diff --git a/changelog.d/3965.bugfix b/changelog.d/3965.bugfix
deleted file mode 100644
index 9d966c2ca3..0000000000
--- a/changelog.d/3965.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Enable image preview in Android's share sheet (Android 11+)
diff --git a/changelog.d/3983.bugfix b/changelog.d/3983.bugfix
deleted file mode 100644
index 4b3fdc454d..0000000000
--- a/changelog.d/3983.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Voice Message - Cannot render voice message if the waveform data is corrupted
\ No newline at end of file
diff --git a/changelog.d/3990.bugfix b/changelog.d/3990.bugfix
deleted file mode 100644
index 19bf9c65d1..0000000000
--- a/changelog.d/3990.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-- Fix memory leak on RoomDetailFragment (ValueAnimator)
\ No newline at end of file