diff --git a/ChangeLog b/ChangeLog
index 22aa07ae0..3657c6585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m: commented out key cache ivars
+	(temporarily).
+
 	* OpenChange/MAPIStoreContext.m (-getRootFolder:inMemCtx:): do not
 	store the looked up folders when they are not descendants of
 	SOGoObject. Return MAPISTORE_ERR_NOT_FOUND when the looked up
diff --git a/OpenChange/MAPIStoreFSFolder.m b/OpenChange/MAPIStoreFSFolder.m
index 145781383..7ac725979 100644
--- a/OpenChange/MAPIStoreFSFolder.m
+++ b/OpenChange/MAPIStoreFSFolder.m
@@ -163,8 +163,9 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
   NSUInteger count, max;
   NSDate *date, *fileDate;
   MAPIStoreFSMessage *msg;
+  NSArray *messageKeys;
 
-  [self messageKeys];
+  messageKeys = [self messageKeys];
 
   date = [NSCalendarDate date];
   [self logWithFormat: @"current date: %@", date];
diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index b327e8d6d..41b3bdd61 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -46,9 +46,9 @@
 @interface MAPIStoreFolder : MAPIStoreObject
 {
   MAPIStoreContext *context;
-  NSArray *messageKeys;
-  NSArray *faiMessageKeys;
-  NSArray *folderKeys;
+  // NSArray *messageKeys;
+  // NSArray *faiMessageKeys;
+  // NSArray *folderKeys;
 
   SOGoMAPIFSFolder *faiFolder;
   SOGoMAPIFSFolder *propsFolder;
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index a0c75d3ae..664094048 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -75,9 +75,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 {
   if ((self = [super init]))
     {
-      messageKeys = nil;
-      faiMessageKeys = nil;
-      folderKeys = nil;
+      // messageKeys = nil;
+      // faiMessageKeys = nil;
+      // folderKeys = nil;
       faiFolder = nil;
       context = nil;
 
@@ -141,11 +141,11 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
 - (void) dealloc
 {
+  // [messageKeys release];
+  // [faiMessageKeys release];
+  // [folderKeys release];
   [propsMessage release];
   [propsFolder release];
-  [messageKeys release];
-  [faiMessageKeys release];
-  [folderKeys release];
   [faiFolder release];
   [context release];
 
@@ -261,8 +261,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
   if (messageKey)
     {
-      [self faiMessageKeys];
-      if ([faiMessageKeys containsObject: messageKey])
+      if ([[self faiMessageKeys] containsObject: messageKey])
         {
           msgObject = [faiFolder lookupName: messageKey
                                   inContext: nil
@@ -1003,14 +1002,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
 - (NSArray *) messageKeys
 {
-  if (!messageKeys)
-    {
-      messageKeys = [self messageKeysMatchingQualifier: nil
-                                      andSortOrderings: nil];
-      [messageKeys retain];
-    }
+  return [self messageKeysMatchingQualifier: nil
+                           andSortOrderings: nil];
+  // if (!messageKeys)
+  //   {
+  //     messageKeys = [self messageKeysMatchingQualifier: nil
+  //                                     andSortOrderings: nil];
+  //     [messageKeys retain];
+  //   }
 
-  return messageKeys;
+  // return messageKeys;
 }
 
 - (MAPIStoreFAIMessageTable *) faiMessageTable
@@ -1028,14 +1029,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
 - (NSArray *) faiMessageKeys
 {
-  if (!faiMessageKeys)
-    {
-      faiMessageKeys = [self faiMessageKeysMatchingQualifier: nil
-                                            andSortOrderings: nil];
-      [faiMessageKeys retain];
-    }
+  return [self faiMessageKeysMatchingQualifier: nil
+                              andSortOrderings: nil];
+  // if (!faiMessageKeys)
+  //   {
+  //     faiMessageKeys = [self faiMessageKeysMatchingQualifier: nil
+  //                                           andSortOrderings: nil];
+  //     [faiMessageKeys retain];
+  //   }
 
-  return faiMessageKeys;
+  // return faiMessageKeys;
 }
 
 - (MAPIStoreFolderTable *) folderTable
@@ -1045,14 +1048,16 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 
 - (NSArray *) folderKeys
 {
-  if (!folderKeys)
-    {
-      folderKeys = [self folderKeysMatchingQualifier: nil
-                                    andSortOrderings: nil];
-      [folderKeys retain];
-    }
+  return [self folderKeysMatchingQualifier: nil
+                          andSortOrderings: nil];
+  // if (!folderKeys)
+  //   {
+  //     folderKeys = [self folderKeysMatchingQualifier: nil
+  //                                   andSortOrderings: nil];
+  //     [folderKeys retain];
+  //   }
 
-  return folderKeys;
+  // return folderKeys;
 }
 
 - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
@@ -1098,12 +1103,12 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [self _cleanupTableCaches: MAPISTORE_MESSAGE_TABLE];
   [self _cleanupTableCaches: MAPISTORE_FAI_TABLE];
   [self _cleanupTableCaches: MAPISTORE_FOLDER_TABLE];
-  [faiMessageKeys release];
-  faiMessageKeys = nil;
-  [messageKeys release];
-  messageKeys = nil;
-  [folderKeys release];
-  folderKeys = nil;
+  // [faiMessageKeys release];
+  // faiMessageKeys = nil;
+  // [messageKeys release];
+  // messageKeys = nil;
+  // [folderKeys release];
+  // folderKeys = nil;
 }
 
 - (int) getPidTagParentFolderId: (void **) data