From acba8b20f902e3ec7f0b56836ce268aaa93da647 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 11 Nov 2018 07:09:49 +0000 Subject: [PATCH] Match identities for sent messages --- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 529817dc74..59ff4e4fe8 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -1870,16 +1870,18 @@ public class ServiceSynchronize extends LifecycleService { } if (message == null) { - Address[] tos = helper.getTo(); + Address[] tos = (folder.isOutgoing() ? helper.getFrom() : helper.getTo()); EntityIdentity identity = null; if (tos != null && tos.length > 0) { String to = ((InternetAddress) tos[0]).getAddress(); if (!TextUtils.isEmpty(to)) { to = to.toLowerCase(); identity = db.identity().getIdentity(folder.account, to); + if (identity == null) identity = db.identity().getIdentity(folder.account, Helper.canonicalAddress(to)); - if (identity == null) { + + if (identity == null && !folder.isOutgoing()) { to = helper.getDeliveredTo(); if (!TextUtils.isEmpty(to)) identity = db.identity().getIdentity(folder.account, to);