diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 5ee6ee00c3..413d32ff7d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -197,7 +197,8 @@ public class MessageHelper {
             String name = ((InternetAddress) message.from[0]).getPersonal();
             if (email != null && !TextUtils.isEmpty(message.extra)) {
                 int at = email.indexOf('@');
-                email = email.substring(0, at) + "+" + message.extra + email.substring(at);
+                boolean separator = Character.isLetterOrDigit(message.extra.charAt(0));
+                email = email.substring(0, at) + (separator ? "+" : "") + message.extra + email.substring(at);
                 Log.i(Helper.TAG, "extra=" + email);
             }
             imessage.setFrom(new InternetAddress(email, name));