diff --git a/ChangeLog b/ChangeLog
index 3cf1de4c4..db55c6eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 
 2011-07-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSObject+MAPIStore.m (MAPIStoreTallocWrapperDestroy):
+	the object release now occurs within an NSAutoreleasePool.
+
 	* Tools/sogo-tool.m (main): instantiate SOGoSystemDefaults in
 	order to properly inject the entries from SOGoDefaults.plist.
 
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index f84598715..7caaa0e65 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSAutoreleasePool.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import "NSData+MAPIStore.h"
@@ -37,10 +38,13 @@
 static int MAPIStoreTallocWrapperDestroy (void *data)
 {
   struct MAPIStoreTallocWrapper *wrapper;
+  NSAutoreleasePool *pool;
 
+  pool = [NSAutoreleasePool new];
   wrapper = data;
-  NSLog (@"destroying wrapped object (wrapper: %p; object: %p...\n", wrapper, wrapper->MAPIStoreSOGoObject);
+  NSLog (@"destroying wrapped object (wrapper: %p; object: %p)...\n", wrapper, wrapper->MAPIStoreSOGoObject);
   [wrapper->MAPIStoreSOGoObject release];
+  [pool release];
 
   return 0;
 }