diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 99d634106..e91dd5d56 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1416,7 +1416,7 @@ public class MessageList
                 {
                     MessageInfoHolder msgInfoHolder = (MessageInfoHolder) mAdapter.getItem(position);
 
-                    if (msgInfoHolder != null)
+                    if (msgInfoHolder != null && msgInfoHolder.selected != selected)
                     {
                         msgInfoHolder.selected = selected;
                         mSelectedCount += (selected ? 1 : -1);