diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
index f02178d9d6..a84436bdff 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogForwardRaw.java
@@ -95,7 +95,7 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
                 try {
                     db.beginTransaction();
 
-                    List<String> msgids = new ArrayList<>();
+                    List<String> hashes = new ArrayList<>();
 
                     for (long id : ids) {
                         EntityMessage message = db.message().getMessage(id);
@@ -128,9 +128,10 @@ public class FragmentDialogForwardRaw extends FragmentDialogBase {
                             continue;
 
                         for (EntityMessage thread : messages) {
-                            if (msgids.contains(thread.msgid))
+                            String hash = (message.hash == null ? message.msgid : message.hash);
+                            if (hashes.contains(hash))
                                 continue;
-                            msgids.add(thread.msgid);
+                            hashes.add(hash);
 
                             result.add(thread.id);