From 83f2f6bb6584fe15bd6834f161ccf2dc8c97ee77 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 19 Oct 2012 15:30:28 +0200
Subject: [PATCH] Display email address if contact has more than one (in
 compose address book widget)

---
 program/steps/mail/list_contacts.inc | 7 +++++--
 skins/larry/mail.css                 | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
index 7c99a1309..9347190da 100644
--- a/program/steps/mail/list_contacts.inc
+++ b/program/steps/mail/list_contacts.inc
@@ -69,11 +69,14 @@ if ($CONTACTS && $CONTACTS->ready) {
             $name = rcube_addressbook::compose_list_name($row);
 
             // add record for every email address of the contact
-            foreach ($CONTACTS->get_col_values('email', $row, true) as $i => $email) {
+            $emails = $CONTACTS->get_col_values('email', $row, true);
+            foreach ($emails as $i => $email) {
                 $row_id = $row['ID'].$i;
                 $jsresult[$row_id] = format_email_recipient($email, $name);
                 $OUTPUT->command('add_contact_row', $row_id, array(
-                    'contact' => html::span(array('title' => $email), Q($name ? $name : $email))), 'person');
+                    'contact' => html::span(array('title' => $email), Q($name ? $name : $email) .
+                        ($name && count($emails) > 1 ? '&nbsp;' . html::span('email', Q($email)) : '')
+                    )), 'person');
             }
         }
     }
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index a2756638d..95d76c596 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -1104,6 +1104,13 @@ div.message-part blockquote blockquote blockquote {
 	display: block;
 }
 
+#contacts-table td span.email {
+	display: inline;
+	color: #69939e;
+	font-style: italic;
+	margin-left: 0.5em;
+}
+
 #compose-contacts li a, #contacts-table td {
 	background: url(images/listicons.png) -100px 0 no-repeat;
 	overflow: hidden;