diff --git a/ChangeLog b/ChangeLog
index b175cd97d..19f563e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/SOGoMAPIFSMessage.m (-appendProperties:): new name
+	for "setMAPIProperties:"
+	(-save): new name for "MAPISave", since those were methods
+	ususally found in the obsolete category modules.
+
 	* OpenChange/MAPIStoreSOGo.m:
 	(sogo_pocop_get_attachment_table, sogo_pocop_get_attachment)
 	(sogo_pocop_create_attachment, sogo_pocop_set_table_columns)
diff --git a/OpenChange/SOGoMAPIFSMessage.h b/OpenChange/SOGoMAPIFSMessage.h
index 012f96d10..f23959605 100644
--- a/OpenChange/SOGoMAPIFSMessage.h
+++ b/OpenChange/SOGoMAPIFSMessage.h
@@ -26,6 +26,7 @@
 #import <SOGo/SOGoObject.h>
 
 @class NSDictionary;
+@class NSMutableDictionary;
 
 @interface SOGoMAPIFSMessage : SOGoObject
 {
@@ -33,6 +34,8 @@
 }
 
 - (NSDictionary *) properties;
+- (void) appendProperties: (NSDictionary *) newProperties;
+- (void) save;
 
 @end
 
diff --git a/OpenChange/SOGoMAPIFSMessage.m b/OpenChange/SOGoMAPIFSMessage.m
index 3e74be617..8bdc96dbf 100644
--- a/OpenChange/SOGoMAPIFSMessage.m
+++ b/OpenChange/SOGoMAPIFSMessage.m
@@ -67,7 +67,7 @@
   return properties;
 }
 
-- (void) setMAPIProperties: (NSDictionary *) newProperties
+- (void) appendProperties: (NSDictionary *) newProperties
 {
   NSArray *keys;
   NSString *key;
@@ -87,12 +87,12 @@
     }
 }
 
-- (void) MAPISave
+- (void) save
 {
   NSArray *pathComponents;
   NSString *filePath;
 
-  [self logWithFormat: @"-MAPISave"];
+  [self logWithFormat: @"-save"];
 
   [container ensureDirectory];