diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6333a572de78ca274f48335677383f8fdaff1e8..554360daee85ec3f18df274b9757e53eccd347b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.5
+
+* Move message bubbles closer together instead of merging them
+* Add ability to hide avatars in chat views when not stricly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)
+
 ### Version 2.17.4
 
 * improve handling of some emoji reactions
diff --git a/build.gradle b/build.gradle
index 1dfb565d3cca29aa618c938e943e4689789b336a..c8c048df072f32d07063680ea7e3466b1937e9aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,8 +111,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42125
-        versionName "2.17.4"
+        versionCode 42126
+        versionName "2.17.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212604.txt b/fastlane/metadata/android/en-US/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..84d0effac257f8e9b438a6cd4bb5f82a96e25fd2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Move message bubbles closer together instead of merging them
+* Add ability to hide avatars in chat views when not stricly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)