diff --git a/files/routes/chat.py b/files/routes/chat.py
index ff7a2bec4..276bd2baf 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -25,14 +25,15 @@ if "load_chat" in sys.argv:
 	@auth_required
 	def speak(data, v):
 		global messages
-		data = data[:1000].strip()
-		if not data: abort(403)
+		text = data[:1000].strip()
+		if not text: abort(403)
 
 		data={
 			"avatar": v.profile_url,
 			"username":v.username,
 			"namecolor":v.namecolor,
-			"text":sanitize(data),
+			"text":text,
+			"text_html":sanitize(text),
 		}
 
 		messages.append(data)
diff --git a/files/templates/chat.html b/files/templates/chat.html
index f6db9a1b4..fce829efc 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -47,7 +47,12 @@
 								<img src="{{m['avatar']}}" class="mobile-avatar profile-pic-30 mr-1 d-inline-block d-md-none" data-toggle="tooltip" data-placement="right">
 								<a class="font-weight-bold text-black userlink" style="color:#{{m['namecolor']}}" target="_blank" href="/@{{m['username']}}">{{m['username']}}</a>
 								<div style="overflow:hidden">
-									<span class="chat-message text-black text-break">{{m['text'] | safe}}</span>
+									{% set text=m['text'] %}
+									<span class="chat-message text-black text-break">{{m['text_html'] | safe}}
+										<button onclick="quote('{{text}}')">
+											<i class="fas fa-reply" aria-hidden="true"></i>
+										</button>
+									</span>
 								</div>
 							</div>
 						</div>
@@ -146,7 +151,7 @@
 
 
 	socket.on('speak', function(json) {
-		let text = json['text']
+		let text = json['text_html']
 
 		if (text.includes('<a href="/id/{{v.id}}">')){
 			chatline.classList.add('chat-mention');
@@ -184,6 +189,10 @@
 		}
 	}
 
+	function quote(text) {
+		textbox.value = text + '\n'
+		textbox.focus()
+	}
 
 	textbox.addEventListener("keyup", function(e) {
 		if (!e.shiftKey && e.key === 'Enter') {