diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 03e7db64..3b317f21 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -211,13 +211,14 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments))
 }
 
 // Add reply
+$html = $modsForHesk_settings['rich_text_for_tickets'];
 if ($submit_as_customer)
 {
-    hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($ticket['name']))."','".hesk_dbEscape($message."<br /><br /><i>{$hesklang['creb']} {$_SESSION['name']}</i>")."',NOW(),'".hesk_dbEscape($myattachments)."')");
+    hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($ticket['name']))."','".hesk_dbEscape($message."<br /><br /><i>{$hesklang['creb']} {$_SESSION['name']}</i>")."',NOW(),'".hesk_dbEscape($myattachments)."', '".$html."')");
 }
 else
 {
-    hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($_SESSION['name']))."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".intval($_SESSION['id'])."')");
+    hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`html`) VALUES ('".intval($replyto)."','".hesk_dbEscape(addslashes($_SESSION['name']))."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".intval($_SESSION['id'])."', '".$html."')");
 }
 
 /* Track ticket status changes for history */
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index ec44868c..33f675ff 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -279,6 +279,8 @@ if (!$modsForHesk_settings['rich_text_for_tickets']) {
 $tmpvar['latitude'] = hesk_POST('latitude', 'E-4');
 $tmpvar['longitude'] = hesk_POST('longitude', 'E-4');
 
+$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets'];
+
 // Insert ticket to database
 $ticket = hesk_newTicket($tmpvar);
 
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 9842b6bd..35aca09b 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1399,7 +1399,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                      <!-- Message -->
                     <p><b><?php echo $hesklang['message']; ?>:</b></p>
 		            <div class="message">
-                        <?php if ($modsForHesk_settings['rich_text_for_tickets']) {
+                        <?php if ($ticket['html']) {
                             echo hesk_html_entity_decode($ticket['message']);
                         } else {
                             echo $ticket['message'];
@@ -1697,7 +1697,7 @@ function hesk_printTicketReplies() {
                 </div>
                 <div class="ticketMessageBottom">
                     <p><b><?php echo $hesklang['message']; ?>:</b></p>
-			        <p><?php if ($modsForHesk_settings['rich_text_for_tickets']) {
+			        <p><?php if ($reply['html']) {
                             echo hesk_html_entity_decode($reply['message']);
                         } else {
                             echo $reply['message'];
diff --git a/inc/posting_functions.inc.php b/inc/posting_functions.inc.php
index 92ae6da5..6f1a2d09 100644
--- a/inc/posting_functions.inc.php
+++ b/inc/posting_functions.inc.php
@@ -99,7 +99,8 @@ function hesk_newTicket($ticket, $isVerified = true)
 		`custom20`,
 		`status`,
 		`latitude`,
-		`longitude`
+		`longitude`,
+		`html`
 	)
 	VALUES
 	(
@@ -142,7 +143,8 @@ function hesk_newTicket($ticket, $isVerified = true)
 		'".hesk_dbEscape($ticket['custom20'])."',
 		'".intval($ticket['status'])."',
 		'".hesk_dbEscape($ticket['latitude'])."',
-		'".hesk_dbEscape($ticket['longitude'])."'
+		'".hesk_dbEscape($ticket['longitude'])."',
+		'".hesk_dbEscape($ticket['html'])."'
 	)
 	");
 
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 842cee30..bebd4e5d 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -591,6 +591,8 @@ function execute240Scripts() {
     // Process attachment improvement tables
     executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` ADD COLUMN `download_count` INT NOT NULL DEFAULT 0");
     executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_attachments` ADD COLUMN `download_count` INT NOT NULL DEFAULT 0");
+    executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` ADD COLUMN `html` ENUM('0','1') NOT NULL DEFAULT '0'");
+    executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` ADD COLUMN `html` ENUM('0','1') NOT NULL DEFAULT '0'");
 
     executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.4.0' WHERE `Key` = 'modsForHeskVersion'");
 }
diff --git a/print.php b/print.php
index 47af6670..f3b43b12 100644
--- a/print.php
+++ b/print.php
@@ -243,7 +243,7 @@ echo '</table><br>';
 
 // Print initial ticket message
 $newMessage = hesk_unhortenUrl($ticket['message']);
-if ($modsForHesk_settings['rich_text_for_tickets'])
+if ($ticket['html'])
 {
     $newMessage = hesk_html_entity_decode($newMessage);
 }
@@ -254,7 +254,7 @@ while ($reply = hesk_dbFetchAssoc($res))
 {
 	$reply['dt'] = hesk_date($reply['dt'], true);
     $theReply = hesk_unhortenUrl($reply['message']);
-    if ($modsForHesk_settings['rich_text_for_tickets']) {
+    if ($reply['html']) {
         $theReply = hesk_html_entity_decode($theReply);
     }
 
diff --git a/reply_ticket.php b/reply_ticket.php
index 7a96d5fe..997b5017 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -37,6 +37,7 @@ define('HESK_PATH','./');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'modsForHesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 
 // Are we in maintenance mode?
@@ -204,7 +205,8 @@ $ticket['status'] = $ticket['status'] == $defaultNewTicketStatus['ID'] ? $defaul
 $res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `lastchange`=NOW(), `status`='{$ticket['status']}', `replies`=`replies`+1, `lastreplier`='0' WHERE `id`='{$ticket['id']}' LIMIT 1");
 
 // Insert reply into database
-hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."')");
+$html = $modsForHesk_settings['rich_text_for_tickets'];
+hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`, `html`) VALUES ({$ticket['id']},'".hesk_dbEscape($ticket['name'])."','".hesk_dbEscape($message)."',NOW(),'".hesk_dbEscape($myattachments)."','".$html."')");
 
 
 /*** Need to notify any staff? ***/
diff --git a/submit_ticket.php b/submit_ticket.php
index 004cd186..856df272 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -447,6 +447,9 @@ if ($hesk_settings['attachments']['use'] && ! empty($attachments) )
 $tmpvar['latitude'] = hesk_POST('latitude');
 $tmpvar['longitude'] = hesk_POST('longitude');
 
+// Set html
+$tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets'];
+
 // Should the helpdesk validate emails?
 $createTicket = true;
 if ($modsForHesk_settings['customer_email_verification_required'])
diff --git a/ticket.php b/ticket.php
index bc1e34c2..3c39a94c 100644
--- a/ticket.php
+++ b/ticket.php
@@ -381,7 +381,14 @@ if (!$show['show']) {
                 <div class="ticketMessageBottom">
                      <!-- Message -->
                      <p><b><?php echo $hesklang['message']; ?>:</b></p>
-                     <div class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?></div>
+                     <div class="message">
+                         <?php if ($ticket['html']) {
+                             echo hesk_html_entity_decode($ticket['message']);
+                         } else {
+                             echo $ticket['message'];
+                         }
+                         ?>
+                     </div>
                 </div>
                 <div class="ticketMessageTop">
                      <!-- Custom Fields after Message -->
@@ -724,7 +731,15 @@ function hesk_printCustomerTicketReplies()
                 <div class="ticketMessageBottom">
                      <!-- Message -->
                      <p><b><?php echo $hesklang['message']; ?>:</b></p>
-			         <div class="message"><?php echo hesk_html_entity_decode($reply['message']); ?></div>
+			         <div class="message">
+                         <?php
+                         if ($reply['html']) {
+                             echo hesk_html_entity_decode($reply['message']);
+                         } else {
+                             echo $reply['message'];
+                         }
+                         ?>
+                     </div>
                 </div>
                 <div class="ticketMessageTop">
                      <?php mfh_listAttachments($reply['attachments'],$i,false);?>