diff --git a/app/src/main/res/layout/item_sent_message.xml b/app/src/main/res/layout/item_sent_message.xml
index 3af7a076..a5d57e11 100644
--- a/app/src/main/res/layout/item_sent_message.xml
+++ b/app/src/main/res/layout/item_sent_message.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/medium_margin"
-    android:layout_marginBottom="@dimen/medium_margin"
     android:foreground="@drawable/selector"
     android:paddingStart="@dimen/activity_margin"
     android:paddingEnd="@dimen/activity_margin">
diff --git a/app/src/main/res/layout/item_sent_unknown_attachment.xml b/app/src/main/res/layout/item_sent_unknown_attachment.xml
index 4c7b3ea2..5a2967c3 100644
--- a/app/src/main/res/layout/item_sent_unknown_attachment.xml
+++ b/app/src/main/res/layout/item_sent_unknown_attachment.xml
@@ -3,8 +3,7 @@
     android:id="@+id/thread_sent_attachment_wrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/medium_margin"
-    android:paddingBottom="@dimen/medium_margin">
+    android:paddingTop="@dimen/medium_margin">
 
     <TextView
         android:id="@+id/thread_sent_attachment_label"
diff --git a/app/src/main/res/layout/item_thread_error.xml b/app/src/main/res/layout/item_thread_error.xml
index 344769c4..9d75acb9 100644
--- a/app/src/main/res/layout/item_thread_error.xml
+++ b/app/src/main/res/layout/item_thread_error.xml
@@ -6,6 +6,7 @@
     android:gravity="end"
     android:paddingStart="@dimen/activity_margin"
     android:paddingEnd="@dimen/activity_margin"
+    android:paddingBottom="@dimen/tiny_margin"
     android:text="@string/message_not_sent_touch_retry"
     android:textColor="@color/theme_dark_red_primary_color"
     android:textSize="@dimen/normal_text_size" />
diff --git a/app/src/main/res/layout/item_thread_success.xml b/app/src/main/res/layout/item_thread_success.xml
index 230a3141..9819d459 100644
--- a/app/src/main/res/layout/item_thread_success.xml
+++ b/app/src/main/res/layout/item_thread_success.xml
@@ -9,7 +9,8 @@
         android:id="@+id/thread_success"
         android:layout_width="@dimen/activity_margin"
         android:layout_height="@dimen/activity_margin"
-        android:layout_marginBottom="@dimen/medium_margin"
+        android:layout_marginTop="@dimen/small_margin"
+        android:layout_marginBottom="@dimen/small_margin"
         android:src="@drawable/ic_check_vector" />
 
 </RelativeLayout>