diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index f88fd22807..123f3a09ac 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -301,7 +301,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
                         if (message == null || message.uid == null)
                             return null;
 
-                        EntityAccount account = db.account().getAccount(message.id);
+                        EntityAccount account = db.account().getAccount(message.account);
                         if (account == null)
                             return null;
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index 9e077093c4..433406640e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -141,7 +141,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
                                 if (message == null || message.uid == null)
                                     return null;
 
-                                EntityAccount account = db.account().getAccount(message.id);
+                                EntityAccount account = db.account().getAccount(message.account);
                                 if (account == null)
                                     return null;