diff --git a/OpenChange/MAPIStoreDBMessage.m b/OpenChange/MAPIStoreDBMessage.m
index 2e535c7bc..b337ea6be 100644
--- a/OpenChange/MAPIStoreDBMessage.m
+++ b/OpenChange/MAPIStoreDBMessage.m
@@ -165,8 +165,8 @@
 /* TODO: differentiate between the "Own" and "All" cases */
 - (BOOL) subscriberCanReadMessage
 {
-  return ([(MAPIStoreFolder *) container subscriberCanReadMessages]
-          || [self _messageIsFreeBusy]);
+  return [(MAPIStoreFolder *) container subscriberCanReadMessages];
+          // || [self _messageIsFreeBusy]);
 }
 
 - (BOOL) subscriberCanModifyMessage
@@ -174,8 +174,8 @@
   return ((isNew
            && [(MAPIStoreFolder *) container subscriberCanCreateMessages])
           || (!isNew
-              && [(MAPIStoreFolder *) container subscriberCanModifyMessages])
-          || [self _messageIsFreeBusy]);
+              && [(MAPIStoreFolder *) container subscriberCanModifyMessages]));
+          // || [self _messageIsFreeBusy]);
 }
 
 - (NSDate *) creationTime