diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 99e2e0ed4a..fa82484970 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -577,7 +577,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
 
             Helper.copy(is, new FileOutputStream(file));
 
-            return FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID, file);
+            return FileProviderEx.getUri(this, BuildConfig.APPLICATION_ID, file);
         } catch (Throwable ex) {
             Log.w(ex);
             return uri;
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 78aaf2f7f0..e4deead3c7 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6359,7 +6359,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                             Helper.copy(source, target);
 
-                            return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, target);
+                            return FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, target);
                         }
 
                         @Override
@@ -7246,7 +7246,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         if (attachments != null)
                             for (EntityAttachment attachment : attachments) {
                                 File file = attachment.getFile(context);
-                                Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                                Uri uri = FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file, attachment.name);
                                 uris.add(uri);
                             }
 
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 957b276f12..d611c5e5c2 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -165,10 +165,7 @@ public class EntityAttachment {
 
     Uri getUri(Context context) {
         File file = getFile(context);
-        if (TextUtils.isEmpty(name))
-            return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
-        else
-            return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file, name);
+        return FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file, name);
     }
 
     File getFile(Context context) {
diff --git a/app/src/main/java/eu/faircode/email/FileProviderEx.java b/app/src/main/java/eu/faircode/email/FileProviderEx.java
index 02c833f4f3..37a66008d5 100644
--- a/app/src/main/java/eu/faircode/email/FileProviderEx.java
+++ b/app/src/main/java/eu/faircode/email/FileProviderEx.java
@@ -22,11 +22,14 @@ package eu.faircode.email;
 import android.content.Context;
 import android.content.pm.ProviderInfo;
 import android.net.Uri;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 
+import java.io.File;
+
 public class FileProviderEx extends FileProvider {
     // https://android-review.googlesource.com/c/platform/frameworks/support/+/1978527
     public FileProviderEx() {
@@ -69,6 +72,19 @@ public class FileProviderEx extends FileProvider {
         }
     }
 
+    public static Uri getUri(@NonNull Context context, @NonNull String authority, @NonNull File file) {
+        return getUri(context, authority, file, null);
+    }
+
+    public static Uri getUri(@NonNull Context context, @NonNull String authority, @NonNull File file, @NonNull String name) {
+        Uri uri;
+        if (TextUtils.isEmpty(name))
+            uri = getUriForFile(context, authority, file);
+        else
+            uri = getUriForFile(context, authority, file, name);
+        return uri;
+    }
+
     @Override
     public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
         throw new UnsupportedOperationException("No external updates");
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 70709263a2..9b7ee18581 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3574,7 +3574,7 @@ public class FragmentCompose extends FragmentBase {
                 File dir = Helper.ensureExists(new File(context.getFilesDir(), "photo"));
                 File file = new File(dir, working + "_" + new Date().getTime() + ".jpg");
                 try {
-                    photoURI = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                    photoURI = FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file);
                     intent.putExtra(MediaStore.EXTRA_OUTPUT, photoURI);
                     startActivityForResult(intent, REQUEST_TAKE_PHOTO);
                 } catch (Throwable ex) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
index 6a4bdd251f..69f06f6754 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
@@ -293,7 +293,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
             for (long id : ids) {
                 EntityLog.log(context, "Sending raw id=" + id);
                 File file = EntityMessage.getRawFile(context, id);
-                Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                Uri uri = FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file);
                 uris.add(uri);
             }
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 2b83c9c344..8095d1ec32 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -997,7 +997,7 @@ public class Helper {
 
     static void share(Context context, File file, String type, String name) {
         // https://developer.android.com/reference/androidx/core/content/FileProvider
-        Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+        Uri uri = FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file, name);
         share(context, uri, type, name);
     }
 
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index e2a5b77ab6..661ab50729 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2407,7 +2407,7 @@ public class HtmlHelper {
                 if (attachment != null && attachment.available) {
                     File file = attachment.getFile(context);
                     if (local) {
-                        Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID, file);
+                        Uri uri = FileProviderEx.getUri(context, BuildConfig.APPLICATION_ID, file, attachment.name);
                         img.attr("src", uri.toString());
                         Log.i("Inline image uri=" + uri);
                     } else {