diff --git a/ChangeLog b/ChangeLog
index a3e54ec45..bdf6c4779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMessage.m (-saveMessage): make sure that the
+	PidTagChangeKey and PidTagChangeNumber props are no longer set in
+	the properties dict after the save occurred.
+
 	* OpenChange/MAPIApplication.m (-shouldSetupSignalHandlers):
 	overriden method by returning "NO".
 
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index a5a8827ab..febdb629c 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -496,6 +496,11 @@ rtf2html (NSData *compressedRTF)
         }
   
       [self save];
+      /* We make sure that any change-related properties are removes from the
+         properties dictionary, to make sure that related methods will be
+         invoked the next time they are requested. */
+      [properties removeObjectForKey: MAPIPropertyKey (PidTagChangeKey)];
+      [properties removeObjectForKey: MAPIPropertyKey (PidTagChangeNumber)];
 
       if ([container isKindOfClass: MAPIStoreFolderK])
         {