diff --git a/app/k9mail/build.gradle.kts b/app/k9mail/build.gradle.kts
index cf3f8573a..541129a68 100644
--- a/app/k9mail/build.gradle.kts
+++ b/app/k9mail/build.gradle.kts
@@ -44,8 +44,8 @@ android {
         applicationId = "com.fsck.k9"
         testApplicationId = "com.fsck.k9.tests"
 
-        versionCode = 37005
-        versionName = "6.706-SNAPSHOT"
+        versionCode = 37006
+        versionName = "6.706"
 
         // Keep in sync with the resource string array "supported_languages"
         resourceConfigurations.addAll(
diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/app/ui/legacy/src/main/res/raw/changelog_master.xml
index 1d5333b18..9a5f9b171 100644
--- a/app/ui/legacy/src/main/res/raw/changelog_master.xml
+++ b/app/ui/legacy/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,10 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.706" versioncode="37006" date="2023-06-16">
+        <change>Fixed a bug that lead to folders appearing to be empty</change>
+        <change>Don't use nickname as display name when auto-completing recipient using the nickname</change>
+    </release>
     <release version="6.705" versioncode="37005" date="2023-06-12">
         <change>Adding to contacts should now allow you again to add the email address to an existing contact</change>
         <change>Fixed display issue with recipients in message view screen</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/37006.txt b/fastlane/metadata/android/en-US/changelogs/37006.txt
new file mode 100644
index 000000000..3ec017936
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/37006.txt
@@ -0,0 +1,2 @@
+- Fixed a bug that lead to folders appearing to be empty
+- Don't use nickname as display name when auto-completing recipient using the nickname