From bf0532c46cef9a20b88386e87b420a39f2e566ae Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 7 Jul 2022 19:38:00 +0200
Subject: [PATCH] Fixed thread with empty msgid

---
 app/src/main/java/eu/faircode/email/MessageHelper.java   | 3 ++-
 app/src/main/java/eu/faircode/email/TupleThreadInfo.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 16d562d12c..76dd1f1716 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1533,7 +1533,8 @@ public class MessageHelper {
         DB db = DB.getInstance(context);
 
         List<String> all = new ArrayList<>(refs);
-        all.add(msgid);
+        if (!TextUtils.isEmpty(msgid))
+            all.add(msgid);
 
         int thread_range = prefs.getInt("thread_range", MessageHelper.DEFAULT_THREAD_RANGE);
         int range = (int) Math.pow(2, thread_range);
diff --git a/app/src/main/java/eu/faircode/email/TupleThreadInfo.java b/app/src/main/java/eu/faircode/email/TupleThreadInfo.java
index be71903868..ed7212b346 100644
--- a/app/src/main/java/eu/faircode/email/TupleThreadInfo.java
+++ b/app/src/main/java/eu/faircode/email/TupleThreadInfo.java
@@ -36,6 +36,6 @@ public class TupleThreadInfo {
     }
 
     public boolean isReferencing(String msgid) {
-        return !isSelf(msgid) && !isReferenced(msgid);
+        return !TextUtils.isEmpty(msgid) && !isSelf(msgid) && !isReferenced(msgid);
     }
 }