diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9f5b2c876e..de8c22b9e0 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1628,7 +1628,7 @@ unset($query['actions']);
$sel_options[$field][] = array(
// taglist requires these
'id' => $field_data['EMAIL'],
- 'label' => $field_data['PERSONAL_NAME'],
+ 'label' => ($field_data['PERSONAL_NAME'] && $field_data['PERSONAL_NAME']!='NIL') ? $field_data['PERSONAL_NAME']:$field_data['EMAIL'],
// Optional
'title' => $field_data['RFC822_EMAIL']
)
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index ea47a39bfd..06a25ada0f 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -4,21 +4,25 @@