Make sure an email address is valid when replacing it with mailto: link

program/include/rcmail_string_replacer.php

@@ -41,6 +41,16 @@ class rcmail_string_replacer extends rcube_string_replacer
     {
         $href   = $matches[1];
         $suffix = $this->parse_url_brackets($href);
+        $email  = $href;
+
+        if (strpos($email, '?')) {
+            list($email,) = explode('?', $email);
+        }
+
+        // skip invalid emails
+        if (!rcube_utils::check_email($email, false)) {
+            return $matches[1];
+        }
 
         $i = $this->add(html::a(array(
             'href'    => 'mailto:' . $href,

program/lib/Roundcube/rcube_string_replacer.php

@@ -30,10 +30,10 @@ class rcube_string_replacer
     public $linkref_index;
     public $linkref_pattern;
 
-    private $values = array();
-    private $options = array();
-    private $linkrefs = array();
-    private $urls = array();
+    protected $values   = array();
+    protected $options  = array();
+    protected $linkrefs = array();
+    protected $urls     = array();
 
 
     function __construct($options = array())
@@ -44,16 +44,15 @@ class rcube_string_replacer
         $url1       = '.:;,';
         $url2       = 'a-zA-Z0-9%=#$@+?|!&\\/_~\\[\\]\\(\\){}\*\x80-\xFE-';
 
-        $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]*[$url2]+)*)/";
-        $this->mailto_pattern = "/("
+        $this->options         = $options;
+        $this->linkref_index   = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/';
+        $this->linkref_pattern = '/\[([^\]#]+)\]/';
+        $this->link_pattern    = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]*[$url2]+)*)/";
+        $this->mailto_pattern  = "/("
             ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
             ."@$utf_domain"                                                 // domain-part
             ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
             .")/";
-        $this->linkref_index = '/\[([^\]#]+)\](:?\s*##str_replacement_(\d+)##)/';
-        $this->linkref_pattern = '/\[([^\]#]+)\]/';
-
-        $this->options = $options;
     }
 
     /**