diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 4431122d8..7d3379215 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -604,7 +604,9 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 return true;
             }
             case KeyEvent.KEYCODE_Q: {
-                goBack();
+                if (mMessageListFragment != null && mMessageListFragment.isSingleAccountMode()) {
+                    onShowFolderList();
+                }
                 return true;
             }
             case KeyEvent.KEYCODE_O: {
@@ -1063,15 +1065,16 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             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);
                 menu.findItem(R.id.send_messages).setVisible(false);
+                menu.findItem(R.id.show_folder_list).setVisible(false);
             } else {
                 menu.findItem(R.id.send_messages).setVisible(mMessageListFragment.isOutbox());
                 menu.findItem(R.id.expunge).setVisible(mMessageListFragment.isRemoteFolder() &&
                         mMessageListFragment.isAccountExpungeCapable());
+                menu.findItem(R.id.show_folder_list).setVisible(true);
             }
 
             menu.findItem(R.id.check_mail).setVisible(mMessageListFragment.isCheckMailSupported());