diff --git a/src/com/fsck/k9/MessagingController.java b/src/com/fsck/k9/MessagingController.java
index 918a82bba..49bb50847 100644
--- a/src/com/fsck/k9/MessagingController.java
+++ b/src/com/fsck/k9/MessagingController.java
@@ -763,7 +763,7 @@ public class MessagingController implements Runnable
                         displayableOnly = true;
                         noSpecialFolders = true;
                     }
-                    else
+                    else if (integrate == false && folderNames == null)
                     {
                         Account.Searchable searchableFolders = account.getSearchableFolders();
                         switch (searchableFolders)