From 6670da2b6f2ba10bfbdf2c878d8d8709306a9903 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 10 Sep 2007 20:58:57 +0000
Subject: [PATCH] Monotone-Parent: c05483cd1b7ffd63baa781b41930aca2f985b0b5
 Monotone-Revision: 279fca526b178f040bcbf469c4a1b60370cae7d9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-10T20:58:57
Monotone-Branch: ca.inverse.sogo
---
 NEWS                          |  1 +
 UI/MailerUI/UIxMailListView.m | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 325e515bb..f0c0a1b08 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 - fixed a bug where a false positive happening whenever a wrong user login was
   given during an indirect bind;
 - deleting a message no longer expunges its parent folder;
+- fixed search in message content;
 - countless bugfixes;
 
 0.9.0-20070824
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index ae2758675..46f7505e7 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -140,6 +140,7 @@ static int attachmentFlagSize = 8096;
   flags = [[self message] valueForKey:@"flags"];
   return [flags containsObject:@"seen"];
 }
+
 - (NSString *) messageUidString 
 {
   return [[[self message] valueForKey:@"uid"] stringValue];
@@ -465,22 +466,20 @@ static int attachmentFlagSize = 8096;
 			     value];
   else if ([criteria isEqualToString: @"sender"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
-			     @"(from doesContain: %@)",
-			     value];
+			       @"(sender doesContain: %@)", value];
   else if ([criteria isEqualToString: @"subject_or_sender"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
-			       @"(subject doesContain: %@) OR "
-			     @"(from doesContain: %@)",
+			       @"((sender doesContain: %@)"
+			     @" OR (from doesContain: %@))",
 			     value, value];
   else if ([criteria isEqualToString: @"to_or_cc"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
-			       @"(to doesContain: %@) OR "
-			     @"(cc doesContain: %@)",
+			       @"((to doesContain: %@)"
+			     @" OR (cc doesContain: %@))",
 			     value, value];
   else if ([criteria isEqualToString: @"entire_message"])
     qualifier = [EOQualifier qualifierWithQualifierFormat:
-			     @"(message doesContain: %@)",
-			     value];
+			       @"(body doesContain: %@)", value];
   else
     qualifier = nil;
 
@@ -499,8 +498,7 @@ static int attachmentFlagSize = 8096;
   specificMessage = [request formValueForKey: @"pageforuid"];
   searchCriteria = [request formValueForKey: @"search"];
   searchValue = [request formValueForKey: @"value"];
-  if ([searchCriteria length] > 0
-      && [searchValue length] > 0)
+  if ([searchValue length])
     [self _setQualifierForCriteria: searchCriteria
 	  andValue: searchValue];