diff --git a/ChangeLog b/ChangeLog
index 5658819a5..9af3630c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-01  Cyril Robert <crobert@inverse.ca>
+
+	* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit): 
+	Fixed encoding issue/crash.
+
 2009-05-30  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Modified SOGoCalendarComponent.m so that we
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index a11e3a2f0..cef67f63d 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -2,9 +2,10 @@
 
 function onSearchFormSubmit() {
   var searchValue = $("searchValue");
+  var encodedValue = encodeURI(searchValue.value);
 
   var url = (UserFolderURL
-						 + "usersSearch?search=" + escape(searchValue.value));
+						 + "usersSearch?search=" + encodedValue);
   if (document.userFoldersRequest) {
 		document.userFoldersRequest.aborted = true;
 		document.userFoldersRequest.abort();