diff --git a/ChangeLog b/ChangeLog
index 746c617a8..cc184aad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-07-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTable.m
+	(-evaluateContentRestriction:intoQualifier:): temporarily
+	commented out code initializing "operator" as this local var is
+	never used.
+
 	* OpenChange/MAPIStoreFolder.m (-initWithSOstringByAddingPercentEscapesUsingEncodinGoObject:inContainer:):
 	make use of -[NSString stringByAddingPercentEscapesUsingEncoding:]
 	to properly escape folder names with non-ascii characters.
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 9c8736461..12c62840d 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -534,7 +534,7 @@ static Class NSDataK, NSStringK;
 				      intoQualifier: (EOQualifier **) qualifier
 {
   NSString *property;
-  SEL operator;
+  // SEL operator;
   id value;
   MAPIRestrictionState rc;
 
@@ -553,23 +553,23 @@ static Class NSDataK, NSStringK;
 		    format: @"unhandled content restriction for class '%@'",
 		     NSStringFromClass ([value class])];
 
-      switch (res->fuzzy & 0xf)
-	{
-	case 0:
-	  operator = EOQualifierOperatorEqual;
-	  break;
-	case 1:
-	  operator = EOQualifierOperatorLike;
-	  value = [NSString stringWithFormat: @"%%%@%%", value];
-	  break;
-	case 2:
-	  operator = EOQualifierOperatorEqual;
-	  value = [NSString stringWithFormat: @"%@%%", value];
-	  break;
-	default: [NSException raise: @"MAPIStoreInvalidOperatorException"
-			     format: @"fuzzy operator value '%.4x' is invalid",
-			      res->fuzzy];
-	}
+      // switch (res->fuzzy & 0xf)
+      //   {
+      //   case 0:
+      //     operator = EOQualifierOperatorEqual;
+      //     break;
+      //   case 1:
+      //     operator = EOQualifierOperatorLike;
+      //     value = [NSString stringWithFormat: @"%%%@%%", value];
+      //     break;
+      //   case 2:
+      //     operator = EOQualifierOperatorEqual;
+      //     value = [NSString stringWithFormat: @"%@%%", value];
+      //     break;
+      //   default: [NSException raise: @"MAPIStoreInvalidOperatorException"
+      //   		     format: @"fuzzy operator value '%.4x' is invalid",
+      //   		      res->fuzzy];
+      //   }
       
       *qualifier = [[EOKeyValueQualifier alloc] initWithKey: property
 					   operatorSelector: EOQualifierOperatorCaseInsensitiveLike