diff --git a/ChangeLog b/ChangeLog
index c2bcf304f..c4dab2402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-getPidTagSubFolders:inMemCtx:):
+	invoke [self folderKeys] rather than the corresponding ivar.
+
 	* OpenChange/MAPIStoreTypes.m (NSObjectFromMAPISPropValue)
 	(NSObjectFromSPropValue): treat PT_ERROR just as PT_LONG.
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 71dc2f97d..a0c75d3ae 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -1196,7 +1196,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (int) getPidTagSubfolders: (void **) data
                    inMemCtx: (TALLOC_CTX *) memCtx
 {
-  *data = MAPIBoolValue (memCtx, [folderKeys count] > 0);
+  *data = MAPIBoolValue (memCtx, [[self folderKeys] count] > 0);
   
   return MAPISTORE_SUCCESS;
 }