diff --git a/html_generator.py b/html_generator.py
index 665f2e7b..e6c9e85c 100644
--- a/html_generator.py
+++ b/html_generator.py
@@ -148,7 +148,8 @@ def generate_html(f):
     output += '</div>'
     output = output.split('\n')
     for i in range(len(output)):
-        output[i] = re.sub('^(&gt;[^\n]*(<br>|</div>))', '<span class="greentext">\\1</span>\n', output[i])
+        output[i] = re.sub(r'^(&gt;(.*?)(<br>|</div>))', r'<span class="greentext">\1</span>', output[i])
+        output[i] = re.sub(r'^<blockquote class="message">(&gt;(.*?)(<br>|</div>))', r'<blockquote class="message"><span class="greentext">\1</span>', output[i])
     output = '\n'.join(output)
 
     return output