diff --git a/ChangeLog b/ChangeLog
index 9a62bcb42..64dd4ce43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreNotesMessageTable.m
+	(-getChildProperty:forKey:withTag:): make PR_SUBJECT_UNICODE an
+	alias to PR_NORMALIZED_SUBJECT_UNICODE.
+
 	* OpenChange/MAPIStoreMailMessageTable.m
 	(-getChildProperty:forKey:withTag:): return a proper value for
 	PR_SUBJECT_PREFIX_UNICODE and PR_NORMALIZED_SUBJECT_UNICODE.
diff --git a/OpenChange/MAPIStoreNotesMessageTable.m b/OpenChange/MAPIStoreNotesMessageTable.m
index a6fece914..87cdc1080 100644
--- a/OpenChange/MAPIStoreNotesMessageTable.m
+++ b/OpenChange/MAPIStoreNotesMessageTable.m
@@ -60,6 +60,11 @@
       *data = MAPILongValue (memCtx, 0x00000303);
       break;
 
+    case PR_SUBJECT_UNICODE:
+      rc = [self getChildProperty: data
+                           forKey: childKey
+                          withTag: PR_NORMALIZED_SUBJECT_UNICODE];
+      break;
     default:
       rc = [super getChildProperty: data
 			    forKey: childKey