diff --git a/OpenChange/MAPIStoreNotesContext.m b/OpenChange/MAPIStoreNotesContext.m
index 725b0d158..f5b8b1be3 100644
--- a/OpenChange/MAPIStoreNotesContext.m
+++ b/OpenChange/MAPIStoreNotesContext.m
@@ -1,6 +1,7 @@
 /* MAPIStoreNotesContext.m - this file is part of SOGo
  *
  * Copyright (C) 2010-2012 Inverse inc.
+ * Copyright (C) 2016 Enrique J. Hernandez
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -30,13 +31,30 @@
 #undef DEBUG
 #include <mapistore/mapistore.h>
 
+static Class MAPIStoreNotesFolderK;
+
 @implementation MAPIStoreNotesContext
 
++ (void) initialize
+{
+  MAPIStoreNotesFolderK = [MAPIStoreNotesFolder class];
+}
+
 + (NSString *) MAPIModuleName
 {
   return @"notes";
 }
 
++ (enum mapistore_context_role) MAPIContextRole
+{
+  return MAPISTORE_NOTES_ROLE;
+}
+
+- (Class) MAPIStoreFolderClass
+{
+  return MAPIStoreNotesFolderK;
+}
+
 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *)  userName
                                          withIndexing: (struct indexing_context *) indexing
                                                 inMemCtx: (TALLOC_CTX *) memCtx