diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 473996f8d..cb366797d 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -153,34 +153,16 @@
 
                 </RelativeLayout>
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <!-- Show more/less indicator -->
-                    <ImageView
-                        android:id="@+id/show_additional_headers_icon"
-                        android:src="@drawable/show_more"
-                        android:layout_alignParentRight="true"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="4dp"
-                        android:paddingRight="12dp"
-                        android:scaleType="fitEnd"/>
-
                     <TextView
                         android:id="@+id/additional_headers_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/show_additional_headers_icon"
                         android:layout_marginRight="10dp"
                         android:singleLine="false"
                         android:ellipsize="none"
                         android:textColor="?android:attr/textColorSecondary"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                </RelativeLayout>
 
             </LinearLayout>
 
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index e868bf835..cf4161acb 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -112,6 +112,14 @@
         android:showAsAction="never"
         android:title="@string/mark_as_unread_action"/>
 
+    <item android:id="@+id/show_headers"
+          android:showAsAction="never"
+          android:title="@string/show_headers_action"/>
+
+    <item android:id="@+id/hide_headers"
+          android:showAsAction="never"
+          android:title="@string/hide_headers_action"/>
+
     <!-- MessageList -->
     <item
         android:id="@+id/set_sort"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 02ecda8cd..55e67f432 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -165,6 +165,8 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="unflag_action">Remove star</string>
     <string name="copy_action">Copy</string>
     <string name="select_text_action">Select text</string>
+    <string name="show_headers_action">Show headers</string>
+    <string name="hide_headers_action">Hide headers</string>
 
     <string name="message_view_theme_action_dark">Switch to dark theme</string>
     <string name="message_view_theme_action_light">Switch to light theme</string>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index a86b31022..6e65fcd52 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -838,6 +838,12 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 mMessageViewFragment.onSelectText();
                 return true;
             }
+            case R.id.show_headers:
+            case R.id.hide_headers: {
+                mMessageViewFragment.onToggleAllHeadersView();
+                updateMenu();
+                return true;
+            }
         }
 
         if (!mSingleFolderMode) {
@@ -927,6 +933,8 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             menu.findItem(R.id.toggle_unread).setVisible(false);
             menu.findItem(R.id.select_text).setVisible(false);
             menu.findItem(R.id.toggle_message_view_theme).setVisible(false);
+            menu.findItem(R.id.show_headers).setVisible(false);
+            menu.findItem(R.id.hide_headers).setVisible(false);
         } else {
             // hide prev/next buttons in split mode
             if (mDisplayMode != DisplayMode.MESSAGE_VIEW) {
@@ -974,6 +982,13 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 menu.findItem(R.id.archive).setVisible(false);
                 menu.findItem(R.id.spam).setVisible(false);
             }
+
+            if (mMessageViewFragment.allHeadersVisible()) {
+                menu.findItem(R.id.show_headers).setVisible(false);
+            } else {
+                menu.findItem(R.id.hide_headers).setVisible(false);
+            }
+
         }
 
 
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index 51f5723c3..fefa26f48 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -276,6 +276,14 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
         }
     }
 
+    public void onToggleAllHeadersView() {
+        mMessageView.getMessageHeaderView().onShowAdditionalHeaders();
+    }
+
+    public boolean allHeadersVisible() {
+        return mMessageView.getMessageHeaderView().additionalHeadersVisible();
+    }
+
     private void delete() {
         if (mMessage != null) {
             // Disable the delete button after it's tapped (to try to prevent
diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java
index 3d08f4946..c0bd45db9 100644
--- a/src/com/fsck/k9/view/MessageHeader.java
+++ b/src/com/fsck/k9/view/MessageHeader.java
@@ -59,7 +59,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
     private Account mAccount;
     private FontSizes mFontSizes = K9.getFontSizes();
     private Contacts mContacts;
-    private ImageView mShowAdditionalHeadersIcon;
     private SavedState mSavedState;
 
     private OnLayoutChangedListener mOnLayoutChangedListener;
@@ -99,7 +98,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
         mDateView = (TextView) findViewById(R.id.date);
         mTimeView = (TextView) findViewById(R.id.time);
         mFlagged = (CheckBox) findViewById(R.id.flagged);
-        mShowAdditionalHeadersIcon = (ImageView) findViewById(R.id.show_additional_headers_icon);
 
         defaultSubjectColor = mSubjectView.getCurrentTextColor();
         mSubjectView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageViewSubject());
@@ -111,7 +109,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
         mToView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageViewTo());
         mCcView.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageViewCC());
 
-        mShowAdditionalHeadersIcon.setOnClickListener(this);
         mFromView.setOnClickListener(this);
         mToView.setOnClickListener(this);
         mCcView.setOnClickListener(this);
@@ -127,10 +124,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.show_additional_headers_icon: {
-                onShowAdditionalHeaders();
-                break;
-            }
             case R.id.from: {
                 onAddSenderToContacts();
                 break;
@@ -173,7 +166,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
     private void hideAdditionalHeaders() {
         mAdditionalHeadersView.setVisibility(View.GONE);
         mAdditionalHeadersView.setText("");
-        mShowAdditionalHeadersIcon.setImageResource(R.drawable.show_more);
     }
 
 
@@ -192,7 +184,6 @@ public class MessageHeader extends ScrollView implements OnClickListener {
                 // Show the additional headers that we have got.
                 populateAdditionalHeadersView(additionalHeaders);
                 mAdditionalHeadersView.setVisibility(View.VISIBLE);
-                mShowAdditionalHeadersIcon.setImageResource(R.drawable.show_less);
             }
             if (!allHeadersDownloaded) {
                 /*