diff --git a/components/MessageArea.vue b/components/MessageArea.vue
index 900e053..e2788ae 100644
--- a/components/MessageArea.vue
+++ b/components/MessageArea.vue
@@ -1,14 +1,12 @@
 <template>
 	<div id="message-area">
 		<div id="messages" ref="messagesElement">
-			<Message v-for="(message, i) of messages" :username="getDisplayName(message.member.user)" :key="message.uuid"
-				:text="message.message" :timestamp="messageTimestamps[message.uuid]" :img="message.member.user.avatar"
-				:format="timeFormat" :type="messagesType[message.uuid]"
-				:margin-bottom="(messages[i + 1] && messagesType[messages[i + 1].uuid] == 'normal') ?? false"
-				:last="i == messages.length - 1" :message-id="message.uuid" :author="message.member" :me="me"
+			<Message v-for="(message, i) of messages" :key="message.uuid"
 				:message="message" :is-reply="message.reply_to"
-				:author-color="`${generateIrcColor(message.member.user.uuid)}`"
-				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined" />
+				:reply-message="message.reply_to ? getReplyMessage(message.reply_to) : undefined"
+				:type="messagesType[message.uuid]"
+				:editing="false"
+				:is-mentioned="false" />
 		</div>
 		<div id="message-box" class="rounded-corners">
 			<form id="message-form" @submit="sendMessage">