diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 0153d6eb7..54d65d6f9 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -367,8 +367,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 FragmentManager fragmentManager = getSupportFragmentManager();
                 if (fragmentManager.getBackStackEntryCount() > 0) {
                     fragmentManager.popBackStack();
-                } else if (!mSingleFolderMode || mMessageListFragment.isManualSearch()) {
+                } else if (mMessageListFragment.isManualSearch()) {
                     onBackPressed();
+                } else if (!mSingleFolderMode) {
+                    onAccounts();
                 } else {
                     onShowFolderList();
                 }