diff --git a/ChangeLog b/ChangeLog
index 864a5d08e..5a83ab2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreMailMessageTable.m
+	(-evaluateExistRestriction:intoQualifier:): declare that
+	PR_CLIENT_SUBMIT_TIME always exists on messages, which prevents
+	Outlook from looping on a search request that always returns the
+	same unexpected result...
+
 2011-04-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreCalendarMessage.m (-getProperty:withTag):
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index 81470de9d..7d2e879cf 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -194,6 +194,9 @@ static Class NSDataK, NSStringK;
     case PR_MESSAGE_DELIVERY_TIME:
       rc = MAPIRestrictionStateAlwaysTrue;
       break;
+    case PR_CLIENT_SUBMIT_TIME:
+      rc = MAPIRestrictionStateAlwaysTrue;
+      break;
     case PR_PROCESSED:
       rc = MAPIRestrictionStateAlwaysFalse;
       break;