diff --git a/ChangeLog b/ChangeLog
index a05380841..dabf1ed30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-createFolder:withRow:andFID:):
+	append a "/" to the new folder url when registering with the
+	url/id mapper.
+
 	* OpenChange/MAPIStoreDBFolder.m (-moveToFolder:withNewName:):
 	implemented method.
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index d2baea090..d39683bff 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -399,7 +399,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
               baseURL = [self url];
               if (![baseURL hasSuffix: @"/"])
                 baseURL = [NSString stringWithFormat: @"%@/", baseURL];
-              childURL = [NSString stringWithFormat: @"%@%@",
+              childURL = [NSString stringWithFormat: @"%@%@/",
                                    baseURL, folderKey];
               [mapping registerURL: childURL withID: fid];
               childFolder = [self lookupFolder: folderKey];