diff --git a/files/assets/css/chat.css b/files/assets/css/chat.css
index c119639a2..6011709cb 100644
--- a/files/assets/css/chat.css
+++ b/files/assets/css/chat.css
@@ -91,7 +91,8 @@ p {
 	float: right;
 	color: var(--black);
 	font-size: 12px;
-	margin-top: 4px;
+	margin-top: auto;
+	margin-bottom: auto;
 }
 
 lite-youtube {
@@ -129,7 +130,7 @@ lite-youtube {
 }
 
 .chat-message {
-	max-height: 30vh;
+	max-height: 50vh;
 	overflow: auto;
     max-width: 80%;
 }
diff --git a/files/templates/chat.html b/files/templates/chat.html
index d38643bdf..5cd16b9ee 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -29,7 +29,7 @@
 				{% set mentioned = m and vlink in m['text_html'] or (quote_exists and messages[m['quotes']]['user_id'] == v.id) %}
 				<div class="chat-line {% if mentioned %}chat-mention{% endif %}" {% if m %}id="{{id}}"{% endif %}>
 					<div class="d-flex align-items-center">
-						<div class="text-muted chat-line-content">
+						<div class="text-muted chat-line-content row">
 							<div class="{% if not (m and m['quotes']) %}d-none{% endif %} quotes" style="font-size:12px">
 								<a class="QuotedMessageLink" {% if m and m['quotes'] %}href="#{{m['quotes']}}"{% endif %}>
 									<i class="fas fa-reply"></i> 
@@ -46,7 +46,7 @@
 								</a>
 							</div>
 
-							<span class="chat-message text-black text-break">
+							<span class="chat-message text-black text-break col">
 								{% if m %}
 									{% if v.slurreplacer %}
 										{{m['text_censored'] | safe}}