diff --git a/ChangeLog b/ChangeLog
index c82436dfe..84a38fd61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,10 @@
 
 2011-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessage.m
+	(-modifyRecipientsWithRows:andCount:andColumns:): take BCC
+	recipients into account.
+
 	* OpenChange/MAPIStoreMessage.m
 	(_convertRecipientFromRow:andColumns:): temp hack: make use of
 	set_mapi_SPropValue_sogo instead of set_mapi_SPropValue, which was
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 8bf5cbd24..273c9069d 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -318,7 +318,7 @@ NSData *MAPIStoreExternalEntryId (NSString *cn, NSString *email)
       currentRow = rows + count;
 
       if (currentRow->RecipClass >= MAPI_ORIG
-          && currentRow->RecipClass < MAPI_BCC)
+          && currentRow->RecipClass <= MAPI_BCC)
         {
           recType = recTypes[currentRow->RecipClass];
           list = [recipients objectForKey: recType];