Fix bug where \u200b characters were added into the recipient input preventing mail delivery (#8269)

2 files changed, 6 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e145e1f55..c3aa2f26a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 - Fix installation/upgrade on MySQL 5.5 - Index column size too large (#8231)
 - Fix regression in setting of contact listing name (#8260)
 - Fix bug in Larry skin where headers toggle state was reset on full page preview (#8203)
+- Fix bug where \u200b characters were added into the recipient input preventing mail delivery (#8269)
 
 ## Release 1.5.0
 
diff --git a/program/js/app.js b/program/js/app.js
index b37abdc84..5caafdbcf 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4858,16 +4858,18 @@ function rcube_webmail()
       var data, name, n, id;
       for (n = 0; n < selection.length; n++) {
         if ((id = selection[n]) && (data = this.env.contactdata[id])) {
-          // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
-          name = '\u200b' + (data.name || data) + '\u200b';
-          recipients.push(name);
+          name = data.name || data
 
           // group is added, expand it
           if (id.charAt(0) == 'E' && input.length) {
+            // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
+            name = '\u200b' + name + '\u200b';
             var gid = id.substr(1);
             this.group2expand[gid] = {name: name, input: input.get(0)};
             this.http_request('group-expand', {_source: data.source || this.env.source, _gid: gid}, false);
           }
+
+          recipients.push(name);
         }
       }
     }