diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PreviewlessMediaGridStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PreviewlessMediaGridStatusDisplayItem.java
index 6ff73e2d2..e6dd9f389 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PreviewlessMediaGridStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PreviewlessMediaGridStatusDisplayItem.java
@@ -73,10 +73,9 @@ public class PreviewlessMediaGridStatusDisplayItem extends StatusDisplayItem{
 			super(new FrameLayoutThatOnlyMeasuresFirstChild(activity));
 			wrapper=(FrameLayout)itemView;
 			layout= new LinearLayout(activity);
-			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-			params.setMargins(V.dp(16), 0, V.dp(16), 0);
-			layout.setLayoutParams(params);
 			layout.setOrientation(LinearLayout.VERTICAL);
+			LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+			layout.setLayoutParams(params);
 			wrapper.addView(layout);
 			wrapper.setClipToPadding(false);
 
diff --git a/mastodon/src/main/res/layout/display_item_file.xml b/mastodon/src/main/res/layout/display_item_file.xml
index 9db212e7b..bf775980d 100644
--- a/mastodon/src/main/res/layout/display_item_file.xml
+++ b/mastodon/src/main/res/layout/display_item_file.xml
@@ -3,12 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_marginHorizontal="16dp"
     android:layout_height="wrap_content">
 
     <org.joinmastodon.android.ui.views.MaxWidthFrameLayout
         android:id="@+id/inner"
         android:layout_marginBottom="16dp"
+		android:layout_marginHorizontal="16dp"
         android:background="@drawable/bg_search_field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"