diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings
index 37984457e..3eabc68ae 100644
--- a/Riot/Assets/de.lproj/Bwi.strings
+++ b/Riot/Assets/de.lproj/Bwi.strings
@@ -750,8 +750,11 @@
 // MARK: migration to new client
 // Banner
 "bwi_mobile_dialog_m_banner_title" = "Wechsel zum BundesMessengerX";
-"bwi_mobileMdialog_m1_banner_text" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.";
-"bwi_mobileMdialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
+"bwi_mobile_dialog_m1_banner_text" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.";
+"bwi_mobile_dialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
+"bwi_mobile_dialog_m2_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM. Du hast nur noch";
+"bwi_mobile_dialog_m2_banner_text_bold" = " wenige Tage";
+"bwi_mobile_dialog_m2_banner_text_suffix" = " Zeit zu wechseln. Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
 "bwi_mobile_dialog_m_banner_button2" = "Erfahre mehr";
 "bwi_mobile_dialog_m_banner_button1" = "Später erinnern";
 
diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings
index d9139bb59..6904f0486 100644
--- a/Riot/Assets/en.lproj/Bwi.strings
+++ b/Riot/Assets/en.lproj/Bwi.strings
@@ -663,8 +663,11 @@
 // MARK: migration to new client
 // Banner
 "bwi_mobile_dialog_m_banner_title" = "Change to BundesMessengerX";
-"bwi_mobileMdialog_m1_banner_text" = "This is a new technically optimized app from BuM. You can try it out now before everyone has to switch soon.";
-"bwi_mobileMdialog_m1_banner_text_bold" = " All your contacts and messages will be retained.";
+"bwi_mobile_dialog_m1_banner_text" = "This is a new technically optimized app from BuM. You can try it out now before everyone has to switch soon.";
+"bwi_mobile_dialog_m1_banner_text_bold" = " All your contacts and messages will be retained.";
+"bwi_mobile_dialog_m2_banner_text_prefix" = "This is a new technically optimized app from BuM. You only have";
+"bwi_mobile_dialog_m2_banner_text_bold" = " a few days";
+"bwi_mobile_dialog_m2_banner_text_suffix" = " to switch. All your contacts and messages will be retained.";
 "bwi_mobile_dialog_m_banner_button2" = "Learn more";
 "bwi_mobile_dialog_m_banner_button1" = "Remember later";
 
diff --git a/bwi/FeatureBanner/FeatureBannerView.swift b/bwi/FeatureBanner/FeatureBannerView.swift
index 0a259070e..fee450f9a 100644
--- a/bwi/FeatureBanner/FeatureBannerView.swift
+++ b/bwi/FeatureBanner/FeatureBannerView.swift
@@ -112,7 +112,16 @@ protocol FeatureBannerDelegate {
 struct FeatureBannerView: View {
     var delegate: FeatureBannerDelegate?
     let darkmodeBackground = UIColor(rgb:0x2394A7)
-    
+    let warningColor = UIColor(rgb:0xD51928)
+
+    var backgroundColor: Color {
+        if BWIBuildSettings.shared.BuMXMigrationInfoLevel >= 2 {
+            ThemeService.shared().isCurrentThemeDark() ? Color(uiColor: warningColor) : Color(ThemeService.shared().theme.warningColor)
+        } else {
+            ThemeService.shared().isCurrentThemeDark() ? Color(uiColor: darkmodeBackground) : Color(ThemeService.shared().theme.tintColor)
+        }
+    }
+
     var body: some View {
         VStack(alignment: .center) {
             header
@@ -124,7 +133,7 @@ struct FeatureBannerView: View {
             }
         }
         .padding(.horizontal, 12)
-        .background(ThemeService.shared().isCurrentThemeDark() ? Color(uiColor: darkmodeBackground) : Color(ThemeService.shared().theme.tintColor))
+        .background(backgroundColor)
         .cornerRadius(12)
         .padding(16)
     }
@@ -145,9 +154,18 @@ struct FeatureBannerView: View {
     
     var advertisementText: some View {
         VStack {
-            Text(BWIL10n.bwiMobileMdialogM1BannerText) +
-            Text(BWIL10n.bwiMobileMdialogM1BannerTextBold)
-                .bold()
+            VStack {
+                if BWIBuildSettings.shared.BuMXMigrationInfoLevel == 1 {
+                    Text(BWIL10n.bwiMobileDialogM1BannerText) +
+                    Text(BWIL10n.bwiMobileDialogM1BannerTextBold)
+                        .bold()
+                } else {
+                    Text(BWIL10n.bwiMobileDialogM2BannerTextPrefix) +
+                    Text(BWIL10n.bwiMobileDialogM2BannerTextBold)
+                        .bold() +
+                    Text(BWIL10n.bwiMobileDialogM2BannerTextSuffix)
+                }
+            }
         }
         .font(.system(size: 15))
         .multilineTextAlignment(.leading)