diff --git a/inc/header.inc.php b/inc/header.inc.php
index 739b7348..61848b5a 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -205,6 +205,12 @@ $modsForHesk_settings = mfh_getSettings();
     if (defined('RECAPTCHA')) {
         echo '<script src="https://www.google.com/recaptcha/api.js?hl=' . $hesklang['RECAPTCHA'] . '" async defer></script>';
     }
+
+    if (defined('VALIDATOR')) {
+        ?>
+        <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/validation-scripts.js"></script>
+    <?php
+    }
     ?>
 
 </head>
diff --git a/index.php b/index.php
index 1ee52dd3..f0efabe1 100644
--- a/index.php
+++ b/index.php
@@ -31,6 +31,7 @@
 define('IN_SCRIPT', 1);
 define('HESK_PATH', './');
 define('WYSIWYG', 1);
+define('VALIDATOR', 1);
 
 // Get all the required files and functions
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -186,8 +187,14 @@ function print_add_ticket()
             <div align="left" class="h3"><?php echo $hesklang['add_ticket_general_information']; ?></div>
             <div class="footerWithBorder"></div>
             <div class="blankSpace"></div>
+            <?php
+            $onsubmit = '';
+            if ($modsForHesk_settings['rich_text_for_tickets_for_customers']) {
+                $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
+            }
+            ?>
             <form class="form-horizontal" role="form" method="post" action="submit_ticket.php?submit=1" name="form1"
-                  enctype="multipart/form-data" onsubmit="return validateRichText();">
+                  enctype="multipart/form-data" <?php echo $onsubmit; ?>>
                 <!-- Contact info -->
                 <div class="form-group">
                     <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?>: <font
@@ -1146,31 +1153,7 @@ function print_add_ticket()
 
                         <?php
                     } // End ELSE submit_notice
-
-                    if ($modsForHesk_settings['rich_text_for_tickets_for_customers']):
-                        ?>
-                        <script>
-                            function validateRichText() {
-                                $('#message-help-block').text("");
-                                $('#message-group').removeClass('has-error');
-
-                                var content = tinyMCE.get("message").getContent();
-                                if (content == '') {
-                                    $('#message-help-block').text("<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>").focus();
-                                    $('#message-group').addClass('has-error');
-                                    $('#message-group').get(0).scrollIntoView();
-                                    return false;
-                                }
-                                return true;
-                            }
-                        </script>
-                    <?php else: ?>
-                        <script>
-                            function validateRichText() {
-                                return true;
-                            }
-                        </script>
-                    <?php endif; ?>
+                    ?>
 
                     <!-- Do not delete or modify the code below, it is used to detect simple SPAM bots -->
                     <input type="hidden" name="hx" value="3"/><input type="hidden" name="hy" value=""/>
diff --git a/js/validation-scripts.js b/js/validation-scripts.js
new file mode 100644
index 00000000..6fa0822b
--- /dev/null
+++ b/js/validation-scripts.js
@@ -0,0 +1,13 @@
+function validateRichText(helpBlock, messageGroup, messageContainer, errorText) {
+    $('#' + helpBlock).text("");
+    $('#' + messageGroup).removeClass('has-error');
+
+    var content = tinyMCE.get(messageContainer).getContent();
+    if (content == '') {
+        $('#' + helpBlock).text(errorText).focus();
+        $('#' + messageGroup).addClass('has-error');
+        $('#' + messageGroup).get(0).scrollIntoView();
+        return false;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/ticket.php b/ticket.php
index 4f3a9cb3..4193e853 100644
--- a/ticket.php
+++ b/ticket.php
@@ -32,6 +32,7 @@ define('IN_SCRIPT', 1);
 define('HESK_PATH', './');
 define('HESK_NO_ROBOTS', 1);
 define('WYSIWYG', 1);
+define('VALIDATOR', 1);
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -581,16 +582,24 @@ function hesk_printCustomerReplyForm($reopen = 0)
     <div class="footerWithBorder"></div>
     <div class="blankSpace"></div>
 
-    <form role="form" class="form-horizontal" method="post" action="reply_ticket.php" enctype="multipart/form-data">
-        <div class="form-group">
+    <?php
+    $onsubmit = '';
+    if ($modsForHesk_settings['rich_text_for_tickets_for_customers']) {
+        $onsubmit = 'onclick="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
+    }
+    ?>
+    <form data-toggle="validator" role="form" class="form-horizontal" method="post" action="reply_ticket.php"
+          enctype="multipart/form-data" <?php echo $onsubmit; ?>>
+        <div class="form-group" id="message-group">
             <label for="message" class="col-sm-3 control-label"><?php echo $hesklang['message']; ?>: <span
                     class="important">*</span></label>
 
             <div class="col-sm-9">
                 <textarea name="message" class="form-control htmlEditor" rows="12"
-                          cols="60"><?php if (isset($_SESSION['ticket_message'])) {
+                          cols="60" data-error="<?php echo htmlspecialchars($hesklang['enter_message']); ?>" required><?php if (isset($_SESSION['ticket_message'])) {
                         echo stripslashes(hesk_input($_SESSION['ticket_message']));
                     } ?></textarea>
+                <div class="help-block with-errors" id="message-help-block"></div>
                 <?php if ($modsForHesk_settings['rich_text_for_tickets_for_customers']): ?>
                     <script type="text/javascript">
                         /* <![CDATA[ */
@@ -646,7 +655,7 @@ function hesk_printCustomerReplyForm($reopen = 0)
         ?>
         <div class="form-group">
             <div class="col-sm-9 col-sm-offset-3">
-                <input type="submit" value="<?php echo $hesklang['submit_reply']; ?>" class="btn btn-default"/>
+                <input type="submit" value="<?php echo $hesklang['submit_reply']; ?>" class="btn btn-default">
             </div>
         </div>
     </form>