diff --git a/ChangeLog b/ChangeLog
index 8af3e7c63..0999c912b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-27  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/generic.js (openMailTo): mail addresses
+	must now be separated by semi-colons and not commas. This allow
+	display names to contain commas.
+
 	* UI/WebServerResources/SchedulerUI.js (tasksListCallback): prefix
 	tasks with a color box insted of changing the task's background color.
 
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index f9189d3bc..372f1abfd 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -143,7 +143,7 @@ function onComposeToAllAttendees()
         }
     });
     if (window.opener)
-        window.opener.openMailTo(addresses.join(","));
+        window.opener.openMailTo(addresses.join(";"));
 }
 
 function onComposeToUndecidedAttendees()
@@ -165,7 +165,7 @@ function onComposeToUndecidedAttendees()
         }
     });
     if (window.opener)
-        window.opener.openMailTo(addresses.join(","));
+        window.opener.openMailTo(addresses.join(";"));
 }
 
 function addContact(tag, fullContactName, contactId, contactName, contactEmail) {
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 2d04513a0..63817e1bf 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -319,7 +319,7 @@ function openMailComposeWindow(url, wId) {
 }
 
 function openMailTo(senderMailTo) {
-    var addresses = senderMailTo.split(",");
+    var addresses = senderMailTo.split(";");
     var sanitizedAddresses = new Array();
     var subject = extractSubject(senderMailTo);
     for (var i = 0; i < addresses.length; i++) {