diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 235bf18e4e..9ee366c83e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4244,7 +4244,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
                 lbm.sendBroadcast(
                         new Intent(FragmentMessages.ACTION_STORE_RAW)
-                                .putExtra("id", message.id));
+                                .putExtra("id", message.id)
+                                .putExtra("subject", message.subject));
             }
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 90e9e7363c..1c3f63f829 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4816,10 +4816,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
     private void onStoreRaw(Intent intent) {
         message = intent.getLongExtra("id", -1);
+        String subject = intent.getStringExtra("subject");
+        String name = (TextUtils.isEmpty(subject) ? "email" : Helper.sanitizeFilename(subject)) + ".eml";
+
         Intent create = new Intent(Intent.ACTION_CREATE_DOCUMENT);
         create.addCategory(Intent.CATEGORY_OPENABLE);
         create.setType("*/*");
-        create.putExtra(Intent.EXTRA_TITLE, "email.eml");
+        create.putExtra(Intent.EXTRA_TITLE, name);
         Helper.openAdvanced(create);
         if (create.resolveActivity(getContext().getPackageManager()) == null)
             Snackbar.make(view, R.string.title_no_saf, Snackbar.LENGTH_LONG).show();