Some more cleanup.

Wino.Mail.WinUI/Views/WelcomeHostPage.xaml.cs

@@ -25,19 +25,21 @@ public sealed partial class WelcomeHostPage : WelcomeHostPageAbstract,
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         base.OnNavigatedTo(e);
-
-        WeakReferenceMessenger.Default.Register<BreadcrumbNavigationRequested>(this);
-        WeakReferenceMessenger.Default.Register<BackBreadcrumNavigationRequested>(this);
-
         ResetWizard();
     }
 
-    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    protected override void RegisterRecipients()
     {
+        base.RegisterRecipients();
+        WeakReferenceMessenger.Default.Register<BreadcrumbNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Register<BackBreadcrumNavigationRequested>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
         WeakReferenceMessenger.Default.Unregister<BreadcrumbNavigationRequested>(this);
         WeakReferenceMessenger.Default.Unregister<BackBreadcrumNavigationRequested>(this);
-
-        base.OnNavigatingFrom(e);
     }
 
     public void Receive(BreadcrumbNavigationRequested message)

Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs

@@ -28,6 +28,7 @@ using Wino.Mail.ViewModels;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.WinUI.ViewModels;
 using Wino.Mail.WinUI.Controls;
+using Wino.Mail.WinUI.Helpers;
 using Wino.MenuFlyouts;
 using Wino.MenuFlyouts.Context;
 using Wino.Messaging.Client.Accounts;
@@ -127,6 +128,7 @@ public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
 
         navigationView.MenuItemsSource = null;
         CalendarHostListView.ItemsSource = null;
+        WindowCleanupHelper.CleanupFrame(InnerShellFrame);
     }
 
     private void OnLoaded(object sender, RoutedEventArgs e)