diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index ec46f3d7..68a1df02 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -860,6 +860,27 @@ if ( defined('HESK_DEMO') )
 								?>
 							</div>
 						</div>
+                        <div class="form-group">
+                            <label for="rich_text_for_tickets" class="col-sm-6 control-label">
+                                <span class="label label-primary"
+                                      data-toggle="tooltip"
+                                      title="<?php echo $hesklang['added_in_mods_for_hesk']; ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
+                                <?php echo $hesklang['allow_rich_text_for_tickets']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                   title="<?php echo $hesklang['allow_rich_text_for_tickets']; ?>"
+                                   data-content="<?php echo $hesklang['allow_rich_text_for_tickets_help']; ?>"></i>
+                            </label>
+                            <div class="col-sm-6 form-inline">
+                                <?php
+                                $on = $modsForHesk_settings['rich_text_for_tickets'] ? 'checked' : '';
+                                $off = $modsForHesk_settings['rich_text_for_tickets'] ? '' : 'checked';
+                                echo '
+								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="0" '.$off.'> '.$hesklang['off'].'</label></div>&nbsp;&nbsp;&nbsp;
+								<div class="radio"><label><input type="radio" name="rich_text_for_tickets" value="1" '.$on.'> '.$hesklang['on'].'</label></div>
+								';
+                                ?>
+                            </div>
+                        </div>
                     </div>
                     <!-- Second column -->
                     <div class="col-md-6">
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 597fff54..e749b178 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -516,6 +516,7 @@ $set['mfh_attachments'] = empty($_POST['email_attachments']) ? 0 : 1;
 $set['show_number_merged'] = empty($_POST['show_number_merged']) ? 0 : 1;
 $set['request_location'] = empty($_POST['request_location']) ? 0 : 1;
 $set['category_order_column'] = empty($_POST['category_order_column']) ? 'cat_order' : 'name';
+$set['rich_text_for_tickets'] = empty($_POST['rich_text_for_tickets']) ? 0 : 1;
 
 if ($set['customer-email-verification-required'])
 {
@@ -584,7 +585,10 @@ $modsForHesk_settings[\'show_number_merged\'] = '.$set['show_number_merged'].';
 $modsForHesk_settings[\'request_location\'] = '.$set['request_location'].';
 
 //-- Column to sort categories by. Can be either \'name\' or \'cat_order\'
-$modsForHesk_settings[\'category_order_column\'] = \''.$set['category_order_column'].'\';';
+$modsForHesk_settings[\'category_order_column\'] = \''.$set['category_order_column'].'\';
+
+//-- Setting for using rich-text editor for tickets. 0 = Disable, 1 = Enable
+$modsForHesk_settings[\'rich_text_for_tickets\'] = '.$set['rich_text_for_tickets'].';';
 
 // Write the file
 if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )
diff --git a/language/en/text.php b/language/en/text.php
index a934805c..7b6dfe57 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -32,6 +32,8 @@ $hesklang['quick_help_sections_help'] = 'Check the checkbox to show the "Quick H
 $hesklang['create_ticket'] = 'Create ticket';
 $hesklang['view_ticket_form'] = 'View ticket form';
 $hesklang['knowledgebase'] = 'Knowledgebase section';
+$hesklang['allow_rich_text_for_tickets'] = 'Allow rich text for tickets';
+$hesklang['allow_rich_text_for_tickets_help'] = 'Allow staff and customers to use rich text formatting when writing ticket messages / replies.';
 
 // ADDED OR MODIFIED IN Mods for HESK 2.3.0
 $hesklang['sm_icon'] = 'Icon';