diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index e840f89d2..5fc37743a 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -817,6 +817,7 @@ public class Account implements BaseAccount
         {
             this.mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;
         }
+        resetVisibleLimits();
     }
 
     public synchronized long getLastAutomaticCheckTime()