diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index ff2f176f5..f6035c47e 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -2667,8 +2667,9 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             outMessages.add(message);
         }
 
-        for (String folderName : folderMap.keySet()) {
-            List<Message> outMessages = folderMap.get(folderName);
+        for (Map.Entry<String, List<Message>> entry : folderMap.entrySet()) {
+            String folderName = entry.getKey();
+            List<Message> outMessages = entry.getValue();
             Account account = outMessages.get(0).getFolder().getAccount();
 
             if (operation == FolderOperation.MOVE) {