diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 432c14582..ca3fbbea5 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -1791,7 +1791,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private void onAddCcBcc() {
         mCcWrapper.setVisibility(View.VISIBLE);
         mBccWrapper.setVisibility(View.VISIBLE);
-        mMenu.findItem(R.id.add_cc_bcc).setVisible(false);
+        if (mMenu != null) {
+            mMenu.findItem(R.id.add_cc_bcc).setVisible(false);
+        }
     }
 
     private void onReadReceipt() {