diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 49446e21d0..25a3f1baad 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2617,7 +2617,7 @@ public class MessageHelper {
             String email = iaddress.getAddress();
             String personal = iaddress.getPersonal();
             if (!TextUtils.isEmpty(personal))
-                personal = personal.replace("\u00ad", ""); // soft hyphen
+                personal = personal.replace("\u00ad", BuildConfig.DEBUG ? "-" : ""); // soft hyphen
 
             if (TextUtils.isEmpty(email) && TextUtils.isEmpty(personal))
                 continue;
@@ -2854,7 +2854,7 @@ public class MessageHelper {
                 .trim()
                 .replace("\n", "")
                 .replace("\r", "")
-                .replace("\u00ad", "");  // soft hyphen
+                .replace("\u00ad", BuildConfig.DEBUG ? "-" : "");  // soft hyphen
     }
 
     Long getSize() throws MessagingException {