diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 022a23a69..710165394 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -2266,6 +2266,11 @@ public class MessageList
                 MessageInfoHolder holder = iter.next();
                 if (holder.dirty)
                 {
+                    if (holder.selected)
+                    {
+                        mSelectedCount--;
+                        toggleBatchButtons();
+                    }
                     iter.remove();
                 }
             }