diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
index 00672c4f9..2c2bb2fef 100644
--- a/src/com/fsck/k9/mail/store/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -1476,11 +1476,10 @@ public class ImapStore extends Store {
             checkOpen(); //only need READ access
             List<String> uids = new ArrayList<String>(messages.length);
             HashMap<String, Message> messageMap = new HashMap<String, Message>();
-            for (int i = 0, count = messages.length; i < count; i++) {
-
-                String uid = messages[i].getUid();
+            for (Message msg : messages) {
+                String uid = msg.getUid();
                 uids.add(uid);
-                messageMap.put(uid, messages[i]);
+                messageMap.put(uid, msg);
             }
 
             /*