diff --git a/client/css/style.css b/client/css/style.css
index c013e6d1..93ca9186 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -713,11 +713,14 @@ button {
 }
 
 #chat .messages {
+	display: table;
+	table-layout: fixed;
 	width: 100%;
 	padding: 10px 0;
-	overflow-wrap: break-word;
+}
+
+#chat .msg {
 	word-wrap: break-word;
-	word-break: break-word;
 }
 
 #chat .unread-marker {
@@ -768,7 +771,7 @@ button {
 #chat .time {
 	color: #ddd;
 	text-align: right;
-	width: 46px;
+	max-width: 46px;
 	min-width: 46px;
 }