diff --git a/ChangeLog b/ChangeLog
index 2ed755c25..73b8e88b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< variant A
 2009-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailerUI/UIxMailFolderActions.m (-deleteFolderAction):
@@ -9,6 +10,14 @@
 	* SoObjects/SOGo/SOGoPermissions.m: declared new "Delete Object"
 	permission.
 
+>>>>>>> variant B
+2009-06-01  Cyril Robert <crobert@inverse.ca>
+
+	* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit): 
+	Fixed encoding issue/crash.
+
+####### Ancestor
+======= end
 2009-05-30  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* Modified SOGoCalendarComponent.m so that we
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 14dc8c9ad..d24730ac4 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1545,10 +1545,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   document = [[context request] contentAsDOMDocument];
   documentElement = [document documentElement];
   properties = [[self _parseRequestedProperties: documentElement]
-		 asPointersOfObjects];
+                 asPointersOfObjects];
   [self _appendComponentProperties: properties
-	matchingFilters: [self _parseCalendarFilters: documentElement]
-        toResponse: r];
+	                 matchingFilters: [self _parseCalendarFilters: documentElement]
+                        toResponse: r];
   [r appendContentString:@"</D:multistatus>"];
   free (properties);
 
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();