From df2188d778cb9bd89ca118c03850ef7f9fc86ce7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 4 Oct 2010 06:52:12 +0000
Subject: - Fix mailto optional params in plain text messages aren't handled
 (#1487026)

---
 CHANGELOG                                 | 1 +
 program/include/rcube_string_replacer.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5d54de0f9..4ad602439 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ CHANGELOG Roundcube Webmail
 - Fix: contact group input is empty when using rename action more than once on the same group record
 - Fix "Server Error! (Not Found)" when using utils/save-pref action (#1487023)
 - Fix handling of Thunderbird's vCards (#1487024)
+- Fix mailto optional params in plain text messages aren't handled (#1487026)
 
 RELEASE 0.4.1
 -------------
diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php
index 962ea04fe..1eed1bf3c 100644
--- a/program/include/rcube_string_replacer.php
+++ b/program/include/rcube_string_replacer.php
@@ -42,6 +42,7 @@ class rcube_string_replacer
     $this->mailto_pattern = "/("
         ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
         ."@([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z]{2,5}"               // domain-part
+        ."(\?\S+)?"                                                     // e.g. ?subject=test...
         .")/i";
   }
 
-- 
cgit v1.2.3