diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java
index 8ca6f3523..0bd3efed6 100644
--- a/src/com/fsck/k9/mail/store/ImapStore.java
+++ b/src/com/fsck/k9/mail/store/ImapStore.java
@@ -924,30 +924,7 @@ public class ImapStore extends Store
                 {
                     if (ImapResponseParser.equalsIgnoreCase(response.get(0), "SEARCH"))
                     {
-                        /*
-                         * At least one server software decided it'd be a nice challenge for
-                         * client implementations to return a message sequence number of 0 when
-                         * no matches were found. So we're doing some sanity checks on the
-                         * returned values before adding them to our message count.
-                         *
-                         * See issue 2078
-                         */
-                        boolean invalidResponse = false;
-                        for (int i = 1, length = response.size(); i < length; i++)
-                        {
-                            if ("0".equals(response.get(i)))
-                            {
-                                invalidResponse = true;
-                            }
-                            else
-                            {
-                                count++;
-                            }
-                        }
-                        if (K9.DEBUG && invalidResponse)
-                        {
-                            Log.d(K9.LOG_TAG, "Invalid value found in SEARCH response.");
-                        }
+                        count += response.size() - 1;
                     }
                 }
                 return count;