From 9409db25d6e827f2a34924dc27478c7ba1ca60a3 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 1 Sep 2018 19:44:01 +0000 Subject: [PATCH] Reply to recipient, not to known self --- .../eu/faircode/email/FragmentCompose.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 9eca04fdbf..ab8425c16a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -746,22 +746,21 @@ public class FragmentCompose extends FragmentEx { } else { account = ref.account; - // Reply to sender, not to known self + // Reply to recipient, not to known self String from = (ref.from == null || ref.from.length == 0 ? null : ((InternetAddress) ref.from[0]).getAddress()); String replyto = (ref.reply == null || ref.reply.length == 0 ? null : ((InternetAddress) ref.reply[0]).getAddress()); List identities = db.identity().getIdentities(); for (EntityIdentity identity : identities) - if (from != null && from.equals(identity.email)) { - Address[] tmp = ref.to; - ref.to = ref.from; - ref.reply = null; - ref.from = tmp; - break; - } else if (replyto != null && replyto.equals(identity.email)) { - Address[] tmp = ref.reply; - ref.to = ref.from; - ref.reply = null; - ref.from = tmp; + if (replyto == null) { + if (from != null && from.equals(identity.email)) { + Address[] tmp = ref.to; + ref.to = ref.from; + ref.reply = null; + ref.from = tmp; + break; + } + } else if (replyto.equals(identity.email)) { + ref.reply = ref.to; break; } }