diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 5f87cb304..0065a1e5d 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -398,9 +398,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         setOnClickListener(R.id.archive);
         setOnClickListener(R.id.move);
         setOnClickListener(R.id.spam);
-        // To show full header
-        setOnClickListener(R.id.header_container);
-        setOnClickListener(R.id.show_pictures);
         setOnClickListener(R.id.download_remainder);
 
 
@@ -812,9 +809,6 @@ public class MessageView extends K9Activity implements OnClickListener {
         case R.id.download:
             ((AttachmentView)view).saveFile();
             break;
-        case R.id.show_pictures:
-            mMessageView.setLoadPictures(true);
-            break;
         case R.id.download_remainder:
             onDownloadRemainder();
             break;
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 878d6b08d..5553a6dbd 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -104,6 +104,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
         mShowHiddenAttachments.setOnClickListener(this);
         mShowMessageAction.setOnClickListener(this);
         mShowAttachmentsAction.setOnClickListener(this);
+        mShowPicturesAction.setOnClickListener(this);
     }
 
     @Override
@@ -121,6 +122,10 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
                 onShowAttachments();
                 break;
             }
+            case R.id.show_pictures: {
+                setLoadPictures(true);
+                break;
+            }
         }
     }