From 7519eddfa256799195260df177eb5bd6b76a0d22 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 6 Feb 2022 16:20:05 +0100
Subject: [PATCH] For my own convenience

---
 .../java/eu/faircode/email/MessageHelper.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 5b853141ac..7dee2763ce 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1494,6 +1494,25 @@ public class MessageHelper {
                 }
         }
 
+        if (thread == null && BuildConfig.DEBUG) {
+            String awsses = imessage.getHeader("X-SES-Outgoing", null);
+            if (!TextUtils.isEmpty(awsses)) {
+                Address[] froms = getFrom();
+                if (froms != null && froms.length > 0) {
+                    String from = ((InternetAddress) froms[0]).getAddress();
+                    if (!TextUtils.isEmpty(from) && from.endsWith("@faircode.eu")) {
+                        Address[] rr = getReply();
+                        Address[] tos = (rr != null && rr.length > 0 ? rr : getTo());
+                        if (tos != null && tos.length > 0) {
+                            String email = ((InternetAddress) tos[0]).getAddress();
+                            if (!TextUtils.isEmpty(email))
+                                thread = "ses:" + email;
+                        }
+                    }
+                }
+            }
+        }
+
         // Common reference
         if (thread == null && refs.size() > 0) {
             String ref = refs.get(0);