diff --git a/ChangeLog b/ChangeLog
index f35aa52e6..698ce982c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxListEditor.m (-references): avoid printing the
+	email address between brackets if not defined.
+
+	* UI/Contacts/UIxListView.m (-itemHasEmail): new method that
+	returns YES if the current list item has an email address.
+
 2010-01-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/SOGoToolRestore.m (+initialize): we need to invoke
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index 5e116ff94..2007b6515 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -79,8 +79,12 @@
     {
       ref = [[list cardReferences] objectAtIndex: i];
       row = [NSMutableDictionary dictionary];
-      [row setObject: [NSString stringWithFormat: @"%@ <%@>", [ref fn], [ref email]]
-              forKey: @"name"];
+      if ([[ref email] length] > 0)
+	[row setObject: [NSString stringWithFormat: @"%@ <%@>", [ref fn], [ref email]]
+		forKey: @"name"];
+      else
+	[row setObject: [ref fn]
+		forKey: @"name"];
       [row setObject: [ref reference] forKey: @"id"];
       [rc addObject: row];
     }
diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m
index 230db6bd3..36cacca6a 100644
--- a/UI/Contacts/UIxListView.m
+++ b/UI/Contacts/UIxListView.m
@@ -61,6 +61,11 @@
   return [list cardReferences];
 }
 
+- (BOOL) itemHasEmail
+{
+  return [[item email] length] > 0;
+}
+
 - (NSString *) itemHref
 {
   return [NSString stringWithFormat: @"mailto:%@",
diff --git a/UI/Templates/ContactsUI/UIxListView.wox b/UI/Templates/ContactsUI/UIxListView.wox
index f47dbcc97..c0a7a8552 100644
--- a/UI/Templates/ContactsUI/UIxListView.wox
+++ b/UI/Templates/ContactsUI/UIxListView.wox
@@ -20,8 +20,8 @@
     <ul class="listComponents">
       <var:foreach list="components" item="item">
         <li><var:string var:value="itemName"/> 
-          <a var:href="itemHref" var:onclick="itemOnclick">
-            &lt;<var:string var:value="itemEmail"/>&gt;</a>
+          <var:if condition="itemHasEmail"><a var:href="itemHref" var:onclick="itemOnclick">
+            &lt;<var:string var:value="itemEmail"/>&gt;</a></var:if>
         </li>
       </var:foreach>
     </ul>