diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 532c2746..270fcbc0 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1983,7 +1983,8 @@ function hesk_printCanned()
                         tinymce.get("message").setContent('');
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
                     } else {
-                        document.getElementById('message').value = myMsg;
+                        myMsg = $('<textarea />').html(myMsg).text();
+                        $('#message').val(myMsg).trigger('input');
                     }
                 }
                 else {
@@ -1992,8 +1993,9 @@ function hesk_printCanned()
                         tinymce.get("message").setContent('');
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
                     } else {
-                        var oldMsg = document.getElementById('message').value;
-                        document.getElementById('message').value = oldMsg + myMsg;
+                        var oldMsg = $('#message').text();
+                        var newMsg = $('<textarea />').html(oldMsg + myMsg).text();
+                        $('#message').val(newMsg).trigger('input');
                     }
                 }
             }
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index c27d32ba..16f10252 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -248,9 +248,9 @@ $num = hesk_dbNumRows($result);
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
                     }
                     else {
-                        document.getElementById('message').value = '';
+                        $('#message').val('');
                     }
-                    document.getElementById('subject').value = '';
+                    $('#subject').val('');
                     return true;
                 }
                 if (document.getElementById) {
@@ -258,9 +258,11 @@ $num = hesk_dbNumRows($result);
                         tinymce.get("message").setContent('');
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
                     } else {
-                        document.getElementById('message').value = myMsg;
+                        myMsg = $('<textarea />').html(myMsg).text();
+                        $('#message').val(myMsg).trigger('input');
                     }
-                    document.getElementById('subject').value = mySubject;
+                    mySubject = $('<textarea />').html(mySubject).text();
+                    $('#subject').val(mySubject).trigger('input');
                 }
                 else {
                     document.form1.message.value = myMsg;
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 775d176b..fe0b6603 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -326,9 +326,9 @@ $num = hesk_dbNumRows($result);
                 tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
             }
             else {
-                document.getElementById('message').value = '';
+                $('#message').val('');
             }
-            document.getElementById('subject').value = '';
+            $('#subject').val('');
             return true;
         }
         if (document.getElementById) {
@@ -336,9 +336,11 @@ $num = hesk_dbNumRows($result);
                 tinymce.get("message").setContent('');
                 tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
             } else {
-                document.getElementById('message').value = myMsg;
+                myMsg = $('<textarea />').html(myMsg).text();
+                $('#message').val(myMsg).trigger('input');
             }
-            document.getElementById('subject').value = mySubject;
+            mySubject = $('<textarea />').html(mySubject).text();
+            $('#subject').val(mySubject).trigger('input');
         }
         else {
             document.form1.message.value = myMsg;
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 4d349edd..519e257d 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -635,9 +635,9 @@ if (hesk_dbNumRows($res)) {
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
                     }
                     else {
-                        document.getElementById('message').value = '';
+                        $('#message').val('');
                     }
-                    document.getElementById('subject').value = '';
+                    $('#subject').val('');
                 }
                 return true;
             }
@@ -647,9 +647,11 @@ if (hesk_dbNumRows($res)) {
                         tinymce.get("message").setContent('');
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
                     } else {
-                        document.getElementById('message').value = myMsg;
+                        myMsg = $('<textarea />').html(myMsg).text();
+                        $('#message').val(myMsg).trigger('input');
                     }
-                    document.getElementById('subject').value = mySubject;
+                    mySubject = $('<textarea />').html(mySubject).text();
+                    $('#subject').val(mySubject).trigger('input');
                 }
                 else {
                     if (useHtmlEditor) {
@@ -658,10 +660,12 @@ if (hesk_dbNumRows($res)) {
                         tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
                     } else {
                         var oldMsg = document.getElementById('message').value;
-                        document.getElementById('message').value = oldMsg + myMsg;
+                        var theMsg = $('<textarea />').html(oldMsg + myMsg).text();
+                        $('#message').val(theMsg).trigger('input');
                     }
                     if (document.getElementById('subject').value == '') {
-                        document.getElementById('subject').value = mySubject;
+                        mySubject = $('<textarea />').html(mySubject).text();
+                        $('#subject').val(mySubject).trigger('input');
                     }
                 }
             }
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 16578588..a3d076c2 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -43,6 +43,7 @@ $modsForHesk_settings = array();
 if (is_dir(HESK_PATH . 'install')) {
     $modsForHesk_settings['rtl'] = 0;
     $modsForHesk_settings['use_bootstrap_theme'] = 1;
+    $modsForHesk_settings['show_icons'] = 1;
     $modsForHesk_settings['navbarBackgroundColor'] = '#414a5c';
     $modsForHesk_settings['navbarBrandColor'] = '#d4dee7';
     $modsForHesk_settings['navbarBrandHoverColor'] = '#ffffff';