diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index f7b056760..ce5f5d52b 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -67,12 +67,6 @@
         android:title="@string/read_toggle_action"
         android:icon="?attr/iconActionToggleRead"
         android:showAsAction="never"
-    />
-    <item
-        android:id="@+id/flag"
-        android:alphabeticShortcut="s"
-        android:title="@string/flag_action"
-        android:showAsAction="never"
     />
 	<item
 		android:id="@+id/select_text"
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index e6cefaa3d..54cfba77a 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -778,9 +778,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.forward:
             onForward();
             break;
-        case R.id.flag:
-            onFlag();
-            break;
         case R.id.share:
             onSendAlternate();
             break;