diff --git a/client/components/MessageList.vue b/client/components/MessageList.vue
index 7de87d08..62215e21 100644
--- a/client/components/MessageList.vue
+++ b/client/components/MessageList.vue
@@ -79,7 +79,7 @@ import {
 } from "vue";
 import {useStore} from "../js/store";
 import {ClientChan, ClientMessage, ClientNetwork, ClientLinkPreview} from "../js/types";
-import Msg from "../../server/models/msg";
+import {SharedMsg} from "../../shared/types/msg";
 
 type CondensedMessageContainer = {
 	type: "condensed";
@@ -242,7 +242,7 @@ export default defineComponent({
 		});
 
 		const shouldDisplayDateMarker = (
-			message: Msg | ClientMessage | CondensedMessageContainer,
+			message: SharedMsg | ClientMessage | CondensedMessageContainer,
 			id: number
 		) => {
 			const previousMessage = condensedMessages.value[id - 1];
@@ -270,7 +270,7 @@ export default defineComponent({
 			return false;
 		};
 
-		const isPreviousSource = (currentMessage: ClientMessage | Msg, id: number) => {
+		const isPreviousSource = (currentMessage: ClientMessage | SharedMsg, id: number) => {
 			const previousMessage = condensedMessages.value[id - 1];
 			return !!(
 				previousMessage &&
diff --git a/client/js/types.d.ts b/client/js/types.d.ts
index e2d0ff14..c58557b6 100644
--- a/client/js/types.d.ts
+++ b/client/js/types.d.ts
@@ -3,7 +3,7 @@ import {defineComponent} from "vue";
 import Chan from "../../server/models/chan";
 import Network from "../../server/models/network";
 import User from "../../server/models/user";
-import Message from "../../server/models/msg";
+import SharedMessage from "../../shared/types/msg";
 import {Mention} from "../../server/client";
 import {ClientConfiguration} from "../../server/server";
 import {LinkPreview} from "../../server/plugins/irc-events/link";
@@ -20,8 +20,8 @@ type ClientUser = User & {
 	//
 };
 
-type ClientMessage = Omit<Message, "users"> & {
-	time: number;
+type ClientMessage = Omit<SharedMessage, "users"> & {
+	time: Date;
 	users: string[];
 };