diff --git a/ChangeLog b/ChangeLog
index ece013a23..25cfbd2f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (onCategoriesMenuItemClick):
+	makes use of "encodeURIComponent" rather than "escape" to encode
+	URL parameters, because for some reason the former takes the
+	encoding into account and not the latter.
+
 2011-03-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreCalendarMessage.m (-save): accept entries
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 924860c7f..8a27fad8a 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1342,7 +1342,7 @@ function onCategoriesMenuItemClick() {
         for (var i = 0; i < rowIds.length; i++) {
             var url = (URLForFolderID(Contact.currentAddressBook)
                        + "/" + rowIds[i] + "/" + method);
-            url += "?category=" + escape(this.category);
+            url += "?category=" + encodeURIComponent(this.category);
             triggerAjaxRequest(url);
             if (set) {
                 setCategoryOnNode($(rowIds[i]), this.category);