diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java
index b08a02dc0..9647e8ce5 100644
--- a/src/com/fsck/k9/mail/store/LocalStore.java
+++ b/src/com/fsck/k9/mail/store/LocalStore.java
@@ -6288,17 +6288,21 @@ public class LocalStore extends Store implements Serializable, LocalStoreMigrati
                 }
 
 
-                if ( flag == Flag.SEEN && !isSet(Flag.DELETED))
+                if ( !isSet(Flag.DELETED) )
                 {
-                    if (set != isSet(Flag.SEEN))
-                    {
-                        folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
-                    }
-                }
 
-                if (flag == Flag.FLAGGED && !isSet(Flag.DELETED))
-                {
-                    folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ?  1 : -1));
+                    if ( flag == Flag.SEEN )
+                    {
+                        if (set != isSet(Flag.SEEN))
+                        {
+                            folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
+                        }
+                    }
+
+                    if ( flag == Flag.FLAGGED )
+                    {
+                        folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ?  1 : -1));
+                    }
                 }
             }
             catch (MessagingException me)