diff --git a/files/assets/css/chat.css b/files/assets/css/chat.css
index 83cad7d18..b801d1cc1 100644
--- a/files/assets/css/chat.css
+++ b/files/assets/css/chat.css
@@ -27,7 +27,6 @@
 
 .chat-mention {
     position: relative;
-	padding: 0 10px;
 }
 
 .chat-mention::before {
@@ -38,6 +37,7 @@
     left: 0;
     background-color: var(--primary);
     opacity: 0.2;
+	pointer-events: none !important;
 }
 
 p, h1, h2, h3, h4, h5 {
@@ -80,7 +80,8 @@ p {
 
 .chat-line {
 	overflow: hidden;
-	margin-left: 27px;
+	padding: 0 10px;
+	margin: 2px 0 2px 27px;
 }
 
 .quote, .del {
diff --git a/files/routes/chat.py b/files/routes/chat.py
index 09f65281f..cb76cbf24 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -81,7 +81,7 @@ def speak(data, v):
 	id = str(uuid.uuid4())
 	data = {
 		"id": id,
-		"quotes": quotes if quotes != 'undefined' else '',
+		"quotes": quotes if messages[request.referrer].get(quotes) else '',
 		"hat": v.hat_active(v)[0],
 		"user_id": v.id,
 		"username": v.username,