diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ebe133e5b0..8b3a915923 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2066,7 +2066,9 @@ public class MessageHelper {
 
     static String formatAddressesCompose(Address[] addresses) {
         String result = formatAddresses(addresses, true, true);
-        if (!TextUtils.isEmpty(result))
+        if (result != null && result.endsWith(","))
+            result += " ";
+        else if (!TextUtils.isEmpty(result))
             result += ", ";
         return result;
     }