diff --git a/ChangeLog b/ChangeLog
index a30e40848..8c00429f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreSOGoObject.m (-objectId): force generation
+	of objectId by parent, whether it is a folder or not.
+
 2012-08-03  Jean Raby  <jraby@inverse.ca>
 
 	* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):
diff --git a/OpenChange/MAPIStoreSOGoObject.m b/OpenChange/MAPIStoreSOGoObject.m
index 421337505..f6d849857 100644
--- a/OpenChange/MAPIStoreSOGoObject.m
+++ b/OpenChange/MAPIStoreSOGoObject.m
@@ -132,18 +132,7 @@ static Class MAPIStoreFolderK;
 /* helpers */
 - (uint64_t) objectId
 {
-  uint64_t objectId;
-
-  if ([container isKindOfClass: MAPIStoreFolderK])
-    objectId = [(MAPIStoreFolder *) container
-                 idForObjectWithKey: [sogoObject nameInContainer]];
-  else
-    {
-      [self errorWithFormat: @"%s: container is not a folder", __PRETTY_FUNCTION__];
-      objectId = (uint64_t) -1;
-    }
- 
-  return objectId;
+  return [container idForObjectWithKey: [sogoObject nameInContainer]];
 }
 
 /* getters */