diff --git a/ChangeLog b/ChangeLog
index 2df7c4a48..2aba6c95e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-01-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolderTable.m
+	(-backendIdentifierForProperty:): new overriden method to avoid an
+	exception under certain circumstances.
+
 	* OpenChange/SOGoMAPIFSMessage.m (-MAPISave): make use of
 	"ensureDirectory" on the container folder to avoid errors with
 	NSDictionary failing to save itself to the filesystem.
diff --git a/OpenChange/MAPIStoreFolderTable.m b/OpenChange/MAPIStoreFolderTable.m
index 5cf265ede..5bcac4e8c 100644
--- a/OpenChange/MAPIStoreFolderTable.m
+++ b/OpenChange/MAPIStoreFolderTable.m
@@ -126,4 +126,9 @@ static MAPIStoreMapping *mapping;
   return rc;
 }
 
+- (NSString *) backendIdentifierForProperty: (enum MAPITAGS) property
+{
+  return nil;
+}
+
 @end