diff --git a/ChangeLog b/ChangeLog
index be22b7b30..e41af375a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFSMessage.m (-subscriberCanModifyMessage):
+	handle the case where the message is being created.
+
 	* OpenChange/MAPIStoreFSFolder.m
 	(-messageKeysMatchingQualifier:andSortOrderings:): ensure the
 	active user can read the folder messages before returning them.
diff --git a/OpenChange/MAPIStoreFSMessage.m b/OpenChange/MAPIStoreFSMessage.m
index 161359e8b..8af3edca2 100644
--- a/OpenChange/MAPIStoreFSMessage.m
+++ b/OpenChange/MAPIStoreFSMessage.m
@@ -105,7 +105,10 @@
 
 - (BOOL) subscriberCanModifyMessage
 {
-  return ([(MAPIStoreFolder *) container subscriberCanModifyMessages]
+  return ((isNew
+           && [(MAPIStoreFolder *) container subscriberCanCreateMessages])
+          || (!isNew
+              && [(MAPIStoreFolder *) container subscriberCanModifyMessages])
           || [self _messageIsFreeBusy]);
 }