diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 8d73513546..8c83acbd0b 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -3,6 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:background="?conversation_background"
     android:orientation="vertical">
 
     <org.thoughtcrime.securesms.components.RecipientsPanel
@@ -17,7 +18,6 @@
             android:layout_height="fill_parent"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:background="?conversation_background"
             android:gravity="bottom">
 
         <fragment
@@ -33,8 +33,7 @@
                 android:id="@id/bottom_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="?conversation_background">
+                android:orientation="vertical">
 
             <ScrollView android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 165cb71ab5..7e880b1f36 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -18,6 +18,7 @@
               android:fadingEdge="none"
               android:divider="@android:color/transparent"
               android:dividerHeight="0dp"
-              android:layout_marginBottom="1dip"/>
+              android:layout_marginBottom="1dip"
+              android:cacheColorHint="?conversation_background" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_item_activity.xml b/res/layout/conversation_item_activity.xml
index 11b3032fa2..0087083bb0 100644
--- a/res/layout/conversation_item_activity.xml
+++ b/res/layout/conversation_item_activity.xml
@@ -5,7 +5,6 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="?conversation_background"
     android:padding="8dp">
 
     <TextView android:id="@+id/conversation_item_body"
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 9b38941e6c..055fb97784 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:paddingRight="10dip"
     android:orientation="vertical"
-    android:background="?conversation_background"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/group_message_status"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index b1130e963a..300a32cf3f 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -4,8 +4,7 @@
     android:id="@+id/conversation_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="?conversation_background">
+    android:orientation="horizontal">
 
     <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d32a9a2c06..218a1ca000 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -145,6 +145,16 @@
         <item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
     </style>
 
+    <style name="TextSecure.LightTheme.ConversationActivity"
+           parent="@style/TextSecure.LightTheme">
+        <item name="android:windowBackground">@null</item>
+    </style>
+
+    <style name="TextSecure.DarkTheme.ConversationActivity"
+           parent="@style/TextSecure.DarkTheme">
+        <item name="android:windowBackground">@null</item>
+    </style>
+
     <style name="TextSecure.Light.Dialog"
            parent="@android:style/Theme.Dialog"
            tools:ignore="NewApi">
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
index 52897f83d9..2a1e3d0bce 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -6,6 +6,7 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
+import org.thoughtcrime.securesms.ConversationActivity;
 import org.thoughtcrime.securesms.ConversationListActivity;
 import org.thoughtcrime.securesms.R;
 
@@ -41,9 +42,11 @@ public class DynamicTheme {
 
     if (theme.equals("light")) {
       if (activity instanceof ConversationListActivity) return R.style.TextSecure_LightTheme_NavigationDrawer;
+      else if (activity instanceof ConversationActivity) return R.style.TextSecure_LightTheme_ConversationActivity;
       else                                              return R.style.TextSecure_LightTheme;
     } else if (theme.equals("dark")) {
       if (activity instanceof ConversationListActivity) return R.style.TextSecure_DarkTheme_NavigationDrawer;
+      else if (activity instanceof ConversationActivity) return R.style.TextSecure_DarkTheme_ConversationActivity;
       else                                              return R.style.TextSecure_DarkTheme;
     }