diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index dc3a0419f97a353471b6a87f7dc4ad1453b5b881..509315ff46057e90ba7bb316b9a87f047ab62050 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -122,7 +122,7 @@ if($ticket->getThreadCount() && ($thread=$ticket->getClientThread())) {
                 <span><?php echo $poster; ?></span>
             </div>
             </th></tr>
-            <tr><td class="thread-body"><div><?php echo $entry['body']->toHtml(); ?></div></td></tr>
+            <tr><td class="thread-body"><div><?php echo Format::clickableurls($entry['body']->toHtml()); ?></div></td></tr>
             <?php
             if($entry['attachments']
                     && ($tentry=$ticket->getThreadEntry($entry['id']))
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 23ab4b0cb19c2ada6373befe1895e439fd192775..c39d1bcee555bff254f6b73017b7c3db9f2e48a5 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -406,7 +406,7 @@ $tcount+= $ticket->getNumNotes();
             </tr>
             <tr><td colspan="4" class="thread-body" id="thread-id-<?php
                 echo $entry['id']; ?>"><div><?php
-                echo $entry['body']->toHtml(); ?></div></td></tr>
+                echo Format::clickableurls($entry['body']->toHtml()); ?></div></td></tr>
             <?php
             if($entry['attachments']
                     && ($tentry = $ticket->getThreadEntry($entry['id']))