From 55d9d5e0b7c75d7a4a2f59a76a8fdc793bf78b43 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 23 Feb 2014 14:20:43 +0100
Subject: Improvement in handling invalid email address strings

---
 program/lib/Roundcube/rcube_mime.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'program/lib/Roundcube/rcube_mime.php')

diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 55b70f67c..091b2fae8 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/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) {
-- 
cgit v1.2.3