diff --git a/client/index.html b/client/index.html
index 452058ae..fe0fe835 100644
--- a/client/index.html
+++ b/client/index.html
@@ -224,9 +224,7 @@
 			<span class="text">
 				<em class="type">{{type}}</em>
 				{{#equal type "image"}}
-				<a href="{{text}}" target="_blank">
-					<img src="{{text}}" class="image">
-				</a>
+				<img src="{{text}}" class="image">
 				{{else}}
 				{{{uri text}}}
 				{{/equal}}
diff --git a/package.json b/package.json
index 327d0a07..5b88648e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "author": "Mattias Erming",
   "preferGlobal": true,
   "bin": {
diff --git a/src/plugins/irc-events/image.js b/src/plugins/irc-events/image.js
index 3aaa6c3d..83e0392a 100644
--- a/src/plugins/irc-events/image.js
+++ b/src/plugins/irc-events/image.js
@@ -56,8 +56,10 @@ function fetchImage(url, callback) {
 		req.on("error", function(e) {
 			console.log(e);
 		});
-		req.on("end", function(e, res) {
-			callback(name);
+		req.on("end", function() {
+			if (this.req.res.statusCode == 200) {
+				callback(name);	
+			}
 		});
 		
 	});