From 46f7b7096450939fe03c95aa81ce06ae4bfca89d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Mar 2016 06:51:43 -0400
Subject: [PATCH] Enable reply/reply-all/forward buttons also in preview frame of message/rfc822

---
 program/include/rcmail_string_replacer.php |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/program/include/rcmail_string_replacer.php b/program/include/rcmail_string_replacer.php
index d3fdc3e..2037db6 100644
--- a/program/include/rcmail_string_replacer.php
+++ b/program/include/rcmail_string_replacer.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  +-----------------------------------------------------------------------+
  | program/include/rcmail_string_replacer.php                            |
  |                                                                       |
@@ -41,6 +41,16 @@
     {
         $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,

--
Gitblit v1.9.1