diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 67f8520d5..05036a64c 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1496,6 +1496,12 @@ public class MessageList
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(info.position);
 
+        // in multi-select mode, the context menu pops up unintentionally 
+        // causes misclicks
+        if (mSelectedWidget == WIDGET_MULTISELECT) {
+            return;
+        }
+
         if (message == null)
         {
             return;