diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java
index ba506c444..a13523636 100644
--- a/src/com/fsck/k9/view/MessageHeader.java
+++ b/src/com/fsck/k9/view/MessageHeader.java
@@ -150,7 +150,7 @@ public class MessageHeader extends LinearLayout
 
     public boolean additionalHeadersVisible()
     {
-        if ( mAdditionalHeadersView.getVisibility() == View.VISIBLE )
+        if ( mAdditionalHeadersView != null && mAdditionalHeadersView.getVisibility() == View.VISIBLE )
         {
             return true;
         }