diff --git a/ChangeLog b/ChangeLog
index b49d44e64..292358045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreDraftsContext.m
+	(-createMessageOfClass:inFolderAtURL:): implemented method to
+	avoid a crash when "saving" drafts messages in Outlook.
+
 2011-02-07  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* OpenChange/MAPIStoreDeletedItemsContext.m: now a subclass of
diff --git a/OpenChange/MAPIStoreDraftsContext.m b/OpenChange/MAPIStoreDraftsContext.m
index 2ad70c212..561132906 100644
--- a/OpenChange/MAPIStoreDraftsContext.m
+++ b/OpenChange/MAPIStoreDraftsContext.m
@@ -26,6 +26,7 @@
 
 #import "MAPIStoreMapping.h"
 
+#import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 
 #import "MAPIApplication.h"
@@ -82,4 +83,10 @@
     }
 }
 
+- (id) createMessageOfClass: (NSString *) messageClass
+	      inFolderAtURL: (NSString *) folderURL;
+{
+  return [moduleFolder newDraft];
+}
+
 @end