diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 538b068169..43450bdab1 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -564,8 +564,8 @@ public class MessageHelper {
                     try {
                         MailTo mailto = MailTo.parse(entry.substring(lt + 1, gt));
                         if (mailto.getTo() != null)
-                            return new Address[]{new InternetAddress(mailto.getTo().split(",")[0])};
-                    } catch (android.net.ParseException ex) {
+                            return new Address[]{new InternetAddress(mailto.getTo().split(",")[0], null)};
+                    } catch (Throwable ex) {
                         Log.i(ex);
                     }
             }
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 8b89e1f762..9e3455a637 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -329,7 +329,7 @@ public class ServiceSend extends ServiceBase {
 
         // Add reply to
         if (ident.replyto != null)
-            imessage.setReplyTo(new Address[]{new InternetAddress(ident.replyto)});
+            imessage.setReplyTo(new Address[]{new InternetAddress(ident.replyto, null)});
 
         // Add bcc
         if (ident.bcc != null) {
@@ -337,7 +337,7 @@ public class ServiceSend extends ServiceBase {
             Address[] existing = imessage.getRecipients(Message.RecipientType.BCC);
             if (existing != null)
                 bcc.addAll(Arrays.asList(existing));
-            bcc.add(new InternetAddress(ident.bcc));
+            bcc.add(new InternetAddress(ident.bcc, null));
             imessage.setRecipients(Message.RecipientType.BCC, bcc.toArray(new Address[0]));
         }