diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index cf9d1a84..1faa6e38 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1394,7 +1394,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 $ticket['message']; ?><br />&nbsp;</p>
+		            <p class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?><br />&nbsp;</p>
                 </div>
                 <div class="ticketMessageTop">
                          <!-- Custom Fields after Message -->
@@ -1835,7 +1835,7 @@ function hesk_printTicketReplies() {
                 </div>
                 <div class="ticketMessageBottom">
                     <p><b><?php echo $hesklang['message']; ?>:</b></p>
-			        <p><?php echo $reply['message']; ?></p> 
+			        <p><?php echo hesk_html_entity_decode($reply['message']); ?></p>
                 </div>
                 <div class="ticketMessageTop pushMargin">
                      <?php hesk_listAttachments($reply['attachments'],$reply['id']);
diff --git a/ticket.php b/ticket.php
index 81abf9fc..b3fd29b1 100644
--- a/ticket.php
+++ b/ticket.php
@@ -370,7 +370,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                 <div class="ticketMessageBottom">
                      <!-- Message -->
                      <p><b><?php echo $hesklang['message']; ?>:</b></p>
-                     <p class="message"><?php echo $ticket['message']; ?><br />&nbsp;</p>
+                     <p class="message"><?php echo hesk_html_entity_decode($ticket['message']); ?><br />&nbsp;</p>
                 </div>
                 <div class="ticketMessageTop">
                      <!-- Custom Fields after Message -->
@@ -676,7 +676,7 @@ function hesk_printCustomerTicketReplies()
                 <div class="ticketMessageBottom">
                      <!-- Message -->
                      <p><b><?php echo $hesklang['message']; ?>:</b></p>
-			         <p class="message"><?php echo $reply['message']; ?></p> 
+			         <p class="message"><?php echo hesk_html_entity_decode($reply['message']); ?></p>
                 </div>
                 <div class="ticketMessageTop">
                      <?php hesk_listAttachments($reply['attachments'],$i);?>