diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index e6847dad2..8a12ddff9 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -79,7 +79,8 @@ function send() {
 
 function quote(t) {
 	textbox.style.height = '80px'
-	textbox.value = '> ' + t.previousElementSibling.innerHTML + '\n\n'
+	text = t.previousElementSibling.innerHTML.replace(/>/g, ">").replace(/\n/g, "\n>")
+	textbox.value = '> ' + text + '\n\n'
 	textbox.focus()
 }
 
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 732e8e30f..af1b98ade 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -81,7 +81,7 @@
 <input id="vid" type="hidden" value="{{v.id}}">
 <input id="site_name" type="hidden" value="{{SITE_NAME}}">
 
-<script data-cfasync="false" src="/assets/js/chat.js?v=25"></script>
+<script data-cfasync="false" src="/assets/js/chat.js?v=26"></script>
 
 <style>
 	#chat-window {