diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 83f170d16..522a1c2bb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1252,6 +1252,7 @@ function rcmail_mod_html_body($body, $container_id)
 // parse link attributes and set correct target
 function rcmail_alter_html_link($in)
   {
+  $in = preg_replace('/=([^("|\s)]+)(\s|$)/', '="\1"', $in);
   $attrib = parse_attrib_string($in);
 
   if (stristr((string)$attrib['href'], 'mailto:'))