From 3e71453e71968c29a400cc949b6f284dfccabb1e Mon Sep 17 00:00:00 2001
From: Andrew Chen <achen.code@gmail.com>
Date: Fri, 14 Sep 2012 19:45:04 -0700
Subject: [PATCH] Handle implicit vs. explicit searches in ActionBar home
 button behavior.

---
 src/com/fsck/k9/activity/MessageList.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 6812603ba..3a72cceea 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1414,10 +1414,16 @@ public class MessageList extends K9ListActivity implements OnItemClickListener {
         int itemId = item.getItemId();
         switch (itemId) {
         case android.R.id.home: {
-            if (mQueryString == null) {
-                onShowFolderList();
-            } else {
+            if (mIntegrate) {
+                // If we were in one of the integrated mailboxes (think All Mail or Integrated Inbox), then
+                // go to accounts.
                 onAccounts();
+            } else if (mQueryString != null) {
+                // We did a search of some sort.  Go back to wherever the user searched from.
+                onBackPressed();
+            } else {
+                // In a standard message list of a folder.  Go to folder list.
+                onShowFolderList();
             }
             return true;
         }