diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 253282f2e5..a2324d4abc 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1183,7 +1183,7 @@ public class MessageHelper {
         }
 
         if (thread == null)
-            thread = (uid == 0 /* POP3 */ ? msgid : account + ":" + folder + ":" + uid);
+            thread = getHash() + ":" + uid;
 
         List<EntityMessage> after = db.message().getMessagesByInReplyTo(account, msgid);
         for (EntityMessage message : after)