diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index a636b769e7..c89e2b8a5d 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -18,7 +18,7 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/large_spacing"
+        android:layout_marginEnd="12dp"
         android:clipToPadding="false"
         android:clipChildren="false">
 
diff --git a/res/layout/conversation_typing_view.xml b/res/layout/conversation_typing_view.xml
index 4feb065e71..fb6c8e23aa 100644
--- a/res/layout/conversation_typing_view.xml
+++ b/res/layout/conversation_typing_view.xml
@@ -4,7 +4,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="@dimen/large_spacing"
+    android:paddingStart="12dp"
     android:paddingEnd="8dp"
     android:paddingBottom="@dimen/small_spacing"
     android:gravity="center_vertical">