diff --git a/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java b/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
index 9cf537e5b7..f6edf10ac7 100644
--- a/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
+++ b/legacy/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
@@ -43,12 +43,12 @@ public class AttachmentTempFileProvider extends FileProvider {
     }
 
     @WorkerThread
-    public static Uri createTempUriForContentUri(Context context, Uri uri) throws IOException {
+    public static Uri createTempUriForContentUri(Context context, Uri uri, String displayName) throws IOException {
         Context applicationContext = context.getApplicationContext();
 
         File tempFile = getTempFileForUri(uri, applicationContext);
         writeUriContentToTempFileIfNotExists(context, uri, tempFile);
-        Uri tempFileUri = FileProvider.getUriForFile(context, AUTHORITY, tempFile);
+        Uri tempFileUri = FileProvider.getUriForFile(context, AUTHORITY, tempFile, displayName);
 
         registerFileCleanupReceiver(applicationContext);
 
diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
index 6e89e8698b..e61bd91d6f 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
+++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
@@ -130,7 +130,7 @@ public class AttachmentController {
     @WorkerThread
     private Intent getBestViewIntent() {
         try {
-            Uri intentDataUri = AttachmentTempFileProvider.createTempUriForContentUri(context, attachment.internalUri);
+            Uri intentDataUri = AttachmentTempFileProvider.createTempUriForContentUri(context, attachment.internalUri, attachment.displayName);
 
             return viewIntentFinder.getBestViewIntent(intentDataUri, attachment.displayName, attachment.mimeType);
         } catch (IOException e) {