From af1a42d2665da08a14133aaf8e766b0f8cd9dd1f Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 8 Jan 2023 10:32:40 +0100 Subject: [PATCH] Improved/fixed DSN handling --- app/src/main/java/eu/faircode/email/Core.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index b42250f081..025baf1fbd 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -4576,7 +4576,7 @@ class Core { if (replied != null) all.addAll(replied); } - if (r.refid != null) { + if (r.refid != null && !r.refid.equals(message.inreplyto)) { List refs = db.message().getMessagesByMsgId(folder.account, r.refid); if (refs != null) all.addAll(refs); @@ -4589,8 +4589,10 @@ class Core { map.put(f.id, f); } - for (EntityFolder f : map.values()) - EntityOperation.queue(context, f, EntityOperation.REPORT, message.inreplyto, label); + for (String msgid : new String[]{message.inreplyto, r.refid}) + if (msgid != null) + for (EntityFolder f : map.values()) + EntityOperation.queue(context, f, EntityOperation.REPORT, msgid, label); } } } catch (Throwable ex) {