diff --git a/public/js/extra.js b/public/js/extra.js
index a82a53c..e0f78b2 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -260,19 +260,22 @@ function finishView(view) {
     //image href new window(emoji not included)
     var images = view.find("img.raw[src]").removeClass("raw");
     images.each(function (key, value) {
+        // if it's already wrapped by link, then ignore
+        var $value = $(value);
+        if ($value.parent()[0].nodeName === 'A') return;
         var src = $(value).attr('src');
         var a = $('<a>');
         if (src) {
             a.attr('href', src);
             a.attr('target', "_blank");
         }
-        var clone = $(value).clone();
+        var clone = $value.clone();
         clone[0].onload = function (e) {
             if(viewAjaxCallback)
                 viewAjaxCallback();
         };
         a.html(clone);
-        $(value).replaceWith(a);
+        $value.replaceWith(a);
     });
     //blockquote
     var blockquote = view.find("blockquote.raw").removeClass("raw");