diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 282083282..5c459cdc4 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1576,7 +1576,12 @@ public class MessageList
             {
                 if (updateForMe(account, folder))
                 {
-                    addOrUpdateMessage(account, folder, message);
+                    FolderInfoHolder f = mCurrentFolder;
+                    // XXX TODO, this is the wrong folder
+                    if (f != null)
+                    {
+                        addOrUpdateMessage(account, f, message);
+                    }
                 }
 
                 return;
@@ -1658,7 +1663,12 @@ public class MessageList
             {
                 if (updateForMe(account, folder))
                 {
-                    addOrUpdateMessage(account, folder, message);
+                    FolderInfoHolder f = mCurrentFolder;
+                    // XXX TODO, this is the wrong folder
+                    if (f != null)
+                    {
+                        addOrUpdateMessage(account, f, message);
+                    }
                 }
 
             }
@@ -1737,18 +1747,6 @@ public class MessageList
             removeMessages(messages);
         }
 
-        private void addOrUpdateMessage(Account account, String folder, Message message)
-        {
-            // TODO do we want "f" or "mCurrentFolder" below?
-            FolderInfoHolder f = mCurrentFolder;
-
-            if (f != null)
-            {
-                addOrUpdateMessage(account, f, message);
-            }
-
-        }
-
         private void addOrUpdateMessage(Account account, FolderInfoHolder folder, Message message)
         {
             List<Message> messages = new ArrayList<Message>();