diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e0e473c0..5ed263ddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 1.22.0
+* Text markup *bold*, _italic_,`monospace` and ~strikethrough~
+* Use same emoji style on all Android versions
+* Display emojis slightly larger within continuous text
+
 ### Version 1.21.0
 * Inline player for audio messages
 * Stronger compression for long videos
diff --git a/build.gradle b/build.gradle
index bf8a6a200..1aa6870f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,8 +65,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 236
-        versionName "1.21.0"
+        versionCode 239
+        versionName "1.22.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }