Remove spaces from email addresses

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

@@ -610,7 +610,7 @@ public class EntityRule {
         } else {
             reply.wasforwardedfrom = message.msgid;
             reply.thread = reply.msgid; // new thread
-            reply.to = InternetAddress.parseHeader(to, false);
+            reply.to = MessageHelper.parseAddresses(context, to);
         }
 
         reply.from = from;

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

@@ -1974,7 +1974,7 @@ public class FragmentCompose extends FragmentBase {
 
                                 InternetAddress[] to = null;
                                 try {
-                                    to = InternetAddress.parseHeader(etTo.getText().toString(), false);
+                                    to = MessageHelper.parseAddresses(getContext(), etTo.getText().toString());
                                 } catch (AddressException ignored) {
                                 }
 
@@ -3994,21 +3994,21 @@ public class FragmentCompose extends FragmentBase {
 
                         try {
                             String to = args.getString("to");
-                            data.draft.to = (TextUtils.isEmpty(to) ? null : InternetAddress.parseHeader(to, false));
+                            data.draft.to = MessageHelper.parseAddresses(context, to);
                         } catch (AddressException ex) {
                             Log.w(ex);
                         }
 
                         try {
                             String cc = args.getString("cc");
-                            data.draft.cc = (TextUtils.isEmpty(cc) ? null : InternetAddress.parseHeader(cc, false));
+                            data.draft.cc = MessageHelper.parseAddresses(context, cc);
                         } catch (AddressException ex) {
                             Log.w(ex);
                         }
 
                         try {
                             String bcc = args.getString("bcc");
-                            data.draft.bcc = (TextUtils.isEmpty(bcc) ? null : InternetAddress.parseHeader(bcc, false));
+                            data.draft.bcc = MessageHelper.parseAddresses(context, bcc);
                         } catch (AddressException ex) {
                             Log.w(ex);
                         }
@@ -4953,9 +4953,9 @@ public class FragmentCompose extends FragmentBase {
 
                     // Get data
                     InternetAddress[] afrom = (identity == null ? null : new InternetAddress[]{new InternetAddress(identity.email, identity.name, StandardCharsets.UTF_8.name())});
-                    InternetAddress[] ato = (TextUtils.isEmpty(to) ? null : InternetAddress.parseHeader(to, false));
+                    InternetAddress[] ato = MessageHelper.parseAddresses(context, to);
-                    InternetAddress[] acc = (TextUtils.isEmpty(cc) ? null : InternetAddress.parseHeader(cc, false));
+                    InternetAddress[] acc = MessageHelper.parseAddresses(context, cc);
-                    InternetAddress[] abcc = (TextUtils.isEmpty(bcc) ? null : InternetAddress.parseHeader(bcc, false));
+                    InternetAddress[] abcc = MessageHelper.parseAddresses(context, bcc);
 
                     // Safe guard
                     if (action == R.id.action_send) {

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

@@ -2884,6 +2884,23 @@ public class MessageHelper {
         return email;
     }
 
+    static InternetAddress[] parseAddresses(Context context, String text) throws AddressException {
+        if (TextUtils.isEmpty(text))
+            return null;
+
+        InternetAddress[] addresses = InternetAddress.parseHeader(text, false);
+        if (addresses.length == 0)
+            return null;
+
+        for (InternetAddress address : addresses) {
+            String email = address.getAddress();
+            if (email != null)
+                address.setAddress(email.replace(" ", ""));
+        }
+
+        return addresses;
+    }
+
     static boolean isRemoved(Throwable ex) {
         while (ex != null) {
             if (ex instanceof MessageRemovedException ||