diff --git a/client/css/style.css b/client/css/style.css
index f4c4eb66..c88a072c 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -760,6 +760,14 @@ button,
 	color: #999;
 }
 
+#chat .msg.motd .text,
+#chat .msg.message .text,
+#chat .msg.action .action-text,
+#chat .msg.notice .text {
+	white-space: pre-wrap;
+	overflow: hidden;
+}
+
 #chat.hide-join .join,
 #chat.hide-mode .mode,
 #chat.hide-motd .motd,
diff --git a/client/views/actions/action.tpl b/client/views/actions/action.tpl
index ddb8efce..1fcced98 100644
--- a/client/views/actions/action.tpl
+++ b/client/views/actions/action.tpl
@@ -1,2 +1,2 @@
 <a href="#" class="user" data-name="{{from}}">{{mode}}{{from}}</a>
-{{{parse text}}}
+<span class="action-text">{{{parse text}}}</span>
diff --git a/client/views/msg.tpl b/client/views/msg.tpl
index c3155ba4..7563d6b8 100644
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@@ -7,16 +7,17 @@
 		<a href="#" class="user" style="color: #{{stringcolor from}}" data-name="{{from}}">{{mode}}{{from}}</a>
 		{{/if}}
 	</span>
-	<span class="text">
-		{{#equal type "toggle"}}
+	{{#equal type "toggle"}}
+		<span class="text">
 			<div class="force-newline">
 				<button id="toggle-{{id}}" class="toggle-button">···</button>
 			</div>
 			{{#if toggle}}
 				{{partial "toggle"}}
 			{{/if}}
-		{{else}}
-			{{{parse text}}}
-		{{/equal}}
+		</span>
+	{{else}}
+		<span class="text">{{{parse text}}}</span>
+	{{/equal}}
 	</span>
 </div>