diff --git a/ChangeLog b/ChangeLog
index 33f4e95cb..dd13f3229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,13 @@
 
 	* OpenChange/MAPIStoreMailMessageTable.m
 	(-getChildProperty:forKey:withTag:): removed non-unicode string
-	proptags.
+	proptags. Added support for case
+	PR_RCVD_REPRESENTING_ADDRTYPE_UNICODE,
+	PR_RECEIVED_BY_ADDRTYPE_UNICODE, PR_SENDER_ADDRTYPE_UNICODE,
+	PR_ORIGINAL_AUTHOR_NAME_UNICODE, PR_SENDER_NAME_UNICODE,
+	PR_SENDER_EMAIL_ADDRESS_UNICODE,
+	PR_RECEIVED_BY_EMAIL_ADDRESS_UNICODE and
+	PR_RCVD_REPRESENTING_EMAIL_ADDRESS_UNICODE.
 
 2011-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index f0c3b63d4..a884dde10 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -259,17 +259,25 @@ static EOQualifier *nonDeletedQualifier = nil;
       break;
 
     case PR_SENT_REPRESENTING_ADDRTYPE_UNICODE:
+    case PR_RCVD_REPRESENTING_ADDRTYPE_UNICODE:
+    case PR_RECEIVED_BY_ADDRTYPE_UNICODE:
+    case PR_SENDER_ADDRTYPE_UNICODE:
       *data = [@"SMTP" asUnicodeInMemCtx: memCtx];
       break;
+    case PR_ORIGINAL_AUTHOR_NAME_UNICODE:
+    case PR_SENDER_NAME_UNICODE:
+    case PR_SENDER_EMAIL_ADDRESS_UNICODE:
     case PR_SENT_REPRESENTING_EMAIL_ADDRESS_UNICODE:
     case PR_SENT_REPRESENTING_NAME_UNICODE:
       child = [self lookupChild: childKey];
       *data = [[child from] asUnicodeInMemCtx: memCtx];
       break;
 
-      /* TODO: the following are supposed to be display names, separated by a semicolumn */
+      /* TODO: some of the following are supposed to be display names, separated by a semicolumn */
     case PR_RECEIVED_BY_NAME_UNICODE:
+    case PR_RECEIVED_BY_EMAIL_ADDRESS_UNICODE:
     case PR_RCVD_REPRESENTING_NAME_UNICODE:
+    case PR_RCVD_REPRESENTING_EMAIL_ADDRESS_UNICODE:
     case PR_DISPLAY_TO_UNICODE:
     case PR_ORIGINAL_DISPLAY_TO_UNICODE:
       child = [self lookupChild: childKey];