diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php
index 71845a7c..dc1e5d69 100644
--- a/admin/admin_reply_ticket.php
+++ b/admin/admin_reply_ticket.php
@@ -138,14 +138,20 @@ if (strlen($message))
     // Attach signature to the message?
     if ( ! $submit_as_customer && ! empty($_POST['signature']))
 	{
-	    $message .= "\n\n" . addslashes($_SESSION['signature']) . "\n";
+        if ($modsForHesk_settings['rich_text_for_tickets']) {
+            $message .= "<br><br>" . nl2br($_SESSION['signature']) . "<br>";
+        } else {
+            $message .= "\n\n" . addslashes($_SESSION['signature']) . "\n";
+        }
 	}
 
-    // Make links clickable
-	$message = hesk_makeURL($message);
+    if (!$modsForHesk_settings['rich_text_for_tickets']) {
+        // Make links clickable
+        $message = hesk_makeURL($message);
 
-    // Turn newlines into <br /> tags
-	$message = nl2br($message);
+        // Turn newlines into <br /> tags
+        $message = nl2br($message);
+    }
 }
 else
 {
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index c3ad79a0..e166aaaa 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_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');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 hesk_load_database_functions();
@@ -269,8 +270,10 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments))
     }
 }
 
-$tmpvar['message']=hesk_makeURL($tmpvar['message']);
-$tmpvar['message']=nl2br($tmpvar['message']);
+if (!$modsForHesk_settings['rich_text_for_tickets']) {
+    $tmpvar['message']=hesk_makeURL($tmpvar['message']);
+    $tmpvar['message']=nl2br($tmpvar['message']);
+}
 
 $tmpvar['latitude'] = hesk_POST('latitude', 'E-4');
 $tmpvar['longitude'] = hesk_POST('longitude', 'E-4');
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index d35ff59f..d937fd17 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1395,7 +1395,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <div class="ticketMessageBottom">
                      <!-- Message -->
                     <p><b><?php echo $hesklang['message']; ?>:</b></p>
-		            <p class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?><br />&nbsp;</p>
+		            <div class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?></div>
                 </div>
                 <div class="ticketMessageTop">
                          <!-- Custom Fields after Message -->
diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php
index f9dd3585..2b8ffef2 100644
--- a/css/hesk_newStyle.php
+++ b/css/hesk_newStyle.php
@@ -193,11 +193,16 @@
     font-size: 15px;
     background-color: #fff;
 }
-.ticketMessageBottom > p.message {
+.ticketMessageBottom > .message {
     margin-bottom: 0px;
 
 }
 
+.message > ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
 .ticketMessage {
     margin-left: 238px;
     background: #fff;
diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php
index 82541dc0..a467f342 100644
--- a/css/hesk_newStyleRTL.php
+++ b/css/hesk_newStyleRTL.php
@@ -196,11 +196,16 @@
     font-size: 15px;
     background-color: #fff;
 }
-.ticketMessageBottom > p.message {
+.ticketMessageBottom > .message {
     margin-bottom: 0px;
 
 }
 
+.ticketMessageBottom > ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
 .ticketMessage {
     margin-right: 238px;
     background: #fff;