From 1983a7e2a77d8c8252f4299d820c4c2893b6baab Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Tue, 3 Nov 2009 03:21:42 +0000
Subject: [PATCH] Correct unread message counts for stores (like Pop3Store)
 which are unable to provide a server-side tracked unread message count.

---
 src/com/android/email/MessagingController.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index d026d0525..5c2e4a7a0 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -1009,10 +1009,7 @@ public class MessagingController implements Runnable {
     private void setLocalUnreadCountToRemote(LocalFolder localFolder, Folder remoteFolder, int newMessageCount) throws MessagingException
     {
         int remoteUnreadMessageCount = remoteFolder.getUnreadMessageCount();
-        if (remoteUnreadMessageCount == -1) {
-            localFolder.setUnreadMessageCount(localFolder.getUnreadMessageCount() + newMessageCount);
-        }
-        else {
+        if (remoteUnreadMessageCount != -1) {
             localFolder.setUnreadMessageCount(remoteUnreadMessageCount);
         }
     }