From e1bd260bd06ce2dedb22f7f0a6bef788a303c74a Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Fri, 13 Mar 2015 12:53:17 +0100
Subject: [PATCH 1/4] Copy changelog for 5.104

---
 res/xml/changelog_master.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/xml/changelog_master.xml b/res/xml/changelog_master.xml
index 84865ad4f..93b007f29 100644
--- a/res/xml/changelog_master.xml
+++ b/res/xml/changelog_master.xml
@@ -8,6 +8,13 @@
      They are automatically updated with "ant bump-version".
 -->
 <changelog>
+    <release version="5.104" versioncode="23040">
+        <change>Fixed crash when selecting multiple messages on Android 5.1</change>
+        <change>Fixed settings export</change>
+        <change>Fixed some layout bugs</change>
+        <change>Added Serbian translation</change>
+        <change>Updated several translations</change>
+    </release>
     <release version="5.103" versioncode="23030">
         <change>Added ability to customize lock screen notifications (Android 5.0+ only)</change>
         <change>Fixed a bug where a certificate error was wrongly reported</change>

From 672a85bcf4285ea54d1479b5f6182f63bea84ab2 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Fri, 13 Mar 2015 21:12:21 +0100
Subject: [PATCH 2/4] Fix crashes when selecting messages in the message list

Throughout the code we make the assumption that onPrepareActionMode() is
called right after starting the action mode. However, this is not the case on
Android 5.1.
With this change we call ActionMode.invalidate() right after starting the
action mode which causes onPrepareActionMode() to be invoked.
---
 src/com/fsck/k9/fragment/MessageListFragment.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index f6bd09f74..205383e55 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -2224,7 +2224,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
             }
 
             if (mActionMode == null) {
-                mActionMode = getActivity().startActionMode(mActionModeCallback);
+                startAndPrepareActionMode();
             }
             computeBatchDirection();
             updateActionModeTitle();
@@ -2283,7 +2283,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
                 return;
             }
         } else {
-            mActionMode = getActivity().startActionMode(mActionModeCallback);
+            startAndPrepareActionMode();
         }
 
         if (selected) {
@@ -3542,13 +3542,18 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
         }
 
         if (mActionMode == null) {
-            mActionMode = getActivity().startActionMode(mActionModeCallback);
+            startAndPrepareActionMode();
         }
 
         recalculateSelectionCount();
         updateActionModeTitle();
     }
 
+    private void startAndPrepareActionMode() {
+        mActionMode = getActivity().startActionMode(mActionModeCallback);
+        mActionMode.invalidate();
+    }
+
     /**
      * Recalculates the selection count.
      *

From c147ce08223f2b20ce4ca20522c4501fc124740a Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 14 Mar 2015 12:06:50 +0100
Subject: [PATCH 3/4] Prepare changelog for 5.105

---
 res/xml/changelog_master.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/res/xml/changelog_master.xml b/res/xml/changelog_master.xml
index 93b007f29..1b3e0f69c 100644
--- a/res/xml/changelog_master.xml
+++ b/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>

From 83de921a1afd5ec393aa05865a7504a48cfc43eb Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 14 Mar 2015 12:10:13 +0100
Subject: [PATCH 4/4] Bump version to 5.105

---
 AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16ce08390..a8db319bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     package="com.fsck.k9"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="23030"
-    android:versionName="5.103">
+    android:versionCode="23050"
+    android:versionName="5.105">
 
     <uses-feature
         android:name="android.hardware.touchscreen"