- return preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!u', '\1"\2" \3', $email);
+ $email = preg_replace('!(^|, *)([^<"]+?) *(<[^>]*>)!ue',
+ '\1 "\2" \3', $email);
+ return preg_replace('/"([^<]+)"/e',
+ '"\\"" . PlMailer::encodeStringQP("\1") . "\\""',
+ $email);