Reply to recipient, not to known self

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<EntityIdentity> 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;
                         }
                 }