diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 7a7393c68..ea490dec8 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1702,15 +1702,10 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             super.synchronizeMailboxFailed(account, folder, message);
         }
 
-        @Override
-        public void searchStats(AccountStats stats) {
-            mUnreadMessageCount = stats.unreadMessageCount;
-            super.searchStats(stats);
-        }
-
         @Override
         public void folderStatusChanged(Account account, String folder, int unreadMessageCount) {
-            if (updateForMe(account, folder)) {
+            if (isSingleAccountMode() && isSingleFolderMode() && mAccount.equals(account) &&
+                    mFolderName.equals(folder)) {
                 mUnreadMessageCount = unreadMessageCount;
             }
             super.folderStatusChanged(account, folder, unreadMessageCount);
@@ -1721,9 +1716,12 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
                 return false;
             }
 
-            // FIXME: There could be more than one account and one folder
+            if (!Utility.arrayContains(mAccountUuids, account.getUuid())) {
+                return false;
+            }
 
-            return ((account.equals(mAccount) && folder.equals(mFolderName)));
+            List<String> folderNames = mSearch.getFolderNames();
+            return (folderNames.size() == 0 || folderNames.contains(folder));
         }
     }