diff --git a/client/components/MessageTypes/action.vue b/client/components/MessageTypes/action.vue
index 3e940f6f..edb6a259 100644
--- a/client/components/MessageTypes/action.vue
+++ b/client/components/MessageTypes/action.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		<span
diff --git a/client/components/MessageTypes/away.vue b/client/components/MessageTypes/away.vue
index f2228dc0..1b569006 100644
--- a/client/components/MessageTypes/away.vue
+++ b/client/components/MessageTypes/away.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<template v-if="message.self">
 			<i v-html="$options.filters.parse(message.text)"/>
diff --git a/client/components/MessageTypes/back.vue b/client/components/MessageTypes/back.vue
index 0c52660b..459884e1 100644
--- a/client/components/MessageTypes/back.vue
+++ b/client/components/MessageTypes/back.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<template v-if="message.self">
 			<i v-html="$options.filters.parse(message.text)"/>
diff --git a/client/components/MessageTypes/chghost.vue b/client/components/MessageTypes/chghost.vue
index 828ae3aa..0b7b986e 100644
--- a/client/components/MessageTypes/chghost.vue
+++ b/client/components/MessageTypes/chghost.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		has changed
diff --git a/client/components/MessageTypes/ctcp.vue b/client/components/MessageTypes/ctcp.vue
index 6674fa07..23f9985f 100644
--- a/client/components/MessageTypes/ctcp.vue
+++ b/client/components/MessageTypes/ctcp.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		<span
diff --git a/client/components/MessageTypes/ctcp_request.vue b/client/components/MessageTypes/ctcp_request.vue
index dcc2925e..3d0c8cf0 100644
--- a/client/components/MessageTypes/ctcp_request.vue
+++ b/client/components/MessageTypes/ctcp_request.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		sent a <abbr title="Client-to-client protocol">CTCP</abbr> request:
diff --git a/client/components/MessageTypes/invite.vue b/client/components/MessageTypes/invite.vue
index 0d1633c6..12b60a32 100644
--- a/client/components/MessageTypes/invite.vue
+++ b/client/components/MessageTypes/invite.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		invited
diff --git a/client/components/MessageTypes/join.vue b/client/components/MessageTypes/join.vue
index c8325bf7..410b3028 100644
--- a/client/components/MessageTypes/join.vue
+++ b/client/components/MessageTypes/join.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		<i class="hostmask">({{ message.hostmask }})</i>
diff --git a/client/components/MessageTypes/kick.vue b/client/components/MessageTypes/kick.vue
index fbe7f039..deb9e17c 100644
--- a/client/components/MessageTypes/kick.vue
+++ b/client/components/MessageTypes/kick.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		has kicked
diff --git a/client/components/MessageTypes/mode.vue b/client/components/MessageTypes/mode.vue
index 00b07b35..6f32584c 100644
--- a/client/components/MessageTypes/mode.vue
+++ b/client/components/MessageTypes/mode.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		sets mode
diff --git a/client/components/MessageTypes/nick.vue b/client/components/MessageTypes/nick.vue
index 3a438297..766e9ead 100644
--- a/client/components/MessageTypes/nick.vue
+++ b/client/components/MessageTypes/nick.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		is now known as
diff --git a/client/components/MessageTypes/part.vue b/client/components/MessageTypes/part.vue
index c3d29b97..4cd20c15 100644
--- a/client/components/MessageTypes/part.vue
+++ b/client/components/MessageTypes/part.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		<i class="hostmask">({{ message.hostmask }})</i>
diff --git a/client/components/MessageTypes/quit.vue b/client/components/MessageTypes/quit.vue
index 491b2af0..63b7c4db 100644
--- a/client/components/MessageTypes/quit.vue
+++ b/client/components/MessageTypes/quit.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<Username :user="message.from"/>
 		<i class="hostmask">({{ message.hostmask }})</i>
diff --git a/client/components/MessageTypes/topic.vue b/client/components/MessageTypes/topic.vue
index 05abc049..8cd48955 100644
--- a/client/components/MessageTypes/topic.vue
+++ b/client/components/MessageTypes/topic.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<template v-if="message.from && message.from.nick">
 			<Username :user="message.from"/>
diff --git a/client/components/MessageTypes/topic_set_by.vue b/client/components/MessageTypes/topic_set_by.vue
index 9835d006..0397e1d2 100644
--- a/client/components/MessageTypes/topic_set_by.vue
+++ b/client/components/MessageTypes/topic_set_by.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		Topic set by
 		<Username :user="message.from"/>
diff --git a/client/components/MessageTypes/whois.vue b/client/components/MessageTypes/whois.vue
index de8f3fb9..bc0d44eb 100644
--- a/client/components/MessageTypes/whois.vue
+++ b/client/components/MessageTypes/whois.vue
@@ -1,4 +1,4 @@
-<template v-elseif="message.type === 'message'">
+<template>
 	<span class="content">
 		<p>
 			<Username :user="{nick: message.whois.nick}"/>