diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 61afdd4e46..d8ebd032e5 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -402,6 +402,10 @@ public class MessageHelper {
             if (!TextUtils.isEmpty(ref))
                 return ref;
 
+        String inreplyto = getInReplyTo();
+        if (inreplyto != null)
+            return inreplyto;
+
         String msgid = getMessageID();
         return (TextUtils.isEmpty(msgid) ? Long.toString(uid) : msgid);
     }