From 189452618a99bd14fc2a9467139293628f983f38 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Wed, 21 Nov 2012 02:18:52 +0100
Subject: [PATCH] Reset the message view theme when the app theme changes

---
 src/com/fsck/k9/activity/setup/Prefs.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 0175765e1..5c413e6c7 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -407,7 +407,14 @@ public class Prefs extends K9PreferenceActivity {
         SharedPreferences preferences = Preferences.getPreferences(this).getPreferences();
 
         K9.setK9Language(mLanguage.getValue());
-        K9.setK9Theme(mTheme.getValue().equals("dark") ? K9.THEME_DARK : K9.THEME_LIGHT);
+
+        int newTheme = mTheme.getValue().equals("dark") ? K9.THEME_DARK : K9.THEME_LIGHT;
+        if (K9.getK9Theme() != newTheme) {
+            // Reset the message view theme when the app theme changes
+            K9.setK9MessageViewTheme(newTheme);
+        }
+        K9.setK9Theme(newTheme);
+
         K9.setAnimations(mAnimations.isChecked());
         K9.setGesturesEnabled(mGestures.isChecked());
         K9.setUseVolumeKeysForNavigation(mVolumeNavigation.getCheckedItems()[0]);