From a00626264fb0769018190685a9164d796f9cd7ff Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 29 Jan 2013 01:25:22 +0100
Subject: [PATCH] Go back to message list when using the back button in message
 view

---
 src/com/fsck/k9/activity/MessageList.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 4b55e0081..7f3e94359 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -368,6 +368,15 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         return ret;
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mDisplayMode == DisplayMode.MESSAGE_VIEW) {
+            showMessageList();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
     /**
      * Handle hotkeys
      *
@@ -1077,7 +1086,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
         } else if (fragmentManager.getBackStackEntryCount() > 0) {
             fragmentManager.popBackStack();
         } else if (mMessageListFragment.isManualSearch()) {
-            onBackPressed();
+            finish();
         } else if (!mSingleFolderMode) {
             onAccounts();
         } else {