diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index f3e5113c7..49c489859 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -502,6 +502,7 @@ public class MessageCompose extends K9Activity implements OnClickListener {
             setContentView(v);
         } else {
             setContentView(R.layout.message_compose);
+            mThemeContext = this;
         }
 
         final Intent intent = getIntent();