diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
index 956d5618d..9d4295655 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
@@ -446,9 +446,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             LinearLayoutCompat.MarginLayoutParams pmc = (LinearLayoutCompat.MarginLayoutParams) holder.binding.mediaContainer.getLayoutParams();
             pmc.setMarginStart((int) Helper.convertDpToPixel(6, context));
             holder.binding.mediaContainer.setLayoutParams(pmc);
-            LinearLayoutCompat.MarginLayoutParams pal = (LinearLayoutCompat.MarginLayoutParams) holder.binding.media.mediaContainer.getLayoutParams();
+            LinearLayoutCompat.MarginLayoutParams pal = (LinearLayoutCompat.MarginLayoutParams) holder.binding.mediaCroppedContainer.getLayoutParams();
             pal.setMarginStart((int) Helper.convertDpToPixel(6, context));
-            holder.binding.media.mediaContainer.setLayoutParams(pal);
+            holder.binding.mediaCroppedContainer.setLayoutParams(pal);
             LinearLayoutCompat.MarginLayoutParams pp = (LinearLayoutCompat.MarginLayoutParams) holder.binding.poll.pollContainer.getLayoutParams();
             pp.setMarginStart((int) Helper.convertDpToPixel(6, context));
             holder.binding.poll.pollContainer.setLayoutParams(pp);
diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
index 1557e75e0..66ac2f484 100644
--- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
+++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml
@@ -457,15 +457,21 @@
             android:visibility="gone" />
 
 
-        <include
-            android:id="@+id/media"
-            layout="@layout/layout_drawer_attachments"
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:id="@+id/media_cropped_container"
             android:layout_marginStart="48dp"
             android:layout_marginTop="6dp"
-            android:layout_marginEnd="6dp"
-            android:visibility="gone" />
+            android:layout_marginEnd="6dp">
+
+            <include
+                android:id="@+id/media"
+                layout="@layout/layout_drawer_attachments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
         <include
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/481.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/481.txt
new file mode 100644
index 000000000..75b968ea5
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/481.txt
@@ -0,0 +1,8 @@
+Added:
+
+Changed:
+- Align media with text (left margin enabled)
+
+Fixed:
+- Media previews remain the same when sharing
+- Several crashes
\ No newline at end of file