diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8afa039da..59e5224d3 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -53,7 +53,6 @@
         <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
         <attr name="messageViewAttachmentBackground" format="reference"/>
         <attr name="composerBackgroundColor" format="color"/>
-        <attr name="composerTextColor" format="color"/>
 
     </declare-styleable>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c4b2067cb..d25ae1021 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -52,7 +52,6 @@
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
         <item name="composerBackgroundColor">@android:color/white</item>
-        <item name="composerTextColor">@android:color/black</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -107,7 +106,6 @@
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
         <item name="composerBackgroundColor">@android:color/black</item>
-        <item name="composerTextColor">@android:color/white</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index bf22d4728..b0206a047 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -486,9 +486,22 @@ public class MessageCompose extends K9Activity implements OnClickListener {
             finish();
             return;
         }
-
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.message_compose);
+
+        if (K9.getK9ComposerThemeSetting() != K9.Theme.USE_GLOBAL) {
+            // theme the whole content according to the theme (except the action bar)
+            ContextThemeWrapper wrapper = new ContextThemeWrapper(this,
+                    K9.getK9ThemeResourceId(K9.getK9ComposerTheme()));
+            View v = ((LayoutInflater) wrapper.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).
+                    inflate(R.layout.message_compose, null);
+            TypedValue outValue = new TypedValue();
+            // background color needs to be forced
+            wrapper.getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
+            v.setBackgroundColor(outValue.data);
+            setContentView(v);
+        } else {
+            setContentView(R.layout.message_compose);
+        }
 
         final Intent intent = getIntent();
 
@@ -554,18 +567,6 @@ public class MessageCompose extends K9Activity implements OnClickListener {
         mMessageContentView = (EditText)findViewById(R.id.message_content);
         mMessageContentView.getInputExtras(true).putBoolean("allowEmoji", true);
 
-        if (K9.getK9ComposerThemeSetting() != K9.Theme.USE_GLOBAL) {
-            ContextThemeWrapper wrapper = new ContextThemeWrapper(this,
-                    K9.getK9ThemeResourceId(K9.getK9ComposerTheme()));
-            TypedValue outValue = new TypedValue();
-            EditText[] editors = new EditText[] { mMessageContentView, upperSignature, lowerSignature };
-
-            wrapper.getTheme().resolveAttribute(R.attr.composerBackgroundColor, outValue, true);
-            for (EditText edit : editors) edit.setBackgroundColor(outValue.data);
-            wrapper.getTheme().resolveAttribute(R.attr.composerTextColor, outValue, true);
-            for (EditText edit : editors) edit.setTextColor(outValue.data);
-        }
-
         mAttachments = (LinearLayout)findViewById(R.id.attachments);
         mQuotedTextShow = (Button)findViewById(R.id.quoted_text_show);
         mQuotedTextBar = findViewById(R.id.quoted_text_bar);