diff --git a/ChangeLog b/ChangeLog
index bd264e5e2..9ca24252f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-10  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/generic.js (openMailTo): recipients are
+	now a JSON string (see commit of February 2nd).
+
 	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
 	(-startElement:namespace:rawName:attributes:): we should not add
 	end tags to void tags (ex: <br>).
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 2aaab1fa3..c59bf0b1c 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -279,7 +279,7 @@ function openMailTo(senderMailTo) {
 
     if (mailto.length > 0)
         openMailComposeWindow(ApplicationBaseURL
-                              + "../Mail/compose?mailto=" + encodeURIComponent(mailto)
+                              + "../Mail/compose?mailto=" + encodeURIComponent(Object.toJSON([mailto]))
                               + ((subject.length > 0)?"?subject=" + encodeURIComponent(subject):""));
 
     return false; /* stop following the link */