diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
index 5c7057581..0e491f50a 100644
--- a/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
+++ b/Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
@@ -17,6 +17,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
     
     public enum Section: SessionTableSection {
         case type
+        case timerLegacy
         case timerDisappearAfterSend
         case timerDisappearAfterRead
         case noteToSelf
@@ -25,6 +26,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
         var title: String? {
             switch self {
                 case .type: return "DISAPPERING_MESSAGES_TYPE_TITLE".localized()
+                case .timerLegacy: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
                 case .timerDisappearAfterSend: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
                 case .timerDisappearAfterRead: return "DISAPPERING_MESSAGES_TIMER_TITLE".localized()
                 case .noteToSelf: return nil
diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings
index f75b156d8..5047a117e 100644
--- a/Session/Meta/Translations/de.lproj/Localizable.strings
+++ b/Session/Meta/Translations/de.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings
index 34ebeeabd..c7ebd2f7d 100644
--- a/Session/Meta/Translations/en.lproj/Localizable.strings
+++ b/Session/Meta/Translations/en.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings
index 2fc52a293..ccc2dc806 100644
--- a/Session/Meta/Translations/es.lproj/Localizable.strings
+++ b/Session/Meta/Translations/es.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings
index c126a47dc..54996e566 100644
--- a/Session/Meta/Translations/fa.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fa.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings
index 28468f484..d5b2b60b5 100644
--- a/Session/Meta/Translations/fi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fi.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings
index cca407d61..5b0ea238a 100644
--- a/Session/Meta/Translations/fr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/fr.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings
index 42142a06f..65ed46574 100644
--- a/Session/Meta/Translations/hi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hi.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings
index 35f217b87..75fbf97ff 100644
--- a/Session/Meta/Translations/hr.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hr.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings
index 4bc67225e..c39b3b2b6 100644
--- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings
+++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings
index 04380e6aa..8caa48d8d 100644
--- a/Session/Meta/Translations/it.lproj/Localizable.strings
+++ b/Session/Meta/Translations/it.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings
index 54aae658f..cf37b4462 100644
--- a/Session/Meta/Translations/ja.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ja.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings
index f53395957..071924c9e 100644
--- a/Session/Meta/Translations/nl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/nl.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings
index ee3bbd0e3..bd99cfd3d 100644
--- a/Session/Meta/Translations/pl.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pl.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
index 1b209f719..0f4f40083 100644
--- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
+++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings
index cbe487d72..7d749fe90 100644
--- a/Session/Meta/Translations/ru.lproj/Localizable.strings
+++ b/Session/Meta/Translations/ru.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings
index 273476973..a67d4e98e 100644
--- a/Session/Meta/Translations/si.lproj/Localizable.strings
+++ b/Session/Meta/Translations/si.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings
index 534d11fd2..a7ae45623 100644
--- a/Session/Meta/Translations/sk.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sk.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings
index 5d478b252..57a387ee7 100644
--- a/Session/Meta/Translations/sv.lproj/Localizable.strings
+++ b/Session/Meta/Translations/sv.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings
index 32f9cde69..bc5db1f5d 100644
--- a/Session/Meta/Translations/th.lproj/Localizable.strings
+++ b/Session/Meta/Translations/th.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
index 78cc33c63..67c18bea0 100644
--- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
index 2940e24e9..832293300 100644
--- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
index 5e3eb5e8f..8da790f2b 100644
--- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
+++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings
@@ -601,3 +601,6 @@
 "YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
 "YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";
 "MESSAGE_REQUEST_PENDING_APPROVAL_INFO" = "You will be able to send voice messages and attachments once the recipient has approved this message request";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_TITLE" = "Legacy";
+"DISAPPEARING_MESSAGES_TYPE_LEGACY_DESCRIPTION" = "USe the original version of disappearing messages.";
+"DISAPPEARING_MESSAGES_OUTDATED_CLIENT_BANNER" = "This user's client is outdated.";
diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
index bb534672b..78755dbc4 100644
--- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
+++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
@@ -5,6 +5,8 @@ import GRDB
 import SessionUtilitiesKit
 
 public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatable, Hashable, FetchableRecord, PersistableRecord, TableRecord, ColumnExpressible {
+    public static let isNewConfigurationEnabled: Bool = Date().timeIntervalSince1970 > 1671062400 // 15/12/2022
+    
     public static var databaseTableName: String { "disappearingMessagesConfiguration" }
     internal static let threadForeignKey = ForeignKey([Columns.threadId], to: [SessionThread.Columns.id])
     private static let thread = belongsTo(SessionThread.self, using: threadForeignKey)
@@ -21,22 +23,27 @@ public struct DisappearingMessagesConfiguration: Codable, Identifiable, Equatabl
     public enum DisappearingMessageType: Int, Codable, Hashable, DatabaseValueConvertible {
         case disappearAfterRead
         case disappearAfterSend
+        case legacy
         
-        init(protoType: SNProtoContent.SNProtoContentExpirationType) {
+        init(protoType: SNProtoContent.SNProtoContentExpirationType?) {
             switch protoType {
                 case .deleteAfterSend:
                     self = .disappearAfterSend
                 case .deleteAfterRead:
                     self = .disappearAfterRead
+                case .none:
+                    self = .legacy
             }
         }
         
-        func toProto() -> SNProtoContent.SNProtoContentExpirationType {
+        func toProto() -> SNProtoContent.SNProtoContentExpirationType? {
             switch self {
                 case .disappearAfterRead:
                     return .deleteAfterRead
                 case .disappearAfterSend:
                     return .deleteAfterSend
+                case .legacy:
+                    return nil
             }
         }
     }
@@ -185,7 +192,7 @@ extension DisappearingMessagesConfiguration {
     
     public static func validDurationsSeconds(_ type: DisappearingMessageType) -> [TimeInterval] {
         switch type {
-            case .disappearAfterRead:
+            case .disappearAfterRead, .legacy:
                 return [
                     60, // TODO: remove this, for test purpose only
                     (5 * 60),