From 9b5e7360d013c5b97baf162d83eefceda59cb4ab Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 13 Aug 2012 03:56:16 +0000
Subject: [PATCH] Monotone-Parent: 047b040e318a98223980da2af8241b7eb6d75341
 Monotone-Revision: 2fea5fbc833aa109f5048dda8ddd9884c91385e1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-13T03:56:16
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                    | 3 +++
 OpenChange/MAPIStoreFolder.m | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

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];