- $name = str_replace($address, '', $item);
- $name = trim($name);
- if ($name && ($name[0] != '"' || $name[strlen($name)-1] != '"')
- && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) {
- $name = '"'.addcslashes($name, '"').'"';
- }
- $address = rcube_idn_to_ascii($address);
- if (!preg_match('/^<'.$email_regexp.'>$/', $address))
- $address = '<'.$address.'>';
-
- $result[] = $name.' '.$address;
+ $name = trim(str_replace($address, '', $item), '" ');
+ $address = rcube_idn_to_ascii(trim($address, '<>'));
+ $result[] = format_email_recipient($address, $name);