Improvement in handling invalid email address strings

program/lib/Roundcube/rcube_mime.php

@@ -366,6 +366,9 @@ class rcube_mime
                 $address = 'MAILER-DAEMON';
                 $name    = substr($val, 0, -strlen($m[1]));
             }
+            else if (preg_match('/('.$email_rx.')/', $val, $m)) {
+                $name = $m[1];
+            }
             else {
                 $name = $val;
             }
@@ -387,6 +390,7 @@ class rcube_mime
 
             if (!$address && $name) {
                 $address = $name;
+                $name    = '';
             }
 
             if ($address) {

tests/Framework/Mime.php

@@ -42,6 +42,8 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
             // invalid (#1489092)
             22 => '"John Doe @ SomeBusinessName" <MAILER-DAEMON>',
             23 => '=?UTF-8?B?IlRlc3QsVGVzdCI=?= <test@domain.tld>',
+            // invalid, but we do our best to parse correctly
+            24 => '"email@test.com" <>',
         );
 
         $results = array(
@@ -70,6 +72,7 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
             // invalid (#1489092)
             22 => array(1, 'John Doe @ SomeBusinessName', 'MAILER-DAEMON'),
             23 => array(1, 'Test,Test', 'test@domain.tld'),
+            24 => array(1, '', 'email@test.com'),
         );
 
         foreach ($headers as $idx => $header) {