diff --git a/ChangeLog b/ChangeLog
index f8c133f33..1378519ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreObject.m (-addPropertiesFromRow:): perform
+	test on PT_STRING8 alone after "masking" the ulPropTag with 0xfff,
+	since PT_XX values are not bitmasks.
+
 2011-12-06  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/ContactsUI.js (contactsListCallback):
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index d836eb2a2..6652940f1 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -452,7 +452,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
   for (counter = 0; counter < aRow->cValues; counter++)
     {
       cValue = aRow->lpProps + counter;
-      if ((cValue->ulPropTag & PT_STRING8) == PT_STRING8)
+      if ((cValue->ulPropTag & 0xfff) == PT_STRING8)
         [self warnWithFormat:
                 @"attempting to set string property as PR_STRING8: %.8x",
               cValue->ulPropTag];