diff --git a/ChangeLog b/ChangeLog
index 8336bbd2d..6d43eae25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreContext.m
+	(-createMessageOfClass:inFolderAtURL:): renamed from
+	"-createMessageInFolder:", taking an additional message class
+	parameter that enables the subclasses to accept or deny a message
+	creation.
+
 	* OpenChange/EOQualifier+MAPIFS.m (-evaluateMAPIFSMessage:): added
-	logging for debugging.
+	logging for easier debugging.
 
 	* OpenChange/MAPIStoreSentItemsContext.[hm]: class is now derived
 	from MAPIStoreMailContext and set up its module folder to the
diff --git a/OpenChange/MAPIStoreOutboxContext.m b/OpenChange/MAPIStoreOutboxContext.m
index 3ca57132d..bb8dafd78 100644
--- a/OpenChange/MAPIStoreOutboxContext.m
+++ b/OpenChange/MAPIStoreOutboxContext.m
@@ -24,18 +24,13 @@
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 
-#import <SOGo/SOGoUserFolder.h>
-
 #import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailAccounts.h>
+#import <Mailer/SOGoMailFolder.h>
 
 #import "MAPIApplication.h"
 #import "MAPIStoreAuthenticator.h"
 #import "MAPIStoreMapping.h"
-#import "MAPIStoreTypes.h"
-
-#import "NSData+MAPIStore.h"
 
 #import "MAPIStoreOutboxContext.h"
 
@@ -86,30 +81,10 @@
     }
 }
 
-- (id) createMessageInFolder: (id) parentFolder
+- (id) createMessageOfClass: (NSString *) messageClass
+	      inFolderAtURL: (NSString *) folderURL;
 {
   return [moduleFolder newDraft];
 }
 
-- (enum MAPISTATUS) getMessageTableChildproperty: (void **) data
-					   atURL: (NSString *) childURL
-					 withTag: (enum MAPITAGS) proptag
-					inFolder: (SOGoFolder *) folder
-					 withFID: (uint64_t) fid
-{
-  enum MAPISTATUS rc;
-
-  if (proptag == PR_CHANGE_KEY)
-    {
-      *data = [[@"openchangedraft" dataUsingEncoding: NSASCIIStringEncoding]
-		asShortBinaryInMemCtx: memCtx];
-      rc = MAPI_E_SUCCESS;
-    }
-  else
-    rc = [super getMessageTableChildproperty: data atURL: childURL withTag:
-		  proptag inFolder: folder withFID: fid];
-
-  return rc;
-}
-
 @end