diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
index 49429c960..b20523ae2 100644
--- a/res/values-v11/themes.xml
+++ b/res/values-v11/themes.xml
@@ -2,6 +2,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
+        <item name="composerBackgroundColor">@android:color/background_dark</item>
+    </style>
+
+    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
+        <item name="composerBackgroundColor">@android:color/background_light</item>
     </style>
 
     <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c22ea1bef..0b17bf8ab 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -44,7 +44,6 @@
         <item name="messageListDividerColor">#ffcccccc</item>
         <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
-        <item name="composerBackgroundColor">@android:color/white</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -90,14 +89,15 @@
         <item name="messageListDividerColor">#ff333333</item>
         <item name="messageViewHeaderBackgroundColor">#000000</item>
         <item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
-        <item name="composerBackgroundColor">@android:color/black</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
+        <item name="composerBackgroundColor">@android:color/white</item>
     </style>
 
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
         <item name="android:windowBackground">@android:color/black</item>
+        <item name="composerBackgroundColor">@android:color/black</item>
         <!-- Work around some oddities -->
         <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>