diff --git a/ChangeLog b/ChangeLog
index 0fe28a8a7..47373bb32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreObject.m (-url): make use of
+	-[MAPIStoreObject nameInContainer] rather than the equivalent on
+	SOGoObject to make that code reusable for objects that are not
+	based on SOGoObject instances.
+
 	* OpenChange/MAPIStoreRecurrenceUtils.m: new module implementing
 	methods useful for handling recurrences in events and tasks.
 
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index 4b763f263..d06738945 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -159,7 +159,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
     format = @"%@/%@";
 
   return  [NSString stringWithFormat: format,
-                    containerURL, [sogoObject nameInContainer]];
+                    containerURL, [self nameInContainer]];
 }
 
 - (void) addActiveTable: (MAPIStoreTable *) activeTable