diff --git a/k9mail/src/main/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml
index de8250b32..34159eedd 100644
--- a/k9mail/src/main/AndroidManifest.xml
+++ b/k9mail/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     package="com.fsck.k9"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="23040"
-    android:versionName="5.104">
+    android:versionCode="23050"
+    android:versionName="5.105">
 
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/k9mail/src/main/res/xml/changelog_master.xml b/k9mail/src/main/res/xml/changelog_master.xml
index 93b007f29..1b3e0f69c 100644
--- a/k9mail/src/main/res/xml/changelog_master.xml
+++ b/k9mail/src/main/res/xml/changelog_master.xml
@@ -8,6 +8,9 @@
      They are automatically updated with "ant bump-version".
 -->
 <changelog>
+    <release version="5.105" versioncode="23050">
+        <change>Reverted all changes introduced with v5.104 except for the bugfixes related to Android 5.1</change>
+    </release>
     <release version="5.104" versioncode="23040">
         <change>Fixed crash when selecting multiple messages on Android 5.1</change>
         <change>Fixed settings export</change>