diff --git a/app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java b/app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
index 7b87d3cc9a297b5938bfce587fec1c98cf4da54b..f695e792b71672d3f8fbd294a31a9a97be9d91be 100644
--- a/app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
+++ b/app/core/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java
@@ -42,12 +42,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/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
index 80954646f2a32cbfeadc81eee056ef80b75302a4..989d2a0192055b6174a973f01853e1e56c8a6e38 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
@@ -133,7 +133,7 @@ public class AttachmentController {
     private Intent getBestViewIntent() {
         Uri intentDataUri;
         try {
-            intentDataUri = AttachmentTempFileProvider.createTempUriForContentUri(context, attachment.internalUri);
+            intentDataUri = AttachmentTempFileProvider.createTempUriForContentUri(context, attachment.internalUri, attachment.displayName);
         } catch (IOException e) {
             Timber.e(e, "Error creating temp file for attachment!");
             return null;