diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 8ff7d655..caa31ae0 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -133,7 +133,9 @@ $num = hesk_dbNumRows($result);
                             $options .= '>'.$mysaved['title'].'</option>';
 
                             if ($modsForHesk_settings['rich_text_for_tickets']) {
-                                $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", html_entity_decode($mysaved['message'] ))."';\n";
+                                $theMessage = html_entity_decode($mysaved['message']);
+                                $theMessage = addslashes($theMessage);
+                                $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", $theMessage)."';\n";
                             } else {
                                 $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
                             }