diff --git a/app/src/main/res/layout/item_received_message.xml b/app/src/main/res/layout/item_received_message.xml
index f6293f44..60c96090 100644
--- a/app/src/main/res/layout/item_received_message.xml
+++ b/app/src/main/res/layout/item_received_message.xml
@@ -33,7 +33,7 @@
             android:id="@+id/thread_mesage_attachments_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignStart="@+id/thread_message_body"
+            android:layout_toEndOf="@+id/thread_message_sender_photo"
             android:orientation="vertical" />
 
         <ImageView
diff --git a/app/src/main/res/layout/item_received_unknown_attachment.xml b/app/src/main/res/layout/item_received_unknown_attachment.xml
index 679fff86..b56653ca 100644
--- a/app/src/main/res/layout/item_received_unknown_attachment.xml
+++ b/app/src/main/res/layout/item_received_unknown_attachment.xml
@@ -2,9 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/thread_received_attachment_wrapper"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="@dimen/medium_margin"
-    android:paddingBottom="@dimen/medium_margin">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/thread_received_attachment_label"