diff --git a/ChangeLog b/ChangeLog
index bad50c6cf..93ede8750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-02  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView _responseForResults:]):
+	has to return only one element.
+
 2007-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index a2af399e1..cbc7b4451 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -147,7 +147,7 @@
     {
       contacts = [results objectEnumerator];
       contact = [contacts nextObject];
-      while (contact)
+      if (contact)
 	{
 	  responseString = [NSString stringWithFormat: @"%@:%@:%@",
 				     [contact objectForKey: @"c_uid"],
@@ -157,7 +157,7 @@
 // 	  [response setHeader: @"text/plain; charset=iso-8859-1"
 // 		    forKey: @"Content-Type"];
 	  [response appendContentString: responseString];
-	  contact = [contacts nextObject];
+//	  contact = [contacts nextObject];
 	}
     }
   else