diff --git a/ChangeLog b/ChangeLog
index c9933b59e..cd8723c63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreFSMessage.m (-objectVersion): return
+	0xff...fff when "version" does not exist in the object properties.
+
 2011-09-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreFolder.m
diff --git a/OpenChange/MAPIStoreFSMessage.m b/OpenChange/MAPIStoreFSMessage.m
index abf5ba568..4a915d926 100644
--- a/OpenChange/MAPIStoreFSMessage.m
+++ b/OpenChange/MAPIStoreFSMessage.m
@@ -89,7 +89,9 @@ Class NSNumberK;
 
   version = [[sogoObject properties] objectForKey: @"version"];
 
-  return exchange_globcnt ([version unsignedLongLongValue]);
+  return (version
+          ? exchange_globcnt ([version unsignedLongLongValue])
+          : 0xffffffffffffffff);
 }
 
 - (int) getProperty: (void **) data