diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 899d37e6..e377927c 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1847,22 +1847,15 @@ function hesk_printReplyForm()
     <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
     <script type="text/javascript">
         /* <![CDATA[ */
-        tinyMCE.init({
-            mode: "textareas",
-            editor_selector: "htmlEditor",
-            elements: "content",
-            theme: "advanced",
-            convert_urls: false,
-            plugins: "autolink",
-
-            theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-            theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-            theme_advanced_buttons3: "",
-
-            theme_advanced_toolbar_location: "top",
-            theme_advanced_toolbar_align: "left",
-            theme_advanced_statusbar_location: "bottom",
-            theme_advanced_resizing: true
+    	$(document).ready(function() {
+        	$('.htmlEditor').summernote({
+			height: 200,
+			toolbar: [
+				['style', ['bold', 'italic', 'underline', 'clear']],
+				['font', ['strikethrough', 'superscript', 'subscript']],
+				['para', ['ul', 'ol']]
+			]
+		});
         });
         /* ]]> */
     </script>
@@ -2138,8 +2131,8 @@ function hesk_printCanned()
             if (document.getElementById) {
                 if (document.getElementById('moderep').checked) {
                     if (isHtml) {
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                        $("#message").summernote('reset');
+                        $("#message").summernote('editor.insertText', myMsg));
                     } else {
                         myMsg = $('<textarea />').html(myMsg).text();
                         $('#message').val(myMsg).trigger('input');
@@ -2147,9 +2140,9 @@ function hesk_printCanned()
                 }
                 else {
                     if (isHtml) {
-                        var oldMsg = tinymce.get("message").getContent();
-                        tinymce.get("message").setContent('');
-                        tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
+                        var oldMsg = $("#message").val();
+                        $("#message").summernote('reset');
+                        $("#message").summernote('editor.insertText', oldMsg + myMsg));
                     } else {
                         var oldMsg = $('#message').val();
                         var newMsg = $('<textarea />').html(oldMsg + '\n' + myMsg).text();
diff --git a/admin/edit_post.php b/admin/edit_post.php
index ee3a9e19..65211dd3 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -642,27 +642,20 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             buildValidatorForTicketSubmission('form1', "<?php echo addslashes($hesklang['select_at_least_one_value']); ?>");
         </script>
     <?php if ($ticket['html']): ?>
-        <script type="text/javascript">
-            /* <![CDATA[ */
-            tinyMCE.init({
-                mode: "textareas",
-                editor_selector: "htmlEditor",
-                elements: "content",
-                theme: "advanced",
-                convert_urls: false,
-                plugins: "autolink",
-
-                theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                theme_advanced_buttons3: "",
-
-                theme_advanced_toolbar_location: "top",
-                theme_advanced_toolbar_align: "left",
-                theme_advanced_statusbar_location: "bottom",
-                theme_advanced_resizing: true
-            });
-            /* ]]> */
-        </script>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+    	$(document).ready(function() {
+        	$('.htmlEditor').summernote({
+			height: 200,
+			toolbar: [
+				['style', ['bold', 'italic', 'underline', 'clear']],
+				['font', ['strikethrough', 'superscript', 'subscript']],
+				['para', ['ul', 'ol']]
+			]
+		});
+        });
+        /* ]]> */
+    </script>
     <?php endif; ?>
     </section>
 </div>
@@ -679,4 +672,4 @@ function hesk_countAttachments($attachments_string) {
 
     return count($att);
 
-} // END hesk_countAttachments()
\ No newline at end of file
+} // END hesk_countAttachments()
diff --git a/admin/manage_canned.php b/admin/manage_canned.php
index 30ee8e07..b9acc947 100644
--- a/admin/manage_canned.php
+++ b/admin/manage_canned.php
@@ -74,9 +74,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         var msg = '';
         <?php
         if ($modsForHesk_settings['rich_text_for_tickets']) { ?>
-        msg = tinymce.get("message").getContent();
-        tinymce.get("message").setContent('');
-        tinymce.get("message").execCommand('mceInsertRawHTML', false, msg + text_to_insert);
+        msg = $('#message').val();
+        $("#message").summernote('reset');
+        $("#message").summernote('editor.insertText', msg + text_to_insert));
         <?php } else { ?>
         msg = document.getElementById('message').value;
         document.getElementById('message').value = msg + text_to_insert;
@@ -202,22 +202,15 @@ $num = hesk_dbNumRows($result);
     <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
         <script type="text/javascript">
             /* <![CDATA[ */
-            tinyMCE.init({
-                mode: "textareas",
-                editor_selector: "htmlEditor",
-                elements: "content",
-                theme: "advanced",
-                convert_urls: false,
-                plugins: "autolink",
-
-                theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                theme_advanced_buttons3: "",
-
-                theme_advanced_toolbar_location: "top",
-                theme_advanced_toolbar_align: "left",
-                theme_advanced_statusbar_location: "bottom",
-                theme_advanced_resizing: true
+        	$(document).ready(function() {
+            	$('.htmlEditor').summernote({
+			    height: 200,
+			    toolbar: [
+				    ['style', ['bold', 'italic', 'underline', 'clear']],
+				    ['font', ['strikethrough', 'superscript', 'subscript']],
+				    ['para', ['ul', 'ol']]
+			    ]
+		    });
             });
             /* ]]> */
         </script>
@@ -255,8 +248,7 @@ $num = hesk_dbNumRows($result);
 
                     if (myMsg == '') {
                         if (useHtmlEditor) {
-                            tinymce.get("message").setContent('');
-                            tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                            $("#message").summernote("reset");
                         }
                         else {
                             $('#message').val('');
@@ -266,8 +258,8 @@ $num = hesk_dbNumRows($result);
                     }
                     if (document.getElementById) {
                         if (useHtmlEditor) {
-                            tinymce.get("message").setContent('');
-                            tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                            $("#message").summernote('reset');
+                            $("#message").summernote('editor.insertText', myMsg));
                         } else {
                             myMsg = $('<textarea />').html(myMsg).text();
                             $('#message').val(myMsg).trigger('input');
diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
index 4e690d14..52583be1 100644
--- a/admin/manage_email_templates.php
+++ b/admin/manage_email_templates.php
@@ -39,26 +39,22 @@ if (isset($_POST['action'])) {
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
 if ($modsForHesk_settings['html_emails']) {
-    echo '<script type="text/javascript">
-        tinyMCE.init({
-                        mode : "textareas",
-                        editor_selector : "htmlEditor",
-                        elements : "content",
-                        theme : "advanced",
-                        convert_urls : false,
-                        gecko_spellcheck: true,
-                        plugins: "autolink",
-
-                        theme_advanced_buttons1 : "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                        theme_advanced_buttons2 : "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                        theme_advanced_buttons3 : "",
-
-                        theme_advanced_toolbar_location : "top",
-                        theme_advanced_toolbar_align : "left",
-                        theme_advanced_statusbar_location : "bottom",
-                        theme_advanced_resizing : true
-                    });
-                </script>';
+?>
+    <script type="text/javascript">
+        /* <![CDATA[ */
+    	$(document).ready(function() {
+        	$('.htmlEditor').summernote({
+			height: 200,
+			toolbar: [
+				['style', ['bold', 'italic', 'underline', 'clear']],
+				['font', ['strikethrough', 'superscript', 'subscript']],
+				['para', ['ul', 'ol']]
+			]
+		});
+        });
+        /* ]]> */
+    </script>
+<?php
 }
 
 /* Print main manage users page */
@@ -338,4 +334,4 @@ function getSpecialTagMap()
     }
 
     return $map;
-}
\ No newline at end of file
+}
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 0652220f..5710d455 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -334,25 +334,20 @@ if (!isset($_SESSION['hide']['new_article']))
     if ($hesk_settings['kb_wysiwyg'])
     {
         ?>
-        <script type="text/javascript">
-        tinyMCE.init({
-            mode : "exact",
-            elements : "content",
-            theme : "advanced",
-            convert_urls : false,
-            gecko_spellcheck: true,
-            plugins: "autolink",
-
-            theme_advanced_buttons1 : "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-            theme_advanced_buttons2 : "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-            theme_advanced_buttons3 : "",
-
-            theme_advanced_toolbar_location : "top",
-            theme_advanced_toolbar_align : "left",
-            theme_advanced_statusbar_location : "bottom",
-            theme_advanced_resizing : true
+    <script type="text/javascript">
+        /* <![CDATA[ */
+    	$(document).ready(function() {
+        	$('#content').summernote({
+			height: 200,
+			toolbar: [
+				['style', ['bold', 'italic', 'underline', 'clear']],
+				['font', ['strikethrough', 'superscript', 'subscript']],
+				['para', ['ul', 'ol']]
+			]
+		});
         });
-        </script>
+        /* ]]> */
+    </script>
         <?php
     }
     ?>
diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php
index 9208a085..4440e279 100644
--- a/admin/manage_ticket_templates.php
+++ b/admin/manage_ticket_templates.php
@@ -286,22 +286,15 @@ $num = hesk_dbNumRows($result);
 <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
     <script type="text/javascript">
         /* <![CDATA[ */
-        tinyMCE.init({
-            mode: "textareas",
-            editor_selector: "htmlEditor",
-            elements: "content",
-            theme: "advanced",
-            convert_urls: false,
-            plugins: "autolink",
-
-            theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-            theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-            theme_advanced_buttons3: "",
-
-            theme_advanced_toolbar_location: "top",
-            theme_advanced_toolbar_align: "left",
-            theme_advanced_statusbar_location: "bottom",
-            theme_advanced_resizing: true
+    	$(document).ready(function() {
+        	$('.htmlEditor').summernote({
+			height: 200,
+			toolbar: [
+				['style', ['bold', 'italic', 'underline', 'clear']],
+				['font', ['strikethrough', 'superscript', 'subscript']],
+				['para', ['ul', 'ol']]
+			]
+		});
         });
         /* ]]> */
     </script>
@@ -326,8 +319,7 @@ $num = hesk_dbNumRows($result);
 
         if (myMsg == '') {
             if (useHtmlEditor) {
-                tinymce.get("message").setContent('');
-                tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                $("#message").summernote('reset');
             }
             else {
                 $('#message').val('');
@@ -337,8 +329,8 @@ $num = hesk_dbNumRows($result);
         }
         if (document.getElementById) {
             if (useHtmlEditor) {
-                tinymce.get("message").setContent('');
-                tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                $("#message").summernote('reset');
+                $("#message").summernote('editor.insertText', myMsg));
             } else {
                 myMsg = $('<textarea />').html(myMsg).text();
                 $('#message').val(myMsg).trigger('input');
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 9233b35b..22ff7534 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -193,22 +193,15 @@ $show_quick_help = $show['show'];
             <?php if ($modsForHesk_settings['rich_text_for_tickets']): ?>
                 <script type="text/javascript">
                     /* <![CDATA[ */
-                    tinyMCE.init({
-                        mode: "textareas",
-                        editor_selector: "htmlEditor",
-                        elements: "content",
-                        theme: "advanced",
-                        convert_urls: false,
-                        plugins: "autolink",
-
-                        theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                        theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                        theme_advanced_buttons3: "",
-
-                        theme_advanced_toolbar_location: "top",
-                        theme_advanced_toolbar_align: "left",
-                        theme_advanced_statusbar_location: "bottom",
-                        theme_advanced_resizing: true
+                	$(document).ready(function() {
+                    	$('.htmlEditor').summernote({
+			            height: 200,
+			            toolbar: [
+				            ['style', ['bold', 'italic', 'underline', 'clear']],
+				            ['font', ['strikethrough', 'superscript', 'subscript']],
+				            ['para', ['ul', 'ol']]
+			            ]
+		            });
                     });
                     /* ]]> */
                 </script>
@@ -539,8 +532,7 @@ $show_quick_help = $show['show'];
                             if (myMsg == '') {
                                 if (document.form1.mode[1].checked) {
                                     if (useHtmlEditor) {
-                                        tinymce.get("message").setContent('');
-                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, '');
+                                        $("#message").summernote('reset');
                                     }
                                     else {
                                         $('#message').val('');
@@ -552,8 +544,8 @@ $show_quick_help = $show['show'];
                             if (document.getElementById) {
                                 if (document.getElementById('moderep').checked) {
                                     if (useHtmlEditor) {
-                                        tinymce.get("message").setContent('');
-                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, myMsg);
+                                        $("#message").summernote('reset');
+                                        $("#message").summernote('editor.insertText', myMsg));
                                     } else {
                                         myMsg = $('<textarea />').html(myMsg).text();
                                         $('#message').val(myMsg).trigger('input');
@@ -563,9 +555,9 @@ $show_quick_help = $show['show'];
                                 }
                                 else {
                                     if (useHtmlEditor) {
-                                        var oldMsg = tinymce.get("message").getContent();
-                                        tinymce.get("message").setContent('');
-                                        tinymce.get("message").execCommand('mceInsertRawHTML', false, oldMsg + myMsg);
+                                        var oldMsg = $("#message").val();
+                                        $("#message").summernote('reset');
+                                        $("#message").summernote('editor.insertText', oldMsg + myMsg));
                                     } else {
                                         var oldMsg = document.getElementById('message').value;
                                         var theMsg = $('<textarea />').html(oldMsg + myMsg).text();
@@ -998,8 +990,8 @@ if ($modsForHesk_settings['rich_text_for_tickets']) {
     $message = hesk_SESSION('as_message', '');
     echo "
     <script>
-        tinymce.get('message').setContent('');
-        tinymce.get('message').execCommand('mceInsertRawHTML', false, '".$message."');
+        $(\"#message\").summernote('reset');
+        $(\"#message\").summernote('editor.insertText', '".$message."'));
     </script>
     ";
 }
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 580d0012..0f941f17 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -126,23 +126,18 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             if ($hesk_settings['kb_wysiwyg']) {
                                 ?>
                                 <script type="text/javascript">
-                                    tinyMCE.init({
-                                        mode: "exact",
-                                        elements: "content",
-                                        theme: "advanced",
-                                        convert_urls: false,
-                                        gecko_spellcheck: true,
-                                        plugins: "autolink",
-
-                                        theme_advanced_buttons1: "cut,copy,paste,|,undo,redo,|,formatselect,fontselect,fontsizeselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull",
-                                        theme_advanced_buttons2: "sub,sup,|,charmap,|,bullist,numlist,|,outdent,indent,insertdate,inserttime,preview,|,forecolor,backcolor,|,hr,removeformat,visualaid,|,link,unlink,anchor,image,cleanup,code",
-                                        theme_advanced_buttons3: "",
-
-                                        theme_advanced_toolbar_location: "top",
-                                        theme_advanced_toolbar_align: "left",
-                                        theme_advanced_statusbar_location: "bottom",
-                                        theme_advanced_resizing: true
+                                    /* <![CDATA[ */
+                                	$(document).ready(function() {
+                                    	$('#content').summernote({
+			                            height: 200,
+			                            toolbar: [
+				                            ['style', ['bold', 'italic', 'underline', 'clear']],
+				                            ['font', ['strikethrough', 'superscript', 'subscript']],
+				                            ['para', ['ul', 'ol']]
+			                            ]
+		                            });
                                     });
+                                    /* ]]> */
                                 </script>
                                 <?php
                             }
diff --git a/css/font/summernote.eot b/css/font/summernote.eot
new file mode 100644
index 00000000..39a5964d
Binary files /dev/null and b/css/font/summernote.eot differ
diff --git a/css/font/summernote.ttf b/css/font/summernote.ttf
new file mode 100644
index 00000000..cdf353b9
Binary files /dev/null and b/css/font/summernote.ttf differ
diff --git a/css/font/summernote.woff b/css/font/summernote.woff
new file mode 100644
index 00000000..668808e9
Binary files /dev/null and b/css/font/summernote.woff differ
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 192e1580..eb30be2e 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -173,10 +173,11 @@ if (is_dir(HESK_PATH . 'install')) {
         <?php
     }
 
-    /* If page requires WYSIWYG editor include TinyMCE Javascript */
+    /* If page requires WYSIWYG editor include Summernote Javascript and CSS */
     if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) {
         ?>
-        <script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.11/tiny_mce.js"></script>
+        <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/summernote.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+        <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/summernote.js"></script>
         <?php
     }
 
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index ce2f0f1d..40f43b56 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -185,10 +185,11 @@ $modsForHesk_settings = mfh_getSettings();
         <?php
     }
 
-    /* If page requires WYSIWYG editor include TinyMCE Javascript */
+    /* If page requires WYSIWYG editor include Summernote Javascript and CSS */
     if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg']) {
         ?>
-        <script type="text/javascript" src="<?php echo HESK_PATH; ?>inc/tiny_mce/3.5.11/tiny_mce.js"></script>
+        <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/summernote.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+        <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/summernote.js"></script>
         <?php
     }
 
diff --git a/index.php b/index.php
index 9f07f95d..4185a27a 100644
--- a/index.php
+++ b/index.php
@@ -693,12 +693,14 @@ function print_add_ticket()
                                     <script type="text/javascript">
                                         /* <![CDATA[ */
                                     	$(document).ready(function() {
-                                        	$('#message').summernote({height: 200,
-  												toolbar: [
-													['style', ['bold', 'italic', 'underline', 'clear']],
-													['font', ['strikethrough', 'superscript', 'subscript']],
-													['para', ['ul', 'ol']]
-											]});
+                                        	$('.htmlEditor').summernote({
+							height: 200,
+  							toolbar: [
+								['style', ['bold', 'italic', 'underline', 'clear']],
+								['font', ['strikethrough', 'superscript', 'subscript']],
+								['para', ['ul', 'ol']]
+							]
+						});
                                         });
                                         /* ]]> */
                                     </script>
@@ -1592,4 +1594,4 @@ function has_public_kb($use_cache=1) {
 
     return $hesk_settings['kb_enable'];
 
-} // End has_public_kb()
\ No newline at end of file
+} // End has_public_kb()