diff --git a/ChangeLog b/ChangeLog
index 20bbaff23..0038b6700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreSpoolerContext.[hm]: new context module,
+	which subclasses MAPIStoreSpoolerContext from
+	MAPIStoreFSBaseContext rather than MAPIStoreOutboxContext.
+
 2011-05-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreTypes.m (NSObjectFromMAPISPropValue)
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index c96f10110..a0e7f4a19 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -99,6 +99,7 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreScheduleContext.m \
 	MAPIStoreSearchContext.m \
 	MAPIStoreShortcutsContext.m \
+	MAPIStoreSpoolerContext.m \
 	MAPIStoreViewsContext.m \
 	\
 	NSArray+MAPIStore.m \
diff --git a/OpenChange/MAPIStoreMailContext.h b/OpenChange/MAPIStoreMailContext.h
index 644fb7daf..e6fbf9643 100644
--- a/OpenChange/MAPIStoreMailContext.h
+++ b/OpenChange/MAPIStoreMailContext.h
@@ -43,7 +43,4 @@
 @interface MAPIStoreOutboxContext : MAPIStoreMailContext
 @end
 
-@interface MAPIStoreSpoolerContext : MAPIStoreOutboxContext
-@end
-
 #endif /* MAPISTOREMAILCONTEXT_H */
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 8c94c3015..0b9a47968 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -115,12 +115,3 @@
 }
 
 @end
-
-@implementation MAPIStoreSpoolerContext
-
-+ (NSString *) MAPIModuleName
-{
-  return @"spooler-queue";
-}
-
-@end