diff --git a/ChangeLog b/ChangeLog
index a04e500dd..94b7a073a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-02-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m
+	(+createRootFolder:withFID:andName:forUser:withRole:): removed the
+	"andTDBIndexing:" argument.
+	(+createRootSecondaryFolderWithFID:andName:forUser:): same as
+	above.
+
 	* OpenChange/MAPIStoreCalendarMessage.m
 	(-subscriberCanReadMessage): returns YES when the current role is
 	ComponentDAndTViewer too.
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 3d41985ad..49d5d0b95 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -72,8 +72,7 @@
                                   withFID: (uint64_t ) fid
                                   andName: (NSString *) folderName
                                   forUser: (NSString *) username
-                                 withRole: (enum mapistore_context_role) role
-                           andTDBIndexing: (struct tdb_wrap *) indexingTdb;
+                                 withRole: (enum mapistore_context_role) role;
 
 + (int) openContext: (MAPIStoreContext **) contextPtr
             withURI: (const char *) newUri
@@ -114,8 +113,7 @@
 + (NSString *)
  createRootSecondaryFolderWithFID: (uint64_t) fid
                           andName: (NSString *) folderName
-                          forUser: (NSString *) userName
-                  withTDBIndexing: (struct tdb_wrap *) indexingTdb;
+                          forUser: (NSString *) userName;
 - (Class) MAPIStoreFolderClass;
 
 /* the top-most parent of the context folder: SOGoMailAccount,
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 376e5e63b..2f6212005 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -175,7 +175,6 @@ MAPIStoreLookupContextClassByRole (Class self, enum mapistore_context_role role)
                                   andName: (NSString *) folderName
                                   forUser: (NSString *) userName
                                  withRole: (enum mapistore_context_role) role
-                           andTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
   Class contextClass;
   NSString *mapistoreURI;
@@ -187,8 +186,7 @@ MAPIStoreLookupContextClassByRole (Class self, enum mapistore_context_role role)
 
   mapistoreURI = [contextClass createRootSecondaryFolderWithFID: fid
                                                         andName: (NSString *) folderName
-                                                        forUser: userName
-                                                withTDBIndexing: indexingTdb];
+                                                        forUser: userName];
   if (mapistoreURI)
     *mapistoreUriP = mapistoreURI;
   else
@@ -546,7 +544,6 @@ static inline NSURL *CompleteURLFromMapistoreURI (const char *uri)
  createRootSecondaryFolderWithFID: (uint64_t) fid
                           andName: (NSString *) folderName
                           forUser: (NSString *) userName
-                  withTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
   [self subclassResponsibility: _cmd];
 
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index c3ff666bb..f77ecea68 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -93,7 +93,6 @@
  createRootSecondaryFolderWithFID: (uint64_t) fid
                           andName: (NSString *) folderName
                           forUser: (NSString *) userName
-                  withTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
   return [NSString stringWithFormat: @"sogo://%@@fallback/0x%.16"PRIx64"/",
                    userName, (unsigned long long) fid];
diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m
index a8e552e9c..60ec45346 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@@ -92,14 +92,13 @@
  createRootSecondaryFolderWithFID: (uint64_t) fid
                           andName: (NSString *) folderName
                           forUser: (NSString *) userName
-                  withTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
   NSString *mapistoreURI, *nameInContainer, *moduleName;
   MAPIStoreUserContext *userContext;
   SOGoParentFolder *parentFolder;
 
   userContext = [MAPIStoreUserContext userContextWithUsername: userName
-                                               andTDBIndexing: indexingTdb];
+                                               andTDBIndexing: NULL];
   moduleName = [self MAPIModuleName];
   parentFolder = [[userContext rootFolders] objectForKey: moduleName];
   if (![parentFolder newFolderWithName: folderName
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 84d4c935a..0c9ccf035 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -137,7 +137,6 @@ static Class MAPIStoreMailFolderK;
  createRootSecondaryFolderWithFID: (uint64_t) fid
                           andName: (NSString *) newFolderName
                           forUser: (NSString *) userName
-                  withTDBIndexing: (struct tdb_wrap *) indexingTdb
 {
   NSString *mapistoreURI, *folderName;
   MAPIStoreUserContext *userContext;
@@ -145,7 +144,7 @@ static Class MAPIStoreMailFolderK;
   SOGoMailFolder *newFolder;
 
   userContext = [MAPIStoreUserContext userContextWithUsername: userName
-                                               andTDBIndexing: indexingTdb];
+                                               andTDBIndexing: NULL];
   accountFolder = [[userContext rootFolders] objectForKey: @"mail"];
   folderName = [NSString stringWithFormat: @"folder%@",
                          [newFolderName asCSSIdentifier]];
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 7f6767eb6..69df2ffc5 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -152,7 +152,7 @@ static enum mapistore_error
 sogo_backend_create_root_folder (const char *username,
                                  enum mapistore_context_role role,
                                  uint64_t fid, const char *name,
-                                 struct tdb_wrap *indexingTdb,
+                                 // struct tdb_wrap *indexingTdb,
                                  TALLOC_CTX *mem_ctx, char **mapistore_urip)
 {
   NSAutoreleasePool *pool;
@@ -172,8 +172,7 @@ sogo_backend_create_root_folder (const char *username,
                                        withFID: fid
                                        andName: folderName
                                        forUser: userName
-                                      withRole: role
-                                andTDBIndexing: indexingTdb];
+                                      withRole: role];
       if (rc == MAPISTORE_SUCCESS)
         *mapistore_urip = [mapistoreUri asUnicodeInMemCtx: mem_ctx];
     }