diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index 49a9ff4d..adea2271 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -1014,6 +1014,8 @@ public class ImapConnection extends AbstractConnection {
                 } else {
                     startUid = endUid = convertToLong(currentRange);
                 }
+                // Need to reset index for Palm pre
+                currentIndex = 0;
                 while (currentIndex < currentFolder.count() && currentFolder.getImapUid(currentIndex) < startUid) {
                     currentIndex++;
                 }
@@ -1072,6 +1074,8 @@ public class ImapConnection extends AbstractConnection {
                 } else {
                     startUid = endUid = convertToLong(currentRange);
                 }
+                // Need to reset index for Palm pre
+                currentIndex = 0;
                 while (currentIndex < currentFolder.count() && (currentIndex + 1) < startUid) {
                     currentIndex++;
                 }