diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 1fbf8908db..1260ec69ca 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -275,7 +275,8 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         }
 
         private void onShare(EntityAttachment attachment) {
-            Helper.share(context, attachment.getFile(context), attachment.getMimeType(), attachment.name);
+            String title = (attachment.name == null ? attachment.cid : attachment.name);
+            Helper.share(context, attachment.getFile(context), attachment.getMimeType(), title);
         }
 
         private void onDownload(EntityAttachment attachment) {