diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index a87c08ed8..8a1c5e03b 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1810,6 +1810,11 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
     private void setSelectionState(boolean selected) {
         if (selected) {
             mSelectedCount = mAdapter.getCount();
+            if (mSelectedCount == 0) {
+                // Nothing to do if there are no messages
+                return;
+            }
+
             for (int i = 0, end = mSelectedCount; i < end; i++) {
                 mSelected.put(i, true);
             }