diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c543cfad1e..fdbb8f1559 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3542,7 +3542,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             db.attachment().setMediaUri(attachment.id, uri.toString());
                         }
 
-                    return collection;
+                    // Viewing the containing folder is not possible
+                    for (EntityAttachment attachment : attachments)
+                        if (attachment.media_uri != null)
+                            return Uri.parse(attachment.media_uri);
+
+                    return null;
                 }
 
                 @Override