diff --git a/ChangeLog b/ChangeLog
index f976832ad..b04c6fcc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-12-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSValue+MAPIStore.[hm]: new category module for
+	returning native MAPI types.
+
 	* OpenChange/SOGoMAPIFSFolder.[hm]: new class module that
 	implements a SOGoFolder subclass that stores and retrives data
 	to/and from the file system in the form of a plist.
diff --git a/OpenChange/NSValue+MAPIStore.h b/OpenChange/NSValue+MAPIStore.h
new file mode 100644
index 000000000..9cde6029e
--- /dev/null
+++ b/OpenChange/NSValue+MAPIStore.h
@@ -0,0 +1,37 @@
+/* NSValue+MAPIStore.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010 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 3, 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 NSVALUE_MAPISTORE_H
+#define NSVALUE_MAPISTORE_H
+
+#import <Foundation/NSValue.h>
+
+@interface NSNumber (MAPIStoreDataTypes)
+
+- (uint8_t *) asBooleanInMemCtx: (void *) memCtx;
+- (uint16_t *) asShortInMemCtx: (void *) memCtx;
+- (uint32_t *) asLongInMemCtx: (void *) memCtx;
+- (uint64_t *) asDoubleInMemCtx: (void *) memCtx;
+
+@end
+
+#endif /* NSVALUE_MAPISTORE_H */
diff --git a/OpenChange/NSValue+MAPIStore.m b/OpenChange/NSValue+MAPIStore.m
new file mode 100644
index 000000000..262e41afc
--- /dev/null
+++ b/OpenChange/NSValue+MAPIStore.m
@@ -0,0 +1,69 @@
+/* NSValue+MAPIStore.m - this file is part of SOGo
+ *
+ * Copyright (C) 2010 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 3, 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 "NSValue+MAPIStore.h"
+
+@implementation NSNumber (MAPIStoreDataTypes)
+
+- (uint8_t *) asBooleanInMemCtx: (void *) memCtx
+{
+  uint8_t *value;
+
+  value = talloc (memCtx, uint8_t);
+  *value = [self boolValue];
+
+  return value;
+}
+
+- (uint16_t *) asShortInMemCtx: (void *) memCtx
+{
+  uint16_t *value;
+
+  value = talloc (memCtx, uint16_t);
+  *value = [self shortValue];
+
+  return value;
+}
+
+- (uint32_t *) asLongInMemCtx: (void *) memCtx
+{
+  uint32_t *value;
+
+  value = talloc (memCtx, uint32_t);
+  *value = [self longValue];
+
+  return value;
+}
+
+- (uint64_t *) asDoubleInMemCtx: (void *) memCtx
+{
+  uint64_t *value;
+
+  value = talloc (memCtx, uint64_t);
+  *value = [self doubleValue];
+
+  return value;
+}
+
+@end