diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java
index 7b5a11abb..c35c02835 100644
--- a/src/com/android/email/mail/store/Pop3Store.java
+++ b/src/com/android/email/mail/store/Pop3Store.java
@@ -584,12 +584,12 @@ public class Pop3Store extends Store {
                     if (ok > 0) {
                         try {
                             int start = ok + 3;
-                            int end = response.indexOf(" ", start);
-                            if (start < response.length()) {
+                            if (start > response.length()) {
                                 // No length was supplied, this is a protocol error.
                                 LogUtils.e(Logging.LOG_TAG, "No body length supplied");
                                 message.setSize(0);
                             } else {
+                                int end = response.indexOf(" ", start);
                                 final String intString;
                                 if (end > 0) {
                                     intString = response.substring(start, end);