diff --git a/ChangeLog b/ChangeLog
index 420281a78..f821b20f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/code-MAPIStorePropertySelectors.m
+	(MAPIStorePropertyGettersForClass): insert the newly created table
+	in the hash in order to avoid a leak... and to enable it to be
+	found during the next search.
+
 	* SoObjects/SOGo/SOGoContentObject.m (-version, -createDate)
 	(-lastModified): new accessors that return the value of the
 	corresponding ivar.
diff --git a/OpenChange/code-MAPIStorePropertySelectors.m b/OpenChange/code-MAPIStorePropertySelectors.m
index f44bdbadc..ff7a0eda6 100644
--- a/OpenChange/code-MAPIStorePropertySelectors.m
+++ b/OpenChange/code-MAPIStorePropertySelectors.m
@@ -23,6 +23,9 @@
 #import <Foundation/NSMapTable.h>
 #import <NGExtensions/NGLogger.h>
 
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
 const MAPIStorePropertyGetter *
 MAPIStorePropertyGettersForClass (Class klass)
 {
@@ -41,6 +44,7 @@ MAPIStorePropertyGettersForClass (Class klass)
   if (!getters)
     {
       getters = NSZoneCalloc (NULL, 65536, sizeof (MAPIStorePropertyGetter));
+      NSMapInsert (classesTable, klass, getters);
       for (count = 0; count < 65535; count++)
         {
           idx = MAPIStorePropertyGettersIdx[count];