diff --git a/ChangeLog b/ChangeLog
index 4f41ee2f0..9f8d8b7c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-19  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxMailToSelection.js
+	(addressFieldChanged): remove commas before testing email regexp.
+
 2012-01-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/WebServerResources/UIxFilterEditor.js (setupNewFilterData):
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 4452e0613..f9f97a304 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -154,6 +154,7 @@ function addressFieldChanged(event) {
     //   "dude, buddy dude@domain.com; bro" => "dude, buddy <dude@domain.com>" + "bro"
     //   "dude, buddy, bro <bro@domain.com>" => "dude, buddy, bro <bro@domain.com>"
     //   "dude, buddy, bro" => "dude" + "buddy" + "bro"
+    //   "dude@domain.com, <buddy@domain.com>" => "<dude@domain.com>" + "<buddy@domain.com>"
     var addresses = this.value.split(';');
     if (addresses.length > 0) {
         var first = true;
@@ -161,7 +162,7 @@ function addressFieldChanged(event) {
             var words = addresses[i].split(' ');
             var phrase = new Array();
             for (var j = 0; j < words.length; j++) {
-                var word = words[j].strip().replace(/<(.+)>/, "$1");
+                var word = words[j].strip().replace(/<(.+)>/, "$1").replace(',', '');
                 if (word.length > 0) {
                     // Use the regexp defined in generic.js
                     if (emailRE.test(word)) {
@@ -176,7 +177,7 @@ function addressFieldChanged(event) {
                         phrase = new Array();
                     }
                     else
-                        phrase.push(word);
+                        phrase.push(words[j].strip());
                 }
             }
             if (phrase.length > 0) {