diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx
index b06c34664..69ad7690b 100644
--- a/app/soapbox/features/chats/components/chat-message-list.tsx
+++ b/app/soapbox/features/chats/components/chat-message-list.tsx
@@ -109,9 +109,13 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
       return [];
     }
 
+    const currentYear = new Date().getFullYear();
+
     return chatMessages.reduce((acc: any, curr: any, idx: number) => {
       const lastMessage = formattedChatMessages[idx - 1];
 
+      const messageDate = new Date(curr.created_at);
+
       if (lastMessage) {
         switch (timeChange(lastMessage, curr)) {
           case 'today':
@@ -123,7 +127,14 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
           case 'date':
             acc.push({
               type: 'divider',
-              text: intl.formatDate(new Date(curr.created_at), { weekday: 'short', hour: 'numeric', minute: '2-digit', month: 'short', day: 'numeric' }),
+              text: intl.formatDate(messageDate, {
+                weekday: 'short',
+                hour: 'numeric',
+                minute: '2-digit',
+                month: 'short',
+                day: 'numeric',
+                year: messageDate.getFullYear() !== currentYear ? '2-digit' : undefined,
+              }),
             });
             break;
         }