diff --git a/client/components/Message.vue b/client/components/Message.vue
index 2a20fe8e..9463c655 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -24,9 +24,9 @@
 		<template v-else-if="message.type === 'action'">
 			<span class="from" />
 			<span class="content">
-				<span class="text"><Username :user="message.from" /> <ParsedMessage
+				<Username :user="message.from" /> <ParsedMessage
 					:network="network"
-					:message="message" /></span>
+					:message="message" />
 				<LinkPreview
 					v-for="preview in message.previews"
 					:key="preview.link"
@@ -41,9 +41,9 @@
 				</template>
 			</span>
 			<span class="content">
-				<span class="text"><ParsedMessage
+				<ParsedMessage
 					:network="network"
-					:message="message" /></span>
+					:message="message" />
 				<LinkPreview
 					v-for="preview in message.previews"
 					:key="preview.link"
diff --git a/client/components/MessageTypes/chghost.vue b/client/components/MessageTypes/chghost.vue
index 25a287fc..231fe724 100644
--- a/client/components/MessageTypes/chghost.vue
+++ b/client/components/MessageTypes/chghost.vue
@@ -16,6 +16,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/ctcp.vue b/client/components/MessageTypes/ctcp.vue
index 49d62e13..c8d6c8fa 100644
--- a/client/components/MessageTypes/ctcp.vue
+++ b/client/components/MessageTypes/ctcp.vue
@@ -16,6 +16,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/ctcp_request.vue b/client/components/MessageTypes/ctcp_request.vue
index 8e1ee825..592441cd 100644
--- a/client/components/MessageTypes/ctcp_request.vue
+++ b/client/components/MessageTypes/ctcp_request.vue
@@ -17,6 +17,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index 8353a11c..da16fdbf 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -15,6 +15,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/mode.vue b/client/components/MessageTypes/mode.vue
index c8405054..4ca48bd2 100644
--- a/client/components/MessageTypes/mode.vue
+++ b/client/components/MessageTypes/mode.vue
@@ -17,6 +17,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/nick.vue b/client/components/MessageTypes/nick.vue
index cf521856..53d300b6 100644
--- a/client/components/MessageTypes/nick.vue
+++ b/client/components/MessageTypes/nick.vue
@@ -15,6 +15,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/components/MessageTypes/topic_set_by.vue b/client/components/MessageTypes/topic_set_by.vue
index a98271ee..c2fea5f6 100644
--- a/client/components/MessageTypes/topic_set_by.vue
+++ b/client/components/MessageTypes/topic_set_by.vue
@@ -15,6 +15,7 @@ export default {
 		Username,
 	},
 	props: {
+		network: Object,
 		message: Object,
 	},
 };
diff --git a/client/css/style.css b/client/css/style.css
index 9cf9f1f3..1263c835 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1292,7 +1292,7 @@ background on hover (unless active) */
 #chat.colored-nicks .user.color-31 { color: #eb0400; }
 #chat.colored-nicks .user.color-32 { color: #e60082; }
 
-#chat .self .text {
+#chat .self .content {
 	color: var(--body-color-muted);
 }
 
@@ -1370,13 +1370,13 @@ background on hover (unless active) */
 }
 
 #chat .action .from,
-#chat .action .text,
+#chat .action .content,
 #chat .action .user {
 	color: #f39c12;
 }
 
 #chat .notice .time,
-#chat .notice .text,
+#chat .notice .content,
 #chat .chan .notice .user {
 	color: #0074d9 !important;
 }
@@ -2640,14 +2640,14 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
    For example: user has quit ( ===> L   O   L <=== )  */
 
 #windows .header .topic,
-#chat .message .text,
-#chat .motd .text,
-#chat .notice .text,
+#chat .message .content,
+#chat .motd .content,
+#chat .notice .content,
 #chat .ctcp-message,
 #chat .part-reason,
 #chat .quit-reason,
 #chat .new-topic,
-#chat .action .text,
+#chat .action .content,
 #chat table.channel-list .topic {
 	white-space: pre-wrap;
 }