diff --git a/ChangeLog b/ChangeLog
index 6bc0f79e4..6825eeec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTypes.m (NSObjectFromStreamData): convert
+	read PT_UNICODE stream data as UTF-16.
+
 	* OpenChange/MAPIStoreContext.m
 	(-setProperty:withFMID:ofTableType:fromFile:): considering the
 	cached message as a MAPIStoreMessage instance instead of NSDictionary.
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 98c56dc9c..a4d35c024 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -214,7 +214,8 @@ id NSObjectFromStreamData (enum MAPITAGS property, NSData* streamData)
     {
     case PT_UNICODE:
     case PT_STRING8:
-      result = [NSString stringWithUTF8String: [streamData bytes]];
+      result = [NSString stringWithCharacters: (unichar *) [streamData bytes]
+                                       length: [streamData length] / 2];
       break;
     case PT_BINARY:
       result = streamData;