Fix incorrect handling of some specific links (#1489060)

Conflicts:

	program/lib/Roundcube/rcube_string_replacer.php

1 files changed, 2 insertions, 2 deletions

diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php
index 49a378166..02d5856cc 100644
--- a/program/lib/Roundcube/rcube_string_replacer.php
+++ b/program/lib/Roundcube/rcube_string_replacer.php
@@ -89,7 +89,7 @@ class rcube_string_replacer
 
         if ($url) {
             $suffix = $this->parse_url_brackets($url);
-            $i = $this->add($prefix . html::a(array(
+            $i = $this->add(html::a(array(
                 'href'   => $url_prefix . $url,
                 'target' => '_blank'
             ), rcube::Q($url)) . $suffix);
@@ -97,7 +97,7 @@ class rcube_string_replacer
 
         // Return valid link for recognized schemes, otherwise
         // return the unmodified string for unrecognized schemes.
-        return $i >= 0 ? $this->get_replacement($i) : $matches[0];
+        return $i >= 0 ? $prefix . $this->get_replacement($i) : $matches[0];
     }
 
     /**