diff --git a/Classes/Dmailer.php b/Classes/Dmailer.php
index 0028e2a88..fa2eabc50 100755
--- a/Classes/Dmailer.php
+++ b/Classes/Dmailer.php
@@ -1152,7 +1152,7 @@ public function substHTTPurlsInPlainText($content)
 
         $jumpUrlCounter = 1;
         return preg_replace_callback(
-            '/http[s]?:\/\/\S+/',
+            '/http[s]?:\/\/[^\s>]+/',
             function ($urlMatches) use (&$jumpUrlCounter) {
                 $url = $urlMatches[0];
                 if (strpos($url, '&no_jumpurl=1') !== false) {