diff --git a/ChangeLog b/ChangeLog
index ac7d9e482..8d96d50ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFallbackContext.[hm]: new class module for
+	the "fallback" context, used by the OpenChange core to create
+	contexts that are not specifically handled.
+
 	* OpenChange/MAPIStoreSOGo.m (sogo_create_context): a new struct
 	mapistore_connection_info * is now passed as parameter, which
 	contains useful data about the current connection.
diff --git a/OpenChange/MAPIStoreFallbackContext.h b/OpenChange/MAPIStoreFallbackContext.h
new file mode 100644
index 000000000..da8e03c0d
--- /dev/null
+++ b/OpenChange/MAPIStoreFallbackContext.h
@@ -0,0 +1,32 @@
+/* MAPIStoreFallbackContext.h - this file is part of SOGo
+ *
+ * Copyright (C) 2010 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 MAPISTOREFALLBACKCONTEXT_H
+#define MAPISTOREFALLBACKCONTEXT_H
+
+#import "MAPIStoreFSBaseContext.h"
+
+@interface MAPIStoreFallbackContext : MAPIStoreFSBaseContext
+
+@end
+
+#endif /* MAPISTOREFALLBACKCONTEXT_H */
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
new file mode 100644
index 000000000..e48b63802
--- /dev/null
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -0,0 +1,42 @@
+/* MAPIStoreFallbackContext.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 "MAPIStoreFSFolder.h"
+
+#import "MAPIStoreFallbackContext.h"
+
+@implementation MAPIStoreFallbackContext
+
++ (NSString *) MAPIModuleName
+{
+  return @"fallback";
+}
+
+- (void) setupBaseFolder: (NSURL *) newURL
+{
+  baseFolder = [MAPIStoreFSFolder baseFolderWithURL: newURL inContext: self];
+  [baseFolder retain];
+}
+
+@end