Simplify reply self

app/src/main/java/eu/faircode/email/EntityMessage.java

@@ -224,8 +224,10 @@ public class EntityMessage implements Serializable {
     Address[] getAllRecipients(List<TupleIdentityEx> identities, long account) {
         List<Address> addresses = new ArrayList<>();
 
-        if (to != null && !replySelf(identities, account))
-            addresses.addAll(Arrays.asList(to));
+        if (!replySelf(identities, account)) {
+            if (to != null)
+                addresses.addAll(Arrays.asList(to));
+        }
 
         if (cc != null)
             addresses.addAll(Arrays.asList(cc));

app/src/main/java/eu/faircode/email/FragmentCompose.java

@@ -3318,15 +3318,7 @@ public class FragmentCompose extends FragmentBase {
                                 // Prevent replying to self
                                 if (ref.replySelf(data.identities, ref.account)) {
                                     data.draft.from = ref.from;
-                                    List<Address> tos = new ArrayList<>();
-                                    if (ref.to != null)
-                                        for (Address to : ref.to)
-                                            for (EntityIdentity identity : data.identities)
-                                                if (!Objects.equals(identity.account, ref.account) ||
-                                                        !identity.self ||
-                                                        !identity.similarAddress(to))
-                                                    tos.add(to);
-                                    data.draft.to = (tos.size() == 0 ? null : tos.toArray(new Address[0]));
+                                    data.draft.to = ref.to;
                                 } else {
                                     data.draft.from = ref.to;
                                     data.draft.to = (ref.reply == null || ref.reply.length == 0 ? ref.from : ref.reply);