diff --git a/ChangeLog b/ChangeLog
index e578ce025..df07e5215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolder.m (-deleteFolder): cleanup the caches
+	in order to let the folder disappear.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_create_root_folder):
 	new backend method.
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 912c766a6..8c10feb07 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -388,6 +388,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [propsFolder delete];
   [faiFolder delete];
 
+  [self cleanupCaches];
+
   return MAPISTORE_SUCCESS;
 }