diff --git a/ChangeLog b/ChangeLog
index 3a178ac55..09371a146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreSpoolerContext.[hm]: new backend context.
+
 2011-06-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxAttendeesEditor.js: adjustments for the
diff --git a/OpenChange/MAPIStoreSpoolerContext.h b/OpenChange/MAPIStoreSpoolerContext.h
new file mode 100644
index 000000000..466f2c063
--- /dev/null
+++ b/OpenChange/MAPIStoreSpoolerContext.h
@@ -0,0 +1,32 @@
+/* MAPIStoreSpoolerContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2011 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef MAPISTORESPOOLERCONTEXT_H
+#define MAPISTORESPOOLERCONTEXT_H
+
+#import "MAPIStoreFSBaseContext.h"
+
+@interface MAPIStoreSpoolerContext : MAPIStoreFSBaseContext
+
+@end
+
+#endif /* MAPISTORESPOOLERCONTEXT_H */
diff --git a/OpenChange/MAPIStoreSpoolerContext.m b/OpenChange/MAPIStoreSpoolerContext.m
new file mode 100644
index 000000000..92d531ca8
--- /dev/null
+++ b/OpenChange/MAPIStoreSpoolerContext.m
@@ -0,0 +1,34 @@
+/* MAPIStoreSpoolerContext.m - this file is part of SOGo
+ *
+ * Copyright (C) 2011 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSString.h>
+
+#import "MAPIStoreSpoolerContext.h"
+
+@implementation MAPIStoreSpoolerContext
+
++ (NSString *) MAPIModuleName
+{
+  return @"spooler-queue";
+}
+
+@end