From b4c8afbe220a5217ae40a0ee4dbca582038f9723 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Tue, 2 Jul 2013 13:14:43 -0400
Subject: [PATCH] better guarding for the  folders menu item in the face of
 search folders with multiple accounts

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

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 957b4ce01..4431122d8 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -604,7 +604,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 return true;
             }
             case KeyEvent.KEYCODE_Q: {
-                onShowFolderList();
+                goBack();
                 return true;
             }
             case KeyEvent.KEYCODE_O: {
@@ -1057,11 +1057,13 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             menu.findItem(R.id.send_messages).setVisible(false);
             menu.findItem(R.id.expunge).setVisible(false);
             menu.findItem(R.id.mark_all_as_read).setVisible(false);
+            menu.findItem(R.id.show_folder_list).setVisible(false);
         } else {
             menu.findItem(R.id.set_sort).setVisible(true);
             menu.findItem(R.id.select_all).setVisible(true);
             menu.findItem(R.id.mark_all_as_read).setVisible(
                     mMessageListFragment.isMarkAllAsReadSupported());
+            menu.findItem(R.id.show_folder_list).setVisible(mAccount == null ? false : true);
 
             if (!mMessageListFragment.isSingleAccountMode()) {
                 menu.findItem(R.id.expunge).setVisible(false);