diff --git a/ts/components/conversation/message/DateBreak.tsx b/ts/components/conversation/message/DateBreak.tsx
index b381d5b74..3ee73c9dd 100644
--- a/ts/components/conversation/message/DateBreak.tsx
+++ b/ts/components/conversation/message/DateBreak.tsx
@@ -15,15 +15,19 @@ const DateBreakText = styled.div`
   color: ${props => props.theme.colors.lastSeenIndicatorTextColor};
 `;
 
-export const MessageDateBreak = (props: { timestamp: number }) => {
-  const { timestamp } = props;
-  moment().calendar();
-
-  const text = moment().calendar(timestamp, {
+export const MessageDateBreak = (props: { timestamp: number; messageId: string }) => {
+  const { timestamp, messageId } = props;
+  const text = moment(timestamp).calendar(undefined, {
+    lastDay: '[Yesterday at] LT',
+    sameDay: '[Today at] LT',
+    nextDay: '[Tomorrow at] LT',
+    lastWeek: '[last] dddd [at] LT',
+    nextWeek: 'dddd [at] LT',
     sameElse: 'llll',
   });
+
   return (
-    <DateBreakContainer id={`date-break-${timestamp}`}>
+    <DateBreakContainer id={`date-break-${messageId}`}>
       <DateBreakText>{text}</DateBreakText>
     </DateBreakContainer>
   );
diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx
index 99d02eca6..b555301a4 100644
--- a/ts/components/session/conversation/SessionMessagesList.tsx
+++ b/ts/components/session/conversation/SessionMessagesList.tsx
@@ -33,6 +33,7 @@ export const SessionMessagesList = (props: {
             <MessageDateBreak
               key={`date-break-${messageId}`}
               timestamp={messageProps.showDateBreak}
+              messageId={messageId}
             />
           ) : null;
         if (messageProps.message?.messageType === 'group-notification') {