diff --git a/ChangeLog b/ChangeLog
index 1ef9cac00..1befe2dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailContext.m: MAPIStoreDeletedItemsContext
+	is now temporarily a fs-based context.
+
 	* SoObjects/Mailer/SOGoMailFolder.m
 	(_fetchMessageProperties:matchingQualifier:andSortOrderings::):
 	properly implement this method, as properties should be an array
diff --git a/OpenChange/MAPIStoreMailContext.h b/OpenChange/MAPIStoreMailContext.h
index e6fbf9643..44778857c 100644
--- a/OpenChange/MAPIStoreMailContext.h
+++ b/OpenChange/MAPIStoreMailContext.h
@@ -37,7 +37,9 @@
 @interface MAPIStoreDraftsContext : MAPIStoreMailContext
 @end
 
-@interface MAPIStoreDeletedItemsContext : MAPIStoreMailContext
+#import "MAPIStoreFSBaseContext.h"
+
+@interface MAPIStoreDeletedItemsContext : MAPIStoreFSBaseContext
 @end
 
 @interface MAPIStoreOutboxContext : MAPIStoreMailContext
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 0b9a47968..f8a85977d 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -84,20 +84,27 @@
 
 @end
 
+#import "MAPIStoreFSFolder.h"
+
 @implementation MAPIStoreDeletedItemsContext
 
 + (NSString *) MAPIModuleName
 {
   return @"deleted-items";
 }
-
 - (void) setupBaseFolder: (NSURL *) newURL
 {
-  baseFolder = [MAPIStoreDeletedItemsFolder baseFolderWithURL: newURL
-                                                    inContext: self];
+  baseFolder = [MAPIStoreFSFolder baseFolderWithURL: newURL inContext: self];
   [baseFolder retain];
 }
 
+// - (void) setupBaseFolder: (NSURL *) newURL
+// {
+//   baseFolder = [MAPIStoreDeletedItemsFolder baseFolderWithURL: newURL
+//                                                     inContext: self];
+//   [baseFolder retain];
+// }
+
 @end
 
 @implementation MAPIStoreOutboxContext