diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 45f82b823..424396d39 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -194,13 +194,18 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-		android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
 		android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+		android:layout_marginTop="3dp"
+		android:paddingTop="2dp"
+		android:paddingBottom="2dp"
+		android:paddingLeft="2dp"
+		android:paddingRight="2dp"
 		android:layout_gravity="end"
 		android:gravity="end"
 		android:clipChildren="false"
 		android:clipToPadding="false"
-		app:footer_text_color="@color/gray50"/>
+		android:background="@drawable/conversation_item_update_background"
+		app:footer_text_color="@color/core_dark_05"/>
 
         </LinearLayout>
 
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 08066fa91..2f150eadd 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -171,13 +171,18 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-		android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
 		android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+		android:layout_marginTop="3dp"
+		android:paddingTop="2dp"
+		android:paddingBottom="2dp"
+		android:paddingLeft="2dp"
+		android:paddingRight="2dp"
 		android:layout_gravity="end"
 		android:gravity="end"
 		android:clipChildren="false"
 		android:clipToPadding="false"
-		app:footer_text_color="@color/gray50"/>
+		android:background="@drawable/conversation_item_update_background"
+		app:footer_text_color="@color/core_dark_05"/>
 
         </LinearLayout>
 
diff --git a/res/layout/conversation_item_videochat.xml b/res/layout/conversation_item_videochat.xml
index 17bab3cd9..c008fccff 100644
--- a/res/layout/conversation_item_videochat.xml
+++ b/res/layout/conversation_item_videochat.xml
@@ -87,13 +87,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginRight="@dimen/message_bubble_horizontal_padding"
             android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:layout_marginTop="3dp"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:paddingLeft="2dp"
+            android:paddingRight="2dp"
             android:layout_gravity="end"
             android:gravity="end"
             android:clipChildren="false"
             android:clipToPadding="false"
-            app:footer_text_color="@color/gray50"/>
+            android:background="@drawable/conversation_item_update_background"
+            app:footer_text_color="@color/core_dark_05"/>
 
     </LinearLayout>