diff --git a/ChangeLog b/ChangeLog
index 8da14bc8c..9309ada68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreContactsMessageTable.m
+	(-getChildProperty:forKey:withTag:): result the same value for
+	"PR_SUBJECT" as for "PR_DISPLAY_NAME_UNICODE" instead of a stub
+	string.
+
 2010-12-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailMessageTable.m
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index bc9f0ec84..f7f847d1a 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -118,9 +118,6 @@
       // case PR_EMS_AB_DXA_REMOTE_CLIENT_UNICODE: "Home:" ???
       //         *data = talloc_strdup (memCtx, "PR_EMS...");
       //         break;
-    case PR_SUBJECT_UNICODE:
-      *data = talloc_strdup (memCtx, "PR_SUBJECT...");
-      break;
     case PR_OAB_NAME_UNICODE:
       *data = talloc_strdup (memCtx, "PR_OAB_NAME_UNICODE");
       break;
@@ -143,6 +140,7 @@
       *data = [stringValue asUnicodeInMemCtx: memCtx];
       break;
 
+    case PR_SUBJECT_UNICODE:
     case PR_DISPLAY_NAME_UNICODE: // Full Name
     case PidLidFileUnder: // contact block title name
       rc = [super getChildProperty: data