diff --git a/ChangeLog b/ChangeLog
index 61883ba79..2c358b0ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreFSMessage.m (-canGetProperty:): method moved
+	up in MAPIStoreVolatileMessage.
+
 2011-10-27  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxAttendeesEditor.js
diff --git a/OpenChange/MAPIStoreFSMessage.m b/OpenChange/MAPIStoreFSMessage.m
index dd6b2c231..352c0931a 100644
--- a/OpenChange/MAPIStoreFSMessage.m
+++ b/OpenChange/MAPIStoreFSMessage.m
@@ -65,12 +65,6 @@
   return MAPISTORE_SUCCESS;
 }
 
-- (BOOL) canGetProperty: (enum MAPITAGS) propTag
-{
-  return ([[sogoObject properties] objectForKey: MAPIPropertyKey (propTag)]
-          || [super canGetProperty: propTag]);
-}
-
 - (void) save
 {
   uint64_t newVersion;
diff --git a/OpenChange/MAPIStoreVolatileMessage.m b/OpenChange/MAPIStoreVolatileMessage.m
index 177ca4d0d..2c427424b 100644
--- a/OpenChange/MAPIStoreVolatileMessage.m
+++ b/OpenChange/MAPIStoreVolatileMessage.m
@@ -103,6 +103,12 @@ Class NSNumberK;
   ASSIGN (lastModificationTime, [NSDate date]);
 }
 
+- (BOOL) canGetProperty: (enum MAPITAGS) propTag
+{
+  return ([super canGetProperty: propTag]
+          || [[sogoObject properties] objectForKey: MAPIPropertyKey (propTag)]);
+}
+
 - (uint64_t) objectVersion
 {
   NSNumber *version;