diff --git a/ChangeLog b/ChangeLog
index ada561243..8212eaf47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
 
 2011-07-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFSMessage.m
+	(+getAvailableProperties:inMemCtx:): added memCtx parameter.
+
 	* OpenChange/MAPIStoreSOGo.m: (sogo_op_get_table_property)
 	(sogo_op_get_available_table_properties): removed obsolete
 	methods.
diff --git a/OpenChange/MAPIStoreFSMessage.m b/OpenChange/MAPIStoreFSMessage.m
index 70ac53fc0..e73b7ca16 100644
--- a/OpenChange/MAPIStoreFSMessage.m
+++ b/OpenChange/MAPIStoreFSMessage.m
@@ -38,6 +38,7 @@
 @implementation MAPIStoreFSMessage
 
 + (int) getAvailableProperties: (struct SPropTagArray **) propertiesP
+                      inMemCtx: (TALLOC_CTX *) memCtx
 {
   struct SPropTagArray *properties;
   NSUInteger count;
@@ -45,7 +46,7 @@
                                     0x683f0102, 0x68410003, 0x68420102,
                                     0x68450102, 0x68460003 };
 
-  properties = talloc_zero (NULL, struct SPropTagArray);
+  properties = talloc_zero (memCtx, struct SPropTagArray);
   properties->cValues = MAPIStoreSupportedPropertiesCount + 8;
   properties->aulPropTag = talloc_array (NULL, enum MAPITAGS,
                                          MAPIStoreSupportedPropertiesCount + 8);