diff --git a/ChangeLog b/ChangeLog
index ad27e0360..56bff4964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessageTable.m
+	(-getChildProperty:forKey:withTag:): returns a default value for
+	PR_ORIG_MESSAGE_CLASS_UNICODE based of PR_MESSAGE_CLASS_UNICODE.
+
 	* OpenChange/NSArray+MAPIStore.m (-asArrayOfUnicodeStringsInCtx:):
 	new method for returning array of "PT_UNICODE" values.
 
diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index b7766a795..f9e99386f 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -205,6 +205,11 @@ static MAPIStoreMapping *mapping;
       *data = [@"openchange" asUnicodeInMemCtx: memCtx];
       break;
 
+    case PR_ORIG_MESSAGE_CLASS_UNICODE:
+      rc = [self getChildProperty: data forKey: childKey
+                          withTag: PR_MESSAGE_CLASS_UNICODE];
+      break;
+
     default:
       rc = [super getChildProperty: data
 			    forKey: childKey