diff --git a/OpenChange/MAPIStoreMapping.h b/OpenChange/MAPIStoreMapping.h
index 13a8ba768..620112d76 100644
--- a/OpenChange/MAPIStoreMapping.h
+++ b/OpenChange/MAPIStoreMapping.h
@@ -42,7 +42,6 @@
 - (id) initForUsername: (NSString *) username
           withIndexing: (struct indexing_context *) indexing;
 
-- (void) updateIndexing: (struct indexing_context *) indexing;
 
 - (void) increaseUseCount;
 - (void) decreaseUseCount;
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index 9346b156f..194488bc7 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -119,11 +119,6 @@ MAPIStoreMappingKeyFromId (uint64_t idNbr)
   return self;
 }
 
-- (void) updateIndexing: (struct indexing_context *) newIndexing
-{
-    indexing = newIndexing;
-}
-
 - (void) dealloc
 {
   [username release];
diff --git a/OpenChange/MAPIStoreUserContext.h b/OpenChange/MAPIStoreUserContext.h
index 32582271d..f9867d15a 100644
--- a/OpenChange/MAPIStoreUserContext.h
+++ b/OpenChange/MAPIStoreUserContext.h
@@ -68,8 +68,6 @@
 - (id) initWithUsername: (NSString *) newUsername
          andTDBIndexing: (struct indexing_context *) indexing;
 
-- (void) updateIndexing: (struct indexing_context *) indexing;
-
 - (NSString *) username;
 - (SOGoUser *) sogoUser;
 
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index 68d063e02..04300fd35 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -65,14 +65,7 @@ static NSMapTable *contextsTable = nil;
   id userContext;
 
   userContext = [contextsTable objectForKey: username];
-  if (userContext)
-    {
-      // The indexing_context used when this user context was created
-      // could had been freed, so we have to update it and use the one
-      // that we receive as parameter (which is a valid one for sure).
-      [userContext updateIndexing: indexing];
-    }
-  else
+  if (!userContext)
     {
       userContext = [[self alloc] initWithUsername: username
                                     andTDBIndexing: indexing];
@@ -83,11 +76,6 @@ static NSMapTable *contextsTable = nil;
   return userContext;
 }
 
-- (void) updateIndexing: (struct indexing_context *) indexing
-{
-    [mapping updateIndexing: indexing];
-}
-
 - (id) init
 {
   if ((self = [super init]))