diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
index de9a836737..7fb9256117 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
@@ -151,7 +151,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
                         for (EntityMessage thread : messages) {
                             EntityLog.log(context, "Fetching raw id=" + thread.id + " subject=" + thread.subject);
                             if (threads) {
-                                String hash = (message.hash == null ? message.msgid : message.hash);
+                                String hash = (thread.hash == null ? thread.msgid : thread.hash);
                                 if (hashes.contains(hash))
                                     continue;
                                 hashes.add(hash);