Backported commit 10467e8a5957 and other improvements

1 files changed, 1 insertions, 1 deletions

diff --git a/program/include/html.php b/program/include/html.php
index c15ef45cb..dc93b3317 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -301,7 +301,7 @@ class html
                 $attrib_arr[] = $key . '="' . Q($value, 'strict', false) . '"';
             }
             else {
-                $attrib_arr[] = $key . '="' . Q($value) . '"';
+                $attrib_arr[] = $key . '="' . htmlspecialchars($value, ENT_COMPAT, RCMAIL_CHARSET) . '"';
             }
         }
         return count($attrib_arr) ? ' '.implode(' ', $attrib_arr) : '';