diff --git a/ChangeLog b/ChangeLog
index c86e7a592..6cf4ed546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
+	-contactSearchAction]): only return the records which have an
+	email set.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	-trashInContext:_ctx]): no longer expunge the mailbox after
 	marking a message deleted.
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index ed6dcd9d4..1509f4a52 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -139,25 +139,29 @@
 {
   WOResponse *response;
   NSEnumerator *contacts;
-  NSString *responseString;
+  NSString *responseString, *email;
   NSDictionary *contact;
 
   response = [context response];
 
   if ([results count] > 0)
     {
+      [response setStatus: 200];
       contacts = [results objectEnumerator];
       contact = [contacts nextObject];
       if (contact)
 	{
-	  responseString = [NSString stringWithFormat: @"%@:%@:%@",
-				     [contact objectForKey: @"c_uid"],
-				     [contact objectForKey: @"cn"],
-				     [contact objectForKey: @"c_email"]];
-	  [response setStatus: 200];
+	  email = [contact objectForKey: @"c_email"];
+	  if ([email length])
+	    {
+	      responseString = [NSString stringWithFormat: @"%@:%@:%@",
+					 [contact objectForKey: @"c_uid"],
+					 [contact objectForKey: @"cn"],
+					 email];
 // 	  [response setHeader: @"text/plain; charset=iso-8859-1"
 // 		    forKey: @"Content-Type"];
-	  [response appendContentString: responseString];
+	      [response appendContentString: responseString];
+	    }
 //	  contact = [contacts nextObject];
 	}
     }