diff --git a/ChangeLog b/ChangeLog
index 87b3d0dad..a8ec85b14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	url string of non-ascii folder names.
 	(+createRootSecondaryFolderWithFID:andName:forUser:): same as
 	above.
+	(+*): reverted all of the above.
 
 	* OpenChange/MAPIStoreMailVolatileMessage.m
 	(FillMessageHeadersFromProperties): build a recipient list for the
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 83dc70e1f..b57ea1949 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -129,8 +129,7 @@ MakeDisplayFolderName (NSString *folderName)
   for (count = 0; count < 3; count++)
     {
       context = talloc_zero (memCtx, struct mapistore_contexts_list);
-      stringData = [NSString stringWithFormat: @"%@%@", urlBase,
-                             [folderName[count] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+      stringData = [NSString stringWithFormat: @"%@%@", urlBase, folderName[count]];
       context->url = [stringData asUnicodeInMemCtx: context];
       /* remove "folder" prefix */
       stringData = MakeDisplayFolderName (folderName[count]);
@@ -153,8 +152,7 @@ MakeDisplayFolderName (NSString *folderName)
     {
       context = talloc_zero (memCtx, struct mapistore_contexts_list);
       currentName = [secondaryFolders objectAtIndex: count];
-      stringData = [NSString stringWithFormat: @"%@%@",
-                             urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+      stringData = [NSString stringWithFormat: @"%@%@", urlBase, currentName];
       context->url = [stringData asUnicodeInMemCtx: context];
       stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
       context->name = [stringData asUnicodeInMemCtx: context];
@@ -187,8 +185,7 @@ MakeDisplayFolderName (NSString *folderName)
                                  inContainer: accountFolder];
   if ([newFolder create])
     mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
-                             userName, userName,
-                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+                             userName, userName, folderName];
   else
     mapistoreURI = nil;
   [MAPIApp setUserContext: nil];