diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index 406329bab..e46a5813e 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -74,10 +74,12 @@ static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
 			  forKey: MAPIPropertyKey (PidLidEmail2EmailAddress)];
       [knownProperties setObject: @"c_mail"
 			  forKey: MAPIPropertyKey (PidLidEmail3EmailAddress)];
-      [knownProperties setObject: @"c_cn"
-			  forKey: MAPIPropertyKey (PR_DISPLAY_NAME_UNICODE)];
       [knownProperties setObject: @"c_cn"
 			  forKey: MAPIPropertyKey (PidLidFileUnder)];
+      [knownProperties setObject: @"c_cn"
+                          forKey: MAPIPropertyKey (PidTagDisplayName)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagSubject)]; 
     }
 
   return [knownProperties objectForKey: MAPIPropertyKey (property)];
@@ -213,7 +215,11 @@ static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
       [knownProperties setObject: @"c_cn"
                           forKey: MAPIPropertyKey (PidLidFileUnder)];
       [knownProperties setObject: @"c_cn"
-                          forKey: MAPIPropertyKey (PR_DISPLAY_NAME_UNICODE)];
+                          forKey: MAPIPropertyKey (PidTagDisplayName)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagSubject)];
+      [knownProperties setObject: @"c_cn"
+			  forKey: MAPIPropertyKey (PidTagNormalizedSubject)];
     }
 
   return [knownProperties objectForKey: MAPIPropertyKey (property)];