diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx
index 79e3eb759..b8794553a 100644
--- a/ts/components/conversation/header/ConversationHeaderTitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx
@@ -90,7 +90,7 @@ export const ConversationHeaderTitle = () => {
       : expirationType === 'deleteAfterSend'
       ? window.i18n('disappearingMessagesModeAfterSend')
       : // legacy mode support
-      isGroup
+      isMe || isGroup
       ? window.i18n('disappearingMessagesModeAfterSend')
       : window.i18n('disappearingMessagesModeAfterRead');
   const abbreviatedExpireTime = Boolean(expireTimer)
@@ -128,11 +128,6 @@ export const ConversationHeaderTitle = () => {
     }
   }, [visibleTitleIndex, subtitles]);
 
-  if (isMe) {
-    // TODO customise for new disappearing message system
-    return <div className="module-conversation-header__title">{i18n('noteToSelf')}</div>;
-  }
-
   return (
     <div className="module-conversation-header__title-container">
       <div className="module-conversation-header__title-flex">
@@ -141,12 +136,16 @@ export const ConversationHeaderTitle = () => {
           onClick={handleRightPanelToggle}
           role="button"
         >
-          <span
-            className="module-contact-name__profile-name"
-            data-testid="header-conversation-name"
-          >
-            {convoName}
-          </span>
+          {isMe ? (
+            <span>{i18n('noteToSelf')}</span>
+          ) : (
+            <span
+              className="module-contact-name__profile-name"
+              data-testid="header-conversation-name"
+            >
+              {convoName}
+            </span>
+          )}
           {subtitles && subtitles[visibleTitleIndex] && (
             <ConversationHeaderSubitle
               currentIndex={visibleTitleIndex}
diff --git a/ts/models/message.ts b/ts/models/message.ts
index bc630d2a7..2e8e6002a 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -1224,7 +1224,7 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
     const expirationType = this.get('expirationType');
     // TODO legacy messages support will be removed in a future release
     const convo = this.getConversation();
-    const isLegacyMode = convo && convo.isPrivate() && expirationType === 'legacy';
+    const isLegacyMode = convo && !convo.isMe() && convo.isPrivate() && expirationType === 'legacy';
     if ((isLegacyMode || expirationType === 'deleteAfterRead') && this.get('expireTimer')) {
       this.set({
         expirationStartTimestamp: setExpirationStartTimestamp(
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 184f2a06e..2316c0e07 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -166,7 +166,7 @@ function updateReadStatus(message: MessageModel) {
     const expirationType = message.get('expirationType');
     // TODO legacy messages support will be removed in a future release
     const convo = message.getConversation();
-    const isLegacyMode = convo && convo.isPrivate() && expirationType === 'legacy';
+    const isLegacyMode = convo && !convo.isMe() && convo.isPrivate() && expirationType === 'legacy';
     if ((isLegacyMode || expirationType === 'deleteAfterRead') && message.get('expireTimer')) {
       message.set({
         expirationStartTimestamp: setExpirationStartTimestamp(
@@ -340,7 +340,8 @@ export async function handleMessageJob(
     if (
       messageModel.isIncoming() &&
       Boolean(messageModel.get('expirationStartTimestamp')) === false &&
-      ((messageModel.get('expirationType') === 'legacy' && conversation.isGroup()) ||
+      ((messageModel.get('expirationType') === 'legacy' &&
+        (conversation.isMe() || conversation.isMediumGroup())) ||
         messageModel.get('expirationType') === 'deleteAfterSend')
     ) {
       messageModel.set({
diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts
index 2d9e2136d..313673027 100644
--- a/ts/session/sending/MessageSentHandler.ts
+++ b/ts/session/sending/MessageSentHandler.ts
@@ -125,8 +125,10 @@ async function handleMessageSentSuccess(
   const expirationType = fetchedMessage.get('expirationType');
   // TODO legacy messages support will be removed in a future release
   const convo = fetchedMessage.getConversation();
-  const isLegacyReadMode = convo && convo.isPrivate() && expirationType === 'legacy';
-  const isLegacySentMode = convo && convo.isMediumGroup() && expirationType === 'legacy';
+  const isLegacyReadMode =
+    convo && !convo.isMe() && convo.isPrivate() && expirationType === 'legacy';
+  const isLegacySentMode =
+    convo && (convo.isMe() || convo.isMediumGroup()) && expirationType === 'legacy';
 
   fetchedMessage.set({
     sent_to: sentTo,
diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts
index ee7d82078..59b7504ee 100644
--- a/ts/session/utils/calling/CallManager.ts
+++ b/ts/session/utils/calling/CallManager.ts
@@ -505,8 +505,8 @@ export async function USER_callRecipient(recipient: string) {
   weAreCallerOnCurrentCall = true;
 
   // TODO legacy messages support will be removed in a future release
-  const isLegacyMode = calledConvo.get('expirationType') !== 'legacy';
-  const expirationType = isLegacyMode ? calledConvo.get('expirationType') : 'deleteAfterSend';
+  const isLegacyMode = calledConvo.get('expirationType') === 'legacy';
+  const expirationType = !isLegacyMode ? calledConvo.get('expirationType') : 'deleteAfterSend';
   await calledConvo?.addSingleOutgoingMessage({
     callNotificationType: 'started-call',
     sent_at: now,
@@ -867,8 +867,8 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) {
   callerConvo.set('active_at', networkTimestamp);
 
   // TODO legacy messages support will be removed in a future release
-  const isLegacyMode = callerConvo.get('expirationType') !== 'legacy';
-  const expirationType = isLegacyMode ? callerConvo.get('expirationType') : 'deleteAfterSend';
+  const isLegacyMode = callerConvo.get('expirationType') === 'legacy';
+  const expirationType = !isLegacyMode ? callerConvo.get('expirationType') : 'deleteAfterSend';
   await callerConvo?.addSingleIncomingMessage({
     callNotificationType: 'answered-a-call',
     source: UserUtils.getOurPubKeyStrFromCache(),
@@ -1202,8 +1202,8 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) {
   }
 
   // TODO legacy messages support will be removed in a future release
-  const isLegacyMode = incomingCallConversation.get('expirationType') !== 'legacy';
-  const expirationType = isLegacyMode
+  const isLegacyMode = incomingCallConversation.get('expirationType') === 'legacy';
+  const expirationType = !isLegacyMode
     ? incomingCallConversation.get('expirationType')
     : 'deleteAfterSend';
   await incomingCallConversation?.addSingleIncomingMessage({