diff --git a/ChangeLog b/ChangeLog
index a2d9c0d68..fd48855a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
 
 2010-09-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactFoldersView.m (-allContactSearchAction):
+	inverted the contact/list condition test as the vlist test is
+	faster to execute.
+
 	* UI/MailerUI/UIxMailView.m (_receiptMessageHeaderTo:): properly
 	escape the message subject in QP when needed.
 
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index 040b6b207..ff207f1b8 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -207,11 +207,7 @@
               mail = [contact objectForKey: @"c_mail"];
               //NSLog(@"   found %@ (%@) ? %@", [contact objectForKey: @"c_name"], mail,
               //      [contact description]);
-              if ([mail isNotNull]
-                  && [uniqueContacts objectForKey: mail] == nil
-                  && !(excludeGroups && [contact objectForKey: @"isGroup"]))
-                [uniqueContacts setObject: contact forKey: mail];
-              else if (!excludeLists && [[contact objectForKey: @"c_component"]
+              if (!excludeLists && [[contact objectForKey: @"c_component"]
                                           isEqualToString: @"vlist"])
                 {
                   [contact setObject: [folder nameInContainer] 
@@ -219,6 +215,10 @@
                   [uniqueContacts setObject: contact 
                                      forKey: [contact objectForKey: @"c_name"]]; 
                 }
+              else if ([mail length]
+                       && [uniqueContacts objectForKey: mail] == nil
+                       && !(excludeGroups && [contact objectForKey: @"isGroup"]))
+                [uniqueContacts setObject: contact forKey: mail];
             }
         }
       if ([uniqueContacts count] > 0)