diff --git a/ChangeLog b/ChangeLog
index 5a83ab2fc..a0bdc0adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-07  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (onMenuRenameFolderConfirm):
+	encode the folder name in the URL.
+
 2011-04-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailMessageTable.m
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 89a43d939..9045a3877 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2224,7 +2224,7 @@ function onMenuRenameFolderConfirm() {
     var name = this.value;
     if (name && name.length > 0) {
         var folderID = document.menuTarget.getAttribute("dataname");
-        var urlstr = URLForFolderID(folderID) + "/renameFolder?name=" + name;
+        var urlstr = URLForFolderID(folderID) + "/renameFolder?name=" + encodeURIComponent(name);
         var errorLabel = labels["This folder could not be renamed to \"%{0}\"."];
         triggerAjaxRequest(urlstr, folderOperationCallback,
                            errorLabel.formatted(name));