diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index b9e1b37a9..a5d171dae 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -19,8 +19,9 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/conversation_individual_right_gutter"
         android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
-        android:paddingLeft="8dp"
-        android:paddingStart="8dp"
+        android:layout_marginBottom="@dimen/below_bubble"
+        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:clipToPadding="false"
         android:clipChildren="false">
 
@@ -37,7 +38,7 @@
                 android:foreground="@drawable/contact_photo_background"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:layout_marginBottom="6dp"
+                android:layout_marginBottom="1dp"
                 android:cropToPadding="true"
                 android:contentDescription="@null" />
 
@@ -49,8 +50,8 @@
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/message_bubble_edge_margin"
             android:layout_marginEnd="@dimen/message_bubble_edge_margin"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginLeft="6dp"
+            android:layout_marginStart="6dp"
             android:layout_toRightOf="@id/contact_photo_container"
             android:layout_toEndOf="@id/contact_photo_container"
             android:orientation="vertical"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index acb83ea6f..3eb22f445 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -19,6 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/conversation_individual_right_gutter"
         android:layout_marginEnd="@dimen/conversation_individual_right_gutter"
+        android:layout_marginBottom="@dimen/below_bubble"
         android:clipToPadding="false"
         android:clipChildren="false">
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 06f2281d0..a394800b4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,7 +15,6 @@
     <dimen name="transport_selection_popup_yoff">2dp</dimen>
     <dimen name="contact_photo_target_size">64dp</dimen>
 
-    <!-- TODO: Consolidate these two message corner things -->
     <dimen name="message_corner_radius">12dp</dimen>
     <dimen name="message_corner_collapse_radius">1dp</dimen>
     <dimen name="message_bubble_corner_radius">2dp</dimen>
@@ -32,9 +31,10 @@
     <dimen name="media_bubble_max_width">240dp</dimen>
     <dimen name="media_bubble_min_height">100dp</dimen>
     <dimen name="media_bubble_max_height">320dp</dimen>
+    <dimen name="below_bubble">3dp</dimen>
 
-    <dimen name="conversation_individual_right_gutter">16dp</dimen>
-    <dimen name="conversation_individual_left_gutter">16dp</dimen>
+    <dimen name="conversation_individual_right_gutter">12dp</dimen>
+    <dimen name="conversation_individual_left_gutter">12dp</dimen>
     <dimen name="conversation_group_left_gutter">52dp</dimen>
     <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>