From bb409d608a04ca6a00640d770443d0ba2467435f Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 11 Feb 2020 10:53:46 +0100 Subject: [PATCH] Match delivered-to for extra --- .../java/eu/faircode/email/FragmentCompose.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index a0ed5a8295..cae5b9f961 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -2935,12 +2935,25 @@ public class FragmentCompose extends FragmentBase { if (recognized != null) { Address same = null; Address similar = null; + for (Address from : data.draft.from) { if (same == null && recognized.sameAddress(from)) same = from; if (similar == null && recognized.similarAddress(from)) similar = from; } + + if (ref.deliveredto != null) + try { + Address deliveredto = new InternetAddress(ref.deliveredto); + if (same == null && recognized.sameAddress(deliveredto)) + same = deliveredto; + if (similar == null && recognized.similarAddress(deliveredto)) + similar = deliveredto; + } catch (AddressException ex) { + Log.w(ex); + } + preferred = (same == null ? similar : same); } }