From 8d754432fd497d0f66f3a71753221e433b7983ec Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Dec 2021 11:19:52 +0100
Subject: [PATCH] Use message hash as thread ID

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)