diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index f885a7ceff0e3ae2aa1307e9d93e0695137d6408..621365fc4cd85b0c06cab4128c9f10ea1331affe 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -375,7 +375,8 @@ $tcount+= $ticket->getNumNotes();
             if ($urls) { ?>
                 <script type="text/javascript">
                     $(function() { showImagesInline(<?php echo
-                        JsonDataEncoder::encode($urls); ?>); });
+                        JsonDataEncoder::encode($urls); ?>, <?php echo
+                        $entry['id']; ?>); });
                 </script>
 <?php
             } ?>
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 7199d0829ef136a746413894d3584d3ad66234f1..f16576d6f84320f8f3dc5c928a8d36f7cf950032 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -414,10 +414,10 @@ showImagesInline = function(urls, thread_id) {
         ? '.thread-body img[data-cid]'
         : '.thread-body#thread-id-'+thread_id+' img[data-cid]';
     $(selector).each(function(i, el) {
-        var cid = $(el).data('cid').toLowerCase(),
-            info = urls[cid],
-            e = $(el);
-        if (info) {
+        var e = $(el),
+            cid = e.data('cid').toLowerCase(),
+            info = urls[cid];
+        if (info && !e.data('wrapped')) {
             // Add a hover effect with the filename
             var timeout, caption = $('<div class="image-hover">')
                 .css({'float':e.css('float')});
@@ -437,6 +437,7 @@ showImagesInline = function(urls, thread_id) {
                     .append('<span class="filename">'+info.filename+'</span>')
                     .append('<a href="'+info.download_url+'" class="action-button"><i class="icon-download-alt"></i> Download</a>')
                 );
+            e.data('wrapped', true);
         }
     });
 }