diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
index defa7dfef2..5d9e091f3d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
@@ -94,12 +94,8 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
 
   private @Nullable String saveAttachment(Context context, Attachment attachment) throws IOException
   {
-    String      contentType = Objects.requireNonNull(MediaUtil.getCorrectedMimeType(attachment.contentType));
-    String         fileName = attachment.fileName;
-
-    if (fileName == null) fileName = generateOutputFileName(contentType, attachment.date);
-    fileName = sanitizeOutputFileName(fileName);
-
+    String        contentType  = Objects.requireNonNull(MediaUtil.getCorrectedMimeType(attachment.contentType));
+    String        fileName     = generateOutputFileName(contentType, attachment.date);
     Uri           outputUri    = getMediaStoreContentUriForType(contentType);
     Uri           mediaUri     = createOutputUri(outputUri, contentType, fileName);
     ContentValues updateValues = new ContentValues();
@@ -214,10 +210,6 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
     return base + "." + extension;
   }
 
-  private String sanitizeOutputFileName(@NonNull String fileName) {
-    return new File(fileName).getName();
-  }
-
   private @Nullable Uri createOutputUri(@NonNull Uri outputUri, @NonNull String contentType, @NonNull String fileName)
       throws IOException
   {