diff --git a/OpenChange/MAPIStoreOutboxContext.h b/OpenChange/MAPIStoreOutboxContext.h
index d103ba40b..aea74496c 100644
--- a/OpenChange/MAPIStoreOutboxContext.h
+++ b/OpenChange/MAPIStoreOutboxContext.h
@@ -1,12 +1,12 @@
 /* MAPIStoreOutboxContext.h - this file is part of SOGo
  *
- * Copyright (C) 2010 Wolfgang Sourdeau
+ * Copyright (C) 2010 Inverse inc.
  *
- * Author: Wolfgang Sourdeau <root@inverse.ca>
+ * 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 2, or (at your option)
+ * 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,
diff --git a/OpenChange/MAPIStoreOutboxContext.m b/OpenChange/MAPIStoreOutboxContext.m
index ef5cee9d4..1506402da 100644
--- a/OpenChange/MAPIStoreOutboxContext.m
+++ b/OpenChange/MAPIStoreOutboxContext.m
@@ -1,12 +1,12 @@
 /* MAPIStoreOutboxContext.m - this file is part of SOGo
  *
- * Copyright (C) 2010 Wolfgang Sourdeau
+ * Copyright (C) 2010 Inverse inc.
  *
- * Author: Wolfgang Sourdeau <root@inverse.ca>
+ * 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 2, or (at your option)
+ * 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,
@@ -55,6 +55,7 @@
   SOGoUserFolder *userFolder;
   SOGoMailAccounts *accountsFolder;
   SOGoMailAccount *accountFolder;
+  id currentContainer;
 
   userFolder = [SOGoUserFolder objectWithName: [authenticator username]
                                   inContainer: MAPIApp];
@@ -75,6 +76,12 @@
 
   moduleFolder = [accountFolder draftsFolderInContext: nil];
   [moduleFolder retain];
+  currentContainer = [moduleFolder container];
+  while (currentContainer != accountFolder)
+    {
+      [parentFoldersBag addObject: currentContainer];
+      currentContainer = [currentContainer container];
+    }
 }
 
 - (id) createMessageInFolder: (id) parentFolder