diff --git a/Podfile b/Podfile
index e08232fa5..ce5fc9a89 100644
--- a/Podfile
+++ b/Podfile
@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
 $matrixSDKVersionSpec = $matrixSDKVersion
 end
 
-$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi_beta_2' }
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi_beta_4905' }
 
 # Method to import the MatrixSDK
 def import_MatrixSDK
diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings
index ab99c5aa4..f709ea12b 100644
--- a/Riot/Assets/de.lproj/Bwi.strings
+++ b/Riot/Assets/de.lproj/Bwi.strings
@@ -629,3 +629,7 @@
 
 // MARK: - Accessibility declaration
 "bwi_accessibility_declaration_button_title" = "Barrierefreiheitserklärung";
+
+// MARK: - Crypto Store migration
+"bwi_launch_loading_crypto_store_migration_info" = "Die Ver-/Entschlüsselung von Nachrichten wird verbessert, dies kann ein paar Minuten dauern, bitte schließe die App nicht. Verbesserung läuft.";
+
diff --git a/Riot/Assets/en.lproj/Bwi.strings b/Riot/Assets/en.lproj/Bwi.strings
index 04f634ee0..cc5022d2a 100644
--- a/Riot/Assets/en.lproj/Bwi.strings
+++ b/Riot/Assets/en.lproj/Bwi.strings
@@ -539,3 +539,6 @@
 
 // MARK: - Accessibility declaration
 "bwi_accessibility_declaration_button_title" = "Accessibility declaration";
+
+// MARK: - Crypto Store migration
+"bwi_launch_loading_crypto_store_migration_info" = "Message encryption/decryption has been updated to improve app performance, this may take a few minutes. Please do not close the app during the update. The update is running.";
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index aed4ddca3..2f481b7f2 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -2573,25 +2573,24 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
     {
         MXLogDebug(@"[AppDelegate] showLaunchAnimation");
         
-        /* bwi: 4782 removed by nv
+        // bwi: #4905 show loading animation
         UIView *launchLoadingView;
-        if (MXSDKOptions.sharedInstance.enableStartupProgress)
+        if (BWIBuildSettings.shared.showBUMLottieAnimation)
         {
-            if (BWIBuildSettings.shared.showBUMLottieAnimation)
-            {
-                launchLoadingView = [BUMLaunchLoadingViewController makeView];
-            } else {
-                MXSession *mainSession = self.mxSessions.firstObject;
-                launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
-                [(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
-            }
+            launchLoadingView = [BUMLaunchLoadingViewController makeView];
             
-            launchLoadingView.frame = window.bounds;
-            launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-            
-            [window addSubview:launchLoadingView];
+        } else {
+            MXSession *mainSession = self.mxSessions.firstObject;
+            launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
+            [(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
         }
-         */
+        
+        launchLoadingView.frame = window.bounds;
+        launchLoadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        
+        [window addSubview:launchLoadingView];
+        launchAnimationContainerView = launchLoadingView;
+         
          
         /* bwi: 4782 - new code from nv
         MXSession *mainSession = self.mxSessions.firstObject;
diff --git a/Riot/Modules/LaunchLoading/LaunchLoadingView.swift b/Riot/Modules/LaunchLoading/LaunchLoadingView.swift
index c4cdee422..b3119cf0b 100644
--- a/Riot/Modules/LaunchLoading/LaunchLoadingView.swift
+++ b/Riot/Modules/LaunchLoading/LaunchLoadingView.swift
@@ -86,7 +86,11 @@ extension LaunchLoadingView: MXSessionStartupProgressDelegate {
         CATransaction.begin()
         progressContainer.isHidden = false
         progressView.progress = Float(state.progress)
-        statusLabel.text = state.showDelayWarning ? VectorL10n.launchLoadingDelayWarning : VectorL10n.launchLoadingGeneric
+        if state.stage == .storeMigration {
+            statusLabel.text = BWIL10n.bwiLaunchLoadingCryptoStoreMigrationInfo
+        } else {
+            statusLabel.text = state.showDelayWarning ? VectorL10n.launchLoadingDelayWarning : VectorL10n.launchLoadingGeneric
+        }
         CATransaction.commit()
     }
 }