diff --git a/res/layout/view_fake_chat.xml b/res/layout/view_fake_chat.xml
index c24fd1b64b..5680186dc2 100644
--- a/res/layout/view_fake_chat.xml
+++ b/res/layout/view_fake_chat.xml
@@ -8,7 +8,7 @@
     android:orientation="vertical">
 
     <TextView
-        style="@style/FakeChatViewOutgoingMessageBubble"
+        style="@style/FakeChatViewMessageBubble.Outgoing"
         android:id="@+id/bubble1"
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
@@ -17,7 +17,7 @@
         android:layout_gravity="right" />
 
     <TextView
-        style="@style/FakeChatViewIncomingMessageBubble"
+        style="@style/FakeChatViewMessageBubble.Incoming"
         android:id="@+id/bubble2"
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
         android:layout_gravity="left" />
 
     <TextView
-        style="@style/FakeChatViewOutgoingMessageBubble"
+        style="@style/FakeChatViewMessageBubble.Outgoing"
         android:id="@+id/bubble3"
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
         android:layout_gravity="right" />
 
     <TextView
-        style="@style/FakeChatViewIncomingMessageBubble"
+        style="@style/FakeChatViewMessageBubble.Incoming"
         android:id="@+id/bubble4"
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
         android:layout_gravity="left" />
 
     <TextView
-        style="@style/FakeChatViewIncomingMessageBubble"
+        style="@style/FakeChatViewMessageBubble.Incoming"
         android:id="@+id/bubble5"
         android:layout_width="@dimen/fake_chat_view_bubble_width"
         android:layout_height="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 61113f181f..01ae2632e9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -138,28 +138,25 @@
         <item name="android:maxLines">1</item>
     </style>
 
-    <style name="FakeChatViewIncomingMessageBubble">
-        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+    <style name="FakeChatViewMessageBubble">
         <item name="android:paddingLeft">@dimen/medium_spacing</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingRight">@dimen/medium_spacing</item>
         <item name="android:paddingBottom">12dp</item>
         <item name="android:textSize">15sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textColor">@color/fake_chat_bubble_text</item>
-        <item name="android:elevation">20dp</item>
+        <item name="android:elevation">0dp</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="FakeChatViewOutgoingMessageBubble">
+    <style name="FakeChatViewMessageBubble.Incoming">
+        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+<!--        <item name="android:textColor">@color/fake_chat_bubble_text</item>-->
+    </style>
+
+    <style name="FakeChatViewMessageBubble.Outgoing">
         <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
-        <item name="android:paddingLeft">@dimen/medium_spacing</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textColor">@color/text</item>
-        <item name="android:elevation">20dp</item>
+<!--        <item name="android:textColor">@color/text</item>-->
     </style>
 
     <style name="Session.SettingsTheme" parent="PreferenceThemeOverlay.v14.Material" >