diff --git a/ChangeLog b/ChangeLog
index e0d40931f..a03f024a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreContext.m
+	(-deleteMessageWithMID:inFID:withFlags:): we need to invoke
+	-cleanupCaches on the related table to avoid listing deleted
+	elements after this operation.
+
 2011-02-03  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* OpenChange/SOGoAppointmentObject+MAPIStore.m
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index cbc57d634..1e45f143b 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -1471,6 +1471,7 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
             {
               [self logWithFormat: @"sucessfully deleted object at URL: %@", childURL];
               [mapping unregisterURLWithID: mid];
+              [table cleanupCaches];
               rc = MAPISTORE_SUCCESS;
             }
         }