diff --git a/ChangeLog b/ChangeLog
index f949ad0f0..1f12a81d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-objectId): folder keys always end
+	with a "/" by convention.
+
 	* OpenChange/MAPIStoreMapping.m (-updateID:withURL:): new method
 	that perform a change of url on container and leaf entries.
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 50b635c06..d2baea090 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -1656,9 +1656,14 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (uint64_t) objectId
 {
   uint64_t objectId;
+  NSString *folderKey;
 
   if (container)
-    objectId = [super objectId];
+    {
+      folderKey = [NSString stringWithFormat: @"%@/",
+                            [sogoObject nameInContainer]];
+      objectId = [container idForObjectWithKey: folderKey];
+    }
   else
     objectId = [self idForObjectWithKey: nil];