diff --git a/ChangeLog b/ChangeLog
index ed3ffe630..a75da81d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-11  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxMailToSelection.js
+	(addressFieldLostFocus): split content separated by commas
+	or semi-colons.
+
 2011-04-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tests/Unit/TestNSString+URLEscaping.m: new test module.
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 2df8b678f..f9f55c6dd 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -140,7 +140,7 @@ function addressFieldGotFocus(event) {
 function addressFieldLostFocus(event) {
     lastIndex = getIndexFromIdentifier(this.id);
     
-    var addresses = this.value.split(',');
+    var addresses = this.value.split(/[,;]/);
     if (addresses.length > 0) {
         var first = true;
         for (var i = 0; i < addresses.length; i++) {