diff --git a/ChangeLog b/ChangeLog
index ddba08d14..eec2a4c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreFolderTable.m (-restrictedChildKeys): no
+	longer a mandatory method, returns [self childKeys] when not
+	overriden and issue an error message.
+
 	* OpenChange/MAPIStoreFolder.m (-createMessage): no longer a
 	mandatory method. Returns nil when not overriden.
 
diff --git a/OpenChange/MAPIStoreFolderTable.m b/OpenChange/MAPIStoreFolderTable.m
index b34b07015..e492369f0 100644
--- a/OpenChange/MAPIStoreFolderTable.m
+++ b/OpenChange/MAPIStoreFolderTable.m
@@ -59,7 +59,7 @@ static MAPIStoreMapping *mapping;
 
 - (NSArray *) restrictedChildKeys
 {
-  [self errorWithFormat: @"restrictions are ignored on folder tables"];
+  /* FIXME: restrictions are ignored on folder tables */
   return [self childKeys];
 }