diff --git a/ChangeLog b/ChangeLog
index ccb02d2ce..61eb463b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreTable.m (-dealloc): free the list of
+	columns, otherwise the last list set is leaked.
+
 2011-07-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreSOGo.m (sogo_folder_get_deleted_fmids):
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 870113103..861279473 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -289,6 +289,9 @@ static Class NSDataK, NSStringK;
       restriction = nil;
       restrictionState = MAPIRestrictionStateAlwaysTrue;
       sortOrderings = nil;
+
+      columns = NULL;
+      columnsCount = 0;
     }
 
   return self;
@@ -320,6 +323,8 @@ static Class NSDataK, NSStringK;
 - (void) dealloc
 {
   [self logWithFormat: @"-dealloc"];
+  if (columns)
+    NSZoneFree (NULL, columns);
   if (container)
     [[MAPIStoreActiveTables activeTables] unregisterTable: self];
   [currentChild release];