diff --git a/client/components/Chat.vue b/client/components/Chat.vue
index 0796780a..9124c84d 100644
--- a/client/components/Chat.vue
+++ b/client/components/Chat.vue
@@ -51,62 +51,11 @@
 								v-else
 								class="btn">Show older messages</button>
 						</div>
-						<div
-							class="messages"
-							role="log"
-							aria-live="polite"
-							aria-relevant="additions"
-						>
-							<template v-for="(message, id) in channel.messages">
-								<div
-									v-if="shouldDisplayDateMarker(id)"
-									:key="message.id + '-date'"
-									:data-time="message.time"
-									:aria-label="message.time | localedate"
-									class="date-marker-container tooltipped tooltipped-s"
-								>
-									<div class="date-marker">
-										<span
-											:data-label="message.time | friendlydate"
-											class="date-marker-text"/>
-									</div>
-								</div>
-								<div
-									v-if="shouldDisplayUnreadMarker(message.id)"
-									:key="message.id + '-unread'"
-									class="unread-marker"
-								>
-									<span class="unread-marker-text"/>
-								</div>
-								<Message
-									:message="message"
-									:key="message.id"/>
-							</template>
-						</div>
+						<MessageList :channel="channel"/>
 					</div>
-					<aside
+					<ChatUserList
 						v-if="channel.type === 'channel'"
-						class="userlist">
-						<div class="count">
-							<input
-								:placeholder="channel.users.length + ' user' + (channel.users.length === 1 ? '' : 's')"
-								type="search"
-								class="search"
-								aria-label="Search among the user list"
-								tabindex="-1">
-						</div>
-						<div class="names">
-							<div
-								v-for="(users, mode) in groupedUsers"
-								:key="mode"
-								:class="['user-mode', getModeClass(mode)]">
-								<Username
-									v-for="user in users"
-									:key="user.nick"
-									:user="user"/>
-							</div>
-						</div>
-					</aside>
+						:channel="channel"/>
 				</div>
 			</div>
 		</div>
@@ -120,46 +69,21 @@
 <script>
 require("intersection-observer");
 const socket = require("../js/socket");
-import Message from "./Message.vue";
-import Username from "./Username.vue";
+import MessageList from "./MessageList.vue";
 import ChatInput from "./ChatInput.vue";
-
-const modes = {
-	"~": "owner",
-	"&": "admin",
-	"!": "admin",
-	"@": "op",
-	"%": "half-op",
-	"+": "voice",
-	"": "normal",
-};
+import ChatUserList from "./ChatUserList.vue";
 
 export default {
 	name: "Chat",
 	components: {
-		Message,
-		Username,
+		MessageList,
 		ChatInput,
+		ChatUserList,
 	},
 	props: {
 		network: Object,
 		channel: Object,
 	},
-	computed: {
-		groupedUsers() {
-			const groups = {};
-
-			for (const user of this.channel.users) {
-				if (!groups[user.mode]) {
-					groups[user.mode] = [user];
-				} else {
-					groups[user.mode].push(user);
-				}
-			}
-
-			return groups;
-		},
-	},
 	created() {
 		if (window.IntersectionObserver) {
 			this.historyObserver = new window.IntersectionObserver(loadMoreHistory, {
@@ -178,29 +102,6 @@ export default {
 		}
 	},
 	methods: {
-		shouldDisplayDateMarker(id) {
-			const previousTime = this.channel.messages[id - 1];
-
-			if (!previousTime) {
-				return true;
-			}
-
-			const currentTime = this.channel.messages[id];
-
-			return (new Date(previousTime.time)).getDay() !== (new Date(currentTime.time)).getDay();
-		},
-		shouldDisplayUnreadMarker(msgId) {
-			if (this.channel.firstUnread < msgId) {
-				return false;
-			}
-
-			this.channel.firstUnread = 0;
-
-			return true;
-		},
-		getModeClass(mode) {
-			return modes[mode];
-		},
 		onShowMoreClick() {
 			let lastMessage = this.channel.messages[0];
 			lastMessage = lastMessage ? lastMessage.id : -1;
diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
new file mode 100644
index 00000000..879ea080
--- /dev/null
+++ b/client/components/ChatUserList.vue
@@ -0,0 +1,67 @@
+<template>
+	<aside class="userlist">
+		<div class="count">
+			<input
+				:placeholder="channel.users.length + ' user' + (channel.users.length === 1 ? '' : 's')"
+				type="search"
+				class="search"
+				aria-label="Search among the user list"
+				tabindex="-1">
+		</div>
+		<div class="names">
+			<div
+				v-for="(users, mode) in groupedUsers"
+				:key="mode"
+				:class="['user-mode', getModeClass(mode)]">
+				<Username
+					v-for="user in users"
+					:key="user.nick"
+					:user="user"/>
+			</div>
+		</div>
+	</aside>
+</template>
+
+<script>
+import Username from "./Username.vue";
+
+const modes = {
+	"~": "owner",
+	"&": "admin",
+	"!": "admin",
+	"@": "op",
+	"%": "half-op",
+	"+": "voice",
+	"": "normal",
+};
+
+export default {
+	name: "ChatUserList",
+	components: {
+		Username,
+	},
+	props: {
+		channel: Object,
+	},
+	computed: {
+		groupedUsers() {
+			const groups = {};
+
+			for (const user of this.channel.users) {
+				if (!groups[user.mode]) {
+					groups[user.mode] = [user];
+				} else {
+					groups[user.mode].push(user);
+				}
+			}
+
+			return groups;
+		},
+	},
+	methods: {
+		getModeClass(mode) {
+			return modes[mode];
+		},
+	},
+};
+</script>
diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
new file mode 100644
index 00000000..ff6dd311
--- /dev/null
+++ b/client/components/MessageList.vue
@@ -0,0 +1,70 @@
+<template>
+	<div
+		class="messages"
+		role="log"
+		aria-live="polite"
+		aria-relevant="additions"
+	>
+		<template v-for="(message, id) in channel.messages">
+			<div
+				v-if="shouldDisplayDateMarker(id)"
+				:key="message.id + '-date'"
+				:data-time="message.time"
+				:aria-label="message.time | localedate"
+				class="date-marker-container tooltipped tooltipped-s"
+			>
+				<div class="date-marker">
+					<span
+						:data-label="message.time | friendlydate"
+						class="date-marker-text"/>
+				</div>
+			</div>
+			<div
+				v-if="shouldDisplayUnreadMarker(message.id)"
+				:key="message.id + '-unread'"
+				class="unread-marker"
+			>
+				<span class="unread-marker-text"/>
+			</div>
+			<Message
+				:message="message"
+				:key="message.id"/>
+		</template>
+	</div>
+</template>
+
+<script>
+import Message from "./Message.vue";
+
+export default {
+	name: "MessageList",
+	components: {
+		Message,
+	},
+	props: {
+		channel: Object,
+	},
+	methods: {
+		shouldDisplayDateMarker(id) {
+			const previousTime = this.channel.messages[id - 1];
+
+			if (!previousTime) {
+				return true;
+			}
+
+			const currentTime = this.channel.messages[id];
+
+			return (new Date(previousTime.time)).getDay() !== (new Date(currentTime.time)).getDay();
+		},
+		shouldDisplayUnreadMarker(msgId) {
+			if (this.channel.firstUnread < msgId) {
+				return false;
+			}
+
+			this.channel.firstUnread = 0;
+
+			return true;
+		},
+	},
+};
+</script>