diff --git a/ChangeLog b/ChangeLog
index c1ec6a976..e3d814721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* OpenChange/MAPIStoreMailContext.m
 	(+listContextsForUser:withTDBIndexing:inMemCtx:): we escape the
 	url string of non-ascii folder names.
+	(+createRootSecondaryFolderWithFID:andName:forUser:): same as
+	above.
+
 
 	* OpenChange/MAPIStoreMailVolatileMessage.m
 	(FillMessageHeadersFromProperties): build a recipient list for the
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index afdbb98b0..6aea0687a 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -210,12 +210,12 @@ static Class NSArrayK;
 - (int) getPidTagMessageClass: (void **) data
                      inMemCtx: (TALLOC_CTX *) memCtx
 {
-  SOGoUser *owner;
+  // SOGoUser *owner;
 
-  owner = [[self userContext] sogoUser];
-  if ([masterEvent userAsAttendee: owner])
-    *data = talloc_strdup (memCtx, "IPM.Schedule.Meeting.Request");
-  else
+  // owner = [[self userContext] sogoUser];
+  // if ([masterEvent userAsAttendee: owner])
+  //   *data = talloc_strdup (memCtx, "IPM.Schedule.Meeting.Request");
+  // else
     *data = talloc_strdup (memCtx, "IPM.Appointment");
 
   return MAPISTORE_SUCCESS;
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 8d1cea8cc..83dc70e1f 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -187,7 +187,8 @@ MakeDisplayFolderName (NSString *folderName)
                                  inContainer: accountFolder];
   if ([newFolder create])
     mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
-                             userName, userName, folderName];
+                             userName, userName,
+                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
   else
     mapistoreURI = nil;
   [MAPIApp setUserContext: nil];