diff --git a/ChangeLog b/ChangeLog
index 745546012..7ea975e60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreMailFolder.m (-messageTable): we no longer
+	cache the table object as we don't want to assign different
+	handles to the same memory object, causing inconsistencies with
+	tables instantiated twice with different parameters.
+
 2011-08-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailFolder.m
diff --git a/OpenChange/MAPIStoreMailFolder.h b/OpenChange/MAPIStoreMailFolder.h
index d992d565b..317452c0b 100644
--- a/OpenChange/MAPIStoreMailFolder.h
+++ b/OpenChange/MAPIStoreMailFolder.h
@@ -36,7 +36,6 @@
 
 @interface MAPIStoreMailFolder : MAPIStoreFolder
 {
-  MAPIStoreMailMessageTable *messageTable;
   SOGoMAPIFSMessage *versionsMessage;
 }
 
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index a851e802f..2b691679a 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -143,7 +143,6 @@ static Class SOGoMailFolderK;
 - (void) dealloc
 {
   [versionsMessage release];
-  [messageTable release];
   [super dealloc];
 }
 
@@ -157,13 +156,8 @@ static Class SOGoMailFolderK;
 
 - (MAPIStoreMessageTable *) messageTable
 {
-  if (!messageTable)
-    {
-      [self synchroniseCache];
-      ASSIGN (messageTable, [MAPIStoreMailMessageTable tableForContainer: self]);
-    }
-
-  return messageTable;
+  [self synchroniseCache];
+  return [MAPIStoreMailMessageTable tableForContainer: self];
 }
 
 - (Class) messageClass