diff --git a/res/layout/recipient_dropdown_item.xml b/res/layout/recipient_dropdown_item.xml
index 29a58a331..c1f96171b 100644
--- a/res/layout/recipient_dropdown_item.xml
+++ b/res/layout/recipient_dropdown_item.xml
@@ -6,7 +6,7 @@
     android:layout_centerVertical="true"
     android:orientation="vertical">
     <TextView android:id="@+id/text1"
-        android:textColor="@android:color/primary_text_light"
+        android:textColor="?attr/textColorPrimaryRecipientDropdown"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         android:ellipsize="end"
         />
     <TextView android:id="@+id/text2"
-        android:textColor="@android:color/secondary_text_light"
+        android:textColor="?attr/textColorSecondaryRecipientDropdown"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
new file mode 100644
index 000000000..1d23ec041
--- /dev/null
+++ b/res/values-v11/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- We need to override the dark theme to *not* use the workarounds of Theme.K9.Dark in
+         res/values/ -->
+    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
+    </style>
+
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 662cc1d02..2d4ff70d9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -39,6 +39,8 @@
         <attr name="iconMenuSearch" format="reference" />
         <attr name="iconMenuSelectAll" format="reference" />
         <attr name="iconMenuShowFolders" format="reference" />
+        <attr name="textColorPrimaryRecipientDropdown" format="reference" />
+        <attr name="textColorSecondaryRecipientDropdown" format="reference" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 20c0d60dd..0d13eddd0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
-        <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+    <style name="Theme.K9.Light.Base" parent="Theme.Sherlock.Light">
         <item name="iconFolder">@drawable/folder_light</item>
         <item name="listDivider">@drawable/divider_light</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_light</item>
@@ -40,10 +39,11 @@
         <item name="iconMenuSearch">@drawable/ic_menu_search</item>
         <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
         <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
+        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
     </style>
 
-    <style name="Theme.K9.Dark" parent="Theme.Sherlock">
-        <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+    <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
         <item name="iconFolder">@drawable/folder_dark</item>
         <item name="listDivider">@drawable/divider_dark</item>
         <item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
@@ -81,6 +81,18 @@
         <item name="iconMenuSearch">@drawable/ic_menu_search</item>
         <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
         <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>
+        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
+    </style>
+
+    <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
+    </style>
+
+    <!-- Work around some oddities -->
+    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
+        <item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
+        <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
+        <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
     </style>
 
 </resources>