diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 0975d7dff..ed88cb6cc 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -978,6 +978,9 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
 
             menu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable());
 
+            // Jellybean has built-in long press selection support
+            menu.findItem(R.id.select_text).setVisible(Build.VERSION.SDK_INT < 16);
+
             if (mMessageViewFragment.isMoveCapable()) {
                 menu.findItem(R.id.move).setVisible(true);
                 menu.findItem(R.id.archive).setVisible(mMessageViewFragment.canMessageBeArchived());