diff --git a/ChangeLog b/ChangeLog
index edf23a415..bee14c483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/SOGoMAPIFSMessage.m (-MAPISave): restored old way of
+	decoding the property dictionary from the property list as the
+	"new method" was working around that was solved elsewhere and was
+	causing trouble with value typing.
+
 2011-02-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/SOGoMAPIFSMessage.m (-properties): initialize
diff --git a/OpenChange/SOGoMAPIFSMessage.m b/OpenChange/SOGoMAPIFSMessage.m
index b52966a1c..3e74be617 100644
--- a/OpenChange/SOGoMAPIFSMessage.m
+++ b/OpenChange/SOGoMAPIFSMessage.m
@@ -24,7 +24,6 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSPropertyList.h>
 #import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
@@ -92,7 +91,6 @@
 {
   NSArray *pathComponents;
   NSString *filePath;
-  NSData *content;
 
   [self logWithFormat: @"-MAPISave"];
 
@@ -112,11 +110,7 @@
       return;
     }
 
-  content = [NSPropertyListSerialization
-              dataFromPropertyList: properties
-                            format: NSPropertyListOpenStepFormat
-                  errorDescription: NULL];
-  if (![content writeToFile: filePath atomically: NO])
+  if (![properties writeToFile: filePath atomically: YES])
     [NSException raise: @"MAPIStoreIOException"
 		 format: @"could not save message"];
 }