diff --git a/ChangeLog b/ChangeLog
index d6f25003f..3f6512387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSAutoreleasePool+MAPIStore: removed module since it
+	was a lot of code to handle one specific case.
+
 	* OpenChange/MAPIStoreGCSMessageTable.m
 	(-evaluatePropertyRestriction:intoQualifier:): create a local
 	talloc context and free it at the end when generating a new date
diff --git a/OpenChange/NSAutoreleasePool+MAPIStore.h b/OpenChange/NSAutoreleasePool+MAPIStore.h
deleted file mode 100644
index 78a7fe871..000000000
--- a/OpenChange/NSAutoreleasePool+MAPIStore.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* NSAutoreleasePool+MAPIStore.h - this file is part of $PROJECT_NAME_HERE$
- *
- * Copyright (C) 2011 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef NSAUTORELEASEPOOL_MAPISTORE_H
-#define NSAUTORELEASEPOOL_MAPISTORE_H
-
-#import <Foundation/NSObject.h>
-
-@interface NSAutoreleasedTallocPointer : NSObject
-{
-  void *ptr;
-}
-
-@end
-
-void NSAutoreleaseTallocPointer (void *ptr);
-
-#endif /* NSAUTORELEASEPOOL_MAPISTORE_H */
diff --git a/OpenChange/NSAutoreleasePool+MAPIStore.m b/OpenChange/NSAutoreleasePool+MAPIStore.m
deleted file mode 100644
index aea6419b7..000000000
--- a/OpenChange/NSAutoreleasePool+MAPIStore.m
+++ /dev/null
@@ -1,62 +0,0 @@
-/* NSAutoreleasePool+MAPIStore.m - this file is part of SOGo
- *
- * Copyright (C) 2011 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <talloc.h>
-
-#import "NSAutoreleasePool+MAPIStore.h"
-
-@implementation NSAutoreleasedTallocPointer
-
-- (id) init
-{
-  if ((self = [super init]))
-    {
-      ptr = NULL;
-    }
-
-  return self;
-}
-
-- (void) setPtr: (void *) newPtr
-{
-  ptr = newPtr;
-}
-
-- (void) dealloc
-{
-  if (ptr)
-    talloc_free (ptr);
-  [super dealloc];
-}
-
-@end
-
-void NSAutoreleaseTallocPointer (void *ptr)
-{
-  NSAutoreleasedTallocPointer *newPointer;
-
-  talloc_steal (NULL, ptr);
-
-  newPointer = [NSAutoreleasedTallocPointer new];
-  [newPointer setPtr: ptr];
-  [newPointer autorelease];
-}