Only return the bare email address if there is no full name.

diff --git a/framework/Prefs/lib/Horde/Prefs/Identity.php b/framework/Prefs/lib/Horde/Prefs/Identity.php
index c8b5bdf..6c5ca3c 100644 (file)
--- a/framework/Prefs/lib/Horde/Prefs/Identity.php
+++ b/framework/Prefs/lib/Horde/Prefs/Identity.php
@@ -388,9 +388,10 @@ class Horde_Prefs_Identity
         $addr = $this->getValue($this->_prefnames['from_addr']);
         if (empty($addr)) {
             $addr = $this->_user;
-            if (empty($from_addr)) {
-                return $addr;
-            }
+        }
+
+        if (empty($from_addr)) {
+            return $addr;
         }
 
         return $from_addr . '<' . $addr . '>';