diff --git a/ChangeLog b/ChangeLog
index cbef3208c..23a29a1e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreContactsMessageTable.m
+	(-evaluatePropertyRestriction:intoQualifier:): returns
+	"MAPIRestrictionStateAlwaysTrue" for PR_SENSITIVITY.
+
+	* OpenChange/MAPIStoreContactsMessage.m
+	(-getPrSensitivity:inMemCtx:): new getter that always returns 0.
+
 2011-11-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/NSArray+MAPIStore.m (-asMVUnicodeInMemCtx:) renamed
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index 97719f449..5ef07ff99 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -745,6 +745,12 @@
   return MAPISTORE_SUCCESS;
 }
 
+- (int) getPrSensitivity: (void **) data
+                inMemCtx: (TALLOC_CTX *) memCtx
+{
+  return [self getLongZero: data inMemCtx: memCtx];
+}
+
 /* attachments (photos) */
 - (void) _fetchAttachmentParts
 {
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index 60e95a968..406329bab 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -105,6 +105,9 @@ static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
 	rc = MAPIRestrictionStateAlwaysFalse;
       break;
 
+    case PR_SENSITIVITY:
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
     case PidLidAddressBookProviderArrayType:
     case PidLidAddressBookProviderEmailList:
       /* FIXME: this is a hack. We should return a real qualifier here */