diff --git a/include/class.ticket.php b/include/class.ticket.php
index 78058d5483af63de3a8734255750bb81c709cf27..e8235b49ea6312d0e7cc7bc2263a0c8e4fa8b1d1 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -990,9 +990,13 @@ class Ticket {
         $uid = 0;
         if ($entry instanceof Message) {
             $poster = $entry->getUser();
+            // Skip the person who sent in the message
             $uid = $entry->getUserId();
-        } else
+        } else {
             $poster = $entry->getStaff();
+            // Skip the ticket owner
+            $uid = $this->getUserId();
+        }
 
         $vars = array(
                 'message' => (string) $entry,