diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 18d1e4bbc..1b96b6670 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -95,6 +95,7 @@ public class MessageView extends K9Activity implements OnClickListener
     private CheckBox mFlagged;
     private int defaultSubjectColor;
     private WebView mMessageContentView;
+    private LinearLayout mHeaderContainer;
     private LinearLayout mAttachments;
     private LinearLayout mCcContainerView;
     private TextView mAdditionalHeadersView;
@@ -652,6 +653,7 @@ public class MessageView extends K9Activity implements OnClickListener
 
         setContentView(R.layout.message_view);
 
+        mHeaderContainer = (LinearLayout)findViewById(R.id.header_container);
 
         mFromView = (TextView)findViewById(R.id.from);
         mToView = (TextView)findViewById(R.id.to);