diff --git a/ChangeLog b/ChangeLog
index 7e3a81e14..b361e3b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailFolderTable.[hm]: new class module
+	subclassed from MAPIStoreFolderTable, that provides the interface
+	for folders in MAPIStoreMailContext.
+
 	* OpenChange/MAPIStoreMailContext.m: Old table methods (see
 	below) split into the new "MAPIStoreMailMessageTable" class.
 	(+registerFixedMappings:): changed handled uri to
diff --git a/OpenChange/MAPIStoreMailFolderTable.h b/OpenChange/MAPIStoreMailFolderTable.h
new file mode 100644
index 000000000..2c9a2b7c4
--- /dev/null
+++ b/OpenChange/MAPIStoreMailFolderTable.h
@@ -0,0 +1,31 @@
+/* MAPIStoreMailFolderTable.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 MAPISTOREMAILFOLDERTABLE_H
+#define MAPISTOREMAILFOLDERTABLE_H
+
+#import "MAPIStoreFolderTable.h"
+
+@interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
+@end
+
+#endif /* MAPISTOREMAILFOLDERTABLE_H */
diff --git a/OpenChange/MAPIStoreMailFolderTable.m b/OpenChange/MAPIStoreMailFolderTable.m
new file mode 100644
index 000000000..ce8e86d47
--- /dev/null
+++ b/OpenChange/MAPIStoreMailFolderTable.m
@@ -0,0 +1,57 @@
+/* MAPIStoreMailFolderTable.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.
+ */
+
+#import <Foundation/NSString.h>
+
+#import "NSString+MAPIStore.h"
+#import "NSValue+MAPIStore.h"
+#import "MAPIStoreTypes.h"
+
+#import "MAPIStoreMailFolderTable.h"
+
+@implementation MAPIStoreMailFolderTable
+
+- (enum MAPISTATUS) getChildProperty: (void **) data
+			      forKey: (NSString *) childKey
+			     withTag: (enum MAPITAGS) propTag
+{
+  enum MAPISTATUS rc;
+
+  rc = MAPI_E_SUCCESS;
+  switch (propTag)
+    {
+    case PR_CONTENT_UNREAD:
+      *data = MAPILongValue (memCtx, 0);
+      break;
+    case PR_CONTAINER_CLASS_UNICODE:
+      *data = [@"IPF.Note" asUnicodeInMemCtx: memCtx];
+      break;
+    default:
+      rc = [super getChildProperty: data
+			    forKey: childKey
+			   withTag: propTag];
+    }
+  
+  return rc;
+}
+
+@end