diff --git a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
index 2577ac92..802382f6 100644
--- a/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MediaActivity.java
@@ -397,7 +397,7 @@ public class MediaActivity extends BaseTransparentActivity implements OnDownload
                             }
                         } else {
                             binding.translate.setVisibility(View.GONE);
-                            binding.originalMessage.setVisibility(View.INVISIBLE);
+                            binding.originalMessage.setVisibility(View.VISIBLE);
                             binding.mediaDescriptionTranslated.setVisibility(View.GONE);
                             binding.mediaDescription.setVisibility(View.GONE);
                         }
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index c95bffe7..32326720 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -939,7 +939,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                         composeAttachmentItemBinding.buttonOrderDown.setVisibility(View.INVISIBLE);
                     }
                     int finalMediaPosition = mediaPosition;
-                    if (attachment.local_path.endsWith("png") || attachment.local_path.endsWith("jpg") || attachment.local_path.endsWith("jpeg")) {
+                    if (attachment.local_path != null && (attachment.local_path.endsWith("png") || attachment.local_path.endsWith("jpg") || attachment.local_path.endsWith("jpeg"))) {
                         composeAttachmentItemBinding.editPreview.setVisibility(View.VISIBLE);
                     } else {
                         composeAttachmentItemBinding.editPreview.setVisibility(View.GONE);