diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index e48b63802..8368671e3 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -26,6 +26,9 @@
 
 #import "MAPIStoreFallbackContext.h"
 
+#undef DEBUG
+#include <mapistore/mapistore.h>
+
 @implementation MAPIStoreFallbackContext
 
 + (NSString *) MAPIModuleName
@@ -33,6 +36,23 @@
   return @"fallback";
 }
 
++ (struct mapistore_contexts_list *) listContextsForUser: (NSString *)  userName
+                                                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  struct mapistore_contexts_list *context;
+
+  context = talloc_zero(memCtx, struct mapistore_contexts_list);
+  context->url = talloc_asprintf (context, "sogo://%s@fallback/",
+                                  [userName UTF8String]);
+  context->name = "Fallback";
+  context->main_folder = true;
+  context->role = MAPISTORE_FALLBACK_ROLE;
+  context->tag = "tag";
+  context->prev = context;
+
+  return context;
+}
+
 - (void) setupBaseFolder: (NSURL *) newURL
 {
   baseFolder = [MAPIStoreFSFolder baseFolderWithURL: newURL inContext: self];