diff --git a/ChangeLog b/ChangeLog
index bdc553a64..c39ba96dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-03  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
+	* OpenChange/MAPIStoreTable.m (-setRestrictions:): log the old
+	restriction when unset.
+
 	* OpenChange/MAPIStoreMapping.m (-unregisterURLWithID:): new
 	method for removing entries from the mapping dictionaries.
 
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index df3a38b83..452ce5b73 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -372,7 +372,7 @@ static Class NSDataK, NSStringK;
   // 	type, MAPIStringForRestriction (res)];
 
   oldRestriction = restriction;
-  [restriction release];
+  [restriction autorelease];
   if (res)
     restrictionState = [self evaluateRestriction: res
 				   intoQualifier: &restriction];
@@ -384,6 +384,7 @@ static Class NSDataK, NSStringK;
   else
     restriction = nil;
   
+  // FIXME: we should not flush the caches if the restrictions matches
   [cachedRestrictedKeys release];
   cachedRestrictedKeys = nil;
   
@@ -391,7 +392,7 @@ static Class NSDataK, NSStringK;
     [self logWithFormat: @"restriction set to EOQualifier: %@",
 	  restriction];
   else if (oldRestriction)
-    [self logWithFormat: @"restriction unset"];
+    [self logWithFormat: @"restriction unset (was %@)", oldRestriction];
 }
 
 - (enum MAPISTATUS) getChildProperty: (void **) data