diff --git a/4chan_x.user.js b/4chan_x.user.js
index 77c7a773c..9b2566f4e 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -632,7 +632,7 @@
     },
     comment: function(root) {
       return ($.el('a', {
-        innerHTML: $('blockquote', root).innerHTML.replace(/<br>/g, '\n')
+        innerHTML: root.lastChild.innerHTML.replace(/<br>/g, '\n')
       })).textContent;
     },
     filename: function(root) {
@@ -4023,7 +4023,7 @@ img[md5], img[md5] + img {\
   padding: 5px;\
   text-align: left;\
   vertical-align: middle;\
-  width: 500px;\
+  width: 600px;\
 }\
 #credits {\
   float: right;\
diff --git a/script.coffee b/script.coffee
index 7ed966bb0..d75e92644 100644
--- a/script.coffee
+++ b/script.coffee
@@ -543,7 +543,7 @@ filter =
     sub = if isOP then $ '.filetitle', root else $ '.replytitle', root
     sub.textContent
   comment: (root) ->
-    ($.el 'a', innerHTML: $('blockquote', root).innerHTML.replace /<br>/g, '\n').textContent
+    ($.el 'a', innerHTML: root.lastChild.innerHTML.replace /<br>/g, '\n').textContent
   filename: (root) ->
     if file = $ '.filesize > span', root
       return file.title
@@ -3353,7 +3353,7 @@ img[md5], img[md5] + img {
   padding: 5px;
   text-align: left;
   vertical-align: middle;
-  width: 500px;
+  width: 600px;
 }
 #credits {
   float: right;