diff --git a/.editorconfig b/.editorconfig
index b06e6570..ba6b725a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,9 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
+[XamlTypeInfo.g.cs]
+dotnet_diagnostic.CS0612.severity = none
+dotnet_diagnostic.CS0618.severity = none
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
@@ -289,4 +292,4 @@ csharp_style_prefer_readonly_struct = true:suggestion
 csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
 csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
 csharp_style_prefer_primary_constructors = true:silent
-csharp_prefer_system_threading_lock = true:suggestion
\ No newline at end of file
+csharp_prefer_system_threading_lock = true:suggestion
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000..91271c54
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,191 @@
+# Copilot Instructions for Wino-Mail Project
+
+## Project Overview
+
+Wino Mail is a native Windows mail client targeting Windows 10 1809+ and Windows 11. The project is **transitioning from UWP to WinUI 3** - always work with WinUI projects (Wino.Mail.WinUI, Wino.Core.WinUI), never edit the old Wino.Mail UWP project.
+
+### Key Technologies
+- **WinUI 3** for UI (previously UWP/WinUI 2)
+- **MVVM Toolkit** (CommunityToolkit.Mvvm) for ViewModels with source generators
+- **Messenger** pattern (WeakReferenceMessenger.Default) for event pub-sub throughout the codebase
+- **SQLite** database stored in publisher cache folder (not local storage)
+- **WebView2** for mail rendering/composition with custom HTML/JavaScript editors
+- **MimeKit/MailKit** for IMAP/SMTP operations
+- **Microsoft Graph SDK** for Outlook synchronization
+- **Gmail API** for Gmail synchronization
+
+### Solution Structure
+```
+Wino.Core.Domain       → Entities, interfaces, translations, enums (shared contracts)
+Wino.Core              → Synchronization engine, authenticators, request processing
+Wino.Services          → Database, mail, folder, account services
+Wino.Mail.ViewModels   → Mail-specific ViewModels
+Wino.Core.ViewModels   → Shared ViewModels (settings, personalization)
+Wino.Mail.WinUI        → **Active WinUI 3 UI project** (use this)
+Wino.Mail              → **Deprecated UWP project** (DO NOT EDIT)
+```
+
+## Architecture Patterns
+
+### Mail Synchronization Flow
+1. **WinoRequestDelegator** → Validates and delegates user actions (mark read, delete, move)
+2. **WinoRequestProcessor** → Batches requests using RequestComparer, queues to synchronizers
+3. **Synchronizers** (OutlookSynchronizer, GmailSynchronizer, ImapSynchronizer) → Execute batched operations
+4. **ChangeProcessors** (OutlookChangeProcessor, etc.) → Apply changes to local database
+5. Database updates trigger **Messenger** events (MailAddedMessage, MailUpdatedMessage, etc.)
+
+### Queue-Based Sync (New Pattern - See QUEUE_SYNC_IMPLEMENTATION.md)
+- Initial sync now queues mail IDs first (MailItemQueue table), downloads metadata only (no MIME)
+- MIME content downloaded on-demand when user opens mail
+- Synchronizers override `QueueMailIdsForInitialSyncAsync()`, `DownloadMailsFromQueueAsync()`, `CreateMinimalMailCopyAsync()`
+- Check `MailItemFolder.IsInitialSyncCompleted` to determine sync state
+
+### Dependency Injection Setup
+Services registered in extension methods across projects:
+- `RegisterCoreServices()` in Wino.Core/CoreContainerSetup.cs
+- `RegisterSharedServices()` in Wino.Services/ServicesContainerSetup.cs
+- `RegisterCoreUWPServices()` in CoreUWPContainerSetup.cs
+- ViewModels registered in App.xaml.cs with AddTransient/AddSingleton
+
+### Messenger Pattern (Event Pub-Sub)
+- All ViewModels inherit from CoreBaseViewModel or MailBaseViewModel which implement IRecipient<T>
+- Register/unregister message handlers in `RegisterRecipients()` / `UnregisterRecipients()`
+- Send messages via `WeakReferenceMessenger.Default.Send(new MessageType(...))`
+- Common messages: MailAddedMessage, MailUpdatedMessage, NavigationRequested, ThemeChanged
+
+## ViewModels Development Guidelines
+
+### Observable Properties - Critical Pattern
+- **ALWAYS** use `public partial` observable properties with MVVM Toolkit source generators
+- **NEVER** use private fields with `[ObservableProperty]` attribute
+- **Correct:**
+  ```csharp
+  [ObservableProperty]
+  public partial string SearchQuery { get; set; } = string.Empty;
+  ```
+- **Incorrect:**
+  ```csharp
+  [ObservableProperty]
+  private string searchQuery = string.Empty;  // WRONG - will not work
+  ```
+
+### ViewModels Structure
+- Inherit from MailBaseViewModel (for mail features) or CoreBaseViewModel (for shared features)
+- Use `[RelayCommand]` for command methods - source generator creates Command properties
+- Implement IRecipient<TMessage> for message handlers
+- Use `IMailDialogService` for Mail-related dialogs, `IDialogServiceBase` for core dialogs
+- Call `RegisterRecipients()` in constructor/OnNavigatedTo, `UnregisterRecipients()` in OnNavigatedFrom
+
+## Localization System
+
+### Translation Workflow (Custom T4-based System)
+1. Add English strings ONLY to `Wino.Core.Domain/Translations/en_US/resources.json`
+2. Build the project - source generators automatically create Translator properties
+3. Use `Translator.{PropertyName}` in ViewModels, XAML (with x:Bind, OneTime mode)
+4. **NEVER** edit other language files - Crowdin manages translations automatically
+5. **NEVER** hardcode user-facing strings
+
+### Usage Examples
+```csharp
+// ViewModel
+_dialogService.InfoBarMessage(Translator.Info_MissingFolderTitle, message);
+
+// XAML
+<TextBlock Text="{x:Bind Translator.Settings_Title, Mode=OneTime}" />
+```
+
+## UI Data Binding and Converters
+
+### WinUI 3 Automatic Conversions
+- **NEVER** create IValueConverter classes or add them to Converters.xaml
+- **NEVER** use BoolToVisibilityConverter - WinUI 3 SDK automatically converts bool to Visibility
+- Direct binding: `Visibility="{x:Bind IsVisible, Mode=OneWay}"`
+- Register control events (for example `Loaded`, `Unloaded`, `SizeChanged`, `PointerEntered`) in XAML markup, not with `+=` in `.xaml.cs`.
+
+### XamlHelpers for Complex Conversions
+- **ALWAYS** use XamlHelpers static methods instead of converters
+- Add xmlns: `xmlns:helpers="using:Wino.Helpers"`
+- Usage: `{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(PropertyName), Mode=OneWay}`
+- Available methods: ReverseBoolToVisibilityConverter, CountToBooleanConverter, BoolToSelectionMode, Base64ToBitmapImage
+- Add new methods to XamlHelpers.cs when needed, don't create converters
+
+## WebView2 Mail Rendering
+
+### Architecture
+- **reader.html** (Wino.Mail.WinUI/JS/) for reading mails
+- **editor.html** for composing mails (uses Jodit editor, not Quill as originally planned)
+- WebView2 uses virtual host mapping: `https://wino.mail/reader.html`
+- JavaScript interop via `ExecuteScriptFunctionAsync()` to call functions like `RenderHTML()`
+- MIME content downloaded on-demand, not during sync
+
+### Key Patterns
+- Set environment variables for WebView2 before initialization (overlay scrollbars, cache)
+- Wait for DOMContentLoaded event before script execution
+- Handle theme changes by updating editor CSS dynamically
+- Cancel external navigation, open in browser via Launcher.LaunchUriAsync()
+
+## File Structure and Project Organization
+
+### Critical Rules
+- **NEVER** edit files in Wino.Mail (UWP) project - it's deprecated
+- **ALWAYS** work with Wino.Mail.WinUI for UI components
+- Place ViewModels in Wino.Mail.ViewModels (mail-specific) or Wino.Core.ViewModels (shared)
+- Create abstract base classes in Views/Abstract folders
+- Mail-specific dialog services go in Wino.Mail.WinUI/Services
+
+### Database and Storage
+- SQLite database in publisher cache folder (not app local storage)
+- EML files stored in app local storage, referenced by MailCopy.FileId
+- Paths resolved via MimeFileService.GetMimeMessagePath()
+- Database entities in Wino.Core.Domain/Entities
+
+## Error Handling and User Feedback
+
+### Exception Handling Patterns
+```csharp
+try {
+    await operation();
+} catch (UnavailableSpecialFolderException ex) {
+    _dialogService.InfoBarMessage(title, message, InfoBarMessageType.Warning, buttonText, action);
+} catch (NotImplementedException) {
+    _dialogService.ShowNotSupportedMessage();
+}
+```
+
+### Dialog Service Methods
+- `InfoBarMessage()` - simple notifications with optional action button
+- `ShowConfirmationDialogAsync()` - yes/no dialogs
+- `PickFilesAsync()` - file selection
+- Always check for null/empty results from dialog operations
+
+## Code Style and Best Practices
+
+- Use `var` where type is obvious from right side
+- String interpolation over string.Format for simple cases
+- Keep methods focused and single-responsibility
+- Add XML documentation for public APIs
+- Avoid introducing new NuGet packages - maximize use of existing libraries
+- Wrap async operations in try-catch blocks
+- Log errors via IWinoLogger but don't expose technical details to users
+
+## Development Workflow
+
+### Building and Running
+- Open WinoMail.slnx in Visual Studio 2022+
+- Target platforms: x86, x64, ARM64 (ARM32 being phased out)
+- Minimum: Windows 10 1809, Target: Windows 11 22H2
+- Set Wino.Mail.WinUI as startup project
+
+### Testing
+- Test suite in Wino.Core.Tests
+- Manual testing required for UI/WebView2 interactions
+- Test synchronization with real accounts when modifying synchronizers
+
+### Common Pitfalls
+- Forgetting to register ViewModels in App.xaml.cs RegisterViewModels()
+- Not calling RegisterRecipients() for message handlers
+- Using private fields with [ObservableProperty] (won't work - must be public partial)
+- Creating IValueConverter classes instead of using XamlHelpers
+- Editing UWP project files instead of WinUI equivalents
+- Hardcoding strings instead of using Translator
+- Forgetting to unregister Messenger recipients (memory leaks)
diff --git a/.github/workflows/pr-winui-build.yml b/.github/workflows/pr-winui-build.yml
new file mode 100644
index 00000000..93be3bc4
--- /dev/null
+++ b/.github/workflows/pr-winui-build.yml
@@ -0,0 +1,125 @@
+name: PR WinUI Build
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  build-winui:
+    name: Build project (${{ matrix.platform }})
+    if: github.event.pull_request.draft == false
+    runs-on: windows-latest
+    continue-on-error: ${{ contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association) }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: x86
+            rid: win-x86
+          - platform: x64
+            rid: win-x64
+          - platform: ARM64
+            rid: win-arm64
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+          source-url: https://nuget.pkg.github.com/bkaankose/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Restore WinUI project dependencies
+        run: dotnet restore Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configfile nuget.config -p:Platform=${{ matrix.platform }} -p:RuntimeIdentifier=${{ matrix.rid }}
+
+      - name: Build WinUI project
+        run: dotnet build Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configuration Release --no-restore -p:Platform=${{ matrix.platform }} -p:RuntimeIdentifier=${{ matrix.rid }} -p:GenerateAppxPackageOnBuild=false -p:AppxPackageSigningEnabled=false
+
+  core-tests:
+    name: Run Core tests
+    if: github.event.pull_request.draft == false
+    runs-on: windows-latest
+    continue-on-error: ${{ contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association) }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+          source-url: https://nuget.pkg.github.com/bkaankose/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Restore Core test projects
+        shell: pwsh
+        run: |
+          $coreTests = Get-ChildItem -Path . -Recurse -Filter "*Core*.Tests.csproj" | ForEach-Object { $_.FullName }
+          if (-not $coreTests) {
+            throw "No Core test projects were found."
+          }
+
+          foreach ($project in $coreTests) {
+            dotnet restore $project --configfile nuget.config
+          }
+
+      - name: Run Core test projects
+        shell: pwsh
+        run: |
+          New-Item -ItemType Directory -Path TestResults -Force | Out-Null
+          $coreTests = Get-ChildItem -Path . -Recurse -Filter "*Core*.Tests.csproj"
+          if (-not $coreTests) {
+            throw "No Core test projects were found."
+          }
+
+          foreach ($project in $coreTests) {
+            $name = $project.BaseName
+            dotnet test $project.FullName --configuration Release --no-restore --verbosity normal --logger "trx;LogFileName=$name.trx" --results-directory TestResults
+          }
+
+      - name: Upload Core test result artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-test-results
+          path: TestResults/*.trx
+          if-no-files-found: warn
+
+      - name: Publish Core test report
+        if: always()
+        uses: EnricoMi/publish-unit-test-result-action/windows@v2
+        with:
+          trx_files: TestResults/*.trx
+          check_name: Core test results
+
+  enforce-for-non-maintainers:
+    name: Enforce required checks (non-maintainers)
+    if: github.event.pull_request.draft == false && !contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association)
+    runs-on: ubuntu-latest
+    needs:
+      - build-winui
+      - core-tests
+
+    steps:
+      - name: Fail when build or tests fail for non-maintainers
+        if: needs.build-winui.result != 'success' || needs.core-tests.result != 'success'
+        run: |
+          echo "WinUI build and Core tests must pass for non-maintainer pull requests."
+          exit 1
+
+      - name: Confirm build and test success for non-maintainers
+        run: echo "WinUI build and Core tests passed."
diff --git a/.gitignore b/.gitignore
index cfa63f40..b19b3eb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -399,3 +399,4 @@ Wino/obj/x86/Debug/XamlSaveStateFile.xml
 Wino/obj/x86/Debug/XamlSaveStateFile.xml
 *.cache
 .vs/Wino/v16/.suo
+/.claude/settings.local.json
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..08771976
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,160 @@
+# AGENTS.md
+
+This file provides guidance to AI agent when working with code in this repository.
+
+## Project Overview
+
+Wino Mail is a native Windows mail client (Windows 10 1809+ / Windows 11) replacing the deprecated Windows Mail & Calendar. It's **transitioning from UWP to WinUI 3** - always work with WinUI projects (Wino.Mail.WinUI), never edit the deprecated Wino.Mail UWP project.
+
+## Build and Development Commands
+
+```bash
+# Open solution
+# WinoMail.slnx is the main solution file (VS 2022+)
+
+# Build WinUI project (Debug x64)
+dotnet restore Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configfile nuget.config -p:Platform=x64 -p:RuntimeIdentifier=win-x64 && dotnet build Wino.Mail.WinUI/Wino.Mail.WinUI.csproj -c Debug --no-restore /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:GenerateAppxPackageOnBuild=false /p:AppxPackageSigningEnabled=false
+
+# Build WinUI project with diagnostic XAML/compiler logging (use when plain build only shows "XamlCompiler.exe exited with code 1")
+dotnet build Wino.Mail.WinUI/Wino.Mail.WinUI.csproj -c Debug --no-restore /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:GenerateAppxPackageOnBuild=false /p:AppxPackageSigningEnabled=false "/flp:logfile=winui-build.log;verbosity=diagnostic" /bl:winui-build.binlog
+
+# Run tests (Debug x64)
+dotnet test Wino.Core.Tests/Wino.Core.Tests.csproj -c Debug /p:Platform=x64
+
+# Copilot CLI build command (Debug x64)
+dotnet restore Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configfile nuget.config -p:Platform=x64 -p:RuntimeIdentifier=win-x64 && dotnet build Wino.Mail.WinUI/Wino.Mail.WinUI.csproj -c Debug --no-restore /p:Platform=x64 /p:RuntimeIdentifier=win-x64 /p:GenerateAppxPackageOnBuild=false /p:AppxPackageSigningEnabled=false
+```
+
+**Prerequisites:** Visual Studio 2022+ with ".NET desktop development" workload, .NET SDK 10+
+
+**Startup project:** Wino.Mail.WinUI
+
+**Platforms:** x86, x64, ARM64
+
+## Efficient Workflow
+
+- Start with targeted symbol or file search before reading full files
+- Prefer one focused task per thread; use a new thread for unrelated follow-up work
+- Keep verification narrow: build only the affected project, not the full solution, unless cross-project changes require it
+- After the first restore, prefer `--no-restore` builds unless package or project references changed
+- Summarize long build logs and inspect only the files named in diagnostics instead of loading large logs into context
+- When the prompt already names likely files, types, or symbols, start there instead of re-mapping the repository
+- If a WinUI build only reports `XamlCompiler.exe exited with code 1`, rerun with the diagnostic logging command above and inspect the terminal output plus `winui-build.log` for real `WMC`/`WMC1121`/binding diagnostics before guessing
+
+## Architecture
+
+### Solution Structure
+```
+Wino.Core.Domain       → Entities, interfaces, translations, enums (shared contracts)
+Wino.Core              → Synchronization engine, authenticators, request processing
+Wino.Services          → Database, mail, folder, account services
+Wino.Authentication    → OAuth2 authenticators (Outlook, Gmail)
+Wino.Mail.ViewModels   → Mail-specific ViewModels
+Wino.Core.ViewModels   → Shared ViewModels (settings, personalization)
+Wino.Messaging         → Pub-sub message definitions
+Wino.Mail.WinUI        → **Active WinUI 3 UI project** (use this)
+Wino.Mail              → **Deprecated UWP project** (DO NOT EDIT)
+```
+
+### Mail Synchronization Flow
+1. **WinoRequestDelegator** → Validates and delegates user actions (mark read, delete, move)
+2. **WinoRequestProcessor** → Batches requests using RequestComparer, queues to synchronizers
+3. **Synchronizers** (OutlookSynchronizer, GmailSynchronizer, ImapSynchronizer) → Execute batched operations
+4. **ChangeProcessors** → Apply changes to local SQLite database
+5. Database updates trigger **Messenger** events (MailAddedMessage, MailUpdatedMessage, etc.)
+
+### Synchronizer Types
+- **OutlookSynchronizer** - Microsoft Graph SDK for Office 365
+- **GmailSynchronizer** - Gmail API
+- **ImapSynchronizer** - MimeKit/MailKit for IMAP/SMTP
+
+### Queue-Based Sync Pattern
+- Initial sync queues mail IDs first (MailItemQueue table), downloads metadata only
+- MIME content downloaded on-demand when user opens mail
+- Check `MailItemFolder.IsInitialSyncCompleted` for sync state
+- See QUEUE_SYNC_IMPLEMENTATION.md for details
+
+### Dependency Injection
+- `RegisterCoreServices()` in Wino.Core/CoreContainerSetup.cs
+- `RegisterSharedServices()` in Wino.Services/ServicesContainerSetup.cs
+- ViewModels registered in App.xaml.cs
+
+## Key Patterns
+
+### MVVM with Source Generators
+**CORRECT - use public partial properties:**
+```csharp
+[ObservableProperty]
+public partial string SearchQuery { get; set; } = string.Empty;
+```
+
+**WRONG - will not work:**
+```csharp
+[ObservableProperty]
+private string searchQuery = string.Empty;
+```
+
+### Messenger Pattern
+- ViewModels inherit from CoreBaseViewModel or MailBaseViewModel
+- Register handlers in `RegisterRecipients()`, unregister in `UnregisterRecipients()`
+- Send via `WeakReferenceMessenger.Default.Send(new MessageType(...))`
+
+### Data Binding - No Converters
+- **NEVER** create IValueConverter classes
+- WinUI 3 auto-converts bool to Visibility: `Visibility="{x:Bind IsVisible, Mode=OneWay}"`
+- Use XamlHelpers for complex conversions: `{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(Prop)}`
+- `x:Bind` does not implicitly convert `double` to `GridLength`; when binding `RowDefinition.Height` or `ColumnDefinition.Width`, use a `XamlHelpers` method such as `DoubleToGridLength(...)`
+- For `ComboBox` controls in XAML, never use `DisplayMemberPath` or `SelectedValuePath`; use a typed `ItemTemplate` and bind `SelectedItem` explicitly, preferably with `x:Bind`
+
+## Localization
+
+1. Add English strings ONLY to Wino.Core.Domain/Translations/en_US/resources.json
+2. Build project - source generators create Translator properties
+3. Use Translator.{PropertyName} in code/XAML
+4. NEVER edit any resources.json file outside Wino.Core.Domain/Translations/en_US/resources.json
+5. Treat all non-en_US translation files as managed externally and leave them untouched, even when adding new localization keys
+
+## Storage
+
+- **SQLite database** in publisher cache folder (shared with future Wino Calendar)
+- **EML files** in app local storage, referenced by `MailCopy.FileId`
+- Paths resolved via `MimeFileService.GetMimeMessagePath()`
+
+## WebView2 Mail Rendering
+
+- `reader.html` for reading mails, `editor.html` for composing (Jodit editor)
+- Virtual host mapping: `https://wino.mail/reader.html`
+- JavaScript interop via `ExecuteScriptFunctionAsync()`
+- MIME content downloaded on-demand, not during sync
+
+## Common Pitfalls
+
+- Forgetting to register ViewModels in App.xaml.cs `RegisterViewModels()`
+- Not calling `RegisterRecipients()` for message handlers
+- Using private fields with `[ObservableProperty]` instead of public partial
+- Creating IValueConverter classes instead of using XamlHelpers
+- Editing UWP project files instead of WinUI equivalents
+- Hardcoding strings instead of using Translator
+- Forgetting to unregister Messenger recipients (memory leaks)
+- Putting authentication validation, token refresh, account API calls, settings serialization/deserialization, or preference-application logic into ViewModels instead of the corresponding service
+
+## Code Style
+
+- Avoid introducing new NuGet packages when possible
+- Use existing libraries (MimeKit, MailKit, Microsoft Graph, Gmail API)
+- Use `var` where type is obvious
+- String interpolation over string.Format
+- Wrap async operations in try-catch
+- Log errors via IWinoLogger
+- For dependency properties in WinUI code, always prefer `[GeneratedDependencyProperty]` from CommunityToolkit over manual `DependencyProperty.Register(...)` declarations.
+- When a `[RelayCommand]` needs enable/disable logic, prefer the command's `CanExecute` over binding `Button.IsEnabled` in XAML; use `[NotifyCanExecuteChangedFor]` on dependent properties and call `NotifyCanExecuteChanged()` explicitly when non-generated state affects the command.
+- In ViewModels, update all UI-bound properties/collections via `ExecuteUIThread(...)` (especially after awaited calls and any use of `ConfigureAwait(false)`).
+- ViewModels should only handle UI interaction/state and delegate business logic to services; account-management work belongs in `WinoAccountProfileService`, and preferences import/export/apply logic belongs in `PreferencesService`.
+- In `EventDetailsPageViewModel.LoadAttendeesAsync`, never mutate `CurrentEvent.Attendees` outside `ExecuteUIThread(...)`.
+- Never create pure C# controls or controls that heavily manipulate UI structure from `.cs` files. Define controls in XAML and keep UI composition in XAML.
+- Never add XAML-backed UI controls to `.xaml.cs`. If a view has XAML, all control declarations, flyouts, templates, and visual composition belong in the `.xaml` file; keep `.xaml.cs` limited to event handling and view glue.
+- Never subscribe to framework events like `Loaded`, `Unloaded`, or input events from constructors in `.xaml.cs` for XAML-backed controls and pages; wire them directly in XAML instead.
+- If you use `x:Load` in XAML, always give that `UIElement` an `x:Name`.
+
+
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
index c6262929..e0dee889 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,66 +3,78 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="ColorHashSharp" Version="1.0.0" />
-    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
-    <PackageVersion Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250402" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Primitives" Version="8.2.250129-preview2" />
+    <PackageVersion Include="ColorHashSharp" Version="1.1.0" />
+    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.2" />
+    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.2" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.TabbedCommandBar" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250926-build.2293" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Lottie" Version="8.2.250604" />
+    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" Version="0.1.250926-build.2293" />
     <PackageVersion Include="EmailValidation" Version="1.3.0" />
     <PackageVersion Include="gravatar-dotnet" Version="0.1.3" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.12.0" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
     <PackageVersion Include="Ical.Net" Version="4.3.1" />
     <PackageVersion Include="IsExternalInit" Version="1.0.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Graph" Version="5.75.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.70.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.70.1" />
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.70.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Graph" Version="5.103.0" />
+    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.4.0" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.83.3" />
+    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.82.1" />
+    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.82.1" />
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
-    <PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
-    <PackageVersion Include="MimeKit" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.1" />
+    <PackageVersion Include="Wino.Mail.Contracts" Version="1.0.17" />
+    <PackageVersion Include="MimeKit" Version="4.15.1" />
     <PackageVersion Include="morelinq" Version="4.4.0" />
     <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-    <PackageVersion Include="NodaTime" Version="3.2.2" />
-    <PackageVersion Include="Sentry.Serilog" Version="5.12.0" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="NodaTime" Version="3.3.1" />
+    <PackageVersion Include="Sentry.Serilog" Version="6.3.0" />
+    <PackageVersion Include="Serilog" Version="4.3.1" />
     <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
-    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
-    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="SqlKata" Version="4.0.1" />
+    <PackageVersion Include="SkiaSharp" Version="3.119.2" />
+    <PackageVersion Include="SkiaSharp.Views.WinUI" Version="3.119.2" />
+    <PackageVersion Include="sqlite-net-pcl" Version="1.10.196-beta" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.5" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
-    <PackageVersion Include="Win2D.uwp" Version="1.28.2" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
+    <PackageVersion Include="H.NotifyIcon.WinUI" Version="2.4.1" />
     <PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
-    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
-    <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
-    <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
+    <PackageVersion Include="Google.Apis.Auth" Version="1.73.0" />
+    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.73.0.4063" />
+    <PackageVersion Include="Google.Apis.Drive.v3" Version="1.73.0.4068" />
+    <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.73.0.4029" />
+    <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.72.0.3973" />
     <PackageVersion Include="HtmlKit" Version="1.2.0" />
-    <PackageVersion Include="MailKit" Version="4.11.0" />
+    <PackageVersion Include="MailKit" Version="4.15.1" />
     <PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.6" />
-    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.4" />
+    <PackageVersion Include="System.Reactive" Version="6.1.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.28000.1721" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.250930001-experimental1" />
+    <PackageVersion Include="WinUIEx" Version="2.9.0" />
+    <!-- Testing packages -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="FluentAssertions" Version="8.8.0" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 93f88c5c..a4dd1da0 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,54 @@
-
 <p align="center">
-  <a href="https://apps.microsoft.com/detail/Wino%20Mail/9NCRCVJC50WL?launch=true
-	&mode=full">
-    <img src="https://www.winomail.app/images/wino_logo.png" width=90 height=90>
+  <a href="https://apps.microsoft.com/detail/Wino%20Mail/9NCRCVJC50WL?launch=true&mode=full">
+    <img src="https://www.winomail.app/images/v2/Logo.png" width="90" height="90" alt="Wino Mail logo">
   </a>
 
   <h3 align="center">Wino Mail</h3>
 
   <p align="center">
-    Native mail client for Windows device families. 
+    Native mail and calendar client for Windows.
   </p>
 </p>
 
 <br>
 
-![pdark](https://user-images.githubusercontent.com/12009960/232114528-2d2c8e3c-dbe7-429a-94e0-6aecc73bdf70.png)
+![Wino Mail screenshot](https://user-images.githubusercontent.com/12009960/232114528-2d2c8e3c-dbe7-429a-94e0-6aecc73bdf70.png)
 
 ## Motivation
 
-I'm a big fan of Windows Mail & Calendars due to its simplicity. Personally, I find it more intuitive for daily use cases compared to Outlook desktop and the new WebView2 powered Outlook version. Seeing [Microsoft deprecating it](https://support.microsoft.com/en-us/office/outlook-for-windows-the-future-of-mail-calendar-and-people-on-windows-11-715fc27c-e0f4-4652-9174-47faa751b199#:~:text=The%20Mail%20and%20Calendar%20applications,will%20no%20longer%20be%20supported.) dragged me into starting to work on Wino a couple of years ago. Wino's main motivation is to bring all the existing functionality from Mail & Calendars over time without changing the user experience that millions have loved since the Windows 8 days in Mail & Calendars
+I'm a big fan of Windows Mail & Calendars due to its simplicity. Personally, I find it more intuitive for daily use cases compared to Outlook desktop and the new WebView2 powered Outlook version. Seeing [Microsoft deprecating it](https://support.microsoft.com/en-us/office/outlook-for-windows-the-future-of-mail-calendar-and-people-on-windows-11-715fc27c-e0f4-4652-9174-47faa751b199#:~:text=The%20Mail%20and%20Calendar%20applications,will%20no%20longer%20be%20supported.) dragged me into starting to work on Wino a couple of years ago. Wino's main motivation is to bring all the existing functionality from Mail & Calendars over time without changing the user experience that millions have loved since the Windows 8 days in Mail & Calendars.
+
+## vNext Release Highlights
+
+Wino vNext focuses on making Mail, Calendar, and Contacts feel like one cohesive native Windows experience while improving sync reliability and startup responsiveness.
+
+- 📅 **Calendar management:** Event compose/create flow, calendar-mail mapping, reminder snooze support, occurrence and detail-page improvements, and CalDAV correctness fixes.
+- 👥 **Contact management:** Improved contact workflows, account/settings integration, and contact data-model cleanup.
+- 🔄 **Synchronization reliability:** Refactored synchronizers, better state handling, 404 + 429 error handling, and duplicate-operation prevention.
+- ✉️ **Compose and drafts:** Refined editor/toolbar architecture, better rendering pipeline, Gmail draft support, and large Outlook attachment upload sessions.
+- ⚡ **Performance and quality:** Faster mail fetching with batched DB queries and caching, SQLite indexing/foreign key enforcement, and broader test + CI coverage.
+- 🎨 **WinUI polish:** Improved onboarding/startup, settings and dialogs refresh, notification routing fixes, and keyboard/navigation quality-of-life improvements.
 
 ## Features
 
-- API integration for Outlook and Gmail
-- IMAP/SMTP support for custom mail servers
-- Send, receive, mark as (read,important,spam etc), move mails.
-- Linked/Merged Accounts
-- Toast notifications with background sync.
-- Instant startup performance
-- Offline use / search.
-- Modern and responsive UI
-- Lots of personalization options
-- Dark / Light mode for mail reader
+- 📨 Outlook and Gmail API integration
+- 🌐 IMAP/SMTP support for custom mail servers
+- 📅 Calendar support with event creation/compose and reminders
+- 👥 Contact management and people-centric account experience
+- ✅ Core mail actions: send, receive, read/unread, move, spam, and more
+- 🔗 Linked/Merged accounts
+- 🔔 Toast notifications with background sync
+- ⚡ Instant startup-oriented architecture
+- 🔎 Offline-capable workflows and search improvements
+- 🎛️ Modern responsive WinUI interface with personalization options
+- 🌗 Dark/Light mode for mail reader and app surfaces
 
 ## Download
 
 Download latest version of Wino Mail from Microsoft Store for free.
 
-<a href="https://apps.microsoft.com/detail/Wino%20Mail/9NCRCVJC50WL?launch=true
-	&mode=full">
-	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
+<a href="https://apps.microsoft.com/detail/Wino%20Mail/9NCRCVJC50WL?launch=true&mode=full">
+	<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200" alt="Get Wino Mail from Microsoft Store"/>
 </a>
 
 ## Beta Releases
@@ -48,7 +57,6 @@ Stable releases will always be distributed on Microsoft Store. However, beta rel
 
 These releases are distributed as side-loaded packages. To install them, download the **.msixbundle** file in GitHub releases and [follow the steps explained here.](https://learn.microsoft.com/en-us/windows/application-management/sideload-apps-in-windows)
 
-
 ## Contributing
 
 Check out the [contribution guidelines](/CONTRIBUTING.md) before diving into the source code or opening an issue. There are multiple ways to contribute and all of them are explained in detail there.
@@ -59,3 +67,4 @@ Your donations will motivate me more to work on Wino in my spare time and cover
 
 - You can [donate via Paypal by clicking here](https://www.paypal.com/donate/?hosted_button_id=LGPERGGXFMQ7U)
 - You can buy Unlimited Accounts add-on in the application. It's a one-time payment for lifetime, not a monthly recurring payment.
+
diff --git a/RELEASE_NOTES_vNext.md b/RELEASE_NOTES_vNext.md
new file mode 100644
index 00000000..3625fe02
--- /dev/null
+++ b/RELEASE_NOTES_vNext.md
@@ -0,0 +1,158 @@
+# Wino Mail vNext Improvements
+
+This document summarizes the major improvements on `feature/vNext` compared to `main`, based on the commit history between the current branch and the merge-base with `main`.
+
+## Wino Calendar
+
+Calendar has grown from an early implementation into a much more complete product area on this branch.
+
+### A full Wino Calendar experience
+
+- Added a dedicated Wino Calendar app entry, making calendar a first-class experience instead of a secondary add-on.
+- Built out the calendar rendering experience with multiple rounds of rendering improvements, updated calendar view styling, calendar buttons, and better event visuals.
+- Added event creation and full event compose flows, including follow-up improvements for attachments, attendees, recurrence summaries, RSVP actions, reminders, and event details.
+- Improved support for all-day events, better display dates, occurrence handling, and mail-to-calendar mapping so calendar actions connect more naturally with messages and invitations.
+
+### Local calendar support
+
+- Added local calendar operation coverage and supporting behavior for IMAP-backed/local calendar scenarios.
+- Prevented duplicate operations by ignoring local calendar apply-changes in the wrong paths.
+- Added busy-state support and metadata fetch flows so newly created accounts can initialize calendar data more reliably.
+
+### CalDAV sync
+
+- Introduced a dedicated CalDAV synchronizer and supporting service/client work.
+- Fixed CalDAV delta sync issues.
+- Fixed CalDAV timezone issues.
+- Added manual live CalDAV workflow tests to validate real-world sync behavior.
+
+This means local and self-hosted calendar scenarios are much better represented on this branch than on `main`.
+
+### API calendar sync for Outlook and Gmail
+
+- Expanded Outlook calendar sync behavior, including broader sync windows and fixes around date/time handling.
+- Improved Gmail drafting and mail/calendar integration so event-related actions work better across providers.
+- Added mail and calendar synchronizer state tracking to make sync progress and error handling more reliable.
+- Added auto calendar sync on account creation and broader auto-sync trigger and cancellation support.
+
+### Calendar polish and reliability
+
+- Fixed calendar crashes and null-handling issues in calendar view date range updates.
+- Fixed double initialization in calendar day views.
+- Improved reaction to calendar changes and calendar item update-source handling.
+- Added reminder snooze support across toast UI, services, and database storage.
+
+Overall, Wino Calendar is one of the biggest themes of this branch: richer UI, more complete event workflows, and real sync support across local, CalDAV, Outlook, and Gmail-backed scenarios.
+
+## Wino Accounts
+
+Wino Accounts was significantly expanded and polished on this branch.
+
+### Account flows and identity
+
+- Added sign in, sign out, and registration flows.
+- Redesigned login and registration dialogs.
+- Added privacy policy presentation during registration.
+- Added forgot password and email confirmation flows.
+- Pointed the app to the real API and improved profile caching.
+
+### Account management and settings
+
+- Added Wino account settings and a dedicated management page.
+- Added a special navigation item for Wino Accounts.
+- Added import functionality for Wino Accounts.
+- Added a preference to hide the title bar Wino account button.
+- Improved the top-shell account icon and signed-out identity visuals.
+
+### Purchases and add-ons
+
+- Added handling for Paddle purchases and add-ons.
+- Added purchase-success deep linking.
+- Added support for AI pack handling through the Microsoft Store.
+
+### User-facing polish
+
+- Redesigned the Wino Account flyout and menu with a more polished Fluent-style presentation.
+- Improved account cleanup behavior when an account is deleted.
+- Added account attention handling and better account details/settings behavior.
+
+Compared to `main`, this branch turns Wino Accounts into a much more complete platform feature rather than a minimal sign-in surface.
+
+## Improved Stability and Reliability
+
+A large part of this branch is about making the app more dependable in everyday use.
+
+### Synchronization stability
+
+- Refactored synchronizers to address long-standing reliability issues.
+- Improved thread mapping across synchronizers.
+- Added generic 404 handling for synchronizers.
+- Added specific Outlook 429 handling for rate-limit scenarios.
+- Improved Outlook authentication and Outlook sync reliability.
+- Improved Gmail synchronizer behavior.
+- Added explicit mail and calendar synchronizer state support.
+
+### Mail and data reliability
+
+- Optimized mail fetching with batched database queries and in-memory caching.
+- Added SQLite indexes and enabled foreign key enforcement.
+- Switched away from the old mail item queue approach and returned to a simpler initial sync strategy.
+- Improved local draft resend behavior and added grace-period handling for local drafts.
+- Added better handling for large Outlook attachments via upload sessions.
+- Fixed issues with sent/draft placement, loading mails with infinite scroll, selection cleanup, and deleted-object scenarios.
+
+### UI and lifecycle stability
+
+- Fixed mail rendering page disposal issues.
+- Fixed WebView2 runtime toast dispatching on the UI thread.
+- Fixed startup mode issues, single-instancing problems, and shell/navigation regressions.
+- Fixed multiple thread selection, container, flicker, and context-menu issues.
+- Fixed crashes and null-reference style issues in several calendar and shell flows.
+
+### Engineering quality
+
+- Added more tests across calendar, CalDAV, IMAP, view-model, sanitization, and account sync scenarios.
+- Added a GitHub Actions workflow to build WinUI and run Core tests on pull requests.
+- Resolved warnings and moved the WinUI project toward warnings-as-errors discipline.
+- Added AOT compatibility work and related cleanup across the app.
+
+The branch is not just adding features; it is also clearly reducing failure points throughout sync, rendering, navigation, and storage.
+
+## Contacts, Settings, and General UX
+
+This branch also improves the everyday product experience outside mail and calendar core flows.
+
+### Contacts
+
+- Added contacts management.
+- Improved contacts UI and related thread/image preview behavior.
+- Removed legacy SQLite base64 contact storage from `AccountContact`.
+- Added contact picture handling support and supporting contact service improvements.
+
+### Settings
+
+- Added a dedicated settings shell and refactored settings home/navigation.
+- Expanded settings UI and introduced new setting options.
+- Added calendar settings into the settings experience.
+- Improved account details/settings pages and storage settings navigation.
+- Refined settings visuals, shell integration, and menu behavior.
+
+### Onboarding and app experience
+
+- Added a new startup window and a more guided onboarding flow with wizard-like steps.
+- Added a "What's New" implementation for feature communication.
+- Improved dialogs, title bar behavior, shell content, navigation, and shell polish across multiple iterations.
+- Added live store update notifications.
+- Improved keyboard shortcuts and related dialogs.
+- Added tray icon support and better toast routing between mail and calendar app entries.
+
+## Summary
+
+Compared to `main`, `feature/vNext` delivers four major leaps:
+
+1. Wino Calendar becomes a substantially more complete feature set, including local calendar support, CalDAV sync, and stronger Outlook and Gmail calendar integration.
+2. Wino Accounts becomes a real product surface with better authentication flows, management, imports, purchases, and polish.
+3. The app is more stable thanks to synchronization refactors, storage improvements, test expansion, and many crash and lifecycle fixes.
+4. Contacts, settings, onboarding, and shell/navigation experience all feel more mature and more consistent.
+
+In short, this branch is a broad product maturation release rather than a narrow feature drop.
diff --git a/Wino.Authentication/OutlookAuthenticator.cs b/Wino.Authentication/OutlookAuthenticator.cs
index 10bc5f26..156cc321 100644
--- a/Wino.Authentication/OutlookAuthenticator.cs
+++ b/Wino.Authentication/OutlookAuthenticator.cs
@@ -24,12 +24,14 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
     public override MailProviderType ProviderType => MailProviderType.Outlook;
 
     private readonly IPublicClientApplication _publicClientApplication;
+    private readonly INativeAppService _nativeAppService;
     private readonly IApplicationConfiguration _applicationConfiguration;
 
     public OutlookAuthenticator(INativeAppService nativeAppService,
                                 IApplicationConfiguration applicationConfiguration,
                                 IAuthenticatorConfig authenticatorConfig) : base(authenticatorConfig)
     {
+        _nativeAppService = nativeAppService;
         _applicationConfiguration = applicationConfiguration;
 
         var authenticationRedirectUri = nativeAppService.GetWebAuthenticationBrokerUri();
@@ -40,11 +42,25 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
             ListOperatingSystemAccounts = true,
         };
 
-        var outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
-            .WithParentActivityOrWindow(nativeAppService.GetCoreWindowHwnd)
-            .WithBroker(options)
-            .WithDefaultRedirectUri()
-            .WithAuthority(Authority);
+        PublicClientApplicationBuilder outlookAppBuilder = null;
+
+        // Being created from an app notification.
+        // This is where we avoid all interactive shit for authentication.
+        if (nativeAppService.GetCoreWindowHwnd == null)
+        {
+            outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
+                .WithDefaultRedirectUri()
+                .WithBroker(options)
+                .WithAuthority(Authority);
+        }
+        else
+        {
+            outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
+                .WithBroker(options)
+                .WithParentActivityOrWindow(_nativeAppService.GetCoreWindowHwnd)
+                .WithDefaultRedirectUri()
+                .WithAuthority(Authority);
+        }
 
         _publicClientApplication = outlookAppBuilder.Build();
     }
@@ -82,7 +98,8 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
         catch (MsalUiRequiredException)
         {
             // Somehow MSAL is not able to refresh the token silently.
-            // Force interactive login.
+            // Force interactive login which will include calendar scopes.
+            // The calling code should update account.IsCalendarAccessGranted = true after successful authentication.
 
             return await GenerateTokenInformationAsync(account);
         }
@@ -98,7 +115,13 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
         {
             await EnsureTokenCacheAttachedAsync();
 
-            var authResult = await _publicClientApplication
+            // Interactive authentication required but window doesn't exist.
+            // This can happen when being called from a notification background task and the token is expired.
+            // Force account attention;
+
+            if (_nativeAppService.GetCoreWindowHwnd == null) throw new AuthenticationAttentionException(account);
+
+            AuthenticationResult authResult = await _publicClientApplication
                 .AcquireTokenInteractive(Scope)
                 .ExecuteAsync();
 
diff --git a/Wino.Authentication/Wino.Authentication.csproj b/Wino.Authentication/Wino.Authentication.csproj
index 3c7c77ce..86d3b5e3 100644
--- a/Wino.Authentication/Wino.Authentication.csproj
+++ b/Wino.Authentication/Wino.Authentication.csproj
@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<RootNamespace>Wino.Authentication</RootNamespace>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Diagnostics" />
diff --git a/Wino.BackgroundTasks/AppUpdatedTask.cs b/Wino.BackgroundTasks/AppUpdatedTask.cs
deleted file mode 100644
index 1a70899f..00000000
--- a/Wino.BackgroundTasks/AppUpdatedTask.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Microsoft.Toolkit.Uwp.Notifications;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Background;
-
-namespace Wino.BackgroundTasks
-{
-    /// <summary>
-    /// Creates a toast notification to notify user when the Store update happens.
-    /// </summary>
-    public sealed class AppUpdatedTask : IBackgroundTask
-    {
-        public void Run(IBackgroundTaskInstance taskInstance)
-        {
-            var def = taskInstance.GetDeferral();
-
-            var builder = new ToastContentBuilder();
-            builder.SetToastScenario(ToastScenario.Default);
-
-            Package package = Package.Current;
-            PackageId packageId = package.Id;
-            PackageVersion version = packageId.Version;
-
-            var versionText = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-
-            // TODO: Handle with Translator, but it's not initialized here yet.
-            builder.AddText("Wino Mail is updated!");
-            builder.AddText(string.Format("New version {0} is ready.", versionText));
-
-            builder.Show();
-
-            def.Complete();
-        }
-    }
-}
diff --git a/Wino.BackgroundTasks/Properties/AssemblyInfo.cs b/Wino.BackgroundTasks/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9887885d..00000000
--- a/Wino.BackgroundTasks/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Wino.BackgroundTasks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Wino.BackgroundTasks")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Wino.BackgroundTasks/Wino.BackgroundTasks.csproj b/Wino.BackgroundTasks/Wino.BackgroundTasks.csproj
deleted file mode 100644
index 67f9296c..00000000
--- a/Wino.BackgroundTasks/Wino.BackgroundTasks.csproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D9EF0F59-F5F2-4D6C-A5BA-84043D8F3E08}</ProjectGuid>
-    <OutputType>winmdobj</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Wino.BackgroundTasks</RootNamespace>
-    <AssemblyName>Wino.BackgroundTasks</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AppUpdatedTask.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.66.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.14</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>7.1.3</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj">
-      <Project>{CF3312E5-5DA0-4867-9945-49EA7598AF1F}</Project>
-      <Name>Wino.Core.Domain</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj">
-      <Project>{395f19ba-1e42-495c-9db5-1a6f537fccb8}</Project>
-      <Name>Wino.Core.UWP</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Core\Wino.Core.csproj">
-      <Project>{e6b1632a-8901-41e8-9ddf-6793c7698b0b}</Project>
-      <Name>Wino.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="WindowsDesktop, Version=10.0.22621.0">
-      <Name>Windows Desktop Extensions for the UWP</Name>
-    </SDKReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Wino.Calendar.ViewModels/AccountDetailsPageViewModel.cs b/Wino.Calendar.ViewModels/AccountDetailsPageViewModel.cs
deleted file mode 100644
index a110d386..00000000
--- a/Wino.Calendar.ViewModels/AccountDetailsPageViewModel.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.ViewModels;
-using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.Client.Navigation;
-
-namespace Wino.Calendar.ViewModels;
-
-public partial class AccountDetailsPageViewModel : CalendarBaseViewModel
-{
-    private readonly IAccountService _accountService;
-
-    public AccountProviderDetailViewModel Account { get; private set; }
-    public ICalendarDialogService CalendarDialogService { get; }
-    public IAccountCalendarStateService AccountCalendarStateService { get; }
-
-    public AccountDetailsPageViewModel(ICalendarDialogService calendarDialogService, IAccountService accountService, IAccountCalendarStateService accountCalendarStateService)
-    {
-        CalendarDialogService = calendarDialogService;
-        _accountService = accountService;
-        AccountCalendarStateService = accountCalendarStateService;
-    }
-
-    [RelayCommand]
-    private void EditAccountDetails()
-            => Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsEditAccountDetails_Title, WinoPage.EditAccountDetailsPage, Account));
-
-    public override void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-    }
-}
diff --git a/Wino.Calendar.ViewModels/AccountManagementViewModel.cs b/Wino.Calendar.ViewModels/AccountManagementViewModel.cs
deleted file mode 100644
index f7eb9563..00000000
--- a/Wino.Calendar.ViewModels/AccountManagementViewModel.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Input;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Authentication;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Server;
-
-namespace Wino.Calendar.ViewModels;
-
-public partial class AccountManagementViewModel : AccountManagementPageViewModelBase
-{
-    private readonly IProviderService _providerService;
-
-    public AccountManagementViewModel(ICalendarDialogService dialogService,
-                                      IWinoServerConnectionManager winoServerConnectionManager,
-                                      INavigationService navigationService,
-                                      IAccountService accountService,
-                                      IProviderService providerService,
-                                      IStoreManagementService storeManagementService,
-                                      IAuthenticationProvider authenticationProvider,
-                                      IPreferencesService preferencesService) : base(dialogService, winoServerConnectionManager, navigationService, accountService, providerService, storeManagementService, authenticationProvider, preferencesService)
-    {
-        CalendarDialogService = dialogService;
-        _providerService = providerService;
-    }
-
-    public ICalendarDialogService CalendarDialogService { get; }
-
-    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-
-        await InitializeAccountsAsync();
-    }
-
-    public override async Task InitializeAccountsAsync()
-    {
-        Accounts.Clear();
-
-        var accounts = await AccountService.GetAccountsAsync().ConfigureAwait(false);
-
-        await ExecuteUIThread(() =>
-        {
-            foreach (var account in accounts)
-            {
-                var accountDetails = GetAccountProviderDetails(account);
-
-                Accounts.Add(accountDetails);
-            }
-        });
-
-        await ManageStorePurchasesAsync().ConfigureAwait(false);
-    }
-
-    [RelayCommand]
-    private async Task AddNewAccountAsync()
-    {
-        if (IsAccountCreationBlocked)
-        {
-            var isPurchaseClicked = await DialogService.ShowConfirmationDialogAsync(Translator.DialogMessage_AccountLimitMessage, Translator.DialogMessage_AccountLimitTitle, Translator.Buttons_Purchase);
-
-            if (!isPurchaseClicked) return;
-
-            await PurchaseUnlimitedAccountAsync();
-
-            return;
-        }
-
-        var availableProviders = _providerService.GetAvailableProviders();
-
-        var accountCreationDialogResult = await DialogService.ShowAccountProviderSelectionDialogAsync(availableProviders);
-
-        if (accountCreationDialogResult == null) return;
-
-        var accountCreationCancellationTokenSource = new CancellationTokenSource();
-        var accountCreationDialog = CalendarDialogService.GetAccountCreationDialog(accountCreationDialogResult);
-
-        await accountCreationDialog.ShowDialogAsync(accountCreationCancellationTokenSource);
-        await Task.Delay(500);
-
-        // For OAuth authentications, we just generate token and assign it to the MailAccount.
-
-        var createdAccount = new MailAccount()
-        {
-            ProviderType = accountCreationDialogResult.ProviderType,
-            Name = accountCreationDialogResult.AccountName,
-            Id = Guid.NewGuid()
-        };
-
-        var tokenInformationResponse = await WinoServerConnectionManager
-            .GetResponseAsync<TokenInformationEx, AuthorizationRequested>(new AuthorizationRequested(accountCreationDialogResult.ProviderType,
-                                                                                                   createdAccount,
-                                                                                                   createdAccount.ProviderType == MailProviderType.Gmail), accountCreationCancellationTokenSource.Token);
-
-        if (accountCreationDialog.State == AccountCreationDialogState.Canceled)
-            throw new AccountSetupCanceledException();
-
-        tokenInformationResponse.ThrowIfFailed();
-
-        await AccountService.CreateAccountAsync(createdAccount, null);
-
-        // Sync profile information if supported.
-        if (createdAccount.IsProfileInfoSyncSupported)
-        {
-            // Start profile information synchronization.
-            // It's only available for Outlook and Gmail synchronizers.
-
-            var profileSyncOptions = new MailSynchronizationOptions()
-            {
-                AccountId = createdAccount.Id,
-                Type = MailSynchronizationType.UpdateProfile
-            };
-
-            var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client));
-
-            var profileSynchronizationResult = profileSynchronizationResponse.Data;
-
-            if (profileSynchronizationResult.CompletedState != SynchronizationCompletedState.Success)
-                throw new Exception(Translator.Exception_FailedToSynchronizeProfileInformation);
-
-            createdAccount.SenderName = profileSynchronizationResult.ProfileInformation.SenderName;
-            createdAccount.Base64ProfilePictureData = profileSynchronizationResult.ProfileInformation.Base64ProfilePictureData;
-
-            await AccountService.UpdateProfileInformationAsync(createdAccount.Id, profileSynchronizationResult.ProfileInformation);
-        }
-
-        accountCreationDialog.State = AccountCreationDialogState.FetchingEvents;
-
-        // Start synchronizing events.
-        var synchronizationOptions = new CalendarSynchronizationOptions()
-        {
-            AccountId = createdAccount.Id,
-            Type = CalendarSynchronizationType.CalendarMetadata
-        };
-
-        var synchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<CalendarSynchronizationResult, NewCalendarSynchronizationRequested>(new NewCalendarSynchronizationRequested(synchronizationOptions, SynchronizationSource.Client));
-    }
-}
diff --git a/Wino.Calendar.ViewModels/AppShellViewModel.cs b/Wino.Calendar.ViewModels/AppShellViewModel.cs
deleted file mode 100644
index a7454eb5..00000000
--- a/Wino.Calendar.ViewModels/AppShellViewModel.cs
+++ /dev/null
@@ -1,366 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using Serilog;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain.Collections;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Extensions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Calendar;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Calendar;
-using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.Server;
-
-namespace Wino.Calendar.ViewModels;
-
-public partial class AppShellViewModel : CalendarBaseViewModel,
-    IRecipient<VisibleDateRangeChangedMessage>,
-    IRecipient<CalendarEnableStatusChangedMessage>,
-    IRecipient<NavigateManageAccountsRequested>,
-    IRecipient<CalendarDisplayTypeChangedMessage>,
-    IRecipient<DetailsPageStateChangedMessage>
-{
-    public IPreferencesService PreferencesService { get; }
-    public IStatePersistanceService StatePersistenceService { get; }
-    public IAccountCalendarStateService AccountCalendarStateService { get; }
-    public INavigationService NavigationService { get; }
-    public IWinoServerConnectionManager ServerConnectionManager { get; }
-
-    [ObservableProperty]
-    private bool _isEventDetailsPageActive;
-
-    [ObservableProperty]
-    private int _selectedMenuItemIndex = -1;
-
-    [ObservableProperty]
-    private bool isCalendarEnabled;
-
-    /// <summary>
-    /// Gets or sets the active connection status of the Wino server.
-    /// </summary>
-    [ObservableProperty]
-    private WinoServerConnectionStatus activeConnectionStatus;
-
-    /// <summary>
-    /// Gets or sets the display date of the calendar.
-    /// </summary>
-    [ObservableProperty]
-    private DateTimeOffset _displayDate;
-
-    /// <summary>
-    /// Gets or sets the highlighted range in the CalendarView and displayed date range in FlipView.
-    /// </summary>
-    [ObservableProperty]
-    private DateRange highlightedDateRange;
-
-    [ObservableProperty]
-    private ObservableRangeCollection<string> dateNavigationHeaderItems = [];
-
-    [ObservableProperty]
-    private int _selectedDateNavigationHeaderIndex;
-
-    public bool IsVerticalCalendar => StatePersistenceService.CalendarDisplayType == CalendarDisplayType.Month;
-
-    // For updating account calendars asynchronously.
-    private SemaphoreSlim _accountCalendarUpdateSemaphoreSlim = new(1);
-
-    public AppShellViewModel(IPreferencesService preferencesService,
-                             IStatePersistanceService statePersistanceService,
-                             IAccountService accountService,
-                             ICalendarService calendarService,
-                             IAccountCalendarStateService accountCalendarStateService,
-                             INavigationService navigationService,
-                             IWinoServerConnectionManager serverConnectionManager)
-    {
-        _accountService = accountService;
-        _calendarService = calendarService;
-
-        AccountCalendarStateService = accountCalendarStateService;
-        AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
-        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
-
-        NavigationService = navigationService;
-        ServerConnectionManager = serverConnectionManager;
-        PreferencesService = preferencesService;
-
-        StatePersistenceService = statePersistanceService;
-        StatePersistenceService.StatePropertyChanged += PrefefencesChanged;
-    }
-
-    private void SelectedCalendarItemsChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-    {
-        throw new NotImplementedException();
-    }
-
-    private void PrefefencesChanged(object sender, string e)
-    {
-        if (e == nameof(StatePersistenceService.CalendarDisplayType))
-        {
-            Messenger.Send(new CalendarDisplayTypeChangedMessage(StatePersistenceService.CalendarDisplayType));
-
-
-            // Change the calendar.
-            DateClicked(new CalendarViewDayClickedEventArgs(GetDisplayTypeSwitchDate()));
-        }
-    }
-
-    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-
-        UpdateDateNavigationHeaderItems();
-
-        await InitializeAccountCalendarsAsync();
-
-        TodayClicked();
-    }
-
-    private async void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
-    {
-        // When using three-state checkbox, multiple accounts will be selected/unselected at the same time.
-        // Reporting all these changes one by one to the UI is not efficient and may cause problems in the future.
-
-        // Update all calendar states at once.
-        try
-        {
-            await _accountCalendarUpdateSemaphoreSlim.WaitAsync();
-
-            foreach (var calendar in e.AccountCalendars)
-            {
-                await _calendarService.UpdateAccountCalendarAsync(calendar.AccountCalendar).ConfigureAwait(false);
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error while waiting for account calendar update semaphore.");
-        }
-        finally
-        {
-            _accountCalendarUpdateSemaphoreSlim.Release();
-        }
-    }
-
-    private async void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
-        => await _calendarService.UpdateAccountCalendarAsync(e.AccountCalendar).ConfigureAwait(false);
-
-    private async Task InitializeAccountCalendarsAsync()
-    {
-        await Dispatcher.ExecuteOnUIThread(() => AccountCalendarStateService.ClearGroupedAccountCalendar());
-
-        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
-
-        foreach (var account in accounts)
-        {
-            var accountCalendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
-            var calendarViewModels = new List<AccountCalendarViewModel>();
-
-            foreach (var calendar in accountCalendars)
-            {
-                var calendarViewModel = new AccountCalendarViewModel(account, calendar);
-
-                calendarViewModels.Add(calendarViewModel);
-            }
-
-            var groupedAccountCalendarViewModel = new GroupedAccountCalendarViewModel(account, calendarViewModels);
-
-            await Dispatcher.ExecuteOnUIThread(() =>
-            {
-                AccountCalendarStateService.AddGroupedAccountCalendar(groupedAccountCalendarViewModel);
-            });
-        }
-    }
-
-    private void ForceNavigateCalendarDate()
-    {
-        if (SelectedMenuItemIndex == -1)
-        {
-            var args = new CalendarPageNavigationArgs()
-            {
-                NavigationDate = _navigationDate ?? DateTime.Now.Date
-            };
-
-            // Already on calendar. Just navigate.
-            NavigationService.Navigate(WinoPage.CalendarPage, args);
-
-            _navigationDate = null;
-        }
-        else
-        {
-            SelectedMenuItemIndex = -1;
-        }
-    }
-
-    partial void OnSelectedMenuItemIndexChanged(int oldValue, int newValue)
-    {
-        switch (newValue)
-        {
-            case -1:
-                ForceNavigateCalendarDate();
-                break;
-            case 0:
-                NavigationService.Navigate(WinoPage.ManageAccountsPage);
-                break;
-            case 1:
-                NavigationService.Navigate(WinoPage.SettingsPage);
-                break;
-            default:
-                break;
-        }
-    }
-
-    [RelayCommand]
-    private async Task Sync()
-    {
-        // Sync all calendars.
-        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
-
-        foreach (var account in accounts)
-        {
-            var t = new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions()
-            {
-                AccountId = account.Id,
-                Type = CalendarSynchronizationType.CalendarMetadata
-            }, SynchronizationSource.Client);
-
-            Messenger.Send(t);
-        }
-    }
-
-    /// <summary>
-    /// When calendar type switches, we need to navigate to the most ideal date.
-    /// This method returns that date.
-    /// </summary>
-    private DateTime GetDisplayTypeSwitchDate()
-    {
-        var settings = PreferencesService.GetCurrentCalendarSettings();
-        switch (StatePersistenceService.CalendarDisplayType)
-        {
-            case CalendarDisplayType.Day:
-                if (HighlightedDateRange.IsInRange(DateTime.Now)) return DateTime.Now.Date;
-
-                return HighlightedDateRange.StartDate;
-            case CalendarDisplayType.Week:
-                if (HighlightedDateRange == null || HighlightedDateRange.IsInRange(DateTime.Now))
-                {
-                    return DateTime.Now.Date.GetWeekStartDateForDate(settings.FirstDayOfWeek);
-                }
-
-                return HighlightedDateRange.StartDate.GetWeekStartDateForDate(settings.FirstDayOfWeek);
-            case CalendarDisplayType.WorkWeek:
-                break;
-            case CalendarDisplayType.Month:
-                break;
-            case CalendarDisplayType.Year:
-                break;
-            default:
-                break;
-        }
-
-        return DateTime.Today.Date;
-    }
-
-    private DateTime? _navigationDate;
-    private readonly IAccountService _accountService;
-    private readonly ICalendarService _calendarService;
-
-    #region Commands
-
-    [RelayCommand]
-    private void TodayClicked()
-    {
-        _navigationDate = DateTime.Now.Date;
-
-        ForceNavigateCalendarDate();
-    }
-
-    [RelayCommand]
-    public void ManageAccounts() => NavigationService.Navigate(WinoPage.AccountManagementPage);
-
-    [RelayCommand]
-    private Task ReconnectServerAsync() => ServerConnectionManager.ConnectAsync();
-
-    [RelayCommand]
-    private void DateClicked(CalendarViewDayClickedEventArgs clickedDateArgs)
-    {
-        _navigationDate = clickedDateArgs.ClickedDate;
-
-        ForceNavigateCalendarDate();
-    }
-
-    #endregion
-
-    public void Receive(VisibleDateRangeChangedMessage message) => HighlightedDateRange = message.DateRange;
-
-    /// <summary>
-    /// Sets the header navigation items based on visible date range and calendar type.
-    /// </summary>
-    private void UpdateDateNavigationHeaderItems()
-    {
-        DateNavigationHeaderItems.Clear();
-
-        // TODO: From settings
-        var testInfo = new CultureInfo("en-US");
-
-        switch (StatePersistenceService.CalendarDisplayType)
-        {
-            case CalendarDisplayType.Day:
-            case CalendarDisplayType.Week:
-            case CalendarDisplayType.WorkWeek:
-            case CalendarDisplayType.Month:
-                DateNavigationHeaderItems.ReplaceRange(testInfo.DateTimeFormat.MonthNames);
-                break;
-            case CalendarDisplayType.Year:
-                break;
-            default:
-                break;
-        }
-
-        SetDateNavigationHeaderItems();
-    }
-
-    partial void OnHighlightedDateRangeChanged(DateRange value) => SetDateNavigationHeaderItems();
-
-    private void SetDateNavigationHeaderItems()
-    {
-        if (HighlightedDateRange == null) return;
-
-        if (DateNavigationHeaderItems.Count == 0)
-        {
-            UpdateDateNavigationHeaderItems();
-        }
-
-        // TODO: Year view
-        var monthIndex = HighlightedDateRange.GetMostVisibleMonthIndex();
-
-        SelectedDateNavigationHeaderIndex = Math.Max(monthIndex - 1, -1);
-    }
-
-    public async void Receive(CalendarEnableStatusChangedMessage message)
-        => await ExecuteUIThread(() => IsCalendarEnabled = message.IsEnabled);
-
-    public void Receive(NavigateManageAccountsRequested message) => SelectedMenuItemIndex = 1;
-
-    public void Receive(CalendarDisplayTypeChangedMessage message) => OnPropertyChanged(nameof(IsVerticalCalendar));
-
-    public async void Receive(DetailsPageStateChangedMessage message)
-    {
-        await ExecuteUIThread(() =>
-        {
-            IsEventDetailsPageActive = message.IsActivated;
-
-            // TODO: This is for Wino Mail. Generalize this later on.
-            StatePersistenceService.IsReaderNarrowed = message.IsActivated;
-            StatePersistenceService.IsReadingMail = message.IsActivated;
-        });
-    }
-}
diff --git a/Wino.Calendar.ViewModels/CalendarAccountSettingsPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarAccountSettingsPageViewModel.cs
new file mode 100644
index 00000000..79400c7d
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarAccountSettingsPageViewModel.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Calendar.ViewModels;
+
+/// <summary>
+/// ViewModel for managing calendar account settings.
+/// </summary>
+public partial class CalendarAccountSettingsPageViewModel : CalendarBaseViewModel
+{
+    private readonly ICalendarService _calendarService;
+    private readonly IAccountService _accountService;
+    
+    [ObservableProperty]
+    public partial MailAccount Account { get; set; }
+
+    [ObservableProperty]
+    public partial AccountCalendar AccountCalendar { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountColorHex { get; set; } = "#0078D4";
+
+    [ObservableProperty]
+    public partial bool IsSyncEnabled { get; set; }
+
+    public ObservableCollection<ShowAsOption> ShowAsOptions { get; } = new ObservableCollection<ShowAsOption>();
+
+    [ObservableProperty]
+    public partial ShowAsOption SelectedDefaultShowAsOption { get; set; }
+
+    public CalendarAccountSettingsPageViewModel(ICalendarService calendarService, IAccountService accountService)
+    {
+        _calendarService = calendarService;
+        _accountService = accountService;
+
+        // Initialize ShowAs options
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Free));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Tentative));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Busy));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.OutOfOffice));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.WorkingElsewhere));
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        if (parameters is AccountCalendar selectedCalendar)
+        {
+            Account = await _accountService.GetAccountAsync(selectedCalendar.AccountId);
+            AccountCalendar = await _calendarService.GetAccountCalendarAsync(selectedCalendar.Id) ?? selectedCalendar;
+        }
+        else if (parameters is Guid accountId)
+        {
+            Account = await _accountService.GetAccountAsync(accountId);
+            var calendars = await _calendarService.GetAccountCalendarsAsync(accountId);
+            AccountCalendar = calendars.FirstOrDefault(c => c.IsPrimary) ?? calendars.FirstOrDefault();
+        }
+        else
+        {
+            return;
+        }
+
+        if (Account == null || AccountCalendar == null)
+            return;
+
+        // Initialize properties from AccountCalendar
+        AccountColorHex = AccountCalendar.BackgroundColorHex ?? "#0078D4";
+        IsSyncEnabled = AccountCalendar.IsSynchronizationEnabled;
+        SelectedDefaultShowAsOption = ShowAsOptions.FirstOrDefault(o => o.ShowAs == AccountCalendar.DefaultShowAs) ?? ShowAsOptions[2];
+    }
+
+    partial void OnAccountColorHexChanged(string value)
+    {
+        if (AccountCalendar != null && !string.IsNullOrEmpty(value))
+        {
+            AccountCalendar.BackgroundColorHex = value;
+            SaveChangesAsync();
+        }
+    }
+
+    partial void OnIsSyncEnabledChanged(bool value)
+    {
+        if (AccountCalendar != null)
+        {
+            AccountCalendar.IsSynchronizationEnabled = value;
+            SaveChangesAsync();
+        }
+    }
+
+    partial void OnSelectedDefaultShowAsOptionChanged(ShowAsOption value)
+    {
+        if (AccountCalendar != null && value != null)
+        {
+            AccountCalendar.DefaultShowAs = value.ShowAs;
+            SaveChangesAsync();
+        }
+    }
+
+    private async void SaveChangesAsync()
+    {
+        if (AccountCalendar == null)
+            return;
+
+        await _calendarService.UpdateAccountCalendarAsync(AccountCalendar);
+        
+        // Send message to update UI
+        Messenger.Send(new CalendarListUpdated(AccountCalendar));
+    }
+}
diff --git a/Wino.Calendar.ViewModels/CalendarAppShellViewModel.cs b/Wino.Calendar.ViewModels/CalendarAppShellViewModel.cs
new file mode 100644
index 00000000..43cf07b7
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarAppShellViewModel.cs
@@ -0,0 +1,551 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Collections;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Server;
+using Wino.Messaging.UI;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarAppShellViewModel : CalendarBaseViewModel,
+    ICalendarShellClient,
+    IRecipient<CalendarDisplayTypeChangedMessage>,
+    IRecipient<AccountRemovedMessage>
+{
+    public IPreferencesService PreferencesService { get; }
+    public IStatePersistanceService StatePersistenceService { get; }
+    public IAccountCalendarStateService AccountCalendarStateService { get; }
+    public INavigationService NavigationService { get; }
+    public WinoApplicationMode Mode => WinoApplicationMode.Calendar;
+    public bool HandlesNavigationSelection => false;
+    public VisibleDateRange CurrentVisibleRange => _calendarPageViewModel.CurrentVisibleRange;
+    public string VisibleDateRangeText => _calendarPageViewModel.VisibleDateRangeText;
+    System.Collections.IEnumerable ICalendarShellClient.GroupedAccountCalendars => AccountCalendarStateService.GroupedAccountCalendars;
+    System.Collections.IEnumerable ICalendarShellClient.DateNavigationHeaderItems => DateNavigationHeaderItems;
+    object IShellClient.SelectedMenuItem
+    {
+        get => null;
+        set { }
+    }
+    System.Windows.Input.ICommand ICalendarShellClient.TodayClickedCommand => TodayClickedCommand;
+    System.Windows.Input.ICommand ICalendarShellClient.DateClickedCommand => DateClickedCommand;
+    System.Windows.Input.ICommand ICalendarShellClient.PreviousDateRangeCommand => PreviousDateRangeCommand;
+    System.Windows.Input.ICommand ICalendarShellClient.NextDateRangeCommand => NextDateRangeCommand;
+    System.Windows.Input.ICommand ICalendarShellClient.SyncCommand => SyncCommand;
+
+    public bool CanSynchronizeCalendars => !AccountCalendarStateService.IsAnySynchronizationInProgress;
+
+    public MenuItemCollection MenuItems { get; private set; }
+    public MenuItemCollection FooterItems { get; private set; }
+
+    [ObservableProperty]
+    private int _selectedMenuItemIndex = -1;
+
+    [ObservableProperty]
+    private ObservableRangeCollection<string> dateNavigationHeaderItems = [];
+
+    [ObservableProperty]
+    private int _selectedDateNavigationHeaderIndex;
+
+    public bool IsVerticalCalendar => StatePersistenceService.CalendarDisplayType == CalendarDisplayType.Month;
+
+    [ObservableProperty]
+    private bool isStoreUpdateItemVisible;
+
+    private readonly SettingsItem _settingsItem = new();
+    private readonly StoreUpdateMenuItem _storeUpdateMenuItem = new();
+    private readonly SemaphoreSlim _accountCalendarUpdateSemaphoreSlim = new(1);
+    private readonly CalendarPageViewModel _calendarPageViewModel;
+    private readonly IMailDialogService _dialogService;
+    private readonly IStoreUpdateService _storeUpdateService;
+    private readonly IAccountService _accountService;
+    private readonly ICalendarService _calendarService;
+    private readonly IDateContextProvider _dateContextProvider;
+    private bool _runtimeSubscriptionsAttached;
+    private bool _hasRegisteredPersistentRecipients;
+    private DateTime? _navigationDate;
+
+    public CalendarAppShellViewModel(
+        IPreferencesService preferencesService,
+        IStatePersistanceService statePersistanceService,
+        IAccountService accountService,
+        ICalendarService calendarService,
+        IAccountCalendarStateService accountCalendarStateService,
+        INavigationService navigationService,
+        CalendarPageViewModel calendarPageViewModel,
+        IMailDialogService dialogService,
+        IStoreUpdateService storeUpdateService,
+        IDateContextProvider dateContextProvider)
+    {
+        PreferencesService = preferencesService;
+        StatePersistenceService = statePersistanceService;
+        AccountCalendarStateService = accountCalendarStateService;
+        NavigationService = navigationService;
+        _accountService = accountService;
+        _calendarService = calendarService;
+        _calendarPageViewModel = calendarPageViewModel;
+        _dialogService = dialogService;
+        _storeUpdateService = storeUpdateService;
+        _dateContextProvider = dateContextProvider;
+
+        _calendarPageViewModel.PropertyChanged += CalendarPageViewModelPropertyChanged;
+        AccountCalendarStateService.PropertyChanged += AccountCalendarStateServicePropertyChanged;
+    }
+
+    protected override void OnDispatcherAssigned()
+    {
+        base.OnDispatcherAssigned();
+
+        AccountCalendarStateService.Dispatcher = Dispatcher;
+        MenuItems = new MenuItemCollection(Dispatcher);
+        FooterItems = new MenuItemCollection(Dispatcher);
+        _ = RefreshFooterItemsAsync(false);
+    }
+
+    private void CalendarPageViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(CalendarPageViewModel.CurrentVisibleRange))
+        {
+            OnPropertyChanged(nameof(CurrentVisibleRange));
+        }
+
+        if (e.PropertyName == nameof(CalendarPageViewModel.CurrentVisibleRange) ||
+            e.PropertyName == nameof(CalendarPageViewModel.VisibleDateRangeText))
+        {
+            OnPropertyChanged(nameof(VisibleDateRangeText));
+            UpdateDateNavigationHeaderItems();
+        }
+    }
+
+    private void PrefefencesChanged(object sender, string e)
+    {
+        if (e != nameof(StatePersistenceService.CalendarDisplayType))
+            return;
+
+        Messenger.Send(new CalendarDisplayTypeChangedMessage(StatePersistenceService.CalendarDisplayType));
+        OnPropertyChanged(nameof(IsVerticalCalendar));
+        UpdateDateNavigationHeaderItems();
+        NavigateCalendarDate(GetDisplayTypeSwitchDate());
+    }
+
+    private async void PreferencesServiceChanged(object sender, string e)
+    {
+        if (e == nameof(IPreferencesService.IsStoreUpdateNotificationsEnabled))
+        {
+            await RefreshFooterItemsAsync(false);
+        }
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        if (!_hasRegisteredPersistentRecipients)
+        {
+            RegisterRecipients();
+            _hasRegisteredPersistentRecipients = true;
+        }
+
+        AttachRuntimeSubscriptions();
+
+        var activationContext = parameters as ShellModeActivationContext;
+        var shouldRunStartupFlows = activationContext?.IsInitialActivation ?? true;
+
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+        PreferencesService.PreferenceChanged += PreferencesServiceChanged;
+
+        await RefreshFooterItemsAsync(mode == NavigationMode.New);
+        UpdateDateNavigationHeaderItems();
+        await InitializeAccountCalendarsAsync();
+        ValidateConfiguredNewEventCalendar();
+
+        TodayClicked();
+    }
+
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        DetachRuntimeSubscriptions();
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+        _ = ExecuteUIThread(() =>
+        {
+            DateNavigationHeaderItems.Clear();
+            AccountCalendarStateService.ClearGroupedAccountCalendars();
+            SelectedDateNavigationHeaderIndex = -1;
+        });
+        _calendarPageViewModel.CleanupForShellDeactivation();
+    }
+
+    public void PrepareForShellShutdown()
+    {
+        DetachRuntimeSubscriptions();
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+
+        if (_hasRegisteredPersistentRecipients)
+        {
+            UnregisterRecipients();
+            _hasRegisteredPersistentRecipients = false;
+        }
+
+        DateNavigationHeaderItems.Clear();
+        SelectedDateNavigationHeaderIndex = -1;
+        SelectedMenuItemIndex = -1;
+        MenuItems?.Clear();
+        FooterItems?.Clear();
+        AccountCalendarStateService.ClearGroupedAccountCalendars();
+        _calendarPageViewModel.CleanupForShellDeactivation();
+    }
+
+    private void AccountCalendarStateServicePropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName != nameof(IAccountCalendarStateService.IsAnySynchronizationInProgress))
+            return;
+
+        OnPropertyChanged(nameof(CanSynchronizeCalendars));
+        SyncCommand.NotifyCanExecuteChanged();
+    }
+
+    private void AttachRuntimeSubscriptions()
+    {
+        if (_runtimeSubscriptionsAttached)
+            return;
+
+        AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
+        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
+        StatePersistenceService.StatePropertyChanged += PrefefencesChanged;
+        _runtimeSubscriptionsAttached = true;
+    }
+
+    private void DetachRuntimeSubscriptions()
+    {
+        if (!_runtimeSubscriptionsAttached)
+            return;
+
+        AccountCalendarStateService.AccountCalendarSelectionStateChanged -= UpdateAccountCalendarRequested;
+        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged -= AccountCalendarStateCollectivelyChanged;
+        StatePersistenceService.StatePropertyChanged -= PrefefencesChanged;
+        _runtimeSubscriptionsAttached = false;
+    }
+
+    private async Task RefreshFooterItemsAsync(bool showNotification)
+    {
+        await ExecuteUIThread(() =>
+        {
+            FooterItems.Clear();
+        });
+    }
+
+    private async Task StartStoreUpdateAsync()
+    {
+        await _storeUpdateService.StartUpdateAsync().ConfigureAwait(false);
+        await RefreshFooterItemsAsync(false).ConfigureAwait(false);
+    }
+
+    private async void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
+    {
+        try
+        {
+            await _accountCalendarUpdateSemaphoreSlim.WaitAsync();
+
+            foreach (var calendar in e.AccountCalendars)
+            {
+                await _calendarService.UpdateAccountCalendarAsync(calendar.AccountCalendar).ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error while waiting for account calendar update semaphore.");
+        }
+        finally
+        {
+            _accountCalendarUpdateSemaphoreSlim.Release();
+        }
+    }
+
+    private async void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
+        => await _calendarService.UpdateAccountCalendarAsync(e.AccountCalendar).ConfigureAwait(false);
+
+    private async Task InitializeAccountCalendarsAsync()
+    {
+        await Dispatcher.ExecuteOnUIThread(() => AccountCalendarStateService.ClearGroupedAccountCalendars());
+
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+        foreach (var account in accounts)
+        {
+            var accountCalendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
+            var calendarViewModels = accountCalendars.Select(calendar => new AccountCalendarViewModel(account, calendar)).ToList();
+            var groupedAccountCalendarViewModel = new GroupedAccountCalendarViewModel(account, calendarViewModels);
+
+            await Dispatcher.ExecuteOnUIThread(() =>
+            {
+                AccountCalendarStateService.AddGroupedAccountCalendar(groupedAccountCalendarViewModel);
+            });
+        }
+    }
+
+    private void NavigateCalendarDate(DateTime date)
+    {
+        _navigationDate = date.Date;
+        ForceNavigateCalendarDate();
+    }
+
+    private void ForceNavigateCalendarDate()
+    {
+        var args = new CalendarPageNavigationArgs
+        {
+            NavigationDate = _navigationDate ?? DateTime.Now.Date
+        };
+
+        NavigationService.Navigate(WinoPage.CalendarPage, args);
+        _navigationDate = null;
+    }
+
+    [RelayCommand(CanExecute = nameof(CanSynchronizeCalendars))]
+    private async Task Sync()
+    {
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        foreach (var account in accounts)
+        {
+            Messenger.Send(new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions
+            {
+                AccountId = account.Id,
+                Type = CalendarSynchronizationType.Strict
+            }));
+        }
+    }
+
+    private DateTime GetDisplayTypeSwitchDate()
+    {
+        var today = _dateContextProvider.GetToday();
+        var settings = PreferencesService.GetCurrentCalendarSettings();
+        var referenceRange = CurrentVisibleRange
+                             ?? CalendarRangeResolver.Resolve(new CalendarDisplayRequest(StatePersistenceService.CalendarDisplayType, today), settings, today);
+        var targetRange = CalendarRangeResolver.ChangeDisplayType(referenceRange, StatePersistenceService.CalendarDisplayType, settings, today);
+        return targetRange.AnchorDate.ToDateTime(TimeOnly.MinValue);
+    }
+
+    [RelayCommand]
+    private void TodayClicked()
+    {
+        NavigateCalendarDate(_dateContextProvider.GetToday().ToDateTime(TimeOnly.MinValue));
+    }
+
+    [RelayCommand]
+    private void PreviousDateRange()
+    {
+        NavigateRelativePeriod(-1);
+    }
+
+    [RelayCommand]
+    private void NextDateRange()
+    {
+        NavigateRelativePeriod(1);
+    }
+
+    private void NavigateRelativePeriod(int direction)
+    {
+        var today = _dateContextProvider.GetToday();
+        var settings = PreferencesService.GetCurrentCalendarSettings();
+        var referenceRange = CurrentVisibleRange
+                             ?? CalendarRangeResolver.Resolve(new CalendarDisplayRequest(StatePersistenceService.CalendarDisplayType, today), settings, today);
+        var targetRange = CalendarRangeResolver.Navigate(referenceRange, direction, settings, today);
+        NavigateCalendarDate(targetRange.AnchorDate.ToDateTime(TimeOnly.MinValue));
+    }
+
+    public async Task HandleNavigationItemInvokedAsync(IMenuItem menuItem)
+    {
+        switch (menuItem)
+        {
+            case NewMailMenuItem:
+                await NewEventAsync().ConfigureAwait(false);
+                break;
+            case SettingsItem:
+                NavigationService.Navigate(WinoPage.SettingsPage);
+                break;
+            case StoreUpdateMenuItem:
+                await StartStoreUpdateAsync().ConfigureAwait(false);
+                break;
+        }
+    }
+
+    [RelayCommand]
+    private async Task NewEventAsync()
+    {
+        var pickedCalendar = TryResolveConfiguredNewEventCalendar();
+
+        if (pickedCalendar == null)
+        {
+            var availableGroups = AccountCalendarStateService.GroupedAccountCalendars
+                .Where(group => group.AccountCalendars.Count > 0)
+                .Select(group => new CalendarPickerAccountGroup
+                {
+                    Account = group.Account,
+                    Calendars = group.AccountCalendars.Select(calendar => calendar.AccountCalendar).ToList()
+                })
+                .ToList();
+
+            if (availableGroups.Count == 0)
+            {
+                _dialogService.InfoBarMessage(
+                    Translator.CalendarEventCompose_NoCalendarsTitle,
+                    Translator.CalendarEventCompose_NoCalendarsMessage,
+                    InfoBarMessageType.Warning);
+                return;
+            }
+
+            var pickingResult = await _dialogService.ShowSingleCalendarPickerDialogAsync(availableGroups);
+            if (pickingResult.ShouldNavigateToCalendarSettings)
+            {
+                NavigationService.Navigate(WinoPage.CalendarPreferenceSettingsPage);
+                return;
+            }
+
+            pickedCalendar = pickingResult.PickedCalendar;
+        }
+
+        if (pickedCalendar == null)
+            return;
+
+        var (startDate, endDate) = GetDefaultComposeDateRange();
+
+        NavigationService.Navigate(WinoPage.CalendarEventComposePage, new CalendarEventComposeNavigationArgs
+        {
+            SelectedCalendarId = pickedCalendar.Id,
+            StartDate = startDate,
+            EndDate = endDate
+        });
+    }
+
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
+    {
+        if (args.Handled || args.Mode != WinoApplicationMode.Calendar)
+            return;
+
+        if (args.Action == KeyboardShortcutAction.NewEvent)
+        {
+            await NewEventAsync();
+            args.Handled = true;
+        }
+    }
+
+    [RelayCommand]
+    private void DateClicked(CalendarViewDayClickedEventArgs clickedDateArgs)
+        => NavigateCalendarDate(clickedDateArgs.ClickedDate);
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        UnregisterRecipients();
+
+        Messenger.Register<CalendarDisplayTypeChangedMessage>(this);
+        Messenger.Register<AccountRemovedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<CalendarDisplayTypeChangedMessage>(this);
+        Messenger.Unregister<AccountRemovedMessage>(this);
+    }
+
+    private void UpdateDateNavigationHeaderItems()
+    {
+        var headerText = VisibleDateRangeText;
+        DateNavigationHeaderItems.ReplaceRange(string.IsNullOrWhiteSpace(headerText) ? [] : [headerText]);
+        SelectedDateNavigationHeaderIndex = DateNavigationHeaderItems.Count > 0 ? 0 : -1;
+    }
+
+    public void Receive(CalendarDisplayTypeChangedMessage message)
+    {
+        OnPropertyChanged(nameof(IsVerticalCalendar));
+        UpdateDateNavigationHeaderItems();
+    }
+
+    public async void Receive(AccountRemovedMessage message)
+    {
+        await InitializeAccountCalendarsAsync();
+        ValidateConfiguredNewEventCalendar();
+    }
+
+    private AccountCalendar TryResolveConfiguredNewEventCalendar()
+    {
+        ValidateConfiguredNewEventCalendar();
+
+        if (PreferencesService.NewEventButtonBehavior != NewEventButtonBehavior.AlwaysUseSpecificCalendar
+            || !PreferencesService.DefaultNewEventCalendarId.HasValue)
+        {
+            return null;
+        }
+
+        return AccountCalendarStateService.AllCalendars
+            .FirstOrDefault(calendar => calendar.Id == PreferencesService.DefaultNewEventCalendarId.Value)?
+            .AccountCalendar;
+    }
+
+    private void ValidateConfiguredNewEventCalendar()
+    {
+        if (PreferencesService.NewEventButtonBehavior != NewEventButtonBehavior.AlwaysUseSpecificCalendar
+            || !PreferencesService.DefaultNewEventCalendarId.HasValue)
+        {
+            return;
+        }
+
+        var exists = AccountCalendarStateService.AllCalendars
+            .Any(calendar => calendar.Id == PreferencesService.DefaultNewEventCalendarId.Value);
+
+        if (!exists)
+        {
+            PreferencesService.NewEventButtonBehavior = NewEventButtonBehavior.AskEachTime;
+            PreferencesService.DefaultNewEventCalendarId = null;
+        }
+    }
+
+    private static (DateTime StartDate, DateTime EndDate) GetDefaultComposeDateRange()
+    {
+        var localNow = DateTime.Now;
+        var roundedMinutes = localNow.Minute switch
+        {
+            < 30 => 30,
+            30 when localNow.Second == 0 && localNow.Millisecond == 0 => 30,
+            _ => 60
+        };
+
+        var startDate = new DateTime(localNow.Year, localNow.Month, localNow.Day, localNow.Hour, 0, 0);
+        startDate = roundedMinutes == 60 ? startDate.AddHours(1) : startDate.AddMinutes(roundedMinutes);
+
+        return (startDate, startDate.AddMinutes(30));
+    }
+
+    void IShellClient.Activate(ShellModeActivationContext activationContext)
+        => OnNavigatedTo(NavigationMode.New, activationContext);
+
+    void IShellClient.Deactivate()
+        => OnNavigatedFrom(NavigationMode.New, null!);
+
+    Task IShellClient.HandleNavigationItemInvokedAsync(IMenuItem menuItem)
+        => menuItem == null ? Task.CompletedTask : HandleNavigationItemInvokedAsync(menuItem);
+
+    Task IShellClient.HandleNavigationSelectionChangedAsync(IMenuItem menuItem)
+        => Task.CompletedTask;
+}
diff --git a/Wino.Calendar.ViewModels/CalendarEventComposePageViewModel.cs b/Wino.Calendar.ViewModels/CalendarEventComposePageViewModel.cs
new file mode 100644
index 00000000..951493be
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarEventComposePageViewModel.cs
@@ -0,0 +1,760 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using EmailValidation;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Validation;
+using Wino.Core.ViewModels;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarEventComposePageViewModel : CalendarBaseViewModel
+{
+    private readonly IAccountService _accountService;
+    private readonly ICalendarService _calendarService;
+    private readonly INavigationService _navigationService;
+    private readonly IMailDialogService _dialogService;
+    private readonly IContactService _contactService;
+    private readonly IPreferencesService _preferencesService;
+    private readonly IUnderlyingThemeService _underlyingThemeService;
+    private readonly IWinoRequestDelegator _winoRequestDelegator;
+    private readonly CalendarEventComposeResultValidator _composeResultValidator = new();
+
+    public Func<Task<string>> GetHtmlNotesAsync { get; set; }
+
+    public ObservableCollection<AccountCalendarViewModel> AvailableCalendars { get; } = [];
+    public ObservableCollection<GroupedAccountCalendarViewModel> AvailableCalendarGroups { get; } = [];
+    public ObservableCollection<CalendarComposeAttendeeViewModel> Attendees { get; } = [];
+    public ObservableCollection<CalendarComposeAttachmentViewModel> Attachments { get; } = [];
+    public ObservableCollection<ShowAsOption> ShowAsOptions { get; } = [];
+    public ObservableCollection<ReminderOption> ReminderOptions { get; } = [];
+    public ObservableCollection<int> RecurrenceIntervalOptions { get; } = [];
+    public ObservableCollection<CalendarComposeFrequencyOption> RecurrenceFrequencyOptions { get; } = [];
+    public ObservableCollection<CalendarComposeWeekdayOption> WeekdayOptions { get; } = [];
+
+    [ObservableProperty]
+    public partial AccountCalendarViewModel SelectedCalendar { get; set; }
+
+    [ObservableProperty]
+    public partial string Title { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string Location { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool IsAllDay { get; set; }
+
+    [ObservableProperty]
+    public partial DateTimeOffset StartDate { get; set; }
+
+    [ObservableProperty]
+    public partial TimeSpan StartTime { get; set; }
+
+    [ObservableProperty]
+    public partial TimeSpan EndTime { get; set; }
+
+    [ObservableProperty]
+    public partial DateTimeOffset AllDayEndDate { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsRecurring { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedRecurrenceInterval { get; set; } = 1;
+
+    [ObservableProperty]
+    public partial CalendarComposeFrequencyOption SelectedRecurrenceFrequencyOption { get; set; }
+
+    [ObservableProperty]
+    public partial DateTimeOffset? RecurrenceEndDate { get; set; }
+
+    [ObservableProperty]
+    public partial string RecurrenceSummary { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial ReminderOption SelectedReminderOption { get; set; }
+
+    [ObservableProperty]
+    public partial ShowAsOption SelectedShowAsOption { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsDarkWebviewRenderer { get; set; }
+
+    [ObservableProperty]
+    public partial CalendarEventComposeResult LastCreatedResult { get; set; }
+
+    public CalendarSettings CurrentSettings { get; }
+    public string TimePickerClockIdentifier => CurrentSettings.DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour ? "24HourClock" : "12HourClock";
+    public bool HasAttachments => Attachments.Count > 0;
+    public bool IsSelectedCalendarCalDav => SelectedCalendar?.Account?.ProviderType == MailProviderType.IMAP4 &&
+                                            SelectedCalendar.Account.ServerInformation?.CalendarSupportMode == ImapCalendarSupportMode.CalDav;
+    public bool CanAddAttachments => !IsSelectedCalendarCalDav;
+    public string AttachmentsDisabledTooltipText => IsSelectedCalendarCalDav
+        ? Translator.CalendarEventCompose_AttachmentsNotSupportedForCalDav
+        : string.Empty;
+    public string SelectedCalendarDisplayText => SelectedCalendar?.Name ?? Translator.CalendarEventCompose_SelectCalendar;
+    public string SelectedCalendarAccountText => SelectedCalendar?.Account?.Address ?? string.Empty;
+    public bool IsDailyRecurrenceSelected => SelectedRecurrenceFrequencyOption?.Frequency == CalendarItemRecurrenceFrequency.Daily;
+
+    public CalendarEventComposePageViewModel(IAccountService accountService,
+                                             ICalendarService calendarService,
+                                             INavigationService navigationService,
+                                             IMailDialogService dialogService,
+                                             IContactService contactService,
+                                             IPreferencesService preferencesService,
+                                             IUnderlyingThemeService underlyingThemeService,
+                                             IWinoRequestDelegator winoRequestDelegator)
+    {
+        _accountService = accountService;
+        _calendarService = calendarService;
+        _navigationService = navigationService;
+        _dialogService = dialogService;
+        _contactService = contactService;
+        _preferencesService = preferencesService;
+        _underlyingThemeService = underlyingThemeService;
+        _winoRequestDelegator = winoRequestDelegator;
+
+        CurrentSettings = _preferencesService.GetCurrentCalendarSettings();
+        IsDarkWebviewRenderer = _underlyingThemeService.IsUnderlyingThemeDark();
+
+        Attachments.CollectionChanged += AttachmentsCollectionChanged;
+
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Free));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Tentative));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Busy));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.OutOfOffice));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.WorkingElsewhere));
+
+        foreach (var reminderMinutes in _calendarService.GetPredefinedReminderMinutes().OrderByDescending(x => x))
+        {
+            ReminderOptions.Add(new ReminderOption(reminderMinutes));
+        }
+
+        foreach (var interval in Enumerable.Range(1, 99))
+        {
+            RecurrenceIntervalOptions.Add(interval);
+        }
+
+        RecurrenceFrequencyOptions.Add(new CalendarComposeFrequencyOption(CalendarItemRecurrenceFrequency.Daily, Translator.CalendarEventCompose_FrequencyDay));
+        RecurrenceFrequencyOptions.Add(new CalendarComposeFrequencyOption(CalendarItemRecurrenceFrequency.Weekly, Translator.CalendarEventCompose_FrequencyWeek));
+        RecurrenceFrequencyOptions.Add(new CalendarComposeFrequencyOption(CalendarItemRecurrenceFrequency.Monthly, Translator.CalendarEventCompose_FrequencyMonth));
+        RecurrenceFrequencyOptions.Add(new CalendarComposeFrequencyOption(CalendarItemRecurrenceFrequency.Yearly, Translator.CalendarEventCompose_FrequencyYear));
+        SelectedRecurrenceFrequencyOption = RecurrenceFrequencyOptions.FirstOrDefault();
+
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Monday, "MO", Translator.CalendarEventCompose_Weekday_Monday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Tuesday, "TU", Translator.CalendarEventCompose_Weekday_Tuesday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Wednesday, "WE", Translator.CalendarEventCompose_Weekday_Wednesday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Thursday, "TH", Translator.CalendarEventCompose_Weekday_Thursday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Friday, "FR", Translator.CalendarEventCompose_Weekday_Friday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Saturday, "SA", Translator.CalendarEventCompose_Weekday_Saturday));
+        WeekdayOptions.Add(CreateWeekdayOption(DayOfWeek.Sunday, "SU", Translator.CalendarEventCompose_Weekday_Sunday));
+
+        SelectedReminderOption = GetDefaultReminderOption();
+        SelectedShowAsOption = ShowAsOptions.FirstOrDefault(option => option.ShowAs == CalendarItemShowAs.Busy);
+
+        var (defaultStart, defaultEnd) = GetDefaultComposeDateRange();
+        ApplyDateRange(defaultStart, defaultEnd, false);
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        await LoadAvailableCalendarsAsync();
+
+        var args = parameters as CalendarEventComposeNavigationArgs;
+        ApplyNavigationArgs(args);
+        UpdateRecurrenceSummary();
+    }
+
+    partial void OnSelectedCalendarChanged(AccountCalendarViewModel value)
+    {
+        if (value == null)
+            return;
+
+        SelectedShowAsOption = ShowAsOptions.FirstOrDefault(option => option.ShowAs == value.DefaultShowAs)
+                               ?? ShowAsOptions.FirstOrDefault();
+
+        if (IsSelectedCalendarCalDav && Attachments.Count > 0)
+        {
+            Attachments.Clear();
+        }
+
+        OnPropertyChanged(nameof(IsSelectedCalendarCalDav));
+        OnPropertyChanged(nameof(CanAddAttachments));
+        OnPropertyChanged(nameof(AttachmentsDisabledTooltipText));
+        OnPropertyChanged(nameof(SelectedCalendarDisplayText));
+        OnPropertyChanged(nameof(SelectedCalendarAccountText));
+    }
+
+    partial void OnIsAllDayChanged(bool value)
+    {
+        if (value)
+        {
+            if (AllDayEndDate.Date <= StartDate.Date)
+            {
+                AllDayEndDate = StartDate.AddDays(1);
+            }
+        }
+
+        UpdateRecurrenceSummary();
+    }
+
+    partial void OnStartDateChanged(DateTimeOffset value)
+    {
+        if (IsAllDay && AllDayEndDate.Date <= value.Date)
+        {
+            AllDayEndDate = value.AddDays(1);
+        }
+
+        if (IsRecurring && WeekdayOptions.All(option => !option.IsSelected))
+        {
+            SelectSingleWeekday(value.DayOfWeek);
+        }
+
+        UpdateRecurrenceSummary();
+    }
+
+    partial void OnStartTimeChanged(TimeSpan value) => UpdateRecurrenceSummary();
+    partial void OnEndTimeChanged(TimeSpan value) => UpdateRecurrenceSummary();
+    partial void OnAllDayEndDateChanged(DateTimeOffset value) => UpdateRecurrenceSummary();
+    partial void OnIsRecurringChanged(bool value)
+    {
+        if (value && WeekdayOptions.All(option => !option.IsSelected))
+        {
+            SelectSingleWeekday(StartDate.DayOfWeek);
+        }
+
+        UpdateRecurrenceSummary();
+    }
+    partial void OnSelectedRecurrenceIntervalChanged(int value) => UpdateRecurrenceSummary();
+    partial void OnSelectedRecurrenceFrequencyOptionChanged(CalendarComposeFrequencyOption value)
+    {
+        OnPropertyChanged(nameof(IsDailyRecurrenceSelected));
+        UpdateRecurrenceSummary();
+    }
+    partial void OnRecurrenceEndDateChanged(DateTimeOffset? value) => UpdateRecurrenceSummary();
+
+    [RelayCommand]
+    private async Task AddAttachmentsAsync()
+    {
+        if (!CanAddAttachments)
+            return;
+
+        var pickedFiles = await _dialogService.PickFilesMetadataAsync("*");
+        if (pickedFiles.Count == 0)
+            return;
+
+        await ExecuteUIThread(() =>
+        {
+            foreach (var file in pickedFiles)
+            {
+                TryAddAttachment(file.FileName, file.FullFilePath, file.FileExtension, file.Size);
+            }
+        });
+    }
+
+    public bool TryAddAttachment(string filePath, long size)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+            return false;
+
+        var fileName = Path.GetFileName(filePath);
+        var fileExtension = Path.GetExtension(filePath);
+        return TryAddAttachment(fileName, filePath, fileExtension, size);
+    }
+
+    [RelayCommand]
+    private void RemoveAttachment(CalendarComposeAttachmentViewModel attachment)
+    {
+        if (attachment == null)
+            return;
+
+        Attachments.Remove(attachment);
+    }
+
+    [RelayCommand]
+    private void ClearRecurrenceEndDate()
+    {
+        RecurrenceEndDate = null;
+    }
+
+    [RelayCommand]
+    private void Cancel()
+    {
+        _navigationService.GoBack();
+    }
+
+    [RelayCommand]
+    private async Task CreateAsync()
+    {
+        var uniqueAttendees = Attendees
+            .GroupBy(attendee => attendee.Email, StringComparer.OrdinalIgnoreCase)
+            .Select(group => group.First())
+            .ToList();
+
+        var createdResult = await BuildResultAsync(uniqueAttendees);
+
+        try
+        {
+            _composeResultValidator.Validate(createdResult);
+        }
+        catch (CalendarEventComposeValidationException ex)
+        {
+            ShowValidationMessage(ex.Message);
+            return;
+        }
+
+        LastCreatedResult = createdResult;
+
+        await _winoRequestDelegator.ExecuteAsync(new CalendarOperationPreparationRequest(
+            CalendarSynchronizerOperation.CreateEvent,
+            ComposeResult: createdResult));
+
+        NavigateBackToCalendar(createdResult.StartDate);
+    }
+
+    private void NavigateBackToCalendar(DateTime targetDate)
+    {
+        _navigationService.Navigate(
+            WinoPage.CalendarPage,
+            new CalendarPageNavigationArgs
+            {
+                NavigationDate = targetDate,
+                ForceReload = true
+            });
+    }
+
+    public async Task<List<AccountContact>> SearchContactsAsync(string queryText)
+    {
+        if (string.IsNullOrWhiteSpace(queryText) || queryText.Length < 2)
+            return [];
+
+        return await _contactService.GetAddressInformationAsync(queryText).ConfigureAwait(false);
+    }
+
+    public async Task<CalendarComposeAttendeeViewModel> GetAttendeeAsync(string tokenText)
+    {
+        if (!EmailValidator.Validate(tokenText))
+            return null;
+
+        var existing = Attendees.Any(attendee => attendee.Email.Equals(tokenText, StringComparison.OrdinalIgnoreCase));
+        if (existing)
+            return null;
+
+        var info = await _contactService.GetAddressInformationByAddressAsync(tokenText).ConfigureAwait(false);
+        if (info != null)
+        {
+            return CalendarComposeAttendeeViewModel.FromContact(info);
+        }
+
+        return new CalendarComposeAttendeeViewModel(string.Empty, tokenText);
+    }
+
+    public void AddAttendee(CalendarComposeAttendeeViewModel attendee)
+    {
+        if (Attendees.Any(existing => existing.Email.Equals(attendee.Email, StringComparison.OrdinalIgnoreCase)))
+            return;
+
+        Attendees.Add(attendee);
+    }
+
+    [RelayCommand]
+    private void RemoveAttendee(CalendarComposeAttendeeViewModel attendee)
+    {
+        if (attendee == null)
+            return;
+
+        Attendees.Remove(attendee);
+    }
+
+    public void NotifyAddressExists()
+    {
+        _dialogService.InfoBarMessage(
+            Translator.Info_ContactExistsTitle,
+            Translator.Info_ContactExistsMessage,
+            InfoBarMessageType.Warning);
+    }
+
+    public void NotifyInvalidEmail(string address)
+    {
+        _dialogService.InfoBarMessage(
+            Translator.Info_InvalidAddressTitle,
+            string.Format(Translator.Info_InvalidAddressMessage, address),
+            InfoBarMessageType.Warning);
+    }
+
+    private async Task LoadAvailableCalendarsAsync()
+    {
+        var accountCalendars = new List<AccountCalendarViewModel>();
+        var groupedCalendars = new List<GroupedAccountCalendarViewModel>();
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+        foreach (var account in accounts)
+        {
+            var calendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
+            var viewModels = calendars
+                .Select(calendar => new AccountCalendarViewModel(account, calendar))
+                .ToList();
+
+            accountCalendars.AddRange(viewModels);
+
+            if (viewModels.Count > 0)
+            {
+                groupedCalendars.Add(new GroupedAccountCalendarViewModel(account, viewModels));
+            }
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            AvailableCalendars.Clear();
+            AvailableCalendarGroups.Clear();
+
+            foreach (var calendar in accountCalendars.OrderBy(calendar => calendar.Account.Name).ThenBy(calendar => calendar.Name))
+            {
+                AvailableCalendars.Add(calendar);
+            }
+
+            foreach (var group in groupedCalendars.OrderBy(group => group.Account.Name))
+            {
+                AvailableCalendarGroups.Add(group);
+            }
+        });
+    }
+
+    private void ApplyNavigationArgs(CalendarEventComposeNavigationArgs args)
+    {
+        var (defaultStart, defaultEnd) = GetDefaultComposeDateRange();
+        var startDate = args?.StartDate != default ? args!.StartDate : defaultStart;
+        var endDate = args?.EndDate != default ? args!.EndDate : defaultEnd;
+        var isAllDay = args?.IsAllDay ?? false;
+
+        Title = args?.Title ?? string.Empty;
+        Location = args?.Location ?? string.Empty;
+
+        ApplyDateRange(startDate, endDate, isAllDay);
+
+        SelectedCalendar = ResolveSelectedCalendar(args?.SelectedCalendarId);
+        if (SelectedCalendar != null)
+        {
+            SelectedShowAsOption = ShowAsOptions.FirstOrDefault(option => option.ShowAs == SelectedCalendar.DefaultShowAs)
+                                   ?? SelectedShowAsOption
+                                   ?? ShowAsOptions.FirstOrDefault();
+        }
+    }
+
+    private AccountCalendarViewModel ResolveSelectedCalendar(Guid? selectedCalendarId)
+    {
+        if (selectedCalendarId.HasValue)
+        {
+            var selectedCalendar = AvailableCalendars.FirstOrDefault(calendar => calendar.Id == selectedCalendarId.Value);
+            if (selectedCalendar != null)
+                return selectedCalendar;
+        }
+
+        return AvailableCalendars.FirstOrDefault(calendar => calendar.IsPrimary) ?? AvailableCalendars.FirstOrDefault();
+    }
+
+    private void ApplyDateRange(DateTime startDate, DateTime endDate, bool isAllDay)
+    {
+        IsAllDay = isAllDay;
+        StartDate = new DateTimeOffset(startDate.Date);
+        StartTime = startDate.TimeOfDay;
+        EndTime = endDate.TimeOfDay;
+        AllDayEndDate = new DateTimeOffset((isAllDay ? endDate.Date : startDate.Date.AddDays(1)));
+    }
+
+    private async Task<CalendarEventComposeResult> BuildResultAsync(List<CalendarComposeAttendeeViewModel> uniqueAttendees)
+    {
+        if (RecurrenceEndDate.HasValue && RecurrenceEndDate.Value.Date < StartDate.Date)
+        {
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationInvalidRecurrenceEnd);
+        }
+
+        var htmlNotes = GetHtmlNotesAsync == null ? string.Empty : await GetHtmlNotesAsync();
+        var effectiveStart = GetEffectiveStartDateTime();
+        var effectiveEnd = GetEffectiveEndDateTime();
+
+        return new CalendarEventComposeResult
+        {
+            CalendarId = SelectedCalendar?.Id ?? Guid.Empty,
+            AccountId = SelectedCalendar?.Account.Id ?? Guid.Empty,
+            Title = Title.Trim(),
+            Location = Location?.Trim() ?? string.Empty,
+            HtmlNotes = htmlNotes,
+            StartDate = effectiveStart,
+            EndDate = effectiveEnd,
+            IsAllDay = IsAllDay,
+            TimeZoneId = TimeZoneInfo.Local.Id,
+            ShowAs = SelectedShowAsOption?.ShowAs ?? SelectedCalendar?.DefaultShowAs ?? CalendarItemShowAs.Busy,
+            SelectedReminders = BuildSelectedReminders(),
+            Attendees = BuildAttendees(uniqueAttendees),
+            Attachments = CanAddAttachments
+                ? Attachments.Select(attachment => attachment.ToDraftModel()).ToList()
+                : [],
+            Recurrence = BuildRecurrenceRule(),
+            RecurrenceSummary = RecurrenceSummary
+        };
+    }
+
+    private List<Reminder> BuildSelectedReminders()
+    {
+        if (SelectedReminderOption == null)
+            return [];
+
+        return
+        [
+            new Reminder
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = Guid.Empty,
+                DurationInSeconds = SelectedReminderOption.Minutes * 60L,
+                ReminderType = CalendarItemReminderType.Popup
+            }
+        ];
+    }
+
+    private static List<CalendarEventAttendee> BuildAttendees(IEnumerable<CalendarComposeAttendeeViewModel> attendees)
+    {
+        return attendees
+            .Select(attendee => new CalendarEventAttendee
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = Guid.Empty,
+                Name = attendee.HasDistinctDisplayName ? attendee.DisplayName : string.Empty,
+                Email = attendee.Email,
+                AttendenceStatus = AttendeeStatus.NeedsAction,
+                IsOrganizer = false,
+                ResolvedContact = attendee.ResolvedContact
+            })
+            .ToList();
+    }
+
+    private ReminderOption GetDefaultReminderOption()
+    {
+        var reminderMinutes = Math.Max(1, _preferencesService.DefaultReminderDurationInSeconds / 60);
+        return ReminderOptions.FirstOrDefault(option => option.Minutes == reminderMinutes)
+               ?? ReminderOptions.FirstOrDefault();
+    }
+
+    private void UpdateRecurrenceSummary()
+    {
+        if (!HasInitializedComposeDateRange())
+        {
+            RecurrenceSummary = string.Empty;
+            return;
+        }
+
+        var effectiveStart = GetEffectiveStartDateTime();
+        var effectiveEnd = GetEffectiveEndDateTime();
+        var selectedDays = IsDailyRecurrenceSelected
+            ? WeekdayOptions
+                .Where(option => option.IsSelected)
+                .Select(option => option.DayOfWeek)
+                .ToList()
+            : [];
+
+        RecurrenceSummary = CalendarRecurrenceSummaryFormatter.BuildSummary(
+            IsRecurring,
+            effectiveStart,
+            effectiveEnd,
+            IsAllDay,
+            CurrentSettings,
+            SelectedRecurrenceInterval,
+            SelectedRecurrenceFrequencyOption?.Frequency ?? CalendarItemRecurrenceFrequency.Weekly,
+            selectedDays,
+            RecurrenceEndDate);
+    }
+
+    private bool HasInitializedComposeDateRange()
+    {
+        if (StartDate == default)
+        {
+            return false;
+        }
+
+        return !IsAllDay || AllDayEndDate != default;
+    }
+
+    private string BuildRecurrenceRule()
+    {
+        if (!IsRecurring || SelectedRecurrenceFrequencyOption == null)
+            return string.Empty;
+
+        var parts = new List<string>
+        {
+            $"FREQ={SelectedRecurrenceFrequencyOption.Frequency.ToString().ToUpperInvariant()}",
+            $"INTERVAL={SelectedRecurrenceInterval}"
+        };
+
+        var selectedDays = IsDailyRecurrenceSelected
+            ? WeekdayOptions
+                .Where(option => option.IsSelected)
+                .Select(option => option.RuleValue)
+                .ToList()
+            : [];
+
+        if (selectedDays.Count > 0)
+        {
+            parts.Add($"BYDAY={string.Join(",", selectedDays)}");
+        }
+
+        if (RecurrenceEndDate.HasValue)
+        {
+            var untilValue = IsAllDay
+                ? RecurrenceEndDate.Value.ToString("yyyyMMdd", CultureInfo.InvariantCulture)
+                : RecurrenceEndDate.Value.Date.AddDays(1).AddSeconds(-1).ToString("yyyyMMdd'T'HHmmss", CultureInfo.InvariantCulture);
+
+            parts.Add($"UNTIL={untilValue}");
+        }
+
+        return $"RRULE:{string.Join(";", parts)}";
+    }
+
+    private DateTime GetEffectiveStartDateTime()
+        => StartDate.Date.Add(IsAllDay ? TimeSpan.Zero : StartTime);
+
+    private DateTime GetEffectiveEndDateTime()
+        => IsAllDay
+            ? AllDayEndDate.Date
+            : StartDate.Date.Add(EndTime);
+
+    private static (DateTime StartDate, DateTime EndDate) GetDefaultComposeDateRange()
+    {
+        var localNow = DateTime.Now;
+        var roundedMinutes = localNow.Minute switch
+        {
+            < 30 => 30,
+            30 when localNow.Second == 0 && localNow.Millisecond == 0 => 30,
+            _ => 60
+        };
+
+        var startDate = new DateTime(localNow.Year, localNow.Month, localNow.Day, localNow.Hour, 0, 0);
+        startDate = roundedMinutes == 60 ? startDate.AddHours(1) : startDate.AddMinutes(roundedMinutes);
+
+        return (startDate, startDate.AddMinutes(30));
+    }
+
+    private CalendarComposeWeekdayOption CreateWeekdayOption(DayOfWeek dayOfWeek, string ruleValue, string label)
+    {
+        var option = new CalendarComposeWeekdayOption(dayOfWeek, ruleValue, label);
+        option.PropertyChanged += WeekdayOptionPropertyChanged;
+        return option;
+    }
+
+    private void WeekdayOptionPropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(CalendarComposeWeekdayOption.IsSelected))
+        {
+            UpdateRecurrenceSummary();
+        }
+    }
+
+    private void SelectSingleWeekday(DayOfWeek dayOfWeek)
+    {
+        foreach (var option in WeekdayOptions)
+        {
+            option.IsSelected = option.DayOfWeek == dayOfWeek;
+        }
+    }
+
+    private void ShowValidationMessage(string message)
+    {
+        _dialogService.InfoBarMessage(
+            Translator.CalendarEventCompose_ValidationTitle,
+            message,
+            InfoBarMessageType.Warning);
+    }
+
+    private void AttachmentsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        OnPropertyChanged(nameof(HasAttachments));
+    }
+
+    private bool TryAddAttachment(string fileName, string filePath, string fileExtension, long size)
+    {
+        if (!CanAddAttachments ||
+            string.IsNullOrWhiteSpace(filePath) ||
+            Attachments.Any(existing => existing.FilePath.Equals(filePath, StringComparison.OrdinalIgnoreCase)))
+        {
+            return false;
+        }
+
+        Attachments.Add(new CalendarComposeAttachmentViewModel(fileName, filePath, fileExtension, size));
+        return true;
+    }
+
+}
+
+public partial class CalendarComposeFrequencyOption : ObservableObject
+{
+    public CalendarItemRecurrenceFrequency Frequency { get; }
+    public string DisplayText { get; }
+
+    public CalendarComposeFrequencyOption(CalendarItemRecurrenceFrequency frequency, string displayText)
+    {
+        Frequency = frequency;
+        DisplayText = displayText;
+    }
+
+    public string PluralLabel(int interval)
+    {
+        if (interval == 1)
+            return DisplayText;
+
+        return Frequency switch
+        {
+            CalendarItemRecurrenceFrequency.Daily => Translator.CalendarEventCompose_FrequencyDayPlural,
+            CalendarItemRecurrenceFrequency.Weekly => Translator.CalendarEventCompose_FrequencyWeekPlural,
+            CalendarItemRecurrenceFrequency.Monthly => Translator.CalendarEventCompose_FrequencyMonthPlural,
+            CalendarItemRecurrenceFrequency.Yearly => Translator.CalendarEventCompose_FrequencyYearPlural,
+            _ => DisplayText
+        };
+    }
+}
+
+public partial class CalendarComposeWeekdayOption : ObservableObject
+{
+    public DayOfWeek DayOfWeek { get; }
+    public string RuleValue { get; }
+    public string Label { get; }
+    public string FullDayName => DayOfWeek switch
+    {
+        DayOfWeek.Monday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[1],
+        DayOfWeek.Tuesday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[2],
+        DayOfWeek.Wednesday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[3],
+        DayOfWeek.Thursday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[4],
+        DayOfWeek.Friday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[5],
+        DayOfWeek.Saturday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[6],
+        DayOfWeek.Sunday => CultureInfo.CurrentCulture.DateTimeFormat.DayNames[0],
+        _ => string.Empty
+    };
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public CalendarComposeWeekdayOption(DayOfWeek dayOfWeek, string ruleValue, string label)
+    {
+        DayOfWeek = dayOfWeek;
+        RuleValue = ruleValue;
+        Label = label;
+    }
+}
+
+
diff --git a/Wino.Calendar.ViewModels/CalendarNotificationSettingsPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarNotificationSettingsPageViewModel.cs
new file mode 100644
index 00000000..df4af29f
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarNotificationSettingsPageViewModel.cs
@@ -0,0 +1,44 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarNotificationSettingsPageViewModel : CalendarSettingsSectionViewModelBase
+{
+    [ObservableProperty]
+    public partial int SelectedDefaultReminderIndex { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedDefaultSnoozeIndex { get; set; }
+
+    public CalendarNotificationSettingsPageViewModel(
+        IPreferencesService preferencesService,
+        ICalendarService calendarService,
+        IAccountService accountService)
+        : base(preferencesService, calendarService, accountService)
+    {
+        LoadReminderOptions();
+        LoadSnoozeOptions();
+
+        SelectedDefaultReminderIndex = GetSelectedReminderIndex();
+        SelectedDefaultSnoozeIndex = GetSelectedSnoozeIndex();
+
+        IsLoaded = true;
+    }
+
+    partial void OnSelectedDefaultReminderIndexChanged(int value)
+    {
+        if (!IsLoaded)
+            return;
+
+        SaveReminderIndex(value);
+    }
+
+    partial void OnSelectedDefaultSnoozeIndexChanged(int value)
+    {
+        if (!IsLoaded)
+            return;
+
+        SaveSnoozeIndex(value);
+    }
+}
diff --git a/Wino.Calendar.ViewModels/CalendarPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
index 99cd7a94..fedfce72 100644
--- a/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
+++ b/Wino.Calendar.ViewModels/CalendarPageViewModel.cs
@@ -1,27 +1,27 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using CommunityToolkit.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using MoreLinq;
+using Itenso.TimePeriod;
 using Serilog;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Calendar.ViewModels.Interfaces;
 using Wino.Calendar.ViewModels.Messages;
-using Wino.Core.Domain.Collections;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Calendar;
-using Wino.Core.Domain.Models.Calendar.CalendarTypeStrategies;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.UI;
 
 namespace Wino.Calendar.ViewModels;
 
@@ -31,81 +31,95 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
     IRecipient<CalendarSettingsUpdatedMessage>,
     IRecipient<CalendarItemTappedMessage>,
     IRecipient<CalendarItemDoubleTappedMessage>,
-    IRecipient<CalendarItemRightTappedMessage>
+    IRecipient<CalendarItemRightTappedMessage>,
+    IRecipient<AccountRemovedMessage>,
+    IDisposable
 {
     #region Quick Event Creation
 
-    [ObservableProperty]
-    private bool _isQuickEventDialogOpen;
-
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(SelectedQuickEventAccountCalendarName))]
     [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
-    private AccountCalendarViewModel _selectedQuickEventAccountCalendar;
+    public partial AccountCalendarViewModel SelectedQuickEventAccountCalendar { get; set; }
 
     public string SelectedQuickEventAccountCalendarName
-    {
-        get
-        {
-            return SelectedQuickEventAccountCalendar == null ? "Pick a calendar" : SelectedQuickEventAccountCalendar.Name;
-        }
-    }
+        => SelectedQuickEventAccountCalendar == null ? "Pick a calendar" : SelectedQuickEventAccountCalendar.Name;
 
     [ObservableProperty]
-    private List<string> _hourSelectionStrings;
+    public partial List<string> HourSelectionStrings { get; set; } = [];
 
-    // To be able to revert the values when the user enters an invalid time.
-    private string _previousSelectedStartTimeString;
-    private string _previousSelectedEndTimeString;
-
-    [ObservableProperty]
-    private DateTime? _selectedQuickEventDate;
-
-    [ObservableProperty]
-    private bool _isAllDay;
+    private string _previousSelectedStartTimeString = string.Empty;
+    private string _previousSelectedEndTimeString = string.Empty;
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
-    private string _selectedStartTimeString;
+    public partial DateTime? SelectedQuickEventDate { get; set; }
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
-    private string _selectedEndTimeString;
-
-    [ObservableProperty]
-    private string _location;
+    public partial bool IsAllDay { get; set; }
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
-    private string _eventName;
+    public partial string SelectedStartTimeString { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
+    public partial string SelectedEndTimeString { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string Location { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(SaveQuickEventCommand))]
+    public partial string EventName { get; set; } = string.Empty;
 
     public DateTime QuickEventStartTime => SelectedQuickEventDate.Value.Date.Add(CurrentSettings.GetTimeSpan(SelectedStartTimeString).Value);
     public DateTime QuickEventEndTime => SelectedQuickEventDate.Value.Date.Add(CurrentSettings.GetTimeSpan(SelectedEndTimeString).Value);
 
-    public bool CanSaveQuickEvent => SelectedQuickEventAccountCalendar != null &&
-                                    !string.IsNullOrWhiteSpace(EventName) &&
-                                    !string.IsNullOrWhiteSpace(SelectedStartTimeString) &&
-                                    !string.IsNullOrWhiteSpace(SelectedEndTimeString) &&
-                                    QuickEventEndTime > QuickEventStartTime;
+    public bool CanSaveQuickEvent
+    {
+        get
+        {
+            if (SelectedQuickEventAccountCalendar == null ||
+                SelectedQuickEventDate == null ||
+                string.IsNullOrWhiteSpace(EventName) ||
+                string.IsNullOrWhiteSpace(SelectedStartTimeString) ||
+                string.IsNullOrWhiteSpace(SelectedEndTimeString))
+            {
+                return false;
+            }
+
+            var startTime = CurrentSettings.GetTimeSpan(SelectedStartTimeString);
+            var endTime = CurrentSettings.GetTimeSpan(SelectedEndTimeString);
+
+            if (!startTime.HasValue || !endTime.HasValue)
+            {
+                return false;
+            }
+
+            return IsAllDay || endTime > startTime;
+        }
+    }
 
     #endregion
 
-    #region Data Initialization
+    #region Visible Range
 
     [ObservableProperty]
-    private CalendarOrientation _calendarOrientation = CalendarOrientation.Horizontal;
+    public partial VisibleDateRange CurrentVisibleRange { get; set; }
 
     [ObservableProperty]
-    private DayRangeCollection _dayRanges = [];
+    public partial string VisibleDateRangeText { get; set; } = string.Empty;
 
     [ObservableProperty]
-    private int _selectedDateRangeIndex;
+    public partial DateRange LoadedDateWindow { get; set; }
 
     [ObservableProperty]
-    private DayRangeRenderModel _selectedDayRange;
+    public partial bool IsCalendarEnabled { get; set; } = true;
 
     [ObservableProperty]
-    private bool _isCalendarEnabled = true;
+    public partial IReadOnlyList<CalendarItemViewModel> CalendarItems { get; set; } = [];
 
     #endregion
 
@@ -113,107 +127,305 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
 
     public event EventHandler DetailsShowCalendarItemChanged;
 
+    public bool CanJoinOnline => DisplayDetailsCalendarItemViewModel != null &&
+                                 !string.IsNullOrEmpty(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink);
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsEventDetailsVisible))]
-    private CalendarItemViewModel _displayDetailsCalendarItemViewModel;
+    [NotifyCanExecuteChangedFor(nameof(JoinOnlineCommand))]
+    [NotifyPropertyChangedFor(nameof(CanJoinOnline))]
+    public partial CalendarItemViewModel DisplayDetailsCalendarItemViewModel { get; set; }
 
     public bool IsEventDetailsVisible => DisplayDetailsCalendarItemViewModel != null;
 
     #endregion
 
-    // TODO: Get rid of some of the items if we have too many.
-    private const int maxDayRangeSize = 10;
-
     private readonly ICalendarService _calendarService;
     private readonly INavigationService _navigationService;
-    private readonly IKeyPressService _keyPressService;
+    private readonly INativeAppService _nativeAppService;
     private readonly IPreferencesService _preferencesService;
+    private readonly IWinoRequestDelegator _winoRequestDelegator;
+    private readonly IMailDialogService _dialogService;
+    private readonly IDateContextProvider _dateContextProvider;
+    private readonly ICalendarRangeTextFormatter _calendarRangeTextFormatter;
 
-    // Store latest rendered options.
-    private CalendarDisplayType _currentDisplayType;
-    private int _displayDayCount;
-
-    private SemaphoreSlim _calendarLoadingSemaphore = new(1);
-    private bool isLoadMoreBlocked = false;
+    private readonly SemaphoreSlim _calendarLoadingSemaphore = new(1);
+    private bool _subscriptionsAttached;
+    private CancellationTokenSource _pageLifetimeCts = new();
+    private long _pageLifetimeVersion;
+    private List<CalendarItemViewModel> _loadedCalendarItems = [];
 
     [ObservableProperty]
-    private CalendarSettings _currentSettings;
+    public partial CalendarSettings CurrentSettings { get; set; }
 
     public IStatePersistanceService StatePersistanceService { get; }
     public IAccountCalendarStateService AccountCalendarStateService { get; }
 
-    public CalendarPageViewModel(IStatePersistanceService statePersistanceService,
-                                 ICalendarService calendarService,
-                                 INavigationService navigationService,
-                                 IKeyPressService keyPressService,
-                                 IAccountCalendarStateService accountCalendarStateService,
-                                 IPreferencesService preferencesService)
+    public CalendarPageViewModel(
+        IStatePersistanceService statePersistanceService,
+        ICalendarService calendarService,
+        INavigationService navigationService,
+        IKeyPressService keyPressService,
+        INativeAppService nativeAppService,
+        IAccountCalendarStateService accountCalendarStateService,
+        IPreferencesService preferencesService,
+        IWinoRequestDelegator winoRequestDelegator,
+        IMailDialogService dialogService,
+        IDateContextProvider dateContextProvider,
+        ICalendarRangeTextFormatter calendarRangeTextFormatter)
     {
         StatePersistanceService = statePersistanceService;
         AccountCalendarStateService = accountCalendarStateService;
-
         _calendarService = calendarService;
         _navigationService = navigationService;
-        _keyPressService = keyPressService;
+        _nativeAppService = nativeAppService;
         _preferencesService = preferencesService;
+        _winoRequestDelegator = winoRequestDelegator;
+        _dialogService = dialogService;
+        _dateContextProvider = dateContextProvider;
+        _calendarRangeTextFormatter = calendarRangeTextFormatter;
 
-        AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
-        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
+        RefreshSettings();
+    }
+
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
+    {
+        if (args.Handled || args.Mode != WinoApplicationMode.Calendar || args.Action != KeyboardShortcutAction.Delete)
+            return;
+
+        if (DisplayDetailsCalendarItemViewModel?.CalendarItem == null)
+            return;
+
+        if (DisplayDetailsCalendarItemViewModel.CalendarItem.IsRecurringParent)
+        {
+            var confirmed = await _dialogService.ShowConfirmationDialogAsync(
+                Translator.DialogMessage_DeleteRecurringSeriesMessage,
+                Translator.DialogMessage_DeleteRecurringSeriesTitle,
+                Translator.Buttons_Delete);
+
+            if (!confirmed)
+                return;
+        }
+
+        var preparationRequest = new CalendarOperationPreparationRequest(
+            CalendarSynchronizerOperation.DeleteEvent,
+            DisplayDetailsCalendarItemViewModel.CalendarItem,
+            null);
+
+        await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+        DisplayDetailsCalendarItemViewModel = null;
+        args.Handled = true;
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Unregister<LoadCalendarMessage>(this);
+        Messenger.Unregister<CalendarSettingsUpdatedMessage>(this);
+        Messenger.Unregister<CalendarItemTappedMessage>(this);
+        Messenger.Unregister<CalendarItemDoubleTappedMessage>(this);
+        Messenger.Unregister<CalendarItemRightTappedMessage>(this);
+        Messenger.Unregister<AccountRemovedMessage>(this);
+
+        Messenger.Register<LoadCalendarMessage>(this);
+        Messenger.Register<CalendarSettingsUpdatedMessage>(this);
+        Messenger.Register<CalendarItemTappedMessage>(this);
+        Messenger.Register<CalendarItemDoubleTappedMessage>(this);
+        Messenger.Register<CalendarItemRightTappedMessage>(this);
+        Messenger.Register<AccountRemovedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<LoadCalendarMessage>(this);
+        Messenger.Unregister<CalendarSettingsUpdatedMessage>(this);
+        Messenger.Unregister<CalendarItemTappedMessage>(this);
+        Messenger.Unregister<CalendarItemDoubleTappedMessage>(this);
+        Messenger.Unregister<CalendarItemRightTappedMessage>(this);
+        Messenger.Unregister<AccountRemovedMessage>(this);
     }
 
     private void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
-        => FilterActiveCalendars(DayRanges);
+    {
+        EnsureSelectedQuickEventAccountCalendar();
+        _ = ReloadCurrentVisibleRangeAsync();
+    }
 
     private void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
-        => FilterActiveCalendars(DayRanges);
-
-    private async void FilterActiveCalendars(IEnumerable<DayRangeRenderModel> dayRangeRenderModels)
     {
-        await ExecuteUIThread(() =>
-        {
-            var days = dayRangeRenderModels.SelectMany(a => a.CalendarDays);
-
-            days.ForEach(a => a.EventsCollection.FilterByCalendars(AccountCalendarStateService.ActiveCalendars.Select(a => a.Id)));
-
-            DisplayDetailsCalendarItemViewModel = null;
-        });
+        EnsureSelectedQuickEventAccountCalendar();
+        _ = ReloadCurrentVisibleRangeAsync();
     }
 
-    // TODO: Replace when calendar settings are updated.
-    // Should be a field ideally.
-    private BaseCalendarTypeDrawingStrategy GetDrawingStrategy(CalendarDisplayType displayType)
+    [RelayCommand(CanExecute = nameof(CanJoinOnline))]
+    private async Task JoinOnlineAsync()
     {
-        return displayType switch
-        {
-            CalendarDisplayType.Day => new DayCalendarDrawingStrategy(CurrentSettings),
-            CalendarDisplayType.Week => new WeekCalendarDrawingStrategy(CurrentSettings),
-            CalendarDisplayType.Month => new MonthCalendarDrawingStrategy(CurrentSettings),
-            _ => throw new NotImplementedException(),
-        };
-    }
+        if (DisplayDetailsCalendarItemViewModel == null || string.IsNullOrEmpty(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink))
+            return;
 
-    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
-    {
-        // Do not call base method because that will unregister messenger recipient.
-        // This is a singleton view model and should not be unregistered.
+        await _nativeAppService.LaunchUriAsync(new Uri(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink));
     }
 
     public override void OnNavigatedTo(NavigationMode mode, object parameters)
     {
+        ResetPageLifetime();
         base.OnNavigatedTo(mode, parameters);
-
-        if (mode == NavigationMode.Back) return;
-
+        AttachSubscriptions();
         RefreshSettings();
+        IsCalendarEnabled = true;
+        EnsureSelectedQuickEventAccountCalendar();
+    }
 
-        // Automatically select the first primary calendar for quick event dialog.
-        SelectedQuickEventAccountCalendar = AccountCalendarStateService.ActiveCalendars.FirstOrDefault(a => a.IsPrimary);
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedFrom(mode, parameters);
+
+        if (StatePersistanceService.ApplicationMode == WinoApplicationMode.Calendar)
+        {
+            CancelPendingOperations();
+            DetachSubscriptions();
+            return;
+        }
+
+        CleanupForShellDeactivation();
+    }
+
+    private void AttachSubscriptions()
+    {
+        if (_subscriptionsAttached)
+            return;
+
+        AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
+        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
+        _subscriptionsAttached = true;
+    }
+
+    private void DetachSubscriptions()
+    {
+        if (!_subscriptionsAttached)
+            return;
+
+        AccountCalendarStateService.AccountCalendarSelectionStateChanged -= UpdateAccountCalendarRequested;
+        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged -= AccountCalendarStateCollectivelyChanged;
+        _subscriptionsAttached = false;
+    }
+
+    private void ReleasePageState()
+    {
+        DetachSubscriptions();
+        DisplayDetailsCalendarItemViewModel = null;
+        SelectedQuickEventAccountCalendar = null;
+        SelectedQuickEventDate = null;
+        HourSelectionStrings = [];
+        CurrentVisibleRange = null;
+        VisibleDateRangeText = string.Empty;
+        LoadedDateWindow = null;
+        _loadedCalendarItems = [];
+        CalendarItems = [];
+    }
+
+    public void Dispose()
+    {
+        CleanupForShellDeactivation();
+    }
+
+    public void CleanupForShellDeactivation()
+    {
+        CancelPendingOperations();
+        ReleasePageState();
+        GC.SuppressFinalize(this);
+    }
+
+    public bool RestoreVisibleState() => CurrentVisibleRange != null;
+
+    public DateTime GetRestoreDate()
+        => CurrentVisibleRange?.AnchorDate.ToDateTime(TimeOnly.MinValue) ?? DateTime.Now.Date;
+
+    private long CurrentPageLifetimeVersion => Interlocked.Read(ref _pageLifetimeVersion);
+
+    private bool IsPageActive(long lifetimeVersion)
+        => lifetimeVersion == CurrentPageLifetimeVersion && !_pageLifetimeCts.IsCancellationRequested;
+
+    private void ResetPageLifetime()
+    {
+        CancelPendingOperations();
+        _pageLifetimeCts = new CancellationTokenSource();
+        Interlocked.Increment(ref _pageLifetimeVersion);
+    }
+
+    private void CancelPendingOperations()
+    {
+        if (!_pageLifetimeCts.IsCancellationRequested)
+        {
+            _pageLifetimeCts.Cancel();
+        }
+    }
+
+    private async Task<bool> WaitForCalendarLoadingLockAsync(long lifetimeVersion)
+    {
+        if (!IsPageActive(lifetimeVersion))
+            return false;
+
+        try
+        {
+            await _calendarLoadingSemaphore.WaitAsync(_pageLifetimeCts.Token).ConfigureAwait(false);
+            return IsPageActive(lifetimeVersion);
+        }
+        catch (OperationCanceledException)
+        {
+            return false;
+        }
+        catch (ObjectDisposedException)
+        {
+            return false;
+        }
+    }
+
+    private void ReleaseCalendarLoadingLock()
+    {
+        try
+        {
+            _calendarLoadingSemaphore.Release();
+        }
+        catch (ObjectDisposedException)
+        {
+        }
+        catch (SemaphoreFullException)
+        {
+        }
+    }
+
+    private async Task ExecuteUIThreadIfActiveAsync(long lifetimeVersion, Action action)
+    {
+        if (action == null || !IsPageActive(lifetimeVersion))
+            return;
+
+        try
+        {
+            await ExecuteUIThread(() =>
+            {
+                if (IsPageActive(lifetimeVersion))
+                {
+                    action();
+                }
+            }).ConfigureAwait(false);
+        }
+        catch (COMException) when (!IsPageActive(lifetimeVersion))
+        {
+        }
+        catch (ObjectDisposedException) when (!IsPageActive(lifetimeVersion))
+        {
+        }
     }
 
     [RelayCommand]
     private void NavigateSeries()
     {
-        if (DisplayDetailsCalendarItemViewModel == null) return;
+        if (DisplayDetailsCalendarItemViewModel == null)
+            return;
 
         NavigateEvent(DisplayDetailsCalendarItemViewModel, CalendarEventTargetType.Series);
     }
@@ -221,7 +433,8 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
     [RelayCommand]
     private void NavigateEventDetails()
     {
-        if (DisplayDetailsCalendarItemViewModel == null) return;
+        if (DisplayDetailsCalendarItemViewModel == null)
+            return;
 
         NavigateEvent(DisplayDetailsCalendarItemViewModel, CalendarEventTargetType.Single);
     }
@@ -235,57 +448,81 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
     [RelayCommand(AllowConcurrentExecutions = false, CanExecute = nameof(CanSaveQuickEvent))]
     private async Task SaveQuickEventAsync()
     {
-        var durationSeconds = (QuickEventEndTime - QuickEventStartTime).TotalSeconds;
-
-        var testCalendarItem = new CalendarItem
+        var startDate = IsAllDay ? SelectedQuickEventDate.Value.Date : QuickEventStartTime;
+        var endDate = IsAllDay ? SelectedQuickEventDate.Value.Date.AddDays(1) : QuickEventEndTime;
+        var composeResult = new CalendarEventComposeResult
         {
             CalendarId = SelectedQuickEventAccountCalendar.Id,
-            StartDate = QuickEventStartTime,
-            DurationInSeconds = durationSeconds,
-            CreatedAt = DateTime.UtcNow,
-            Description = string.Empty,
-            Location = Location,
+            AccountId = SelectedQuickEventAccountCalendar.Account.Id,
             Title = EventName,
-            Id = Guid.NewGuid()
+            Location = Location ?? string.Empty,
+            HtmlNotes = string.Empty,
+            StartDate = startDate,
+            EndDate = endDate,
+            IsAllDay = IsAllDay,
+            TimeZoneId = TimeZoneInfo.Local.Id,
+            ShowAs = SelectedQuickEventAccountCalendar.DefaultShowAs,
+            SelectedReminders = [],
+            Attendees = [],
+            Attachments = [],
+            Recurrence = string.Empty,
+            RecurrenceSummary = string.Empty
         };
 
-        IsQuickEventDialogOpen = false;
-        await _calendarService.CreateNewCalendarItemAsync(testCalendarItem, null);
-
-        // TODO: Create the request with the synchronizer.
+        var preparationRequest = new CalendarOperationPreparationRequest(
+            CalendarSynchronizerOperation.CreateEvent,
+            ComposeResult: composeResult);
+        await _winoRequestDelegator.ExecuteAsync(preparationRequest);
     }
 
     [RelayCommand]
-    private void MoreDetails()
+    private void GoToEventComposePage()
     {
-        // TODO: Navigate to advanced event creation  page with existing parameters.
+        if (SelectedQuickEventDate == null)
+            return;
+
+        var startDate = SelectedQuickEventDate.Value;
+        var endDate = SelectedQuickEventDate.Value.AddMinutes(30);
+
+        if (!IsAllDay)
+        {
+            var selectedStartTime = CurrentSettings.GetTimeSpan(SelectedStartTimeString);
+            var selectedEndTime = CurrentSettings.GetTimeSpan(SelectedEndTimeString);
+
+            if (selectedStartTime.HasValue)
+            {
+                startDate = SelectedQuickEventDate.Value.Date.Add(selectedStartTime.Value);
+            }
+
+            if (selectedEndTime.HasValue)
+            {
+                endDate = SelectedQuickEventDate.Value.Date.Add(selectedEndTime.Value);
+            }
+        }
+        else
+        {
+            startDate = SelectedQuickEventDate.Value.Date;
+            endDate = SelectedQuickEventDate.Value.Date.AddDays(1);
+        }
+
+        _navigationService.Navigate(WinoPage.CalendarEventComposePage, new CalendarEventComposeNavigationArgs
+        {
+            SelectedCalendarId = SelectedQuickEventAccountCalendar?.Id,
+            Title = EventName ?? string.Empty,
+            Location = Location ?? string.Empty,
+            IsAllDay = IsAllDay,
+            StartDate = startDate,
+            EndDate = endDate
+        });
     }
 
     public void SelectQuickEventTimeRange(TimeSpan startTime, TimeSpan endTime)
     {
         IsAllDay = false;
-
         SelectedStartTimeString = CurrentSettings.GetTimeString(startTime);
         SelectedEndTimeString = CurrentSettings.GetTimeString(endTime);
     }
 
-    // Manage event detail popup context and select-unselect the proper items.
-    // Item selection rules are defined in the selection method.
-    partial void OnDisplayDetailsCalendarItemViewModelChanging(CalendarItemViewModel oldValue, CalendarItemViewModel newValue)
-    {
-        if (oldValue != null)
-        {
-            UnselectCalendarItem(oldValue);
-        }
-
-        if (newValue != null)
-        {
-            SelectCalendarItem(newValue);
-        }
-    }
-
-    // Notify view that the detail context changed.
-    // This will align the event detail popup to the selected event.
     partial void OnDisplayDetailsCalendarItemViewModelChanged(CalendarItemViewModel value)
         => DetailsShowCalendarItemChanged?.Invoke(this, EventArgs.Empty);
 
@@ -293,414 +530,293 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
     {
         CurrentSettings = _preferencesService.GetCurrentCalendarSettings();
 
-        // Populate the hour selection strings.
         var timeStrings = new List<string>();
-
         for (int hour = 0; hour < 24; hour++)
         {
             for (int minute = 0; minute < 60; minute += 30)
             {
                 var time = new DateTime(1, 1, 1, hour, minute, 0);
-
-                if (CurrentSettings.DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour)
-                {
-                    timeStrings.Add(time.ToString("HH:mm"));
-                }
-                else
-                {
-                    timeStrings.Add(time.ToString("h:mm tt"));
-                }
+                timeStrings.Add(CurrentSettings.DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour
+                    ? time.ToString("HH:mm")
+                    : time.ToString("h:mm tt"));
             }
         }
 
         HourSelectionStrings = timeStrings;
-    }
 
-    partial void OnIsCalendarEnabledChanging(bool oldValue, bool newValue) => Messenger.Send(new CalendarEnableStatusChangedMessage(newValue));
-
-    private bool ShouldResetDayRanges(LoadCalendarMessage message)
-    {
-        if (message.ForceRedraw) return true;
-
-        // Never reset if the initiative is from the app.
-        if (message.CalendarInitInitiative == CalendarInitInitiative.App) return false;
-
-        // 1. Display type is different.
-        // 2. Day display count is different.
-        // 3. Display date is not in the visible range.
-
-        if (DayRanges.DisplayRange == null) return false;
-
-        return
-            (_currentDisplayType != StatePersistanceService.CalendarDisplayType ||
-            _displayDayCount != StatePersistanceService.DayDisplayCount ||
-            !(message.DisplayDate >= DayRanges.DisplayRange.StartDate && message.DisplayDate <= DayRanges.DisplayRange.EndDate));
-    }
-
-    private void AdjustCalendarOrientation()
-    {
-        // Orientation only changes when we should reset.
-        // Handle the FlipView orientation here.
-        // We don't want to change the orientation while the item manipulation is going on.
-        // That causes a glitch in the UI.
-
-        bool isRequestedVerticalCalendar = StatePersistanceService.CalendarDisplayType == CalendarDisplayType.Month;
-        bool isLastRenderedVerticalCalendar = _currentDisplayType == CalendarDisplayType.Month;
-
-        if (isRequestedVerticalCalendar && !isLastRenderedVerticalCalendar)
+        if (CurrentVisibleRange != null)
         {
-            CalendarOrientation = CalendarOrientation.Vertical;
-        }
-        else
-        {
-            CalendarOrientation = CalendarOrientation.Horizontal;
+            VisibleDateRangeText = _calendarRangeTextFormatter.Format(CurrentVisibleRange, _dateContextProvider);
         }
     }
 
-    public async void Receive(LoadCalendarMessage message)
+    public async Task ApplyDisplayRequestAsync(CalendarDisplayRequest request, bool forceReload = false)
     {
-        await _calendarLoadingSemaphore.WaitAsync();
+        var lifetimeVersion = CurrentPageLifetimeVersion;
+        var hasLoadingLock = await WaitForCalendarLoadingLockAsync(lifetimeVersion).ConfigureAwait(false);
+
+        if (!hasLoadingLock)
+            return;
 
         try
         {
-            await ExecuteUIThread(() => IsCalendarEnabled = false);
+            await ExecuteUIThreadIfActiveAsync(lifetimeVersion, () => IsCalendarEnabled = false).ConfigureAwait(false);
 
-            if (ShouldResetDayRanges(message))
-            {
-                Debug.WriteLine("Will reset day ranges.");
-                await ClearDayRangeModelsAsync();
-            }
-            else if (ShouldScrollToItem(message))
-            {
-                // Scroll to the selected date.
-                Messenger.Send(new ScrollToDateMessage(message.DisplayDate));
-                Debug.WriteLine("Scrolling to selected date.");
+            if (!IsPageActive(lifetimeVersion))
                 return;
+
+            var currentSettings = CurrentSettings;
+            if (currentSettings == null)
+            {
+                RefreshSettings();
+                currentSettings = CurrentSettings;
             }
 
-            AdjustCalendarOrientation();
+            var today = _dateContextProvider.GetToday();
+            var visibleRange = CalendarRangeResolver.Resolve(request, currentSettings, today);
+            var previousRange = CalendarRangeResolver.Navigate(visibleRange, -1, currentSettings, today);
+            var nextRange = CalendarRangeResolver.Navigate(visibleRange, 1, currentSettings, today);
+            var loadedDateWindow = new DateRange(
+                previousRange.StartDate.ToDateTime(TimeOnly.MinValue),
+                nextRange.EndDate.AddDays(1).ToDateTime(TimeOnly.MinValue));
 
-            // This will replace the whole collection because the user initiated a new render.
-            await RenderDatesAsync(message.CalendarInitInitiative,
-                                   message.DisplayDate,
-                                   CalendarLoadDirection.Replace);
+            var shouldReload = forceReload || !IsSameVisibleRange(CurrentVisibleRange, visibleRange) || !IsSameDateRange(LoadedDateWindow, loadedDateWindow);
+            List<CalendarItemViewModel> loadedItems = null;
 
-            // Scroll to the current hour.
-            Messenger.Send(new ScrollToHourMessage(TimeSpan.FromHours(DateTime.Now.Hour)));
+            if (shouldReload)
+            {
+                loadedItems = await LoadCalendarItemsAsync(loadedDateWindow, lifetimeVersion).ConfigureAwait(false);
+                if (!IsPageActive(lifetimeVersion))
+                    return;
+            }
+
+            await ExecuteUIThreadIfActiveAsync(lifetimeVersion, () =>
+            {
+                if (loadedItems != null)
+                {
+                    _loadedCalendarItems = loadedItems;
+                    CalendarItems = loadedItems;
+                }
+
+                EnsureSelectedQuickEventAccountCalendar();
+                CurrentVisibleRange = visibleRange;
+                LoadedDateWindow = loadedDateWindow;
+                VisibleDateRangeText = _calendarRangeTextFormatter.Format(visibleRange, _dateContextProvider);
+                if (DisplayDetailsCalendarItemViewModel != null && !IsCalendarActive(DisplayDetailsCalendarItemViewModel.AssignedCalendar?.Id))
+                {
+                    DisplayDetailsCalendarItemViewModel = null;
+                }
+            }).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (COMException) when (!IsPageActive(lifetimeVersion))
+        {
+        }
+        catch (ObjectDisposedException) when (!IsPageActive(lifetimeVersion))
+        {
         }
         catch (Exception ex)
         {
-            Log.Error(ex, "Error while loading calendar.");
-            Debugger.Break();
+            Log.Error(ex, "Error while loading visible calendar range.");
         }
         finally
         {
-            _calendarLoadingSemaphore.Release();
-
-            await ExecuteUIThread(() => IsCalendarEnabled = true);
+            ReleaseCalendarLoadingLock();
+            await ExecuteUIThreadIfActiveAsync(lifetimeVersion, () => IsCalendarEnabled = true).ConfigureAwait(false);
         }
     }
 
-
-    private async Task AddDayRangeModelAsync(DayRangeRenderModel dayRangeRenderModel)
+    public Task ReloadCurrentVisibleRangeAsync()
     {
-        if (dayRangeRenderModel == null) return;
+        if (CurrentVisibleRange == null)
+            return Task.CompletedTask;
 
-        await ExecuteUIThread(() =>
-        {
-            DayRanges.Add(dayRangeRenderModel);
-        });
+        return ApplyDisplayRequestAsync(new CalendarDisplayRequest(CurrentVisibleRange.DisplayType, CurrentVisibleRange.AnchorDate), forceReload: true);
     }
 
-    private async Task InsertDayRangeModelAsync(DayRangeRenderModel dayRangeRenderModel, int index)
+    public async Task<IReadOnlyList<CalendarItem>> SearchCalendarItemsAsync(string queryText, int limit, CancellationToken cancellationToken)
     {
-        if (dayRangeRenderModel == null) return;
+        var results = await _calendarService.SearchCalendarItemsAsync(queryText, limit, cancellationToken).ConfigureAwait(false);
+        var activeCalendarIds = AccountCalendarStateService.ActiveCalendars.Select(calendar => calendar.Id).ToHashSet();
 
-        await ExecuteUIThread(() =>
-        {
-            DayRanges.Insert(index, dayRangeRenderModel);
-        });
+        return results
+            .Where(result => activeCalendarIds.Contains(result.CalendarId))
+            .ToList();
     }
 
-    private async Task RemoveDayRangeModelAsync(DayRangeRenderModel dayRangeRenderModel)
+    public void OpenCalendarSearchResult(CalendarItem calendarItem)
     {
-        if (dayRangeRenderModel == null) return;
-
-        await ExecuteUIThread(() =>
-        {
-            DayRanges.Remove(dayRangeRenderModel);
-        });
+        ArgumentNullException.ThrowIfNull(calendarItem);
+        NavigateEvent(new CalendarItemViewModel(calendarItem), CalendarEventTargetType.Single);
     }
 
-    private async Task ClearDayRangeModelsAsync()
+    private async Task<List<CalendarItemViewModel>> LoadCalendarItemsAsync(DateRange loadedDateWindow, long lifetimeVersion)
     {
-        await ExecuteUIThread(() =>
+        var loadedItems = new Dictionary<Guid, CalendarItemViewModel>();
+        var loadPeriod = new TimeRange(loadedDateWindow.StartDate, loadedDateWindow.EndDate);
+
+        foreach (var calendarViewModel in AccountCalendarStateService.ActiveCalendars)
         {
-            DayRanges.Clear();
-        });
-    }
+            if (!IsPageActive(lifetimeVersion))
+                return [];
 
-    private async Task RenderDatesAsync(CalendarInitInitiative calendarInitInitiative,
-                                        DateTime? loadingDisplayDate = null,
-                                        CalendarLoadDirection calendarLoadDirection = CalendarLoadDirection.Replace)
-    {
-        isLoadMoreBlocked = calendarLoadDirection == CalendarLoadDirection.Replace;
-
-        // This is the part we arrange the flip view calendar logic.
-
-        /* Loading for a month of the selected date is fine.
-         * If the selected date is in the loaded range, we'll just change the selected flip index to scroll.
-         * If the selected date is not in the loaded range:
-         * 1. Detect the direction of the scroll.
-         * 2. Load the next month.
-         * 3. Replace existing month with the new month.
-         */
-
-        // 2 things are important: How many items should 1 flip have, and, where we should start loading?
-
-        // User initiated renders must always have a date to start with.
-        if (calendarInitInitiative == CalendarInitInitiative.User) Guard.IsNotNull(loadingDisplayDate, nameof(loadingDisplayDate));
-
-        var strategy = GetDrawingStrategy(StatePersistanceService.CalendarDisplayType);
-        var displayDate = loadingDisplayDate.GetValueOrDefault();
-
-        // How many days should be placed in 1 flip view item?
-        int eachFlipItemCount = strategy.GetRenderDayCount(displayDate, StatePersistanceService.DayDisplayCount);
-
-        DateRange flipLoadRange = null;
-
-
-        if (calendarInitInitiative == CalendarInitInitiative.User || DayRanges.DisplayRange == null)
-        {
-            flipLoadRange = strategy.GetRenderDateRange(displayDate, StatePersistanceService.DayDisplayCount);
-        }
-        else
-        {
-            // App is trying to load.
-            // This should be based on direction. We'll load the next or previous range.
-            // DisplayDate is either the start or end date of the current visible range.
-
-            if (calendarLoadDirection == CalendarLoadDirection.Previous)
+            var events = await _calendarService.GetCalendarEventsAsync(calendarViewModel, loadPeriod).ConfigureAwait(false);
+            foreach (var calendarItem in events)
             {
-                flipLoadRange = strategy.GetPreviousDateRange(DayRanges.DisplayRange, StatePersistanceService.DayDisplayCount);
-            }
-            else
-            {
-                flipLoadRange = strategy.GetNextDateRange(DayRanges.DisplayRange, StatePersistanceService.DayDisplayCount);
-            }
-        }
+                if (calendarItem.IsRecurringParent || calendarItem.IsHidden)
+                    continue;
 
-        // Create day ranges for each flip item until we reach the total days to load.
-        int totalFlipItemCount = (int)Math.Ceiling((double)flipLoadRange.TotalDays / eachFlipItemCount);
+                calendarItem.AssignedCalendar ??= calendarViewModel;
 
-        List<DayRangeRenderModel> renderModels = new();
-
-        for (int i = 0; i < totalFlipItemCount; i++)
-        {
-            var startDate = flipLoadRange.StartDate.AddDays(i * eachFlipItemCount);
-            var endDate = startDate.AddDays(eachFlipItemCount);
-
-            var range = new DateRange(startDate, endDate);
-            var renderOptions = new CalendarRenderOptions(range, CurrentSettings);
-
-            var dayRangeHeaderModel = new DayRangeRenderModel(renderOptions);
-            renderModels.Add(dayRangeHeaderModel);
-        }
-
-        // Dates are loaded. Now load the events for them.
-        foreach (var renderModel in renderModels)
-        {
-            await InitializeCalendarEventsForDayRangeAsync(renderModel).ConfigureAwait(false);
-        }
-
-        // Filter by active calendars. This is a quick operation, and things are not on the UI yet.
-        FilterActiveCalendars(renderModels);
-
-        CalendarLoadDirection animationDirection = calendarLoadDirection;
-
-        //bool removeCurrent = calendarLoadDirection == CalendarLoadDirection.Replace;
-
-        if (calendarLoadDirection == CalendarLoadDirection.Replace)
-        {
-            // New date ranges are being replaced.
-            // We must preserve existing selection if any, add the items before/after the current one, remove the current one.
-            // This will make sure the new dates are animated in the correct direction.
-
-            isLoadMoreBlocked = true;
-
-            // Remove all other dates except this one.
-            var rangesToRemove = DayRanges.Where(a => a != SelectedDayRange).ToList();
-
-            foreach (var range in rangesToRemove)
-            {
-                await RemoveDayRangeModelAsync(range);
-            }
-
-            animationDirection = displayDate <= SelectedDayRange?.CalendarRenderOptions.DateRange.StartDate ?
-                CalendarLoadDirection.Previous : CalendarLoadDirection.Next;
-        }
-
-        if (animationDirection == CalendarLoadDirection.Next)
-        {
-            foreach (var item in renderModels)
-            {
-                await AddDayRangeModelAsync(item);
-            }
-        }
-        else if (animationDirection == CalendarLoadDirection.Previous)
-        {
-            // Wait for the animation to finish.
-            // Otherwise it somehow shutters a little, which is annoying.
-
-            // if (!removeCurrent) await Task.Delay(350);
-
-            // Insert each render model in reverse order.
-            for (int i = renderModels.Count - 1; i >= 0; i--)
-            {
-                await InsertDayRangeModelAsync(renderModels[i], 0);
-            }
-        }
-
-        Debug.WriteLine($"Flip count: ({DayRanges.Count})");
-
-        foreach (var item in DayRanges)
-        {
-            Debug.WriteLine($"- {item.CalendarRenderOptions.DateRange.ToString()}");
-        }
-
-        //if (removeCurrent)
-        //{
-        //    await RemoveDayRangeModelAsync(SelectedDayRange);
-        //}
-
-        // TODO...
-        // await TryConsolidateItemsAsync();
-
-        isLoadMoreBlocked = false;
-
-        // Only scroll if the render is initiated by user.
-        // Otherwise we'll scroll to the app rendered invisible date range.
-        if (calendarInitInitiative == CalendarInitInitiative.User)
-        {
-            // Save the current settings for the page for later comparison.
-            _currentDisplayType = StatePersistanceService.CalendarDisplayType;
-            _displayDayCount = StatePersistanceService.DayDisplayCount;
-
-            Messenger.Send(new ScrollToDateMessage(displayDate));
-        }
-    }
-
-    protected override async void OnCalendarItemAdded(CalendarItem calendarItem)
-    {
-        base.OnCalendarItemAdded(calendarItem);
-
-        // Check if event falls into the current date range.
-
-
-        if (DayRanges.DisplayRange == null) return;
-
-        // Check whether this event falls into any of the loaded date ranges.
-        var allDaysForEvent = DayRanges.SelectMany(a => a.CalendarDays).Where(a => a.Period.OverlapsWith(calendarItem.Period));
-
-        foreach (var calendarDay in allDaysForEvent)
-        {
-            var calendarItemViewModel = new CalendarItemViewModel(calendarItem);
-
-            await ExecuteUIThread(() =>
-            {
-                calendarDay.EventsCollection.AddCalendarItem(calendarItemViewModel);
-            });
-        }
-
-        FilterActiveCalendars(DayRanges);
-    }
-
-    private async Task InitializeCalendarEventsForDayRangeAsync(DayRangeRenderModel dayRangeRenderModel)
-    {
-        // Clear all events first for all days.
-        foreach (var day in dayRangeRenderModel.CalendarDays)
-        {
-            await ExecuteUIThread(() =>
-            {
-                day.EventsCollection.Clear();
-            });
-        }
-
-        // Initialization is done for all calendars, regardless whether they are actively selected or not.
-        // This is because the filtering is cached internally of the calendar items in CalendarEventCollection.
-        var allCalendars = AccountCalendarStateService.GroupedAccountCalendars.SelectMany(a => a.AccountCalendars);
-
-        foreach (var calendarViewModel in allCalendars)
-        {
-            // Check all the events for the given date range and calendar.
-            // Then find the day representation for all the events returned, and add to the collection.
-
-            var events = await _calendarService.GetCalendarEventsAsync(calendarViewModel, dayRangeRenderModel).ConfigureAwait(false);
-
-            foreach (var @event in events)
-            {
-                // Find the days that the event falls into.
-                var allDaysForEvent = dayRangeRenderModel.CalendarDays.Where(a => a.Period.OverlapsWith(@event.Period));
-
-                foreach (var calendarDay in allDaysForEvent)
+                if (!loadedItems.ContainsKey(calendarItem.Id))
                 {
-                    var calendarItemViewModel = new CalendarItemViewModel(@event);
-                    await ExecuteUIThread(() =>
-                    {
-                        calendarDay.EventsCollection.AddCalendarItem(calendarItemViewModel);
-                    });
+                    loadedItems.Add(calendarItem.Id, new CalendarItemViewModel(calendarItem));
                 }
             }
         }
+
+        return loadedItems.Values.ToList();
     }
 
-    private async Task TryConsolidateItemsAsync()
+    private static bool IsSameVisibleRange(VisibleDateRange current, VisibleDateRange next)
     {
-        // Check if trimming is necessary
-        if (DayRanges.Count > maxDayRangeSize)
+        if (current == null && next == null)
+            return true;
+
+        if (current == null || next == null)
+            return false;
+
+        return current.DisplayType == next.DisplayType &&
+               current.AnchorDate == next.AnchorDate &&
+               current.StartDate == next.StartDate &&
+               current.EndDate == next.EndDate;
+    }
+
+    private static bool IsSameDateRange(DateRange current, DateRange next)
+    {
+        if (current == null && next == null)
+            return true;
+
+        if (current == null || next == null)
+            return false;
+
+        return current.StartDate == next.StartDate && current.EndDate == next.EndDate;
+    }
+
+    private bool IsCalendarActive(Guid? calendarId)
+        => calendarId.HasValue && AccountCalendarStateService.ActiveCalendars.Any(calendar => calendar.Id == calendarId.Value);
+
+    private void EnsureSelectedQuickEventAccountCalendar()
+    {
+        if (SelectedQuickEventAccountCalendar != null && IsCalendarActive(SelectedQuickEventAccountCalendar.Id))
         {
-            Debug.WriteLine("Trimming items.");
+            return;
+        }
 
-            isLoadMoreBlocked = true;
+        SelectedQuickEventAccountCalendar = AccountCalendarStateService.ActiveCalendars.FirstOrDefault(a => a.IsPrimary)
+                                            ?? AccountCalendarStateService.ActiveCalendars.FirstOrDefault();
+    }
 
-            var removeCount = DayRanges.Count - maxDayRangeSize;
+    public async void Receive(LoadCalendarMessage message)
+        => await ApplyDisplayRequestAsync(message.DisplayRequest, message.ForceReload);
 
-            await Task.Delay(500);
+    public void Receive(CalendarSettingsUpdatedMessage message)
+    {
+        RefreshSettings();
+        _ = ReloadCurrentVisibleRangeAsync();
+    }
 
-            // Right shifted, remove from the start.
-            if (SelectedDateRangeIndex > DayRanges.Count / 2)
-            {
-                DayRanges.RemoveRange(DayRanges.Take(removeCount).ToList());
-            }
-            else
-            {
-                // Left shifted, remove from the end.
-                DayRanges.RemoveRange(DayRanges.Skip(DayRanges.Count - removeCount).Take(removeCount));
-            }
+    public void Receive(CalendarItemTappedMessage message)
+    {
+        if (message.CalendarItemViewModel == null)
+            return;
 
-            SelectedDateRangeIndex = DayRanges.IndexOf(SelectedDayRange);
+        DisplayDetailsCalendarItemViewModel = message.CalendarItemViewModel;
+    }
+
+    public void Receive(CalendarItemDoubleTappedMessage message)
+        => NavigateEvent(message.CalendarItemViewModel, CalendarEventTargetType.Single);
+
+    public void Receive(CalendarItemRightTappedMessage message)
+    {
+    }
+
+    public async void Receive(AccountRemovedMessage message)
+    {
+        if (DisplayDetailsCalendarItemViewModel?.AssignedCalendar?.AccountId == message.Account.Id)
+        {
+            DisplayDetailsCalendarItemViewModel = null;
+        }
+
+        EnsureSelectedQuickEventAccountCalendar();
+        await ReloadCurrentVisibleRangeAsync().ConfigureAwait(false);
+    }
+
+    protected override void OnCalendarItemDeleted(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemDeleted(calendarItem);
+
+        if (DisplayDetailsCalendarItemViewModel?.Id == calendarItem.Id ||
+            DisplayDetailsCalendarItemViewModel?.CalendarItem?.RecurringCalendarItemId == calendarItem.Id)
+        {
+            DisplayDetailsCalendarItemViewModel = null;
+        }
+
+        if (ShouldReloadFor(calendarItem))
+        {
+            _ = ReloadCurrentVisibleRangeAsync();
         }
     }
 
-    private bool ShouldScrollToItem(LoadCalendarMessage message)
+    protected override void OnCalendarItemUpdated(CalendarItem calendarItem, CalendarItemUpdateSource source)
     {
-        // Never scroll if the initiative is from the app.
-        if (message.CalendarInitInitiative == CalendarInitInitiative.App) return false;
+        base.OnCalendarItemUpdated(calendarItem, source);
 
-        // Nothing to scroll.
-        if (DayRanges.Count == 0) return false;
+        if (DisplayDetailsCalendarItemViewModel?.Id == calendarItem.Id)
+        {
+            calendarItem.AssignedCalendar ??= DisplayDetailsCalendarItemViewModel.AssignedCalendar;
+            DisplayDetailsCalendarItemViewModel = new CalendarItemViewModel(calendarItem);
+        }
 
-        if (DayRanges.DisplayRange == null) return false;
+        if (ShouldReloadFor(calendarItem))
+        {
+            _ = ReloadCurrentVisibleRangeAsync();
+        }
+    }
 
-        var selectedDate = message.DisplayDate;
+    protected override void OnCalendarItemAdded(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemAdded(calendarItem);
 
-        return selectedDate >= DayRanges.DisplayRange.StartDate && selectedDate <= DayRanges.DisplayRange.EndDate;
+        if (calendarItem.IsRecurringParent)
+        {
+            _ = ReloadCurrentVisibleRangeAsync();
+            return;
+        }
+
+        if (ShouldReloadFor(calendarItem))
+        {
+            _ = ReloadCurrentVisibleRangeAsync();
+        }
+    }
+
+    private bool ShouldReloadFor(CalendarItem calendarItem)
+    {
+        if (calendarItem == null || LoadedDateWindow == null)
+            return false;
+
+        var loadedWindow = new TimeRange(LoadedDateWindow.StartDate, LoadedDateWindow.EndDate);
+        return loadedWindow.OverlapsWith(calendarItem.Period);
     }
 
     partial void OnIsAllDayChanged(bool value)
     {
         if (value)
         {
+            _previousSelectedStartTimeString = SelectedStartTimeString;
+            _previousSelectedEndTimeString = SelectedEndTimeString;
             SelectedStartTimeString = HourSelectionStrings.FirstOrDefault();
             SelectedEndTimeString = HourSelectionStrings.FirstOrDefault();
         }
@@ -711,7 +827,7 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
         }
     }
 
-    partial void OnSelectedStartTimeStringChanged(string newValue)
+    partial void OnSelectedStartTimeStringChanged(string oldValue, string newValue)
     {
         var parsedTime = CurrentSettings.GetTimeSpan(newValue);
 
@@ -719,152 +835,23 @@ public partial class CalendarPageViewModel : CalendarBaseViewModel,
         {
             SelectedStartTimeString = _previousSelectedStartTimeString;
         }
-        else if (IsAllDay)
+        else if (!IsAllDay)
         {
             _previousSelectedStartTimeString = newValue;
         }
     }
 
-    partial void OnSelectedEndTimeStringChanged(string newValue)
+    partial void OnSelectedEndTimeStringChanged(string oldValue, string newValue)
     {
         var parsedTime = CurrentSettings.GetTimeSpan(newValue);
 
         if (parsedTime == null)
         {
-            SelectedEndTimeString = _previousSelectedStartTimeString;
+            SelectedEndTimeString = _previousSelectedEndTimeString;
         }
-        else if (IsAllDay)
+        else if (!IsAllDay)
         {
             _previousSelectedEndTimeString = newValue;
         }
     }
-
-    partial void OnSelectedDayRangeChanged(DayRangeRenderModel value)
-    {
-        DisplayDetailsCalendarItemViewModel = null;
-
-        if (DayRanges.Count == 0 || SelectedDateRangeIndex < 0) return;
-
-        var selectedRange = DayRanges[SelectedDateRangeIndex];
-
-        Messenger.Send(new VisibleDateRangeChangedMessage(new DateRange(selectedRange.Period.Start, selectedRange.Period.End)));
-
-        if (isLoadMoreBlocked) return;
-
-        _ = LoadMoreAsync();
-    }
-
-    private async Task LoadMoreAsync()
-    {
-        try
-        {
-            await _calendarLoadingSemaphore.WaitAsync();
-
-            // Depending on the selected index, we'll load more dates.
-            // Day ranges may change while the async update is in progress.
-            // Therefore we wait for semaphore to be released before we continue.
-            // There is no need to load more if the current index is not in ideal position.
-
-            if (SelectedDateRangeIndex == 0)
-            {
-                await RenderDatesAsync(CalendarInitInitiative.App, calendarLoadDirection: CalendarLoadDirection.Previous);
-            }
-            else if (SelectedDateRangeIndex == DayRanges.Count - 1)
-            {
-                await RenderDatesAsync(CalendarInitInitiative.App, calendarLoadDirection: CalendarLoadDirection.Next);
-            }
-        }
-        catch (Exception)
-        {
-            Debugger.Break();
-        }
-        finally
-        {
-            _calendarLoadingSemaphore.Release();
-        }
-    }
-
-    public void Receive(CalendarSettingsUpdatedMessage message)
-    {
-        RefreshSettings();
-
-        // TODO: This might need throttling due to slider in the settings page for hour height.
-        // or make sure the slider does not update on each tick but on focus lost.
-
-        // Messenger.Send(new LoadCalendarMessage(DateTime.UtcNow.Date, CalendarInitInitiative.App, true));
-    }
-
-    private IEnumerable<CalendarItemViewModel> GetCalendarItems(CalendarItemViewModel calendarItemViewModel, CalendarDayModel selectedDay)
-    {
-        // All-day and multi-day events are selected collectively.
-        // Recurring events must be selected as a single instance.
-        // We need to find the day that the event is in, and then select the event.
-
-        if (!calendarItemViewModel.IsRecurringEvent)
-        {
-            return [calendarItemViewModel];
-        }
-        else
-        {
-            return DayRanges
-                .SelectMany(a => a.CalendarDays)
-                .Select(b => b.EventsCollection.GetCalendarItem(calendarItemViewModel.Id))
-                .Where(c => c != null)
-                .Cast<CalendarItemViewModel>()
-                .Distinct();
-        }
-    }
-
-    private void UnselectCalendarItem(CalendarItemViewModel calendarItemViewModel, CalendarDayModel calendarDay = null)
-    {
-        if (calendarItemViewModel == null) return;
-
-        var itemsToUnselect = GetCalendarItems(calendarItemViewModel, calendarDay);
-
-        foreach (var item in itemsToUnselect)
-        {
-            item.IsSelected = false;
-        }
-    }
-
-    private void SelectCalendarItem(CalendarItemViewModel calendarItemViewModel, CalendarDayModel calendarDay = null)
-    {
-        if (calendarItemViewModel == null) return;
-
-        var itemsToSelect = GetCalendarItems(calendarItemViewModel, calendarDay);
-
-        foreach (var item in itemsToSelect)
-        {
-            item.IsSelected = true;
-        }
-    }
-
-    public void Receive(CalendarItemTappedMessage message)
-    {
-        if (message.CalendarItemViewModel == null) return;
-
-        DisplayDetailsCalendarItemViewModel = message.CalendarItemViewModel;
-    }
-
-    public void Receive(CalendarItemDoubleTappedMessage message) => NavigateEvent(message.CalendarItemViewModel, CalendarEventTargetType.Single);
-
-    public void Receive(CalendarItemRightTappedMessage message)
-    {
-
-    }
-
-    public async void Receive(CalendarItemDeleted message)
-    {
-        // Each deleted recurrence will report for it's own.
-
-        await ExecuteUIThread(() =>
-        {
-            var deletedItem = message.CalendarItem;
-
-            // Event might be spreaded into multiple days.
-            // Remove from all.
-
-            // var calendarItems = GetCalendarItems(deletedItem.Id);
-        });
-    }
 }
diff --git a/Wino.Calendar.ViewModels/CalendarPreferenceSettingsPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarPreferenceSettingsPageViewModel.cs
new file mode 100644
index 00000000..c66b1d1d
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarPreferenceSettingsPageViewModel.cs
@@ -0,0 +1,62 @@
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarPreferenceSettingsPageViewModel : CalendarSettingsSectionViewModelBase
+{
+    [ObservableProperty]
+    public partial CalendarNewEventBehaviorOption SelectedNewEventBehaviorOption { get; set; }
+
+    [ObservableProperty]
+    public partial AccountCalendarViewModel SelectedNewEventCalendar { get; set; }
+
+    public bool ShouldShowSpecificNewEventCalendar
+        => SelectedNewEventBehaviorOption?.Behavior == NewEventButtonBehavior.AlwaysUseSpecificCalendar;
+
+    public CalendarPreferenceSettingsPageViewModel(
+        IPreferencesService preferencesService,
+        ICalendarService calendarService,
+        IAccountService accountService)
+        : base(preferencesService, calendarService, accountService)
+    {
+        LoadNewEventBehaviorOptions();
+        SelectedNewEventBehaviorOption = GetSelectedNewEventBehaviorOption();
+
+        IsLoaded = true;
+        LoadCalendarsAsync(ApplyStoredNewEventCalendarPreference);
+    }
+
+    partial void OnSelectedNewEventBehaviorOptionChanged(CalendarNewEventBehaviorOption value)
+    {
+        if (!IsLoaded)
+            return;
+
+        OnPropertyChanged(nameof(ShouldShowSpecificNewEventCalendar));
+        SaveNewEventBehavior(SelectedNewEventBehaviorOption, SelectedNewEventCalendar);
+    }
+
+    partial void OnSelectedNewEventCalendarChanged(AccountCalendarViewModel value)
+    {
+        if (!IsLoaded)
+            return;
+
+        SaveNewEventBehavior(SelectedNewEventBehaviorOption, value);
+    }
+
+    private void ApplyStoredNewEventCalendarPreference()
+    {
+        var configuredCalendar = ResolveSelectedNewEventCalendar();
+        if (PreferencesService.NewEventButtonBehavior == NewEventButtonBehavior.AlwaysUseSpecificCalendar && configuredCalendar == null)
+        {
+            SelectedNewEventBehaviorOption = NewEventBehaviorOptions.First(option => option.Behavior == NewEventButtonBehavior.AskEachTime);
+            SelectedNewEventCalendar = null;
+            return;
+        }
+
+        SelectedNewEventCalendar = configuredCalendar ?? ResolveFallbackNewEventCalendar();
+    }
+}
diff --git a/Wino.Calendar.ViewModels/CalendarRenderingSettingsPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarRenderingSettingsPageViewModel.cs
new file mode 100644
index 00000000..5a7fe685
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarRenderingSettingsPageViewModel.cs
@@ -0,0 +1,191 @@
+using System;
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarRenderingSettingsPageViewModel : CalendarSettingsSectionViewModelBase
+{
+    [ObservableProperty]
+    public partial double CellHourHeight { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedFirstDayOfWeekIndex { get; set; }
+
+    [ObservableProperty]
+    public partial bool Is24HourHeaders { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsWorkingHoursEnabled { get; set; }
+
+    [ObservableProperty]
+    public partial TimeSpan WorkingHourStart { get; set; }
+
+    [ObservableProperty]
+    public partial TimeSpan WorkingHourEnd { get; set; }
+
+    [ObservableProperty]
+    public partial int WorkingDayStartIndex { get; set; }
+
+    [ObservableProperty]
+    public partial int WorkingDayEndIndex { get; set; }
+
+    [ObservableProperty]
+    public partial string TimedDayHeaderDateFormat { get; set; } = "ddd dd";
+
+    [ObservableProperty]
+    public partial int SelectedTimedDayHeaderFormatPresetIndex { get; set; } = -1;
+
+    public CalendarRenderingSettingsPageViewModel(
+        IPreferencesService preferencesService,
+        ICalendarService calendarService,
+        IAccountService accountService)
+        : base(preferencesService, calendarService, accountService)
+    {
+        SelectedFirstDayOfWeekIndex = DayNames.IndexOf(CalendarCulture.DateTimeFormat.GetDayName(preferencesService.FirstDayOfWeek));
+        Is24HourHeaders = preferencesService.Prefer24HourTimeFormat;
+        IsWorkingHoursEnabled = preferencesService.IsWorkingHoursEnabled;
+        WorkingHourStart = preferencesService.WorkingHourStart;
+        WorkingHourEnd = preferencesService.WorkingHourEnd;
+        CellHourHeight = preferencesService.HourHeight;
+        WorkingDayStartIndex = DayNames.IndexOf(CalendarCulture.DateTimeFormat.GetDayName(preferencesService.WorkingDayStart));
+        WorkingDayEndIndex = DayNames.IndexOf(CalendarCulture.DateTimeFormat.GetDayName(preferencesService.WorkingDayEnd));
+        TimedDayHeaderDateFormat = preferencesService.CalendarTimedDayHeaderDateFormat;
+        SelectedTimedDayHeaderFormatPresetIndex = TimedDayHeaderFormatPresets.IndexOf(TimedDayHeaderDateFormat);
+
+        IsLoaded = true;
+    }
+
+    partial void OnCellHourHeightChanged(double oldValue, double newValue) => SaveSettings();
+
+    partial void OnIs24HourHeadersChanged(bool value)
+    {
+        OnPropertyChanged(nameof(TimedHourLabelPreview));
+        SaveSettings();
+    }
+
+    partial void OnSelectedFirstDayOfWeekIndexChanged(int value) => SaveSettings();
+    partial void OnIsWorkingHoursEnabledChanged(bool value) => SaveSettings();
+    partial void OnWorkingHourStartChanged(TimeSpan value) => SaveSettings();
+    partial void OnWorkingHourEndChanged(TimeSpan value) => SaveSettings();
+    partial void OnWorkingDayStartIndexChanged(int value) => SaveSettings();
+    partial void OnWorkingDayEndIndexChanged(int value) => SaveSettings();
+
+    partial void OnTimedDayHeaderDateFormatChanged(string value)
+    {
+        OnPropertyChanged(nameof(TimedDayHeaderFormatPreview));
+        OnPropertyChanged(nameof(TimedHourLabelPreview));
+
+        var normalizedFormat = string.IsNullOrWhiteSpace(value) ? "ddd dd" : value.Trim();
+        var matchingPresetIndex = TimedDayHeaderFormatPresets
+            .Select((format, index) => new { format, index })
+            .Where(item => string.Equals(item.format, normalizedFormat, StringComparison.Ordinal))
+            .Select(item => item.index)
+            .DefaultIfEmpty(-1)
+            .First();
+
+        if (SelectedTimedDayHeaderFormatPresetIndex != matchingPresetIndex)
+        {
+            SelectedTimedDayHeaderFormatPresetIndex = matchingPresetIndex;
+        }
+
+        SaveSettings();
+    }
+
+    partial void OnSelectedTimedDayHeaderFormatPresetIndexChanged(int value)
+    {
+        if (value < 0 || value >= TimedDayHeaderFormatPresets.Count)
+            return;
+
+        var selectedPreset = TimedDayHeaderFormatPresets[value];
+        if (string.Equals(TimedDayHeaderDateFormat, selectedPreset, StringComparison.Ordinal))
+            return;
+
+        TimedDayHeaderDateFormat = selectedPreset;
+    }
+
+    public string TimedDayHeaderFormatPreview
+    {
+        get
+        {
+            var format = string.IsNullOrWhiteSpace(TimedDayHeaderDateFormat) ? "ddd dd" : TimedDayHeaderDateFormat.Trim();
+            var previewDates = new[]
+            {
+                new DateTime(2026, 3, 23),
+                new DateTime(2026, 3, 24),
+                new DateTime(2026, 3, 25)
+            };
+
+            try
+            {
+                return string.Join(" · ", previewDates.Select(date => date.ToString(format, CalendarCulture)));
+            }
+            catch (FormatException)
+            {
+                return string.Join(" · ", previewDates.Select(date => date.ToString("ddd dd", CalendarCulture)));
+            }
+        }
+    }
+
+    public string TimedHourLabelPreview
+        => string.Join("  ·  ", new[] { 0, 9, 14, 24 }.Select(CurrentSettingsPreviewLabel));
+
+    private string CurrentSettingsPreviewLabel(int hour)
+    {
+        if (Is24HourHeaders)
+            return hour.ToString(CalendarCulture);
+
+        var displayHour = hour % 24;
+        return DateTime.Today.AddHours(displayHour).ToString("h tt", CalendarCulture);
+    }
+
+    private void SaveSettings()
+    {
+        if (!IsLoaded)
+            return;
+
+        PreferencesService.FirstDayOfWeek = SelectedFirstDayOfWeekIndex switch
+        {
+            0 => DayOfWeek.Sunday,
+            1 => DayOfWeek.Monday,
+            2 => DayOfWeek.Tuesday,
+            3 => DayOfWeek.Wednesday,
+            4 => DayOfWeek.Thursday,
+            5 => DayOfWeek.Friday,
+            6 => DayOfWeek.Saturday,
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        PreferencesService.WorkingDayStart = WorkingDayStartIndex switch
+        {
+            0 => DayOfWeek.Sunday,
+            1 => DayOfWeek.Monday,
+            2 => DayOfWeek.Tuesday,
+            3 => DayOfWeek.Wednesday,
+            4 => DayOfWeek.Thursday,
+            5 => DayOfWeek.Friday,
+            6 => DayOfWeek.Saturday,
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        PreferencesService.WorkingDayEnd = WorkingDayEndIndex switch
+        {
+            0 => DayOfWeek.Sunday,
+            1 => DayOfWeek.Monday,
+            2 => DayOfWeek.Tuesday,
+            3 => DayOfWeek.Wednesday,
+            4 => DayOfWeek.Thursday,
+            5 => DayOfWeek.Friday,
+            6 => DayOfWeek.Saturday,
+            _ => throw new ArgumentOutOfRangeException()
+        };
+
+        PreferencesService.Prefer24HourTimeFormat = Is24HourHeaders;
+        PreferencesService.IsWorkingHoursEnabled = IsWorkingHoursEnabled;
+        PreferencesService.WorkingHourStart = WorkingHourStart;
+        PreferencesService.WorkingHourEnd = WorkingHourEnd;
+        PreferencesService.HourHeight = CellHourHeight;
+        PreferencesService.CalendarTimedDayHeaderDateFormat = TimedDayHeaderDateFormat;
+    }
+}
diff --git a/Wino.Calendar.ViewModels/CalendarSettingsPageViewModel.cs b/Wino.Calendar.ViewModels/CalendarSettingsPageViewModel.cs
deleted file mode 100644
index 4d0075c7..00000000
--- a/Wino.Calendar.ViewModels/CalendarSettingsPageViewModel.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Translations;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Calendar;
-
-namespace Wino.Calendar.ViewModels;
-
-public partial class CalendarSettingsPageViewModel : CalendarBaseViewModel
-{
-    [ObservableProperty]
-    private double _cellHourHeight;
-
-    [ObservableProperty]
-    private int _selectedFirstDayOfWeekIndex;
-
-    [ObservableProperty]
-    private bool _is24HourHeaders;
-
-    [ObservableProperty]
-    private TimeSpan _workingHourStart;
-
-    [ObservableProperty]
-    private TimeSpan _workingHourEnd;
-
-    [ObservableProperty]
-    private List<string> _dayNames = [];
-
-    [ObservableProperty]
-    private int _workingDayStartIndex;
-
-    [ObservableProperty]
-    private int _workingDayEndIndex;
-
-    public IPreferencesService PreferencesService { get; }
-
-    private readonly bool _isLoaded = false;
-
-    public CalendarSettingsPageViewModel(IPreferencesService preferencesService)
-    {
-        PreferencesService = preferencesService;
-
-        var currentLanguageLanguageCode = WinoTranslationDictionary.GetLanguageFileNameRelativePath(preferencesService.CurrentLanguage);
-
-        var cultureInfo = new CultureInfo(currentLanguageLanguageCode);
-
-        // Populate the day names list
-        for (var i = 0; i < 7; i++)
-        {
-            _dayNames.Add(cultureInfo.DateTimeFormat.DayNames[i]);
-        }
-
-        var cultureFirstDayName = cultureInfo.DateTimeFormat.GetDayName(preferencesService.FirstDayOfWeek);
-
-        _selectedFirstDayOfWeekIndex = _dayNames.IndexOf(cultureFirstDayName);
-        _is24HourHeaders = preferencesService.Prefer24HourTimeFormat;
-        _workingHourStart = preferencesService.WorkingHourStart;
-        _workingHourEnd = preferencesService.WorkingHourEnd;
-        _cellHourHeight = preferencesService.HourHeight;
-
-        _workingDayStartIndex = _dayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayStart));
-        _workingDayEndIndex = _dayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayEnd));
-
-        _isLoaded = true;
-    }
-
-    partial void OnCellHourHeightChanged(double oldValue, double newValue) => SaveSettings();
-    partial void OnIs24HourHeadersChanged(bool value) => SaveSettings();
-    partial void OnSelectedFirstDayOfWeekIndexChanged(int value) => SaveSettings();
-    partial void OnWorkingHourStartChanged(TimeSpan value) => SaveSettings();
-    partial void OnWorkingHourEndChanged(TimeSpan value) => SaveSettings();
-    partial void OnWorkingDayStartIndexChanged(int value) => SaveSettings();
-    partial void OnWorkingDayEndIndexChanged(int value) => SaveSettings();
-
-    public void SaveSettings()
-    {
-        if (!_isLoaded) return;
-
-        PreferencesService.FirstDayOfWeek = SelectedFirstDayOfWeekIndex switch
-        {
-            0 => DayOfWeek.Sunday,
-            1 => DayOfWeek.Monday,
-            2 => DayOfWeek.Tuesday,
-            3 => DayOfWeek.Wednesday,
-            4 => DayOfWeek.Thursday,
-            5 => DayOfWeek.Friday,
-            6 => DayOfWeek.Saturday,
-            _ => throw new ArgumentOutOfRangeException()
-        };
-
-        PreferencesService.WorkingDayStart = WorkingDayStartIndex switch
-        {
-            0 => DayOfWeek.Sunday,
-            1 => DayOfWeek.Monday,
-            2 => DayOfWeek.Tuesday,
-            3 => DayOfWeek.Wednesday,
-            4 => DayOfWeek.Thursday,
-            5 => DayOfWeek.Friday,
-            6 => DayOfWeek.Saturday,
-            _ => throw new ArgumentOutOfRangeException()
-        };
-
-        PreferencesService.WorkingDayEnd = WorkingDayEndIndex switch
-        {
-            0 => DayOfWeek.Sunday,
-            1 => DayOfWeek.Monday,
-            2 => DayOfWeek.Tuesday,
-            3 => DayOfWeek.Wednesday,
-            4 => DayOfWeek.Thursday,
-            5 => DayOfWeek.Friday,
-            6 => DayOfWeek.Saturday,
-            _ => throw new ArgumentOutOfRangeException()
-        };
-
-        PreferencesService.Prefer24HourTimeFormat = Is24HourHeaders;
-        PreferencesService.WorkingHourStart = WorkingHourStart;
-        PreferencesService.WorkingHourEnd = WorkingHourEnd;
-        PreferencesService.HourHeight = CellHourHeight;
-
-        Messenger.Send(new CalendarSettingsUpdatedMessage());
-    }
-}
diff --git a/Wino.Calendar.ViewModels/CalendarSettingsSectionViewModelBase.cs b/Wino.Calendar.ViewModels/CalendarSettingsSectionViewModelBase.cs
new file mode 100644
index 00000000..3058479f
--- /dev/null
+++ b/Wino.Calendar.ViewModels/CalendarSettingsSectionViewModelBase.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Translations;
+using Wino.Core.ViewModels;
+
+namespace Wino.Calendar.ViewModels;
+
+public abstract class CalendarSettingsSectionViewModelBase : CalendarBaseViewModel
+{
+    protected CalendarSettingsSectionViewModelBase(
+        IPreferencesService preferencesService,
+        ICalendarService calendarService,
+        IAccountService accountService)
+    {
+        PreferencesService = preferencesService;
+        CalendarService = calendarService;
+        AccountService = accountService;
+
+        var languageCode = WinoTranslationDictionary.GetLanguageFileNameRelativePath(preferencesService.CurrentLanguage);
+        CalendarCulture = new CultureInfo(languageCode);
+
+        for (var index = 0; index < 7; index++)
+        {
+            DayNames.Add(CalendarCulture.DateTimeFormat.DayNames[index]);
+        }
+    }
+
+    protected IPreferencesService PreferencesService { get; }
+    protected ICalendarService CalendarService { get; }
+    protected IAccountService AccountService { get; }
+    protected CultureInfo CalendarCulture { get; }
+    protected bool IsLoaded { get; set; }
+
+    public ObservableCollection<string> DayNames { get; } = [];
+    public ObservableCollection<string> ReminderOptions { get; } = [];
+    public ObservableCollection<string> SnoozeOptions { get; } = [];
+    public ObservableCollection<CalendarNewEventBehaviorOption> NewEventBehaviorOptions { get; } = [];
+    public ObservableCollection<AccountCalendarViewModel> AvailableNewEventCalendars { get; } = [];
+    public ObservableCollection<string> TimedDayHeaderFormatPresets { get; } =
+    [
+        "ddd dd",
+        "dddd dd",
+        "ddd d MMM",
+        "dd MMM ddd",
+        "M/d ddd"
+    ];
+
+    protected void LoadReminderOptions()
+    {
+        ReminderOptions.Clear();
+
+        var predefinedMinutes = CalendarService.GetPredefinedReminderMinutes();
+        ReminderOptions.Add("None");
+
+        foreach (var minutes in predefinedMinutes)
+        {
+            var displayText = minutes switch
+            {
+                >= 60 => $"{minutes / 60} Hour{(minutes / 60 > 1 ? "s" : "")}",
+                _ => $"{minutes} Minute{(minutes > 1 ? "s" : "")}"
+            };
+
+            ReminderOptions.Add(displayText);
+        }
+    }
+
+    protected int GetSelectedReminderIndex()
+    {
+        if (PreferencesService.DefaultReminderDurationInSeconds == 0)
+            return 0;
+
+        var minutes = (int)(PreferencesService.DefaultReminderDurationInSeconds / 60);
+        var predefinedMinutes = CalendarService.GetPredefinedReminderMinutes();
+        var index = Array.IndexOf(predefinedMinutes, minutes);
+        return index >= 0 ? index + 1 : 0;
+    }
+
+    protected void SaveReminderIndex(int selectedDefaultReminderIndex)
+    {
+        if (selectedDefaultReminderIndex == 0)
+        {
+            PreferencesService.DefaultReminderDurationInSeconds = 0;
+            return;
+        }
+
+        var predefinedMinutes = CalendarService.GetPredefinedReminderMinutes();
+        var minutes = predefinedMinutes[selectedDefaultReminderIndex - 1];
+        PreferencesService.DefaultReminderDurationInSeconds = minutes * 60;
+    }
+
+    protected void LoadSnoozeOptions()
+    {
+        SnoozeOptions.Clear();
+
+        foreach (var snoozeMinutes in CalendarReminderSnoozeOptions.GetSupportedSnoozeMinutes())
+        {
+            SnoozeOptions.Add(string.Format(Translator.CalendarReminder_SnoozeMinutesOption, snoozeMinutes));
+        }
+    }
+
+    protected int GetSelectedSnoozeIndex()
+    {
+        var supportedSnoozeMinutes = CalendarReminderSnoozeOptions.GetSupportedSnoozeMinutes().ToArray();
+        var selectedIndex = Array.IndexOf(supportedSnoozeMinutes, PreferencesService.DefaultSnoozeDurationInMinutes);
+        return selectedIndex >= 0 ? selectedIndex : 0;
+    }
+
+    protected void SaveSnoozeIndex(int selectedDefaultSnoozeIndex)
+    {
+        var supportedSnoozeMinutes = CalendarReminderSnoozeOptions.GetSupportedSnoozeMinutes();
+        if (supportedSnoozeMinutes.Count == 0)
+            return;
+
+        var selectedIndex = Math.Clamp(selectedDefaultSnoozeIndex, 0, supportedSnoozeMinutes.Count - 1);
+        PreferencesService.DefaultSnoozeDurationInMinutes = supportedSnoozeMinutes[selectedIndex];
+    }
+
+    protected void LoadNewEventBehaviorOptions()
+    {
+        NewEventBehaviorOptions.Clear();
+        NewEventBehaviorOptions.Add(new CalendarNewEventBehaviorOption(NewEventButtonBehavior.AskEachTime, Translator.CalendarSettings_NewEventBehavior_AskEachTime));
+        NewEventBehaviorOptions.Add(new CalendarNewEventBehaviorOption(NewEventButtonBehavior.AlwaysUseSpecificCalendar, Translator.CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar));
+    }
+
+    protected CalendarNewEventBehaviorOption GetSelectedNewEventBehaviorOption()
+        => NewEventBehaviorOptions.FirstOrDefault(option => option.Behavior == PreferencesService.NewEventButtonBehavior)
+           ?? NewEventBehaviorOptions.First();
+
+    protected async void LoadCalendarsAsync(Action applySelection)
+    {
+        var accounts = await AccountService.GetAccountsAsync().ConfigureAwait(false);
+        var calendarsByAccount = new List<AccountCalendarViewModel>();
+
+        foreach (var account in accounts)
+        {
+            var calendars = await CalendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
+            calendarsByAccount.AddRange(calendars.Select(calendar => new AccountCalendarViewModel(account, calendar)));
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            AvailableNewEventCalendars.Clear();
+
+            foreach (var calendar in calendarsByAccount)
+            {
+                AvailableNewEventCalendars.Add(calendar);
+            }
+
+            applySelection();
+        });
+    }
+
+    protected AccountCalendarViewModel ResolveSelectedNewEventCalendar()
+    {
+        var configuredCalendarId = PreferencesService.DefaultNewEventCalendarId;
+        return configuredCalendarId.HasValue
+            ? AvailableNewEventCalendars.FirstOrDefault(calendar => calendar.Id == configuredCalendarId.Value)
+            : null;
+    }
+
+    protected AccountCalendarViewModel ResolveFallbackNewEventCalendar()
+        => AvailableNewEventCalendars.FirstOrDefault(calendar => calendar.IsPrimary)
+           ?? AvailableNewEventCalendars.FirstOrDefault();
+
+    protected void SaveNewEventBehavior(CalendarNewEventBehaviorOption selectedBehaviorOption, AccountCalendarViewModel selectedCalendar)
+    {
+        var newEventBehavior = selectedBehaviorOption?.Behavior ?? NewEventButtonBehavior.AskEachTime;
+        if (newEventBehavior == NewEventButtonBehavior.AlwaysUseSpecificCalendar && selectedCalendar != null)
+        {
+            PreferencesService.NewEventButtonBehavior = NewEventButtonBehavior.AlwaysUseSpecificCalendar;
+            PreferencesService.DefaultNewEventCalendarId = selectedCalendar.Id;
+            return;
+        }
+
+        PreferencesService.NewEventButtonBehavior = NewEventButtonBehavior.AskEachTime;
+        PreferencesService.DefaultNewEventCalendarId = null;
+    }
+}
+
+public sealed class CalendarNewEventBehaviorOption
+{
+    public CalendarNewEventBehaviorOption(NewEventButtonBehavior behavior, string displayText)
+    {
+        Behavior = behavior;
+        DisplayText = displayText;
+    }
+
+    public NewEventButtonBehavior Behavior { get; }
+    public string DisplayText { get; }
+}
diff --git a/Wino.Calendar.ViewModels/CalendarViewModelContainerSetup.cs b/Wino.Calendar.ViewModels/CalendarViewModelContainerSetup.cs
deleted file mode 100644
index 2f8b452d..00000000
--- a/Wino.Calendar.ViewModels/CalendarViewModelContainerSetup.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Wino.Core;
-
-namespace Wino.Calendar.ViewModels;
-
-public static class CalendarViewModelContainerSetup
-{
-    public static void RegisterCalendarViewModelServices(this IServiceCollection services)
-    {
-        services.RegisterCoreServices();
-    }
-}
diff --git a/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs b/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs
index df55f72f..1f41f633 100644
--- a/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs
+++ b/Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs
@@ -2,6 +2,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Calendar.ViewModels.Data;
@@ -54,6 +55,12 @@ public partial class AccountCalendarViewModel : ObservableObject, IAccountCalend
         set => SetProperty(AccountCalendar.IsPrimary, value, AccountCalendar, (u, i) => u.IsPrimary = i);
     }
 
+    public bool IsSynchronizationEnabled
+    {
+        get => AccountCalendar.IsSynchronizationEnabled;
+        set => SetProperty(AccountCalendar.IsSynchronizationEnabled, value, AccountCalendar, (u, i) => u.IsSynchronizationEnabled = i);
+    }
+
     public Guid AccountId
     {
         get => AccountCalendar.AccountId;
@@ -65,5 +72,12 @@ public partial class AccountCalendarViewModel : ObservableObject, IAccountCalend
         get => AccountCalendar.RemoteCalendarId;
         set => SetProperty(AccountCalendar.RemoteCalendarId, value, AccountCalendar, (u, r) => u.RemoteCalendarId = r);
     }
+
+    public CalendarItemShowAs DefaultShowAs
+    {
+        get => AccountCalendar.DefaultShowAs;
+        set => SetProperty(AccountCalendar.DefaultShowAs, value, AccountCalendar, (u, s) => u.DefaultShowAs = s);
+    }
     public Guid Id { get => ((IAccountCalendar)AccountCalendar).Id; set => ((IAccountCalendar)AccountCalendar).Id = value; }
+    public MailAccount MailAccount { get => MailAccount; set => MailAccount = value; }
 }
diff --git a/Wino.Calendar.ViewModels/Data/CalendarAttachmentViewModel.cs b/Wino.Calendar.ViewModels/Data/CalendarAttachmentViewModel.cs
new file mode 100644
index 00000000..3202909c
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Data/CalendarAttachmentViewModel.cs
@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Extensions;
+
+namespace Wino.Calendar.ViewModels.Data;
+
+public partial class CalendarAttachmentViewModel : ObservableObject
+{
+    public CalendarAttachment Attachment { get; }
+
+    public Guid Id => Attachment.Id;
+    public string FileName => Attachment.FileName;
+    public string ReadableSize { get; }
+    public MailAttachmentType AttachmentType { get; }
+    public bool IsDownloaded => Attachment.IsDownloaded;
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    public CalendarAttachmentViewModel(CalendarAttachment attachment)
+    {
+        Attachment = attachment;
+        ReadableSize = attachment.Size.GetBytesReadable();
+
+        var extension = Path.GetExtension(FileName);
+        AttachmentType = GetAttachmentType(extension);
+    }
+
+    private MailAttachmentType GetAttachmentType(string extension)
+    {
+        if (string.IsNullOrEmpty(extension))
+            return MailAttachmentType.None;
+
+        switch (extension.ToLower())
+        {
+            case ".exe":
+                return MailAttachmentType.Executable;
+            case ".rar":
+                return MailAttachmentType.RarArchive;
+            case ".zip":
+                return MailAttachmentType.Archive;
+            case ".ogg":
+            case ".mp3":
+            case ".wav":
+            case ".aac":
+            case ".alac":
+                return MailAttachmentType.Audio;
+            case ".mp4":
+            case ".wmv":
+            case ".avi":
+            case ".flv":
+                return MailAttachmentType.Video;
+            case ".pdf":
+                return MailAttachmentType.PDF;
+            case ".htm":
+            case ".html":
+                return MailAttachmentType.HTML;
+            case ".png":
+            case ".jpg":
+            case ".jpeg":
+            case ".gif":
+            case ".jiff":
+                return MailAttachmentType.Image;
+            default:
+                return MailAttachmentType.Other;
+        }
+    }
+}
diff --git a/Wino.Calendar.ViewModels/Data/CalendarComposeAttachmentViewModel.cs b/Wino.Calendar.ViewModels/Data/CalendarComposeAttachmentViewModel.cs
new file mode 100644
index 00000000..34aece53
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Data/CalendarComposeAttachmentViewModel.cs
@@ -0,0 +1,57 @@
+using System;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Extensions;
+
+namespace Wino.Calendar.ViewModels.Data;
+
+public class CalendarComposeAttachmentViewModel
+{
+    public Guid Id { get; } = Guid.NewGuid();
+    public string FileName { get; }
+    public string FilePath { get; }
+    public string FileExtension { get; }
+    public long Size { get; }
+    public string ReadableSize => Size.GetBytesReadable();
+    public MailAttachmentType AttachmentType { get; }
+
+    public CalendarComposeAttachmentViewModel(string fileName, string filePath, string fileExtension, long size)
+    {
+        FileName = fileName;
+        FilePath = filePath;
+        FileExtension = fileExtension;
+        Size = size;
+        AttachmentType = GetAttachmentType(fileExtension);
+    }
+
+    public CalendarEventComposeAttachmentDraft ToDraftModel()
+    {
+        return new CalendarEventComposeAttachmentDraft
+        {
+            Id = Id,
+            FileName = FileName,
+            FilePath = FilePath,
+            FileExtension = FileExtension,
+            Size = Size
+        };
+    }
+
+    private static MailAttachmentType GetAttachmentType(string extension)
+    {
+        if (string.IsNullOrWhiteSpace(extension))
+            return MailAttachmentType.None;
+
+        return extension.ToLowerInvariant() switch
+        {
+            ".exe" => MailAttachmentType.Executable,
+            ".rar" => MailAttachmentType.RarArchive,
+            ".zip" => MailAttachmentType.Archive,
+            ".ogg" or ".mp3" or ".wav" or ".aac" or ".alac" => MailAttachmentType.Audio,
+            ".mp4" or ".wmv" or ".avi" or ".flv" => MailAttachmentType.Video,
+            ".pdf" => MailAttachmentType.PDF,
+            ".htm" or ".html" => MailAttachmentType.HTML,
+            ".png" or ".jpg" or ".jpeg" or ".gif" or ".jiff" => MailAttachmentType.Image,
+            _ => MailAttachmentType.Other
+        };
+    }
+}
diff --git a/Wino.Calendar.ViewModels/Data/CalendarComposeAttendeeViewModel.cs b/Wino.Calendar.ViewModels/Data/CalendarComposeAttendeeViewModel.cs
new file mode 100644
index 00000000..f6231563
--- /dev/null
+++ b/Wino.Calendar.ViewModels/Data/CalendarComposeAttendeeViewModel.cs
@@ -0,0 +1,23 @@
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Calendar.ViewModels.Data;
+
+public class CalendarComposeAttendeeViewModel : IContactDisplayItem
+{
+    public string DisplayName { get; }
+    public string Email { get; }
+    public AccountContact ResolvedContact { get; }
+    public string Address => Email;
+    public AccountContact PreviewContact => ResolvedContact;
+    public bool HasDistinctDisplayName => !string.IsNullOrWhiteSpace(DisplayName) && !DisplayName.Equals(Email, System.StringComparison.OrdinalIgnoreCase);
+
+    public CalendarComposeAttendeeViewModel(string displayName, string email, AccountContact resolvedContact = null)
+    {
+        DisplayName = string.IsNullOrWhiteSpace(displayName) ? email : displayName;
+        Email = email;
+        ResolvedContact = resolvedContact;
+    }
+
+    public static CalendarComposeAttendeeViewModel FromContact(AccountContact contact)
+        => new(contact.Name, contact.Address, contact);
+}
diff --git a/Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs b/Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs
index f402a562..de2416a6 100644
--- a/Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs
+++ b/Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs
@@ -2,8 +2,11 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Itenso.TimePeriod;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 
 namespace Wino.Calendar.ViewModels.Data;
 
@@ -17,13 +20,52 @@ public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, IC
 
     public IAccountCalendar AssignedCalendar => CalendarItem.AssignedCalendar;
 
-    public DateTime StartDate { get => CalendarItem.StartDate; set => CalendarItem.StartDate = value; }
+    /// <summary>
+    /// Gets or sets the start date converted to user's local timezone for display.
+    /// The underlying CalendarItem stores dates according to their timezone.
+    /// </summary>
+    public DateTime StartDate
+    {
+        get
+        {
+            // Get start date in user's local timezone
+            return CalendarItem.LocalStartDate;
+        }
+        set
+        {
+            // All-day events use floating dates and should not shift across timezones.
+            CalendarItem.StartDate = CalendarItem.IsAllDayEvent
+                ? value.Date
+                : value.ToTimeZoneFromLocal(CalendarItem.StartTimeZone);
+        }
+    }
 
-    public DateTime EndDate => CalendarItem.EndDate;
+    /// <summary>
+    /// Gets the end date converted to user's local timezone for display.
+    /// The underlying CalendarItem stores dates according to their timezone.
+    /// </summary>
+    public DateTime EndDate
+    {
+        get
+        {
+            // Get end date in user's local timezone
+            return CalendarItem.LocalEndDate;
+        }
+    }
 
     public double DurationInSeconds { get => CalendarItem.DurationInSeconds; set => CalendarItem.DurationInSeconds = value; }
 
-    public ITimePeriod Period => CalendarItem.Period;
+    /// <summary>
+    /// Gets the time period in local time.
+    /// </summary>
+    public ITimePeriod Period
+    {
+        get
+        {
+            // Return a period using local times for UI display
+            return new TimeRange(StartDate, EndDate);
+        }
+    }
 
     public bool IsAllDayEvent => CalendarItem.IsAllDayEvent;
     public bool IsMultiDayEvent => CalendarItem.IsMultiDayEvent;
@@ -32,7 +74,39 @@ public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, IC
     public bool IsRecurringParent => CalendarItem.IsRecurringParent;
 
     [ObservableProperty]
-    private bool _isSelected;
+    public partial bool IsSelected { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    /// <summary>
+    /// The period of the day where this item is currently being displayed.
+    /// Used for multi-day event title formatting.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(DisplayTitle))]
+    public partial ITimePeriod DisplayingPeriod { get; set; }
+
+    /// <summary>
+    /// Calendar settings for time formatting.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(DisplayTitle))]
+    public partial CalendarSettings CalendarSettings { get; set; }
+
+    /// <summary>
+    /// Gets the display title based on the current displaying period.
+    /// </summary>
+    public string DisplayTitle
+    {
+        get
+        {
+            if (DisplayingPeriod == null || CalendarSettings == null)
+                return Title;
+
+            return GetDisplayTitle(DisplayingPeriod, CalendarSettings);
+        }
+    }
 
     public ObservableCollection<CalendarEventAttendee> Attendees { get; } = new ObservableCollection<CalendarEventAttendee>();
 
@@ -41,5 +115,82 @@ public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, IC
         CalendarItem = calendarItem;
     }
 
+    /// <summary>
+    /// Updates the underlying CalendarItem with new data and raises property change notifications.
+    /// </summary>
+    /// <param name="calendarItem">The updated calendar item data.</param>
+    public void UpdateFrom(CalendarItem calendarItem)
+    {
+        if (calendarItem == null || calendarItem.Id != CalendarItem.Id)
+            return;
+
+        // Update all mutable properties
+        CalendarItem.Title = calendarItem.Title;
+        CalendarItem.Description = calendarItem.Description;
+        CalendarItem.Location = calendarItem.Location;
+        CalendarItem.StartDate = calendarItem.StartDate;
+        CalendarItem.StartTimeZone = calendarItem.StartTimeZone;
+        CalendarItem.EndTimeZone = calendarItem.EndTimeZone;
+        CalendarItem.DurationInSeconds = calendarItem.DurationInSeconds;
+        CalendarItem.Recurrence = calendarItem.Recurrence;
+        CalendarItem.RecurringCalendarItemId = calendarItem.RecurringCalendarItemId;
+        CalendarItem.OrganizerDisplayName = calendarItem.OrganizerDisplayName;
+        CalendarItem.OrganizerEmail = calendarItem.OrganizerEmail;
+        CalendarItem.IsLocked = calendarItem.IsLocked;
+        CalendarItem.IsHidden = calendarItem.IsHidden;
+        CalendarItem.CustomEventColorHex = calendarItem.CustomEventColorHex;
+        CalendarItem.HtmlLink = calendarItem.HtmlLink;
+        CalendarItem.Status = calendarItem.Status;
+        CalendarItem.Visibility = calendarItem.Visibility;
+        CalendarItem.ShowAs = calendarItem.ShowAs;
+        CalendarItem.UpdatedAt = calendarItem.UpdatedAt;
+        CalendarItem.AssignedCalendar = calendarItem.AssignedCalendar;
+
+        // Raise property changed for all bindable properties
+        OnPropertyChanged(nameof(Title));
+        OnPropertyChanged(nameof(StartDate));
+        OnPropertyChanged(nameof(EndDate));
+        OnPropertyChanged(nameof(DurationInSeconds));
+        OnPropertyChanged(nameof(Period));
+        OnPropertyChanged(nameof(IsAllDayEvent));
+        OnPropertyChanged(nameof(IsMultiDayEvent));
+        OnPropertyChanged(nameof(IsRecurringEvent));
+        OnPropertyChanged(nameof(IsRecurringChild));
+        OnPropertyChanged(nameof(IsRecurringParent));
+        OnPropertyChanged(nameof(AssignedCalendar));
+        OnPropertyChanged(nameof(DisplayTitle));
+    }
+
+    /// <summary>
+    /// Gets the display title for this calendar item when rendered in a specific day.
+    /// </summary>
+    public string GetDisplayTitle(ITimePeriod displayingPeriod, CalendarSettings calendarSettings)
+    {
+        if (!IsMultiDayEvent)
+            return Title;
+
+        var periodRelation = Period.GetRelation(displayingPeriod);
+
+        if (periodRelation == PeriodRelation.StartInside || periodRelation == PeriodRelation.EnclosingStartTouching)
+        {
+            // Event starts within this day: "HH:mm -> Title"
+            return $"{calendarSettings.GetTimeString(StartDate.TimeOfDay)} -> {Title}";
+        }
+        else if (periodRelation == PeriodRelation.EndInside || periodRelation == PeriodRelation.EnclosingEndTouching)
+        {
+            // Event ends within this day: "Title <- HH:mm"
+            return $"{Title} <- {calendarSettings.GetTimeString(EndDate.TimeOfDay)}";
+        }
+        else if (periodRelation == PeriodRelation.Enclosing)
+        {
+            // Event spans the entire day
+            return $"{Translator.CalendarItemAllDay} {Title}";
+        }
+        else
+        {
+            return Title;
+        }
+    }
+
     public override string ToString() => CalendarItem.Title;
 }
diff --git a/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs b/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs
index 92b388ba..0994b8c0 100644
--- a/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs
+++ b/Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs
@@ -20,6 +20,7 @@ public partial class GroupedAccountCalendarViewModel : ObservableObject
     {
         Account = account;
         AccountCalendars = new ObservableCollection<AccountCalendarViewModel>(calendarViewModels);
+        AccountColorHex = account.AccountColorHex;
 
         ManageIsCheckedState();
 
@@ -69,10 +70,22 @@ public partial class GroupedAccountCalendarViewModel : ObservableObject
     }
 
     [ObservableProperty]
-    private bool _isExpanded = true;
+    public partial bool IsExpanded { get; set; } = true;
 
     [ObservableProperty]
-    private bool? isCheckedState = true;
+    public partial bool? IsCheckedState { get; set; } = true;
+
+    [ObservableProperty]
+    public partial string AccountColorHex { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool IsSynchronizationInProgress { get; set; }
+
+    [ObservableProperty]
+    public partial string SynchronizationStatus { get; set; } = string.Empty;
+
+    public bool CanSynchronize => !IsSynchronizationInProgress;
+    public bool IsSynchronizationProgressVisible => IsSynchronizationInProgress;
 
     private bool _isExternalPropChangeBlocked = false;
 
@@ -98,7 +111,7 @@ public partial class GroupedAccountCalendarViewModel : ObservableObject
         _isExternalPropChangeBlocked = false;
     }
 
-    partial void OnIsCheckedStateChanged(bool? newValue)
+    partial void OnIsCheckedStateChanged(bool? oldValue, bool? newValue)
     {
         if (_isExternalPropChangeBlocked) return;
 
@@ -142,4 +155,24 @@ public partial class GroupedAccountCalendarViewModel : ObservableObject
 
         CalendarSelectionStateChanged?.Invoke(this, accountCalendarViewModel);
     }
+
+    partial void OnIsSynchronizationInProgressChanged(bool value)
+    {
+        OnPropertyChanged(nameof(CanSynchronize));
+        OnPropertyChanged(nameof(IsSynchronizationProgressVisible));
+    }
+
+    public void UpdateAccount(MailAccount updatedAccount)
+    {
+        if (updatedAccount == null || updatedAccount.Id != Account.Id)
+            return;
+
+        Account.Name = updatedAccount.Name;
+        Account.Address = updatedAccount.Address;
+        Account.AccountColorHex = updatedAccount.AccountColorHex;
+        Account.AttentionReason = updatedAccount.AttentionReason;
+        Account.MergedInboxId = updatedAccount.MergedInboxId;
+        AccountColorHex = updatedAccount.AccountColorHex;
+        OnPropertyChanged(nameof(Account));
+    }
 }
diff --git a/Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs b/Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs
index f57d797e..2cc5a0d2 100644
--- a/Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs
+++ b/Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs
@@ -1,14 +1,23 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
 using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Services;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
@@ -19,43 +28,210 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
     private readonly ICalendarService _calendarService;
     private readonly INativeAppService _nativeAppService;
     private readonly IPreferencesService _preferencesService;
+    private readonly IMailDialogService _dialogService;
+    private readonly IWinoRequestDelegator _winoRequestDelegator;
+    private readonly INavigationService _navigationService;
+    private readonly IUnderlyingThemeService _underlyingThemeService;
+    private readonly INotificationBuilder _notificationBuilder;
+    private readonly IContactService _contactService;
 
     public CalendarSettings CurrentSettings { get; }
+    public INativeAppService NativeAppService => _nativeAppService;
+
+    [ObservableProperty]
+    public partial bool IsDarkWebviewRenderer { get; set; }
+
+    public ObservableCollection<CalendarAttachmentViewModel> Attachments { get; } = new ObservableCollection<CalendarAttachmentViewModel>();
+
+    /// <summary>
+    /// Returns true if the current event has attachments.
+    /// </summary>
+    public bool HasAttachments => Attachments.Count > 0;
 
     #region Details
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanViewSeries))]
-    private CalendarItemViewModel _currentEvent;
+    [NotifyPropertyChangedFor(nameof(CanEditSeries))]
+    [NotifyPropertyChangedFor(nameof(IsCurrentUserOrganizer))]
+    [NotifyPropertyChangedFor(nameof(CurrentRsvpText))]
+    [NotifyPropertyChangedFor(nameof(CurrentRsvpStatus))]
+    public partial CalendarItemViewModel CurrentEvent { get; set; }
+
+    partial void OnCurrentEventChanged(CalendarItemViewModel value)
+    {
+        // Notify the view to re-render the description
+        Messenger.Send(new CalendarDescriptionRenderingRequested());
+    }
 
     [ObservableProperty]
-    private CalendarItemViewModel _seriesParent;
+    public partial CalendarItemViewModel SeriesParent { get; set; }
+    [ObservableProperty]
+    public partial List<Reminder> Reminders { get; set; }
 
+    public ObservableCollection<ReminderOption> ReminderOptions { get; } = new ObservableCollection<ReminderOption>();
+
+    /// <summary>
+    /// Returns true if the event is part of a recurring series (as a child occurrence).
+    /// Used to enable "View Series" functionality.
+    /// </summary>
     public bool CanViewSeries => CurrentEvent?.IsRecurringChild ?? false;
 
+    /// <summary>
+    /// Returns true if the "Edit Series" button should be visible.
+    /// Only visible for child occurrences of recurring events, not for master events or single events.
+    /// </summary>
+    public bool CanEditSeries => CurrentEvent?.IsRecurringChild ?? false;
+
+    /// <summary>
+    /// Returns true if the current user is the organizer of the event.
+    /// Used to determine if the user can invite attendees or modify the event.
+    /// </summary>
+    public bool IsCurrentUserOrganizer => CurrentEvent?.Attendees?.Any(a => a.IsOrganizer) ?? true;
+
     #endregion
 
-    public EventDetailsPageViewModel(ICalendarService calendarService, INativeAppService nativeAppService, IPreferencesService preferencesService)
+    #region Show As Options
+
+    public ObservableCollection<ShowAsOption> ShowAsOptions { get; } = new ObservableCollection<ShowAsOption>();
+
+    [ObservableProperty]
+    public partial ShowAsOption SelectedShowAsOption { get; set; }
+
+    #endregion
+
+    #region RSVP Panel
+
+    [ObservableProperty]
+    public partial bool IsRsvpPanelVisible { get; set; }
+
+    public bool IncludeRsvpMessage => !string.IsNullOrEmpty(RsvpMessage);
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IncludeRsvpMessage))]
+    public partial string RsvpMessage { get; set; } = string.Empty;
+
+    public ObservableCollection<RsvpStatusOption> RsvpStatusOptions { get; } = new ObservableCollection<RsvpStatusOption>();
+
+    public CalendarItemStatus CurrentRsvpStatus
+    {
+        get
+        {
+            return CurrentEvent?.CalendarItem?.Status ?? CalendarItemStatus.NotResponded;
+        }
+    }
+
+    public string CurrentRsvpText
+    {
+        get
+        {
+            if (CurrentEvent?.CalendarItem == null) return Translator.CalendarEventResponse_Accept;
+
+            return CurrentEvent.CalendarItem.Status switch
+            {
+                CalendarItemStatus.Accepted => Translator.CalendarEventResponse_AcceptedResponse,
+                CalendarItemStatus.Tentative => Translator.CalendarEventResponse_TentativeResponse,
+                CalendarItemStatus.Cancelled => Translator.CalendarEventResponse_DeclinedResponse,
+                CalendarItemStatus.NotResponded => Translator.CalendarEventResponse_NotResponded,
+                _ => Translator.CalendarEventResponse_NotResponded
+            };
+        }
+    }
+
+    #endregion
+
+    public EventDetailsPageViewModel(ICalendarService calendarService,
+                                     INativeAppService nativeAppService,
+                                     IPreferencesService preferencesService,
+                                     IMailDialogService dialogService,
+                                     IWinoRequestDelegator winoRequestDelegator,
+                                     INavigationService navigationService,
+                                     INotificationBuilder notificationBuilder,
+                                     IUnderlyingThemeService underlyingThemeService,
+                                     IContactService contactService)
     {
         _calendarService = calendarService;
         _nativeAppService = nativeAppService;
         _preferencesService = preferencesService;
+        _dialogService = dialogService;
+        _winoRequestDelegator = winoRequestDelegator;
+        _navigationService = navigationService;
+        _underlyingThemeService = underlyingThemeService;
+        _notificationBuilder = notificationBuilder;
+        _contactService = contactService;
 
         CurrentSettings = _preferencesService.GetCurrentCalendarSettings();
+        IsDarkWebviewRenderer = _underlyingThemeService.IsUnderlyingThemeDark();
+
+        // Initialize Show As options
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Free));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Tentative));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Busy));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.OutOfOffice));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.WorkingElsewhere));
+        SelectedShowAsOption = ShowAsOptions[2]; // Default to Busy
+
+        // Initialize RSVP status options
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Accepted));
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Tentative));
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Cancelled));
     }
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
         base.OnNavigatedTo(mode, parameters);
 
-        Messenger.Send(new DetailsPageStateChangedMessage(true));
-
         if (parameters == null || parameters is not CalendarItemTarget args)
             return;
 
         await LoadCalendarItemTargetAsync(args);
     }
 
+    protected override async void OnCalendarItemUpdated(CalendarItem calendarItem, CalendarItemUpdateSource source)
+    {
+        base.OnCalendarItemUpdated(calendarItem, source);
+
+        // If the current event was updated, reload it
+        if (CurrentEvent?.CalendarItem?.Id == calendarItem.Id || CurrentEvent?.CalendarItem.RecurringCalendarItemId == calendarItem.Id)
+        {
+            // Reflect client-side optimistic changes immediately; fallback to DB for server updates.
+            if (source == CalendarItemUpdateSource.ClientUpdated || source == CalendarItemUpdateSource.ClientReverted)
+            {
+                var previousAttendees = CurrentEvent?.Attendees?.ToList() ?? [];
+                CurrentEvent = new CalendarItemViewModel(calendarItem)
+                {
+                    IsBusy = source == CalendarItemUpdateSource.ClientUpdated
+                };
+
+                foreach (var attendee in previousAttendees)
+                {
+                    CurrentEvent.Attendees.Add(attendee);
+                }
+
+                return;
+            }
+
+            // Refresh from DB when update comes from server sync.
+            var refreshedEvent = await _calendarService.GetCalendarItemAsync(calendarItem.Id);
+            if (refreshedEvent != null)
+            {
+                CurrentEvent = new CalendarItemViewModel(refreshedEvent);
+                await LoadAttendeesAsync(refreshedEvent.Id, refreshedEvent);
+            }
+        }
+    }
+
+    protected override void OnCalendarItemDeleted(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemDeleted(calendarItem);
+
+        // If the current event was deleted, navigate back
+        if (CurrentEvent?.CalendarItem?.Id == calendarItem.Id || CurrentEvent?.CalendarItem.RecurringCalendarItemId == calendarItem.Id)
+        {
+            NavigateBackToCalendar(forceReload: true);
+        }
+    }
+
     private async Task LoadCalendarItemTargetAsync(CalendarItemTarget target)
     {
         try
@@ -67,12 +243,17 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
 
             CurrentEvent = new CalendarItemViewModel(currentEventItem);
 
-            var attendees = await _calendarService.GetAttendeesAsync(currentEventItem.EventTrackingId);
+            await LoadAttendeesAsync(currentEventItem.Id, currentEventItem);
 
-            foreach (var item in attendees)
-            {
-                CurrentEvent.Attendees.Add(item);
-            }
+            // Initialize SelectedShowAsOption based on current event's ShowAs
+            SelectedShowAsOption = ShowAsOptions.FirstOrDefault(o => o.ShowAs == currentEventItem.ShowAs) ?? ShowAsOptions[2];
+
+            // Load reminders for this calendar item
+            Reminders = await _calendarService.GetRemindersAsync(currentEventItem.Id);
+            InitializeReminderOptions();
+
+            // Load attachments
+            await LoadAttachmentsAsync(currentEventItem.Id);
         }
         catch (Exception ex)
         {
@@ -80,36 +261,572 @@ public partial class EventDetailsPageViewModel : CalendarBaseViewModel
         }
     }
 
-    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    private async Task LoadAttendeesAsync(Guid calendarItemId, CalendarItem calendarItem)
     {
-        base.OnNavigatedFrom(mode, parameters);
+        var attendees = await _calendarService.GetAttendeesAsync(calendarItemId);
 
-        Messenger.Send(new DetailsPageStateChangedMessage(false));
+        // Resolve contacts for all attendees in a single batch DB query.
+        var emails = attendees
+            .Where(a => !string.IsNullOrEmpty(a.Email))
+            .Select(a => a.Email)
+            .ToList();
+
+        if (!string.IsNullOrEmpty(calendarItem.OrganizerEmail))
+            emails.Add(calendarItem.OrganizerEmail);
+
+        var contacts = await _contactService.GetContactsByAddressesAsync(emails).ConfigureAwait(false);
+        var contactLookup = contacts.ToDictionary(c => c.Address, StringComparer.OrdinalIgnoreCase);
+
+        foreach (var attendee in attendees)
+        {
+            if (!string.IsNullOrEmpty(attendee.Email) && contactLookup.TryGetValue(attendee.Email, out var contact))
+                attendee.ResolvedContact = contact;
+        }
+
+        // Separate organizer from other attendees to ensure organizer is always first
+        var organizer = attendees.FirstOrDefault(a => a.IsOrganizer);
+        var nonOrganizerAttendees = attendees.Where(a => !a.IsOrganizer).ToList();
+
+        var attendeesForUi = new List<CalendarEventAttendee>();
+
+        // If the organizer is in the list, add them first
+        if (organizer != null)
+        {
+            attendeesForUi.Add(organizer);
+        }
+        else if (!string.IsNullOrEmpty(calendarItem.OrganizerEmail))
+        {
+            // If the organizer is not in the attendees list, create and add them first
+            var organizerAttendee = new CalendarEventAttendee
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = calendarItem.Id,
+                Name = calendarItem.OrganizerDisplayName ?? calendarItem.OrganizerEmail,
+                Email = calendarItem.OrganizerEmail,
+                IsOrganizer = true,
+                AttendenceStatus = AttendeeStatus.Accepted
+            };
+
+            if (contactLookup.TryGetValue(calendarItem.OrganizerEmail, out var organizerContact))
+                organizerAttendee.ResolvedContact = organizerContact;
+
+            attendeesForUi.Add(organizerAttendee);
+        }
+
+        // Add all other attendees after the organizer
+        foreach (var item in nonOrganizerAttendees)
+        {
+            attendeesForUi.Add(item);
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            if (CurrentEvent == null)
+                return;
+
+            CurrentEvent.Attendees.Clear();
+
+            foreach (var attendee in attendeesForUi)
+            {
+                CurrentEvent.Attendees.Add(attendee);
+            }
+        });
     }
 
+    private async Task LoadAttachmentsAsync(Guid calendarItemId)
+    {
+        Attachments.Clear();
+
+        try
+        {
+            var attachments = await _calendarService.GetAttachmentsAsync(calendarItemId);
+
+            foreach (var attachment in attachments)
+            {
+                Attachments.Add(new CalendarAttachmentViewModel(attachment));
+            }
+
+            OnPropertyChanged(nameof(HasAttachments));
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error loading attachments: {ex.Message}");
+        }
+    }
+
+    private void InitializeReminderOptions()
+    {
+        ReminderOptions.Clear();
+
+        // Add predefined options from service
+        var predefinedMinutes = _calendarService.GetPredefinedReminderMinutes();
+        var predefinedOptions = predefinedMinutes.Select(m => new ReminderOption(m)).ToList();
+
+        // Add custom reminders from synced data
+        if (Reminders != null)
+        {
+            foreach (var reminder in Reminders)
+            {
+                // Convert seconds to minutes
+                var minutesDiff = (int)(reminder.DurationInSeconds / 60);
+
+                // Check if this is a custom value not in predefined list
+                if (!predefinedMinutes.Contains(minutesDiff))
+                {
+                    predefinedOptions.Add(new ReminderOption(minutesDiff, isCustom: true));
+                }
+            }
+        }
+
+        // Sort by minutes descending and add to collection
+        foreach (var option in predefinedOptions.OrderByDescending(o => o.Minutes))
+        {
+            ReminderOptions.Add(option);
+        }
+
+        // Set selected state based on current reminders
+        if (Reminders != null)
+        {
+            foreach (var reminder in Reminders)
+            {
+                // Convert seconds to minutes
+                var minutesDiff = (int)(reminder.DurationInSeconds / 60);
+
+                var matchingOption = ReminderOptions.FirstOrDefault(o => o.Minutes == minutesDiff);
+                matchingOption?.IsSelected = true;
+            }
+        }
+    }
+
+
     [RelayCommand]
     private async Task SaveAsync()
     {
+        if (CurrentEvent == null) return;
 
+        try
+        {
+            // Capture original state BEFORE making any changes for potential revert
+            var originalItem = await _calendarService.GetCalendarItemAsync(CurrentEvent.CalendarItem.Id);
+            var originalAttendees = await _calendarService.GetAttendeesAsync(CurrentEvent.CalendarItem.Id);
+
+            // Get selected reminder options
+            var selectedOptions = ReminderOptions.Where(o => o.IsSelected).ToList();
+
+            // Create separate Reminder entities for each selected option
+            var newReminders = new List<Reminder>();
+
+            foreach (var option in selectedOptions)
+            {
+                var durationInSeconds = option.Minutes * 60; // Convert minutes to seconds
+
+                newReminders.Add(new Reminder
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarItemId = CurrentEvent.Id,
+                    DurationInSeconds = durationInSeconds,
+                    ReminderType = CalendarItemReminderType.Popup
+                });
+            }
+
+            // Save reminders to database
+            await _calendarService.SaveRemindersAsync(CurrentEvent.CalendarItem.Id, newReminders);
+            Reminders = newReminders;
+
+            // Update ShowAs if changed
+            if (SelectedShowAsOption != null)
+            {
+                CurrentEvent.CalendarItem.ShowAs = SelectedShowAsOption.ShowAs;
+            }
+
+            // Update the calendar item and attendees in database
+            await _calendarService.UpdateCalendarItemAsync(CurrentEvent.CalendarItem, CurrentEvent.Attendees.ToList());
+
+            // Queue the update request to synchronizer with original state for revert capability
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                CalendarSynchronizerOperation.UpdateEvent,
+                CurrentEvent.CalendarItem,
+                CurrentEvent.Attendees.ToList(),
+                ResponseMessage: null,
+                OriginalItem: originalItem,
+                OriginalAttendees: originalAttendees);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            NavigateBackToCalendar(forceReload: true);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error saving event: {ex.Message}");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
     }
 
     [RelayCommand]
     private async Task DeleteAsync()
     {
+        if (CurrentEvent == null) return;
 
+        // If the event is a master recurring event, ask for confirmation
+        if (CurrentEvent.IsRecurringParent)
+        {
+            var confirmed = await _dialogService.ShowConfirmationDialogAsync(
+                Translator.DialogMessage_DeleteRecurringSeriesMessage,
+                Translator.DialogMessage_DeleteRecurringSeriesTitle,
+                Translator.Buttons_Delete);
+
+            if (!confirmed) return;
+        }
+
+        try
+        {
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                CalendarSynchronizerOperation.DeleteEvent,
+                CurrentEvent.CalendarItem,
+                null);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            NavigateBackToCalendar(forceReload: true);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error deleting calendar event: {ex.Message}");
+        }
+    }
+
+    private void NavigateBackToCalendar(bool forceReload)
+    {
+        var navigationDate = CurrentEvent?.CalendarItem.LocalStartDate ?? DateTime.Now;
+
+        _navigationService.Navigate(
+            WinoPage.CalendarPage,
+            new CalendarPageNavigationArgs
+            {
+                NavigationDate = navigationDate,
+                ForceReload = forceReload
+            });
+    }
+
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
+    {
+        if (args.Handled || args.Mode != WinoApplicationMode.Calendar || args.Action != KeyboardShortcutAction.Delete)
+            return;
+
+        await DeleteAsync();
+        args.Handled = true;
     }
 
     [RelayCommand]
-    private Task JoinOnline()
+    private Task JoinOnlineAsync()
     {
-        if (CurrentEvent == null || string.IsNullOrEmpty(CurrentEvent.CalendarItem.HtmlLink)) return Task.CompletedTask;
+        if (CurrentEvent == null || string.IsNullOrEmpty(CurrentEvent.CalendarItem.HtmlLink))
+            return Task.CompletedTask;
 
         return _nativeAppService.LaunchUriAsync(new Uri(CurrentEvent.CalendarItem.HtmlLink));
     }
 
     [RelayCommand]
-    private async Task Respond(CalendarItemStatus status)
+    private Task CreateTestNotificationAsync()
+    {
+        if (CurrentEvent?.CalendarItem == null)
+            return Task.CompletedTask;
+
+        var reminderDurationInSeconds = Reminders?
+            .Where(x => x.DurationInSeconds > 0)
+            .OrderByDescending(x => x.DurationInSeconds)
+            .Select(x => x.DurationInSeconds)
+            .FirstOrDefault() ?? 0;
+
+        if (reminderDurationInSeconds <= 0)
+            reminderDurationInSeconds = Math.Max(_preferencesService.DefaultReminderDurationInSeconds, 30 * 60);
+
+        return _notificationBuilder.CreateCalendarReminderNotificationAsync(CurrentEvent.CalendarItem, reminderDurationInSeconds);
+    }
+
+    [RelayCommand]
+    private void ToggleRsvpPanel()
+    {
+        IsRsvpPanelVisible = !IsRsvpPanelVisible;
+
+        if (IsRsvpPanelVisible && CurrentEvent?.CalendarItem != null)
+        {
+            // Initialize selection based on current status
+            foreach (var item in RsvpStatusOptions)
+            {
+                item.IsSelected = CurrentEvent?.CalendarItem?.Status == item.Status;
+            }
+        }
+    }
+
+    [RelayCommand]
+    private void CloseRsvpPanel()
+    {
+        IsRsvpPanelVisible = false;
+        RsvpMessage = string.Empty;
+    }
+
+    [RelayCommand]
+    private async Task SendRsvpResponse(AttendeeStatus status)
     {
         if (CurrentEvent == null) return;
+
+        try
+        {
+            // Get the optional response message if user wants to include it
+            var responseMessage = IncludeRsvpMessage ? RsvpMessage : null;
+
+            // Map status to operation
+            CalendarSynchronizerOperation operation = status switch
+            {
+                AttendeeStatus.Accepted => CalendarSynchronizerOperation.AcceptEvent,
+                AttendeeStatus.Tentative => CalendarSynchronizerOperation.TentativeEvent,
+                AttendeeStatus.Declined => CalendarSynchronizerOperation.DeclineEvent,
+                _ => throw new InvalidOperationException($"Invalid RSVP status: {status}")
+            };
+
+            // Create preparation request with the optional message
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                operation,
+                CurrentEvent.CalendarItem,
+                null,
+                responseMessage);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            // Reload attendees to get the updated status from the server
+            await LoadAttendeesAsync(CurrentEvent.CalendarItem.Id, CurrentEvent.CalendarItem);
+
+            OnPropertyChanged(nameof(CurrentRsvpText));
+            OnPropertyChanged(nameof(CurrentRsvpStatus));
+
+            CloseRsvpPanel();
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error sending RSVP response: {ex.Message}");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task ViewSeriesAsync()
+    {
+        if (CurrentEvent == null || !CurrentEvent.IsRecurringChild) return;
+
+        try
+        {
+            // Get the master event from the recurring series
+            var masterEventId = CurrentEvent.CalendarItem.RecurringCalendarItemId.Value;
+            var masterEvent = await _calendarService.GetCalendarItemAsync(masterEventId);
+
+            if (masterEvent == null) return;
+
+            // Load the master event without navigation
+            var target = new CalendarItemTarget(masterEvent, CalendarEventTargetType.Series);
+            await LoadCalendarItemTargetAsync(target);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error loading series: {ex.Message}");
+        }
+    }
+
+    [RelayCommand]
+    private async Task OpenAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (attachmentViewModel == null || CurrentEvent?.CalendarItem == null) return;
+
+        try
+        {
+            attachmentViewModel.IsBusy = true;
+
+            // If not downloaded, download it first
+            if (!attachmentViewModel.IsDownloaded)
+            {
+                await DownloadAttachmentAsync(attachmentViewModel);
+            }
+
+            // Launch the file
+            if (!string.IsNullOrEmpty(attachmentViewModel.Attachment.LocalFilePath) &&
+                File.Exists(attachmentViewModel.Attachment.LocalFilePath))
+            {
+                await _nativeAppService.LaunchFileAsync(attachmentViewModel.Attachment.LocalFilePath);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to open calendar attachment.");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentOpenFailedTitle,
+                Translator.Info_AttachmentOpenFailedMessage,
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            attachmentViewModel.IsBusy = false;
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (attachmentViewModel == null) return;
+
+        try
+        {
+            attachmentViewModel.IsBusy = true;
+
+            var pickedPath = await _dialogService.PickWindowsFolderAsync();
+            if (string.IsNullOrEmpty(pickedPath)) return;
+
+            // Download if not already downloaded
+            if (!attachmentViewModel.IsDownloaded)
+            {
+                await DownloadAttachmentAsync(attachmentViewModel);
+            }
+
+            // Copy to selected location
+            if (!string.IsNullOrEmpty(attachmentViewModel.Attachment.LocalFilePath) &&
+                File.Exists(attachmentViewModel.Attachment.LocalFilePath))
+            {
+                var destinationPath = Path.Combine(pickedPath, attachmentViewModel.FileName);
+                File.Copy(attachmentViewModel.Attachment.LocalFilePath, destinationPath, overwrite: true);
+
+                _dialogService.InfoBarMessage(
+                    Translator.Info_AttachmentSaveSuccessTitle,
+                    Translator.Info_AttachmentSaveSuccessMessage,
+                    InfoBarMessageType.Success);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to save calendar attachment.");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                Translator.Info_AttachmentSaveFailedMessage,
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            attachmentViewModel.IsBusy = false;
+        }
+    }
+
+    private async Task DownloadAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (CurrentEvent?.CalendarItem == null) return;
+
+        // Create attachments folder for this calendar item
+        var attachmentsFolder = Path.Combine(
+            _nativeAppService.GetCalendarAttachmentsFolderPath(),
+            CurrentEvent.CalendarItem.Id.ToString());
+
+        Directory.CreateDirectory(attachmentsFolder);
+
+        var localFilePath = Path.Combine(attachmentsFolder, attachmentViewModel.FileName);
+
+        // Download attachment using synchronizer
+        await SynchronizationManager.Instance.DownloadCalendarAttachmentAsync(
+            CurrentEvent.CalendarItem,
+            attachmentViewModel.Attachment,
+            localFilePath);
+
+        // Mark as downloaded
+        await _calendarService.MarkAttachmentDownloadedAsync(
+            attachmentViewModel.Id,
+            localFilePath);
+
+        // Update view model
+        attachmentViewModel.Attachment.IsDownloaded = true;
+        attachmentViewModel.Attachment.LocalFilePath = localFilePath;
+        OnPropertyChanged(nameof(attachmentViewModel.IsDownloaded));
+    }
+}
+
+public partial class ReminderOption : ObservableObject
+{
+    public int Minutes { get; }
+    public bool IsCustom { get; }
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public string DisplayText
+    {
+        get
+        {
+            if (Minutes >= 60)
+            {
+                var hours = Minutes / 60;
+                return hours == 1 ? "1 Hour" : $"{hours} Hours";
+            }
+            return Minutes == 1 ? "1 Minute" : $"{Minutes} Minutes";
+        }
+    }
+
+    public ReminderOption(int minutes, bool isCustom = false)
+    {
+        Minutes = minutes;
+        IsCustom = isCustom;
+    }
+}
+
+public partial class ShowAsOption : ObservableObject
+{
+    public CalendarItemShowAs ShowAs { get; }
+
+    public string DisplayText
+    {
+        get
+        {
+            return ShowAs switch
+            {
+                CalendarItemShowAs.Free => Translator.CalendarShowAs_Free,
+                CalendarItemShowAs.Tentative => Translator.CalendarShowAs_Tentative,
+                CalendarItemShowAs.Busy => Translator.CalendarShowAs_Busy,
+                CalendarItemShowAs.OutOfOffice => Translator.CalendarShowAs_OutOfOffice,
+                CalendarItemShowAs.WorkingElsewhere => Translator.CalendarShowAs_WorkingElsewhere,
+                _ => Translator.CalendarShowAs_Busy
+            };
+        }
+    }
+
+    public ShowAsOption(CalendarItemShowAs showAs)
+    {
+        ShowAs = showAs;
+    }
+}
+
+public partial class RsvpStatusOption : ObservableObject
+{
+    public CalendarItemStatus Status { get; }
+
+    public string StatusText
+    {
+        get
+        {
+            return Status switch
+            {
+                CalendarItemStatus.Accepted => Translator.CalendarEventResponse_Accept,
+                CalendarItemStatus.Tentative => Translator.CalendarEventResponse_Tentative,
+                CalendarItemStatus.Cancelled => Translator.CalendarEventResponse_Decline,
+                _ => Translator.CalendarEventResponse_Accept
+            };
+        }
+    }
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public RsvpStatusOption(CalendarItemStatus status)
+    {
+        Status = status;
     }
 }
diff --git a/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs b/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs
index 9aaf17a4..d639040d 100644
--- a/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs
+++ b/Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs
@@ -2,14 +2,16 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
+using CommunityToolkit.Mvvm.Collections;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Calendar.ViewModels.Interfaces;
 
 public interface IAccountCalendarStateService : INotifyPropertyChanged
 {
+    IDispatcher Dispatcher { get; set; }
     ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; }
 
     event EventHandler<GroupedAccountCalendarViewModel> CollectiveAccountGroupSelectionStateChanged;
@@ -17,7 +19,7 @@ public interface IAccountCalendarStateService : INotifyPropertyChanged
 
     public void AddGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar);
     public void RemoveGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar);
-    public void ClearGroupedAccountCalendar();
+    public void ClearGroupedAccountCalendars();
 
     public void AddAccountCalendar(AccountCalendarViewModel accountCalendar);
     public void RemoveAccountCalendar(AccountCalendarViewModel accountCalendar);
@@ -26,5 +28,7 @@ public interface IAccountCalendarStateService : INotifyPropertyChanged
     /// Enumeration of currently selected calendars.
     /// </summary>
     IEnumerable<AccountCalendarViewModel> ActiveCalendars { get; }
-    IEnumerable<IGrouping<MailAccount, AccountCalendarViewModel>> GroupedAccountCalendarsEnumerable { get; }
+    IEnumerable<AccountCalendarViewModel> AllCalendars { get; }
+    bool IsAnySynchronizationInProgress { get; }
+    ReadOnlyObservableGroupedCollection<MailAccount, AccountCalendarViewModel> GroupedCalendars { get; set; }
 }
diff --git a/Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs b/Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs
index 05f2d99c..8419eaba 100644
--- a/Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs
+++ b/Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs
@@ -1,16 +1,12 @@
 using Wino.Calendar.ViewModels.Data;
-using Wino.Core.Domain.Models.Calendar;
-
 namespace Wino.Calendar.ViewModels.Messages;
 
 public class CalendarItemTappedMessage
 {
-    public CalendarItemTappedMessage(CalendarItemViewModel calendarItemViewModel, CalendarDayModel clickedPeriod)
+    public CalendarItemTappedMessage(CalendarItemViewModel calendarItemViewModel)
     {
         CalendarItemViewModel = calendarItemViewModel;
-        ClickedPeriod = clickedPeriod;
     }
 
     public CalendarItemViewModel CalendarItemViewModel { get; }
-    public CalendarDayModel ClickedPeriod { get; }
 }
diff --git a/Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj b/Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj
index e0e88340..b51d389c 100644
--- a/Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj
+++ b/Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj
@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Platforms>x86;x64;arm64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
-	  <PackageReference Include="TimePeriodLibrary.NET" />
+		<PackageReference Include="TimePeriodLibrary.NET" />
+		<PackageReference Include="EmailValidation" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Wino.Calendar/Activation/DefaultActivationHandler.cs b/Wino.Calendar/Activation/DefaultActivationHandler.cs
deleted file mode 100644
index e2d1b8f7..00000000
--- a/Wino.Calendar/Activation/DefaultActivationHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Wino.Activation;
-using Wino.Calendar.Views;
-
-namespace Wino.Calendar.Activation;
-
-public class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
-{
-    protected override Task HandleInternalAsync(IActivatedEventArgs args)
-    {
-        (Window.Current.Content as Frame).Navigate(typeof(AppShell), null, new DrillInNavigationTransitionInfo());
-
-        return Task.CompletedTask;
-    }
-
-    // Only navigate if Frame content doesn't exist.
-    protected override bool CanHandleInternal(IActivatedEventArgs args)
-        => (Window.Current?.Content as Frame)?.Content == null;
-}
diff --git a/Wino.Calendar/App.xaml b/Wino.Calendar/App.xaml
deleted file mode 100644
index 1b0db3ef..00000000
--- a/Wino.Calendar/App.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<core:WinoApplication
-    x:Class="Wino.Calendar.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-    xmlns:core="using:Wino.Core.UWP"
-    xmlns:coreStyles="using:Wino.Core.UWP.Styles"
-    xmlns:local="using:Wino.Calendar"
-    xmlns:styles="using:Wino.Calendar.Styles">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-
-                <core:CoreGeneric />
-
-                <styles:WinoCalendarResources />
-
-                <ResourceDictionary Source="Styles/CalendarThemeResources.xaml" />
-
-                <ResourceDictionary Source="Styles/WinoDayTimelineCanvas.xaml" />
-                <ResourceDictionary Source="Styles/WinoCalendarView.xaml" />
-                <ResourceDictionary Source="Styles/WinoCalendarTypeSelectorControl.xaml" />
-
-                <!--  Last item must always be the default theme.  -->
-                <ResourceDictionary Source="ms-appx:///Wino.Core.UWP/AppThemes/Mica.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</core:WinoApplication>
-
diff --git a/Wino.Calendar/App.xaml.cs b/Wino.Calendar/App.xaml.cs
deleted file mode 100644
index 0ae35172..00000000
--- a/Wino.Calendar/App.xaml.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Background;
-using Windows.UI.Core.Preview;
-using Wino.Activation;
-using Wino.Calendar.Activation;
-using Wino.Calendar.Services;
-using Wino.Calendar.ViewModels;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.UWP;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Connection;
-using Wino.Messaging.Server;
-using Wino.Services;
-
-namespace Wino.Calendar;
-
-public sealed partial class App : WinoApplication, IRecipient<NewCalendarSynchronizationRequested>
-{
-    private BackgroundTaskDeferral connectionBackgroundTaskDeferral;
-
-    public App()
-    {
-        InitializeComponent();
-        WeakReferenceMessenger.Default.Register<NewCalendarSynchronizationRequested>(this);
-    }
-
-    public override IServiceProvider ConfigureServices()
-    {
-        var services = new ServiceCollection();
-
-        services.RegisterSharedServices();
-        services.RegisterCalendarViewModelServices();
-        services.RegisterCoreUWPServices();
-        services.RegisterCoreViewModels();
-
-        RegisterUWPServices(services);
-        RegisterViewModels(services);
-        RegisterActivationHandlers(services);
-
-        return services.BuildServiceProvider();
-    }
-
-    #region Dependency Injection
-
-    private void RegisterActivationHandlers(IServiceCollection services)
-    {
-        //services.AddTransient<ProtocolActivationHandler>();
-        //services.AddTransient<ToastNotificationActivationHandler>();
-        //services.AddTransient<FileActivationHandler>();
-    }
-
-    private void RegisterUWPServices(IServiceCollection services)
-    {
-        services.AddSingleton<INavigationService, NavigationService>();
-        services.AddSingleton<ICalendarDialogService, DialogService>();
-        services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
-        services.AddTransient<IProviderService, ProviderService>();
-        services.AddSingleton<IAuthenticatorConfig, CalendarAuthenticatorConfig>();
-        services.AddSingleton<IAccountCalendarStateService, AccountCalendarStateService>();
-    }
-
-    private void RegisterViewModels(IServiceCollection services)
-    {
-        services.AddSingleton(typeof(AppShellViewModel));
-        services.AddSingleton(typeof(CalendarPageViewModel));
-        services.AddTransient(typeof(CalendarSettingsPageViewModel));
-        services.AddTransient(typeof(AccountManagementViewModel));
-        services.AddTransient(typeof(PersonalizationPageViewModel));
-        services.AddTransient(typeof(AccountDetailsPageViewModel));
-        services.AddTransient(typeof(EventDetailsPageViewModel));
-    }
-
-    #endregion
-
-    protected override void OnApplicationCloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
-    {
-        // TODO: Check server running.
-    }
-
-    protected override async void OnLaunched(LaunchActivatedEventArgs args)
-    {
-        LogActivation($"OnLaunched -> {args.GetType().Name}, Kind -> {args.Kind}, PreviousExecutionState -> {args.PreviousExecutionState}, IsPrelaunch -> {args.PrelaunchActivated}");
-
-        if (!args.PrelaunchActivated)
-        {
-            await ActivateWinoAsync(args);
-        }
-    }
-
-    protected override IEnumerable<ActivationHandler> GetActivationHandlers()
-    {
-        return null;
-    }
-
-    protected override ActivationHandler<IActivatedEventArgs> GetDefaultActivationHandler()
-        => new DefaultActivationHandler();
-
-    protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
-    {
-        base.OnBackgroundActivated(args);
-
-        if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails appServiceTriggerDetails)
-        {
-            LogActivation("OnBackgroundActivated -> AppServiceTriggerDetails received.");
-
-            // Only accept connections from callers in the same package
-            if (appServiceTriggerDetails.CallerPackageFamilyName == Package.Current.Id.FamilyName)
-            {
-                // Connection established from the fulltrust process
-
-                connectionBackgroundTaskDeferral = args.TaskInstance.GetDeferral();
-                args.TaskInstance.Canceled += OnConnectionBackgroundTaskCanceled;
-
-                AppServiceConnectionManager.Connection = appServiceTriggerDetails.AppServiceConnection;
-
-                WeakReferenceMessenger.Default.Send(new WinoServerConnectionEstablished());
-            }
-        }
-    }
-
-    public void OnConnectionBackgroundTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-    {
-        sender.Canceled -= OnConnectionBackgroundTaskCanceled;
-
-        Log.Information($"Server connection background task was canceled. Reason: {reason}");
-
-        connectionBackgroundTaskDeferral?.Complete();
-        connectionBackgroundTaskDeferral = null;
-
-        AppServiceConnectionManager.Connection = null;
-    }
-
-    public async void Receive(NewCalendarSynchronizationRequested message)
-    {
-        try
-        {
-            var synchronizationResultResponse = await AppServiceConnectionManager.GetResponseAsync<CalendarSynchronizationResult, NewCalendarSynchronizationRequested>(message);
-            synchronizationResultResponse.ThrowIfFailed();
-        }
-        catch (WinoServerException serverException)
-        {
-            var dialogService = Services.GetService<ICalendarDialogService>();
-
-            dialogService.InfoBarMessage(Translator.Info_SyncFailedTitle, serverException.Message, InfoBarMessageType.Error);
-        }
-    }
-}
diff --git a/Wino.Calendar/Assets/LargeTile.scale-100.png b/Wino.Calendar/Assets/LargeTile.scale-100.png
deleted file mode 100644
index 42334872..00000000
Binary files a/Wino.Calendar/Assets/LargeTile.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/LargeTile.scale-125.png b/Wino.Calendar/Assets/LargeTile.scale-125.png
deleted file mode 100644
index 9c03a75c..00000000
Binary files a/Wino.Calendar/Assets/LargeTile.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/LargeTile.scale-150.png b/Wino.Calendar/Assets/LargeTile.scale-150.png
deleted file mode 100644
index e29aa6e0..00000000
Binary files a/Wino.Calendar/Assets/LargeTile.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/LargeTile.scale-200.png b/Wino.Calendar/Assets/LargeTile.scale-200.png
deleted file mode 100644
index 5ad11086..00000000
Binary files a/Wino.Calendar/Assets/LargeTile.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/LargeTile.scale-400.png b/Wino.Calendar/Assets/LargeTile.scale-400.png
deleted file mode 100644
index af446cf4..00000000
Binary files a/Wino.Calendar/Assets/LargeTile.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/LockScreenLogo.scale-200.png b/Wino.Calendar/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57ad..00000000
Binary files a/Wino.Calendar/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SmallTile.scale-100.png b/Wino.Calendar/Assets/SmallTile.scale-100.png
deleted file mode 100644
index 2d1167f7..00000000
Binary files a/Wino.Calendar/Assets/SmallTile.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SmallTile.scale-125.png b/Wino.Calendar/Assets/SmallTile.scale-125.png
deleted file mode 100644
index d8bc11c5..00000000
Binary files a/Wino.Calendar/Assets/SmallTile.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SmallTile.scale-150.png b/Wino.Calendar/Assets/SmallTile.scale-150.png
deleted file mode 100644
index e124da41..00000000
Binary files a/Wino.Calendar/Assets/SmallTile.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SmallTile.scale-200.png b/Wino.Calendar/Assets/SmallTile.scale-200.png
deleted file mode 100644
index 3854c86c..00000000
Binary files a/Wino.Calendar/Assets/SmallTile.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SmallTile.scale-400.png b/Wino.Calendar/Assets/SmallTile.scale-400.png
deleted file mode 100644
index f242a580..00000000
Binary files a/Wino.Calendar/Assets/SmallTile.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-100.png b/Wino.Calendar/Assets/SplashScreen.scale-100.png
deleted file mode 100644
index 86ade338..00000000
Binary files a/Wino.Calendar/Assets/SplashScreen.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-125.png b/Wino.Calendar/Assets/SplashScreen.scale-125.png
deleted file mode 100644
index 55d0473d..00000000
Binary files a/Wino.Calendar/Assets/SplashScreen.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-150.png b/Wino.Calendar/Assets/SplashScreen.scale-150.png
deleted file mode 100644
index 80b9ed0d..00000000
Binary files a/Wino.Calendar/Assets/SplashScreen.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-200.png b/Wino.Calendar/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 8510c90c..00000000
Binary files a/Wino.Calendar/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/SplashScreen.scale-400.png b/Wino.Calendar/Assets/SplashScreen.scale-400.png
deleted file mode 100644
index 7efc715b..00000000
Binary files a/Wino.Calendar/Assets/SplashScreen.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-100.png b/Wino.Calendar/Assets/Square150x150Logo.scale-100.png
deleted file mode 100644
index 37501fe7..00000000
Binary files a/Wino.Calendar/Assets/Square150x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-125.png b/Wino.Calendar/Assets/Square150x150Logo.scale-125.png
deleted file mode 100644
index 0622878d..00000000
Binary files a/Wino.Calendar/Assets/Square150x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-150.png b/Wino.Calendar/Assets/Square150x150Logo.scale-150.png
deleted file mode 100644
index 15dc07b5..00000000
Binary files a/Wino.Calendar/Assets/Square150x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-200.png b/Wino.Calendar/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index 75c9945a..00000000
Binary files a/Wino.Calendar/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square150x150Logo.scale-400.png b/Wino.Calendar/Assets/Square150x150Logo.scale-400.png
deleted file mode 100644
index cb218b68..00000000
Binary files a/Wino.Calendar/Assets/Square150x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
deleted file mode 100644
index 2c72b37d..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
deleted file mode 100644
index 895753c9..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
deleted file mode 100644
index eeaaad33..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
deleted file mode 100644
index e7c0cb66..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
deleted file mode 100644
index 56792258..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index 2c72b37d..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index eeaaad33..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
deleted file mode 100644
index e7c0cb66..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index 56792258..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-100.png b/Wino.Calendar/Assets/Square44x44Logo.scale-100.png
deleted file mode 100644
index 43b04c94..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-125.png b/Wino.Calendar/Assets/Square44x44Logo.scale-125.png
deleted file mode 100644
index c6ca31f5..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-150.png b/Wino.Calendar/Assets/Square44x44Logo.scale-150.png
deleted file mode 100644
index 97bf5eb8..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-200.png b/Wino.Calendar/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index f1a2ddef..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.scale-400.png b/Wino.Calendar/Assets/Square44x44Logo.scale-400.png
deleted file mode 100644
index b25cb5bc..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-16.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 22a4ac74..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-16.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-24.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-24.png
deleted file mode 100644
index ac5a485d..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-24.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index 895753c9..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-256.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index 9e6a53b2..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-256.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-32.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-32.png
deleted file mode 100644
index 79388f0d..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-32.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Square44x44Logo.targetsize-48.png b/Wino.Calendar/Assets/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index 47aea727..00000000
Binary files a/Wino.Calendar/Assets/Square44x44Logo.targetsize-48.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.backup.png b/Wino.Calendar/Assets/StoreLogo.backup.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.backup.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.scale-100.png b/Wino.Calendar/Assets/StoreLogo.scale-100.png
deleted file mode 100644
index caafaee8..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.scale-125.png b/Wino.Calendar/Assets/StoreLogo.scale-125.png
deleted file mode 100644
index 59f77d4e..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.scale-150.png b/Wino.Calendar/Assets/StoreLogo.scale-150.png
deleted file mode 100644
index 6adf5536..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.scale-200.png b/Wino.Calendar/Assets/StoreLogo.scale-200.png
deleted file mode 100644
index b4b471f8..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/StoreLogo.scale-400.png b/Wino.Calendar/Assets/StoreLogo.scale-400.png
deleted file mode 100644
index be94d352..00000000
Binary files a/Wino.Calendar/Assets/StoreLogo.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-100.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-100.png
deleted file mode 100644
index 0847e264..00000000
Binary files a/Wino.Calendar/Assets/Wide310x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-125.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-125.png
deleted file mode 100644
index 0be7583f..00000000
Binary files a/Wino.Calendar/Assets/Wide310x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-150.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-150.png
deleted file mode 100644
index f969318f..00000000
Binary files a/Wino.Calendar/Assets/Wide310x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 86ade338..00000000
Binary files a/Wino.Calendar/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Calendar/Assets/Wide310x150Logo.scale-400.png b/Wino.Calendar/Assets/Wide310x150Logo.scale-400.png
deleted file mode 100644
index 8510c90c..00000000
Binary files a/Wino.Calendar/Assets/Wide310x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Calendar/Controls/CalendarItemControl.xaml.cs b/Wino.Calendar/Controls/CalendarItemControl.xaml.cs
deleted file mode 100644
index dbd2333b..00000000
--- a/Wino.Calendar/Controls/CalendarItemControl.xaml.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Itenso.TimePeriod;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Calendar.ViewModels.Messages;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls;
-
-public sealed partial class CalendarItemControl : UserControl
-{
-    // Single tap has a delay to report double taps properly.
-    private bool isSingleTap = false;
-
-    public static readonly DependencyProperty CalendarItemProperty = DependencyProperty.Register(nameof(CalendarItem), typeof(CalendarItemViewModel), typeof(CalendarItemControl), new PropertyMetadata(null, new PropertyChangedCallback(OnCalendarItemChanged)));
-    public static readonly DependencyProperty IsDraggingProperty = DependencyProperty.Register(nameof(IsDragging), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsCustomEventAreaProperty = DependencyProperty.Register(nameof(IsCustomEventArea), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty CalendarItemTitleProperty = DependencyProperty.Register(nameof(CalendarItemTitle), typeof(string), typeof(CalendarItemControl), new PropertyMetadata(string.Empty));
-    public static readonly DependencyProperty DisplayingDateProperty = DependencyProperty.Register(nameof(DisplayingDate), typeof(CalendarDayModel), typeof(CalendarItemControl), new PropertyMetadata(null, new PropertyChangedCallback(OnDisplayDateChanged)));
-
-    /// <summary>
-    /// Whether the control is displaying as regular event or all-multi day area in the day control.
-    /// </summary>
-    public bool IsCustomEventArea
-    {
-        get { return (bool)GetValue(IsCustomEventAreaProperty); }
-        set { SetValue(IsCustomEventAreaProperty, value); }
-    }
-
-    /// <summary>
-    /// Day that the calendar item is rendered at.
-    /// It's needed for title manipulation and some other adjustments later on.
-    /// </summary>
-    public CalendarDayModel DisplayingDate
-    {
-        get { return (CalendarDayModel)GetValue(DisplayingDateProperty); }
-        set { SetValue(DisplayingDateProperty, value); }
-    }
-
-    public string CalendarItemTitle
-    {
-        get { return (string)GetValue(CalendarItemTitleProperty); }
-        set { SetValue(CalendarItemTitleProperty, value); }
-    }
-
-    public CalendarItemViewModel CalendarItem
-    {
-        get { return (CalendarItemViewModel)GetValue(CalendarItemProperty); }
-        set { SetValue(CalendarItemProperty, value); }
-    }
-
-    public bool IsDragging
-    {
-        get { return (bool)GetValue(IsDraggingProperty); }
-        set { SetValue(IsDraggingProperty, value); }
-    }
-
-    public CalendarItemControl()
-    {
-        InitializeComponent();
-    }
-
-    private static void OnDisplayDateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is CalendarItemControl control)
-        {
-            control.UpdateControlVisuals();
-        }
-    }
-
-    private static void OnCalendarItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is CalendarItemControl control)
-        {
-            control.UpdateControlVisuals();
-        }
-    }
-
-    private void UpdateControlVisuals()
-    {
-        // Depending on the calendar item's duration and attributes, we might need to change the display title.
-        // 1. Multi-Day events should display the start date and end date.
-        // 2. Multi-Day events that occupy the whole day just shows 'all day'.
-        // 3. Other events should display the title.
-
-        if (CalendarItem == null) return;
-        if (DisplayingDate == null) return;
-
-        if (CalendarItem.IsMultiDayEvent)
-        {
-            // Multi day events are divided into 3 categories:
-            // 1. All day events
-            // 2. Events that started after the period.
-            // 3. Events that started before the period and finishes within the period.
-
-            var periodRelation = CalendarItem.Period.GetRelation(DisplayingDate.Period);
-
-            if (periodRelation == Itenso.TimePeriod.PeriodRelation.StartInside ||
-                periodRelation == PeriodRelation.EnclosingStartTouching)
-            {
-                // hour -> title
-                CalendarItemTitle = $"{DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.StartDate.TimeOfDay)} -> {CalendarItem.Title}";
-            }
-            else if (
-                periodRelation == PeriodRelation.EndInside ||
-                periodRelation == PeriodRelation.EnclosingEndTouching)
-            {
-                // title <- hour
-                CalendarItemTitle = $"{CalendarItem.Title} <- {DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.EndDate.TimeOfDay)}";
-            }
-            else if (periodRelation == PeriodRelation.Enclosing)
-            {
-                // This event goes all day and it's multi-day.
-                // Item must be hidden in the calendar but displayed on the custom area at the top.
-
-                CalendarItemTitle = $"{Translator.CalendarItemAllDay} {CalendarItem.Title}";
-            }
-            else
-            {
-                // Not expected, but there it is.
-                CalendarItemTitle = CalendarItem.Title;
-            }
-
-            // Debug.WriteLine($"{CalendarItem.Title} Period relation with {DisplayingDate.Period.ToString()}: {periodRelation}");
-        }
-        else
-        {
-            CalendarItemTitle = CalendarItem.Title;
-        }
-
-        UpdateVisualStates();
-    }
-
-    private void UpdateVisualStates()
-    {
-        if (CalendarItem == null) return;
-
-        if (CalendarItem.IsAllDayEvent)
-        {
-            VisualStateManager.GoToState(this, "AllDayEvent", true);
-        }
-        else if (CalendarItem.IsMultiDayEvent)
-        {
-            if (IsCustomEventArea)
-            {
-                VisualStateManager.GoToState(this, "CustomAreaMultiDayEvent", true);
-            }
-            else
-            {
-                // Hide it.
-                VisualStateManager.GoToState(this, "MultiDayEvent", true);
-            }
-        }
-        else
-        {
-            VisualStateManager.GoToState(this, "RegularEvent", true);
-        }
-    }
-
-    private void ControlDragStarting(UIElement sender, DragStartingEventArgs args) => IsDragging = true;
-
-    private void ControlDropped(UIElement sender, DropCompletedEventArgs args) => IsDragging = false;
-
-    private async void ControlTapped(object sender, TappedRoutedEventArgs e)
-    {
-        if (CalendarItem == null) return;
-
-        isSingleTap = true;
-
-        await Task.Delay(100);
-
-        if (isSingleTap)
-        {
-            WeakReferenceMessenger.Default.Send(new CalendarItemTappedMessage(CalendarItem, DisplayingDate));
-        }
-    }
-
-    private void ControlDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
-    {
-        if (CalendarItem == null) return;
-
-        isSingleTap = false;
-
-        WeakReferenceMessenger.Default.Send(new CalendarItemDoubleTappedMessage(CalendarItem));
-    }
-
-    private void ControlRightTapped(object sender, RightTappedRoutedEventArgs e)
-    {
-        if (CalendarItem == null) return;
-
-        WeakReferenceMessenger.Default.Send(new CalendarItemRightTappedMessage(CalendarItem));
-    }
-}
diff --git a/Wino.Calendar/Controls/CustomCalendarFlipView.cs b/Wino.Calendar/Controls/CustomCalendarFlipView.cs
deleted file mode 100644
index 8d73220e..00000000
--- a/Wino.Calendar/Controls/CustomCalendarFlipView.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Windows.UI.Xaml.Automation.Peers;
-using Windows.UI.Xaml.Controls;
-
-namespace Wino.Calendar.Controls;
-
-/// <summary>
-/// FlipView that hides the navigation buttons and exposes methods to navigate to the next and previous items with animations.
-/// </summary>
-public partial class CustomCalendarFlipView : FlipView
-{
-    private const string PART_PreviousButton = "PreviousButtonHorizontal";
-    private const string PART_NextButton = "NextButtonHorizontal";
-
-    private Button PreviousButton;
-    private Button NextButton;
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        PreviousButton = GetTemplateChild(PART_PreviousButton) as Button;
-        NextButton = GetTemplateChild(PART_NextButton) as Button;
-
-        // Hide navigation buttons
-        PreviousButton.Opacity = NextButton.Opacity = 0;
-        PreviousButton.IsHitTestVisible = NextButton.IsHitTestVisible = false;
-
-        var t = FindName("ScrollingHost");
-    }
-
-    public void GoPreviousFlip()
-    {
-        var backPeer = new ButtonAutomationPeer(PreviousButton);
-        backPeer.Invoke();
-    }
-
-    public void GoNextFlip()
-    {
-        var nextPeer = new ButtonAutomationPeer(NextButton);
-        nextPeer.Invoke();
-    }
-}
diff --git a/Wino.Calendar/Controls/DayColumnControl.cs b/Wino.Calendar/Controls/DayColumnControl.cs
deleted file mode 100644
index a3f3cb78..00000000
--- a/Wino.Calendar/Controls/DayColumnControl.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls;
-
-public partial class DayColumnControl : Control
-{
-    private const string PART_HeaderDateDayText = nameof(PART_HeaderDateDayText);
-    private const string PART_IsTodayBorder = nameof(PART_IsTodayBorder);
-    private const string PART_ColumnHeaderText = nameof(PART_ColumnHeaderText);
-
-    private const string PART_AllDayItemsControl = nameof(PART_AllDayItemsControl);
-
-    private const string TodayState = nameof(TodayState);
-    private const string NotTodayState = nameof(NotTodayState);
-
-    private TextBlock HeaderDateDayText;
-    private TextBlock ColumnHeaderText;
-    private Border IsTodayBorder;
-    private ItemsControl AllDayItemsControl;
-
-    public CalendarDayModel DayModel
-    {
-        get { return (CalendarDayModel)GetValue(DayModelProperty); }
-        set { SetValue(DayModelProperty, value); }
-    }
-
-    public static readonly DependencyProperty DayModelProperty = DependencyProperty.Register(nameof(DayModel), typeof(CalendarDayModel), typeof(DayColumnControl), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-
-    public DayColumnControl()
-    {
-        DefaultStyleKey = typeof(DayColumnControl);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        HeaderDateDayText = GetTemplateChild(PART_HeaderDateDayText) as TextBlock;
-        ColumnHeaderText = GetTemplateChild(PART_ColumnHeaderText) as TextBlock;
-        IsTodayBorder = GetTemplateChild(PART_IsTodayBorder) as Border;
-        AllDayItemsControl = GetTemplateChild(PART_AllDayItemsControl) as ItemsControl;
-
-        UpdateValues();
-    }
-
-    private static void OnRenderingPropertiesChanged(DependencyObject control, DependencyPropertyChangedEventArgs e)
-    {
-        if (control is DayColumnControl columnControl)
-        {
-            columnControl.UpdateValues();
-        }
-    }
-
-    private void UpdateValues()
-    {
-        if (HeaderDateDayText == null || IsTodayBorder == null || DayModel == null) return;
-
-        HeaderDateDayText.Text = DayModel.RepresentingDate.Day.ToString();
-
-        // Monthly template does not use it.
-        if (ColumnHeaderText != null)
-        {
-            ColumnHeaderText.Text = DayModel.RepresentingDate.ToString("dddd", DayModel.CalendarRenderOptions.CalendarSettings.CultureInfo);
-        }
-
-        AllDayItemsControl.ItemsSource = DayModel.EventsCollection.AllDayEvents;
-
-        bool isToday = DayModel.RepresentingDate.Date == DateTime.Now.Date;
-
-        VisualStateManager.GoToState(this, isToday ? TodayState : NotTodayState, false);
-
-        UpdateLayout();
-    }
-}
diff --git a/Wino.Calendar/Controls/DayHeaderControl.cs b/Wino.Calendar/Controls/DayHeaderControl.cs
deleted file mode 100644
index 567cdaef..00000000
--- a/Wino.Calendar/Controls/DayHeaderControl.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Calendar.Controls;
-
-public partial class DayHeaderControl : Control
-{
-    private const string PART_DayHeaderTextBlock = nameof(PART_DayHeaderTextBlock);
-    private TextBlock HeaderTextblock;
-
-    public DayHeaderDisplayType DisplayType
-    {
-        get { return (DayHeaderDisplayType)GetValue(DisplayTypeProperty); }
-        set { SetValue(DisplayTypeProperty, value); }
-    }
-
-    public DateTime Date
-    {
-        get { return (DateTime)GetValue(DateProperty); }
-        set { SetValue(DateProperty, value); }
-    }
-
-    public static readonly DependencyProperty DateProperty = DependencyProperty.Register(nameof(Date), typeof(DateTime), typeof(DayHeaderControl), new PropertyMetadata(default(DateTime), new PropertyChangedCallback(OnHeaderPropertyChanged)));
-    public static readonly DependencyProperty DisplayTypeProperty = DependencyProperty.Register(nameof(DisplayType), typeof(DayHeaderDisplayType), typeof(DayHeaderControl), new PropertyMetadata(DayHeaderDisplayType.TwentyFourHour, new PropertyChangedCallback(OnHeaderPropertyChanged)));
-
-    public DayHeaderControl()
-    {
-        DefaultStyleKey = typeof(DayHeaderControl);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        HeaderTextblock = GetTemplateChild(PART_DayHeaderTextBlock) as TextBlock;
-        UpdateHeaderText();
-    }
-
-    private static void OnHeaderPropertyChanged(DependencyObject control, DependencyPropertyChangedEventArgs e)
-    {
-        if (control is DayHeaderControl headerControl)
-        {
-            headerControl.UpdateHeaderText();
-        }
-    }
-
-    private void UpdateHeaderText()
-    {
-        if (HeaderTextblock != null)
-        {
-            HeaderTextblock.Text = DisplayType == DayHeaderDisplayType.TwelveHour ? Date.ToString("h tt") : Date.ToString("HH:mm");
-        }
-    }
-}
diff --git a/Wino.Calendar/Controls/WinoCalendarControl.cs b/Wino.Calendar/Controls/WinoCalendarControl.cs
deleted file mode 100644
index e2930e6c..00000000
--- a/Wino.Calendar/Controls/WinoCalendarControl.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Calendar.Args;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Calendar;
-using Wino.Helpers;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarControl : Control
-{
-    private const string PART_WinoFlipView = nameof(PART_WinoFlipView);
-    private const string PART_IdleGrid = nameof(PART_IdleGrid);
-
-    public event EventHandler<TimelineCellSelectedArgs> TimelineCellSelected;
-    public event EventHandler<TimelineCellUnselectedArgs> TimelineCellUnselected;
-
-    public event EventHandler ScrollPositionChanging;
-
-    #region Dependency Properties
-
-    public static readonly DependencyProperty DayRangesProperty = DependencyProperty.Register(nameof(DayRanges), typeof(ObservableCollection<DayRangeRenderModel>), typeof(WinoCalendarControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty SelectedFlipViewIndexProperty = DependencyProperty.Register(nameof(SelectedFlipViewIndex), typeof(int), typeof(WinoCalendarControl), new PropertyMetadata(-1));
-    public static readonly DependencyProperty SelectedFlipViewDayRangeProperty = DependencyProperty.Register(nameof(SelectedFlipViewDayRange), typeof(DayRangeRenderModel), typeof(WinoCalendarControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty ActiveCanvasProperty = DependencyProperty.Register(nameof(ActiveCanvas), typeof(WinoDayTimelineCanvas), typeof(WinoCalendarControl), new PropertyMetadata(null, new PropertyChangedCallback(OnActiveCanvasChanged)));
-    public static readonly DependencyProperty IsFlipIdleProperty = DependencyProperty.Register(nameof(IsFlipIdle), typeof(bool), typeof(WinoCalendarControl), new PropertyMetadata(true, new PropertyChangedCallback(OnIdleStateChanged)));
-    public static readonly DependencyProperty ActiveScrollViewerProperty = DependencyProperty.Register(nameof(ActiveScrollViewer), typeof(ScrollViewer), typeof(WinoCalendarControl), new PropertyMetadata(null, new PropertyChangedCallback(OnActiveVerticalScrollViewerChanged)));
-
-    public static readonly DependencyProperty VerticalItemsPanelTemplateProperty = DependencyProperty.Register(nameof(VerticalItemsPanelTemplate), typeof(ItemsPanelTemplate), typeof(WinoCalendarControl), new PropertyMetadata(null, new PropertyChangedCallback(OnCalendarOrientationPropertiesUpdated)));
-    public static readonly DependencyProperty HorizontalItemsPanelTemplateProperty = DependencyProperty.Register(nameof(HorizontalItemsPanelTemplate), typeof(ItemsPanelTemplate), typeof(WinoCalendarControl), new PropertyMetadata(null, new PropertyChangedCallback(OnCalendarOrientationPropertiesUpdated)));
-    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(nameof(Orientation), typeof(CalendarOrientation), typeof(WinoCalendarControl), new PropertyMetadata(CalendarOrientation.Horizontal, new PropertyChangedCallback(OnCalendarOrientationPropertiesUpdated)));
-    public static readonly DependencyProperty DisplayTypeProperty = DependencyProperty.Register(nameof(DisplayType), typeof(CalendarDisplayType), typeof(WinoCalendarControl), new PropertyMetadata(CalendarDisplayType.Day));
-
-    /// <summary>
-    /// Gets or sets the day-week-month-year display type.
-    /// Orientation is not determined by this property, but Orientation property.
-    /// This property is used to determine the template to use for the calendar.
-    /// </summary>
-    public CalendarDisplayType DisplayType
-    {
-        get { return (CalendarDisplayType)GetValue(DisplayTypeProperty); }
-        set { SetValue(DisplayTypeProperty, value); }
-    }
-
-    public CalendarOrientation Orientation
-    {
-        get { return (CalendarOrientation)GetValue(OrientationProperty); }
-        set { SetValue(OrientationProperty, value); }
-    }
-
-    public ItemsPanelTemplate VerticalItemsPanelTemplate
-    {
-        get { return (ItemsPanelTemplate)GetValue(VerticalItemsPanelTemplateProperty); }
-        set { SetValue(VerticalItemsPanelTemplateProperty, value); }
-    }
-
-    public ItemsPanelTemplate HorizontalItemsPanelTemplate
-    {
-        get { return (ItemsPanelTemplate)GetValue(HorizontalItemsPanelTemplateProperty); }
-        set { SetValue(HorizontalItemsPanelTemplateProperty, value); }
-    }
-
-    public DayRangeRenderModel SelectedFlipViewDayRange
-    {
-        get { return (DayRangeRenderModel)GetValue(SelectedFlipViewDayRangeProperty); }
-        set { SetValue(SelectedFlipViewDayRangeProperty, value); }
-    }
-
-    public ScrollViewer ActiveScrollViewer
-    {
-        get { return (ScrollViewer)GetValue(ActiveScrollViewerProperty); }
-        set { SetValue(ActiveScrollViewerProperty, value); }
-    }
-
-    public WinoDayTimelineCanvas ActiveCanvas
-    {
-        get { return (WinoDayTimelineCanvas)GetValue(ActiveCanvasProperty); }
-        set { SetValue(ActiveCanvasProperty, value); }
-    }
-
-    public bool IsFlipIdle
-    {
-        get { return (bool)GetValue(IsFlipIdleProperty); }
-        set { SetValue(IsFlipIdleProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the collection of day ranges to render.
-    /// Each day range usually represents a week, but it may support other ranges.
-    /// </summary>
-    public ObservableCollection<DayRangeRenderModel> DayRanges
-    {
-        get { return (ObservableCollection<DayRangeRenderModel>)GetValue(DayRangesProperty); }
-        set { SetValue(DayRangesProperty, value); }
-    }
-
-    public int SelectedFlipViewIndex
-    {
-        get { return (int)GetValue(SelectedFlipViewIndexProperty); }
-        set { SetValue(SelectedFlipViewIndexProperty, value); }
-    }
-
-    #endregion
-
-    private WinoCalendarFlipView InternalFlipView;
-    private Grid IdleGrid;
-
-    public WinoCalendarControl()
-    {
-        DefaultStyleKey = typeof(WinoCalendarControl);
-        SizeChanged += CalendarSizeChanged;
-    }
-
-    private static void OnCalendarOrientationPropertiesUpdated(DependencyObject calendar, DependencyPropertyChangedEventArgs e)
-    {
-        if (calendar is WinoCalendarControl control)
-        {
-            control.ManageCalendarOrientation();
-        }
-    }
-
-    private static void OnIdleStateChanged(DependencyObject calendar, DependencyPropertyChangedEventArgs e)
-    {
-        if (calendar is WinoCalendarControl calendarControl)
-        {
-            calendarControl.UpdateIdleState();
-        }
-    }
-
-
-    private static void OnActiveVerticalScrollViewerChanged(DependencyObject calendar, DependencyPropertyChangedEventArgs e)
-    {
-        if (calendar is WinoCalendarControl calendarControl)
-        {
-            if (e.OldValue is ScrollViewer oldScrollViewer)
-            {
-                calendarControl.DeregisterScrollChanges(oldScrollViewer);
-            }
-
-            if (e.NewValue is ScrollViewer newScrollViewer)
-            {
-                calendarControl.RegisterScrollChanges(newScrollViewer);
-            }
-
-            calendarControl.ManageHighlightedDateRange();
-        }
-    }
-
-
-    private static void OnActiveCanvasChanged(DependencyObject calendar, DependencyPropertyChangedEventArgs e)
-    {
-        if (calendar is WinoCalendarControl calendarControl)
-        {
-            if (e.OldValue is WinoDayTimelineCanvas oldCanvas)
-            {
-                // Dismiss any selection on the old canvas.
-                calendarControl.DeregisterCanvas(oldCanvas);
-            }
-
-            if (e.NewValue is WinoDayTimelineCanvas newCanvas)
-            {
-                calendarControl.RegisterCanvas(newCanvas);
-            }
-
-            calendarControl.ManageHighlightedDateRange();
-        }
-    }
-
-    private void ManageCalendarOrientation()
-    {
-        if (InternalFlipView == null || HorizontalItemsPanelTemplate == null || VerticalItemsPanelTemplate == null) return;
-
-        InternalFlipView.ItemsPanel = Orientation == CalendarOrientation.Horizontal ? HorizontalItemsPanelTemplate : VerticalItemsPanelTemplate;
-    }
-
-    private void ManageHighlightedDateRange()
-        => SelectedFlipViewDayRange = InternalFlipView.SelectedItem as DayRangeRenderModel;
-
-    private void DeregisterCanvas(WinoDayTimelineCanvas canvas)
-    {
-        if (canvas == null) return;
-
-        canvas.SelectedDateTime = null;
-        canvas.TimelineCellSelected -= ActiveTimelineCellSelected;
-        canvas.TimelineCellUnselected -= ActiveTimelineCellUnselected;
-    }
-
-    private void RegisterCanvas(WinoDayTimelineCanvas canvas)
-    {
-        if (canvas == null) return;
-
-        canvas.SelectedDateTime = null;
-        canvas.TimelineCellSelected += ActiveTimelineCellSelected;
-        canvas.TimelineCellUnselected += ActiveTimelineCellUnselected;
-    }
-
-    private void RegisterScrollChanges(ScrollViewer scrollViewer)
-    {
-        if (scrollViewer == null) return;
-
-        scrollViewer.ViewChanging += ScrollViewChanging;
-    }
-
-    private void DeregisterScrollChanges(ScrollViewer scrollViewer)
-    {
-        if (scrollViewer == null) return;
-
-        scrollViewer.ViewChanging -= ScrollViewChanging;
-    }
-
-    private void ScrollViewChanging(object sender, ScrollViewerViewChangingEventArgs e)
-        => ScrollPositionChanging?.Invoke(this, EventArgs.Empty);
-
-    private void CalendarSizeChanged(object sender, SizeChangedEventArgs e)
-    {
-        if (ActiveCanvas == null) return;
-
-        ActiveCanvas.SelectedDateTime = null;
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        InternalFlipView = GetTemplateChild(PART_WinoFlipView) as WinoCalendarFlipView;
-        IdleGrid = GetTemplateChild(PART_IdleGrid) as Grid;
-
-        UpdateIdleState();
-        ManageCalendarOrientation();
-    }
-
-    private void UpdateIdleState()
-    {
-        InternalFlipView.Opacity = IsFlipIdle ? 0 : 1;
-        IdleGrid.Visibility = IsFlipIdle ? Visibility.Visible : Visibility.Collapsed;
-    }
-
-    private void ActiveTimelineCellUnselected(object sender, TimelineCellUnselectedArgs e)
-        => TimelineCellUnselected?.Invoke(this, e);
-
-    private void ActiveTimelineCellSelected(object sender, TimelineCellSelectedArgs e)
-        => TimelineCellSelected?.Invoke(this, e);
-
-    public void NavigateToDay(DateTime dateTime) => InternalFlipView.NavigateToDay(dateTime);
-
-    public async void NavigateToHour(TimeSpan timeSpan)
-    {
-        if (ActiveScrollViewer == null) return;
-
-        // Total height of the FlipViewItem is the same as vertical ScrollViewer to position day headers.
-
-        await Task.Yield();
-        await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
-        {
-            double hourHeght = 60;
-            double totalHeight = ActiveScrollViewer.ScrollableHeight;
-            double scrollPosition = timeSpan.TotalHours * hourHeght;
-
-            ActiveScrollViewer.ChangeView(null, scrollPosition, null, disableAnimation: false);
-        });
-    }
-    public void ResetTimelineSelection()
-    {
-        if (ActiveCanvas == null) return;
-
-        ActiveCanvas.SelectedDateTime = null;
-    }
-
-    public void GoNextRange()
-    {
-        if (InternalFlipView == null) return;
-
-        InternalFlipView.GoNextFlip();
-    }
-
-    public void GoPreviousRange()
-    {
-        if (InternalFlipView == null) return;
-
-        InternalFlipView.GoPreviousFlip();
-    }
-
-    public void UnselectActiveTimelineCell()
-    {
-        if (ActiveCanvas == null) return;
-
-        ActiveCanvas.SelectedDateTime = null;
-    }
-
-    public CalendarItemControl GetCalendarItemControl(CalendarItemViewModel calendarItemViewModel)
-    {
-        return this.FindDescendants<CalendarItemControl>().FirstOrDefault(a => a.CalendarItem == calendarItemViewModel);
-    }
-}
diff --git a/Wino.Calendar/Controls/WinoCalendarFlipView.cs b/Wino.Calendar/Controls/WinoCalendarFlipView.cs
deleted file mode 100644
index 679490d4..00000000
--- a/Wino.Calendar/Controls/WinoCalendarFlipView.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using System;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.WinUI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Collections;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarFlipView : CustomCalendarFlipView
-{
-    public static readonly DependencyProperty IsIdleProperty = DependencyProperty.Register(nameof(IsIdle), typeof(bool), typeof(WinoCalendarFlipView), new PropertyMetadata(true));
-    public static readonly DependencyProperty ActiveCanvasProperty = DependencyProperty.Register(nameof(ActiveCanvas), typeof(WinoDayTimelineCanvas), typeof(WinoCalendarFlipView), new PropertyMetadata(null));
-    public static readonly DependencyProperty ActiveVerticalScrollViewerProperty = DependencyProperty.Register(nameof(ActiveVerticalScrollViewer), typeof(ScrollViewer), typeof(WinoCalendarFlipView), new PropertyMetadata(null));
-
-    /// <summary>
-    /// Gets or sets the active canvas that is currently displayed in the flip view.
-    /// Each day-range of flip view item has a canvas that displays the day timeline.
-    /// </summary>
-    public WinoDayTimelineCanvas ActiveCanvas
-    {
-        get { return (WinoDayTimelineCanvas)GetValue(ActiveCanvasProperty); }
-        set { SetValue(ActiveCanvasProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the scroll viewer that is currently active in the flip view.
-    /// It's the vertical scroll that scrolls the timeline only, not the header part that belongs
-    /// to parent FlipView control.
-    /// </summary>
-    public ScrollViewer ActiveVerticalScrollViewer
-    {
-        get { return (ScrollViewer)GetValue(ActiveVerticalScrollViewerProperty); }
-        set { SetValue(ActiveVerticalScrollViewerProperty, value); }
-    }
-
-    public bool IsIdle
-    {
-        get { return (bool)GetValue(IsIdleProperty); }
-        set { SetValue(IsIdleProperty, value); }
-    }
-
-    public WinoCalendarFlipView()
-    {
-        RegisterPropertyChangedCallback(SelectedIndexProperty, new DependencyPropertyChangedCallback(OnSelectedIndexUpdated));
-        RegisterPropertyChangedCallback(ItemsSourceProperty, new DependencyPropertyChangedCallback(OnItemsSourceChanged));
-    }
-
-    private static void OnItemsSourceChanged(DependencyObject d, DependencyProperty e)
-    {
-        if (d is WinoCalendarFlipView flipView)
-        {
-            flipView.RegisterItemsSourceChange();
-        }
-    }
-
-    private static void OnSelectedIndexUpdated(DependencyObject d, DependencyProperty e)
-    {
-        if (d is WinoCalendarFlipView flipView)
-        {
-            flipView.UpdateActiveCanvas();
-            flipView.UpdateActiveScrollViewer();
-        }
-    }
-
-    private void RegisterItemsSourceChange()
-    {
-        if (GetItemsSource() is INotifyCollectionChanged notifyCollectionChanged)
-        {
-            notifyCollectionChanged.CollectionChanged += ItemsSourceUpdated;
-        }
-    }
-
-    private void ItemsSourceUpdated(object sender, NotifyCollectionChangedEventArgs e)
-    {
-        IsIdle = e.Action == NotifyCollectionChangedAction.Reset || e.Action == NotifyCollectionChangedAction.Replace;
-    }
-
-    private async Task<FlipViewItem> GetCurrentFlipViewItem()
-    {
-        // TODO: Refactor this mechanism by listening to PrepareContainerForItemOverride and Loaded events together.
-        while (ContainerFromIndex(SelectedIndex) == null)
-        {
-            await Task.Delay(100);
-        }
-
-        return ContainerFromIndex(SelectedIndex) as FlipViewItem;
-
-
-    }
-
-    private void UpdateActiveScrollViewer()
-    {
-        if (SelectedIndex < 0)
-            ActiveVerticalScrollViewer = null;
-        else
-        {
-            GetCurrentFlipViewItem().ContinueWith(task =>
-            {
-                if (task.IsCompletedSuccessfully)
-                {
-                    var flipViewItem = task.Result;
-
-                    _ = Dispatcher.TryRunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-                    {
-                        ActiveVerticalScrollViewer = flipViewItem.FindDescendant<ScrollViewer>();
-                    });
-                }
-            });
-        }
-    }
-
-    public void UpdateActiveCanvas()
-    {
-        if (SelectedIndex < 0)
-            ActiveCanvas = null;
-        else
-        {
-            GetCurrentFlipViewItem().ContinueWith(task =>
-            {
-                if (task.IsCompletedSuccessfully)
-                {
-                    var flipViewItem = task.Result;
-
-                    _ = Dispatcher.TryRunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-                    {
-                        ActiveCanvas = flipViewItem.FindDescendant<WinoDayTimelineCanvas>();
-                    });
-                }
-            });
-        }
-    }
-
-    /// <summary>
-    /// Navigates to the specified date in the calendar.
-    /// </summary>
-    /// <param name="dateTime">Date to navigate.</param>
-    public async void NavigateToDay(DateTime dateTime)
-    {
-        await Task.Yield();
-
-        await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
-        {
-            // Find the day range that contains the date.
-            var dayRange = GetItemsSource()?.FirstOrDefault(a => a.CalendarDays.Any(b => b.RepresentingDate.Date == dateTime.Date));
-
-            if (dayRange != null)
-            {
-                var navigationItemIndex = GetItemsSource().IndexOf(dayRange);
-
-                if (Math.Abs(navigationItemIndex - SelectedIndex) > 4)
-                {
-                    // Difference between dates are high.
-                    // No need to animate this much, just go without animating.
-
-                    SelectedIndex = navigationItemIndex;
-                }
-                else
-                {
-                    // Until we reach the day in the flip, simulate next-prev button clicks.
-                    // This will make sure the FlipView animations are triggered.
-                    // Setting SelectedIndex directly doesn't trigger the animations.
-
-                    while (SelectedIndex != navigationItemIndex)
-                    {
-                        if (SelectedIndex > navigationItemIndex)
-                        {
-                            GoPreviousFlip();
-                        }
-                        else
-                        {
-                            GoNextFlip();
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-    private ObservableRangeCollection<DayRangeRenderModel> GetItemsSource()
-        => ItemsSource as ObservableRangeCollection<DayRangeRenderModel>;
-}
diff --git a/Wino.Calendar/Controls/WinoCalendarPanel.cs b/Wino.Calendar/Controls/WinoCalendarPanel.cs
deleted file mode 100644
index c76801ea..00000000
--- a/Wino.Calendar/Controls/WinoCalendarPanel.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using CommunityToolkit.WinUI;
-using Itenso.TimePeriod;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Calendar.Models;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarPanel : Panel
-{
-    private const double LastItemRightExtraMargin = 12d;
-
-    // Store each ICalendarItem measurements by their Id.
-    private readonly Dictionary<ICalendarItem, CalendarItemMeasurement> _measurements = new Dictionary<ICalendarItem, CalendarItemMeasurement>();
-
-    public static readonly DependencyProperty EventItemMarginProperty = DependencyProperty.Register(nameof(EventItemMargin), typeof(Thickness), typeof(WinoCalendarPanel), new PropertyMetadata(new Thickness(0, 0, 0, 0)));
-    public static readonly DependencyProperty HourHeightProperty = DependencyProperty.Register(nameof(HourHeight), typeof(double), typeof(WinoCalendarPanel), new PropertyMetadata(0d));
-    public static readonly DependencyProperty PeriodProperty = DependencyProperty.Register(nameof(Period), typeof(ITimePeriod), typeof(WinoCalendarPanel), new PropertyMetadata(null));
-
-    public ITimePeriod Period
-    {
-        get { return (ITimePeriod)GetValue(PeriodProperty); }
-        set { SetValue(PeriodProperty, value); }
-    }
-
-    public double HourHeight
-    {
-        get { return (double)GetValue(HourHeightProperty); }
-        set { SetValue(HourHeightProperty, value); }
-    }
-
-    public Thickness EventItemMargin
-    {
-        get { return (Thickness)GetValue(EventItemMarginProperty); }
-        set { SetValue(EventItemMarginProperty, value); }
-    }
-
-    private void ResetMeasurements() => _measurements.Clear();
-
-    private double GetChildTopMargin(ICalendarItem calendarItemViewModel, double availableHeight)
-    {
-        var childStart = calendarItemViewModel.StartDate;
-
-        if (childStart <= Period.Start)
-        {
-            // Event started before or exactly at the periods tart. This might be a multi-day event.
-            // We can simply consider event must not have a top margin.
-
-            return 0d;
-        }
-
-        double minutesFromStart = (childStart - Period.Start).TotalMinutes;
-        return (minutesFromStart / 1440) * availableHeight;
-    }
-
-    private double GetChildWidth(CalendarItemMeasurement calendarItemMeasurement, double availableWidth)
-    {
-        return (calendarItemMeasurement.Right - calendarItemMeasurement.Left) * availableWidth;
-    }
-
-    private double GetChildLeftMargin(CalendarItemMeasurement calendarItemMeasurement, double availableWidth)
-        => availableWidth * calendarItemMeasurement.Left;
-
-    private double GetChildHeight(ICalendarItem child)
-    {
-        // All day events are not measured.
-        if (child.IsAllDayEvent) return 0;
-
-        double childDurationInMinutes = 0d;
-        double availableHeight = HourHeight * 24;
-
-        var periodRelation = child.Period.GetRelation(Period);
-
-        // Debug.WriteLine($"Render relation of {child.Title} ({child.Period.Start} - {child.Period.End}) is {periodRelation} with {Period.Start.Day}");
-
-        if (!child.IsMultiDayEvent)
-        {
-            childDurationInMinutes = child.Period.Duration.TotalMinutes;
-        }
-        else
-        {
-            // Multi-day event.
-            // Check how many of the event falls into the current period.
-            childDurationInMinutes = (child.Period.End - Period.Start).TotalMinutes;
-        }
-
-        return (childDurationInMinutes / 1440) * availableHeight;
-    }
-
-    protected override Size MeasureOverride(Size availableSize)
-    {
-        ResetMeasurements();
-        return base.MeasureOverride(availableSize);
-    }
-
-    protected override Size ArrangeOverride(Size finalSize)
-    {
-        if (Period == null || HourHeight == 0d) return finalSize;
-
-        // Measure/arrange each child height and width.
-        // This is a vertical calendar. Therefore the height of each child is the duration of the event.
-        // Children weights for left and right will be saved if they don't exist.
-        // This is important because we don't want to measure the weights again.
-        // They don't change until new event is added or removed.
-        // Width of the each child may depend on the rectangle packing algorithm.
-        // Children are first categorized into columns. Then each column is shifted to the left until
-        // no overlap occurs. The width of each child is calculated based on the number of columns it spans.
-
-        double availableHeight = finalSize.Height;
-        double availableWidth = finalSize.Width;
-
-        var calendarControls = Children.Cast<ContentPresenter>();
-
-        if (!calendarControls.Any()) return base.ArrangeOverride(finalSize);
-
-        var events = calendarControls.Select(a => a.Content as CalendarItemViewModel);
-
-        LayoutEvents(events);
-
-        foreach (var control in calendarControls)
-        {
-            // We can't arrange this child.
-            if (!(control.Content is ICalendarItem child)) continue;
-
-            bool isHorizontallyLastItem = false;
-
-            double childWidth = 0,
-                childHeight = Math.Max(0, GetChildHeight(child)),
-                childTop = Math.Max(0, GetChildTopMargin(child, availableHeight)),
-                childLeft = 0;
-
-            // No need to measure anything here.
-            if (childHeight == 0) continue;
-
-            if (!_measurements.ContainsKey(child))
-            {
-                // Multi-day event.
-
-                childLeft = 0;
-                childWidth = availableWidth;
-            }
-            else
-            {
-                var childMeasurement = _measurements[child];
-
-                childWidth = Math.Max(0, GetChildWidth(childMeasurement, finalSize.Width));
-                childLeft = Math.Max(0, GetChildLeftMargin(childMeasurement, availableWidth));
-
-                isHorizontallyLastItem = childMeasurement.Right == 1;
-            }
-
-            // Add additional right margin to items that falls on the right edge of the panel.
-            double extraRightMargin = 0;
-
-            // Multi-day events don't have any margin and their hit test is disabled.
-            if (!child.IsMultiDayEvent)
-            {
-                // Max of 5% of the width or 20px max.
-                extraRightMargin = isHorizontallyLastItem ? Math.Max(LastItemRightExtraMargin, finalSize.Width * 5 / 100) : 0;
-            }
-
-            if (childWidth < 0) childWidth = 1;
-
-            // Regular events must have 2px margin
-            if (!child.IsMultiDayEvent && !child.IsAllDayEvent)
-            {
-                childLeft += 2;
-                childTop += 2;
-                childHeight -= 2;
-                childWidth -= 2;
-            }
-
-            var arrangementRect = new Rect(childLeft + EventItemMargin.Left, childTop + EventItemMargin.Top, Math.Max(childWidth - extraRightMargin, 1), childHeight);
-
-            // Make sure measured size will fit in the arranged box.
-            var measureSize = arrangementRect.ToSize();
-            control.Measure(measureSize);
-            control.Arrange(arrangementRect);
-
-            //Debug.WriteLine($"{child.Title}, Measured: {measureSize}, Arranged: {arrangementRect}");
-        }
-
-
-        return finalSize;
-    }
-
-    #region ColumSpanning and Packing Algorithm
-
-    private void AddOrUpdateMeasurement(ICalendarItem calendarItem, CalendarItemMeasurement measurement)
-    {
-        if (_measurements.ContainsKey(calendarItem))
-        {
-            _measurements[calendarItem] = measurement;
-        }
-        else
-        {
-            _measurements.Add(calendarItem, measurement);
-        }
-    }
-
-    // Pick the left and right positions of each event, such that there are no overlap.
-    private void LayoutEvents(IEnumerable<ICalendarItem> events)
-    {
-        var columns = new List<List<ICalendarItem>>();
-        DateTime? lastEventEnding = null;
-
-        foreach (var ev in events.OrderBy(ev => ev.StartDate).ThenBy(ev => ev.EndDate))
-        {
-            // Multi-day events are not measured.
-            if (ev.IsMultiDayEvent) continue;
-
-            if (ev.Period.Start >= lastEventEnding)
-            {
-                PackEvents(columns);
-                columns.Clear();
-                lastEventEnding = null;
-            }
-
-            bool placed = false;
-
-            foreach (var col in columns)
-            {
-                if (!col.Last().Period.OverlapsWith(ev.Period))
-                {
-                    col.Add(ev);
-                    placed = true;
-                    break;
-                }
-            }
-            if (!placed)
-            {
-                columns.Add(new List<ICalendarItem> { ev });
-            }
-            if (lastEventEnding == null || ev.Period.End > lastEventEnding.Value)
-            {
-                lastEventEnding = ev.Period.End;
-            }
-        }
-        if (columns.Count > 0)
-        {
-            PackEvents(columns);
-        }
-    }
-
-    // Set the left and right positions for each event in the connected group.
-    private void PackEvents(List<List<ICalendarItem>> columns)
-    {
-        float numColumns = columns.Count;
-        int iColumn = 0;
-
-        foreach (var col in columns)
-        {
-            foreach (var ev in col)
-            {
-                int colSpan = ExpandEvent(ev, iColumn, columns);
-
-                var leftWeight = iColumn / numColumns;
-                var rightWeight = (iColumn + colSpan) / numColumns;
-
-                AddOrUpdateMeasurement(ev, new CalendarItemMeasurement(leftWeight, rightWeight));
-            }
-
-            iColumn++;
-        }
-    }
-
-    // Checks how many columns the event can expand into, without colliding with other events.
-    private int ExpandEvent(ICalendarItem ev, int iColumn, List<List<ICalendarItem>> columns)
-    {
-        int colSpan = 1;
-
-        foreach (var col in columns.Skip(iColumn + 1))
-        {
-            foreach (var ev1 in col)
-            {
-                if (ev1.Period.OverlapsWith(ev.Period)) return colSpan;
-            }
-
-            colSpan++;
-        }
-
-        return colSpan;
-    }
-
-    #endregion
-}
diff --git a/Wino.Calendar/Controls/WinoCalendarTypeSelectorControl.cs b/Wino.Calendar/Controls/WinoCalendarTypeSelectorControl.cs
deleted file mode 100644
index 899e32da..00000000
--- a/Wino.Calendar/Controls/WinoCalendarTypeSelectorControl.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.Windows.Input;
-using CommunityToolkit.Diagnostics;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarTypeSelectorControl : Control
-{
-    private const string PART_TodayButton = nameof(PART_TodayButton);
-    private const string PART_DayToggle = nameof(PART_DayToggle);
-    private const string PART_WeekToggle = nameof(PART_WeekToggle);
-    private const string PART_MonthToggle = nameof(PART_MonthToggle);
-    private const string PART_YearToggle = nameof(PART_YearToggle);
-
-    public static readonly DependencyProperty SelectedTypeProperty = DependencyProperty.Register(nameof(SelectedType), typeof(CalendarDisplayType), typeof(WinoCalendarTypeSelectorControl), new PropertyMetadata(CalendarDisplayType.Week));
-    public static readonly DependencyProperty DisplayDayCountProperty = DependencyProperty.Register(nameof(DisplayDayCount), typeof(int), typeof(WinoCalendarTypeSelectorControl), new PropertyMetadata(0));
-    public static readonly DependencyProperty TodayClickedCommandProperty = DependencyProperty.Register(nameof(TodayClickedCommand), typeof(ICommand), typeof(WinoCalendarTypeSelectorControl), new PropertyMetadata(null));
-
-    public ICommand TodayClickedCommand
-    {
-        get { return (ICommand)GetValue(TodayClickedCommandProperty); }
-        set { SetValue(TodayClickedCommandProperty, value); }
-    }
-
-    public CalendarDisplayType SelectedType
-    {
-        get { return (CalendarDisplayType)GetValue(SelectedTypeProperty); }
-        set { SetValue(SelectedTypeProperty, value); }
-    }
-
-    public int DisplayDayCount
-    {
-        get { return (int)GetValue(DisplayDayCountProperty); }
-        set { SetValue(DisplayDayCountProperty, value); }
-    }
-
-    private AppBarButton _todayButton;
-    private AppBarToggleButton _dayToggle;
-    private AppBarToggleButton _weekToggle;
-    private AppBarToggleButton _monthToggle;
-    private AppBarToggleButton _yearToggle;
-
-    public WinoCalendarTypeSelectorControl()
-    {
-        DefaultStyleKey = typeof(WinoCalendarTypeSelectorControl);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        _todayButton = GetTemplateChild(PART_TodayButton) as AppBarButton;
-        _dayToggle = GetTemplateChild(PART_DayToggle) as AppBarToggleButton;
-        _weekToggle = GetTemplateChild(PART_WeekToggle) as AppBarToggleButton;
-        _monthToggle = GetTemplateChild(PART_MonthToggle) as AppBarToggleButton;
-        _yearToggle = GetTemplateChild(PART_YearToggle) as AppBarToggleButton;
-
-        Guard.IsNotNull(_todayButton, nameof(_todayButton));
-        Guard.IsNotNull(_dayToggle, nameof(_dayToggle));
-        Guard.IsNotNull(_weekToggle, nameof(_weekToggle));
-        Guard.IsNotNull(_monthToggle, nameof(_monthToggle));
-        Guard.IsNotNull(_yearToggle, nameof(_yearToggle));
-
-        _todayButton.Click += TodayClicked;
-
-        _dayToggle.Click += (s, e) => { SetSelectedType(CalendarDisplayType.Day); };
-        _weekToggle.Click += (s, e) => { SetSelectedType(CalendarDisplayType.Week); };
-        _monthToggle.Click += (s, e) => { SetSelectedType(CalendarDisplayType.Month); };
-        _yearToggle.Click += (s, e) => { SetSelectedType(CalendarDisplayType.Year); };
-
-        UpdateToggleButtonStates();
-    }
-
-    private void TodayClicked(object sender, RoutedEventArgs e) => TodayClickedCommand?.Execute(null);
-
-    private void SetSelectedType(CalendarDisplayType type)
-    {
-        SelectedType = type;
-        UpdateToggleButtonStates();
-    }
-
-    private void UpdateToggleButtonStates()
-    {
-        _dayToggle.IsChecked = SelectedType == CalendarDisplayType.Day;
-        _weekToggle.IsChecked = SelectedType == CalendarDisplayType.Week;
-        _monthToggle.IsChecked = SelectedType == CalendarDisplayType.Month;
-        _yearToggle.IsChecked = SelectedType == CalendarDisplayType.Year;
-    }
-}
diff --git a/Wino.Calendar/Controls/WinoCalendarView.cs b/Wino.Calendar/Controls/WinoCalendarView.cs
deleted file mode 100644
index 6048d03c..00000000
--- a/Wino.Calendar/Controls/WinoCalendarView.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Windows.Input;
-using CommunityToolkit.Diagnostics;
-using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Wino.Core.Domain.Models.Calendar;
-using Wino.Helpers;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoCalendarView : Control
-{
-    private const string PART_DayViewItemBorder = nameof(PART_DayViewItemBorder);
-    private const string PART_CalendarView = nameof(PART_CalendarView);
-
-    public static readonly DependencyProperty HighlightedDateRangeProperty = DependencyProperty.Register(nameof(HighlightedDateRange), typeof(DateRange), typeof(WinoCalendarView), new PropertyMetadata(null, new PropertyChangedCallback(OnHighlightedDateRangeChanged)));
-    public static readonly DependencyProperty VisibleDateBackgroundProperty = DependencyProperty.Register(nameof(VisibleDateBackground), typeof(Brush), typeof(WinoCalendarView), new PropertyMetadata(null, new PropertyChangedCallback(OnPropertiesChanged)));
-    public static readonly DependencyProperty DateClickedCommandProperty = DependencyProperty.Register(nameof(DateClickedCommand), typeof(ICommand), typeof(WinoCalendarView), new PropertyMetadata(null));
-    public static readonly DependencyProperty TodayBackgroundColorProperty = DependencyProperty.Register(nameof(TodayBackgroundColor), typeof(Color), typeof(WinoCalendarView), new PropertyMetadata(null));
-
-    public Color TodayBackgroundColor
-    {
-        get { return (Color)GetValue(TodayBackgroundColorProperty); }
-        set { SetValue(TodayBackgroundColorProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the command to execute when a date is picked.
-    /// Unused.
-    /// </summary>
-    public ICommand DateClickedCommand
-    {
-        get { return (ICommand)GetValue(DateClickedCommandProperty); }
-        set { SetValue(DateClickedCommandProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets the highlighted range of dates.
-    /// </summary>
-    public DateRange HighlightedDateRange
-    {
-        get { return (DateRange)GetValue(HighlightedDateRangeProperty); }
-        set { SetValue(HighlightedDateRangeProperty, value); }
-    }
-
-    public Brush VisibleDateBackground
-    {
-        get { return (Brush)GetValue(VisibleDateBackgroundProperty); }
-        set { SetValue(VisibleDateBackgroundProperty, value); }
-    }
-
-
-
-    private CalendarView CalendarView;
-
-    public WinoCalendarView()
-    {
-        DefaultStyleKey = typeof(WinoCalendarView);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        CalendarView = GetTemplateChild(PART_CalendarView) as CalendarView;
-
-        Guard.IsNotNull(CalendarView, nameof(CalendarView));
-
-        CalendarView.SelectedDatesChanged -= InternalCalendarViewSelectionChanged;
-        CalendarView.SelectedDatesChanged += InternalCalendarViewSelectionChanged;
-
-        // TODO: Should come from settings.
-        CalendarView.FirstDayOfWeek = Windows.Globalization.DayOfWeek.Monday;
-
-        // Everytime display mode changes, update the visible date range backgrounds.
-        // If users go back from year -> month -> day, we need to update the visible date range backgrounds.
-
-        CalendarView.RegisterPropertyChangedCallback(CalendarView.DisplayModeProperty, (s, e) => UpdateVisibleDateRangeBackgrounds());
-    }
-
-    private void InternalCalendarViewSelectionChanged(CalendarView sender, CalendarViewSelectedDatesChangedEventArgs args)
-    {
-        if (args.AddedDates?.Count > 0)
-        {
-            var clickedDate = args.AddedDates[0].Date;
-            SetInnerDisplayDate(clickedDate);
-
-            var clickArgs = new CalendarViewDayClickedEventArgs(clickedDate);
-            DateClickedCommand?.Execute(clickArgs);
-        }
-
-        // Reset selection, we don't show selected dates but react to them.
-        CalendarView.SelectedDates.Clear();
-    }
-
-    private static void OnPropertiesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is WinoCalendarView control)
-        {
-            control.UpdateVisibleDateRangeBackgrounds();
-        }
-    }
-
-    private void SetInnerDisplayDate(DateTime dateTime) => CalendarView?.SetDisplayDate(dateTime);
-
-    // Changing selected dates will trigger the selection changed event.
-    // It will behave like user clicked the date.
-    public void GoToDay(DateTime dateTime) => CalendarView.SelectedDates.Add(dateTime);
-
-    private static void OnHighlightedDateRangeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is WinoCalendarView control)
-        {
-            control.SetInnerDisplayDate(control.HighlightedDateRange.StartDate);
-            control.UpdateVisibleDateRangeBackgrounds();
-        }
-    }
-
-    public void UpdateVisibleDateRangeBackgrounds()
-    {
-        if (HighlightedDateRange == null || VisibleDateBackground == null || TodayBackgroundColor == null || CalendarView == null) return;
-
-        var markDateCalendarDayItems = WinoVisualTreeHelper.FindDescendants<CalendarViewDayItem>(CalendarView);
-
-        foreach (var calendarDayItem in markDateCalendarDayItems)
-        {
-            var border = WinoVisualTreeHelper.GetChildObject<Border>(calendarDayItem, PART_DayViewItemBorder);
-
-            if (border == null) return;
-
-            if (calendarDayItem.Date.Date == DateTime.Today.Date)
-            {
-                border.Background = new SolidColorBrush(TodayBackgroundColor);
-            }
-            else if (calendarDayItem.Date.Date >= HighlightedDateRange.StartDate.Date && calendarDayItem.Date.Date < HighlightedDateRange.EndDate.Date)
-            {
-                border.Background = VisibleDateBackground;
-            }
-            else
-            {
-                border.Background = null;
-            }
-        }
-    }
-}
diff --git a/Wino.Calendar/Controls/WinoDayTimelineCanvas.cs b/Wino.Calendar/Controls/WinoDayTimelineCanvas.cs
deleted file mode 100644
index 66b3bdd8..00000000
--- a/Wino.Calendar/Controls/WinoDayTimelineCanvas.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-using System;
-using System.Diagnostics;
-using Microsoft.Graphics.Canvas.Geometry;
-using Microsoft.Graphics.Canvas.UI.Xaml;
-using Windows.Foundation;
-using Windows.UI.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Wino.Calendar.Args;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls;
-
-public partial class WinoDayTimelineCanvas : Control, IDisposable
-{
-    public event EventHandler<TimelineCellSelectedArgs> TimelineCellSelected;
-    public event EventHandler<TimelineCellUnselectedArgs> TimelineCellUnselected;
-
-    private const string PART_InternalCanvas = nameof(PART_InternalCanvas);
-    private CanvasControl Canvas;
-
-    public static readonly DependencyProperty RenderOptionsProperty = DependencyProperty.Register(nameof(RenderOptions), typeof(CalendarRenderOptions), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-    public static readonly DependencyProperty SeperatorColorProperty = DependencyProperty.Register(nameof(SeperatorColor), typeof(SolidColorBrush), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-    public static readonly DependencyProperty HalfHourSeperatorColorProperty = DependencyProperty.Register(nameof(HalfHourSeperatorColor), typeof(SolidColorBrush), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-    public static readonly DependencyProperty SelectedCellBackgroundBrushProperty = DependencyProperty.Register(nameof(SelectedCellBackgroundBrush), typeof(SolidColorBrush), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-    public static readonly DependencyProperty WorkingHourCellBackgroundColorProperty = DependencyProperty.Register(nameof(WorkingHourCellBackgroundColor), typeof(SolidColorBrush), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-    public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(nameof(SelectedDateTime), typeof(DateTime?), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedDateTimeChanged)));
-    public static readonly DependencyProperty PositionerUIElementProperty = DependencyProperty.Register(nameof(PositionerUIElement), typeof(UIElement), typeof(WinoDayTimelineCanvas), new PropertyMetadata(null));
-
-    public UIElement PositionerUIElement
-    {
-        get { return (UIElement)GetValue(PositionerUIElementProperty); }
-        set { SetValue(PositionerUIElementProperty, value); }
-    }
-
-    public CalendarRenderOptions RenderOptions
-    {
-        get { return (CalendarRenderOptions)GetValue(RenderOptionsProperty); }
-        set { SetValue(RenderOptionsProperty, value); }
-    }
-
-    public SolidColorBrush HalfHourSeperatorColor
-    {
-        get { return (SolidColorBrush)GetValue(HalfHourSeperatorColorProperty); }
-        set { SetValue(HalfHourSeperatorColorProperty, value); }
-    }
-
-    public SolidColorBrush SeperatorColor
-    {
-        get { return (SolidColorBrush)GetValue(SeperatorColorProperty); }
-        set { SetValue(SeperatorColorProperty, value); }
-    }
-
-    public SolidColorBrush WorkingHourCellBackgroundColor
-    {
-        get { return (SolidColorBrush)GetValue(WorkingHourCellBackgroundColorProperty); }
-        set { SetValue(WorkingHourCellBackgroundColorProperty, value); }
-    }
-
-    public SolidColorBrush SelectedCellBackgroundBrush
-    {
-        get { return (SolidColorBrush)GetValue(SelectedCellBackgroundBrushProperty); }
-        set { SetValue(SelectedCellBackgroundBrushProperty, value); }
-    }
-
-    public DateTime? SelectedDateTime
-    {
-        get { return (DateTime?)GetValue(SelectedDateTimeProperty); }
-        set { SetValue(SelectedDateTimeProperty, value); }
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        Canvas = GetTemplateChild(PART_InternalCanvas) as CanvasControl;
-
-        // TODO: These will leak. Dispose them properly when needed.
-        Canvas.Draw += OnCanvasDraw;
-        Canvas.PointerPressed += OnCanvasPointerPressed;
-
-        ForceDraw();
-    }
-
-    private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is WinoDayTimelineCanvas control)
-        {
-            if (e.OldValue != null && e.NewValue == null)
-            {
-                control.RaiseCellUnselected();
-            }
-
-            control.ForceDraw();
-        }
-    }
-
-    private void RaiseCellUnselected()
-    {
-        TimelineCellUnselected?.Invoke(this, new TimelineCellUnselectedArgs());
-    }
-
-    private void OnCanvasPointerPressed(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        if (RenderOptions == null) return;
-
-        var hourHeight = RenderOptions.CalendarSettings.HourHeight;
-
-        // When users click to cell we need to find the day, hour and minutes (first 30 minutes or second 30 minutes) that it represents on the timeline.
-
-        PointerPoint positionerRootPoint = e.GetCurrentPoint(PositionerUIElement);
-        PointerPoint canvasPointerPoint = e.GetCurrentPoint(Canvas);
-
-        Point touchPoint = canvasPointerPoint.Position;
-
-        var singleDayWidth = (Canvas.ActualWidth / RenderOptions.TotalDayCount);
-
-        int day = (int)(touchPoint.X / singleDayWidth);
-        int hour = (int)(touchPoint.Y / hourHeight);
-
-        bool isSecondHalf = touchPoint.Y % hourHeight > (hourHeight / 2);
-
-        var diffX = positionerRootPoint.Position.X - touchPoint.X;
-        var diffY = positionerRootPoint.Position.Y - touchPoint.Y;
-
-        var cellStartRelativePositionX = diffX + (day * singleDayWidth);
-        var cellEndRelativePositionX = cellStartRelativePositionX + singleDayWidth;
-
-        var cellStartRelativePositionY = diffY + (hour * hourHeight) + (isSecondHalf ? hourHeight / 2 : 0);
-        var cellEndRelativePositionY = cellStartRelativePositionY + (isSecondHalf ? (hourHeight / 2) : hourHeight);
-
-        var cellSize = new Size(cellEndRelativePositionX - cellStartRelativePositionX, hourHeight / 2);
-        var positionerPoint = new Point(cellStartRelativePositionX, cellStartRelativePositionY);
-
-        var clickedDateTime = RenderOptions.DateRange.StartDate.AddDays(day).AddHours(hour).AddMinutes(isSecondHalf ? 30 : 0);
-
-        // If there is already a selected date, in order to mimic the popup behavior, we need to dismiss the previous selection first.
-        // Next click will be a new selection.
-
-        // Raise the events directly here instead of DP to not lose pointer position.
-        if (clickedDateTime == SelectedDateTime || SelectedDateTime != null)
-        {
-            SelectedDateTime = null;
-        }
-        else
-        {
-            SelectedDateTime = clickedDateTime;
-            TimelineCellSelected?.Invoke(this, new TimelineCellSelectedArgs(clickedDateTime, touchPoint, positionerPoint, cellSize));
-        }
-
-        Debug.WriteLine($"Clicked: {clickedDateTime}");
-    }
-
-    public WinoDayTimelineCanvas()
-    {
-        DefaultStyleKey = typeof(WinoDayTimelineCanvas);
-    }
-
-    private static void OnRenderingPropertiesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        if (d is WinoDayTimelineCanvas control)
-        {
-            control.ForceDraw();
-        }
-    }
-
-    private void ForceDraw() => Canvas?.Invalidate();
-
-    private bool CanDrawTimeline()
-    {
-        return RenderOptions != null
-            && Canvas != null
-            && Canvas.ReadyToDraw
-            && WorkingHourCellBackgroundColor != null
-            && SeperatorColor != null
-            && HalfHourSeperatorColor != null
-            && SelectedCellBackgroundBrush != null;
-    }
-
-    private void OnCanvasDraw(CanvasControl sender, CanvasDrawEventArgs args)
-    {
-        if (!CanDrawTimeline()) return;
-
-        int hours = 24;
-
-        double canvasWidth = Canvas.ActualWidth;
-        double canvasHeight = Canvas.ActualHeight;
-
-        if (canvasWidth == 0 || canvasHeight == 0) return;
-
-        // Calculate the width of each rectangle (1 day column)
-        // Equal distribution of the whole width.
-        double rectWidth = canvasWidth / RenderOptions.TotalDayCount;
-
-        // Calculate the height of each rectangle (1 hour row)
-        double rectHeight = RenderOptions.CalendarSettings.HourHeight;
-
-        // Define stroke and fill colors
-        var strokeColor = SeperatorColor.Color;
-        float strokeThickness = 0.5f;
-
-        for (int day = 0; day < RenderOptions.TotalDayCount; day++)
-        {
-            var currentDay = RenderOptions.DateRange.StartDate.AddDays(day);
-
-            bool isWorkingDay = RenderOptions.CalendarSettings.WorkingDays.Contains(currentDay.DayOfWeek);
-
-            // Loop through each hour (rows)
-            for (int hour = 0; hour < hours; hour++)
-            {
-                var renderTime = TimeSpan.FromHours(hour);
-
-                var representingDateTime = currentDay.AddHours(hour);
-
-                // Calculate the position and size of the rectangle
-                double x = day * rectWidth;
-                double y = hour * rectHeight;
-
-                var rectangle = new Rect(x, y, rectWidth, rectHeight);
-
-                // Draw the rectangle border.
-                // This is the main rectangle.
-                args.DrawingSession.DrawRectangle(rectangle, strokeColor, strokeThickness);
-
-                // Fill another rectangle with the working hour background color
-                // This rectangle must be placed with -1 margin to prevent invisible borders of the main rectangle.
-                if (isWorkingDay && renderTime >= RenderOptions.CalendarSettings.WorkingHourStart && renderTime <= RenderOptions.CalendarSettings.WorkingHourEnd)
-                {
-                    var backgroundRectangle = new Rect(x + 1, y + 1, rectWidth - 1, rectHeight - 1);
-
-                    args.DrawingSession.DrawRectangle(backgroundRectangle, strokeColor, strokeThickness);
-                    args.DrawingSession.FillRectangle(backgroundRectangle, WorkingHourCellBackgroundColor.Color);
-                }
-
-                // Draw a line in the center of the rectangle for representing half hours.
-                double lineY = y + rectHeight / 2;
-
-                args.DrawingSession.DrawLine((float)x, (float)lineY, (float)(x + rectWidth), (float)lineY, HalfHourSeperatorColor.Color, strokeThickness, new CanvasStrokeStyle()
-                {
-                    DashStyle = CanvasDashStyle.Dot
-                });
-            }
-
-            // Draw selected item background color for the date if possible.
-            if (SelectedDateTime != null)
-            {
-                var selectedDateTime = SelectedDateTime.Value;
-                if (selectedDateTime.Date == currentDay.Date)
-                {
-                    var selectionRectHeight = rectHeight / 2;
-                    var selectedY = selectedDateTime.Hour * rectHeight + (selectedDateTime.Minute / 60) * rectHeight;
-
-                    // Second half of the hour is selected.
-                    if (selectedDateTime.TimeOfDay.Minutes == 30)
-                    {
-                        selectedY += rectHeight / 2;
-                    }
-
-                    var selectedRectangle = new Rect(day * rectWidth, selectedY, rectWidth, selectionRectHeight);
-                    args.DrawingSession.FillRectangle(selectedRectangle, SelectedCellBackgroundBrush.Color);
-                }
-            }
-        }
-    }
-
-    public void Dispose()
-    {
-        if (Canvas == null) return;
-
-        Canvas.Draw -= OnCanvasDraw;
-        Canvas.PointerPressed -= OnCanvasPointerPressed;
-        Canvas.RemoveFromVisualTree();
-
-        Canvas = null;
-    }
-}
diff --git a/Wino.Calendar/MainPage.xaml.cs b/Wino.Calendar/MainPage.xaml.cs
deleted file mode 100644
index 7fb5bdf3..00000000
--- a/Wino.Calendar/MainPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-namespace Wino.Calendar;
-
-/// <summary>
-/// An empty page that can be used on its own or navigated to within a Frame.
-/// </summary>
-public sealed partial class MainPage : Page
-{
-    public MainPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Package.appxmanifest b/Wino.Calendar/Package.appxmanifest
deleted file mode 100644
index 7d96dede..00000000
--- a/Wino.Calendar/Package.appxmanifest
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="58272BurakKSE.WinoCalendar"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-    Version="1.0.15.0" />
-
-	<!-- Publisher Cache Folders -->
-	<Extensions>
-		<Extension Category="windows.publisherCacheFolders">
-			<PublisherCacheFolders>
-				<Folder Name="WinoShared" />
-			</PublisherCacheFolders>
-		</Extension>
-	</Extensions>
-
-	<mp:PhoneIdentity PhoneProductId="f047b7dd-96ec-4d54-a862-9321e271e449" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>Wino Calendar</DisplayName>
-    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="Wino.Calendar.App">
-      <uap:VisualElements
-        DisplayName="Wino Calendar"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="Wino.Calendar"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-
-		<Extensions>
-			<!-- Protocol activation: Google oAuth -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="google.pw.oauth2">
-					<uap:DisplayName>Google Auth Protocol</uap:DisplayName>
-				</uap:Protocol>
-			</uap:Extension>
-
-			<uap5:Extension Category="windows.startupTask">
-				<uap5:StartupTask
-					TaskId="WinoStartupId"
-					Enabled="false"
-					DisplayName="Wino Startup Service" />
-			</uap5:Extension>
-		</Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-	  <Capability Name="internetClient" />
-	  <Capability Name="privateNetworkClientServer"/>
-	  <Capability Name="internetClientServer"/>
-  </Capabilities>
-</Package>
diff --git a/Wino.Calendar/Properties/launchSettings.json b/Wino.Calendar/Properties/launchSettings.json
deleted file mode 100644
index 0f9c975c..00000000
--- a/Wino.Calendar/Properties/launchSettings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "profiles": {
-        "Wino.Calendar": {
-            "commandName": "MsixPackage"
-        }
-    }
-}
diff --git a/Wino.Calendar/Services/AccountCalendarStateService.cs b/Wino.Calendar/Services/AccountCalendarStateService.cs
deleted file mode 100644
index cf58b2f3..00000000
--- a/Wino.Calendar/Services/AccountCalendarStateService.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Calendar.Services;
-
-/// <summary>
-/// Encapsulated state manager for collectively managing the state of account calendars.
-/// Callers must react to the events to update their state only from this service.
-/// </summary>
-public partial class AccountCalendarStateService : ObservableObject, IAccountCalendarStateService
-{
-    public event EventHandler<GroupedAccountCalendarViewModel> CollectiveAccountGroupSelectionStateChanged;
-    public event EventHandler<AccountCalendarViewModel> AccountCalendarSelectionStateChanged;
-
-    [ObservableProperty]
-    public partial ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; set; }
-
-    private ObservableCollection<GroupedAccountCalendarViewModel> _internalGroupedAccountCalendars = new ObservableCollection<GroupedAccountCalendarViewModel>();
-
-    public IEnumerable<AccountCalendarViewModel> ActiveCalendars
-    {
-        get
-        {
-            return GroupedAccountCalendars
-            .SelectMany(a => a.AccountCalendars)
-            .Where(b => b.IsChecked);
-        }
-    }
-
-    public IEnumerable<IGrouping<MailAccount, AccountCalendarViewModel>> GroupedAccountCalendarsEnumerable
-    {
-        get
-        {
-            return GroupedAccountCalendars
-            .Select(a => a.AccountCalendars)
-            .SelectMany(b => b)
-            .GroupBy(c => c.Account);
-        }
-    }
-
-    public AccountCalendarStateService()
-    {
-        GroupedAccountCalendars = new ReadOnlyObservableCollection<GroupedAccountCalendarViewModel>(_internalGroupedAccountCalendars);
-    }
-
-    private void SingleGroupCalendarCollectiveStateChanged(object sender, EventArgs e)
-        => CollectiveAccountGroupSelectionStateChanged?.Invoke(this, sender as GroupedAccountCalendarViewModel);
-
-    private void SingleCalendarSelectionStateChanged(object sender, AccountCalendarViewModel e)
-        => AccountCalendarSelectionStateChanged?.Invoke(this, e);
-
-    public void AddGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar)
-    {
-        groupedAccountCalendar.CalendarSelectionStateChanged += SingleCalendarSelectionStateChanged;
-        groupedAccountCalendar.CollectiveSelectionStateChanged += SingleGroupCalendarCollectiveStateChanged;
-
-        _internalGroupedAccountCalendars.Add(groupedAccountCalendar);
-    }
-
-    public void RemoveGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar)
-    {
-        groupedAccountCalendar.CalendarSelectionStateChanged -= SingleCalendarSelectionStateChanged;
-        groupedAccountCalendar.CollectiveSelectionStateChanged -= SingleGroupCalendarCollectiveStateChanged;
-
-        _internalGroupedAccountCalendars.Remove(groupedAccountCalendar);
-    }
-
-    public void ClearGroupedAccountCalendar()
-    {
-        foreach (var groupedAccountCalendar in _internalGroupedAccountCalendars)
-        {
-            RemoveGroupedAccountCalendar(groupedAccountCalendar);
-        }
-    }
-
-    public void AddAccountCalendar(AccountCalendarViewModel accountCalendar)
-    {
-        // Find the group that this calendar belongs to.
-        var group = _internalGroupedAccountCalendars.FirstOrDefault(g => g.Account.Id == accountCalendar.Account.Id);
-
-        if (group == null)
-        {
-            // If the group doesn't exist, create it.
-            group = new GroupedAccountCalendarViewModel(accountCalendar.Account, new[] { accountCalendar });
-            AddGroupedAccountCalendar(group);
-        }
-        else
-        {
-            group.AccountCalendars.Add(accountCalendar);
-        }
-    }
-
-    public void RemoveAccountCalendar(AccountCalendarViewModel accountCalendar)
-    {
-        var group = _internalGroupedAccountCalendars.FirstOrDefault(g => g.Account.Id == accountCalendar.Account.Id);
-
-        // We don't expect but just in case.
-        if (group == null) return;
-
-        group.AccountCalendars.Remove(accountCalendar);
-
-        if (group.AccountCalendars.Count == 0)
-        {
-            RemoveGroupedAccountCalendar(group);
-        }
-    }
-}
diff --git a/Wino.Calendar/Services/CalendarAuthenticatorConfig.cs b/Wino.Calendar/Services/CalendarAuthenticatorConfig.cs
deleted file mode 100644
index 391ff7f2..00000000
--- a/Wino.Calendar/Services/CalendarAuthenticatorConfig.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Calendar.Services;
-
-public class CalendarAuthenticatorConfig : IAuthenticatorConfig
-{
-    public string OutlookAuthenticatorClientId => "b19c2035-d740-49ff-b297-de6ec561b208";
-
-    public string[] OutlookScope => new string[]
-    {
-        "Calendars.Read",
-        "Calendars.Read.Shared",
-        "offline_access",
-        "Calendars.ReadBasic",
-        "Calendars.ReadWrite",
-        "Calendars.ReadWrite.Shared",
-        "User.Read"
-    };
-
-    public string GmailAuthenticatorClientId => "973025879644-s7b4ur9p3rlgop6a22u7iuptdc0brnrn.apps.googleusercontent.com";
-
-    public string[] GmailScope => new string[]
-    {
-        "https://www.googleapis.com/auth/calendar",
-        "https://www.googleapis.com/auth/calendar.events",
-        "https://www.googleapis.com/auth/calendar.settings.readonly",
-        "https://www.googleapis.com/auth/userinfo.profile",
-        "https://www.googleapis.com/auth/userinfo.email"
-    };
-
-    public string GmailTokenStoreIdentifier => "WinoCalendarGmailTokenStore";
-}
diff --git a/Wino.Calendar/Services/DialogService.cs b/Wino.Calendar/Services/DialogService.cs
deleted file mode 100644
index 5a8c8965..00000000
--- a/Wino.Calendar/Services/DialogService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Windows.UI.Xaml;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Services;
-
-namespace Wino.Calendar.Services;
-
-public class DialogService : DialogServiceBase, ICalendarDialogService
-{
-    public DialogService(IThemeService themeService,
-                         IConfigurationService configurationService,
-                         IApplicationResourceManager<ResourceDictionary> applicationResourceManager) : base(themeService, configurationService, applicationResourceManager)
-    {
-    }
-}
diff --git a/Wino.Calendar/Services/NavigationService.cs b/Wino.Calendar/Services/NavigationService.cs
deleted file mode 100644
index f409c4b3..00000000
--- a/Wino.Calendar/Services/NavigationService.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Calendar.Views;
-using Wino.Calendar.Views.Account;
-using Wino.Calendar.Views.Settings;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.UWP.Services;
-using Wino.Views;
-
-namespace Wino.Calendar.Services;
-
-public class NavigationService : NavigationServiceBase, INavigationService
-{
-    public Type GetPageType(WinoPage winoPage)
-    {
-        return winoPage switch
-        {
-            WinoPage.CalendarPage => typeof(CalendarPage),
-            WinoPage.SettingsPage => typeof(SettingsPage),
-            WinoPage.CalendarSettingsPage => typeof(CalendarSettingsPage),
-            WinoPage.AccountManagementPage => typeof(AccountManagementPage),
-            WinoPage.ManageAccountsPage => typeof(ManageAccountsPage),
-            WinoPage.PersonalizationPage => typeof(PersonalizationPage),
-            WinoPage.AccountDetailsPage => typeof(AccountDetailsPage),
-            WinoPage.EventDetailsPage => typeof(EventDetailsPage),
-            _ => throw new Exception("Page is not implemented yet."),
-        };
-    }
-
-    public void GoBack()
-    {
-        if (Window.Current.Content is Frame appFrame && appFrame.Content is AppShell shellPage)
-        {
-            var shellFrame = shellPage.GetShellFrame();
-
-            if (shellFrame.CanGoBack)
-            {
-                shellFrame.GoBack();
-            }
-        }
-    }
-
-    public bool Navigate(WinoPage page, object parameter = null, NavigationReferenceFrame frame = NavigationReferenceFrame.ShellFrame, NavigationTransitionType transition = NavigationTransitionType.None)
-    {
-        // All navigations are performed on shell frame for calendar.
-
-        if (Window.Current.Content is Frame appFrame && appFrame.Content is AppShell shellPage)
-        {
-            var shellFrame = shellPage.GetShellFrame();
-
-            var pageType = GetPageType(page);
-
-            shellFrame.Navigate(pageType, parameter);
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/Wino.Calendar/Services/ProviderService.cs b/Wino.Calendar/Services/ProviderService.cs
deleted file mode 100644
index e0cac8ad..00000000
--- a/Wino.Calendar/Services/ProviderService.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Accounts;
-
-namespace Wino.Calendar.Services;
-
-public class ProviderService : IProviderService
-{
-    public IProviderDetail GetProviderDetail(MailProviderType type)
-    {
-        var details = GetAvailableProviders();
-
-        return details.FirstOrDefault(a => a.Type == type);
-    }
-
-    public List<IProviderDetail> GetAvailableProviders()
-    {
-        var providerList = new List<IProviderDetail>();
-
-        var providers = new MailProviderType[]
-        {
-            MailProviderType.Outlook,
-            MailProviderType.Gmail
-        };
-
-        foreach (var type in providers)
-        {
-            providerList.Add(new ProviderDetail(type, SpecialImapProvider.None));
-        }
-
-        return providerList;
-    }
-}
diff --git a/Wino.Calendar/Services/SettingsBuilderService.cs b/Wino.Calendar/Services/SettingsBuilderService.cs
deleted file mode 100644
index 953a4031..00000000
--- a/Wino.Calendar/Services/SettingsBuilderService.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Settings;
-
-namespace Wino.Calendar.Services;
-
-public class SettingsBuilderService : ISettingsBuilderService
-{
-    public List<SettingOption> GetSettingItems()
-        => new List<SettingOption>()
-        {
-            new SettingOption(Translator.SettingsManageAccountSettings_Title, Translator.SettingsManageAccountSettings_Description, WinoPage.AccountManagementPage,"F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.420572 0 10.056966 0.128582 10.65918 0.385742 C 11.261393 0.642904 11.791992 0.99284 12.250977 1.435547 C 12.709961 1.878256 13.074544 2.397461 13.344727 2.993164 C 13.614908 3.588867 13.75 4.225262 13.75 4.902344 C 13.75 5.397137 13.689778 5.87077 13.569336 6.323242 C 13.448893 6.775717 13.258463 7.213542 12.998047 7.636719 C 12.229817 7.799479 11.510416 8.079428 10.839844 8.476562 C 10.169271 8.873698 9.583333 9.378256 9.082031 9.990234 C 9.042969 9.996745 9.005533 10 8.969727 10 C 8.933919 10 8.899739 10 8.867188 10 L 8.652344 10 C 7.97526 10 7.338867 9.864909 6.743164 9.594727 C 6.147461 9.324545 5.628255 8.959961 5.185547 8.500977 C 4.742838 8.041993 4.392903 7.511395 4.135742 6.90918 C 3.878581 6.306967 3.75 5.670573 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 12.148438 19.365234 C 11.777344 19.208984 11.41276 19.010416 11.054688 18.769531 C 11.113281 18.561197 11.170247 18.357748 11.225586 18.15918 C 11.280924 17.960611 11.308594 17.753906 11.308594 17.539062 C 11.308594 17.252604 11.259766 16.977539 11.162109 16.713867 C 11.064453 16.450195 10.930989 16.210938 10.761719 15.996094 C 10.592447 15.78125 10.390625 15.597331 10.15625 15.444336 C 9.921875 15.291342 9.664713 15.182292 9.384766 15.117188 L 8.779297 14.980469 C 8.759766 14.778646 8.75 14.576823 8.75 14.375 C 8.75 14.179688 8.759766 13.977865 8.779297 13.769531 L 9.384766 13.632812 C 9.664713 13.567709 9.921875 13.458659 10.15625 13.305664 C 10.390625 13.15267 10.592447 12.96875 10.761719 12.753906 C 10.930989 12.539062 11.064453 12.299805 11.162109 12.036133 C 11.259766 11.772461 11.308594 11.497396 11.308594 11.210938 C 11.308594 10.996094 11.280924 10.789389 11.225586 10.59082 C 11.170247 10.392253 11.113281 10.188803 11.054688 9.980469 C 11.41276 9.739584 11.777344 9.541016 12.148438 9.384766 C 12.324219 9.560547 12.488606 9.720053 12.641602 9.863281 C 12.794596 10.006511 12.957356 10.131836 13.129883 10.239258 C 13.302408 10.34668 13.487955 10.429688 13.686523 10.488281 C 13.885091 10.546875 14.114583 10.576172 14.375 10.576172 C 14.635416 10.576172 14.866535 10.546875 15.068359 10.488281 C 15.270182 10.429688 15.455729 10.34668 15.625 10.239258 C 15.79427 10.131836 15.955402 10.006511 16.108398 9.863281 C 16.261393 9.720053 16.425781 9.560547 16.601562 9.384766 C 16.972656 9.541016 17.337238 9.739584 17.695312 9.980469 C 17.636719 10.188803 17.579752 10.392253 17.524414 10.59082 C 17.469074 10.789389 17.441406 10.996094 17.441406 11.210938 C 17.441406 11.497396 17.488605 11.772461 17.583008 12.036133 C 17.677408 12.299805 17.810871 12.539062 17.983398 12.753906 C 18.155924 12.96875 18.359375 13.15267 18.59375 13.305664 C 18.828125 13.458659 19.085285 13.567709 19.365234 13.632812 L 19.970703 13.769531 C 19.990234 13.977865 20 14.179688 20 14.375 C 20 14.576823 19.990234 14.778646 19.970703 14.980469 L 19.365234 15.117188 C 19.085285 15.182292 18.828125 15.291342 18.59375 15.444336 C 18.359375 15.597331 18.155924 15.78125 17.983398 15.996094 C 17.810871 16.210938 17.677408 16.450195 17.583008 16.713867 C 17.488605 16.977539 17.441406 17.252604 17.441406 17.539062 C 17.441406 17.753906 17.469074 17.960611 17.524414 18.15918 C 17.579752 18.357748 17.636719 18.561197 17.695312 18.769531 C 17.337238 19.010416 16.972656 19.208984 16.601562 19.365234 C 16.425781 19.189453 16.261393 19.029947 16.108398 18.886719 C 15.955402 18.74349 15.79427 18.618164 15.625 18.510742 C 15.455729 18.40332 15.270182 18.320312 15.068359 18.261719 C 14.866535 18.203125 14.635416 18.173828 14.375 18.173828 C 14.108072 18.173828 13.875324 18.203125 13.676758 18.261719 C 13.478189 18.320312 13.294271 18.40332 13.125 18.510742 C 12.955729 18.618164 12.794596 18.74349 12.641602 18.886719 C 12.488606 19.029947 12.324219 19.189453 12.148438 19.365234 Z M 0 13.75 C 0 13.404948 0.065104 13.081055 0.195312 12.77832 C 0.325521 12.475586 0.504557 12.210287 0.732422 11.982422 C 0.960286 11.754558 1.225586 11.575521 1.52832 11.445312 C 1.831055 11.315104 2.154948 11.25 2.5 11.25 L 8.251953 11.25 C 8.043619 11.660156 7.880859 12.076823 7.763672 12.5 L 2.5 12.5 C 2.324219 12.5 2.159831 12.532553 2.006836 12.597656 C 1.853841 12.662761 1.722005 12.750651 1.611328 12.861328 C 1.500651 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.420573 1.360677 15.008139 1.582031 15.512695 C 1.803385 16.017252 2.102865 16.455078 2.480469 16.826172 C 2.858073 17.197266 3.297526 17.50651 3.798828 17.753906 C 4.30013 18.001303 4.827474 18.198242 5.380859 18.344727 C 5.934244 18.491211 6.50065 18.595377 7.080078 18.657227 C 7.659505 18.719076 8.216146 18.75 8.75 18.75 L 9.072266 18.75 C 9.449869 19.199219 9.866536 19.5931 10.322266 19.931641 C 10.061849 19.964193 9.801432 19.983725 9.541016 19.990234 C 9.280599 19.996744 9.016927 20 8.75 20 C 8.190104 20 7.618814 19.973959 7.036133 19.921875 C 6.45345 19.869791 5.878906 19.775391 5.3125 19.638672 C 4.746094 19.501953 4.197591 19.319662 3.666992 19.091797 C 3.136393 18.863932 2.646484 18.574219 2.197266 18.222656 C 1.474609 17.66276 0.927734 17.005209 0.556641 16.25 C 0.185547 15.494792 0 14.661458 0 13.75 Z M 15.625 14.375 C 15.625 14.205729 15.592447 14.044597 15.527344 13.891602 C 15.462239 13.738607 15.372721 13.605144 15.258789 13.491211 C 15.144855 13.377279 15.011393 13.287761 14.858398 13.222656 C 14.705403 13.157553 14.544271 13.125 14.375 13.125 C 14.199219 13.125 14.036458 13.157553 13.886719 13.222656 C 13.736979 13.287761 13.605143 13.377279 13.491211 13.491211 C 13.377278 13.605144 13.28776 13.736979 13.222656 13.886719 C 13.157551 14.036459 13.124999 14.199219 13.125 14.375 C 13.124999 14.550781 13.157551 14.71517 13.222656 14.868164 C 13.28776 15.021159 13.37565 15.152995 13.486328 15.263672 C 13.597004 15.37435 13.72884 15.46224 13.881836 15.527344 C 14.03483 15.592448 14.199219 15.625 14.375 15.625 C 14.550781 15.625 14.713541 15.592448 14.863281 15.527344 C 15.01302 15.46224 15.144855 15.372722 15.258789 15.258789 C 15.372721 15.144857 15.462239 15.013021 15.527344 14.863281 C 15.592447 14.713542 15.625 14.550781 15.625 14.375 Z "),
-            new SettingOption(Translator.SettingsAppPreferences_Title, Translator.SettingsAppPreferences_Description, WinoPage.AppPreferencesPage,"F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 12.724609 8.935547 C 12.724609 9.195964 12.762044 9.446615 12.836914 9.6875 C 12.911783 9.928386 13.020832 10.151367 13.164062 10.356445 C 13.307291 10.561523 13.476562 10.742188 13.671875 10.898438 C 13.867188 11.054688 14.088541 11.178386 14.335938 11.269531 C 14.348957 11.367188 14.358723 11.466472 14.365234 11.567383 C 14.371744 11.668295 14.375 11.770834 14.375 11.875 C 14.375 11.979167 14.371744 12.081706 14.365234 12.182617 C 14.358723 12.283529 14.348957 12.382812 14.335938 12.480469 C 14.088541 12.571615 13.867188 12.695312 13.671875 12.851562 C 13.476562 13.007812 13.307291 13.188477 13.164062 13.393555 C 13.020832 13.598633 12.911783 13.821615 12.836914 14.0625 C 12.762044 14.303386 12.724609 14.554037 12.724609 14.814453 C 12.724609 14.886068 12.727864 14.960938 12.734375 15.039062 C 12.740885 15.117188 12.75065 15.192058 12.763672 15.263672 C 12.470703 15.511068 12.145182 15.712891 11.787109 15.869141 C 11.546224 15.621745 11.274414 15.43457 10.97168 15.307617 C 10.668945 15.180664 10.345052 15.117188 10 15.117188 C 9.654947 15.117188 9.331055 15.180664 9.02832 15.307617 C 8.725586 15.43457 8.453775 15.621745 8.212891 15.869141 C 7.854817 15.712891 7.529296 15.511068 7.236328 15.263672 C 7.249349 15.192058 7.259114 15.117188 7.265625 15.039062 C 7.272135 14.960938 7.275391 14.886068 7.275391 14.814453 C 7.275391 14.554037 7.237956 14.303386 7.163086 14.0625 C 7.088216 13.821615 6.979167 13.598633 6.835938 13.393555 C 6.692708 13.188477 6.52181 13.007812 6.323242 12.851562 C 6.124674 12.695312 5.904948 12.571615 5.664062 12.480469 C 5.651042 12.382812 5.641276 12.283529 5.634766 12.182617 C 5.628255 12.081706 5.625 11.979167 5.625 11.875 C 5.625 11.770834 5.628255 11.668295 5.634766 11.567383 C 5.641276 11.466472 5.651042 11.367188 5.664062 11.269531 C 5.904948 11.178386 6.124674 11.054688 6.323242 10.898438 C 6.52181 10.742188 6.692708 10.561523 6.835938 10.356445 C 6.979167 10.151367 7.088216 9.928386 7.163086 9.6875 C 7.237956 9.446615 7.275391 9.195964 7.275391 8.935547 C 7.275391 8.863933 7.272135 8.789062 7.265625 8.710938 C 7.259114 8.632812 7.249349 8.557943 7.236328 8.486328 C 7.529296 8.238933 7.854817 8.037109 8.212891 7.880859 C 8.440755 8.121745 8.712564 8.307292 9.02832 8.4375 C 9.344075 8.567709 9.667969 8.632812 10 8.632812 C 10.332031 8.632812 10.655924 8.567709 10.97168 8.4375 C 11.287435 8.307292 11.559244 8.121745 11.787109 7.880859 C 12.145182 8.037109 12.470703 8.238933 12.763672 8.486328 C 12.75065 8.557943 12.740885 8.632812 12.734375 8.710938 C 12.727864 8.789062 12.724609 8.863933 12.724609 8.935547 Z M 10.9375 11.875 C 10.9375 11.614584 10.846354 11.393229 10.664062 11.210938 C 10.481771 11.028646 10.260416 10.9375 10 10.9375 C 9.739583 10.9375 9.518229 11.028646 9.335938 11.210938 C 9.153646 11.393229 9.0625 11.614584 9.0625 11.875 C 9.0625 12.135417 9.153646 12.356771 9.335938 12.539062 C 9.518229 12.721354 9.739583 12.8125 10 12.8125 C 10.260416 12.8125 10.481771 12.721354 10.664062 12.539062 C 10.846354 12.356771 10.9375 12.135417 10.9375 11.875 Z "),
-            new SettingOption(Translator.SettingsPersonalization_Title, Translator.SettingsPersonalization_Description, WinoPage.PersonalizationPage,"F1 M 10 17.5 L 10 18.75 L 12.5 18.75 L 12.5 20 L 6.25 20 L 6.25 18.75 L 8.75 18.75 L 8.75 17.5 L 0 17.5 L 0 6.25 L 10 6.25 L 8.740234 7.5 L 1.25 7.5 L 1.25 16.25 L 17.5 16.25 L 17.5 8.75 L 18.75 7.5 L 18.75 17.5 Z M 5 13.75 C 5.175781 13.75 5.338542 13.717448 5.488281 13.652344 C 5.638021 13.58724 5.769856 13.497722 5.883789 13.383789 C 5.997721 13.269857 6.087239 13.138021 6.152344 12.988281 C 6.217448 12.838542 6.25 12.675781 6.25 12.5 C 6.25 12.18099 6.306966 11.878256 6.420898 11.591797 C 6.53483 11.305339 6.69108 11.051433 6.889648 10.830078 C 7.088216 10.608725 7.322591 10.424805 7.592773 10.27832 C 7.862955 10.131836 8.157552 10.042318 8.476562 10.009766 L 15.419922 3.066406 C 15.602213 2.884115 15.813802 2.744141 16.054688 2.646484 C 16.295572 2.548828 16.542969 2.5 16.796875 2.5 C 17.063801 2.5 17.31608 2.550457 17.553711 2.651367 C 17.79134 2.752279 17.998047 2.890625 18.173828 3.066406 C 18.349609 3.242188 18.487955 3.448895 18.588867 3.686523 C 18.689777 3.924154 18.740234 4.179688 18.740234 4.453125 C 18.740234 4.707031 18.691406 4.954428 18.59375 5.195312 C 18.496094 5.436199 18.356119 5.647787 18.173828 5.830078 L 11.230469 12.773438 C 11.197916 13.085938 11.110025 13.378906 10.966797 13.652344 C 10.823567 13.925781 10.639648 14.161784 10.415039 14.360352 C 10.19043 14.55892 9.936523 14.71517 9.65332 14.829102 C 9.370117 14.943034 9.06901 15 8.75 15 L 2.5 15 L 2.5 13.75 Z M 16.796875 3.75 C 16.608072 3.75 16.445312 3.818359 16.308594 3.955078 L 11.962891 8.300781 C 12.333984 8.58724 12.66276 8.916016 12.949219 9.287109 L 17.294922 4.941406 C 17.431641 4.804688 17.5 4.641928 17.5 4.453125 C 17.5 4.257812 17.430012 4.091797 17.290039 3.955078 C 17.150064 3.818359 16.985676 3.75 16.796875 3.75 Z M 10.175781 10.087891 C 10.572916 10.348308 10.901692 10.677084 11.162109 11.074219 L 12.060547 10.185547 C 11.787109 9.794922 11.455078 9.462891 11.064453 9.189453 Z M 10 12.5 C 10 12.324219 9.967447 12.161459 9.902344 12.011719 C 9.837239 11.861979 9.747721 11.730144 9.633789 11.616211 C 9.519856 11.502279 9.388021 11.412761 9.238281 11.347656 C 9.088541 11.282553 8.925781 11.25 8.75 11.25 C 8.574219 11.25 8.411458 11.282553 8.261719 11.347656 C 8.111979 11.412761 7.980143 11.502279 7.866211 11.616211 C 7.752278 11.730144 7.66276 11.861979 7.597656 12.011719 C 7.532552 12.161459 7.5 12.324219 7.5 12.5 C 7.5 12.942709 7.389322 13.359375 7.167969 13.75 L 8.75 13.75 C 8.919271 13.75 9.080403 13.717448 9.233398 13.652344 C 9.386393 13.58724 9.519856 13.497722 9.633789 13.383789 C 9.747721 13.269857 9.837239 13.136394 9.902344 12.983398 C 9.967447 12.830404 10 12.669271 10 12.5 Z "),
-            new SettingOption(Translator.SettingsCalendarSettings_Title, Translator.SettingsCalendarSettings_Description, WinoPage.CalendarSettingsPage,"F1 M 1.25 3.75 C 1.25 3.404949 1.315104 3.081055 1.445312 2.77832 C 1.575521 2.475586 1.754557 2.210287 1.982422 1.982422 C 2.210286 1.754559 2.475586 1.575521 2.77832 1.445312 C 3.081055 1.315105 3.404948 1.25 3.75 1.25 L 16.25 1.25 C 16.595051 1.25 16.918945 1.315105 17.22168 1.445312 C 17.524414 1.575521 17.789713 1.754559 18.017578 1.982422 C 18.245441 2.210287 18.424479 2.475586 18.554688 2.77832 C 18.684895 3.081055 18.75 3.404949 18.75 3.75 L 18.75 5 L 1.25 5 Z M 3.75 18.75 C 3.404948 18.75 3.081055 18.684896 2.77832 18.554688 C 2.475586 18.424479 2.210286 18.245443 1.982422 18.017578 C 1.754557 17.789713 1.575521 17.524414 1.445312 17.22168 C 1.315104 16.918945 1.25 16.595053 1.25 16.25 L 1.25 6.25 L 18.75 6.25 L 18.75 16.25 C 18.75 16.595053 18.684895 16.918945 18.554688 17.22168 C 18.424479 17.524414 18.245441 17.789713 18.017578 18.017578 C 17.789713 18.245443 17.524414 18.424479 17.22168 18.554688 C 16.918945 18.684896 16.595051 18.75 16.25 18.75 Z M 7.65625 9.990234 C 7.65625 9.794922 7.618815 9.612631 7.543945 9.443359 C 7.469075 9.274089 7.368164 9.125977 7.241211 8.999023 C 7.114258 8.87207 6.966146 8.772787 6.796875 8.701172 C 6.627604 8.629558 6.445312 8.59375 6.25 8.59375 C 6.054688 8.59375 5.870768 8.631186 5.698242 8.706055 C 5.525716 8.780925 5.375977 8.881836 5.249023 9.008789 C 5.12207 9.135742 5.022786 9.283854 4.951172 9.453125 C 4.879557 9.622396 4.84375 9.804688 4.84375 10 C 4.84375 10.195312 4.879557 10.377604 4.951172 10.546875 C 5.022786 10.716146 5.12207 10.864258 5.249023 10.991211 C 5.375977 11.118164 5.524088 11.219076 5.693359 11.293945 C 5.86263 11.368815 6.044922 11.40625 6.240234 11.40625 C 6.442057 11.40625 6.629231 11.370443 6.801758 11.298828 C 6.974283 11.227214 7.124023 11.12793 7.250977 11.000977 C 7.377929 10.874023 7.477213 10.724284 7.548828 10.551758 C 7.620442 10.379232 7.65625 10.192058 7.65625 9.990234 Z M 11.40625 9.990234 C 11.40625 9.794922 11.368814 9.612631 11.293945 9.443359 C 11.219075 9.274089 11.118164 9.125977 10.991211 8.999023 C 10.864258 8.87207 10.716146 8.772787 10.546875 8.701172 C 10.377604 8.629558 10.195312 8.59375 10 8.59375 C 9.804688 8.59375 9.620768 8.631186 9.448242 8.706055 C 9.275716 8.780925 9.125977 8.881836 8.999023 9.008789 C 8.87207 9.135742 8.772786 9.283854 8.701172 9.453125 C 8.629557 9.622396 8.59375 9.804688 8.59375 10 C 8.59375 10.195312 8.629557 10.377604 8.701172 10.546875 C 8.772786 10.716146 8.87207 10.864258 8.999023 10.991211 C 9.125977 11.118164 9.274088 11.219076 9.443359 11.293945 C 9.61263 11.368815 9.794922 11.40625 9.990234 11.40625 C 10.192057 11.40625 10.379231 11.370443 10.551758 11.298828 C 10.724283 11.227214 10.874023 11.12793 11.000977 11.000977 C 11.12793 10.874023 11.227213 10.724284 11.298828 10.551758 C 11.370442 10.379232 11.40625 10.192058 11.40625 9.990234 Z M 15.15625 9.990234 C 15.15625 9.794922 15.118814 9.612631 15.043945 9.443359 C 14.969075 9.274089 14.868164 9.125977 14.741211 8.999023 C 14.614258 8.87207 14.466146 8.772787 14.296875 8.701172 C 14.127604 8.629558 13.945312 8.59375 13.75 8.59375 C 13.554688 8.59375 13.370768 8.631186 13.198242 8.706055 C 13.025716 8.780925 12.875977 8.881836 12.749023 9.008789 C 12.62207 9.135742 12.522786 9.283854 12.451172 9.453125 C 12.379557 9.622396 12.34375 9.804688 12.34375 10 C 12.34375 10.195312 12.379557 10.377604 12.451172 10.546875 C 12.522786 10.716146 12.62207 10.864258 12.749023 10.991211 C 12.875977 11.118164 13.024088 11.219076 13.193359 11.293945 C 13.362629 11.368815 13.544921 11.40625 13.740234 11.40625 C 13.942057 11.40625 14.129231 11.370443 14.301758 11.298828 C 14.474283 11.227214 14.624022 11.12793 14.750977 11.000977 C 14.877929 10.874023 14.977213 10.724284 15.048828 10.551758 C 15.120442 10.379232 15.15625 10.192058 15.15625 9.990234 Z M 7.65625 13.740234 C 7.65625 13.544922 7.618815 13.362631 7.543945 13.193359 C 7.469075 13.024089 7.368164 12.875977 7.241211 12.749023 C 7.114258 12.62207 6.966146 12.522787 6.796875 12.451172 C 6.627604 12.379558 6.445312 12.34375 6.25 12.34375 C 6.054688 12.34375 5.870768 12.381186 5.698242 12.456055 C 5.525716 12.530925 5.375977 12.631836 5.249023 12.758789 C 5.12207 12.885742 5.022786 13.033854 4.951172 13.203125 C 4.879557 13.372396 4.84375 13.554688 4.84375 13.75 C 4.84375 13.945312 4.879557 14.127604 4.951172 14.296875 C 5.022786 14.466146 5.12207 14.614258 5.249023 14.741211 C 5.375977 14.868164 5.524088 14.969076 5.693359 15.043945 C 5.86263 15.118815 6.044922 15.15625 6.240234 15.15625 C 6.442057 15.15625 6.629231 15.120443 6.801758 15.048828 C 6.974283 14.977214 7.124023 14.87793 7.250977 14.750977 C 7.377929 14.624023 7.477213 14.474284 7.548828 14.301758 C 7.620442 14.129232 7.65625 13.942058 7.65625 13.740234 Z M 11.40625 13.740234 C 11.40625 13.544922 11.368814 13.362631 11.293945 13.193359 C 11.219075 13.024089 11.118164 12.875977 10.991211 12.749023 C 10.864258 12.62207 10.716146 12.522787 10.546875 12.451172 C 10.377604 12.379558 10.195312 12.34375 10 12.34375 C 9.804688 12.34375 9.620768 12.381186 9.448242 12.456055 C 9.275716 12.530925 9.125977 12.631836 8.999023 12.758789 C 8.87207 12.885742 8.772786 13.033854 8.701172 13.203125 C 8.629557 13.372396 8.59375 13.554688 8.59375 13.75 C 8.59375 13.945312 8.629557 14.127604 8.701172 14.296875 C 8.772786 14.466146 8.87207 14.614258 8.999023 14.741211 C 9.125977 14.868164 9.274088 14.969076 9.443359 15.043945 C 9.61263 15.118815 9.794922 15.15625 9.990234 15.15625 C 10.192057 15.15625 10.379231 15.120443 10.551758 15.048828 C 10.724283 14.977214 10.874023 14.87793 11.000977 14.750977 C 11.12793 14.624023 11.227213 14.474284 11.298828 14.301758 C 11.370442 14.129232 11.40625 13.942058 11.40625 13.740234 Z "),
-            new SettingOption(Translator.SettingsAbout_Title, Translator.SettingsAbout_Description, WinoPage.AboutPage,"F1 M 9.375 18.75 C 8.509114 18.75 7.677409 18.639322 6.879883 18.417969 C 6.082356 18.196615 5.335286 17.882486 4.638672 17.475586 C 3.942057 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.807943 1.274414 14.111328 C 0.867513 13.414714 0.553385 12.667644 0.332031 11.870117 C 0.110677 11.072592 0 10.240886 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.639322 11.072592 18.417969 11.870117 C 18.196613 12.667644 17.882486 13.414714 17.475586 14.111328 C 17.068684 14.807943 16.580402 15.441081 16.010742 16.010742 C 15.44108 16.580404 14.807942 17.068686 14.111328 17.475586 C 13.414713 17.882486 12.667643 18.196615 11.870117 18.417969 C 11.072591 18.639322 10.240885 18.75 9.375 18.75 Z M 9.375 1.25 C 8.626302 1.25 7.906901 1.347656 7.216797 1.542969 C 6.526692 1.738281 5.880533 2.011719 5.27832 2.363281 C 4.676106 2.714844 4.127604 3.138021 3.632812 3.632812 C 3.138021 4.127604 2.714844 4.676107 2.363281 5.27832 C 2.011719 5.880534 1.738281 6.52832 1.542969 7.22168 C 1.347656 7.915039 1.25 8.632812 1.25 9.375 C 1.25 10.117188 1.347656 10.834961 1.542969 11.52832 C 1.738281 12.22168 2.011719 12.869467 2.363281 13.47168 C 2.714844 14.073894 3.138021 14.622396 3.632812 15.117188 C 4.127604 15.611979 4.676106 16.035156 5.27832 16.386719 C 5.880533 16.738281 6.526692 17.011719 7.216797 17.207031 C 7.906901 17.402344 8.626302 17.5 9.375 17.5 C 10.117188 17.5 10.834961 17.402344 11.52832 17.207031 C 12.221679 17.011719 12.869465 16.738281 13.47168 16.386719 C 14.073893 16.035156 14.622396 15.611979 15.117188 15.117188 C 15.611979 14.622396 16.035156 14.073894 16.386719 13.47168 C 16.738281 12.869467 17.011719 12.223308 17.207031 11.533203 C 17.402344 10.8431 17.5 10.123698 17.5 9.375 C 17.5 8.632812 17.402344 7.915039 17.207031 7.22168 C 17.011719 6.52832 16.738281 5.880534 16.386719 5.27832 C 16.035156 4.676107 15.611979 4.127604 15.117188 3.632812 C 14.622396 3.138021 14.073893 2.714844 13.47168 2.363281 C 12.869465 2.011719 12.221679 1.738281 11.52832 1.542969 C 10.834961 1.347656 10.117188 1.25 9.375 1.25 Z M 8.75 7.5 L 10 7.5 L 10 13.75 L 8.75 13.75 Z M 8.75 5 L 10 5 L 10 6.25 L 8.75 6.25 Z "),
-        };
-}
diff --git a/Wino.Calendar/Styles/DayHeaderControl.xaml b/Wino.Calendar/Styles/DayHeaderControl.xaml
deleted file mode 100644
index 396a0cf0..00000000
--- a/Wino.Calendar/Styles/DayHeaderControl.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Calendar.Controls">
-
-    <!--  Left day header DayHeaderControl  -->
-    <Style TargetType="controls:DayHeaderControl">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:DayHeaderControl">
-                    <Grid>
-                        <TextBlock
-                            x:Name="PART_DayHeaderTextBlock"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Top"
-                            FontSize="12" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
diff --git a/Wino.Calendar/Styles/WinoCalendarResources.xaml b/Wino.Calendar/Styles/WinoCalendarResources.xaml
deleted file mode 100644
index c0469ff1..00000000
--- a/Wino.Calendar/Styles/WinoCalendarResources.xaml
+++ /dev/null
@@ -1,424 +0,0 @@
-<ResourceDictionary
-    x:Class="Wino.Calendar.Styles.WinoCalendarResources"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Calendar.Controls"
-    xmlns:controls1="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Calendar.ViewModels.Data"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="using:Wino.Core.Domain.Models.Calendar"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:selectors="using:Wino.Calendar.Selectors"
-    xmlns:toolkitControls="using:CommunityToolkit.WinUI.Controls">
-
-    <!--  08:00 or 8 AM/PM on the left etc.  -->
-    <DataTemplate x:Key="DayCalendarHourHeaderTemplate" x:DataType="models:DayHeaderRenderModel">
-        <Grid Height="{x:Bind HourHeight}">
-            <TextBlock
-                HorizontalAlignment="Center"
-                VerticalAlignment="Top"
-                Text="{x:Bind DayHeader}" />
-        </Grid>
-    </DataTemplate>
-
-    <!--  Vertical panel that renders items on canvas.  -->
-    <DataTemplate x:Key="DayCalendarItemVerticalRenderTemplate" x:DataType="models:CalendarDayModel">
-        <ItemsControl x:Name="RegularEventItemsControl" ItemsSource="{x:Bind EventsCollection.RegularEvents}">
-            <ItemsControl.ItemTemplate>
-                <!--  Default Calendar Item View Model Template  -->
-                <DataTemplate x:DataType="data:CalendarItemViewModel">
-                    <controls:CalendarItemControl
-                        CalendarItem="{x:Bind}"
-                        DisplayingDate="{Binding ElementName=RegularEventItemsControl, Path=DataContext}"
-                        IsCustomEventArea="False" />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-            <ItemsControl.ItemContainerTransitions>
-                <TransitionCollection>
-                    <PaneThemeTransition Edge="Left" />
-                </TransitionCollection>
-            </ItemsControl.ItemContainerTransitions>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <controls:WinoCalendarPanel HourHeight="{Binding Path=CalendarRenderOptions.CalendarSettings.HourHeight}" Period="{Binding Path=Period}" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-        </ItemsControl>
-    </DataTemplate>
-
-    <!--  Equally distributed days of week representation in FlipView.  -->
-    <!--  Used for day-week-work week templates.  -->
-    <!--  Horizontal template  -->
-    <DataTemplate x:Key="FlipTemplate" x:DataType="models:DayRangeRenderModel">
-        <Grid
-            x:Name="RootGrid"
-            Background="Transparent"
-            ColumnSpacing="0"
-            RowSpacing="0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" MinHeight="100" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <ItemsControl Margin="50,0,16,0" ItemsSource="{x:Bind CalendarDays}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate x:DataType="models:CalendarDayModel">
-                        <controls:DayColumnControl DayModel="{x:Bind}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <toolkitControls:UniformGrid
-                            Columns="{Binding CalendarRenderOptions.TotalDayCount}"
-                            Orientation="Horizontal"
-                            Rows="1" />
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-            </ItemsControl>
-
-            <ScrollViewer
-                Grid.Row="1"
-                Grid.ColumnSpan="2"
-                Margin="0"
-                Padding="0,0,16,0">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="50" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <!--  Rendering left hour headers.  -->
-                    <ItemsControl ItemTemplate="{StaticResource DayCalendarHourHeaderTemplate}" ItemsSource="{x:Bind DayHeaders}" />
-
-                    <!--  Drawing canvas for timeline.  -->
-                    <controls:WinoDayTimelineCanvas
-                        Grid.Column="1"
-                        HalfHourSeperatorColor="{ThemeResource CalendarSeperatorBrush}"
-                        PositionerUIElement="{Binding ElementName=RootGrid}"
-                        RenderOptions="{x:Bind CalendarRenderOptions}"
-                        SelectedCellBackgroundBrush="{ThemeResource CalendarFieldSelectedBackgroundBrush}"
-                        SeperatorColor="{ThemeResource CalendarSeperatorBrush}"
-                        WorkingHourCellBackgroundColor="{ThemeResource CalendarFieldWorkingHoursBackgroundBrush}" />
-
-                    <!--  Each vertical day grids that renders events.  -->
-                    <ItemsControl
-                        Grid.Column="1"
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ItemTemplate="{StaticResource DayCalendarItemVerticalRenderTemplate}"
-                        ItemsSource="{x:Bind CalendarDays}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <toolkitControls:UniformGrid
-                                    Columns="{Binding CalendarRenderOptions.TotalDayCount}"
-                                    Orientation="Horizontal"
-                                    Rows="1" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </Grid>
-            </ScrollViewer>
-        </Grid>
-    </DataTemplate>
-
-    <!--  Template that displays 35 days in total.  -->
-    <!--  Used for monthly view  -->
-    <!--  Vertical template  -->
-    <DataTemplate x:Key="MonthlyFlipTemplate" x:DataType="models:DayRangeRenderModel">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <Grid Height="20">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-            </Grid>
-            <ItemsControl Grid.Row="1" ItemsSource="{x:Bind CalendarDays}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate x:DataType="models:CalendarDayModel">
-                        <controls:DayColumnControl DayModel="{x:Bind Mode=OneWay}" Template="{StaticResource MonthlyColumnControlTemplate}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-                <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <controls1:EqualGridPanel Columns="7" Rows="5" />
-                        <!--<ItemsWrapGrid MaximumRowsOrColumns="7" Orientation="Horizontal" />-->
-                    </ItemsPanelTemplate>
-                </ItemsControl.ItemsPanel>
-            </ItemsControl>
-        </Grid>
-    </DataTemplate>
-
-    <ItemsPanelTemplate x:Key="VerticalFlipViewItemsPanel">
-        <VirtualizingStackPanel Orientation="Vertical" />
-    </ItemsPanelTemplate>
-
-    <ItemsPanelTemplate x:Key="HorizontalFlipViewItemsPanel">
-        <VirtualizingStackPanel Orientation="Horizontal" />
-    </ItemsPanelTemplate>
-
-
-
-    <!--  Default style for WinoCalendarControl  -->
-    <Style TargetType="controls:WinoCalendarControl">
-        <Style.Setters>
-            <Setter Property="HorizontalItemsPanelTemplate" Value="{StaticResource HorizontalFlipViewItemsPanel}" />
-            <Setter Property="VerticalItemsPanelTemplate" Value="{StaticResource VerticalFlipViewItemsPanel}" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="controls:WinoCalendarControl">
-                        <Grid>
-                            <controls:WinoCalendarFlipView
-                                x:Name="PART_WinoFlipView"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Stretch"
-                                ActiveCanvas="{x:Bind ActiveCanvas, Mode=TwoWay}"
-                                ActiveVerticalScrollViewer="{x:Bind ActiveScrollViewer, Mode=TwoWay}"
-                                Background="Transparent"
-                                IsIdle="{x:Bind IsFlipIdle, Mode=TwoWay}"
-                                IsTabStop="False"
-                                ItemsSource="{TemplateBinding DayRanges}"
-                                SelectedIndex="{Binding SelectedFlipViewIndex, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}">
-                                <controls:WinoCalendarFlipView.ItemTemplateSelector>
-                                    <selectors:WinoCalendarItemTemplateSelector
-                                        DayWeekWorkWeekTemplate="{StaticResource FlipTemplate}"
-                                        DisplayType="{x:Bind DisplayType, Mode=OneWay}"
-                                        MonthlyTemplate="{StaticResource MonthlyFlipTemplate}" />
-                                </controls:WinoCalendarFlipView.ItemTemplateSelector>
-                            </controls:WinoCalendarFlipView>
-
-                            <Grid x:Name="PART_IdleGrid" Visibility="Collapsed">
-                                <muxc:ProgressRing
-                                    Width="50"
-                                    Height="50"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    IsActive="True" />
-                            </Grid>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-
-    <!--  Top header control for days.  -->
-    <ControlTemplate x:Key="DailyColumnControlTemplate" TargetType="controls:DayColumnControl">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="25" />
-                <RowDefinition Height="7" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <!--  Name of the day. Monday, Tuesday etc. at the top.  -->
-            <TextBlock
-                x:Name="PART_ColumnHeaderText"
-                Margin="8,0,0,0"
-                FontSize="16"
-                TextTrimming="CharacterEllipsis" />
-
-            <Grid
-                Grid.Row="2"
-                Grid.RowSpan="2"
-                BorderBrush="{ThemeResource CalendarSeperatorBrush}"
-                BorderThickness="1,1,0,1" />
-
-            <!--  Border for today indication.  -->
-            <Border
-                x:Name="PART_IsTodayBorder"
-                Grid.Row="1"
-                Height="5"
-                Margin="2,0,2,0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Background="{ThemeResource SystemAccentColor}"
-                CornerRadius="2"
-                Visibility="Collapsed" />
-
-            <!--  Place where full day events go.  -->
-            <Grid
-                x:Name="PART_DayDataAreaGrid"
-                Grid.Row="2"
-                Padding="6"
-                BorderBrush="{ThemeResource CalendarSeperatorBrush}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" MinHeight="35" />
-                </Grid.RowDefinitions>
-
-                <!--  Day number  -->
-                <TextBlock x:Name="PART_HeaderDateDayText" FontSize="17" />
-
-                <!--  Extras  -->
-                <StackPanel Grid.Column="1" HorizontalAlignment="Right" />
-
-                <!--  All-Multi Day Events  -->
-                <ItemsControl
-                    x:Name="PART_AllDayItemsControl"
-                    Grid.Row="1"
-                    Grid.ColumnSpan="2"
-                    Margin="0,6">
-                    <ItemsControl.ItemTemplateSelector>
-                        <selectors:CustomAreaCalendarItemSelector>
-                            <selectors:CustomAreaCalendarItemSelector.AllDayTemplate>
-                                <DataTemplate x:DataType="data:CalendarItemViewModel">
-                                    <controls:CalendarItemControl
-                                        CalendarItem="{x:Bind}"
-                                        DisplayingDate="{Binding DataContext, ElementName=PART_AllDayItemsControl}"
-                                        IsCustomEventArea="True" />
-                                </DataTemplate>
-                            </selectors:CustomAreaCalendarItemSelector.AllDayTemplate>
-                            <selectors:CustomAreaCalendarItemSelector.MultiDayTemplate>
-                                <DataTemplate x:DataType="data:CalendarItemViewModel">
-                                    <controls:CalendarItemControl
-                                        CalendarItem="{x:Bind}"
-                                        DisplayingDate="{Binding DataContext, ElementName=PART_AllDayItemsControl}"
-                                        IsCustomEventArea="True" />
-                                </DataTemplate>
-                            </selectors:CustomAreaCalendarItemSelector.MultiDayTemplate>
-                        </selectors:CustomAreaCalendarItemSelector>
-                    </ItemsControl.ItemTemplateSelector>
-                    <ItemsControl.ItemContainerTransitions>
-                        <TransitionCollection>
-                            <AddDeleteThemeTransition />
-                        </TransitionCollection>
-                    </ItemsControl.ItemContainerTransitions>
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel Orientation="Vertical" Spacing="2" />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                </ItemsControl>
-            </Grid>
-
-            <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup x:Name="TodayOrNotStates">
-                    <VisualState x:Name="NotTodayState" />
-                    <VisualState x:Name="TodayState">
-                        <VisualState.Setters>
-                            <Setter Target="PART_IsTodayBorder.Visibility" Value="Visible" />
-                            <Setter Target="PART_HeaderDateDayText.Foreground" Value="{ThemeResource SystemAccentColor}" />
-                            <Setter Target="PART_HeaderDateDayText.FontWeight" Value="Semibold" />
-                            <Setter Target="PART_ColumnHeaderText.FontWeight" Value="Semibold" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Monthly data control for months  -->
-    <ControlTemplate x:Key="MonthlyColumnControlTemplate" TargetType="controls:DayColumnControl">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="5" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <!--  Border for today indication.  -->
-            <Border
-                x:Name="PART_IsTodayBorder"
-                Grid.Row="0"
-                Height="5"
-                Margin="2,0,2,0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Background="{ThemeResource SystemAccentColor}"
-                CornerRadius="2"
-                Visibility="Collapsed" />
-
-            <!--  Border  -->
-            <Grid
-                Grid.Row="0"
-                Grid.RowSpan="2"
-                BorderBrush="{ThemeResource CalendarSeperatorBrush}"
-                BorderThickness="1,1,0,1" />
-
-            <!--  Place where full day events go.  -->
-            <Grid
-                x:Name="PART_DayDataAreaGrid"
-                Grid.Row="1"
-                Padding="6"
-                BorderBrush="{ThemeResource CalendarSeperatorBrush}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" MinHeight="35" />
-                </Grid.RowDefinitions>
-
-                <!--  Extras  -->
-                <StackPanel Grid.Column="1" HorizontalAlignment="Right" />
-
-                <!--  All events summary.  -->
-                <ScrollViewer
-                    Grid.Row="1"
-                    Grid.ColumnSpan="2"
-                    Margin="0,6"
-                    Padding="0,0,16,0">
-                    <ItemsControl x:Name="PART_AllDayItemsControl">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="data:CalendarItemViewModel">
-                                <controls:CalendarItemControl
-                                    CalendarItem="{x:Bind}"
-                                    DisplayingDate="{Binding DataContext, ElementName=PART_AllDayItemsControl}"
-                                    IsCustomEventArea="True" />
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                        <ItemsControl.ItemContainerTransitions>
-                            <TransitionCollection>
-                                <AddDeleteThemeTransition />
-                            </TransitionCollection>
-                        </ItemsControl.ItemContainerTransitions>
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Vertical" Spacing="2" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </ScrollViewer>
-            </Grid>
-
-            <VisualStateManager.VisualStateGroups>
-                <VisualStateGroup x:Name="TodayOrNotStates">
-                    <VisualState x:Name="NotTodayState" />
-                    <VisualState x:Name="TodayState">
-                        <VisualState.Setters>
-                            <Setter Target="PART_IsTodayBorder.Visibility" Value="Visible" />
-                            <Setter Target="PART_HeaderDateDayText.Foreground" Value="{ThemeResource SystemAccentColor}" />
-                            <Setter Target="PART_HeaderDateDayText.FontWeight" Value="Semibold" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-        </Grid>
-    </ControlTemplate>
-
-    <!--  Default style for DayColumnControl  -->
-    <Style TargetType="controls:DayColumnControl">
-        <Setter Property="Template" Value="{StaticResource DailyColumnControlTemplate}" />
-    </Style>
-
-
-</ResourceDictionary>
-
diff --git a/Wino.Calendar/Styles/WinoCalendarResources.xaml.cs b/Wino.Calendar/Styles/WinoCalendarResources.xaml.cs
deleted file mode 100644
index fd055e7b..00000000
--- a/Wino.Calendar/Styles/WinoCalendarResources.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Windows.UI.Xaml;
-
-namespace Wino.Calendar.Styles;
-
-public sealed partial class WinoCalendarResources : ResourceDictionary
-{
-    public WinoCalendarResources()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Styles/WinoCalendarView.xaml b/Wino.Calendar/Styles/WinoCalendarView.xaml
deleted file mode 100644
index 8259f570..00000000
--- a/Wino.Calendar/Styles/WinoCalendarView.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Calendar.Controls">
-
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="CalendarThemeResources.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style TargetType="controls:WinoCalendarView">
-        <Setter Property="VisibleDateBackground" Value="{ThemeResource WinoCalendarViewVisibleDayBackgroundBrush}" />
-
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:WinoCalendarView">
-                    <CalendarView
-                        x:Name="PART_CalendarView"
-                        BorderBrush="{ThemeResource WinoCalendarViewBorderBrush}"
-                        CalendarItemCornerRadius="5"
-                        CornerRadius="4"
-                        DayItemMargin="0"
-                        IsTodayHighlighted="False"
-                        SelectionMode="Single">
-                        <CalendarView.CalendarViewDayItemStyle>
-                            <Style TargetType="CalendarViewDayItem">
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="CalendarViewDayItem">
-                                            <Grid>
-                                                <Border
-                                                    x:Name="PART_DayViewItemBorder"
-                                                    Margin="0,-1,0,-3"
-                                                    CornerRadius="5">
-                                                    <ContentPresenter />
-                                                </Border>
-                                            </Grid>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </CalendarView.CalendarViewDayItemStyle>
-                    </CalendarView>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/Wino.Calendar/Styles/WinoDayTimelineCanvas.xaml b/Wino.Calendar/Styles/WinoDayTimelineCanvas.xaml
deleted file mode 100644
index 96257f2f..00000000
--- a/Wino.Calendar/Styles/WinoDayTimelineCanvas.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:canvas="using:Microsoft.Graphics.Canvas.UI.Xaml"
-    xmlns:controls="using:Wino.Calendar.Controls">
-
-    <!--  Background Timeline Canvas  -->
-    <Style TargetType="controls:WinoDayTimelineCanvas">
-        <Style.Setters>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="controls:WinoDayTimelineCanvas">
-                        <canvas:CanvasControl x:Name="PART_InternalCanvas" />
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-</ResourceDictionary>
diff --git a/Wino.Calendar/Views/Abstract/AccountDetailsPageAbstract.cs b/Wino.Calendar/Views/Abstract/AccountDetailsPageAbstract.cs
deleted file mode 100644
index de113056..00000000
--- a/Wino.Calendar/Views/Abstract/AccountDetailsPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public abstract class AccountDetailsPageAbstract : BasePage<AccountDetailsPageViewModel> { }
diff --git a/Wino.Calendar/Views/Abstract/AccountManagementPageAbstract.cs b/Wino.Calendar/Views/Abstract/AccountManagementPageAbstract.cs
deleted file mode 100644
index e7edd065..00000000
--- a/Wino.Calendar/Views/Abstract/AccountManagementPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public partial class AccountManagementPageAbstract : BasePage<AccountManagementViewModel> { }
diff --git a/Wino.Calendar/Views/Abstract/AppShellAbstract.cs b/Wino.Calendar/Views/Abstract/AppShellAbstract.cs
deleted file mode 100644
index 8ab81b95..00000000
--- a/Wino.Calendar/Views/Abstract/AppShellAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public abstract class AppShellAbstract : BasePage<AppShellViewModel> { }
diff --git a/Wino.Calendar/Views/Abstract/CalendarPageAbstract.cs b/Wino.Calendar/Views/Abstract/CalendarPageAbstract.cs
deleted file mode 100644
index abd1fb5f..00000000
--- a/Wino.Calendar/Views/Abstract/CalendarPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public abstract class CalendarPageAbstract : BasePage<CalendarPageViewModel> { }
diff --git a/Wino.Calendar/Views/Abstract/CalendarSettingsPageAbstract.cs b/Wino.Calendar/Views/Abstract/CalendarSettingsPageAbstract.cs
deleted file mode 100644
index 47eef1d4..00000000
--- a/Wino.Calendar/Views/Abstract/CalendarSettingsPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public abstract class CalendarSettingsPageAbstract : BasePage<CalendarSettingsPageViewModel> { }
diff --git a/Wino.Calendar/Views/Abstract/PersonalizationPageAbstract.cs b/Wino.Calendar/Views/Abstract/PersonalizationPageAbstract.cs
deleted file mode 100644
index b970f09a..00000000
--- a/Wino.Calendar/Views/Abstract/PersonalizationPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Core.ViewModels;
-
-namespace Wino.Calendar.Views.Abstract;
-
-public partial class PersonalizationPageAbstract : BasePage<PersonalizationPageViewModel> { }
diff --git a/Wino.Calendar/Views/Account/AccountManagementPage.xaml b/Wino.Calendar/Views/Account/AccountManagementPage.xaml
deleted file mode 100644
index 636a25df..00000000
--- a/Wino.Calendar/Views/Account/AccountManagementPage.xaml
+++ /dev/null
@@ -1,179 +0,0 @@
-<abstract:AccountManagementPageAbstract
-    x:Class="Wino.Calendar.Views.Account.AccountManagementPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Calendar.Views.Account"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:winuiControls="using:CommunityToolkit.WinUI.Controls"
-    x:Name="root"
-    mc:Ignorable="d">
-
-    <ScrollViewer Margin="-12,0">
-        <Grid
-            MaxWidth="900"
-            Padding="20"
-            HorizontalAlignment="Stretch"
-            RowSpacing="20">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <Grid ColumnSpacing="12">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!--  Add account button.  -->
-                <Button
-                    Grid.Row="0"
-                    Width="200"
-                    Height="200"
-                    Margin="0,12"
-                    Command="{x:Bind ViewModel.AddNewAccountCommand}">
-                    <Button.Content>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <StackPanel Spacing="12">
-                                <Viewbox Width="46">
-                                    <PathIcon Data="F1 M 17.5 9.375 C 17.5 9.544271 17.43815 9.690756 17.314453 9.814453 C 17.190754 9.938151 17.04427 10 16.875 10 L 10 10 L 10 16.875 C 10 17.044271 9.93815 17.190756 9.814453 17.314453 C 9.690755 17.43815 9.544271 17.5 9.375 17.5 C 9.205729 17.5 9.059244 17.43815 8.935547 17.314453 C 8.811849 17.190756 8.75 17.044271 8.75 16.875 L 8.75 10 L 1.875 10 C 1.705729 10 1.559245 9.938151 1.435547 9.814453 C 1.311849 9.690756 1.25 9.544271 1.25 9.375 C 1.25 9.205729 1.311849 9.059245 1.435547 8.935547 C 1.559245 8.81185 1.705729 8.75 1.875 8.75 L 8.75 8.75 L 8.75 1.875 C 8.75 1.70573 8.811849 1.559246 8.935547 1.435547 C 9.059244 1.31185 9.205729 1.25 9.375 1.25 C 9.544271 1.25 9.690755 1.31185 9.814453 1.435547 C 9.93815 1.559246 10 1.70573 10 1.875 L 10 8.75 L 16.875 8.75 C 17.04427 8.75 17.190754 8.81185 17.314453 8.935547 C 17.43815 9.059245 17.5 9.205729 17.5 9.375 Z " />
-                                </Viewbox>
-                                <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.Buttons_AddAccount}" />
-                            </StackPanel>
-                        </Grid>
-                    </Button.Content>
-                </Button>
-
-                <!--  Account Limits  -->
-                <Grid
-                    x:Name="PurchasePanel"
-                    Grid.Column="1"
-                    x:Load="{x:Bind ViewModel.IsPurchasePanelVisible, Mode=OneWay}">
-                    <winuiControls:SettingsCard
-                        Margin="0,12"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <Grid MinHeight="160" RowSpacing="6">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid ColumnSpacing="12">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Viewbox
-                                    Width="32"
-                                    Height="32"
-                                    HorizontalAlignment="Left">
-                                    <PathIcon
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Data="F1 M 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 7.5 7.451172 C 7.5 7.112631 7.568359 6.795248 7.705078 6.499023 C 7.841796 6.202801 8.024088 5.944012 8.251953 5.722656 C 8.479817 5.501303 8.745117 5.325521 9.047852 5.195312 C 9.350586 5.065105 9.667969 5.000001 10 5 C 10.338541 5.000001 10.660807 5.066732 10.966797 5.200195 C 11.272786 5.333659 11.538086 5.512695 11.762695 5.737305 C 11.987304 5.961914 12.16634 6.227214 12.299805 6.533203 C 12.433268 6.839193 12.5 7.161459 12.5 7.5 C 12.5 7.845053 12.433268 8.168945 12.299805 8.47168 C 12.16634 8.774414 11.987304 9.038086 11.762695 9.262695 C 11.538086 9.487305 11.272786 9.666342 10.966797 9.799805 C 10.660807 9.933269 10.338541 10 10 10 C 9.648438 10 9.319661 9.933269 9.013672 9.799805 C 8.707682 9.666342 8.442383 9.48405 8.217773 9.25293 C 7.993164 9.021811 7.817382 8.751628 7.69043 8.442383 C 7.563476 8.133139 7.5 7.802734 7.5 7.451172 Z M 11.25 7.5 C 11.25 7.330729 11.217447 7.169597 11.152344 7.016602 C 11.087239 6.863607 10.997721 6.730145 10.883789 6.616211 C 10.769856 6.502279 10.636393 6.412761 10.483398 6.347656 C 10.330403 6.282553 10.169271 6.25 10 6.25 C 9.824219 6.25 9.661458 6.282553 9.511719 6.347656 C 9.361979 6.412761 9.230143 6.502279 9.116211 6.616211 C 9.002278 6.730145 8.91276 6.86198 8.847656 7.011719 C 8.782552 7.161459 8.75 7.324219 8.75 7.5 C 8.75 7.675781 8.782552 7.84017 8.847656 7.993164 C 8.91276 8.146159 9.00065 8.277995 9.111328 8.388672 C 9.222005 8.49935 9.353841 8.58724 9.506836 8.652344 C 9.65983 8.717448 9.824219 8.75 10 8.75 C 10.175781 8.75 10.338541 8.717448 10.488281 8.652344 C 10.638021 8.58724 10.769856 8.497722 10.883789 8.383789 C 10.997721 8.269857 11.087239 8.138021 11.152344 7.988281 C 11.217447 7.838542 11.25 7.675781 11.25 7.5 Z M 5.488281 12.880859 C 5.488281 12.639975 5.530599 12.41862 5.615234 12.216797 C 5.69987 12.014975 5.81543 11.842448 5.961914 11.699219 C 6.108398 11.55599 6.282552 11.445312 6.484375 11.367188 C 6.686198 11.289062 6.907552 11.25 7.148438 11.25 L 12.851562 11.25 C 13.092447 11.25 13.313801 11.289062 13.515625 11.367188 C 13.717447 11.445312 13.891602 11.55599 14.038086 11.699219 C 14.18457 11.842448 14.30013 12.014975 14.384766 12.216797 C 14.4694 12.41862 14.511719 12.639975 14.511719 12.880859 C 14.511719 13.525391 14.379883 14.0625 14.116211 14.492188 C 13.852539 14.921875 13.505859 15.266928 13.076172 15.527344 C 12.646484 15.787761 12.163086 15.973308 11.625977 16.083984 C 11.088867 16.194662 10.546875 16.25 10 16.25 C 9.453125 16.25 8.911133 16.194662 8.374023 16.083984 C 7.836914 15.973308 7.353516 15.787761 6.923828 15.527344 C 6.494141 15.266928 6.147461 14.921875 5.883789 14.492188 C 5.620117 14.0625 5.488281 13.525391 5.488281 12.880859 Z M 13.261719 12.832031 C 13.261719 12.701823 13.221028 12.613933 13.139648 12.568359 C 13.058268 12.522787 12.962239 12.5 12.851562 12.5 L 7.148438 12.5 C 7.03776 12.5 6.941731 12.522787 6.860352 12.568359 C 6.778971 12.613933 6.738281 12.701823 6.738281 12.832031 C 6.738281 13.294271 6.839192 13.666992 7.041016 13.950195 C 7.242838 14.233398 7.501627 14.453125 7.817383 14.609375 C 8.133138 14.765625 8.483072 14.869792 8.867188 14.921875 C 9.251302 14.973959 9.628906 15 10 15 C 10.371094 15 10.748697 14.973959 11.132812 14.921875 C 11.516927 14.869792 11.866861 14.765625 12.182617 14.609375 C 12.498371 14.453125 12.75716 14.233398 12.958984 13.950195 C 13.160807 13.666992 13.261719 13.294271 13.261719 12.832031 Z " />
-                                </Viewbox>
-
-                                <TextBlock
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    FontWeight="SemiBold"
-                                    Style="{StaticResource BodyTextBlockStyle}"
-                                    Text="{x:Bind domain:Translator.WinoUpgradeDescription}"
-                                    TextTrimming="CharacterEllipsis" />
-                            </Grid>
-
-                            <StackPanel
-                                Grid.Row="2"
-                                VerticalAlignment="Center"
-                                Spacing="12">
-
-                                <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind ViewModel.UsedAccountsString, Mode=OneWay}" />
-                                <muxc:ProgressBar
-                                    Maximum="{x:Bind ViewModel.FREE_ACCOUNT_COUNT}"
-                                    ShowError="{x:Bind ViewModel.IsAccountCreationBlocked, Mode=OneWay}"
-                                    ShowPaused="{x:Bind ViewModel.IsAccountCreationAlmostOnLimit, Mode=OneWay}"
-                                    Value="{x:Bind ViewModel.Accounts.Count, Mode=OneWay}" />
-                            </StackPanel>
-
-                            <Button
-                                Grid.Row="3"
-                                MinHeight="45"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Bottom"
-                                Command="{x:Bind ViewModel.PurchaseUnlimitedAccountCommand}"
-                                Style="{StaticResource AccentButtonStyle}">
-                                <StackPanel Orientation="Horizontal" Spacing="6">
-                                    <PathIcon
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Data="F1 M 1.25 7.480469 C 1.25 7.207031 1.329753 6.956381 1.489258 6.728516 C 1.648763 6.500651 1.858724 6.344401 2.119141 6.259766 L 3.857422 5.703125 C 4.065755 5.631511 4.264323 5.533854 4.453125 5.410156 C 4.641927 5.286459 4.811198 5.14974 4.960938 5 C 5.286458 4.674479 5.517578 4.303386 5.654297 3.886719 L 6.220703 2.138672 C 6.305338 1.878256 6.463216 1.665039 6.694336 1.499023 C 6.925456 1.333008 7.177734 1.25 7.451172 1.25 C 7.724609 1.25 7.976888 1.328125 8.208008 1.484375 C 8.439127 1.640625 8.60026 1.852215 8.691406 2.119141 L 9.257812 3.847656 C 9.394531 4.277344 9.628906 4.658203 9.960938 4.990234 C 10.279947 5.315756 10.660807 5.550131 11.103516 5.693359 L 12.822266 6.259766 C 13.102213 6.350912 13.326822 6.507162 13.496094 6.728516 C 13.665364 6.94987 13.75 7.210287 13.75 7.509766 C 13.75 7.776693 13.668619 8.025717 13.505859 8.256836 C 13.343099 8.487956 13.134766 8.645834 12.880859 8.730469 L 11.142578 9.296875 C 10.712891 9.433594 10.332031 9.667969 10 10 C 9.791666 10.208334 9.624023 10.445964 9.49707 10.712891 C 9.370117 10.979818 9.262695 11.253256 9.174805 11.533203 C 9.086914 11.813151 9.003906 12.084961 8.925781 12.348633 C 8.847656 12.612305 8.75 12.848308 8.632812 13.056641 C 8.515625 13.264975 8.369141 13.432617 8.193359 13.55957 C 8.017578 13.686523 7.786458 13.75 7.5 13.75 C 7.226562 13.75 6.974283 13.670248 6.743164 13.510742 C 6.512044 13.351237 6.354167 13.141276 6.269531 12.880859 L 5.703125 11.142578 C 5.651042 10.979818 5.587565 10.825195 5.512695 10.678711 C 5.437825 10.532227 5.348307 10.393881 5.244141 10.263672 C 5.022786 9.983725 4.770508 9.76237 4.487305 9.599609 C 4.204102 9.43685 3.916016 9.303386 3.623047 9.199219 C 3.330078 9.095053 3.040365 9.005534 2.753906 8.930664 C 2.467448 8.855795 2.213542 8.761394 1.992188 8.647461 C 1.770833 8.533529 1.591797 8.388672 1.455078 8.212891 C 1.318359 8.037109 1.25 7.792969 1.25 7.480469 Z M 12.470703 7.548828 C 11.975911 7.360026 11.502278 7.185873 11.049805 7.026367 C 10.59733 6.866863 10.179036 6.671551 9.794922 6.44043 C 9.410807 6.209311 9.070638 5.922852 8.774414 5.581055 C 8.478189 5.239258 8.242188 4.791667 8.066406 4.238281 L 7.509766 2.519531 L 6.855469 4.238281 C 6.738281 4.550782 6.601562 4.840496 6.445312 5.107422 C 6.289062 5.37435 6.09375 5.628256 5.859375 5.869141 C 5.638021 6.090496 5.388997 6.290691 5.112305 6.469727 C 4.835612 6.648764 4.547526 6.787109 4.248047 6.884766 L 2.519531 7.441406 C 3.007812 7.630209 3.476562 7.804363 3.925781 7.963867 C 4.375 8.123373 4.788411 8.318686 5.166016 8.549805 C 5.54362 8.780925 5.880534 9.069011 6.176758 9.414062 C 6.472981 9.759115 6.708984 10.205078 6.884766 10.751953 L 7.441406 12.470703 L 8.095703 10.751953 C 8.336588 10.120443 8.673502 9.573568 9.106445 9.111328 C 9.539388 8.649089 10.084635 8.313803 10.742188 8.105469 Z M 11.25 14.960938 C 11.25 14.759115 11.315104 14.573568 11.445312 14.404297 C 11.575521 14.235026 11.735025 14.117839 11.923828 14.052734 L 12.890625 13.740234 C 13.111979 13.66862 13.284505 13.557943 13.408203 13.408203 C 13.5319 13.258464 13.631184 13.09082 13.706055 12.905273 C 13.780924 12.719727 13.8444 12.529297 13.896484 12.333984 C 13.948566 12.138672 14.015299 11.961264 14.09668 11.801758 C 14.17806 11.642253 14.285481 11.510417 14.418945 11.40625 C 14.552408 11.302084 14.739582 11.25 14.980469 11.25 C 15.188801 11.25 15.382486 11.31185 15.561523 11.435547 C 15.74056 11.559245 15.86263 11.722006 15.927734 11.923828 C 15.966797 12.054037 16.00423 12.185873 16.040039 12.319336 C 16.075846 12.4528 16.116535 12.583008 16.162109 12.709961 C 16.207682 12.836914 16.26302 12.960612 16.328125 13.081055 C 16.393229 13.201498 16.474609 13.310547 16.572266 13.408203 C 16.676432 13.518881 16.803385 13.605144 16.953125 13.666992 C 17.102863 13.728842 17.259113 13.785808 17.421875 13.837891 C 17.584635 13.889975 17.745768 13.942058 17.905273 13.994141 C 18.064777 14.046225 18.206379 14.112956 18.330078 14.194336 C 18.453775 14.275717 18.554688 14.379883 18.632812 14.506836 C 18.710938 14.633789 18.75 14.794922 18.75 14.990234 C 18.75 15.205078 18.689777 15.400391 18.569336 15.576172 C 18.448893 15.751953 18.284504 15.875651 18.076172 15.947266 C 17.952473 15.986328 17.823893 16.023764 17.69043 16.05957 C 17.556965 16.095377 17.423502 16.136068 17.290039 16.181641 C 17.156574 16.227215 17.029621 16.282553 16.90918 16.347656 C 16.788736 16.41276 16.679688 16.494141 16.582031 16.591797 C 16.425781 16.754559 16.310221 16.958008 16.235352 17.202148 C 16.16048 17.446289 16.082355 17.68392 16.000977 17.915039 C 15.919596 18.146158 15.807291 18.3431 15.664062 18.505859 C 15.520833 18.668619 15.299479 18.75 15 18.75 C 14.791666 18.75 14.597981 18.68815 14.418945 18.564453 C 14.239908 18.440756 14.117838 18.277994 14.052734 18.076172 C 14.013672 17.958984 13.976236 17.832031 13.94043 17.695312 C 13.904621 17.558594 13.863932 17.423502 13.818359 17.290039 C 13.772786 17.156576 13.717447 17.027994 13.652344 16.904297 C 13.587239 16.7806 13.509114 16.673178 13.417969 16.582031 C 13.30078 16.471354 13.167316 16.383463 13.017578 16.318359 C 12.867838 16.253256 12.713216 16.196289 12.553711 16.147461 C 12.394205 16.098633 12.236328 16.049805 12.080078 16.000977 C 11.923828 15.952148 11.783854 15.887045 11.660156 15.805664 C 11.536458 15.724284 11.437174 15.616862 11.362305 15.483398 C 11.287435 15.349936 11.25 15.175781 11.25 14.960938 Z M 16.943359 15 C 16.66341 14.915365 16.420898 14.816081 16.21582 14.702148 C 16.010742 14.588217 15.833332 14.454753 15.683594 14.301758 C 15.533854 14.148764 15.403646 13.969727 15.292969 13.764648 C 15.182291 13.55957 15.078125 13.320312 14.980469 13.046875 C 14.902344 13.313803 14.806314 13.548178 14.692383 13.75 C 14.57845 13.951823 14.443359 14.130859 14.287109 14.287109 C 14.130859 14.443359 13.951822 14.580078 13.75 14.697266 C 13.548176 14.814453 13.317057 14.915365 13.056641 15 C 13.583984 15.14974 14.00065 15.382487 14.306641 15.698242 C 14.612629 16.013998 14.843749 16.432291 15 16.953125 C 15.097655 16.673178 15.200194 16.432291 15.307617 16.230469 C 15.415038 16.028646 15.543619 15.852865 15.693359 15.703125 C 15.843099 15.553386 16.017252 15.423178 16.21582 15.3125 C 16.414387 15.201823 16.6569 15.097656 16.943359 15 Z " />
-                                    <TextBlock
-                                        Text="{x:Bind domain:Translator.WinoUpgradeMessage}"
-                                        TextAlignment="Center"
-                                        TextWrapping="WrapWholeWords" />
-                                </StackPanel>
-                            </Button>
-                        </Grid>
-                    </winuiControls:SettingsCard>
-                </Grid>
-            </Grid>
-
-            <!--  Current Accounts  -->
-            <ListView
-                x:Name="AccountsListView"
-                Grid.Row="1"
-                x:Load="{x:Bind ViewModel.HasAccountsDefined, Mode=OneWay}"
-                ItemContainerStyle="{StaticResource StretchedItemContainerStyle}"
-                ItemTemplate="{StaticResource RootAccountTemplate}"
-                ItemsSource="{x:Bind ViewModel.Accounts, Mode=OneWay}"
-                SelectionMode="None">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <ItemsStackPanel Orientation="Vertical" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-            </ListView>
-
-            <!--  No Accounts Panel  -->
-            <!--  TODO: Shared  -->
-
-            <Grid
-                x:Name="NoAccountsPanel"
-                Grid.Row="1"
-                x:Load="{x:Bind ViewModel.HasAccountsDefined, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}">
-                <StackPanel
-                    Margin="0,150,0,0"
-                    VerticalAlignment="Top"
-                    Spacing="12">
-                    <Viewbox
-                        Width="90"
-                        Height="90"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <PathIcon
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Data="F1 M 18.066406 6.71875 C 18.359375 6.881512 18.626301 7.081707 18.867188 7.319336 C 19.108072 7.556967 19.311523 7.817383 19.477539 8.100586 C 19.643555 8.383789 19.772135 8.686523 19.863281 9.008789 C 19.954426 9.331055 20 9.661459 20 10 L 18.75 10 C 18.75 9.661459 18.683268 9.339193 18.549805 9.033203 C 18.41634 8.727214 18.237305 8.461914 18.012695 8.237305 C 17.788086 8.012696 17.522785 7.83366 17.216797 7.700195 C 16.910807 7.566732 16.588541 7.5 16.25 7.5 C 15.904947 7.5 15.581054 7.566732 15.27832 7.700195 C 14.975585 7.83366 14.711913 8.012696 14.487305 8.237305 C 14.262694 8.461914 14.083658 8.727214 13.950195 9.033203 C 13.816731 9.339193 13.75 9.661459 13.75 10 C 13.75 10.592448 13.614908 11.1556 13.344727 11.689453 C 13.074544 12.223308 12.701822 12.666016 12.226562 13.017578 C 12.649738 13.232422 13.032226 13.497722 13.374023 13.813477 C 13.715819 14.129232 14.00716 14.480795 14.248047 14.868164 C 14.488932 15.255534 14.674479 15.672201 14.804688 16.118164 C 14.934895 16.564127 14.999999 17.02474 15 17.5 L 13.75 17.5 C 13.75 16.985678 13.650716 16.50065 13.452148 16.044922 C 13.25358 15.589193 12.985025 15.192058 12.646484 14.853516 C 12.307942 14.514975 11.910807 14.24642 11.455078 14.047852 C 10.999349 13.849284 10.514322 13.75 10 13.75 C 9.485677 13.75 9.00065 13.849284 8.544922 14.047852 C 8.089192 14.24642 7.692057 14.514975 7.353516 14.853516 C 7.014974 15.192058 6.746419 15.589193 6.547852 16.044922 C 6.349284 16.50065 6.25 16.985678 6.25 17.5 L 5 17.5 C 5 17.02474 5.065104 16.564127 5.195312 16.118164 C 5.325521 15.672201 5.511067 15.255534 5.751953 14.868164 C 5.992838 14.480795 6.28418 14.129232 6.625977 13.813477 C 6.967773 13.497722 7.35026 13.232422 7.773438 13.017578 C 7.298177 12.666016 6.925455 12.223308 6.655273 11.689453 C 6.385091 11.1556 6.25 10.592448 6.25 10 C 6.25 9.661459 6.183268 9.339193 6.049805 9.033203 C 5.916341 8.727214 5.737305 8.461914 5.512695 8.237305 C 5.288086 8.012696 5.022786 7.83366 4.716797 7.700195 C 4.410807 7.566732 4.088542 7.5 3.75 7.5 C 3.404948 7.5 3.081055 7.566732 2.77832 7.700195 C 2.475586 7.83366 2.211914 8.012696 1.987305 8.237305 C 1.762695 8.461914 1.583659 8.727214 1.450195 9.033203 C 1.316732 9.339193 1.25 9.661459 1.25 10 L 0 10 C 0 9.661459 0.045573 9.331055 0.136719 9.008789 C 0.227865 8.686523 0.356445 8.383789 0.522461 8.100586 C 0.688477 7.817383 0.891927 7.556967 1.132812 7.319336 C 1.373698 7.081707 1.640625 6.881512 1.933594 6.71875 C 1.71875 6.490887 1.551107 6.227215 1.430664 5.927734 C 1.310221 5.628256 1.25 5.319011 1.25 5 C 1.25 4.661459 1.316732 4.339193 1.450195 4.033203 C 1.583659 3.727215 1.762695 3.461914 1.987305 3.237305 C 2.211914 3.012695 2.475586 2.83366 2.77832 2.700195 C 3.081055 2.566732 3.404948 2.5 3.75 2.5 C 4.088542 2.5 4.410807 2.566732 4.716797 2.700195 C 5.022786 2.83366 5.288086 3.012695 5.512695 3.237305 C 5.737305 3.461914 5.916341 3.727215 6.049805 4.033203 C 6.183268 4.339193 6.25 4.661459 6.25 5 C 6.25 5.319011 6.189778 5.628256 6.069336 5.927734 C 5.948893 6.227215 5.78125 6.490887 5.566406 6.71875 C 6.10026 7.011719 6.536458 7.415365 6.875 7.929688 C 7.226562 7.408854 7.677409 6.998698 8.227539 6.699219 C 8.777669 6.39974 9.368489 6.25 10 6.25 C 10.63151 6.25 11.22233 6.39974 11.772461 6.699219 C 12.32259 6.998698 12.773437 7.408854 13.125 7.929688 C 13.463541 7.415365 13.899739 7.011719 14.433594 6.71875 C 14.21875 6.490887 14.051106 6.227215 13.930664 5.927734 C 13.810221 5.628256 13.75 5.319011 13.75 5 C 13.75 4.661459 13.816731 4.339193 13.950195 4.033203 C 14.083658 3.727215 14.262694 3.461914 14.487305 3.237305 C 14.711913 3.012695 14.975585 2.83366 15.27832 2.700195 C 15.581054 2.566732 15.904947 2.5 16.25 2.5 C 16.588541 2.5 16.910807 2.566732 17.216797 2.700195 C 17.522785 2.83366 17.788086 3.012695 18.012695 3.237305 C 18.237305 3.461914 18.41634 3.727215 18.549805 4.033203 C 18.683268 4.339193 18.75 4.661459 18.75 5 C 18.75 5.319011 18.689777 5.628256 18.569336 5.927734 C 18.448893 6.227215 18.28125 6.490887 18.066406 6.71875 Z M 2.5 5 C 2.5 5.175782 2.532552 5.338543 2.597656 5.488281 C 2.66276 5.638021 2.752279 5.769857 2.866211 5.883789 C 2.980143 5.997723 3.111979 6.08724 3.261719 6.152344 C 3.411458 6.217448 3.574219 6.25 3.75 6.25 C 3.925781 6.25 4.088542 6.217448 4.238281 6.152344 C 4.388021 6.08724 4.519856 5.997723 4.633789 5.883789 C 4.747721 5.769857 4.837239 5.638021 4.902344 5.488281 C 4.967448 5.338543 5 5.175782 5 5 C 5 4.82422 4.967448 4.661459 4.902344 4.511719 C 4.837239 4.361979 4.747721 4.230144 4.633789 4.116211 C 4.519856 4.002279 4.388021 3.912762 4.238281 3.847656 C 4.088542 3.782553 3.925781 3.75 3.75 3.75 C 3.574219 3.75 3.411458 3.782553 3.261719 3.847656 C 3.111979 3.912762 2.980143 4.002279 2.866211 4.116211 C 2.752279 4.230144 2.66276 4.361979 2.597656 4.511719 C 2.532552 4.661459 2.5 4.82422 2.5 5 Z M 10 12.5 C 10.338541 12.5 10.660807 12.433269 10.966797 12.299805 C 11.272786 12.166342 11.538086 11.987305 11.762695 11.762695 C 11.987304 11.538086 12.16634 11.274414 12.299805 10.97168 C 12.433268 10.668945 12.5 10.345053 12.5 10 C 12.5 9.661459 12.433268 9.339193 12.299805 9.033203 C 12.16634 8.727214 11.987304 8.461914 11.762695 8.237305 C 11.538086 8.012696 11.272786 7.83366 10.966797 7.700195 C 10.660807 7.566732 10.338541 7.5 10 7.5 C 9.654947 7.5 9.331055 7.566732 9.02832 7.700195 C 8.725586 7.83366 8.461914 8.012696 8.237305 8.237305 C 8.012695 8.461914 7.833659 8.727214 7.700195 9.033203 C 7.566731 9.339193 7.5 9.661459 7.5 10 C 7.5 10.345053 7.566731 10.668945 7.700195 10.97168 C 7.833659 11.274414 8.012695 11.538086 8.237305 11.762695 C 8.461914 11.987305 8.725586 12.166342 9.02832 12.299805 C 9.331055 12.433269 9.654947 12.5 10 12.5 Z M 15 5 C 14.999999 5.175782 15.032551 5.338543 15.097656 5.488281 C 15.16276 5.638021 15.252278 5.769857 15.366211 5.883789 C 15.480143 5.997723 15.611979 6.08724 15.761719 6.152344 C 15.911458 6.217448 16.074219 6.25 16.25 6.25 C 16.425781 6.25 16.588541 6.217448 16.738281 6.152344 C 16.88802 6.08724 17.019855 5.997723 17.133789 5.883789 C 17.247721 5.769857 17.337238 5.638021 17.402344 5.488281 C 17.467447 5.338543 17.5 5.175782 17.5 5 C 17.5 4.82422 17.467447 4.661459 17.402344 4.511719 C 17.337238 4.361979 17.247721 4.230144 17.133789 4.116211 C 17.019855 4.002279 16.88802 3.912762 16.738281 3.847656 C 16.588541 3.782553 16.425781 3.75 16.25 3.75 C 16.074219 3.75 15.911458 3.782553 15.761719 3.847656 C 15.611979 3.912762 15.480143 4.002279 15.366211 4.116211 C 15.252278 4.230144 15.16276 4.361979 15.097656 4.511719 C 15.032551 4.661459 14.999999 4.82422 15 5 Z " />
-                    </Viewbox>
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource SubheaderTextBlockStyle}"
-                        Text="{x:Bind domain:Translator.SettingsNoAccountSetupMessage}" />
-                </StackPanel>
-            </Grid>
-        </Grid>
-    </ScrollViewer>
-</abstract:AccountManagementPageAbstract>
diff --git a/Wino.Calendar/Views/Account/AccountManagementPage.xaml.cs b/Wino.Calendar/Views/Account/AccountManagementPage.xaml.cs
deleted file mode 100644
index 4e63cca5..00000000
--- a/Wino.Calendar/Views/Account/AccountManagementPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Calendar.Views.Abstract;
-
-namespace Wino.Calendar.Views.Account;
-
-public sealed partial class AccountManagementPage : AccountManagementPageAbstract
-{
-    public AccountManagementPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Views/AppShell.xaml b/Wino.Calendar/Views/AppShell.xaml
deleted file mode 100644
index a8b31d8f..00000000
--- a/Wino.Calendar/Views/AppShell.xaml
+++ /dev/null
@@ -1,405 +0,0 @@
-<abstract:AppShellAbstract
-    x:Class="Wino.Calendar.Views.AppShell"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-    xmlns:calendarControls="using:Wino.Calendar.Controls"
-    xmlns:communityControls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Calendar.ViewModels.Data"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Calendar.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <coreSelectors:NavigationMenuTemplateSelector
-            x:Key="NavigationMenuTemplateSelector"
-            AccountManagementTemplate="{StaticResource ManageAccountsTemplate}"
-            RatingItemTemplate="{StaticResource RatingItemTemplate}"
-            SeperatorTemplate="{StaticResource SeperatorTemplate}"
-            SettingsItemTemplate="{StaticResource SettingsItemTemplate}" />
-
-        <Style
-            x:Key="CalendarNavigationButtonStyle"
-            BasedOn="{StaticResource DefaultButtonStyle}"
-            TargetType="Button">
-            <Setter Property="Margin" Value="0,4,0,0" />
-            <Setter Property="Padding" Value="8,4,8,6" />
-            <Setter Property="CornerRadius" Value="6" />
-            <Setter Property="Width" Value="40" />
-        </Style>
-    </Page.Resources>
-
-    <Grid
-        x:Name="RootGrid"
-        Padding="0"
-        ColumnSpacing="0"
-        RowSpacing="0">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="48" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="48" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <!--  CoreWindowText="{x:Bind ViewModel.StatePersistenceService.CoreWindowTitle, Mode=OneWay}"  -->
-        <coreControls:WinoAppTitleBar
-            x:Name="RealAppBar"
-            Grid.ColumnSpan="2"
-            BackButtonClicked="AppBarBackButtonClicked"
-            Canvas.ZIndex="150"
-            ConnectionStatus="{x:Bind ViewModel.ActiveConnectionStatus, Mode=OneWay}"
-            CoreWindowText="Wino Calendar"
-            IsBackButtonVisible="{x:Bind ViewModel.StatePersistenceService.IsBackButtonVisible, Mode=OneWay}"
-            IsNavigationPaneOpen="{x:Bind MainSplitView.IsPaneOpen, Mode=TwoWay}"
-            NavigationViewDisplayMode="{x:Bind helpers:XamlHelpers.NavigationViewDisplayModeConverter(MainSplitView.DisplayMode), Mode=OneWay}"
-            OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=OneWay}"
-            ReconnectCommand="{x:Bind ViewModel.ReconnectServerCommand}"
-            ShrinkShellContentOnExpansion="False"
-            SystemReserved="180">
-            <coreControls:WinoAppTitleBar.ShellFrameContent>
-                <Grid Margin="4,0,0,0" ColumnSpacing="12">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <Grid
-                        x:Name="DragArea"
-                        Grid.ColumnSpan="3"
-                        Background="Transparent" />
-
-                    <Grid x:Name="ShellContentArea" ColumnSpacing="12">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="3*" />
-                            <ColumnDefinition Width="7*" />
-                        </Grid.ColumnDefinitions>
-                        <AutoSuggestBox
-                            x:Name="SearchBox"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Center"
-                            BorderBrush="Transparent"
-                            PlaceholderText="Search" />
-
-                        <StackPanel
-                            x:Name="NavigationTitleStack"
-                            Grid.Column="1"
-                            Margin="0,0,12,4"
-                            Orientation="Horizontal"
-                            Spacing="6">
-                            <Button
-                                x:Name="PreviousDateButton"
-                                Click="PreviousDateClicked"
-                                Style="{StaticResource CalendarNavigationButtonStyle}">
-                                <PathIcon x:Name="PreviousDateButtonPathIcon" Data="F1 M 8.72 18.599998 C 8.879999 18.733334 9.059999 18.799999 9.26 18.799999 C 9.459999 18.799999 9.633332 18.719999 9.78 18.559999 C 9.926666 18.4 10 18.219999 10 18.019999 C 10 17.82 9.92 17.653332 9.76 17.52 L 4.52 12.559999 L 17.24 12.559999 C 17.453333 12.559999 17.633331 12.486667 17.779999 12.339999 C 17.926666 12.193334 18 12.013333 18 11.799999 C 18 11.586666 17.926666 11.406667 17.779999 11.259999 C 17.633331 11.113333 17.453333 11.039999 17.24 11.039999 L 4.52 11.039999 L 9.76 6.08 C 9.973333 5.893333 10.046666 5.653332 9.98 5.359999 C 9.913333 5.066666 9.74 4.880001 9.46 4.799999 C 9.179999 4.720001 8.933332 4.786667 8.72 5 L 2.32 11.08 C 2.16 11.24 2.053333 11.426666 2 11.639999 C 1.973333 11.746666 1.973333 11.853333 2 11.959999 C 2.053333 12.173333 2.16 12.360001 2.32 12.52 Z " />
-                            </Button>
-
-                            <Button
-                                x:Name="NextDateButton"
-                                Click="NextDateClicked"
-                                Style="{StaticResource CalendarNavigationButtonStyle}">
-                                <PathIcon x:Name="NextDateButtonPathIcon" Data="F1 M 11.28 5 C 11.12 4.866667 10.94 4.806667 10.74 4.82 C 10.539999 4.833334 10.366666 4.913334 10.219999 5.059999 C 10.073333 5.206665 10 5.379999 10 5.58 C 10 5.779999 10.08 5.946667 10.24 6.08 L 15.48 11.039999 L 2.76 11.039999 C 2.546667 11.039999 2.366667 11.113333 2.22 11.259999 C 2.073333 11.406667 2 11.586666 2 11.799999 C 2 12.013333 2.073333 12.193334 2.22 12.339999 C 2.366667 12.486667 2.546667 12.559999 2.76 12.559999 L 15.48 12.559999 L 10.24 17.52 C 10.026667 17.706665 9.953333 17.946667 10.02 18.24 C 10.086666 18.533333 10.259999 18.719999 10.54 18.799999 C 10.82 18.879999 11.066667 18.813334 11.28 18.599998 L 17.68 12.52 C 17.84 12.360001 17.946667 12.173333 18 11.959999 C 18 11.853333 18 11.746666 18 11.639999 C 17.946667 11.426666 17.84 11.24 17.68 11.08 Z " />
-                            </Button>
-
-                            <calendarControls:CustomCalendarFlipView
-                                x:Name="DayHeaderNavigationItemsFlipView"
-                                MaxHeight="30"
-                                Margin="8,4,0,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Left"
-                                Background="Transparent"
-                                FontSize="14"
-                                FontWeight="Normal"
-                                IsHitTestVisible="False"
-                                ItemsSource="{x:Bind ViewModel.DateNavigationHeaderItems}"
-                                SelectedIndex="{x:Bind ViewModel.SelectedDateNavigationHeaderIndex, Mode=OneWay}">
-                                <FlipView.ItemTemplate>
-                                    <DataTemplate>
-                                        <TextBlock
-                                            VerticalAlignment="Center"
-                                            FontSize="18"
-                                            Style="{StaticResource BodyTextBlockStyle}"
-                                            Text="{Binding}" />
-                                    </DataTemplate>
-                                </FlipView.ItemTemplate>
-                            </calendarControls:CustomCalendarFlipView>
-                        </StackPanel>
-                    </Grid>
-
-                    <calendarControls:WinoCalendarTypeSelectorControl
-                        x:Name="CalendarTypeSelector"
-                        Grid.Column="2"
-                        HorizontalAlignment="Right"
-                        DisplayDayCount="{x:Bind ViewModel.StatePersistenceService.DayDisplayCount, Mode=OneWay}"
-                        SelectedType="{x:Bind ViewModel.StatePersistenceService.CalendarDisplayType, Mode=TwoWay}"
-                        TodayClickedCommand="{x:Bind ViewModel.TodayClickedCommand}" />
-                </Grid>
-            </coreControls:WinoAppTitleBar.ShellFrameContent>
-        </coreControls:WinoAppTitleBar>
-
-        <Grid
-            Grid.RowSpan="2"
-            Grid.ColumnSpan="2"
-            Background="{ThemeResource WinoApplicationBackgroundColor}"
-            IsHitTestVisible="False">
-            <Grid.BackgroundTransition>
-                <BrushTransition />
-            </Grid.BackgroundTransition>
-        </Grid>
-
-        <SplitView
-            x:Name="MainSplitView"
-            Grid.Row="1"
-            Grid.ColumnSpan="3"
-            Background="Transparent"
-            DisplayMode="Inline"
-            IsPaneOpen="{x:Bind ViewModel.PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
-            PaneBackground="Transparent">
-            <SplitView.Pane>
-                <Grid Padding="0,20,0,6">
-                    <Grid.RowDefinitions>
-
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <calendarControls:WinoCalendarView
-                        x:Name="CalendarView"
-                        Grid.Row="0"
-                        HorizontalAlignment="Center"
-                        DateClickedCommand="{x:Bind ViewModel.DateClickedCommand}"
-                        HighlightedDateRange="{x:Bind ViewModel.HighlightedDateRange, Mode=OneWay}"
-                        TodayBackgroundColor="{ThemeResource SystemAccentColor}" />
-
-
-                    <!--  Account Calendars Host  -->
-                    <ListView
-                        x:Name="CalendarHostListView"
-                        Grid.Row="1"
-                        ItemsSource="{x:Bind ViewModel.AccountCalendarStateService.GroupedAccountCalendars}"
-                        SelectionMode="None">
-                        <ListView.Header>
-                            <TextBlock
-                                Margin="20,12,12,12"
-                                FontSize="16"
-                                Text="Calendars" />
-                        </ListView.Header>
-                        <ListView.ItemTemplate>
-                            <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
-                                <muxc:Expander
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
-                                    <muxc:Expander.Header>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto" />
-                                                <ColumnDefinition Width="*" />
-                                            </Grid.ColumnDefinitions>
-
-                                            <CheckBox
-                                                Width="26"
-                                                MinWidth="0"
-                                                IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
-                                                IsThreeState="True" />
-
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                TextWrapping="Wrap">
-                                                <Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
-                                                <Run FontSize="12" Text="(" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
-                                            </TextBlock>
-                                        </Grid>
-                                    </muxc:Expander.Header>
-                                    <muxc:Expander.Content>
-                                        <ItemsControl ItemsSource="{x:Bind AccountCalendars}">
-                                            <ItemsControl.ItemTemplate>
-                                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
-                                                    <CheckBox
-                                                        HorizontalAlignment="Stretch"
-                                                        VerticalAlignment="Center"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        VerticalContentAlignment="Stretch"
-                                                        IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
-                                                        <Grid Margin="0,0,0,5" ColumnSpacing="6">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="Auto" />
-                                                                <ColumnDefinition Width="*" />
-                                                            </Grid.ColumnDefinitions>
-
-                                                            <Ellipse
-                                                                Width="20"
-                                                                Height="20"
-                                                                Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
-
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                VerticalAlignment="Center"
-                                                                FontSize="14"
-                                                                Text="{x:Bind Name, Mode=OneWay}"
-                                                                TextWrapping="Wrap" />
-                                                        </Grid>
-                                                        <!--<Border
-                                                            Margin="0,0,0,4"
-                                                            Padding="4,2,4,2"
-                                                            HorizontalAlignment="Stretch"
-                                                            VerticalAlignment="Center"
-                                                            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
-                                                            CornerRadius="3">
-
-                                                        </Border>-->
-                                                    </CheckBox>
-                                                </DataTemplate>
-                                            </ItemsControl.ItemTemplate>
-                                        </ItemsControl>
-                                    </muxc:Expander.Content>
-                                </muxc:Expander>
-                            </DataTemplate>
-                        </ListView.ItemTemplate>
-                        <ListView.Footer>
-                            <Button
-                                Margin="14,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom"
-                                Command="{x:Bind ViewModel.SyncCommand}"
-                                Content="Test Sync" />
-                        </ListView.Footer>
-                    </ListView>
-
-                    <!--  Menu Items  -->
-                    <ListView
-                        Grid.Row="2"
-                        ItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
-                        SelectedIndex="{x:Bind ViewModel.SelectedMenuItemIndex, Mode=TwoWay}">
-                        <ListView.Items>
-                            <ListViewItem>
-                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <PathIcon
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Data="F1 M 2.5 3.75 L 2.5 3.671875 C 2.5 3.164062 2.600911 2.687176 2.802734 2.241211 C 3.004557 1.795248 3.277995 1.40625 3.623047 1.074219 C 3.968099 0.742188 4.366862 0.480145 4.819336 0.288086 C 5.27181 0.096029 5.748698 0 6.25 0 C 6.770833 0 7.259114 0.097656 7.714844 0.292969 C 8.170572 0.488281 8.567708 0.755209 8.90625 1.09375 C 9.244791 1.432293 9.511719 1.829428 9.707031 2.285156 C 9.902344 2.740887 10 3.229168 10 3.75 C 10 4.270834 9.902344 4.759115 9.707031 5.214844 C 9.511719 5.670573 9.244791 6.067709 8.90625 6.40625 C 8.567708 6.744792 8.170572 7.011719 7.714844 7.207031 C 7.259114 7.402344 6.770833 7.5 6.25 7.5 C 5.729167 7.5 5.240885 7.402344 4.785156 7.207031 C 4.329427 7.011719 3.932292 6.744792 3.59375 6.40625 C 3.255208 6.067709 2.988281 5.670573 2.792969 5.214844 C 2.597656 4.759115 2.5 4.270834 2.5 3.75 Z M 8.75 3.75 L 8.75 3.701172 C 8.75 3.362631 8.681641 3.045248 8.544922 2.749023 C 8.408203 2.452801 8.225911 2.194012 7.998047 1.972656 C 7.770182 1.751303 7.504883 1.575521 7.202148 1.445312 C 6.899414 1.315105 6.582031 1.25 6.25 1.25 C 5.904948 1.25 5.581055 1.316732 5.27832 1.450195 C 4.975586 1.58366 4.711914 1.762695 4.487305 1.987305 C 4.262695 2.211914 4.083659 2.477215 3.950195 2.783203 C 3.816731 3.089193 3.75 3.411459 3.75 3.75 C 3.75 4.095053 3.816731 4.418946 3.950195 4.72168 C 4.083659 5.024415 4.262695 5.288087 4.487305 5.512695 C 4.711914 5.737306 4.975586 5.916342 5.27832 6.049805 C 5.581055 6.183269 5.904948 6.25 6.25 6.25 C 6.588542 6.25 6.910807 6.183269 7.216797 6.049805 C 7.522786 5.916342 7.788085 5.737306 8.012695 5.512695 C 8.237305 5.288087 8.416341 5.024415 8.549805 4.72168 C 8.683268 4.418946 8.75 4.095053 8.75 3.75 Z M 12.5 6.201172 C 12.5 5.862631 12.568359 5.545248 12.705078 5.249023 C 12.841797 4.9528 13.024088 4.694011 13.251953 4.472656 C 13.479816 4.251303 13.745116 4.075521 14.047852 3.945312 C 14.350585 3.815105 14.667968 3.75 15 3.75 C 15.338541 3.75 15.660807 3.816732 15.966797 3.950195 C 16.272785 4.08366 16.538086 4.262696 16.762695 4.487305 C 16.987305 4.711915 17.16634 4.977215 17.299805 5.283203 C 17.433268 5.589193 17.5 5.911459 17.5 6.25 C 17.5 6.582031 17.434895 6.899414 17.304688 7.202148 C 17.174479 7.504883 16.998697 7.770183 16.777344 7.998047 C 16.555988 8.225912 16.297199 8.408203 16.000977 8.544922 C 15.704752 8.681641 15.387369 8.75 15.048828 8.75 C 14.684244 8.75 14.34733 8.684896 14.038086 8.554688 C 13.728841 8.424479 13.460286 8.245443 13.232422 8.017578 C 13.004557 7.789714 12.82552 7.521159 12.695312 7.211914 C 12.565104 6.90267 12.5 6.565756 12.5 6.201172 Z M 16.25 6.25 C 16.25 6.08073 16.217447 5.919598 16.152344 5.766602 C 16.087238 5.613607 15.997721 5.480144 15.883789 5.366211 C 15.769856 5.252279 15.636393 5.162761 15.483398 5.097656 C 15.330403 5.032553 15.169271 5.000001 15 5 C 14.824218 5.000001 14.661457 5.032553 14.511719 5.097656 C 14.361979 5.162761 14.230143 5.252279 14.116211 5.366211 C 14.002277 5.480144 13.91276 5.611979 13.847656 5.761719 C 13.782552 5.911459 13.75 6.074219 13.75 6.25 C 13.75 6.425781 13.782552 6.59017 13.847656 6.743164 C 13.91276 6.896159 14.00065 7.027995 14.111328 7.138672 C 14.222005 7.24935 14.353841 7.33724 14.506836 7.402344 C 14.65983 7.467448 14.824218 7.5 15 7.5 C 15.17578 7.5 15.338541 7.467448 15.488281 7.402344 C 15.638021 7.33724 15.769856 7.247722 15.883789 7.133789 C 15.997721 7.019857 16.087238 6.888021 16.152344 6.738281 C 16.217447 6.588542 16.25 6.425781 16.25 6.25 Z M 10.048828 7.5 C 10.387369 7.5 10.704752 7.568359 11.000977 7.705078 C 11.2972 7.841797 11.555989 8.024089 11.777344 8.251953 C 11.998697 8.479818 12.174479 8.745117 12.304688 9.047852 C 12.434896 9.350586 12.5 9.667969 12.5 10 C 12.5 10.345053 12.434896 10.670573 12.304688 10.976562 C 12.174479 11.282553 11.99707 11.547852 11.772461 11.772461 C 11.547852 11.99707 11.282552 12.174479 10.976562 12.304688 C 10.670572 12.434896 10.345052 12.5 10 12.5 C 9.667969 12.5 9.350586 12.434896 9.047852 12.304688 C 8.745117 12.174479 8.479817 11.998698 8.251953 11.777344 C 8.024088 11.55599 7.841796 11.297201 7.705078 11.000977 C 7.568359 10.704753 7.5 10.38737 7.5 10.048828 C 7.5 9.684245 7.565104 9.347331 7.695312 9.038086 C 7.825521 8.728842 8.004557 8.460287 8.232422 8.232422 C 8.460286 8.004558 8.728841 7.825521 9.038086 7.695312 C 9.34733 7.565104 9.684244 7.5 10.048828 7.5 Z M 1.875 8.75 L 6.464844 8.75 C 6.321614 9.140625 6.25 9.557292 6.25 10 L 1.875 10 C 1.731771 10 1.617839 10.02767 1.533203 10.083008 C 1.448568 10.138347 1.385091 10.209961 1.342773 10.297852 C 1.300456 10.385742 1.272786 10.483398 1.259766 10.59082 C 1.246745 10.698242 1.240234 10.807292 1.240234 10.917969 C 1.240234 10.976562 1.241862 11.033529 1.245117 11.088867 C 1.248372 11.144206 1.25 11.197917 1.25 11.25 C 1.25 11.640625 1.32487 12.010092 1.474609 12.358398 C 1.624349 12.706706 1.822917 13.024089 2.070312 13.310547 C 2.317708 13.597006 2.602539 13.849284 2.924805 14.067383 C 3.24707 14.285482 3.580729 14.462891 3.925781 14.599609 C 3.854167 14.807943 3.806966 15.014648 3.78418 15.219727 C 3.761393 15.424805 3.75 15.638021 3.75 15.859375 C 3.261719 15.703125 2.791341 15.478516 2.338867 15.185547 C 1.886393 14.892578 1.48763 14.549154 1.142578 14.155273 C 0.797526 13.761394 0.520833 13.323568 0.3125 12.841797 C 0.104167 12.360026 0 11.848959 0 11.308594 L 0 10.625 C 0 10.371094 0.048828 10.130209 0.146484 9.902344 C 0.244141 9.674479 0.379232 9.474284 0.551758 9.301758 C 0.724284 9.129232 0.924479 8.994141 1.152344 8.896484 C 1.380208 8.798828 1.621094 8.75 1.875 8.75 Z M 10.107422 11.25 C 10.263672 11.25 10.411783 11.212565 10.551758 11.137695 C 10.691731 11.062826 10.813802 10.966797 10.917969 10.849609 C 11.022135 10.732422 11.103516 10.598959 11.162109 10.449219 C 11.220703 10.299479 11.25 10.14974 11.25 10 C 11.25 9.830729 11.217447 9.669597 11.152344 9.516602 C 11.087239 9.363607 10.997721 9.230144 10.883789 9.116211 C 10.769856 9.002279 10.636393 8.912761 10.483398 8.847656 C 10.330403 8.782553 10.169271 8.75 10 8.75 C 9.824219 8.75 9.661458 8.782553 9.511719 8.847656 C 9.361979 8.912761 9.230143 9.002279 9.116211 9.116211 C 9.002278 9.230144 8.91276 9.361979 8.847656 9.511719 C 8.782552 9.661459 8.75 9.824219 8.75 10 C 8.75 10.201823 8.785807 10.379232 8.857422 10.532227 C 8.929036 10.685222 9.025064 10.81543 9.145508 10.922852 C 9.26595 11.030273 9.40918 11.111654 9.575195 11.166992 C 9.741211 11.222331 9.918619 11.25 10.107422 11.25 Z M 16.25 15.625 C 16.25 15.371094 16.220703 15.120443 16.162109 14.873047 C 16.546223 14.794922 16.897785 14.669597 17.216797 14.49707 C 17.535807 14.324545 17.809244 14.111328 18.037109 13.857422 C 18.264973 13.603516 18.440754 13.310547 18.564453 12.978516 C 18.68815 12.646484 18.75 12.278646 18.75 11.875 C 18.75 11.705729 18.68815 11.559245 18.564453 11.435547 C 18.440754 11.31185 18.29427 11.25 18.125 11.25 L 13.535156 11.25 C 13.678385 10.859375 13.75 10.442709 13.75 10 L 18.125 10 C 18.378906 10 18.619791 10.048828 18.847656 10.146484 C 19.07552 10.244141 19.275715 10.379232 19.448242 10.551758 C 19.620768 10.724284 19.755859 10.924479 19.853516 11.152344 C 19.951172 11.380209 20 11.621094 20 11.875 C 20 12.460938 19.907227 12.991537 19.72168 13.466797 C 19.536133 13.942058 19.277344 14.360352 18.945312 14.72168 C 18.613281 15.083008 18.216145 15.382487 17.753906 15.620117 C 17.291666 15.857748 16.783854 16.0319 16.230469 16.142578 C 16.236979 16.051432 16.241861 15.96517 16.245117 15.883789 C 16.248371 15.802409 16.25 15.716146 16.25 15.625 Z M 5 15.625 C 5 15.364584 5.048828 15.120443 5.146484 14.892578 C 5.244141 14.664714 5.377604 14.466146 5.546875 14.296875 C 5.716146 14.127604 5.914713 13.994141 6.142578 13.896484 C 6.370442 13.798828 6.614583 13.75 6.875 13.75 L 13.125 13.75 C 13.385416 13.75 13.629557 13.798828 13.857422 13.896484 C 14.085286 13.994141 14.283854 14.127604 14.453125 14.296875 C 14.622395 14.466146 14.755858 14.664714 14.853516 14.892578 C 14.951171 15.120443 14.999999 15.364584 15 15.625 C 14.999999 16.341146 14.86328 16.971029 14.589844 17.514648 C 14.316405 18.058268 13.950194 18.513998 13.491211 18.881836 C 13.032226 19.249674 12.501627 19.527994 11.899414 19.716797 C 11.2972 19.9056 10.664062 20 10 20 C 9.335938 20 8.701172 19.907227 8.095703 19.72168 C 7.490234 19.536133 6.958008 19.259439 6.499023 18.891602 C 6.040039 18.523764 5.675456 18.066406 5.405273 17.519531 C 5.135091 16.972656 5 16.341146 5 15.625 Z M 13.75 15.625 C 13.75 15.455729 13.68815 15.309245 13.564453 15.185547 C 13.440755 15.06185 13.294271 15 13.125 15 L 6.875 15 C 6.705729 15 6.559244 15.06185 6.435547 15.185547 C 6.311849 15.309245 6.25 15.455729 6.25 15.625 C 6.25 16.165365 6.354167 16.632486 6.5625 17.026367 C 6.770833 17.420248 7.049153 17.744141 7.397461 17.998047 C 7.745768 18.251953 8.144531 18.440756 8.59375 18.564453 C 9.042969 18.68815 9.511719 18.75 10 18.75 C 10.488281 18.75 10.957031 18.68815 11.40625 18.564453 C 11.855469 18.440756 12.254231 18.251953 12.602539 17.998047 C 12.950846 17.744141 13.229166 17.420248 13.4375 17.026367 C 13.645833 16.632486 13.75 16.165365 13.75 15.625 Z " />
-
-                                    <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.MenuManageAccounts}" />
-                                </StackPanel>
-                            </ListViewItem>
-                            <ListViewItem>
-                                <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <muxc:AnimatedIcon Width="20">
-                                        <muxc:AnimatedIcon.Source>
-                                            <animatedvisuals:AnimatedSettingsVisualSource />
-                                        </muxc:AnimatedIcon.Source>
-                                        <muxc:AnimatedIcon.FallbackIconSource>
-                                            <muxc:SymbolIconSource Symbol="Setting" />
-                                        </muxc:AnimatedIcon.FallbackIconSource>
-                                    </muxc:AnimatedIcon>
-
-                                    <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.MenuSettings}" />
-                                </StackPanel>
-                            </ListViewItem>
-                        </ListView.Items>
-                    </ListView>
-                </Grid>
-            </SplitView.Pane>
-            <SplitView.Content>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <!--  Main Content  -->
-                    <Frame
-                        x:Name="ShellFrame"
-                        Padding="0,0,7,7"
-                        CacheSize="2"
-                        IsNavigationStackEnabled="True">
-                        <Frame.ContentTransitions>
-                            <TransitionCollection>
-                                <PopupThemeTransition />
-                            </TransitionCollection>
-                        </Frame.ContentTransitions>
-                    </Frame>
-
-                    <!--  InfoBar  -->
-                    <coreControls:WinoInfoBar
-                        x:Name="ShellInfoBar"
-                        MaxWidth="700"
-                        Margin="0,60,25,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        IsClosable="False"
-                        IsOpen="False" />
-                </Grid>
-            </SplitView.Content>
-        </SplitView>
-
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="LowResolutionStates">
-                <VisualState x:Name="BigScreen">
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="1200" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="MainSplitView.IsPaneOpen" Value="True" />
-                    </VisualState.Setters>
-                </VisualState>
-                <VisualState x:Name="SmallScreen">
-                    <VisualState.Setters>
-                        <Setter Target="NavigationTitleStack.Visibility" Value="Collapsed" />
-                        <Setter Target="SearchBox.(Grid.ColumnSpan)" Value="2" />
-                        <Setter Target="MainSplitView.IsPaneOpen" Value="False" />
-                    </VisualState.Setters>
-                    <VisualState.StateTriggers>
-                        <AdaptiveTrigger MinWindowWidth="0" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-            </VisualStateGroup>
-
-            <VisualStateGroup x:Name="CalendarOrientationStates">
-                <VisualState x:Name="HorizontalCalendar" />
-                <VisualState x:Name="VerticalCalendar">
-                    <VisualState.Setters>
-                        <Setter Target="DayHeaderNavigationItemsFlipView.ItemsPanel">
-                            <Setter.Value>
-                                <ItemsPanelTemplate>
-                                    <VirtualizingStackPanel Orientation="Vertical" />
-                                </ItemsPanelTemplate>
-                            </Setter.Value>
-                        </Setter>
-                        <Setter Target="PreviousDateButtonPathIcon.Data" Value="F1 M 3.2 10.52 C 2.986666 10.733333 2.92 10.98 3 11.259999 C 3.08 11.54 3.266666 11.713333 3.56 11.78 C 3.853333 11.846666 4.093333 11.773333 4.28 11.559999 L 9.24 6.32 L 9.24 19.039999 C 9.24 19.253332 9.313333 19.433332 9.46 19.58 C 9.606666 19.726665 9.786666 19.799999 10 19.799999 C 10.213333 19.799999 10.393332 19.726665 10.54 19.58 C 10.686666 19.433332 10.76 19.253332 10.76 19.039999 L 10.76 6.32 L 15.719999 11.559999 C 15.906666 11.773333 16.139999 11.846666 16.42 11.78 C 16.700001 11.713333 16.886665 11.54 16.98 11.259999 C 17.073332 10.98 17.013332 10.733333 16.799999 10.52 L 10.719999 4.119999 C 10.559999 3.959999 10.373333 3.853333 10.16 3.799999 C 10.053333 3.799999 9.946667 3.799999 9.84 3.799999 C 9.626666 3.853333 9.439999 3.959999 9.28 4.119999 Z " />
-                        <Setter Target="NextDateButtonPathIcon.Data" Value="F1 M 16.799999 13.079999 C 16.933332 12.92 16.993332 12.74 16.98 12.539999 C 16.966665 12.34 16.886665 12.166667 16.74 12.02 C 16.593334 11.873333 16.42 11.799999 16.219999 11.799999 C 16.02 11.799999 15.853333 11.879999 15.719999 12.039999 L 10.76 17.279999 L 10.76 4.559999 C 10.76 4.346666 10.686666 4.166668 10.54 4.02 C 10.393332 3.873333 10.213333 3.799999 10 3.799999 C 9.786666 3.799999 9.606666 3.873333 9.46 4.02 C 9.313333 4.166668 9.24 4.346666 9.24 4.559999 L 9.24 17.279999 L 4.28 12.039999 C 4.146667 11.879999 3.98 11.799999 3.78 11.799999 C 3.58 11.799999 3.4 11.873333 3.24 12.02 C 3.08 12.166667 3 12.34 3 12.539999 C 3 12.74 3.066667 12.92 3.2 13.079999 L 9.28 19.48 C 9.439999 19.639999 9.626666 19.746666 9.84 19.799999 C 9.946667 19.799999 10.053333 19.799999 10.16 19.799999 C 10.373333 19.746666 10.559999 19.639999 10.719999 19.48 Z " />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-
-            <VisualStateGroup x:Name="ShellStateContentGroup">
-                <VisualState x:Name="DefaultShellContentState" />
-                <VisualState x:Name="EventDetailsContentState">
-                    <VisualState.Setters>
-                        <Setter Target="ShellContentArea.Visibility" Value="Collapsed" />
-                        <Setter Target="CalendarTypeSelector.Visibility" Value="Collapsed" />
-                        <Setter Target="CalendarView.IsEnabled" Value="False" />
-                        <Setter Target="CalendarHostListView.IsEnabled" Value="False" />
-                    </VisualState.Setters>
-                    <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind ViewModel.IsEventDetailsPageActive, Mode=OneWay}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-    </Grid>
-</abstract:AppShellAbstract>
-
-
diff --git a/Wino.Calendar/Views/AppShell.xaml.cs b/Wino.Calendar/Views/AppShell.xaml.cs
deleted file mode 100644
index b68a2ca9..00000000
--- a/Wino.Calendar/Views/AppShell.xaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Calendar.Views.Abstract;
-using Wino.Core.UWP;
-using Wino.Messaging.Client.Calendar;
-
-namespace Wino.Calendar.Views;
-
-public sealed partial class AppShell : AppShellAbstract,
-    IRecipient<CalendarDisplayTypeChangedMessage>
-{
-    private const string STATE_HorizontalCalendar = "HorizontalCalendar";
-    private const string STATE_VerticalCalendar = "VerticalCalendar";
-
-    public Frame GetShellFrame() => ShellFrame;
-
-    public AppShell()
-    {
-        InitializeComponent();
-
-        Window.Current.SetTitleBar(DragArea);
-        ManageCalendarDisplayType();
-    }
-
-    private void ManageCalendarDisplayType()
-    {
-        // Go to different states based on the display type.
-        if (ViewModel.IsVerticalCalendar)
-        {
-            VisualStateManager.GoToState(this, STATE_VerticalCalendar, false);
-        }
-        else
-        {
-            VisualStateManager.GoToState(this, STATE_HorizontalCalendar, false);
-        }
-    }
-
-    private void PreviousDateClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new GoPreviousDateRequestedMessage());
-
-    private void NextDateClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new GoNextDateRequestedMessage());
-
-    public void Receive(CalendarDisplayTypeChangedMessage message)
-    {
-        ManageCalendarDisplayType();
-    }
-
-    private void ShellFrameContentNavigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)
-        => RealAppBar.ShellFrameContent = (e.Content as BasePage).ShellContent;
-
-    private void AppBarBackButtonClicked(Core.UWP.Controls.WinoAppTitleBar sender, RoutedEventArgs args)
-        => ViewModel.NavigationService.GoBack();
-}
diff --git a/Wino.Calendar/Views/CalendarPage.xaml b/Wino.Calendar/Views/CalendarPage.xaml
deleted file mode 100644
index 85d569cb..00000000
--- a/Wino.Calendar/Views/CalendarPage.xaml
+++ /dev/null
@@ -1,400 +0,0 @@
-<abstract:CalendarPageAbstract
-    x:Class="Wino.Calendar.Views.CalendarPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-    xmlns:calendarControls="using:Wino.Calendar.Controls"
-    xmlns:calendarHelpers="using:Wino.Calendar.Helpers"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Calendar.ViewModels.Data"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Calendar.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:shared="using:Wino.Core.Domain.Entities.Shared"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <CollectionViewSource
-            x:Key="GroupedCalendarEnumerableViewSource"
-            IsSourceGrouped="True"
-            Source="{x:Bind ViewModel.AccountCalendarStateService.GroupedAccountCalendarsEnumerable, Mode=OneWay}" />
-    </Page.Resources>
-
-    <Border
-        Margin="4,0,7,7"
-        BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
-        BorderThickness="1"
-        CornerRadius="7">
-        <Grid>
-            <!--  Calendar control  -->
-            <calendarControls:WinoCalendarControl
-                x:Name="CalendarControl"
-                DayRanges="{x:Bind ViewModel.DayRanges}"
-                DisplayType="{x:Bind ViewModel.StatePersistanceService.CalendarDisplayType, Mode=OneWay}"
-                IsHitTestVisible="{x:Bind ViewModel.IsCalendarEnabled, Mode=OneWay}"
-                Orientation="{x:Bind ViewModel.CalendarOrientation, Mode=OneWay}"
-                ScrollPositionChanging="CalendarScrolling"
-                SelectedFlipViewDayRange="{x:Bind ViewModel.SelectedDayRange, Mode=TwoWay}"
-                SelectedFlipViewIndex="{x:Bind ViewModel.SelectedDateRangeIndex, Mode=TwoWay}"
-                TimelineCellSelected="CellSelected"
-                TimelineCellUnselected="CellUnselected" />
-
-            <!--  Popup canvas  -->
-            <Canvas x:Name="CalendarOverlayCanvas" IsHitTestVisible="False">
-                <!--  Invisible target UI element for teaching tip display.  -->
-                <Grid
-                    x:Name="TeachingTipPositionerGrid"
-                    Background="Transparent"
-                    IsHitTestVisible="False"
-                    Visibility="Visible" />
-
-                <!--  Popup to display create event dialog.  -->
-                <Popup
-                    x:Name="QuickEventPopupDialog"
-                    ActualPlacementChanged="PopupPlacementChanged"
-                    Closed="QuickEventPopupClosed"
-                    DesiredPlacement="{x:Bind helpers:XamlHelpers.GetPlaccementModeForCalendarType(ViewModel.StatePersistanceService.CalendarDisplayType), Mode=OneWay}"
-                    HorizontalOffset="16"
-                    IsLightDismissEnabled="True"
-                    IsOpen="{x:Bind ViewModel.IsQuickEventDialogOpen, Mode=TwoWay}"
-                    PlacementTarget="{x:Bind TeachingTipPositionerGrid}"
-                    VerticalOffset="16">
-                    <Popup.ChildTransitions>
-                        <TransitionCollection>
-                            <PopupThemeTransition />
-                        </TransitionCollection>
-                    </Popup.ChildTransitions>
-
-                    <Grid
-                        MinWidth="500"
-                        MinHeight="300"
-                        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                        BorderBrush="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay, TargetNullValue='LightGray'}"
-                        BorderThickness="1"
-                        CornerRadius="8"
-                        RowSpacing="12">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-
-                        <!--  Title and close button area.  -->
-                        <Grid VerticalAlignment="Top" Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay, TargetNullValue='LightGray'}">
-                            <Button
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                HorizontalContentAlignment="Stretch"
-                                VerticalContentAlignment="Stretch"
-                                Background="Transparent">
-                                <Button.Content>
-                                    <Grid Height="30" ColumnSpacing="12">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock
-                                            VerticalAlignment="Center"
-                                            Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}"
-                                            Text="{x:Bind ViewModel.SelectedQuickEventAccountCalendar.Account.Name, Mode=OneWay}" />
-                                        <TextBlock
-                                            Grid.Column="1"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
-                                            FontWeight="SemiBold"
-                                            Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}"
-                                            Text="{x:Bind ViewModel.SelectedQuickEventAccountCalendarName, Mode=OneWay}"
-                                            TextTrimming="CharacterEllipsis" />
-
-                                        <Viewbox Grid.Column="2" Width="14">
-                                            <PathIcon
-                                                HorizontalAlignment="Center"
-                                                VerticalAlignment="Center"
-                                                Data="F1 M 18.935547 4.560547 L 19.814453 5.439453 L 10 15.253906 L 0.185547 5.439453 L 1.064453 4.560547 L 10 13.496094 Z "
-                                                Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}" />
-                                        </Viewbox>
-                                    </Grid>
-                                </Button.Content>
-                                <Button.Flyout>
-                                    <Flyout x:Name="QuickEventAccountSelectorFlyout" Placement="Bottom">
-                                        <ListView
-                                            MaxHeight="300"
-                                            HorizontalAlignment="Stretch"
-                                            ItemsSource="{Binding Source={StaticResource GroupedCalendarEnumerableViewSource}}"
-                                            SelectedItem="{x:Bind ViewModel.SelectedQuickEventAccountCalendar, Mode=TwoWay}"
-                                            SelectionChanged="QuickEventAccountSelectorSelectionChanged">
-                                            <ListView.ItemTemplate>
-                                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
-                                                    <StackPanel
-                                                        Margin="0,0,16,0"
-                                                        Orientation="Horizontal"
-                                                        Spacing="6">
-                                                        <Ellipse
-                                                            Width="16"
-                                                            Height="16"
-                                                            Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
-                                                            Stroke="White"
-                                                            StrokeThickness="1" />
-                                                        <TextBlock
-                                                            VerticalAlignment="Center"
-                                                            FontSize="14"
-                                                            Text="{x:Bind Name, Mode=OneWay}"
-                                                            TextWrapping="Wrap" />
-                                                    </StackPanel>
-                                                </DataTemplate>
-                                            </ListView.ItemTemplate>
-                                            <ListView.GroupStyle>
-                                                <GroupStyle>
-                                                    <GroupStyle.HeaderTemplate>
-                                                        <DataTemplate>
-                                                            <TextBlock
-                                                                FontSize="14"
-                                                                FontWeight="SemiBold"
-                                                                Text="{Binding Key.Name}" />
-                                                        </DataTemplate>
-                                                    </GroupStyle.HeaderTemplate>
-                                                </GroupStyle>
-                                            </ListView.GroupStyle>
-                                        </ListView>
-                                    </Flyout>
-                                </Button.Flyout>
-                            </Button>
-                        </Grid>
-
-                        <!--  Rest of the content  -->
-                        <Grid
-                            Grid.Row="1"
-                            Padding="12"
-                            RowSpacing="20">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <!--  Event name  -->
-                            <Grid ColumnSpacing="12">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-
-                                <TextBox
-                                    HorizontalAlignment="Stretch"
-                                    VerticalContentAlignment="Center"
-                                    FontSize="16"
-                                    FontWeight="SemiLight"
-                                    PlaceholderText="{x:Bind domain:Translator.QuickEventDialog_EventName}"
-                                    Text="{x:Bind ViewModel.EventName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-
-                                <CheckBox
-                                    Grid.Column="1"
-                                    MinWidth="10"
-                                    VerticalAlignment="Center"
-                                    Content="{x:Bind domain:Translator.QuickEventDialog_IsAllDay}"
-                                    IsChecked="{x:Bind ViewModel.IsAllDay, Mode=TwoWay}" />
-                            </Grid>
-
-                            <!--  Start - end time  -->
-                            <Grid Grid.Row="1" ColumnSpacing="16">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-
-                                <PathIcon
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Data="F1 M 7.900391 17.5 C 8.011067 17.721354 8.129883 17.936197 8.256836 18.144531 C 8.383789 18.352865 8.522135 18.554688 8.671875 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 8.671875 C 18.554688 8.522136 18.352863 8.383789 18.144531 8.256836 C 17.936197 8.129883 17.721354 8.011068 17.5 7.900391 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 Z M 16.25 15 C 16.41927 15 16.565754 14.938151 16.689453 14.814453 C 16.81315 14.690756 16.875 14.544271 16.875 14.375 C 16.875 14.205729 16.81315 14.059245 16.689453 13.935547 C 16.565754 13.81185 16.41927 13.75 16.25 13.75 L 15 13.75 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 14.375 C 13.75 14.544271 13.811849 14.690756 13.935547 14.814453 C 14.059244 14.938151 14.205729 15 14.375 15 Z " />
-
-                                <ComboBox
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
-                                    IsEditable="True"
-                                    IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsAllDay), Mode=OneWay}"
-                                    ItemsSource="{x:Bind ViewModel.HourSelectionStrings, Mode=OneWay}"
-                                    SelectedItem="{x:Bind ViewModel.SelectedStartTimeString, Mode=TwoWay}"
-                                    TextSubmitted="StartTimeDurationSubmitted" />
-
-                                <TextBlock
-                                    Grid.Column="2"
-                                    VerticalAlignment="Center"
-                                    Text="-" />
-
-                                <ComboBox
-                                    Grid.Column="3"
-                                    HorizontalAlignment="Stretch"
-                                    IsEditable="True"
-                                    IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsAllDay), Mode=OneWay}"
-                                    ItemsSource="{x:Bind ViewModel.HourSelectionStrings, Mode=OneWay}"
-                                    SelectedItem="{x:Bind ViewModel.SelectedEndTimeString, Mode=TwoWay}"
-                                    TextSubmitted="EndTimeDurationSubmitted" />
-                            </Grid>
-
-                            <!--  Location  -->
-                            <Grid Grid.Row="2" ColumnSpacing="16">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <PathIcon
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Data="F1 M 0 10 C 0 9.082031 0.118815 8.196615 0.356445 7.34375 C 0.594076 6.490886 0.93099 5.694987 1.367188 4.956055 C 1.803385 4.217123 2.325846 3.543295 2.93457 2.93457 C 3.543294 2.325848 4.217122 1.803387 4.956055 1.367188 C 5.694986 0.93099 6.490885 0.594076 7.34375 0.356445 C 8.196614 0.118816 9.082031 0 10 0 C 10.917969 0 11.803385 0.118816 12.65625 0.356445 C 13.509114 0.594076 14.305013 0.93099 15.043945 1.367188 C 15.782877 1.803387 16.456705 2.325848 17.06543 2.93457 C 17.674152 3.543295 18.196613 4.217123 18.632812 4.956055 C 19.06901 5.694987 19.405924 6.490886 19.643555 7.34375 C 19.881184 8.196615 20 9.082031 20 10 C 20 10.917969 19.881184 11.803386 19.643555 12.65625 C 19.405924 13.509115 19.06901 14.305014 18.632812 15.043945 C 18.196613 15.782878 17.674152 16.456705 17.06543 17.06543 C 16.456705 17.674154 15.782877 18.196615 15.043945 18.632812 C 14.305013 19.06901 13.509114 19.405924 12.65625 19.643555 C 11.803385 19.881186 10.917969 20 10 20 C 9.082031 20 8.196614 19.881186 7.34375 19.643555 C 6.490885 19.405924 5.694986 19.06901 4.956055 18.632812 C 4.217122 18.196615 3.543294 17.674154 2.93457 17.06543 C 2.325846 16.456705 1.803385 15.782878 1.367188 15.043945 C 0.93099 14.305014 0.594076 13.509115 0.356445 12.65625 C 0.118815 11.803386 0 10.917969 0 10 Z M 18.75 10 C 18.75 9.199219 18.645832 8.426107 18.4375 7.680664 C 18.229166 6.935222 17.93457 6.238607 17.553711 5.59082 C 17.172852 4.943035 16.715494 4.352215 16.181641 3.818359 C 15.647785 3.284506 15.056965 2.827148 14.40918 2.446289 C 13.761393 2.06543 13.064778 1.770834 12.319336 1.5625 C 11.573893 1.354168 10.800781 1.25 10 1.25 C 9.192708 1.25 8.416341 1.354168 7.670898 1.5625 C 6.925456 1.770834 6.228841 2.06543 5.581055 2.446289 C 4.933268 2.827148 4.344075 3.282879 3.813477 3.813477 C 3.282877 4.344076 2.827148 4.933269 2.446289 5.581055 C 2.06543 6.228842 1.770833 6.925457 1.5625 7.670898 C 1.354167 8.416342 1.25 9.192709 1.25 10 C 1.25 10.807292 1.354167 11.583659 1.5625 12.329102 C 1.770833 13.074545 2.06543 13.771159 2.446289 14.418945 C 2.827148 15.066732 3.282877 15.655925 3.813477 16.186523 C 4.344075 16.717123 4.933268 17.172852 5.581055 17.553711 C 6.228841 17.93457 6.925456 18.229166 7.670898 18.4375 C 8.416341 18.645834 9.192708 18.75 10 18.75 C 10.807291 18.75 11.583658 18.645834 12.329102 18.4375 C 13.074543 18.229166 13.771158 17.93457 14.418945 17.553711 C 15.066731 17.172852 15.655924 16.717123 16.186523 16.186523 C 16.717121 15.655925 17.172852 15.066732 17.553711 14.418945 C 17.93457 13.771159 18.229166 13.074545 18.4375 12.329102 C 18.645832 11.583659 18.75 10.807292 18.75 10 Z M 5 9.902344 C 5 9.225261 5.135091 8.588867 5.405273 7.993164 C 5.675456 7.397461 6.040039 6.878256 6.499023 6.435547 C 6.958008 5.992839 7.488606 5.642904 8.09082 5.385742 C 8.693033 5.128582 9.329427 5.000001 10 5 C 10.690104 5.000001 11.339518 5.130209 11.948242 5.390625 C 12.556965 5.651042 13.087564 6.007487 13.540039 6.459961 C 13.992513 6.912436 14.348958 7.443035 14.609375 8.051758 C 14.869791 8.660482 14.999999 9.309896 15 10 C 14.999999 10.690104 14.869791 11.339519 14.609375 11.948242 C 14.348958 12.556967 13.992513 13.087565 13.540039 13.540039 C 13.087564 13.992514 12.556965 14.348959 11.948242 14.609375 C 11.339518 14.869792 10.690104 15 10 15 C 9.290364 15 8.631185 14.866537 8.022461 14.599609 C 7.413737 14.332683 6.884766 13.9681 6.435547 13.505859 C 5.986328 13.04362 5.634766 12.503256 5.380859 11.884766 C 5.126953 11.266276 5 10.605469 5 9.902344 Z " />
-
-                                <!--  TODO: Auto suggest box for searching addresses later on.  -->
-                                <TextBox Grid.Column="1" PlaceholderText="{x:Bind domain:Translator.QuickEventDialog_Location}" />
-                            </Grid>
-
-                            <!--  Reminder  -->
-                            <Grid Grid.Row="3" ColumnSpacing="16">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <PathIcon
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Data="F1 M 10 1.25 C 10.572916 1.25 11.126302 1.324871 11.660156 1.474609 C 12.19401 1.62435 12.692057 1.834311 13.154297 2.104492 C 13.616536 2.374676 14.038086 2.700195 14.418945 3.081055 C 14.799805 3.461914 15.125325 3.883465 15.395508 4.345703 C 15.665689 4.807943 15.87565 5.30599 16.025391 5.839844 C 16.175129 6.373699 16.25 6.927084 16.25 7.5 L 16.25 12.099609 L 17.871094 14.248047 C 17.949219 14.358725 18.011066 14.477539 18.056641 14.604492 C 18.102213 14.731445 18.125 14.860026 18.125 14.990234 C 18.125 15.166016 18.092447 15.330404 18.027344 15.483398 C 17.962238 15.636394 17.872721 15.769857 17.758789 15.883789 C 17.644855 15.997722 17.511393 16.08724 17.358398 16.152344 C 17.205402 16.217449 17.041016 16.25 16.865234 16.25 L 13.066406 16.25 C 12.98828 16.614584 12.854816 16.949869 12.666016 17.255859 C 12.477213 17.56185 12.247721 17.825521 11.977539 18.046875 C 11.707356 18.268229 11.402994 18.440756 11.064453 18.564453 C 10.725911 18.68815 10.371094 18.75 10 18.75 C 9.628906 18.75 9.274088 18.68815 8.935547 18.564453 C 8.597005 18.440756 8.292643 18.268229 8.022461 18.046875 C 7.752278 17.825521 7.522786 17.56185 7.333984 17.255859 C 7.145182 16.949869 7.011719 16.614584 6.933594 16.25 L 3.134766 16.25 C 2.958984 16.25 2.794596 16.217449 2.641602 16.152344 C 2.488607 16.08724 2.355143 15.997722 2.241211 15.883789 C 2.127279 15.769857 2.03776 15.636394 1.972656 15.483398 C 1.907552 15.330404 1.875 15.166016 1.875 14.990234 C 1.875 14.860026 1.897786 14.731445 1.943359 14.604492 C 1.988932 14.477539 2.050781 14.358725 2.128906 14.248047 L 3.75 12.099609 L 3.75 7.5 C 3.75 6.927084 3.82487 6.373699 3.974609 5.839844 C 4.124349 5.30599 4.33431 4.807943 4.604492 4.345703 C 4.874674 3.883465 5.200195 3.461914 5.581055 3.081055 C 5.961914 2.700195 6.383463 2.374676 6.845703 2.104492 C 7.307942 1.834311 7.805989 1.62435 8.339844 1.474609 C 8.873697 1.324871 9.427083 1.25 10 1.25 Z M 10 2.5 C 9.309896 2.5 8.660481 2.630209 8.051758 2.890625 C 7.443034 3.151043 6.912435 3.507488 6.459961 3.959961 C 6.007487 4.412436 5.651042 4.943034 5.390625 5.551758 C 5.130208 6.160482 5 6.809896 5 7.5 L 5 12.207031 C 5 12.304688 4.983724 12.403972 4.951172 12.504883 C 4.91862 12.605795 4.873047 12.695312 4.814453 12.773438 L 3.134766 15 L 16.865234 15 L 15.185547 12.773438 C 15.126953 12.695312 15.08138 12.605795 15.048828 12.504883 C 15.016275 12.403972 14.999999 12.304688 15 12.207031 L 15 7.5 C 14.999999 6.809896 14.869791 6.160482 14.609375 5.551758 C 14.348958 4.943034 13.992513 4.412436 13.540039 3.959961 C 13.087564 3.507488 12.556965 3.151043 11.948242 2.890625 C 11.339518 2.630209 10.690104 2.5 10 2.5 Z M 8.232422 16.25 C 8.297525 16.438803 8.388672 16.609701 8.505859 16.762695 C 8.623047 16.915689 8.759766 17.047525 8.916016 17.158203 C 9.072266 17.268881 9.243164 17.353516 9.428711 17.412109 C 9.614258 17.470703 9.804688 17.5 10 17.5 C 10.195312 17.5 10.385742 17.470703 10.571289 17.412109 C 10.756836 17.353516 10.927734 17.268881 11.083984 17.158203 C 11.240234 17.047525 11.376953 16.915689 11.494141 16.762695 C 11.611328 16.609701 11.702474 16.438803 11.767578 16.25 Z " />
-                                <ComboBox Grid.Column="1" HorizontalAlignment="Stretch" />
-                            </Grid>
-
-                            <!--  Buttons  -->
-                            <Grid Grid.Row="4" ColumnSpacing="16">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-
-                                <Button
-                                    HorizontalAlignment="Stretch"
-                                    Command="{x:Bind ViewModel.MoreDetailsCommand}"
-                                    Content="{x:Bind domain:Translator.QuickEventDialogMoreDetailsButtonText}" />
-                                <Button
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
-                                    Command="{x:Bind ViewModel.SaveQuickEventCommand}"
-                                    Content="{x:Bind domain:Translator.Buttons_Save}"
-                                    Style="{ThemeResource AccentButtonStyle}" />
-                            </Grid>
-                        </Grid>
-                    </Grid>
-                </Popup>
-
-                <!--  Popup to display event details.  -->
-                <Popup
-                    x:Name="EventDetailsPopup"
-                    ActualPlacementChanged="PopupPlacementChanged"
-                    Closed="EventDetailsPopupClosed"
-                    DesiredPlacement="{x:Bind calendarHelpers:CalendarXamlHelpers.GetDesiredPlacementModeForEventsDetailsPopup(ViewModel.DisplayDetailsCalendarItemViewModel, ViewModel.StatePersistanceService.CalendarDisplayType), Mode=OneWay}"
-                    HorizontalOffset="16"
-                    IsLightDismissEnabled="True"
-                    IsOpen="{x:Bind ViewModel.IsEventDetailsVisible, Mode=OneWay}"
-                    PlacementTarget="{x:Bind TeachingTipPositionerGrid}"
-                    VerticalOffset="16">
-                    <Popup.ChildTransitions>
-                        <TransitionCollection>
-                            <PopupThemeTransition />
-                        </TransitionCollection>
-                    </Popup.ChildTransitions>
-                    <Grid
-                        MinWidth="300"
-                        Padding="20"
-                        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                        BorderBrush="{ThemeResource CalendarSeperatorBrush}"
-                        BorderThickness="1"
-                        CornerRadius="8"
-                        RowSpacing="12">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <TextBlock
-                            FontWeight="Normal"
-                            Style="{StaticResource SubtitleTextBlockStyle}"
-                            Text="{x:Bind ViewModel.DisplayDetailsCalendarItemViewModel.Title, Mode=OneWay}" />
-
-                        <Grid
-                            Grid.Row="1"
-                            ColumnSpacing="8"
-                            RowSpacing="12">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <muxc:PersonPicture
-                                Width="46"
-                                Height="46"
-                                DisplayName="BK" />
-
-                            <StackPanel
-                                Grid.Column="1"
-                                VerticalAlignment="Center"
-                                Spacing="0">
-                                <TextBlock Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetDetailsPopupDurationString(ViewModel.DisplayDetailsCalendarItemViewModel, ViewModel.CurrentSettings), Mode=OneWay, TargetNullValue=''}" />
-                                <TextBlock Text="{x:Bind ViewModel.DisplayDetailsCalendarItemViewModel.CalendarItem.OrganizerDisplayName, Mode=OneWay}" />
-                            </StackPanel>
-
-                            <!--  TODO: HtmlLink visibility  -->
-                            <HyperlinkButton
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                HorizontalAlignment="Right">
-                                <StackPanel Orientation="Horizontal" Spacing="6">
-                                    <PathIcon
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        Data="F1 M 20 10 C 20 10.917969 19.881184 11.803386 19.643555 12.65625 C 19.405924 13.509115 19.06901 14.305014 18.632812 15.043945 C 18.196613 15.782878 17.674152 16.456705 17.06543 17.06543 C 16.456705 17.674154 15.782877 18.196615 15.043945 18.632812 C 14.305013 19.06901 13.509114 19.405924 12.65625 19.643555 C 11.803385 19.881186 10.917969 20 10 20 C 9.082031 20 8.196614 19.881186 7.34375 19.643555 C 6.490885 19.405924 5.694986 19.06901 4.956055 18.632812 C 4.217122 18.196615 3.543294 17.674154 2.93457 17.06543 C 2.325846 16.456705 1.803385 15.782878 1.367188 15.043945 C 0.93099 14.305014 0.594076 13.509115 0.356445 12.65625 C 0.118815 11.803386 0 10.917969 0 10 C 0 9.082031 0.118815 8.196615 0.356445 7.34375 C 0.594076 6.490886 0.93099 5.694987 1.367188 4.956055 C 1.803385 4.217123 2.325846 3.543295 2.93457 2.93457 C 3.543294 2.325848 4.217122 1.803387 4.956055 1.367188 C 5.694986 0.93099 6.490885 0.594076 7.34375 0.356445 C 8.196614 0.118816 9.082031 0 10 0 C 10.917969 0 11.803385 0.118816 12.65625 0.356445 C 13.509114 0.594076 14.305013 0.93099 15.043945 1.367188 C 15.782877 1.803387 16.456705 2.325848 17.06543 2.93457 C 17.674152 3.543295 18.196613 4.217123 18.632812 4.956055 C 19.06901 5.694987 19.405924 6.490886 19.643555 7.34375 C 19.881184 8.196615 20 9.082031 20 10 Z M 3.515625 15.869141 C 3.932292 16.331381 4.388021 16.741537 4.882812 17.099609 C 5.377604 17.457682 5.901692 17.758789 6.455078 18.00293 C 7.008463 18.24707 7.583008 18.432617 8.178711 18.55957 C 8.774414 18.686523 9.38151 18.75 10 18.75 C 10.813802 18.75 11.612955 18.639322 12.397461 18.417969 C 13.181966 18.196615 13.919271 17.871094 14.609375 17.441406 C 14.479166 17.317709 14.352213 17.18099 14.228516 17.03125 C 14.104817 16.881512 13.995768 16.725262 13.901367 16.5625 C 13.806966 16.39974 13.732096 16.228842 13.676758 16.049805 C 13.621418 15.870769 13.593749 15.68685 13.59375 15.498047 C 13.593749 15.224609 13.64746 14.969076 13.754883 14.731445 C 13.862304 14.493815 13.997395 14.275717 14.160156 14.077148 C 14.322916 13.878581 14.500325 13.693034 14.692383 13.520508 C 14.884439 13.347982 15.061849 13.185222 15.224609 13.032227 C 15.387369 12.879232 15.52246 12.734375 15.629883 12.597656 C 15.737304 12.460938 15.791015 12.327475 15.791016 12.197266 C 15.791015 12.080078 15.740559 11.977539 15.639648 11.889648 C 15.538736 11.801758 15.432942 11.757812 15.322266 11.757812 C 15.198567 11.757812 15.076497 11.785482 14.956055 11.84082 C 14.835611 11.896159 14.716797 11.958008 14.599609 12.026367 C 14.482422 12.094727 14.365234 12.156576 14.248047 12.211914 C 14.130859 12.267253 14.016927 12.294922 13.90625 12.294922 C 13.691406 12.294922 13.51888 12.231445 13.388672 12.104492 C 13.258463 11.977539 13.170572 11.813151 13.125 11.611328 C 13.092447 11.4681 13.064778 11.292318 13.041992 11.083984 C 13.019205 10.875651 12.991535 10.664062 12.958984 10.449219 C 12.926432 10.234375 12.888997 10.029297 12.84668 9.833984 C 12.804361 9.638672 12.75065 9.482422 12.685547 9.365234 C 12.496744 9.026693 12.280273 8.709311 12.036133 8.413086 C 11.791992 8.116862 11.565755 7.80599 11.357422 7.480469 C 11.285807 7.363281 11.232096 7.254232 11.196289 7.15332 C 11.160481 7.052409 11.142578 6.933594 11.142578 6.796875 C 11.142578 6.608073 11.183268 6.435547 11.264648 6.279297 C 11.346028 6.123047 11.455078 5.979818 11.591797 5.849609 C 11.728516 5.719401 11.868489 5.595703 12.011719 5.478516 L 12.285156 5.224609 C 12.428385 5.100912 12.568359 4.977214 12.705078 4.853516 C 13.076172 4.508464 13.432617 4.153646 13.774414 3.789062 C 14.116211 3.42448 14.453125 3.053387 14.785156 2.675781 C 14.075521 2.213543 13.313802 1.860352 12.5 1.616211 C 11.686197 1.37207 10.852864 1.25 10 1.25 C 9.947916 1.25 9.897461 1.25 9.848633 1.25 C 9.799805 1.25 9.749349 1.253256 9.697266 1.259766 C 9.807942 1.455078 9.915364 1.682943 10.019531 1.943359 C 10.123697 2.203777 10.216471 2.472332 10.297852 2.749023 C 10.379231 3.025717 10.444336 3.30241 10.493164 3.579102 C 10.541992 3.855795 10.566406 4.104818 10.566406 4.326172 C 10.566406 4.632162 10.525716 4.933269 10.444336 5.229492 C 10.362955 5.525717 10.23763 5.800782 10.068359 6.054688 C 9.918619 6.276042 9.760742 6.458334 9.594727 6.601562 C 9.428711 6.744793 9.248047 6.865235 9.052734 6.962891 C 8.857422 7.060548 8.650716 7.140301 8.432617 7.202148 C 8.214518 7.263998 7.981771 7.317709 7.734375 7.363281 C 7.584635 7.395834 7.436523 7.444662 7.290039 7.509766 C 7.143555 7.574871 7.027995 7.675782 6.943359 7.8125 C 6.884765 7.903646 6.845703 8.004558 6.826172 8.115234 C 6.80664 8.225912 6.796875 8.336589 6.796875 8.447266 C 6.796875 8.6556 6.824544 8.85905 6.879883 9.057617 C 6.935221 9.256186 6.995442 9.453125 7.060547 9.648438 C 7.125651 9.84375 7.185872 10.039062 7.241211 10.234375 C 7.296549 10.429688 7.324218 10.631511 7.324219 10.839844 C 7.324218 11.171875 7.254231 11.44694 7.114258 11.665039 C 6.974284 11.883139 6.79362 12.062175 6.572266 12.202148 C 6.350911 12.342123 6.103515 12.4528 5.830078 12.53418 C 5.556641 12.615561 5.286458 12.685547 5.019531 12.744141 C 4.902344 12.770183 4.781901 12.804362 4.658203 12.84668 C 4.534505 12.888998 4.418945 12.944336 4.311523 13.012695 C 4.204102 13.081055 4.1097 13.162436 4.02832 13.256836 C 3.94694 13.351237 3.896484 13.466797 3.876953 13.603516 Z M 1.25 10 C 1.25 10.787761 1.354167 11.559245 1.5625 12.314453 C 1.770833 13.069662 2.073568 13.785808 2.470703 14.462891 C 2.496745 14.326172 2.519531 14.189453 2.539062 14.052734 L 2.578125 13.779297 C 2.597656 13.642578 2.620443 13.505859 2.646484 13.369141 C 2.698568 13.095703 2.792969 12.856445 2.929688 12.651367 C 3.066406 12.446289 3.232422 12.267253 3.427734 12.114258 C 3.623047 11.961264 3.839518 11.835938 4.077148 11.738281 C 4.314778 11.640625 4.560547 11.565756 4.814453 11.513672 C 4.899088 11.494141 5.013021 11.471354 5.15625 11.445312 C 5.299479 11.419271 5.439453 11.380209 5.576172 11.328125 C 5.712891 11.276042 5.830078 11.210938 5.927734 11.132812 C 6.025391 11.054688 6.074219 10.957031 6.074219 10.839844 C 6.074219 10.755209 6.061198 10.65918 6.035156 10.551758 C 6.009114 10.444336 5.979817 10.336914 5.947266 10.229492 C 5.914713 10.12207 5.878906 10.016276 5.839844 9.912109 C 5.800781 9.807943 5.768229 9.713542 5.742188 9.628906 C 5.611979 9.238281 5.546875 8.844401 5.546875 8.447266 C 5.546875 7.789715 5.725911 7.268881 6.083984 6.884766 C 6.442057 6.500651 6.933593 6.246745 7.558594 6.123047 C 7.825521 6.070964 8.068033 6.004232 8.286133 5.922852 C 8.504231 5.841472 8.689778 5.732422 8.842773 5.595703 C 8.995768 5.458984 9.112955 5.288086 9.194336 5.083008 C 9.275716 4.87793 9.316406 4.622396 9.316406 4.316406 C 9.316406 4.160156 9.298502 3.982748 9.262695 3.78418 C 9.226888 3.585613 9.181314 3.383789 9.125977 3.178711 C 9.070638 2.973633 9.007161 2.776693 8.935547 2.587891 C 8.863932 2.39909 8.792317 2.233074 8.720703 2.089844 C 8.67513 1.998699 8.626302 1.914062 8.574219 1.835938 L 8.476562 1.660156 C 8.424479 1.575521 8.37565 1.490887 8.330078 1.40625 C 7.301432 1.608074 6.355794 1.972656 5.493164 2.5 C 4.630534 3.027344 3.883463 3.671875 3.251953 4.433594 C 2.620443 5.195312 2.128906 6.051433 1.777344 7.001953 C 1.425781 7.952475 1.25 8.951823 1.25 10 Z M 18.75 10 C 18.75 9.375 18.684895 8.759766 18.554688 8.154297 C 18.424479 7.548828 18.232422 6.964519 17.978516 6.401367 C 17.724609 5.838217 17.413736 5.30599 17.045898 4.804688 C 16.678059 4.303386 16.25651 3.847656 15.78125 3.4375 C 15.507812 3.75 15.23763 4.051107 14.970703 4.34082 C 14.703775 4.630534 14.431966 4.913737 14.155273 5.19043 C 13.87858 5.467123 13.595377 5.738933 13.305664 6.005859 C 13.01595 6.272787 12.711588 6.539715 12.392578 6.806641 C 12.503255 6.93685 12.607422 7.07194 12.705078 7.211914 C 12.802734 7.351889 12.900391 7.490234 12.998047 7.626953 C 13.245442 7.972006 13.439127 8.251953 13.579102 8.466797 C 13.719075 8.681641 13.829752 8.889975 13.911133 9.091797 C 13.992512 9.29362 14.057616 9.521484 14.106445 9.775391 C 14.155272 10.029297 14.212238 10.364584 14.277344 10.78125 C 14.446613 10.703125 14.624022 10.638021 14.80957 10.585938 C 14.995116 10.533854 15.182291 10.507812 15.371094 10.507812 C 15.592447 10.507812 15.804035 10.553386 16.005859 10.644531 C 16.207682 10.735678 16.386719 10.859375 16.542969 11.015625 C 16.699219 11.171875 16.822916 11.350912 16.914062 11.552734 C 17.005207 11.754558 17.050781 11.966146 17.050781 12.1875 C 17.050781 12.441406 16.99707 12.677409 16.889648 12.895508 C 16.782227 13.113607 16.645508 13.318686 16.479492 13.510742 C 16.313477 13.7028 16.136066 13.885092 15.947266 14.057617 C 15.758463 14.230144 15.581055 14.396159 15.415039 14.555664 C 15.249023 14.71517 15.112305 14.873047 15.004883 15.029297 C 14.897461 15.185547 14.84375 15.345053 14.84375 15.507812 C 14.84375 15.61849 14.871419 15.729167 14.926758 15.839844 C 14.982096 15.950521 15.048828 16.057943 15.126953 16.162109 C 15.205078 16.266275 15.289713 16.363932 15.380859 16.455078 C 15.472005 16.546225 15.556641 16.62435 15.634766 16.689453 C 16.129557 16.272787 16.56901 15.810547 16.953125 15.302734 C 17.337238 14.794922 17.66276 14.256186 17.929688 13.686523 C 18.196613 13.116862 18.400064 12.522787 18.540039 11.904297 C 18.680012 11.285808 18.75 10.651042 18.75 10 Z " />
-                                    <TextBlock Text="{x:Bind domain:Translator.CalendarItem_DetailsPopup_JoinOnline}" />
-                                </StackPanel>
-                            </HyperlinkButton>
-                        </Grid>
-
-                        <!--  Buttons  -->
-                        <Grid
-                            Grid.Row="2"
-                            VerticalAlignment="Bottom"
-                            ColumnSpacing="12">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-
-                            <!--  View series  -->
-                            <Button
-                                HorizontalAlignment="Stretch"
-                                Command="{x:Bind ViewModel.NavigateSeriesCommand}"
-                                Content="{x:Bind domain:Translator.CalendarItem_DetailsPopup_ViewSeriesButton}"
-                                Visibility="{x:Bind ViewModel.DisplayDetailsCalendarItemViewModel.IsRecurringEvent, Mode=OneWay}" />
-
-                            <Button
-                                Grid.Column="1"
-                                HorizontalAlignment="Stretch"
-                                Command="{x:Bind ViewModel.NavigateEventDetailsCommand}"
-                                Content="{x:Bind domain:Translator.CalendarItem_DetailsPopup_ViewEventButton}"
-                                Style="{ThemeResource AccentButtonStyle}" />
-                        </Grid>
-                    </Grid>
-                </Popup>
-            </Canvas>
-        </Grid>
-    </Border>
-
-</abstract:CalendarPageAbstract>
-
-
diff --git a/Wino.Calendar/Views/CalendarPage.xaml.cs b/Wino.Calendar/Views/CalendarPage.xaml.cs
deleted file mode 100644
index d8ce61ee..00000000
--- a/Wino.Calendar/Views/CalendarPage.xaml.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System;
-using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Navigation;
-using Wino.Calendar.Args;
-using Wino.Calendar.Views.Abstract;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Calendar;
-using Wino.Messaging.Client.Calendar;
-
-namespace Wino.Calendar.Views;
-
-public sealed partial class CalendarPage : CalendarPageAbstract,
-    IRecipient<ScrollToDateMessage>,
-    IRecipient<ScrollToHourMessage>,
-    IRecipient<GoNextDateRequestedMessage>,
-    IRecipient<GoPreviousDateRequestedMessage>
-{
-    private const int PopupDialogOffset = 12;
-
-    public CalendarPage()
-    {
-        InitializeComponent();
-        NavigationCacheMode = NavigationCacheMode.Enabled;
-
-        ViewModel.DetailsShowCalendarItemChanged += CalendarItemDetailContextChanged;
-    }
-
-    private void CalendarItemDetailContextChanged(object sender, EventArgs e)
-    {
-        if (ViewModel.DisplayDetailsCalendarItemViewModel != null)
-        {
-            var control = CalendarControl.GetCalendarItemControl(ViewModel.DisplayDetailsCalendarItemViewModel);
-
-            if (control != null)
-            {
-                EventDetailsPopup.PlacementTarget = control;
-            }
-        }
-    }
-
-    public void Receive(ScrollToHourMessage message) => CalendarControl.NavigateToHour(message.TimeSpan);
-    public void Receive(ScrollToDateMessage message) => CalendarControl.NavigateToDay(message.Date);
-    public void Receive(GoNextDateRequestedMessage message) => CalendarControl.GoNextRange();
-    public void Receive(GoPreviousDateRequestedMessage message) => CalendarControl.GoPreviousRange();
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        if (e.NavigationMode == NavigationMode.Back) return;
-
-        if (e.Parameter is CalendarPageNavigationArgs args)
-        {
-            if (args.RequestDefaultNavigation)
-            {
-                // Go today.
-                WeakReferenceMessenger.Default.Send(new LoadCalendarMessage(DateTime.Now.Date, CalendarInitInitiative.App));
-            }
-            else
-            {
-                // Go specified date.
-                WeakReferenceMessenger.Default.Send(new LoadCalendarMessage(args.NavigationDate, CalendarInitInitiative.User));
-            }
-        }
-    }
-
-    private void CellSelected(object sender, TimelineCellSelectedArgs e)
-    {
-        // Dismiss event details if exists and cancel the selection.
-        // This is to prevent the event details from being displayed when the user clicks somewhere else.
-
-        if (EventDetailsPopup.IsOpen)
-        {
-            CalendarControl.UnselectActiveTimelineCell();
-            ViewModel.DisplayDetailsCalendarItemViewModel = null;
-
-            return;
-        }
-
-        ViewModel.SelectedQuickEventDate = e.ClickedDate;
-
-        TeachingTipPositionerGrid.Width = e.CellSize.Width;
-        TeachingTipPositionerGrid.Height = e.CellSize.Height;
-
-        Canvas.SetLeft(TeachingTipPositionerGrid, e.PositionerPoint.X);
-        Canvas.SetTop(TeachingTipPositionerGrid, e.PositionerPoint.Y);
-
-        // Adjust the start and end time in the flyout.
-        var startTime = ViewModel.SelectedQuickEventDate.Value.TimeOfDay;
-        var endTime = startTime.Add(TimeSpan.FromMinutes(30));
-
-        ViewModel.SelectQuickEventTimeRange(startTime, endTime);
-
-        QuickEventPopupDialog.IsOpen = true;
-    }
-
-    private void CellUnselected(object sender, TimelineCellUnselectedArgs e)
-    {
-        QuickEventPopupDialog.IsOpen = false;
-    }
-
-    private void QuickEventAccountSelectorSelectionChanged(object sender, SelectionChangedEventArgs e)
-    {
-        QuickEventAccountSelectorFlyout.Hide();
-    }
-
-    private void QuickEventPopupClosed(object sender, object e)
-    {
-        // Reset the timeline selection when the tip is closed.
-        CalendarControl.ResetTimelineSelection();
-    }
-
-    private void PopupPlacementChanged(object sender, object e)
-    {
-        if (sender is Popup senderPopup)
-        {
-            // When the quick event Popup is positioned for different calendar types,
-            // we must adjust the offset to make sure the tip is not hidden and has nice
-            // spacing from the cell.
-
-            switch (senderPopup.ActualPlacement)
-            {
-                case PopupPlacementMode.Top:
-                    senderPopup.VerticalOffset = PopupDialogOffset * -1;
-                    break;
-                case PopupPlacementMode.Bottom:
-                    senderPopup.VerticalOffset = PopupDialogOffset;
-                    break;
-                case PopupPlacementMode.Left:
-                    senderPopup.HorizontalOffset = PopupDialogOffset * -1;
-                    break;
-                case PopupPlacementMode.Right:
-                    senderPopup.HorizontalOffset = PopupDialogOffset;
-                    break;
-                default:
-                    break;
-            }
-        }
-
-    }
-
-    private void StartTimeDurationSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArgs args)
-        => ViewModel.SelectedStartTimeString = args.Text;
-
-    private void EndTimeDurationSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArgs args)
-        => ViewModel.SelectedEndTimeString = args.Text;
-
-    private void EventDetailsPopupClosed(object sender, object e)
-    {
-        ViewModel.DisplayDetailsCalendarItemViewModel = null;
-    }
-
-    private void CalendarScrolling(object sender, EventArgs e)
-    {
-        // In case of scrolling, we must dismiss the event details dialog.
-        ViewModel.DisplayDetailsCalendarItemViewModel = null;
-    }
-}
diff --git a/Wino.Calendar/Views/EventDetailsPage.xaml b/Wino.Calendar/Views/EventDetailsPage.xaml
deleted file mode 100644
index 875b5689..00000000
--- a/Wino.Calendar/Views/EventDetailsPage.xaml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<abstract:EventDetailsPageAbstract
-    x:Class="Wino.Calendar.Views.EventDetailsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:calendar="using:Wino.Core.Domain.Entities.Calendar"
-    xmlns:calendarHelpers="using:Wino.Calendar.Helpers"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Calendar.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wino="using:Wino.Core.UWP"
-    Style="{StaticResource PageStyle}"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <Style x:Key="ActionBarElementContainerStackStyle" TargetType="StackPanel">
-            <Setter Property="Spacing" Value="6" />
-            <Setter Property="Padding" Value="10,0,4,0" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="Orientation" Value="Horizontal" />
-        </Style>
-
-        <Style TargetType="AppBarElementContainer">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-
-        <Style x:Key="EventDetailsPanelGridStyle" TargetType="Grid">
-            <Setter Property="Padding" Value="0,12" />
-            <Setter Property="Margin" Value="12,0" />
-        </Style>
-
-        <Style
-            x:Key="EventDetailsPanelTitleStyle"
-            BasedOn="{StaticResource SubtitleTextBlockStyle}"
-            TargetType="TextBlock">
-            <Setter Property="FontWeight" Value="Normal" />
-            <Setter Property="Margin" Value="0,0,0,20" />
-        </Style>
-    </Page.Resources>
-    <Grid Padding="20">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <!--  Action Bar  -->
-        <Border
-            VerticalAlignment="Top"
-            Background="{ThemeResource WinoContentZoneBackgroud}"
-            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
-            BorderThickness="1"
-            CornerRadius="7">
-            <CommandBar
-                HorizontalAlignment="Left"
-                Background="Transparent"
-                DefaultLabelPosition="Right"
-                IsSticky="True"
-                OverflowButtonVisibility="Auto">
-                <AppBarToggleButton
-                    x:Name="ReadOnlyToggle"
-                    Content="Read-only event"
-                    IsChecked="True" />
-                <AppBarButton Label="{x:Bind domain:Translator.Buttons_Save}">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="Save" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-                <AppBarButton Label="{x:Bind domain:Translator.Buttons_Delete}">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="Delete" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarSeparator />
-
-                <!--  Join Online  -->
-                <AppBarButton Label="Join Online">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="EventJoinOnline" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarSeparator />
-
-                <!--  Join Options  -->
-                <AppBarButton Label="Accept">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Foreground="#527257" Icon="EventAccept" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarButton Label="Tentative">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Foreground="#805682" Icon="EventTentative" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarButton Label="Decline">
-                    <AppBarButton.Icon>
-                        <PathIcon Data="F1 M 10.253906 9.375 L 16.064453 15.185547 C 16.18815 15.309245 16.25 15.455729 16.25 15.625 C 16.25 15.794271 16.18815 15.940756 16.064453 16.064453 C 15.940754 16.188152 15.79427 16.25 15.625 16.25 C 15.455729 16.25 15.309244 16.188152 15.185547 16.064453 L 9.375 10.253906 L 3.564453 16.064453 C 3.440755 16.188152 3.294271 16.25 3.125 16.25 C 2.955729 16.25 2.809245 16.188152 2.685547 16.064453 C 2.561849 15.940756 2.5 15.794271 2.5 15.625 C 2.5 15.455729 2.561849 15.309245 2.685547 15.185547 L 8.496094 9.375 L 2.685547 3.564453 C 2.561849 3.440756 2.5 3.294271 2.5 3.125 C 2.5 2.95573 2.561849 2.809246 2.685547 2.685547 C 2.809245 2.56185 2.955729 2.5 3.125 2.5 C 3.294271 2.5 3.440755 2.56185 3.564453 2.685547 L 9.375 8.496094 L 15.185547 2.685547 C 15.309244 2.56185 15.455729 2.5 15.625 2.5 C 15.79427 2.5 15.940754 2.56185 16.064453 2.685547 C 16.18815 2.809246 16.25 2.95573 16.25 3.125 C 16.25 3.294271 16.18815 3.440756 16.064453 3.564453 Z " Foreground="#d94b4e" />
-
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarButton Label="Respond">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Foreground="#805682" Icon="EventRespond" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarSeparator />
-
-                <!--  Show as  -->
-                <AppBarElementContainer>
-                    <StackPanel Style="{StaticResource ActionBarElementContainerStackStyle}">
-                        <TextBlock VerticalAlignment="Center" Text="Show as" />
-                        <ComboBox Width="150" />
-                    </StackPanel>
-                </AppBarElementContainer>
-
-                <!--  Reminder  -->
-                <AppBarElementContainer>
-                    <StackPanel Style="{StaticResource ActionBarElementContainerStackStyle}">
-                        <coreControls:WinoFontIcon FontSize="16" Icon="Reminder" />
-                        <TextBlock VerticalAlignment="Center" Text="Reminder" />
-                        <ComboBox Width="150" />
-                    </StackPanel>
-                </AppBarElementContainer>
-
-                <AppBarSeparator />
-
-                <!--  Edit Series  -->
-                <AppBarButton Label="Edit Series">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="EventEditSeries" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-            </CommandBar>
-        </Border>
-
-        <!--  Event details  -->
-        <ScrollViewer Grid.Row="1">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-
-                <!--  Details  -->
-                <Grid x:Name="DetailsGrid" Style="{StaticResource EventDetailsPanelGridStyle}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="Details" />
-
-                    <Grid Grid.Row="1">
-                        <!--  Read-Only Event  -->
-                        <Grid
-                            x:Name="ReadOnlyDetailsGrid"
-                            RowSpacing="6"
-                            Visibility="{x:Bind ReadOnlyToggle.IsChecked, Mode=OneWay}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="16" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <!--  Title  -->
-                            <TextBlock
-                                Style="{StaticResource SubheaderTextBlockStyle}"
-                                Text="{x:Bind ViewModel.CurrentEvent.Title, Mode=OneWay}"
-                                TextWrapping="Wrap" />
-
-                            <!--  Date and Duration  -->
-                            <TextBlock
-                                Grid.Row="2"
-                                Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetEventDetailsDateString(ViewModel.CurrentEvent, ViewModel.CurrentSettings), Mode=OneWay}"
-                                TextWrapping="Wrap" />
-
-                            <!--  Recurrence Info  -->
-                            <Grid
-                                Grid.Row="3"
-                                ColumnSpacing="6"
-                                Visibility="{x:Bind ViewModel.CurrentEvent.IsRecurringEvent}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-
-                                <coreControls:WinoFontIcon FontSize="14" Icon="CalendarEventRepeat" />
-                                <TextBlock
-                                    Grid.Column="1"
-                                    VerticalAlignment="Center"
-                                    Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetRecurrenceString(ViewModel.CurrentEvent), Mode=OneWay}"
-                                    TextWrapping="Wrap" />
-                            </Grid>
-
-                        </Grid>
-
-                        <!--  Editable Event  -->
-                        <Grid Visibility="{x:Bind helpers:XamlHelpers.ReverseVisibilityConverter(ReadOnlyDetailsGrid.Visibility), Mode=OneWay}">
-                            <TextBlock Text="editing" />
-                        </Grid>
-                    </Grid>
-                </Grid>
-
-                <!--  People  -->
-                <Grid
-                    x:Name="PeopleGrid"
-                    Grid.Column="1"
-                    Style="{StaticResource EventDetailsPanelGridStyle}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="People" />
-
-                    <Grid Grid.Row="1" RowSpacing="12">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <AutoSuggestBox
-                            Margin="6,0"
-                            BorderThickness="0"
-                            PlaceholderText="Invite someone" />
-
-                        <ListView
-                            Grid.Row="1"
-                            IsItemClickEnabled="True"
-                            ItemsSource="{x:Bind ViewModel.CurrentEvent.Attendees, Mode=OneWay}"
-                            SelectionMode="None">
-                            <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="calendar:CalendarEventAttendee">
-                                    <Grid Margin="0,6" ColumnSpacing="12">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-
-                                        <PersonPicture
-                                            Width="40"
-                                            Height="40"
-                                            DisplayName="{x:Bind Name}" />
-
-                                        <!--  TODO: Organizer  -->
-                                        <Grid Grid.Column="1">
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                            </Grid.RowDefinitions>
-
-                                            <TextBlock FontWeight="SemiBold" Text="{x:Bind Name}" />
-                                            <TextBlock
-                                                Grid.Row="1"
-                                                FontSize="13"
-                                                Text="{x:Bind Email}" />
-                                        </Grid>
-                                    </Grid>
-                                </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
-                    </Grid>
-                </Grid>
-
-                <!--  Attachments  -->
-                <Grid
-                    x:Name="AttachmentsGrid"
-                    Grid.Column="2"
-                    Style="{StaticResource EventDetailsPanelGridStyle}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="Attachments" />
-
-                </Grid>
-            </Grid>
-        </ScrollViewer>
-    </Grid>
-</abstract:EventDetailsPageAbstract>
diff --git a/Wino.Calendar/Views/EventDetailsPage.xaml.cs b/Wino.Calendar/Views/EventDetailsPage.xaml.cs
deleted file mode 100644
index ac3cff0a..00000000
--- a/Wino.Calendar/Views/EventDetailsPage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-using Wino.Calendar.Views.Abstract;
-
-namespace Wino.Calendar.Views;
-
-public sealed partial class EventDetailsPage : EventDetailsPageAbstract
-{
-    public EventDetailsPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml b/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml
deleted file mode 100644
index afab9d7f..00000000
--- a/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml
+++ /dev/null
@@ -1,125 +0,0 @@
-<abstract:AccountDetailsPageAbstract
-    x:Class="Wino.Calendar.Views.Settings.AccountDetailsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:calendar="using:Wino.Core.Domain.Entities.Calendar"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Calendar.ViewModels.Data"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Calendar.Views.Settings"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
-
-    <ScrollViewer>
-        <StackPanel Spacing="4">
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAccountName_Description}" Header="{x:Bind domain:Translator.SettingsAccountName_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 10 0.625 C 10 0.45573 10.061849 0.309246 10.185547 0.185547 C 10.309244 0.06185 10.455729 0 10.625 0 L 15.625 0 C 15.79427 0 15.940754 0.06185 16.064453 0.185547 C 16.18815 0.309246 16.25 0.45573 16.25 0.625 C 16.25 0.794271 16.18815 0.940756 16.064453 1.064453 C 15.940754 1.188152 15.79427 1.25 15.625 1.25 L 13.75 1.25 L 13.75 18.75 L 15.625 18.75 C 15.79427 18.75 15.940754 18.81185 16.064453 18.935547 C 16.18815 19.059244 16.25 19.205729 16.25 19.375 C 16.25 19.544271 16.18815 19.690756 16.064453 19.814453 C 15.940754 19.93815 15.79427 20 15.625 20 L 10.625 20 C 10.455729 20 10.309244 19.93815 10.185547 19.814453 C 10.061849 19.690756 10 19.544271 10 19.375 C 10 19.205729 10.061849 19.059244 10.185547 18.935547 C 10.309244 18.81185 10.455729 18.75 10.625 18.75 L 12.5 18.75 L 12.5 1.25 L 10.625 1.25 C 10.455729 1.25 10.309244 1.188152 10.185547 1.064453 C 10.061849 0.940756 10 0.794271 10 0.625 Z M 0 6.25 C 0 5.735678 0.097656 5.250651 0.292969 4.794922 C 0.488281 4.339193 0.756836 3.94043 1.098633 3.598633 C 1.44043 3.256836 1.837565 2.988281 2.290039 2.792969 C 2.742513 2.597656 3.229167 2.5 3.75 2.5 L 11.25 2.5 L 11.25 3.75 L 3.75 3.75 C 3.404948 3.75 3.081055 3.815105 2.77832 3.945312 C 2.475586 4.075521 2.210286 4.254558 1.982422 4.482422 C 1.754557 4.710287 1.575521 4.975587 1.445312 5.27832 C 1.315104 5.581056 1.25 5.904949 1.25 6.25 L 1.25 13.75 C 1.25 14.095053 1.315104 14.418945 1.445312 14.72168 C 1.575521 15.024414 1.754557 15.289714 1.982422 15.517578 C 2.210286 15.745443 2.475586 15.924479 2.77832 16.054688 C 3.081055 16.184896 3.404948 16.25 3.75 16.25 L 11.25 16.25 L 11.25 17.5 L 3.75 17.5 C 3.229167 17.5 2.742513 17.402344 2.290039 17.207031 C 1.837565 17.011719 1.44043 16.743164 1.098633 16.401367 C 0.756836 16.05957 0.488281 15.662436 0.292969 15.209961 C 0.097656 14.757487 0 14.270834 0 13.75 Z M 15 3.75 L 15 2.5 L 16.25 2.5 C 16.764322 2.5 17.249348 2.597656 17.705078 2.792969 C 18.160807 2.988281 18.55957 3.256836 18.901367 3.598633 C 19.243164 3.94043 19.511719 4.339193 19.707031 4.794922 C 19.902344 5.250651 20 5.735678 20 6.25 L 20 13.75 C 20 14.270834 19.902344 14.757487 19.707031 15.209961 C 19.511719 15.662436 19.243164 16.05957 18.901367 16.401367 C 18.55957 16.743164 18.160807 17.011719 17.705078 17.207031 C 17.249348 17.402344 16.764322 17.5 16.25 17.5 L 15 17.5 L 15 16.25 L 16.25 16.25 C 16.595051 16.25 16.918945 16.184896 17.22168 16.054688 C 17.524414 15.924479 17.789713 15.745443 18.017578 15.517578 C 18.245441 15.289714 18.424479 15.024414 18.554688 14.72168 C 18.684895 14.418945 18.75 14.095053 18.75 13.75 L 18.75 6.25 C 18.75 5.904949 18.684895 5.581056 18.554688 5.27832 C 18.424479 4.975587 18.245441 4.710287 18.017578 4.482422 C 17.789713 4.254558 17.524414 4.075521 17.22168 3.945312 C 16.918945 3.815105 16.595051 3.75 16.25 3.75 Z M 7.441406 5.361328 C 7.389323 5.250651 7.312825 5.162761 7.211914 5.097656 C 7.111002 5.032553 6.998697 5.000001 6.875 5 C 6.751302 5.000001 6.638997 5.032553 6.538086 5.097656 C 6.437174 5.162761 6.360677 5.250651 6.308594 5.361328 L 2.871094 12.861328 C 2.799479 13.017578 2.792969 13.177084 2.851562 13.339844 C 2.910156 13.502604 3.017578 13.619792 3.173828 13.691406 C 3.330078 13.763021 3.489583 13.769531 3.652344 13.710938 C 3.815104 13.652344 3.932292 13.544922 4.003906 13.388672 L 4.84375 11.5625 L 8.896484 11.5625 L 8.90625 11.5625 L 9.746094 13.388672 C 9.817708 13.544922 9.934896 13.652344 10.097656 13.710938 C 10.260416 13.769531 10.419922 13.763021 10.576172 13.691406 C 10.732422 13.619792 10.839844 13.502604 10.898438 13.339844 C 10.957031 13.177084 10.950521 13.017578 10.878906 12.861328 Z M 5.410156 10.3125 L 6.875 7.128906 L 8.339844 10.3125 Z " />
-                </controls:SettingsCard.HeaderIcon>
-                <Button Command="{x:Bind ViewModel.EditAccountDetailsCommand}" Content="{x:Bind domain:Translator.FolderOperation_Rename}" />
-            </controls:SettingsCard>
-
-            <!--  TODO  -->
-            <controls:SettingsExpander Description="Change expansion state and display colors for each calendar." Header="Calendar Display Configuration">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 6.328125 11.835938 C 6.035156 11.835938 5.768229 11.894531 5.527344 12.011719 C 5.286458 12.128906 5.050456 12.259115 4.819336 12.402344 C 4.588216 12.545573 4.348958 12.675781 4.101562 12.792969 C 3.854167 12.910156 3.580729 12.96875 3.28125 12.96875 C 2.877604 12.96875 2.49349 12.871094 2.128906 12.675781 C 1.764323 12.480469 1.435547 12.255859 1.142578 12.001953 C 0.745443 11.656901 0.455729 11.261394 0.273438 10.81543 C 0.091146 10.369467 0 9.886068 0 9.365234 C 0 8.844401 0.071615 8.325195 0.214844 7.807617 C 0.358073 7.290039 0.533854 6.796875 0.742188 6.328125 C 0.970052 5.820312 1.233724 5.328776 1.533203 4.853516 C 1.832682 4.378256 2.158203 3.925781 2.509766 3.496094 C 2.828776 3.105469 3.167318 2.736004 3.525391 2.387695 C 3.883463 2.039389 4.277344 1.728516 4.707031 1.455078 C 5.442708 0.986328 6.225586 0.628256 7.055664 0.380859 C 7.885742 0.133465 8.736979 0.009766 9.609375 0.009766 C 10.436197 0.009766 11.25 0.117188 12.050781 0.332031 C 12.851562 0.546875 13.616536 0.849609 14.345703 1.240234 C 15.23763 1.728516 16.033527 2.298178 16.733398 2.949219 C 17.433268 3.600262 18.025715 4.322917 18.510742 5.117188 C 18.995768 5.911459 19.365234 6.769206 19.619141 7.69043 C 19.873047 8.611654 20 9.583334 20 10.605469 C 20 11.230469 19.952799 11.850586 19.858398 12.46582 C 19.763996 13.081055 19.62565 13.688151 19.443359 14.287109 C 19.300129 14.74935 19.119465 15.213217 18.901367 15.678711 C 18.683268 16.144205 18.427734 16.59017 18.134766 17.016602 C 17.841797 17.443033 17.516275 17.843424 17.158203 18.217773 C 16.800129 18.592123 16.411133 18.916016 15.991211 19.189453 C 15.571289 19.462891 15.12207 19.677734 14.643555 19.833984 C 14.165039 19.990234 13.662109 20.068359 13.134766 20.068359 C 12.841797 20.068359 12.553711 20.042318 12.270508 19.990234 C 11.987305 19.93815 11.708984 19.863281 11.435547 19.765625 C 10.86263 19.563803 10.371094 19.31315 9.960938 19.013672 C 9.550781 18.714193 9.210611 18.365885 8.94043 17.96875 C 8.670247 17.571615 8.465169 17.12565 8.325195 16.630859 C 8.185221 16.136068 8.095703 15.592448 8.056641 15 C 8.030599 14.641928 8.012695 14.283854 8.00293 13.925781 C 7.993164 13.567709 7.945963 13.212891 7.861328 12.861328 C 7.835286 12.763672 7.805989 12.659506 7.773438 12.548828 C 7.740885 12.438151 7.688802 12.347006 7.617188 12.275391 C 7.545573 12.197266 7.457682 12.128906 7.353516 12.070312 C 7.249349 12.011719 7.138672 11.966146 7.021484 11.933594 C 6.904297 11.901042 6.785481 11.876628 6.665039 11.860352 C 6.544596 11.844076 6.432292 11.835938 6.328125 11.835938 Z M 13.134766 18.818359 C 13.623047 18.818359 14.088541 18.725586 14.53125 18.540039 C 14.973958 18.354492 15.384114 18.108725 15.761719 17.802734 C 16.276041 17.386068 16.722004 16.894531 17.099609 16.328125 C 17.477213 15.761719 17.789713 15.157878 18.037109 14.516602 C 18.284504 13.875326 18.466797 13.214519 18.583984 12.53418 C 18.701172 11.853842 18.759766 11.191406 18.759766 10.546875 C 18.759766 9.641928 18.647461 8.785808 18.422852 7.978516 C 18.198242 7.171225 17.871094 6.420898 17.441406 5.727539 C 17.011719 5.03418 16.487629 4.404297 15.869141 3.837891 C 15.25065 3.271484 14.547525 2.773438 13.759766 2.34375 C 13.128255 1.998699 12.460938 1.728516 11.757812 1.533203 C 11.054688 1.337891 10.338541 1.240234 9.609375 1.240234 C 8.710938 1.240234 7.869466 1.383465 7.084961 1.669922 C 6.300456 1.956381 5.582682 2.351889 4.931641 2.856445 C 4.280599 3.361004 3.697917 3.953451 3.183594 4.633789 C 2.669271 5.314128 2.236328 6.048178 1.884766 6.835938 C 1.702474 7.233074 1.551107 7.64323 1.430664 8.066406 C 1.310221 8.489584 1.25 8.922526 1.25 9.365234 C 1.25 9.703776 1.302083 10.011394 1.40625 10.288086 C 1.510417 10.564779 1.689453 10.817058 1.943359 11.044922 C 2.014974 11.110026 2.104492 11.181641 2.211914 11.259766 C 2.319336 11.337891 2.431641 11.411133 2.548828 11.479492 C 2.666016 11.547852 2.783203 11.606445 2.900391 11.655273 C 3.017578 11.704102 3.125 11.728516 3.222656 11.728516 C 3.404948 11.728516 3.60026 11.668295 3.808594 11.547852 C 4.016927 11.427409 4.246419 11.297201 4.49707 11.157227 C 4.747721 11.017253 5.022786 10.887045 5.322266 10.766602 C 5.621745 10.646159 5.957031 10.585938 6.328125 10.585938 C 6.529948 10.585938 6.731771 10.603842 6.933594 10.639648 C 7.135416 10.675456 7.330729 10.722656 7.519531 10.78125 C 7.942708 10.917969 8.268229 11.113281 8.496094 11.367188 C 8.723958 11.621094 8.891602 11.912436 8.999023 12.241211 C 9.106445 12.569987 9.173177 12.928061 9.199219 13.31543 C 9.22526 13.7028 9.249674 14.098308 9.272461 14.501953 C 9.295247 14.9056 9.337564 15.309245 9.399414 15.712891 C 9.461263 16.116537 9.580078 16.499023 9.755859 16.860352 C 9.931641 17.22168 10.185547 17.552084 10.517578 17.851562 C 10.849609 18.151041 11.295572 18.398438 11.855469 18.59375 C 12.272135 18.74349 12.698566 18.818359 13.134766 18.818359 Z M 8.75 4.6875 C 8.75 4.427084 8.841146 4.20573 9.023438 4.023438 C 9.205729 3.841146 9.427083 3.75 9.6875 3.75 C 9.947916 3.75 10.169271 3.841146 10.351562 4.023438 C 10.533854 4.20573 10.625 4.427084 10.625 4.6875 C 10.625 4.947917 10.533854 5.169271 10.351562 5.351562 C 10.169271 5.533854 9.947916 5.625 9.6875 5.625 C 9.427083 5.625 9.205729 5.533854 9.023438 5.351562 C 8.841146 5.169271 8.75 4.947917 8.75 4.6875 Z M 12.5 5.9375 C 12.5 5.677084 12.591146 5.455729 12.773438 5.273438 C 12.955729 5.091146 13.177083 5.000001 13.4375 5 C 13.697916 5.000001 13.91927 5.091146 14.101562 5.273438 C 14.283854 5.455729 14.375 5.677084 14.375 5.9375 C 14.375 6.197917 14.283854 6.419271 14.101562 6.601562 C 13.91927 6.783855 13.697916 6.875001 13.4375 6.875 C 13.177083 6.875001 12.955729 6.783855 12.773438 6.601562 C 12.591146 6.419271 12.5 6.197917 12.5 5.9375 Z M 14.6875 8.75 C 14.6875 8.489584 14.778646 8.268229 14.960938 8.085938 C 15.143229 7.903646 15.364582 7.812501 15.625 7.8125 C 15.885416 7.812501 16.10677 7.903646 16.289062 8.085938 C 16.471354 8.268229 16.5625 8.489584 16.5625 8.75 C 16.5625 9.010417 16.471354 9.231771 16.289062 9.414062 C 16.10677 9.596354 15.885416 9.6875 15.625 9.6875 C 15.364582 9.6875 15.143229 9.596354 14.960938 9.414062 C 14.778646 9.231771 14.6875 9.010417 14.6875 8.75 Z M 14.6875 12.5 C 14.6875 12.239584 14.778646 12.018229 14.960938 11.835938 C 15.143229 11.653646 15.364582 11.5625 15.625 11.5625 C 15.885416 11.5625 16.10677 11.653646 16.289062 11.835938 C 16.471354 12.018229 16.5625 12.239584 16.5625 12.5 C 16.5625 12.760417 16.471354 12.981771 16.289062 13.164062 C 16.10677 13.346354 15.885416 13.4375 15.625 13.4375 C 15.364582 13.4375 15.143229 13.346354 14.960938 13.164062 C 14.778646 12.981771 14.6875 12.760417 14.6875 12.5 Z M 12.1875 15 C 12.187499 14.739584 12.278645 14.518229 12.460938 14.335938 C 12.643229 14.153646 12.864583 14.0625 13.125 14.0625 C 13.385416 14.0625 13.606771 14.153646 13.789062 14.335938 C 13.971354 14.518229 14.062499 14.739584 14.0625 15 C 14.062499 15.260417 13.971354 15.481771 13.789062 15.664062 C 13.606771 15.846354 13.385416 15.9375 13.125 15.9375 C 12.864583 15.9375 12.643229 15.846354 12.460938 15.664062 C 12.278645 15.481771 12.187499 15.260417 12.1875 15 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <ScrollViewer>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="180" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-
-                                <!--  Headers  -->
-                                <Grid Grid.Column="1">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBlock
-                                        FontWeight="SemiBold"
-                                        Text="{x:Bind domain:Translator.CalendarDisplayOptions_Expand}"
-                                        TextWrapping="Wrap" />
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        HorizontalAlignment="Right"
-                                        FontWeight="SemiBold"
-                                        Text="{x:Bind domain:Translator.CalendarDisplayOptions_Color}"
-                                        TextWrapping="Wrap" />
-                                </Grid>
-
-                                <ScrollViewer Grid.Row="1" Grid.ColumnSpan="2">
-                                    <ItemsControl ItemsSource="{x:Bind ViewModel.AccountCalendarStateService.GroupedAccountCalendars}">
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
-                                                <Grid>
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="Auto" />
-                                                        <RowDefinition Height="Auto" />
-                                                    </Grid.RowDefinitions>
-                                                    <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind Account.Name}" />
-
-                                                    <ItemsControl Grid.Row="1" ItemsSource="{x:Bind AccountCalendars, Mode=OneWay}">
-                                                        <ItemsControl.ItemTemplate>
-                                                            <DataTemplate x:DataType="data:AccountCalendarViewModel">
-                                                                <Grid>
-                                                                    <Grid.ColumnDefinitions>
-                                                                        <ColumnDefinition Width="*" />
-                                                                        <ColumnDefinition Width="Auto" />
-                                                                    </Grid.ColumnDefinitions>
-                                                                    <TextBlock Text="{x:Bind Name, Mode=OneWay}" />
-
-                                                                    <Grid Grid.Column="1">
-                                                                        <Grid.ColumnDefinitions>
-                                                                            <ColumnDefinition Width="*" />
-                                                                            <ColumnDefinition Width="*" />
-                                                                        </Grid.ColumnDefinitions>
-                                                                        <CheckBox HorizontalAlignment="Center" IsChecked="{x:Bind IsExtended, Mode=TwoWay}" />
-
-                                                                        <Button
-                                                                            Grid.Column="1"
-                                                                            Width="30"
-                                                                            Height="30"
-                                                                            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
-                                                                            CornerRadius="15">
-                                                                            <Button.Flyout>
-                                                                                <Flyout Placement="Left">
-                                                                                    <muxc:ColorPicker VerticalAlignment="Center" Color="{x:Bind helpers:XamlHelpers.GetWindowsColorFromHex(BackgroundColorHex), Mode=TwoWay, BindBack=helpers:XamlHelpers.GetColorFromHex}" />
-                                                                                </Flyout>
-                                                                            </Button.Flyout>
-                                                                        </Button>
-
-                                                                    </Grid>
-                                                                </Grid>
-                                                            </DataTemplate>
-                                                        </ItemsControl.ItemTemplate>
-                                                    </ItemsControl>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                </ScrollViewer>
-                            </Grid>
-                        </ScrollViewer>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-        </StackPanel>
-    </ScrollViewer>
-</abstract:AccountDetailsPageAbstract>
diff --git a/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml.cs b/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml.cs
deleted file mode 100644
index 0cb918b0..00000000
--- a/Wino.Calendar/Views/Settings/AccountDetailsPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Calendar.Views.Abstract;
-
-namespace Wino.Calendar.Views.Settings;
-
-public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
-{
-    public AccountDetailsPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml b/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml
deleted file mode 100644
index 7254969f..00000000
--- a/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml
+++ /dev/null
@@ -1,200 +0,0 @@
-<abstract:CalendarSettingsPageAbstract
-    x:Class="Wino.Calendar.Views.Settings.CalendarSettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:controls1="using:Microsoft.UI.Xaml.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Calendar.Views.Settings"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkitExt="using:CommunityToolkit.WinUI"
-    mc:Ignorable="d">
-
-    <Grid>
-        <StackPanel>
-            <!--  First day of week  -->
-            <controls:SettingsCard Description="Adjust the day that week starts." Header="First day of week">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 16.328125 2.5 C 16.816406 2.5 17.283527 2.599285 17.729492 2.797852 C 18.175455 2.99642 18.56608 3.263348 18.901367 3.598633 C 19.236652 3.93392 19.50358 4.324545 19.702148 4.770508 C 19.900715 5.216473 20 5.683595 20 6.171875 L 20 13.828125 C 20 14.316406 19.900715 14.783529 19.702148 15.229492 C 19.50358 15.675456 19.236652 16.066082 18.901367 16.401367 C 18.56608 16.736654 18.175455 17.00358 17.729492 17.202148 C 17.283527 17.400717 16.816406 17.5 16.328125 17.5 L 3.671875 17.5 C 3.183594 17.5 2.716471 17.400717 2.270508 17.202148 C 1.824544 17.00358 1.433919 16.736654 1.098633 16.401367 C 0.763346 16.066082 0.496419 15.675456 0.297852 15.229492 C 0.099284 14.783529 0 14.316406 0 13.828125 L 0 6.171875 C 0 5.683595 0.099284 5.216473 0.297852 4.770508 C 0.496419 4.324545 0.763346 3.93392 1.098633 3.598633 C 1.433919 3.263348 1.824544 2.99642 2.270508 2.797852 C 2.716471 2.599285 3.183594 2.5 3.671875 2.5 Z M 18.75 6.201172 C 18.75 5.875651 18.683268 5.564779 18.549805 5.268555 C 18.41634 4.972332 18.237305 4.711915 18.012695 4.487305 C 17.788086 4.262696 17.527668 4.08366 17.231445 3.950195 C 16.935221 3.816732 16.624348 3.75 16.298828 3.75 L 3.701172 3.75 C 3.375651 3.75 3.064779 3.816732 2.768555 3.950195 C 2.472331 4.08366 2.211914 4.262696 1.987305 4.487305 C 1.762695 4.711915 1.583659 4.972332 1.450195 5.268555 C 1.316732 5.564779 1.25 5.875651 1.25 6.201172 L 1.25 13.798828 C 1.25 14.130859 1.318359 14.446615 1.455078 14.746094 C 1.591797 15.045573 1.774089 15.30599 2.001953 15.527344 C 2.229818 15.748698 2.495117 15.924479 2.797852 16.054688 C 3.100586 16.184896 3.417969 16.25 3.75 16.25 L 3.75 8.125 C 3.75 7.871094 3.798828 7.630209 3.896484 7.402344 C 3.99414 7.174479 4.129231 6.974284 4.301758 6.801758 C 4.474284 6.629232 4.674479 6.494141 4.902344 6.396484 C 5.130208 6.298828 5.371094 6.25 5.625 6.25 L 14.375 6.25 C 14.628906 6.25 14.869791 6.298828 15.097656 6.396484 C 15.32552 6.494141 15.525715 6.629232 15.698242 6.801758 C 15.870768 6.974284 16.005859 7.174479 16.103516 7.402344 C 16.201172 7.630209 16.25 7.871094 16.25 8.125 L 16.25 16.25 L 16.298828 16.25 C 16.624348 16.25 16.935221 16.18327 17.231445 16.049805 C 17.527668 15.916342 17.788086 15.737305 18.012695 15.512695 C 18.237305 15.288086 18.41634 15.02767 18.549805 14.731445 C 18.683268 14.435222 18.75 14.12435 18.75 13.798828 Z M 15 16.25 L 15 8.125 C 14.999999 7.95573 14.93815 7.809246 14.814453 7.685547 C 14.690755 7.56185 14.544271 7.5 14.375 7.5 L 5.625 7.5 C 5.455729 7.5 5.309245 7.56185 5.185547 7.685547 C 5.061849 7.809246 5 7.95573 5 8.125 L 5 16.25 Z M 9.0625 9.6875 C 9.0625 9.947917 8.971354 10.169271 8.789062 10.351562 C 8.606771 10.533854 8.385416 10.625 8.125 10.625 C 7.864583 10.625 7.643229 10.533854 7.460938 10.351562 C 7.278646 10.169271 7.1875 9.947917 7.1875 9.6875 C 7.1875 9.427084 7.278646 9.205729 7.460938 9.023438 C 7.643229 8.841146 7.864583 8.75 8.125 8.75 C 8.385416 8.75 8.606771 8.841146 8.789062 9.023438 C 8.971354 9.205729 9.0625 9.427084 9.0625 9.6875 Z M 12.8125 9.6875 C 12.8125 9.947917 12.721354 10.169271 12.539062 10.351562 C 12.356771 10.533854 12.135416 10.625 11.875 10.625 C 11.614583 10.625 11.393229 10.533854 11.210938 10.351562 C 11.028646 10.169271 10.9375 9.947917 10.9375 9.6875 C 10.9375 9.427084 11.028646 9.205729 11.210938 9.023438 C 11.393229 8.841146 11.614583 8.75 11.875 8.75 C 12.135416 8.75 12.356771 8.841146 12.539062 9.023438 C 12.721354 9.205729 12.8125 9.427084 12.8125 9.6875 Z M 9.0625 13.4375 C 9.0625 13.697917 8.971354 13.919271 8.789062 14.101562 C 8.606771 14.283854 8.385416 14.375 8.125 14.375 C 7.864583 14.375 7.643229 14.283854 7.460938 14.101562 C 7.278646 13.919271 7.1875 13.697917 7.1875 13.4375 C 7.1875 13.177084 7.278646 12.955729 7.460938 12.773438 C 7.643229 12.591146 7.864583 12.5 8.125 12.5 C 8.385416 12.5 8.606771 12.591146 8.789062 12.773438 C 8.971354 12.955729 9.0625 13.177084 9.0625 13.4375 Z M 12.8125 13.4375 C 12.8125 13.697917 12.721354 13.919271 12.539062 14.101562 C 12.356771 14.283854 12.135416 14.375 11.875 14.375 C 11.614583 14.375 11.393229 14.283854 11.210938 14.101562 C 11.028646 13.919271 10.9375 13.697917 10.9375 13.4375 C 10.9375 13.177084 11.028646 12.955729 11.210938 12.773438 C 11.393229 12.591146 11.614583 12.5 11.875 12.5 C 12.135416 12.5 12.356771 12.591146 12.539062 12.773438 C 12.721354 12.955729 12.8125 13.177084 12.8125 13.4375 Z " />
-                </controls:SettingsCard.HeaderIcon>
-                <controls:SettingsCard.Content>
-                    <ComboBox ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedFirstDayOfWeekIndex, Mode=TwoWay}" />
-                </controls:SettingsCard.Content>
-            </controls:SettingsCard>
-
-            <!--  Working days/hours  -->
-            <controls:SettingsExpander Description="Set the day range for your working hours." Header="Working days">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 18.75 8.056641 L 18.75 14.443359 C 18.75 14.853516 18.666992 15.244141 18.500977 15.615234 C 18.334961 15.986328 18.113605 16.310221 17.836914 16.586914 C 17.560221 16.863607 17.236328 17.084961 16.865234 17.250977 C 16.494141 17.416992 16.103516 17.5 15.693359 17.5 L 4.306641 17.5 C 3.896484 17.5 3.505859 17.416992 3.134766 17.250977 C 2.763672 17.084961 2.439779 16.863607 2.163086 16.586914 C 1.886393 16.310221 1.665039 15.986328 1.499023 15.615234 C 1.333008 15.244141 1.25 14.853516 1.25 14.443359 L 1.25 8.056641 C 1.25 7.633464 1.334635 7.236328 1.503906 6.865234 C 1.673177 6.494141 1.901042 6.170248 2.1875 5.893555 C 2.473958 5.616862 2.80599 5.398764 3.183594 5.239258 C 3.561198 5.079754 3.958333 5.000001 4.375 5 L 6.25 5 L 6.25 2.5 C 6.25 2.324219 6.282552 2.161459 6.347656 2.011719 C 6.41276 1.86198 6.502278 1.730145 6.616211 1.616211 C 6.730143 1.502279 6.861979 1.412762 7.011719 1.347656 C 7.161458 1.282553 7.324218 1.25 7.5 1.25 L 12.5 1.25 C 12.675781 1.25 12.840169 1.282553 12.993164 1.347656 C 13.146158 1.412762 13.277994 1.500652 13.388672 1.611328 C 13.499349 1.722006 13.587239 1.853842 13.652344 2.006836 C 13.717447 2.159832 13.75 2.324219 13.75 2.5 L 13.75 5 L 15.693359 5 C 16.103516 5.000001 16.494141 5.083009 16.865234 5.249023 C 17.236328 5.41504 17.560221 5.636395 17.836914 5.913086 C 18.113605 6.189779 18.334961 6.513672 18.500977 6.884766 C 18.666992 7.255859 18.75 7.646484 18.75 8.056641 Z M 12.5 2.5 L 7.5 2.5 L 7.5 5 L 12.5 5 Z M 17.5 8.125 C 17.5 7.871094 17.451172 7.630209 17.353516 7.402344 C 17.255859 7.174479 17.120768 6.974284 16.948242 6.801758 C 16.775715 6.629232 16.57552 6.494141 16.347656 6.396484 C 16.119791 6.298828 15.878906 6.25 15.625 6.25 L 4.375 6.25 C 4.121094 6.25 3.880208 6.298828 3.652344 6.396484 C 3.424479 6.494141 3.224284 6.629232 3.051758 6.801758 C 2.879232 6.974284 2.744141 7.174479 2.646484 7.402344 C 2.548828 7.630209 2.5 7.871094 2.5 8.125 L 2.5 14.375 C 2.5 14.628906 2.548828 14.869792 2.646484 15.097656 C 2.744141 15.325521 2.879232 15.525717 3.051758 15.698242 C 3.224284 15.870769 3.424479 16.005859 3.652344 16.103516 C 3.880208 16.201172 4.121094 16.25 4.375 16.25 L 15.625 16.25 C 15.878906 16.25 16.119791 16.201172 16.347656 16.103516 C 16.57552 16.005859 16.775715 15.870769 16.948242 15.698242 C 17.120768 15.525717 17.255859 15.325521 17.353516 15.097656 C 17.451172 14.869792 17.5 14.628906 17.5 14.375 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <Grid RowSpacing="12">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="50" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <TextBlock
-                                    VerticalAlignment="Center"
-                                    FontWeight="Bold"
-                                    Text="From" />
-                                <ComboBox
-                                    Grid.Column="1"
-                                    ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}"
-                                    SelectedIndex="{x:Bind ViewModel.WorkingDayStartIndex, Mode=TwoWay}" />
-                                <TimePicker
-                                    x:Name="WorkHourStartPicker"
-                                    Grid.Column="2"
-                                    Margin="12,0"
-                                    Time="{x:Bind ViewModel.WorkingHourStart, Mode=TwoWay}" />
-                            </Grid>
-
-                            <Grid Grid.Row="1">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="50" />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <TextBlock
-                                    VerticalAlignment="Center"
-                                    FontWeight="Bold"
-                                    Text="To" />
-                                <ComboBox
-                                    Grid.Column="1"
-                                    ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}"
-                                    SelectedIndex="{x:Bind ViewModel.WorkingDayEndIndex, Mode=TwoWay}" />
-
-                                <TimePicker
-                                    x:Name="WorkEndStartPicker"
-                                    Grid.Column="2"
-                                    Margin="12,0"
-                                    Time="{x:Bind ViewModel.WorkingHourEnd, Mode=TwoWay}" />
-                            </Grid>
-                        </Grid>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-            <!--  Cell hour height  -->
-            <controls:SettingsExpander
-                Description="Adjust calendar timeline rendering options."
-                Header="Calendar rendering"
-                IsExpanded="True">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 16.25 9.375 C 16.25 9.544271 16.18815 9.690756 16.064453 9.814453 C 15.940754 9.938151 15.79427 10 15.625 10 L 13.642578 10 C 13.577474 10.188803 13.486328 10.359701 13.369141 10.512695 C 13.251953 10.66569 13.115234 10.797526 12.958984 10.908203 C 12.802734 11.018881 12.633463 11.103516 12.451172 11.162109 C 12.26888 11.220703 12.076822 11.25 11.875 11.25 C 11.673177 11.25 11.481119 11.220703 11.298828 11.162109 C 11.116536 11.103516 10.947266 11.018881 10.791016 10.908203 C 10.634766 10.797526 10.498047 10.66569 10.380859 10.512695 C 10.263672 10.359701 10.172525 10.188803 10.107422 10 L 4.375 10 C 4.205729 10 4.059245 9.938151 3.935547 9.814453 C 3.811849 9.690756 3.75 9.544271 3.75 9.375 C 3.75 9.205729 3.811849 9.059245 3.935547 8.935547 C 4.059245 8.81185 4.205729 8.75 4.375 8.75 L 10.107422 8.75 C 10.172525 8.561198 10.263672 8.3903 10.380859 8.237305 C 10.498047 8.084311 10.634766 7.952475 10.791016 7.841797 C 10.947266 7.73112 11.116536 7.646484 11.298828 7.587891 C 11.481119 7.529297 11.673177 7.5 11.875 7.5 C 12.076822 7.5 12.26888 7.529297 12.451172 7.587891 C 12.633463 7.646484 12.802734 7.73112 12.958984 7.841797 C 13.115234 7.952475 13.251953 8.084311 13.369141 8.237305 C 13.486328 8.3903 13.577474 8.561198 13.642578 8.75 L 15.625 8.75 C 15.79427 8.75 15.940754 8.81185 16.064453 8.935547 C 16.18815 9.059245 16.25 9.205729 16.25 9.375 Z M 16.25 14.375 C 16.25 14.544271 16.18815 14.690756 16.064453 14.814453 C 15.940754 14.938151 15.79427 15 15.625 15 L 9.892578 15 C 9.827474 15.188803 9.736328 15.359701 9.619141 15.512695 C 9.501953 15.66569 9.365234 15.797526 9.208984 15.908203 C 9.052734 16.018881 8.883463 16.103516 8.701172 16.162109 C 8.51888 16.220703 8.326822 16.25 8.125 16.25 C 7.923177 16.25 7.731119 16.220703 7.548828 16.162109 C 7.366536 16.103516 7.197266 16.018881 7.041016 15.908203 C 6.884766 15.797526 6.748047 15.66569 6.630859 15.512695 C 6.513672 15.359701 6.422526 15.188803 6.357422 15 L 4.375 15 C 4.205729 15 4.059245 14.938151 3.935547 14.814453 C 3.811849 14.690756 3.75 14.544271 3.75 14.375 C 3.75 14.205729 3.811849 14.059245 3.935547 13.935547 C 4.059245 13.81185 4.205729 13.75 4.375 13.75 L 6.357422 13.75 C 6.422526 13.561198 6.513672 13.3903 6.630859 13.237305 C 6.748047 13.084311 6.884766 12.952475 7.041016 12.841797 C 7.197266 12.73112 7.366536 12.646484 7.548828 12.587891 C 7.731119 12.529297 7.923177 12.5 8.125 12.5 C 8.326822 12.5 8.51888 12.529297 8.701172 12.587891 C 8.883463 12.646484 9.052734 12.73112 9.208984 12.841797 C 9.365234 12.952475 9.501953 13.084311 9.619141 13.237305 C 9.736328 13.3903 9.827474 13.561198 9.892578 13.75 L 15.625 13.75 C 15.79427 13.75 15.940754 13.81185 16.064453 13.935547 C 16.18815 14.059245 16.25 14.205729 16.25 14.375 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical"
-                        Description="How many pixels should 1 hour representation occupy in daily/weekly calendars."
-                        Header="Hour height">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 Z M 2.5 10 L 17.5 10 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-                        <Grid
-                            Padding="0,20"
-                            ColumnSpacing="12"
-                            RowSpacing="12">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Margin="0,5,0,0" VerticalAlignment="Top">
-                                <Run Text="{x:Bind ViewModel.CellHourHeight, Mode=OneWay}" />
-                                <Run Text="px" />
-                            </TextBlock>
-
-                            <Slider
-                                x:Name="HourCellSlider"
-                                Grid.Column="1"
-                                Maximum="200"
-                                Minimum="60"
-                                Value="{x:Bind ViewModel.CellHourHeight, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" />
-
-                            <!--  Hour cell demo  -->
-                            <Grid
-                                Grid.Column="2"
-                                HorizontalAlignment="Center"
-                                ColumnSpacing="6">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <TextBlock HorizontalAlignment="Right" Text="00:00" />
-                                <TextBlock
-                                    Grid.Row="2"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Bottom"
-                                    Text="01:00" />
-                                <Grid
-                                    Grid.Column="1"
-                                    Width="100"
-                                    Height="{x:Bind HourCellSlider.Value, Mode=OneWay}"
-                                    VerticalAlignment="Center"
-                                    BorderBrush="Black"
-                                    BorderThickness="1">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="*" />
-                                        <RowDefinition Height="1" />
-                                        <RowDefinition Height="*" />
-                                    </Grid.RowDefinitions>
-
-
-                                    <Rectangle
-                                        Grid.Row="1"
-                                        HorizontalAlignment="Stretch"
-                                        Stroke="Black"
-                                        StrokeThickness="0.5" />
-
-                                </Grid>
-                            </Grid>
-
-                        </Grid>
-                    </controls:SettingsCard>
-                    <controls:SettingsCard Description="Set whether you want to use AM/PM or 24 hour clock identifier." Header="Clock identifier for headers">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 Z M 2.5 10 L 17.5 10 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-                        <ToggleSwitch
-                            IsOn="{x:Bind ViewModel.Is24HourHeaders, Mode=TwoWay}"
-                            OffContent="12h"
-                            OnContent="24h" />
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-        </StackPanel>
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="ClockIdentifierStates">
-                <VisualState x:Name="TwelweHour" />
-                <VisualState x:Name="TwentyFourHour">
-                    <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind ViewModel.Is24HourHeaders, Mode=OneWay}" />
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="WorkStartStartPicker.ClockIdentifier" Value="24HourClock" />
-                        <Setter Target="WorkEndStartPicker.ClockIdentifier" Value="24HourClock" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-    </Grid>
-</abstract:CalendarSettingsPageAbstract>
-
-
diff --git a/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml.cs b/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml.cs
deleted file mode 100644
index 1114ea5d..00000000
--- a/Wino.Calendar/Views/Settings/CalendarSettingsPage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Wino.Calendar.Views.Abstract;
-
-
-namespace Wino.Calendar.Views.Settings;
-
-public sealed partial class CalendarSettingsPage : CalendarSettingsPageAbstract
-{
-    public CalendarSettingsPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml.cs b/Wino.Calendar/Views/Settings/PersonalizationPage.xaml.cs
deleted file mode 100644
index a9518467..00000000
--- a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Calendar.Views.Abstract;
-
-namespace Wino.Calendar.Views.Settings;
-
-public sealed partial class PersonalizationPage : PersonalizationPageAbstract
-{
-    public PersonalizationPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Calendar/Wino.Calendar.csproj b/Wino.Calendar/Wino.Calendar.csproj
deleted file mode 100644
index 97d6df07..00000000
--- a/Wino.Calendar/Wino.Calendar.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-		<UseUwp>true</UseUwp>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<DefaultLanguage>en-US</DefaultLanguage>
-		<!--<PublishAot>true</PublishAot>-->
-		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
-		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
-		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-	</PropertyGroup>
-
-	<ItemGroup>
-	  <Compile Remove="BundleArtifacts\**" />
-	  <EmbeddedResource Remove="BundleArtifacts\**" />
-	  <None Remove="BundleArtifacts\**" />
-	  <Page Remove="BundleArtifacts\**" />
-	</ItemGroup>
-	<ItemGroup>
-	  <PRIResource Remove="BundleArtifacts\**" />
-	</ItemGroup>
-
-  <ItemGroup>
-    <None Include="Package.StoreAssociation.xml" />
-    <Content Include="Assets\LargeTile.scale-100.png" />
-    <Content Include="Assets\LargeTile.scale-125.png" />
-    <Content Include="Assets\LargeTile.scale-150.png" />
-    <Content Include="Assets\LargeTile.scale-200.png" />
-    <Content Include="Assets\LargeTile.scale-400.png" />
-    <Content Include="Assets\SmallTile.scale-100.png" />
-    <Content Include="Assets\SmallTile.scale-125.png" />
-    <Content Include="Assets\SmallTile.scale-150.png" />
-    <Content Include="Assets\SmallTile.scale-200.png" />
-    <Content Include="Assets\SmallTile.scale-400.png" />
-    <Content Include="Assets\SplashScreen.scale-100.png" />
-    <Content Include="Assets\SplashScreen.scale-125.png" />
-    <Content Include="Assets\SplashScreen.scale-150.png" />
-    <Content Include="Assets\SplashScreen.scale-400.png" />
-    <Content Include="Assets\Square150x150Logo.scale-100.png" />
-    <Content Include="Assets\Square150x150Logo.scale-125.png" />
-    <Content Include="Assets\Square150x150Logo.scale-150.png" />
-    <Content Include="Assets\Square150x150Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-    <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Assets\Square44x44Logo.scale-100.png" />
-    <Content Include="Assets\Square44x44Logo.scale-125.png" />
-    <Content Include="Assets\Square44x44Logo.scale-150.png" />
-    <Content Include="Assets\Square44x44Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Assets\StoreLogo.scale-100.png" />
-    <Content Include="Assets\StoreLogo.scale-125.png" />
-    <Content Include="Assets\StoreLogo.scale-150.png" />
-    <Content Include="Assets\StoreLogo.scale-200.png" />
-    <Content Include="Assets\StoreLogo.scale-400.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-100.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-125.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-150.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives" />
-    <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
-    <PackageReference Include="Win2D.uwp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Authentication\Wino.Authentication.csproj" />
-    <ProjectReference Include="..\Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj" />
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj" />
-    <ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj" />
-    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
-    <ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Wino.Core.Domain/AppUrls.cs b/Wino.Core.Domain/AppUrls.cs
new file mode 100644
index 00000000..72740d3f
--- /dev/null
+++ b/Wino.Core.Domain/AppUrls.cs
@@ -0,0 +1,10 @@
+namespace Wino.Core.Domain;
+
+public static class AppUrls
+{
+    public const string Website = "https://www.winomail.app";
+    public const string Discord = "https://discord.gg/windows-apps-hub-714581497222398064";
+    public const string GitHub = "https://github.com/bkaankose/Wino-Mail/";
+    public const string PrivacyPolicy = "https://www.winomail.app/support/privacy";
+    public const string Paypal = "https://paypal.me/bkaankose?country.x=PL&locale.x=en_US";
+}
diff --git a/Wino.Core.Domain/BasicTypesJsonContext.cs b/Wino.Core.Domain/BasicTypesJsonContext.cs
index b9dba02d..f6085c1c 100644
--- a/Wino.Core.Domain/BasicTypesJsonContext.cs
+++ b/Wino.Core.Domain/BasicTypesJsonContext.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using Wino.Core.Domain.Models.Updates;
 
 namespace Wino.Core.Domain;
 
@@ -8,4 +9,6 @@ namespace Wino.Core.Domain;
 [JsonSerializable(typeof(int))]
 [JsonSerializable(typeof(List<string>))]
 [JsonSerializable(typeof(bool))]
+[JsonSerializable(typeof(UpdateNotes))]
+[JsonSerializable(typeof(List<UpdateNoteSection>))]
 public partial class BasicTypesJsonContext : JsonSerializerContext;
diff --git a/Wino.Core.Domain/CalendarRecurrenceSummaryFormatter.cs b/Wino.Core.Domain/CalendarRecurrenceSummaryFormatter.cs
new file mode 100644
index 00000000..3092b0f8
--- /dev/null
+++ b/Wino.Core.Domain/CalendarRecurrenceSummaryFormatter.cs
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Core.Domain;
+
+public static class CalendarRecurrenceSummaryFormatter
+{
+    private static readonly DayOfWeek[] OrderedDays =
+    [
+        DayOfWeek.Monday,
+        DayOfWeek.Tuesday,
+        DayOfWeek.Wednesday,
+        DayOfWeek.Thursday,
+        DayOfWeek.Friday,
+        DayOfWeek.Saturday,
+        DayOfWeek.Sunday
+    ];
+
+    public static string BuildSummary(
+        bool isRecurring,
+        DateTimeOffset effectiveStart,
+        DateTimeOffset effectiveEnd,
+        bool isAllDay,
+        CalendarSettings settings,
+        int interval,
+        CalendarItemRecurrenceFrequency frequency,
+        IReadOnlyCollection<DayOfWeek> daysOfWeek,
+        DateTimeOffset? recurrenceEndDate)
+    {
+        var culture = settings?.CultureInfo ?? CultureInfo.CurrentCulture;
+        var timeSummary = isAllDay
+            ? Translator.CalendarItemAllDay
+            : string.Format(
+                culture,
+                Translator.CalendarEventCompose_TimeRangeSummary,
+                effectiveStart.ToString(settings?.DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour ? "HH:mm" : "h:mm tt", culture),
+                effectiveEnd.ToString(settings?.DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour ? "HH:mm" : "h:mm tt", culture));
+
+        if (!isRecurring)
+        {
+            return string.Format(
+                culture,
+                Translator.CalendarEventCompose_SingleOccurrenceSummary,
+                effectiveStart.ToString("dddd yyyy-MM-dd", culture),
+                timeSummary);
+        }
+
+        var normalizedDays = NormalizeDays(daysOfWeek);
+        var isEveryDay = (frequency == CalendarItemRecurrenceFrequency.Daily && interval == 1) ||
+                         (frequency == CalendarItemRecurrenceFrequency.Weekly && interval == 1 && normalizedDays.Count == 7);
+
+        var cadenceSummary = isEveryDay
+            ? $"{Translator.CalendarEventCompose_Every} {Translator.CalendarEventCompose_FrequencyDay}"
+            : interval == 1
+                ? $"{Translator.CalendarEventCompose_Every} {GetSingularFrequencyLabel(frequency)}"
+                : $"{Translator.CalendarEventCompose_Every} {interval.ToString(culture)} {GetPluralFrequencyLabel(frequency)}";
+
+        var weekdaySummary = string.Empty;
+        if (frequency == CalendarItemRecurrenceFrequency.Weekly && normalizedDays.Count > 0 && normalizedDays.Count < 7)
+        {
+            weekdaySummary = string.Format(
+                culture,
+                Translator.CalendarEventCompose_WeekdaySummary,
+                string.Join(", ", normalizedDays.Select(day => culture.DateTimeFormat.GetDayName(day))));
+        }
+
+        var untilSummary = recurrenceEndDate.HasValue
+            ? string.Format(
+                culture,
+                Translator.CalendarEventCompose_UntilSummary,
+                recurrenceEndDate.Value.ToString("ddd yyyy-MM-dd", culture))
+            : string.Empty;
+
+        return string.Format(
+            culture,
+            Translator.CalendarEventCompose_RecurringSummarySmart,
+            cadenceSummary,
+            weekdaySummary,
+            timeSummary,
+            effectiveStart.ToString("dddd yyyy-MM-dd", culture),
+            untilSummary).Trim();
+    }
+
+    private static IReadOnlyList<DayOfWeek> NormalizeDays(IReadOnlyCollection<DayOfWeek> daysOfWeek)
+    {
+        if (daysOfWeek == null || daysOfWeek.Count == 0)
+        {
+            return [];
+        }
+
+        return daysOfWeek
+            .Distinct()
+            .OrderBy(day => Array.IndexOf(OrderedDays, day))
+            .ToList();
+    }
+
+    private static string GetSingularFrequencyLabel(CalendarItemRecurrenceFrequency frequency)
+    {
+        return frequency switch
+        {
+            CalendarItemRecurrenceFrequency.Daily => Translator.CalendarEventCompose_FrequencyDay,
+            CalendarItemRecurrenceFrequency.Weekly => Translator.CalendarEventCompose_FrequencyWeek,
+            CalendarItemRecurrenceFrequency.Monthly => Translator.CalendarEventCompose_FrequencyMonth,
+            CalendarItemRecurrenceFrequency.Yearly => Translator.CalendarEventCompose_FrequencyYear,
+            _ => Translator.CalendarEventCompose_FrequencyWeek
+        };
+    }
+
+    private static string GetPluralFrequencyLabel(CalendarItemRecurrenceFrequency frequency)
+    {
+        return frequency switch
+        {
+            CalendarItemRecurrenceFrequency.Daily => Translator.CalendarEventCompose_FrequencyDayPlural,
+            CalendarItemRecurrenceFrequency.Weekly => Translator.CalendarEventCompose_FrequencyWeekPlural,
+            CalendarItemRecurrenceFrequency.Monthly => Translator.CalendarEventCompose_FrequencyMonthPlural,
+            CalendarItemRecurrenceFrequency.Yearly => Translator.CalendarEventCompose_FrequencyYearPlural,
+            _ => Translator.CalendarEventCompose_FrequencyWeekPlural
+        };
+    }
+}
+
+
diff --git a/Wino.Core.Domain/CalendarReminderSnoozeOptions.cs b/Wino.Core.Domain/CalendarReminderSnoozeOptions.cs
new file mode 100644
index 00000000..5786c42f
--- /dev/null
+++ b/Wino.Core.Domain/CalendarReminderSnoozeOptions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Wino.Core.Domain;
+
+public static class CalendarReminderSnoozeOptions
+{
+    private static readonly int[] SupportedSnoozeMinutes = [5, 10, 15, 30];
+
+    public static IReadOnlyList<int> GetSupportedSnoozeMinutes()
+        => SupportedSnoozeMinutes;
+
+    public static IReadOnlyList<int> GetAllowedSnoozeMinutes(long reminderDurationInSeconds, long defaultReminderDurationInSeconds)
+    {
+        var reminderMinutes = (int)Math.Max(0, reminderDurationInSeconds / 60);
+
+        if (reminderMinutes <= 0)
+            return [];
+
+        var maxSnoozeMinutes = reminderMinutes;
+        var defaultReminderMinutes = (int)Math.Max(0, defaultReminderDurationInSeconds / 60);
+
+        if (defaultReminderMinutes > 0)
+            maxSnoozeMinutes = Math.Min(maxSnoozeMinutes, defaultReminderMinutes);
+
+        return SupportedSnoozeMinutes.Where(minutes => minutes <= maxSnoozeMinutes).ToArray();
+    }
+}
diff --git a/Wino.Core.Domain/Collections/CalendarEventCollection.cs b/Wino.Core.Domain/Collections/CalendarEventCollection.cs
index 94a1eef6..1b070837 100644
--- a/Wino.Core.Domain/Collections/CalendarEventCollection.cs
+++ b/Wino.Core.Domain/Collections/CalendarEventCollection.cs
@@ -13,6 +13,7 @@ public class CalendarEventCollection
 {
     public event EventHandler<ICalendarItem> CalendarItemAdded;
     public event EventHandler<ICalendarItem> CalendarItemRemoved;
+    public event EventHandler<ICalendarItem> CalendarItemUpdated;
 
     public event EventHandler CalendarItemsCleared;
 
@@ -114,11 +115,27 @@ public class CalendarEventCollection
         }
     }
 
+    public void RemoveCalendarItems(Func<ICalendarItem, bool> predicate)
+    {
+        if (predicate == null) return;
+
+        var itemsToRemove = _allItems.Where(predicate).ToList();
+
+        foreach (var item in itemsToRemove)
+        {
+            RemoveCalendarItem(item);
+        }
+    }
+
     private void AddCalendarItemInternal(ObservableRangeCollection<ICalendarItem> collection, ICalendarItem calendarItem, bool create = true)
     {
-        if (calendarItem is not ICalendarItemViewModel)
+        if (calendarItem is not ICalendarItemViewModel viewModel)
             throw new ArgumentException("CalendarItem must be of type ICalendarItemViewModel", nameof(calendarItem));
 
+        // Set the displaying context for proper title calculation
+        viewModel.DisplayingPeriod = Period;
+        viewModel.CalendarSettings = Settings;
+
         collection.Add(calendarItem);
 
         if (create)
@@ -144,6 +161,53 @@ public class CalendarEventCollection
         CalendarItemRemoved?.Invoke(this, calendarItem);
     }
 
+    /// <summary>
+    /// Updates an existing calendar item in-place. If the item's type changed (all-day vs regular),
+    /// it will be moved to the appropriate collection.
+    /// </summary>
+    /// <param name="calendarItem">The updated calendar item data.</param>
+    /// <returns>True if the item was found and updated; false otherwise.</returns>
+    public bool UpdateCalendarItem(CalendarItem calendarItem)
+    {
+        var existingItem = _allItems.FirstOrDefault(x => x.Id == calendarItem.Id);
+        if (existingItem == null)
+            return false;
+
+        // Get the collections this item is currently in (before update)
+        var oldCollections = GetProperCollectionsForCalendarItem(existingItem).ToList();
+
+        // Update the underlying data
+        if (existingItem is ICalendarItemViewModel viewModel)
+        {
+            viewModel.UpdateFrom(calendarItem);
+        }
+
+        // Get the collections this item should be in (after update)
+        var newCollections = GetProperCollectionsForCalendarItem(existingItem).ToList();
+
+        // Check if the collections changed
+        var collectionsToRemoveFrom = oldCollections.Except(newCollections).ToList();
+        var collectionsToAddTo = newCollections.Except(oldCollections).ToList();
+
+        // Remove from old collections that are no longer applicable
+        foreach (var collection in collectionsToRemoveFrom)
+        {
+            collection.Remove(existingItem);
+        }
+
+        // Add to new collections that are now applicable
+        foreach (var collection in collectionsToAddTo)
+        {
+            if (!collection.Contains(existingItem))
+            {
+                collection.Add(existingItem);
+            }
+        }
+
+        CalendarItemUpdated?.Invoke(this, existingItem);
+        return true;
+    }
+
     public void Clear()
     {
         _internalAllDayEvents.Clear();
diff --git a/Wino.Core.Domain/Collections/DayRangeCollection.cs b/Wino.Core.Domain/Collections/DayRangeCollection.cs
deleted file mode 100644
index 89afeb68..00000000
--- a/Wino.Core.Domain/Collections/DayRangeCollection.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.Linq;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Core.Domain.Collections;
-
-public class DayRangeCollection : ObservableRangeCollection<DayRangeRenderModel>
-{
-    /// <summary>
-    /// Gets the range of dates that are currently displayed in the collection.
-    /// </summary>
-    public DateRange DisplayRange
-    {
-        get
-        {
-            if (Count == 0) return null;
-
-            var minimumLoadedDate = this[0].CalendarRenderOptions.DateRange.StartDate;
-            var maximumLoadedDate = this[Count - 1].CalendarRenderOptions.DateRange.EndDate;
-
-            return new DateRange(minimumLoadedDate, maximumLoadedDate);
-        }
-    }
-
-    public void RemoveCalendarItem(ICalendarItem calendarItem)
-    {
-        foreach (var dayRange in this)
-        {
-
-        }
-    }
-
-    public void AddCalendarItem(ICalendarItem calendarItem)
-    {
-        foreach (var dayRange in this)
-        {
-            var calendarDayModel = dayRange.CalendarDays.FirstOrDefault(x => x.Period.HasInside(calendarItem.Period.Start));
-            calendarDayModel?.EventsCollection.AddCalendarItem(calendarItem);
-        }
-    }
-}
diff --git a/Wino.Core.Domain/Constants.cs b/Wino.Core.Domain/Constants.cs
index 0406edcd..cded77eb 100644
--- a/Wino.Core.Domain/Constants.cs
+++ b/Wino.Core.Domain/Constants.cs
@@ -1,4 +1,4 @@
-namespace Wino.Core.Domain;
+namespace Wino.Core.Domain;
 
 public static class Constants
 {
@@ -12,7 +12,17 @@ public static class Constants
 
     public const string ToastMailUniqueIdKey = nameof(ToastMailUniqueIdKey);
     public const string ToastActionKey = nameof(ToastActionKey);
-
+    public const string ToastMailAccountIdKey = nameof(ToastMailAccountIdKey);
+    public const string ToastCalendarItemIdKey = nameof(ToastCalendarItemIdKey);
+    public const string ToastCalendarActionKey = nameof(ToastCalendarActionKey);
+    public const string ToastCalendarNavigateAction = nameof(ToastCalendarNavigateAction);
+    public const string ToastCalendarSnoozeAction = nameof(ToastCalendarSnoozeAction);
+    public const string ToastCalendarSnoozeDurationInputId = nameof(ToastCalendarSnoozeDurationInputId);
+    public const string ToastModeKey = nameof(ToastModeKey);
+    public const string ToastModeMail = nameof(ToastModeMail);
+    public const string ToastModeCalendar = nameof(ToastModeCalendar);
+    public const string ToastStoreUpdateActionKey = nameof(ToastStoreUpdateActionKey);
+    public const string ToastStoreUpdateActionInstall = nameof(ToastStoreUpdateActionInstall);
     public const string ClientLogFile = "Client_.log";
     public const string ServerLogFile = "Server_.log";
     public const string LogArchiveFileName = "WinoLogs.zip";
@@ -20,3 +30,4 @@ public static class Constants
     public const string WinoMailIdentiifer = nameof(WinoMailIdentiifer);
     public const string WinoCalendarIdentifier = nameof(WinoCalendarIdentifier);
 }
+
diff --git a/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs b/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
index 29a200cf..e3fe9ba6 100644
--- a/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
+++ b/Wino.Core.Domain/Entities/Calendar/AccountCalendar.cs
@@ -1,9 +1,12 @@
 using System;
 using SQLite;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Core.Domain.Entities.Calendar;
 
+[Preserve]
 public class AccountCalendar : IAccountCalendar
 {
     [PrimaryKey]
@@ -13,7 +16,9 @@ public class AccountCalendar : IAccountCalendar
     public string SynchronizationDeltaToken { get; set; }
     public string Name { get; set; }
     public bool IsPrimary { get; set; }
+    public bool IsSynchronizationEnabled { get; set; } = true;
     public bool IsExtended { get; set; } = true;
+    public CalendarItemShowAs DefaultShowAs { get; set; } = CalendarItemShowAs.Busy;
 
     /// <summary>
     /// Unused for now.
@@ -21,4 +26,7 @@ public class AccountCalendar : IAccountCalendar
     public string TextColorHex { get; set; }
     public string BackgroundColorHex { get; set; }
     public string TimeZone { get; set; }
+
+    [Ignore]
+    public MailAccount MailAccount { get; set; }
 }
diff --git a/Wino.Core.Domain/Entities/Calendar/CalendarAttachment.cs b/Wino.Core.Domain/Entities/Calendar/CalendarAttachment.cs
new file mode 100644
index 00000000..477acd38
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Calendar/CalendarAttachment.cs
@@ -0,0 +1,55 @@
+using System;
+using SQLite;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Entities.Calendar;
+
+/// <summary>
+/// Represents metadata for calendar event attachments.
+/// Actual file content is downloaded on-demand.
+/// </summary>
+public class CalendarAttachment
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// The calendar item this attachment belongs to.
+    /// </summary>
+    public Guid CalendarItemId { get; set; }
+
+    /// <summary>
+    /// Remote identifier for the attachment from the provider (Outlook, Gmail, etc.).
+    /// </summary>
+    public string RemoteAttachmentId { get; set; }
+
+    /// <summary>
+    /// File name of the attachment.
+    /// </summary>
+    public string FileName { get; set; }
+
+    /// <summary>
+    /// Size of the attachment in bytes.
+    /// </summary>
+    public long Size { get; set; }
+
+    /// <summary>
+    /// MIME content type (e.g., "application/pdf", "image/png").
+    /// </summary>
+    public string ContentType { get; set; }
+
+    /// <summary>
+    /// Whether the attachment has been downloaded to local storage.
+    /// </summary>
+    public bool IsDownloaded { get; set; }
+
+    /// <summary>
+    /// Local file path where the attachment is stored (if downloaded).
+    /// </summary>
+    public string LocalFilePath { get; set; }
+
+    /// <summary>
+    /// When the attachment was last modified.
+    /// </summary>
+    public DateTimeOffset LastModified { get; set; }
+}
diff --git a/Wino.Core.Domain/Entities/Calendar/CalendarEventAttendee.cs b/Wino.Core.Domain/Entities/Calendar/CalendarEventAttendee.cs
index e9c47da3..8935589a 100644
--- a/Wino.Core.Domain/Entities/Calendar/CalendarEventAttendee.cs
+++ b/Wino.Core.Domain/Entities/Calendar/CalendarEventAttendee.cs
@@ -1,10 +1,10 @@
 using System;
 using SQLite;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Entities.Calendar;
 
-// TODO: Connect to Contact store with Wino People.
 public class CalendarEventAttendee
 {
     [PrimaryKey]
@@ -16,4 +16,11 @@ public class CalendarEventAttendee
     public bool IsOrganizer { get; set; }
     public bool IsOptionalAttendee { get; set; }
     public string Comment { get; set; }
+
+    /// <summary>
+    /// Resolved contact from the contact store. Populated at runtime via IContactService;
+    /// not persisted to the database.
+    /// </summary>
+    [Ignore]
+    public AccountContact ResolvedContact { get; set; }
 }
diff --git a/Wino.Core.Domain/Entities/Calendar/CalendarItem.cs b/Wino.Core.Domain/Entities/Calendar/CalendarItem.cs
index de03e74e..a04576f9 100644
--- a/Wino.Core.Domain/Entities/Calendar/CalendarItem.cs
+++ b/Wino.Core.Domain/Entities/Calendar/CalendarItem.cs
@@ -3,7 +3,9 @@ using System.Diagnostics;
 using Itenso.TimePeriod;
 using SQLite;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 
 namespace Wino.Core.Domain.Entities.Calendar;
 
@@ -17,6 +19,14 @@ public class CalendarItem : ICalendarItem
     public string Description { get; set; }
     public string Location { get; set; }
 
+    /// <summary>
+    /// Indicates whether this item is a local preview that hasn't been synced to the server yet.
+    /// When true, the item exists only in the local database without a RemoteEventId.
+    /// Used to prevent duplicates when the server returns the newly created event.
+    /// </summary>
+    [Ignore]
+    public bool IsLocalPreview => string.IsNullOrEmpty(RemoteEventId);
+
     public DateTime StartDate { get; set; }
 
     public DateTime EndDate
@@ -27,8 +37,17 @@ public class CalendarItem : ICalendarItem
         }
     }
 
-    public TimeSpan StartDateOffset { get; set; }
-    public TimeSpan EndDateOffset { get; set; }
+    /// <summary>
+    /// IANA timezone identifier for the start time (e.g., "America/New_York", "Europe/London").
+    /// If null or empty, UTC is assumed.
+    /// </summary>
+    public string StartTimeZone { get; set; }
+
+    /// <summary>
+    /// IANA timezone identifier for the end time (e.g., "America/New_York", "Europe/London").
+    /// If null or empty, UTC is assumed.
+    /// </summary>
+    public string EndTimeZone { get; set; }
 
     private ITimePeriod _period;
     public ITimePeriod Period
@@ -55,9 +74,7 @@ public class CalendarItem : ICalendarItem
     }
 
     /// <summary>
-    /// Events that are either an exceptional instance of a recurring event or occurrences.
-    /// IsOccurrence is used to display occurrence instances of parent recurring events.
-    /// IsOccurrence == false && IsRecurringChild == true => exceptional single instance.
+    /// Events that are child instances of a recurring event (occurrences or exceptions).
     /// </summary>
     public bool IsRecurringChild
     {
@@ -68,7 +85,7 @@ public class CalendarItem : ICalendarItem
     }
 
     /// <summary>
-    /// Events that are either an exceptional instance of a recurring event or occurrences.
+    /// Events that are part of a recurring series (either as parent or child).
     /// </summary>
     public bool IsRecurringEvent => IsRecurringChild || IsRecurringParent;
 
@@ -121,8 +138,15 @@ public class CalendarItem : ICalendarItem
     // TODO
     public string CustomEventColorHex { get; set; }
     public string HtmlLink { get; set; }
+    public DateTime? SnoozedUntil { get; set; }
     public CalendarItemStatus Status { get; set; }
     public CalendarItemVisibility Visibility { get; set; }
+
+    /// <summary>
+    /// Indicates how the event should be shown in the calendar (Free, Busy, Tentative, etc.).
+    /// </summary>
+    public CalendarItemShowAs ShowAs { get; set; } = CalendarItemShowAs.Busy;
+
     public DateTimeOffset CreatedAt { get; set; }
     public DateTimeOffset UpdatedAt { get; set; }
     public Guid CalendarId { get; set; }
@@ -131,49 +155,37 @@ public class CalendarItem : ICalendarItem
     public IAccountCalendar AssignedCalendar { get; set; }
 
     /// <summary>
-    /// Whether this item does not really exist in the database or not.
-    /// These are used to display occurrence instances of parent recurring events.
+    /// Id to load information related to this event (attendees, reminders, etc.).
+    /// For child events, if they have their own data, use their own Id.
+    /// For events that share data with their parent, return parent's Id.
     /// </summary>
-    [Ignore]
-    public bool IsOccurrence { get; set; }
+    public Guid EventTrackingId => Id;
 
     /// <summary>
-    /// Id to load information related to this event.
-    /// Occurrences tracked by the parent recurring event if they are not exceptional instances.
-    /// Recurring children here are exceptional instances. They have their own info in the database including Id.
+    /// Gets the start date converted to user's local timezone for display.
+    /// StartDate is stored according to StartTimeZone.
     /// </summary>
-    public Guid EventTrackingId => IsOccurrence ? RecurringCalendarItemId.Value : Id;
-
-    public CalendarItem CreateRecurrence(DateTime startDate, double durationInSeconds)
+    [Ignore]
+    public DateTime LocalStartDate
     {
-        // Create a copy with the new start date and duration
-
-        return new CalendarItem
+        get
         {
-            Id = Guid.NewGuid(),
-            Title = Title,
-            Description = Description,
-            Location = Location,
-            StartDate = startDate,
-            DurationInSeconds = durationInSeconds,
-            Recurrence = Recurrence,
-            OrganizerDisplayName = OrganizerDisplayName,
-            OrganizerEmail = OrganizerEmail,
-            RecurringCalendarItemId = Id,
-            AssignedCalendar = AssignedCalendar,
-            CalendarId = CalendarId,
-            CreatedAt = CreatedAt,
-            UpdatedAt = UpdatedAt,
-            Visibility = Visibility,
-            Status = Status,
-            CustomEventColorHex = CustomEventColorHex,
-            HtmlLink = HtmlLink,
-            StartDateOffset = StartDateOffset,
-            EndDateOffset = EndDateOffset,
-            RemoteEventId = RemoteEventId,
-            IsHidden = IsHidden,
-            IsLocked = IsLocked,
-            IsOccurrence = true
-        };
+            return this.GetLocalStartDate();
+        }
     }
+
+    /// <summary>
+    /// Gets the end date converted to user's local timezone for display.
+    /// EndDate is calculated from StartDate and is in StartTimeZone.
+    /// </summary>
+    [Ignore]
+    public DateTime LocalEndDate
+    {
+        get
+        {
+            return this.GetLocalEndDate();
+        }
+    }
+
+    public string GetDisplayTitle(ITimePeriod displayingPeriod, CalendarSettings calendarSettings) => Period.ToString();
 }
diff --git a/Wino.Core.Domain/Entities/Calendar/Reminder.cs b/Wino.Core.Domain/Entities/Calendar/Reminder.cs
index 3dc64b81..389c4cef 100644
--- a/Wino.Core.Domain/Entities/Calendar/Reminder.cs
+++ b/Wino.Core.Domain/Entities/Calendar/Reminder.cs
@@ -10,6 +10,10 @@ public class Reminder
     public Guid Id { get; set; }
     public Guid CalendarItemId { get; set; }
 
-    public DateTimeOffset ReminderTime { get; set; }
+    /// <summary>
+    /// Duration in seconds before the event start time when the reminder should trigger.
+    /// For example, 900 seconds = 15 minutes before event.
+    /// </summary>
+    public long DurationInSeconds { get; set; }
     public CalendarItemReminderType ReminderType { get; set; }
 }
diff --git a/Wino.Core.Domain/Entities/Mail/EmailTemplate.cs b/Wino.Core.Domain/Entities/Mail/EmailTemplate.cs
new file mode 100644
index 00000000..271e51b0
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Mail/EmailTemplate.cs
@@ -0,0 +1,16 @@
+using System;
+using SQLite;
+
+namespace Wino.Core.Domain.Entities.Mail;
+
+public class EmailTemplate
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    public string Name { get; set; } = string.Empty;
+
+    public string Description { get; set; } = string.Empty;
+
+    public string HtmlContent { get; set; } = string.Empty;
+}
diff --git a/Wino.Core.Domain/Entities/Mail/MailAccountAlias.cs b/Wino.Core.Domain/Entities/Mail/MailAccountAlias.cs
index f13dd5ef..b23aaf4e 100644
--- a/Wino.Core.Domain/Entities/Mail/MailAccountAlias.cs
+++ b/Wino.Core.Domain/Entities/Mail/MailAccountAlias.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.ObjectModel;
+using System.Security.Cryptography.X509Certificates;
 using SQLite;
 
 namespace Wino.Core.Domain.Entities.Mail;
@@ -59,4 +61,13 @@ public class MailAccountAlias : RemoteAccountAlias
     /// Root aliases can't be deleted.
     /// </summary>
     public bool CanDelete => !IsRootAlias;
+
+    public string SelectedSigningCertificateThumbprint { get; set; }
+    public bool IsSmimeEncryptionEnabled { get; set; }
+
+    [Ignore]
+    public X509Certificate2 SelectedSigningCertificate { get; set; }
+
+    [Ignore]
+    public ObservableCollection<X509Certificate2> Certificates { get; set; } = [];
 }
diff --git a/Wino.Core.Domain/Entities/Mail/MailCopy.cs b/Wino.Core.Domain/Entities/Mail/MailCopy.cs
index b3c1049d..ebd71c61 100644
--- a/Wino.Core.Domain/Entities/Mail/MailCopy.cs
+++ b/Wino.Core.Domain/Entities/Mail/MailCopy.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using SQLite;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.MailItem;
 
 namespace Wino.Core.Domain.Entities.Mail;
 
@@ -11,7 +10,7 @@ namespace Wino.Core.Domain.Entities.Mail;
 /// Summary of the parsed MIME messages.
 /// Wino will do non-network operations on this table and others from the original MIME.
 /// </summary>
-public class MailCopy : IMailItem
+public class MailCopy
 {
     /// <summary>
     /// Unique Id of the mail.
@@ -104,6 +103,11 @@ public class MailCopy : IMailItem
     /// </summary>
     public bool HasAttachments { get; set; }
 
+    /// <summary>
+    /// Type of mail item (regular mail, calendar invitation, calendar response, etc.).
+    /// </summary>
+    public MailItemType ItemType { get; set; } = MailItemType.Mail;
+
     /// <summary>
     /// Assigned draft id.
     /// </summary>
diff --git a/Wino.Core.Domain/Entities/Mail/MailInvitationCalendarMapping.cs b/Wino.Core.Domain/Entities/Mail/MailInvitationCalendarMapping.cs
new file mode 100644
index 00000000..d1290062
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Mail/MailInvitationCalendarMapping.cs
@@ -0,0 +1,31 @@
+using System;
+using SQLite;
+
+namespace Wino.Core.Domain.Entities.Mail;
+
+/// <summary>
+/// Maps a calendar invitation mail item to a persisted calendar event.
+/// </summary>
+public class MailInvitationCalendarMapping
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    public Guid AccountId { get; set; }
+
+    /// <summary>
+    /// MailCopy.Id value of the invitation mail.
+    /// </summary>
+    public string MailCopyId { get; set; }
+
+    /// <summary>
+    /// iCalendar UID extracted from invitation MIME/ICS content.
+    /// </summary>
+    public string InvitationUid { get; set; }
+
+    public Guid CalendarId { get; set; }
+    public Guid CalendarItemId { get; set; }
+    public string CalendarRemoteEventId { get; set; }
+
+    public DateTime UpdatedAtUtc { get; set; } = DateTime.UtcNow;
+}
diff --git a/Wino.Core.Domain/Entities/Mail/MailItemFolder.cs b/Wino.Core.Domain/Entities/Mail/MailItemFolder.cs
index bb1a2cae..4555799e 100644
--- a/Wino.Core.Domain/Entities/Mail/MailItemFolder.cs
+++ b/Wino.Core.Domain/Entities/Mail/MailItemFolder.cs
@@ -29,6 +29,8 @@ public class MailItemFolder : IMailItemFolder
     // For IMAP
     public uint UidValidity { get; set; }
     public long HighestModeSeq { get; set; }
+    public uint HighestKnownUid { get; set; }
+    public DateTime? LastUidReconcileUtc { get; set; }
 
     /// <summary>
     /// Outlook shares delta changes per-folder. Gmail is for per-account.
diff --git a/Wino.Core.Domain/Entities/Shared/AccountContact.cs b/Wino.Core.Domain/Entities/Shared/AccountContact.cs
index 49949665..8ca24de4 100644
--- a/Wino.Core.Domain/Entities/Shared/AccountContact.cs
+++ b/Wino.Core.Domain/Entities/Shared/AccountContact.cs
@@ -11,7 +11,7 @@ namespace Wino.Core.Domain.Entities.Shared;
 
 // TODO: This can easily evolve to Contact store, just like People app in Windows 10/11.
 // Do it.
-public class AccountContact : IEquatable<AccountContact>
+public class AccountContact : IEquatable<AccountContact>, IContactDisplayItem
 {
     /// <summary>
     /// E-mail address of the contact.
@@ -25,9 +25,10 @@ public class AccountContact : IEquatable<AccountContact>
     public string Name { get; set; }
 
     /// <summary>
-    /// Base64 encoded profile image of the contact.
+    /// File ID for the contact picture stored on disk.
+    /// The actual file lives at {ApplicationDataFolderPath}/contacts/{ContactPictureFileId}.jpg.
     /// </summary>
-    public string Base64ContactPicture { get; set; }
+    public Guid? ContactPictureFileId { get; set; }
 
     /// <summary>
     /// All registered accounts have their contacts registered as root.
@@ -36,6 +37,15 @@ public class AccountContact : IEquatable<AccountContact>
     /// </summary>
     public bool IsRootContact { get; set; }
 
+    /// <summary>
+    /// When true, indicates that the contact has been manually modified by the user.
+    /// Contacts with this flag set to true should not be updated during synchronization.
+    /// </summary>
+    public bool IsOverridden { get; set; } = false;
+
+    public string DisplayName => string.IsNullOrWhiteSpace(Name) ? Address : Name;
+    AccountContact IContactDisplayItem.PreviewContact => this;
+
     public override bool Equals(object obj)
     {
         return Equals(obj as AccountContact);
diff --git a/Wino.Core.Domain/Entities/Shared/ContactGroup.cs b/Wino.Core.Domain/Entities/Shared/ContactGroup.cs
new file mode 100644
index 00000000..6fd28dcd
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Shared/ContactGroup.cs
@@ -0,0 +1,19 @@
+using System;
+using SQLite;
+
+namespace Wino.Core.Domain.Entities.Shared;
+
+/// <summary>
+/// A named group of contacts that can be expanded to individual addresses during mail composition.
+/// </summary>
+public class ContactGroup
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    /// <summary>Display name of the group (e.g., "Team Alpha", "Family").</summary>
+    public string Name { get; set; }
+
+    /// <summary>Optional description for the group.</summary>
+    public string Description { get; set; }
+}
diff --git a/Wino.Core.Domain/Entities/Shared/ContactGroupMember.cs b/Wino.Core.Domain/Entities/Shared/ContactGroupMember.cs
new file mode 100644
index 00000000..1209f5e3
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Shared/ContactGroupMember.cs
@@ -0,0 +1,21 @@
+using System;
+using SQLite;
+
+namespace Wino.Core.Domain.Entities.Shared;
+
+/// <summary>
+/// Associates an e-mail address with a <see cref="ContactGroup"/>.
+/// </summary>
+public class ContactGroupMember
+{
+    [PrimaryKey, AutoIncrement]
+    public int Id { get; set; }
+
+    /// <summary>Group this member belongs to.</summary>
+    [Indexed]
+    public Guid GroupId { get; set; }
+
+    /// <summary>E-mail address of the member (FK to AccountContact.Address).</summary>
+    [Indexed]
+    public string MemberAddress { get; set; }
+}
diff --git a/Wino.Core.Domain/Entities/Shared/CustomServerInformation.cs b/Wino.Core.Domain/Entities/Shared/CustomServerInformation.cs
index 00aee83b..555fb64d 100644
--- a/Wino.Core.Domain/Entities/Shared/CustomServerInformation.cs
+++ b/Wino.Core.Domain/Entities/Shared/CustomServerInformation.cs
@@ -30,6 +30,11 @@ public class CustomServerInformation
     public string OutgoingServerUsername { get; set; }
     public string OutgoingServerPassword { get; set; }
 
+    public string CalDavServiceUrl { get; set; }
+    public string CalDavUsername { get; set; }
+    public string CalDavPassword { get; set; }
+    public ImapCalendarSupportMode CalendarSupportMode { get; set; }
+
     /// <summary>
     /// useSSL True: SslOnConnect
     /// useSSL False: StartTlsWhenAvailable
@@ -65,6 +70,8 @@ public class CustomServerInformation
             { "OutgoingServerPort", OutgoingServerPort },
             { "OutgoingServerSocketOption", OutgoingServerSocketOption.ToString() },
             { "OutgoingAuthenticationMethod", OutgoingAuthenticationMethod.ToString() },
+            { "CalendarSupportMode", CalendarSupportMode.ToString() },
+            { "CalDavServiceUrl", CalDavServiceUrl },
             { "ProxyServer", ProxyServer },
             { "ProxyServerPort", ProxyServerPort }
         };
diff --git a/Wino.Core.Domain/Entities/Shared/IContactDisplayItem.cs b/Wino.Core.Domain/Entities/Shared/IContactDisplayItem.cs
new file mode 100644
index 00000000..4938f8d4
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Shared/IContactDisplayItem.cs
@@ -0,0 +1,8 @@
+namespace Wino.Core.Domain.Entities.Shared;
+
+public interface IContactDisplayItem
+{
+    string DisplayName { get; }
+    string Address { get; }
+    AccountContact PreviewContact { get; }
+}
diff --git a/Wino.Core.Domain/Entities/Shared/KeyboardShortcut.cs b/Wino.Core.Domain/Entities/Shared/KeyboardShortcut.cs
new file mode 100644
index 00000000..8b066ad5
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Shared/KeyboardShortcut.cs
@@ -0,0 +1,65 @@
+using System;
+using SQLite;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Entities.Shared;
+
+/// <summary>
+/// Represents a user-defined keyboard shortcut for mail operations.
+/// </summary>
+public class KeyboardShortcut
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// The application mode this shortcut applies to.
+    /// </summary>
+    public WinoApplicationMode Mode { get; set; } = WinoApplicationMode.Mail;
+
+    /// <summary>
+    /// The key combination string (e.g., "D", "Delete", "F1").
+    /// </summary>
+    public string Key { get; set; }
+
+    /// <summary>
+    /// The modifier keys for this shortcut.
+    /// </summary>
+    public ModifierKeys ModifierKeys { get; set; }
+
+    /// <summary>
+    /// The shortcut action this shortcut triggers.
+    /// </summary>
+    public KeyboardShortcutAction Action { get; set; }
+
+    /// <summary>
+    /// Whether this shortcut is enabled.
+    /// </summary>
+    public bool IsEnabled { get; set; } = true;
+
+    /// <summary>
+    /// When this shortcut was created.
+    /// </summary>
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+
+    /// <summary>
+    /// User-friendly display name for the shortcut.
+    /// </summary>
+    public string DisplayName 
+    { 
+        get 
+        {
+            var modifierText = string.Empty;
+            if (ModifierKeys.HasFlag(ModifierKeys.Control))
+                modifierText += "Ctrl+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Alt))
+                modifierText += "Alt+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Shift))
+                modifierText += "Shift+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Windows))
+                modifierText += "Win+";
+
+            return modifierText + Key;
+        }
+    }
+}
diff --git a/Wino.Core.Domain/Entities/Shared/MailAccount.cs b/Wino.Core.Domain/Entities/Shared/MailAccount.cs
index 8f40f70d..c27008a4 100644
--- a/Wino.Core.Domain/Entities/Shared/MailAccount.cs
+++ b/Wino.Core.Domain/Entities/Shared/MailAccount.cs
@@ -78,6 +78,14 @@ public class MailAccount
     /// </summary>
     public SpecialImapProvider SpecialImapProvider { get; set; }
 
+    /// <summary>
+    /// Gets or sets whether calendar access is granted for this account.
+    /// When false, synchronizers will not process EventMessages or calendar invitations.
+    /// Default is false for existing accounts to prevent scope issues.
+    /// New accounts created after this feature will have this set to true.
+    /// </summary>
+    public bool IsCalendarAccessGranted { get; set; }
+
     /// <summary>
     /// Contains the merged inbox this account belongs to.
     /// Ignored for all SQLite operations.
@@ -98,6 +106,12 @@ public class MailAccount
     [Ignore]
     public MailAccountPreferences Preferences { get; set; }
 
+    /// <summary>
+    /// Last time folder structure was synchronized.
+    /// Used for optimization - skip folder sync if synced recently.
+    /// </summary>
+    public DateTime? LastFolderStructureSyncDate { get; set; }
+
     /// <summary>
     /// Gets whether the account can perform ProfileInformation sync type.
     /// </summary>
@@ -107,4 +121,6 @@ public class MailAccount
     /// Gets whether the account can perform AliasInformation sync type.
     /// </summary>
     public bool IsAliasSyncSupported => ProviderType == MailProviderType.Gmail;
+
+    public override string ToString() => Name;
 }
diff --git a/Wino.Core.Domain/Entities/Shared/WinoAccount.cs b/Wino.Core.Domain/Entities/Shared/WinoAccount.cs
new file mode 100644
index 00000000..9b0a92e1
--- /dev/null
+++ b/Wino.Core.Domain/Entities/Shared/WinoAccount.cs
@@ -0,0 +1,30 @@
+using System;
+using SQLite;
+
+namespace Wino.Core.Domain.Entities.Shared;
+
+public class WinoAccount
+{
+    [PrimaryKey]
+    public Guid Id { get; set; }
+
+    public string Email { get; set; } = string.Empty;
+
+    public string AccountStatus { get; set; } = string.Empty;
+
+    public bool HasPassword { get; set; }
+
+    public bool HasGoogleLogin { get; set; }
+
+    public bool HasFacebookLogin { get; set; }
+
+    public string AccessToken { get; set; } = string.Empty;
+
+    public DateTime AccessTokenExpiresAtUtc { get; set; }
+
+    public string RefreshToken { get; set; } = string.Empty;
+
+    public DateTime RefreshTokenExpiresAtUtc { get; set; }
+
+    public DateTime LastAuthenticatedUtc { get; set; }
+}
diff --git a/Wino.Core.Domain/Enums/AccountCreationDialogState.cs b/Wino.Core.Domain/Enums/AccountCreationDialogState.cs
index 0cc10546..2e91d743 100644
--- a/Wino.Core.Domain/Enums/AccountCreationDialogState.cs
+++ b/Wino.Core.Domain/Enums/AccountCreationDialogState.cs
@@ -5,6 +5,7 @@ public enum AccountCreationDialogState
     Idle,
     SigningIn,
     PreparingFolders,
+    CalendarMetadataFetch,
     Completed,
     ManuelSetupWaiting,
     TestingConnection,
diff --git a/Wino.Core.Domain/Enums/AccountSetupStepStatus.cs b/Wino.Core.Domain/Enums/AccountSetupStepStatus.cs
new file mode 100644
index 00000000..a0bb99a3
--- /dev/null
+++ b/Wino.Core.Domain/Enums/AccountSetupStepStatus.cs
@@ -0,0 +1,9 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum AccountSetupStepStatus
+{
+    Pending,
+    InProgress,
+    Succeeded,
+    Failed
+}
diff --git a/Wino.Core.Domain/Enums/AiActionType.cs b/Wino.Core.Domain/Enums/AiActionType.cs
new file mode 100644
index 00000000..26501bb0
--- /dev/null
+++ b/Wino.Core.Domain/Enums/AiActionType.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Wino.Core.Domain.Enums;
+
+[Flags]
+public enum AiActionType
+{
+    None = 0,
+    Translate = 1,
+    Rewrite = 2,
+    Summarize = 4,
+}
diff --git a/Wino.Core.Domain/Enums/CalendarDisplayType.cs b/Wino.Core.Domain/Enums/CalendarDisplayType.cs
index 5582899b..afb838d2 100644
--- a/Wino.Core.Domain/Enums/CalendarDisplayType.cs
+++ b/Wino.Core.Domain/Enums/CalendarDisplayType.cs
@@ -5,6 +5,5 @@ public enum CalendarDisplayType
     Day,
     Week,
     WorkWeek,
-    Month,
-    Year
+    Month
 }
diff --git a/Wino.Core.Domain/Enums/CalendarInitInitiative.cs b/Wino.Core.Domain/Enums/CalendarInitInitiative.cs
deleted file mode 100644
index d5e08a76..00000000
--- a/Wino.Core.Domain/Enums/CalendarInitInitiative.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Wino.Core.Domain.Enums;
-
-/// <summary>
-/// Trigger to load more data.
-/// </summary>
-public enum CalendarInitInitiative
-{
-    User,
-    App
-}
diff --git a/Wino.Core.Domain/Enums/CalendarItemShowAs.cs b/Wino.Core.Domain/Enums/CalendarItemShowAs.cs
new file mode 100644
index 00000000..57c55f00
--- /dev/null
+++ b/Wino.Core.Domain/Enums/CalendarItemShowAs.cs
@@ -0,0 +1,13 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Defines how a calendar item should be displayed in terms of availability.
+/// </summary>
+public enum CalendarItemShowAs
+{
+    Free,
+    Tentative,
+    Busy,
+    OutOfOffice,
+    WorkingElsewhere
+}
diff --git a/Wino.Core.Domain/Enums/CalendarItemStatus.cs b/Wino.Core.Domain/Enums/CalendarItemStatus.cs
index e8605573..c6d08b52 100644
--- a/Wino.Core.Domain/Enums/CalendarItemStatus.cs
+++ b/Wino.Core.Domain/Enums/CalendarItemStatus.cs
@@ -3,7 +3,7 @@
 public enum CalendarItemStatus
 {
     NotResponded,
-    Confirmed,
+    Accepted,
     Tentative,
     Cancelled,
 }
diff --git a/Wino.Core.Domain/Enums/CalendarItemUpdateSource.cs b/Wino.Core.Domain/Enums/CalendarItemUpdateSource.cs
new file mode 100644
index 00000000..f4e3828c
--- /dev/null
+++ b/Wino.Core.Domain/Enums/CalendarItemUpdateSource.cs
@@ -0,0 +1,22 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Indicates the source of a calendar item update.
+/// </summary>
+public enum CalendarItemUpdateSource
+{
+    /// <summary>
+    /// Update originated from client-side UI changes (ApplyUIChanges).
+    /// </summary>
+    ClientUpdated,
+
+    /// <summary>
+    /// Update originated from client-side UI revert (RevertUIChanges).
+    /// </summary>
+    ClientReverted,
+
+    /// <summary>
+    /// Update originated from server synchronization or database operations.
+    /// </summary>
+    Server
+}
diff --git a/Wino.Core.Domain/Enums/CalendarSynchronizationType.cs b/Wino.Core.Domain/Enums/CalendarSynchronizationType.cs
index d9f01a19..96351243 100644
--- a/Wino.Core.Domain/Enums/CalendarSynchronizationType.cs
+++ b/Wino.Core.Domain/Enums/CalendarSynchronizationType.cs
@@ -5,6 +5,7 @@ public enum CalendarSynchronizationType
     ExecuteRequests, // Execute all requests in the queue.
     CalendarMetadata, // Sync calendar metadata.
     CalendarEvents, // Sync all events for all calendars.
+    Strict, // Run metadata and event synchronization in sequence.
     SingleCalendar, // Sync events for only specified calendars.
     UpdateProfile // Update profile information only.
 }
diff --git a/Wino.Core.Domain/Enums/EmailGroupingType.cs b/Wino.Core.Domain/Enums/EmailGroupingType.cs
new file mode 100644
index 00000000..703cc21a
--- /dev/null
+++ b/Wino.Core.Domain/Enums/EmailGroupingType.cs
@@ -0,0 +1,10 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Grouping options for emails
+/// </summary>
+public enum EmailGroupingType
+{
+    ByFromName,
+    ByDate
+}
diff --git a/Wino.Core.Domain/Enums/ImapCalendarSupportMode.cs b/Wino.Core.Domain/Enums/ImapCalendarSupportMode.cs
new file mode 100644
index 00000000..4e082a87
--- /dev/null
+++ b/Wino.Core.Domain/Enums/ImapCalendarSupportMode.cs
@@ -0,0 +1,8 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum ImapCalendarSupportMode
+{
+    Disabled = 0,
+    CalDav = 1,
+    LocalOnly = 2
+}
diff --git a/Wino.Core.Domain/Enums/KeyboardShortcutAction.cs b/Wino.Core.Domain/Enums/KeyboardShortcutAction.cs
new file mode 100644
index 00000000..f48f5cf4
--- /dev/null
+++ b/Wino.Core.Domain/Enums/KeyboardShortcutAction.cs
@@ -0,0 +1,16 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum KeyboardShortcutAction
+{
+    None,
+    NewMail,
+    ToggleReadUnread,
+    ToggleFlag,
+    ToggleArchive,
+    Delete,
+    Move,
+    Reply,
+    ReplyAll,
+    Send,
+    NewEvent
+}
diff --git a/Wino.Core.Domain/Enums/MailCopyChangeFlags.cs b/Wino.Core.Domain/Enums/MailCopyChangeFlags.cs
new file mode 100644
index 00000000..f500aa5d
--- /dev/null
+++ b/Wino.Core.Domain/Enums/MailCopyChangeFlags.cs
@@ -0,0 +1,57 @@
+using System;
+
+namespace Wino.Core.Domain.Enums;
+
+[Flags]
+public enum MailCopyChangeFlags
+{
+    None = 0,
+    Id = 1 << 0,
+    FolderId = 1 << 1,
+    ThreadId = 1 << 2,
+    MessageId = 1 << 3,
+    References = 1 << 4,
+    InReplyTo = 1 << 5,
+    FromName = 1 << 6,
+    FromAddress = 1 << 7,
+    Subject = 1 << 8,
+    PreviewText = 1 << 9,
+    CreationDate = 1 << 10,
+    Importance = 1 << 11,
+    IsRead = 1 << 12,
+    IsFlagged = 1 << 13,
+    IsFocused = 1 << 14,
+    HasAttachments = 1 << 15,
+    ItemType = 1 << 16,
+    DraftId = 1 << 17,
+    IsDraft = 1 << 18,
+    FileId = 1 << 19,
+    AssignedFolder = 1 << 20,
+    AssignedAccount = 1 << 21,
+    SenderContact = 1 << 22,
+    UniqueId = 1 << 23,
+    All = Id |
+          FolderId |
+          ThreadId |
+          MessageId |
+          References |
+          InReplyTo |
+          FromName |
+          FromAddress |
+          Subject |
+          PreviewText |
+          CreationDate |
+          Importance |
+          IsRead |
+          IsFlagged |
+          IsFocused |
+          HasAttachments |
+          ItemType |
+          DraftId |
+          IsDraft |
+          FileId |
+          AssignedFolder |
+          AssignedAccount |
+          SenderContact |
+          UniqueId
+}
diff --git a/Wino.Core.Domain/Enums/MailItemType.cs b/Wino.Core.Domain/Enums/MailItemType.cs
new file mode 100644
index 00000000..63fcfa5a
--- /dev/null
+++ b/Wino.Core.Domain/Enums/MailItemType.cs
@@ -0,0 +1,27 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Represents the type of mail item.
+/// </summary>
+public enum MailItemType
+{
+    /// <summary>
+    /// Regular mail message.
+    /// </summary>
+    Mail = 0,
+
+    /// <summary>
+    /// Calendar invitation (meeting request).
+    /// </summary>
+    CalendarInvitation = 1,
+
+    /// <summary>
+    /// Calendar response (meeting accepted, tentatively accepted, or declined).
+    /// </summary>
+    CalendarResponse = 2,
+
+    /// <summary>
+    /// Calendar cancellation (meeting cancelled).
+    /// </summary>
+    CalendarCancellation = 3
+}
diff --git a/Wino.Core.Domain/Enums/MailOperation.cs b/Wino.Core.Domain/Enums/MailOperation.cs
index 973ff62f..9d482958 100644
--- a/Wino.Core.Domain/Enums/MailOperation.cs
+++ b/Wino.Core.Domain/Enums/MailOperation.cs
@@ -19,6 +19,18 @@ public enum FolderSynchronizerOperation
     RenameFolder,
     EmptyFolder,
     MarkFolderRead,
+    DeleteFolder,
+    CreateSubFolder,
+}
+
+public enum CalendarSynchronizerOperation
+{
+    CreateEvent,
+    UpdateEvent,
+    DeleteEvent,
+    AcceptEvent,
+    DeclineEvent,
+    TentativeEvent,
 }
 
 // UI requests
diff --git a/Wino.Core.Domain/Enums/MailUpdateSource.cs b/Wino.Core.Domain/Enums/MailUpdateSource.cs
new file mode 100644
index 00000000..e8a3b91f
--- /dev/null
+++ b/Wino.Core.Domain/Enums/MailUpdateSource.cs
@@ -0,0 +1,22 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Indicates the source of a mail update.
+/// </summary>
+public enum MailUpdateSource
+{
+    /// <summary>
+    /// Update originated from client-side UI changes (ApplyUIChanges).
+    /// </summary>
+    ClientUpdated,
+
+    /// <summary>
+    /// Update originated from client-side UI revert (RevertUIChanges).
+    /// </summary>
+    ClientReverted,
+
+    /// <summary>
+    /// Update originated from server synchronization or database operations.
+    /// </summary>
+    Server
+}
diff --git a/Wino.Core.Domain/Enums/ModifierKeys.cs b/Wino.Core.Domain/Enums/ModifierKeys.cs
new file mode 100644
index 00000000..f5d7147d
--- /dev/null
+++ b/Wino.Core.Domain/Enums/ModifierKeys.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Defines keyboard modifier keys that can be used in keyboard shortcuts.
+/// </summary>
+[Flags]
+public enum ModifierKeys
+{
+    None = 0,
+    Control = 1,
+    Alt = 2,
+    Shift = 4,
+    Windows = 8
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/NavigationReferenceFrame.cs b/Wino.Core.Domain/Enums/NavigationReferenceFrame.cs
index 3495a98e..e7279206 100644
--- a/Wino.Core.Domain/Enums/NavigationReferenceFrame.cs
+++ b/Wino.Core.Domain/Enums/NavigationReferenceFrame.cs
@@ -3,5 +3,6 @@
 public enum NavigationReferenceFrame
 {
     ShellFrame,
+    InnerShellFrame,
     RenderingFrame
 }
diff --git a/Wino.Core.Domain/Enums/NavigationTransitionEffect.cs b/Wino.Core.Domain/Enums/NavigationTransitionEffect.cs
new file mode 100644
index 00000000..73be75f6
--- /dev/null
+++ b/Wino.Core.Domain/Enums/NavigationTransitionEffect.cs
@@ -0,0 +1,27 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Specifies the animation effect to use during a slide navigation transition.
+/// </summary>
+public enum NavigationTransitionEffect
+{
+    /// <summary>
+    /// The navigation transition effect starts from the left edge of the frame.
+    /// </summary>
+    FromLeft,
+
+    /// <summary>
+    /// The navigation transition effect starts from the right edge of the frame.
+    /// </summary>
+    FromRight,
+
+    /// <summary>
+    /// The navigation transition effect starts from the top edge of the frame.
+    /// </summary>
+    FromTop,
+
+    /// <summary>
+    /// The navigation transition effect starts from the bottom edge of the frame.
+    /// </summary>
+    FromBottom
+}
diff --git a/Wino.Core.Domain/Enums/NewEventButtonBehavior.cs b/Wino.Core.Domain/Enums/NewEventButtonBehavior.cs
new file mode 100644
index 00000000..9ef143e4
--- /dev/null
+++ b/Wino.Core.Domain/Enums/NewEventButtonBehavior.cs
@@ -0,0 +1,7 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum NewEventButtonBehavior
+{
+    AskEachTime = 0,
+    AlwaysUseSpecificCalendar = 1
+}
diff --git a/Wino.Core.Domain/Enums/PrintCollation.cs b/Wino.Core.Domain/Enums/PrintCollation.cs
new file mode 100644
index 00000000..94b5bf93
--- /dev/null
+++ b/Wino.Core.Domain/Enums/PrintCollation.cs
@@ -0,0 +1,22 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Print collation options.
+/// </summary>
+public enum PrintCollation
+{
+    /// <summary>
+    /// Default collation.
+    /// </summary>
+    Default = 0,
+    
+    /// <summary>
+    /// Collated printing.
+    /// </summary>
+    Collated = 1,
+    
+    /// <summary>
+    /// Uncollated printing.
+    /// </summary>
+    Uncollated = 2
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/PrintColorMode.cs b/Wino.Core.Domain/Enums/PrintColorMode.cs
new file mode 100644
index 00000000..869f9b15
--- /dev/null
+++ b/Wino.Core.Domain/Enums/PrintColorMode.cs
@@ -0,0 +1,22 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Print color mode options.
+/// </summary>
+public enum PrintColorMode
+{
+    /// <summary>
+    /// Default color mode.
+    /// </summary>
+    Default = 0,
+    
+    /// <summary>
+    /// Color printing.
+    /// </summary>
+    Color = 1,
+    
+    /// <summary>
+    /// Grayscale printing.
+    /// </summary>
+    Grayscale = 2
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/PrintDuplex.cs b/Wino.Core.Domain/Enums/PrintDuplex.cs
new file mode 100644
index 00000000..51becc23
--- /dev/null
+++ b/Wino.Core.Domain/Enums/PrintDuplex.cs
@@ -0,0 +1,27 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Print duplex (double-sided) options.
+/// </summary>
+public enum PrintDuplex
+{
+    /// <summary>
+    /// Default duplex mode.
+    /// </summary>
+    Default = 0,
+    
+    /// <summary>
+    /// Single-sided printing.
+    /// </summary>
+    Simplex = 1,
+    
+    /// <summary>
+    /// Double-sided printing with pages flipped horizontally.
+    /// </summary>
+    DuplexShortEdge = 2,
+    
+    /// <summary>
+    /// Double-sided printing with pages flipped vertically.
+    /// </summary>
+    DuplexLongEdge = 3
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/PrintMediaSize.cs b/Wino.Core.Domain/Enums/PrintMediaSize.cs
new file mode 100644
index 00000000..5e454992
--- /dev/null
+++ b/Wino.Core.Domain/Enums/PrintMediaSize.cs
@@ -0,0 +1,57 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Print media size options.
+/// </summary>
+public enum PrintMediaSize
+{
+    /// <summary>
+    /// Default media size.
+    /// </summary>
+    Default = 0,
+    
+    /// <summary>
+    /// Letter size (8.5 x 11 inches).
+    /// </summary>
+    NorthAmericaLetter = 1,
+    
+    /// <summary>
+    /// Legal size (8.5 x 14 inches).
+    /// </summary>
+    NorthAmericaLegal = 2,
+    
+    /// <summary>
+    /// A4 size (210 x 297 mm).
+    /// </summary>
+    IsoA4 = 3,
+    
+    /// <summary>
+    /// A3 size (297 x 420 mm).
+    /// </summary>
+    IsoA3 = 4,
+    
+    /// <summary>
+    /// A5 size (148 x 210 mm).
+    /// </summary>
+    IsoA5 = 5,
+    
+    /// <summary>
+    /// Tabloid size (11 x 17 inches).
+    /// </summary>
+    NorthAmericaTabloid = 6,
+    
+    /// <summary>
+    /// Executive size (7.25 x 10.5 inches).
+    /// </summary>
+    NorthAmericaExecutive = 7,
+    
+    /// <summary>
+    /// B4 size (250 x 353 mm).
+    /// </summary>
+    JisB4 = 8,
+    
+    /// <summary>
+    /// B5 size (176 x 250 mm).
+    /// </summary>
+    JisB5 = 9
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/PrintOrientation.cs b/Wino.Core.Domain/Enums/PrintOrientation.cs
new file mode 100644
index 00000000..8b9b169c
--- /dev/null
+++ b/Wino.Core.Domain/Enums/PrintOrientation.cs
@@ -0,0 +1,17 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Print orientation options.
+/// </summary>
+public enum PrintOrientation
+{
+    /// <summary>
+    /// Portrait orientation (default).
+    /// </summary>
+    Portrait = 0,
+    
+    /// <summary>
+    /// Landscape orientation.
+    /// </summary>
+    Landscape = 1
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/ServerBackgroundMode.cs b/Wino.Core.Domain/Enums/ServerBackgroundMode.cs
deleted file mode 100644
index d7f9e5df..00000000
--- a/Wino.Core.Domain/Enums/ServerBackgroundMode.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Wino.Core.Domain.Enums;
-
-/// <summary>
-/// What should happen to server app when the client is terminated.
-/// </summary>
-public enum ServerBackgroundMode
-{
-    MinimizedTray, // Still runs, tray icon is visible.
-    Invisible, // Still runs, tray icon is invisible.
-    Terminate // Server is terminated as Wino terminates.
-}
diff --git a/Wino.Core.Domain/Enums/SynchronizationCompletedState.cs b/Wino.Core.Domain/Enums/SynchronizationCompletedState.cs
index 6a2edb6c..fc794169 100644
--- a/Wino.Core.Domain/Enums/SynchronizationCompletedState.cs
+++ b/Wino.Core.Domain/Enums/SynchronizationCompletedState.cs
@@ -4,5 +4,6 @@ public enum SynchronizationCompletedState
 {
     Success, // All succeeded.
     Canceled, // Canceled by user or HTTP call.
-    Failed // Exception.
+    Failed, // Exception.
+    PartiallyCompleted // Some folders succeeded, some failed.
 }
diff --git a/Wino.Core.Domain/Enums/SynchronizationSource.cs b/Wino.Core.Domain/Enums/SynchronizationSource.cs
deleted file mode 100644
index d7b3e2d3..00000000
--- a/Wino.Core.Domain/Enums/SynchronizationSource.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Wino.Core.Domain.Enums;
-
-/// <summary>
-/// Enumeration for the source of synchronization.
-/// Right now it can either be from the client or the server.
-/// </summary>
-public enum SynchronizationSource
-{
-    Client,
-    Server
-}
diff --git a/Wino.Core.Domain/Enums/SynchronizerErrorCategory.cs b/Wino.Core.Domain/Enums/SynchronizerErrorCategory.cs
new file mode 100644
index 00000000..4590273c
--- /dev/null
+++ b/Wino.Core.Domain/Enums/SynchronizerErrorCategory.cs
@@ -0,0 +1,47 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Categorizes synchronization errors by their root cause for targeted handling.
+/// </summary>
+public enum SynchronizerErrorCategory
+{
+    /// <summary>
+    /// Network-related issues: connection timeouts, DNS failures, socket errors.
+    /// </summary>
+    Network,
+
+    /// <summary>
+    /// Authentication failures: invalid credentials, expired tokens, revoked access.
+    /// </summary>
+    Authentication,
+
+    /// <summary>
+    /// Rate limiting: too many requests (HTTP 429), quota exceeded.
+    /// </summary>
+    RateLimit,
+
+    /// <summary>
+    /// Resource not found: folder or message deleted externally (HTTP 404).
+    /// </summary>
+    ResourceNotFound,
+
+    /// <summary>
+    /// Server errors: internal server errors (HTTP 5xx), service unavailable.
+    /// </summary>
+    ServerError,
+
+    /// <summary>
+    /// Protocol errors: IMAP/SMTP command failures, malformed responses.
+    /// </summary>
+    ProtocolError,
+
+    /// <summary>
+    /// Validation errors: invalid data, constraint violations.
+    /// </summary>
+    Validation,
+
+    /// <summary>
+    /// Unknown or unclassified error.
+    /// </summary>
+    Unknown
+}
diff --git a/Wino.Core.Domain/Enums/SynchronizerErrorSeverity.cs b/Wino.Core.Domain/Enums/SynchronizerErrorSeverity.cs
new file mode 100644
index 00000000..49ce1d4c
--- /dev/null
+++ b/Wino.Core.Domain/Enums/SynchronizerErrorSeverity.cs
@@ -0,0 +1,31 @@
+namespace Wino.Core.Domain.Enums;
+
+/// <summary>
+/// Classifies the severity of synchronization errors to determine retry behavior.
+/// </summary>
+public enum SynchronizerErrorSeverity
+{
+    /// <summary>
+    /// Transient error that should be retried with exponential backoff.
+    /// Examples: network timeout, temporary server unavailability, rate limiting.
+    /// </summary>
+    Transient,
+
+    /// <summary>
+    /// Error that can be recovered from by skipping the affected item/folder and continuing sync.
+    /// Examples: folder deleted externally, message not found, permission denied on single item.
+    /// </summary>
+    Recoverable,
+
+    /// <summary>
+    /// Fatal error that requires stopping synchronization and user intervention.
+    /// Examples: account disabled, server permanently unavailable, critical configuration error.
+    /// </summary>
+    Fatal,
+
+    /// <summary>
+    /// Authentication error that requires the user to re-authenticate.
+    /// Examples: token expired, password changed, OAuth refresh failed.
+    /// </summary>
+    AuthRequired
+}
diff --git a/Wino.Core.Domain/Enums/WindowBackdropType.cs b/Wino.Core.Domain/Enums/WindowBackdropType.cs
new file mode 100644
index 00000000..62b74cf8
--- /dev/null
+++ b/Wino.Core.Domain/Enums/WindowBackdropType.cs
@@ -0,0 +1,11 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum WindowBackdropType
+{
+    None,
+    Mica,
+    MicaAlt,
+    DesktopAcrylic,
+    AcrylicBase,
+    AcrylicThin
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Enums/WinoAddOnProductType.cs b/Wino.Core.Domain/Enums/WinoAddOnProductType.cs
new file mode 100644
index 00000000..e4e08540
--- /dev/null
+++ b/Wino.Core.Domain/Enums/WinoAddOnProductType.cs
@@ -0,0 +1,7 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum WinoAddOnProductType
+{
+    AI_PACK,
+    UNLIMITED_ACCOUNTS
+}
diff --git a/Wino.Core.Domain/Enums/WinoApplicationMode.cs b/Wino.Core.Domain/Enums/WinoApplicationMode.cs
new file mode 100644
index 00000000..a1b6114d
--- /dev/null
+++ b/Wino.Core.Domain/Enums/WinoApplicationMode.cs
@@ -0,0 +1,9 @@
+namespace Wino.Core.Domain.Enums;
+
+public enum WinoApplicationMode
+{
+    Mail,
+    Calendar,
+    Contacts,
+    Settings
+}
diff --git a/Wino.Core.Domain/Enums/WinoPage.cs b/Wino.Core.Domain/Enums/WinoPage.cs
index 9bf5347a..eb78105a 100644
--- a/Wino.Core.Domain/Enums/WinoPage.cs
+++ b/Wino.Core.Domain/Enums/WinoPage.cs
@@ -9,8 +9,8 @@ public enum WinoPage
     IdlePage,
     ComposePage,
     SettingsPage,
+    ContactsPage,
     MailRenderingPage,
-    WelcomePage,
     AccountDetailsPage,
     MergedAccountDetailsPage,
     ManageAccountsPage,
@@ -21,13 +21,27 @@ public enum WinoPage
     MessageListPage,
     MailListPage,
     ReadComposePanePage,
-    LanguageTimePage,
     AppPreferencesPage,
     SettingOptionsPage,
     AliasManagementPage,
-    EditAccountDetailsPage,
-    // Calendar
+    ImapCalDavSettingsPage,
+    KeyboardShortcutsPage,
     CalendarPage,
     CalendarSettingsPage,
-    EventDetailsPage
+    CalendarRenderingSettingsPage,
+    CalendarNotificationSettingsPage,
+    CalendarPreferenceSettingsPage,
+    CalendarAccountSettingsPage,
+    EventDetailsPage,
+    CalendarEventComposePage,
+    SignatureAndEncryptionPage,
+    EmailTemplatesPage,
+    CreateEmailTemplatePage,
+    StoragePage,
+    WinoAccountManagementPage,
+    WelcomePageV2,
+    WelcomeHostPage,
+    ProviderSelectionPage,
+    AccountSetupProgressPage,
+    SpecialImapCredentialsPage
 }
diff --git a/Wino.Core.Domain/Enums/WinoServerConnectionStatus.cs b/Wino.Core.Domain/Enums/WinoServerConnectionStatus.cs
deleted file mode 100644
index 9897b5bd..00000000
--- a/Wino.Core.Domain/Enums/WinoServerConnectionStatus.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Wino.Core.Domain.Enums;
-
-public enum WinoServerConnectionStatus
-{
-    None,
-    Connecting,
-    Connected,
-    Disconnected,
-    Failed
-}
diff --git a/Wino.Core.Domain/Exceptions/BackgroundTaskRegistrationFailedException.cs b/Wino.Core.Domain/Exceptions/BackgroundTaskRegistrationFailedException.cs
deleted file mode 100644
index 1a8ac966..00000000
--- a/Wino.Core.Domain/Exceptions/BackgroundTaskRegistrationFailedException.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Wino.Core.Domain.Exceptions;
-
-/// <summary>
-/// An exception thrown when the background task registration is failed.
-/// </summary>
-public class BackgroundTaskRegistrationFailedException : Exception { }
diff --git a/Wino.Core.Domain/Exceptions/CalendarEventComposeValidationException.cs b/Wino.Core.Domain/Exceptions/CalendarEventComposeValidationException.cs
new file mode 100644
index 00000000..834606cc
--- /dev/null
+++ b/Wino.Core.Domain/Exceptions/CalendarEventComposeValidationException.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace Wino.Core.Domain.Exceptions;
+
+public sealed class CalendarEventComposeValidationException : Exception
+{
+    public CalendarEventComposeValidationException(string message) : base(message)
+    {
+    }
+}
diff --git a/Wino.Core.Domain/Exceptions/ImapClientPoolException.cs b/Wino.Core.Domain/Exceptions/ImapClientPoolException.cs
index f109d383..4ff337b5 100644
--- a/Wino.Core.Domain/Exceptions/ImapClientPoolException.cs
+++ b/Wino.Core.Domain/Exceptions/ImapClientPoolException.cs
@@ -9,22 +9,18 @@ public class ImapClientPoolException : Exception
     {
     }
 
-    public ImapClientPoolException(string message, CustomServerInformation customServerInformation, string protocolLog) : base(message)
+    public ImapClientPoolException(string message, CustomServerInformation customServerInformation) : base(message)
     {
         CustomServerInformation = customServerInformation;
-        ProtocolLog = protocolLog;
     }
 
-    public ImapClientPoolException(string message, string protocolLog) : base(message)
+    public ImapClientPoolException(string message) : base(message)
     {
-        ProtocolLog = protocolLog;
     }
 
-    public ImapClientPoolException(Exception innerException, string protocolLog) : base(innerException.Message, innerException)
+    public ImapClientPoolException(Exception innerException) : base(innerException.Message, innerException)
     {
-        ProtocolLog = protocolLog;
     }
 
     public CustomServerInformation CustomServerInformation { get; }
-    public string ProtocolLog { get; }
 }
diff --git a/Wino.Core.Domain/Exceptions/ImapConnectionFailedPackage.cs b/Wino.Core.Domain/Exceptions/ImapConnectionFailedPackage.cs
deleted file mode 100644
index e431d969..00000000
--- a/Wino.Core.Domain/Exceptions/ImapConnectionFailedPackage.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Wino.Core.Domain.Models.AutoDiscovery;
-
-namespace Wino.Core.Domain.Exceptions;
-
-public class ImapConnectionFailedPackage
-{
-    public ImapConnectionFailedPackage(string errorMessage, string protocolLog, AutoDiscoverySettings settings)
-    {
-        ErrorMessage = errorMessage;
-        ProtocolLog = protocolLog;
-        Settings = settings;
-    }
-
-    public AutoDiscoverySettings Settings { get; }
-    public string ErrorMessage { get; set; }
-    public string ProtocolLog { get; }
-}
diff --git a/Wino.Core.Domain/Exceptions/WinoServerException.cs b/Wino.Core.Domain/Exceptions/WinoServerException.cs
deleted file mode 100644
index afa7f132..00000000
--- a/Wino.Core.Domain/Exceptions/WinoServerException.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Wino.Core.Domain.Exceptions;
-
-/// <summary>
-/// All server crash types. Wino Server ideally should not throw anything else than this Exception type.
-/// </summary>
-public class WinoServerException : Exception
-{
-    public WinoServerException(string message) : base(message) { }
-}
diff --git a/Wino.Core.Domain/Extensions/CalendarRemoteEventIdExtensions.cs b/Wino.Core.Domain/Extensions/CalendarRemoteEventIdExtensions.cs
new file mode 100644
index 00000000..a21f9ccc
--- /dev/null
+++ b/Wino.Core.Domain/Extensions/CalendarRemoteEventIdExtensions.cs
@@ -0,0 +1,67 @@
+using System;
+
+namespace Wino.Core.Domain.Extensions;
+
+public static class CalendarRemoteEventIdExtensions
+{
+    private const string ClientTrackingSeparator = "::";
+    private const string CalDavClientTrackingPrefix = "caldav-";
+    private const string LocalClientTrackingPrefix = "local-";
+
+    public static string GetProviderRemoteEventId(this string remoteEventId)
+    {
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            return string.Empty;
+
+        var separatorIndex = remoteEventId.IndexOf(ClientTrackingSeparator, StringComparison.Ordinal);
+        return separatorIndex >= 0 ? remoteEventId[..separatorIndex] : remoteEventId;
+    }
+
+    public static Guid? GetClientTrackingId(this string remoteEventId)
+    {
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            return null;
+
+        if (remoteEventId.Contains(ClientTrackingSeparator, StringComparison.Ordinal))
+        {
+            var trackedPart = remoteEventId[(remoteEventId.LastIndexOf(ClientTrackingSeparator, StringComparison.Ordinal) + ClientTrackingSeparator.Length)..];
+            if (TryParseGuid(trackedPart, out var trackedId))
+                return trackedId;
+        }
+
+        if (TryParseGuid(remoteEventId, out var directId))
+            return directId;
+
+        if (remoteEventId.StartsWith(CalDavClientTrackingPrefix, StringComparison.OrdinalIgnoreCase) &&
+            TryParseGuid(remoteEventId[CalDavClientTrackingPrefix.Length..], out var calDavId))
+        {
+            return calDavId;
+        }
+
+        if (remoteEventId.StartsWith(LocalClientTrackingPrefix, StringComparison.OrdinalIgnoreCase) &&
+            TryParseGuid(remoteEventId[LocalClientTrackingPrefix.Length..], out var localId))
+        {
+            return localId;
+        }
+
+        return null;
+    }
+
+    public static string WithClientTrackingId(this string providerRemoteEventId, Guid? clientTrackingId)
+    {
+        if (string.IsNullOrWhiteSpace(providerRemoteEventId) || !clientTrackingId.HasValue)
+            return providerRemoteEventId ?? string.Empty;
+
+        return $"{providerRemoteEventId}{ClientTrackingSeparator}{clientTrackingId.Value:N}";
+    }
+
+    private static bool TryParseGuid(string value, out Guid parsedGuid)
+    {
+        parsedGuid = Guid.Empty;
+
+        if (string.IsNullOrWhiteSpace(value))
+            return false;
+
+        return Guid.TryParseExact(value, "N", out parsedGuid) || Guid.TryParse(value, out parsedGuid);
+    }
+}
diff --git a/Wino.Core.Domain/Extensions/DateTimeExtensions.cs b/Wino.Core.Domain/Extensions/DateTimeExtensions.cs
index f026c80f..0268a93a 100644
--- a/Wino.Core.Domain/Extensions/DateTimeExtensions.cs
+++ b/Wino.Core.Domain/Extensions/DateTimeExtensions.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Models.Calendar;
 
 namespace Wino.Core.Domain.Extensions;
@@ -29,4 +30,60 @@ public static class DateTimeExtensions
         // Start loading from this date instead of visible date.
         return date.AddDays(-diff).Date;
     }
+
+    /// <summary>
+    /// Converts a datetime from source timezone into local timezone.
+    /// If timezone lookup fails, returns original value.
+    /// </summary>
+    public static DateTime ToLocalTimeFromTimeZone(this DateTime dateTime, string sourceTimeZoneId)
+    {
+        if (string.IsNullOrWhiteSpace(sourceTimeZoneId))
+            return dateTime;
+
+        try
+        {
+            var sourceTimeZone = TimeZoneInfo.FindSystemTimeZoneById(sourceTimeZoneId);
+            var localTimeZone = TimeZoneInfo.Local;
+            var unspecifiedDateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
+
+            return TimeZoneInfo.ConvertTime(unspecifiedDateTime, sourceTimeZone, localTimeZone);
+        }
+        catch
+        {
+            return dateTime;
+        }
+    }
+
+    /// <summary>
+    /// Converts local datetime into target timezone.
+    /// If timezone lookup fails, returns original value.
+    /// </summary>
+    public static DateTime ToTimeZoneFromLocal(this DateTime localDateTime, string targetTimeZoneId)
+    {
+        if (string.IsNullOrWhiteSpace(targetTimeZoneId))
+            return localDateTime;
+
+        try
+        {
+            var sourceTimeZone = TimeZoneInfo.Local;
+            var targetTimeZone = TimeZoneInfo.FindSystemTimeZoneById(targetTimeZoneId);
+            var unspecifiedDateTime = DateTime.SpecifyKind(localDateTime, DateTimeKind.Unspecified);
+
+            return TimeZoneInfo.ConvertTime(unspecifiedDateTime, sourceTimeZone, targetTimeZone);
+        }
+        catch
+        {
+            return localDateTime;
+        }
+    }
+
+    public static DateTime GetLocalStartDate(this CalendarItem calendarItem)
+        => calendarItem.IsAllDayEvent
+            ? calendarItem.StartDate
+            : calendarItem.StartDate.ToLocalTimeFromTimeZone(calendarItem.StartTimeZone);
+
+    public static DateTime GetLocalEndDate(this CalendarItem calendarItem)
+        => calendarItem.IsAllDayEvent
+            ? calendarItem.EndDate
+            : calendarItem.EndDate.ToLocalTimeFromTimeZone(calendarItem.EndTimeZone);
 }
diff --git a/Wino.Core.Domain/Extensions/MailHeaderExtensions.cs b/Wino.Core.Domain/Extensions/MailHeaderExtensions.cs
new file mode 100644
index 00000000..aa41729b
--- /dev/null
+++ b/Wino.Core.Domain/Extensions/MailHeaderExtensions.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Linq;
+
+namespace Wino.Core.Domain.Extensions;
+
+public static class MailHeaderExtensions
+{
+    /// <summary>
+    /// Strips angle brackets from a Message-ID or In-Reply-To value.
+    /// RFC 5322 Message-IDs are formatted as &lt;id@domain&gt;, but MimeKit
+    /// properties store them without brackets. This normalizes raw header
+    /// values to match MimeKit's convention.
+    /// </summary>
+    public static string StripAngleBrackets(string value)
+    {
+        if (string.IsNullOrEmpty(value)) return value;
+
+        value = value.Trim();
+
+        if (value.StartsWith("<") && value.EndsWith(">"))
+            return value.Substring(1, value.Length - 2);
+
+        return value;
+    }
+
+    /// <summary>
+    /// Normalizes a raw RFC References header value into semicolon-separated Message-IDs
+    /// without angle brackets. Raw References headers contain space-separated bracketed IDs
+    /// like "&lt;id1@domain&gt; &lt;id2@domain&gt;". This converts them to "id1@domain;id2@domain".
+    /// </summary>
+    public static string NormalizeReferences(string rawReferences)
+    {
+        if (string.IsNullOrEmpty(rawReferences)) return rawReferences;
+
+        var ids = rawReferences
+            .Split(new[] { ' ', '\t', '\r', '\n', ';', ',' }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(StripAngleBrackets)
+            .Where(id => !string.IsNullOrEmpty(id));
+
+        return string.Join(";", ids);
+    }
+}
diff --git a/Wino.Core.Domain/Interfaces/IAccountCalendar.cs b/Wino.Core.Domain/Interfaces/IAccountCalendar.cs
index 85a340c3..7e070f40 100644
--- a/Wino.Core.Domain/Interfaces/IAccountCalendar.cs
+++ b/Wino.Core.Domain/Interfaces/IAccountCalendar.cs
@@ -1,4 +1,6 @@
 using System;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -8,8 +10,11 @@ public interface IAccountCalendar
     string TextColorHex { get; set; }
     string BackgroundColorHex { get; set; }
     bool IsPrimary { get; set; }
+    bool IsSynchronizationEnabled { get; set; }
     Guid AccountId { get; set; }
     string RemoteCalendarId { get; set; }
     bool IsExtended { get; set; }
+    CalendarItemShowAs DefaultShowAs { get; set; }
     Guid Id { get; set; }
+    MailAccount MailAccount { get; set; }
 }
diff --git a/Wino.Core.Domain/Interfaces/IAccountMenuItem.cs b/Wino.Core.Domain/Interfaces/IAccountMenuItem.cs
index b3a917bd..b978978f 100644
--- a/Wino.Core.Domain/Interfaces/IAccountMenuItem.cs
+++ b/Wino.Core.Domain/Interfaces/IAccountMenuItem.cs
@@ -7,7 +7,27 @@ namespace Wino.Core.Domain.Interfaces;
 public interface IAccountMenuItem : IMenuItem
 {
     bool IsEnabled { get; set; }
-    double SynchronizationProgress { get; set; }
+    
+    /// <summary>
+    /// Calculated synchronization progress percentage (0-100). -1 for indeterminate.
+    /// </summary>
+    double SynchronizationProgress { get; }
+    
+    /// <summary>
+    /// Total items to sync. 0 for indeterminate progress.
+    /// </summary>
+    int TotalItemsToSync { get; set; }
+    
+    /// <summary>
+    /// Remaining items to sync.
+    /// </summary>
+    int RemainingItemsToSync { get; set; }
+    
+    /// <summary>
+    /// Current synchronization status message.
+    /// </summary>
+    string SynchronizationStatus { get; set; }
+    
     int UnreadItemCount { get; set; }
     IEnumerable<MailAccount> HoldingAccounts { get; }
     void UpdateAccount(MailAccount account);
diff --git a/Wino.Core.Domain/Interfaces/IAccountService.cs b/Wino.Core.Domain/Interfaces/IAccountService.cs
index 6c590df7..cc31f0d9 100644
--- a/Wino.Core.Domain/Interfaces/IAccountService.cs
+++ b/Wino.Core.Domain/Interfaces/IAccountService.cs
@@ -171,4 +171,19 @@ public interface IAccountService
     /// <returns>Whether the notifications should be created after sync or not.</returns>
     Task<bool> IsNotificationsEnabled(Guid accountId);
     Task UpdateAccountCustomServerInformationAsync(CustomServerInformation customServerInformation);
+
+    /// <summary>
+    /// Updates the last folder structure sync date for the given account.
+    /// Used for optimization to skip folder sync if it was done recently.
+    /// </summary>
+    /// <param name="accountId">Account id.</param>
+    Task UpdateLastFolderStructureSyncDateAsync(Guid accountId);
+
+    /// <summary>
+    /// Checks if folder structure should be synced based on the configured interval.
+    /// Returns true if LastFolderStructureSyncDate is null or older than the interval.
+    /// </summary>
+    /// <param name="accountId">Account id.</param>
+    /// <param name="syncInterval">Minimum interval between folder syncs.</param>
+    Task<bool> ShouldSyncFolderStructureAsync(Guid accountId, TimeSpan syncInterval);
 }
diff --git a/Wino.Core.Domain/Interfaces/IAiActionOptionsService.cs b/Wino.Core.Domain/Interfaces/IAiActionOptionsService.cs
new file mode 100644
index 00000000..5efaf1e7
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IAiActionOptionsService.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Wino.Core.Domain.Models.Ai;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IAiActionOptionsService
+{
+    IReadOnlyList<AiTranslateLanguageOption> GetTranslateLanguageOptions();
+    IReadOnlyList<AiRewriteModeOption> GetRewriteModeOptions();
+}
diff --git a/Wino.Core.Domain/Interfaces/IAutoDiscoveryService.cs b/Wino.Core.Domain/Interfaces/IAutoDiscoveryService.cs
index 0ba6642a..3f49c0bf 100644
--- a/Wino.Core.Domain/Interfaces/IAutoDiscoveryService.cs
+++ b/Wino.Core.Domain/Interfaces/IAutoDiscoveryService.cs
@@ -1,17 +1,22 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Wino.Core.Domain.Models.AutoDiscovery;
 
 namespace Wino.Core.Domain.Interfaces;
 
 /// <summary>
-/// Searches for Auto Discovery settings for custom mail accounts.
+/// Searches for auto-discovery settings for custom mail accounts.
 /// </summary>
 public interface IAutoDiscoveryService
 {
     /// <summary>
     /// Tries to return the best mail server settings using different techniques.
     /// </summary>
-    /// <param name="mailAddress">Address to search settings for.</param>
-    /// <returns>CustomServerInformation with only settings applied.</returns>
     Task<AutoDiscoverySettings> GetAutoDiscoverySettings(AutoDiscoveryMinimalSettings autoDiscoveryMinimalSettings);
+
+    /// <summary>
+    /// Tries to resolve a CalDAV endpoint for the mailbox address.
+    /// </summary>
+    Task<Uri> DiscoverCalDavServiceUriAsync(string mailAddress, CancellationToken cancellationToken = default);
 }
diff --git a/Wino.Core.Domain/Interfaces/IBackgroundTaskService.cs b/Wino.Core.Domain/Interfaces/IBackgroundTaskService.cs
deleted file mode 100644
index 651ee659..00000000
--- a/Wino.Core.Domain/Interfaces/IBackgroundTaskService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IBackgroundTaskService
-{
-    /// <summary>
-    /// Unregisters all background tasks once.
-    /// This is used to clean up the background tasks when the app is updated.
-    /// </summary>
-    void UnregisterAllBackgroundTask();
-
-    /// <summary>
-    /// Registers required background tasks.
-    /// </summary>
-    Task RegisterBackgroundTasksAsync();
-}
diff --git a/Wino.Core.Domain/Interfaces/IBaseSynchronizer.cs b/Wino.Core.Domain/Interfaces/IBaseSynchronizer.cs
index 00f2f406..f423eadf 100644
--- a/Wino.Core.Domain/Interfaces/IBaseSynchronizer.cs
+++ b/Wino.Core.Domain/Interfaces/IBaseSynchronizer.cs
@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Accounts;
@@ -23,6 +25,23 @@ public interface IBaseSynchronizer
     /// <param name="request">Request to queue.</param>
     void QueueRequest(IRequestBase request);
 
+    /// <summary>
+    /// Returns whether there is an in-progress (queued or currently executing) operation for the given mail unique id.
+    /// </summary>
+    /// <param name="mailUniqueId">Mail unique id to check.</param>
+    bool HasPendingOperation(Guid mailUniqueId);
+
+    /// <summary>
+    /// Returns mail unique ids that currently have queued or executing operations.
+    /// </summary>
+    IReadOnlyCollection<Guid> GetPendingOperationUniqueIds();
+
+    /// <summary>
+    /// Returns whether there is an in-progress (queued or currently executing) operation for the given calendar item id.
+    /// </summary>
+    /// <param name="calendarItemId">Calendar item id to check.</param>
+    bool HasPendingCalendarOperation(Guid calendarItemId);
+
     /// <summary>
     /// Synchronizes profile information with the server.
     /// Sender name and Profile picture are updated.
diff --git a/Wino.Core.Domain/Interfaces/ICalDavClient.cs b/Wino.Core.Domain/Interfaces/ICalDavClient.cs
new file mode 100644
index 00000000..824ff22f
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ICalDavClient.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface ICalDavClient
+{
+    Task<IReadOnlyList<CalDavCalendar>> DiscoverCalendarsAsync(
+        CalDavConnectionSettings connectionSettings,
+        CancellationToken cancellationToken = default);
+
+    Task<IReadOnlyList<CalDavCalendarEvent>> GetCalendarEventsAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        DateTimeOffset startUtc,
+        DateTimeOffset endUtc,
+        CancellationToken cancellationToken = default);
+
+    Task UpsertCalendarEventAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        string remoteEventId,
+        string icsContent,
+        CancellationToken cancellationToken = default);
+
+    Task DeleteCalendarEventAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        string remoteEventId,
+        CancellationToken cancellationToken = default);
+}
+
diff --git a/Wino.Core.Domain/Interfaces/ICalendarDialogService.cs b/Wino.Core.Domain/Interfaces/ICalendarDialogService.cs
deleted file mode 100644
index 7b48f868..00000000
--- a/Wino.Core.Domain/Interfaces/ICalendarDialogService.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Wino.Core.Domain.Interfaces;
-
-public interface ICalendarDialogService : IDialogServiceBase
-{
-}
diff --git a/Wino.Core.Domain/Interfaces/ICalendarIcsFileService.cs b/Wino.Core.Domain/Interfaces/ICalendarIcsFileService.cs
new file mode 100644
index 00000000..919ea737
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ICalendarIcsFileService.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Persists CalDAV ICS payloads on disk for IMAP accounts.
+/// </summary>
+public interface ICalendarIcsFileService
+{
+    Task SaveCalendarItemIcsAsync(Guid accountId, Guid calendarId, Guid calendarItemId, string remoteEventId, string remoteResourceHref, string eTag, string icsContent);
+    Task<string> GetCalendarItemIcsETagAsync(Guid accountId, Guid calendarId, Guid calendarItemId);
+    Task DeleteCalendarItemIcsAsync(Guid accountId, Guid calendarItemId);
+    Task DeleteCalendarIcsForCalendarAsync(Guid accountId, Guid calendarId);
+}
diff --git a/Wino.Core.Domain/Interfaces/ICalendarItem.cs b/Wino.Core.Domain/Interfaces/ICalendarItem.cs
index e83827a6..cfa0cb31 100644
--- a/Wino.Core.Domain/Interfaces/ICalendarItem.cs
+++ b/Wino.Core.Domain/Interfaces/ICalendarItem.cs
@@ -1,5 +1,6 @@
 using System;
 using Itenso.TimePeriod;
+using Wino.Core.Domain.Models.Calendar;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -19,4 +20,13 @@ public interface ICalendarItem
     bool IsRecurringChild { get; }
     bool IsRecurringParent { get; }
     bool IsRecurringEvent { get; }
+
+    /// <summary>
+    /// Gets the display title for this calendar item when rendered in a specific day.
+    /// For multi-day events, includes start/end time indicators.
+    /// </summary>
+    /// <param name="displayingPeriod">The period of the day where this item is being rendered.</param>
+    /// <param name="calendarSettings">Calendar settings for time formatting.</param>
+    /// <returns>The formatted title string.</returns>
+    string GetDisplayTitle(ITimePeriod displayingPeriod, CalendarSettings calendarSettings);
 }
diff --git a/Wino.Core.Domain/Interfaces/ICalendarItemViewModel.cs b/Wino.Core.Domain/Interfaces/ICalendarItemViewModel.cs
index 3eaf1ff7..55a91f68 100644
--- a/Wino.Core.Domain/Interfaces/ICalendarItemViewModel.cs
+++ b/Wino.Core.Domain/Interfaces/ICalendarItemViewModel.cs
@@ -1,4 +1,8 @@
-namespace Wino.Core.Domain.Interfaces;
+using Itenso.TimePeriod;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Core.Domain.Interfaces;
 
 /// <summary>
 /// Temporarily to enforce CalendarItemViewModel. Used in CalendarEventCollection.
@@ -6,4 +10,23 @@
 public interface ICalendarItemViewModel
 {
     bool IsSelected { get; set; }
+
+    bool IsBusy { get; set; }
+
+    /// <summary>
+    /// The period of the day where this item is currently being displayed.
+    /// </summary>
+    ITimePeriod DisplayingPeriod { get; set; }
+
+    /// <summary>
+    /// Calendar settings for time formatting.
+    /// </summary>
+    CalendarSettings CalendarSettings { get; set; }
+
+    /// <summary>
+    /// Updates the view model's underlying CalendarItem from new data.
+    /// This allows in-place updates without removing and re-adding items.
+    /// </summary>
+    /// <param name="calendarItem">The updated calendar item data.</param>
+    void UpdateFrom(CalendarItem calendarItem);
 }
diff --git a/Wino.Core.Domain/Interfaces/ICalendarService.cs b/Wino.Core.Domain/Interfaces/ICalendarService.cs
index f0e18b4a..fae3d08f 100644
--- a/Wino.Core.Domain/Interfaces/ICalendarService.cs
+++ b/Wino.Core.Domain/Interfaces/ICalendarService.cs
@@ -1,6 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
+using Itenso.TimePeriod;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Models.Calendar;
 
@@ -11,12 +13,22 @@ public interface ICalendarService
     Task<List<AccountCalendar>> GetAccountCalendarsAsync(Guid accountId);
     Task<AccountCalendar> GetAccountCalendarAsync(Guid accountCalendarId);
     Task DeleteCalendarItemAsync(Guid calendarItemId);
+    Task DeleteCalendarItemAsync(string calendarRemoteEventId, Guid calendarId);
 
     Task DeleteAccountCalendarAsync(AccountCalendar accountCalendar);
     Task InsertAccountCalendarAsync(AccountCalendar accountCalendar);
     Task UpdateAccountCalendarAsync(AccountCalendar accountCalendar);
+    Task SetPrimaryCalendarAsync(Guid accountId, Guid accountCalendarId);
     Task CreateNewCalendarItemAsync(CalendarItem calendarItem, List<CalendarEventAttendee> attendees);
-    Task<List<CalendarItem>> GetCalendarEventsAsync(IAccountCalendar calendar, DayRangeRenderModel dayRangeRenderModel);
+
+    /// <summary>
+    /// Retrieves calendar events for a given calendar within the specified time period.
+    /// </summary>
+    /// <param name="calendar">The calendar to retrieve events from.</param>
+    /// <param name="period">The time period to query events for.</param>
+    /// <returns>List of calendar items that fall within the requested period.</returns>
+    Task<List<CalendarItem>> GetCalendarEventsAsync(IAccountCalendar calendar, ITimePeriod period);
+
     Task<CalendarItem> GetCalendarItemAsync(Guid accountCalendarId, string remoteEventId);
     Task UpdateCalendarDeltaSynchronizationToken(Guid calendarId, string deltaToken);
 
@@ -28,4 +40,43 @@ public interface ICalendarService
     Task<CalendarItem> GetCalendarItemAsync(Guid id);
     Task<List<CalendarEventAttendee>> GetAttendeesAsync(Guid calendarEventTrackingId);
     Task<List<CalendarEventAttendee>> ManageEventAttendeesAsync(Guid calendarItemId, List<CalendarEventAttendee> allAttendees);
+    Task UpdateCalendarItemAsync(CalendarItem calendarItem, List<CalendarEventAttendee> attendees);
+    Task<List<CalendarItem>> SearchCalendarItemsAsync(string searchQuery, int limit, CancellationToken cancellationToken = default);
+    Task<List<Reminder>> GetRemindersAsync(Guid calendarItemId);
+    Task SaveRemindersAsync(Guid calendarItemId, List<Reminder> reminders);
+    Task SnoozeCalendarItemAsync(Guid calendarItemId, DateTime snoozedUntilLocal);
+
+    /// <summary>
+    /// Checks due reminder windows and returns reminder notifications that should trigger now.
+    /// </summary>
+    Task<List<CalendarReminderNotificationRequest>> CheckAndNotifyAsync(DateTime lastCheckLocal, DateTime nowLocal, ISet<string> sentReminderKeys, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets predefined reminder options in minutes (1 Hour, 30 Min, 15 Min, 5 Min, 1 Min).
+    /// </summary>
+    int[] GetPredefinedReminderMinutes();
+
+    #region Attachments
+
+    /// <summary>
+    /// Gets all attachments for a calendar event.
+    /// </summary>
+    Task<List<CalendarAttachment>> GetAttachmentsAsync(Guid calendarItemId);
+
+    /// <summary>
+    /// Inserts or updates calendar attachments.
+    /// </summary>
+    Task InsertOrReplaceAttachmentsAsync(List<CalendarAttachment> attachments);
+
+    /// <summary>
+    /// Marks an attachment as downloaded and updates its local file path.
+    /// </summary>
+    Task MarkAttachmentDownloadedAsync(Guid attachmentId, string localFilePath);
+
+    /// <summary>
+    /// Deletes all attachments for a calendar item.
+    /// </summary>
+    Task DeleteAttachmentsAsync(Guid calendarItemId);
+
+    #endregion
 }
diff --git a/Wino.Core.Domain/Interfaces/IContactPictureFileService.cs b/Wino.Core.Domain/Interfaces/IContactPictureFileService.cs
new file mode 100644
index 00000000..ea654a17
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IContactPictureFileService.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Manages contact picture files stored on disk instead of as base64 in SQLite,
+/// eliminating DB bloat and enabling native WIC hardware-accelerated image loading.
+/// </summary>
+public interface IContactPictureFileService
+{
+    /// <summary>
+    /// Returns the full file path for the given file ID, or null if the file does not exist on disk.
+    /// </summary>
+    string GetContactPicturePath(Guid fileId);
+
+    /// <summary>
+    /// Saves raw image bytes to disk and returns the new file ID.
+    /// </summary>
+    Task<Guid> SaveContactPictureAsync(byte[] imageData);
+
+    /// <summary>
+    /// Deletes the picture file for the given file ID if it exists.
+    /// </summary>
+    Task DeleteContactPictureAsync(Guid fileId);
+}
diff --git a/Wino.Core.Domain/Interfaces/IContactService.cs b/Wino.Core.Domain/Interfaces/IContactService.cs
index e721ec2a..6462026d 100644
--- a/Wino.Core.Domain/Interfaces/IContactService.cs
+++ b/Wino.Core.Domain/Interfaces/IContactService.cs
@@ -1,7 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using MimeKit;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Models.Contacts;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -9,6 +12,30 @@ public interface IContactService
 {
     Task<List<AccountContact>> GetAddressInformationAsync(string queryText);
     Task<AccountContact> GetAddressInformationByAddressAsync(string address);
+    Task<List<AccountContact>> GetContactsByAddressesAsync(IEnumerable<string> addresses);
     Task SaveAddressInformationAsync(MimeMessage message);
+    Task SaveAddressInformationAsync(IEnumerable<AccountContact> contacts);
     Task<AccountContact> CreateNewContactAsync(string address, string displayName);
+    
+    // Paged contact queries for ContactsPage
+    Task<List<AccountContact>> GetAllContactsAsync();
+    Task<List<AccountContact>> SearchContactsAsync(string searchQuery);
+    Task<PagedContactsResult> GetContactsPageAsync(int offset, int pageSize, string searchQuery = null, bool excludeRootContacts = false);
+    Task<AccountContact> UpdateContactAsync(AccountContact contact);
+    Task DeleteContactAsync(string address);
+    Task DeleteContactsAsync(IEnumerable<string> addresses);
+
+    // Group / distribution list support
+    Task<List<ContactGroup>> GetGroupsAsync();
+    Task<ContactGroup> CreateGroupAsync(string name, string description = null);
+    Task DeleteGroupAsync(Guid groupId);
+    Task<List<AccountContact>> GetGroupMembersAsync(Guid groupId);
+    Task AddGroupMemberAsync(Guid groupId, string memberAddress);
+    Task RemoveGroupMemberAsync(Guid groupId, string memberAddress);
+
+    /// <summary>
+    /// Expands a contact group to the individual <see cref="AccountContact"/> entries of its members.
+    /// Returns an empty list if the group does not exist or has no members.
+    /// </summary>
+    Task<List<AccountContact>> ExpandGroupAsync(Guid groupId);
 }
diff --git a/Wino.Core.Domain/Interfaces/IContextMenuItemService.cs b/Wino.Core.Domain/Interfaces/IContextMenuItemService.cs
index c3b1c54d..eee75ad5 100644
--- a/Wino.Core.Domain/Interfaces/IContextMenuItemService.cs
+++ b/Wino.Core.Domain/Interfaces/IContextMenuItemService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Menus;
 
 namespace Wino.Core.Domain.Interfaces;
@@ -8,6 +8,6 @@ namespace Wino.Core.Domain.Interfaces;
 public interface IContextMenuItemService
 {
     IEnumerable<FolderOperationMenuItem> GetFolderContextMenuActions(IBaseFolderMenuItem folderInformation);
-    IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IEnumerable<IMailItem> selectedMailItems);
-    IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(IMailItem mailItem, bool isDarkEditor);
+    IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IEnumerable<MailCopy> selectedMailItems);
+    IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(MailCopy mailItem, bool isDarkEditor);
 }
diff --git a/Wino.Core.Domain/Interfaces/IContextMenuProvider.cs b/Wino.Core.Domain/Interfaces/IContextMenuProvider.cs
index 7e7ef089..d5b676b4 100644
--- a/Wino.Core.Domain/Interfaces/IContextMenuProvider.cs
+++ b/Wino.Core.Domain/Interfaces/IContextMenuProvider.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Menus;
 
 namespace Wino.Core.Domain.Interfaces;
@@ -18,12 +18,12 @@ public interface IContextMenuProvider
     /// </summary>
     /// <param name="folderInformation">Current folder that asks for the menu items.</param>
     /// <param name="selectedMailItems">Selected menu items in the given folder.</param>
-    IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IMailItemFolder folderInformation, IEnumerable<IMailItem> selectedMailItems);
+    IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IMailItemFolder folderInformation, IEnumerable<MailCopy> selectedMailItems);
 
     /// <summary>
     /// Calculates and returns available mail operations for mail rendering CommandBar.
     /// </summary>
     /// <param name="mailItem">Rendered mail item.</param>
     /// <param name="activeFolder">Folder that mail item belongs to.</param>
-    IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(IMailItem mailItem, IMailItemFolder activeFolder, bool isDarkEditor);
+    IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(MailCopy mailItem, IMailItemFolder activeFolder, bool isDarkEditor);
 }
diff --git a/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs b/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
index 8cc97e6d..c915d5b9 100644
--- a/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
+++ b/Wino.Core.Domain/Interfaces/IDialogServiceBase.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Common;
+using Wino.Core.Domain.Models.Printing;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -27,5 +28,7 @@ public interface IDialogServiceBase
     Task<AccountCreationDialogResult> ShowAccountProviderSelectionDialogAsync(List<IProviderDetail> availableProviders);
     IAccountCreationDialog GetAccountCreationDialog(AccountCreationDialogResult accountCreationDialogResult);
     Task<List<SharedFile>> PickFilesAsync(params object[] typeFilters);
+    Task<List<PickedFileMetadata>> PickFilesMetadataAsync(params object[] typeFilters);
     Task<string> PickFilePathAsync(string saveFileName);
+    Task<WebView2PrintSettingsModel> ShowPrintDialogAsync(WebView2PrintSettingsModel initialSettings = null);
 }
diff --git a/Wino.Core.Domain/Interfaces/IEmailTemplateService.cs b/Wino.Core.Domain/Interfaces/IEmailTemplateService.cs
new file mode 100644
index 00000000..52afff79
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IEmailTemplateService.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Mail;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IEmailTemplateService
+{
+    Task<List<EmailTemplate>> GetEmailTemplatesAsync();
+    Task<EmailTemplate> GetEmailTemplateAsync(Guid templateId);
+    Task<EmailTemplate> CreateEmailTemplateAsync(EmailTemplate template);
+    Task<EmailTemplate> UpdateEmailTemplateAsync(EmailTemplate template);
+    Task<EmailTemplate> DeleteEmailTemplateAsync(EmailTemplate template);
+}
diff --git a/Wino.Core.Domain/Interfaces/IFolderMenuItem.cs b/Wino.Core.Domain/Interfaces/IFolderMenuItem.cs
index 7deff38d..26413208 100644
--- a/Wino.Core.Domain/Interfaces/IFolderMenuItem.cs
+++ b/Wino.Core.Domain/Interfaces/IFolderMenuItem.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
@@ -20,7 +21,7 @@ public interface IBaseFolderMenuItem : IMenuItem
     int UnreadItemCount { get; set; }
     SpecialFolderType SpecialFolderType { get; }
     IEnumerable<IMailItemFolder> HandlingFolders { get; }
-    IEnumerable<IMenuItem> SubMenuItems { get; }
+    ObservableCollection<IMenuItem> SubMenuItems { get; }
     bool IsMoveTarget { get; }
     bool IsSticky { get; }
     bool IsSystemFolder { get; }
diff --git a/Wino.Core.Domain/Interfaces/IFolderService.cs b/Wino.Core.Domain/Interfaces/IFolderService.cs
index 33cf1f35..754a67e2 100644
--- a/Wino.Core.Domain/Interfaces/IFolderService.cs
+++ b/Wino.Core.Domain/Interfaces/IFolderService.cs
@@ -79,6 +79,13 @@ public interface IFolderService
     /// <param name="folder">Folder to update.</param>
     Task UpdateFolderAsync(MailItemFolder folder);
 
+    /// <summary>
+    /// Updates only IMAP HighestModeSeq for the given folder.
+    /// </summary>
+    /// <param name="folderId">Folder id to update.</param>
+    /// <param name="highestModeSeq">Latest known mod-seq value.</param>
+    Task UpdateFolderHighestModeSeqAsync(Guid folderId, long highestModeSeq);
+
     /// <summary>
     /// Returns the active folder menu items for the given account for UI.
     /// </summary>
diff --git a/Wino.Core.Domain/Interfaces/IGmailThreadingStrategy.cs b/Wino.Core.Domain/Interfaces/IGmailThreadingStrategy.cs
deleted file mode 100644
index 17ec3b74..00000000
--- a/Wino.Core.Domain/Interfaces/IGmailThreadingStrategy.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IGmailThreadingStrategy : IThreadingStrategy { }
diff --git a/Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs b/Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs
deleted file mode 100644
index 21d9fb47..00000000
--- a/Wino.Core.Domain/Interfaces/IImapAccountCreationDialog.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IImapAccountCreationDialog : IAccountCreationDialog
-{
-    /// <summary>
-    /// Returns the custom server information from the dialog..
-    /// </summary>
-    /// <returns>Null if canceled.</returns>
-    Task<CustomServerInformation> GetCustomServerInformationAsync();
-
-    /// <summary>
-    /// Displays preparing folders page.
-    /// </summary>
-    void ShowPreparingFolders();
-
-    /// <summary>
-    /// Updates account properties for the welcome imap setup dialog and starts the setup.
-    /// </summary>
-    /// <param name="account">Account properties.</param>
-    void StartImapConnectionSetup(MailAccount account);
-}
diff --git a/Wino.Core.Domain/Interfaces/IImapSynchronizationStrategyProvider.cs b/Wino.Core.Domain/Interfaces/IImapSynchronizationStrategyProvider.cs
deleted file mode 100644
index 3fafc48e..00000000
--- a/Wino.Core.Domain/Interfaces/IImapSynchronizationStrategyProvider.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using MailKit.Net.Imap;
-
-namespace Wino.Core.Domain.Interfaces;
-
-/// <summary>
-/// Provides a synchronization strategy for synchronizing IMAP folders based on the server capabilities.
-/// </summary>
-public interface IImapSynchronizationStrategyProvider
-{
-    IImapSynchronizerStrategy GetSynchronizationStrategy(IImapClient client);
-}
diff --git a/Wino.Core.Domain/Interfaces/IImapSynchronizerStrategy.cs b/Wino.Core.Domain/Interfaces/IImapSynchronizerStrategy.cs
deleted file mode 100644
index 8b7769b6..00000000
--- a/Wino.Core.Domain/Interfaces/IImapSynchronizerStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MailKit;
-using MailKit.Net.Imap;
-using Wino.Core.Domain.Entities.Mail;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IImapSynchronizerStrategy
-{
-    /// <summary>
-    /// Synchronizes given folder with the ImapClient client from the client pool.
-    /// </summary>
-    /// <param name="client">Client to perform sync with. I love Mira and Jasminka</param>
-    /// <param name="folder">Folder to synchronize.</param>
-    /// <param name="synchronizer">Imap synchronizer that downloads messages.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>List of new downloaded message ids that don't exist locally.</returns>
-    Task<List<string>> HandleSynchronizationAsync(IImapClient client,
-                                                  MailItemFolder folder,
-                                                  IImapSynchronizer synchronizer,
-                                                  CancellationToken cancellationToken = default);
-
-    /// <summary>
-    /// Downloads given set of messages from the folder.
-    /// Folder is expected to be opened and synchronizer is connected.
-    /// </summary>
-    /// <param name="synchronizer">Synchronizer that performs the action.</param>
-    /// <param name="remoteFolder">Remote folder to download messages from.</param>
-    /// <param name="localFolder">Local folder to assign mails to.</param>
-    /// <param name="uniqueIdSet">Set of message uniqueids.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    Task DownloadMessagesAsync(IImapSynchronizer synchronizer,
-                               IMailFolder remoteFolder,
-                               MailItemFolder localFolder,
-                               UniqueIdSet uniqueIdSet,
-                               CancellationToken cancellationToken = default);
-}
-
diff --git a/Wino.Core.Domain/Interfaces/IImapThreadingStrategy.cs b/Wino.Core.Domain/Interfaces/IImapThreadingStrategy.cs
deleted file mode 100644
index b613cd70..00000000
--- a/Wino.Core.Domain/Interfaces/IImapThreadingStrategy.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IImapThreadingStrategy : IThreadingStrategy { }
diff --git a/Wino.Core.Domain/Interfaces/IKeyboardShortcutService.cs b/Wino.Core.Domain/Interfaces/IKeyboardShortcutService.cs
new file mode 100644
index 00000000..eb242d84
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IKeyboardShortcutService.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Service for managing keyboard shortcuts for mail operations.
+/// </summary>
+public interface IKeyboardShortcutService
+{
+    /// <summary>
+    /// Gets all available keyboard shortcuts.
+    /// </summary>
+    /// <returns>Collection of keyboard shortcuts.</returns>
+    Task<IEnumerable<KeyboardShortcut>> GetKeyboardShortcutsAsync();
+
+    /// <summary>
+    /// Gets enabled keyboard shortcuts only.
+    /// </summary>
+    /// <returns>Collection of enabled keyboard shortcuts.</returns>
+    Task<IEnumerable<KeyboardShortcut>> GetEnabledKeyboardShortcutsAsync();
+
+    /// <summary>
+    /// Creates or updates a keyboard shortcut.
+    /// </summary>
+    /// <param name="shortcut">The keyboard shortcut to save.</param>
+    /// <returns>The saved keyboard shortcut.</returns>
+    Task<KeyboardShortcut> SaveKeyboardShortcutAsync(KeyboardShortcut shortcut);
+
+    /// <summary>
+    /// Deletes a keyboard shortcut.
+    /// </summary>
+    /// <param name="shortcutId">The ID of the shortcut to delete.</param>
+    Task DeleteKeyboardShortcutAsync(Guid shortcutId);
+
+    /// <summary>
+    /// Gets the keyboard shortcut for the given key combination in a specific mode.
+    /// </summary>
+    /// <param name="mode">The application mode to search within.</param>
+    /// <param name="key">The pressed key.</param>
+    /// <param name="modifierKeys">The modifier keys pressed.</param>
+    /// <returns>The matching shortcut if found, otherwise null.</returns>
+    Task<KeyboardShortcut> GetShortcutForKeyAsync(WinoApplicationMode mode, string key, ModifierKeys modifierKeys);
+
+    /// <summary>
+    /// Checks if a key combination is already assigned to another shortcut.
+    /// </summary>
+    /// <param name="mode">The application mode to check within.</param>
+    /// <param name="key">The key to check.</param>
+    /// <param name="modifierKeys">The modifier keys to check.</param>
+    /// <param name="excludeShortcutId">Optional ID to exclude from the check (for updates).</param>
+    /// <returns>True if the combination is already used, false otherwise.</returns>
+    Task<bool> IsKeyCombinationInUseAsync(WinoApplicationMode mode, string key, ModifierKeys modifierKeys, Guid? excludeShortcutId = null);
+
+    /// <summary>
+    /// Creates default keyboard shortcuts for common mail operations.
+    /// </summary>
+    Task CreateDefaultShortcutsAsync();
+
+    /// <summary>
+    /// Resets all shortcuts to defaults.
+    /// </summary>
+    Task ResetToDefaultShortcutsAsync();
+}
diff --git a/Wino.Core.Domain/Interfaces/ILaunchProtocolService.cs b/Wino.Core.Domain/Interfaces/ILaunchProtocolService.cs
index 3e11c83d..39a75615 100644
--- a/Wino.Core.Domain/Interfaces/ILaunchProtocolService.cs
+++ b/Wino.Core.Domain/Interfaces/ILaunchProtocolService.cs
@@ -1,4 +1,5 @@
-using Wino.Core.Domain.Models.Launch;
+using System;
+using Wino.Core.Domain.Models.Launch;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -13,4 +14,5 @@ public interface ILaunchProtocolService
     /// Used to handle mailto links.
     /// </summary>
     MailToUri MailToUri { get; set; }
+
 }
diff --git a/Wino.Core.Domain/Interfaces/IMailDialogService.cs b/Wino.Core.Domain/Interfaces/IMailDialogService.cs
index 53050931..dc60c422 100644
--- a/Wino.Core.Domain/Interfaces/IMailDialogService.cs
+++ b/Wino.Core.Domain/Interfaces/IMailDialogService.cs
@@ -1,10 +1,15 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Folders;
 
 namespace Wino.Core.Domain.Interfaces;
@@ -17,6 +22,7 @@ public interface IMailDialogService : IDialogServiceBase
     // Custom dialogs
     Task<IMailItemFolder> ShowMoveMailFolderDialogAsync(List<IMailItemFolder> availableFolders);
     Task<MailAccount> ShowAccountPickerDialogAsync(List<MailAccount> availableAccounts);
+    Task<AccountCalendarPickingResult> ShowSingleCalendarPickerDialogAsync(List<CalendarPickerAccountGroup> availableCalendarGroups);
 
     /// <summary>
     /// Displays a dialog to the user for reordering accounts.
@@ -37,7 +43,7 @@ public interface IMailDialogService : IDialogServiceBase
     /// Presents a dialog to the user for signature creation/modification.
     /// </summary>
     /// <returns>Signature information. Null if canceled.</returns>
-    Task<AccountSignature> ShowSignatureEditorDialog(AccountSignature signatureModel = null);
+    Task<AccountSignature> ShowSignatureEditorDialog(AccountSignature? signatureModel = null);
 
     /// <summary>
     /// Presents a dialog to the user for account alias creation/modification.
@@ -49,4 +55,26 @@ public interface IMailDialogService : IDialogServiceBase
     /// Presents a dialog to the user to show email source.
     /// </summary>
     Task ShowMessageSourceDialogAsync(string messageSource);
+
+    /// <summary>
+    /// Presents a dialog to the user for keyboard shortcut creation/modification.
+    /// </summary>
+    /// <param name="existingShortcut">Existing shortcut to edit, or null for new shortcut.</param>
+    /// <returns>Dialog result with shortcut information.</returns>
+#pragma warning disable CS8625
+    Task<KeyboardShortcutDialogResult> ShowKeyboardShortcutDialogAsync(KeyboardShortcut existingShortcut = null);
+#pragma warning restore CS8625
+
+    /// <summary>
+    /// Presents a dialog to the user for contact creation/modification.
+    /// </summary>
+    /// <param name="contact">Existing contact to edit, or null for new contact.</param>
+    /// <returns>Contact information. Null if canceled.</returns>
+    Task<AccountContact?> ShowEditContactDialogAsync(AccountContact? contact = null);
+
+    Task<WinoAccount?> ShowWinoAccountRegistrationDialogAsync();
+
+    Task<WinoAccount?> ShowWinoAccountLoginDialogAsync();
+
+    Task<WinoAccountSyncExportResult?> ShowWinoAccountExportDialogAsync();
 }
diff --git a/Wino.Core.Domain/Interfaces/IMailHashContainer.cs b/Wino.Core.Domain/Interfaces/IMailHashContainer.cs
new file mode 100644
index 00000000..9b4a0952
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IMailHashContainer.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IMailHashContainer
+{
+    IEnumerable<Guid> GetContainingIds();
+}
diff --git a/Wino.Core.Domain/Interfaces/IMailItemDisplayInformation.cs b/Wino.Core.Domain/Interfaces/IMailItemDisplayInformation.cs
new file mode 100644
index 00000000..613f2be2
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IMailItemDisplayInformation.cs
@@ -0,0 +1,27 @@
+using System;
+using System.ComponentModel;
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Shared display contract for mail list item rendering.
+/// Implemented by both single mail and thread mail view models.
+/// </summary>
+public interface IMailItemDisplayInformation : INotifyPropertyChanged
+{
+    string Subject { get; }
+    string FromName { get; }
+    string FromAddress { get; }
+    string PreviewText { get; }
+    bool IsRead { get; }
+    bool IsDraft { get; }
+    bool HasAttachments { get; }
+    bool IsCalendarEvent { get; }
+    bool IsFlagged { get; }
+    DateTime CreationDate { get; }
+    Guid? ContactPictureFileId { get; }
+    bool ThumbnailUpdatedEvent { get; }
+    bool IsThreadExpanded { get; }
+    AccountContact SenderContact { get; }
+}
diff --git a/Wino.Core.Domain/Interfaces/IMailListItemSorting.cs b/Wino.Core.Domain/Interfaces/IMailListItemSorting.cs
new file mode 100644
index 00000000..5d4c24f5
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IMailListItemSorting.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IMailListItemSorting
+{
+    DateTime SortingDate { get; }
+    string SortingName { get; }
+}
diff --git a/Wino.Core.Domain/Interfaces/IMailService.cs b/Wino.Core.Domain/Interfaces/IMailService.cs
index 544889ea..f5f4b30d 100644
--- a/Wino.Core.Domain/Interfaces/IMailService.cs
+++ b/Wino.Core.Domain/Interfaces/IMailService.cs
@@ -25,7 +25,7 @@ public interface IMailService
     /// Caution: This method is not safe. Use other overrides.
     /// </summary>
     Task<List<MailCopy>> GetMailItemsAsync(IEnumerable<string> mailCopyIds);
-    Task<List<IMailItem>> FetchMailsAsync(MailListInitializationOptions options, CancellationToken cancellationToken = default);
+    Task<List<MailCopy>> FetchMailsAsync(MailListInitializationOptions options, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Deletes all mail copies for all folders.
@@ -131,6 +131,12 @@ public interface IMailService
     /// <returns>Draft MailCopy and Draft MimeMessage as base64.</returns>
     Task<(MailCopy draftMailCopy, string draftBase64MimeMessage)> CreateDraftAsync(Guid accountId, DraftCreationOptions draftCreationOptions);
 
+    /// <summary>
+    /// Finds a mail copy in the given account by RFC Message-Id.
+    /// Returns null when no local match exists.
+    /// </summary>
+    Task<MailCopy> GetMailCopyByMessageIdAsync(Guid accountId, string messageId);
+
     /// <summary>
     /// Returns ids 
     /// </summary>
@@ -162,4 +168,17 @@ public interface IMailService
     /// <param name="onlineArchiveMailIds">Retrieved MailCopy ids from search result.</param>
     /// <returns>Result model that contains added and removed mail copy ids.</returns>
     Task<GmailArchiveComparisonResult> GetGmailArchiveComparisonResultAsync(Guid archiveFolderId, List<string> onlineArchiveMailIds);
+
+    /// <summary>
+    /// Gets the most recent mail IDs for a folder.
+    /// Used for notification purposes after sync completes.
+    /// </summary>
+    /// <param name="folderId">Folder ID.</param>
+    /// <param name="count">Number of recent mails to return.</param>
+    Task<IEnumerable<string>> GetRecentMailIdsForFolderAsync(Guid folderId, int count);
+
+    /// <summary>
+    /// Returns all mail copies for the account created before the given UTC date.
+    /// </summary>
+    Task<List<MailCopy>> GetMailCopiesBeforeDateAsync(Guid accountId, DateTime cutoffDateUtc);
 }
diff --git a/Wino.Core.Domain/Interfaces/IMenuOperation.cs b/Wino.Core.Domain/Interfaces/IMenuOperation.cs
index 2d588edb..340260c3 100644
--- a/Wino.Core.Domain/Interfaces/IMenuOperation.cs
+++ b/Wino.Core.Domain/Interfaces/IMenuOperation.cs
@@ -4,4 +4,5 @@ public interface IMenuOperation
 {
     bool IsEnabled { get; }
     string Identifier { get; }
+    bool IsSecondaryMenuPreferred { get; }
 }
diff --git a/Wino.Core.Domain/Interfaces/IMimeFileService.cs b/Wino.Core.Domain/Interfaces/IMimeFileService.cs
index a7b5b8db..b27a9df8 100644
--- a/Wino.Core.Domain/Interfaces/IMimeFileService.cs
+++ b/Wino.Core.Domain/Interfaces/IMimeFileService.cs
@@ -59,6 +59,26 @@ public interface IMimeFileService
     /// </summary>
     Task<bool> DeleteMimeMessageAsync(Guid accountId, Guid fileId);
 
+    /// <summary>
+    /// Returns cached translated html for the given mime resource if it exists.
+    /// </summary>
+    Task<string> GetTranslatedHtmlAsync(Guid accountId, Guid fileId, string targetLanguage, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Saves translated html for the given mime resource.
+    /// </summary>
+    Task SaveTranslatedHtmlAsync(Guid accountId, Guid fileId, string targetLanguage, string html, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Returns cached summary text for the given mime resource if it exists.
+    /// </summary>
+    Task<string> GetSummaryTextAsync(Guid accountId, Guid fileId, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Saves summary text for the given mime resource.
+    /// </summary>
+    Task SaveSummaryTextAsync(Guid accountId, Guid fileId, string summary, CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Prepares the final model containing rendering details.
     /// </summary>
diff --git a/Wino.Core.Domain/Interfaces/IMimeStorageService.cs b/Wino.Core.Domain/Interfaces/IMimeStorageService.cs
new file mode 100644
index 00000000..9c67ebea
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IMimeStorageService.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IMimeStorageService
+{
+    Task<string> GetMimeRootPathAsync();
+    Task<Dictionary<Guid, long>> GetAccountsMimeStorageSizesAsync(IEnumerable<Guid> accountIds);
+    Task DeleteAccountMimeStorageAsync(Guid accountId);
+    Task<int> DeleteAccountMimeStorageOlderThanAsync(Guid accountId, DateTime cutoffDateUtc);
+}
diff --git a/Wino.Core.Domain/Interfaces/INativeAppService.cs b/Wino.Core.Domain/Interfaces/INativeAppService.cs
index cfbea72f..2c5c4662 100644
--- a/Wino.Core.Domain/Interfaces/INativeAppService.cs
+++ b/Wino.Core.Domain/Interfaces/INativeAppService.cs
@@ -22,4 +22,9 @@ public interface INativeAppService
     /// This is used to display WAM broker dialog on running UWP app called by a windowless server code.
     /// </summary>
     Func<IntPtr> GetCoreWindowHwnd { get; set; }
+
+    /// <summary>
+    /// Gets the folder path where calendar attachments are stored.
+    /// </summary>
+    string GetCalendarAttachmentsFolderPath();
 }
diff --git a/Wino.Core.Domain/Interfaces/INewThemeService.cs b/Wino.Core.Domain/Interfaces/INewThemeService.cs
new file mode 100644
index 00000000..037b4bee
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/INewThemeService.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Personalization;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface INewThemeService : IInitializeAsync
+{
+    event EventHandler<ApplicationElementTheme> ElementThemeChanged;
+    event EventHandler<string> AccentColorChanged;
+    event EventHandler<WindowBackdropType> BackdropChanged;
+
+    Task<List<AppThemeBase>> GetAvailableThemesAsync();
+    Task<CustomThemeMetadata> CreateNewCustomThemeAsync(string themeName, string accentColor, byte[] wallpaperData);
+    Task<List<CustomThemeMetadata>> GetCurrentCustomThemesAsync();
+    List<string> GetAvailableAccountColors();
+    Task ApplyCustomThemeAsync(bool isInitializing);
+
+    // Window Backdrop Management
+    WindowBackdropType CurrentBackdropType { get; set; }
+    void ApplyBackdrop(WindowBackdropType backdropType);
+
+    // Settings
+    ApplicationElementTheme RootTheme { get; set; }
+    Guid? CurrentApplicationThemeId { get; set; }
+    string AccentColor { get; set; }
+    string GetSystemAccentColorHex();
+    bool IsCustomTheme { get; }
+
+    // Improved accent color management
+    Task SetAccentColorAsync(string hexColor, bool preserveTheme = true);
+
+    // Title bar color management
+    void UpdateSystemCaptionButtonColors();
+
+    // Backdrop management
+    List<BackdropTypeWrapper> GetAvailableBackdropTypes();
+
+    /// <summary>
+    /// Re-applies the current theme (backdrop, root theme, accent, caption colors)
+    /// to the currently active window. Use after a window transition.
+    /// </summary>
+    Task ApplyThemeToActiveWindowAsync();
+}
diff --git a/Wino.Core.Domain/Interfaces/INotificationBuilder.cs b/Wino.Core.Domain/Interfaces/INotificationBuilder.cs
index 86961ad7..ed41e474 100644
--- a/Wino.Core.Domain/Interfaces/INotificationBuilder.cs
+++ b/Wino.Core.Domain/Interfaces/INotificationBuilder.cs
@@ -1,7 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -10,7 +12,7 @@ public interface INotificationBuilder
     /// <summary>
     /// Creates toast notifications for new mails.
     /// </summary>
-    Task CreateNotificationsAsync(Guid inboxFolderId, IEnumerable<IMailItem> newMailItems);
+    Task CreateNotificationsAsync(IEnumerable<MailCopy> newMailItems);
 
     /// <summary>
     /// Gets the unread Inbox messages for each account and updates the taskbar icon.
@@ -18,13 +20,30 @@ public interface INotificationBuilder
     /// <returns></returns>
     Task UpdateTaskbarIconBadgeAsync();
 
-    /// <summary>
-    /// Creates test notification for test purposes.
-    /// </summary>
-    Task CreateTestNotificationAsync(string title, string message);
-
     /// <summary>
     /// Removes the toast notification for a specific mail by unique id.
     /// </summary>
     void RemoveNotification(Guid mailUniqueId);
+
+    /// <summary>
+    /// Shows a notification that the account requires attention.
+    /// </summary>
+    /// <param name="account">Account that needs attention.</param>
+    void CreateAttentionRequiredNotification(MailAccount account);
+
+    /// <summary>
+    /// Shows a notification when WebView2 runtime is unavailable.
+    /// </summary>
+    void CreateWebView2RuntimeMissingNotification();
+
+    /// <summary>
+    /// Shows a notification when a Microsoft Store update is available.
+    /// </summary>
+    void CreateStoreUpdateNotification();
+
+    /// <summary>
+    /// Creates a calendar reminder toast for the specified calendar item.
+    /// </summary>
+    Task CreateCalendarReminderNotificationAsync(CalendarItem calendarItem, long reminderDurationInSeconds);
 }
+
diff --git a/Wino.Core.Domain/Interfaces/IOutlookThreadingStrategy.cs b/Wino.Core.Domain/Interfaces/IOutlookThreadingStrategy.cs
deleted file mode 100644
index 03525f6f..00000000
--- a/Wino.Core.Domain/Interfaces/IOutlookThreadingStrategy.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IOutlookThreadingStrategy : IThreadingStrategy { }
diff --git a/Wino.Core.Domain/Interfaces/IPreferencesService.cs b/Wino.Core.Domain/Interfaces/IPreferencesService.cs
index 95def0d5..b4f93412 100644
--- a/Wino.Core.Domain/Interfaces/IPreferencesService.cs
+++ b/Wino.Core.Domain/Interfaces/IPreferencesService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Calendar;
@@ -6,7 +6,7 @@ using Wino.Core.Domain.Models.Reader;
 
 namespace Wino.Core.Domain.Interfaces;
 
-public interface IPreferencesService: INotifyPropertyChanged
+public interface IPreferencesService : INotifyPropertyChanged
 {
     /// <summary>
     /// When any of the preferences are changed.
@@ -30,11 +30,6 @@ public interface IPreferencesService: INotifyPropertyChanged
     /// </summary>
     bool IsNavigationPaneOpened { get; set; }
 
-    /// <summary>
-    /// Setting: Gets or sets what should happen to server app when the client is terminated.
-    /// </summary>
-    ServerBackgroundMode ServerTerminationBehavior { get; set; }
-
     /// <summary>
     /// Setting: Preferred time format for mail or calendar header display.
     /// </summary>
@@ -57,6 +52,47 @@ public interface IPreferencesService: INotifyPropertyChanged
     /// </summary>
     int EmailSyncIntervalMinutes { get; set; }
 
+    /// <summary>
+    /// Setting: Default application mode to open when activation does not specify one.
+    /// </summary>
+    WinoApplicationMode DefaultApplicationMode { get; set; }
+
+    /// <summary>
+    /// Setting: Whether Microsoft Store update notifications should be shown.
+    /// </summary>
+    bool IsStoreUpdateNotificationsEnabled { get; set; }
+
+    /// <summary>
+    /// Setting: Whether the Wino account profile button in the shell title bar should be hidden.
+    /// </summary>
+    bool IsWinoAccountButtonHidden { get; set; }
+
+    /// <summary>
+    /// Setting: Default target language code used for AI translation actions.
+    /// </summary>
+    string AiDefaultTranslationLanguageCode { get; set; }
+
+    /// <summary>
+    /// Setting: Preferred target language code for AI summarize actions.
+    /// </summary>
+    string AiSummarizeLanguageCode { get; set; }
+
+    /// <summary>
+    /// Setting: Preferred folder path used when saving AI summaries.
+    /// </summary>
+    string AiSummarySavePath { get; set; }
+
+    /// <summary>
+    /// Serializes the current syncable preferences snapshot.
+    /// </summary>
+    string ExportPreferences();
+
+    /// <summary>
+    /// Deserializes and applies a preferences snapshot.
+    /// Returns the applied and failed property counts.
+    /// </summary>
+    (int appliedCount, int failedCount) ImportPreferences(string settingsJson);
+
     #endregion
 
     #region Mail
@@ -96,11 +132,6 @@ public interface IPreferencesService: INotifyPropertyChanged
     /// </summary>
     bool IsShowPreviewEnabled { get; set; }
 
-    /// <summary>
-    /// Setting: Enable/disable semantic zoom on clicking date headers.
-    /// </summary>
-    bool IsSemanticZoomEnabled { get; set; }
-
     /// <summary>
     /// Setting: Set whether 'img' tags in rendered HTMLs should be removed.
     /// </summary>
@@ -151,11 +182,6 @@ public interface IPreferencesService: INotifyPropertyChanged
     /// </summary>
     MailOperation RightHoverAction { get; set; }
 
-    /// <summary>
-    /// Setting: Whether Mailkit Protocol Logger is enabled for ImapTestService or not.
-    /// </summary>
-    bool IsMailkitProtocolLoggerEnabled { get; set; }
-
     /// <summary>
     /// Setting: Which entity id (merged account or folder) should be expanded automatically on startup.
     /// </summary>
@@ -215,12 +241,34 @@ public interface IPreferencesService: INotifyPropertyChanged
     #region Calendar
 
     DayOfWeek FirstDayOfWeek { get; set; }
+    bool IsWorkingHoursEnabled { get; set; }
     TimeSpan WorkingHourStart { get; set; }
     TimeSpan WorkingHourEnd { get; set; }
     DayOfWeek WorkingDayStart { get; set; }
     DayOfWeek WorkingDayEnd { get; set; }
     double HourHeight { get; set; }
+    string CalendarTimedDayHeaderDateFormat { get; set; }
 
+    /// <summary>
+    /// Setting: Default reminder duration in seconds for new calendar events.
+    /// Set to 0 to disable default reminders.
+    /// </summary>
+    long DefaultReminderDurationInSeconds { get; set; }
+
+    /// <summary>
+    /// Setting: Default snooze duration in minutes for calendar reminder notifications.
+    /// </summary>
+    int DefaultSnoozeDurationInMinutes { get; set; }
+
+    /// <summary>
+    /// Setting: How the New Event button chooses a calendar.
+    /// </summary>
+    NewEventButtonBehavior NewEventButtonBehavior { get; set; }
+
+    /// <summary>
+    /// Setting: Default calendar used when New Event is configured to always use a specific calendar.
+    /// </summary>
+    Guid? DefaultNewEventCalendarId { get; set; }
 
     CalendarSettings GetCurrentCalendarSettings();
 
diff --git a/Wino.Core.Domain/Interfaces/IRequestBundle.cs b/Wino.Core.Domain/Interfaces/IRequestBundle.cs
index f88a3dc2..955b89d8 100644
--- a/Wino.Core.Domain/Interfaces/IRequestBundle.cs
+++ b/Wino.Core.Domain/Interfaces/IRequestBundle.cs
@@ -1,4 +1,6 @@
-using Wino.Core.Domain.Entities.Mail;
+using System;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Interfaces;
@@ -63,3 +65,10 @@ public interface IFolderActionRequest : IRequestBase
 
     FolderSynchronizerOperation Operation { get; }
 }
+
+public interface ICalendarActionRequest : IRequestBase
+{
+    CalendarItem Item { get; }
+    Guid? LocalCalendarItemId { get; }
+    CalendarSynchronizerOperation Operation { get; }
+}
diff --git a/Wino.Core.Domain/Interfaces/IRetryExecutor.cs b/Wino.Core.Domain/Interfaces/IRetryExecutor.cs
new file mode 100644
index 00000000..e7d31c34
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IRetryExecutor.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Retry;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Executes operations with automatic retry and error handling support.
+/// </summary>
+public interface IRetryExecutor
+{
+    /// <summary>
+    /// Executes an operation with automatic retry based on the specified policy.
+    /// </summary>
+    /// <typeparam name="T">The return type of the operation.</typeparam>
+    /// <param name="operation">The async operation to execute.</param>
+    /// <param name="policy">The retry policy to apply.</param>
+    /// <param name="errorContextFactory">Factory to create error context from exceptions.</param>
+    /// <param name="errorHandler">Optional error handler for custom error processing.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>The result of the operation.</returns>
+    /// <exception cref="Exception">Thrown when all retries are exhausted or a fatal error occurs.</exception>
+    Task<T> ExecuteWithRetryAsync<T>(
+        Func<CancellationToken, Task<T>> operation,
+        RetryPolicy policy,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        ISynchronizerErrorHandlerFactory errorHandler = null,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Executes an operation with automatic retry based on the specified policy (void return).
+    /// </summary>
+    /// <param name="operation">The async operation to execute.</param>
+    /// <param name="policy">The retry policy to apply.</param>
+    /// <param name="errorContextFactory">Factory to create error context from exceptions.</param>
+    /// <param name="errorHandler">Optional error handler for custom error processing.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <exception cref="Exception">Thrown when all retries are exhausted or a fatal error occurs.</exception>
+    Task ExecuteWithRetryAsync(
+        Func<CancellationToken, Task> operation,
+        RetryPolicy policy,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        ISynchronizerErrorHandlerFactory errorHandler = null,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Executes an operation with default retry policy.
+    /// </summary>
+    /// <typeparam name="T">The return type of the operation.</typeparam>
+    /// <param name="operation">The async operation to execute.</param>
+    /// <param name="errorContextFactory">Factory to create error context from exceptions.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>The result of the operation.</returns>
+    Task<T> ExecuteWithRetryAsync<T>(
+        Func<CancellationToken, Task<T>> operation,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        CancellationToken cancellationToken = default);
+}
diff --git a/Wino.Core.Domain/Interfaces/ISettingsBuilderService.cs b/Wino.Core.Domain/Interfaces/ISettingsBuilderService.cs
deleted file mode 100644
index 7cca8604..00000000
--- a/Wino.Core.Domain/Interfaces/ISettingsBuilderService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-using Wino.Core.Domain.Models.Settings;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface ISettingsBuilderService
-{
-    List<SettingOption> GetSettingItems();
-}
diff --git a/Wino.Core.Domain/Interfaces/IShellClient.cs b/Wino.Core.Domain/Interfaces/IShellClient.cs
new file mode 100644
index 00000000..ab9ad0c9
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IShellClient.cs
@@ -0,0 +1,79 @@
+#nullable enable
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Folders;
+using Wino.Core.Domain.Models.Navigation;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IShellClient : INotifyPropertyChanged
+{
+    WinoApplicationMode Mode { get; }
+    IDispatcher Dispatcher { get; set; }
+    MenuItemCollection? MenuItems { get; }
+    object? SelectedMenuItem { get; set; }
+    bool HandlesNavigationSelection { get; }
+
+    void Activate(ShellModeActivationContext activationContext);
+    void Deactivate();
+    Task HandleNavigationItemInvokedAsync(IMenuItem? menuItem);
+    Task HandleNavigationSelectionChangedAsync(IMenuItem? menuItem);
+    Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args);
+}
+
+public interface IMailShellClient : IShellClient
+{
+    IMenuItem CreatePrimaryMenuItem { get; }
+
+    IEnumerable<FolderOperationMenuItem> GetFolderContextMenuActions(IBaseFolderMenuItem folder);
+    Task HandleAccountCreatedAsync(MailAccount createdAccount);
+    Task NavigateFolderAsync(IBaseFolderMenuItem baseFolderMenuItem, TaskCompletionSource<bool>? folderInitAwaitTask = null);
+    Task ChangeLoadedAccountAsync(IAccountMenuItem clickedBaseAccountMenuItem, bool navigateInbox = true);
+    Task PerformFolderOperationAsync(FolderOperation operation, IBaseFolderMenuItem folderMenuItem);
+    Task PerformMoveOperationAsync(IEnumerable<MailCopy> items, IBaseFolderMenuItem targetFolderMenuItem);
+    Task CreateNewMailForAsync(MailAccount account);
+}
+
+public interface ICalendarShellClient : IShellClient
+{
+    IStatePersistanceService StatePersistenceService { get; }
+    IEnumerable DateNavigationHeaderItems { get; }
+    int SelectedDateNavigationHeaderIndex { get; }
+    VisibleDateRange? CurrentVisibleRange { get; }
+    string VisibleDateRangeText { get; }
+    bool CanSynchronizeCalendars { get; }
+    ICommand SyncCommand { get; }
+    ICommand TodayClickedCommand { get; }
+    ICommand DateClickedCommand { get; }
+    ICommand PreviousDateRangeCommand { get; }
+    ICommand NextDateRangeCommand { get; }
+    IEnumerable GroupedAccountCalendars { get; }
+}
+
+public interface IShellViewModel
+{
+    WinoApplicationMode CurrentMode { get; }
+    IShellClient CurrentClient { get; }
+    MenuItemCollection? CurrentMenuItems { get; }
+    object? SelectedMenuItem { get; set; }
+
+    void SetCurrentMode(WinoApplicationMode mode);
+    IShellClient GetClient(WinoApplicationMode mode);
+}
+
+public interface IShellHost
+{
+    bool HasShellContent { get; }
+
+    void ActivateMode(WinoApplicationMode mode, ShellModeActivationContext activationContext);
+}
diff --git a/Wino.Core.Domain/Interfaces/ISmimeCertificateService.cs b/Wino.Core.Domain/Interfaces/ISmimeCertificateService.cs
new file mode 100644
index 00000000..9b9fee6a
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ISmimeCertificateService.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface ISmimeCertificateService
+{
+    public IEnumerable<X509Certificate2> GetCertificates(StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser, string emailAddress = null);
+    public void ImportCertificate(string fileExtension, byte[] rawData, string password = null, StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser);
+    public void RemoveCertificate(string thumbprint, StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser);
+}
diff --git a/Wino.Core.Domain/Interfaces/IStatePersistenceService.cs b/Wino.Core.Domain/Interfaces/IStatePersistenceService.cs
index 8ed05626..834415d0 100644
--- a/Wino.Core.Domain/Interfaces/IStatePersistenceService.cs
+++ b/Wino.Core.Domain/Interfaces/IStatePersistenceService.cs
@@ -18,16 +18,26 @@ public interface IStatePersistanceService : INotifyPropertyChanged
     /// </summary>
     string CoreWindowTitle { get; set; }
 
+    /// <summary>
+    /// App mode title shown in the title bar.
+    /// </summary>
+    string AppModeTitle { get; set; }
+
     /// <summary>
     /// When only reader page is visible in small sized window.
     /// </summary>
     bool IsReaderNarrowed { get; set; }
 
     /// <summary>
-    /// Should display back button on the shell title bar.
+    /// Current application mode (Mail or Calendar).
+    /// Not persisted to configuration, only kept in memory.
     /// </summary>
-    bool IsBackButtonVisible { get; }
+    WinoApplicationMode ApplicationMode { get; set; }
 
+    /// <summary>
+    /// Whether event details page is visible in Calendar mode.
+    /// </summary>
+    bool IsEventDetailsVisible { get; set; }
 
     /// <summary>
     /// Setting: Opened pane length for the navigation view.
@@ -54,4 +64,5 @@ public interface IStatePersistanceService : INotifyPropertyChanged
     /// Setting: Calendar display count for the day view.
     /// </summary>
     int DayDisplayCount { get; set; }
+
 }
diff --git a/Wino.Core.Domain/Interfaces/IStoreManagementService.cs b/Wino.Core.Domain/Interfaces/IStoreManagementService.cs
index ea61f1b7..bd945540 100644
--- a/Wino.Core.Domain/Interfaces/IStoreManagementService.cs
+++ b/Wino.Core.Domain/Interfaces/IStoreManagementService.cs
@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
+#nullable enable
+using System.Threading.Tasks;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Store;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -9,10 +9,20 @@ public interface IStoreManagementService
     /// <summary>
     /// Checks whether user has the type of an add-on purchased.
     /// </summary>
-    Task<bool> HasProductAsync(StoreProductType productType);
+    Task<bool> HasProductAsync(WinoAddOnProductType productType);
 
     /// <summary>
     /// Attempts to purchase the given add-on.
     /// </summary>
-    Task<StorePurchaseResult> PurchaseAsync(StoreProductType productType);
+    Task<StorePurchaseResult> PurchaseAsync(WinoAddOnProductType productType);
+
+    /// <summary>
+    /// Requests a Microsoft Store collections ID key for the current customer.
+    /// </summary>
+    Task<string?> GetCustomerCollectionsIdAsync(string serviceTicket, string publisherUserId);
+
+    /// <summary>
+    /// Requests a Microsoft Store purchase ID key for the current customer.
+    /// </summary>
+    Task<string?> GetCustomerPurchaseIdAsync(string serviceTicket, string publisherUserId);
 }
diff --git a/Wino.Core.Domain/Interfaces/IStoreUpdateService.cs b/Wino.Core.Domain/Interfaces/IStoreUpdateService.cs
new file mode 100644
index 00000000..1977b13e
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IStoreUpdateService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IStoreUpdateService
+{
+    bool HasAvailableUpdate { get; }
+
+    Task<bool> RefreshAvailabilityAsync(bool showNotification = false);
+
+    Task<bool> StartUpdateAsync();
+}
diff --git a/Wino.Core.Domain/Interfaces/ISynchronizationManager.cs b/Wino.Core.Domain/Interfaces/ISynchronizationManager.cs
new file mode 100644
index 00000000..bfacad73
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ISynchronizationManager.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Authentication;
+using Wino.Core.Domain.Models.Connectivity;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Domain.Interfaces;
+
+/// <summary>
+/// Interface for the singleton synchronization manager that handles synchronizer instances and operations.
+/// </summary>
+public interface ISynchronizationManager
+{
+    /// <summary>
+    /// Initializes the SynchronizationManager with required dependencies.
+    /// </summary>
+    Task InitializeAsync(ISynchronizerFactory synchronizerFactory,
+                        IImapTestService imapTestService,
+                        IAccountService accountService,
+                        INotificationBuilder notificationBuilder,
+                        IAuthenticationProvider authenticationProvider);
+
+    /// <summary>
+    /// Tests IMAP server connectivity for the given server information.
+    /// </summary>
+    Task<ImapConnectivityTestResults> TestImapConnectivityAsync(CustomServerInformation serverInformation, bool allowSSLHandshake);
+
+    /// <summary>
+    /// Starts a new mail synchronization for the given account.
+    /// </summary>
+    Task<MailSynchronizationResult> SynchronizeMailAsync(MailSynchronizationOptions options,
+                                                         CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Checks if there is an ongoing synchronization for the given account.
+    /// </summary>
+    bool IsAccountSynchronizing(Guid accountId);
+
+    /// <summary>
+    /// Queues a mail action request to the corresponding account's synchronizer with optional synchronization triggering.
+    /// </summary>
+    Task QueueRequestAsync(IRequestBase request, Guid accountId, bool triggerSynchronization);
+
+    /// <summary>
+    /// Handles folder synchronization for the given account.
+    /// </summary>
+    Task<MailSynchronizationResult> SynchronizeFoldersAsync(Guid accountId,
+                                                            CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Handles alias synchronization for the given account.
+    /// </summary>
+    Task<MailSynchronizationResult> SynchronizeAliasesAsync(Guid accountId,
+                                                            CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Handles profile synchronization for the given account.
+    /// </summary>
+    Task<MailSynchronizationResult> SynchronizeProfileAsync(Guid accountId,
+                                                            CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Handles calendar synchronization for the given account.
+    /// </summary>
+    Task<CalendarSynchronizationResult> SynchronizeCalendarAsync(CalendarSynchronizationOptions options,
+                                                                  CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Downloads a MIME message for the given mail item.
+    /// </summary>
+    Task<string> DownloadMimeMessageAsync(MailCopy mailItem, Guid accountId,
+                                         CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Creates a new synchronizer for a newly added account.
+    /// </summary>
+    IWinoSynchronizerBase CreateSynchronizerForAccount(MailAccount account);
+
+    /// <summary>
+    /// Cancels ongoing synchronizations for the given account.
+    /// </summary>
+    Task CancelSynchronizationsAsync(Guid accountId);
+
+    /// <summary>
+    /// Destroys the synchronizer for the given account.
+    /// </summary>
+    Task DestroySynchronizerAsync(Guid accountId);
+
+    /// <summary>
+    /// Gets all cached synchronizers.
+    /// </summary>
+    IEnumerable<IWinoSynchronizerBase> GetAllSynchronizers();
+
+    /// <summary>
+    /// Gets a synchronizer for the given account ID.
+    /// </summary>
+    Task<IWinoSynchronizerBase> GetSynchronizerAsync(Guid accountId);
+
+    /// <summary>
+    /// Handles OAuth authentication for the specified provider.
+    /// </summary>
+    Task<TokenInformationEx> HandleAuthorizationAsync(MailProviderType providerType,
+                                                     MailAccount account = null,
+                                                     bool proposeCopyAuthorizationURL = false);
+}
diff --git a/Wino.Core.Domain/Interfaces/ISynchronizerErrorHandlerFactory.cs b/Wino.Core.Domain/Interfaces/ISynchronizerErrorHandlerFactory.cs
new file mode 100644
index 00000000..79f32f84
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/ISynchronizerErrorHandlerFactory.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface ISynchronizerErrorHandlerFactory
+{
+    Task<bool> HandleErrorAsync(SynchronizerErrorContext error);
+}
diff --git a/Wino.Core.Domain/Interfaces/IThemeService.cs b/Wino.Core.Domain/Interfaces/IThemeService.cs
deleted file mode 100644
index 322643af..00000000
--- a/Wino.Core.Domain/Interfaces/IThemeService.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Personalization;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IThemeService : IInitializeAsync
-{
-    event EventHandler<ApplicationElementTheme> ElementThemeChanged;
-    event EventHandler<string> AccentColorChanged;
-
-    Task<List<AppThemeBase>> GetAvailableThemesAsync();
-    Task<CustomThemeMetadata> CreateNewCustomThemeAsync(string themeName, string accentColor, byte[] wallpaperData);
-    Task<List<CustomThemeMetadata>> GetCurrentCustomThemesAsync();
-    List<string> GetAvailableAccountColors();
-    Task ApplyCustomThemeAsync(bool isInitializing);
-
-    // Settings
-    ApplicationElementTheme RootTheme { get; set; }
-    Guid CurrentApplicationThemeId { get; set; }
-    string AccentColor { get; set; }
-    string GetSystemAccentColorHex();
-    bool IsCustomTheme { get; }
-}
diff --git a/Wino.Core.Domain/Interfaces/IThreadingStrategy.cs b/Wino.Core.Domain/Interfaces/IThreadingStrategy.cs
deleted file mode 100644
index c27b8e56..00000000
--- a/Wino.Core.Domain/Interfaces/IThreadingStrategy.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IThreadingStrategy
-{
-    /// <summary>
-    /// Attach thread mails to the list.
-    /// </summary>
-    /// <param name="items">Original mails.</param>
-    /// <returns>Original mails with thread mails.</returns>
-    Task<List<IMailItem>> ThreadItemsAsync(List<MailCopy> items, IMailItemFolder threadingForFolder);
-    bool ShouldThreadWithItem(IMailItem originalItem, IMailItem targetItem);
-}
diff --git a/Wino.Core.Domain/Interfaces/IThreadingStrategyProvider.cs b/Wino.Core.Domain/Interfaces/IThreadingStrategyProvider.cs
deleted file mode 100644
index cca544f5..00000000
--- a/Wino.Core.Domain/Interfaces/IThreadingStrategyProvider.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IThreadingStrategyProvider
-{
-    /// <summary>
-    /// Returns corresponding threading strategy that applies to given provider type.
-    /// </summary>
-    /// <param name="mailProviderType">Provider type.</param>
-    IThreadingStrategy GetStrategy(MailProviderType mailProviderType);
-}
diff --git a/Wino.Core.Domain/Interfaces/IUpdateManager.cs b/Wino.Core.Domain/Interfaces/IUpdateManager.cs
new file mode 100644
index 00000000..d0e4a900
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IUpdateManager.cs
@@ -0,0 +1,21 @@
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Updates;
+using System.Collections.Generic;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IUpdateManager
+{
+    /// <summary>Loads and parses the update notes for the current version from the bundled asset file.</summary>
+    Task<UpdateNotes> GetLatestUpdateNotesAsync();
+
+    /// <summary>Loads and parses the app feature highlights from the bundled asset file.</summary>
+    Task<List<UpdateNoteSection>> GetFeaturesAsync();
+
+    /// <summary>Returns true if the current version's update notes have not yet been shown to the user.</summary>
+    bool ShouldShowUpdateNotes();
+
+    /// <summary>Stores a flag in local settings indicating the update notes for the current version have been seen.</summary>
+    void MarkUpdateNotesAsSeen();
+
+}
diff --git a/Wino.Core.Domain/Interfaces/IWebView2RuntimeValidatorService.cs b/Wino.Core.Domain/Interfaces/IWebView2RuntimeValidatorService.cs
new file mode 100644
index 00000000..aafa0669
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IWebView2RuntimeValidatorService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IWebView2RuntimeValidatorService
+{
+    /// <summary>
+    /// Validates whether WebView2 runtime is installed and available for use.
+    /// </summary>
+    Task<bool> IsRuntimeAvailableAsync();
+}
+
diff --git a/Wino.Core.Domain/Interfaces/IWinoAccountApiClient.cs b/Wino.Core.Domain/Interfaces/IWinoAccountApiClient.cs
new file mode 100644
index 00000000..79d21e29
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IWinoAccountApiClient.cs
@@ -0,0 +1,33 @@
+#nullable enable
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Mail.Api.Contracts.Users;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IWinoAccountApiClient
+{
+    Task<WinoAccountApiResult<AuthResultDto>> RegisterAsync(string email, string password, CancellationToken cancellationToken = default);
+    Task<WinoAccountApiResult<AuthResultDto>> LoginAsync(string email, string password, CancellationToken cancellationToken = default);
+    Task<WinoAccountApiResult<AuthResultDto>> RefreshAsync(string refreshToken, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<EmailConfirmationResendResultDto>> ResendEmailConfirmationAsync(string endpoint, string ticket, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<JsonElement>> ForgotPasswordAsync(string email, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<JsonElement>> LogoutAsync(string refreshToken, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AuthUserDto>> GetCurrentUserAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiStatusResultDto>> GetAiStatusAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> SummarizeAsync(string html, string targetLanguage, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> TranslateAsync(string html, string targetLanguage, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> RewriteAsync(string html, string mode, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<WinoStoreCollectionsIdTicketInfo>> CreateCollectionsIdTicketAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<WinoStoreCollectionsIdTicketInfo>> CreatePurchaseIdTicketAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<JsonElement>> SyncStoreEntitlementsAsync(string? storeIdKey, string? purchaseIdKey, CancellationToken cancellationToken = default);
+    Task<string?> GetSettingsAsync(CancellationToken cancellationToken = default);
+    Task SaveSettingsAsync(string settingsJson, CancellationToken cancellationToken = default);
+    Task<UserMailboxSyncListDto> GetMailboxesAsync(CancellationToken cancellationToken = default);
+    Task ReplaceMailboxesAsync(ReplaceUserMailboxesRequestDto request, CancellationToken cancellationToken = default);
+}
diff --git a/Wino.Core.Domain/Interfaces/IWinoAccountDataSyncService.cs b/Wino.Core.Domain/Interfaces/IWinoAccountDataSyncService.cs
new file mode 100644
index 00000000..da08a933
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IWinoAccountDataSyncService.cs
@@ -0,0 +1,11 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IWinoAccountDataSyncService
+{
+    Task<WinoAccountSyncExportResult> ExportAsync(WinoAccountSyncSelection selection, CancellationToken cancellationToken = default);
+    Task<WinoAccountSyncImportResult> ImportAsync(WinoAccountSyncSelection selection, CancellationToken cancellationToken = default);
+}
diff --git a/Wino.Core.Domain/Interfaces/IWinoAccountProfileService.cs b/Wino.Core.Domain/Interfaces/IWinoAccountProfileService.cs
new file mode 100644
index 00000000..d91ffa0e
--- /dev/null
+++ b/Wino.Core.Domain/Interfaces/IWinoAccountProfileService.cs
@@ -0,0 +1,38 @@
+#nullable enable
+using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Mail.Api.Contracts.Users;
+
+namespace Wino.Core.Domain.Interfaces;
+
+public interface IWinoAccountProfileService
+{
+    Task<WinoAccountOperationResult> RegisterAsync(string email, string password, CancellationToken cancellationToken = default);
+    Task<WinoAccountOperationResult> LoginAsync(string email, string password, CancellationToken cancellationToken = default);
+    Task<WinoAccountOperationResult> RefreshAsync(CancellationToken cancellationToken = default);
+    Task<WinoAccountOperationResult> RefreshProfileAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<EmailConfirmationResendResultDto>> ResendEmailConfirmationAsync(string endpoint, string ticket, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<JsonElement>> ForgotPasswordAsync(string email, CancellationToken cancellationToken = default);
+    Task<WinoAccount?> GetActiveAccountAsync();
+    Task<WinoAccount?> GetAuthenticatedAccountAsync(CancellationToken cancellationToken = default);
+    Task<bool> HasActiveAccountAsync();
+    Task<ApiEnvelope<AuthUserDto>> GetCurrentUserAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiStatusResultDto>> GetAiStatusAsync(CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> SummarizeAsync(string html, string targetLanguage, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> TranslateAsync(string html, string targetLanguage, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<AiTextResultDto>> RewriteAsync(string html, string mode, CancellationToken cancellationToken = default);
+    Task<ApiEnvelope<JsonElement>> SyncStoreEntitlementsAsync(CancellationToken cancellationToken = default);
+    Task<string?> GetSettingsAsync(CancellationToken cancellationToken = default);
+    Task SaveSettingsAsync(string settingsJson, CancellationToken cancellationToken = default);
+    Task<UserMailboxSyncListDto> GetMailboxesAsync(CancellationToken cancellationToken = default);
+    Task ReplaceMailboxesAsync(ReplaceUserMailboxesRequestDto request, CancellationToken cancellationToken = default);
+    Task<bool> ProcessBillingCallbackAsync(Uri callbackUri, CancellationToken cancellationToken = default);
+    Task SignOutAsync(CancellationToken cancellationToken = default);
+}
diff --git a/Wino.Core.Domain/Interfaces/IWinoNavigationService.cs b/Wino.Core.Domain/Interfaces/IWinoNavigationService.cs
index 28b015c7..458f820c 100644
--- a/Wino.Core.Domain/Interfaces/IWinoNavigationService.cs
+++ b/Wino.Core.Domain/Interfaces/IWinoNavigationService.cs
@@ -8,9 +8,12 @@ public interface INavigationService
 {
     bool Navigate(WinoPage page,
                          object parameter = null,
-                         NavigationReferenceFrame frame = NavigationReferenceFrame.ShellFrame,
+                         NavigationReferenceFrame frame = NavigationReferenceFrame.InnerShellFrame,
                          NavigationTransitionType transition = NavigationTransitionType.None);
 
     Type GetPageType(WinoPage winoPage);
-    void GoBack();
+    bool ChangeApplicationMode(WinoApplicationMode mode);
+    bool ChangeApplicationMode(WinoApplicationMode mode, ShellModeActivationContext activationContext);
+    bool CanGoBack();
+    void GoBack(NavigationTransitionEffect slideEffect = NavigationTransitionEffect.FromRight);
 }
diff --git a/Wino.Core.Domain/Interfaces/IWinoRequestDelegator.cs b/Wino.Core.Domain/Interfaces/IWinoRequestDelegator.cs
index de50c517..0cf1cabf 100644
--- a/Wino.Core.Domain/Interfaces/IWinoRequestDelegator.cs
+++ b/Wino.Core.Domain/Interfaces/IWinoRequestDelegator.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 
@@ -29,4 +30,10 @@ public interface IWinoRequestDelegator
     /// </summary>
     /// <param name="folderOperationPreperationRequest">Folder prep request.</param>
     Task ExecuteAsync(FolderOperationPreperationRequest folderOperationPreperationRequest);
+
+    /// <summary>
+    /// Prepares and queues calendar action requests for proper synchronizers.
+    /// </summary>
+    /// <param name="calendarOperationPreparationRequest">Calendar preparation request.</param>
+    Task ExecuteAsync(CalendarOperationPreparationRequest calendarOperationPreparationRequest);
 }
diff --git a/Wino.Core.Domain/Interfaces/IWinoServerConnectionManager.cs b/Wino.Core.Domain/Interfaces/IWinoServerConnectionManager.cs
deleted file mode 100644
index 69949a0a..00000000
--- a/Wino.Core.Domain/Interfaces/IWinoServerConnectionManager.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Server;
-
-namespace Wino.Core.Domain.Interfaces;
-
-public interface IWinoServerConnectionManager
-{
-    /// <summary>
-    /// When the connection status changes, this event will be triggered.
-    /// </summary>
-    event EventHandler<WinoServerConnectionStatus> StatusChanged;
-
-    /// <summary>
-    /// Gets the connection status.
-    /// </summary>
-    WinoServerConnectionStatus Status { get; }
-
-    /// <summary>
-    /// Launches Full Trust process (Wino Server) and awaits connection completion.
-    /// If connection is not established in 10 seconds, it will return false.
-    /// If the server process is already running, it'll connect to existing one.
-    /// If the server process is not running, it'll be launched and connection establishment is awaited.
-    /// </summary>
-    /// <returns>Whether connection is established or not.</returns>
-    Task<bool> ConnectAsync();
-
-    /// <summary>
-    /// Queues a new user request to be processed by Wino Server.
-    /// Healthy connection must present before calling this method.
-    /// </summary>
-    /// <param name="request">Request to queue for synchronizer in the server.</param>
-    /// <param name="accountId">Account id to queueu request for.</param>
-    Task QueueRequestAsync(IRequestBase request, Guid accountId);
-
-    /// <summary>
-    /// Returns response from server for the given request.
-    /// </summary>
-    /// <typeparam name="TResponse">Response type.</typeparam>
-    /// <typeparam name="TRequestType">Request type.</typeparam>
-    /// <param name="clientMessage">Request type.</param>
-    /// <returns>Response received from the server for the given TResponse type.</returns>
-    Task<WinoServerResponse<TResponse>> GetResponseAsync<TResponse, TRequestType>(TRequestType clientMessage, CancellationToken cancellationToken = default) where TRequestType : IClientMessage;
-
-    /// <summary>
-    /// Handle for connecting to the server.
-    /// If the server is already running, it'll connect to existing one.
-    /// Callers can await this handle to wait for connection establishment.
-    /// </summary>
-    TaskCompletionSource<bool> ConnectingHandle { get; }
-}
-
-public interface IWinoServerConnectionManager<TAppServiceConnection> : IWinoServerConnectionManager, IInitializeAsync
-{
-    /// <summary>
-    /// Existing connection handle to the server of TAppServiceConnection type.
-    /// </summary>
-    TAppServiceConnection Connection { get; set; }
-}
diff --git a/Wino.Core.Domain/Interfaces/IWinoSynchronizerBase.cs b/Wino.Core.Domain/Interfaces/IWinoSynchronizerBase.cs
index ba2384b5..f19c1e5e 100644
--- a/Wino.Core.Domain/Interfaces/IWinoSynchronizerBase.cs
+++ b/Wino.Core.Domain/Interfaces/IWinoSynchronizerBase.cs
@@ -2,9 +2,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using MailKit;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Synchronization;
 
 namespace Wino.Core.Domain.Interfaces;
@@ -30,7 +30,7 @@ public interface IWinoSynchronizerBase : IBaseSynchronizer
     /// <param name="mailItem">Mail item to download from server.</param>
     /// <param name="transferProgress">Optional progress reporting for download operation.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
-    Task DownloadMissingMimeMessageAsync(IMailItem mailItem, ITransferProgress transferProgress, CancellationToken cancellationToken = default);
+    Task DownloadMissingMimeMessageAsync(MailCopy mailItem, ITransferProgress transferProgress, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// 1. Cancel active synchronization.
@@ -47,4 +47,5 @@ public interface IWinoSynchronizerBase : IBaseSynchronizer
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>Search results after downloading missing mail copies from server.</returns>
     Task<List<MailCopy>> OnlineSearchAsync(string queryText, List<IMailItemFolder> folders, CancellationToken cancellationToken = default);
+    Task DownloadCalendarAttachmentAsync(CalendarItem calendarItem, CalendarAttachment attachment, string localFilePath, CancellationToken cancellationToken);
 }
diff --git a/Wino.Core.Domain/MenuItems/AccountMenuItem.cs b/Wino.Core.Domain/MenuItems/AccountMenuItem.cs
index 7b1e881e..fc836dbe 100644
--- a/Wino.Core.Domain/MenuItems/AccountMenuItem.cs
+++ b/Wino.Core.Domain/MenuItems/AccountMenuItem.cs
@@ -14,18 +14,57 @@ public partial class AccountMenuItem : MenuItemBase<MailAccount, MenuItemBase<IM
     [ObservableProperty]
     private int unreadItemCount;
 
+    /// <summary>
+    /// Total items to sync. 0 means indeterminate progress.
+    /// </summary>
     [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(IsSynchronizationProgressVisible))]
-    private double synchronizationProgress;
+    [NotifyPropertyChangedFor(nameof(IsSynchronizationProgressVisible), nameof(SynchronizationProgress), nameof(IsProgressIndeterminate))]
+    public partial int TotalItemsToSync { get; set; }
+
+    /// <summary>
+    /// Remaining items to sync.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(SynchronizationProgress))]
+    public partial int RemainingItemsToSync { get; set; }
+
+    /// <summary>
+    /// Current synchronization status message.
+    /// </summary>
+    [ObservableProperty]
+    public partial string SynchronizationStatus { get; set; } = string.Empty;
 
     [ObservableProperty]
     private bool _isEnabled = true;
 
     public bool IsAttentionRequired => AttentionReason != AccountAttentionReason.None;
-    public bool IsSynchronizationProgressVisible => SynchronizationProgress > 0 && SynchronizationProgress < 100;
 
-    // We can't  determine the progress for gmail synchronization since it is based on history changes.
-    public bool IsProgressIndeterminate => Parameter?.ProviderType == MailProviderType.Gmail;
+    /// <summary>
+    /// Calculates synchronization progress percentage (0-100).
+    /// Returns -1 for indeterminate progress when TotalItemsToSync is 0.
+    /// </summary>
+    public double SynchronizationProgress
+    {
+        get
+        {
+            if (TotalItemsToSync == 0 || RemainingItemsToSync == 0)
+                return -1; // Indeterminate
+
+            return ((double)(TotalItemsToSync - RemainingItemsToSync) / TotalItemsToSync) * 100;
+        }
+    }
+
+    /// <summary>
+    /// Whether synchronization progress should be visible.
+    /// Visible when there's active synchronization (TotalItemsToSync > 0 or RemainingItemsToSync > 0).
+    /// </summary>
+    public bool IsSynchronizationProgressVisible => TotalItemsToSync > 0 || RemainingItemsToSync > 0;
+
+    /// <summary>
+    /// Whether progress should be indeterminate (when total is 0 but there's still synchronization happening).
+    /// </summary>
+    public bool IsProgressIndeterminate => TotalItemsToSync == 0 && RemainingItemsToSync == 0 && IsSynchronizationProgressVisible;
+
     public Guid AccountId => Parameter.Id;
 
     private AccountAttentionReason attentionReason;
@@ -72,6 +111,7 @@ public partial class AccountMenuItem : MenuItemBase<MailAccount, MenuItemBase<IM
     public void UpdateAccount(MailAccount account)
     {
         Parameter = account;
+        AttentionReason = account.AttentionReason;
 
         OnPropertyChanged(nameof(AccountName));
         OnPropertyChanged(nameof(Base64ProfilePicture));
diff --git a/Wino.Core.Domain/MenuItems/ContactsMenuItem.cs b/Wino.Core.Domain/MenuItems/ContactsMenuItem.cs
new file mode 100644
index 00000000..1fa8c71c
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/ContactsMenuItem.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.MenuItems;
+
+public class ContactsMenuItem : MenuItemBase { }
diff --git a/Wino.Core.Domain/MenuItems/FolderMenuItem.cs b/Wino.Core.Domain/MenuItems/FolderMenuItem.cs
index c5cbbf5d..d3f0fbc4 100644
--- a/Wino.Core.Domain/MenuItems/FolderMenuItem.cs
+++ b/Wino.Core.Domain/MenuItems/FolderMenuItem.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Shared;
@@ -20,6 +21,8 @@ public partial class FolderMenuItem : MenuItemBase<IMailItemFolder, FolderMenuIt
     public bool IsSticky => Parameter.IsSticky;
     public bool IsSystemFolder => Parameter.IsSystemFolder;
 
+
+
     /// <summary>
     /// Display name of the folder. More and Category folders have localized display names.
     /// </summary>
@@ -53,7 +56,7 @@ public partial class FolderMenuItem : MenuItemBase<IMailItemFolder, FolderMenuIt
 
     public bool ShowUnreadCount => Parameter.ShowUnreadCount;
 
-    IEnumerable<IMenuItem> IBaseFolderMenuItem.SubMenuItems => SubMenuItems;
+    public new ObservableCollection<IMenuItem> SubMenuItems { get; set; } = new ObservableCollection<IMenuItem>();
 
     public FolderMenuItem(IMailItemFolder folderStructure, MailAccount parentAccount, IMenuItem parentMenuItem) : base(folderStructure, folderStructure.Id, parentMenuItem)
     {
diff --git a/Wino.Core.Domain/MenuItems/ManageAccountsMenuItem.cs b/Wino.Core.Domain/MenuItems/ManageAccountsMenuItem.cs
deleted file mode 100644
index 147501b2..00000000
--- a/Wino.Core.Domain/MenuItems/ManageAccountsMenuItem.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Wino.Core.Domain.MenuItems;
-
-public class ManageAccountsMenuItem : MenuItemBase { }
diff --git a/Wino.Core.Domain/MenuItems/MenuItemBase.cs b/Wino.Core.Domain/MenuItems/MenuItemBase.cs
index eaf53f82..db4958de 100644
--- a/Wino.Core.Domain/MenuItems/MenuItemBase.cs
+++ b/Wino.Core.Domain/MenuItems/MenuItemBase.cs
@@ -8,10 +8,10 @@ namespace Wino.Core.Domain.MenuItems;
 public partial class MenuItemBase : ObservableObject, IMenuItem
 {
     [ObservableProperty]
-    private bool _isExpanded;
+    public partial bool IsExpanded { get; set; }
 
     [ObservableProperty]
-    private bool _isSelected;
+    public partial bool IsSelected { get; set; }
 
     public IMenuItem ParentMenuItem { get; }
 
@@ -46,7 +46,7 @@ public partial class MenuItemBase : ObservableObject, IMenuItem
 public partial class MenuItemBase<T> : MenuItemBase
 {
     [ObservableProperty]
-    private T _parameter;
+    public partial T Parameter { get; set; }
 
     public MenuItemBase(T parameter, Guid? entityId, IMenuItem parentMenuItem = null) : base(entityId, parentMenuItem) => Parameter = parameter;
 }
@@ -54,7 +54,7 @@ public partial class MenuItemBase<T> : MenuItemBase
 public partial class MenuItemBase<TValue, TCollection> : MenuItemBase<TValue>
 {
     [ObservableProperty]
-    private bool _isChildSelected;
+    public partial bool IsChildSelected { get; set; }
 
     protected MenuItemBase(TValue parameter, Guid? entityId, IMenuItem parentMenuItem = null) : base(parameter, entityId, parentMenuItem) { }
 
diff --git a/Wino.Core.Domain/MenuItems/MenuItemCollection.cs b/Wino.Core.Domain/MenuItems/MenuItemCollection.cs
index bd0ac6b2..7504c0a7 100644
--- a/Wino.Core.Domain/MenuItems/MenuItemCollection.cs
+++ b/Wino.Core.Domain/MenuItems/MenuItemCollection.cs
@@ -188,6 +188,35 @@ public class MenuItemCollection : ObservableRangeCollection<IMenuItem>
         Insert(insertIndex, accountMenuItem);
     }
 
+    public bool RemoveFolderMenuItem(Guid folderId)
+    {
+        // Check root-level items.
+        var rootItem = this.OfType<IBaseFolderMenuItem>()
+            .FirstOrDefault(a => a.HandlingFolders.Any(b => b.Id == folderId));
+
+        if (rootItem != null)
+        {
+            Remove(rootItem);
+            return true;
+        }
+
+        // Check sub-items of root folders.
+        foreach (var rootFolder in this.OfType<IBaseFolderMenuItem>())
+        {
+            var subItem = rootFolder.SubMenuItems
+                .OfType<IBaseFolderMenuItem>()
+                .FirstOrDefault(a => a.HandlingFolders.Any(b => b.Id == folderId));
+
+            if (subItem != null)
+            {
+                rootFolder.SubMenuItems.Remove(subItem);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     private void ClearFolderAreaMenuItems()
     {
         var itemsToRemove = this.Where(a => !_preservingTypesForFolderArea.Contains(a.GetType())).ToList();
diff --git a/Wino.Core.Domain/MenuItems/MergedAccountMenuItem.cs b/Wino.Core.Domain/MenuItems/MergedAccountMenuItem.cs
index 5cbf7c97..3e970d65 100644
--- a/Wino.Core.Domain/MenuItems/MergedAccountMenuItem.cs
+++ b/Wino.Core.Domain/MenuItems/MergedAccountMenuItem.cs
@@ -16,8 +16,50 @@ public partial class MergedAccountMenuItem : MenuItemBase<MergedInbox, IMenuItem
     [ObservableProperty]
     private int unreadItemCount;
 
+    /// <summary>
+    /// Total items to sync across all merged accounts.
+    /// </summary>
     [ObservableProperty]
-    private double synchronizationProgress;
+    [NotifyPropertyChangedFor(nameof(SynchronizationProgress), nameof(IsSynchronizationProgressVisible), nameof(IsProgressIndeterminate))]
+    public partial int TotalItemsToSync { get; set; }
+
+    /// <summary>
+    /// Remaining items to sync across all merged accounts.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(SynchronizationProgress), nameof(IsSynchronizationProgressVisible), nameof(IsProgressIndeterminate))]
+    public partial int RemainingItemsToSync { get; set; }
+
+    /// <summary>
+    /// Current synchronization status message.
+    /// </summary>
+    [ObservableProperty]
+    public partial string SynchronizationStatus { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Calculated synchronization progress for merged accounts.
+    /// </summary>
+    public double SynchronizationProgress
+    {
+        get
+        {
+            if (TotalItemsToSync == 0 || RemainingItemsToSync == 0)
+                return -1; // Indeterminate
+
+            return ((double)(TotalItemsToSync - RemainingItemsToSync) / TotalItemsToSync) * 100;
+        }
+    }
+
+    /// <summary>
+    /// Whether synchronization progress should be visible.
+    /// Visible when there's active synchronization (TotalItemsToSync > 0 or RemainingItemsToSync > 0).
+    /// </summary>
+    public bool IsSynchronizationProgressVisible => TotalItemsToSync > 0 || RemainingItemsToSync > 0;
+
+    /// <summary>
+    /// Whether progress should be indeterminate.
+    /// </summary>
+    public bool IsProgressIndeterminate => TotalItemsToSync == 0 && IsSynchronizationProgressVisible;
 
     [ObservableProperty]
     private string mergedAccountName;
@@ -35,6 +77,20 @@ public partial class MergedAccountMenuItem : MenuItemBase<MergedInbox, IMenuItem
     {
         UnreadItemCount = SubMenuItems.OfType<IAccountMenuItem>().Sum(a => a.UnreadItemCount);
     }
+    
+    /// <summary>
+    /// Aggregates synchronization progress from all child account menu items.
+    /// </summary>
+    public void RefreshSynchronizationProgress()
+    {
+        var accountMenuItems = SubMenuItems.OfType<IAccountMenuItem>().ToList();
+        
+        TotalItemsToSync = accountMenuItems.Sum(a => a.TotalItemsToSync);
+        RemainingItemsToSync = accountMenuItems.Sum(a => a.RemainingItemsToSync);
+        
+        // Use first non-empty status message
+        SynchronizationStatus = accountMenuItems.FirstOrDefault(a => !string.IsNullOrEmpty(a.SynchronizationStatus))?.SynchronizationStatus ?? string.Empty;
+    }
 
     public void UpdateAccount(MailAccount account)
     {
diff --git a/Wino.Core.Domain/MenuItems/NewCalendarEventMenuItem.cs b/Wino.Core.Domain/MenuItems/NewCalendarEventMenuItem.cs
new file mode 100644
index 00000000..8fe87fec
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/NewCalendarEventMenuItem.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.MenuItems;
+
+public sealed class NewCalendarEventMenuItem : NewMailMenuItem { }
diff --git a/Wino.Core.Domain/MenuItems/NewContactMenuItem.cs b/Wino.Core.Domain/MenuItems/NewContactMenuItem.cs
new file mode 100644
index 00000000..24d09bc0
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/NewContactMenuItem.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.MenuItems;
+
+public sealed class NewContactMenuItem : MenuItemBase { }
diff --git a/Wino.Core.Domain/MenuItems/SettingsShellPageMenuItem.cs b/Wino.Core.Domain/MenuItems/SettingsShellPageMenuItem.cs
new file mode 100644
index 00000000..f478ab72
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/SettingsShellPageMenuItem.cs
@@ -0,0 +1,22 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.MenuItems;
+
+public partial class SettingsShellPageMenuItem(
+    WinoPage pageType,
+    string title,
+    string description,
+    string glyph) : MenuItemBase
+{
+    public WinoPage PageType { get; } = pageType;
+
+    [ObservableProperty]
+    public partial string Title { get; set; } = title;
+
+    [ObservableProperty]
+    public partial string Description { get; set; } = description;
+
+    [ObservableProperty]
+    public partial string Glyph { get; set; } = glyph;
+}
diff --git a/Wino.Core.Domain/MenuItems/SettingsShellSectionMenuItem.cs b/Wino.Core.Domain/MenuItems/SettingsShellSectionMenuItem.cs
new file mode 100644
index 00000000..223d76c2
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/SettingsShellSectionMenuItem.cs
@@ -0,0 +1,12 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Wino.Core.Domain.MenuItems;
+
+public partial class SettingsShellSectionMenuItem(string title, string glyph) : MenuItemBase
+{
+    [ObservableProperty]
+    public partial string Title { get; set; } = title;
+
+    [ObservableProperty]
+    public partial string Glyph { get; set; } = glyph;
+}
diff --git a/Wino.Core.Domain/MenuItems/StoreUpdateMenuItem.cs b/Wino.Core.Domain/MenuItems/StoreUpdateMenuItem.cs
new file mode 100644
index 00000000..6afa77c4
--- /dev/null
+++ b/Wino.Core.Domain/MenuItems/StoreUpdateMenuItem.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.MenuItems;
+
+public class StoreUpdateMenuItem : MenuItemBase { }
diff --git a/Wino.Core.Domain/Misc/CalendarColorPalette.cs b/Wino.Core.Domain/Misc/CalendarColorPalette.cs
new file mode 100644
index 00000000..6adc8620
--- /dev/null
+++ b/Wino.Core.Domain/Misc/CalendarColorPalette.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Wino.Core.Domain.Misc;
+
+public static class CalendarColorPalette
+{
+    private static readonly string[] FlatUiColorPalette =
+    [
+        "#E53935", "#D81B60", "#C2185B", "#AD1457", "#8E24AA", "#7B1FA2", "#6A1B9A", "#5E35B1", "#512DA8", "#4527A0",
+        "#3949AB", "#303F9F", "#283593", "#1E88E5", "#1976D2", "#1565C0", "#039BE5", "#0288D1", "#0277BD", "#00ACC1",
+        "#0097A7", "#00838F", "#00897B", "#00796B", "#00695C", "#43A047", "#388E3C", "#2E7D32", "#7CB342", "#689F38",
+        "#558B2F", "#9CCC65", "#8BC34A", "#AED581", "#C0CA33", "#AFB42B", "#9E9D24", "#D4E157", "#CDDC39", "#FDD835",
+        "#FBC02D", "#F9A825", "#FFB300", "#FFA000", "#FF8F00", "#FB8C00", "#F57C00", "#EF6C00", "#F4511E", "#E64A19",
+        "#D84315", "#FF7043", "#FF8A65", "#FFAB91", "#6D4C41", "#5D4037", "#4E342E", "#8D6E63", "#795548", "#A1887F",
+        "#546E7A", "#455A64", "#37474F", "#607D8B", "#78909C", "#90A4AE", "#757575", "#616161", "#424242", "#9E9E9E",
+        "#BDBDBD", "#EC407A", "#F06292", "#F48FB1", "#BA68C8", "#CE93D8", "#9575CD", "#B39DDB", "#7986CB", "#9FA8DA",
+        "#64B5F6", "#90CAF9", "#4FC3F7", "#81D4FA", "#4DD0E1", "#80DEEA", "#4DB6AC", "#80CBC4", "#81C784", "#A5D6A7",
+        "#C5E1A5", "#E6EE9C", "#FFF176", "#FFD54F", "#FFCC80", "#FFB74D", "#FFAB40", "#FF9E80", "#BCAAA4", "#A1887F"
+    ];
+
+    public static IReadOnlyList<string> GetColors() => FlatUiColorPalette;
+
+    public static string GetDistinctColor(IEnumerable<string> usedColors)
+    {
+        var used = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        if (usedColors != null)
+        {
+            foreach (var color in usedColors)
+            {
+                if (TryNormalizeHexColor(color, out var normalized))
+                {
+                    used.Add(normalized);
+                }
+            }
+        }
+
+        foreach (var color in FlatUiColorPalette)
+        {
+            if (!used.Contains(color))
+            {
+                return color;
+            }
+        }
+
+        return FlatUiColorPalette[0];
+    }
+
+    private static bool TryNormalizeHexColor(string value, out string normalized)
+    {
+        normalized = null;
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return false;
+        }
+
+        var color = value.Trim();
+        if (color.StartsWith('#'))
+        {
+            color = color[1..];
+        }
+
+        if (color.Length != 6)
+        {
+            return false;
+        }
+
+        if (!int.TryParse(color, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _))
+        {
+            return false;
+        }
+
+        normalized = $"#{color.ToUpperInvariant()}";
+        return true;
+    }
+}
diff --git a/Wino.Core.Domain/Models/Accounts/AccountSetupStepModel.cs b/Wino.Core.Domain/Models/Accounts/AccountSetupStepModel.cs
new file mode 100644
index 00000000..65befde6
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/AccountSetupStepModel.cs
@@ -0,0 +1,24 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Accounts;
+
+public partial class AccountSetupStepModel : ObservableObject
+{
+    public string Title { get; init; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsPending))]
+    [NotifyPropertyChangedFor(nameof(IsInProgress))]
+    [NotifyPropertyChangedFor(nameof(IsSucceeded))]
+    [NotifyPropertyChangedFor(nameof(IsFailed))]
+    public partial AccountSetupStepStatus Status { get; set; } = AccountSetupStepStatus.Pending;
+
+    [ObservableProperty]
+    public partial string ErrorMessage { get; set; }
+
+    public bool IsPending => Status == AccountSetupStepStatus.Pending;
+    public bool IsInProgress => Status == AccountSetupStepStatus.InProgress;
+    public bool IsSucceeded => Status == AccountSetupStepStatus.Succeeded;
+    public bool IsFailed => Status == AccountSetupStepStatus.Failed;
+}
diff --git a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
index c5449892..b495db70 100644
--- a/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
+++ b/Wino.Core.Domain/Models/Accounts/ProviderDetail.cs
@@ -17,11 +17,11 @@ public class ProviderDetail : IProviderDetail
         {
             if (SpecialImapProvider == SpecialImapProvider.None)
             {
-                return $"/Wino.Core.UWP/Assets/Providers/{Type}.png";
+                return $"/Assets/Providers/{Type}.png";
             }
             else
             {
-                return $"/Wino.Core.UWP/Assets/Providers/{SpecialImapProvider}.png";
+                return $"/Assets/Providers/{SpecialImapProvider}.png";
             }
         }
     }
diff --git a/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs b/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs
index 1286d431..a91e9f35 100644
--- a/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs
+++ b/Wino.Core.Domain/Models/Accounts/SpecialImapProviderDetails.cs
@@ -2,4 +2,9 @@
 
 namespace Wino.Core.Domain.Models.Accounts;
 
-public record SpecialImapProviderDetails(string Address, string Password, string SenderName, SpecialImapProvider SpecialImapProvider);
+public record SpecialImapProviderDetails(
+    string Address,
+    string Password,
+    string SenderName,
+    SpecialImapProvider SpecialImapProvider,
+    ImapCalendarSupportMode CalendarSupportMode = ImapCalendarSupportMode.CalDav);
diff --git a/Wino.Core.Domain/Models/Accounts/WinoAccountApiResult.cs b/Wino.Core.Domain/Models/Accounts/WinoAccountApiResult.cs
new file mode 100644
index 00000000..ee4f2c3d
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoAccountApiResult.cs
@@ -0,0 +1,29 @@
+#nullable enable
+using System.Text.Json;
+
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed class WinoAccountApiResult<T>
+{
+    public bool IsSuccess { get; init; }
+    public string? ErrorCode { get; init; }
+    public string? ErrorMessage { get; init; }
+    public JsonElement? ErrorDetails { get; init; }
+    public T? Result { get; init; }
+
+    public static WinoAccountApiResult<T> Success(T result)
+        => new()
+        {
+            IsSuccess = true,
+            Result = result
+        };
+
+    public static WinoAccountApiResult<T> Failure(string? errorCode, string? errorMessage = null, JsonElement? errorDetails = null)
+        => new()
+        {
+            IsSuccess = false,
+            ErrorCode = errorCode,
+            ErrorMessage = errorMessage,
+            ErrorDetails = errorDetails
+        };
+}
diff --git a/Wino.Core.Domain/Models/Accounts/WinoAccountOperationResult.cs b/Wino.Core.Domain/Models/Accounts/WinoAccountOperationResult.cs
new file mode 100644
index 00000000..8b14fdc7
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoAccountOperationResult.cs
@@ -0,0 +1,30 @@
+#nullable enable
+using System.Text.Json;
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed class WinoAccountOperationResult
+{
+    public bool IsSuccess { get; init; }
+    public string? ErrorCode { get; init; }
+    public string? ErrorMessage { get; init; }
+    public JsonElement? ErrorDetails { get; init; }
+    public WinoAccount? Account { get; init; }
+
+    public static WinoAccountOperationResult Success(WinoAccount account)
+        => new()
+        {
+            IsSuccess = true,
+            Account = account
+        };
+
+    public static WinoAccountOperationResult Failure(string? errorCode, string? errorMessage = null, JsonElement? errorDetails = null)
+        => new()
+        {
+            IsSuccess = false,
+            ErrorCode = errorCode,
+            ErrorMessage = errorMessage,
+            ErrorDetails = errorDetails
+        };
+}
diff --git a/Wino.Core.Domain/Models/Accounts/WinoAccountSyncExportResult.cs b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncExportResult.cs
new file mode 100644
index 00000000..998bfcb1
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncExportResult.cs
@@ -0,0 +1,8 @@
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed class WinoAccountSyncExportResult
+{
+    public bool IncludedPreferences { get; init; }
+    public bool IncludedAccounts { get; init; }
+    public int ExportedMailboxCount { get; init; }
+}
diff --git a/Wino.Core.Domain/Models/Accounts/WinoAccountSyncImportResult.cs b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncImportResult.cs
new file mode 100644
index 00000000..df2ebcf5
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncImportResult.cs
@@ -0,0 +1,15 @@
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed class WinoAccountSyncImportResult
+{
+    public bool IncludedPreferences { get; init; }
+    public bool IncludedAccounts { get; init; }
+    public bool HadRemotePreferences { get; init; }
+    public int AppliedPreferenceCount { get; init; }
+    public int FailedPreferenceCount { get; init; }
+    public int ImportedMailboxCount { get; init; }
+    public int SkippedDuplicateMailboxCount { get; init; }
+    public int RemoteMailboxCount { get; init; }
+
+    public bool HasAnyRemoteData => HadRemotePreferences || RemoteMailboxCount > 0;
+}
diff --git a/Wino.Core.Domain/Models/Accounts/WinoAccountSyncSelection.cs b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncSelection.cs
new file mode 100644
index 00000000..9116c197
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoAccountSyncSelection.cs
@@ -0,0 +1,5 @@
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed record WinoAccountSyncSelection(
+    bool IncludePreferences = true,
+    bool IncludeAccounts = true);
diff --git a/Wino.Core.Domain/Models/Accounts/WinoStoreCollectionsIdTicketInfo.cs b/Wino.Core.Domain/Models/Accounts/WinoStoreCollectionsIdTicketInfo.cs
new file mode 100644
index 00000000..19278214
--- /dev/null
+++ b/Wino.Core.Domain/Models/Accounts/WinoStoreCollectionsIdTicketInfo.cs
@@ -0,0 +1,9 @@
+#nullable enable
+using System;
+
+namespace Wino.Core.Domain.Models.Accounts;
+
+public sealed record WinoStoreCollectionsIdTicketInfo(
+    string ServiceTicket,
+    string PublisherUserId,
+    DateTimeOffset ExpiresAtUtc);
diff --git a/Wino.Core.Domain/Models/Ai/AiRewriteModeOption.cs b/Wino.Core.Domain/Models/Ai/AiRewriteModeOption.cs
new file mode 100644
index 00000000..3b3013bb
--- /dev/null
+++ b/Wino.Core.Domain/Models/Ai/AiRewriteModeOption.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.Models.Ai;
+
+public sealed record AiRewriteModeOption(string Mode, string Label, string Description, bool IsCustom = false);
diff --git a/Wino.Core.Domain/Models/Ai/AiTranslateLanguageOption.cs b/Wino.Core.Domain/Models/Ai/AiTranslateLanguageOption.cs
new file mode 100644
index 00000000..ed0b97be
--- /dev/null
+++ b/Wino.Core.Domain/Models/Ai/AiTranslateLanguageOption.cs
@@ -0,0 +1,3 @@
+namespace Wino.Core.Domain.Models.Ai;
+
+public sealed record AiTranslateLanguageOption(string Code, string Label);
diff --git a/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs b/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
index 87494dcc..793edad9 100644
--- a/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
+++ b/Wino.Core.Domain/Models/AutoDiscovery/AutoDiscoverySettings.cs
@@ -64,8 +64,8 @@ public class AutoDiscoverySettings
     }
 
     public AutoDiscoveryProviderSetting GetImapSettings()
-        => Settings?.Find(a => a.Protocol == "IMAP");
+        => Settings?.Find(a => string.Equals(a.Protocol, "IMAP", StringComparison.OrdinalIgnoreCase));
 
     public AutoDiscoveryProviderSetting GetSmptpSettings()
-        => Settings?.Find(a => a.Protocol == "SMTP");
+        => Settings?.Find(a => string.Equals(a.Protocol, "SMTP", StringComparison.OrdinalIgnoreCase));
 }
diff --git a/Wino.Core.Domain/Models/Calendar/AccountCalendarPickingResult.cs b/Wino.Core.Domain/Models/Calendar/AccountCalendarPickingResult.cs
new file mode 100644
index 00000000..8cbe511a
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/AccountCalendarPickingResult.cs
@@ -0,0 +1,7 @@
+#nullable enable
+
+using Wino.Core.Domain.Entities.Calendar;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed record AccountCalendarPickingResult(AccountCalendar? PickedCalendar, bool ShouldNavigateToCalendarSettings);
diff --git a/Wino.Core.Domain/Models/Calendar/CalDavCalendar.cs b/Wino.Core.Domain/Models/Calendar/CalDavCalendar.cs
new file mode 100644
index 00000000..edf1890e
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalDavCalendar.cs
@@ -0,0 +1,10 @@
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class CalDavCalendar
+{
+    public string RemoteCalendarId { get; init; } = string.Empty;
+    public string Name { get; init; } = string.Empty;
+    public string CTag { get; init; } = string.Empty;
+    public string SyncToken { get; init; } = string.Empty;
+}
+
diff --git a/Wino.Core.Domain/Models/Calendar/CalDavCalendarEvent.cs b/Wino.Core.Domain/Models/Calendar/CalDavCalendarEvent.cs
new file mode 100644
index 00000000..d77164ef
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalDavCalendarEvent.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class CalDavCalendarEvent
+{
+    public string RemoteEventId { get; init; } = string.Empty;
+    public string RemoteResourceHref { get; init; } = string.Empty;
+    public string ETag { get; init; } = string.Empty;
+    public string IcsContent { get; init; } = string.Empty;
+
+    public string Uid { get; init; } = string.Empty;
+    public string SeriesMasterRemoteEventId { get; init; } = string.Empty;
+    public bool IsSeriesMaster { get; init; }
+    public bool IsRecurringInstance { get; init; }
+
+    public string Title { get; init; } = string.Empty;
+    public string Description { get; init; } = string.Empty;
+    public string Location { get; init; } = string.Empty;
+
+    public DateTimeOffset Start { get; init; }
+    public DateTimeOffset End { get; init; }
+    public string StartTimeZone { get; init; } = string.Empty;
+    public string EndTimeZone { get; init; } = string.Empty;
+    public string Recurrence { get; init; } = string.Empty;
+
+    public string OrganizerDisplayName { get; init; } = string.Empty;
+    public string OrganizerEmail { get; init; } = string.Empty;
+
+    public CalendarItemStatus Status { get; init; } = CalendarItemStatus.Accepted;
+    public CalendarItemVisibility Visibility { get; init; } = CalendarItemVisibility.Default;
+    public CalendarItemShowAs ShowAs { get; init; } = CalendarItemShowAs.Busy;
+    public bool IsHidden { get; init; }
+
+    public IReadOnlyList<CalDavEventAttendee> Attendees { get; init; } = [];
+    public IReadOnlyList<CalDavEventReminder> Reminders { get; init; } = [];
+}
+
+public sealed class CalDavEventAttendee
+{
+    public string Name { get; init; } = string.Empty;
+    public string Email { get; init; } = string.Empty;
+    public AttendeeStatus AttendenceStatus { get; init; } = AttendeeStatus.NeedsAction;
+    public bool IsOrganizer { get; init; }
+    public bool IsOptionalAttendee { get; init; }
+}
+
+public sealed class CalDavEventReminder
+{
+    public int DurationInSeconds { get; init; }
+    public CalendarItemReminderType ReminderType { get; init; } = CalendarItemReminderType.Popup;
+}
+
diff --git a/Wino.Core.Domain/Models/Calendar/CalDavConnectionSettings.cs b/Wino.Core.Domain/Models/Calendar/CalDavConnectionSettings.cs
new file mode 100644
index 00000000..3b9c874f
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalDavConnectionSettings.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class CalDavConnectionSettings
+{
+    public Uri ServiceUri { get; init; }
+    public string Username { get; init; } = string.Empty;
+    public string Password { get; init; } = string.Empty;
+}
+
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarDayModel.cs b/Wino.Core.Domain/Models/Calendar/CalendarDayModel.cs
deleted file mode 100644
index 4f3f06a8..00000000
--- a/Wino.Core.Domain/Models/Calendar/CalendarDayModel.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using Itenso.TimePeriod;
-using Wino.Core.Domain.Collections;
-
-namespace Wino.Core.Domain.Models.Calendar;
-
-/// <summary>
-/// Represents a day in the calendar.
-/// Can hold events, appointments, wheather status etc.
-/// </summary>
-public class CalendarDayModel
-{
-    public ITimePeriod Period { get; }
-    public CalendarEventCollection EventsCollection { get; }
-
-    public CalendarDayModel(DateTime representingDate, CalendarRenderOptions calendarRenderOptions)
-    {
-        RepresentingDate = representingDate;
-        Period = new TimeRange(representingDate, representingDate.AddDays(1));
-        CalendarRenderOptions = calendarRenderOptions;
-        EventsCollection = new CalendarEventCollection(Period, calendarRenderOptions.CalendarSettings);
-    }
-
-    public DateTime RepresentingDate { get; }
-    public CalendarRenderOptions CalendarRenderOptions { get; }
-}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarDisplayRequest.cs b/Wino.Core.Domain/Models/Calendar/CalendarDisplayRequest.cs
new file mode 100644
index 00000000..bc172fae
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarDisplayRequest.cs
@@ -0,0 +1,6 @@
+using System;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public readonly record struct CalendarDisplayRequest(CalendarDisplayType DisplayType, DateOnly AnchorDate);
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarEventComposeAttachmentDraft.cs b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeAttachmentDraft.cs
new file mode 100644
index 00000000..44b17035
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeAttachmentDraft.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public class CalendarEventComposeAttachmentDraft
+{
+    public Guid Id { get; set; }
+    public string FileName { get; set; } = string.Empty;
+    public string FilePath { get; set; } = string.Empty;
+    public string FileExtension { get; set; } = string.Empty;
+    public long Size { get; set; }
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarEventComposeNavigationArgs.cs b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeNavigationArgs.cs
new file mode 100644
index 00000000..a2522ce6
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeNavigationArgs.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public class CalendarEventComposeNavigationArgs
+{
+    public Guid? SelectedCalendarId { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public string Location { get; set; } = string.Empty;
+    public bool IsAllDay { get; set; }
+    public DateTime StartDate { get; set; }
+    public DateTime EndDate { get; set; }
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarEventComposeResult.cs b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeResult.cs
new file mode 100644
index 00000000..2be440ac
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarEventComposeResult.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public class CalendarEventComposeResult
+{
+    public Guid CalendarId { get; set; }
+    public Guid AccountId { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public string Location { get; set; } = string.Empty;
+    public string HtmlNotes { get; set; } = string.Empty;
+    public DateTime StartDate { get; set; }
+    public DateTime EndDate { get; set; }
+    public bool IsAllDay { get; set; }
+    public string TimeZoneId { get; set; } = string.Empty;
+    public CalendarItemShowAs ShowAs { get; set; }
+    public List<Reminder> SelectedReminders { get; set; } = [];
+    public List<CalendarEventAttendee> Attendees { get; set; } = [];
+    public List<CalendarEventComposeAttachmentDraft> Attachments { get; set; } = [];
+    public string Recurrence { get; set; } = string.Empty;
+    public string RecurrenceSummary { get; set; } = string.Empty;
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarOperationPreparationRequest.cs b/Wino.Core.Domain/Models/Calendar/CalendarOperationPreparationRequest.cs
new file mode 100644
index 00000000..a43c6e10
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarOperationPreparationRequest.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+/// <summary>
+/// Encapsulates the options for preparing calendar operation requests.
+/// </summary>
+/// <param name="Operation">Calendar operation to execute (Create, Update, Delete, Accept, Decline, Tentative).</param>
+/// <param name="CalendarItem">Calendar item to operate on.</param>
+/// <param name="Attendees">List of attendees for the calendar event.</param>
+/// <param name="ResponseMessage">Optional message to include with event responses (Accept, Decline, Tentative).</param>
+/// <param name="OriginalItem">Original calendar item state before update (for revert capability).</param>
+/// <param name="OriginalAttendees">Original attendees list before update (for revert capability).</param>
+public record CalendarOperationPreparationRequest(
+    CalendarSynchronizerOperation Operation,
+    CalendarItem CalendarItem = null,
+    List<CalendarEventAttendee> Attendees = null,
+    string ResponseMessage = null,
+    CalendarItem OriginalItem = null,
+    List<CalendarEventAttendee> OriginalAttendees = null,
+    CalendarEventComposeResult ComposeResult = null);
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarPageNavigationArgs.cs b/Wino.Core.Domain/Models/Calendar/CalendarPageNavigationArgs.cs
index a39d536b..6e1c0ba7 100644
--- a/Wino.Core.Domain/Models/Calendar/CalendarPageNavigationArgs.cs
+++ b/Wino.Core.Domain/Models/Calendar/CalendarPageNavigationArgs.cs
@@ -13,4 +13,9 @@ public class CalendarPageNavigationArgs
     /// Display the calendar view for the specified date.
     /// </summary>
     public DateTime NavigationDate { get; set; }
+
+    /// <summary>
+    /// Force reloading the calendar data even when the target range does not change.
+    /// </summary>
+    public bool ForceReload { get; set; }
 }
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarPickerAccountGroup.cs b/Wino.Core.Domain/Models/Calendar/CalendarPickerAccountGroup.cs
new file mode 100644
index 00000000..62c2295c
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarPickerAccountGroup.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public class CalendarPickerAccountGroup
+{
+    public MailAccount Account { get; set; } = null!;
+    public List<AccountCalendar> Calendars { get; set; } = [];
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarRangeResolver.cs b/Wino.Core.Domain/Models/Calendar/CalendarRangeResolver.cs
new file mode 100644
index 00000000..1c20bd79
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarRangeResolver.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Linq;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public static class CalendarRangeResolver
+{
+    public static VisibleDateRange Resolve(CalendarDisplayRequest request, CalendarSettings settings, DateOnly today)
+    {
+        var startDate = GetStartDate(request.DisplayType, request.AnchorDate, settings);
+        var endDate = GetEndDate(request.DisplayType, request.AnchorDate, startDate, settings);
+        var dayCount = endDate.DayNumber - startDate.DayNumber + 1;
+        var dates = Enumerable.Range(0, dayCount)
+                              .Select(offset => startDate.AddDays(offset))
+                              .ToArray();
+
+        return new VisibleDateRange(
+            request.DisplayType,
+            request.AnchorDate,
+            startDate,
+            endDate,
+            request.AnchorDate,
+            dayCount,
+            today >= startDate && today <= endDate,
+            startDate.Year == endDate.Year && startDate.Month == endDate.Month,
+            dates);
+    }
+
+    public static VisibleDateRange ChangeDisplayType(VisibleDateRange currentRange, CalendarDisplayType targetDisplayType, CalendarSettings settings, DateOnly today)
+    {
+        if (currentRange.DisplayType == targetDisplayType)
+        {
+            return currentRange;
+        }
+
+        var anchorDate = currentRange.AnchorDate;
+
+        if (currentRange.DisplayType == CalendarDisplayType.Month)
+        {
+            anchorDate = currentRange.Contains(today) ? today : currentRange.StartDate;
+        }
+
+        return Resolve(new CalendarDisplayRequest(targetDisplayType, anchorDate), settings, today);
+    }
+
+    public static VisibleDateRange Navigate(VisibleDateRange currentRange, int direction, CalendarSettings settings, DateOnly today)
+    {
+        if (direction == 0)
+        {
+            return currentRange;
+        }
+
+        var normalizedDirection = Math.Sign(direction);
+        var anchorDate = currentRange.DisplayType switch
+        {
+            CalendarDisplayType.Day => currentRange.AnchorDate.AddDays(normalizedDirection),
+            CalendarDisplayType.Week => currentRange.AnchorDate.AddDays(7 * normalizedDirection),
+            CalendarDisplayType.WorkWeek => currentRange.AnchorDate.AddDays(7 * normalizedDirection),
+            CalendarDisplayType.Month => currentRange.AnchorDate.AddMonths(normalizedDirection),
+            _ => currentRange.AnchorDate
+        };
+
+        return Resolve(new CalendarDisplayRequest(currentRange.DisplayType, anchorDate), settings, today);
+    }
+
+    private static DateOnly GetStartDate(CalendarDisplayType displayType, DateOnly anchorDate, CalendarSettings settings)
+    {
+        return displayType switch
+        {
+            CalendarDisplayType.Day => anchorDate,
+            CalendarDisplayType.Week => GetStartOfWeek(anchorDate, settings.FirstDayOfWeek),
+            CalendarDisplayType.WorkWeek => GetStartOfWorkWeek(anchorDate, settings),
+            CalendarDisplayType.Month => new DateOnly(anchorDate.Year, anchorDate.Month, 1),
+            _ => anchorDate
+        };
+    }
+
+    private static DateOnly GetEndDate(CalendarDisplayType displayType, DateOnly anchorDate, DateOnly startDate, CalendarSettings settings)
+    {
+        return displayType switch
+        {
+            CalendarDisplayType.Day => anchorDate,
+            CalendarDisplayType.Week => startDate.AddDays(6),
+            CalendarDisplayType.WorkWeek => startDate.AddDays(settings.WorkWeekDayCount - 1),
+            CalendarDisplayType.Month => new DateOnly(anchorDate.Year, anchorDate.Month, DateTime.DaysInMonth(anchorDate.Year, anchorDate.Month)),
+            _ => anchorDate
+        };
+    }
+
+    private static DateOnly GetStartOfWeek(DateOnly date, DayOfWeek firstDayOfWeek)
+    {
+        var offset = ((int)date.DayOfWeek - (int)firstDayOfWeek + 7) % 7;
+        return date.AddDays(-offset);
+    }
+
+    private static DateOnly GetStartOfWorkWeek(DateOnly anchorDate, CalendarSettings settings)
+    {
+        var startOfWeek = GetStartOfWeek(anchorDate, settings.FirstDayOfWeek);
+        var offsetToWorkWeekStart = settings.GetWeekOffset(settings.WorkWeekStart);
+        return startOfWeek.AddDays(offsetToWorkWeekStart);
+    }
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarRangeTextFormatter.cs b/Wino.Core.Domain/Models/Calendar/CalendarRangeTextFormatter.cs
new file mode 100644
index 00000000..598ab3e5
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarRangeTextFormatter.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Globalization;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class CalendarRangeTextFormatter : ICalendarRangeTextFormatter
+{
+    public string Format(VisibleDateRange range, IDateContextProvider dateContextProvider)
+    {
+        var culture = dateContextProvider.Culture;
+
+        if (range.DayCount >= 28)
+        {
+            return FormatMonth(range.PrimaryDate, culture);
+        }
+
+        if (range.DayCount == 1 || range.DisplayType == CalendarDisplayType.Day)
+        {
+            return FormatDate(range.StartDate, culture);
+        }
+
+        if (range.SpansSingleMonth)
+        {
+            return $"{FormatDate(range.StartDate, culture)} - {FormatDay(range.EndDate, culture)}";
+        }
+
+        return $"{FormatDate(range.StartDate, culture)} - {FormatDate(range.EndDate, culture)}";
+    }
+
+    private static string FormatDate(DateOnly date, CultureInfo culture)
+        => date.ToString(culture.DateTimeFormat.MonthDayPattern, culture);
+
+    private static string FormatDay(DateOnly date, CultureInfo culture)
+        => date.Day.ToString(culture);
+
+    private static string FormatMonth(DateOnly date, CultureInfo culture)
+        => date.ToString(culture.DateTimeFormat.YearMonthPattern, culture);
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarReminderNotificationRequest.cs b/Wino.Core.Domain/Models/Calendar/CalendarReminderNotificationRequest.cs
new file mode 100644
index 00000000..4a0c634e
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/CalendarReminderNotificationRequest.cs
@@ -0,0 +1,10 @@
+using Wino.Core.Domain.Entities.Calendar;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class CalendarReminderNotificationRequest
+{
+    public CalendarItem CalendarItem { get; init; } = null!;
+    public long ReminderDurationInSeconds { get; init; }
+    public string ReminderKey { get; init; } = string.Empty;
+}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarRenderOptions.cs b/Wino.Core.Domain/Models/Calendar/CalendarRenderOptions.cs
deleted file mode 100644
index 2f31db08..00000000
--- a/Wino.Core.Domain/Models/Calendar/CalendarRenderOptions.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Wino.Core.Domain.Models.Calendar;
-
-public class CalendarRenderOptions
-{
-    public CalendarRenderOptions(DateRange dateRange, CalendarSettings calendarSettings)
-    {
-        DateRange = dateRange;
-        CalendarSettings = calendarSettings;
-    }
-    public int TotalDayCount => DateRange.TotalDays;
-    public DateRange DateRange { get; }
-    public CalendarSettings CalendarSettings { get; }
-}
diff --git a/Wino.Core.Domain/Models/Calendar/CalendarSettings.cs b/Wino.Core.Domain/Models/Calendar/CalendarSettings.cs
index 573654c1..bb1359d8 100644
--- a/Wino.Core.Domain/Models/Calendar/CalendarSettings.cs
+++ b/Wino.Core.Domain/Models/Calendar/CalendarSettings.cs
@@ -7,12 +7,35 @@ namespace Wino.Core.Domain.Models.Calendar;
 
 public record CalendarSettings(DayOfWeek FirstDayOfWeek,
                                List<DayOfWeek> WorkingDays,
+                               bool IsWorkingHoursEnabled,
+                               DayOfWeek WorkWeekStart,
+                               DayOfWeek WorkWeekEnd,
                                TimeSpan WorkingHourStart,
                                TimeSpan WorkingHourEnd,
                                double HourHeight,
                                DayHeaderDisplayType DayHeaderDisplayType,
-                               CultureInfo CultureInfo)
+                               CultureInfo CultureInfo,
+                               string TimedDayHeaderDateFormat = "ddd dd")
 {
+    public int WorkWeekDayCount
+    {
+        get
+        {
+            var startOffset = GetWeekOffset(WorkWeekStart);
+            var endOffset = GetWeekOffset(WorkWeekEnd);
+
+            if (endOffset < startOffset)
+            {
+                endOffset += 7;
+            }
+
+            return (endOffset - startOffset) + 1;
+        }
+    }
+
+    public int GetWeekOffset(DayOfWeek dayOfWeek)
+        => ((int)dayOfWeek - (int)FirstDayOfWeek + 7) % 7;
+
     public TimeSpan? GetTimeSpan(string selectedTime)
     {
         // Regardless of the format, we need to parse the time to a TimeSpan.
@@ -44,4 +67,35 @@ public record CalendarSettings(DayOfWeek FirstDayOfWeek,
         var dateTime = DateTime.Today.Add(timeSpan);
         return dateTime.ToString(format, CultureInfo.InvariantCulture);
     }
+
+    public string GetTimedDayHeaderText(DateOnly date)
+    {
+        var format = string.IsNullOrWhiteSpace(TimedDayHeaderDateFormat) ? "ddd dd" : TimedDayHeaderDateFormat;
+
+        try
+        {
+            return date.ToDateTime(TimeOnly.MinValue).ToString(format, CultureInfo);
+        }
+        catch (FormatException)
+        {
+            return date.ToDateTime(TimeOnly.MinValue).ToString("ddd dd", CultureInfo);
+        }
+    }
+
+    public string GetTimedHourLabelText(int hour)
+    {
+        if (hour < 0 || hour > 24)
+        {
+            throw new ArgumentOutOfRangeException(nameof(hour));
+        }
+
+        if (DayHeaderDisplayType == DayHeaderDisplayType.TwentyFourHour)
+        {
+            return hour.ToString(CultureInfo);
+        }
+
+        var displayHour = hour % 24;
+        var dateTime = DateTime.Today.AddHours(displayHour);
+        return dateTime.ToString("h tt", CultureInfo);
+    }
 }
diff --git a/Wino.Core.Domain/Models/Calendar/DayHeaderRenderModel.cs b/Wino.Core.Domain/Models/Calendar/DayHeaderRenderModel.cs
deleted file mode 100644
index 2df4b2aa..00000000
--- a/Wino.Core.Domain/Models/Calendar/DayHeaderRenderModel.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Wino.Core.Domain.Models.Calendar;
-
-public class DayHeaderRenderModel
-{
-    public DayHeaderRenderModel(string dayHeader, double hourHeight)
-    {
-        DayHeader = dayHeader;
-        HourHeight = hourHeight;
-    }
-
-    public string DayHeader { get; }
-    public double HourHeight { get; }
-}
diff --git a/Wino.Core.Domain/Models/Calendar/DayRangeRenderModel.cs b/Wino.Core.Domain/Models/Calendar/DayRangeRenderModel.cs
deleted file mode 100644
index 17245c32..00000000
--- a/Wino.Core.Domain/Models/Calendar/DayRangeRenderModel.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Itenso.TimePeriod;
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Core.Domain.Models.Calendar;
-
-/// <summary>
-/// Represents a range of days in the calendar.
-/// Corresponds to 1 view of the FlipView in CalendarPage.
-/// </summary>
-public class DayRangeRenderModel
-{
-    public ITimePeriod Period { get; }
-    public List<CalendarDayModel> CalendarDays { get; } = [];
-
-    // TODO: Get rid of this at some point.
-    public List<DayHeaderRenderModel> DayHeaders { get; } = [];
-    public CalendarRenderOptions CalendarRenderOptions { get; }
-
-    public DayRangeRenderModel(CalendarRenderOptions calendarRenderOptions)
-    {
-        CalendarRenderOptions = calendarRenderOptions;
-
-        for (var i = 0; i < CalendarRenderOptions.TotalDayCount; i++)
-        {
-            var representingDate = calendarRenderOptions.DateRange.StartDate.AddDays(i);
-            var calendarDayModel = new CalendarDayModel(representingDate, calendarRenderOptions);
-
-            CalendarDays.Add(calendarDayModel);
-        }
-
-        Period = new TimeRange(CalendarDays.First().RepresentingDate, CalendarDays.Last().RepresentingDate.AddDays(1));
-
-        // Create day headers based on culture info.
-
-        for (var i = 0; i < 24; i++)
-        {
-            var representingDate = calendarRenderOptions.DateRange.StartDate.Date.AddHours(i);
-
-            string dayHeader = calendarRenderOptions.CalendarSettings.DayHeaderDisplayType switch
-            {
-                DayHeaderDisplayType.TwelveHour => representingDate.ToString("h tt", calendarRenderOptions.CalendarSettings.CultureInfo),
-                DayHeaderDisplayType.TwentyFourHour => representingDate.ToString("HH", calendarRenderOptions.CalendarSettings.CultureInfo),
-                _ => "N/A"
-            };
-
-            DayHeaders.Add(new DayHeaderRenderModel(dayHeader, calendarRenderOptions.CalendarSettings.HourHeight));
-        }
-    }
-}
diff --git a/Wino.Core.Domain/Models/Calendar/ICalendarRangeTextFormatter.cs b/Wino.Core.Domain/Models/Calendar/ICalendarRangeTextFormatter.cs
new file mode 100644
index 00000000..78433f04
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/ICalendarRangeTextFormatter.cs
@@ -0,0 +1,6 @@
+namespace Wino.Core.Domain.Models.Calendar;
+
+public interface ICalendarRangeTextFormatter
+{
+    string Format(VisibleDateRange range, IDateContextProvider dateContextProvider);
+}
diff --git a/Wino.Core.Domain/Models/Calendar/IDateContextProvider.cs b/Wino.Core.Domain/Models/Calendar/IDateContextProvider.cs
new file mode 100644
index 00000000..049d622d
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/IDateContextProvider.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Globalization;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public interface IDateContextProvider
+{
+    CultureInfo Culture { get; }
+    TimeZoneInfo TimeZone { get; }
+    DateOnly GetToday();
+}
diff --git a/Wino.Core.Domain/Models/Calendar/SystemDateContextProvider.cs b/Wino.Core.Domain/Models/Calendar/SystemDateContextProvider.cs
new file mode 100644
index 00000000..97bdc77d
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/SystemDateContextProvider.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Globalization;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed class SystemDateContextProvider : IDateContextProvider
+{
+    public CultureInfo Culture => CultureInfo.CurrentCulture;
+
+    public TimeZoneInfo TimeZone => TimeZoneInfo.Local;
+
+    public DateOnly GetToday()
+    {
+        var localNow = TimeZoneInfo.ConvertTime(DateTimeOffset.UtcNow, TimeZone);
+        return DateOnly.FromDateTime(localNow.DateTime);
+    }
+}
diff --git a/Wino.Core.Domain/Models/Calendar/VisibleDateRange.cs b/Wino.Core.Domain/Models/Calendar/VisibleDateRange.cs
new file mode 100644
index 00000000..d218f260
--- /dev/null
+++ b/Wino.Core.Domain/Models/Calendar/VisibleDateRange.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Itenso.TimePeriod;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Calendar;
+
+public sealed record VisibleDateRange(
+    CalendarDisplayType DisplayType,
+    DateOnly AnchorDate,
+    DateOnly StartDate,
+    DateOnly EndDate,
+    DateOnly PrimaryDate,
+    int DayCount,
+    bool ContainsToday,
+    bool SpansSingleMonth,
+    IReadOnlyList<DateOnly> Dates)
+{
+    public DateRange ToDateRangeExclusive()
+        => new(StartDate.ToDateTime(TimeOnly.MinValue), EndDate.AddDays(1).ToDateTime(TimeOnly.MinValue));
+
+    public ITimePeriod ToTimePeriod()
+        => new TimeRange(StartDate.ToDateTime(TimeOnly.MinValue), EndDate.AddDays(1).ToDateTime(TimeOnly.MinValue));
+
+    public bool Contains(DateOnly date)
+        => date >= StartDate && date <= EndDate;
+
+    public bool Contains(DateTime date)
+        => Contains(DateOnly.FromDateTime(date));
+
+    public static VisibleDateRange FromDateRange(CalendarDisplayType displayType, DateRange dateRange, DateOnly anchorDate, DateOnly today)
+    {
+        var startDate = DateOnly.FromDateTime(dateRange.StartDate);
+        var endDate = DateOnly.FromDateTime(dateRange.EndDate.AddDays(-1));
+        var dayCount = endDate.DayNumber - startDate.DayNumber + 1;
+        var dates = Enumerable.Range(0, dayCount)
+                              .Select(offset => startDate.AddDays(offset))
+                              .ToArray();
+
+        return new VisibleDateRange(
+            displayType,
+            anchorDate,
+            startDate,
+            endDate,
+            anchorDate,
+            dayCount,
+            today >= startDate && today <= endDate,
+            startDate.Year == endDate.Year && startDate.Month == endDate.Month,
+            dates);
+    }
+}
diff --git a/Wino.Core.Domain/Models/Common/PickedFileMetadata.cs b/Wino.Core.Domain/Models/Common/PickedFileMetadata.cs
new file mode 100644
index 00000000..57c0722c
--- /dev/null
+++ b/Wino.Core.Domain/Models/Common/PickedFileMetadata.cs
@@ -0,0 +1,9 @@
+using System.IO;
+
+namespace Wino.Core.Domain.Models.Common;
+
+public record PickedFileMetadata(string FullFilePath, long Size)
+{
+    public string FileName => Path.GetFileName(FullFilePath);
+    public string FileExtension => Path.GetExtension(FullFilePath)?.ToLowerInvariant() ?? string.Empty;
+}
diff --git a/Wino.Core.Domain/Models/Common/SharedFile.cs b/Wino.Core.Domain/Models/Common/SharedFile.cs
index c5b28f6a..fe1c3640 100644
--- a/Wino.Core.Domain/Models/Common/SharedFile.cs
+++ b/Wino.Core.Domain/Models/Common/SharedFile.cs
@@ -10,4 +10,5 @@ namespace Wino.Core.Domain.Models.Common;
 public record SharedFile(string FullFilePath, byte[] Data)
 {
     public string FileName => Path.GetFileName(FullFilePath);
+    public string FileExtension => Path.GetExtension(FullFilePath)?.ToLowerInvariant();
 }
diff --git a/Wino.Core.Domain/Models/Comparers/DateComparer.cs b/Wino.Core.Domain/Models/Comparers/DateComparer.cs
deleted file mode 100644
index 7729831c..00000000
--- a/Wino.Core.Domain/Models/Comparers/DateComparer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Wino.Core.Domain.Models.MailItem;
-
-namespace Wino.Core.Domain.Models.Comparers;
-
-public class DateComparer : IComparer<IMailItem>, IEqualityComparer
-{
-    public int Compare(IMailItem x, IMailItem y)
-    {
-        return DateTime.Compare(y.CreationDate, x.CreationDate);
-    }
-
-    public new bool Equals(object x, object y)
-    {
-        if (x is IMailItem firstItem && y is IMailItem secondItem)
-        {
-            return firstItem.Equals(secondItem);
-        }
-
-        return false;
-    }
-
-    public int GetHashCode(object obj) => (obj as IMailItem).GetHashCode();
-
-    public DateComparer()
-    {
-
-    }
-}
diff --git a/Wino.Core.Domain/Models/Comparers/DateTimeComparer.cs b/Wino.Core.Domain/Models/Comparers/DateTimeComparer.cs
deleted file mode 100644
index c5ae37a0..00000000
--- a/Wino.Core.Domain/Models/Comparers/DateTimeComparer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Wino.Core.Domain.Models.Comparers;
-
-/// <summary>
-/// Used to insert date grouping into proper place in Reader page.
-/// </summary>
-public class DateTimeComparer : IComparer<DateTime>
-{
-    public int Compare(DateTime x, DateTime y)
-    {
-        return DateTime.Compare(y, x);
-    }
-}
diff --git a/Wino.Core.Domain/Models/Comparers/FolderNameComparer.cs b/Wino.Core.Domain/Models/Comparers/FolderNameComparer.cs
deleted file mode 100644
index 440391f2..00000000
--- a/Wino.Core.Domain/Models/Comparers/FolderNameComparer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using Wino.Core.Domain.Entities.Mail;
-
-namespace Wino.Core.Domain.Models.Comparers;
-
-public class FolderNameComparer : IComparer<MailItemFolder>
-{
-    public int Compare(MailItemFolder x, MailItemFolder y)
-    {
-        return x.FolderName.CompareTo(y.FolderName);
-    }
-}
diff --git a/Wino.Core.Domain/Models/Comparers/ListItemComparer.cs b/Wino.Core.Domain/Models/Comparers/ListItemComparer.cs
index 393b9f6b..50aecc8a 100644
--- a/Wino.Core.Domain/Models/Comparers/ListItemComparer.cs
+++ b/Wino.Core.Domain/Models/Comparers/ListItemComparer.cs
@@ -1,37 +1,22 @@
 using System;
 using System.Collections.Generic;
-using Wino.Core.Domain.Models.MailItem;
-
-namespace Wino.Core.Domain.Models.Comparers;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Interfaces;
 
 public class ListItemComparer : IComparer<object>
 {
     public bool SortByName { get; set; }
 
-    public DateComparer DateComparer = new DateComparer();
-    public readonly NameComparer NameComparer = new NameComparer();
-
     public int Compare(object x, object y)
     {
-        if (x is IMailItem xMail && y is IMailItem yMail)
-        {
-            var itemComparer = GetItemComparer();
-
-            return itemComparer.Compare(xMail, yMail);
-        }
+        if (x is IMailListItemSorting xSorting && y is IMailListItemSorting ySorting)
+            return SortByName ? string.Compare(xSorting.SortingName, ySorting.SortingName, StringComparison.OrdinalIgnoreCase) : DateTime.Compare(ySorting.SortingDate, xSorting.SortingDate);
+        else if (x is MailCopy xMail && y is MailCopy yMail)
+            return SortByName ? string.Compare(xMail.FromName, yMail.FromName, StringComparison.OrdinalIgnoreCase) : DateTime.Compare(yMail.CreationDate, xMail.CreationDate);
         else if (x is DateTime dateX && y is DateTime dateY)
             return DateTime.Compare(dateY, dateX);
         else if (x is string stringX && y is string stringY)
             return stringY.CompareTo(stringX);
-
         return 0;
     }
-
-    public IComparer<IMailItem> GetItemComparer()
-    {
-        if (SortByName)
-            return NameComparer;
-        else
-            return DateComparer;
-    }
 }
diff --git a/Wino.Core.Domain/Models/Comparers/NameComparer.cs b/Wino.Core.Domain/Models/Comparers/NameComparer.cs
deleted file mode 100644
index 9dd03636..00000000
--- a/Wino.Core.Domain/Models/Comparers/NameComparer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using Wino.Core.Domain.Models.MailItem;
-
-namespace Wino.Core.Domain.Models.Comparers;
-
-public class NameComparer : IComparer<IMailItem>
-{
-    public int Compare(IMailItem x, IMailItem y)
-    {
-        return string.Compare(x.FromName, y.FromName);
-    }
-}
diff --git a/Wino.Core.Domain/Models/Connectivity/ConnectionPoolHealth.cs b/Wino.Core.Domain/Models/Connectivity/ConnectionPoolHealth.cs
new file mode 100644
index 00000000..a80424a8
--- /dev/null
+++ b/Wino.Core.Domain/Models/Connectivity/ConnectionPoolHealth.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+
+namespace Wino.Core.Domain.Models.Connectivity;
+
+/// <summary>
+/// Represents the health status of an IMAP connection pool.
+/// </summary>
+public class ConnectionPoolHealth
+{
+    /// <summary>
+    /// Gets or sets the total number of connections in the pool (including IDLE).
+    /// </summary>
+    public int TotalConnections { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of connections available for use.
+    /// </summary>
+    public int AvailableConnections { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of connections currently in use.
+    /// </summary>
+    public int InUseConnections { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of connections that have failed and need reconnection.
+    /// </summary>
+    public int FailedConnections { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of connections currently reconnecting.
+    /// </summary>
+    public int ReconnectingConnections { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the dedicated IDLE connection is active and listening.
+    /// </summary>
+    public bool IdleConnectionActive { get; set; }
+
+    /// <summary>
+    /// Gets or sets the timestamp of the last health check.
+    /// </summary>
+    public DateTime LastHealthCheck { get; set; }
+
+    /// <summary>
+    /// Gets or sets recent issues encountered by the pool.
+    /// </summary>
+    public List<string> RecentIssues { get; set; } = [];
+
+    /// <summary>
+    /// Gets whether the pool is healthy (has minimum required connections).
+    /// </summary>
+    public bool IsHealthy => AvailableConnections >= 1 && FailedConnections == 0;
+
+    /// <summary>
+    /// Gets a summary of the pool health.
+    /// </summary>
+    public string Summary => $"Total: {TotalConnections}, Available: {AvailableConnections}, InUse: {InUseConnections}, Failed: {FailedConnections}, IDLE: {(IdleConnectionActive ? "Active" : "Inactive")}";
+}
diff --git a/Wino.Core.Domain/Models/Connectivity/ImapClientPoolOptions.cs b/Wino.Core.Domain/Models/Connectivity/ImapClientPoolOptions.cs
index 9735e4f8..a9192d24 100644
--- a/Wino.Core.Domain/Models/Connectivity/ImapClientPoolOptions.cs
+++ b/Wino.Core.Domain/Models/Connectivity/ImapClientPoolOptions.cs
@@ -1,24 +1,21 @@
-using System.IO;
 using Wino.Core.Domain.Entities.Shared;
 
 namespace Wino.Core.Domain.Models.Connectivity;
 
 public class ImapClientPoolOptions
 {
-    public Stream ProtocolLog { get; }
     public CustomServerInformation ServerInformation { get; }
     public bool IsTestPool { get; }
 
-    protected ImapClientPoolOptions(CustomServerInformation serverInformation, Stream protocolLog, bool isTestPool)
+    protected ImapClientPoolOptions(CustomServerInformation serverInformation, bool isTestPool)
     {
         ServerInformation = serverInformation;
-        ProtocolLog = protocolLog;
         IsTestPool = isTestPool;
     }
 
-    public static ImapClientPoolOptions CreateDefault(CustomServerInformation serverInformation, Stream protocolLog)
-        => new(serverInformation, protocolLog, false);
+    public static ImapClientPoolOptions CreateDefault(CustomServerInformation serverInformation)
+        => new(serverInformation, false);
 
-    public static ImapClientPoolOptions CreateTestPool(CustomServerInformation serverInformation, Stream protocolLog)
-        => new(serverInformation, protocolLog, true);
+    public static ImapClientPoolOptions CreateTestPool(CustomServerInformation serverInformation)
+        => new(serverInformation, true);
 }
diff --git a/Wino.Core.Domain/Models/Connectivity/ImapConnectivityTestResults.cs b/Wino.Core.Domain/Models/Connectivity/ImapConnectivityTestResults.cs
index 4b50af52..48ed4b3c 100644
--- a/Wino.Core.Domain/Models/Connectivity/ImapConnectivityTestResults.cs
+++ b/Wino.Core.Domain/Models/Connectivity/ImapConnectivityTestResults.cs
@@ -18,13 +18,10 @@ public class ImapConnectivityTestResults
     public bool IsCertificateUIRequired { get; set; }
 
     public string FailedReason { get; set; }
-    public string FailureProtocolLog { get; set; }
-
     public static ImapConnectivityTestResults Success() => new ImapConnectivityTestResults() { IsSuccess = true };
-    public static ImapConnectivityTestResults Failure(Exception ex, string failureProtocolLog) => new ImapConnectivityTestResults()
+    public static ImapConnectivityTestResults Failure(Exception ex) => new ImapConnectivityTestResults()
     {
-        FailedReason = string.Join(Environment.NewLine, ex.GetInnerExceptions().Select(e => e.Message)),
-        FailureProtocolLog = failureProtocolLog
+        FailedReason = string.Join(Environment.NewLine, ex.GetInnerExceptions().Select(e => e.Message))
     };
 
     public static ImapConnectivityTestResults CertificateUIRequired(string issuer,
diff --git a/Wino.Core.Domain/Models/Contacts/PagedContactsResult.cs b/Wino.Core.Domain/Models/Contacts/PagedContactsResult.cs
new file mode 100644
index 00000000..20f6530a
--- /dev/null
+++ b/Wino.Core.Domain/Models/Contacts/PagedContactsResult.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Core.Domain.Models.Contacts;
+
+public record PagedContactsResult(
+    IReadOnlyList<AccountContact> Contacts,
+    int TotalCount,
+    bool HasMore,
+    int Offset,
+    int PageSize);
diff --git a/Wino.Core.Domain/Models/Folders/FolderOperationMenuItem.cs b/Wino.Core.Domain/Models/Folders/FolderOperationMenuItem.cs
index ac81ad54..f0b2e5bc 100644
--- a/Wino.Core.Domain/Models/Folders/FolderOperationMenuItem.cs
+++ b/Wino.Core.Domain/Models/Folders/FolderOperationMenuItem.cs
@@ -1,13 +1,15 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 
 namespace Wino.Core.Domain.Models.Folders;
 
-public class FolderOperationMenuItem : MenuOperationItemBase<FolderOperation>, IMenuOperation
+public class FolderOperationMenuItem : MenuOperationItemBase<FolderOperation>
 {
-    protected FolderOperationMenuItem(FolderOperation operation, bool isEnabled) : base(operation, isEnabled) { }
+    protected FolderOperationMenuItem(FolderOperation operation, bool isEnabled, bool isSecondaryMenuItem = false) : base(operation, isEnabled)
+    {
+        IsSecondaryMenuPreferred = isSecondaryMenuItem;
+    }
 
-    public static FolderOperationMenuItem Create(FolderOperation operation, bool isEnabled = true)
-        => new FolderOperationMenuItem(operation, isEnabled);
+    public static FolderOperationMenuItem Create(FolderOperation operation, bool isEnabled = true, bool isSecondaryMenuItem = false)
+        => new FolderOperationMenuItem(operation, isEnabled, isSecondaryMenuItem);
 }
diff --git a/Wino.Core.Domain/Models/Folders/IMailItemFolder.cs b/Wino.Core.Domain/Models/Folders/IMailItemFolder.cs
index 866213f9..cd3c0a10 100644
--- a/Wino.Core.Domain/Models/Folders/IMailItemFolder.cs
+++ b/Wino.Core.Domain/Models/Folders/IMailItemFolder.cs
@@ -10,12 +10,14 @@ public interface IMailItemFolder
     string DeltaToken { get; set; }
     string FolderName { get; set; }
     long HighestModeSeq { get; set; }
+    uint HighestKnownUid { get; set; }
     Guid Id { get; set; }
     bool IsHidden { get; set; }
     bool IsSticky { get; set; }
     bool IsSynchronizationEnabled { get; set; }
     bool IsSystemFolder { get; set; }
     DateTime? LastSynchronizedDate { get; set; }
+    DateTime? LastUidReconcileUtc { get; set; }
     Guid MailAccountId { get; set; }
     string ParentRemoteFolderId { get; set; }
     string RemoteFolderId { get; set; }
diff --git a/Wino.Core.Domain/Models/KeyboardShortcutDialogResult.cs b/Wino.Core.Domain/Models/KeyboardShortcutDialogResult.cs
new file mode 100644
index 00000000..d8079ce5
--- /dev/null
+++ b/Wino.Core.Domain/Models/KeyboardShortcutDialogResult.cs
@@ -0,0 +1,60 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models;
+
+/// <summary>
+/// Result returned from keyboard shortcut dialog.
+/// </summary>
+public class KeyboardShortcutDialogResult
+{
+    /// <summary>
+    /// Whether the dialog was completed successfully.
+    /// </summary>
+    public bool IsSuccess { get; set; }
+
+    /// <summary>
+    /// The application mode selected by the user.
+    /// </summary>
+    public WinoApplicationMode Mode { get; set; } = WinoApplicationMode.Mail;
+
+    /// <summary>
+    /// The key combination entered by the user.
+    /// </summary>
+    public string Key { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The modifier keys selected by the user.
+    /// </summary>
+    public ModifierKeys ModifierKeys { get; set; }
+
+    /// <summary>
+    /// The shortcut action selected by the user.
+    /// </summary>
+    public KeyboardShortcutAction Action { get; set; }
+
+    /// <summary>
+    /// Creates a successful result.
+    /// </summary>
+    public static KeyboardShortcutDialogResult Success(WinoApplicationMode mode, string key, ModifierKeys modifierKeys, KeyboardShortcutAction action)
+    {
+        return new KeyboardShortcutDialogResult
+        {
+            IsSuccess = true,
+            Mode = mode,
+            Key = key,
+            ModifierKeys = modifierKeys,
+            Action = action
+        };
+    }
+
+    /// <summary>
+    /// Creates a canceled result.
+    /// </summary>
+    public static KeyboardShortcutDialogResult Canceled()
+    {
+        return new KeyboardShortcutDialogResult
+        {
+            IsSuccess = false
+        };
+    }
+}
diff --git a/Wino.Core.Domain/Models/KeyboardShortcutTriggerDetails.cs b/Wino.Core.Domain/Models/KeyboardShortcutTriggerDetails.cs
new file mode 100644
index 00000000..40ac92b2
--- /dev/null
+++ b/Wino.Core.Domain/Models/KeyboardShortcutTriggerDetails.cs
@@ -0,0 +1,16 @@
+using System;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models;
+
+public class KeyboardShortcutTriggerDetails
+{
+    public Guid ShortcutId { get; init; }
+    public WinoApplicationMode Mode { get; init; }
+    public KeyboardShortcutAction Action { get; init; }
+    public string Key { get; init; } = string.Empty;
+    public ModifierKeys ModifierKeys { get; init; }
+    public bool Handled { get; set; }
+    public object Sender { get; init; }
+    public object Origin { get; init; }
+}
diff --git a/Wino.Core.Domain/Models/MailItem/HtmlPreviewVisitor.cs b/Wino.Core.Domain/Models/MailItem/HtmlPreviewVisitor.cs
index deb35a54..f12cab52 100644
--- a/Wino.Core.Domain/Models/MailItem/HtmlPreviewVisitor.cs
+++ b/Wino.Core.Domain/Models/MailItem/HtmlPreviewVisitor.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using MimeKit;
+using MimeKit.Cryptography;
 using MimeKit.Text;
 using MimeKit.Tnef;
 
@@ -12,12 +13,23 @@ namespace Wino.Core.Domain.Models.MailItem;
 /// </summary>
 public class HtmlPreviewVisitor : MimeVisitor
 {
-    List<MultipartRelated> stack = new List<MultipartRelated>();
-    List<MimeEntity> attachments = new List<MimeEntity>();
+    private static readonly HashSet<string> BlockedTags = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "script", "iframe", "frame", "frameset", "object", "embed", "applet", "base", "meta", "form"
+    };
+
+    private static readonly HashSet<string> AllowedDataImageMimeTypes = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "image/png", "image/jpeg", "image/jpg", "image/gif", "image/webp", "image/bmp", "image/x-icon", "image/avif", "image/svg+xml"
+    };
+
+    private readonly List<MultipartRelated> stack = [];
+    private readonly List<MimeEntity> attachments = [];
 
     readonly string tempDir;
 
     public string Body { get; set; }
+    public Dictionary<IDigitalSignature, bool> Signatures = [];
 
     /// <summary>
     /// Creates a new HtmlPreviewVisitor.
@@ -46,9 +58,22 @@ public class HtmlPreviewVisitor : MimeVisitor
 
     protected override void VisitMultipartAlternative(MultipartAlternative alternative)
     {
-        // walk the multipart/alternative children backwards from greatest level of faithfulness to the least faithful
+        // Prefer rich body alternatives first, and only fall back to calendar text if nothing else exists.
         for (int i = alternative.Count - 1; i >= 0 && Body == null; i--)
+        {
+            if (IsCalendarText(alternative[i]))
+                continue;
+
             alternative[i].Accept(this);
+        }
+
+        for (int i = alternative.Count - 1; i >= 0 && Body == null; i--)
+        {
+            if (!IsCalendarText(alternative[i]))
+                continue;
+
+            alternative[i].Accept(this);
+        }
     }
 
     protected override void VisitMultipartRelated(MultipartRelated related)
@@ -65,12 +90,23 @@ public class HtmlPreviewVisitor : MimeVisitor
         stack.RemoveAt(stack.Count - 1);
     }
 
+    protected override void VisitMultipartSigned(MultipartSigned signed)
+    {
+        VerifySignatures(signed.Verify());
+        VisitMultipart(signed);
+    }
+
     // look up the image based on the img src url within our multipart/related stack
     bool TryGetImage(string url, out MimePart image)
     {
+        image = null;
+
+        if (string.IsNullOrWhiteSpace(url))
+            return false;
+
         UriKind kind;
         int index;
-        Uri uri;
+        Uri uri = null;
 
         if (Uri.IsWellFormedUriString(url, UriKind.Absolute))
             kind = UriKind.Absolute;
@@ -85,24 +121,50 @@ public class HtmlPreviewVisitor : MimeVisitor
         }
         catch
         {
-            image = null;
-            return false;
+            // noop: we still attempt CID/content-id lookup below.
         }
 
         for (int i = stack.Count - 1; i >= 0; i--)
         {
-            if ((index = stack[i].IndexOf(uri)) == -1)
+            if (uri != null && (index = stack[i].IndexOf(uri)) != -1)
+            {
+                image = stack[i][index] as MimePart;
+
+                if (image != null)
+                    return true;
+            }
+
+            var normalizedContentId = NormalizeContentId(url);
+
+            if (string.IsNullOrEmpty(normalizedContentId))
                 continue;
 
-            image = stack[i][index] as MimePart;
-            return image != null;
+            foreach (var relatedPart in stack[i])
+            {
+                if (relatedPart is not MimePart candidate || string.IsNullOrEmpty(candidate.ContentId))
+                    continue;
+
+                if (string.Equals(candidate.ContentId.Trim('<', '>'), normalizedContentId, StringComparison.OrdinalIgnoreCase))
+                {
+                    image = candidate;
+                    return true;
+                }
+            }
         }
 
-        image = null;
-
         return false;
     }
 
+    private static string NormalizeContentId(string url)
+    {
+        var trimmed = url.Trim().Trim('\'', '"', '<', '>');
+
+        if (trimmed.StartsWith("cid:", StringComparison.OrdinalIgnoreCase))
+            trimmed = trimmed[4..];
+
+        return trimmed.Trim('<', '>');
+    }
+
     // Save the image to our temp directory and return a "file://" url suitable for
     // the browser control to load.
     // Note: if you'd rather embed the image data into the HTML, you can construct a
@@ -118,83 +180,173 @@ public class HtmlPreviewVisitor : MimeVisitor
 
             return string.Format("data:{0};base64,{1}", image.ContentType.MimeType, base64);
         }
-
-        //string fileName = url
-        //    .Replace(':', '_')
-        //    .Replace('\\', '_')
-        //    .Replace('/', '_');
-
-        //string path = Path.Combine(tempDir, fileName);
-
-        //if (!File.Exists(path))
-        //{
-        //    using (var output = File.Create(path))
-        //        image.Content.DecodeTo(output);
-        //}
-
-        //return "file://" + path.Replace('\\', '/');
     }
 
-    // Replaces <img src=...> urls that refer to images embedded within the message with
-    // "file://" urls that the browser control will actually be able to load.
+    // Replaces image references that refer to images embedded within the message with
+    // "data:" urls the browser control can load. Also sanitizes dangerous tags/attributes.
     void HtmlTagCallback(HtmlTagContext ctx, HtmlWriter htmlWriter)
     {
-        if (ctx.TagId == HtmlTagId.Image && !ctx.IsEndTag && stack.Count > 0)
+        var tagName = ctx.TagName;
+
+        if (BlockedTags.Contains(tagName))
         {
-            ctx.WriteTag(htmlWriter, false);
-
-            // replace the src attribute with a file:// URL
-            foreach (var attribute in ctx.Attributes)
-            {
-                if (attribute.Id == HtmlAttributeId.Src)
-                {
-                    MimePart image;
-                    string url;
-
-                    if (!TryGetImage(attribute.Value, out image))
-                    {
-                        htmlWriter.WriteAttribute(attribute);
-                        continue;
-                    }
-
-                    url = SaveImage(image);
-
-                    htmlWriter.WriteAttributeName(attribute.Name);
-                    htmlWriter.WriteAttributeValue(url);
-                }
-                else
-                {
-                    htmlWriter.WriteAttribute(attribute);
-                }
-            }
+            ctx.DeleteTag = true;
+            ctx.DeleteEndTag = true;
+            return;
         }
-        else if (ctx.TagId == HtmlTagId.Body && !ctx.IsEndTag)
-        {
-            ctx.WriteTag(htmlWriter, false);
 
-            // add and/or replace oncontextmenu="return false;"
-            foreach (var attribute in ctx.Attributes)
+        if (ctx.IsEndTag)
+        {
+            ctx.WriteTag(htmlWriter, true);
+            return;
+        }
+
+        ctx.WriteTag(htmlWriter, false);
+
+        foreach (var attribute in ctx.Attributes)
+        {
+            var attributeName = attribute.Name;
+
+            if (ShouldDropAttribute(tagName, attributeName))
+                continue;
+
+            if (TryResolveImageAttribute(tagName, attributeName, attribute.Value, out var resolvedValue))
             {
-                if (attribute.Name.ToLowerInvariant() == "oncontextmenu")
+                htmlWriter.WriteAttributeName(attributeName);
+                htmlWriter.WriteAttributeValue(resolvedValue);
+                continue;
+            }
+
+            if (IsUrlAttribute(attributeName))
+            {
+                if (!TrySanitizeUrlValue(attribute.Value, out var sanitizedUrl))
                     continue;
 
-                htmlWriter.WriteAttribute(attribute);
+                htmlWriter.WriteAttributeName(attributeName);
+                htmlWriter.WriteAttributeValue(sanitizedUrl);
+                continue;
             }
 
+            htmlWriter.WriteAttribute(attribute);
+        }
+
+        if (ctx.TagId == HtmlTagId.Body)
             htmlWriter.WriteAttribute("oncontextmenu", "return false;");
-        }
-        else
+    }
+
+    private bool TryResolveImageAttribute(string tagName, string attributeName, string value, out string resolvedValue)
+    {
+        resolvedValue = null;
+
+        if (string.IsNullOrWhiteSpace(value))
+            return false;
+
+        var lowerAttributeName = attributeName.ToLowerInvariant();
+        var isImageTag = string.Equals(tagName, "img", StringComparison.OrdinalIgnoreCase);
+
+        if (isImageTag && lowerAttributeName == "srcset")
         {
-            if (ctx.TagId == HtmlTagId.Unknown)
-            {
-                ctx.DeleteTag = true;
-                ctx.DeleteEndTag = true;
-            }
-            else
-            {
-                ctx.WriteTag(htmlWriter, true);
-            }
+            resolvedValue = ResolveSrcSet(value);
+            return resolvedValue != value;
         }
+
+        if (lowerAttributeName != "src" && lowerAttributeName != "background" && lowerAttributeName != "poster")
+            return false;
+
+        if (TryGetImage(value, out var image))
+        {
+            resolvedValue = SaveImage(image);
+            return true;
+        }
+
+        return false;
+    }
+
+    private string ResolveSrcSet(string srcSetValue)
+    {
+        var candidates = srcSetValue.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        var updatedCandidates = new List<string>(candidates.Length);
+
+        foreach (var candidate in candidates)
+        {
+            var parts = candidate.Split(' ', 2, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+
+            if (parts.Length == 0)
+                continue;
+
+            var imageSource = parts[0];
+
+            if (TryGetImage(imageSource, out var image))
+                imageSource = SaveImage(image);
+
+            updatedCandidates.Add(parts.Length == 2 ? $"{imageSource} {parts[1]}" : imageSource);
+        }
+
+        return string.Join(", ", updatedCandidates);
+    }
+
+    private static bool ShouldDropAttribute(string tagName, string attributeName)
+    {
+        if (attributeName.StartsWith("on", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        if (string.Equals(tagName, "body", StringComparison.OrdinalIgnoreCase)
+            && string.Equals(attributeName, "oncontextmenu", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        if (string.Equals(attributeName, "srcdoc", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        return false;
+    }
+
+    private static bool IsUrlAttribute(string attributeName)
+        => string.Equals(attributeName, "href", StringComparison.OrdinalIgnoreCase)
+           || string.Equals(attributeName, "src", StringComparison.OrdinalIgnoreCase)
+           || string.Equals(attributeName, "action", StringComparison.OrdinalIgnoreCase)
+           || string.Equals(attributeName, "xlink:href", StringComparison.OrdinalIgnoreCase)
+           || string.Equals(attributeName, "background", StringComparison.OrdinalIgnoreCase)
+           || string.Equals(attributeName, "poster", StringComparison.OrdinalIgnoreCase);
+
+    private static bool TrySanitizeUrlValue(string rawValue, out string sanitizedValue)
+    {
+        sanitizedValue = null;
+
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return false;
+
+        var value = rawValue.Trim().Trim('"', '\'');
+
+        if (value.StartsWith("javascript:", StringComparison.OrdinalIgnoreCase)
+            || value.StartsWith("vbscript:", StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        if (value.StartsWith("data:", StringComparison.OrdinalIgnoreCase) && !IsAllowedImageDataUrl(value))
+            return false;
+
+        sanitizedValue = value;
+        return true;
+    }
+
+    private static bool IsAllowedImageDataUrl(string value)
+    {
+        const string dataPrefix = "data:";
+
+        if (!value.StartsWith(dataPrefix, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        var payloadStart = value.IndexOf(',', StringComparison.Ordinal);
+
+        if (payloadStart <= dataPrefix.Length)
+            return false;
+
+        var metadata = value[dataPrefix.Length..payloadStart];
+        var metadataParts = metadata.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
+        if (metadataParts.Length == 0)
+            return false;
+
+        return AllowedDataImageMimeTypes.Contains(metadataParts[0]);
     }
 
     protected override void VisitTextPart(TextPart entity)
@@ -233,6 +385,10 @@ public class HtmlPreviewVisitor : MimeVisitor
         Body = converter.Convert(entity.Text);
     }
 
+    private static bool IsCalendarText(MimeEntity entity)
+        => entity is TextPart textPart &&
+           textPart.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true;
+
     protected override void VisitTnefPart(TnefPart entity)
     {
         // extract any attachments in the MS-TNEF part
@@ -247,8 +403,40 @@ public class HtmlPreviewVisitor : MimeVisitor
 
     protected override void VisitMimePart(MimePart entity)
     {
-        // realistically, if we've gotten this far, then we can treat this as an attachment
-        // even if the IsAttachment property is false.
-        attachments.Add(entity);
+        if (entity is ApplicationPkcs7Mime { SecureMimeType: SecureMimeType.EnvelopedData } encrypted)
+        {
+            encrypted.Decrypt().Accept(this);
+        }
+        else if (entity is ApplicationPkcs7Mime { SecureMimeType: SecureMimeType.SignedData } signed)
+        {
+            MimeEntity extracted;
+
+            VerifySignatures(signed.Verify(out extracted));
+
+            extracted.Accept(this);
+        }
+        else
+        {
+            // realistically, if we've gotten this far, then we can treat this as an attachment
+            // even if the IsAttachment property is false.
+            attachments.Add(entity);
+        }
+    }
+
+    private void VerifySignatures(DigitalSignatureCollection signatures)
+    {
+        foreach (var signature in signatures)
+        {
+            try
+            {
+                bool valid = signature.Verify();
+                Signatures.Add(signature, valid);
+            }
+            catch (DigitalSignatureVerifyException)
+            {
+                // There was an error verifying the signature.
+                Signatures.Add(signature, false);
+            }
+        }
     }
 }
diff --git a/Wino.Core.Domain/Models/MailItem/IMailHashContainer.cs b/Wino.Core.Domain/Models/MailItem/IMailHashContainer.cs
deleted file mode 100644
index 52cd64ad..00000000
--- a/Wino.Core.Domain/Models/MailItem/IMailHashContainer.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Wino.Core.Domain.Models.MailItem;
-
-/// <summary>
-/// An interface that returns the UniqueId store for IMailItem.
-/// For threads, it may be multiple items.
-/// For single mails, it'll always be one item.
-/// </summary>
-public interface IMailHashContainer
-{
-    IEnumerable<Guid> GetContainingIds();
-}
diff --git a/Wino.Core.Domain/Models/MailItem/IMailItem.cs b/Wino.Core.Domain/Models/MailItem/IMailItem.cs
deleted file mode 100644
index b5cd99b2..00000000
--- a/Wino.Core.Domain/Models/MailItem/IMailItem.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Core.Domain.Models.MailItem;
-
-/// <summary>
-/// Interface of simplest representation of a MailCopy.
-/// </summary>
-public interface IMailItem : IMailHashContainer
-{
-    Guid UniqueId { get; }
-    string Id { get; }
-    string Subject { get; }
-    string ThreadId { get; }
-    string MessageId { get; }
-    string References { get; }
-    string InReplyTo { get; }
-    string PreviewText { get; }
-    string FromName { get; }
-    DateTime CreationDate { get; }
-    string FromAddress { get; }
-    bool HasAttachments { get; }
-    bool IsFlagged { get; }
-    bool IsFocused { get; }
-    bool IsRead { get; }
-    string DraftId { get; }
-    bool IsDraft { get; }
-    Guid FileId { get; }
-
-    MailItemFolder AssignedFolder { get; }
-    MailAccount AssignedAccount { get; }
-    AccountContact SenderContact { get; }
-}
diff --git a/Wino.Core.Domain/Models/MailItem/IMailItemThread.cs b/Wino.Core.Domain/Models/MailItem/IMailItemThread.cs
deleted file mode 100644
index 5c3cd554..00000000
--- a/Wino.Core.Domain/Models/MailItem/IMailItemThread.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace Wino.Core.Domain.Models.MailItem;
-
-/// <summary>
-/// Interface that represents conversation threads.
-/// Even though this type has 1 single UI representation most of the time,
-/// it can contain multiple IMailItem.
-/// </summary>
-public interface IMailItemThread : IMailItem
-{
-    ObservableCollection<IMailItem> ThreadItems { get; }
-    IMailItem LatestMailItem { get; }
-    IMailItem FirstMailItem { get; }
-}
diff --git a/Wino.Core.Domain/Models/MailItem/MailDragPackage.cs b/Wino.Core.Domain/Models/MailItem/MailDragPackage.cs
index e2fb2949..871aded8 100644
--- a/Wino.Core.Domain/Models/MailItem/MailDragPackage.cs
+++ b/Wino.Core.Domain/Models/MailItem/MailDragPackage.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Mail;
 
 namespace Wino.Core.Domain.Models.MailItem;
 
@@ -7,12 +8,12 @@ namespace Wino.Core.Domain.Models.MailItem;
 /// </summary>
 public class MailDragPackage
 {
-    public MailDragPackage(IEnumerable<IMailItem> draggingMails)
+    public MailDragPackage(IEnumerable<object> draggingMails)
     {
         DraggingMails = draggingMails;
     }
 
-    public MailDragPackage(IMailItem draggingMail)
+    public MailDragPackage(MailCopy draggingMail)
     {
         DraggingMails =
         [
@@ -20,5 +21,5 @@ public class MailDragPackage
         ];
     }
 
-    public IEnumerable<IMailItem> DraggingMails { get; set; }
+    public IEnumerable<object> DraggingMails { get; set; }
 }
diff --git a/Wino.Core.Domain/Models/MailItem/MailInsertPackage.cs b/Wino.Core.Domain/Models/MailItem/MailInsertPackage.cs
index f1eec88c..c57b1589 100644
--- a/Wino.Core.Domain/Models/MailItem/MailInsertPackage.cs
+++ b/Wino.Core.Domain/Models/MailItem/MailInsertPackage.cs
@@ -1,6 +1,12 @@
-using MimeKit;
+using System.Collections.Generic;
+using MimeKit;
 using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
 
 namespace Wino.Core.Domain.Models.MailItem;
 
-public record NewMailItemPackage(MailCopy Copy, MimeMessage Mime, string AssignedRemoteFolderId);
+public record NewMailItemPackage(
+    MailCopy Copy,
+    MimeMessage Mime,
+    string AssignedRemoteFolderId,
+    IReadOnlyList<AccountContact> ExtractedContacts = null);
diff --git a/Wino.Core.Domain/Models/MailItem/MailListInitializationOptions.cs b/Wino.Core.Domain/Models/MailItem/MailListInitializationOptions.cs
index 033ec012..7d97e19d 100644
--- a/Wino.Core.Domain/Models/MailItem/MailListInitializationOptions.cs
+++ b/Wino.Core.Domain/Models/MailItem/MailListInitializationOptions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
@@ -12,5 +13,7 @@ public record MailListInitializationOptions(IEnumerable<IMailItemFolder> Folders
                                             bool CreateThreads,
                                             bool? IsFocusedOnly,
                                             string SearchQuery,
-                                            IEnumerable<Guid> ExistingUniqueIds,
-                                            List<MailCopy> PreFetchMailCopies = null);
+                                            ConcurrentDictionary<Guid, bool> ExistingUniqueIds = null,
+                                            List<MailCopy> PreFetchMailCopies = null,
+                                            int Skip = 0,
+                                            int Take = 0);
diff --git a/Wino.Core.Domain/Models/MailItem/ThreadMailItem.cs b/Wino.Core.Domain/Models/MailItem/ThreadMailItem.cs
deleted file mode 100644
index 1d13f909..00000000
--- a/Wino.Core.Domain/Models/MailItem/ThreadMailItem.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Core.Domain.Models.MailItem;
-
-public class ThreadMailItem : IMailItemThread
-{
-    // TODO: Ideally this should be SortedList.
-    public ObservableCollection<IMailItem> ThreadItems { get; } = new ObservableCollection<IMailItem>();
-
-    public IMailItem LatestMailItem => ThreadItems.LastOrDefault();
-    public IMailItem FirstMailItem => ThreadItems.FirstOrDefault();
-
-    public bool AddThreadItem(IMailItem item)
-    {
-        if (item == null) return false;
-
-        if (ThreadItems.Any(a => a.Id == item.Id))
-        {
-            return false;
-        }
-
-        if (item != null && item.IsDraft)
-        {
-            ThreadItems.Insert(0, item);
-            return true;
-        }
-
-        var insertItem = ThreadItems.FirstOrDefault(a => !a.IsDraft && a.CreationDate < item.CreationDate);
-
-        if (insertItem == null)
-            ThreadItems.Insert(ThreadItems.Count, item);
-        else
-        {
-            var index = ThreadItems.IndexOf(insertItem);
-
-            ThreadItems.Insert(index, item);
-        }
-
-        return true;
-    }
-
-    public IEnumerable<Guid> GetContainingIds() => ThreadItems?.Select(a => a.UniqueId) ?? default;
-
-    #region IMailItem
-
-    public Guid UniqueId => LatestMailItem?.UniqueId ?? Guid.Empty;
-    public string Id => LatestMailItem?.Id ?? string.Empty;
-
-    // Show subject from last item.
-    public string Subject => LatestMailItem?.Subject ?? string.Empty;
-
-    public string ThreadId => LatestMailItem?.ThreadId ?? string.Empty;
-
-    public string PreviewText => FirstMailItem?.PreviewText ?? string.Empty;
-
-    public string FromName => LatestMailItem?.FromName ?? string.Empty;
-
-    public string FromAddress => LatestMailItem?.FromAddress ?? string.Empty;
-
-    public bool HasAttachments => ThreadItems.Any(a => a.HasAttachments);
-
-    public bool IsFlagged => ThreadItems.Any(a => a.IsFlagged);
-
-    public bool IsFocused => LatestMailItem?.IsFocused ?? false;
-
-    public bool IsRead => ThreadItems.All(a => a.IsRead);
-
-    public DateTime CreationDate => FirstMailItem?.CreationDate ?? DateTime.MinValue;
-
-    public bool IsDraft => ThreadItems.Any(a => a.IsDraft);
-
-    public string DraftId => string.Empty;
-
-    public string MessageId => LatestMailItem?.MessageId;
-
-    public string References => LatestMailItem?.References ?? string.Empty;
-
-    public string InReplyTo => LatestMailItem?.InReplyTo ?? string.Empty;
-
-    public MailItemFolder AssignedFolder => LatestMailItem?.AssignedFolder;
-
-    public MailAccount AssignedAccount => LatestMailItem?.AssignedAccount;
-
-    public Guid FileId => LatestMailItem?.FileId ?? Guid.Empty;
-
-    public AccountContact SenderContact => LatestMailItem?.SenderContact;
-
-    #endregion
-}
diff --git a/Wino.Core.Domain/Models/MailItem/ToggleRequestRule.cs b/Wino.Core.Domain/Models/MailItem/ToggleRequestRule.cs
index 70045ead..e3ebb453 100644
--- a/Wino.Core.Domain/Models/MailItem/ToggleRequestRule.cs
+++ b/Wino.Core.Domain/Models/MailItem/ToggleRequestRule.cs
@@ -1,4 +1,5 @@
 using System;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Models.MailItem;
@@ -10,4 +11,4 @@ namespace Wino.Core.Domain.Models.MailItem;
 /// <param name="SourceAction"></param>
 /// <param name="TargetAction"></param>
 /// <param name="Condition"></param>
-public record ToggleRequestRule(MailOperation SourceAction, MailOperation TargetAction, Func<IMailItem, bool> Condition);
+public record ToggleRequestRule(MailOperation SourceAction, MailOperation TargetAction, Func<MailCopy, bool> Condition);
diff --git a/Wino.Core.Domain/Models/Menus/MailOperationMenuItem.cs b/Wino.Core.Domain/Models/Menus/MailOperationMenuItem.cs
index 7c243f55..a3e228b7 100644
--- a/Wino.Core.Domain/Models/Menus/MailOperationMenuItem.cs
+++ b/Wino.Core.Domain/Models/Menus/MailOperationMenuItem.cs
@@ -1,15 +1,9 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Models.Menus;
 
-public class MailOperationMenuItem : MenuOperationItemBase<MailOperation>, IMenuOperation
+public class MailOperationMenuItem : MenuOperationItemBase<MailOperation>
 {
-    /// <summary>
-    /// Gets or sets whether this menu item should be placed in SecondaryCommands if used in CommandBar.
-    /// </summary>
-    public bool IsSecondaryMenuPreferred { get; set; }
-
     protected MailOperationMenuItem(MailOperation operation, bool isEnabled, bool isSecondaryMenuItem = false) : base(operation, isEnabled)
     {
         IsSecondaryMenuPreferred = isSecondaryMenuItem;
diff --git a/Wino.Core.Domain/Models/Menus/MenuOperationItemBase.cs b/Wino.Core.Domain/Models/Menus/MenuOperationItemBase.cs
index 30f4a1a0..cc2bcdcb 100644
--- a/Wino.Core.Domain/Models/Menus/MenuOperationItemBase.cs
+++ b/Wino.Core.Domain/Models/Menus/MenuOperationItemBase.cs
@@ -1,9 +1,16 @@
-using System;
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Core.Domain.Models.Menus;
 
-public class MenuOperationItemBase<TOperation> where TOperation : Enum
+public class MenuOperationItemBase<TOperation> : ObservableObject, IMenuOperation where TOperation : Enum
 {
+    private TOperation _operation;
+    private string _identifier = string.Empty;
+    private bool _isEnabled;
+    private bool _isSecondaryMenuPreferred;
+
     public MenuOperationItemBase(TOperation operation, bool isEnabled)
     {
         Operation = operation;
@@ -11,7 +18,33 @@ public class MenuOperationItemBase<TOperation> where TOperation : Enum
         Identifier = operation.ToString();
     }
 
-    public TOperation Operation { get; set; }
-    public string Identifier { get; set; }
-    public bool IsEnabled { get; set; }
+    public TOperation Operation
+    {
+        get => _operation;
+        set
+        {
+            if (SetProperty(ref _operation, value))
+            {
+                Identifier = value.ToString();
+            }
+        }
+    }
+
+    public string Identifier
+    {
+        get => _identifier;
+        protected set => SetProperty(ref _identifier, value);
+    }
+
+    public bool IsEnabled
+    {
+        get => _isEnabled;
+        set => SetProperty(ref _isEnabled, value);
+    }
+
+    public bool IsSecondaryMenuPreferred
+    {
+        get => _isSecondaryMenuPreferred;
+        set => SetProperty(ref _isSecondaryMenuPreferred, value);
+    }
 }
diff --git a/Wino.Core.Domain/Models/Navigation/ShellModeActivationContext.cs b/Wino.Core.Domain/Models/Navigation/ShellModeActivationContext.cs
new file mode 100644
index 00000000..eb3ea9ca
--- /dev/null
+++ b/Wino.Core.Domain/Models/Navigation/ShellModeActivationContext.cs
@@ -0,0 +1,10 @@
+#nullable enable
+
+namespace Wino.Core.Domain.Models.Navigation;
+
+public sealed class ShellModeActivationContext
+{
+    public bool IsInitialActivation { get; init; }
+    public bool SuppressStartupFlows { get; init; }
+    public object? Parameter { get; init; }
+}
diff --git a/Wino.Core.Domain/Models/Personalization/BackdropTypeWrapper.cs b/Wino.Core.Domain/Models/Personalization/BackdropTypeWrapper.cs
new file mode 100644
index 00000000..1b6e5911
--- /dev/null
+++ b/Wino.Core.Domain/Models/Personalization/BackdropTypeWrapper.cs
@@ -0,0 +1,20 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Personalization;
+
+public class BackdropTypeWrapper
+{
+    public WindowBackdropType BackdropType { get; set; }
+    public string DisplayName { get; set; }
+
+    public BackdropTypeWrapper(WindowBackdropType backdropType, string displayName)
+    {
+        BackdropType = backdropType;
+        DisplayName = displayName;
+    }
+
+    public override string ToString()
+    {
+        return DisplayName;
+    }
+}
\ No newline at end of file
diff --git a/Wino.Core.Domain/Models/Printing/WebView2PrintSettingsModel.cs b/Wino.Core.Domain/Models/Printing/WebView2PrintSettingsModel.cs
new file mode 100644
index 00000000..48455878
--- /dev/null
+++ b/Wino.Core.Domain/Models/Printing/WebView2PrintSettingsModel.cs
@@ -0,0 +1,137 @@
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Printing;
+
+/// <summary>
+/// Wrapper model for CoreWebView2PrintSettings that provides bindable properties for UI controls.
+/// </summary>
+public partial class WebView2PrintSettingsModel : ObservableObject
+{
+    [ObservableProperty]
+    public partial string PrinterName { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial PrintOrientation Orientation { get; set; } = PrintOrientation.Portrait;
+
+    [ObservableProperty]
+    public partial PrintColorMode ColorMode { get; set; } = PrintColorMode.Color;
+
+    [ObservableProperty]
+    public partial PrintCollation Collation { get; set; } = PrintCollation.Default;
+
+    [ObservableProperty]
+    public partial PrintDuplex Duplex { get; set; } = PrintDuplex.Default;
+
+    [ObservableProperty]
+    public partial PrintMediaSize MediaSize { get; set; } = PrintMediaSize.Default;
+
+    [ObservableProperty]
+    public partial int Copies { get; set; } = 1;
+
+    [ObservableProperty]
+    public partial double MarginTop { get; set; } = 1.0;
+
+    [ObservableProperty]
+    public partial double MarginBottom { get; set; } = 1.0;
+
+    [ObservableProperty]
+    public partial double MarginLeft { get; set; } = 1.0;
+
+    [ObservableProperty]
+    public partial double MarginRight { get; set; } = 1.0;
+
+    [ObservableProperty]
+    public partial bool ShouldPrintBackgrounds { get; set; } = false;
+
+    [ObservableProperty]
+    public partial bool ShouldPrintSelectionOnly { get; set; } = false;
+
+    [ObservableProperty]
+    public partial bool ShouldPrintHeaderAndFooter { get; set; } = true;
+
+    [ObservableProperty]
+    public partial string HeaderTitle { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string FooterUri { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial double ScaleFactor { get; set; } = 1.0;
+
+    [ObservableProperty]
+    public partial int PagesPerSide { get; set; } = 1;
+
+    [ObservableProperty]
+    public partial string PageRanges { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Partial method for validation when Copies property changes.
+    /// </summary>
+    partial void OnCopiesChanged(int value)
+    {
+        if (value <= 0)
+        {
+            Copies = 1; // Reset to minimum valid value
+        }
+    }
+
+    /// <summary>
+    /// Partial method for validation when ScaleFactor property changes.
+    /// </summary>
+    partial void OnScaleFactorChanged(double value)
+    {
+        if (value < 0.1 || value > 2.0)
+        {
+            ScaleFactor = Math.Clamp(value, 0.1, 2.0);
+        }
+    }
+
+    /// <summary>
+    /// Partial method for validation when PagesPerSide property changes.
+    /// </summary>
+    partial void OnPagesPerSideChanged(int value)
+    {
+        var validValues = new[] { 1, 2, 4, 6, 9, 16 };
+        if (System.Array.IndexOf(validValues, value) < 0)
+        {
+            PagesPerSide = 1; // Reset to default valid value
+        }
+    }
+
+    /// <summary>
+    /// Partial method for validation when margin properties change.
+    /// </summary>
+    partial void OnMarginTopChanged(double value)
+    {
+        if (value < 0)
+        {
+            MarginTop = 0;
+        }
+    }
+
+    partial void OnMarginBottomChanged(double value)
+    {
+        if (value < 0)
+        {
+            MarginBottom = 0;
+        }
+    }
+
+    partial void OnMarginLeftChanged(double value)
+    {
+        if (value < 0)
+        {
+            MarginLeft = 0;
+        }
+    }
+
+    partial void OnMarginRightChanged(double value)
+    {
+        if (value < 0)
+        {
+            MarginRight = 0;
+        }
+    }
+}
diff --git a/Wino.Core.Domain/Models/Reader/MailRenderModel.cs b/Wino.Core.Domain/Models/Reader/MailRenderModel.cs
index 5ca16b78..1bcae631 100644
--- a/Wino.Core.Domain/Models/Reader/MailRenderModel.cs
+++ b/Wino.Core.Domain/Models/Reader/MailRenderModel.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using MimeKit;
+using MimeKit.Cryptography;
 
 namespace Wino.Core.Domain.Models.Reader;
 
@@ -15,6 +16,11 @@ public class MailRenderModel
 
     public UnsubscribeInfo UnsubscribeInfo { get; set; }
 
+    public Dictionary<IDigitalSignature, bool> Signatures = [];
+
+    // Indicates if the mail is S/MIME encrypted
+    public bool IsSmimeEncrypted { get; set; }
+
     public MailRenderModel(string renderHtml, MailRenderingOptions mailRenderingOptions = null)
     {
         RenderHtml = renderHtml;
diff --git a/Wino.Core.Domain/Models/Reader/SortingOption.cs b/Wino.Core.Domain/Models/Reader/SortingOption.cs
index 09deec80..bb887d1e 100644
--- a/Wino.Core.Domain/Models/Reader/SortingOption.cs
+++ b/Wino.Core.Domain/Models/Reader/SortingOption.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.Comparers;
-using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Enums;
 
 namespace Wino.Core.Domain.Models.Reader;
 
@@ -9,16 +6,6 @@ public class SortingOption
 {
     public SortingOptionType Type { get; set; }
     public string Title { get; set; }
-    public IComparer<IMailItem> Comparer
-    {
-        get
-        {
-            if (Type == SortingOptionType.ReceiveDate)
-                return new DateComparer();
-            else
-                return new NameComparer();
-        }
-    }
 
     public SortingOption(string title, SortingOptionType type)
     {
diff --git a/Wino.Core.Domain/Models/Requests/RequestBase.cs b/Wino.Core.Domain/Models/Requests/RequestBase.cs
index af7b6039..9ea7876c 100644
--- a/Wino.Core.Domain/Models/Requests/RequestBase.cs
+++ b/Wino.Core.Domain/Models/Requests/RequestBase.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
@@ -29,6 +30,11 @@ public abstract record FolderRequestBase(MailItemFolder Folder, FolderSynchroniz
     public virtual object GroupingKey() { return Operation; }
 }
 
+public abstract record CalendarRequestBase(CalendarItem Item) : RequestBase<CalendarSynchronizerOperation>, ICalendarActionRequest
+{
+    public virtual Guid? LocalCalendarItemId => Item?.Id;
+}
+
 public class BatchCollection<TRequestType> : List<TRequestType>, IUIChangeRequest where TRequestType : IUIChangeRequest
 {
     public BatchCollection(IEnumerable<TRequestType> collection) : base(collection)
diff --git a/Wino.Core.Domain/Models/Retry/RetryPolicy.cs b/Wino.Core.Domain/Models/Retry/RetryPolicy.cs
new file mode 100644
index 00000000..e756a825
--- /dev/null
+++ b/Wino.Core.Domain/Models/Retry/RetryPolicy.cs
@@ -0,0 +1,105 @@
+using System;
+
+namespace Wino.Core.Domain.Models.Retry;
+
+/// <summary>
+/// Defines retry behavior for synchronization operations with exponential backoff.
+/// </summary>
+public class RetryPolicy
+{
+    private static readonly Random _jitterRandom = new();
+
+    /// <summary>
+    /// Gets or sets the maximum number of retry attempts. Default is 3.
+    /// </summary>
+    public int MaxRetries { get; set; } = 3;
+
+    /// <summary>
+    /// Gets or sets the initial delay before the first retry. Default is 1 second.
+    /// </summary>
+    public TimeSpan InitialDelay { get; set; } = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Gets or sets the multiplier for exponential backoff. Default is 2.0.
+    /// Each retry delay = previous delay * multiplier.
+    /// </summary>
+    public double BackoffMultiplier { get; set; } = 2.0;
+
+    /// <summary>
+    /// Gets or sets the maximum delay between retries. Default is 2 minutes.
+    /// </summary>
+    public TimeSpan MaxDelay { get; set; } = TimeSpan.FromMinutes(2);
+
+    /// <summary>
+    /// Gets or sets whether to add random jitter to delays to prevent thundering herd.
+    /// Default is true.
+    /// </summary>
+    public bool UseJitter { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the maximum jitter as a percentage of the delay (0.0 to 1.0).
+    /// Default is 0.25 (25%).
+    /// </summary>
+    public double JitterFactor { get; set; } = 0.25;
+
+    /// <summary>
+    /// Calculates the delay for the given retry attempt using exponential backoff.
+    /// </summary>
+    /// <param name="retryAttempt">The retry attempt number (1-based).</param>
+    /// <returns>The delay to wait before the retry.</returns>
+    public TimeSpan GetDelay(int retryAttempt)
+    {
+        if (retryAttempt <= 0)
+            return TimeSpan.Zero;
+
+        // Calculate base delay with exponential backoff
+        var baseDelayMs = InitialDelay.TotalMilliseconds * Math.Pow(BackoffMultiplier, retryAttempt - 1);
+
+        // Apply max delay cap
+        baseDelayMs = Math.Min(baseDelayMs, MaxDelay.TotalMilliseconds);
+
+        // Apply jitter if enabled
+        if (UseJitter)
+        {
+            var jitterRange = baseDelayMs * JitterFactor;
+            var jitter = (_jitterRandom.NextDouble() * 2 - 1) * jitterRange; // +/- jitter range
+            baseDelayMs = Math.Max(0, baseDelayMs + jitter);
+        }
+
+        return TimeSpan.FromMilliseconds(baseDelayMs);
+    }
+
+    /// <summary>
+    /// Creates a default retry policy suitable for most synchronization operations.
+    /// </summary>
+    public static RetryPolicy Default => new();
+
+    /// <summary>
+    /// Creates an aggressive retry policy with more attempts and shorter delays.
+    /// Suitable for transient network issues.
+    /// </summary>
+    public static RetryPolicy Aggressive => new()
+    {
+        MaxRetries = 5,
+        InitialDelay = TimeSpan.FromMilliseconds(500),
+        BackoffMultiplier = 1.5,
+        MaxDelay = TimeSpan.FromSeconds(30)
+    };
+
+    /// <summary>
+    /// Creates a conservative retry policy with longer delays.
+    /// Suitable for rate limiting scenarios.
+    /// </summary>
+    public static RetryPolicy RateLimited => new()
+    {
+        MaxRetries = 3,
+        InitialDelay = TimeSpan.FromSeconds(10),
+        BackoffMultiplier = 2.0,
+        MaxDelay = TimeSpan.FromMinutes(5)
+    };
+
+    /// <summary>
+    /// Creates a no-retry policy that doesn't retry on failure.
+    /// </summary>
+    public static RetryPolicy NoRetry => new() { MaxRetries = 0 };
+}
diff --git a/Wino.Core.Domain/Models/Server/WinoServerResponse.cs b/Wino.Core.Domain/Models/Server/WinoServerResponse.cs
deleted file mode 100644
index d334c89a..00000000
--- a/Wino.Core.Domain/Models/Server/WinoServerResponse.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Wino.Core.Domain.Exceptions;
-
-namespace Wino.Core.Domain.Models.Server;
-
-/// <summary>
-/// Encapsulates responses from the Wino server.
-/// Exceptions are stored separately in the Message and StackTrace properties due to serialization issues.
-/// </summary>
-/// <typeparam name="T">Type of the expected response.</typeparam>
-public class WinoServerResponse<T>
-{
-    public bool IsSuccess { get; set; }
-    public string Message { get; set; }
-    public T Data { get; set; }
-
-    public static WinoServerResponse<T> CreateSuccessResponse(T data)
-    {
-        return new WinoServerResponse<T>
-        {
-            IsSuccess = true,
-            Data = data
-        };
-    }
-
-    public static WinoServerResponse<T> CreateErrorResponse(string message)
-    {
-        return new WinoServerResponse<T>
-        {
-            IsSuccess = false,
-            Message = message
-        };
-    }
-
-    public void ThrowIfFailed()
-    {
-        if (!IsSuccess)
-            throw new WinoServerException(Message);
-    }
-}
diff --git a/Wino.Core.Domain/Models/Settings/SettingOption.cs b/Wino.Core.Domain/Models/Settings/SettingOption.cs
deleted file mode 100644
index 68871d99..00000000
--- a/Wino.Core.Domain/Models/Settings/SettingOption.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Core.Domain.Models.Settings;
-
-public record SettingOption(string Title, string Description, WinoPage NavigationPage, string PathIcon);
diff --git a/Wino.Core.Domain/Models/Settings/SettingsNavigationItemInfo.cs b/Wino.Core.Domain/Models/Settings/SettingsNavigationItemInfo.cs
new file mode 100644
index 00000000..af8ea957
--- /dev/null
+++ b/Wino.Core.Domain/Models/Settings/SettingsNavigationItemInfo.cs
@@ -0,0 +1,231 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Settings;
+
+public sealed class SettingsNavigationItemInfo(
+    WinoPage? pageType,
+    string title,
+    string description,
+    string glyph = "",
+    bool isSeparator = false,
+    string searchKeywords = "")
+{
+    public WinoPage? PageType { get; } = pageType;
+    public string Title { get; } = title;
+    public string Description { get; } = description;
+    public string Glyph { get; } = glyph;
+    public bool IsSeparator { get; } = isSeparator;
+    public string SearchKeywords { get; } = searchKeywords;
+}
+
+public static class SettingsNavigationInfoProvider
+{
+    public static IReadOnlyList<SettingsNavigationItemInfo> GetNavigationItems(string manageAccountsDescription = "")
+    {
+        return
+        [
+            new(WinoPage.SettingOptionsPage,
+                Translator.SettingsHome_Title,
+                Translator.SettingsOptions_HeroDescription,
+                "\uE80F"),
+            new(WinoPage.ManageAccountsPage,
+                Translator.SettingsManageAccountSettings_Title,
+                manageAccountsDescription,
+                "\uE77B",
+                searchKeywords: Translator.SettingsSearch_ManageAccounts_Keywords),
+            new(WinoPage.WinoAccountManagementPage,
+                Translator.WinoAccount_SettingsSection_Title,
+                Translator.WinoAccount_SettingsSection_Description,
+                "\uE77B",
+                searchKeywords: string.Empty),
+            new(null, Translator.SettingsOptions_GeneralSection, string.Empty, "\uE713", isSeparator: true),
+            new(WinoPage.AppPreferencesPage,
+                Translator.SettingsAppPreferences_Title,
+                Translator.SettingsAppPreferences_Description,
+                "\uE770",
+                searchKeywords: Translator.SettingsSearch_AppPreferences_Keywords),
+            new(WinoPage.KeyboardShortcutsPage,
+                Translator.Settings_KeyboardShortcuts_Title,
+                Translator.Settings_KeyboardShortcuts_Description,
+                "\uE765",
+                searchKeywords: Translator.SettingsSearch_KeyboardShortcuts_Keywords),
+            new(WinoPage.PersonalizationPage,
+                Translator.SettingsPersonalization_Title,
+                Translator.SettingsPersonalization_Description,
+                "\uE771",
+                searchKeywords: Translator.SettingsSearch_Personalization_Keywords),
+            new(WinoPage.AboutPage,
+                Translator.SettingsAbout_Title,
+                Translator.SettingsAbout_Description,
+                "\uE946",
+                searchKeywords: Translator.SettingsSearch_About_Keywords),
+            new(null, Translator.SettingsOptions_MailSection, string.Empty, "\uE715", isSeparator: true),
+            new(WinoPage.MessageListPage,
+                Translator.SettingsMessageList_Title,
+                Translator.SettingsMessageList_Description,
+                "\uE8C4",
+                searchKeywords: Translator.SettingsSearch_MessageList_Keywords),
+            new(WinoPage.ReadComposePanePage,
+                Translator.SettingsReadComposePane_Title,
+                Translator.SettingsReadComposePane_Description,
+                "\uE8BD",
+                searchKeywords: Translator.SettingsSearch_ReadComposePane_Keywords),
+            new(WinoPage.SignatureAndEncryptionPage,
+                Translator.SettingsSignatureAndEncryption_Title,
+                Translator.SettingsSignatureAndEncryption_Description,
+                "\uE8D7",
+                searchKeywords: Translator.SettingsSearch_SignatureAndEncryption_Keywords),
+            new(WinoPage.StoragePage,
+                Translator.SettingsStorage_Title,
+                Translator.SettingsStorage_Description,
+                "\uE81C",
+                searchKeywords: Translator.SettingsSearch_Storage_Keywords),
+            new(null, Translator.SettingsOptions_CalendarSection, string.Empty, "\uE787", isSeparator: true),
+            new(WinoPage.CalendarRenderingSettingsPage,
+                Translator.CalendarSettings_Rendering_Title,
+                Translator.CalendarSettings_Rendering_Description,
+                "\uE787",
+                searchKeywords: Translator.SettingsSearch_CalendarSettings_Keywords)
+            ,
+            new(WinoPage.CalendarNotificationSettingsPage,
+                Translator.CalendarSettings_Notifications_Title,
+                Translator.CalendarSettings_Notifications_Description,
+                "\uE7F4",
+                searchKeywords: Translator.SettingsSearch_CalendarSettings_Keywords),
+            new(WinoPage.CalendarPreferenceSettingsPage,
+                Translator.CalendarSettings_Preferences_Title,
+                Translator.CalendarSettings_Preferences_Description,
+                "\uE713",
+                searchKeywords: Translator.SettingsSearch_CalendarSettings_Keywords)
+        ];
+    }
+
+    public static IReadOnlyList<SettingsNavigationItemInfo> Search(string query, string manageAccountsDescription = "")
+    {
+        if (string.IsNullOrWhiteSpace(query))
+            return [];
+
+        var normalizedQuery = NormalizeSearchText(query);
+
+        if (string.IsNullOrWhiteSpace(normalizedQuery))
+            return [];
+
+        var queryTerms = normalizedQuery.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
+        return GetNavigationItems(manageAccountsDescription)
+            .Where(item => item.PageType.HasValue && !item.IsSeparator && item.PageType.Value != WinoPage.SettingOptionsPage)
+            .Select(item => new
+            {
+                Item = item,
+                Score = CalculateSearchScore(item, normalizedQuery, queryTerms)
+            })
+            .Where(x => x.Score > 0)
+            .OrderByDescending(x => x.Score)
+            .ThenBy(x => x.Item.Title)
+            .Select(x => x.Item)
+            .ToList();
+    }
+
+    public static SettingsNavigationItemInfo GetInfo(WinoPage pageType, string manageAccountsDescription = "")
+    {
+        var rootPage = GetRootPage(pageType);
+        return GetNavigationItems(manageAccountsDescription).First(item => item.PageType == rootPage);
+    }
+
+    public static string GetPageTitle(WinoPage pageType)
+        => pageType switch
+        {
+            WinoPage.SettingOptionsPage => Translator.MenuSettings,
+            WinoPage.ManageAccountsPage => Translator.SettingsManageAccountSettings_Title,
+            WinoPage.AccountManagementPage => Translator.SettingsManageAccountSettings_Title,
+            WinoPage.WinoAccountManagementPage => Translator.WinoAccount_SettingsSection_Title,
+            WinoPage.PersonalizationPage => Translator.SettingsPersonalization_Title,
+            WinoPage.AboutPage => Translator.SettingsAbout_Title,
+            WinoPage.MessageListPage => Translator.SettingsMessageList_Title,
+            WinoPage.ReadComposePanePage => Translator.SettingsReadComposePane_Title,
+            WinoPage.AppPreferencesPage => Translator.SettingsAppPreferences_Title,
+            WinoPage.CalendarSettingsPage => Translator.CalendarSettings_Preferences_Title,
+            WinoPage.CalendarRenderingSettingsPage => Translator.CalendarSettings_Rendering_Title,
+            WinoPage.CalendarNotificationSettingsPage => Translator.CalendarSettings_Notifications_Title,
+            WinoPage.CalendarPreferenceSettingsPage => Translator.CalendarSettings_Preferences_Title,
+            WinoPage.SignatureAndEncryptionPage => Translator.SettingsSignatureAndEncryption_Title,
+            WinoPage.KeyboardShortcutsPage => Translator.Settings_KeyboardShortcuts_Title,
+            WinoPage.StoragePage => Translator.SettingsStorage_Title,
+            WinoPage.EmailTemplatesPage => Translator.SettingsEmailTemplates_Title,
+            WinoPage.CreateEmailTemplatePage => Translator.SettingsEmailTemplates_Title,
+            _ => GetInfo(pageType).Title
+        };
+
+    public static WinoPage GetRootPage(WinoPage pageType)
+        => pageType switch
+        {
+            WinoPage.AccountManagementPage => WinoPage.ManageAccountsPage,
+            WinoPage.AccountDetailsPage => WinoPage.ManageAccountsPage,
+            WinoPage.MergedAccountDetailsPage => WinoPage.ManageAccountsPage,
+            WinoPage.AliasManagementPage => WinoPage.ManageAccountsPage,
+            WinoPage.SignatureManagementPage => WinoPage.ManageAccountsPage,
+            WinoPage.ImapCalDavSettingsPage => WinoPage.ManageAccountsPage,
+            WinoPage.EmailTemplatesPage => WinoPage.ManageAccountsPage,
+            WinoPage.CreateEmailTemplatePage => WinoPage.ManageAccountsPage,
+            WinoPage.CalendarSettingsPage => WinoPage.CalendarPreferenceSettingsPage,
+            WinoPage.CalendarAccountSettingsPage => WinoPage.CalendarPreferenceSettingsPage,
+            _ => pageType
+        };
+
+    private static int CalculateSearchScore(SettingsNavigationItemInfo item, string normalizedQuery, IReadOnlyList<string> queryTerms)
+    {
+        var title = NormalizeSearchText(item.Title);
+        var description = NormalizeSearchText(item.Description);
+        var keywords = NormalizeSearchText(item.SearchKeywords);
+        var combinedText = string.Join(' ', new[] { title, description, keywords }.Where(text => !string.IsNullOrWhiteSpace(text)));
+
+        if (!combinedText.Contains(normalizedQuery, StringComparison.Ordinal) &&
+            !queryTerms.All(term => combinedText.Contains(term, StringComparison.Ordinal)))
+        {
+            return 0;
+        }
+
+        var score = 0;
+
+        if (title.StartsWith(normalizedQuery, StringComparison.Ordinal))
+            score += 500;
+        else if (title.Contains(normalizedQuery, StringComparison.Ordinal))
+            score += 360;
+
+        if (keywords.Contains(normalizedQuery, StringComparison.Ordinal))
+            score += 280;
+
+        if (description.Contains(normalizedQuery, StringComparison.Ordinal))
+            score += 180;
+
+        foreach (var term in queryTerms)
+        {
+            if (title.Contains(term, StringComparison.Ordinal))
+                score += 70;
+
+            if (keywords.Contains(term, StringComparison.Ordinal))
+                score += 50;
+
+            if (description.Contains(term, StringComparison.Ordinal))
+                score += 30;
+        }
+
+        return score;
+    }
+
+    private static string NormalizeSearchText(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return string.Empty;
+
+        var sanitized = value
+            .ToLowerInvariant()
+            .Select(character => char.IsLetterOrDigit(character) ? character : ' ')
+            .ToArray();
+
+        return string.Join(' ', new string(sanitized).Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries));
+    }
+}
diff --git a/Wino.Core.Domain/Models/Store/StoreProductType.cs b/Wino.Core.Domain/Models/Store/StoreProductType.cs
deleted file mode 100644
index f8c620ed..00000000
--- a/Wino.Core.Domain/Models/Store/StoreProductType.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Wino.Core.Domain.Models.Store;
-
-public enum StoreProductType
-{
-    UnlimitedAccounts
-}
diff --git a/Wino.Core.Domain/Models/Synchronization/FolderSyncResult.cs b/Wino.Core.Domain/Models/Synchronization/FolderSyncResult.cs
new file mode 100644
index 00000000..2814fc2a
--- /dev/null
+++ b/Wino.Core.Domain/Models/Synchronization/FolderSyncResult.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.Domain.Models.Synchronization;
+
+/// <summary>
+/// Result of synchronizing a single folder.
+/// Used for partial failure tracking when one folder fails but others succeed.
+/// </summary>
+public class FolderSyncResult
+{
+    /// <summary>
+    /// Gets or sets the folder ID.
+    /// </summary>
+    public Guid FolderId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the folder name for display purposes.
+    /// </summary>
+    public string FolderName { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether the folder sync was successful.
+    /// </summary>
+    public bool Success { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of messages downloaded/synchronized.
+    /// </summary>
+    public int DownloadedCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of messages deleted locally (removed from server).
+    /// </summary>
+    public int DeletedCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the number of messages whose flags were updated.
+    /// </summary>
+    public int UpdatedCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the error message if sync failed.
+    /// </summary>
+    public string ErrorMessage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the error severity if sync failed.
+    /// </summary>
+    public SynchronizerErrorSeverity? ErrorSeverity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the error category if sync failed.
+    /// </summary>
+    public SynchronizerErrorCategory? ErrorCategory { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether this folder was skipped (e.g., due to configuration).
+    /// </summary>
+    public bool WasSkipped { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reason the folder was skipped.
+    /// </summary>
+    public string SkipReason { get; set; }
+
+    /// <summary>
+    /// Creates a successful folder sync result.
+    /// </summary>
+    public static FolderSyncResult Successful(Guid folderId, string folderName, int downloaded = 0, int deleted = 0, int updated = 0)
+        => new()
+        {
+            FolderId = folderId,
+            FolderName = folderName,
+            Success = true,
+            DownloadedCount = downloaded,
+            DeletedCount = deleted,
+            UpdatedCount = updated
+        };
+
+    /// <summary>
+    /// Creates a failed folder sync result.
+    /// </summary>
+    public static FolderSyncResult Failed(Guid folderId, string folderName, string errorMessage,
+        SynchronizerErrorSeverity severity = SynchronizerErrorSeverity.Fatal,
+        SynchronizerErrorCategory category = SynchronizerErrorCategory.Unknown)
+        => new()
+        {
+            FolderId = folderId,
+            FolderName = folderName,
+            Success = false,
+            ErrorMessage = errorMessage,
+            ErrorSeverity = severity,
+            ErrorCategory = category
+        };
+
+    /// <summary>
+    /// Creates a failed folder sync result from an error context.
+    /// </summary>
+    public static FolderSyncResult Failed(Guid folderId, string folderName, SynchronizerErrorContext errorContext)
+        => new()
+        {
+            FolderId = folderId,
+            FolderName = folderName,
+            Success = false,
+            ErrorMessage = errorContext?.ErrorMessage ?? "Unknown error",
+            ErrorSeverity = errorContext?.Severity ?? SynchronizerErrorSeverity.Fatal,
+            ErrorCategory = errorContext?.Category ?? SynchronizerErrorCategory.Unknown
+        };
+
+    /// <summary>
+    /// Creates a skipped folder sync result.
+    /// </summary>
+    public static FolderSyncResult Skipped(Guid folderId, string folderName, string reason)
+        => new()
+        {
+            FolderId = folderId,
+            FolderName = folderName,
+            Success = true, // Skipping is not a failure
+            WasSkipped = true,
+            SkipReason = reason
+        };
+}
diff --git a/Wino.Core.Domain/Models/Synchronization/MailSynchronizationResult.cs b/Wino.Core.Domain/Models/Synchronization/MailSynchronizationResult.cs
index f7280889..c38fa6e3 100644
--- a/Wino.Core.Domain/Models/Synchronization/MailSynchronizationResult.cs
+++ b/Wino.Core.Domain/Models/Synchronization/MailSynchronizationResult.cs
@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json.Serialization;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.MailItem;
 
 namespace Wino.Core.Domain.Models.Synchronization;
 
@@ -16,16 +18,67 @@ public class MailSynchronizationResult
     /// It's ignored in serialization. Client should not react to this.
     /// </summary>
     [JsonIgnore]
-    public IEnumerable<IMailItem> DownloadedMessages { get; set; } = [];
+    public IEnumerable<MailCopy> DownloadedMessages { get; set; } = [];
 
     public ProfileInformation ProfileInformation { get; set; }
 
     public SynchronizationCompletedState CompletedState { get; set; }
 
+    public Exception Exception { get; set; }
+
+    /// <summary>
+    /// Gets or sets the results for each folder that was synchronized.
+    /// Enables partial failure tracking - some folders may succeed while others fail.
+    /// </summary>
+    public List<FolderSyncResult> FolderResults { get; set; } = [];
+
+    /// <summary>
+    /// Gets whether the synchronization had any partial failures.
+    /// True if at least one folder failed but others succeeded.
+    /// </summary>
+    [JsonIgnore]
+    public bool HasPartialFailures => FolderResults.Any(f => !f.Success) && FolderResults.Any(f => f.Success);
+
+    /// <summary>
+    /// Gets the number of folders that were successfully synchronized.
+    /// </summary>
+    [JsonIgnore]
+    public int SuccessfulFolderCount => FolderResults.Count(f => f.Success);
+
+    /// <summary>
+    /// Gets the number of folders that failed to synchronize.
+    /// </summary>
+    [JsonIgnore]
+    public int FailedFolderCount => FolderResults.Count(f => !f.Success);
+
+    /// <summary>
+    /// Gets the total number of messages downloaded across all folders.
+    /// </summary>
+    [JsonIgnore]
+    public int TotalDownloadedCount => FolderResults.Sum(f => f.DownloadedCount);
+
+    /// <summary>
+    /// Gets the total number of messages deleted across all folders.
+    /// </summary>
+    [JsonIgnore]
+    public int TotalDeletedCount => FolderResults.Sum(f => f.DeletedCount);
+
+    /// <summary>
+    /// Gets the total number of messages updated across all folders.
+    /// </summary>
+    [JsonIgnore]
+    public int TotalUpdatedCount => FolderResults.Sum(f => f.UpdatedCount);
+
+    /// <summary>
+    /// Gets the folders that failed to sync for error reporting.
+    /// </summary>
+    [JsonIgnore]
+    public IEnumerable<FolderSyncResult> FailedFolders => FolderResults.Where(f => !f.Success);
+
     public static MailSynchronizationResult Empty => new() { CompletedState = SynchronizationCompletedState.Success };
 
     // Mail synchronization
-    public static MailSynchronizationResult Completed(IEnumerable<IMailItem> downloadedMessages)
+    public static MailSynchronizationResult Completed(IEnumerable<MailCopy> downloadedMessages)
         => new()
         {
             DownloadedMessages = downloadedMessages,
@@ -40,6 +93,32 @@ public class MailSynchronizationResult
             CompletedState = SynchronizationCompletedState.Success
         };
 
+    /// <summary>
+    /// Creates a completed result with folder-level results.
+    /// </summary>
+    public static MailSynchronizationResult CompletedWithFolderResults(
+        IEnumerable<MailCopy> downloadedMessages,
+        List<FolderSyncResult> folderResults)
+    {
+        var hasAnyFailure = folderResults.Any(f => !f.Success);
+        var hasAnySuccess = folderResults.Any(f => f.Success);
+
+        return new()
+        {
+            DownloadedMessages = downloadedMessages,
+            FolderResults = folderResults,
+            CompletedState = hasAnyFailure && !hasAnySuccess
+                ? SynchronizationCompletedState.Failed
+                : hasAnyFailure
+                    ? SynchronizationCompletedState.PartiallyCompleted
+                    : SynchronizationCompletedState.Success
+        };
+    }
+
     public static MailSynchronizationResult Canceled => new() { CompletedState = SynchronizationCompletedState.Canceled };
-    public static MailSynchronizationResult Failed => new() { CompletedState = SynchronizationCompletedState.Failed };
+    public static MailSynchronizationResult Failed(Exception exception) => new()
+    {
+        CompletedState = SynchronizationCompletedState.Failed,
+        Exception = exception
+    };
 }
diff --git a/Wino.Core.Domain/Models/Synchronization/SynchronizationActionItem.cs b/Wino.Core.Domain/Models/Synchronization/SynchronizationActionItem.cs
new file mode 100644
index 00000000..655e8918
--- /dev/null
+++ b/Wino.Core.Domain/Models/Synchronization/SynchronizationActionItem.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Wino.Core.Domain.Models.Synchronization;
+
+/// <summary>
+/// Represents a single grouped synchronization action displayed in the sync status flyout.
+/// For example: "Deleting 3 mail(s)" or "Marking folder as read".
+/// </summary>
+public class SynchronizationActionItem
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public Guid AccountId { get; set; }
+    public string AccountName { get; set; }
+    public string Description { get; set; }
+}
diff --git a/Wino.Core.Domain/Models/Synchronization/SynchronizerErrorContext.cs b/Wino.Core.Domain/Models/Synchronization/SynchronizerErrorContext.cs
new file mode 100644
index 00000000..9ba4c84c
--- /dev/null
+++ b/Wino.Core.Domain/Models/Synchronization/SynchronizerErrorContext.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Core.Domain.Models.Synchronization;
+
+/// <summary>
+/// Contains context information about a synchronizer error
+/// </summary>
+public class SynchronizerErrorContext
+{
+    /// <summary>
+    /// Account associated with the error
+    /// </summary>
+    public MailAccount Account { get; set; }
+
+    /// <summary>
+    /// Gets or sets the error code
+    /// </summary>
+    public int? ErrorCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the error message
+    /// </summary>
+    public string ErrorMessage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the request bundle associated with the error
+    /// </summary>
+    public IRequestBundle RequestBundle { get; set; }
+
+    /// <summary>
+    /// Gets or sets additional data associated with the error
+    /// </summary>
+    public Dictionary<string, object> AdditionalData { get; set; } = new Dictionary<string, object>();
+
+    /// <summary>
+    /// Gets or sets the exception associated with the error
+    /// </summary>
+    public Exception Exception { get; set; }
+
+    /// <summary>
+    /// Gets or sets the severity of the error for retry decision making.
+    /// </summary>
+    public SynchronizerErrorSeverity Severity { get; set; } = SynchronizerErrorSeverity.Fatal;
+
+    /// <summary>
+    /// Gets or sets the category of the error for targeted handling.
+    /// </summary>
+    public SynchronizerErrorCategory Category { get; set; } = SynchronizerErrorCategory.Unknown;
+
+    /// <summary>
+    /// Gets or sets the current retry attempt count.
+    /// </summary>
+    public int RetryCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum number of retries allowed.
+    /// </summary>
+    public int MaxRetries { get; set; } = 3;
+
+    /// <summary>
+    /// Gets or sets the suggested delay before retrying.
+    /// </summary>
+    public TimeSpan? RetryDelay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the folder ID associated with the error for partial failure tracking.
+    /// </summary>
+    public Guid? FolderId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the folder name for display purposes.
+    /// </summary>
+    public string FolderName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the type of operation that failed.
+    /// Examples: "FolderSync", "MailSync", "RequestExecution", "Idle"
+    /// </summary>
+    public string OperationType { get; set; }
+
+    /// <summary>
+    /// Gets whether this error should be retried based on severity and retry count.
+    /// </summary>
+    public bool ShouldRetry => Severity == SynchronizerErrorSeverity.Transient && RetryCount < MaxRetries;
+
+    /// <summary>
+    /// Gets whether synchronization can continue despite this error.
+    /// </summary>
+    public bool CanContinueSync => Severity == SynchronizerErrorSeverity.Recoverable ||
+                                    (Severity == SynchronizerErrorSeverity.Transient && RetryCount >= MaxRetries);
+}
diff --git a/Wino.Core.Domain/Models/Updates/UpdateNoteSection.cs b/Wino.Core.Domain/Models/Updates/UpdateNoteSection.cs
new file mode 100644
index 00000000..0bb8f7c8
--- /dev/null
+++ b/Wino.Core.Domain/Models/Updates/UpdateNoteSection.cs
@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace Wino.Core.Domain.Models.Updates;
+
+public class UpdateNoteSection
+{
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = string.Empty;
+
+    [JsonPropertyName("description")]
+    public string Description { get; set; } = string.Empty;
+
+    [JsonPropertyName("imageUrl")]
+    public string ImageUrl { get; set; } = string.Empty;
+
+    [JsonPropertyName("imageWidth")]
+    public double? ImageWidth { get; set; }
+
+    [JsonPropertyName("imageHeight")]
+    public double? ImageHeight { get; set; }
+
+    /// <summary>Gets the image width for binding, returning NaN for auto-sizing when not specified.</summary>
+    public double ActualImageWidth => ImageWidth ?? double.NaN;
+
+    /// <summary>Gets the image height for binding, returning NaN for auto-sizing when not specified.</summary>
+    public double ActualImageHeight => ImageHeight ?? double.NaN;
+}
diff --git a/Wino.Core.Domain/Models/Updates/UpdateNotes.cs b/Wino.Core.Domain/Models/Updates/UpdateNotes.cs
new file mode 100644
index 00000000..fad7d80f
--- /dev/null
+++ b/Wino.Core.Domain/Models/Updates/UpdateNotes.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+namespace Wino.Core.Domain.Models.Updates;
+
+public class UpdateNotes
+{
+    [JsonPropertyName("sections")]
+    public List<UpdateNoteSection> Sections { get; set; } = [];
+}
diff --git a/Wino.Core.Domain/Translations/bg_BG/resources.json b/Wino.Core.Domain/Translations/bg_BG/resources.json
index 4ef469a9..e00be13b 100644
--- a/Wino.Core.Domain/Translations/bg_BG/resources.json
+++ b/Wino.Core.Domain/Translations/bg_BG/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Този акаунт изисква пълна ресинхронизация, за да продължи да работи. Моля, изчакайте, докато Wino ресинхронизира съобщенията ви...",
     "AccountContactNameYou": "Вие",
     "AccountCreationDialog_Completed": "всичко е готово",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Зареждане на календарни данни.",
     "AccountCreationDialog_FetchingEvents": "Извличане на събитията от календара.",
     "AccountCreationDialog_FetchingProfileInformation": "Извличане на данните за профила.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Ако браузърът ви не се е стартирал автоматично, за да завърши удостоверяването:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "инициализиране",
     "AccountCreationDialog_PreparingFolders": "В момента получаваме информация за папките.",
     "AccountCreationDialog_SigninIn": "Информацията за акаунта се запазва.",
+    "Purchased": "Покупено",
     "AccountEditDialog_Message": "Име на акаунта",
     "AccountEditDialog_Title": "Редактиране на акаунта",
     "AccountPickerDialog_Title": "Изберете акаунт",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Променете името на акаунта в Wino и задайте желаното име на изпращача.",
     "AccountDetailsPage_ColorPicker_Title": "Цвят на акаунта",
     "AccountDetailsPage_ColorPicker_Description": "Задайте цвят на акаунта, за да оцветите символа му в списъка.",
+    "AccountDetailsPage_TabGeneral": "Общи",
+    "AccountDetailsPage_TabMail": "Поща",
+    "AccountDetailsPage_TabCalendar": "Календар",
+    "AccountDetailsPage_CalendarListDescription": "Изберете календар, за да конфигурирате неговите настройки.",
     "AddHyperlink": "Добавяне",
     "AppCloseBackgroundSynchronizationWarningTitle": "Синхронизация на заден план",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Приложението не е настроено да се стартира при стартиране на Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP акаунт",
     "Busy": "Зает",
     "Buttons_AddAccount": "Добавяне на акаунт",
+    "Buttons_FixAccount": "Поправи акаунта",
     "Buttons_AddNewAlias": "Добавяне на нов псевдоним",
     "Buttons_Allow": "Позволяване",
+    "Buttons_Apply": "Приложи",
     "Buttons_ApplyTheme": "Прилагане на темата",
     "Buttons_Browse": "Преглед",
     "Buttons_Cancel": "Отказ",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Редактиране",
     "Buttons_EnableImageRendering": "Активиране",
     "Buttons_Multiselect": "Избор на няколко",
+    "Buttons_Manage": "Управлявай",
     "Buttons_No": "Не",
     "Buttons_Open": "Отваряне",
     "Buttons_Purchase": "Купете",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Запазване",
     "Buttons_SaveConfiguration": "Запазване на конфигурацията",
     "Buttons_Send": "Изпращане",
+    "Buttons_SendToServer": "Изпрати към сървър",
     "Buttons_Share": "Споделяне",
     "Buttons_SignIn": "Вход",
     "Buttons_Sync": "Синхронизиране",
     "Buttons_SyncAliases": "Синхронизиране на псевдонимите",
     "Buttons_TryAgain": "Нов опит",
     "Buttons_Yes": "Да",
+    "Sync_SynchronizingFolder": "Синхронизиране на {0} {1}",
+    "Sync_DownloadedMessages": "Изтеглени {0} съобщения от {1}",
+    "SyncAction_Archiving": "Архивиране на {0} имейл(а)",
+    "SyncAction_ClearingFlag": "Премахване на флага от {0} имейл(а)",
+    "SyncAction_CreatingDraft": "Създаване на чернова",
+    "SyncAction_CreatingEvent": "Създаване на събитие",
+    "SyncAction_Deleting": "Изтриване на {0} имейл(а)",
+    "SyncAction_EmptyingFolder": "Изпразване на папка",
+    "SyncAction_MarkingAsRead": "Маркиране на {0} имейл(а) като прочетени",
+    "SyncAction_MarkingAsUnread": "Маркиране на {0} имейл(а) като непрочетени",
+    "SyncAction_MarkingFolderAsRead": "Маркиране на папка като прочетена",
+    "SyncAction_Moving": "Преместване на {0} имейл(а)",
+    "SyncAction_MovingToFocused": "Преместване на {0} имейл(а) към Focused",
+    "SyncAction_RenamingFolder": "Преименуване на папка",
+    "SyncAction_SendingMail": "Изпращане на имейл",
+    "SyncAction_SettingFlag": "Поставяне на флаг на {0} имейл(а)",
+    "SyncAction_SynchronizingAccount": "Синхронизирам {0}",
+    "SyncAction_SynchronizingAccounts": "Синхронизирам {0} акаунт(и)",
+    "SyncAction_SynchronizingCalendarData": "Синхронизиране на календарни данни",
+    "SyncAction_SynchronizingCalendarEvents": "Синхронизиране на календарни събития",
+    "SyncAction_SynchronizingCalendarMetadata": "Синхронизиране на календарни метаданни",
+    "SyncAction_Unarchiving": "Разархивиране на {0} имейл(а)",
     "CalendarAllDayEventSummary": "целодневни събития",
     "CalendarDisplayOptions_Color": "Цвят",
     "CalendarDisplayOptions_Expand": "Разширяване",
+    "CalendarEventResponse_Accept": "Приеми",
+    "CalendarEventResponse_AcceptedResponse": "Прието",
+    "CalendarEventResponse_Decline": "Откажи",
+    "CalendarEventResponse_DeclinedResponse": "Отказано",
+    "CalendarEventResponse_NotResponded": "Без отговор",
+    "CalendarEventResponse_Tentative": "Възможно",
+    "CalendarEventResponse_TentativeResponse": "Възможно",
+    "CalendarEventRsvpPanel_Accept": "Приеми",
+    "CalendarEventRsvpPanel_AddMessage": "Добавете съобщение към отговора... (по избор)",
+    "CalendarEventRsvpPanel_Decline": "Откажи",
+    "CalendarEventRsvpPanel_Message": "Съобщение",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Изпрати съобщение с отговор",
+    "CalendarEventRsvpPanel_Tentative": "Възможно",
+    "CalendarEventRsvpPanel_Title": "Опции за отговор",
+    "CalendarAttendeeStatus_Accepted": "Прието",
+    "CalendarAttendeeStatus_Declined": "Отхвърлено",
+    "CalendarAttendeeStatus_NeedsAction": "Изисква действие",
+    "CalendarAttendeeStatus_Tentative": "Възможно",
+    "CalendarEventDetails_Attachments": "Прикачени файлове",
+    "CalendarEventCompose_AddAttachment": "Добави прикачен файл",
+    "CalendarEventCompose_AllDay": "Цял ден",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Прикачените файлове не се поддържат за календарите CalDAV.",
+    "CalendarEventCompose_EndDate": "Крайна дата",
+    "CalendarEventCompose_EndTime": "Краен час",
+    "CalendarEventCompose_Every": "на всеки",
+    "CalendarEventCompose_ForWeekdays": "за",
+    "CalendarEventCompose_FrequencyDay": "ден",
+    "CalendarEventCompose_FrequencyDayPlural": "дни",
+    "CalendarEventCompose_FrequencyMonth": "месец",
+    "CalendarEventCompose_FrequencyMonthPlural": "месеци",
+    "CalendarEventCompose_FrequencyWeek": "седмица",
+    "CalendarEventCompose_FrequencyWeekPlural": "седмици",
+    "CalendarEventCompose_FrequencyYear": "година",
+    "CalendarEventCompose_FrequencyYearPlural": "години",
+    "CalendarEventCompose_Location": "Местоположение",
+    "CalendarEventCompose_LocationPlaceholder": "Добавете местоположение",
+    "CalendarEventCompose_NewEventButton": "Ново събитие",
+    "CalendarEventCompose_DefaultCalendarHint": "Можете да изберете календар по подразбиране за нови събития в настройките на календара.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Отворете настройките на календара",
+    "CalendarEventCompose_NoCalendarsMessage": "Всe още няма налични календари за създаване на събитиe",
+    "CalendarEventCompose_NoCalendarsTitle": "Няма налични календари",
+    "CalendarEventCompose_NoEndDate": "Няма крайна дата",
+    "CalendarEventCompose_Notes": "Бележки",
+    "CalendarEventCompose_PickCalendarTitle": "Изберете календар",
+    "CalendarEventCompose_Recurring": "Повтарящо се",
+    "CalendarEventCompose_RecurringSummary": "Се повтаря на всеки {0} {1}{2} {3} валидно {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Се повтаря {0}{1} {2} валидно {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Повтаряйте на всеки",
+    "CalendarEventCompose_SelectCalendar": "Изберете календар",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Се случва на {0} {1}",
+    "CalendarEventCompose_StartDate": "Начална дата",
+    "CalendarEventCompose_StartTime": "Начален час",
+    "CalendarEventCompose_TimeRangeSummary": "от {0} до {1}",
+    "CalendarEventCompose_Title": "Заглавие на събитието",
+    "CalendarEventCompose_TitlePlaceholder": "Добавете заглавие",
+    "CalendarEventCompose_Until": "до",
+    "CalendarEventCompose_UntilSummary": " до {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Датата на край за цял ден трябва да е след началната дата.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Един или повече участници имат невалиден имейл адрес.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Датата на край на повторението трябва да е на или след датата на началото на събитието.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Краят трябва да е по-късен от началото.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Един или повече прикачени файлове вече не са налични: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Изберете календар преди да създадете събитието.",
+    "CalendarEventCompose_ValidationMissingTitle": "Въведете заглавие на събитието преди да го създадете.",
+    "CalendarEventCompose_ValidationTitle": "Проверката на събитието не успя",
+    "CalendarEventCompose_WeekdaySummary": "  на {0}",
+    "CalendarEventCompose_Weekday_Friday": "F",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "Сб",
+    "CalendarEventCompose_Weekday_Sunday": "Нд",
+    "CalendarEventCompose_Weekday_Thursday": "Чет",
+    "CalendarEventCompose_Weekday_Tuesday": "Вт",
+    "CalendarEventCompose_Weekday_Wednesday": "Ср",
+    "CalendarEventDetails_Details": "Детайли",
+    "CalendarEventDetails_EditSeries": "Редактиране на серия",
+    "CalendarEventDetails_Editing": "Редактиране",
+    "CalendarEventDetails_InviteSomeone": "Поканете някого",
+    "CalendarEventDetails_JoinOnline": "Присъединете се онлайн",
+    "CalendarEventDetails_Organizer": "Организатор",
+    "CalendarEventDetails_People": "Хора",
+    "CalendarEventDetails_ReadOnlyEvent": "Събитие само за четене",
+    "CalendarEventDetails_Reminder": "Напомняне",
+    "CalendarReminder_StartedHoursAgo": "Започна преди {0} часа",
+    "CalendarReminder_StartedMinutesAgo": "Започна преди {0} минути",
+    "CalendarReminder_StartedNow": "Започна точно сега",
+    "CalendarReminder_StartingNow": "Започва сега",
+    "CalendarReminder_StartsInHours": "Ще започне след {0} часа",
+    "CalendarReminder_StartsInMinutes": "Ще започне след {0} минути",
+    "CalendarReminder_SnoozeAction": "Отложи",
+    "CalendarReminder_SnoozeMinutesOption": "{0} минути",
+    "CalendarEventDetails_ShowAs": "Покажи като",
+    "CalendarShowAs_Free": "Свободен",
+    "CalendarShowAs_Tentative": "Временно",
+    "CalendarShowAs_Busy": "Зает",
+    "CalendarShowAs_OutOfOffice": "Извън офиса",
+    "CalendarShowAs_WorkingElsewhere": "Работя другаде",
     "CalendarItem_DetailsPopup_JoinOnline": "Присъединяване онлайн",
     "CalendarItem_DetailsPopup_ViewEventButton": "Преглед на събитието",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Преглед на сериите",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} е копирано в клипборда.",
     "ClipboardTextCopied_Title": "Копирано",
     "ClipboardTextCopyFailed_Message": "Неуспешно копиране на {0} в клипборда.",
+    "ContactInfoBar_ErrorTitle": "Грешка при зареждане на информация за контакти",
+    "ContactInfoBar_SuccessTitle": "Информация за контактите заредена",
+    "ContactInfoBar_WarningTitle": "Възможна е непълна информация за контакт",
     "ComingSoon": "Очаквайте скоро...",
     "ComposerAttachmentsDragDropAttach_Message": "Прикачване",
     "ComposerAttachmentsDropZone_Message": "Пуснете файловете си тук",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Име на връзката с акаунта",
     "DialogMessage_DeleteAccountConfirmationMessage": "Изтриване на {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Всички данни, свързани с този акаунт, ще бъдат изтрити от диска за постоянно.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Изтриване на шаблона \\\"{0}\\\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Изтриване на шаблон за имейл",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Това ще изтрие всички събития от серията. Искате ли да продължите?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Изтриване на повтаряща се серия",
     "DialogMessage_DiscardDraftConfirmationMessage": "Тази чернова ще бъде отхвърлена. Искате ли да продължите?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Отхвърляне на черновата",
     "DialogMessage_EmptySubjectConfirmation": "Липсваща тема",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Светъл режим",
     "Emoji": "Емотикони",
     "Error_FailedToSetupSystemFolders_Title": "Неуспешна настройка на системните папки",
+    "Exception_AccountNeedsAttention_Title": "Акаунтът се нуждае от внимание",
+    "Exception_AccountNeedsAttention_Message": "'{0}' изисква вашето внимание, за да продължите.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail не може да намери Microsoft Edge WebView2 Runtime. Моля, инсталирайте или поправете runtime-а, за да се показва правилно съдържанието на съобщението.",
+    "Exception_WebView2RuntimeMissing_Title": "Изисква се WebView2 Runtime",
     "Exception_AuthenticationCanceled": "Удостоверяването е отменено",
     "Exception_CustomThemeExists": "Тази тема вече съществува.",
     "Exception_CustomThemeMissingName": "Трябва да посочите име.",
     "Exception_CustomThemeMissingWallpaper": "Трябва да предоставите персонализирано фоново изображение.",
     "Exception_FailedToSynchronizeAliases": "Неуспешно синхронизиране на псевдонимите",
+    "Exception_FailedToSynchronizeCalendarData": "Неуспешна синхронизация на календарните данни",
+    "Exception_FailedToSynchronizeCalendarEvents": "Неуспешна синхронизация на календарните събития",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Неуспешна синхронизация на календарните детайли",
     "Exception_FailedToSynchronizeFolders": "Неуспешно синхронизиране на папките",
     "Exception_FailedToSynchronizeProfileInformation": "Неуспешно синхронизиране на информацията за профила",
     "Exception_GoogleAuthCallbackNull": "Callback uri е празенl при активиране.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Преместване в Нежелани",
     "HoverActionOption_ToggleFlag": "Отбелязване / Без отбелязване",
     "HoverActionOption_ToggleRead": "Прочетено / Непрочетено",
+    "KeyboardShortcuts_FailedToReset": "Неуспешно нулиране на клавишните комбинации.",
+    "KeyboardShortcuts_FailedToUpdate": "Неуспешно актуализиране на клавишните комбинации",
+    "KeyboardShortcuts_MailoperationAction": "Действие",
+    "KeyboardShortcuts_Action": "Действие",
+    "KeyboardShortcuts_FailedToLoad": "Неуспешно зареждане на клавишните комбинации.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Моля, въведете клавиш за клавишната комбинация.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Моля, изберете действие за клавишната комбинация.",
+    "KeyboardShortcuts_EnterKey": "Моля, въведете клавиш за клавишната комбинация.",
+    "KeyboardShortcuts_SelectOperation": "Моля, изберете действие за клавишната комбинация.",
+    "KeyboardShortcuts_ShortcutInUse": "Тази клавишна комбинация вече се използва от друга клавишна комбинация.",
+    "KeyboardShortcuts_FailedToSave": "Неуспешно запазване на клавишната комбинация.",
+    "KeyboardShortcuts_FailedToDelete": "Неуспешно изтриване на клавишната комбинация.",
+    "KeyboardShortcuts_PageDescription": "Настройте клавишни комбинации за бързи операции с поща. Натиснете клавиши, докато полето за въвеждане на клавиша е фокусирано, за да заснемете клавишни комбинации.",
+    "KeyboardShortcuts_Add": "Добави клавишна комбинация",
+    "KeyboardShortcuts_EditTitle": "Редактиране на клавишна комбинация",
+    "KeyboardShortcuts_ResetToDefaults": "Възстанови по подразбиране",
+    "KeyboardShortcuts_PressKeysHere": "Натиснете тук клавишите...",
+    "KeyboardShortcuts_KeyCombination": "Клавишна комбинация",
+    "KeyboardShortcuts_FocusArea": "Фокусирайте полето по-горе и натиснете желаната клавишна комбинация",
+    "KeyboardShortcuts_Modifiers": "Клавиши за модификатори",
+    "KeyboardShortcuts_Mode": "Режим на приложението",
+    "KeyboardShortcuts_ModeMail": "Поща",
+    "KeyboardShortcuts_ModeCalendar": "Календар",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Превключване на прочетено/непрочетено",
+    "KeyboardShortcuts_ActionToggleFlag": "Превключване на флаг",
+    "KeyboardShortcuts_ActionToggleArchive": "Превключване на архивиране/отархивиране",
     "ImageRenderingDisabled": "Показването на изображения е деактивирано за това съобщение.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Метод за удостоверяване",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Сигурност на връзката",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Потребител",
     "IMAPSetupDialog_UsernamePlaceholder": "ivanivanov, ivanivanov@primer.com, domain/ivanivanov",
     "IMAPSetupDialog_UseSameConfig": "Използване на същото потребителско име и парола за изпращане на имейли",
+    "ImapCalDavSettingsPage_TitleCreate": "Настройка IMAP и календар",
+    "ImapCalDavSettingsPage_TitleEdit": "Редактиране на настройките за IMAP и календар",
+    "ImapCalDavSettingsPage_Subtitle": "Конфигурирайте IMAP/SMTP и опционална синхронизация на календара за този акаунт.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Основна настройка",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Въведете вашата идентичност и данни за вход. Wino може да се опита да открие настройките на сървъра автоматично.",
+    "ImapCalDavSettingsPage_BasicTab": "Основни",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Разреши поддръжка на календар",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Автоматично откриване на настройки за поща",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Настройки за пощата открити и приложени.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Разширени настройки",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Въведете настройки на сървъра ръчно, ако автоматичното откриване е недостъпно или неправилно.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Разширени",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Настройки на календара",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Изберете как календарните данни да работят за този IMAP акаунт.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Режим на календара",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Сигурност на връзката",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Метод на удостоверяване",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Изключен",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV синхронизация",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Само локален календар",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Календарът е деактивиран за този акаунт.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Елементите от календара се синхронизират с вашия CalDAV сървър.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Елементите от календара се съхраняват само на този компютър и не се синхронират в мрежата.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Как работи локалният календар",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Само локален календар",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Локалният календар запазва всички събития само на вашия компютър. Нищо не се синхронизира с iCloud, Yahoo или други доставчици.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV URL на услугата",
+    "ImapCalDavSettingsPage_CalDavUsername": "Потребителско име за CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Парола за CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Проверка за CalDAV е необходима само когато режимът на календар е CalDAV синхронизация.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "Изисква се CalDAV URL на услугата.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV URL на услугата трябва да бъде абсолютен URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV потребителското име е задължително.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV паролата е задължителна.",
+    "ImapCalDavSettingsPage_TestImapButton": "Тест IMAP връзка",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Тест CalDAV връзка",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP връзката е успешно тествана.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV връзката е успешно тествана.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Настройките на акаунта са валидирани и записани.",
+    "ImapCalDavSettingsPage_ICloudHint": "Използвайте парола за приложение, генерирана от настройките на вашия Apple акаунт.",
+    "ImapCalDavSettingsPage_YahooHint": "Използвайте парола за приложение от настройките за сигурност на вашия Yahoo акаунт.",
     "Info_AccountCreatedMessage": "{0} е създаден",
     "Info_AccountCreatedTitle": "Създаване на акаунт",
     "Info_AccountCreationFailedTitle": "Неуспешно създаване на акаунт",
     "Info_AccountDeletedMessage": "{0} е изтрит успешно.",
     "Info_AccountDeletedTitle": "Акаунтът е изтрит",
     "Info_AccountIssueFixFailedTitle": "Неуспешно",
+    "Info_AccountIssueFixImapMessage": "Отворете страницата за IMAP и календарни настройки, за да въведете отново данните за сървъра.",
+    "Info_AccountAttentionRequiredMessage": "Този акаунт се нуждае от внимание.",
+    "Info_AccountAttentionRequiredClickableMessage": "Кликнете, за да поправите този акаунт и да го ресинхронизирайте.",
+    "Info_AccountAttentionRequiredAction": "Поправи",
+    "Info_AccountAttentionRequiredActionHint": "Кликнете върху Поправи, за да разрешите проблема с този акаунт.",
     "Info_AccountIssueFixSuccessMessage": "Отстранени са всички проблеми с акаунтите.",
     "Info_AccountIssueFixSuccessTitle": "Успешно",
     "Info_AttachmentOpenFailedMessage": "Не може да се отвори този прикачен файл.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Синхронизирането на тази папка е деактивирано.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Изключена папка",
     "Justify": "Двустранно",
+    "MenuUpdateAvailable": "Налична актуализация",
     "Left": "Ляво",
     "Link": "Връзка",
     "LinkedAccountsCreatePolicyMessage": "Трябва да имате поне 2 акаунта, за да създадете връзка.\nВръзката ще бъде премахната при запазване.",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Разархивиране",
     "MailOperation_ViewMessageSource": "Преглед на изходния код",
     "MailOperation_Zoom": "Мащаб",
+    "MailsDragging": "Преместване на {0} елемент(а)",
     "MailsSelected": "{0} избран(и) елемент(и)",
     "MarkFlagUnflag": "Отбелязано/Без отбелязване",
     "MarkReadUnread": "Маркиране като прочетено/непрочетено",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Нов имейл",
     "Notifications_WinoUpdatedMessage": "Вижте новата версия {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail е актуализиран.",
+    "Notifications_StoreUpdateAvailableTitle": "Налична актуализация",
+    "Notifications_StoreUpdateAvailableMessage": "По-нова версия на Wino Mail е готова за инсталиране от Microsoft Store.",
     "OnlineSearchFailed_Message": "Неуспешно търсене\n{0}\n\nПоказване на офлайн имейли.",
     "OnlineSearchTry_Line1": "Не можете да намерите това, което търсите?",
     "OnlineSearchTry_Line2": "Опитайте онлайн търсене.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Малък",
     "Photos": "Снимки",
     "PreparingFoldersMessage": "Подготовка на папките",
-    "ProtocolLogAvailable_Message": "Протоколните дневници са достъпни за диагностика.",
     "ProviderDetail_Gmail_Description": "Акаунт в Google",
     "ProviderDetail_iCloud_Description": "Акаунт в Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Търсене",
     "SearchingIn": "Търсене в",
     "SearchPivotName": "Резултати",
+    "Settings_KeyboardShortcuts_Title": "Клавишни комбинации",
+    "Settings_KeyboardShortcuts_Description": "Управлявайте клавишните комбинации за бързи действия в пощата.",
     "SettingConfigureSpecialFolders_Button": "Конфигуриране",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Конфигурация на IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Променете настройките на входящия/изходящия сървър.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP и календарни настройки",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Отворете специализираната страница с настройки за IMAP, SMTP и CalDAV за този акаунт.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Отворете настройки",
     "SettingsAbout_Description": "Научете повече за Wino.",
     "SettingsAbout_Title": "За приложението",
     "SettingsAboutGithub_Description": "Към хранилището на GitHub за проследяване на проблеми.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Локално",
     "SettingsAppPreferences_SearchMode_Online": "Онлайн",
     "SettingsAppPreferences_SearchMode_Title": "Режим на търсене по подразбиране",
+    "SettingsAppPreferences_ApplicationMode_Title": "Режим по подразбиране на приложението.",
+    "SettingsAppPreferences_ApplicationMode_Description": "Изберете режим по подразбиране за стартиране на Wino, когато не е явно зададен активиращ тип.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Поща",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Календар",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail ще продължи да работи на заден план. Ще бъдете уведомявани за пристигането на нови имейли.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Работа на заден план",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail ще продължи да работи в системната област. Можете да го стартирате, като щракнете върху иконата. Ще бъдете уведомявани при пристигането на нови имейли.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Възникна фатална грешка при промяна на режима на стартиране на Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Стартиране в минимизиран вид при стартиране на Windows",
     "SettingsAppPreferences_Title": "Предпочитания за приложението",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Скрийте бутона за акаунта Wino в заглавната лента",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Скрийте бутона за профила в заглавната лента, който отваря изскачащото меню за акаунта Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Уведомления за обновления в магазина",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Показвайте уведомления и действия в долния колонтитър, когато има налично обновление на Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "AI действия",
+    "SettingsAppPreferences_AiActions_Description": "Изберете езиците за AI по подразбиране и къде трябва да се запазват резюметата.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Език по подразбиране за превод",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Изберете език по подразбиране за превод от AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Език за обобщение",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Изберете език за обобщение за бъдещите AI резюмета.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Път за запис на резюме по подразбиране",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Изберете папка, която Wino да използва по подразбиране при запазване на AI резюмета.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Използвайте системното местоположение за запис по подразбиране",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Тази папка не съществува. За резюметата ще се използва местоположението за запис по подразбиране.",
     "SettingsAutoSelectNextItem_Description": "Избиране на следващия елемент, след като изтриете или преместите имейл.",
     "SettingsAutoSelectNextItem_Title": "Автоматично избиране на следващия елемент",
     "SettingsAvailableThemes_Description": "Изберете тема от собствената колекция на Wino по ваш вкус или приложете свои собствени теми.",
     "SettingsAvailableThemes_Title": "Налични теми",
     "SettingsCalendarSettings_Description": "Променете първия ден от седмицата, височината на часовата клетка и други...",
     "SettingsCalendarSettings_Title": "Настройки на календара",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Продължителност на отлагане по подразбиране",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Задайте по подразбиране време за отлагане на календарните напомняния.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Формат на заглавието на деня във времевия изглед",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Изберете как да се извеждат горните етикети на деня в изгледите за ден, седмица и работна седмица. Използвайте токени за форматиране на дати като ddd, dd, MMM или dddd.",
     "SettingsComposer_Title": "Съставяне",
     "SettingsComposerFont_Title": "Шрифт по подразбиране за съставяне",
     "SettingsComposerFontFamily_Description": "Промяна на шрифтовото семейство и размера на шрифта по подразбиране за съставяне на имейли.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Канал в Discord",
     "SettingsEditLinkedInbox_Description": "Добавяне/премахване на акаунти, преименуване или прекъсване на връзката между акаунтите.",
     "SettingsEditLinkedInbox_Title": "Редактиране на свързаната входяща поща",
+    "SettingsWindowBackdrop_Title": "Фон на прозореца",
+    "SettingsWindowBackdrop_Description": "Изберете ефект на фона за прозорците на Wino.",
+    "SettingsWindowBackdrop_Disabled": "Изборът на фона на прозореца е деактивиран, когато темата на приложението е различна от По подразбиране.",
     "SettingsElementTheme_Description": "Избор на тема на Windows за Wino",
     "SettingsElementTheme_Title": "Цветови режим",
     "SettingsElementThemeSelectionDisabled": "Изборът на цветови режим е забранен, когато е избрана тема на приложението, различна от тази по подразбиране.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Псевдоними",
     "SettingsEditAccountDetails_Title": "Редактиране на данните на акаунта",
     "SettingsEditAccountDetails_Description": "Променете името на акаунта, името на подателя и задайте нов цвят, ако желаете.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Промените са запазени.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Данните за акаунта ви са успешно актуализирани.",
     "SettingsManageLink_Description": "Преместете елементите, за да добавите нова връзка или да премахнете съществуваща връзка.",
     "SettingsManageLink_Title": "Управление на връзката",
     "SettingsMarkAsRead_Description": "Променете какво трябва да се случи с избрания елемент.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Известия",
     "SettingsNotificationsAndTaskbar_Description": "Променете дали да се показват известия и значка в лентата на задачите за този акаунт.",
     "SettingsNotificationsAndTaskbar_Title": "Известия и лента на задачите",
+    "SettingsHome_Title": "Начало",
+    "SettingsHome_SearchTitle": "Намери настройка",
+    "SettingsHome_SearchDescription": "Търсете по функция, тема или ключова дума, за да стигнете директно до правилната страница за настройки.",
+    "SettingsHome_SearchPlaceholder": "Търсене в настройките",
+    "SettingsHome_SearchExamples": "Пример: тема, съхранение, език, подпис",
+    "SettingsHome_QuickLinks_Title": "Бързи връзки",
+    "SettingsHome_QuickLinks_Description": "Бърз достъп до настройките, които хората използват най-често.",
+    "SettingsHome_StorageCard_Description": "Проверете колко локално MIME съдържание съхранява Wino на това устройство и го почистете при нужда.",
+    "SettingsHome_StorageEmptySummary": "Все още не е открито кеширано MIME съдържание.",
+    "SettingsHome_StorageLoading": "Проверка на използването на локално MIME съдържание...",
+    "SettingsHome_Tips_Title": "Съвети и трикове",
+    "SettingsHome_Tips_Description": "Няколко малки промени могат да направят Wino по-личен.",
+    "SettingsHome_Tip_Theme": "Искате тъмна тема или промени в акцента? Отворете Персонализация.",
+    "SettingsHome_Tip_Background": "Използвайте настройките на приложението, за да контролирате стартиране и фоновата синхронизация.",
+    "SettingsHome_Tip_Shortcuts": "Клавишните комбинации ви помагат да преглеждате пощата по-бързо.",
+    "SettingsHome_Resources_Title": "Полезни връзки",
+    "SettingsHome_Resources_Description": "Отворете ресурсите на проекта, информация за поддръжка и канали за издания.",
     "SettingsOptions_Title": "Настройки",
+    "SettingsOptions_GeneralSection": "Общи",
+    "SettingsOptions_MailSection": "Поща",
+    "SettingsOptions_CalendarSection": "Календар",
+    "SettingsOptions_MoreComingSoon": "Още опции скоро.",
+    "SettingsOptions_HeroDescription": "Персонализирайте опита си с Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} акаунт(а) конфигуриран(и)",
+    "SettingsSearch_ManageAccounts_Keywords": "акаунт;акаунти;пощенска кутия;пощенски кутии;псевдоним;псевдоними;профил;адрес;адреси",
+    "SettingsSearch_AppPreferences_Keywords": "стартиране;фонов режим;стартиране;синхронизация;известие;известия;търсене;системна лента;по подразбиране",
+    "SettingsSearch_LanguageTime_Keywords": "език;време;часовник;локал;регион;формат;24-часов;24ч",
+    "SettingsSearch_Personalization_Keywords": "тема;тъмна;светла;външен вид;акцент;цвят;цвят;режим;оформление;плътност",
+    "SettingsSearch_About_Keywords": "за;версия;уебсайт;поверителност;GitHub;дарение;магазин;поддръжка",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "клавишна комбинация;клавишни комбинации;горещ клавиш;горещи клавиши;клавиатура;клавиши",
+    "SettingsSearch_MessageList_Keywords": "съобщение;съобщения;списък;нишки;нишки;аватар;преглед;изпращач",
+    "SettingsSearch_ReadComposePane_Keywords": "четец;съставяне;съставител;шрифт;шрифтове;външно съдържание;дисплей;четене",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "подпис;подписи;криптиране;сертификат;сертификати;S/MIME;S/MIME;сигурност",
+    "SettingsSearch_Storage_Keywords": "съхранение;кеш; кеширане; MIME; диск; пространство; почистване; почистване; локални данни",
+    "SettingsSearch_CalendarSettings_Keywords": "календар;седмица;часове;график;събитие;събития",
     "SettingsPaneLengthReset_Description": "Възстановете първоначалния размер на списъка с имейли, ако имате проблеми с него.",
     "SettingsPaneLengthReset_Title": "Възстановяване размера на списъка с имейли",
     "SettingsPaypal_Description": "Покажете много повече любов ❤️ Всички дарения са добре дошли.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Показване на часовете в 24-часов формат",
     "SettingsPrivacyPolicy_Description": "Прегледайте политиката за поверителност.",
     "SettingsPrivacyPolicy_Title": "Политика за поверителност",
+    "SettingsWebsite_Description": "Отворете уебсайта на Wino Mail.",
+    "SettingsWebsite_Title": "Уебсайт",
     "SettingsReadComposePane_Description": "Шрифтове, външно съдържание.",
     "SettingsReadComposePane_Title": "Четене и съставяне",
     "SettingsReader_Title": "Четене",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Показване визуализация на текста",
     "SettingsShowSenderPictures_Description": "Скриване/показване на миниатюрите на снимките на изпращача.",
     "SettingsShowSenderPictures_Title": "Показване на аватарите на подателите",
+    "SettingsEmailTemplates_Title": "Шаблони за имейли",
+    "SettingsEmailTemplates_Description": "Управление на шаблоните за електронна поща.",
+    "SettingsEmailTemplates_CreatePageTitle": "Нов шаблон",
+    "SettingsEmailTemplates_EditPageTitle": "Редактиране на шаблон",
+    "SettingsEmailTemplates_NewTemplateTitle": "Нов шаблон",
+    "SettingsEmailTemplates_NewTemplateDescription": "Създайте нов имейл шаблон.",
+    "SettingsEmailTemplates_NameTitle": "Име",
+    "SettingsEmailTemplates_NamePlaceholder": "Име на шаблон",
+    "SettingsEmailTemplates_DescriptionTitle": "Описание",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Опционално описание",
+    "SettingsEmailTemplates_ContentTitle": "Съдържание на шаблона",
+    "SettingsEmailTemplates_ContentDescription": "Редактирайте HTML съдържанието за този шаблон.",
+    "SettingsEmailTemplates_NameRequired": "Името на шаблона е задължително.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Елемент за стартиране",
     "SettingsStore_Description": "Покажете малко любов ❤️",
     "SettingsStore_Title": "Оценете ни в магазина",
+    "SettingsStorage_Title": "Съхранение",
+    "SettingsStorage_Description": "Сканиране и управление на кеша MIME, съхраняван във вашата локална папка с данни.",
+    "SettingsStorage_ScanFolder": "Сканирайте локалната папка за данни",
+    "SettingsStorage_NoLocalMimeDataFound": "Не са намерени локални MIME данни.",
+    "SettingsStorage_NoAccountsFound": "Не са намерени акаунти.",
+    "SettingsStorage_TotalUsage": "Общо използване на локалния MIME кеш: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} използвано в локалния MIME кеш",
+    "SettingsStorage_DeleteAll_Title": "Изтриване на всички MIME данни.",
+    "SettingsStorage_DeleteAll_Description": "Изтрийте цялата MIME кеш папка за този акаунт.",
+    "SettingsStorage_DeleteAll_Button": "Изтрийте всичко",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Изтриване на всички MIME данни.",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Изтриване на всички локални MIME данни за {0}?",
+    "SettingsStorage_DeleteAll_Success": "Цялото MIME съдържание беше изтрито.",
+    "SettingsStorage_DeleteOld_Title": "Изтриване на старо MIME съдържание",
+    "SettingsStorage_DeleteOld_Description": "Изтриване на MIME файлове според датата на създаване на писмото в локалната база данни.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 месец",
+    "SettingsStorage_DeleteOld_3Months": "> 3 месеца",
+    "SettingsStorage_DeleteOld_6Months": "> 6 месеца",
+    "SettingsStorage_DeleteOld_1Year": "> 1 година",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Изтриване на старо MIME съдържание",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Да изтриете локалните MIME данни, по-стари от {0}, за {1}?",
+    "SettingsStorage_DeleteOld_Success": "Изтрити са {0} MIME папки, по-стари от {1}.",
+    "SettingsStorage_1Month": "1 месец",
+    "SettingsStorage_3Months": "3 месеца",
+    "SettingsStorage_6Months": "6 месеца",
+    "SettingsStorage_1Year": "1 година",
+    "SettingsStorage_Months": "{0} месеца",
     "SettingsTaskbarBadge_Description": "Показване броя на непрочетените писма в иконата в лентата на задачите.",
     "SettingsTaskbarBadge_Title": "Значка на лентата на задачите",
     "SettingsThreads_Description": "Организиране на съобщенията в разговори.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Не можете да присвоите папка Входящи към друга системна папка.",
     "SystemFolderConfigSetupSuccess_Message": "Системните папки са успешно конфигурирани.",
     "SystemFolderConfigSetupSuccess_Title": "Настройка на системните папки",
+    "SystemTrayMenu_ShowWino": "Отвори Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Отвори Wino календар",
+    "SystemTrayMenu_ExitWino": "Изход",
     "TestingImapConnectionMessage": "Тестване на връзката със сървъра...",
     "TitleBarServerDisconnectedButton_Description": "Wino е изключен от мрежата. Щракнете върху Повторно свързване, за да възстановите връзката.",
     "TitleBarServerDisconnectedButton_Title": "няма връзка",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Надграждане до неограничен брой акаунти",
     "WinoUpgradeRemainingAccountsMessage": "Използвани са {0} от {1} безплатни акаунта.",
     "Yesterday": "Вчера",
+    "Smime_ImportCertificates_Success": "Сертификатите бяха успешно импортирани.",
+    "Smime_ImportCertificates_Error": "Грешка при импортирането на сертификатите: {0}",
+    "Smime_RemoveCertificates_Confirm": "Наистина ли искате да премахнете сертификатите {0}?",
+    "Smime_RemoveCertificates_Success": "Сертификатите са премахнати.",
+    "Smime_ExportCertificates_Success": "Сертификатите са експортирани.",
+    "Smime_ExportCertificates_Error": "Грешка при експортирането на сертификатите.",
+    "Smime_CertificateDetails": "Предмет: {0}\nИздател: {1}\nВалидно от: {2}\nВалидно до: {3}\nОтпечатък: {4}",
+    "Smime_CertificatePassword_Title": "Изисква се парола за сертификат",
+    "Smime_CertificatePassword_Placeholder": "Парола за сертификат за {0} (по избор)",
+    "Smime_Confirm_Title": "Потвърди",
+    "Buttons_OK": "ОК",
+    "Buttons_Refresh": "Обнови",
+    "SettingsSignatureAndEncryption_Title": "Подписване и криптиране",
+    "SettingsSignatureAndEncryption_Description": "Управление на S/MIME сертификати за подписване и криптиране на имейли.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Моите сертификати",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Лични сертификати за подписване и криптиране",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Сертификати на получателя",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Сертификати на получателя за дешифриране",
+    "SettingsSignatureAndEncryption_NameColumn": "Име",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Изтича на",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Отпечатък",
+    "Buttons_Remove": "Премахни",
+    "Buttons_Export": "Експортирай",
+    "Buttons_Import": "Импортирай",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME Подписващ сертификат",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME Сертификат за криптиране",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Няма",
+    "SmimeSignaturesInMessage": "Подписи в това съобщение:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, валиден до {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Информация за подписващ S/MIME сертификат",
+    "SmimeCertificateInfoTitle": "Информация за S/MIME сертификат",
+    "SmimeNoCertificateFileFound": "Не е намерен файл с сертификат",
+    "SmimeSaveCertificate": "Запазване на сертификат...",
+    "SmimeCertificate": "S/MIME сертификат",
+    "SmimeCertificateSavedTo": "Сертификатът е запазен в {0}",
+    "SmimeSignedTooltip": "Това съобщение е подписано с S/MIME сертификат. Щракнете за повече подробности",
+    "SmimeEncryptedTooltip": "Това съобщение е криптирано с S/MIME сертификат.",
+    "SmimeCertificateFileInfo": "Файл: {0}",
+    "Composer_LightTheme": "Светла тема",
+    "Composer_DarkTheme": "Тъмна тема",
+    "Composer_Outdent": "Намали отстъп",
+    "Composer_Indent": "Увеличи отстъп",
+    "Composer_BulletList": "Списък с водещи точки",
+    "Composer_OrderedList": "Номериран списък",
+    "Composer_Stroke": "Щрих",
+    "Composer_Bold": "Удебелен",
+    "Composer_Italic": "Курсив",
+    "Composer_Underline": "Подчертано",
+    "Composer_CcBcc": "Cc и Bcc",
+    "Composer_EnableSmimeSignature": "Включване/изключване на S/MIME подпис",
+    "Composer_EnableSmimeEncryption": "Включване/изключване на S/MIME криптиране",
+    "Composer_LocalDraftSyncInfo": "Тази чернова е локална. Wino не успя да я изпрати до вашия имейл сървър. Щракнете, за да опитате отново изпращането към сървъра.",
+    "Composer_CertificateExpires": "Изтича на: ",
+    "Composer_SmimeSignature": "S/MIME Подпис",
+    "Composer_SmimeEncryption": "S/MIME Криптиране",
+    "Composer_EmailTemplatesPlaceholder": "Имейл шаблони",
+    "Composer_AiSummarize": "Обобщи с AI",
+    "Composer_AiSummarizeDescription": "Извлича ключови точки, действия и решения от този имейл.",
+    "Composer_AiTranslate": "Преведи с AI",
+    "Composer_AiActions": "AI действия",
+    "Composer_AiRewrite": "Препиши с AI",
+    "AiActions_CheckingStatus": "Проверка на достъпа до AI...",
+    "AiActions_SignedOutTitle": "Разблокирайте Wino AI Pack",
+    "AiActions_SignedOutDescription": "Превеждайте, преписвайте и обобщавайте имейли с AI след влизане във вашия Wino акаунт и активиране на добавката AI Pack.",
+    "AiActions_NoPackTitle": "AI пакет",
+    "AiActions_NoPackDescription": "Вие сте вписани, но AI Pack не е активен. Купете го, за да използвате инструментите за AI превод, преписване и обобщаване на Wino.",
+    "AiActions_UsageSummary": "{0} от {1} кредити използвани този месец.",
+    "Composer_AiRewritePolite": "Направи го учтиво",
+    "Composer_AiRewritePoliteDescription": "Улеснява формулировката, запазвайки същия смисъл.",
+    "Composer_AiRewriteAngry": "Направи го ядосано",
+    "Composer_AiRewriteAngryDescription": "Използва по-остър и по-конфронтиращ тон.",
+    "Composer_AiRewriteHappy": "Направи го щастлив",
+    "Composer_AiRewriteHappyDescription": "Добавя по-оптимистичен и по-ентусиазиран тон.",
+    "Composer_AiRewriteFormal": "Направи го формално",
+    "Composer_AiRewriteFormalDescription": "Прави съобщението по-професионално и структурирано.",
+    "Composer_AiRewriteFriendly": "Направи го по-приятелски",
+    "Composer_AiRewriteFriendlyDescription": "Увеличава приветливия тон на съобщението.",
+    "Composer_AiRewriteShorter": "Направи го по-кратко",
+    "Composer_AiRewriteShorterDescription": "Уплътнява текста и премахва излишни детайли.",
+    "Composer_AiRewriteClearer": "Направи го по-ясен",
+    "Composer_AiRewriteClearerDescription": "Подобрява четимостта и прави съобщението по-лесно за следване.",
+    "Composer_AiRewriteCustom": "Персонализирано",
+    "Composer_AiRewriteCustomDescription": "Опишете вашето собствено намерение за пренаписване.",
+    "Composer_AiRewriteCustomPlaceholder": "Опишете как искате да бъде пренаписано съобщението",
+    "Composer_AiRewriteMode": "Тон на пренаписване",
+    "Composer_AiRewriteApply": "Приложи пренапис",
+    "Composer_AiTranslateDialogTitle": "Преведи с ИИ",
+    "Composer_AiTranslateDialogDescription": "Въведете целевия език или код за култура, например en-US, tr-TR, de-DE или fr-FR.",
+    "Composer_AiTranslateApply": "Преведи",
+    "Composer_AiTranslateLanguage": "Целеви език",
+    "Composer_AiTranslateCustomPlaceholder": "Въведете код за култура",
+    "Composer_AiTranslateLanguageEnglish": "Английски (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Турски (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Немски (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Френски (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Испански (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Италиански (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Португалски (Бразилия) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Холандски (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Полски (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Руски (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Японски (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Корейски (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Китайски, опростен (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Арабски (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Хинди (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Друго...",
+    "Composer_AiBusyTitle": "ИИ вече работи",
+    "Composer_AiBusyMessage": "Моля, изчакайте завършването на текущото действие на ИИ.",
+    "Composer_AiSignInRequired": "Влезте в акаунта си в Wino, за да използвате AI функциите.",
+    "Composer_AiMissingHtml": "Все още няма съдържание на съобщение за изпращане към Wino AI.",
+    "Composer_AiQuotaUnavailable": "Резултатът на ИИ беше приложен.",
+    "Composer_AiAppliedMessage": "Резултатът на ИИ беше приложен към редактора за писане. Използвайте Отмяна, ако искате да върнете промените.",
+    "Composer_AiSummarizeSuccessTitle": "AI резюме приложено",
+    "Composer_AiTranslateSuccessTitle": "Преводът на ИИ е приложен",
+    "Composer_AiRewriteSuccessTitle": "Пренаписът на ИИ е приложен",
+    "Composer_AiErrorTitle": "Действието на ИИ не успя",
+    "Reader_AiAppliedMessage": "Резултатът от ИИ вече е показан за това съобщение. Отворете отново съобщението, за да видите оригиналното съдържание.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Контакти",
+    "ContactsPage_AddContact": "Добави контакт",
+    "ContactsPage_EditContact": "Редактирай контакт",
+    "ContactsPage_DeleteContact": "Изтрий контакт",
+    "ContactsPage_SearchPlaceholder": "Търсене в контактите...",
+    "ContactsPage_NoContacts": "Няма контакти за показване",
+    "ContactsPage_ContactsCount": "{0} контакти",
+    "ContactsPage_SelectedContactsCount": "{0} избрани",
+    "ContactsPage_DeleteSelectedContacts": "Изтрий избраните",
+    "ContactEditDialog_Title": "Редактиране на контакт",
+    "ContactEditDialog_PhotoSection": "Снимка",
+    "ContactEditDialog_ChoosePhoto": "Изберете снимка",
+    "ContactEditDialog_RemovePhoto": "Премахни снимка",
+    "ContactEditDialog_NameHeader": "Име",
+    "ContactEditDialog_NamePlaceholder": "Име на контакт",
+    "ContactEditDialog_EmailHeader": "Имейл адрес",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Информация за контакт",
+    "ContactEditDialog_RootContactInfo": "Този контакт е основен и е свързан с вашите акаунти и не може да бъде изтрит.",
+    "ContactEditDialog_OverriddenContactInfo": "Този контакт е ръчно променен и няма да се актуализира по време на синхронизация.",
+    "ContactsPage_Subtitle": "Управлявайте контактите си за имейл и свързаната с тях информация.",
+    "ContactStatus_Account": "Акаунт",
+    "ContactStatus_Modified": "Променен",
+    "ContactAction_Edit": "Редактиране на контакт",
+    "ContactAction_ChangePhoto": "Смени снимка",
+    "ContactAction_Delete": "Изтрий контакт",
+    "ContactAction_Add": "Добави контакт",
+    "ContactSelection_Selected": "избрани",
+    "ContactSelection_SelectAll": "Избери всички",
+    "ContactSelection_Clear": "Изчисти избора",
+    "ContactsPage_EmptyState": "Няма контакти за показване",
+    "ContactsPage_AddFirstContact": "Добавете първия си контакт",
+    "ContactsPage_ContactsCountSuffix": "контакти",
+    "ContactsPane_NewContact": "Нов контакт",
+    "ContactsPane_DescriptionTitle": "Управлявайте контактите си",
+    "ContactsPane_DescriptionBody": "Създавайте контакти, преименувайте ги, актуализирайте профилните снимки и поддържайте запазената информация организирана на едно място.",
+    "ContactEditDialog_AddTitle": "Добави контакт",
+    "ContactInfoBar_ContactAdded": "Контактът е успешно добавен.",
+    "ContactInfoBar_ContactUpdated": "Контактът е успешно актуализиран.",
+    "ContactInfoBar_ContactsDeleted": "Контактите са успешно изтрити.",
+    "ContactInfoBar_ContactPhotoUpdated": "Снимката на контакта е успешно актуализирана.",
+    "ContactInfoBar_FailedToLoadContacts": "Неуспях да заредя контактите: {0}",
+    "ContactInfoBar_FailedToAddContact": "Неуспях да добавя контакт: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Неуспях да актуализирам контакта: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Неуспях да изтрия контактите: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Неуспях да актуализирам снимката: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Коренните контакти не могат да бъдат изтрити.",
+    "ContactConfirmDialog_DeleteTitle": "Изтрий контакт",
+    "ContactConfirmDialog_DeleteMessage": "Сигурни ли сте, че искате да изтриете контакта '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Сигурни ли сте, че искате да изтриете {0} контакт(а)?",
+    "ContactConfirmDialog_DeleteButton": "Изтрий",
+    "CalendarAccountSettings_Title": "Настройки на календарния акаунт",
+    "CalendarAccountSettings_Description": "Управлявайте настройките за календара за {0}",
+    "CalendarAccountSettings_AccountColor": "Цвят на акаунта",
+    "CalendarAccountSettings_AccountColorDescription": "Променете цвета на показване за този календарен акаунт.",
+    "CalendarAccountSettings_SyncEnabled": "Включване на синхронизацията",
+    "CalendarAccountSettings_SyncEnabledDescription": "Включване или деактивиране на синхронизацията на календара за този акаунт.",
+    "CalendarAccountSettings_DefaultShowAs": "Статус за наличност по подразбиране",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Статусът за наличност по подразбиране за нови събития, създадени с този акаунт.",
+    "CalendarAccountSettings_PrimaryCalendar": "Основен календар",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Маркирайте този календар като основен календар за акаунта.",
+    "CalendarSettings_NewEventBehavior_Header": "Поведение на бутона Ново събитие",
+    "CalendarSettings_NewEventBehavior_Description": "Изберете дали бутонът за Ново събитие да пита за календар всеки път или да отваря винаги конкретен календар.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Попитайте всеки път.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Винаги използвайте конкретен календар.",
+    "CalendarSettings_Rendering_Title": "Изобразяване",
+    "CalendarSettings_Rendering_Description": "Конфигурирайте подредбата на календара и поведението на показване.",
+    "CalendarSettings_Notifications_Title": "Известия",
+    "CalendarSettings_Notifications_Description": "Изберете поведението по подразбиране за напомняне и отлагане.",
+    "CalendarSettings_Preferences_Title": "Настройки",
+    "CalendarSettings_Preferences_Description": "Задайте как да се държи бутонът за Ново събитие.",
+    "WhatIsNew_GetStartedButton": "Започнете",
+    "WhatIsNew_ContinueAnywayButton": "Продължете въпреки това",
+    "WhatIsNew_PreparingForNewVersionButton": "Подготвяме за нова версия...",
+    "WhatIsNew_MigrationPreparing_Title": "Подготовка на данните ви",
+    "WhatIsNew_MigrationPreparing_Description": "Wino прилага миграции на актуализацията. Моля, изчакайте докато подготвим данните за акаунта ви за тази версия.",
+    "WhatIsNew_MigrationFailedMessage": "Прилагането на миграциите завърши с грешка {0}. Можете да продължите да използвате приложението. Ако обаче срещнете сериозни проблеми, моля преинсталирайте приложението.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail обновен",
+    "WhatIsNew_MigrationNotification_Message": "Отворете приложението, за да завършите актуализацията и да видите какво е новото.",
+    "WelcomeWindow_Title": "Добре дошли в Wino Mail",
+    "WelcomeWindow_Subtitle": "Нативно изживяване за Mail и Calendar в Windows.",
+    "WelcomeWindow_WhatsNewTitle": "Последни промени",
+    "WelcomeWindow_FeaturesTitle": "Функции",
+    "WelcomeWindow_WhatsNewTab": "Какво е ново",
+    "WelcomeWindow_FeaturesTab": "Функции",
+    "WelcomeWindow_GetStartedButton": "Добави акаунт",
+    "WelcomeWindow_GetStartedDescription": "Добавете своя акаунт Outlook, Gmail или IMAP, за да започнете с Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Импортирайте от вашия Wino акаунт.",
+    "WelcomeWindow_ImportInProgress": "Импортиране на синхронизирани настройки и акаунти...",
+    "WelcomeWindow_ImportNoAccountsFound": "Не са намерени синхронизирани акаунти във вашия Wino акаунт. Ако имаше налични настройки, те са възстановени. Използвайте Започнете, за да добавите акаунт ръчно.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} синхронизирани акаунти вече са налични на това устройство. Ако е необходимо, използвайте Започнете, за да добавите още акаунт ръчно.",
+    "WelcomeWindow_SetupTitle": "Настройване на акаунт",
+    "WelcomeWindow_SetupSubtitle": "Изберете вашия имейл доставчик, за да започнете.",
+    "WelcomeWindow_AddAccountButton": "Добави акаунт",
+    "WelcomeWindow_SkipForNow": "Прескочете за сега — ще го настроя по-късно",
+    "WelcomeWindow_AppDescription": "Бърза, фокусирана входяща кутия — преработена за Windows 11",
+    "WelcomeWizard_Step1Title": "Добре дошли",
+    "SystemTrayMenu_Open": "Отвори",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Синхронизиране на настройки",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Поддържайте вашите настройки на Wino синхронизирани между устройствата.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Разблокирайте добавки",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Достъп до премиум функции като Wino AI Pack.",
+    "WinoAccount_Management_Description": "Управлявайте своя Wino акаунт, достъп до AI Pack и синхронизираните предпочитания и данни за акаунта.",
+    "WinoAccount_Management_SignedOutTitle": "Влезте в Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Влезте или създайте акаунт, за да синхронирате имейла си, да получите достъп до AI функции и да управлявате настройките си между устройства.",
+    "WinoAccount_Management_ProfileSectionHeader": "Профил",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino добавки",
+    "WinoAccount_Management_DataSectionHeader": "Данни",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Действия на акаунта",
+    "WinoAccount_Management_AccountCardTitle": "Акаунт",
+    "WinoAccount_Management_AccountCardDescription": "Имейл адресът на вашия Wino акаунт и текущото състояние на акаунта.",
+    "WinoAccount_Management_AiPackCardTitle": "AI пакет",
+    "WinoAccount_Management_AiPackCardDescription": "Проверете дали Wino AI Pack е активен и колко използване остава.",
+    "WinoAccount_Management_AiPackActive": "AI Pack е активен",
+    "WinoAccount_Management_AiPackInactive": "AI Pack не е активен",
+    "WinoAccount_Management_AiPackUsage": "{0} от {1} използвания са използвани. Останали са {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Период на фактуриране: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Детайлите за използване все още не са налични.",
+    "WinoAccount_Management_AiPackBuyDescription": "Купете Wino AI Pack, за да превеждате, преписвате или резюмирате имейли с изкуствен интелект.",
+    "WinoAccount_Management_AiPackPromoTitle": "Разблокирайте AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Ускорете работния поток на имейлите си с инструменти, захранени от AI. Превеждайте съобщения на над 50 езика, преработете за яснота и тон и получавайте мигновени резюми на дълги нишки.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / месец",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 кредита",
+    "WinoAccount_Management_AiPackGetButton": "Вземи AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-инструменти за превод, преработка и резюмиране на имейли в Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, превод, преработка, резюмиране, производителност",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Неограничени акаунти",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Премахнете ограниченията за акаунти и добавяйте толкова имейл акаунти, колкото ви трябват.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "акаунти, неограничени, премиум, добавка",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Влезте с вашия Wino акаунт, за да завършите тази покупка.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino не успя да завърши тази покупка в Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Вашата покупка завърши, но Wino не успя да обнови ползите за акаунта ви. Моля, опитайте отново след малко.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Вашият абонамент е активен",
+    "WinoAccount_Management_AiPackRenews": "Подновява се {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Използвани кредити този месец",
+    "WinoAccount_Management_AiPackResets": "Нулиране {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Имаше проблеми при зареждането на баланса на използване на AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Превод",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Преработване",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Резюмиране",
+    "WinoAccount_Management_AddOnLoadFailed": "Имаше проблеми с зареждането на тази добавка.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Синхронизиране на настройки и акаунти",
+    "WinoAccount_Management_SyncPreferencesDescription": "Импортирайте или експортирайте вашите настройки на Wino и детайлите за пощенската кутия между устройства. Паролите, токени и друга чувствителна информация никога не се синхронират.",
+    "WinoAccount_Management_SignOutTitle": "Излез",
+    "WinoAccount_Management_SignOutDescription": "Излезте от акаунта си на това устройство",
+    "WinoAccount_Management_StatusLabel": "Статус: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Все още няма синхронизирани данни за този акаунт.",
+    "WinoAccount_Management_ExportSucceeded": "Избраните данни на Wino са експортирани успешно.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Вашите предпочитания бяха експортирани във вашия Wino акаунт.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Експортирани са подробности за {0} акаунт във вашия Wino акаунт.",
+    "WinoAccount_Management_ImportSucceeded": "Импортирани са синхронизирани данни от вашия Wino акаунт.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Приложени {0} синхронизирани предпочитания.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Импортирани {0} акаунти.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Пропуснати са {0} акаунти, които вече съществуват на това устройство.",
+    "WinoAccount_Management_ImportPartial": "Приложени са {0} синхронизирани настройки. {1} настройки не успяха да бъдат възстановени.",
+    "WinoAccount_Management_ImportReloginReminder": "Паролите, токените и друга чувствителна информация не са импортирани. Влезте отново за всеки акаунт на това устройство преди да ги използвате.",
+    "WinoAccount_Management_SerializeFailed": "Wino не успя да сериализира текущите ви настройки.",
+    "WinoAccount_Management_EmptyExport": "Няма стойности за експортиране на настройки.",
+    "WinoAccount_Management_ImportEmpty": "Пакетът с данни за синхронизация не съдържа нови данни за възстановяване.",
+    "WinoAccount_Management_ExportDialog_Title": "Експортиране към вашия Wino акаунт",
+    "WinoAccount_Management_ExportDialog_Description": "Изберете какво искате да синхронирате във вашия Wino акаунт.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Настройки",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Акаунти",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Паролите, токените и друга чувствителна информация не се синхронират.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Импортираните акаунти на друг компютър ще трябва да влезете отново, преди да могат да се използват.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Експортът на избраните от вас Wino данни...",
+    "WinoAccount_Management_LoadFailed": "Wino не успя да зареди най-новата информация за Wino акаунта.",
+    "WinoAccount_Management_ActionFailed": "Заявката за Wino акаунт не може да бъде завършена.",
+    "WinoAccount_SettingsSection_Title": "Wino акаунт",
+    "WinoAccount_SettingsSection_Description": "Създайте или се впишете в Wino акаунт, използвайки локалната услуга за удостоверяване.",
+    "WinoAccount_RegisterButton_Title": "Регистрирайте акаунт",
+    "WinoAccount_RegisterButton_Description": "Създайте Wino акаунт с имейл и парола.",
+    "WinoAccount_RegisterButton_Action": "Отвори регистрацията",
+    "WinoAccount_LoginButton_Title": "Влезте",
+    "WinoAccount_LoginButton_Description": "Влезте в съществуващ Wino акаунт с имейл и парола.",
+    "WinoAccount_LoginButton_Action": "Отвори вход",
+    "WinoAccount_SignOutButton_Title": "Излезте",
+    "WinoAccount_SignOutButton_Description": "Премахнете локално запазената сесия на Wino акаунта.",
+    "WinoAccount_SignOutButton_Action": "Излезте",
+    "WinoAccount_RegisterDialog_Title": "Създайте Wino акаунт",
+    "WinoAccount_RegisterDialog_Description": "Създайте Wino акаунт, за да синхронизирате вашето изживяване с Wino и да отключите добавки, базирани на акаунти.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Създайте вашия Wino акаунт",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Защо да създадете такъв акаунт?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Импортиране и експортиране на настройки между устройства",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Прехвърляйте настройките на Wino между устройства без да започвате отначало.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Достъп до ексклузивни добавки като Wino AI Pack (платен)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Използвайте един акаунт, за да отключвате премиум функции на Wino, когато станат достъпни.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino акаунтът е отделен от вашите имейл акаунти.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Вашите Outlook, Gmail, IMAP или други имейл акаунти остават точно както са. Wino акаунтът управлява само Wino-специфичните функции и добавки, базирани на акаунти.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Регистрирайте",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Поверителност и обработка на API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "По избор добавки, като Wino AI Pack, могат да изпращат избраното HTML съдържание на имейла към Wino API услугата само когато използвате тези функции.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Прочетете политиката за поверителност.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Съгласен съм с политиката за поверителност.",
+    "WinoAccount_LoginDialog_Title": "Влезте в Wino акаунт",
+    "WinoAccount_LoginDialog_Description": "Влезте във вашия Wino акаунт, за да синхронизирате настройките си и да получите достъп до функции, базирани на акаунти.",
+    "WinoAccount_LoginDialog_HeroTitle": "Добре дошли обратно",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Какво ви дава входът",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Използвайте Wino акаунта си, за да продължите да синхронизирате настройките между устройства и да получите достъп до платени добавки като Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Това не е вход за вашия имейл акаунт",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Входът тук не добавя или замества вашите Outlook, Gmail или IMAP акаунти във Wino. Входът тук е само за услуги, специфични за Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Забравена парола?",
+    "WinoAccount_EmailLabel": "Имейл",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Парола",
+    "WinoAccount_ConfirmPasswordLabel": "Потвърдете паролата",
+    "WinoAccount_ForgotPasswordDialog_Title": "Възстановете паролата си",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Изпрати имейл за нулиране на паролата",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Върнете се към вход",
+    "WinoAccount_ForgotPasswordDialog_Description": "Въведете имейл адреса на вашия Wino акаунт и ние ще изпратим линк за нулиране на паролата, ако адресът е регистриран.",
+    "WinoAccount_Validation_EmailRequired": "Имейлът е задължителен.",
+    "WinoAccount_Validation_PasswordRequired": "Паролата е задължителна.",
+    "WinoAccount_Validation_PasswordMismatch": "Паролите не съвпадат.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Трябва да приемете политиката за поверителност, преди да създадете Wino акаунт.",
+    "WinoAccount_Error_InvalidCredentials": "Имейл адресът или паролата са неправилни.",
+    "WinoAccount_Error_AccountLocked": "Този акаунт е временно заключен.",
+    "WinoAccount_Error_AccountBanned": "Този акаунт е забранен.",
+    "WinoAccount_Error_AccountSuspended": "Този акаунт е спрян.",
+    "WinoAccount_Error_EmailNotConfirmed": "Моля, потвърдете имейл адреса си преди да влезете.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Моля, потвърдете имейл адреса си преди да влезете.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Нов имейл за потвърждение все още не е наличен.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Тази заявка за потвърждение вече не е валидна. Моля, опитайте отново да влезете.",
+    "WinoAccount_Error_EmailNotRegistered": "Този имейл адрес не е регистриран.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Вашата сесия вече не е валидна. Моля, влезте отново.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Този имейл адрес вече е регистриран.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Имейл адрес е необходим за завършване на външно вписване.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Заявката за външно вписване е невалидна.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Състоянието на външното вписване е невалидно или изтекло.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Кодът за външно вписване е невалиден или изтекъл.",
+    "WinoAccount_Error_AiPackRequired": "За това действие е необходим активен абонамент за Wino AI Pack.",
+    "WinoAccount_Error_AiQuotaExceeded": "Достигнат е лимитът за използване на Wino AI Pack за текущия период на фактуриране.",
+    "WinoAccount_Error_AiHtmlEmpty": "Няма съдържание на имейла за обработка.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Този имейл е твърде голям за обработка с Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Този език не се поддържа. Опитайте валиден културен код като en-US или tr-TR.",
+    "WinoAccount_Error_Forbidden": "Нямате разрешение да изпълните това действие.",
+    "WinoAccount_Error_ValidationFailed": "Заявката е невалидна. Моля, прегледайте въведените стойности.",
+    "WinoAccount_RegisterSuccessMessage": "Регистрацията на Wino акаунт завърши за {0}.",
+    "WinoAccount_LoginSuccessMessage": "Влезнахте в Wino акаунт като {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Потвърдете имейл адреса си",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Изпратихме имейл за потвърждение до {0}. Моля, потвърдете го и опитайте отново да влезете.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Изисква се потвърждение на имейла",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Все още очакваме потвърждението на {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Изпрати отново имейла за потвърждение",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Можете да изпратите повторно имейла за потвърждение след {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Можете да изпратите отново имейла за потвърждение сега.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Имейлът за потвърждение е изпратен повторно.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Изпратихме още един имейл за потвърждение до {0}. Моля, потвърдете го и опитайте отново да се впишете.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Изпратен е имейл за нулиране на паролата.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Изпратихме имейл за нулиране на паролата до {0}. Отворете това съобщение, за да изберете нова парола.",
+    "WinoAccount_ChangePassword_Title": "Сменете паролата",
+    "WinoAccount_ChangePassword_Description": "Изпратете имейл за нулиране на паролата до този Wino акаунт.",
+    "WinoAccount_ChangePassword_Action": "Изпрати имейл за нулиране.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Искате ли Wino да изпрати имейл за нулиране на парола до {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Излязохте от Wino акаунт {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Нямате активен Wino акаунт за излизане.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino акаунт",
+    "WinoAccount_Titlebar_SignedOutDescription": "Влезете в акаунт Wino или създайте Wino акаунт, за да управлявате сесията си в Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Статус: {0}",
+    "WelcomeWizard_Step2Title": "Добави акаунт",
+    "WelcomeWizard_Step3Title": "Завършване на настройката",
+    "ProviderSelection_Title": "Изберете вашия имейл доставчик",
+    "ProviderSelection_Subtitle": "Изберете доставчик по-долу, за да добавите вашия имейл акаунт към Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Име на акаунт",
+    "ProviderSelection_AccountNamePlaceholder": "напр. Personal, Work",
+    "ProviderSelection_DisplayNameHeader": "Име за показване",
+    "ProviderSelection_DisplayNamePlaceholder": "напр. John Doe",
+    "ProviderSelection_EmailHeader": "Имейл адрес",
+    "ProviderSelection_EmailPlaceholder": "напр. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Парола за приложение",
+    "ProviderSelection_AppPasswordHelp": "Как да получа парола за приложение?",
+    "ProviderSelection_CalendarModeHeader": "Интеграция на календара",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Изключен",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Няма календарна интеграция",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV синхронизация",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Вашите календарни събития се синхронизират между вашите устройства чрез сървърите на Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Вашите календарни събития се синхронизират между вашите устройства чрез сървърите на Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Локален календар",
+    "ProviderSelection_CalendarMode_LocalDescription": "Вашите събития се съхраняват само на компютъра ви. Няма свързаност със сървър.",
+    "ProviderSelection_ClearColor": "Изчисти цвета",
+    "ProviderSelection_ContinueButton": "Продължи",
+    "ProviderSelection_SpecialImap_Subtitle": "Въведете данните за акаунта си, за да се свържете.",
+    "AccountSetup_Title": "Настройване на вашия акаунт",
+    "AccountSetup_Step_Authenticating": "Аутентикация с {0}",
+    "AccountSetup_Step_TestingMailAuth": "Тестване на имейл аутентификацията",
+    "AccountSetup_Step_SyncingFolders": "Синхронизиране на метаданни за папки",
+    "AccountSetup_Step_FetchingProfile": "Извличане на информация за профила",
+    "AccountSetup_Step_DiscoveringCalDav": "Откриване на настройки CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Тестване на календарната автентикация",
+    "AccountSetup_Step_SavingAccount": "Запазване на информация за акаунта",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Извличане на календарни метаданни",
+    "AccountSetup_Step_SyncingAliases": "Синхронизиране на псевдоними",
+    "AccountSetup_Step_Finalizing": "Завършване на настройката",
+    "AccountSetup_FailureMessage": "Настройката се провали. Върнете се назад, за да коригирате настройките си, или опитайте отново по-късно.",
+    "AccountSetup_SuccessMessage": "Вашият акаунт е успешно настроен!",
+    "AccountSetup_GoBackButton": "Назад",
+    "AccountSetup_TryAgainButton": "Опитайте отново",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Автоматичното откриване се провали. Моля въведете настройките ръчно в раздела Разширени настройки."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/ca_ES/resources.json b/Wino.Core.Domain/Translations/ca_ES/resources.json
index 8eccf7fa..0010c1eb 100644
--- a/Wino.Core.Domain/Translations/ca_ES/resources.json
+++ b/Wino.Core.Domain/Translations/ca_ES/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "all done",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Obtint detalls del calendari.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "initializing",
     "AccountCreationDialog_PreparingFolders": "We are getting folder information at the moment.",
     "AccountCreationDialog_SigninIn": "Account information is being saved.",
+    "Purchased": "Comprat",
     "AccountEditDialog_Message": "Account Name",
     "AccountEditDialog_Title": "Edit Account",
     "AccountPickerDialog_Title": "Pick an account",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "General",
+    "AccountDetailsPage_TabMail": "Correu",
+    "AccountDetailsPage_TabCalendar": "Calendari",
+    "AccountDetailsPage_CalendarListDescription": "Selecciona un calendari per configurar la seva configuració.",
     "AddHyperlink": "Add",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP Account",
     "Busy": "Busy",
     "Buttons_AddAccount": "Add Account",
+    "Buttons_FixAccount": "Reparar el compte",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Aplicar",
     "Buttons_ApplyTheme": "Apply Theme",
     "Buttons_Browse": "Browse",
     "Buttons_Cancel": "Cancel",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Edit",
     "Buttons_EnableImageRendering": "Enable",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Gestiona",
     "Buttons_No": "No",
     "Buttons_Open": "Open",
     "Buttons_Purchase": "Purchase",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Save",
     "Buttons_SaveConfiguration": "Save Configuration",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Envia al servidor",
     "Buttons_Share": "Share",
     "Buttons_SignIn": "Sign In",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Try Again",
     "Buttons_Yes": "Yes",
+    "Sync_SynchronizingFolder": "Sincronitzant {0} {1}%",
+    "Sync_DownloadedMessages": "S'han descarregat {0} missatges de {1}",
+    "SyncAction_Archiving": "Arxivant {0} correu(s)",
+    "SyncAction_ClearingFlag": "Desmarcant {0} correu(s)",
+    "SyncAction_CreatingDraft": "Creant un esborrany",
+    "SyncAction_CreatingEvent": "Creant un esdeveniment",
+    "SyncAction_Deleting": "Esborrant {0} correu(s)",
+    "SyncAction_EmptyingFolder": "Buidant la carpeta",
+    "SyncAction_MarkingAsRead": "Marcant {0} correu(s) com a llegits",
+    "SyncAction_MarkingAsUnread": "Marcant {0} correu(s) com a no llegits",
+    "SyncAction_MarkingFolderAsRead": "Marcant la carpeta com a llegida",
+    "SyncAction_Moving": "Movent {0} correu(s)",
+    "SyncAction_MovingToFocused": "Movent {0} correu(s) a Focused",
+    "SyncAction_RenamingFolder": "Canviant el nom de la carpeta",
+    "SyncAction_SendingMail": "Enviant correu",
+    "SyncAction_SettingFlag": "Marcant {0} correu(s) amb bandera",
+    "SyncAction_SynchronizingAccount": "Sincronitzant {0}",
+    "SyncAction_SynchronizingAccounts": "Sincronitzant {0} compte(s)",
+    "SyncAction_SynchronizingCalendarData": "Sincronitzant dades del calendari",
+    "SyncAction_SynchronizingCalendarEvents": "Sincronitzant esdeveniments del calendari",
+    "SyncAction_SynchronizingCalendarMetadata": "Sincronitzant metadades del calendari",
+    "SyncAction_Unarchiving": "Desarxivant {0} correu(s)",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Acceptar",
+    "CalendarEventResponse_AcceptedResponse": "Acceptat",
+    "CalendarEventResponse_Decline": "Declinar",
+    "CalendarEventResponse_DeclinedResponse": "Declinat",
+    "CalendarEventResponse_NotResponded": "No contestat",
+    "CalendarEventResponse_Tentative": "Tentatiu",
+    "CalendarEventResponse_TentativeResponse": "Tentatiu",
+    "CalendarEventRsvpPanel_Accept": "Accepta",
+    "CalendarEventRsvpPanel_AddMessage": "Afegeix un missatge a la teva resposta... (opcional)",
+    "CalendarEventRsvpPanel_Decline": "Declina",
+    "CalendarEventRsvpPanel_Message": "Missatge",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Envia un missatge de resposta",
+    "CalendarEventRsvpPanel_Tentative": "Tentatiu",
+    "CalendarEventRsvpPanel_Title": "Opcions de resposta",
+    "CalendarAttendeeStatus_Accepted": "Acceptat",
+    "CalendarAttendeeStatus_Declined": "Declinat",
+    "CalendarAttendeeStatus_NeedsAction": "Requereix acció",
+    "CalendarAttendeeStatus_Tentative": "Tentatiu",
+    "CalendarEventDetails_Attachments": "Adjunts",
+    "CalendarEventCompose_AddAttachment": "Afegeix un adjunt",
+    "CalendarEventCompose_AllDay": "Tot el dia",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Els adjunts no són compatibles amb calendaris CalDAV.",
+    "CalendarEventCompose_EndDate": "Data de finalització",
+    "CalendarEventCompose_EndTime": "Hora de finalització",
+    "CalendarEventCompose_Every": "cada",
+    "CalendarEventCompose_ForWeekdays": "per",
+    "CalendarEventCompose_FrequencyDay": "dia",
+    "CalendarEventCompose_FrequencyDayPlural": "dies",
+    "CalendarEventCompose_FrequencyMonth": "mes",
+    "CalendarEventCompose_FrequencyMonthPlural": "mesos",
+    "CalendarEventCompose_FrequencyWeek": "setmana",
+    "CalendarEventCompose_FrequencyWeekPlural": "setmanes",
+    "CalendarEventCompose_FrequencyYear": "any",
+    "CalendarEventCompose_FrequencyYearPlural": "anys",
+    "CalendarEventCompose_Location": "Ubicació",
+    "CalendarEventCompose_LocationPlaceholder": "Afegeix una ubicació",
+    "CalendarEventCompose_NewEventButton": "Nou esdeveniment",
+    "CalendarEventCompose_DefaultCalendarHint": "Podeu triar un calendari per defecte per als nous esdeveniments a la configuració del Calendari.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Obre la configuració del Calendari",
+    "CalendarEventCompose_NoCalendarsMessage": "Encara no hi ha calendaris disponibles per a la creació d'esdeveniments.",
+    "CalendarEventCompose_NoCalendarsTitle": "No hi ha calendaris disponibles",
+    "CalendarEventCompose_NoEndDate": "Sense data de finalització",
+    "CalendarEventCompose_Notes": "Notes",
+    "CalendarEventCompose_PickCalendarTitle": "Tria un calendari",
+    "CalendarEventCompose_Recurring": "Recurrent",
+    "CalendarEventCompose_RecurringSummary": "Ocorre cada {0} {1}{2} {3} efectiu{4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Ocorre {0}{1} {2} efectiu{3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repeteix cada",
+    "CalendarEventCompose_SelectCalendar": "Selecciona el calendari",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Ocorre el {0} {1}",
+    "CalendarEventCompose_StartDate": "Data d'inici",
+    "CalendarEventCompose_StartTime": "Hora d'inici",
+    "CalendarEventCompose_TimeRangeSummary": "dels {0} al {1}",
+    "CalendarEventCompose_Title": "Títol de l'esdeveniment",
+    "CalendarEventCompose_TitlePlaceholder": "Afegeix un títol",
+    "CalendarEventCompose_Until": "fins a",
+    "CalendarEventCompose_UntilSummary": " fins a {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "La data de finalització de tot el dia ha de ser posterior a la data d'inici.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Un o més assistents tenen una adreça de correu electrònic invàlida.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "La data de finalització de la recurrència ha de ser igual o posterior a la data d'inici de l'esdeveniment.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "La hora de finalització ha de ser posterior a la hora d'inici.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Un o més adjunts ja no estan disponibles: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selecciona un calendari abans de crear l'esdeveniment.",
+    "CalendarEventCompose_ValidationMissingTitle": "Introdueix un títol de l'esdeveniment abans de crear l'esdeveniment.",
+    "CalendarEventCompose_ValidationTitle": "La validació de l'esdeveniment ha fallat.",
+    "CalendarEventCompose_WeekdaySummary": " el {0}",
+    "CalendarEventCompose_Weekday_Friday": "Dv",
+    "CalendarEventCompose_Weekday_Monday": "Dl",
+    "CalendarEventCompose_Weekday_Saturday": "Dissabte",
+    "CalendarEventCompose_Weekday_Sunday": "Diumenge",
+    "CalendarEventCompose_Weekday_Thursday": "Dijous",
+    "CalendarEventCompose_Weekday_Tuesday": "Dimarts",
+    "CalendarEventCompose_Weekday_Wednesday": "Dimecres",
+    "CalendarEventDetails_Details": "Detalls",
+    "CalendarEventDetails_EditSeries": "Editar la sèrie",
+    "CalendarEventDetails_Editing": "Editant",
+    "CalendarEventDetails_InviteSomeone": "Convida algú",
+    "CalendarEventDetails_JoinOnline": "Uneix-te en línia",
+    "CalendarEventDetails_Organizer": "Organitzador",
+    "CalendarEventDetails_People": "Persones",
+    "CalendarEventDetails_ReadOnlyEvent": "Esdeveniment de només lectura",
+    "CalendarEventDetails_Reminder": "Recordatori",
+    "CalendarReminder_StartedHoursAgo": "Va començar fa {0} hores",
+    "CalendarReminder_StartedMinutesAgo": "Va començar fa {0} minuts",
+    "CalendarReminder_StartedNow": "Va començar ara mateix",
+    "CalendarReminder_StartingNow": "Començant ara",
+    "CalendarReminder_StartsInHours": "Comença en {0} hores",
+    "CalendarReminder_StartsInMinutes": "Comença en {0} minuts",
+    "CalendarReminder_SnoozeAction": "Aplazar",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minuts",
+    "CalendarEventDetails_ShowAs": "Mostra com",
+    "CalendarShowAs_Free": "Lliure",
+    "CalendarShowAs_Tentative": "Tentatiu",
+    "CalendarShowAs_Busy": "Ocupat",
+    "CalendarShowAs_OutOfOffice": "Fora de l'oficina",
+    "CalendarShowAs_WorkingElsewhere": "Treballant en un altre lloc",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copied to clipboard.",
     "ClipboardTextCopied_Title": "Copied",
     "ClipboardTextCopyFailed_Message": "Failed to copy {0} to clipboard.",
+    "ContactInfoBar_ErrorTitle": "Error al carregar la informació de contactes",
+    "ContactInfoBar_SuccessTitle": "Informació de contacte carregada",
+    "ContactInfoBar_WarningTitle": "La informació de contacte podria estar incompleta",
     "ComingSoon": "Coming soon...",
     "ComposerAttachmentsDragDropAttach_Message": "Attach",
     "ComposerAttachmentsDropZone_Message": "Drop your files here",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Account Link Name",
     "DialogMessage_DeleteAccountConfirmationMessage": "Delete {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "All data associated with this account will be deleted from disk permanently.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Eliminar la plantilla \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Eliminar plantilla de correu",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Aquesta acció eliminarà tots els esdeveniments de la sèrie. Voleu continuar?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Eliminar sèrie recurrent",
     "DialogMessage_DiscardDraftConfirmationMessage": "This draft will be discarded. Do you want to continue?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Discard Draft",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Light mode",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "El compte necessita atenció",
+    "Exception_AccountNeedsAttention_Message": "'{0}' requereix la teva atenció per continuar treballant.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail no va poder trobar el runtime de Microsoft Edge WebView2. Si us plau, instal·leu-lo o reparau el runtime per renderitzar correctament el contingut dels missatges.",
+    "Exception_WebView2RuntimeMissing_Title": "Es necessita el runtime WebView2",
     "Exception_AuthenticationCanceled": "Authentication canceled",
     "Exception_CustomThemeExists": "This theme already exists.",
     "Exception_CustomThemeMissingName": "You must provide a name.",
     "Exception_CustomThemeMissingWallpaper": "You must provide a custom background image.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Error al sincronitzar les dades del calendari",
+    "Exception_FailedToSynchronizeCalendarEvents": "Error al sincronitzar els esdeveniments del calendari",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Error al sincronitzar les metadades del calendari",
     "Exception_FailedToSynchronizeFolders": "Failed to synchronize folders",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Move to Junk",
     "HoverActionOption_ToggleFlag": "Flag / Unflag",
     "HoverActionOption_ToggleRead": "Read / Unread",
+    "KeyboardShortcuts_FailedToReset": "Error al restablir les dreceres de teclat.",
+    "KeyboardShortcuts_FailedToUpdate": "Error en actualitzar les dreceres de teclat.",
+    "KeyboardShortcuts_MailoperationAction": "Acció",
+    "KeyboardShortcuts_Action": "Acció",
+    "KeyboardShortcuts_FailedToLoad": "Error al carregar les dreceres de teclat.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Si us plau, introdueix una tecla per a la drecera.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Si us plau, seleccioneu una acció per a la drecera.",
+    "KeyboardShortcuts_EnterKey": "Si us plau, introdueix una tecla per a la drecera.",
+    "KeyboardShortcuts_SelectOperation": "Si us plau, seleccioneu una acció per a la drecera.",
+    "KeyboardShortcuts_ShortcutInUse": "Aquest accés ràpid ja està en ús per un altre drecera.",
+    "KeyboardShortcuts_FailedToSave": "No s'ha pogut guardar la drecera.",
+    "KeyboardShortcuts_FailedToDelete": "No s'ha pogut eliminar la drecera.",
+    "KeyboardShortcuts_PageDescription": "Configura les dreceres de teclat per a les operacions ràpides de correu. Premeu les tecles mentre el camp d'entrada de tecles estigui enfocat per capturar les dreceres.",
+    "KeyboardShortcuts_Add": "Afegeix drecera",
+    "KeyboardShortcuts_EditTitle": "Edita la drecera de teclat",
+    "KeyboardShortcuts_ResetToDefaults": "Restableix als valors per defecte",
+    "KeyboardShortcuts_PressKeysHere": "Premieu aquí les tecles...",
+    "KeyboardShortcuts_KeyCombination": "Combinació de tecles",
+    "KeyboardShortcuts_FocusArea": "Focalitza el camp anterior i prem la combinació de tecles desitjada",
+    "KeyboardShortcuts_Modifiers": "Tecles modificadores",
+    "KeyboardShortcuts_Mode": "Modalitat",
+    "KeyboardShortcuts_ModeMail": "Correu",
+    "KeyboardShortcuts_ModeCalendar": "Calendari",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Alternar llegit/no llegit",
+    "KeyboardShortcuts_ActionToggleFlag": "Alternar etiqueta",
+    "KeyboardShortcuts_ActionToggleArchive": "Alternar arxivar/no arxivar",
     "ImageRenderingDisabled": "Image rendering is disabled for this message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Username",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "Configuració d'IMAP i Calendari",
+    "ImapCalDavSettingsPage_TitleEdit": "Editar la configuració d'IMAP i Calendari",
+    "ImapCalDavSettingsPage_Subtitle": "Configura IMAP/SMTP i la sincronització opcional del calendari per a aquest compte.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Configuració bàsica",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Introdueix la teva identitat i credencials. Wino pot intentar detectar la configuració del servidor automàticament.",
+    "ImapCalDavSettingsPage_BasicTab": "Bàsic",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Activa el suport de calendaris",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Autodescobriment de la configuració de correu",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Configuracions de correu descobertes i aplicades.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configuració avançada",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Introduïu la configuració del servidor manualment si la descoberta automàtica no està disponible o és incorrecta.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avançat",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configuració del calendari",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Trieu com han de funcionar les dades del calendari per a aquest compte IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Mode de calendari",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Seguretat de la connexió",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Mètode d'autenticació",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Desactivat",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronització CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Calendari local només",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "El calendari està desactivat per a aquest compte.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Els elements del calendari es sincronitzen amb el vostre servidor CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Els elements del calendari s'emmagatzemen només en aquest ordinador i no es sincronitzen a la xarxa.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Com funciona el calendari local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Calendari local només",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "El calendari local guarda tots els esdeveniments només al vostre ordinador. Res es sincronitza amb iCloud, Yahoo o cap altre proveïdor.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL del servei CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nom d'usuari CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Contrasenya CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "La prova de CalDAV només és requerida quan el mode de calendari està configurat per a la sincronització CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "L'URL del servei CalDAV és obligatori.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "L'URL del servei CalDAV ha de ser una URL absoluta.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV: s'ha d'introduir un nom d'usuari.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV: s'ha d'introduir una contrasenya.",
+    "ImapCalDavSettingsPage_TestImapButton": "Prova la connexió IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Prova la connexió CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "La prova de connexió IMAP s'ha completat amb èxit.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "La prova de connexió CalDAV s'ha completat amb èxit.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "La configuració del compte s'ha guardat.",
+    "ImapCalDavSettingsPage_ICloudHint": "Utilitza una contrasenya específica de l'aplicació generada des de la configuració del teu compte Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Utilitza una contrasenya d'aplicació de la configuració de seguretat del teu compte Yahoo.",
     "Info_AccountCreatedMessage": "{0} is created",
     "Info_AccountCreatedTitle": "Account Creation",
     "Info_AccountCreationFailedTitle": "Account Creation Failed",
     "Info_AccountDeletedMessage": "{0} is successfuly deleted.",
     "Info_AccountDeletedTitle": "Account Deleted",
     "Info_AccountIssueFixFailedTitle": "Failed",
+    "Info_AccountIssueFixImapMessage": "Obre la pàgina de configuració IMAP i Calendari per tornar a introduir les credencials del servidor.",
+    "Info_AccountAttentionRequiredMessage": "Aquest compte necessita la teva atenció.",
+    "Info_AccountAttentionRequiredClickableMessage": "Fes clic per solucionar aquest compte i tornar a sincronitzar-lo.",
+    "Info_AccountAttentionRequiredAction": "Solucionar",
+    "Info_AccountAttentionRequiredActionHint": "Feu clic a Solucionar per resoldre aquest problema del compte.",
     "Info_AccountIssueFixSuccessMessage": "Fixed all account issues.",
     "Info_AccountIssueFixSuccessTitle": "Success",
     "Info_AttachmentOpenFailedMessage": "Can't open this attachment.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "Actualització disponible",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Unarchive",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Arrossegant {0} element(s)",
     "MailsSelected": "{0} item(s) selected",
     "MarkFlagUnflag": "Mark as flagged/unflagged",
     "MarkReadUnread": "Mark as read/unread",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "Actualització disponible",
+    "Notifications_StoreUpdateAvailableMessage": "Una nova versió de Wino Mail està preparada per a la instal·lació des de Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Small",
     "Photos": "Photos",
     "PreparingFoldersMessage": "Preparing folders",
-    "ProtocolLogAvailable_Message": "Protocol logs are available for diagnostics.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Atajos de teclat",
+    "Settings_KeyboardShortcuts_Description": "Gestiona els atajos de teclat per a accions ràpides als missatges.",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Configuració IMAP i Calendari",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Obre la pàgina de configuració dedicada d'IMAP, SMTP i CalDAV per a aquest compte.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Obre la configuració",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Mode de l'aplicació per defecte",
+    "SettingsAppPreferences_ApplicationMode_Description": "Trieu el mode per defecte amb què s'obrirà Wino quan no s'especifiqui cap tipus d'activació.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Correu",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendari",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Amaga el botó de compte de Wino a la barra de títol.",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Amaga el botó de perfil de la barra de títol que obre el desplegable del compte de Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notificacions d'actualitzacions de la Botiga",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Mostra notificacions i accions al peu de pàgina quan hi hagi una actualització disponible a Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Accions d'IA",
+    "SettingsAppPreferences_AiActions_Description": "Trieu les llengües d'IA predeterminades i on s'han d'emmagatzemar els resums.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Idioma de traducció predeterminant",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Trieu l'idioma de destinació predeterminat utilitzat per les accions de traducció amb IA.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Idioma de resum",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Seleccioneu l'idioma de resum preferit per a la sortida futura de resums d'IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Ruta de desament predeterminada per als resums.",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Seleccioneu la carpeta que Wino hauria d'utilitzar com a predeterminada per desar resums d'IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Utilitza la ubicació de desament predeterminada del sistema.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Aquesta carpeta no existeix. S'utilitzarà la ubicació de desament predeterminada per als resums.",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Durada de postergació per defecte",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Estableix una durada de postergació per defecte per a les notificacions de recordatoris del calendari.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Format d'encapçalament de dia de la vista amb hora",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Trieu com es representen les etiquetes de dia en les vistes de dia, setmana i setmana laboral. Utilitza tokens de format de data com ddd, dd, MMM o dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Fons de la finestra",
+    "SettingsWindowBackdrop_Description": "Seleccioneu un efecte de fons per a les finestres de Wino.",
+    "SettingsWindowBackdrop_Disabled": "La selecció de fons de finestra està deshabilitada quan el tema de l'aplicació és diferent de Predeterminat.",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Canvis desats",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Les dades del compte s'han actualitzat correctament.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Inici",
+    "SettingsHome_SearchTitle": "Cercar una configuració",
+    "SettingsHome_SearchDescription": "Cerca per característica, tema o paraula-clau per anar directament a la pàgina de configuració correcta.",
+    "SettingsHome_SearchPlaceholder": "Cerca configuracions",
+    "SettingsHome_SearchExamples": "Prova: tema, emmagatzematge, idioma, signatura",
+    "SettingsHome_QuickLinks_Title": "Enllaços ràpids",
+    "SettingsHome_QuickLinks_Description": "Accediu ràpidament a les configuracions que es consulten més sovint.",
+    "SettingsHome_StorageCard_Description": "Comproveu quina quantitat de contingut MIME local guarda Wino en aquest dispositiu i netegeu-lo quan sigui necessari.",
+    "SettingsHome_StorageEmptySummary": "Encara no s'ha detectat contingut MIME en memòria cau.",
+    "SettingsHome_StorageLoading": "Comprovant l'ús de MIME local...",
+    "SettingsHome_Tips_Title": "Consells i trucs",
+    "SettingsHome_Tips_Description": "Uns pocs canvis poden fer que Wino sigui molt més personal.",
+    "SettingsHome_Tip_Theme": "Vols mode fosc o canvis d'accent? Obre Personalització.",
+    "SettingsHome_Tip_Background": "Utilitza Preferències de l'Aplicació per controlar el comportament d'inici i la sincronització en segon pla.",
+    "SettingsHome_Tip_Shortcuts": "Els atajos de teclat t'ajuden a moure't pels correus més ràpidament.",
+    "SettingsHome_Resources_Title": "Enllaços útils",
+    "SettingsHome_Resources_Description": "Obre recursos del projecte, informació de suport i canals de llançament.",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "General",
+    "SettingsOptions_MailSection": "Correu",
+    "SettingsOptions_CalendarSection": "Calendari",
+    "SettingsOptions_MoreComingSoon": "Més opcions aviat",
+    "SettingsOptions_HeroDescription": "Personalitza l'experiència de Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} compte(s) configurat(s)",
+    "SettingsSearch_ManageAccounts_Keywords": "Compte;Comptes;Bústia;Bústies;Àlies;Àlies;Perfil;Adreça;Adreces",
+    "SettingsSearch_AppPreferences_Keywords": "Inici;Segon pla;Llançament;Sincronització;Notificació;Notificacions;Cerca;Safata;Valors predeterminats",
+    "SettingsSearch_LanguageTime_Keywords": "Idioma;Hora;Rellotge;Localització;Regió;Format;hores de 24;24h",
+    "SettingsSearch_Personalization_Keywords": "Tema;Fosc;Clar;Aparença;Accent;Color;Color;Mode;Disposició;Densitat",
+    "SettingsSearch_About_Keywords": "Sobre;Versió;Lloc web;Privacitat;GitHub;Donacions;Botiga;Suport",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "Drecera;Drecers;Tecla ràpida;Tecles ràpides;Teclat;Tecles",
+    "SettingsSearch_MessageList_Keywords": "Missatge;Missatges;Llista;Conversacions;Conversacions;Avatar;Previsualització;Remitent",
+    "SettingsSearch_ReadComposePane_Keywords": "Lector;Redactar;Redactor;Tipus de lletra;Tipus de lletra;Contingut extern;Visualització;Lectura",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "Signatura;Signatures;Xifratge;Certificat;Certificats;S/MIME;S/MIME;Seguretat",
+    "SettingsSearch_Storage_Keywords": "Emmagatzematge;Còpia en memòria cau;Emmagatzematge en memòria cau;MIME;Disc;Espai;Neteja;Netejar;Dades locals",
+    "SettingsSearch_CalendarSettings_Keywords": "Calendari;Setmana;Hores;Horari;Esdeveniment;Esdeveniments",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Obre el lloc web de Wino Mail.",
+    "SettingsWebsite_Title": "Lloc web",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "Plantilles de correu",
+    "SettingsEmailTemplates_Description": "Gestiona plantilles de correu electrònic.",
+    "SettingsEmailTemplates_CreatePageTitle": "Nova plantilla",
+    "SettingsEmailTemplates_EditPageTitle": "Edita plantilla",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nova plantilla",
+    "SettingsEmailTemplates_NewTemplateDescription": "Crea una nova plantilla de correu electrònic",
+    "SettingsEmailTemplates_NameTitle": "Nom",
+    "SettingsEmailTemplates_NamePlaceholder": "Nom de la plantilla",
+    "SettingsEmailTemplates_DescriptionTitle": "Descripció",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descripció opcional",
+    "SettingsEmailTemplates_ContentTitle": "Contingut de la plantilla",
+    "SettingsEmailTemplates_ContentDescription": "Edita el contingut HTML d'aquesta plantilla.",
+    "SettingsEmailTemplates_NameRequired": "Cal introduir un nom per a la plantilla.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Emmagatzematge",
+    "SettingsStorage_Description": "Escaneja i gestiona la memòria cau MIME emmagatzemada a la teva carpeta de dades locals.",
+    "SettingsStorage_ScanFolder": "Escaneja la carpeta de dades locals.",
+    "SettingsStorage_NoLocalMimeDataFound": "No s'han trobat dades MIME locals.",
+    "SettingsStorage_NoAccountsFound": "No s'han trobat comptes.",
+    "SettingsStorage_TotalUsage": "Ús local total de MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} utilitzat en la memòria cau MIME local.",
+    "SettingsStorage_DeleteAll_Title": "Elimina tot el contingut MIME",
+    "SettingsStorage_DeleteAll_Description": "Esborrar tota la carpeta de la memòria cau MIME d'aquest compte.",
+    "SettingsStorage_DeleteAll_Button": "Elimina tot",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Elimina tot el contingut MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Esborrar dades MIME locals per a {0}?",
+    "SettingsStorage_DeleteAll_Success": "Tot el contingut MIME s'ha eliminat.",
+    "SettingsStorage_DeleteOld_Title": "Esborrar contingut MIME vell",
+    "SettingsStorage_DeleteOld_Description": "Esborrar fitxers MIME segons la data de creació del correu electrònic a la base de dades local.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mes",
+    "SettingsStorage_DeleteOld_3Months": "> 3 mesos",
+    "SettingsStorage_DeleteOld_6Months": "> 6 mesos",
+    "SettingsStorage_DeleteOld_1Year": "> 1 any",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Esborrar contingut MIME vell",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Esborrar les dades MIME locals més antigues que {0} per a {1}?",
+    "SettingsStorage_DeleteOld_Success": "S'han eliminat {0} carpeta(s) MIME més antigues que {1}.",
+    "SettingsStorage_1Month": "1 mes",
+    "SettingsStorage_3Months": "3 mesos",
+    "SettingsStorage_6Months": "6 mesos",
+    "SettingsStorage_1Year": "1 any",
+    "SettingsStorage_Months": "{0} mesos",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Obre Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Obre Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Surt",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Certificats importats amb èxit.",
+    "Smime_ImportCertificates_Error": "Error en importar certificats: {0}",
+    "Smime_RemoveCertificates_Confirm": "Voleu realment eliminar els certificats {0}?",
+    "Smime_RemoveCertificates_Success": "Certificats eliminats.",
+    "Smime_ExportCertificates_Success": "Certificats exportats.",
+    "Smime_ExportCertificates_Error": "Error en exportar certificats.",
+    "Smime_CertificateDetails": "Subjecte: {0}\nEmissor: {1}\nVàlid des de: {2}\nVàlid fins a: {3}\nEmpremta: {4}",
+    "Smime_CertificatePassword_Title": "Contrasenya del certificat obligatòria",
+    "Smime_CertificatePassword_Placeholder": "Contrasenya del certificat per a {0} (opcional)",
+    "Smime_Confirm_Title": "Confirma",
+    "Buttons_OK": "D'acord",
+    "Buttons_Refresh": "Actualitza",
+    "SettingsSignatureAndEncryption_Title": "Signatura i xifrat",
+    "SettingsSignatureAndEncryption_Description": "Gestioneu els certificats S/MIME per signar i xifrar correus electrònics.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Els meus certificats",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificats personals per signar i xifrar",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificats dels destinataris",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificats dels destinataris per desxifrar",
+    "SettingsSignatureAndEncryption_NameColumn": "Nom",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Data d'expiració",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Empremta",
+    "Buttons_Remove": "Elimina",
+    "Buttons_Export": "Exporta",
+    "Buttons_Import": "Importa",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificat de signatura S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Xifrat S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Cap",
+    "SmimeSignaturesInMessage": "Signatures en aquest missatge:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, vàlid fins a {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informació del certificat de signatura S/MIME",
+    "SmimeCertificateInfoTitle": "Informació del certificat S/MIME",
+    "SmimeNoCertificateFileFound": "No s'ha trobat cap fitxer de certificat",
+    "SmimeSaveCertificate": "Desa el certificat...",
+    "SmimeCertificate": "Certificat S/MIME",
+    "SmimeCertificateSavedTo": "Certificat desat a {0}",
+    "SmimeSignedTooltip": "Aquest missatge està signat amb un certificat S/MIME. Fes clic per a més detalls",
+    "SmimeEncryptedTooltip": "Aquest missatge està xifrat amb un certificat S/MIME.",
+    "SmimeCertificateFileInfo": "Fitxer: {0}\nTipus: {1}\nMida: {2:N0} bytes",
+    "Composer_LightTheme": "Tema clar",
+    "Composer_DarkTheme": "Tema fosc",
+    "Composer_Outdent": "Disminueix la sangria",
+    "Composer_Indent": "Sangria",
+    "Composer_BulletList": "Llista amb punts",
+    "Composer_OrderedList": "Llista numerada",
+    "Composer_Stroke": "Traç",
+    "Composer_Bold": "Negreta",
+    "Composer_Italic": "Cursiva",
+    "Composer_Underline": "Subratllat",
+    "Composer_CcBcc": "Cc i Còpia oculta",
+    "Composer_EnableSmimeSignature": "Activa/desactiva la signatura S/MIME",
+    "Composer_EnableSmimeEncryption": "Activa/desactiva l'encriptació S/MIME",
+    "Composer_LocalDraftSyncInfo": "Aquest esborrany és només local. Wino no va poder enviar-lo al vostre servidor de correu. Feu clic per tornar a intentar enviar-lo al servidor.",
+    "Composer_CertificateExpires": "Expira el: ",
+    "Composer_SmimeSignature": "Signatura S/MIME",
+    "Composer_SmimeEncryption": "Xifrat S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Plantilles d'e-mails",
+    "Composer_AiSummarize": "Resumir amb IA",
+    "Composer_AiSummarizeDescription": "Extreu punts clau, accions i decisions d'aquest correu electrònic.",
+    "Composer_AiTranslate": "Tradueix amb IA",
+    "Composer_AiActions": "Accions d'IA",
+    "Composer_AiRewrite": "Reescriu amb IA",
+    "AiActions_CheckingStatus": "Comprovant l'accés a IA...",
+    "AiActions_SignedOutTitle": "Desbloqueja el paquet IA de Wino",
+    "AiActions_SignedOutDescription": "Traduïu, reescriviu i resumi correus electrònics amb IA després d'iniciar sessió al teu compte Wino i activar l'extensió AI Pack.",
+    "AiActions_NoPackTitle": "Cal l'AI Pack",
+    "AiActions_NoPackDescription": "Estàs connectat, però l'AI Pack encara no està actiu. Adquireix-lo per utilitzar les eines de traducció, reescriptura i resum amb IA de Wino.",
+    "AiActions_UsageSummary": "{0} de {1} crèdits utilitzats aquest mes.",
+    "Composer_AiRewritePolite": "Fes-ho més educat",
+    "Composer_AiRewritePoliteDescription": "Suavitza la redacció mantenint la mateixa intenció.",
+    "Composer_AiRewriteAngry": "Fes-ho enfadat",
+    "Composer_AiRewriteAngryDescription": "Utilitza un to més contundent i confrontador.",
+    "Composer_AiRewriteHappy": "Fes-ho feliç",
+    "Composer_AiRewriteHappyDescription": "Afegeix un to més optimista i entusiasta.",
+    "Composer_AiRewriteFormal": "Fes-ho formal",
+    "Composer_AiRewriteFormalDescription": "Fa que el missatge soni més professional i estructurat.",
+    "Composer_AiRewriteFriendly": "Fes-ho amigable",
+    "Composer_AiRewriteFriendlyDescription": "Escalfa el missatge amb un to més proper.",
+    "Composer_AiRewriteShorter": "Fes-ho més breu",
+    "Composer_AiRewriteShorterDescription": "Redueix el text i elimina detalls innecessaris.",
+    "Composer_AiRewriteClearer": "Fes-ho més clar",
+    "Composer_AiRewriteClearerDescription": "Millora la llegibilitat i facilita la comprensió del missatge.",
+    "Composer_AiRewriteCustom": "Personalitzat",
+    "Composer_AiRewriteCustomDescription": "Descriu la teva intenció de reescriptura.",
+    "Composer_AiRewriteCustomPlaceholder": "Descriu com vols que el missatge sigui reescrit",
+    "Composer_AiRewriteMode": "Tonalitat de reescriptura",
+    "Composer_AiRewriteApply": "Aplica la reescriptura",
+    "Composer_AiTranslateDialogTitle": "Tradueix amb IA",
+    "Composer_AiTranslateDialogDescription": "Introdueix la llengua o el codi de cultura de destinació, com ara en-US, tr-TR, de-DE o fr-FR.",
+    "Composer_AiTranslateApply": "Tradueix",
+    "Composer_AiTranslateLanguage": "Llengua de destinació",
+    "Composer_AiTranslateCustomPlaceholder": "Introdueix el codi de cultura",
+    "Composer_AiTranslateLanguageEnglish": "Anglès (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turc (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Alemany (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francès (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Espanyol (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italià (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portuguès (Brasil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "neerlandès (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polonès (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rus (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonès (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "coreà (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Xinès, Simplificat (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Àrab (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Altres...",
+    "Composer_AiBusyTitle": "L'IA ja està treballant.",
+    "Composer_AiBusyMessage": "Si us plau, espereu que s'acabi l'acció actual de IA.",
+    "Composer_AiSignInRequired": "Inicia sessió al teu compte Wino per utilitzar les funcions de IA.",
+    "Composer_AiMissingHtml": "Encara no hi ha contingut de missatge per enviar a Wino IA.",
+    "Composer_AiQuotaUnavailable": "El resultat de IA s'ha aplicat.",
+    "Composer_AiAppliedMessage": "El resultat de IA s'ha aplicat al compositor. Utilitza Desfer si vols revertir-ho.",
+    "Composer_AiSummarizeSuccessTitle": "Resum de IA aplicat",
+    "Composer_AiTranslateSuccessTitle": "Traducció de IA aplicada",
+    "Composer_AiRewriteSuccessTitle": "Reescriptura amb IA aplicada",
+    "Composer_AiErrorTitle": "L'acció de IA ha fallat.",
+    "Reader_AiAppliedMessage": "El resultat de la IA ara s'ha mostrat per a aquest missatge. Reobre el missatge per veure de nou el contingut original.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contactes",
+    "ContactsPage_AddContact": "Afegeix contacte",
+    "ContactsPage_EditContact": "Edita contacte",
+    "ContactsPage_DeleteContact": "Elimina contacte",
+    "ContactsPage_SearchPlaceholder": "Cerca contactes...",
+    "ContactsPage_NoContacts": "No s'han trobat contactes.",
+    "ContactsPage_ContactsCount": "{0} contactes",
+    "ContactsPage_SelectedContactsCount": "{0} seleccionats",
+    "ContactsPage_DeleteSelectedContacts": "Elimina els seleccionats",
+    "ContactEditDialog_Title": "Edita contacte",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Selecciona foto",
+    "ContactEditDialog_RemovePhoto": "Elimina foto",
+    "ContactEditDialog_NameHeader": "Nom",
+    "ContactEditDialog_NamePlaceholder": "Nom del contacte",
+    "ContactEditDialog_EmailHeader": "Adreça de correu electrònic",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Informació de contacte",
+    "ContactEditDialog_RootContactInfo": "Aquest és un contacte arrel associat amb els teus comptes i no es pot eliminar.",
+    "ContactEditDialog_OverriddenContactInfo": "Aquest contacte s'ha modificat manualment i no s'actualitzarà durant la sincronització.",
+    "ContactsPage_Subtitle": "Gestioneu els vostres contactes de correu electrònic i la seva informació",
+    "ContactStatus_Account": "Compte",
+    "ContactStatus_Modified": "Modificat",
+    "ContactAction_Edit": "Edita contacte",
+    "ContactAction_ChangePhoto": "Canvia la foto",
+    "ContactAction_Delete": "Elimina contacte",
+    "ContactAction_Add": "Afegeix contacte",
+    "ContactSelection_Selected": "seleccionat",
+    "ContactSelection_SelectAll": "Selecciona tot",
+    "ContactSelection_Clear": "Netejar",
+    "ContactsPage_EmptyState": "No hi ha contactes per mostrar",
+    "ContactsPage_AddFirstContact": "Afegeix el teu primer contacte",
+    "ContactsPage_ContactsCountSuffix": "contactes",
+    "ContactsPane_NewContact": "Nou contacte",
+    "ContactsPane_DescriptionTitle": "Gestioneu els vostres contactes",
+    "ContactsPane_DescriptionBody": "Crea contactes, renombra'ls, actualitza les fotos de perfil i mantingueu les dades guardades organitzades en un lloc.",
+    "ContactEditDialog_AddTitle": "Afegeix contacte",
+    "ContactInfoBar_ContactAdded": "Contacte afegit amb èxit.",
+    "ContactInfoBar_ContactUpdated": "Contacte actualitzat amb èxit.",
+    "ContactInfoBar_ContactsDeleted": "Contactes eliminats amb èxit.",
+    "ContactInfoBar_ContactPhotoUpdated": "La foto del contacte s'ha actualitzat amb èxit.",
+    "ContactInfoBar_FailedToLoadContacts": "Error en carregar contactes: {0}",
+    "ContactInfoBar_FailedToAddContact": "Error en afegir contacte: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Error en actualitzar contacte: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Error en eliminar contactes: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Error en actualitzar la foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "No es poden eliminar contactes arrel.",
+    "ContactConfirmDialog_DeleteTitle": "Elimina contacte",
+    "ContactConfirmDialog_DeleteMessage": "Estàs segur d'eliminar el contacte '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Estàs segur d'eliminar {0} contacte(s)?",
+    "ContactConfirmDialog_DeleteButton": "Elimina",
+    "CalendarAccountSettings_Title": "Configuració del compte de calendari",
+    "CalendarAccountSettings_Description": "Gestioneu la configuració del calendari per a {0}",
+    "CalendarAccountSettings_AccountColor": "Color del compte",
+    "CalendarAccountSettings_AccountColorDescription": "Canvia el color de visualització per a aquest compte de calendari.",
+    "CalendarAccountSettings_SyncEnabled": "Activa la sincronització",
+    "CalendarAccountSettings_SyncEnabledDescription": "Activa o desactiva la sincronització del calendari per a aquest compte.",
+    "CalendarAccountSettings_DefaultShowAs": "Estat de disponibilitat per defecte",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Estat de disponibilitat per defecte per als nous esdeveniments creats amb aquest compte.",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendari principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marca aquest calendari com a calendari principal del compte.",
+    "CalendarSettings_NewEventBehavior_Header": "Comportament del botó Nou Esdeveniment",
+    "CalendarSettings_NewEventBehavior_Description": "Tria si el botó Nou Esdeveniment ha de demanar un calendari cada vegada o obrir sempre un calendari específic.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Demana-ho a cada vegada.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Sempre utilitza un calendari específic.",
+    "CalendarSettings_Rendering_Title": "Representació",
+    "CalendarSettings_Rendering_Description": "Configura la disposició del calendari i el comportament de visualització.",
+    "CalendarSettings_Notifications_Title": "Notificacions",
+    "CalendarSettings_Notifications_Description": "Tria el recordatori per defecte i el comportament de posposar.",
+    "CalendarSettings_Preferences_Title": "Preferències",
+    "CalendarSettings_Preferences_Description": "Defineix com s'ha de comportar el botó Nou Esdeveniment.",
+    "WhatIsNew_GetStartedButton": "Comença",
+    "WhatIsNew_ContinueAnywayButton": "Continuar de totes maneres",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparant la nova versió...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparant les teves dades",
+    "WhatIsNew_MigrationPreparing_Description": "Wino està aplicant migracions de l'actualització. Si us plau espera mentre preparem les dades del teu compte per a aquesta versió.",
+    "WhatIsNew_MigrationFailedMessage": "La migració ha fallat amb el codi d'error {0}. Podeu continuar fent servir l'aplicació. No obstant això, si us trobeu amb problemes greus, torneu a instal·lar l'aplicació.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Actualitzat",
+    "WhatIsNew_MigrationNotification_Message": "Obriu l'aplicació per completar la actualització i veure les novetats.",
+    "WelcomeWindow_Title": "Benvingut a Wino Mail",
+    "WelcomeWindow_Subtitle": "Una experiència nativa de Windows per a Correu i Calendari.",
+    "WelcomeWindow_WhatsNewTitle": "Últims canvis",
+    "WelcomeWindow_FeaturesTitle": "Característiques",
+    "WelcomeWindow_WhatsNewTab": "Què hi ha de nou",
+    "WelcomeWindow_FeaturesTab": "Característiques",
+    "WelcomeWindow_GetStartedButton": "Comença afegint un compte",
+    "WelcomeWindow_GetStartedDescription": "Afegeix el teu compte de Outlook, Gmail o IMAP per començar a utilitzar Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importa des del teu compte Wino.",
+    "WelcomeWindow_ImportInProgress": "S'importen les teves preferències i comptes sincronitzats.",
+    "WelcomeWindow_ImportNoAccountsFound": "No s'han trobat comptes sincronitzats al teu compte Wino. Si hi havia preferències disponibles, s'han restaurat. Utilitza Comença per afegir un compte manualment.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} comptes sincronitzats ja estan disponibles en aquest dispositiu. Utilitza Comença per afegir un altre compte manualment si és necessari.",
+    "WelcomeWindow_SetupTitle": "Configura el teu compte",
+    "WelcomeWindow_SetupSubtitle": "Tria el teu proveïdor de correu per començar",
+    "WelcomeWindow_AddAccountButton": "Afegir compte",
+    "WelcomeWindow_SkipForNow": "Ignora per ara — el configuraré més tard",
+    "WelcomeWindow_AppDescription": "Una bústia d'entrada ràpida i enfocada, redissenyada per a Windows 11",
+    "WelcomeWizard_Step1Title": "Benvingut",
+    "SystemTrayMenu_Open": "Obrir",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Configuració de sincronització",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mantingues les teves preferències de Wino sincronitzades entre dispositius.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Desbloqueja complements",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accedeix a funcions premium com Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gestiona el teu compte Wino, l'accés a Wino AI Pack i les preferències i detalls del compte sincronitzats.",
+    "WinoAccount_Management_SignedOutTitle": "Inicia sessió a Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Inicia sessió o crea un compte per sincronitzar el teu correu, accedir a les funcions d'IA i gestionar la teva configuració entre dispositius.",
+    "WinoAccount_Management_ProfileSectionHeader": "Perfil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Extencions Wino",
+    "WinoAccount_Management_DataSectionHeader": "Dades",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Accions de compte",
+    "WinoAccount_Management_AccountCardTitle": "Compte",
+    "WinoAccount_Management_AccountCardDescription": "La direcció de correu del teu compte Wino i l'estat actual del compte.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Ves si Wino AI Pack està actiu i quanta utilització en queda.",
+    "WinoAccount_Management_AiPackActive": "AI Pack està actiu",
+    "WinoAccount_Management_AiPackInactive": "AI Pack no està actiu",
+    "WinoAccount_Management_AiPackUsage": "{0} de {1} usos consumits. {2} restants.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Període de facturació: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Detalls d'ús encara no disponibles.",
+    "WinoAccount_Management_AiPackBuyDescription": "Compra Wino AI Pack per traduir, reescriure o resumir correus amb IA.",
+    "WinoAccount_Management_AiPackPromoTitle": "Desbloqueja Wino AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Dinamitza el flux de correu amb eines impulsades per IA. Traduïu missatges a més de 50 idiomes, reescriu per a claredat i to, i obtén resums immediats de fils llargs.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mes",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 crèdits",
+    "WinoAccount_Management_AiPackGetButton": "Obtenir AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Eines alimentades per IA per traduir, reformular i resumir accions a Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traducció, reescriptura, resum, productivitat",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Comptes il·limitats",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Elimina la limitació de comptes i afegeix tants comptes de correu com necessitis.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "comptes, il·limitats, premium, complement",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Inicia sessió amb el teu compte Wino per completar aquesta compra.",
+    "WinoAccount_Management_PurchaseStartFailed": "No s'ha pogut completar aquesta compra a Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "La compra s'ha completat, però Wino no ha pogut actualitzar encara els avantatges del teu compte. Prova-ho de nou en un moment.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "La teva subscripció està activa.",
+    "WinoAccount_Management_AiPackRenews": "Renova {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Crèdits utilitzats aquest mes",
+    "WinoAccount_Management_AiPackResets": "Restabliments {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Hem tingut problemes en carregar l'equilibri d'ús d'IA.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Tradueix",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Reescriu",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Resum",
+    "WinoAccount_Management_AddOnLoadFailed": "Hem tingut problemes en carregar aquest complement.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronitza Preferències i Comptes",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importa o exporta les teves preferències de Wino i els detalls de la bústia entre dispositius. Contrasenyes, tokens i altra informació sensible mai no s'intercanvien.",
+    "WinoAccount_Management_SignOutTitle": "Tanca la sessió",
+    "WinoAccount_Management_SignOutDescription": "Tanca la sessió del teu compte en aquest dispositiu.",
+    "WinoAccount_Management_StatusLabel": "Estat: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Encara no hi ha dades sincronitzades emmagatzemades per a aquest compte.",
+    "WinoAccount_Management_ExportSucceeded": "Les dades de Wino que has seleccionat s'han exportat correctament.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Les teves preferències s'han exportat al teu compte Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exportats {0} detalls de compte al teu compte Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Dades sincronitzades importades del teu compte Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Aplicades {0} preferències sincronitzades.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "S'han importat {0} comptes.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "S'han omès {0} comptes que ja existeixen en aquest dispositiu.",
+    "WinoAccount_Management_ImportPartial": "S'han aplicat {0} preferències sincronitzades. {1} preferències no s'han pogut restaurar.",
+    "WinoAccount_Management_ImportReloginReminder": "Les contrasenyes, tokens i altra informació sensible no s'han importat. Inicia sessió de nou per a cada compte en aquest dispositiu abans d'utilitzar-lo.",
+    "WinoAccount_Management_SerializeFailed": "No s'han pogut serialitzar les teves preferències actuals.",
+    "WinoAccount_Management_EmptyExport": "No hi ha valors de preferències per exportar.",
+    "WinoAccount_Management_ImportEmpty": "La càrrega de dades sincronitzades no conté res de nou per restaurar.",
+    "WinoAccount_Management_ExportDialog_Title": "Exporta al teu compte Wino.",
+    "WinoAccount_Management_ExportDialog_Description": "Tria què vols sincronitzar al teu compte Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferències",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Comptes",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Contrasenyes, tokens i altra informació sensible no es sincronitzen.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Els comptes importats en un altre PC encara necessitaran que inicis sessió de nou abans de poder utilitzar-los.",
+    "WinoAccount_Management_ExportDialog_InProgress": "S'està exportant les teves dades de Wino seleccionades.",
+    "WinoAccount_Management_LoadFailed": "No s'ha pogut carregar la darrera informació del compte Wino.",
+    "WinoAccount_Management_ActionFailed": "La sol·licitud del compte Wino no s'ha pogut completar.",
+    "WinoAccount_SettingsSection_Title": "Compte Wino",
+    "WinoAccount_SettingsSection_Description": "Crea o inicia sessió en un compte Wino utilitzant el teu servei d'autenticació local.",
+    "WinoAccount_RegisterButton_Title": "Registra un compte",
+    "WinoAccount_RegisterButton_Description": "Crea un compte Wino amb correu electrònic i contrasenya.",
+    "WinoAccount_RegisterButton_Action": "Obre el registre",
+    "WinoAccount_LoginButton_Title": "Inicia sessió",
+    "WinoAccount_LoginButton_Description": "Inicia sessió en un compte Wino existent amb correu electrònic i contrasenya.",
+    "WinoAccount_LoginButton_Action": "Obre l'inici de sessió",
+    "WinoAccount_SignOutButton_Title": "Tanca sessió",
+    "WinoAccount_SignOutButton_Description": "Elimina la sessió del compte Wino emmagatzemada localment.",
+    "WinoAccount_SignOutButton_Action": "Tanca sessió",
+    "WinoAccount_RegisterDialog_Title": "Crea un compte Wino",
+    "WinoAccount_RegisterDialog_Description": "Crea un compte Wino per mantenir la teva experiència Wino sincronitzada i desbloquejar complements basats en el compte.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Crea el teu compte Wino.",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Per què crear-ne un?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importa i exporta la configuració entre dispositius",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Mou les teves preferències de Wino entre dispositius sense haver de tornar a configurar-ho tot des de zero.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Accedeix a complements exclusius com Wino AI Pack (de pagament)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Utilitza un compte per desbloquejar les funcions premium de Wino a mesura que estiguin disponibles.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "El compte Wino és separat dels teus comptes de correu.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Els teus comptes de Outlook, Gmail, IMAP o altres comptes de correu romanen tal com són. Un compte Wino només gestiona característiques i complements específics de Wino.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registra",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacitat i processament de l'API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Els complements opcionals com Wino AI Pack poden enviar contingut HTML de correu electrònic seleccionat al servei API de Wino només quan utilitzis aquestes funcions.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Llegeix la política de privacitat.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Estic d'acord amb la política de privacitat.",
+    "WinoAccount_LoginDialog_Title": "Inicia sessió al compte Wino.",
+    "WinoAccount_LoginDialog_Description": "Inicia sessió en el teu compte Wino per sincronitzar la configuració de Wino i accedir a funcions basades en el compte.",
+    "WinoAccount_LoginDialog_HeroTitle": "Ben tornat",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Quines avantatges té iniciar sessió.",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Utilitza el teu compte Wino per continuar sincronitzant la configuració entre dispositius i accedir a complements de pagament com Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Això no és l'inici de sessió de la teva bústia de correu.",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Iniciar sessió aquí no afegeix ni substitueix els teus comptes de Outlook, Gmail o IMAP en Wino. Només inicia sessió en serveis específics de Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Has oblidat la contrasenya?",
+    "WinoAccount_EmailLabel": "Correu electrònic",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Contrasenya",
+    "WinoAccount_ConfirmPasswordLabel": "Confirma la contrasenya.",
+    "WinoAccount_ForgotPasswordDialog_Title": "Restableix la teva contrasenya.",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Envia un correu electrònic de restabliment.",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Torna a iniciar sessió",
+    "WinoAccount_ForgotPasswordDialog_Description": "Introdueix l'adreça de correu electrònic del teu compte Wino i t'enviem un enllaç de restabliment de contrasenya si l'adreça està registrada.",
+    "WinoAccount_Validation_EmailRequired": "L'adreça de correu electrònic és obligatòria.",
+    "WinoAccount_Validation_PasswordRequired": "La contrasenya és obligatòria.",
+    "WinoAccount_Validation_PasswordMismatch": "Les contrasenyes no coincideixen.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Has d'acceptar la política de privacitat abans de crear un compte Wino.",
+    "WinoAccount_Error_InvalidCredentials": "L'adreça de correu electrònic o la contrasenya són incorrectes.",
+    "WinoAccount_Error_AccountLocked": "Aquest compte està temporalment bloquejat.",
+    "WinoAccount_Error_AccountBanned": "Aquest compte ha estat bloquejat.",
+    "WinoAccount_Error_AccountSuspended": "Aquest compte ha estat suspès.",
+    "WinoAccount_Error_EmailNotConfirmed": "Si us plau, confirma la teva adreça de correu electrònic abans d'iniciar sessió.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Si us plau, confirma la teva adreça de correu electrònic abans d'iniciar sessió.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Encara no està disponible un nou correu de confirmació.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Aquesta sol·licitud de confirmació ja no és vàlida. Prova d'iniciar sessió de nou.",
+    "WinoAccount_Error_EmailNotRegistered": "Aquesta adreça de correu electrònic no està registrada.",
+    "WinoAccount_Error_RefreshTokenInvalid": "La teva sessió ja no és vàlida. Si us plau, inicia sessió de nou.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Aquesta adreça de correu electrònic ja està registrada.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Cal una adreça de correu electrònic per completar l'inici de sessió extern.",
+    "WinoAccount_Error_ExternalLoginInvalid": "La sol·licitud d'inici de sessió externa és invàlida.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "L'estat d'inici de sessió externa és invàlid o caducat.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "El codi d'inici de sessió externa és invàlid o caducat.",
+    "WinoAccount_Error_AiPackRequired": "Cal una subscripció activa de Wino AI Pack per a aquesta acció.",
+    "WinoAccount_Error_AiQuotaExceeded": "El límit d'ús de Wino AI Pack s'ha assolit per al període de facturació actual.",
+    "WinoAccount_Error_AiHtmlEmpty": "No hi ha contingut de correu electrònic per processar.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Aquest correu és massa gran per processar amb Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Aquest idioma no és compatible. Prova un codi de cultura vàlid com en-US o tr-TR.",
+    "WinoAccount_Error_Forbidden": "No tens permisos per realitzar aquesta acció.",
+    "WinoAccount_Error_ValidationFailed": "La sol·licitud és invàlida. Si us plau, revisa els valors introduïts.",
+    "WinoAccount_RegisterSuccessMessage": "El registre del compte Wino s'ha completat per a {0}.",
+    "WinoAccount_LoginSuccessMessage": "Inici de sessió al compte Wino com {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirma la teva adreça de correu electrònic.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Hem enviat una confirmació per correu a {0}. Confirma-la i torna a iniciar sessió.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Cal confirmar l'adreça de correu electrònic.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Encara esperem que confirmis {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Reenvia el correu de confirmació.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Pots tornar a enviar el correu de confirmació en {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Ara pots tornar a enviar el correu de confirmació.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Correu de confirmació reenviat.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Hem enviat un altre correu de confirmació a {0}. Si us plau, confirma'l i torna a iniciar sessió.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "S'ha enviat un correu de restabliment de contrasenya.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Hem enviat un correu de restabliment de contrasenya a {0}. Obre aquest missatge per triar una nova contrasenya.",
+    "WinoAccount_ChangePassword_Title": "Canvia la contrasenya.",
+    "WinoAccount_ChangePassword_Description": "Envia un correu de restabliment de contrasenya per a aquest compte Wino.",
+    "WinoAccount_ChangePassword_Action": "Envia el correu de restabliment",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Voleu que Wino enviï un correu electrònic de restabliment de contrasenya a {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "S'ha tancat la sessió de Wino Account {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "No hi ha cap compte Wino actiu per desconnectar.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Compte Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Inicia sessió o crea un compte Wino per gestionar la teva sessió de Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Estat: {0}",
+    "WelcomeWizard_Step2Title": "Afegeix un compte",
+    "WelcomeWizard_Step3Title": "Finalitza la configuració",
+    "ProviderSelection_Title": "Trieu el vostre proveïdor de correu electrònic",
+    "ProviderSelection_Subtitle": "Seleccioneu un proveïdor a continuació per afegir el vostre compte de correu a Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nom del compte",
+    "ProviderSelection_AccountNamePlaceholder": "p. ex. Personal, Treball",
+    "ProviderSelection_DisplayNameHeader": "Nom a mostrar",
+    "ProviderSelection_DisplayNamePlaceholder": "p. ex. John Doe",
+    "ProviderSelection_EmailHeader": "Adreça de correu electrònic",
+    "ProviderSelection_EmailPlaceholder": "p. ex. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Contrasenya específica de l'aplicació",
+    "ProviderSelection_AppPasswordHelp": "Com obtinc una contrasenya específica de l'aplicació?",
+    "ProviderSelection_CalendarModeHeader": "Integració del calendari",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Desactivat",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Sense integració de calendari",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronització CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Els esdeveniments del vostre calendari es sincronitzen entre els vostres dispositius amb els servidors d'Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Els esdeveniments del vostre calendari es sincronitzen entre els vostres dispositius amb els servidors de Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendari local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Els vostres esdeveniments s'emmagatzemen només al vostre ordinador. No hi ha connexió amb cap servidor.",
+    "ProviderSelection_ClearColor": "Netejar color",
+    "ProviderSelection_ContinueButton": "Continuar",
+    "ProviderSelection_SpecialImap_Subtitle": "Introdueu les credencials del vostre compte per connectar.",
+    "AccountSetup_Title": "Configuració del vostre compte",
+    "AccountSetup_Step_Authenticating": "Autenticant amb {0}",
+    "AccountSetup_Step_TestingMailAuth": "Provant l'autenticació del correu",
+    "AccountSetup_Step_SyncingFolders": "Sincronitzant les metadades de les carpetes",
+    "AccountSetup_Step_FetchingProfile": "Obtenint informació de perfil",
+    "AccountSetup_Step_DiscoveringCalDav": "Descobrint la configuració CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Provant l'autenticació del calendari",
+    "AccountSetup_Step_SavingAccount": "Guardant la informació del compte",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Recuperant metadades del calendari",
+    "AccountSetup_Step_SyncingAliases": "Sincronitzant àlies",
+    "AccountSetup_Step_Finalizing": "Finalitzant la configuració",
+    "AccountSetup_FailureMessage": "La configuració ha fallat. Torna enrere per corregir la configuració o torna a provar-ho més tard.",
+    "AccountSetup_SuccessMessage": "El teu compte s'ha configurat amb èxit!",
+    "AccountSetup_GoBackButton": "Torna enrere",
+    "AccountSetup_TryAgainButton": "Prova-ho de nou",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "La detecció automàtica ha fallat. Si us plau, introdueix la configuració manualment a la pestanya Avançat."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/cs_CZ/resources.json b/Wino.Core.Domain/Translations/cs_CZ/resources.json
index b4193f0f..cb5fff64 100644
--- a/Wino.Core.Domain/Translations/cs_CZ/resources.json
+++ b/Wino.Core.Domain/Translations/cs_CZ/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "Vy",
     "AccountCreationDialog_Completed": "hotovo",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Načítám detaily kalendáře.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "inicializace",
     "AccountCreationDialog_PreparingFolders": "Stahování informací o složkách.",
     "AccountCreationDialog_SigninIn": "Probíhá ukládání informací o účtu.",
+    "Purchased": "Zakoupeno",
     "AccountEditDialog_Message": "Název účtu",
     "AccountEditDialog_Title": "Upravit účet",
     "AccountPickerDialog_Title": "Vybrat účet",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Obecné",
+    "AccountDetailsPage_TabMail": "E-mail",
+    "AccountDetailsPage_TabCalendar": "Kalendář",
+    "AccountDetailsPage_CalendarListDescription": "Vyberte kalendář pro konfiguraci jeho nastavení.",
     "AddHyperlink": "Přidat",
     "AppCloseBackgroundSynchronizationWarningTitle": "Synchronizace na pozadí",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP účet",
     "Busy": "Busy",
     "Buttons_AddAccount": "Přidat účet",
+    "Buttons_FixAccount": "Opravit účet",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Povolit",
+    "Buttons_Apply": "Použít",
     "Buttons_ApplyTheme": "Použít motiv",
     "Buttons_Browse": "Procházet",
     "Buttons_Cancel": "Zrušit",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Upravit",
     "Buttons_EnableImageRendering": "Povolit",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Spravovat",
     "Buttons_No": "Ne",
     "Buttons_Open": "Otevřít",
     "Buttons_Purchase": "Koupit",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Uložit",
     "Buttons_SaveConfiguration": "Uložit nastavení",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Odeslat na server",
     "Buttons_Share": "Sdílet",
     "Buttons_SignIn": "Přihlásit se",
     "Buttons_Sync": "Synchronizovat",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Zkusit znovu",
     "Buttons_Yes": "Ano",
+    "Sync_SynchronizingFolder": "Synchronizuji {0} {1}%",
+    "Sync_DownloadedMessages": "Staženo {0} zpráv ze {1}",
+    "SyncAction_Archiving": "Archivace {0} e-mailů",
+    "SyncAction_ClearingFlag": "Odebrání vlajky {0} e-mailů",
+    "SyncAction_CreatingDraft": "Vytváření konceptu zprávy",
+    "SyncAction_CreatingEvent": "Vytváření události",
+    "SyncAction_Deleting": "Mazání {0} e-mailů",
+    "SyncAction_EmptyingFolder": "Prázdnění složky",
+    "SyncAction_MarkingAsRead": "Označuji {0} e-mailů jako přečtené",
+    "SyncAction_MarkingAsUnread": "Označuji {0} e-mailů jako nepřečtené",
+    "SyncAction_MarkingFolderAsRead": "Označuji složku jako přečtenou",
+    "SyncAction_Moving": "Přesouvání {0} e-mailů",
+    "SyncAction_MovingToFocused": "Přesouvání {0} e-mailů do složky Focused",
+    "SyncAction_RenamingFolder": "Přejmenovávání složky",
+    "SyncAction_SendingMail": "Odesílání e-mailu",
+    "SyncAction_SettingFlag": "Označování vlajkou {0} e-mailů",
+    "SyncAction_SynchronizingAccount": "Synchronizuji {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronizuji {0} účetů",
+    "SyncAction_SynchronizingCalendarData": "Synchronizuji data kalendáře",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronizuji události kalendáře",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchronizuji metadata kalendáře",
+    "SyncAction_Unarchiving": "Obnovování {0} e-mailů ze složky archivu",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Přijmout",
+    "CalendarEventResponse_AcceptedResponse": "Přijato",
+    "CalendarEventResponse_Decline": "Odmítnout",
+    "CalendarEventResponse_DeclinedResponse": "Odmítnuto",
+    "CalendarEventResponse_NotResponded": "Dosud neodepsáno",
+    "CalendarEventResponse_Tentative": "Předběžný",
+    "CalendarEventResponse_TentativeResponse": "Předběžná odpověď",
+    "CalendarEventRsvpPanel_Accept": "Přijmout",
+    "CalendarEventRsvpPanel_AddMessage": "Přidat zprávu k odpovědi... (volitelné)",
+    "CalendarEventRsvpPanel_Decline": "Odmítnout",
+    "CalendarEventRsvpPanel_Message": "Zpráva",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Odeslat odpověď",
+    "CalendarEventRsvpPanel_Tentative": "Předběžně",
+    "CalendarEventRsvpPanel_Title": "Možnosti odpovědi",
+    "CalendarAttendeeStatus_Accepted": "Přijato",
+    "CalendarAttendeeStatus_Declined": "Odmítnuto",
+    "CalendarAttendeeStatus_NeedsAction": "Vyžaduje akci",
+    "CalendarAttendeeStatus_Tentative": "Předběžně",
+    "CalendarEventDetails_Attachments": "Přílohy",
+    "CalendarEventCompose_AddAttachment": "Přidat přílohu",
+    "CalendarEventCompose_AllDay": "Celý den",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Přílohy nejsou podporovány pro kalendáře CalDAV.",
+    "CalendarEventCompose_EndDate": "Datum konce",
+    "CalendarEventCompose_EndTime": "Čas konce",
+    "CalendarEventCompose_Every": "každý",
+    "CalendarEventCompose_ForWeekdays": "pro",
+    "CalendarEventCompose_FrequencyDay": "den",
+    "CalendarEventCompose_FrequencyDayPlural": "dny",
+    "CalendarEventCompose_FrequencyMonth": "měsíc",
+    "CalendarEventCompose_FrequencyMonthPlural": "měsíců",
+    "CalendarEventCompose_FrequencyWeek": "týden",
+    "CalendarEventCompose_FrequencyWeekPlural": "týdny",
+    "CalendarEventCompose_FrequencyYear": "rok",
+    "CalendarEventCompose_FrequencyYearPlural": "roků",
+    "CalendarEventCompose_Location": "Místo",
+    "CalendarEventCompose_LocationPlaceholder": "Přidat místo",
+    "CalendarEventCompose_NewEventButton": "Nová událost",
+    "CalendarEventCompose_DefaultCalendarHint": "V nastavení Kalendáře si můžete vybrat výchozí kalendář pro nové události.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Otevřít nastavení Kalendáře",
+    "CalendarEventCompose_NoCalendarsMessage": "Zatím nejsou k dispozici žádné kalendáře pro vytvoření události.",
+    "CalendarEventCompose_NoCalendarsTitle": "Žádné kalendáře nejsou k dispozici",
+    "CalendarEventCompose_NoEndDate": "Žádné datum konce",
+    "CalendarEventCompose_Notes": "Poznámky",
+    "CalendarEventCompose_PickCalendarTitle": "Vyberte kalendář",
+    "CalendarEventCompose_Recurring": "Opakující se",
+    "CalendarEventCompose_RecurringSummary": "Probíhá každých {0} {1}{2} {3} platných {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Probíhá {0}{1} {2} platných {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Opakovat každých",
+    "CalendarEventCompose_SelectCalendar": "Vybrat kalendář",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Probíhá v {0} {1}",
+    "CalendarEventCompose_StartDate": "Datum začátku",
+    "CalendarEventCompose_StartTime": "Čas začátku",
+    "CalendarEventCompose_TimeRangeSummary": "od {0} do {1}",
+    "CalendarEventCompose_Title": "Název události",
+    "CalendarEventCompose_TitlePlaceholder": "Přidat název",
+    "CalendarEventCompose_Until": "až do",
+    "CalendarEventCompose_UntilSummary": " až {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Konec události trvající celý den musí být po začátku.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Jeden nebo více účastníků má neplatnou e-mailovou adresu.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Datum ukončení opakování musí být stejné nebo pozdější než datum začátku události.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Konec času musí být později než začátek.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Jedna nebo více příloh již není k dispozici: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Vyberte kalendář před vytvořením události.",
+    "CalendarEventCompose_ValidationMissingTitle": "Zadejte název události před její tvorbou.",
+    "CalendarEventCompose_ValidationTitle": "Ověření události selhalo",
+    "CalendarEventCompose_WeekdaySummary": " na {0}",
+    "CalendarEventCompose_Weekday_Friday": "Pá",
+    "CalendarEventCompose_Weekday_Monday": "Po",
+    "CalendarEventCompose_Weekday_Saturday": "So",
+    "CalendarEventCompose_Weekday_Sunday": "Ne",
+    "CalendarEventCompose_Weekday_Thursday": "Čt",
+    "CalendarEventCompose_Weekday_Tuesday": "Út",
+    "CalendarEventCompose_Weekday_Wednesday": "St",
+    "CalendarEventDetails_Details": "Podrobnosti",
+    "CalendarEventDetails_EditSeries": "Upravit sérii",
+    "CalendarEventDetails_Editing": "Úpravy",
+    "CalendarEventDetails_InviteSomeone": "Pozvat někoho",
+    "CalendarEventDetails_JoinOnline": "Připojit se online",
+    "CalendarEventDetails_Organizer": "Organizátor",
+    "CalendarEventDetails_People": "Lidé",
+    "CalendarEventDetails_ReadOnlyEvent": "Událost pouze pro čtení",
+    "CalendarEventDetails_Reminder": "Upozornění",
+    "CalendarReminder_StartedHoursAgo": "Zahájeno před {0} hodinami",
+    "CalendarReminder_StartedMinutesAgo": "Zahájeno před {0} minutami",
+    "CalendarReminder_StartedNow": "Právě zahájeno",
+    "CalendarReminder_StartingNow": "Startuje se právě teď",
+    "CalendarReminder_StartsInHours": "Bude začínat za {0} hodin",
+    "CalendarReminder_StartsInMinutes": "Bude začínat za {0} minut",
+    "CalendarReminder_SnoozeAction": "Odložit",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minut",
+    "CalendarEventDetails_ShowAs": "Zobrazit jako",
+    "CalendarShowAs_Free": "Volné",
+    "CalendarShowAs_Tentative": "Předběžné",
+    "CalendarShowAs_Busy": "Zaneprázdněno",
+    "CalendarShowAs_OutOfOffice": "Mimo kancelář",
+    "CalendarShowAs_WorkingElsewhere": "Pracuje jinde",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "\"{0}\" zkopírováno do schránky.",
     "ClipboardTextCopied_Title": "Zkopírováno",
     "ClipboardTextCopyFailed_Message": "Nepodařilo se zkopírovat \"{0}\" do schránky.",
+    "ContactInfoBar_ErrorTitle": "Nepodařilo se načíst kontaktní údaje",
+    "ContactInfoBar_SuccessTitle": "Kontaktní údaje načteny",
+    "ContactInfoBar_WarningTitle": "Kontaktní údaje mohou být neúplné",
     "ComingSoon": "Již brzy...",
     "ComposerAttachmentsDragDropAttach_Message": "Přiložit",
     "ComposerAttachmentsDropZone_Message": "Sem přetáhněte soubory",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Název propojeného účtu",
     "DialogMessage_DeleteAccountConfirmationMessage": "Odstranit {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Všechna data spojená s tímto účtem budou trvale smazána z disku.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Smazat šablonu \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Smazat šablonu e-mailu",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Tímto se smažou všechny události v sérii. Chcete pokračovat?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Smazat opakující se sérii",
     "DialogMessage_DiscardDraftConfirmationMessage": "Tento koncept bude zahozen. Chcete pokračovat?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Zahodit koncept",
     "DialogMessage_EmptySubjectConfirmation": "Chybějící Předmět",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Světlý režim",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Nastavení systémových složek se nezdařilo",
+    "Exception_AccountNeedsAttention_Title": "Účet vyžaduje pozornost",
+    "Exception_AccountNeedsAttention_Message": "'{0}' vyžaduje vaši pozornost, abyste mohli pokračovat.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail nemohl najít Microsoft Edge WebView2 Runtime. Nainstalujte nebo opravte runtime, aby bylo možné správně zobrazit obsah zprávy.",
+    "Exception_WebView2RuntimeMissing_Title": "Vyžadován runtime WebView2",
     "Exception_AuthenticationCanceled": "Ověřování bylo zrušeno",
     "Exception_CustomThemeExists": "Tento motiv už existuje.",
     "Exception_CustomThemeMissingName": "Musíte zadat název.",
     "Exception_CustomThemeMissingWallpaper": "Musíte zadat vlastní obrázek pozadí.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Nepodařilo se synchronizovat data kalendáře",
+    "Exception_FailedToSynchronizeCalendarEvents": "Nepodařilo se synchronizovat události kalendáře",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Nepodařilo se synchronizovat podrobnosti kalendáře",
     "Exception_FailedToSynchronizeFolders": "Synchronizace složek se nezdařila",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri je při aktivaci null.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Přesunout do Koše",
     "HoverActionOption_ToggleFlag": "Označit / Zrušit označení",
     "HoverActionOption_ToggleRead": "Přečtené / Nepřečtené",
+    "KeyboardShortcuts_FailedToReset": "Nepodařilo se resetovat klávesové zkratky.",
+    "KeyboardShortcuts_FailedToUpdate": "Nepodařilo se aktualizovat klávesové zkratky",
+    "KeyboardShortcuts_MailoperationAction": "Akce",
+    "KeyboardShortcuts_Action": "Akce",
+    "KeyboardShortcuts_FailedToLoad": "Nepodařilo se načíst klávesové zkratky.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Zadejte klávesu pro zkratku.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Prosím zvolte akci pro zkratku.",
+    "KeyboardShortcuts_EnterKey": "Zadejte klávesu pro zkratku.",
+    "KeyboardShortcuts_SelectOperation": "Prosím vyberte akci pro zkratku.",
+    "KeyboardShortcuts_ShortcutInUse": "Tato zkratka je již používána jinou zkratkou.",
+    "KeyboardShortcuts_FailedToSave": "Nepodařilo se uložit zkratku.",
+    "KeyboardShortcuts_FailedToDelete": "Nepodařilo se smazat zkratku.",
+    "KeyboardShortcuts_PageDescription": "Nastavte klávesové zkratky pro rychlé operace s poštou. Stiskněte klávesy v poli pro zadání klávesy, abyste zachytili zkratky.",
+    "KeyboardShortcuts_Add": "Přidat zkratku",
+    "KeyboardShortcuts_EditTitle": "Upravit klávesovou zkratku",
+    "KeyboardShortcuts_ResetToDefaults": "Obnovit výchozí nastavení",
+    "KeyboardShortcuts_PressKeysHere": "Stiskněte sem klávesy...",
+    "KeyboardShortcuts_KeyCombination": "Klávesová kombinace",
+    "KeyboardShortcuts_FocusArea": "Zaměřte se na pole výše a stiskněte požadovanou klávesovou kombinaci",
+    "KeyboardShortcuts_Modifiers": "Modifikátory",
+    "KeyboardShortcuts_Mode": "Režim aplikace",
+    "KeyboardShortcuts_ModeMail": "Pošta",
+    "KeyboardShortcuts_ModeCalendar": "Kalendář",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Přepnout přečtené/nepřečtené",
+    "KeyboardShortcuts_ActionToggleFlag": "Přepnout vlajku",
+    "KeyboardShortcuts_ActionToggleArchive": "Přepnout archivaci/odarchivaci",
     "ImageRenderingDisabled": "Vykreslování obrázků je pro tuto zprávu zakázáno.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Způsob ověření",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Zabezpečení připojení",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Uživatelské jméno",
     "IMAPSetupDialog_UsernamePlaceholder": "jan.novak, jan.novak@seznam.cz",
     "IMAPSetupDialog_UseSameConfig": "Použít stejné uživatelské jméno a heslo pro odesílání e-mailu",
+    "ImapCalDavSettingsPage_TitleCreate": "Nastavení IMAP a kalendáře",
+    "ImapCalDavSettingsPage_TitleEdit": "Upravit nastavení IMAP a kalendáře",
+    "ImapCalDavSettingsPage_Subtitle": "Nastavte IMAP/SMTP a volitelnou synchronizaci kalendáře pro tento účet.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Základní nastavení",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Zadejte svou identitu a údaje pro přihlášení. Wino se může pokusit automaticky detekovat nastavení serveru.",
+    "ImapCalDavSettingsPage_BasicTab": "Základní",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Povolit podporu kalendáře",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Automatická detekce nastavení pošty",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Nastavení pošty bylo zjištěno a použito.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Pokročilé nastavení",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Zadejte nastavení serveru ručně, pokud autodetekce není k dispozici nebo je nesprávná.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Pokročilé",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Nastavení kalendáře",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Zvolte, jak by měla kalendářová data fungovat pro tento účet IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalendářový režim",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Zabezpečení spojení",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Způsob ověřování",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Zakázáno",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV synchronizace",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Pouze místní kalendář",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalendář je pro tento účet vypnutý.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Položky kalendáře jsou synchronizovány se vaším serverem CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Položky kalendáře jsou uloženy pouze na tomto počítači a nejsou synchronizovány se sítí.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Jak místní kalendář funguje",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Pouze místní kalendář",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Místní kalendář uchovává všechny události pouze na vašem počítači. Žádná synchronizace s iCloud, Yahoo ani s žádným poskytovatelem.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL služby CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Uživatelské jméno CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Heslo CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Test CalDAV je vyžadován pouze tehdy, když je režim kalendáře nastaven na CalDAV synchronizaci.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL služby CalDAV je vyžadována.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL služby CalDAV musí být absolutní URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Uživatelské jméno CalDAV je vyžadováno.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV heslo je vyžadováno.",
+    "ImapCalDavSettingsPage_TestImapButton": "Otestovat připojení k IMAP.",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Otestovat připojení CalDAV.",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Test připojení k IMAP byl úspěšný.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Test připojení CalDAV byl úspěšný.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Nastavení účtu bylo ověřeno a uloženo.",
+    "ImapCalDavSettingsPage_ICloudHint": "Použijte heslo pro aplikaci, které vygenerujete v nastavení vašeho Apple ID.",
+    "ImapCalDavSettingsPage_YahooHint": "Použijte heslo pro aplikaci z nastavení zabezpečení účtu Yahoo.",
     "Info_AccountCreatedMessage": "{0} je vytvořen",
     "Info_AccountCreatedTitle": "Vytvoření účtu",
     "Info_AccountCreationFailedTitle": "Vytvoření účtu selhalo",
     "Info_AccountDeletedMessage": "{0} byl úspěšně smazán.",
     "Info_AccountDeletedTitle": "Účet byl smazán",
     "Info_AccountIssueFixFailedTitle": "Oprava účtu selhala",
+    "Info_AccountIssueFixImapMessage": "Otevřete stránku nastavení IMAP a kalendáře a zadejte znovu údaje o serveru.",
+    "Info_AccountAttentionRequiredMessage": "Tento účet vyžaduje vaši pozornost.",
+    "Info_AccountAttentionRequiredClickableMessage": "Klikněte pro opravu tohoto účtu a znovu jej synchronizujte.",
+    "Info_AccountAttentionRequiredAction": "Opravit",
+    "Info_AccountAttentionRequiredActionHint": "Klikněte na Opravit, aby se vyřešil problém s tímto účtem.",
     "Info_AccountIssueFixSuccessMessage": "Opraveny všechny problémy s účtem.",
     "Info_AccountIssueFixSuccessTitle": "Úspěšně dokončeno",
     "Info_AttachmentOpenFailedMessage": "Tuto přílohu nelze otevřít.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Synchronizace této složky je vypnuta.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Synchronizace složky vypnuta",
     "Justify": "Do bloku",
+    "MenuUpdateAvailable": "Dostupná aktualizace",
     "Left": "Zleva",
     "Link": "Odkaz",
     "LinkedAccountsCreatePolicyMessage": "musíte mít alespoň 2 účty, abyste vytvořili propojení\npropojení bude odstraněno po uložení",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Odarchivovat",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Přiblížit",
+    "MailsDragging": "Přetahuji {0} položku/položek",
     "MailsSelected": "Vybráno {0} položek",
     "MarkFlagUnflag": "Označit / Zrušit označení vlajkou",
     "MarkReadUnread": "Označit jako přečtené/nepřečtené",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Vyzkoušejte novou verzi {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail byl aktualizován.",
+    "Notifications_StoreUpdateAvailableTitle": "Dostupná aktualizace",
+    "Notifications_StoreUpdateAvailableMessage": "Novější verze Wino Mail je připravena k instalaci z Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Malé",
     "Photos": "Fotky",
     "PreparingFoldersMessage": "Připravování složek",
-    "ProtocolLogAvailable_Message": "Protokoly jsou k dispozici pro diagnostiku.",
     "ProviderDetail_Gmail_Description": "Google účet",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Vyhledávaný výraz",
     "SearchingIn": "Vyhledávání v",
     "SearchPivotName": "Výsledky",
+    "Settings_KeyboardShortcuts_Title": "Klávesové zkratky",
+    "Settings_KeyboardShortcuts_Description": "Spravujte klávesové zkratky pro rychlé akce u pošty.",
     "SettingConfigureSpecialFolders_Button": "Nastavit",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Nastavení IMAP a kalendáře",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Otevřete vyhrazenou stránku nastavení IMAP, SMTP a CalDAV pro tento účet.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Otevřít nastavení",
     "SettingsAbout_Description": "Zjistěte více o Wino.",
     "SettingsAbout_Title": "O aplikaci",
     "SettingsAboutGithub_Description": "Přejít na seznam chyb na GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Výchozí režim aplikace",
+    "SettingsAppPreferences_ApplicationMode_Description": "Vyberte režim, ve kterém se Wino spustí, pokud typ aktivace není výslovně nastaven.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Pošta",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalendář",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Skrýt tlačítko účtu Wino v liště titulku",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Skrýt tlačítko profilu v liště titulku, které otevírá nabídku účtu Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Oznámení o aktualizacích z Microsoft Store.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Zobrazovat oznámení a akce v patičce, když je k dispozici aktualizace z Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "AI akce",
+    "SettingsAppPreferences_AiActions_Description": "Vyberte výchozí jazyky pro AI a kde mají být souhrny ukládány.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Výchozí jazyk překladu",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Vyberte výchozí cílový jazyk použitý při překladech AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Jazyk shrnutí",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Zvolte preferovaný jazyk pro shrnutí výsledků AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Výchozí cesta ukládání shrnutí",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Zvolte složku, kterou by Wino měl používat jako výchozí při ukládání AI shrnutí.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Použít výchozí umístění pro ukládání",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Tady adresář neexistuje. Pro shrnutí bude použito výchozí umístění pro ukládání.",
     "SettingsAutoSelectNextItem_Description": "Vyberat další položku poté, co se odstraní nebo přesune vybraný e-mail.",
     "SettingsAutoSelectNextItem_Title": "Automaticky vybrat další položku",
     "SettingsAvailableThemes_Description": "Vyberte si šablonu ze sbírky Wino dle vaší libosti nebo použijte vlastní motiv.",
     "SettingsAvailableThemes_Title": "Dostupné motivy",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Výchozí doba odložení",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Nastavte výchozí dobu odložení pro upozornění na připomenutí v kalendáři.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formát záhlaví dne v časovaném zobrazení",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Zvolte, jak se nahoře zobrazují názvy dnů ve zobrazeních dne, týdne a pracovního týdne. Používejte tokeny formátu data jako ddd, dd, MMM, nebo dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Výchozí písmo editoru",
     "SettingsComposerFontFamily_Description": "Změna výchozího fontu a jeho velikosti pro editor e-mailu",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord kanál",
     "SettingsEditLinkedInbox_Description": "Přidat / odebrat účty, přejmenovat nebo zrušit propojení mezi účty.",
     "SettingsEditLinkedInbox_Title": "Upravit propojený účet",
+    "SettingsWindowBackdrop_Title": "Pozadí okna",
+    "SettingsWindowBackdrop_Description": "Vyberte efekt pozadí pro okna Wino.",
+    "SettingsWindowBackdrop_Disabled": "Výběr pozadí okna je zakázán, pokud je vybrána aplikace motiv jiný než Výchozí.",
     "SettingsElementTheme_Description": "Vyberte motiv Windows pro Wino",
     "SettingsElementTheme_Title": "Motiv prvku",
     "SettingsElementThemeSelectionDisabled": "Výběr motivu prvku je zakázán, pokud je vybrán jiný motiv aplikace než výchozí.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Změny uloženy",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Detaily vašeho účtu byly úspěšně aktualizovány.",
     "SettingsManageLink_Description": "Přesunout položky pro přidání nového propojení účtů nebo odstranění již existujícího.",
     "SettingsManageLink_Title": "Spravovat propojení",
     "SettingsMarkAsRead_Description": "Změnit, co by se mělo stát s vybranou položkou.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Oznámení",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Domov",
+    "SettingsHome_SearchTitle": "Najděte nastavení",
+    "SettingsHome_SearchDescription": "Vyhledejte podle funkce, tématu nebo klíčového slova a rychle se dostanete na správnou stránku nastavení.",
+    "SettingsHome_SearchPlaceholder": "Vyhledat nastavení",
+    "SettingsHome_SearchExamples": "Zkuste: motiv, úložiště, jazyk, podpis",
+    "SettingsHome_QuickLinks_Title": "Rychlé odkazy",
+    "SettingsHome_QuickLinks_Description": "Vstupte do nastavení, které lidé nejčastěji hledají.",
+    "SettingsHome_StorageCard_Description": "Zobrazte, kolik místního MIME obsahu má Wino na tomto zařízení a v případě potřeby ho vyčistěte.",
+    "SettingsHome_StorageEmptySummary": "Žádný uložený obsah MIME dosud nebyl zjištěn.",
+    "SettingsHome_StorageLoading": "Kontroluji použití místního MIME...",
+    "SettingsHome_Tips_Title": "Tipy a triky",
+    "SettingsHome_Tips_Description": "Několik drobných změn může učinit Wino mnohem osobnějším.",
+    "SettingsHome_Tip_Theme": "Chcete tmavý režim nebo změny hlavních barev? Otevřete Personalizaci.",
+    "SettingsHome_Tip_Background": "Použijte Předvolby aplikace k řízení spouštění a synchronizace na pozadí.",
+    "SettingsHome_Tip_Shortcuts": "Klávesové zkratky vám pomohou procházet poštu rychleji.",
+    "SettingsHome_Resources_Title": "Užitečné odkazy",
+    "SettingsHome_Resources_Description": "Otevřete zdroje projektu, informace o podpoře a kanálech vydání.",
     "SettingsOptions_Title": "Nastavení",
+    "SettingsOptions_GeneralSection": "Obecné",
+    "SettingsOptions_MailSection": "Pošta",
+    "SettingsOptions_CalendarSection": "Kalendář",
+    "SettingsOptions_MoreComingSoon": "Více možností bude brzy k dispozici",
+    "SettingsOptions_HeroDescription": "Přizpůsobte si zkušenost s Wino Mail",
+    "SettingsOptions_AccountsSummary": "{0} účet/ů nakonfigurováno",
+    "SettingsSearch_ManageAccounts_Keywords": "účet;účty;poštovní schránka;poštovní schránky;alias;aliasy;profil;adresa;adresy",
+    "SettingsSearch_AppPreferences_Keywords": "spouštění;pozadí;spuštění; synchronizace;notifikace;notifikace;vyhledávání;systémový panel;výchozí",
+    "SettingsSearch_LanguageTime_Keywords": "jazyk;čas;hodiny;lokalizace;region;formát;24 hodin;24h",
+    "SettingsSearch_Personalization_Keywords": "téma;tmavý;světlý;vzhled;akcent;barva;barva;mód;rozvržení;hustota",
+    "SettingsSearch_About_Keywords": "o;verze;webová stránka;ochrana soukromí;GitHub;darovat;obchod;podpora",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "zkratka;zkratky;klávesová zkratka;klávesové zkratky;klávesnice;klávesy",
+    "SettingsSearch_MessageList_Keywords": "zpráva;zprávy;seznam;vlákna;vlákna;avatar;náhled;odesílatel",
+    "SettingsSearch_ReadComposePane_Keywords": "čtečka;psaní;tvůrce;písmo;písma;externí obsah;zobrazení;čtení",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "podpis;podpisy;šifrování;certifikát;certifikáty;S/MIME;S/MIME;zabezpečení",
+    "SettingsSearch_Storage_Keywords": "úložiště;mezipaměť;kešování;MIME;disk;volné místo;odstranění;vyčistit;místní data",
+    "SettingsSearch_CalendarSettings_Keywords": "kalendář;týden;hodiny;rozvrh;událost;události",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Ukažte mnohem více lásky ❤️ Všechny dary jsou vítany.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Zobrazit 24-hodinový formát času",
     "SettingsPrivacyPolicy_Description": "Zkontrolujte zásady ochrany osobních údajů.",
     "SettingsPrivacyPolicy_Title": "Zásady ochrany osobních údajů",
+    "SettingsWebsite_Description": "Otevřete web Wino Mail.",
+    "SettingsWebsite_Title": "Webová stránka",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Zobrazit náhled textu",
     "SettingsShowSenderPictures_Description": "Skrýt/zobrazit náhled obrázku odesílatele.",
     "SettingsShowSenderPictures_Title": "Zobrazit avatary odesílatele",
+    "SettingsEmailTemplates_Title": "Šablony e-mailů",
+    "SettingsEmailTemplates_Description": "Spravovat šablony e-mailů",
+    "SettingsEmailTemplates_CreatePageTitle": "Nová šablona",
+    "SettingsEmailTemplates_EditPageTitle": "Upravit šablonu",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nová šablona",
+    "SettingsEmailTemplates_NewTemplateDescription": "Vytvořte novou šablonu e-mailu",
+    "SettingsEmailTemplates_NameTitle": "Název",
+    "SettingsEmailTemplates_NamePlaceholder": "Název šablony",
+    "SettingsEmailTemplates_DescriptionTitle": "Popis",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Nepovinný popis",
+    "SettingsEmailTemplates_ContentTitle": "Obsah šablony",
+    "SettingsEmailTemplates_ContentDescription": "Upravte HTML obsah této šablony.",
+    "SettingsEmailTemplates_NameRequired": "Název šablony je vyžadován.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Primární účet",
     "SettingsStore_Description": "Ukaž trochu lásky ❤️",
     "SettingsStore_Title": "Ohodnotit v obchodě",
+    "SettingsStorage_Title": "Úložiště",
+    "SettingsStorage_Description": "Skenovat a spravovat MIME mezipaměť uloženou v lokální datové složce.",
+    "SettingsStorage_ScanFolder": "Skenovat lokální datovou složku",
+    "SettingsStorage_NoLocalMimeDataFound": "Nebyla nalezena žádná lokální MIME data.",
+    "SettingsStorage_NoAccountsFound": "Nebyly nalezeny žádné účty.",
+    "SettingsStorage_TotalUsage": "Celkové využití lokální MIME mezipaměti: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} použitých v lokální MIME mezipaměti.",
+    "SettingsStorage_DeleteAll_Title": "Smazat veškerý MIME obsah.",
+    "SettingsStorage_DeleteAll_Description": "Odstranit celou složku mezipaměti MIME tohoto účtu.",
+    "SettingsStorage_DeleteAll_Button": "Smazat vše",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Smazat veškerý MIME obsah",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Smazat všechna lokální MIME data pro {0}?",
+    "SettingsStorage_DeleteAll_Success": "Veškerý obsah MIME byl smazán.",
+    "SettingsStorage_DeleteOld_Title": "Odstranit starší MIME obsah",
+    "SettingsStorage_DeleteOld_Description": "Smazat MIME soubory na základě data vytvoření e-mailu v lokální databázi.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 měsíc",
+    "SettingsStorage_DeleteOld_3Months": "> 3 měsíců",
+    "SettingsStorage_DeleteOld_6Months": "> 6 měsíců",
+    "SettingsStorage_DeleteOld_1Year": "> 1 rok",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Odstranit starší MIME obsah",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Smazat lokální MIME data starší než {0} pro {1}?",
+    "SettingsStorage_DeleteOld_Success": "Smazáno {0} MIME složek starších než {1}.",
+    "SettingsStorage_1Month": "1 měsíc",
+    "SettingsStorage_3Months": "3 měsíce",
+    "SettingsStorage_6Months": "6 měsíců",
+    "SettingsStorage_1Year": "1 rok",
+    "SettingsStorage_Months": "{0} měsíců",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Uspořádat zprávy do konverzačních vláken.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Složku Doručená pošta nelze přiřadit k žádné jiné systémové složce.",
     "SystemFolderConfigSetupSuccess_Message": "Systémové složky jsou úspěšně nakonfigurovány.",
     "SystemFolderConfigSetupSuccess_Title": "Nastavení systémových složek",
+    "SystemTrayMenu_ShowWino": "Otevřít Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Otevřít Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Ukončit",
     "TestingImapConnectionMessage": "Testuji připojení k serveru...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Přejít na neomezený počet účtů",
     "WinoUpgradeRemainingAccountsMessage": "{0} z {1} použitých bezplatných účtů.",
     "Yesterday": "Včera",
+    "Smime_ImportCertificates_Success": "Certifikáty byly úspěšně importovány.",
+    "Smime_ImportCertificates_Error": "Chyba při importu certifikátů: {0}",
+    "Smime_RemoveCertificates_Confirm": "Opravdu chcete odstranit certifikáty {0}?",
+    "Smime_RemoveCertificates_Success": "Certifikáty byly odstraněny.",
+    "Smime_ExportCertificates_Success": "Certifikáty byly exportovány.",
+    "Smime_ExportCertificates_Error": "Chyba při exportu certifikátů.",
+    "Smime_CertificateDetails": "Předmět: {0}\\nVydavatel: {1}\\nPlatné od: {2}\\nPlatné do: {3}\\nOtisk: {4}",
+    "Smime_CertificatePassword_Title": "Vyžaduje se heslo certifikátu",
+    "Smime_CertificatePassword_Placeholder": "Heslo certifikátu pro {0} (nepovinné)",
+    "Smime_Confirm_Title": "Potvrdit",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Obnovit",
+    "SettingsSignatureAndEncryption_Title": "Podpis a šifrování",
+    "SettingsSignatureAndEncryption_Description": "Spravovat S/MIME certifikáty pro podepisování a šifrování e-mailů.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mé certifikáty",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Osobní certifikáty pro podepisování a šifrování",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certifikáty příjemců",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certifikáty příjemců pro dešifrování",
+    "SettingsSignatureAndEncryption_NameColumn": "Název",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Vyprší dne",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Otisk",
+    "Buttons_Remove": "Odebrat",
+    "Buttons_Export": "Exportovat",
+    "Buttons_Import": "Importovat",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME podpisový certifikát",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME šifrovací certifikát",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Žádný",
+    "SmimeSignaturesInMessage": "Podpisy v této zprávě:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, platné do {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informace o S/MIME podpisovém certifikátu",
+    "SmimeCertificateInfoTitle": "Informace o S/MIME certifikátu",
+    "SmimeNoCertificateFileFound": "Nebyl nalezen žádný soubor certifikátu.",
+    "SmimeSaveCertificate": "Uložit certifikát...",
+    "SmimeCertificate": "S/MIME certifikát",
+    "SmimeCertificateSavedTo": "Certifikát uložen do {0}",
+    "SmimeSignedTooltip": "Tato zpráva je podepsána certifikátem S/MIME. Kliknutím zobrazíte podrobnosti",
+    "SmimeEncryptedTooltip": "Tato zpráva je šifrována certifikátem S/MIME.",
+    "SmimeCertificateFileInfo": "Soubor: {0}",
+    "Composer_LightTheme": "Světlé téma",
+    "Composer_DarkTheme": "Tmavé téma",
+    "Composer_Outdent": "Zmenšit odsazení",
+    "Composer_Indent": "Zvětšit odsazení",
+    "Composer_BulletList": "Odrážkový seznam",
+    "Composer_OrderedList": "Číslovaný seznam",
+    "Composer_Stroke": "Čára",
+    "Composer_Bold": "Tučné",
+    "Composer_Italic": "Kurzíva",
+    "Composer_Underline": "Podtržené",
+    "Composer_CcBcc": "Kopie (Cc) a Skrytá kopie (Bcc)",
+    "Composer_EnableSmimeSignature": "Povolit/zakázat S/MIME podpis",
+    "Composer_EnableSmimeEncryption": "Povolit/zakázat šifrování S/MIME",
+    "Composer_LocalDraftSyncInfo": "Tento koncept je pouze lokální. Wino se nepodařilo odeslat na váš poštovní server. Klikněte pro opětovné odeslání na server.",
+    "Composer_CertificateExpires": "Vyprší dne: ",
+    "Composer_SmimeSignature": "S/MIME podpis",
+    "Composer_SmimeEncryption": "S/MIME šifrování",
+    "Composer_EmailTemplatesPlaceholder": "Šablony e-mailů",
+    "Composer_AiSummarize": "Shrnout pomocí AI",
+    "Composer_AiSummarizeDescription": "Z tohoto e-mailu vyextrahujte klíčové body, akční kroky a rozhodnutí.",
+    "Composer_AiTranslate": "Přeložit pomocí AI",
+    "Composer_AiActions": "AI akce",
+    "Composer_AiRewrite": "Přepsat pomocí AI",
+    "AiActions_CheckingStatus": "Ověřování přístupu k AI...",
+    "AiActions_SignedOutTitle": "Odemknout Wino AI balíček",
+    "AiActions_SignedOutDescription": "Překládejte, přepište a shrnujte e-maily pomocí AI po přihlášení k vašemu účtu Wino a aktivaci doplňku AI Pack.",
+    "AiActions_NoPackTitle": "AI Pack vyžadován",
+    "AiActions_NoPackDescription": "Jste přihlášeni, ale AI Pack ještě není aktivní. Zakupte si ho, abyste mohli používat Wino AI překlad, přepis a shrnutí.",
+    "AiActions_UsageSummary": "Použito {0} z {1} kreditů tento měsíc.",
+    "Composer_AiRewritePolite": "Udělej to zdvořile",
+    "Composer_AiRewritePoliteDescription": "Zjemní formulaci a zachová stejný záměr.",
+    "Composer_AiRewriteAngry": "Udělej to agresivně",
+    "Composer_AiRewriteAngryDescription": "Používá ostřejší a konfrontačnější tón.",
+    "Composer_AiRewriteHappy": "Nastavit na radostný tón",
+    "Composer_AiRewriteHappyDescription": "Přidá více optimistický a nadšený tón.",
+    "Composer_AiRewriteFormal": "Nastavit na formální tón",
+    "Composer_AiRewriteFormalDescription": "Zní to profesionálněji a lépe strukturovaná zpráva.",
+    "Composer_AiRewriteFriendly": "Nastavit přátelský tón",
+    "Composer_AiRewriteFriendlyDescription": "Zjemní zprávu a dodá jí přívětilejší tón.",
+    "Composer_AiRewriteShorter": "Udělej to stručnější",
+    "Composer_AiRewriteShorterDescription": "Zkracuje text a odstraňuje zbytečné detaily.",
+    "Composer_AiRewriteClearer": "Udělej to jasnější",
+    "Composer_AiRewriteClearerDescription": "Zlepšuje čitelnost a usnadňuje porozumění sdělení.",
+    "Composer_AiRewriteCustom": "Vlastní",
+    "Composer_AiRewriteCustomDescription": "Popište svůj vlastní záměr přeformulování.",
+    "Composer_AiRewriteCustomPlaceholder": "Popište, jak má být zpráva přeformulována",
+    "Composer_AiRewriteMode": "Přeformulovat tón",
+    "Composer_AiRewriteApply": "Použít přeformulování",
+    "Composer_AiTranslateDialogTitle": "Přeložit pomocí AI",
+    "Composer_AiTranslateDialogDescription": "Zadejte cílový jazyk nebo kód kultury, například en-US, tr-TR, de-DE nebo fr-FR.",
+    "Composer_AiTranslateApply": "Přeložit",
+    "Composer_AiTranslateLanguage": "Cílový jazyk",
+    "Composer_AiTranslateCustomPlaceholder": "Zadejte kód kultury",
+    "Composer_AiTranslateLanguageEnglish": "Angličtina (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turečtina (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Němčina (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francouzština (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Španělština (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italština (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugalština (Brazílie) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Nizozemština (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polština (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Ruština (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonština (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korejština (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Čínština, zjednodušená (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabština (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindština (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Jiné...",
+    "Composer_AiBusyTitle": "AI už pracuje",
+    "Composer_AiBusyMessage": "Prosím počkejte, než se dokončí probíhající akce AI.",
+    "Composer_AiSignInRequired": "Přihlaste se ke svému účtu Wino, abyste mohli používat funkce AI.",
+    "Composer_AiMissingHtml": "Zatím není žádný obsah zprávy k odeslání do Wino AI.",
+    "Composer_AiQuotaUnavailable": "Výsledek AI byl použit.",
+    "Composer_AiAppliedMessage": "Výsledek AI byl použit do editoru. Pokud chcete změny vrátit, použijte Zpět.",
+    "Composer_AiSummarizeSuccessTitle": "Shrnutí AI bylo aplikováno.",
+    "Composer_AiTranslateSuccessTitle": "Překlad AI byl aplikován.",
+    "Composer_AiRewriteSuccessTitle": "Přeformulování AI bylo aplikováno.",
+    "Composer_AiErrorTitle": "Akce AI selhala.",
+    "Reader_AiAppliedMessage": "Výsledek AI je nyní zobrazen pro tuto zprávu. Znovu otevřete zprávu, abyste viděli původní obsah.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontakty",
+    "ContactsPage_AddContact": "Přidat kontakt",
+    "ContactsPage_EditContact": "Upravit kontakt",
+    "ContactsPage_DeleteContact": "Smazat kontakt",
+    "ContactsPage_SearchPlaceholder": "Hledat kontakty...",
+    "ContactsPage_NoContacts": "Žádné kontakty k zobrazení.",
+    "ContactsPage_ContactsCount": "{0} kontaktů",
+    "ContactsPage_SelectedContactsCount": "{0} vybraných",
+    "ContactsPage_DeleteSelectedContacts": "Smazat vybrané",
+    "ContactEditDialog_Title": "Upravit kontakt",
+    "ContactEditDialog_PhotoSection": "Fotografie",
+    "ContactEditDialog_ChoosePhoto": "Vybrat fotku",
+    "ContactEditDialog_RemovePhoto": "Odebrat fotku",
+    "ContactEditDialog_NameHeader": "Jméno",
+    "ContactEditDialog_NamePlaceholder": "Jméno kontaktu",
+    "ContactEditDialog_EmailHeader": "Emailová adresa",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Kontaktní informace",
+    "ContactEditDialog_RootContactInfo": "Toto je kořenový kontakt spojený s vašimi účty a není možné jej smazat.",
+    "ContactEditDialog_OverriddenContactInfo": "Tento kontakt byl ručně upraven a nebude během synchronizace aktualizován.",
+    "ContactsPage_Subtitle": "Spravujte své e-mailové kontakty a jejich informace",
+    "ContactStatus_Account": "Účet",
+    "ContactStatus_Modified": "Upraveno",
+    "ContactAction_Edit": "Upravit kontakt",
+    "ContactAction_ChangePhoto": "Změnit fotku",
+    "ContactAction_Delete": "Smazat kontakt",
+    "ContactAction_Add": "Přidat kontakt",
+    "ContactSelection_Selected": "vybráno",
+    "ContactSelection_SelectAll": "Vybrat vše",
+    "ContactSelection_Clear": "Vymazat výběr",
+    "ContactsPage_EmptyState": "Žádné kontakty k zobrazení",
+    "ContactsPage_AddFirstContact": "Přidejte svůj první kontakt",
+    "ContactsPage_ContactsCountSuffix": "kontakty",
+    "ContactsPane_NewContact": "Nový kontakt",
+    "ContactsPane_DescriptionTitle": "Spravujte své kontakty",
+    "ContactsPane_DescriptionBody": "Vytvářejte kontakty, přejmenovávejte je, aktualizujte jejich profilové fotky a mějte uložené údaje na jednom místě.",
+    "ContactEditDialog_AddTitle": "Přidat kontakt",
+    "ContactInfoBar_ContactAdded": "Kontakt byl úspěšně přidán.",
+    "ContactInfoBar_ContactUpdated": "Kontakt byl úspěšně aktualizován.",
+    "ContactInfoBar_ContactsDeleted": "Kontakty byly úspěšně smazány.",
+    "ContactInfoBar_ContactPhotoUpdated": "Fotografie kontaktu byla úspěšně aktualizována.",
+    "ContactInfoBar_FailedToLoadContacts": "Nepodařilo se načíst kontakty: {0}",
+    "ContactInfoBar_FailedToAddContact": "Nepodařilo se přidat kontakt: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Nepodařilo se aktualizovat kontakt: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Nepodařilo se smazat kontakty: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Nepodařilo se aktualizovat fotografii: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Kořenové kontakty nelze smazat.",
+    "ContactConfirmDialog_DeleteTitle": "Smazat kontakt",
+    "ContactConfirmDialog_DeleteMessage": "Opravdu chcete smazat kontakt '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Opravdu chcete smazat {0} kontakt(ů)?",
+    "ContactConfirmDialog_DeleteButton": "Smazat",
+    "CalendarAccountSettings_Title": "Nastavení účtu kalendáře",
+    "CalendarAccountSettings_Description": "Spravujte nastavení kalendáře pro {0}",
+    "CalendarAccountSettings_AccountColor": "Barva účtu",
+    "CalendarAccountSettings_AccountColorDescription": "Změňte barvu zobrazení tohoto kalendářního účtu.",
+    "CalendarAccountSettings_SyncEnabled": "Povolit synchronizaci",
+    "CalendarAccountSettings_SyncEnabledDescription": "Povolit nebo zakázat synchronizaci kalendáře pro tento účet.",
+    "CalendarAccountSettings_DefaultShowAs": "Výchozí stav dostupnosti",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Výchozí stav dostupnosti pro nové události vytvořené tímto účtem.",
+    "CalendarAccountSettings_PrimaryCalendar": "Hlavní kalendář",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Označte tento kalendář jako hlavní kalendář pro účet.",
+    "CalendarSettings_NewEventBehavior_Header": "Chování tlačítka Nová událost",
+    "CalendarSettings_NewEventBehavior_Description": "Vyberte, zda má tlačítko Nová událost pokaždé vyžadovat výběr kalendáře, nebo má vždy otevírat konkrétní kalendář.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Ptát se pokaždé.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Vždy používat konkrétní kalendář.",
+    "CalendarSettings_Rendering_Title": "Zobrazení",
+    "CalendarSettings_Rendering_Description": "Nastavte rozložení kalendáře a způsob zobrazení.",
+    "CalendarSettings_Notifications_Title": "Upozornění",
+    "CalendarSettings_Notifications_Description": "Zvolte výchozí připomenutí a chování odkládání.",
+    "CalendarSettings_Preferences_Title": "Předvolby",
+    "CalendarSettings_Preferences_Description": "Nastavte, jak má tlačítko Nová událost fungovat.",
+    "WhatIsNew_GetStartedButton": "Začít",
+    "WhatIsNew_ContinueAnywayButton": "Pokračovat bez ohledu na to",
+    "WhatIsNew_PreparingForNewVersionButton": "Příprava nové verze...",
+    "WhatIsNew_MigrationPreparing_Title": "Příprava vašich dat",
+    "WhatIsNew_MigrationPreparing_Description": "Wino provádí migrační aktualizace. Počkejte, dokud nepřipravíme data vašeho účtu pro tuto verzi.",
+    "WhatIsNew_MigrationFailedMessage": "Při migracích došlo k chybě s kódem {0}. Můžete nadále používat aplikaci. Pokud však narazíte na vážné problémy, prosím přeinstalujte aplikaci.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail byl aktualizován",
+    "WhatIsNew_MigrationNotification_Message": "Otevřete aplikaci, abyste dokončili aktualizaci a zjistili novinky.",
+    "WelcomeWindow_Title": "Vítejte v Wino Mail",
+    "WelcomeWindow_Subtitle": "Nativní uživatelská zkušenost pro Mail a Kalendář na Windows.",
+    "WelcomeWindow_WhatsNewTitle": "Nejnovější změny",
+    "WelcomeWindow_FeaturesTitle": "Funkce",
+    "WelcomeWindow_WhatsNewTab": "Co je nového",
+    "WelcomeWindow_FeaturesTab": "Funkce",
+    "WelcomeWindow_GetStartedButton": "Začněte přidáním účtu",
+    "WelcomeWindow_GetStartedDescription": "Přidejte svůj účet Outlook, Gmail nebo IMAP a začněte s Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importovat z vašeho Wino účtu",
+    "WelcomeWindow_ImportInProgress": "Importuji synchronizované preference a účty...",
+    "WelcomeWindow_ImportNoAccountsFound": "Ve vašem Wino účtu nebyly nalezeny žádné synchronizované účty. Pokud byly k dispozici preference, byly obnoveny. Pro ruční přidání účtu použijte možnost Začít.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synchronizovaných účtů je již k dispozici na tomto zařízení. Pokud je potřeba, použijte možnost Začít pro ruční přidání dalšího účtu.",
+    "WelcomeWindow_SetupTitle": "Nastavte si svůj účet",
+    "WelcomeWindow_SetupSubtitle": "Vyberte poskytovatele e-mailu a začněte.",
+    "WelcomeWindow_AddAccountButton": "Přidat účet",
+    "WelcomeWindow_SkipForNow": "Prozatím přeskočit — nastavím to později.",
+    "WelcomeWindow_AppDescription": "Rychlá, soustředěná doručená pošta — přepracována pro Windows 11.",
+    "WelcomeWizard_Step1Title": "Vítejte",
+    "SystemTrayMenu_Open": "Otevřít",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Nastavení synchronizace",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Udržujte své preference Wino synchronizované napříč zařízeními.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Odemknout doplňky",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Získejte přístup k prémiovým funkcím, jako je Wino AI Pack.",
+    "WinoAccount_Management_Description": "Spravujte svůj účet Wino, přístup k AI Pack a synchronizované preference a údaje o účtu.",
+    "WinoAccount_Management_SignedOutTitle": "Přihlaste se do Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Přihlaste se nebo si vytvořte účet pro synchronizaci e-mailu, přístup k AI funkcím a správu nastavení napříč zařízeními.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Doplňky Wino",
+    "WinoAccount_Management_DataSectionHeader": "Data",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Operace s účtem",
+    "WinoAccount_Management_AccountCardTitle": "Účet",
+    "WinoAccount_Management_AccountCardDescription": "E-mailová adresa vašeho účtu Wino a aktuální stav účtu.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Zjistěte, zda je Wino AI Pack aktivní a kolik používání zbývá.",
+    "WinoAccount_Management_AiPackActive": "AI Pack je aktivní",
+    "WinoAccount_Management_AiPackInactive": "AI Pack není aktivní",
+    "WinoAccount_Management_AiPackUsage": "{0} z {1} použití bylo spotřebováno. Zbývá {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Období fakturace: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Podrobnosti o využití AI zatím nejsou k dispozici.",
+    "WinoAccount_Management_AiPackBuyDescription": "Koupit Wino AI Pack pro překlad, přeformulování nebo shrnutí e-mailů pomocí AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Odemknout AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Vylepšete svůj e-mailový pracovní postup nástroji poháněnými AI. Překládejte zprávy do více než 50 jazyků, přeformulujte pro jasnost a tón a získejte okamžité shrnutí dlouhých vláken.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / měs.",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 kreditů",
+    "WinoAccount_Management_AiPackGetButton": "Získat AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Nástroje poháněné AI pro překlad, přeformulování a shrnutí e-mailů ve Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, překlad, přeformulování, shrnutí, produktivita",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Neomezené účty",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Odeberte omezení počtu účtů a přidejte tolik e-mailových účtů, kolik potřebujete.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "účty, neomezené, prémiový, doplněk",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Přihlaste se ke svému účtu Wino, abyste dokončili nákup.",
+    "WinoAccount_Management_PurchaseStartFailed": "Nákup ve Microsoft Store nebyl dokončen.",
+    "WinoAccount_Management_StoreSyncFailed": "Nákup byl dokončen, ale Wino nemůže dosud obnovit výhody vašeho účtu. Zkuste to prosím za okamžik.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Váš předplatné je aktivní.",
+    "WinoAccount_Management_AiPackRenews": "Obnovuje {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Použité kredity tento měsíc.",
+    "WinoAccount_Management_AiPackResets": "Obnovení {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Nepodařilo se načíst zůstatek využití AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Překládat",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Přeformulovat",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Shrnout",
+    "WinoAccount_Management_AddOnLoadFailed": "Při načítání tohoto doplňku došlo k potížím.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchronizace nastavení a účtů",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importujte nebo exportujte nastavení a podrobnosti vaší poštovní schránky napříč zařízeními. Hesla, tokeny a další citlivé údaje se nikdy nesynchronizují.",
+    "WinoAccount_Management_SignOutTitle": "Odhlásit se",
+    "WinoAccount_Management_SignOutDescription": "Odhlašte se ze svého účtu na tomto zařízení.",
+    "WinoAccount_Management_StatusLabel": "Stav: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Pro tento účet dosud nejsou uložena žádná synchronizovaná data.",
+    "WinoAccount_Management_ExportSucceeded": "Vybraná data Wino byla úspěšně exportována.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Vaše preference byly exportovány do vašeho Wino účtu.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exportováno {0} podrobností o účtech do vašeho Wino účtu.",
+    "WinoAccount_Management_ImportSucceeded": "Importována synchronizovaná data z vašeho účtu Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Aplikováno {0} synchronizovaných preferencí.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importováno {0} účtů.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Přeskočeno {0} duplicitních účtů, které na tomto zařízení již existují.",
+    "WinoAccount_Management_ImportPartial": "Použito {0} synchronizovaných nastavení. {1} nastavení nebylo obnoveno.",
+    "WinoAccount_Management_ImportReloginReminder": "Hesla, tokeny a další citlivé údaje nebyly importovány. Přihlaste se znovu pro každý účet na tomto zařízení před použitím.",
+    "WinoAccount_Management_SerializeFailed": "Wino nemohlo serializovat vaše aktuální nastavení.",
+    "WinoAccount_Management_EmptyExport": "Nejsou žádné hodnoty nastavení k exportu.",
+    "WinoAccount_Management_ImportEmpty": "Synchronizovaná sada dat neobsahuje nic nového k obnovení.",
+    "WinoAccount_Management_ExportDialog_Title": "Export do vašeho účtu Wino.",
+    "WinoAccount_Management_ExportDialog_Description": "Vyberte, co chcete synchronizovat do vašeho účtu Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Předvolby",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Účty",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Hesla, tokeny a další citlivé údaje se nesynchronizují.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Importované účty na jiném počítači budou i nadále vyžadovat opětovné přihlášení před jejich použitím.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Probíhá export vybraných dat Wino.",
+    "WinoAccount_Management_LoadFailed": "Nepodařilo se načíst nejnovější informace o účtu Wino.",
+    "WinoAccount_Management_ActionFailed": "Požadavek na účet Wino nebyl dokončen.",
+    "WinoAccount_SettingsSection_Title": "Wino účet",
+    "WinoAccount_SettingsSection_Description": "Vytvořte si účet Wino nebo se do něj přihlaste prostřednictvím vaší lokální autentizační služby.",
+    "WinoAccount_RegisterButton_Title": "Zaregistrovat účet",
+    "WinoAccount_RegisterButton_Description": "Vytvořte účet Wino pomocí e-mailu a hesla.",
+    "WinoAccount_RegisterButton_Action": "Otevřít registraci",
+    "WinoAccount_LoginButton_Title": "Přihlásit se",
+    "WinoAccount_LoginButton_Description": "Přihlaste se k již existujícímu účtu Wino pomocí e-mailu a hesla.",
+    "WinoAccount_LoginButton_Action": "Otevřít přihlášení",
+    "WinoAccount_SignOutButton_Title": "Odhlásit se",
+    "WinoAccount_SignOutButton_Description": "Odstranit místně uloženou relaci účtu Wino.",
+    "WinoAccount_SignOutButton_Action": "Odhlásit se",
+    "WinoAccount_RegisterDialog_Title": "Vytvořit účet Wino",
+    "WinoAccount_RegisterDialog_Description": "Vytvořte si účet Wino, aby se váš zážitek ze Wino synchronizoval a bylo možné odemknout doplňky založené na účtech.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Vytvořte svůj účet Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Proč si ho vytvořit?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Import a export nastavení napříč zařízeními.",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Přesuňte své nastavení Wino mezi zařízeními, aniž byste museli znovu nastavovat celý systém.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Přístup k exkluzivním doplňkům, jako je Wino AI Pack (placené)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Použijte jeden účet k odemknutí prémiových funkcí Wino, jak budou dostupné.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino Account je oddělen od vašich e‑mailových účtů",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Vaše účty Outlook, Gmail, IMAP nebo jiné e‑mailové účty zůstávají přesně takové, jaké jsou. Účet Wino spravuje pouze funkce související s Wino a doplňky založené na účtech.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrovat",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Ochrana soukromí a zpracování API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Volitelné doplňky, jako například Wino AI Pack, mohou odesílat vybraný HTML obsah e-mailů do služby Wino API jen tehdy, když tyto funkce používáte.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Přečtěte si zásady ochrany soukromí.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Souhlasím se zásadami ochrany soukromí.",
+    "WinoAccount_LoginDialog_Title": "Přihlásit se k účtu Wino",
+    "WinoAccount_LoginDialog_Description": "Přihlaste se k svému účtu Wino, abyste mohli synchronizovat nastavení Wino a získat přístup k funkcím založeným na účtu.",
+    "WinoAccount_LoginDialog_HeroTitle": "Vítejte zpět",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Co vám přihlášení přináší",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Použijte svůj účet Wino k pokračování synchronizace nastavení napříč zařízeními a k přístupu k placeným doplňkům, jako je Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Toto není vaše přihlášení k e-mailovému účtu",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Přihlášení zde nepřidává ani nenahradí vaše účty Outlook, Gmail, IMAP ve Wino. Přihlašujete se pouze k službám určeným pro Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Zapomenuté heslo?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Heslo",
+    "WinoAccount_ConfirmPasswordLabel": "Potvrdit heslo",
+    "WinoAccount_ForgotPasswordDialog_Title": "Obnovit heslo",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Odeslat e‑mail pro obnovení hesla.",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Zpět na přihlášení",
+    "WinoAccount_ForgotPasswordDialog_Description": "Zadejte e-mailovou adresu účtu Wino a my vám pošleme odkaz pro obnovení hesla, pokud je adresa registrována.",
+    "WinoAccount_Validation_EmailRequired": "E-mail je vyžadován.",
+    "WinoAccount_Validation_PasswordRequired": "Heslo je vyžadováno.",
+    "WinoAccount_Validation_PasswordMismatch": "Hesla se neshodují.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Před vytvořením účtu Wino musíte souhlasit se zásadami ochrany soukromí.",
+    "WinoAccount_Error_InvalidCredentials": "E‑mailová adresa nebo heslo jsou nesprávné.",
+    "WinoAccount_Error_AccountLocked": "Tento účet je dočasně uzamčen.",
+    "WinoAccount_Error_AccountBanned": "Tento účet byl zablokován.",
+    "WinoAccount_Error_AccountSuspended": "Tento účet byl pozastaven.",
+    "WinoAccount_Error_EmailNotConfirmed": "Před přihlášením potvrďte svou e‑mailovou adresu.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Před přihlášením potvrďte svou e‑mailovou adresu.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Nový e‑mail s potvrzením zatím není k dispozici.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Tato žádost o potvrzení již není platná. Zkuste se prosím znovu přihlásit.",
+    "WinoAccount_Error_EmailNotRegistered": "Tato e‑mailová adresa není registrována.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Vaše relace již není platná. Přihlaste se prosím znovu.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Tato e‑mailová adresa je již registrována.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "K dokončení externího přihlášení je vyžadována e-mailová adresa.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Žádost o externí přihlášení je neplatná.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Stav externího přihlášení je neplatný nebo vypršel.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Kód externího přihlášení je neplatný nebo vypršel.",
+    "WinoAccount_Error_AiPackRequired": "Pro tuto akci je vyžadováno aktivní předplatné Wino AI Pack.",
+    "WinoAccount_Error_AiQuotaExceeded": "V aktuálním fakturačním období byl dosažen limit využití AI Pack.",
+    "WinoAccount_Error_AiHtmlEmpty": "Není žádný obsah e-mailu k zpracování.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Tento e-mail je příliš velký pro zpracování pomocí Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Tento jazyk není podporován. Zkuste platný kód kultury, např. en-US nebo tr-TR.",
+    "WinoAccount_Error_Forbidden": "Nemáte oprávnění k provedení této akce.",
+    "WinoAccount_Error_ValidationFailed": "Požadavek je neplatný. Zkontrolujte prosím zadané hodnoty.",
+    "WinoAccount_RegisterSuccessMessage": "Registrace účtu Wino byla dokončena pro {0}.",
+    "WinoAccount_LoginSuccessMessage": "Přihlášení k účtu Wino jako {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Potvrďte svou e-mailovou adresu.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Odeslali jsme potvrzení e-mailem na {0}. Prosím potvrďte jej a zkuste se znovu přihlásit.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Potvrzení e-mailu vyžadováno.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Stále čekáme na potvrzení {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Znovu odeslat potvrzovací e-mail.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Potvrzovací e-mail můžete znovu odeslat za {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Nyní můžete potvrzovací e-mail odeslat znovu.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Potvrzovací e‑mail byl odeslán znovu.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Na {0} jsme odeslali další potvrzovací e‑mail. Prosím potvrďte jej a zkuste se znovu přihlásit.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Odeslán e‑mail pro obnovení hesla.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Odeslali jsme e‑mail pro obnovení hesla na {0}. Otevřete tuto zprávu a zvolte nové heslo.",
+    "WinoAccount_ChangePassword_Title": "Změnit heslo.",
+    "WinoAccount_ChangePassword_Description": "Pošlete e‑mail pro obnovení hesla na tento účet Wino.",
+    "WinoAccount_ChangePassword_Action": "Odeslat e‑mail pro obnovení hesla.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Chcete, aby Wino odeslalo e-mail pro reset hesla na {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Odhlášeno z účtu Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Neexistuje žádný aktivní účet Wino pro odhlášení.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Účet Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Přihlaste se nebo vytvořte účet Wino a spravujte svou relaci Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Stav: {0}",
+    "WelcomeWizard_Step2Title": "Přidat účet",
+    "WelcomeWizard_Step3Title": "Dokončit nastavení",
+    "ProviderSelection_Title": "Zvolte poskytovatele e-mailu",
+    "ProviderSelection_Subtitle": "Vyberte níže uvedeného poskytovatele a přidejte si svůj e-mailový účet do Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Název účtu",
+    "ProviderSelection_AccountNamePlaceholder": "např. Osobní, Pracovní",
+    "ProviderSelection_DisplayNameHeader": "Zobrazené jméno",
+    "ProviderSelection_DisplayNamePlaceholder": "např. Jan Novák",
+    "ProviderSelection_EmailHeader": "E-mailová adresa",
+    "ProviderSelection_EmailPlaceholder": "např. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Heslo pro aplikaci",
+    "ProviderSelection_AppPasswordHelp": "Jak získám heslo pro použití v aplikaci?",
+    "ProviderSelection_CalendarModeHeader": "Integrace kalendáře",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Vypnuto",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Žádná integrace kalendáře",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV synchronizace",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Vaše kalendářní události jsou mezi vašimi zařízeními synchronizovány se servery Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Vaše kalendářní události jsou mezi vašimi zařízeními synchronizovány se servery Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokální kalendář",
+    "ProviderSelection_CalendarMode_LocalDescription": "Vaše události jsou uloženy pouze v počítači. Žádné připojení k serverům.",
+    "ProviderSelection_ClearColor": "Vymazat barvu",
+    "ProviderSelection_ContinueButton": "Pokračovat",
+    "ProviderSelection_SpecialImap_Subtitle": "Zadejte údaje o účtu pro připojení.",
+    "AccountSetup_Title": "Nastavuji váš účet.",
+    "AccountSetup_Step_Authenticating": "Ověřování s {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testuji autentizaci e-mailu.",
+    "AccountSetup_Step_SyncingFolders": "Synchronizuji metadata složek",
+    "AccountSetup_Step_FetchingProfile": "Načítám informace o profilu",
+    "AccountSetup_Step_DiscoveringCalDav": "Objevování nastavení CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Testuji autentizaci kalendáře",
+    "AccountSetup_Step_SavingAccount": "Ukládám informace o účtu",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Načítám metadata kalendáře",
+    "AccountSetup_Step_SyncingAliases": "Synchronizuji aliasy",
+    "AccountSetup_Step_Finalizing": "Dokončuji nastavení",
+    "AccountSetup_FailureMessage": "Nastavení selhalo. Vraťte se zpět a opravte nastavení, nebo to zkuste později.",
+    "AccountSetup_SuccessMessage": "Váš účet byl úspěšně nastaven!",
+    "AccountSetup_GoBackButton": "Zpět",
+    "AccountSetup_TryAgainButton": "Zkusit znovu",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatické zjištění selhalo. Zadejte nastavení ručně na kartě Pokročilé."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/da_DK/resources.json b/Wino.Core.Domain/Translations/da_DK/resources.json
index 663580b2..4e841d23 100644
--- a/Wino.Core.Domain/Translations/da_DK/resources.json
+++ b/Wino.Core.Domain/Translations/da_DK/resources.json
@@ -1,182 +1,324 @@
 {
     "AccountAlias_Column_Alias": "Alias",
-    "AccountAlias_Column_IsPrimaryAlias": "Primær",
-    "AccountAlias_Column_Verified": "Bekræftetag",
-    "AccountAlias_Disclaimer_FirstLine": "Wino kan kun importere aliaser fra dine Gmail kontoer.",
-    "AccountAlias_Disclaimer_SecondLine": "Hvis du gerne vil bruge aliaser på din Outlook eller IMAP konto, skal du tilføje dem selv.",
-    "AccountCacheReset_Title": "Nulstil Kontocache",
-    "AccountCacheReset_Message": "Denne konto kræver fuld gensynkronisering for at fortsætte. Vent venligst, mens Wino gensynkroniserer dine beskeder...",
-    "AccountContactNameYou": "Dig",
-    "AccountCreationDialog_Completed": "Alt er udført",
-    "AccountCreationDialog_FetchingEvents": "Henter kalenderbegivenheder.",
-    "AccountCreationDialog_FetchingProfileInformation": "Henter profiloplysninger.",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Hvis din browser ikke åbnede automatisk, for at fuldføre autentificeringen:",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row1": "1) Klik på knappen nedenfor for at kopiere godkendelsesadressen",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row2": "2) Åbn din webbrowser (Edge, Chrome, Firefox, osv...)",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row3": "3) Indsæt den kopierede adresse og gå til hjemmesiden for at fuldføre godkendelse manuelt.",
-    "AccountCreationDialog_Initializing": "initialisere",
-    "AccountCreationDialog_PreparingFolders": "Vi henter mappeinformation i øjeblikket.",
-    "AccountCreationDialog_SigninIn": "Kontooplysninger gemmes.",
-    "AccountEditDialog_Message": "Kontonavn",
-    "AccountEditDialog_Title": "Rediger Konto",
-    "AccountPickerDialog_Title": "Vælg en konto",
-    "AccountSettingsDialog_AccountName": "Afsenders Visningsnavn",
-    "AccountSettingsDialog_AccountNamePlaceholder": "f.eks. Jens Jensen",
-    "AccountDetailsPage_Title": "Kontooplysninger",
-    "AccountDetailsPage_Description": "Ændr navnet på kontoen i Wino og angiv ønsket afsendernavn.",
-    "AccountDetailsPage_ColorPicker_Title": "Kontofarve",
-    "AccountDetailsPage_ColorPicker_Description": "Tilknyt en ny kontofarve til at farve symbolet i listen.",
-    "AddHyperlink": "Tilføj",
-    "AppCloseBackgroundSynchronizationWarningTitle": "Baggrundssynkronisering",
-    "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Applikationen er ikke indstillet til at starte ved Windows start.",
-    "AppCloseStartupLaunchDisabledWarningMessageSecondLine": "Dette vil få dig til at gå glip af notifikationer, når du genstarter din computer.",
-    "AppCloseStartupLaunchDisabledWarningMessageThirdLine": "Ønsker du at gå til siden Præferencer for at aktivere det?",
-    "AppCloseTerminateBehaviorWarningMessageFirstLine": "Du er ved at lukke Wino Mail, og din app-lukningsindstilling er sat til ‘Afslut’.",
-    "AppCloseTerminateBehaviorWarningMessageSecondLine": "Dette vil stoppe alle baggrundssynkroniseringer og notifikationer.",
-    "AppCloseTerminateBehaviorWarningMessageThirdLine": "Vil du gå til App-præferencer for at indstille Wino Mail til at køre minimeret eller i baggrunden?",
-    "AutoDiscoveryProgressMessage": "Søger efter indstillinger for mail...",
-    "BasicIMAPSetupDialog_AdvancedConfiguration": "Avanceret opsætning",
-    "BasicIMAPSetupDialog_CredentialLocalMessage": "Dine legitimationsoplysninger gemmes kun lokalt på din computer.",
-    "BasicIMAPSetupDialog_Description": "Nogle konti kræver yderligere trin for at logge på",
-    "BasicIMAPSetupDialog_DisplayName": "Visningsnavn",
-    "BasicIMAPSetupDialog_DisplayNamePlaceholder": "f.eks. Jens Jensen",
-    "BasicIMAPSetupDialog_LearnMore": "Læs mere",
-    "BasicIMAPSetupDialog_MailAddress": "E-mail-adresse",
-    "BasicIMAPSetupDialog_MailAddressPlaceholder": "jensjensen@eksempel.dk",
-    "BasicIMAPSetupDialog_Password": "Adgangskode",
-    "BasicIMAPSetupDialog_Title": "IMAP-konto",
-    "Busy": "Optaget",
-    "Buttons_AddAccount": "Tilføj Konto",
-    "Buttons_AddNewAlias": "Tilføj et nyt alias",
-    "Buttons_Allow": "Tillad",
-    "Buttons_ApplyTheme": "",
-    "Buttons_Browse": "Gennemse",
-    "Buttons_Cancel": "Annuller",
-    "Buttons_Close": "Luk",
-    "Buttons_Copy": "Kopier",
-    "Buttons_Create": "Opret",
-    "Buttons_CreateAccount": "Opret konto",
-    "Buttons_Delete": "Slet",
-    "Buttons_Deny": "Afvis",
-    "Buttons_Discard": "Kassér",
-    "Buttons_Edit": "Rediger",
-    "Buttons_EnableImageRendering": "Aktivér",
-    "Buttons_Multiselect": "Vælg Flere",
-    "Buttons_No": "Nej",
-    "Buttons_Open": "Åbn",
-    "Buttons_Purchase": "Køb",
-    "Buttons_RateWino": "Bedøm Wino",
-    "Buttons_Reset": "Nulstil",
-    "Buttons_Save": "Gem",
-    "Buttons_SaveConfiguration": "Gem konfiguration",
+    "AccountAlias_Column_IsPrimaryAlias": "Primary",
+    "AccountAlias_Column_Verified": "Verified",
+    "AccountAlias_Disclaimer_FirstLine": "Wino can only import aliases for your Gmail accounts.",
+    "AccountAlias_Disclaimer_SecondLine": "If you want to use aliases for your Outlook or IMAP account, please add them yourself.",
+    "AccountCacheReset_Title": "Account Cache Reset",
+    "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
+    "AccountContactNameYou": "You",
+    "AccountCreationDialog_Completed": "all done",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Henter kalenderoplysninger.",
+    "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
+    "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row1": "1) Click the button below to copy the authentication address",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row2": "2) Launch your web browser (Edge, Chrome, Firefox etc...)",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row3": "3) Paste the copied address and go to the website to complete authentication manually.",
+    "AccountCreationDialog_Initializing": "initializing",
+    "AccountCreationDialog_PreparingFolders": "We are getting folder information at the moment.",
+    "AccountCreationDialog_SigninIn": "Account information is being saved.",
+    "Purchased": "Købt",
+    "AccountEditDialog_Message": "Account Name",
+    "AccountEditDialog_Title": "Edit Account",
+    "AccountPickerDialog_Title": "Pick an account",
+    "AccountSettingsDialog_AccountName": "Sender Display Name",
+    "AccountSettingsDialog_AccountNamePlaceholder": "eg. John Doe",
+    "AccountDetailsPage_Title": "Account info",
+    "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
+    "AccountDetailsPage_ColorPicker_Title": "Account color",
+    "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Generelt",
+    "AccountDetailsPage_TabMail": "Mail",
+    "AccountDetailsPage_TabCalendar": "Kalender",
+    "AccountDetailsPage_CalendarListDescription": "Vælg en kalender for at konfigurere dens indstillinger.",
+    "AddHyperlink": "Add",
+    "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
+    "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
+    "AppCloseStartupLaunchDisabledWarningMessageSecondLine": "This will cause you to miss notifications when you restart your computer.",
+    "AppCloseStartupLaunchDisabledWarningMessageThirdLine": "Do you want to go to App Preferences page to enable it?",
+    "AppCloseTerminateBehaviorWarningMessageFirstLine": "You are terminating Wino Mail and your app close behavior is set to 'Terminate'.",
+    "AppCloseTerminateBehaviorWarningMessageSecondLine": "This will stop all background synchronizations and notifications.",
+    "AppCloseTerminateBehaviorWarningMessageThirdLine": "Do you want to go to App Preferences to set Wino Mail to run minimized or in the background?",
+    "AutoDiscoveryProgressMessage": "Searching for mail settings...",
+    "BasicIMAPSetupDialog_AdvancedConfiguration": "Advanced Configuration",
+    "BasicIMAPSetupDialog_CredentialLocalMessage": "Your credentials will only be stored locally on your computer.",
+    "BasicIMAPSetupDialog_Description": "Some accounts require additional steps to sign in",
+    "BasicIMAPSetupDialog_DisplayName": "Display Name",
+    "BasicIMAPSetupDialog_DisplayNamePlaceholder": "eg. John Doe",
+    "BasicIMAPSetupDialog_LearnMore": "Learn more",
+    "BasicIMAPSetupDialog_MailAddress": "E-Mail Address",
+    "BasicIMAPSetupDialog_MailAddressPlaceholder": "johndoe@fabrikam.com",
+    "BasicIMAPSetupDialog_Password": "Password",
+    "BasicIMAPSetupDialog_Title": "IMAP Account",
+    "Busy": "Busy",
+    "Buttons_AddAccount": "Add Account",
+    "Buttons_FixAccount": "Ret kontoen",
+    "Buttons_AddNewAlias": "Add New Alias",
+    "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Anvend",
+    "Buttons_ApplyTheme": "Apply Theme",
+    "Buttons_Browse": "Browse",
+    "Buttons_Cancel": "Cancel",
+    "Buttons_Close": "Close",
+    "Buttons_Copy": "Copy",
+    "Buttons_Create": "Create",
+    "Buttons_CreateAccount": "Create Account",
+    "Buttons_Delete": "Delete",
+    "Buttons_Deny": "Deny",
+    "Buttons_Discard": "Discard",
+    "Buttons_Edit": "Edit",
+    "Buttons_EnableImageRendering": "Enable",
+    "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Administrer",
+    "Buttons_No": "No",
+    "Buttons_Open": "Open",
+    "Buttons_Purchase": "Purchase",
+    "Buttons_RateWino": "Rate Wino",
+    "Buttons_Reset": "Reset",
+    "Buttons_Save": "Save",
+    "Buttons_SaveConfiguration": "Save Configuration",
     "Buttons_Send": "Send",
-    "Buttons_Share": "Del",
-    "Buttons_SignIn": "Log ind",
-    "Buttons_Sync": "Synkronisér",
-    "Buttons_SyncAliases": "Synkronisér Aliaser",
-    "Buttons_TryAgain": "Prøv igen",
-    "Buttons_Yes": "Ja",
-    "CalendarAllDayEventSummary": "heldagsbegivenheder",
-    "CalendarDisplayOptions_Color": "Farve",
-    "CalendarDisplayOptions_Expand": "Udvid",
-    "CalendarItem_DetailsPopup_JoinOnline": "Tilmeld dig online",
-    "CalendarItem_DetailsPopup_ViewEventButton": "Vis begivenhed",
-    "CalendarItem_DetailsPopup_ViewSeriesButton": "Vis serie",
-    "CalendarItemAllDay": "hele dagen",
-    "CategoriesFolderNameOverride": "Kategorier",
-    "Center": "Centrer",
-    "ClipboardTextCopied_Message": "{0} kopierede til udklipsholderen.",
-    "ClipboardTextCopied_Title": "Kopieret",
-    "ClipboardTextCopyFailed_Message": "Kunne ikke kopiere {0} til udklipsholderen.",
-    "ComingSoon": "Kommer snart...",
-    "ComposerAttachmentsDragDropAttach_Message": "Vedhæft",
-    "ComposerAttachmentsDropZone_Message": "Slip dine filer her",
-    "ComposerFrom": "Fra:",
-    "ComposerImagesDropZone_Message": "Slip dine billeder her",
-    "ComposerSubject": "Emne: ",
-    "ComposerTo": "Til: ",
-    "ComposerToPlaceholder": "klik enter for at indtaste adresser",
-    "CreateAccountAliasDialog_AliasAddress": "Adresse",
-    "CreateAccountAliasDialog_AliasAddressPlaceholder": "f.eks. kontakt@mitdomæne.dk",
-    "CreateAccountAliasDialog_Description": "Sørg for at din udgående server tillader at sende mails fra dette alias.",
-    "CreateAccountAliasDialog_ReplyToAddress": "Svar-til-adresse",
-    "CreateAccountAliasDialog_ReplyToAddressPlaceholder": "admin@mitdomæne.dk",
-    "CreateAccountAliasDialog_Title": "Opret Kontoalias",
-    "CustomThemeBuilder_AccentColorDescription": "Indstil brugerdefineret accentfarve, hvis du ønsker det. Hvis du ikke vælger en farve, bruges din Windows-accentfarve.",
-    "CustomThemeBuilder_AccentColorTitle": "Accentfarve",
-    "CustomThemeBuilder_PickColor": "Vælg",
-    "CustomThemeBuilder_ThemeNameDescription": "Unikt navn til dit brugerdefinerede tema.",
-    "CustomThemeBuilder_ThemeNameTitle": "Temanavn",
-    "CustomThemeBuilder_Title": "Tilpasset Temabygger",
-    "CustomThemeBuilder_WallpaperDescription": "Angiv et brugerdefineret baggrundsbillede til Wino",
-    "CustomThemeBuilder_WallpaperTitle": "Indstil brugerdefineret baggrund",
-    "Dialog_DontAskAgain": "Spørg ikke igen",
-    "DialogMessage_AccountLimitMessage": "Du har nået grænsen for kontooprettelse.\nVil du købe tilføjelsen 'Ubegrænset konto' for at fortsætte?",
-    "DialogMessage_AccountLimitTitle": "Kontogrænse Nået",
-    "DialogMessage_AliasCreatedMessage": "Dit nye alias er oprettet.",
-    "DialogMessage_AliasCreatedTitle": "Oprettede Nyt Alias",
-    "DialogMessage_AliasExistsMessage": "Dette alias er allerede i brug.",
-    "DialogMessage_AliasExistsTitle": "Eksisterende Alias",
-    "DialogMessage_AliasNotSelectedMessage": "Du skal vælge et alias, før du sender en besked.",
-    "DialogMessage_AliasNotSelectedTitle": "Mangler Alias",
-    "DialogMessage_CantDeleteRootAliasMessage": "Grundalias kan ikke slettes. Dette er din primære identitet tilknyttet din konto.",
-    "DialogMessage_CantDeleteRootAliasTitle": "Kan ikke slette alias",
-    "DialogMessage_CleanupFolderMessage": "Vil du permanent slette alle mails i denne mappe?",
-    "DialogMessage_CleanupFolderTitle": "Oprydningsmappe",
-    "DialogMessage_ComposerMissingRecipientMessage": "Beskeden har ingen modtager.",
-    "DialogMessage_ComposerValidationFailedTitle": "Godkendelse mislykkedes",
-    "DialogMessage_CreateLinkedAccountMessage": "Giv dette nye link et navn. Konti vil blive flettet under dette navn.",
-    "DialogMessage_CreateLinkedAccountTitle": "Konto Linknavn",
-    "DialogMessage_DeleteAccountConfirmationMessage": "Slet {0}?",
-    "DialogMessage_DeleteAccountConfirmationTitle": "Alle data, der er forbundet med denne konto, vil blive slettet fra disken permanent.",
-    "DialogMessage_DiscardDraftConfirmationMessage": "Dette udkast vil blive kasseret. Vil du fortsætte?",
-    "DialogMessage_DiscardDraftConfirmationTitle": "Kassér udkast",
-    "DialogMessage_EmptySubjectConfirmation": "Mangler Emne",
-    "DialogMessage_EmptySubjectConfirmationMessage": "Beskeden har intet emne. Vil du fortsætte?",
-    "DialogMessage_EnableStartupLaunchDeniedMessage": "Du kan aktivere opstart fra Indstillinger -> App-præferencer.",
-    "DialogMessage_EnableStartupLaunchMessage": "Lad Wino Mail automatisk starte minimeret ved Windows-opstart, så du ikke går glip af nogen notifikationer.\n\nVil du aktivere automatisk opstart?",
-    "DialogMessage_EnableStartupLaunchTitle": "Aktiver automatisk opstart",
-    "DialogMessage_HardDeleteConfirmationMessage": "Slet Permanent",
-    "DialogMessage_HardDeleteConfirmationTitle": "Besked(er) vil blive slettet permanent. Vil du fortsætte?",
-    "DialogMessage_InvalidAliasMessage": "Dette alias er ikke gyldigt. Sørg for, at alle adresser på aliasset er gyldige e-mailadresser.",
-    "DialogMessage_InvalidAliasTitle": "Ugyldigt Alias",
-    "DialogMessage_NoAccountsForCreateMailMessage": "Du har ikke nogen konti at oprette en besked fra.",
-    "DialogMessage_NoAccountsForCreateMailTitle": "Konto mangler",
-    "DialogMessage_PrintingFailedMessage": "Kunne ikke udskrive denne mail. Resultat: {0}",
-    "DialogMessage_PrintingFailedTitle": "Mislykkedes",
-    "DialogMessage_PrintingSuccessMessage": "Mail er sendt til printer.",
-    "DialogMessage_PrintingSuccessTitle": "Succes",
-    "DialogMessage_RenameFolderMessage": "Indtast nyt navn for denne mappe",
-    "DialogMessage_RenameFolderTitle": "Omdøb mappe",
-    "DialogMessage_RenameLinkedAccountsMessage": "Indtast nyt navn for den tilknyttede konto",
-    "DialogMessage_RenameLinkedAccountsTitle": "Omdøb den tilknyttede konto",
-    "DialogMessage_UnlinkAccountsConfirmationMessage": "Denne handling sletter ikke dine konti, men fjerner kun forbindelsen for delte mapper. Vil du fortsætte?",
-    "DialogMessage_UnlinkAccountsConfirmationTitle": "Fjern kontotilknytning",
-    "DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton": "Gå til hjemmesiden",
-    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "For at stoppe med at modtage beskeder fra {0}, gå til deres hjemmeside for at afmelde.",
-    "DialogMessage_UnsubscribeConfirmationMailtoMessage": "Vil du stoppe med at modtage beskeder fra {0}? Wino vil afmelde dig ved at sende en e-mail fra din e-mail-konto til {1}.",
-    "DialogMessage_UnsubscribeConfirmationOneClickMessage": "Vil du stoppe med at modtage beskeder fra {0}?",
-    "DialogMessage_UnsubscribeConfirmationTitle": "Afmeld",
-    "DiscordChannelDisclaimerMessage": "Wino har ikke sin egen Discord-server, men en specialkanal ‘wino-mail’ findes på ‘Developer Sanctuary’-serveren.\nFor at få opdateringer om Wino, join venligst Developer Sanctuary-serveren og følg ‘wino-mail’-kanalen under ‘Community Projects’.\n\nDu vil blive ført til serverens URL, da Discord ikke understøtter kanalinvitationer.",
-    "DiscordChannelDisclaimerTitle": "Vigtig Discord Information",
-    "Draft": "Udkast",
-    "DragMoveToFolderCaption": "Flyt til {0}",
-    "EditorToolbarOption_Draw": "Tegn",
-    "EditorToolbarOption_Format": "Formatér",
-    "EditorToolbarOption_Insert": "Indsæt",
-    "EditorToolbarOption_None": "Ingen",
-    "EditorToolbarOption_Options": "Valgmuligheder",
-    "EditorTooltip_WebViewEditor": "Brug webvisningseditor",
-    "ElementTheme_Dark": "Mørk tilstand",
-    "ElementTheme_Default": "Brug systemindstilling",
-    "ElementTheme_Light": "Lys tilstand",
+    "Buttons_SendToServer": "Send til server",
+    "Buttons_Share": "Share",
+    "Buttons_SignIn": "Sign In",
+    "Buttons_Sync": "Synchronize",
+    "Buttons_SyncAliases": "Synchronize Aliases",
+    "Buttons_TryAgain": "Try Again",
+    "Buttons_Yes": "Yes",
+    "Sync_SynchronizingFolder": "Synkroniserer {0} {1}%",
+    "Sync_DownloadedMessages": "Hentede {0} beskeder fra {1}",
+    "SyncAction_Archiving": "Arkiverer {0} mail",
+    "SyncAction_ClearingFlag": "Fjerner flag for {0} mail",
+    "SyncAction_CreatingDraft": "Opretter kladde",
+    "SyncAction_CreatingEvent": "Opretter begivenhed",
+    "SyncAction_Deleting": "Sletter {0} mail",
+    "SyncAction_EmptyingFolder": "Tømmer mappe",
+    "SyncAction_MarkingAsRead": "Markerer {0} mail som læst",
+    "SyncAction_MarkingAsUnread": "Markerer {0} mail som ulæst",
+    "SyncAction_MarkingFolderAsRead": "Markerer mappe som læst",
+    "SyncAction_Moving": "Flytter {0} mail",
+    "SyncAction_MovingToFocused": "Flytter {0} mail til Focused",
+    "SyncAction_RenamingFolder": "Omdøbning af mappe",
+    "SyncAction_SendingMail": "Sender mail",
+    "SyncAction_SettingFlag": "Markerer {0} mail",
+    "SyncAction_SynchronizingAccount": "Synkroniserer {0}",
+    "SyncAction_SynchronizingAccounts": "Synkroniserer {0} konti",
+    "SyncAction_SynchronizingCalendarData": "Synkroniserer kalenderdata",
+    "SyncAction_SynchronizingCalendarEvents": "Synkroniserer kalenderbegivenheder",
+    "SyncAction_SynchronizingCalendarMetadata": "Synkroniserer kalendermetadata",
+    "SyncAction_Unarchiving": "Fjerner arkivering af {0} mail",
+    "CalendarAllDayEventSummary": "all-day events",
+    "CalendarDisplayOptions_Color": "Color",
+    "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Accepter",
+    "CalendarEventResponse_AcceptedResponse": "Accepteret",
+    "CalendarEventResponse_Decline": "Afvis",
+    "CalendarEventResponse_DeclinedResponse": "Afvist",
+    "CalendarEventResponse_NotResponded": "Ikke besvaret",
+    "CalendarEventResponse_Tentative": "Foreløbig",
+    "CalendarEventResponse_TentativeResponse": "Foreløbig",
+    "CalendarEventRsvpPanel_Accept": "Accepter",
+    "CalendarEventRsvpPanel_AddMessage": "Tilføj en besked til dit svar... (valgfrit)",
+    "CalendarEventRsvpPanel_Decline": "Afvist",
+    "CalendarEventRsvpPanel_Message": "Besked",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Send svarbesked",
+    "CalendarEventRsvpPanel_Tentative": "Foreløbig",
+    "CalendarEventRsvpPanel_Title": "Svarmuligheder",
+    "CalendarAttendeeStatus_Accepted": "Accepteret",
+    "CalendarAttendeeStatus_Declined": "Afvist",
+    "CalendarAttendeeStatus_NeedsAction": "Krever handling",
+    "CalendarAttendeeStatus_Tentative": "Foreløbig",
+    "CalendarEventDetails_Attachments": "Vedhæftede filer",
+    "CalendarEventCompose_AddAttachment": "Tilføj vedhæftet fil",
+    "CalendarEventCompose_AllDay": "Hele dagen",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Vedhæftede filer understøttes ikke for CalDAV-kalendere.",
+    "CalendarEventCompose_EndDate": "Slutdato",
+    "CalendarEventCompose_EndTime": "Sluttid",
+    "CalendarEventCompose_Every": "hver",
+    "CalendarEventCompose_ForWeekdays": "for",
+    "CalendarEventCompose_FrequencyDay": "dag",
+    "CalendarEventCompose_FrequencyDayPlural": "dage",
+    "CalendarEventCompose_FrequencyMonth": "måned",
+    "CalendarEventCompose_FrequencyMonthPlural": "måneder",
+    "CalendarEventCompose_FrequencyWeek": "uge",
+    "CalendarEventCompose_FrequencyWeekPlural": "uger",
+    "CalendarEventCompose_FrequencyYear": "år",
+    "CalendarEventCompose_FrequencyYearPlural": "år",
+    "CalendarEventCompose_Location": "Placering",
+    "CalendarEventCompose_LocationPlaceholder": "Tilføj en placering",
+    "CalendarEventCompose_NewEventButton": "Ny begivenhed",
+    "CalendarEventCompose_DefaultCalendarHint": "Du kan vælge en standardkalender for nye begivenheder i Kalenderindstillinger.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Åbn Kalenderindstillinger",
+    "CalendarEventCompose_NoCalendarsMessage": "Der er endnu ingen kalendere til rådighed til oprettelse af begivenheder.",
+    "CalendarEventCompose_NoCalendarsTitle": "Ingen kalendere tilgængelige",
+    "CalendarEventCompose_NoEndDate": "Ingen slutdato",
+    "CalendarEventCompose_Notes": "Noter",
+    "CalendarEventCompose_PickCalendarTitle": "Vælg en kalender",
+    "CalendarEventCompose_Recurring": "Gentagende",
+    "CalendarEventCompose_RecurringSummary": "Forekommer hver {0} {1}{2} {3} gyldig {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Forekommer {0}{1} {2} gyldig {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Gentag hver",
+    "CalendarEventCompose_SelectCalendar": "Vælg kalender",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Forekommer den {0} {1}",
+    "CalendarEventCompose_StartDate": "Startdato",
+    "CalendarEventCompose_StartTime": "Starttid",
+    "CalendarEventCompose_TimeRangeSummary": "fra {0} til {1}",
+    "CalendarEventCompose_Title": "Begivenhedstitel",
+    "CalendarEventCompose_TitlePlaceholder": "Tilføj en titel",
+    "CalendarEventCompose_Until": "indtil",
+    "CalendarEventCompose_UntilSummary": " indtil {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Slutdatoen for hele dagen skal være efter startdatoen.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Én eller flere deltagere har en ugyldig e-mailadresse.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Gentagelsens slutdato skal være på eller efter begivenhedens startdato.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Sluttiden skal være senere end starttiden.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Én eller flere vedhæftede filer er ikke længere tilgængelige: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Vælg en kalender før oprettelse af begivenheden.",
+    "CalendarEventCompose_ValidationMissingTitle": "Indtast en begivenhedstitel før oprettelsen af begivenheden.",
+    "CalendarEventCompose_ValidationTitle": "Begivenhedsvalidering mislykkedes",
+    "CalendarEventCompose_WeekdaySummary": " på {0}",
+    "CalendarEventCompose_Weekday_Friday": "F",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "Lør",
+    "CalendarEventCompose_Weekday_Sunday": "Søn",
+    "CalendarEventCompose_Weekday_Thursday": "Tor",
+    "CalendarEventCompose_Weekday_Tuesday": "Tir",
+    "CalendarEventCompose_Weekday_Wednesday": "Ons",
+    "CalendarEventDetails_Details": "Detaljer",
+    "CalendarEventDetails_EditSeries": "Rediger serie",
+    "CalendarEventDetails_Editing": "Redigerer",
+    "CalendarEventDetails_InviteSomeone": "Inviter nogen",
+    "CalendarEventDetails_JoinOnline": "Deltag online",
+    "CalendarEventDetails_Organizer": "Arrangør",
+    "CalendarEventDetails_People": "Deltagere",
+    "CalendarEventDetails_ReadOnlyEvent": "Skrivebeskyttet begivenhed",
+    "CalendarEventDetails_Reminder": "Påmindelse",
+    "CalendarReminder_StartedHoursAgo": "Startede {0} timer siden",
+    "CalendarReminder_StartedMinutesAgo": "Startede {0} minutter siden",
+    "CalendarReminder_StartedNow": "Startede netop nu",
+    "CalendarReminder_StartingNow": "Starter nu",
+    "CalendarReminder_StartsInHours": "Starter om {0} timer",
+    "CalendarReminder_StartsInMinutes": "Starter om {0} minutter",
+    "CalendarReminder_SnoozeAction": "Udsæt",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutter",
+    "CalendarEventDetails_ShowAs": "Vis som",
+    "CalendarShowAs_Free": "Ledig",
+    "CalendarShowAs_Tentative": "Foreløbig",
+    "CalendarShowAs_Busy": "Optaget",
+    "CalendarShowAs_OutOfOffice": "Ude af kontoret",
+    "CalendarShowAs_WorkingElsewhere": "Arbejder et andet sted",
+    "CalendarItem_DetailsPopup_JoinOnline": "Join online",
+    "CalendarItem_DetailsPopup_ViewEventButton": "View event",
+    "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
+    "CalendarItemAllDay": "all day",
+    "CategoriesFolderNameOverride": "Categories",
+    "Center": "Center",
+    "ClipboardTextCopied_Message": "{0} copied to clipboard.",
+    "ClipboardTextCopied_Title": "Copied",
+    "ClipboardTextCopyFailed_Message": "Failed to copy {0} to clipboard.",
+    "ContactInfoBar_ErrorTitle": "Kunne ikke indlæse kontaktoplysninger",
+    "ContactInfoBar_SuccessTitle": "Kontaktoplysninger indlæst",
+    "ContactInfoBar_WarningTitle": "Kontaktoplysningerne kan være ufuldstændige",
+    "ComingSoon": "Coming soon...",
+    "ComposerAttachmentsDragDropAttach_Message": "Attach",
+    "ComposerAttachmentsDropZone_Message": "Drop your files here",
+    "ComposerFrom": "From: ",
+    "ComposerImagesDropZone_Message": "Drop your images here",
+    "ComposerSubject": "Subject: ",
+    "ComposerTo": "To: ",
+    "ComposerToPlaceholder": "click enter to input addresses",
+    "CreateAccountAliasDialog_AliasAddress": "Address",
+    "CreateAccountAliasDialog_AliasAddressPlaceholder": "eg. support@mydomain.com",
+    "CreateAccountAliasDialog_Description": "Make sure your outgoing server allows sending mails from this alias.",
+    "CreateAccountAliasDialog_ReplyToAddress": "Reply-To Address",
+    "CreateAccountAliasDialog_ReplyToAddressPlaceholder": "admin@mydomain.com",
+    "CreateAccountAliasDialog_Title": "Create Account Alias",
+    "CustomThemeBuilder_AccentColorDescription": "Set custom accent color if you wish. Not selecting a color will use your Windows accent color.",
+    "CustomThemeBuilder_AccentColorTitle": "Accent color",
+    "CustomThemeBuilder_PickColor": "Pick",
+    "CustomThemeBuilder_ThemeNameDescription": "Unique name for your custom theme.",
+    "CustomThemeBuilder_ThemeNameTitle": "Theme name",
+    "CustomThemeBuilder_Title": "Custom Theme Builder",
+    "CustomThemeBuilder_WallpaperDescription": "Set a custom wallpaper for Wino",
+    "CustomThemeBuilder_WallpaperTitle": "Set custom wallpaper",
+    "Dialog_DontAskAgain": "Don't ask again",
+    "DialogMessage_AccountLimitMessage": "You have reached the account creation limit.\nWould you like to purchase 'Unlimited Account' add-on to continue?",
+    "DialogMessage_AccountLimitTitle": "Account Limit Reached",
+    "DialogMessage_AliasCreatedMessage": "New alias is succesfully created.",
+    "DialogMessage_AliasCreatedTitle": "Created New Alias",
+    "DialogMessage_AliasExistsMessage": "This alias is already in use.",
+    "DialogMessage_AliasExistsTitle": "Existing Alias",
+    "DialogMessage_AliasNotSelectedMessage": "You must select an alias before sending a message.",
+    "DialogMessage_AliasNotSelectedTitle": "Missing Alias",
+    "DialogMessage_CantDeleteRootAliasMessage": "Root alias can't be deleted. This is your main identity associated with your account setup.",
+    "DialogMessage_CantDeleteRootAliasTitle": "Can't Delete Alias",
+    "DialogMessage_CleanupFolderMessage": "Do you want to permanently delete all the mails in this folder?",
+    "DialogMessage_CleanupFolderTitle": "Cleanup Folder",
+    "DialogMessage_ComposerMissingRecipientMessage": "Message has no recipient.",
+    "DialogMessage_ComposerValidationFailedTitle": "Validation Failed",
+    "DialogMessage_CreateLinkedAccountMessage": "Give this new link a name. Accounts will be merged under this name.",
+    "DialogMessage_CreateLinkedAccountTitle": "Account Link Name",
+    "DialogMessage_DeleteAccountConfirmationMessage": "Delete {0}?",
+    "DialogMessage_DeleteAccountConfirmationTitle": "All data associated with this account will be deleted from disk permanently.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Slet skabelon \\\"{0}\\\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Slet e-mail-skabelon",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Dette vil slette alle begivenheder i serien. Vil du fortsætte?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Slet tilbagevendende serie",
+    "DialogMessage_DiscardDraftConfirmationMessage": "This draft will be discarded. Do you want to continue?",
+    "DialogMessage_DiscardDraftConfirmationTitle": "Discard Draft",
+    "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
+    "DialogMessage_EmptySubjectConfirmationMessage": "Message has no subject. Do you want to continue?",
+    "DialogMessage_EnableStartupLaunchDeniedMessage": "You can enable startup launch from Settings -> App Preferences.",
+    "DialogMessage_EnableStartupLaunchMessage": "Let Wino Mail automatically launch minimized on Windows startup to not miss any notifications.\n\nDo you want to enable startup launch?",
+    "DialogMessage_EnableStartupLaunchTitle": "Enable Startup Launch",
+    "DialogMessage_HardDeleteConfirmationMessage": "Permanent Delete",
+    "DialogMessage_HardDeleteConfirmationTitle": "Message(s) will be permanently deleted. Do you want to continue?",
+    "DialogMessage_InvalidAliasMessage": "This alias is not valid. Make sure all addresses of the alias are valid e-mail addresses.",
+    "DialogMessage_InvalidAliasTitle": "Invalid Alias",
+    "DialogMessage_NoAccountsForCreateMailMessage": "You don't have any accounts to create message from.",
+    "DialogMessage_NoAccountsForCreateMailTitle": "Account Missing",
+    "DialogMessage_PrintingFailedMessage": "Failed to print this mail. Result: {0}",
+    "DialogMessage_PrintingFailedTitle": "Failed",
+    "DialogMessage_PrintingSuccessMessage": "Mail is sent to printer.",
+    "DialogMessage_PrintingSuccessTitle": "Success",
+    "DialogMessage_RenameFolderMessage": "Enter new name for this folder",
+    "DialogMessage_RenameFolderTitle": "Rename Folder",
+    "DialogMessage_RenameLinkedAccountsMessage": "Enter new name for linked account",
+    "DialogMessage_RenameLinkedAccountsTitle": "Rename Linked Account",
+    "DialogMessage_UnlinkAccountsConfirmationMessage": "This operation will not delete your accounts but only break the link for shared folder connections. Do you want to continue?",
+    "DialogMessage_UnlinkAccountsConfirmationTitle": "Unlink Accounts",
+    "DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton": "Go to website",
+    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "To stop getting messages from {0}, go to their website to unsubscribe.",
+    "DialogMessage_UnsubscribeConfirmationMailtoMessage": "Do you want to stop getting messages from {0}? Wino will unsubscribe for you by sending an email from your email account to {1}.",
+    "DialogMessage_UnsubscribeConfirmationOneClickMessage": "Do you want to stop getting messages from {0}?",
+    "DialogMessage_UnsubscribeConfirmationTitle": "Unsubscribe",
+    "DiscordChannelDisclaimerMessage": "Wino doesn't have it's own Discord server, but special 'wino-mail' channel is hosted at 'Developer Sanctuary' server.\nTo get the updates about Wino please join Developer Sanctuary server and follow 'wino-mail' channel under 'Community Projects'\n\nYou will be directed to server URL since Discord doesn't support channel invites.",
+    "DiscordChannelDisclaimerTitle": "Important Discord Information",
+    "Draft": "Draft",
+    "DragMoveToFolderCaption": "Move to {0}",
+    "EditorToolbarOption_Draw": "Draw",
+    "EditorToolbarOption_Format": "Format",
+    "EditorToolbarOption_Insert": "Insert",
+    "EditorToolbarOption_None": "None",
+    "EditorToolbarOption_Options": "Options",
+    "EditorTooltip_WebViewEditor": "Use web view editor",
+    "ElementTheme_Dark": "Dark mode",
+    "ElementTheme_Default": "Use system setting",
+    "ElementTheme_Light": "Light mode",
     "Emoji": "Emoji",
-    "Error_FailedToSetupSystemFolders_Title": "Kunne ikke opsætte systemmapper",
-    "Exception_AuthenticationCanceled": "Godkendelsen blev annulleret",
-    "Exception_CustomThemeExists": "Temaet eksisterer allerede.",
-    "Exception_CustomThemeMissingName": "Du skal angive et navn.",
-    "Exception_CustomThemeMissingWallpaper": "Du skal angive et brugerdefineret baggrundsbillede.",
+    "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "Konto kræver opmærksomhed",
+    "Exception_AccountNeedsAttention_Message": "'{0}' kræver din opmærksomhed for at fortsætte med at arbejde.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail kunne ikke finde Microsoft Edge WebView2 Runtime. Installer eller reparer runtime'en for at gengive beskedindholdet korrekt.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2-runtime kræves",
+    "Exception_AuthenticationCanceled": "Authentication canceled",
+    "Exception_CustomThemeExists": "This theme already exists.",
+    "Exception_CustomThemeMissingName": "You must provide a name.",
+    "Exception_CustomThemeMissingWallpaper": "You must provide a custom background image.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Kunne ikke synkronisere kalenderdata",
+    "Exception_FailedToSynchronizeCalendarEvents": "Kunne ikke synkronisere kalenderbegivenheder",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Kunne ikke synkronisere kalenderdetaljer",
     "Exception_FailedToSynchronizeFolders": "Failed to synchronize folders",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -186,11 +328,11 @@
     "Exception_GoogleAuthorizationCodeExchangeFailed": "Authorization code exchange failed.",
     "Exception_ImapAutoDiscoveryFailed": "Couldn't find mailbox settings.",
     "Exception_ImapClientPoolFailed": "IMAP Client Pool failed.",
-    "Exception_InboxNotAvailable": "Kunne ikke konfigurere kontomapper.",
-    "Exception_InvalidSystemFolderConfiguration": "Systemmappekonfiguration er ikke gyldig. Tjek konfigurationen og prøv igen.",
-    "Exception_InvalidMultiAccountMoveTarget": "Du kan ikke flytte flere elementer, der tilhører forskellige konti i en tilknyttet konto.",
-    "Exception_MailProcessing": "Denne mail bliver stadig behandlet. Prøv igen om lidt.",
-    "Exception_MissingAlias": "Primært alias findes ikke for denne konto. Oprettelse af udkast mislykkedes.",
+    "Exception_InboxNotAvailable": "Couldn't setup account folders.",
+    "Exception_InvalidSystemFolderConfiguration": "System folder configuration is not valid. Check configuration and try again.",
+    "Exception_InvalidMultiAccountMoveTarget": "You can't move multiple items that belong to different accounts in linked account.",
+    "Exception_MailProcessing": "This mail is still being processed. Please try again after few seconds.",
+    "Exception_MissingAlias": "Primary alias does not exist for this account. Creating draft failed.",
     "Exception_NullAssignedAccount": "Assigned account is null",
     "Exception_NullAssignedFolder": "Assigned folder is null",
     "Exception_SynchronizerFailureHTTP": "Response handling failed with error HTTP code {0}",
@@ -198,509 +340,1109 @@
     "Exception_TokenInfoRetrivalFailed": "Failed to get token information.",
     "Exception_UnknowErrorDuringAuthentication": "Unknown error occurred during authentication",
     "Exception_UnsupportedAction": "Action {0} is not implemented in request processor",
-    "Exception_UnsupportedProvider": "Denne udbyder er ikke understøttet.",
+    "Exception_UnsupportedProvider": "This provider is not supported.",
     "Exception_UnsupportedSynchronizerOperation": "This operation is not supported for {0}",
     "Exception_UserCancelSystemFolderSetupDialog": "User canceled system folder config dialog.",
-    "Exception_WinoServerException": "Wino server fejlede.",
-    "Files": "Filer",
-    "FilteringOption_All": "Alle",
-    "FilteringOption_Files": "Har filer",
-    "FilteringOption_Flagged": "Markerede",
-    "FilteringOption_Unread": "Ulæste",
-    "Focused": "Fokuserede",
-    "FolderOperation_CreateSubFolder": "Opret undermappe",
-    "FolderOperation_Delete": "Slet",
-    "FolderOperation_DontSync": "Synkroniser ikke denne mappe",
-    "FolderOperation_Empty": "Tøm denne mappe",
-    "FolderOperation_MarkAllAsRead": "Markér alle som læst",
-    "FolderOperation_Move": "Flyt",
-    "FolderOperation_None": "Ingen",
-    "FolderOperation_Pin": "Fastgør",
-    "FolderOperation_Rename": "Omdøb",
-    "FolderOperation_Unpin": "Frigør",
-    "GeneralTitle_Error": "Fejl",
+    "Exception_WinoServerException": "Wino server failed.",
+    "Files": "Files",
+    "FilteringOption_All": "All",
+    "FilteringOption_Files": "Has files",
+    "FilteringOption_Flagged": "Flagged",
+    "FilteringOption_Unread": "Unread",
+    "Focused": "Focused",
+    "FolderOperation_CreateSubFolder": "Create sub folder",
+    "FolderOperation_Delete": "Delete",
+    "FolderOperation_DontSync": "Don't sync this folder",
+    "FolderOperation_Empty": "Empty this folder",
+    "FolderOperation_MarkAllAsRead": "Mark all as read",
+    "FolderOperation_Move": "Move",
+    "FolderOperation_None": "None",
+    "FolderOperation_Pin": "Pin",
+    "FolderOperation_Rename": "Rename",
+    "FolderOperation_Unpin": "Unpin",
+    "GeneralTitle_Error": "Error",
     "GeneralTitle_Info": "Information",
-    "GeneralTitle_Warning": "Advarsel",
-    "GmailServiceDisabled_Title": "Gmail Fejl",
-    "GmailServiceDisabled_Message": "Din Google Workspace konto ser ud til at være deaktiveret for Gmail service. Kontakt venligst din administrator for at aktivere Gmail service for din konto.",
-    "GmailArchiveFolderNameOverride": "Arkiv",
-    "HoverActionOption_Archive": "Arkivér",
-    "HoverActionOption_Delete": "Slet",
-    "HoverActionOption_MoveJunk": "Flyt til Spam",
-    "HoverActionOption_ToggleFlag": "Marker/Fjern markering",
-    "HoverActionOption_ToggleRead": "Læs/Ulæs",
-    "ImageRenderingDisabled": "Billedindlæsning er deaktiveret for denne besked.",
-    "ImapAdvancedSetupDialog_AuthenticationMethod": "Godkendelsesmetode",
-    "ImapAdvancedSetupDialog_ConnectionSecurity": "Forbindelsessikkerhed",
-    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "Godkendelsesmetode er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationConnectionSecurityRequired": "Sikkerhedstype for forbindelse er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationDisplayNameRequired": "Visningsnavn er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationEmailInvalid": "Angiv venligst en gyldig e-mailadresse",
-    "IMAPAdvancedSetupDialog_ValidationEmailRequired": "E-mailadresse er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationErrorTitle": "Tjek venligst følgende:",
-    "IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid": "Indgående port skal være mellem 1-65535",
-    "IMAPAdvancedSetupDialog_ValidationIncomingPortRequired": "Indgående serverport er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationIncomingServerRequired": "Indgående serveradresse er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired": "Udgående serveradgangskode er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid": "Udgående port skal være mellem 1-65535",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired": "Udgående serverport er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired": "Udgående serveradresse er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired": "Udgående serverbrugernavn er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationPasswordRequired": "Adgangskode er påkrævet",
-    "IMAPAdvancedSetupDialog_ValidationUsernameRequired": "Brugernavn er påkrævet",
-    "ImapAuthenticationMethod_Auto": "Automatisk",
+    "GeneralTitle_Warning": "Warning",
+    "GmailServiceDisabled_Title": "Gmail Error",
+    "GmailServiceDisabled_Message": "Your Google Workspace account seems to be disabled for Gmail service. Please contact your administrator to enable Gmail service for your account.",
+    "GmailArchiveFolderNameOverride": "Archive",
+    "HoverActionOption_Archive": "Archive",
+    "HoverActionOption_Delete": "Delete",
+    "HoverActionOption_MoveJunk": "Move to Junk",
+    "HoverActionOption_ToggleFlag": "Flag / Unflag",
+    "HoverActionOption_ToggleRead": "Read / Unread",
+    "KeyboardShortcuts_FailedToReset": "Nulstilling af tastaturgenveje mislykkedes.",
+    "KeyboardShortcuts_FailedToUpdate": "Kunne ikke opdatere tastaturgenveje.",
+    "KeyboardShortcuts_MailoperationAction": "Handling",
+    "KeyboardShortcuts_Action": "Handling",
+    "KeyboardShortcuts_FailedToLoad": "Kunne ikke indlæse tastaturgenveje.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Indtast venligst en tast til genvejen.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Vælg en handling at udføre for genvejen.",
+    "KeyboardShortcuts_EnterKey": "Indtast venligst en tast til genvejen.",
+    "KeyboardShortcuts_SelectOperation": "Vælg en handling til genvejen.",
+    "KeyboardShortcuts_ShortcutInUse": "Denne genvej er allerede i brug af en anden genvej.",
+    "KeyboardShortcuts_FailedToSave": "Kunne ikke gemme genvejen.",
+    "KeyboardShortcuts_FailedToDelete": "Kunne ikke slette genvejen.",
+    "KeyboardShortcuts_PageDescription": "Opret tastaturgenveje til hurtige mail-operationer. Tryk på tasterne, mens fokus er i tastinputfeltet for at fange genvejene.",
+    "KeyboardShortcuts_Add": "Tilføj genvej",
+    "KeyboardShortcuts_EditTitle": "Rediger tastaturgenvej",
+    "KeyboardShortcuts_ResetToDefaults": "Nulstil til standardindstillinger",
+    "KeyboardShortcuts_PressKeysHere": "Tryk på taster her...",
+    "KeyboardShortcuts_KeyCombination": "Tastkombination",
+    "KeyboardShortcuts_FocusArea": "Fokuser feltet ovenfor og tryk på den ønskede tastkombination.",
+    "KeyboardShortcuts_Modifiers": "Modifikator-taster",
+    "KeyboardShortcuts_Mode": "App-tilstand",
+    "KeyboardShortcuts_ModeMail": "Mail",
+    "KeyboardShortcuts_ModeCalendar": "Kalender",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Skift læst/ulæst",
+    "KeyboardShortcuts_ActionToggleFlag": "Skift flag",
+    "KeyboardShortcuts_ActionToggleArchive": "Arkivér/afarkiver",
+    "ImageRenderingDisabled": "Image rendering is disabled for this message.",
+    "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
+    "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
+    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "Authentication method is required",
+    "IMAPAdvancedSetupDialog_ValidationConnectionSecurityRequired": "Connection security type is required",
+    "IMAPAdvancedSetupDialog_ValidationDisplayNameRequired": "Display name is required",
+    "IMAPAdvancedSetupDialog_ValidationEmailInvalid": "Please enter a valid email address",
+    "IMAPAdvancedSetupDialog_ValidationEmailRequired": "Email address is required",
+    "IMAPAdvancedSetupDialog_ValidationErrorTitle": "Please check the following:",
+    "IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid": "Incoming port must be between 1-65535",
+    "IMAPAdvancedSetupDialog_ValidationIncomingPortRequired": "Incoming server port is required",
+    "IMAPAdvancedSetupDialog_ValidationIncomingServerRequired": "Incoming server address is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired": "Outgoing server password is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid": "Outgoing port must be between 1-65535",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired": "Outgoing server port is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired": "Outgoing server address is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired": "Outgoing server username is required",
+    "IMAPAdvancedSetupDialog_ValidationPasswordRequired": "Password is required",
+    "IMAPAdvancedSetupDialog_ValidationUsernameRequired": "Username is required",
+    "ImapAuthenticationMethod_Auto": "Auto",
     "ImapAuthenticationMethod_CramMD5": "CRAM-MD5",
-    "ImapAuthenticationMethod_DigestMD5": "DIGEST- MD5",
-    "ImapAuthenticationMethod_EncryptedPassword": "Krypteret adgangskode",
-    "ImapAuthenticationMethod_None": "Ingen godkendelse",
+    "ImapAuthenticationMethod_DigestMD5": "DIGEST-MD5",
+    "ImapAuthenticationMethod_EncryptedPassword": "Encrypted password",
+    "ImapAuthenticationMethod_None": "No authentication",
     "ImapAuthenticationMethod_Ntlm": "NTLM",
-    "ImapAuthenticationMethod_Plain": "Normal adgangskode",
-    "ImapConnectionSecurity_Auto": "Automatisk",
-    "ImapConnectionSecurity_None": "Ingen",
+    "ImapAuthenticationMethod_Plain": "Normal password",
+    "ImapConnectionSecurity_Auto": "Auto",
+    "ImapConnectionSecurity_None": "None",
     "ImapConnectionSecurity_SslTls": "SSL/TLS",
     "ImapConnectionSecurity_StartTls": "STARTTLS",
-    "IMAPSetupDialog_AccountType": "Kontotype",
-    "IMAPSetupDialog_ValidationSuccess_Title": "Succes",
-    "IMAPSetupDialog_ValidationSuccess_Message": "Validering succesfuld",
-    "IMAPSetupDialog_SaveImapSuccess_Title": "Succes",
-    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP-indstillinger blev gemt.",
-    "IMAPSetupDialog_ValidationFailed_Title": "Validering af IMAP-server mislykkedes.",
-    "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "Denne server anmoder om et SSL-håndtryk for at fortsætte. Bekræft venligst certifikatdetaljerne nedenfor.",
-    "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "Tillad håndtrykket at fortsætte opsætningen af din konto.",
-    "IMAPSetupDialog_CertificateDenied": "Brugeren godkendte ikke håndtrykket med certifikatet.",
-    "IMAPSetupDialog_CertificateIssuer": "Udsteder",
-    "IMAPSetupDialog_CertificateSubject": "Emne",
-    "IMAPSetupDialog_CertificateValidFrom": "Gyldig fra",
-    "IMAPSetupDialog_CertificateValidTo": "Gyldig til",
-    "IMAPSetupDialog_CertificateView": "Vis certifikat",
-    "IMAPSetupDialog_ConnectionFailedMessage": "IMAP-forbindelse mislykkedes.",
-    "IMAPSetupDialog_ConnectionFailedTitle": "Forbindelsen mislykkedes",
-    "IMAPSetupDialog_DisplayName": "Visningsnavn",
-    "IMAPSetupDialog_DisplayNamePlaceholder": "f.eks. Jens Jensen",
-    "IMAPSetupDialog_IncomingMailServer": "Indgående mail-server",
+    "IMAPSetupDialog_AccountType": "Account type",
+    "IMAPSetupDialog_ValidationSuccess_Title": "Success",
+    "IMAPSetupDialog_ValidationSuccess_Message": "Validation successful",
+    "IMAPSetupDialog_SaveImapSuccess_Title": "Success",
+    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP settings saved successfuly.",
+    "IMAPSetupDialog_ValidationFailed_Title": "IMAP Server validation failed.",
+    "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "This server is requesting a SSL handshake to continue. Please confirm the certificate details below.",
+    "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "Allow the handshake to continue setting up your account.",
+    "IMAPSetupDialog_CertificateDenied": "User didn't authorize the handshake with the certificate.",
+    "IMAPSetupDialog_CertificateIssuer": "Issuer",
+    "IMAPSetupDialog_CertificateSubject": "Subject",
+    "IMAPSetupDialog_CertificateValidFrom": "Valid from",
+    "IMAPSetupDialog_CertificateValidTo": "Valid to",
+    "IMAPSetupDialog_CertificateView": "View Certificate",
+    "IMAPSetupDialog_ConnectionFailedMessage": "IMAP connection failed.",
+    "IMAPSetupDialog_ConnectionFailedTitle": "Connection Failed",
+    "IMAPSetupDialog_DisplayName": "Display Name",
+    "IMAPSetupDialog_DisplayNamePlaceholder": "eg. John Doe",
+    "IMAPSetupDialog_IncomingMailServer": "Incoming mail server",
     "IMAPSetupDialog_IncomingMailServerPort": "Port",
-    "IMAPSetupDialog_IMAPSettings": "IMAP Serverindstillinger",
-    "IMAPSetupDialog_SMTPSettings": "SMTP Serverindstillinger",
-    "IMAPSetupDialog_MailAddress": "E-mailadresse",
-    "IMAPSetupDialog_MailAddressPlaceholder": "bruger@eksempel.dk",
-    "IMAPSetupDialog_OutgoingMailServer": "Udgående (SMTP) mailserver",
-    "IMAPSetupDialog_OutgoingMailServerPassword": "Udgående serveradgangskode",
+    "IMAPSetupDialog_IMAPSettings": "IMAP Server Settings",
+    "IMAPSetupDialog_SMTPSettings": "SMTP Server Settings",
+    "IMAPSetupDialog_MailAddress": "Email address",
+    "IMAPSetupDialog_MailAddressPlaceholder": "someone@example.com",
+    "IMAPSetupDialog_OutgoingMailServer": "Outgoing (SMTP) mail server",
+    "IMAPSetupDialog_OutgoingMailServerPassword": "Outgoing server password",
     "IMAPSetupDialog_OutgoingMailServerPort": "Port",
-    "IMAPSetupDialog_OutgoingMailServerRequireAuthentication": "Udgående server kræver godkendelse",
-    "IMAPSetupDialog_OutgoingMailServerUsername": "Udgående serverbrugernavn",
-    "IMAPSetupDialog_Password": "Adgangskode",
-    "IMAPSetupDialog_RequireSSLForIncomingMail": "Kræv SSL for indgående e-mail",
-    "IMAPSetupDialog_RequireSSLForOutgoingMail": "Kræv SSL for udgående e-mail",
-    "IMAPSetupDialog_Title": "Avanceret IMAP-konfiguration",
-    "IMAPSetupDialog_Username": "Brugernavn",
-    "IMAPSetupDialog_UsernamePlaceholder": "jensjensen, jensjensen@email.dk, domæne/jensjensen",
-    "IMAPSetupDialog_UseSameConfig": "Brug det samme brugernavn og adgangskode til at sende e-mail",
-    "Info_AccountCreatedMessage": "{0} er oprettet",
-    "Info_AccountCreatedTitle": "Kontooprettelse",
-    "Info_AccountCreationFailedTitle": "Oprettelse af konto mislykkedes",
-    "Info_AccountDeletedMessage": "{0} blev slettet.",
-    "Info_AccountDeletedTitle": "Konto slettet",
-    "Info_AccountIssueFixFailedTitle": "Mislykkedes",
-    "Info_AccountIssueFixSuccessMessage": "Løste alle kontoproblemer.",
-    "Info_AccountIssueFixSuccessTitle": "Succes",
-    "Info_AttachmentOpenFailedMessage": "Kan ikke åbne denne vedhæftede fil.",
-    "Info_AttachmentOpenFailedTitle": "Mislykkedes",
-    "Info_AttachmentSaveFailedMessage": "Kan ikke gemme denne vedhæftede fil.",
-    "Info_AttachmentSaveFailedTitle": "Mislykkedes",
-    "Info_AttachmentSaveSuccessMessage": "Vedhæftning er gemt.",
-    "Info_AttachmentSaveSuccessTitle": "Vedhæftning gemt",
-    "Info_BackgroundExecutionDeniedMessage": "Baggrundskørsel for appen er afvist. Dette kan påvirke baggrundssynkronisering og live-notifikationer.",
-    "Info_BackgroundExecutionDeniedTitle": "Afviste Baggrundskørsel",
-    "Info_BackgroundExecutionUnknownErrorMessage": "Ukendt undtagelse opstod ved registrering af baggrundssynkronisering.",
-    "Info_BackgroundExecutionUnknownErrorTitle": "Baggrunds kørselsfejl",
-    "Info_CantDeletePrimaryAliasMessage": "Primært alias kan ikke slettes. Skift venligst dit alias, før du sletter dette.",
-    "Info_ComposerMissingMIMEMessage": "Kunne ikke finde MIME-filen. Synkronisering kan muligvis hjælpe.",
-    "Info_ComposerMissingMIMETitle": "Mislykkedes",
-    "Info_ContactExistsMessage": "Denne kontakt er allerede på modtagerlisten.",
-    "Info_ContactExistsTitle": "Kontakt Eksisterer",
-    "Info_DraftFolderMissingMessage": "Udkastmappe mangler for denne konto. Tjek dine kontoindstillinger.",
-    "Info_DraftFolderMissingTitle": "Mangler Udkastmappe",
-    "Info_FailedToOpenFileMessage": "Filen kunne være fjernet fra disken.",
-    "Info_FailedToOpenFileTitle": "Kunne ikke åbne fil.",
-    "Info_FileLaunchFailedTitle": "Kunne ikke starte fil.",
-    "Info_InvalidAddressMessage": "'{0}' er ikke en gyldig e-mailadresse.",
-    "Info_InvalidAddressTitle": "Ugyldig adresse",
-    "Info_InvalidMoveTargetMessage": "Du kan ikke flytte valgte mails til denne mappe.",
-    "Info_InvalidMoveTargetTitle": "Ugyldigt flyttemål",
-    "Info_LogsNotFoundMessage": "Der er ingen logs at dele.",
-    "Info_LogsNotFoundTitle": "Logs Ikke Fundet",
-    "Info_LogsSavedMessage": "{0} er gemt i den valgte mappe.",
-    "Info_LogsSavedTitle": "Gemt",
-    "Info_MailListSizeResetSuccessMessage": "Mail Listestørrelsen er blevet nulstillet.",
-    "Info_MailRenderingFailedMessage": "Denne mail er beskadiget eller kan ikke åbnes.\n{0}",
-    "Info_MailRenderingFailedTitle": "Indlæsning Mislykkedes",
-    "Info_MessageCorruptedMessage": "Denne besked er beskadiget.",
-    "Info_MessageCorruptedTitle": "Fejl",
-    "Info_MissingFolderMessage": "{0} eksisterer ikke for denne konto.",
-    "Info_MissingFolderTitle": "Manglende Mappe",
-    "Info_PDFSaveFailedTitle": "Kunne ikke gemme PDF-fil",
-    "Info_PDFSaveSuccessMessage": "PDF-filen er gemt i {0}",
-    "Info_PDFSaveSuccessTitle": "Succes",
-    "Info_PurchaseExistsMessage": "Ser ud til, at dette produkt allerede er købt før.",
-    "Info_PurchaseExistsTitle": "Eksisterende Produkt",
-    "Info_PurchaseThankYouMessage": "Mange tak!",
-    "Info_PurchaseThankYouTitle": "Købet er gennemført",
-    "Info_RequestCreationFailedTitle": "Kunne ikke oprette anmodninger",
-    "Info_ReviewNetworkErrorMessage": "Der opstod et netværksproblem med din anmeldelse.",
-    "Info_ReviewNetworkErrorTitle": "Netværksproblem",
-    "Info_ReviewNewMessage": "Alt feedback er værdsat. Tak for anmeldelsen!",
-    "Info_ReviewSuccessTitle": "Mange tak!",
-    "Info_ReviewUnknownErrorMessage": "Der opstod en ukendt fejl med din anmeldelse. ({0})",
-    "Info_ReviewUnknownErrorTitle": "Ukendt fejl",
-    "Info_ReviewUpdatedMessage": "Tak for den opdaterede anmeldelse.",
-    "Info_SignatureDisabledMessage": "Deaktiverede signatur for denne konto",
-    "Info_SignatureDisabledTitle": "Succes",
-    "Info_SignatureSavedMessage": "Ny signatur er gemt",
-    "Info_SignatureSavedTitle": "Succes",
-    "Info_SyncCanceledMessage": "Annulleret",
-    "Info_SyncCanceledTitle": "Synkronisering",
-    "Info_SyncFailedTitle": "Synkronisering mislykkedes",
-    "Info_UnsubscribeErrorMessage": "Afmelding mislykkedes",
-    "Info_UnsubscribeLinkInvalidMessage": "Dette afmeldingslink er ugyldigt. Kunne ikke afmelde fra listen.",
-    "Info_UnsubscribeLinkInvalidTitle": "Ugyldigt Afmeldings-URI",
-    "Info_UnsubscribeSuccessMessage": "Abonnement afmeldt fra {0}.",
-    "Info_UnsupportedFunctionalityDescription": "Denne funktion er ikke implementeret endnu.",
-    "Info_UnsupportedFunctionalityTitle": "Ikke understøttet",
-    "InfoBarAction_Enable": "Aktiver",
-    "InfoBarMessage_SynchronizationDisabledFolder": "Denne mappe er deaktiveret for synkronisering.",
-    "InfoBarTitle_SynchronizationDisabledFolder": "Deaktiveret Mappe",
-    "Justify": "Udfyld",
-    "Left": "Venstre",
+    "IMAPSetupDialog_OutgoingMailServerRequireAuthentication": "Outgoing server requires authentication",
+    "IMAPSetupDialog_OutgoingMailServerUsername": "Outgoing server user name",
+    "IMAPSetupDialog_Password": "Password",
+    "IMAPSetupDialog_RequireSSLForIncomingMail": "Require SSL for incoming email",
+    "IMAPSetupDialog_RequireSSLForOutgoingMail": "Require SSL for outgoing email",
+    "IMAPSetupDialog_Title": "Advanced IMAP Configuration",
+    "IMAPSetupDialog_Username": "Username",
+    "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
+    "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP og kalenderopsætning",
+    "ImapCalDavSettingsPage_TitleEdit": "Rediger IMAP- og kalenderindstillinger",
+    "ImapCalDavSettingsPage_Subtitle": "Konfigurer IMAP/SMTP og valgfri kalendersynkronisering for denne konto.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Grundlæggende opsætning",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Indtast din identitet og legitimationsoplysninger. Wino kan forsøge at registrere serverindstillingerne automatisk.",
+    "ImapCalDavSettingsPage_BasicTab": "Grundlæggende",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Aktivér kalenderunderstøttelse",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Automatisk opdagelse af mailindstillinger",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Mailindstillinger fundet og anvendt.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Avanceret konfiguration",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Indtast serverindstillinger manuelt, hvis automatisk opdagelse ikke er tilgængelig eller er ukorrekt.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avanceret",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Kalenderopsætning",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Vælg hvordan kalenderdata skal fungere for denne IMAP-konto.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalendertilstand",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Forbindelsessikkerhed",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Autentificeringsmetode",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Deaktiveret",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV-synkronisering",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Kun lokal kalender",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalenderen er deaktiveret for denne konto.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Kalenderposter synkroniseres med din CalDAV-server.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Kalenderposter gemmes kun på denne computer og synkroniseres ikke til netværket.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Sådan fungerer lokal kalender",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Kun lokal kalender",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Lokal kalender gemmer alle begivenheder kun på din computer. Intet synkroniseres til iCloud, Yahoo eller nogen anden udbyder.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV-tjeneste-URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV-brugernavn",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV-adgangskode",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV-test er kun påkrævet, når kalendertilstand er indstillet til CalDAV-synkronisering.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV-tjeneste-URL er påkrævet.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV-tjeneste-URL skal være en absolut URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV-brugernavn er påkrævet.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV-adgangskode er påkrævet.",
+    "ImapCalDavSettingsPage_TestImapButton": "Test IMAP-forbindelse",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Test CalDAV-forbindelse",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP-forbindelsestest lykkedes.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV-forbindelsestest lykkedes.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Kontoindstillinger valideret og gemt.",
+    "ImapCalDavSettingsPage_ICloudHint": "Brug en app-specifik adgangskode, der er genereret ud fra dine Apple-kontoindstillinger.",
+    "ImapCalDavSettingsPage_YahooHint": "Brug en app-adgangskode fra Yahoo-kontoens sikkerhedsindstillinger.",
+    "Info_AccountCreatedMessage": "{0} is created",
+    "Info_AccountCreatedTitle": "Account Creation",
+    "Info_AccountCreationFailedTitle": "Account Creation Failed",
+    "Info_AccountDeletedMessage": "{0} is successfuly deleted.",
+    "Info_AccountDeletedTitle": "Account Deleted",
+    "Info_AccountIssueFixFailedTitle": "Failed",
+    "Info_AccountIssueFixImapMessage": "Åbn IMAP- og kalenderindstillingssiden for at indtaste dine serveroplysninger igen.",
+    "Info_AccountAttentionRequiredMessage": "Denne konto kræver din opmærksomhed.",
+    "Info_AccountAttentionRequiredClickableMessage": "Klik for at rette denne konto og synkronisere den igen.",
+    "Info_AccountAttentionRequiredAction": "Fiks",
+    "Info_AccountAttentionRequiredActionHint": "Klik på Fiks for at løse dette kontoproblem.",
+    "Info_AccountIssueFixSuccessMessage": "Fixed all account issues.",
+    "Info_AccountIssueFixSuccessTitle": "Success",
+    "Info_AttachmentOpenFailedMessage": "Can't open this attachment.",
+    "Info_AttachmentOpenFailedTitle": "Failed",
+    "Info_AttachmentSaveFailedMessage": "Can't save this attachment.",
+    "Info_AttachmentSaveFailedTitle": "Failed",
+    "Info_AttachmentSaveSuccessMessage": "Attachment is saved.",
+    "Info_AttachmentSaveSuccessTitle": "Attachment Saved",
+    "Info_BackgroundExecutionDeniedMessage": "Background execution for the app is denied. This may affect background synchronization and live notifications.",
+    "Info_BackgroundExecutionDeniedTitle": "Denied Background Execution",
+    "Info_BackgroundExecutionUnknownErrorMessage": "Unknown exception occurred when registering background synchronizer.",
+    "Info_BackgroundExecutionUnknownErrorTitle": "Background Execution Failure",
+    "Info_CantDeletePrimaryAliasMessage": "Primary alias can't be deleted. Please change your alias before deleting this one",
+    "Info_ComposerMissingMIMEMessage": "Couldn't locate the MIME file. Synchronizing may help.",
+    "Info_ComposerMissingMIMETitle": "Failed",
+    "Info_ContactExistsMessage": "This contact is already in the recipient list.",
+    "Info_ContactExistsTitle": "Contact Exists",
+    "Info_DraftFolderMissingMessage": "Draft folder is missing for this account. Please check your account settings.",
+    "Info_DraftFolderMissingTitle": "Missing Draft Folder",
+    "Info_FailedToOpenFileMessage": "File might be removed from the disk.",
+    "Info_FailedToOpenFileTitle": "Failed to launch file.",
+    "Info_FileLaunchFailedTitle": "Failed to launch file",
+    "Info_InvalidAddressMessage": "'{0}' is not a valid e-mail address.",
+    "Info_InvalidAddressTitle": "Invalid Address",
+    "Info_InvalidMoveTargetMessage": "You can't move selected mails to this folder.",
+    "Info_InvalidMoveTargetTitle": "Invalid Move Target",
+    "Info_LogsNotFoundMessage": "There are no logs to share.",
+    "Info_LogsNotFoundTitle": "Logs Not Found",
+    "Info_LogsSavedMessage": "{0} is saved to selected folder.",
+    "Info_LogsSavedTitle": "Saved",
+    "Info_MailListSizeResetSuccessMessage": "The Mail List size has been reset.",
+    "Info_MailRenderingFailedMessage": "This mail is corrupted or can't be opened.\n{0}",
+    "Info_MailRenderingFailedTitle": "Render Failed",
+    "Info_MessageCorruptedMessage": "This message is corrupted.",
+    "Info_MessageCorruptedTitle": "Error",
+    "Info_MissingFolderMessage": "{0} doesn't exist for this account.",
+    "Info_MissingFolderTitle": "Missing Folder",
+    "Info_PDFSaveFailedTitle": "Failed to save PDF file",
+    "Info_PDFSaveSuccessMessage": "PDF file is saved to {0}",
+    "Info_PDFSaveSuccessTitle": "Success",
+    "Info_PurchaseExistsMessage": "Looks like this product has already been purchased before.",
+    "Info_PurchaseExistsTitle": "Existing Product",
+    "Info_PurchaseThankYouMessage": "Thank You",
+    "Info_PurchaseThankYouTitle": "Purchase successful",
+    "Info_RequestCreationFailedTitle": "Failed to Create Requests",
+    "Info_ReviewNetworkErrorMessage": "There was a network issue with your review.",
+    "Info_ReviewNetworkErrorTitle": "Network Issue",
+    "Info_ReviewNewMessage": "All feedbacks are appreciated. Thank you for the review!",
+    "Info_ReviewSuccessTitle": "Thank you",
+    "Info_ReviewUnknownErrorMessage": "There was an unknown issue with your review. ({0})",
+    "Info_ReviewUnknownErrorTitle": "Unknown Error",
+    "Info_ReviewUpdatedMessage": "Thank you for the updated review.",
+    "Info_SignatureDisabledMessage": "Disabled signature for this account",
+    "Info_SignatureDisabledTitle": "Success",
+    "Info_SignatureSavedMessage": "New signature is saved",
+    "Info_SignatureSavedTitle": "Success",
+    "Info_SyncCanceledMessage": "Canceled",
+    "Info_SyncCanceledTitle": "Synchronization",
+    "Info_SyncFailedTitle": "Synchronization Failed",
+    "Info_UnsubscribeErrorMessage": "Failed to unsubscribe",
+    "Info_UnsubscribeLinkInvalidMessage": "This unsubscribe link is invalid. Failed to unsubscribe from the list.",
+    "Info_UnsubscribeLinkInvalidTitle": "Invalid Unsubscribe Uri",
+    "Info_UnsubscribeSuccessMessage": "Successfully unsubscribed from {0}.",
+    "Info_UnsupportedFunctionalityDescription": "This functionality is not implemented yet.",
+    "Info_UnsupportedFunctionalityTitle": "Unsupported",
+    "InfoBarAction_Enable": "Enable",
+    "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
+    "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
+    "Justify": "Justify",
+    "MenuUpdateAvailable": "Opdatering tilgængelig",
+    "Left": "Left",
     "Link": "Link",
-    "LinkedAccountsCreatePolicyMessage": "Du skal have mindst 2 konti for at oprette et link.\nLinket vil blive fjernet ved gem.",
-    "LinkedAccountsTitle": "Tilknyttede Konti",
-    "MailItemNoSubject": "Intet emne",
-    "MailOperation_AlwaysMoveFocused": "Flyt altid til fokuseret",
-    "MailOperation_AlwaysMoveOther": "Flyt altid til andet",
-    "MailOperation_Archive": "Arkiver",
-    "MailOperation_ClearFlag": "Fjern markering",
-    "MailOperation_DarkEditor": "Mørk",
-    "MailOperation_Delete": "Slet",
-    "MailOperation_ExportPDF": "Eksporter til PDF",
+    "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
+    "LinkedAccountsTitle": "Linked Accounts",
+    "MailItemNoSubject": "No subject",
+    "MailOperation_AlwaysMoveFocused": "Always Move to Focused",
+    "MailOperation_AlwaysMoveOther": "Always Move to Other",
+    "MailOperation_Archive": "Archive",
+    "MailOperation_ClearFlag": "Clear flag",
+    "MailOperation_DarkEditor": "Dark",
+    "MailOperation_Delete": "Delete",
+    "MailOperation_ExportPDF": "Export to PDF",
     "MailOperation_Find": "Find",
-    "MailOperation_Forward": "Videresend",
-    "MailOperation_Ignore": "Ignorer",
-    "MailOperation_LightEditor": "Lys",
-    "MailOperation_MarkAsJunk": "Marker som spam",
-    "MailOperation_MarkAsRead": "Marker som læst",
-    "MailOperation_MarkAsUnread": "Marker som ulæst",
-    "MailOperation_MarkNotJunk": "Marker som ikke spam",
-    "MailOperation_Move": "Flyt",
-    "MailOperation_MoveFocused": "Flyt til Fokuseret",
-    "MailOperation_MoveJunk": "Flyt til spam",
-    "MailOperation_MoveOther": "Flyt til andet",
-    "MailOperation_Navigate": "Naviger",
-    "MailOperation_Print": "Udskriv",
-    "MailOperation_Reply": "Svar",
-    "MailOperation_ReplyAll": "Svar alle",
-    "MailOperation_SaveAs": "Gem som",
-    "MailOperation_SetFlag": "Sæt markering",
-    "MailOperation_Unarchive": "Fjern fra arkiv",
-    "MailOperation_ViewMessageSource": "Vis meddelelseskilde",
-    "MailOperation_Zoom": "Forstør",
-    "MailsSelected": "{0} element(er) valgt",
-    "MarkFlagUnflag": "Marker / Fjern markering",
-    "MarkReadUnread": "Marker som læst/ulæst",
-    "MenuManageAccounts": "Administrer Konti",
-    "MenuMergedAccountItemAccountsSuffix": " konti",
-    "MenuNewMail": "Ny Mail",
-    "MenuRate": "Bedøm Wino",
-    "MenuSettings": "Indstillinger",
-    "MergedAccountCommonFolderArchive": "Arkiv",
-    "MergedAccountCommonFolderDraft": "Udkast",
-    "MergedAccountCommonFolderInbox": "Indbakke",
-    "MergedAccountCommonFolderJunk": "Spam",
-    "MergedAccountCommonFolderSent": "Sendt",
-    "MergedAccountCommonFolderTrash": "Slettet",
-    "MergedAccountsAvailableAccountsTitle": "Tilgængelige konti",
-    "MessageSourceDialog_Title": "Beskedkilde",
-    "More": "Flere",
-    "MoreFolderNameOverride": "Flere",
-    "MoveMailDialog_InvalidFolderMessage": "{0} er ikke en gyldig mappe til denne mail.",
-    "MoveMailDialog_Title": "Vælg en mappe",
-    "NewAccountDialog_AccountName": "Kontonavn",
-    "NewAccountDialog_AccountNameDefaultValue": "Personligt",
-    "NewAccountDialog_AccountNamePlaceholder": "f.eks. Personlig Mail",
-    "NewAccountDialog_Title": "Tilføj Ny Konto",
-    "NoMailSelected": "Ingen besked valgt",
-    "NoMessageCrieteria": "Ingen beskeder matcher dine søgekriterier",
-    "NoMessageEmptyFolder": "Denne mappe er tom",
-    "Notifications_MultipleNotificationsMessage": "Du har {0} nye beskeder.",
-    "Notifications_MultipleNotificationsTitle": "Ny e-mail",
-    "Notifications_WinoUpdatedMessage": "Tjek ny version {0} ud",
-    "Notifications_WinoUpdatedTitle": "Wino Mail er blevet opdateret.",
-    "OnlineSearchFailed_Message": "Søgning mislykkedes\n{0}\n\nViser offline-mails.",
-    "OnlineSearchTry_Line1": "Kan du ikke finde det, du leder efter?",
-    "OnlineSearchTry_Line2": "Prøv online søgning.",
-    "Other": "Andet",
-    "PaneLengthOption_Default": "Standard",
-    "PaneLengthOption_ExtraLarge": "Ekstra stor",
-    "PaneLengthOption_Large": "Stor",
+    "MailOperation_Forward": "Forward",
+    "MailOperation_Ignore": "Ignore",
+    "MailOperation_LightEditor": "Light",
+    "MailOperation_MarkAsJunk": "Mark as junk",
+    "MailOperation_MarkAsRead": "Mark as read",
+    "MailOperation_MarkAsUnread": "Mark as unread",
+    "MailOperation_MarkNotJunk": "Mark as Not Junk",
+    "MailOperation_Move": "Move",
+    "MailOperation_MoveFocused": "Move to Focused",
+    "MailOperation_MoveJunk": "Move to Junk",
+    "MailOperation_MoveOther": "Move to Other",
+    "MailOperation_Navigate": "Navigate",
+    "MailOperation_Print": "Print",
+    "MailOperation_Reply": "Reply",
+    "MailOperation_ReplyAll": "Reply all",
+    "MailOperation_SaveAs": "Save As",
+    "MailOperation_SetFlag": "Set flag",
+    "MailOperation_Unarchive": "Unarchive",
+    "MailOperation_ViewMessageSource": "View message source",
+    "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Trækker {0} element(er)",
+    "MailsSelected": "{0} item(s) selected",
+    "MarkFlagUnflag": "Mark as flagged/unflagged",
+    "MarkReadUnread": "Mark as read/unread",
+    "MenuManageAccounts": "Manage Accounts",
+    "MenuMergedAccountItemAccountsSuffix": " accounts",
+    "MenuNewMail": "New Mail",
+    "MenuRate": "Rate Wino",
+    "MenuSettings": "Settings",
+    "MergedAccountCommonFolderArchive": "Archive",
+    "MergedAccountCommonFolderDraft": "Draft",
+    "MergedAccountCommonFolderInbox": "Inbox",
+    "MergedAccountCommonFolderJunk": "Junk",
+    "MergedAccountCommonFolderSent": "Sent",
+    "MergedAccountCommonFolderTrash": "Deleted",
+    "MergedAccountsAvailableAccountsTitle": "Available Accounts",
+    "MessageSourceDialog_Title": "Message source",
+    "More": "More",
+    "MoreFolderNameOverride": "More",
+    "MoveMailDialog_InvalidFolderMessage": "{0} is not a valid folder for this mail.",
+    "MoveMailDialog_Title": "Pick a folder",
+    "NewAccountDialog_AccountName": "Account Name",
+    "NewAccountDialog_AccountNameDefaultValue": "Personal",
+    "NewAccountDialog_AccountNamePlaceholder": "eg. Personal Mail",
+    "NewAccountDialog_Title": "Add New Account",
+    "NoMailSelected": "No message selected",
+    "NoMessageCrieteria": "No messages match your search criteria",
+    "NoMessageEmptyFolder": "This folder is empty",
+    "Notifications_MultipleNotificationsMessage": "You have {0} new messages.",
+    "Notifications_MultipleNotificationsTitle": "New Mail",
+    "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
+    "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "Opdatering tilgængelig",
+    "Notifications_StoreUpdateAvailableMessage": "En nyere version af Wino Mail er klar til at blive installeret fra Microsoft Store.",
+    "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
+    "OnlineSearchTry_Line1": "Can't find what you are looking for?",
+    "OnlineSearchTry_Line2": "Try online search.",
+    "Other": "Other",
+    "PaneLengthOption_Default": "Default",
+    "PaneLengthOption_ExtraLarge": "Extra Large",
+    "PaneLengthOption_Large": "Large",
     "PaneLengthOption_Medium": "Medium",
-    "PaneLengthOption_Micro": "Ekstra Lille",
-    "PaneLengthOption_Small": "Lille",
-    "Photos": "Billeder",
-    "PreparingFoldersMessage": "Forbereder mapper",
-    "ProtocolLogAvailable_Message": "Protokollogs er tilgængelige til diagnosticering.",
-    "ProviderDetail_Gmail_Description": "Google-konto",
-    "ProviderDetail_iCloud_Description": "Apple iCloud-konto",
+    "PaneLengthOption_Micro": "Micro",
+    "PaneLengthOption_Small": "Small",
+    "Photos": "Photos",
+    "PreparingFoldersMessage": "Preparing folders",
+    "ProviderDetail_Gmail_Description": "Google Account",
+    "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
-    "ProviderDetail_IMAP_Description": "Brugerdefineret IMAP/SMTP server",
-    "ProviderDetail_IMAP_Title": "IMAP server",
-    "ProviderDetail_Yahoo_Description": "Yahoo-konto",
+    "ProviderDetail_IMAP_Description": "Custom IMAP/SMTP server",
+    "ProviderDetail_IMAP_Title": "IMAP Server",
+    "ProviderDetail_Yahoo_Description": "Yahoo Account",
     "ProviderDetail_Yahoo_Title": "Yahoo Mail",
-    "QuickEventDialog_EventName": "Begivenhedens navn",
-    "QuickEventDialog_IsAllDay": "Hele dagen",
-    "QuickEventDialog_Location": "Lokation",
-    "QuickEventDialog_RemindMe": "Påmind mig",
-    "QuickEventDialogMoreDetailsButtonText": "Flere detaljer",
-    "Reader_SaveAllAttachmentButtonText": "Gem alle vedhæftede filer",
-    "Results": "Resultater",
-    "Right": "Højre",
-    "SearchBarPlaceholder": "Søg",
-    "SearchingIn": "Søger i",
-    "SearchPivotName": "Resultater",
-    "SettingConfigureSpecialFolders_Button": "Konfigurer",
-    "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Konfiguration",
-    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Skift dine indstillinger for indgående og udgående servere.",
-    "SettingsAbout_Description": "Læs mere om Wino.",
-    "SettingsAbout_Title": "Om",
-    "SettingsAboutGithub_Description": "Gå til issue tracker GitHub repository.",
+    "QuickEventDialog_EventName": "Event name",
+    "QuickEventDialog_IsAllDay": "All day",
+    "QuickEventDialog_Location": "Location",
+    "QuickEventDialog_RemindMe": "Remind me",
+    "QuickEventDialogMoreDetailsButtonText": "More details",
+    "Reader_SaveAllAttachmentButtonText": "Save all attachments",
+    "Results": "Results",
+    "Right": "Right",
+    "SearchBarPlaceholder": "Search",
+    "SearchingIn": "Searching in",
+    "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Tastaturgenveje",
+    "Settings_KeyboardShortcuts_Description": "Administrer tastaturgenveje til hurtige handlinger på e-mails.",
+    "SettingConfigureSpecialFolders_Button": "Configure",
+    "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
+    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP- og kalenderindstillinger",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Åbn den dedikerede IMAP-, SMTP- og CalDAV-indstillingssiden for denne konto.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Åbn indstillinger",
+    "SettingsAbout_Description": "Learn more about Wino.",
+    "SettingsAbout_Title": "About",
+    "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
     "SettingsAboutGithub_Title": "GitHub",
     "SettingsAboutVersion": "Version ",
-    "SettingsAboutWinoDescription": "Letvægts mailklient til Windows-enheder.",
-    "SettingsAccentColor_Description": "Skift applikationens accentfarve",
-    "SettingsAccentColor_Title": "Accentfarve",
-    "SettingsAccentColor_UseWindowsAccentColor": "Brug min Windows accentfarve",
-    "SettingsAccountManagementAppendMessage_Description": "Opret en kopi af beskeden i mappen Sendt efter udkastet er sendt. Aktiver dette hvis du ikke ser dine mails efter du har sendt dem i Sendt mappe.",
-    "SettingsAccountManagementAppendMessage_Title": "Tilføj beskeder til mappen Sendt",
-    "SettingsAccountName_Description": "Ændr navnet på kontoen.",
-    "SettingsAccountName_Title": "Kontonavn",
-    "SettingsApplicationTheme_Description": "Tilpas Wino med forskellige brugerdefinerede applikationtemaer til dit behag.",
-    "SettingsApplicationTheme_Title": "Applikationstema",
-    "SettingsAppPreferences_CloseBehavior_Description": "Hvad skal der ske, når du lukker appen?",
-    "SettingsAppPreferences_CloseBehavior_Title": "Applikationens lukkeopførsel",
-    "SettingsAppPreferences_Description": "Generelle indstillinger for Wino Mail.",
-    "SettingsAppPreferences_SearchMode_Description": "Indstil, om Wino først skal tjekke hentede mails, når du søger, eller spørge din mailserver online. Lokal søgning er altid hurtigere, og du kan altid søge online, hvis din mail ikke findes i resultaterne.",
-    "SettingsAppPreferences_SearchMode_Local": "Lokalt",
+    "SettingsAboutWinoDescription": "Lightweight mail client for Windows device families.",
+    "SettingsAccentColor_Description": "Change application's accent color",
+    "SettingsAccentColor_Title": "Accent Color",
+    "SettingsAccentColor_UseWindowsAccentColor": "Use my Windows accent color",
+    "SettingsAccountManagementAppendMessage_Description": "Create a copy of the message in Sent folder after the draft is sent. Enable this if you don't see your mails after you sent them in Sent folder.",
+    "SettingsAccountManagementAppendMessage_Title": "Append messages to Sent folder",
+    "SettingsAccountName_Description": "Change the name of the account.",
+    "SettingsAccountName_Title": "Account Name",
+    "SettingsApplicationTheme_Description": "Personalize Wino with different custom application themes for your like.",
+    "SettingsApplicationTheme_Title": "Application Theme",
+    "SettingsAppPreferences_CloseBehavior_Description": "What should happen when you close the app?",
+    "SettingsAppPreferences_CloseBehavior_Title": "Application close behavior",
+    "SettingsAppPreferences_Description": "General settings / preferences for Wino Mail.",
+    "SettingsAppPreferences_SearchMode_Description": "Set whether Wino should check fetched mails first while doing a search or ask your mail server online. Local search is always faster and you can always do an online search if your mail is not in the results.",
+    "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
-    "SettingsAppPreferences_SearchMode_Title": "Standard søgetilstand",
-    "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail kører fortsat i baggrunden. Du får besked, når nye mails ankommer.",
-    "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Kør i baggrunden",
-    "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail vil blive ved med at køre på systembakken. Tilgængelig til start ved at klikke på et ikon. Du vil blive underrettet om nye mails ankommer.",
-    "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Title": "Minimer til systembakke",
-    "SettingsAppPreferences_ServerBackgroundingMode_Terminate_Description": "Wino Mail vil ikke fortsætte med at køre. Du vil ikke få besked, når nye mails ankommer. Start Wino Mail igen for at fortsætte mailsynkronisering.",
-    "SettingsAppPreferences_ServerBackgroundingMode_Terminate_Title": "Afslut",
-    "SettingsAppPreferences_StartupBehavior_Description": "Tillad Wino Mail at starte minimeret, når Windows starter. Tillad altid at modtage notifikationer.",
-    "SettingsAppPreferences_StartupBehavior_Disable": "Deaktiver",
-    "SettingsAppPreferences_StartupBehavior_Disabled": "Wino Mail vil ikke blive startet automatisk ved Windows-opstart. Du vil derfor gå glip af notifikationer, når du genstarter computeren.",
-    "SettingsAppPreferences_StartupBehavior_DisabledByPolicy": "Din administrator eller gruppepolitikker har deaktiveret, at programmer kan starte automatisk. Derfor kan Wino Mail ikke sættes til automatisk opstart.",
-    "SettingsAppPreferences_StartupBehavior_DisabledByUser": "Gå til Jobliste -> fanen Opstart for at tillade, at Wino Mail starter ved Windows-opstart.",
-    "SettingsAppPreferences_StartupBehavior_Enable": "Aktiver",
-    "SettingsAppPreferences_StartupBehavior_Enabled": "Wino Mail blev indstillet til at starte i baggrunden ved opstart af Windows.",
-    "SettingsAppPreferences_StartupBehavior_FatalError": "Kritisk fejl opstod under ændring af opstartstilstand for Wino Mail.",
-    "SettingsAppPreferences_StartupBehavior_Title": "Start minimeret ved opstart af Windows",
-    "SettingsAppPreferences_Title": "Indstillinger For Appen",
-    "SettingsAutoSelectNextItem_Description": "Vælg det næste element, når du sletter eller flytter en mail.",
-    "SettingsAutoSelectNextItem_Title": "Vælg automatisk næste element",
-    "SettingsAvailableThemes_Description": "Vælg et tema fra Wino egen samling til din smag eller anvende dine egne temaer.",
-    "SettingsAvailableThemes_Title": "Tilgængelige temaer",
-    "SettingsCalendarSettings_Description": "Ændr første dag i ugen, time celle højde og mere...",
-    "SettingsCalendarSettings_Title": "Kalenderindstillinger",
-    "SettingsComposer_Title": "Skriv mail",
-    "SettingsComposerFont_Title": "Standard skrifttype til beskededitor",
-    "SettingsComposerFontFamily_Description": "Skift standard skrifttype og skriftstørrelse for at skrive mails.",
-    "SettingsConfigureSpecialFolders_Description": "Indstil mapper med særlige funktioner. Mapper som Arkiv, Indbakke og Udkast er essentielle for, at Wino fungerer korrekt.",
-    "SettingsConfigureSpecialFolders_Title": "Konfigurer Systemmapper",
-    "SettingsCustomTheme_Description": "Opret dit eget brugerdefinerede tema med brugerdefineret baggrund og accent farve.",
-    "SettingsCustomTheme_Title": "Brugerdefineret tema",
-    "SettingsDeleteAccount_Description": "Slet alle e-mails og legitimationsoplysninger tilknyttet denne konto.",
-    "SettingsDeleteAccount_Title": "Slet denne konto",
-    "SettingsDeleteProtection_Description": "Skal Wino bede dig om bekræftelse, hver gang du forsøger at permanent slette en mail ved hjælp af Shift + Del-taster?",
-    "SettingsDeleteProtection_Title": "Permanent Slet Beskyttelse",
-    "SettingsDiagnostics_Description": "Til udviklere",
-    "SettingsDiagnostics_DiagnosticId_Description": "Del dette ID med udviklerne, når du bliver bedt om det, for at få hjælp til de problemer, du oplever i Wino Mail.",
-    "SettingsDiagnostics_DiagnosticId_Title": "Diagnostisk ID",
-    "SettingsDiagnostics_Title": "Diagnosticering",
-    "SettingsDiscord_Description": "Få regelmæssige udviklingsopdateringer, deltag i køreplansdiskussioner og giv feedback.",
-    "SettingsDiscord_Title": "Discord Kanal",
-    "SettingsEditLinkedInbox_Description": "Tilføj / fjern konti, omdøb eller bryd linket mellem konti.",
-    "SettingsEditLinkedInbox_Title": "Rediger Tilknyttede Indbakke",
-    "SettingsElementTheme_Description": "Vælg et Windows-tema til Wino",
-    "SettingsElementTheme_Title": "Elementtema",
-    "SettingsElementThemeSelectionDisabled": "Valg af elementtema er deaktiveret, når appens tema er sat til andet end Standard.",
-    "SettingsEnableHoverActions_Title": "Aktiver hover-handlinger",
-    "SettingsEnableIMAPLogs_Description": "Aktivér dette for at give detaljer om eventuelle problemer med IMAP-forbindelsen under opsætning af IMAP-serveren.",
-    "SettingsEnableIMAPLogs_Title": "Aktiver IMAP-protokollogger",
-    "SettingsEnableLogs_Description": "Jeg kan få brug for logfiler ved nedbrud for at diagnosticere problemer, du har åbnet på GitHub. Ingen af logfilerne vil afsløre dine legitimationsoplysninger eller sensitiv information for offentligheden.",
-    "SettingsEnableLogs_Title": "Aktiver logfiler",
-    "SettingsEnableSignature": "Aktiver signatur",
-    "SettingsExpandOnStartup_Description": "Indstil om Wino skal udvide kontoens mapper ved opstart.",
-    "SettingsExpandOnStartup_Title": "Udvid menu ved opstart",
-    "SettingsExternalContent_Description": "Administrer indstillinger for eksternt indhold ved gengivelse af mails.",
-    "SettingsExternalContent_Title": "Eksternt indhold",
-    "SettingsFocusedInbox_Description": "Angiv, om indbakken skal opdeles i to som Fokuseret - Andet.",
-    "SettingsFocusedInbox_Title": "Fokuseret Indbakke",
-    "SettingsFolderMenuStyle_Description": "Vælg om kontomapper skal være indlejret under et konto-menupunkt eller ej. Slå dette fra, hvis du foretrækker det gamle menusystem i Windows Mail.",
-    "SettingsFolderMenuStyle_Title": "Opret Indlejrede Mapper",
-    "SettingsFolderOptions_Description": "Skift indstillinger for enkelte mapper, f.eks. aktiver/deaktiver synkronisering eller vis/skjul ulæst-badge.",
-    "SettingsFolderOptions_Title": "Mappekonfiguration",
-    "SettingsFolderSync_Description": "Aktiver eller deaktiver specifikke mapper til synkronisering.",
-    "SettingsFolderSync_Title": "Mappe Synkronisering",
-    "SettingsFontFamily_Title": "Skrifttype Familie",
-    "SettingsFontPreview_Title": "Forhåndsvisning",
-    "SettingsFontSize_Title": "Skriftstørrelse",
-    "SettingsHoverActionCenter": "Centrer Handling",
-    "SettingsHoverActionLeft": "Venstre Handling",
-    "SettingsHoverActionRight": "Højre handling",
-    "SettingsHoverActions_Description": "Vælg 3 handlinger, der vises, når du holder musen over mails.",
-    "SettingsHoverActions_Title": "Hover-handlinger",
-    "SettingsLanguage_Description": "Skift visningssprog for Wino.",
-    "SettingsLanguage_Title": "Visningssprog",
-    "SettingsLanguageTime_Description": "Wino visningssprog, foretrukket tidsformat.",
-    "SettingsLanguageTime_Title": "Sprog & Tid",
-    "SettingsLinkAccounts_Description": "Flet flere konti til én. Se mails fra en indbakke sammen.",
-    "SettingsLinkAccounts_Title": "Opret Tilknyttede Konti",
-    "SettingsLinkedAccountsSave_Description": "Ændre det aktuelle link med de nye konti.",
-    "SettingsLinkedAccountsSave_Title": "Gem ændringer",
-    "SettingsLoadImages_Title": "Indlæs billeder automatisk",
-    "SettingsLoadPlaintextLinks_Title": "Konverter klartekst links til klikbare links",
-    "SettingsLoadStyles_Title": "Indlæs stilarter automatisk",
-    "SettingsMailListActionBar_Description": "Skjul/vis handlingsbjælke øverst i meddelelseslisten.",
-    "SettingsMailListActionBar_Title": "Vis mailliste handlinger",
-    "SettingsMailSpacing_Description": "Juster afstanden mellem mails i listen.",
-    "SettingsMailSpacing_Title": "Mail Mellemrum",
-    "SettingsManageAccountSettings_Description": "Notifikationer, signaturer, synkronisering og andre indstillinger pr. konto.",
-    "SettingsManageAccountSettings_Title": "Administrer Kontoindstillinger",
-    "SettingsManageAliases_Description": "Se e-mail-aliaser tildelt for denne konto, opdater eller slette dem.",
-    "SettingsManageAliases_Title": "Aliaser",
-    "SettingsEditAccountDetails_Title": "Rediger Kontooplysninger",
-    "SettingsEditAccountDetails_Description": "Skift kontonavn, afsendernavn og tildel en ny farve, hvis du vil.",
-    "SettingsManageLink_Description": "Flyt elementer for at tilføje et nyt link eller fjerne et eksisterende link.",
-    "SettingsManageLink_Title": "Administrer link",
-    "SettingsMarkAsRead_Description": "Ændre hvad der skal ske med det valgte element.",
-    "SettingsMarkAsRead_DontChange": "Marker ikke automatisk elementet som læst",
-    "SettingsMarkAsRead_SecondsToWait": "Sekunder at vente: ",
-    "SettingsMarkAsRead_Timer": "Når de vises i læserruden",
-    "SettingsMarkAsRead_Title": "Marker element som læst",
-    "SettingsMarkAsRead_WhenSelected": "Når valgt",
-    "SettingsMessageList_Description": "Ændr hvordan dine beskeder skal organiseres i e-mail-listen.",
-    "SettingsMessageList_Title": "Beskedliste",
-    "SettingsNoAccountSetupMessage": "Ingen konti er oprettet endnu.",
-    "SettingsNotifications_Description": "Slå notifikationer til eller fra for denne konto.",
-    "SettingsNotifications_Title": "Notifikationer",
-    "SettingsNotificationsAndTaskbar_Description": "Vælg, om notifikationer og proceslinjens badge skal vises for denne konto.",
-    "SettingsNotificationsAndTaskbar_Title": "Notifikationer & Proceslinje",
-    "SettingsOptions_Title": "Indstillinger",
-    "SettingsPaneLengthReset_Description": "Nulstil størrelsen af postlisten til original, hvis du har problemer med den.",
-    "SettingsPaneLengthReset_Title": "Nulstil størrelsen på maillisten",
-    "SettingsPaypal_Description": "Vis meget mere kærlighed ❤️ Alle donationer er værdsat.",
-    "SettingsPaypal_Title": "Doner via PayPal",
-    "SettingsPersonalization_Description": "Skift udseendet af Wino som du vil.",
-    "SettingsPersonalization_Title": "Tilpasning",
-    "SettingsPersonalizationMailDisplayCompactMode": "Kompakt Tilstand",
-    "SettingsPersonalizationMailDisplayMediumMode": "Mellem Tilstand",
-    "SettingsPersonalizationMailDisplaySpaciousMode": "Rummelig Tilstand",
-    "SettingsPrefer24HourClock_Description": "Mail modtagertider vil blive vist i 24 timers format i stedet for 12 (AM/PM)",
-    "SettingsPrefer24HourClock_Title": "Vis urformat i 24 timer",
-    "SettingsPrivacyPolicy_Description": "Gennemgå privatlivspolitik.",
-    "SettingsPrivacyPolicy_Title": "Privatlivspolitik",
-    "SettingsReadComposePane_Description": "Skrifttyper, eksternt indhold.",
-    "SettingsReadComposePane_Title": "Læser og beskededitor",
-    "SettingsReader_Title": "Læser",
-    "SettingsReaderFont_Title": "Standard skrifttype til læser",
-    "SettingsReaderFontFamily_Description": "Skift standard skrifttype familie og skrifttype størrelse for læsning af mails.",
-    "SettingsRenameMergeAccount_Description": "Ændr navnet på de linkede konti.",
-    "SettingsRenameMergeAccount_Title": "Omdøb",
-    "SettingsReorderAccounts_Description": "Ændr rækkefølgen af konti i kontolisten.",
-    "SettingsReorderAccounts_Title": "Omarranger Konti",
-    "SettingsSemanticZoom_Description": "Dette vil give dig mulighed for at klikke på overskrifterne i listen over beskeder og gå til en bestemt dato",
-    "SettingsSemanticZoom_Title": "Semantisk forstørrelse for datooverskrifter",
-    "SettingsShowPreviewText_Description": "Skjul/vis forhåndsvisningsteksten.",
-    "SettingsShowPreviewText_Title": "Vis Forhåndsvisningstekst",
-    "SettingsShowSenderPictures_Description": "Vis/skjul miniaturebilleder af afsender",
-    "SettingsShowSenderPictures_Title": "Vis Afsender-Avatarer",
+    "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Standard applikationstilstand",
+    "SettingsAppPreferences_ApplicationMode_Description": "Vælg hvilken tilstand Wino åbner i, når der ikke er angivet nogen aktiveringstype.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalender",
+    "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
+    "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
+    "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
+    "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Title": "Minimize to system tray",
+    "SettingsAppPreferences_ServerBackgroundingMode_Terminate_Description": "Wino Mail will not keep running anywhere. You will not be notified as new mails arrive. Launch Wino Mail again to continue mail synchronization.",
+    "SettingsAppPreferences_ServerBackgroundingMode_Terminate_Title": "Terminate",
+    "SettingsAppPreferences_StartupBehavior_Description": "Allow Wino Mail to launch minimized when Windows starts. Always allow it to receive notifications.",
+    "SettingsAppPreferences_StartupBehavior_Disable": "Disable",
+    "SettingsAppPreferences_StartupBehavior_Disabled": "Wino Mail will not be launched on Windows startup. This will cause you to miss notifications when you restart your computer.",
+    "SettingsAppPreferences_StartupBehavior_DisabledByPolicy": "Your administrator or group policies disabled running applications on startup. Thus, Wino Mail can't be set to launch on Windows startup.",
+    "SettingsAppPreferences_StartupBehavior_DisabledByUser": "Please go to Task Manager -> Startup tab to allow Wino Mail to launch on Windows startup.",
+    "SettingsAppPreferences_StartupBehavior_Enable": "Enable",
+    "SettingsAppPreferences_StartupBehavior_Enabled": "Wino Mail successfully set to be launched in the background on Windows startup.",
+    "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
+    "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
+    "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Skjul Wino-konto-knappen i titelbjælken",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Skjul profilknappen i titelbjælken, som åbner Wino-kontoens flyout.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Meddelelser om opdateringer i Microsoft Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Vis notifikationer og handlinger i bunden, når der er en opdatering i Microsoft Store tilgængelig.",
+    "SettingsAppPreferences_AiActions_Title": "AI-handlinger",
+    "SettingsAppPreferences_AiActions_Description": "Vælg standard AI-sprog og hvor resuméer skal gemmes.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Standard oversættelsessprog",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Vælg det standardmål, der bruges af AI-oversættelseshandlinger.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Opsummeringssprog",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Vælg det foretrukne opsummeringssprog til fremtidige AI-sammendrag.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Standard sti til opsummeringer",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Vælg den mappe, Wino som standard bør bruge, når AI-sammendrag gemmes.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Brug systemets standard gemmested.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Denne mappe findes ikke. Standard gemmested vil blive brugt til opsummeringer.",
+    "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
+    "SettingsAutoSelectNextItem_Title": "Auto select next item",
+    "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
+    "SettingsAvailableThemes_Title": "Available Themes",
+    "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
+    "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Standard udsættelsesvarighed",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Indstil en standard udsættelsesvarighed for kalenderpåmindelsesmeddelelser.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Dagsoverskriftsformat i tidsvisningen",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Vælg hvordan de øverste dagetiketter vises i dag-, uge- og arbejdsugevisninger. Brug datoformateringstokens som ddd, dd, MMM eller dddd.",
+    "SettingsComposer_Title": "Composer",
+    "SettingsComposerFont_Title": "Default Composer Font",
+    "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
+    "SettingsConfigureSpecialFolders_Description": "Set folders with special functions. Folders such as Archive, Inbox, and Drafts are essential for Wino to function properly.",
+    "SettingsConfigureSpecialFolders_Title": "Configure System Folders",
+    "SettingsCustomTheme_Description": "Create your own custom theme with custom wallpaper and accent color.",
+    "SettingsCustomTheme_Title": "Custom Theme",
+    "SettingsDeleteAccount_Description": "Delete all e-mails and credentials associated with this account.",
+    "SettingsDeleteAccount_Title": "Delete this account",
+    "SettingsDeleteProtection_Description": "Should Wino ask you for confirmation every time you try to permanently delete a mail using Shift + Del keys?",
+    "SettingsDeleteProtection_Title": "Permanent Delete Protection",
+    "SettingsDiagnostics_Description": "For developers",
+    "SettingsDiagnostics_DiagnosticId_Description": "Share this ID with the developers when asked to get help for the issues you experience in Wino Mail.",
+    "SettingsDiagnostics_DiagnosticId_Title": "Diagnostic ID",
+    "SettingsDiagnostics_Title": "Diagnostics",
+    "SettingsDiscord_Description": "Get regular development updates, join roadmap discussions and provide feedback.",
+    "SettingsDiscord_Title": "Discord Channel",
+    "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
+    "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Vinduesbaggrund",
+    "SettingsWindowBackdrop_Description": "Vælg en baggrundseffekt til Wino-vinduer.",
+    "SettingsWindowBackdrop_Disabled": "Valg af vinduesbaggrund er deaktiveret, når app-temaet vælges andet end Standard.",
+    "SettingsElementTheme_Description": "Select a Windows theme for Wino",
+    "SettingsElementTheme_Title": "Element Theme",
+    "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
+    "SettingsEnableHoverActions_Title": "Enable hover actions",
+    "SettingsEnableIMAPLogs_Description": "Enable this to provide details about IMAP connectivity issuses you had during IMAP server setup.",
+    "SettingsEnableIMAPLogs_Title": "Enable IMAP Protocol Logs",
+    "SettingsEnableLogs_Description": "I might need logs for crashes to diagnose issues you have opened in GitHub. None of the logs will expose your credentials or sensetive information to public.",
+    "SettingsEnableLogs_Title": "Enable Logs",
+    "SettingsEnableSignature": "Enable Signature",
+    "SettingsExpandOnStartup_Description": "Set whether Wino should expand this account's folders on startup.",
+    "SettingsExpandOnStartup_Title": "Expand Menu on Startup",
+    "SettingsExternalContent_Description": "Manage external content settings when rendering mails.",
+    "SettingsExternalContent_Title": "External Content",
+    "SettingsFocusedInbox_Description": "Set whether Inbox should be split into two as Focused - Other.",
+    "SettingsFocusedInbox_Title": "Focused Inbox",
+    "SettingsFolderMenuStyle_Description": "Change whether account folders should be nested inside an account menu item or not. Toggle this off if you like the old menu system in Windows Mail",
+    "SettingsFolderMenuStyle_Title": "Create Nested Folders",
+    "SettingsFolderOptions_Description": "Change individual folder settings like enable/disable sync or show/hide unread badge.",
+    "SettingsFolderOptions_Title": "Folder Configuration",
+    "SettingsFolderSync_Description": "Enable or disable specific folders for synchronization.",
+    "SettingsFolderSync_Title": "Folder Synchronization",
+    "SettingsFontFamily_Title": "Font Family",
+    "SettingsFontPreview_Title": "Preview",
+    "SettingsFontSize_Title": "Font Size",
+    "SettingsHoverActionCenter": "Center Action",
+    "SettingsHoverActionLeft": "Left Action",
+    "SettingsHoverActionRight": "Right Action",
+    "SettingsHoverActions_Description": "Select 3 actions to show up when you hover over the mails with cursor.",
+    "SettingsHoverActions_Title": "Hover Actions",
+    "SettingsLanguage_Description": "Change display language for Wino.",
+    "SettingsLanguage_Title": "Display Language",
+    "SettingsLanguageTime_Description": "Wino display language, preferred time format.",
+    "SettingsLanguageTime_Title": "Language & Time",
+    "SettingsLinkAccounts_Description": "Merge multiple accounts into one. See mails from one Inbox together.",
+    "SettingsLinkAccounts_Title": "Create Linked Accounts",
+    "SettingsLinkedAccountsSave_Description": "Modify the current link with the new accounts.",
+    "SettingsLinkedAccountsSave_Title": "Save Changes",
+    "SettingsLoadImages_Title": "Load images automatically",
+    "SettingsLoadPlaintextLinks_Title": "Convert plaintext links to clickable links",
+    "SettingsLoadStyles_Title": "Load styles automatically",
+    "SettingsMailListActionBar_Description": "Hide/show action bar at top of message list.",
+    "SettingsMailListActionBar_Title": "Show mail list actions",
+    "SettingsMailSpacing_Description": "Adjust the spacing for listing mails.",
+    "SettingsMailSpacing_Title": "Mail Spacing",
+    "SettingsManageAccountSettings_Description": "Notifications, signatures, synchronization and other settings per account.",
+    "SettingsManageAccountSettings_Title": "Manage Account Settings",
+    "SettingsManageAliases_Description": "See e-mail aliases assigned for this account, update or delete them.",
+    "SettingsManageAliases_Title": "Aliases",
+    "SettingsEditAccountDetails_Title": "Edit Account Details",
+    "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Ændringer gemt",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Dine kontooplysninger er opdateret.",
+    "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
+    "SettingsManageLink_Title": "Manage Link",
+    "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
+    "SettingsMarkAsRead_DontChange": "Don't automatically mark item as read",
+    "SettingsMarkAsRead_SecondsToWait": "Seconds to wait: ",
+    "SettingsMarkAsRead_Timer": "When viewed in the reading pane",
+    "SettingsMarkAsRead_Title": "Mark item as read",
+    "SettingsMarkAsRead_WhenSelected": "When selected",
+    "SettingsMessageList_Description": "Change how your messages should be organized in mail list.",
+    "SettingsMessageList_Title": "Message List",
+    "SettingsNoAccountSetupMessage": "You didn't setup any accounts yet.",
+    "SettingsNotifications_Description": "Turn on or off notifications for this account.",
+    "SettingsNotifications_Title": "Notifications",
+    "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
+    "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Hjem",
+    "SettingsHome_SearchTitle": "Find en indstilling",
+    "SettingsHome_SearchDescription": "Søg efter funktion, emne eller nøgleord for at springe direkte til den rigtige indstillingssiden.",
+    "SettingsHome_SearchPlaceholder": "Søg i indstillinger",
+    "SettingsHome_SearchExamples": "Prøv: tema, opbevaring, sprog, signatur",
+    "SettingsHome_QuickLinks_Title": "Hurtige links",
+    "SettingsHome_QuickLinks_Description": "Gå direkte til de indstillinger, som bruges mest af folk.",
+    "SettingsHome_StorageCard_Description": "Se hvor meget lokalt MIME-indhold Wino opbevarer på denne enhed, og ryd det op, når det er nødvendigt.",
+    "SettingsHome_StorageEmptySummary": "Intet cachet MIME-indhold endnu.",
+    "SettingsHome_StorageLoading": "Kontrollerer lokal MIME-brug...",
+    "SettingsHome_Tips_Title": "Tips og tricks",
+    "SettingsHome_Tips_Description": "Et par små ændringer kan få Wino til at føles meget mere personlig.",
+    "SettingsHome_Tip_Theme": "Ønsker du mørk tilstand eller ændringer af accentfarver? Åbn Personalisering.",
+    "SettingsHome_Tip_Background": "Brug App-præferencer til at styre opstartsadfærd og baggrundssynkronisering.",
+    "SettingsHome_Tip_Shortcuts": "Tastaturgenveje hjælper dig med at bevæge dig gennem mails hurtigere.",
+    "SettingsHome_Resources_Title": "Hjælpelinks",
+    "SettingsHome_Resources_Description": "Åbn projektressourcer, supportoplysninger og udgivelseskanaler.",
+    "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "Generelt",
+    "SettingsOptions_MailSection": "Mail",
+    "SettingsOptions_CalendarSection": "Kalender",
+    "SettingsOptions_MoreComingSoon": "Flere muligheder kommer snart",
+    "SettingsOptions_HeroDescription": "Tilpas din Wino Mail-oplevelse.",
+    "SettingsOptions_AccountsSummary": "{0} konto(er) konfigureret",
+    "SettingsSearch_ManageAccounts_Keywords": "konto;konti;postkasse;postkasser;alias;aliaser;profil;adresse;adresser",
+    "SettingsSearch_AppPreferences_Keywords": "opstart;baggrund;start;synkronisering;notifikation;notifikationer;søg;systembakke;standardindstillinger",
+    "SettingsSearch_LanguageTime_Keywords": "sprog;tid;ur;lokalitet;region;format;24-timers;24t",
+    "SettingsSearch_Personalization_Keywords": "tema;mørk;lys;udseende;accent;farve;farve;tilstand;layout;densitet",
+    "SettingsSearch_About_Keywords": "om;version;hjemmeside;privatliv;github;donationer;butik;support",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "genvej;genveje;hurtigtast;hurtigtaster;tastatur;taster",
+    "SettingsSearch_MessageList_Keywords": "besked;beskeder;liste;trådvisning;tråde;avatar;forhåndsvisning;afsender",
+    "SettingsSearch_ReadComposePane_Keywords": "læser;komponér;komponist;skrifttype;skrifttyper;ekstern indhold;visning;læsning",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "signatur;signaturer;kryptering;certifikat;certifikater;S/MIME;smime;sikkerhed",
+    "SettingsSearch_Storage_Keywords": "lager;cache;cachelagring;mime;disk;plads;oprydning;ryd op;lokal data",
+    "SettingsSearch_CalendarSettings_Keywords": "kalender;uge;timer;tidsplan;begivenhed;begivenheder",
+    "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
+    "SettingsPaneLengthReset_Title": "Reset Mail List Size",
+    "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
+    "SettingsPaypal_Title": "Donate via PayPal",
+    "SettingsPersonalization_Description": "Change appearance of Wino as you like.",
+    "SettingsPersonalization_Title": "Personalization",
+    "SettingsPersonalizationMailDisplayCompactMode": "Compact Mode",
+    "SettingsPersonalizationMailDisplayMediumMode": "Medium Mode",
+    "SettingsPersonalizationMailDisplaySpaciousMode": "Spacious Mode",
+    "SettingsPrefer24HourClock_Description": "Mail recieve times will be displayed in 24 hour format instead of 12 (AM/PM)",
+    "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
+    "SettingsPrivacyPolicy_Description": "Review privacy policy.",
+    "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Åbn Wino Mail-hjemmesiden.",
+    "SettingsWebsite_Title": "Hjemmeside",
+    "SettingsReadComposePane_Description": "Fonts, external content.",
+    "SettingsReadComposePane_Title": "Reader & Composer",
+    "SettingsReader_Title": "Reader",
+    "SettingsReaderFont_Title": "Default Reader Font",
+    "SettingsReaderFontFamily_Description": "Change the default font family and font size for reading mails.",
+    "SettingsRenameMergeAccount_Description": "Change the display name of the linked accounts.",
+    "SettingsRenameMergeAccount_Title": "Rename",
+    "SettingsReorderAccounts_Description": "Change the order of accounts in the account list.",
+    "SettingsReorderAccounts_Title": "Reorder Accounts",
+    "SettingsSemanticZoom_Description": "This will allow you to click on the headers in messages list and go to specific date",
+    "SettingsSemanticZoom_Title": "Semantic Zoom for Date Headers",
+    "SettingsShowPreviewText_Description": "Hide/show the preview text.",
+    "SettingsShowPreviewText_Title": "Show Preview Text",
+    "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
+    "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "E-mail-skabeloner",
+    "SettingsEmailTemplates_Description": "Administrer e-mail-skabeloner",
+    "SettingsEmailTemplates_CreatePageTitle": "Ny skabelon",
+    "SettingsEmailTemplates_EditPageTitle": "Rediger skabelon",
+    "SettingsEmailTemplates_NewTemplateTitle": "Ny skabelon",
+    "SettingsEmailTemplates_NewTemplateDescription": "Opret en ny e-mail-skabelon",
+    "SettingsEmailTemplates_NameTitle": "Navn",
+    "SettingsEmailTemplates_NamePlaceholder": "Skabelonnavn",
+    "SettingsEmailTemplates_DescriptionTitle": "Beskrivelse",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Valgfri beskrivelse",
+    "SettingsEmailTemplates_ContentTitle": "Skabelonindhold",
+    "SettingsEmailTemplates_ContentDescription": "Rediger HTML-indholdet for denne skabelon.",
+    "SettingsEmailTemplates_NameRequired": "Skabelonnavn er påkrævet.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
-    "SettingsEnableGravatarAvatars_Description": "Brug gravatar (hvis tilgængelig) som afsenderbillede",
-    "SettingsEnableFavicons_Title": "Domæneikoner (Favikoner)",
-    "SettingsEnableFavicons_Description": "Brug favikoner (hvis tilgængelig) som afsenderbillede",
-    "SettingsMailList_ClearAvatarsCache_Button": "Ryd cachelagrede avatarer",
-    "SettingsSignature_AddCustomSignature_Button": "Tilføj signatur",
-    "SettingsSignature_AddCustomSignature_Title": "Tilføj brugerdefineret signatur",
-    "SettingsSignature_DeleteSignature_Title": "Slet signatur",
-    "SettingsSignature_Description": "Administrer kontosignaturer",
-    "SettingsSignature_EditSignature_Title": "Rediger signatur",
-    "SettingsSignature_ForFollowingMessages_Title": "Til Svar/Vidersendelser",
-    "SettingsSignature_ForNewMessages_Title": "Til nye beskeder",
-    "SettingsSignature_NoneSignatureName": "Ingen",
-    "SettingsSignature_SignatureDefaults": "Standarder for signatur",
-    "SettingsSignature_Signatures": "Signaturer",
-    "SettingsSignature_Title": "Signatur",
-    "SettingsStartupItem_Description": "Primær konto, der skal åbne Indbakke ved opstart.",
-    "SettingsStartupItem_Title": "Opstartsobjekt",
-    "SettingsStore_Description": "Vis noget kærlighed ❤️",
-    "SettingsStore_Title": "Bedøm i butik",
-    "SettingsTaskbarBadge_Description": "Vis antal ulæste mails på proceslinjeikonet.",
-    "SettingsTaskbarBadge_Title": "Proceslinjebadge",
-    "SettingsThreads_Description": "Organiser beskeder i samtaletråde.",
-    "SettingsThreads_Title": "Samtaletråde",
-    "SettingsUnlinkAccounts_Description": "Fjern forbindelsen mellem konti. Dette vil ikke slette dine konti.",
-    "SettingsUnlinkAccounts_Title": "Fjern kontotilknytning",
-    "SettingsMailRendering_ActionLabels_Title": "Handlingsetiketter",
-    "SettingsMailRendering_ActionLabels_Description": "Vis handlingsetiketter",
-    "SignatureDeleteDialog_Message": "Er du sikker på du vil slette \"{0}\" signatur?",
-    "SignatureDeleteDialog_Title": "Slet signatur",
-    "SignatureEditorDialog_SignatureName_Placeholder": "Navngiv din signatur",
-    "SignatureEditorDialog_SignatureName_TitleEdit": "Nuværende signaturnavn: {0}",
-    "SignatureEditorDialog_SignatureName_TitleNew": "Signaturnavn",
-    "SignatureEditorDialog_Title": "Signaturedigering",
-    "SortingOption_Date": "efter dato",
-    "SortingOption_Name": "efter navn",
-    "StoreRatingDialog_MessageFirstLine": "Alle feedbacks er værdsat, og de vil gøre meget Wino bedre i fremtiden. Vil du bedømme Wino i Microsoft Store?",
-    "StoreRatingDialog_MessageSecondLine": "Ønsker du at bedømme Wino Mail i Microsoft Store?",
-    "StoreRatingDialog_Title": "Nyder du Wino?",
-    "SynchronizationFolderReport_Failed": "synkronisering fejlede",
-    "SynchronizationFolderReport_Success": "Opdateret",
-    "SystemFolderConfigDialog_ArchiveFolderDescription": "Arkiverede beskeder vil blive flyttet hertil.",
-    "SystemFolderConfigDialog_ArchiveFolderHeader": "Arkiv Mappe",
-    "SystemFolderConfigDialog_DeletedFolderDescription": "Slettede beskeder vil blive flyttet hertil.",
-    "SystemFolderConfigDialog_DeletedFolderHeader": "Slettet mappe",
-    "SystemFolderConfigDialog_DraftFolderDescription": "Nye mails/svar oprettes her.",
-    "SystemFolderConfigDialog_DraftFolderHeader": "Udkastmappe",
-    "SystemFolderConfigDialog_JunkFolderDescription": "Alle spam-mails vil være her.",
-    "SystemFolderConfigDialog_JunkFolderHeader": "Spam-mappe",
-    "SystemFolderConfigDialog_MessageFirstLine": "Denne IMAP-server understøtter ikke SPECIAL-USE-udvidelsen, derfor kunne Wino ikke konfigurere systemmapperne korrekt.",
-    "SystemFolderConfigDialog_MessageSecondLine": "Vælg venligst de relevante mapper til specifikke funktioner.",
-    "SystemFolderConfigDialog_SentFolderDescription": "Mappe, hvor sendte beskeder gemmes.",
-    "SystemFolderConfigDialog_SentFolderHeader": "Sendt Mappe",
-    "SystemFolderConfigDialog_Title": "Konfigurer Systemmapper",
-    "SystemFolderConfigDialogValidation_DuplicateSystemFolders": "Nogle af systemmapperne bruges mere end én gang i konfigurationen.",
-    "SystemFolderConfigDialogValidation_InboxSelected": "Du kan ikke tildele Indbakke-mappen til en anden systemmappe.",
-    "SystemFolderConfigSetupSuccess_Message": "Systemmapper er konfigureret.",
-    "SystemFolderConfigSetupSuccess_Title": "Opsætning Af Systemmapper",
-    "TestingImapConnectionMessage": "Tester serverforbindelse...",
-    "TitleBarServerDisconnectedButton_Description": "Wino er afbrudt fra netværket. Klik igen for at genoprette forbindelsen.",
-    "TitleBarServerDisconnectedButton_Title": "Ingen forbindelse",
-    "TitleBarServerReconnectButton_Title": "Forbind igen",
-    "TitleBarServerReconnectingButton_Title": "Opretter forbindelse",
-    "Today": "I dag",
-    "UnknownAddress": "Ukendt adresse",
-    "UnknownDateHeader": "Ukendt dato",
-    "UnknownGroupAddress": "Ukendt mailgruppeadresse",
-    "UnknownSender": "Ukendt afsender",
-    "Unsubscribe": "Afmeld",
-    "ViewContactDetails": "Vis detaljer",
-    "WinoUpgradeDescription": "Wino tilbyder 3 gratis konti til at starte med. Hvis du har brug for mere end 3 konti, bedes du opgradere.",
-    "WinoUpgradeMessage": "Opgrader til ubegrænsede konti",
-    "WinoUpgradeRemainingAccountsMessage": "{0} ud af {1} gratis konti anvendes.",
-    "Yesterday": "I går",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "E-mail synkroniseringsinterval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatisk synkroniseringsinterval for mails (minutter). Denne indstilling træder først i kraft efter genstart af Wino Mail."
+    "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
+    "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
+    "SettingsEnableFavicons_Description": "Use domain favicons (if available) as sender picture",
+    "SettingsMailList_ClearAvatarsCache_Button": "Clear cached avatars",
+    "SettingsSignature_AddCustomSignature_Button": "Add signature",
+    "SettingsSignature_AddCustomSignature_Title": "Add custom signature",
+    "SettingsSignature_DeleteSignature_Title": "Delete signature",
+    "SettingsSignature_Description": "Manage account signatures",
+    "SettingsSignature_EditSignature_Title": "Edit signature",
+    "SettingsSignature_ForFollowingMessages_Title": "For Replies/Forwards",
+    "SettingsSignature_ForNewMessages_Title": "For New Messages",
+    "SettingsSignature_NoneSignatureName": "None",
+    "SettingsSignature_SignatureDefaults": "Signature defaults",
+    "SettingsSignature_Signatures": "Signatures",
+    "SettingsSignature_Title": "Signature",
+    "SettingsStartupItem_Description": "Primary account item to load Inbox at startup.",
+    "SettingsStartupItem_Title": "Startup Item",
+    "SettingsStore_Description": "Show some love ❤️",
+    "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Opbevaring",
+    "SettingsStorage_Description": "Scan og administrer MIME-cache gemt i din lokale data-mappe.",
+    "SettingsStorage_ScanFolder": "Scan lokal data-mappe",
+    "SettingsStorage_NoLocalMimeDataFound": "Ingen lokal MIME-data fundet.",
+    "SettingsStorage_NoAccountsFound": "Ingen konti fundet.",
+    "SettingsStorage_TotalUsage": "Samlet lokal MIME-brug: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} brugt i lokal MIME-cache",
+    "SettingsStorage_DeleteAll_Title": "Slet alt MIME-indhold",
+    "SettingsStorage_DeleteAll_Description": "Slet hele MIME-cache-mappen for denne konto.",
+    "SettingsStorage_DeleteAll_Button": "Slet alt",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Slet alt MIME-indhold",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Slet alle lokale MIME-data for {0}?",
+    "SettingsStorage_DeleteAll_Success": "Alle MIME-indhold blev slettet.",
+    "SettingsStorage_DeleteOld_Title": "Slet ældre MIME-indhold",
+    "SettingsStorage_DeleteOld_Description": "Slet MIME-filer baseret på oprettelsesdatoen for mails i den lokale database.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 måned",
+    "SettingsStorage_DeleteOld_3Months": "> 3 måneder",
+    "SettingsStorage_DeleteOld_6Months": "> 6 måneder",
+    "SettingsStorage_DeleteOld_1Year": "> 1 år",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Slet ældre MIME-indhold",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Slet lokale MIME-data ældre end {0} for {1}?",
+    "SettingsStorage_DeleteOld_Success": "Slettede {0} MIME-mappe(r) ældre end {1}.",
+    "SettingsStorage_1Month": "1 måned",
+    "SettingsStorage_3Months": "3 måneder",
+    "SettingsStorage_6Months": "6 måneder",
+    "SettingsStorage_1Year": "1 år",
+    "SettingsStorage_Months": "{0} måneder",
+    "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
+    "SettingsTaskbarBadge_Title": "Taskbar Badge",
+    "SettingsThreads_Description": "Organize messages into conversation threads.",
+    "SettingsThreads_Title": "Conversation Threading",
+    "SettingsUnlinkAccounts_Description": "Remove the link between accounts. his will not delete your accounts.",
+    "SettingsUnlinkAccounts_Title": "Unlink Accounts",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
+    "SignatureDeleteDialog_Message": "Are you sure you want to delete \"{0}\" signature?",
+    "SignatureDeleteDialog_Title": "Delete signature",
+    "SignatureEditorDialog_SignatureName_Placeholder": "Name your signature",
+    "SignatureEditorDialog_SignatureName_TitleEdit": "Current signature name: {0}",
+    "SignatureEditorDialog_SignatureName_TitleNew": "Signature name",
+    "SignatureEditorDialog_Title": "Signature Editor",
+    "SortingOption_Date": "by date",
+    "SortingOption_Name": "by name",
+    "StoreRatingDialog_MessageFirstLine": "All feedbacks are appreciated and they will make much Wino better in the future. Would you like to rate Wino in Microsoft Store?",
+    "StoreRatingDialog_MessageSecondLine": "Would you like to rate Wino Mail in Microsoft Store?",
+    "StoreRatingDialog_Title": "Enjoying Wino?",
+    "SynchronizationFolderReport_Failed": "synchronization is failed",
+    "SynchronizationFolderReport_Success": "up to date",
+    "SystemFolderConfigDialog_ArchiveFolderDescription": "Archived messages will be moved to here.",
+    "SystemFolderConfigDialog_ArchiveFolderHeader": "Archive Folder",
+    "SystemFolderConfigDialog_DeletedFolderDescription": "Deleted messages will be moved to here.",
+    "SystemFolderConfigDialog_DeletedFolderHeader": "Deleted Folder",
+    "SystemFolderConfigDialog_DraftFolderDescription": "New mails/replies will be crafted in here.",
+    "SystemFolderConfigDialog_DraftFolderHeader": "Draft Folder",
+    "SystemFolderConfigDialog_JunkFolderDescription": "All spam/junk mails will be here.",
+    "SystemFolderConfigDialog_JunkFolderHeader": "Junk/Spam Folder",
+    "SystemFolderConfigDialog_MessageFirstLine": "This IMAP server doesn't support SPECIAL-USE extension hence Wino couldn't setup the system folders properly.",
+    "SystemFolderConfigDialog_MessageSecondLine": "Please select the appropriate folders for specific functionalities.",
+    "SystemFolderConfigDialog_SentFolderDescription": "Folder that sent messages will be stored.",
+    "SystemFolderConfigDialog_SentFolderHeader": "Sent Folder",
+    "SystemFolderConfigDialog_Title": "Configure System Folders",
+    "SystemFolderConfigDialogValidation_DuplicateSystemFolders": "Some of the system folders are used more than once in the configuration.",
+    "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
+    "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
+    "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Åbn Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Åbn Wino Kalender",
+    "SystemTrayMenu_ExitWino": "Afslut",
+    "TestingImapConnectionMessage": "Testing server connection...",
+    "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
+    "TitleBarServerDisconnectedButton_Title": "no connection",
+    "TitleBarServerReconnectButton_Title": "reconnect",
+    "TitleBarServerReconnectingButton_Title": "connecting",
+    "Today": "Today",
+    "UnknownAddress": "unknown address",
+    "UnknownDateHeader": "Unknown Date",
+    "UnknownGroupAddress": "unknown Mail Group Address",
+    "UnknownSender": "Unknown Sender",
+    "Unsubscribe": "Unsubscribe",
+    "ViewContactDetails": "View Details",
+    "WinoUpgradeDescription": "Wino offers 3 accounts to start with for free. If you need more than 3 accounts, please upgrade",
+    "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
+    "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
+    "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Certifikater importeret med succes.",
+    "Smime_ImportCertificates_Error": "Fejl ved import af certifikater: {0}",
+    "Smime_RemoveCertificates_Confirm": "Vil du virkelig fjerne certifikaterne {0}?",
+    "Smime_RemoveCertificates_Success": "Certifikater fjernet.",
+    "Smime_ExportCertificates_Success": "Certifikater eksporteret.",
+    "Smime_ExportCertificates_Error": "Fejl ved eksport af certifikater.",
+    "Smime_CertificateDetails": "Emne: {0}\\nUdsteder: {1}\\nGyldig fra: {2}\\nGyldig til: {3}\\nFingeraftryk: {4}",
+    "Smime_CertificatePassword_Title": "Certifikatpassword påkrævet",
+    "Smime_CertificatePassword_Placeholder": "Certifikatpassword til {0} (valgfri)",
+    "Smime_Confirm_Title": "Bekræft",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Opdater",
+    "SettingsSignatureAndEncryption_Title": "Signatur og kryptering",
+    "SettingsSignatureAndEncryption_Description": "Administrer S/MIME-certifikater til underskrift og kryptering af e-mails.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mine certifikater",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Personlige certifikater til underskrift og kryptering",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Modtagercertifikater",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Modtagercertifikater til dekryptering",
+    "SettingsSignatureAndEncryption_NameColumn": "Navn",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Udløber den",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Fingeraftryk",
+    "Buttons_Remove": "Fjern",
+    "Buttons_Export": "Eksportér",
+    "Buttons_Import": "Importer",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME Signeringcertifikat",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME-kryptering",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Ingen",
+    "SmimeSignaturesInMessage": "Signaturer i denne besked:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, gyldig til {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME Signeringcertifikat-info",
+    "SmimeCertificateInfoTitle": "S/MIME Certifikat-info",
+    "SmimeNoCertificateFileFound": "Ingen certifikatfil fundet.",
+    "SmimeSaveCertificate": "Gem certifikatet...",
+    "SmimeCertificate": "S/MIME-certifikat",
+    "SmimeCertificateSavedTo": "Certifikat gemt til {0}",
+    "SmimeSignedTooltip": "Denne besked er underskrevet med et S/MIME-certifikat. Klik for flere detaljer",
+    "SmimeEncryptedTooltip": "Denne besked er krypteret med et S/MIME-certifikat.",
+    "SmimeCertificateFileInfo": "Fil: {0}\\nType: {1}\\nStørrelse: {2:N0} bytes",
+    "Composer_LightTheme": "Lyst tema",
+    "Composer_DarkTheme": "Mørkt tema",
+    "Composer_Outdent": "Fjern indrykning",
+    "Composer_Indent": "Indryk",
+    "Composer_BulletList": "Punktliste",
+    "Composer_OrderedList": "Nummereret liste",
+    "Composer_Stroke": "Streg",
+    "Composer_Bold": "Fed",
+    "Composer_Italic": "Kursiv",
+    "Composer_Underline": "Understregning",
+    "Composer_CcBcc": "Cc og Bcc",
+    "Composer_EnableSmimeSignature": "Aktivér/deaktiver S/MIME-signatur",
+    "Composer_EnableSmimeEncryption": "Aktivér/deaktiver S/MIME-kryptering",
+    "Composer_LocalDraftSyncInfo": "Denne kladde er udelukkende lokal. Wino kunne ikke sende den til din mailserver. Klik for at prøve at sende den igen.",
+    "Composer_CertificateExpires": "Udløber den: ",
+    "Composer_SmimeSignature": "S/MIME-signatur",
+    "Composer_SmimeEncryption": "S/MIME-kryptering",
+    "Composer_EmailTemplatesPlaceholder": "E-mail-skabeloner",
+    "Composer_AiSummarize": "Sammenfat med AI",
+    "Composer_AiSummarizeDescription": "Uddrag nøglepunkter, handlingspunkter og beslutninger fra denne e-mail.",
+    "Composer_AiTranslate": "Oversæt med AI",
+    "Composer_AiActions": "AI-handlinger",
+    "Composer_AiRewrite": "Omskriv med AI",
+    "AiActions_CheckingStatus": "Kontrollerer AI-adgang...",
+    "AiActions_SignedOutTitle": "Få adgang til Wino AI-pakken.",
+    "AiActions_SignedOutDescription": "Oversæt, omskriv og opsummer e-mails med AI, når du har logget ind på din Wino-konto og aktiveret AI Pack-tilføjelsen.",
+    "AiActions_NoPackTitle": "AI-pakken kræves",
+    "AiActions_NoPackDescription": "Du er logget ind, men AI Pack er ikke aktiveret endnu. Køb den for at bruge Winos AI-oversættelse, omskrivning og sammenfatningsværktøjer.",
+    "AiActions_UsageSummary": "{0} ud af {1} kreditter brugt denne måned.",
+    "Composer_AiRewritePolite": "Gør den høflig",
+    "Composer_AiRewritePoliteDescription": "Gør formuleringen mere høflig uden at ændre intentionen.",
+    "Composer_AiRewriteAngry": "Gør den vred",
+    "Composer_AiRewriteAngryDescription": "Bruger en skarpere og mere konfronterende tone.",
+    "Composer_AiRewriteHappy": "Gør det muntert",
+    "Composer_AiRewriteHappyDescription": "Tilføjer en mere munter og entusiastisk tone.",
+    "Composer_AiRewriteFormal": "Gør det formelt",
+    "Composer_AiRewriteFormalDescription": "Gør beskeden mere professionel og struktureret.",
+    "Composer_AiRewriteFriendly": "Gør det venligt",
+    "Composer_AiRewriteFriendlyDescription": "Gør beskeden mere imødekommende.",
+    "Composer_AiRewriteShorter": "Gør det kortere",
+    "Composer_AiRewriteShorterDescription": "Trimmer teksten og fjerner unødvendige detaljer.",
+    "Composer_AiRewriteClearer": "Gør det tydeligere",
+    "Composer_AiRewriteClearerDescription": "Forbedrer læsbarheden og gør beskeden lettere at følge.",
+    "Composer_AiRewriteCustom": "Brugerdefineret",
+    "Composer_AiRewriteCustomDescription": "Beskriv din egen omskrivningsintention.",
+    "Composer_AiRewriteCustomPlaceholder": "Beskriv hvordan du vil have beskeden omskrevet",
+    "Composer_AiRewriteMode": "Omskrivning af tone",
+    "Composer_AiRewriteApply": "Anvend omskrivning",
+    "Composer_AiTranslateDialogTitle": "Oversæt med AI",
+    "Composer_AiTranslateDialogDescription": "Indtast målsproget eller kulturkoden, f.eks. en-US, tr-TR, de-DE eller fr-FR.",
+    "Composer_AiTranslateApply": "Oversæt",
+    "Composer_AiTranslateLanguage": "Målsprog",
+    "Composer_AiTranslateCustomPlaceholder": "Indtast kulturkode",
+    "Composer_AiTranslateLanguageEnglish": "Engelsk (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "tyrkisk (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Tysk (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Fransk (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spansk (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiensk (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugisisk (Brasilien) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Nederlandsk (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polsk (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russisk (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japansk (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Koreansk (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Kinesisk, forenklet (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabisk (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Andet...",
+    "Composer_AiBusyTitle": "AI arbejder allerede",
+    "Composer_AiBusyMessage": "Vent venligst, indtil den nuværende AI-handling er færdig.",
+    "Composer_AiSignInRequired": "Log ind på din Wino-konto for at bruge AI-funktioner.",
+    "Composer_AiMissingHtml": "Der er ikke noget beskedindhold at sende til Wino AI endnu.",
+    "Composer_AiQuotaUnavailable": "AI-resultatet blev anvendt.",
+    "Composer_AiAppliedMessage": "AI-resultatet blev anvendt i komponisten. Brug fortryd, hvis du vil fortryde det.",
+    "Composer_AiSummarizeSuccessTitle": "AI-sammenfatning anvendt",
+    "Composer_AiTranslateSuccessTitle": "AI-oversættelse anvendt",
+    "Composer_AiRewriteSuccessTitle": "AI-omskrivning anvendt",
+    "Composer_AiErrorTitle": "AI-handlingen mislykkedes",
+    "Reader_AiAppliedMessage": "AI-resultatet vises nu for denne besked. Genåbn beskeden for at se det oprindelige indhold igen.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontakter",
+    "ContactsPage_AddContact": "Tilføj kontakt",
+    "ContactsPage_EditContact": "Rediger kontakt",
+    "ContactsPage_DeleteContact": "Slet kontakt",
+    "ContactsPage_SearchPlaceholder": "Søg kontakter...",
+    "ContactsPage_NoContacts": "Ingen kontakter fundet",
+    "ContactsPage_ContactsCount": "{0} kontakter",
+    "ContactsPage_SelectedContactsCount": "{0} valgte",
+    "ContactsPage_DeleteSelectedContacts": "Slet valgte",
+    "ContactEditDialog_Title": "Rediger kontakt",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Vælg foto",
+    "ContactEditDialog_RemovePhoto": "Fjern foto",
+    "ContactEditDialog_NameHeader": "Navn",
+    "ContactEditDialog_NamePlaceholder": "Kontaktnavn",
+    "ContactEditDialog_EmailHeader": "E-mail adresse",
+    "ContactEditDialog_EmailPlaceholder": "kontakt@example.com",
+    "ContactEditDialog_InfoSection": "Kontaktoplysninger",
+    "ContactEditDialog_RootContactInfo": "Dette er en rodkontakt tilknyttet dine konti og kan ikke slettes.",
+    "ContactEditDialog_OverriddenContactInfo": "Denne kontakt er manuelt ændret og opdateres ikke under synkronisering.",
+    "ContactsPage_Subtitle": "Administrer dine e-mailkontakter og deres oplysninger",
+    "ContactStatus_Account": "Konto",
+    "ContactStatus_Modified": "Ændret",
+    "ContactAction_Edit": "Rediger kontakt",
+    "ContactAction_ChangePhoto": "Skift foto",
+    "ContactAction_Delete": "Slet kontakt",
+    "ContactAction_Add": "Tilføj kontakt",
+    "ContactSelection_Selected": "valgt",
+    "ContactSelection_SelectAll": "Vælg alle",
+    "ContactSelection_Clear": "Ryd markering",
+    "ContactsPage_EmptyState": "Ingen kontakter at vise",
+    "ContactsPage_AddFirstContact": "Tilføj din første kontakt",
+    "ContactsPage_ContactsCountSuffix": "kontakter",
+    "ContactsPane_NewContact": "Ny kontakt",
+    "ContactsPane_DescriptionTitle": "Administrer dine kontakter",
+    "ContactsPane_DescriptionBody": "Opret kontakter, omdøb dem, opdater profilbilleder, og hold gemte oplysninger organiseret et sted.",
+    "ContactEditDialog_AddTitle": "Tilføj kontakt",
+    "ContactInfoBar_ContactAdded": "Kontakt tilføjet med succes.",
+    "ContactInfoBar_ContactUpdated": "Kontakt opdateret med succes.",
+    "ContactInfoBar_ContactsDeleted": "Kontakter slettet med succes.",
+    "ContactInfoBar_ContactPhotoUpdated": "Kontaktfoto opdateret med succes.",
+    "ContactInfoBar_FailedToLoadContacts": "Kunne ikke indlæse kontakter: {0}",
+    "ContactInfoBar_FailedToAddContact": "Kunne ikke tilføje kontakt: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Kunne ikke opdatere kontakt: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Kunne ikke slette kontakter: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Kunne ikke opdatere foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Rodkontakter kan ikke slettes.",
+    "ContactConfirmDialog_DeleteTitle": "Slet kontakt",
+    "ContactConfirmDialog_DeleteMessage": "Er du sikker på, at du vil slette kontakten '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Er du sikker på, at du vil slette {0} kontakt(er)?",
+    "ContactConfirmDialog_DeleteButton": "Slet",
+    "CalendarAccountSettings_Title": "Kalenderkontoindstillinger",
+    "CalendarAccountSettings_Description": "Administrer kalenderindstillinger for {0}",
+    "CalendarAccountSettings_AccountColor": "Konto-farve",
+    "CalendarAccountSettings_AccountColorDescription": "Skift visningsfarven for denne kalenderkonto",
+    "CalendarAccountSettings_SyncEnabled": "Aktivér synkronisering",
+    "CalendarAccountSettings_SyncEnabledDescription": "Aktivér eller deaktiver kalender-synkronisering for denne konto.",
+    "CalendarAccountSettings_DefaultShowAs": "Standard tilgængelighedsstatus",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Standard tilgængelighedsstatus for nye begivenheder oprettet med denne konto.",
+    "CalendarAccountSettings_PrimaryCalendar": "Primær kalender",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marker denne kalender som primær kalender for kontoen",
+    "CalendarSettings_NewEventBehavior_Header": "Opførsel for knappen Ny begivenhed",
+    "CalendarSettings_NewEventBehavior_Description": "Vælg om knappen Ny begivenhed skal spørge om en kalender hver gang eller altid åbne en specifik kalender.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Spørg hver gang.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Brug altid en specifik kalender.",
+    "CalendarSettings_Rendering_Title": "Visning",
+    "CalendarSettings_Rendering_Description": "Konfigurer kalenderlayout og visningsadfærd.",
+    "CalendarSettings_Notifications_Title": "Notifikationer",
+    "CalendarSettings_Notifications_Description": "Vælg standard påmindelses- og udsættelsesadfærd.",
+    "CalendarSettings_Preferences_Title": "Præferencer",
+    "CalendarSettings_Preferences_Description": "Indstil hvordan knappen Ny begivenhed opfører sig.",
+    "WhatIsNew_GetStartedButton": "Kom i gang",
+    "WhatIsNew_ContinueAnywayButton": "Fortsæt alligevel",
+    "WhatIsNew_PreparingForNewVersionButton": "Forbereder ny version...",
+    "WhatIsNew_MigrationPreparing_Title": "Forbereder dine data",
+    "WhatIsNew_MigrationPreparing_Description": "Wino anvender opdateringsmigrering. Vent venligst, mens vi forbereder dine kontooplysninger til denne udgivelse.",
+    "WhatIsNew_MigrationFailedMessage": "Anvendelse af migreringer mislykkedes med fejlkode {0}. Du kan fortsætte med at bruge applikationen. Hvis du oplever alvorlige problemer, bedes du geninstallere applikationen.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail opdateret",
+    "WhatIsNew_MigrationNotification_Message": "Åbn appen for at fuldføre opdateringen og se hvad der er nyt.",
+    "WelcomeWindow_Title": "Velkommen til Wino Mail",
+    "WelcomeWindow_Subtitle": "En native Windows-oplevelse til Mail og Kalender.",
+    "WelcomeWindow_WhatsNewTitle": "Seneste ændringer",
+    "WelcomeWindow_FeaturesTitle": "Funktioner",
+    "WelcomeWindow_WhatsNewTab": "Hvad er nyt",
+    "WelcomeWindow_FeaturesTab": "Funktioner",
+    "WelcomeWindow_GetStartedButton": "Kom i gang ved at tilføje en konto",
+    "WelcomeWindow_GetStartedDescription": "Tilføj din Outlook-, Gmail- eller IMAP-konto for at komme i gang med Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importer fra din Wino-konto",
+    "WelcomeWindow_ImportInProgress": "Importerere dine synkroniserede præferencer og konti...",
+    "WelcomeWindow_ImportNoAccountsFound": "Ingen synkroniserede konti blev fundet i din Wino-konto. Hvis præferencer var tilgængelige, blev de gendannet. Brug Kom i gang til manuelt at tilføje en konto.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synkroniserede konti er allerede tilgængelige på denne enhed. Brug Kom i gang til manuelt at tilføje en anden konto, hvis det er nødvendigt.",
+    "WelcomeWindow_SetupTitle": "Opsæt din konto",
+    "WelcomeWindow_SetupSubtitle": "Vælg din mailudbyder for at komme i gang",
+    "WelcomeWindow_AddAccountButton": "Tilføj konto",
+    "WelcomeWindow_SkipForNow": "Spring over for nu — jeg vil konfigurere den senere",
+    "WelcomeWindow_AppDescription": "En hurtig, fokuseret indbakke — nydesignet til Windows 11.",
+    "WelcomeWizard_Step1Title": "Velkommen",
+    "SystemTrayMenu_Open": "Åbn",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Synkroniseringsindstillinger",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Hold dine Wino-præferencer synkroniseret på tværs af enheder.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Få adgang til tilføjelser",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Adgang til premiumfunktioner som Wino AI Pack.",
+    "WinoAccount_Management_Description": "Administrer din Wino-konto, adgang til AI Pack og synkroniserede præferencer og kontooplysninger.",
+    "WinoAccount_Management_SignedOutTitle": "Log ind på Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Log ind eller opret en konto for at synkronisere din e-mail, få adgang til AI-funktioner og administrere dine indstillinger på tværs af enheder.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino-tilføjelser",
+    "WinoAccount_Management_DataSectionHeader": "Data",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Kontohandlinger",
+    "WinoAccount_Management_AccountCardTitle": "Konto",
+    "WinoAccount_Management_AccountCardDescription": "Din Wino-konto e-mailadresse og den aktuelle kontostatus.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Se om Wino AI Pack er aktiveret, og hvor meget brug der er tilbage.",
+    "WinoAccount_Management_AiPackActive": "AI Pack er aktiv",
+    "WinoAccount_Management_AiPackInactive": "AI Pack er ikke aktiv",
+    "WinoAccount_Management_AiPackUsage": "{0} af {1} anvendelser brugt. {2} tilbage.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Faktureringsperiode: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Brugsoplysninger er endnu ikke tilgængelige.",
+    "WinoAccount_Management_AiPackBuyDescription": "Køb Wino AI Pack for at oversætte, omskrive eller opsummere e-mails med AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Få adgang til AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Forbedr din e-mail-arbejdsgang med AI-drevne værktøjer. Oversæt beskeder til mere end 50 sprog, omskriv for klarhed og tone, og få øjeblikkelige sammendrag af lange tråde.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mo",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 kreditter",
+    "WinoAccount_Management_AiPackGetButton": "Få AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-drevne værktøjer til oversættelse, omskrivning og sammenfatning af e-mails i Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, oversæt, omskriv, opsummer, produktivitet",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Ubegrænsede konti",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Fjern kontoens begrænsning og tilføj så mange mailkonti, som du har brug for.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "konti, ubegrænsede, premium, tilføjelsesmodul",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Log ind med din Wino-konto for at gennemføre dette køb.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino kunne ikke gennemføre dette køb i Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Dit køb er gennemført, men Wino kunne ikke opdatere dine kontoens fordele endnu. Prøv igen om et øjeblik.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Dit abonnement er aktivt.",
+    "WinoAccount_Management_AiPackRenews": "Fornyer {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Kreditter brugt denne måned",
+    "WinoAccount_Management_AiPackResets": "Nulstiller {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Vi havde problemer med at indlæse din AI-brugsbalance.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Oversæt",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Omskriv",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Opsummer",
+    "WinoAccount_Management_AddOnLoadFailed": "Vi havde problemer med at indlæse denne tilføjelse.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synkroniser præferencer og konti",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importer eller eksporter dine Wino-præferencer og postkasseoplysninger på tværs af enheder. Adgangskoder, tokens og andre følsomme oplysninger bliver aldrig synkroniseret.",
+    "WinoAccount_Management_SignOutTitle": "Log ud",
+    "WinoAccount_Management_SignOutDescription": "Log ud af din konto på denne enhed",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Der er endnu ikke gemt synkroniserede data for denne konto.",
+    "WinoAccount_Management_ExportSucceeded": "Dine valgte Wino-data blev eksporteret med succes.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Dine præferencer blev eksporteret til din Wino-konto.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Eksporterede {0} kontooplysninger til din Wino-konto.",
+    "WinoAccount_Management_ImportSucceeded": "Importerede synkroniserede data fra din Wino-konto.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Anvendte {0} synkroniserede præferencer.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importerede {0} konti.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Springede {0} konti, der allerede findes på denne enhed.",
+    "WinoAccount_Management_ImportPartial": "Anvendte {0} synkroniserede præferencer. {1} præferencer kunne ikke gendannes.",
+    "WinoAccount_Management_ImportReloginReminder": "Adgangskoder, tokens og andre følsomme oplysninger blev ikke importeret. Log ind igen for hver konto på denne enhed, før du bruger den.",
+    "WinoAccount_Management_SerializeFailed": "Wino kunne ikke serialisere dine nuværende præferencer.",
+    "WinoAccount_Management_EmptyExport": "Der er ingen præferencer at eksportere.",
+    "WinoAccount_Management_ImportEmpty": "Den synkroniserede datapayload indeholder ikke noget nyt at gendanne.",
+    "WinoAccount_Management_ExportDialog_Title": "Eksporter til din Wino-konto",
+    "WinoAccount_Management_ExportDialog_Description": "Vælg, hvad du vil synkronisere til din Wino-konto.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Præferencer",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Konti",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Adgangskoder, tokens og andre følsomme oplysninger synkroniseres ikke.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Importerede konti på en anden PC kræver stadig, at du logger ind igen, før de kan bruges.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Eksporterer dine valgte Wino-data...",
+    "WinoAccount_Management_LoadFailed": "Wino kunne ikke indlæse de seneste oplysninger om Wino-kontoen.",
+    "WinoAccount_Management_ActionFailed": "Anmodningen til Wino-kontoen kunne ikke gennemføres.",
+    "WinoAccount_SettingsSection_Title": "Wino-konto",
+    "WinoAccount_SettingsSection_Description": "Opret eller log ind på en Wino-konto ved hjælp af din localhost-godkendelsestjeneste.",
+    "WinoAccount_RegisterButton_Title": "Registrer konto",
+    "WinoAccount_RegisterButton_Description": "Opret en Wino-konto med e-mail og adgangskode.",
+    "WinoAccount_RegisterButton_Action": "Åbn registrering",
+    "WinoAccount_LoginButton_Title": "Log ind",
+    "WinoAccount_LoginButton_Description": "Log ind på en eksisterende Wino-konto med e-mail og adgangskode.",
+    "WinoAccount_LoginButton_Action": "Åbn login",
+    "WinoAccount_SignOutButton_Title": "Log ud",
+    "WinoAccount_SignOutButton_Description": "Fjern den lokalt gemte Wino-konto-session.",
+    "WinoAccount_SignOutButton_Action": "Log ud",
+    "WinoAccount_RegisterDialog_Title": "Opret Wino-konto",
+    "WinoAccount_RegisterDialog_Description": "Opret en Wino-konto for at holde din Wino-oplevelse i synkroniseret og låse op kontobaserede tilføjelser.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Opret din Wino-konto",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Hvorfor oprette en?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importer og eksporter indstillinger på tværs af enheder.",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Flyt dine Wino-præferencer mellem enheder uden at skulle opbygge dit setup fra bunden.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Få adgang til eksklusive tilføjelser som Wino AI Pack (betalt)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Brug én konto til at låse op for Wino-premium-funktioner, efterhånden som de bliver tilgængelige.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino-kontoen er adskilt fra dine mailkonti.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Dine Outlook-, Gmail-, IMAP-, eller andre e-mailkonti forbliver præcis som de er. En Wino-konto håndterer udelukkende Wino-specifikke funktioner og kontobaserede tilføjelser.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrer",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privatliv og API-behandling",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Valgfrie tilføjelser som Wino AI Pack kan sende udvalgte e-mail HTML-indhold til Wino API-tjenesten, kun når du bruger disse funktioner.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Læs privatlivspolitikken",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Jeg accepterer privatlivspolitikken.",
+    "WinoAccount_LoginDialog_Title": "Log ind på Wino-konto",
+    "WinoAccount_LoginDialog_Description": "Log ind på din Wino-konto for at synkronisere din Wino-opsætning og få adgang til kontobaserede funktioner.",
+    "WinoAccount_LoginDialog_HeroTitle": "Velkommen tilbage.",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Hvad du får ved at logge ind.",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Brug din Wino-konto til at fortsætte synkronisering af indstillinger på tværs af enheder og få adgang til betalte tilføjelser som Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Dette er ikke din e-mailkonto-login.",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Log ind her tilføjer ikke eller erstatter dine Outlook-, Gmail-, eller IMAP-konti i Wino. Det logger dig kun ind på Wino-specifikke tjenester.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Glemt adgangskode?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Adgangskode",
+    "WinoAccount_ConfirmPasswordLabel": "Bekræft adgangskode",
+    "WinoAccount_ForgotPasswordDialog_Title": "Nulstil din adgangskode.",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Send nulstillings-e-mail.",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Tilbage til log ind",
+    "WinoAccount_ForgotPasswordDialog_Description": "Indtast din Wino-konto-e-mailadresse, og vi sender dig et link til nulstilling af adgangskoden, hvis adressen er registreret.",
+    "WinoAccount_Validation_EmailRequired": "E-mail er påkrævet.",
+    "WinoAccount_Validation_PasswordRequired": "Adgangskode er påkrævet.",
+    "WinoAccount_Validation_PasswordMismatch": "Adgangskoderne stemmer ikke overens.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Du skal acceptere privatlivspolitikken, før du opretter en Wino-konto.",
+    "WinoAccount_Error_InvalidCredentials": "E-mailadressen eller adgangskoden er forkert.",
+    "WinoAccount_Error_AccountLocked": "Denne konto er midlertidigt låst.",
+    "WinoAccount_Error_AccountBanned": "Denne konto er blevet forbudt.",
+    "WinoAccount_Error_AccountSuspended": "Denne konto er blevet suspenderet.",
+    "WinoAccount_Error_EmailNotConfirmed": "Bekræft venligst din e-mailadresse, før du logger ind.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Bekræft venligst din e-mailadresse, før du logger ind.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "En ny bekræftelses-e-mail er endnu ikke tilgængelig.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Denne bekræftelsesanmodning er ikke længere gyldig. Prøv at logge ind igen.",
+    "WinoAccount_Error_EmailNotRegistered": "Denne e-mailadresse er ikke registreret.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Din session er ikke længere gyldig. Log ind igen.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Denne e-mailadresse er allerede registreret.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "En e-mailadresse er påkrævet for at fuldføre ekstern sign-in.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Anmodningen om ekstern sign-in er ugyldig.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Den eksterne sign-in-tilstand er ugyldig eller udløbet.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Den eksterne sign-in-kode er ugyldig eller udløbet.",
+    "WinoAccount_Error_AiPackRequired": "Et aktivt Wino AI Pack-abonnement er påkrævet for denne handling.",
+    "WinoAccount_Error_AiQuotaExceeded": "Din AI Pack-brugsgrænse er nået for den aktuelle faktureringsperiode.",
+    "WinoAccount_Error_AiHtmlEmpty": "Der er ikke noget e-mailindhold at behandle.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Denne e-mail er for stor til at behandles med Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Det sprog understøttes ikke. Prøv en gyldig kulturkode som en-US eller tr-TR.",
+    "WinoAccount_Error_Forbidden": "Du har ikke tilladelse til at udføre denne handling.",
+    "WinoAccount_Error_ValidationFailed": "Anmodningen er ugyldig. Gennemgå de indtastede værdier.",
+    "WinoAccount_RegisterSuccessMessage": "Registrering af Wino-kontoen er gennemført for {0}.",
+    "WinoAccount_LoginSuccessMessage": "Logget ind på Wino-konto som {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Bekræft din e-mailadresse",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Vi har sendt en bekræftelses-e-mail til {0}. Bekræft den venligst og prøv at logge ind igen.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "E-mailbekræftelse kræves.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Vi venter stadig på, at du bekræfter {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Send bekræftelses-e-mail igen.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Du kan sende bekræftelses-e-mailen igen om {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Du kan nu sende bekræftelses-e-mailen igen.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Bekræftelses-e-mail gensendt.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Vi har sendt endnu en bekræftelses-e-mail til {0}. Bekræft den venligst og prøv at logge ind igen.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Nulstillings-e-mailen er sendt.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Vi har sendt en nulstillings-e-mail til {0}. Åbn den besked for at vælge en ny adgangskode.",
+    "WinoAccount_ChangePassword_Title": "Skift adgangskode.",
+    "WinoAccount_ChangePassword_Description": "Send en nulstillings-e-mail til denne Wino-konto.",
+    "WinoAccount_ChangePassword_Action": "Send nulstillings-e-mail.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Vil du have Wino til at sende en nulstilling af adgangskoden til {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Logget ud fra Wino-konto {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Der er ingen aktiv Wino-konto til at logge ud.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino-konto",
+    "WinoAccount_Titlebar_SignedOutDescription": "Log ind eller opret en Wino-konto for at styre din Wino-session.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Tilføj konto",
+    "WelcomeWizard_Step3Title": "Afslut opsætningen",
+    "ProviderSelection_Title": "Vælg din e-mail-udbyder",
+    "ProviderSelection_Subtitle": "Vælg en udbyder nedenfor for at tilføje din e-mail-konto til Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Konto navn",
+    "ProviderSelection_AccountNamePlaceholder": "f.eks. Personlig, Arbejde",
+    "ProviderSelection_DisplayNameHeader": "Vis navn",
+    "ProviderSelection_DisplayNamePlaceholder": "f.eks. John Doe",
+    "ProviderSelection_EmailHeader": "E-mailadresse",
+    "ProviderSelection_EmailPlaceholder": "f.eks. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "App-specifikt kodeord",
+    "ProviderSelection_AppPasswordHelp": "Hvordan får jeg et app-specifikt kodeord?",
+    "ProviderSelection_CalendarModeHeader": "Kalenderintegration",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Deaktiveret",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Ingen kalenderintegration",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV-synchronisering",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Dine kalenderbegivenheder synkroniseres mellem dine enheder til Apples servere.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Dine kalenderbegivenheder synkroniseres mellem dine enheder til Yahoo-servere.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokal kalender",
+    "ProviderSelection_CalendarMode_LocalDescription": "Dine begivenheder gemmes kun på din computer. Ingen forbindelse til servere.",
+    "ProviderSelection_ClearColor": "Ryd farve",
+    "ProviderSelection_ContinueButton": "Fortsæt",
+    "ProviderSelection_SpecialImap_Subtitle": "Indtast dine kontooplysninger for at oprette forbindelse.",
+    "AccountSetup_Title": "Opsætning af din konto",
+    "AccountSetup_Step_Authenticating": "Autentificerer med {0}",
+    "AccountSetup_Step_TestingMailAuth": "Tester mailgodkendelse",
+    "AccountSetup_Step_SyncingFolders": "Synkroniserer mappemetadata",
+    "AccountSetup_Step_FetchingProfile": "Henter profiloplysninger",
+    "AccountSetup_Step_DiscoveringCalDav": "Opdager CalDAV-indstillinger",
+    "AccountSetup_Step_TestingCalendarAuth": "Tester kalenderautentificering",
+    "AccountSetup_Step_SavingAccount": "Gemmer kontooplysninger",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Henter kalendermetadata",
+    "AccountSetup_Step_SyncingAliases": "Synkroniserer aliaser",
+    "AccountSetup_Step_Finalizing": "Færdiggør opsætningen",
+    "AccountSetup_FailureMessage": "Opsætningen mislykkedes. Gå tilbage for at rette dine indstillinger, eller prøv igen senere.",
+    "AccountSetup_SuccessMessage": "Din konto er oprettet med succes!",
+    "AccountSetup_GoBackButton": "Gå tilbage",
+    "AccountSetup_TryAgainButton": "Prøv igen",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatisk opdagelse mislykkedes. Indtast indstillingerne manuelt i fanen Avanceret."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/de_DE/resources.json b/Wino.Core.Domain/Translations/de_DE/resources.json
index 4473568b..735f28e0 100644
--- a/Wino.Core.Domain/Translations/de_DE/resources.json
+++ b/Wino.Core.Domain/Translations/de_DE/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Dieser Account erfordert eine vollständige Neu-Sychronisierung, um fortzufahren. Bitte warten Sie, während Wino Ihre Nachrichten erneut synchronisiert...",
     "AccountContactNameYou": "Sie",
     "AccountCreationDialog_Completed": "alles erledigt",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Kalenderdetails werden abgerufen.",
     "AccountCreationDialog_FetchingEvents": "Kalenderereignisse werden abgerufen.",
     "AccountCreationDialog_FetchingProfileInformation": "Lade Profildetails.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Falls Ihr Browser nicht automatisch gestartet wurde, um die Authentifizierung abzuschließen:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "Initialisierung",
     "AccountCreationDialog_PreparingFolders": "Es werden Ordner-Informationen gesammelt.",
     "AccountCreationDialog_SigninIn": "Kontoinformationen wurden gespeichert.",
+    "Purchased": "Gekauft",
     "AccountEditDialog_Message": "Konto-Name",
     "AccountEditDialog_Title": "Konto bearbeiten",
     "AccountPickerDialog_Title": "Konto auswählen",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Ändern Sie den Namen des Kontos in Wino und setzen Sie den gewünschten Absendernamen.",
     "AccountDetailsPage_ColorPicker_Title": "Konto-Farbe",
     "AccountDetailsPage_ColorPicker_Description": "Zuweisen einer neuen Kontofarbe, um das Symbol in der Liste einzufärben.",
+    "AccountDetailsPage_TabGeneral": "Allgemein",
+    "AccountDetailsPage_TabMail": "E-Mail",
+    "AccountDetailsPage_TabCalendar": "Kalender",
+    "AccountDetailsPage_CalendarListDescription": "Wähle einen Kalender aus, um dessen Einstellungen zu konfigurieren.",
     "AddHyperlink": "Hinzufügen",
     "AppCloseBackgroundSynchronizationWarningTitle": "Hintergrundsynchronisierung",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Die Anwendung wird beim Start von Windows nicht gestartet.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP-Konto",
     "Busy": "Beschäftigt",
     "Buttons_AddAccount": "Konto hinzufügen",
+    "Buttons_FixAccount": "Konto reparieren",
     "Buttons_AddNewAlias": "Neuen Alias hinzufügen",
     "Buttons_Allow": "Erlauben",
+    "Buttons_Apply": "Übernehmen",
     "Buttons_ApplyTheme": "Thema anwenden",
     "Buttons_Browse": "Durchsuchen",
     "Buttons_Cancel": "Abbrechen",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Bearbeiten",
     "Buttons_EnableImageRendering": "Aktivieren",
     "Buttons_Multiselect": "Mehrfachauswahl",
+    "Buttons_Manage": "Verwalten",
     "Buttons_No": "Nein",
     "Buttons_Open": "Öffnen",
     "Buttons_Purchase": "Kaufen",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Speichern",
     "Buttons_SaveConfiguration": "Einstellungen speichern",
     "Buttons_Send": "Senden",
+    "Buttons_SendToServer": "An Server senden",
     "Buttons_Share": "Teilen",
     "Buttons_SignIn": "Anmelden",
     "Buttons_Sync": "Synchronisieren",
     "Buttons_SyncAliases": "Aliase synchronisieren",
     "Buttons_TryAgain": "Wiederholen",
     "Buttons_Yes": "Ja",
+    "Sync_SynchronizingFolder": "Synchronisiere {0} {1}%",
+    "Sync_DownloadedMessages": "Heruntergeladene {0} Nachrichten von {1}",
+    "SyncAction_Archiving": "Archivieren von {0} E-Mail(n)",
+    "SyncAction_ClearingFlag": "Markierung von {0} E-Mail(n) aufheben",
+    "SyncAction_CreatingDraft": "Entwurf erstellen",
+    "SyncAction_CreatingEvent": "Termin erstellen",
+    "SyncAction_Deleting": "Lösche {0} E-Mail(n)",
+    "SyncAction_EmptyingFolder": "Ordner leeren",
+    "SyncAction_MarkingAsRead": "Markiere {0} E-Mail(n) als gelesen",
+    "SyncAction_MarkingAsUnread": "Markiere {0} E-Mail(n) als ungelesen",
+    "SyncAction_MarkingFolderAsRead": "Ordner als gelesen markieren",
+    "SyncAction_Moving": "Verschiebe {0} E-Mail(n)",
+    "SyncAction_MovingToFocused": "Verschiebe {0} E-Mail(n) in den Fokus-Posteingang",
+    "SyncAction_RenamingFolder": "Ordner umbenennen",
+    "SyncAction_SendingMail": "E-Mail wird gesendet",
+    "SyncAction_SettingFlag": "Flagge setzen für {0} E-Mail(n)",
+    "SyncAction_SynchronizingAccount": "Synchronisiere {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronisiere {0} Konto(n)",
+    "SyncAction_SynchronizingCalendarData": "Synchronisiere Kalenderdaten",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronisiere Kalenderereignisse",
+    "SyncAction_SynchronizingCalendarMetadata": "Kalender-Metadaten synchronisieren",
+    "SyncAction_Unarchiving": "Aus dem Archiv wiederherstellen von {0} E-Mail(n)",
     "CalendarAllDayEventSummary": "ganztägige Ereignisse",
     "CalendarDisplayOptions_Color": "Farbe",
     "CalendarDisplayOptions_Expand": "Ausklappen",
+    "CalendarEventResponse_Accept": "Annehmen",
+    "CalendarEventResponse_AcceptedResponse": "Akzeptiert",
+    "CalendarEventResponse_Decline": "Ablehnen",
+    "CalendarEventResponse_DeclinedResponse": "Abgelehnt",
+    "CalendarEventResponse_NotResponded": "Noch nicht beantwortet",
+    "CalendarEventResponse_Tentative": "Vorläufig",
+    "CalendarEventResponse_TentativeResponse": "Vorläufig",
+    "CalendarEventRsvpPanel_Accept": "Annehmen",
+    "CalendarEventRsvpPanel_AddMessage": "Füge eine Nachricht zu deiner Antwort hinzu... (optional)",
+    "CalendarEventRsvpPanel_Decline": "Ablehnen",
+    "CalendarEventRsvpPanel_Message": "Nachricht",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Antwortnachricht senden",
+    "CalendarEventRsvpPanel_Tentative": "Vorläufig",
+    "CalendarEventRsvpPanel_Title": "Antwortoptionen",
+    "CalendarAttendeeStatus_Accepted": "Akzeptiert",
+    "CalendarAttendeeStatus_Declined": "Abgelehnt",
+    "CalendarAttendeeStatus_NeedsAction": "Erfordert Aktion",
+    "CalendarAttendeeStatus_Tentative": "Vorläufig",
+    "CalendarEventDetails_Attachments": "Anhänge",
+    "CalendarEventCompose_AddAttachment": "Anhang hinzufügen",
+    "CalendarEventCompose_AllDay": "Ganztägig",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Anhänge werden für CalDAV-Kalender nicht unterstützt.",
+    "CalendarEventCompose_EndDate": "Enddatum",
+    "CalendarEventCompose_EndTime": "Endzeit",
+    "CalendarEventCompose_Every": "jeden",
+    "CalendarEventCompose_ForWeekdays": "für",
+    "CalendarEventCompose_FrequencyDay": "Tag",
+    "CalendarEventCompose_FrequencyDayPlural": "Tage",
+    "CalendarEventCompose_FrequencyMonth": "Monat",
+    "CalendarEventCompose_FrequencyMonthPlural": "Monate",
+    "CalendarEventCompose_FrequencyWeek": "Woche",
+    "CalendarEventCompose_FrequencyWeekPlural": "Wochen",
+    "CalendarEventCompose_FrequencyYear": "Jahr",
+    "CalendarEventCompose_FrequencyYearPlural": "Jahre",
+    "CalendarEventCompose_Location": "Ort",
+    "CalendarEventCompose_LocationPlaceholder": "Ort hinzufügen",
+    "CalendarEventCompose_NewEventButton": "Neuer Termin",
+    "CalendarEventCompose_DefaultCalendarHint": "Sie können in den Kalender-Einstellungen einen Standardkalender für neue Termine auswählen.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Kalender-Einstellungen öffnen",
+    "CalendarEventCompose_NoCalendarsMessage": "Für die Termin-Erstellung stehen noch keine Kalender zur Verfügung.",
+    "CalendarEventCompose_NoCalendarsTitle": "Keine Kalender verfügbar",
+    "CalendarEventCompose_NoEndDate": "Kein Enddatum",
+    "CalendarEventCompose_Notes": "Notizen",
+    "CalendarEventCompose_PickCalendarTitle": "Wähle einen Kalender",
+    "CalendarEventCompose_Recurring": "Wiederkehrend",
+    "CalendarEventCompose_RecurringSummary": "Tritt alle {0} {1}{2} {3} in Kraft {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Tritt {0}{1} {2} in Kraft {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Wiederhole alle",
+    "CalendarEventCompose_SelectCalendar": "Kalender auswählen",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Findet statt am {0} {1}",
+    "CalendarEventCompose_StartDate": "Startdatum",
+    "CalendarEventCompose_StartTime": "Startzeit",
+    "CalendarEventCompose_TimeRangeSummary": "von {0} bis {1}",
+    "CalendarEventCompose_Title": "Veranstaltungstitel",
+    "CalendarEventCompose_TitlePlaceholder": "Titel hinzufügen",
+    "CalendarEventCompose_Until": "bis",
+    "CalendarEventCompose_UntilSummary": " bis {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Das Enddatum eines Ganztags-Ereignisses muss nach dem Startdatum liegen.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Ein oder mehrere Teilnehmer haben eine ungültige E-Mail-Adresse.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Das Enddatum der Wiederholung muss gleich oder nach dem Startdatum des Termins liegen.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Die Endzeit muss später als die Startzeit sein.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Ein oder mehrere Anhänge sind nicht mehr verfügbar: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Wähle einen Kalender, bevor du das Ereignis erstellst.",
+    "CalendarEventCompose_ValidationMissingTitle": "Gib vor dem Erstellen des Termins einen Titel ein.",
+    "CalendarEventCompose_ValidationTitle": "Terminvalidierung fehlgeschlagen",
+    "CalendarEventCompose_WeekdaySummary": " am {0}",
+    "CalendarEventCompose_Weekday_Friday": "Fr",
+    "CalendarEventCompose_Weekday_Monday": "Mo",
+    "CalendarEventCompose_Weekday_Saturday": "Sa",
+    "CalendarEventCompose_Weekday_Sunday": "So",
+    "CalendarEventCompose_Weekday_Thursday": "Do",
+    "CalendarEventCompose_Weekday_Tuesday": "Di",
+    "CalendarEventCompose_Weekday_Wednesday": "Mi",
+    "CalendarEventDetails_Details": "Details",
+    "CalendarEventDetails_EditSeries": "Serie bearbeiten",
+    "CalendarEventDetails_Editing": "Bearbeiten",
+    "CalendarEventDetails_InviteSomeone": "Jemand einladen",
+    "CalendarEventDetails_JoinOnline": "Online teilnehmen",
+    "CalendarEventDetails_Organizer": "Organisator",
+    "CalendarEventDetails_People": "Personen",
+    "CalendarEventDetails_ReadOnlyEvent": "Schreibgeschütztes Ereignis",
+    "CalendarEventDetails_Reminder": "Erinnerung",
+    "CalendarReminder_StartedHoursAgo": "Vor {0} Stunden gestartet",
+    "CalendarReminder_StartedMinutesAgo": "Vor {0} Minuten gestartet",
+    "CalendarReminder_StartedNow": "Gerade gestartet",
+    "CalendarReminder_StartingNow": "Startet jetzt",
+    "CalendarReminder_StartsInHours": "Beginnt in {0} Stunden",
+    "CalendarReminder_StartsInMinutes": "Beginnt in {0} Minuten",
+    "CalendarReminder_SnoozeAction": "Schlummern",
+    "CalendarReminder_SnoozeMinutesOption": "{0} Minuten",
+    "CalendarEventDetails_ShowAs": "Anzeigen als",
+    "CalendarShowAs_Free": "Verfügbar",
+    "CalendarShowAs_Tentative": "Vorgemerkt",
+    "CalendarShowAs_Busy": "Beschäftigt",
+    "CalendarShowAs_OutOfOffice": "Außer Haus",
+    "CalendarShowAs_WorkingElsewhere": "Arbeiten woanders",
     "CalendarItem_DetailsPopup_JoinOnline": "Online beitreten",
     "CalendarItem_DetailsPopup_ViewEventButton": "Event anzeigen",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Serie anzeigen",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} in die Zwischenablage kopiert.",
     "ClipboardTextCopied_Title": "Kopiert",
     "ClipboardTextCopyFailed_Message": "{0} konnte nicht in die Zwischenablage kopiert werden.",
+    "ContactInfoBar_ErrorTitle": "Fehler beim Laden der Kontaktinformationen",
+    "ContactInfoBar_SuccessTitle": "Kontaktinformationen geladen",
+    "ContactInfoBar_WarningTitle": "Kontaktinformationen könnten unvollständig sein",
     "ComingSoon": "Bald verfügbar...",
     "ComposerAttachmentsDragDropAttach_Message": "Anhängen",
     "ComposerAttachmentsDropZone_Message": "Dateien hier ablegen",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Name des Konto-Links",
     "DialogMessage_DeleteAccountConfirmationMessage": "{0} löschen?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Alle mit diesem Konto verknüpften Daten werden dauerhaft von der Festplatte gelöscht.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Vorlage \"{0}\" löschen?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "E-Mail-Vorlage löschen",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Dies wird alle Termine in der Serie löschen. Möchten Sie fortfahren?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Wiederkehrende Serie löschen",
     "DialogMessage_DiscardDraftConfirmationMessage": "Dieser Entwurf wird verworfen. Möchten Sie fortfahren?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Entwurf verwerfen",
     "DialogMessage_EmptySubjectConfirmation": "Betreff fehlt",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Heller Modus",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Fehler beim Einrichten der Systemordner",
+    "Exception_AccountNeedsAttention_Title": "Konto benötigt Aufmerksamkeit",
+    "Exception_AccountNeedsAttention_Message": "'{0}' erfordert Ihre Aufmerksamkeit, um weiterzuarbeiten.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail konnte Microsoft Edge WebView2 Runtime nicht finden. Bitte installieren oder reparieren Sie die Laufzeit, damit die Nachrichteninhalte korrekt dargestellt werden.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2-Laufzeit erforderlich",
     "Exception_AuthenticationCanceled": "Authentifizierung abgebrochen",
     "Exception_CustomThemeExists": "Dieses Thema existiert bereits.",
     "Exception_CustomThemeMissingName": "Sie müssen einen Namen angeben.",
     "Exception_CustomThemeMissingWallpaper": "Sie müssen ein eigenes Hintergrundbild angeben.",
     "Exception_FailedToSynchronizeAliases": "Fehler beim Synchronisieren der Aliase",
+    "Exception_FailedToSynchronizeCalendarData": "Kalenderdaten konnten nicht synchronisiert werden.",
+    "Exception_FailedToSynchronizeCalendarEvents": "Kalendereinträge konnten nicht synchronisiert werden.",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Kalendermetadaten konnten nicht synchronisiert werden.",
     "Exception_FailedToSynchronizeFolders": "Fehler beim Synchronisieren der Ordner",
     "Exception_FailedToSynchronizeProfileInformation": "Fehler beim Synchronisieren der Profilinformationen",
     "Exception_GoogleAuthCallbackNull": "'Callback uri ist 'null' bei der Aktivierung.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "In den Papierkorb verschieben",
     "HoverActionOption_ToggleFlag": "Markieren / Markierung entfernen",
     "HoverActionOption_ToggleRead": "Lesen / Ungelesen",
+    "KeyboardShortcuts_FailedToReset": "Tastenkombinationen konnten nicht zurückgesetzt werden.",
+    "KeyboardShortcuts_FailedToUpdate": "Tastenkombinationen konnten nicht aktualisiert werden.",
+    "KeyboardShortcuts_MailoperationAction": "Aktion",
+    "KeyboardShortcuts_Action": "Aktion",
+    "KeyboardShortcuts_FailedToLoad": "Tastenkombinationen konnten nicht geladen werden.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Bitte drücken Sie eine Taste für die Verknüpfung.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Bitte wählen Sie eine Aktion für die Verknüpfung.",
+    "KeyboardShortcuts_EnterKey": "Bitte drücken Sie eine Taste für die Verknüpfung.",
+    "KeyboardShortcuts_SelectOperation": "Bitte wählen Sie eine Aktion für die Verknüpfung.",
+    "KeyboardShortcuts_ShortcutInUse": "Diese Verknüpfung wird bereits von einer anderen Verknüpfung verwendet.",
+    "KeyboardShortcuts_FailedToSave": "Die Verknüpfung konnte nicht gespeichert werden.",
+    "KeyboardShortcuts_FailedToDelete": "Die Verknüpfung konnte nicht gelöscht werden.",
+    "KeyboardShortcuts_PageDescription": "Richten Sie Tastenkombinationen für schnelle Mail-Operationen ein. Drücken Sie Tasten, während der Fokus im Tastatureingabefeld liegt, um Verknüpfungen zu erfassen.",
+    "KeyboardShortcuts_Add": "Verknüpfung hinzufügen",
+    "KeyboardShortcuts_EditTitle": "Tastenkombination bearbeiten",
+    "KeyboardShortcuts_ResetToDefaults": "Auf Standardwerte zurücksetzen",
+    "KeyboardShortcuts_PressKeysHere": "Drücken Sie hier Tasten...",
+    "KeyboardShortcuts_KeyCombination": "Tastenkombination",
+    "KeyboardShortcuts_FocusArea": "Fokusfeld oben auswählen und die gewünschte Tastenkombination drücken",
+    "KeyboardShortcuts_Modifiers": "Modifikatortasten",
+    "KeyboardShortcuts_Mode": "App-Modus",
+    "KeyboardShortcuts_ModeMail": "Mail",
+    "KeyboardShortcuts_ModeCalendar": "Kalender",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Gelesen/Ungelesen umschalten",
+    "KeyboardShortcuts_ActionToggleFlag": "Flagge umschalten",
+    "KeyboardShortcuts_ActionToggleArchive": "Archiv umschalten",
     "ImageRenderingDisabled": "Bilddarstellung ist für diese Nachricht deaktiviert.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentifizierungsmethode",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Verbindungssicherheit",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Benutzername",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Den gleichen Benutzernamen und das gleiche Passwort für das Senden von E-Mails verwenden",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP- und Kalender-Einrichtung",
+    "ImapCalDavSettingsPage_TitleEdit": "IMAP- und Kalender-Einstellungen bearbeiten",
+    "ImapCalDavSettingsPage_Subtitle": "Richten Sie IMAP/SMTP und optionale Kalender-Synchronisierung für dieses Konto ein.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Grundkonfiguration",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Geben Sie Ihre Identität und Anmeldedaten ein. Wino kann versuchen, die Servereinstellungen automatisch zu erkennen.",
+    "ImapCalDavSettingsPage_BasicTab": "Grundlegend",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Kalendersupport aktivieren",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Mail-Einstellungen automatisch erkennen",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Mail-Einstellungen wurden erkannt und angewendet.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Erweiterte Konfiguration",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Geben Sie Servereinstellungen manuell ein, wenn die automatische Erkennung nicht verfügbar oder falsch ist.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Erweitert",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Kalender-Einrichtung",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Wählen Sie aus, wie Kalenderdaten für dieses IMAP-Konto funktionieren sollen.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalendermodus",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Verbindungssicherheit",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Authentifizierungsmethode",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Deaktiviert",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV-Synchronisierung",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Nur lokaler Kalender",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Der Kalender ist für dieses Konto deaktiviert.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Kalendereinträge werden mit Ihrem CalDAV-Server synchronisiert.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Kalendereinträge werden nur auf diesem Computer gespeichert und nicht mit dem Netzwerk synchronisiert.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Wie der lokale Kalender funktioniert",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Nur lokaler Kalender",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Der lokale Kalender speichert alle Termine nur auf Ihrem Computer. Nichts wird mit iCloud, Yahoo oder einem anderen Anbieter synchronisiert.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV-Service-URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV-Benutzername",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV-Passwort",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV-Test ist nur erforderlich, wenn der Kalendermodus auf CalDAV-Synchronisierung eingestellt ist.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV-Service-URL ist erforderlich.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV-Service-URL muss eine absolute URL sein.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV-Benutzername ist erforderlich.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV-Passwort ist erforderlich.",
+    "ImapCalDavSettingsPage_TestImapButton": "IMAP-Verbindung testen",
+    "ImapCalDavSettingsPage_TestCalDavButton": "CalDAV-Verbindung testen",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP-Verbindung erfolgreich getestet.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV-Verbindung erfolgreich getestet.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Kontoeinstellungen validiert und gespeichert.",
+    "ImapCalDavSettingsPage_ICloudHint": "Verwenden Sie ein app-spezifisches Passwort, das in Ihren Apple-Kontoeinstellungen generiert wird.",
+    "ImapCalDavSettingsPage_YahooHint": "Verwenden Sie ein App-Passwort aus Ihren Yahoo-Kontoeinstellungen.",
     "Info_AccountCreatedMessage": "{0} wurde erstellt",
     "Info_AccountCreatedTitle": "Konto-Erstellung",
     "Info_AccountCreationFailedTitle": "Konto-Erstellung fehlgeschlagen",
     "Info_AccountDeletedMessage": "{0} wurde erfolgreich gelöscht.",
     "Info_AccountDeletedTitle": "Konto gelöscht",
     "Info_AccountIssueFixFailedTitle": "Fehlschlagen",
+    "Info_AccountIssueFixImapMessage": "Öffnen Sie die IMAP- und Kalendereinstellungen-Seite, um Ihre Serveranmeldeinformationen erneut einzugeben.",
+    "Info_AccountAttentionRequiredMessage": "Dieses Konto benötigt Ihre Aufmerksamkeit.",
+    "Info_AccountAttentionRequiredClickableMessage": "Klicken Sie hier, um dieses Konto zu beheben und es erneut zu synchronisieren.",
+    "Info_AccountAttentionRequiredAction": "Beheben",
+    "Info_AccountAttentionRequiredActionHint": "Klicken Sie Beheben, um dieses Kontoproblem zu lösen.",
     "Info_AccountIssueFixSuccessMessage": "Alle Konto-Probleme wurden behoben.",
     "Info_AccountIssueFixSuccessTitle": "Erfolg",
     "Info_AttachmentOpenFailedMessage": "Anhang kann nicht geöffnet werden.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Dieser Ordner wird nicht synchronisiert.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Deaktivierter Ordner",
     "Justify": "Block",
+    "MenuUpdateAvailable": "Update verfügbar",
     "Left": "Links",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "Sie müssen mindestens 2 Konten haben, um Link zu erstellen\nLink wird beim Speichern entfernt",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Archivierung aufheben",
     "MailOperation_ViewMessageSource": "Nachrichtenquelle anzeigen",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Verschiebe {0} Element(e)",
     "MailsSelected": "{0} Element(e) ausgewählt",
     "MarkFlagUnflag": "Als markiert/nicht markiert setzen",
     "MarkReadUnread": "Als gelesen/ungelesen markieren",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Neue Mail",
     "Notifications_WinoUpdatedMessage": "Neue Version {0} herunterladen",
     "Notifications_WinoUpdatedTitle": "Wino Mail wurde aktualisiert.",
+    "Notifications_StoreUpdateAvailableTitle": "Update verfügbar",
+    "Notifications_StoreUpdateAvailableMessage": "Eine neuere Version von Wino Mail ist zum Installieren aus dem Microsoft Store bereit.",
     "OnlineSearchFailed_Message": "Fehler bei der Suche\n{0}\n\nAuflistung von Offline-Mails.",
     "OnlineSearchTry_Line1": "Finden Sie nicht, was Sie suchen?",
     "OnlineSearchTry_Line2": "Online-Suche probieren.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Klein",
     "Photos": "Fotos",
     "PreparingFoldersMessage": "Ordnervorbereitung",
-    "ProtocolLogAvailable_Message": "Protokolle zur Diagnose sind verfügbar.",
     "ProviderDetail_Gmail_Description": "Google-Konto",
     "ProviderDetail_iCloud_Description": "Apple iCloud-Konto",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Suche",
     "SearchingIn": "Suche in",
     "SearchPivotName": "Ergebnisse",
+    "Settings_KeyboardShortcuts_Title": "Tastenkombinationen",
+    "Settings_KeyboardShortcuts_Description": "Verwalten Sie Tastenkombinationen für schnelle Aktionen in Mails.",
     "SettingConfigureSpecialFolders_Button": "Konfigurieren",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP-Konfiguration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Ändern Sie Ihre eingehenden/ausgehenden Servereinstellungen.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP- und Kalender-Einstellungen",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Öffnen Sie die dedizierte IMAP-, SMTP- und CalDAV-Einstellungsseite für dieses Konto.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Einstellungen öffnen",
     "SettingsAbout_Description": "Erfahren Sie mehr über Wino.",
     "SettingsAbout_Title": "Über",
     "SettingsAboutGithub_Description": "Gehen Sie zum Problem-Tracker GitHub-Repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Lokal",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Standard-Suchmodus",
+    "SettingsAppPreferences_ApplicationMode_Title": "Standard-Anwendungsmodus",
+    "SettingsAppPreferences_ApplicationMode_Description": "Wählen Sie aus, in welchem Modus Wino geöffnet wird, wenn kein Aktivierungstyp explizit festgelegt wird.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "E-Mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalender",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail wird weiterhin im Hintergrund ausgeführt. Sie werden benachrichtigt, sobald neue Mails eintreffen.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Im Hintergrund ausführen",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail wird weiterhin im System-Tray laufen. Startet beim Klicken des Symbols die Anwendung. Sie werden benachrichtigt, sobald neue Mails eintreffen.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Ein schwerwiegender Fehler ist beim Ändern des Startmodus für Wino Mail aufgetreten.",
     "SettingsAppPreferences_StartupBehavior_Title": "Beim Start von Windows minimiert starten",
     "SettingsAppPreferences_Title": "App-Präferenzen",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Wino-Konto-Schaltfläche in der Titelleiste ausblenden",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Profil-Schaltfläche in der Titelleiste ausblenden, die das Wino-Konto-Ausklappmenü öffnet.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Store-Update-Benachrichtigungen",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Zeigen Sie Benachrichtigungen und Fußzeilenaktionen, wenn ein Microsoft Store-Update verfügbar ist.",
+    "SettingsAppPreferences_AiActions_Title": "KI-Aktionen",
+    "SettingsAppPreferences_AiActions_Description": "Standard-KI-Sprachen auswählen und Speicherort für Zusammenfassungen festlegen.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Standardsprache der Übersetzung",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Wählen Sie die Standardzielsprache, die von KI-Übersetzungsaktionen verwendet wird.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Zusammenfassungssprache",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Wählen Sie die bevorzugte Sprache für zukünftige KI-Zusammenfassungen.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Standard-Speicherort für Zusammenfassungen",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Wählen Sie den Ordner, der standardmäßig zum Speichern von KI-Zusammenfassungen verwendet wird.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Standard-Speicherort des Systems verwenden",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Dieser Ordner existiert nicht. Der Standard-Speicherort wird für Zusammenfassungen verwendet.",
     "SettingsAutoSelectNextItem_Description": "Das nächste Element auswählen, nachdem Sie eine Mail gelöscht oder verschoben haben.",
     "SettingsAutoSelectNextItem_Title": "Nächsten Eintrag automatisch auswählen",
     "SettingsAvailableThemes_Description": "Wählen Sie ein Thema aus der Sammlung von Wino oder verwenden Sie Ihre eigenen Themen.",
     "SettingsAvailableThemes_Title": "Verfügbare Themen",
     "SettingsCalendarSettings_Description": "Ändern Sie den ersten Tag der Woche, die Stunden-Zellenhöhe und mehr...",
     "SettingsCalendarSettings_Title": "Kalendereinstellungen",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Standard-Schlummerdauer",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Legen Sie eine Standard-Schlummerdauer für Kalender-Erinnerungsbenachrichtigungen fest.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Format der Tagesüberschrift in der Zeitansicht",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Wählen Sie aus, wie die oberen Tag-Bezeichnungen in der Tages-, Wochen- und Arbeitswochenansicht angezeigt werden. Verwenden Sie Datumsformat-Token wie ddd, dd, MMM oder dddd.",
     "SettingsComposer_Title": "Verfasser",
     "SettingsComposerFont_Title": "Standard Verfasser-Schriftart",
     "SettingsComposerFontFamily_Description": "Ändern Sie die Standardschriftart und Schriftgröße für das Verfassen von Mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Kanal",
     "SettingsEditLinkedInbox_Description": "Konten hinzufügen/entfernen, umbenennen oder die Verbindung zwischen Konten unterbrechen.",
     "SettingsEditLinkedInbox_Title": "Verlinkten Posteingang bearbeiten",
+    "SettingsWindowBackdrop_Title": "Fensterhintergrund",
+    "SettingsWindowBackdrop_Description": "Wählen Sie einen Hintergrund-Effekt für Wino-Fenster.",
+    "SettingsWindowBackdrop_Disabled": "Die Fensterhintergrund-Auswahl ist deaktiviert, wenn ein anderes Anwendungs-Theme als Standard ausgewählt ist.",
     "SettingsElementTheme_Description": "Wählen Sie ein Windows-Thema für Wino",
     "SettingsElementTheme_Title": "Element-Thema",
     "SettingsElementThemeSelectionDisabled": "Auswahl des Element-Themas ist deaktiviert, wenn das Anwendungs-Thema nicht als Standard festgelegt ist.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliase",
     "SettingsEditAccountDetails_Title": "Kontodaten bearbeiten",
     "SettingsEditAccountDetails_Description": "Ändern Sie den Kontonamen, Absendernamen und weisen Sie eine neue Farbe zu.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Änderungen gespeichert",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Ihre Kontodaten wurden erfolgreich aktualisiert.",
     "SettingsManageLink_Description": "Elemente verschieben, um neuen Link hinzuzufügen oder bestehenden Link zu entfernen.",
     "SettingsManageLink_Title": "Link verwalten",
     "SettingsMarkAsRead_Description": "Ändern Sie, was mit dem ausgewählten Element passieren soll.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Benachrichtigungen",
     "SettingsNotificationsAndTaskbar_Description": "Passt Benachrichtigungen und das Taskleisten-Symbol für dieses Konto an.",
     "SettingsNotificationsAndTaskbar_Title": "Benachrichtigungen & Taskleiste",
+    "SettingsHome_Title": "Startseite",
+    "SettingsHome_SearchTitle": "Eine Einstellung finden",
+    "SettingsHome_SearchDescription": "Suchen Sie nach Funktion, Thema oder Stichwort, um direkt zur richtigen Einstellungsseite zu springen.",
+    "SettingsHome_SearchPlaceholder": "Einstellungen durchsuchen",
+    "SettingsHome_SearchExamples": "Beispiele: Design, Speicher, Sprache, Signatur",
+    "SettingsHome_QuickLinks_Title": "Schnellzugriffe",
+    "SettingsHome_QuickLinks_Description": "Direkt zu den am häufigsten verwendeten Einstellungen springen.",
+    "SettingsHome_StorageCard_Description": "Sehen Sie, wie viel lokaler MIME-Inhalt Wino auf diesem Gerät speichert, und bereinigen Sie ihn bei Bedarf.",
+    "SettingsHome_StorageEmptySummary": "Noch kein zwischengespeicherter MIME-Inhalt erkannt.",
+    "SettingsHome_StorageLoading": "Lokale MIME-Nutzung wird geprüft...",
+    "SettingsHome_Tips_Title": "Tipps & Tricks",
+    "SettingsHome_Tips_Description": "Ein paar kleine Änderungen können Wino deutlich persönlicher machen.",
+    "SettingsHome_Tip_Theme": "Möchten Sie Dunkelmodus oder Akzentänderungen? Öffnen Sie Personalisierung.",
+    "SettingsHome_Tip_Background": "Verwenden Sie die App-Einstellungen, um das Startverhalten und die Hintergrund-Synchronisierung zu steuern.",
+    "SettingsHome_Tip_Shortcuts": "Tastenkombinationen helfen Ihnen, sich schneller durch Mails zu bewegen.",
+    "SettingsHome_Resources_Title": "Nützliche Links",
+    "SettingsHome_Resources_Description": "Öffnen Sie Projektressourcen, Support-Informationen und Release-Kanäle.",
     "SettingsOptions_Title": "Einstellungen",
+    "SettingsOptions_GeneralSection": "Allgemein",
+    "SettingsOptions_MailSection": "E-Mail",
+    "SettingsOptions_CalendarSection": "Kalender",
+    "SettingsOptions_MoreComingSoon": "Weitere Optionen folgen in Kürze",
+    "SettingsOptions_HeroDescription": "Passen Sie Ihr Wino Mail-Erlebnis an",
+    "SettingsOptions_AccountsSummary": "{0} Konto(n) konfiguriert",
+    "SettingsSearch_ManageAccounts_Keywords": "Konto;Konten;Postfach;Postfächer;Alias;Aliases;Profil;Adresse;Adressen",
+    "SettingsSearch_AppPreferences_Keywords": "Start;Hintergrund;Starten;Synchronisierung;Benachrichtigungen;Suche;Systemablage;Standardeinstellungen",
+    "SettingsSearch_LanguageTime_Keywords": "Sprache;Zeit;Uhr;Locale;Region;Format;24-Stunden;24h",
+    "SettingsSearch_Personalization_Keywords": "Design;dunkel;hell;Aussehen;Akzent;Farbe;Farbe;Modus;Layout;Dichte",
+    "SettingsSearch_About_Keywords": "Über;Version;Website;Datenschutz;GitHub;Spenden;Store;Support",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "Tastenkürzel;Tastenkürzel;Hotkeys;Hotkeys;Tastatur;Tasten",
+    "SettingsSearch_MessageList_Keywords": "Nachrichten;Nachrichten;Liste;Threads;Threads;Avatar;Vorschau;Absender",
+    "SettingsSearch_ReadComposePane_Keywords": "Leser;Verfassen;Verfasser;Schrift;Schriften;Externer Inhalt;Anzeige;Lesen",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "Signatur;Signaturen;Verschlüsselung;Zertifikat;Zertifikate;S/MIME;SMIME;Sicherheit",
+    "SettingsSearch_Storage_Keywords": "Speicher;Cache;Caching;Mime;Festplatte;Speicherplatz;Bereinigung;Bereinigen;Lokale Daten",
+    "SettingsSearch_CalendarSettings_Keywords": "Kalender;Woche;Stunden;Planung;Termin;Termine",
     "SettingsPaneLengthReset_Description": "Setzen Sie die Größe der Mailliste auf die Originaleinstellung zurück, falls sie Probleme haben.",
     "SettingsPaneLengthReset_Title": "Größe der Mailliste zurücksetzen",
     "SettingsPaypal_Description": "Zeigen Sie viel mehr Liebe ❤️ Alle Spenden werden wertgeschätzt.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Uhr-Format in 24 Stunden anzeigen",
     "SettingsPrivacyPolicy_Description": "Datenschutzrichtlinie ansehen.",
     "SettingsPrivacyPolicy_Title": "Datenschutzerklärung",
+    "SettingsWebsite_Description": "Öffnen Sie die Wino Mail-Website.",
+    "SettingsWebsite_Title": "Website",
     "SettingsReadComposePane_Description": "Schriftarten, externe Inhalte.",
     "SettingsReadComposePane_Title": "Leseansicht & Verfasser",
     "SettingsReader_Title": "Leseansicht",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Vorschautext anzeigen",
     "SettingsShowSenderPictures_Description": "Absender-Profilbilder ausblenden/anzeigen.",
     "SettingsShowSenderPictures_Title": "Absender-Profilbilder anzeigen",
+    "SettingsEmailTemplates_Title": "E-Mail-Vorlagen",
+    "SettingsEmailTemplates_Description": "E-Mail-Vorlagen verwalten",
+    "SettingsEmailTemplates_CreatePageTitle": "Neue Vorlage",
+    "SettingsEmailTemplates_EditPageTitle": "Vorlage bearbeiten",
+    "SettingsEmailTemplates_NewTemplateTitle": "Neue Vorlage",
+    "SettingsEmailTemplates_NewTemplateDescription": "Eine neue E-Mail-Vorlage erstellen",
+    "SettingsEmailTemplates_NameTitle": "Name",
+    "SettingsEmailTemplates_NamePlaceholder": "Vorlagenname",
+    "SettingsEmailTemplates_DescriptionTitle": "Beschreibung",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Optionale Beschreibung",
+    "SettingsEmailTemplates_ContentTitle": "Vorlageninhalt",
+    "SettingsEmailTemplates_ContentDescription": "Bearbeiten Sie den HTML-Inhalt für diese Vorlage.",
+    "SettingsEmailTemplates_NameRequired": "Vorlagenname ist erforderlich.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Gravatar (falls verfügbar) als Absenderbild verwenden",
     "SettingsEnableFavicons_Title": "Domain-Icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startelement",
     "SettingsStore_Description": "Zeigen Sie etwas Liebe ❤️",
     "SettingsStore_Title": "Im Store bewerten",
+    "SettingsStorage_Title": "Speicher",
+    "SettingsStorage_Description": "Scannen und Verwalten des MIME-Caches, der in Ihrem lokalen Datenordner gespeichert ist.",
+    "SettingsStorage_ScanFolder": "Lokalen Datenordner scannen",
+    "SettingsStorage_NoLocalMimeDataFound": "Keine lokalen MIME-Daten gefunden.",
+    "SettingsStorage_NoAccountsFound": "Keine Konten gefunden.",
+    "SettingsStorage_TotalUsage": "Gesamter lokaler MIME-Verbrauch: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} im lokalen MIME-Cache verwendet",
+    "SettingsStorage_DeleteAll_Title": "Alle MIME-Inhalte löschen",
+    "SettingsStorage_DeleteAll_Description": "Diesen Kontos MIME-Cache-Ordner vollständig löschen.",
+    "SettingsStorage_DeleteAll_Button": "Alle löschen",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Alle MIME-Inhalte löschen",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Alle lokalen MIME-Daten für {0} löschen?",
+    "SettingsStorage_DeleteAll_Success": "Alle MIME-Inhalte wurden gelöscht.",
+    "SettingsStorage_DeleteOld_Title": "Alte MIME-Inhalte löschen",
+    "SettingsStorage_DeleteOld_Description": "Lösche MIME-Dateien basierend auf dem Erstellungsdatum der E-Mails in der lokalen Datenbank.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 Monat",
+    "SettingsStorage_DeleteOld_3Months": "> 3 Monate",
+    "SettingsStorage_DeleteOld_6Months": "> 6 Monate",
+    "SettingsStorage_DeleteOld_1Year": "> 1 Jahr",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Alte MIME-Inhalte löschen",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Lokale MIME-Daten, die älter sind als {0}, für {1} löschen?",
+    "SettingsStorage_DeleteOld_Success": "{0} MIME-Ordner älter als {1} gelöscht.",
+    "SettingsStorage_1Month": "1 Monat",
+    "SettingsStorage_3Months": "3 Monate",
+    "SettingsStorage_6Months": "6 Monate",
+    "SettingsStorage_1Year": "1 Jahr",
+    "SettingsStorage_Months": "{0} Monate",
     "SettingsTaskbarBadge_Description": "Zeigt die Anzahl der ungelesenen Mails auf der Taskleiste an.",
     "SettingsTaskbarBadge_Title": "Taskleisten-Symbol",
     "SettingsThreads_Description": "Nachrichten in Unterhaltungsthreads organisieren.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Sie können den Posteingang keinem anderen Systemordner zuordnen.",
     "SystemFolderConfigSetupSuccess_Message": "Systemordner wurden erfolgreich konfiguriert.",
     "SystemFolderConfigSetupSuccess_Title": "Systemordner-Einrichtung",
+    "SystemTrayMenu_ShowWino": "Wino Mail öffnen",
+    "SystemTrayMenu_ShowWinoCalendar": "Wino Kalender öffnen",
+    "SystemTrayMenu_ExitWino": "Beenden",
     "TestingImapConnectionMessage": "Serververbindung wird getestet...",
     "TitleBarServerDisconnectedButton_Description": "Wino ist vom Netzwerk getrennt. Klicken Sie auf \"Erneut verbinden\", um die Verbindung wiederherzustellen.",
     "TitleBarServerDisconnectedButton_Title": "Keine Verbindung",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Auf unbegrenzte Konten upgraden",
     "WinoUpgradeRemainingAccountsMessage": "{0} von {1} kostenlosen Konten verwendet.",
     "Yesterday": "Gestern",
+    "Smime_ImportCertificates_Success": "Zertifikate erfolgreich importiert.",
+    "Smime_ImportCertificates_Error": "Fehler beim Importieren der Zertifikate: {0}",
+    "Smime_RemoveCertificates_Confirm": "Möchten Sie wirklich die Zertifikate {0} entfernen?",
+    "Smime_RemoveCertificates_Success": "Zertifikate entfernt.",
+    "Smime_ExportCertificates_Success": "Zertifikate exportiert.",
+    "Smime_ExportCertificates_Error": "Fehler beim Exportieren der Zertifikate.",
+    "Smime_CertificateDetails": "Betreff: {0}\\nAussteller: {1}\\nGültig von: {2}\\nGültig bis: {3}\\nFingerabdruck: {4}",
+    "Smime_CertificatePassword_Title": "Zertifikatspasswort erforderlich",
+    "Smime_CertificatePassword_Placeholder": "Zertifikatpasswort für {0} (optional)",
+    "Smime_Confirm_Title": "Bestätigen",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Aktualisieren",
+    "SettingsSignatureAndEncryption_Title": "Signatur und Verschlüsselung",
+    "SettingsSignatureAndEncryption_Description": "S/MIME-Zertifikate zum Signieren und Verschlüsseln von E-Mails verwalten.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Meine Zertifikate",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Persönliche Zertifikate zum Signieren und Verschlüsseln",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Zertifikate der Empfänger",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Zertifikate der Empfänger zum Entschlüsseln",
+    "SettingsSignatureAndEncryption_NameColumn": "Name",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Läuft ab am",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Fingerabdruck",
+    "Buttons_Remove": "Entfernen",
+    "Buttons_Export": "Exportieren",
+    "Buttons_Import": "Importieren",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME-Signaturzertifikat",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME-Verschlüsselung",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Keines",
+    "SmimeSignaturesInMessage": "Signaturen in dieser Nachricht:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, gültig bis {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME-Signaturzertifikat-Info",
+    "SmimeCertificateInfoTitle": "S/MIME-Zertifikat-Info",
+    "SmimeNoCertificateFileFound": "Kein Zertifikatsdatei gefunden",
+    "SmimeSaveCertificate": "Zertifikat speichern...",
+    "SmimeCertificate": "S/MIME-Zertifikat",
+    "SmimeCertificateSavedTo": "Zertifikat gespeichert unter {0}",
+    "SmimeSignedTooltip": "Diese Nachricht ist mit einem S/MIME-Zertifikat signiert. Zum Anzeigen weiterer Details klicken.",
+    "SmimeEncryptedTooltip": "Diese Nachricht ist mit einem S/MIME-Zertifikat verschlüsselt.",
+    "SmimeCertificateFileInfo": "Datei: {0}",
+    "Composer_LightTheme": "Helles Design",
+    "Composer_DarkTheme": "Dunkles Design",
+    "Composer_Outdent": "Einzug verringern",
+    "Composer_Indent": "Einzug erhöhen",
+    "Composer_BulletList": "Aufzählungsliste",
+    "Composer_OrderedList": "Nummerierte Liste",
+    "Composer_Stroke": "Strich",
+    "Composer_Bold": "Fett",
+    "Composer_Italic": "Kursiv",
+    "Composer_Underline": "Unterstrichen",
+    "Composer_CcBcc": "Cc & Bcc",
+    "Composer_EnableSmimeSignature": "S/MIME-Signatur aktivieren/deaktivieren",
+    "Composer_EnableSmimeEncryption": "S/MIME-Verschlüsselung aktivieren/deaktivieren",
+    "Composer_LocalDraftSyncInfo": "Dieser Entwurf ist nur lokal. Wino konnte ihn nicht an Ihren Mail-Server senden. Klicken Sie, um den Versand erneut zu versuchen.",
+    "Composer_CertificateExpires": "Gültig bis: ",
+    "Composer_SmimeSignature": "S/MIME-Signatur",
+    "Composer_SmimeEncryption": "S/MIME-Verschlüsselung",
+    "Composer_EmailTemplatesPlaceholder": "E-Mail-Vorlagen",
+    "Composer_AiSummarize": "Mit KI zusammenfassen",
+    "Composer_AiSummarizeDescription": "Extrahiert zentrale Punkte, Maßnahmen und Entscheidungen aus dieser E-Mail.",
+    "Composer_AiTranslate": "Mit KI übersetzen",
+    "Composer_AiActions": "KI-Aktionen",
+    "Composer_AiRewrite": "Mit KI umschreiben",
+    "AiActions_CheckingStatus": "KI-Zugriff wird geprüft...",
+    "AiActions_SignedOutTitle": "Wino AI-Paket entsperren",
+    "AiActions_SignedOutDescription": "Übersetzen, Umschreiben und Zusammenfassen von E-Mails mit KI nach der Anmeldung bei Ihrem Wino-Konto und Aktivierung des AI Pack-Add-ons.",
+    "AiActions_NoPackTitle": "KI-Paket erforderlich",
+    "AiActions_NoPackDescription": "Sie sind angemeldet, aber das KI-Paket ist noch nicht aktiv. Kaufen Sie es, um Winos KI-Übersetzung, Umschreiben und Zusammenfassungswerkzeuge zu verwenden.",
+    "AiActions_UsageSummary": "{0} von {1} Credits in diesem Monat verwendet.",
+    "Composer_AiRewritePolite": "Höflicher formulieren",
+    "Composer_AiRewritePoliteDescription": "Formulierung mildern, aber denselben Sinn beibehalten.",
+    "Composer_AiRewriteAngry": "Wütend formulieren",
+    "Composer_AiRewriteAngryDescription": "Verwendet einen schärferen und konfrontativeren Ton.",
+    "Composer_AiRewriteHappy": "Mach es fröhlich",
+    "Composer_AiRewriteHappyDescription": "Fügt einen lebhafteren und enthusiastischeren Ton hinzu.",
+    "Composer_AiRewriteFormal": "Mach es formell.",
+    "Composer_AiRewriteFormalDescription": "Lässt die Nachricht professioneller und strukturierter klingen.",
+    "Composer_AiRewriteFriendly": "Mach es freundlicher.",
+    "Composer_AiRewriteFriendlyDescription": "Lässt die Nachricht freundlicher wirken.",
+    "Composer_AiRewriteShorter": "Mach es kürzer.",
+    "Composer_AiRewriteShorterDescription": "Strafft den Text und entfernt unnötige Details.",
+    "Composer_AiRewriteClearer": "Mach es klarer.",
+    "Composer_AiRewriteClearerDescription": "Verbessert die Lesbarkeit und macht die Nachricht leichter verständlich.",
+    "Composer_AiRewriteCustom": "Benutzerdefiniert",
+    "Composer_AiRewriteCustomDescription": "Beschreiben Sie Ihre gewünschte Umformulierung.",
+    "Composer_AiRewriteCustomPlaceholder": "Beschreiben Sie, wie die Nachricht umformuliert werden soll.",
+    "Composer_AiRewriteMode": "Ton umschreiben",
+    "Composer_AiRewriteApply": "Umformulierung anwenden",
+    "Composer_AiTranslateDialogTitle": "Übersetzen mit KI",
+    "Composer_AiTranslateDialogDescription": "Geben Sie die Zielsprache oder den Kulturcode ein, z. B. en-US, tr-TR, de-DE oder fr-FR.",
+    "Composer_AiTranslateApply": "Übersetzen",
+    "Composer_AiTranslateLanguage": "Zielsprache",
+    "Composer_AiTranslateCustomPlaceholder": "Geben Sie den Kulturcode ein.",
+    "Composer_AiTranslateLanguageEnglish": "Englisch (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Türkisch (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Deutsch (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Französisch (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spanisch (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italienisch (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugiesisch (Brasilien) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Niederländisch (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polnisch (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russisch (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japanisch (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Koreanisch (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinesisch, Vereinfachtes (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabisch (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Andere...",
+    "Composer_AiBusyTitle": "KI arbeitet bereits",
+    "Composer_AiBusyMessage": "Bitte warten Sie, bis der aktuelle KI-Vorgang abgeschlossen ist.",
+    "Composer_AiSignInRequired": "Melden Sie sich bei Ihrem Wino-Konto an, um KI-Funktionen zu verwenden.",
+    "Composer_AiMissingHtml": "Es gibt noch keinen Nachrichteninhalt, der an Wino-KI gesendet werden kann.",
+    "Composer_AiQuotaUnavailable": "Das KI-Ergebnis wurde angewendet.",
+    "Composer_AiAppliedMessage": "Das KI-Ergebnis wurde dem Editor angewendet. Verwenden Sie Rückgängig, wenn Sie es wieder rückgängig machen möchten.",
+    "Composer_AiSummarizeSuccessTitle": "KI-Zusammenfassung angewendet.",
+    "Composer_AiTranslateSuccessTitle": "KI-Übersetzung angewendet.",
+    "Composer_AiRewriteSuccessTitle": "KI-Umformulierung angewendet.",
+    "Composer_AiErrorTitle": "KI-Aktion fehlgeschlagen.",
+    "Reader_AiAppliedMessage": "Das KI-Ergebnis wird jetzt für diese Nachricht angezeigt. Öffnen Sie die Nachricht erneut, um den ursprünglichen Inhalt wieder anzuzeigen.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Intervall für E-Mail-Synchronisierung",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervall für die automatisches E-Mail-Synchronisierung (Minuten). Diese Einstellung wird erst nach einem Neustart von Wino Mail angewendet."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervall für die automatisches E-Mail-Synchronisierung (Minuten). Diese Einstellung wird erst nach einem Neustart von Wino Mail angewendet.",
+    "ContactsPage_Title": "Kontakte",
+    "ContactsPage_AddContact": "Kontakt hinzufügen",
+    "ContactsPage_EditContact": "Kontakt bearbeiten",
+    "ContactsPage_DeleteContact": "Kontakt löschen",
+    "ContactsPage_SearchPlaceholder": "Kontakte durchsuchen...",
+    "ContactsPage_NoContacts": "Keine Kontakte gefunden",
+    "ContactsPage_ContactsCount": "{0} Kontakte",
+    "ContactsPage_SelectedContactsCount": "{0} ausgewählt",
+    "ContactsPage_DeleteSelectedContacts": "Ausgewählte löschen",
+    "ContactEditDialog_Title": "Kontakt bearbeiten",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Foto auswählen",
+    "ContactEditDialog_RemovePhoto": "Foto entfernen",
+    "ContactEditDialog_NameHeader": "Name",
+    "ContactEditDialog_NamePlaceholder": "Kontaktname",
+    "ContactEditDialog_EmailHeader": "E-Mail-Adresse",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Kontaktinformationen",
+    "ContactEditDialog_RootContactInfo": "Dies ist ein Hauptkontakt, der mit Ihren Konten verknüpft ist und nicht gelöscht werden kann.",
+    "ContactEditDialog_OverriddenContactInfo": "Dieser Kontakt wurde manuell bearbeitet und während der Synchronisierung nicht aktualisiert.",
+    "ContactsPage_Subtitle": "Verwalten Sie Ihre E-Mail-Kontakte und deren Informationen.",
+    "ContactStatus_Account": "Konto",
+    "ContactStatus_Modified": "Geändert",
+    "ContactAction_Edit": "Kontakt bearbeiten",
+    "ContactAction_ChangePhoto": "Foto ändern",
+    "ContactAction_Delete": "Kontakt löschen",
+    "ContactAction_Add": "Kontakt hinzufügen",
+    "ContactSelection_Selected": "ausgewählt",
+    "ContactSelection_SelectAll": "Alle auswählen",
+    "ContactSelection_Clear": "Auswahl löschen",
+    "ContactsPage_EmptyState": "Keine Kontakte anzuzeigen",
+    "ContactsPage_AddFirstContact": "Fügen Sie Ihren ersten Kontakt hinzu",
+    "ContactsPage_ContactsCountSuffix": "Kontakte",
+    "ContactsPane_NewContact": "Neuer Kontakt",
+    "ContactsPane_DescriptionTitle": "Verwalten Sie Ihre Kontakte",
+    "ContactsPane_DescriptionBody": "Erstellen Sie Kontakte, benennen Sie sie um, aktualisieren Sie Profilfotos und halten Sie gespeicherte Details an einem Ort organisiert.",
+    "ContactEditDialog_AddTitle": "Kontakt hinzufügen",
+    "ContactInfoBar_ContactAdded": "Kontakt erfolgreich hinzugefügt.",
+    "ContactInfoBar_ContactUpdated": "Kontakt erfolgreich aktualisiert.",
+    "ContactInfoBar_ContactsDeleted": "Kontakte erfolgreich gelöscht.",
+    "ContactInfoBar_ContactPhotoUpdated": "Kontaktfoto erfolgreich aktualisiert.",
+    "ContactInfoBar_FailedToLoadContacts": "Fehler beim Laden der Kontakte: {0}",
+    "ContactInfoBar_FailedToAddContact": "Fehler beim Hinzufügen des Kontakts: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Fehler beim Aktualisieren des Kontakts: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Fehler beim Löschen der Kontakte: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Fehler beim Aktualisieren des Fotos: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Wurzelkontakte können nicht gelöscht werden.",
+    "ContactConfirmDialog_DeleteTitle": "Kontakt löschen",
+    "ContactConfirmDialog_DeleteMessage": "Möchten Sie den Kontakt '{0}' wirklich löschen?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Möchten Sie wirklich {0} Kontakt(e) löschen?",
+    "ContactConfirmDialog_DeleteButton": "Löschen",
+    "CalendarAccountSettings_Title": "Kalenderkonto-Einstellungen",
+    "CalendarAccountSettings_Description": "Kalendereinstellungen für {0} verwalten.",
+    "CalendarAccountSettings_AccountColor": "Kontofarbe",
+    "CalendarAccountSettings_AccountColorDescription": "Anzeige-Farbe für dieses Kalenderkonto ändern",
+    "CalendarAccountSettings_SyncEnabled": "Synchronisierung aktivieren",
+    "CalendarAccountSettings_SyncEnabledDescription": "Kalendersynchronisierung für dieses Konto aktivieren oder deaktivieren",
+    "CalendarAccountSettings_DefaultShowAs": "Standard-Verfügbarkeitsstatus",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Standard-Verfügbarkeitsstatus für neue Termine, die mit diesem Konto erstellt werden.",
+    "CalendarAccountSettings_PrimaryCalendar": "Primärer Kalender",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Diesen Kalender als primären Kalender für das Konto festlegen.",
+    "CalendarSettings_NewEventBehavior_Header": "Verhalten der Schaltfläche Neuer Termin",
+    "CalendarSettings_NewEventBehavior_Description": "Wählen Sie, ob die Schaltfläche Neuer Termin jedes Mal nach einem Kalender fragen oder immer einen bestimmten Kalender öffnen soll.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Bei jeder Verwendung fragen.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Immer denselben Kalender verwenden.",
+    "CalendarSettings_Rendering_Title": "Darstellung",
+    "CalendarSettings_Rendering_Description": "Kalender-Layout und Anzeigeverhalten konfigurieren.",
+    "CalendarSettings_Notifications_Title": "Benachrichtigungen",
+    "CalendarSettings_Notifications_Description": "Standard-Erinnerungs- und Schlummerverhalten festlegen.",
+    "CalendarSettings_Preferences_Title": "Einstellungen",
+    "CalendarSettings_Preferences_Description": "Legen Sie fest, wie sich die Schaltfläche Neuer Termin verhält.",
+    "WhatIsNew_GetStartedButton": "Loslegen",
+    "WhatIsNew_ContinueAnywayButton": "Trotzdem fortfahren",
+    "WhatIsNew_PreparingForNewVersionButton": "Auf die neue Version vorbereiten...",
+    "WhatIsNew_MigrationPreparing_Title": "Daten werden vorbereitet",
+    "WhatIsNew_MigrationPreparing_Description": "Wino führt Update-Migrationen durch. Bitte warten Sie, während wir Ihre Kontodaten für diese Version vorbereiten.",
+    "WhatIsNew_MigrationFailedMessage": "Beim Anwenden der Migrationen ist ein Fehler aufgetreten: {0}. Sie können die Anwendung weiterhin verwenden. Falls Sie jedoch schwerwiegende Probleme feststellen, installieren Sie die Anwendung bitte neu.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail aktualisiert",
+    "WhatIsNew_MigrationNotification_Message": "Öffnen Sie die App, um das Update abzuschließen und Neues zu sehen.",
+    "WelcomeWindow_Title": "Willkommen bei Wino Mail",
+    "WelcomeWindow_Subtitle": "Eine native Windows-Erfahrung für Mail und Kalender.",
+    "WelcomeWindow_WhatsNewTitle": "Neueste Änderungen",
+    "WelcomeWindow_FeaturesTitle": "Funktionen",
+    "WelcomeWindow_WhatsNewTab": "Was gibt es Neues",
+    "WelcomeWindow_FeaturesTab": "Funktionen",
+    "WelcomeWindow_GetStartedButton": "Konto hinzufügen und loslegen",
+    "WelcomeWindow_GetStartedDescription": "Fügen Sie Ihr Outlook-, Gmail- oder IMAP-Konto hinzu, um mit Wino Mail zu beginnen.",
+    "WelcomeWindow_ImportFromWinoAccount": "Aus Ihrem Wino-Konto importieren",
+    "WelcomeWindow_ImportInProgress": "Import Ihrer synchronisierten Einstellungen und Konten läuft.",
+    "WelcomeWindow_ImportNoAccountsFound": "Es wurden keine synchronisierten Konten in Ihrem Wino-Konto gefunden. Falls Einstellungen verfügbar waren, wurden sie wiederhergestellt. Verwenden Sie Loslegen, um manuell ein Konto hinzuzufügen.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synchronisierte Konten sind auf diesem Gerät bereits verfügbar. Verwenden Sie Loslegen, um bei Bedarf manuell ein weiteres Konto hinzuzufügen.",
+    "WelcomeWindow_SetupTitle": "Ihr Konto einrichten",
+    "WelcomeWindow_SetupSubtitle": "Wählen Sie Ihren E-Mail-Anbieter, um loszulegen",
+    "WelcomeWindow_AddAccountButton": "Konto hinzufügen",
+    "WelcomeWindow_SkipForNow": "Jetzt überspringen — später einrichten.",
+    "WelcomeWindow_AppDescription": "Ein schnelles, fokussiertes Postfach – neu gestaltet für Windows 11.",
+    "WelcomeWizard_Step1Title": "Willkommen",
+    "SystemTrayMenu_Open": "Öffnen",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Synchronisierungseinstellungen",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Ihre Wino-Einstellungen geräteübergreifend synchron halten.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Add-Ons freischalten",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Zugriff auf Premium-Funktionen wie Wino AI Pack.",
+    "WinoAccount_Management_Description": "Verwalten Sie Ihr Wino-Konto, den Zugriff auf AI Pack sowie synchronisierte Präferenzen und Kontodetails.",
+    "WinoAccount_Management_SignedOutTitle": "Bei Wino Mail anmelden",
+    "WinoAccount_Management_SignedOutDescription": "Melden Sie sich an oder erstellen Sie ein Konto, um Ihre E-Mails zu synchronisieren, auf KI-Funktionen zuzugreifen und Ihre Einstellungen über Geräte hinweg zu verwalten.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino Add-Ons",
+    "WinoAccount_Management_DataSectionHeader": "Daten",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Kontenaktionen",
+    "WinoAccount_Management_AccountCardTitle": "Konto",
+    "WinoAccount_Management_AccountCardDescription": "Ihre Wino-Konto-E-Mail-Adresse und aktueller Kontostatus.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Sehen Sie, ob Wino AI Pack aktiv ist und wie viel Nutzung übrig bleibt.",
+    "WinoAccount_Management_AiPackActive": "AI Pack ist aktiv",
+    "WinoAccount_Management_AiPackInactive": "AI Pack ist nicht aktiv",
+    "WinoAccount_Management_AiPackUsage": "{0} von {1} Nutzungen verbraucht. {2} verbleibend.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Abrechnungszeitraum: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Nutzungsdetails sind noch nicht verfügbar.",
+    "WinoAccount_Management_AiPackBuyDescription": "Kaufen Sie Wino AI Pack, um E-Mails mithilfe von KI zu übersetzen, umzuschreiben oder zusammenzufassen.",
+    "WinoAccount_Management_AiPackPromoTitle": "AI Pack freischalten",
+    "WinoAccount_Management_AiPackPromoDescription": "Beschleunigen Sie Ihren E-Mail-Workflow mit KI-gestützten Tools. Übersetzen Sie Nachrichten in über 50 Sprachen, verbessern Sie Klarheit und Tonfall und erhalten Sie sofortige Zusammenfassungen langer Threads.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mo",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 Credits",
+    "WinoAccount_Management_AiPackGetButton": "AI Pack erhalten",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "KI-gestützte Tools zum Übersetzen, Umformulieren und Zusammenfassen von Nachrichten in Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "KI, übersetzen, umschreiben, zusammenfassen, Produktivität",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Unbegrenzte Konten",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Entfernt das Kontolimit und fügt beliebig viele E-Mail-Konten hinzu.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "Konten, unbegrenzt, Premium, Add-on",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Melden Sie sich mit Ihrem Wino-Konto an, um diesen Kauf abzuschließen.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino konnte diesen Kauf im Microsoft Store nicht abschließen.",
+    "WinoAccount_Management_StoreSyncFailed": "Ihr Kauf ist abgeschlossen, aber Wino konnte Ihre Kontofunktionen noch nicht aktualisieren. Bitte versuchen Sie es in einem Moment erneut.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Ihr Abonnement ist aktiv",
+    "WinoAccount_Management_AiPackRenews": "Verlängert sich {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "In diesem Monat verwendete Credits",
+    "WinoAccount_Management_AiPackResets": "Zurücksetzungen {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Beim Laden Ihres AI-Nutzungsstands gab es Probleme.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Übersetzen",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Umschreiben",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Zusammenfassen",
+    "WinoAccount_Management_AddOnLoadFailed": "Beim Laden dieses Add-Ons gab es Probleme.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Einstellungen und Konten synchronisieren",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importieren oder exportieren Sie Ihre Wino-Einstellungen und Postfachdaten über Geräte hinweg. Passwörter, Tokens und andere sensible Informationen werden niemals synchronisiert.",
+    "WinoAccount_Management_SignOutTitle": "Abmelden",
+    "WinoAccount_Management_SignOutDescription": "Melden Sie sich von Ihrem Konto auf diesem Gerät ab.",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Es liegen derzeit keine synchronisierten Daten für dieses Konto vor.",
+    "WinoAccount_Management_ExportSucceeded": "Ihre ausgewählten Wino-Daten wurden erfolgreich exportiert.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Ihre Einstellungen wurden in Ihr Wino-Konto exportiert.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Es wurden {0} Kontodaten in Ihr Wino-Konto exportiert.",
+    "WinoAccount_Management_ImportSucceeded": "Synchronisierte Daten aus Ihrem Wino-Konto importiert.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Es wurden {0} synchronisierte Präferenzen angewendet.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Es wurden {0} Konten importiert.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Es wurden {0} Konten übersprungen, die auf diesem Gerät bereits vorhanden sind.",
+    "WinoAccount_Management_ImportPartial": "Es wurden {0} synchronisierte Einstellungen übernommen. {1} Einstellungen konnten nicht wiederhergestellt werden.",
+    "WinoAccount_Management_ImportReloginReminder": "Passwörter, Tokens und andere sensible Informationen wurden nicht importiert. Melden Sie sich vor der Verwendung dieses Geräts für jedes Konto erneut an.",
+    "WinoAccount_Management_SerializeFailed": "Wino konnte Ihre aktuellen Einstellungen nicht serialisieren.",
+    "WinoAccount_Management_EmptyExport": "Es liegen keine Einstellungen zum Export bereit.",
+    "WinoAccount_Management_ImportEmpty": "Der synchronisierte Datenpayload enthält keine neuen Daten zur Wiederherstellung.",
+    "WinoAccount_Management_ExportDialog_Title": "Exportieren Sie in Ihr Wino-Konto.",
+    "WinoAccount_Management_ExportDialog_Description": "Wählen Sie aus, was Sie mit Ihrem Wino-Konto synchronisieren möchten.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Einstellungen",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Konten",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Passwörter, Tokens und andere sensible Informationen werden nicht synchronisiert.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Auf einem anderen PC importierte Konten müssen sich weiterhin erneut anmelden, bevor sie verwendet werden können.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportieren Sie Ihre ausgewählten Wino-Daten.",
+    "WinoAccount_Management_LoadFailed": "Wino konnte die neuesten Informationen zum Wino-Konto nicht laden.",
+    "WinoAccount_Management_ActionFailed": "Die Wino-Konto-Anfrage konnte nicht abgeschlossen werden.",
+    "WinoAccount_SettingsSection_Title": "Wino-Konto",
+    "WinoAccount_SettingsSection_Description": "Erstellen oder melden Sie sich über Ihren lokalen Authentifizierungsdienst bei einem Wino-Konto an.",
+    "WinoAccount_RegisterButton_Title": "Konto registrieren",
+    "WinoAccount_RegisterButton_Description": "Erstellen Sie ein Wino-Konto mit E-Mail-Adresse und Passwort.",
+    "WinoAccount_RegisterButton_Action": "Registrierung öffnen",
+    "WinoAccount_LoginButton_Title": "Anmelden",
+    "WinoAccount_LoginButton_Description": "Melden Sie sich mit E-Mail und Passwort bei einem bestehenden Wino-Konto an.",
+    "WinoAccount_LoginButton_Action": "Anmeldung öffnen",
+    "WinoAccount_SignOutButton_Title": "Abmelden",
+    "WinoAccount_SignOutButton_Description": "Die lokal gespeicherte Wino-Konto-Sitzung entfernen.",
+    "WinoAccount_SignOutButton_Action": "Abmelden",
+    "WinoAccount_RegisterDialog_Title": "Wino-Konto erstellen",
+    "WinoAccount_RegisterDialog_Description": "Erstellen Sie ein Wino-Konto, um Ihr Wino-Erlebnis zu synchronisieren und kontobasierte Add-ons freizuschalten.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Ihr Wino-Konto erstellen",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Warum eines erstellen?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Einstellungen geräteübergreifend importieren und exportieren",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Verschieben Sie Ihre Wino-Einstellungen zwischen Geräten, ohne Ihre Einrichtung von Grund auf neu aufbauen zu müssen.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Zugriff auf exklusive Add-ons wie das Wino AI Pack (kostenpflichtig).",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Verwenden Sie ein Konto, um Premium-Wino-Funktionen freizuschalten, sobald sie verfügbar sind.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino-Konto ist von Ihren E-Mail-Konten getrennt",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Ihre Outlook-, Gmail-, IMAP- oder anderen E-Mail-Konten bleiben unverändert. Ein Wino-Konto verwaltet nur Wino-spezifische Funktionen und kontoabhängige Add-ons.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrieren",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Datenschutz und API-Verarbeitung",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Optionale Add-ons wie das Wino AI Pack können ausgewählte E-Mail-HTML-Inhalte nur dann an den Wino-API-Dienst senden, wenn Sie diese Funktionen verwenden.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Datenschutzerklärung lesen",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Ich stimme der Datenschutzerklärung zu.",
+    "WinoAccount_LoginDialog_Title": "Wino-Konto anmelden",
+    "WinoAccount_LoginDialog_Description": "Melden Sie sich bei Ihrem Wino-Konto an, um Ihre Wino-Einstellungen zu synchronisieren und auf kontobasierte Funktionen zuzugreifen.",
+    "WinoAccount_LoginDialog_HeroTitle": "Willkommen zurück",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Was das Anmelden Ihnen bietet",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Verwenden Sie Ihr Wino-Konto, um Einstellungen geräteübergreifend weiter zu synchronisieren und auf kostenpflichtige Add-ons wie das Wino AI Pack zuzugreifen.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Dies ist nicht die Anmeldung für Ihr E-Mail-Postfach",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Das Anmelden hier fügt Ihre Outlook-, Gmail- oder IMAP-Konten in Wino weder hinzu noch ersetzt es sie. Sie melden sich ausschließlich bei Wino-spezifischen Diensten an.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Passwort vergessen?",
+    "WinoAccount_EmailLabel": "E-Mail",
+    "WinoAccount_EmailPlaceholder": "name@beispiel.de",
+    "WinoAccount_PasswordLabel": "Passwort",
+    "WinoAccount_ConfirmPasswordLabel": "Passwort bestätigen",
+    "WinoAccount_ForgotPasswordDialog_Title": "Passwort zurücksetzen",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "E-Mail zum Zurücksetzen senden",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Zurück zur Anmeldung",
+    "WinoAccount_ForgotPasswordDialog_Description": "Geben Sie Ihre Wino-Konto-E-Mail-Adresse ein, und wir senden Ihnen einen Link zum Zurücksetzen des Passworts, falls die Adresse registriert ist.",
+    "WinoAccount_Validation_EmailRequired": "E-Mail-Adresse ist erforderlich.",
+    "WinoAccount_Validation_PasswordRequired": "Passwort ist erforderlich.",
+    "WinoAccount_Validation_PasswordMismatch": "Passwörter stimmen nicht überein.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Sie müssen der Datenschutzerklärung zustimmen, bevor Sie ein Wino-Konto erstellen.",
+    "WinoAccount_Error_InvalidCredentials": "Die E-Mail-Adresse oder das Passwort ist falsch.",
+    "WinoAccount_Error_AccountLocked": "Dieses Konto ist vorübergehend gesperrt.",
+    "WinoAccount_Error_AccountBanned": "Dieses Konto wurde gesperrt.",
+    "WinoAccount_Error_AccountSuspended": "Dieses Konto wurde vorübergehend deaktiviert.",
+    "WinoAccount_Error_EmailNotConfirmed": "Bitte bestätigen Sie Ihre E-Mail-Adresse, bevor Sie sich anmelden.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Bitte bestätigen Sie Ihre E-Mail-Adresse, bevor Sie sich anmelden.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Eine neue Bestätigungs-E-Mail ist noch nicht verfügbar.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Diese Bestätigungsanfrage ist nicht mehr gültig. Bitte versuchen Sie sich erneut anzumelden.",
+    "WinoAccount_Error_EmailNotRegistered": "Diese E-Mail-Adresse ist nicht registriert.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Ihre Sitzung ist nicht mehr gültig. Bitte melden Sie sich erneut an.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Diese E-Mail-Adresse ist bereits registriert.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Eine E-Mail-Adresse ist erforderlich, um die externe Anmeldung abzuschließen.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Die externe Anmeldung ist ungültig.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Der Zustand der externen Anmeldung ist ungültig oder abgelaufen.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Der externe Anmeldecode ist ungültig oder abgelaufen.",
+    "WinoAccount_Error_AiPackRequired": "Für diese Aktion ist ein aktives Wino AI Pack-Abonnement erforderlich.",
+    "WinoAccount_Error_AiQuotaExceeded": "Ihr AI Pack-Verbrauchslimit wurde im aktuellen Abrechnungszeitraum erreicht.",
+    "WinoAccount_Error_AiHtmlEmpty": "Es gibt keinen E-Mail-Inhalt zum Verarbeiten.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Diese E-Mail ist zu groß, um sie mit Wino AI zu verarbeiten.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Diese Sprache wird nicht unterstützt. Versuchen Sie einen gültigen Kulturcode wie en-US oder tr-TR.",
+    "WinoAccount_Error_Forbidden": "Sie haben nicht die Berechtigung, diese Aktion auszuführen.",
+    "WinoAccount_Error_ValidationFailed": "Die Anfrage ist ungültig. Bitte überprüfen Sie die eingegebenen Werte.",
+    "WinoAccount_RegisterSuccessMessage": "Wino-Konto-Registrierung für {0} abgeschlossen.",
+    "WinoAccount_LoginSuccessMessage": "Sie sind als {0} bei Ihrem Wino-Konto angemeldet.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Bestätigen Sie Ihre E-Mail-Adresse.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Wir haben eine Bestätigungs-E-Mail an {0} gesendet. Bitte bestätigen Sie diese und versuchen Sie sich erneut anzumelden.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "E-Mail-Bestätigung erforderlich",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Wir warten noch darauf, dass Sie {0} bestätigen.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Bestätigungs-E-Mail erneut senden",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Sie können die Bestätigungs-E-Mail in {0} erneut senden.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Sie können die Bestätigungs-E-Mail jetzt erneut senden.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Bestätigungs-E-Mail erneut gesendet",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Wir haben eine weitere Bestätigungs-E-Mail an {0} gesendet. Bitte bestätigen Sie diese und versuchen Sie sich erneut anzumelden.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "E-Mail zum Zurücksetzen des Passworts gesendet.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Wir haben eine E-Mail zum Zurücksetzen des Passworts an {0} gesendet. Öffnen Sie diese Nachricht, um ein neues Passwort festzulegen.",
+    "WinoAccount_ChangePassword_Title": "Passwort ändern",
+    "WinoAccount_ChangePassword_Description": "Senden Sie eine E-Mail zum Zurücksetzen des Passworts an dieses Wino-Konto.",
+    "WinoAccount_ChangePassword_Action": "E-Mail zum Zurücksetzen senden",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Möchten Sie, dass Wino eine Passwort-Zurücksetzungs-E-Mail an {0} sendet?",
+    "WinoAccount_SignOut_SuccessMessage": "Vom Wino-Konto {0} abgemeldet.",
+    "WinoAccount_SignOut_NoAccountMessage": "Es gibt kein aktives Wino-Konto zum Abmelden.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino-Konto",
+    "WinoAccount_Titlebar_SignedOutDescription": "Melden Sie sich an oder erstellen Sie ein Wino-Konto, um Ihre Wino-Sitzung zu verwalten.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Konto hinzufügen",
+    "WelcomeWizard_Step3Title": "Einrichtung abschließen",
+    "ProviderSelection_Title": "E-Mail-Anbieter auswählen",
+    "ProviderSelection_Subtitle": "Wählen Sie unten einen Anbieter aus, um Ihr E-Mail-Konto zu Wino Mail hinzuzufügen.",
+    "ProviderSelection_AccountNameHeader": "Kontoname",
+    "ProviderSelection_AccountNamePlaceholder": "z. B. Privat, Arbeit",
+    "ProviderSelection_DisplayNameHeader": "Anzeigename",
+    "ProviderSelection_DisplayNamePlaceholder": "z. B. John Doe",
+    "ProviderSelection_EmailHeader": "E-Mail-Adresse",
+    "ProviderSelection_EmailPlaceholder": "z. B. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Anwendungsspezifisches Passwort",
+    "ProviderSelection_AppPasswordHelp": "Wie erhalte ich ein anwendungsspezifisches Passwort?",
+    "ProviderSelection_CalendarModeHeader": "Kalender-Integration",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Deaktiviert",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Keine Kalenderintegration",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV-Synchronisierung",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Ihre Kalendereinträge werden zwischen Ihren Geräten mit Apple-Servern synchronisiert.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Ihre Kalendereinträge werden zwischen Ihren Geräten mit Yahoo-Servern synchronisiert.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokaler Kalender",
+    "ProviderSelection_CalendarMode_LocalDescription": "Ihre Termine werden nur auf Ihrem Computer gespeichert. Keine Serververbindung.",
+    "ProviderSelection_ClearColor": "Farbe zurücksetzen",
+    "ProviderSelection_ContinueButton": "Weiter",
+    "ProviderSelection_SpecialImap_Subtitle": "Geben Sie Ihre Kontodaten ein, um eine Verbindung herzustellen.",
+    "AccountSetup_Title": "Konto einrichten",
+    "AccountSetup_Step_Authenticating": "Authentifizierung mit {0}",
+    "AccountSetup_Step_TestingMailAuth": "E-Mail-Authentifizierung wird getestet",
+    "AccountSetup_Step_SyncingFolders": "Ordner-Metadaten werden synchronisiert.",
+    "AccountSetup_Step_FetchingProfile": "Profildaten werden abgerufen.",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV-Einstellungen werden ermittelt.",
+    "AccountSetup_Step_TestingCalendarAuth": "Kalender-Authentifizierung wird getestet",
+    "AccountSetup_Step_SavingAccount": "Kontoinformationen werden gespeichert.",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Kalender-Metadaten werden abgerufen.",
+    "AccountSetup_Step_SyncingAliases": "Aliases werden synchronisiert.",
+    "AccountSetup_Step_Finalizing": "Einrichtung abschließen.",
+    "AccountSetup_FailureMessage": "Einrichtung fehlgeschlagen. Gehen Sie zurück, um Ihre Einstellungen zu korrigieren, oder versuchen Sie es später erneut.",
+    "AccountSetup_SuccessMessage": "Ihr Konto wurde erfolgreich eingerichtet!",
+    "AccountSetup_GoBackButton": "Zurück",
+    "AccountSetup_TryAgainButton": "Versuchen Sie es erneut.",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatische Erkennung fehlgeschlagen. Bitte geben Sie die Einstellungen manuell im Reiter Erweitert ein."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/el_GR/resources.json b/Wino.Core.Domain/Translations/el_GR/resources.json
index f2ee62a4..6256152f 100644
--- a/Wino.Core.Domain/Translations/el_GR/resources.json
+++ b/Wino.Core.Domain/Translations/el_GR/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Αυτός ο λογαριασμός απαιτεί πλήρη επανασυγχρονισμό για να συνεχίσει να δουλεύει. Παρακαλώ περιμένετε ενώ ο Wino επανασυγχρονίζει τα μηνύματά σας...",
     "AccountContactNameYou": "Εσείς",
     "AccountCreationDialog_Completed": "όλα έτοιμα",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Ανάκτηση λεπτομερειών ημερολογίου.",
     "AccountCreationDialog_FetchingEvents": "Ανάκτηση συμβάντων ημερολογίου.",
     "AccountCreationDialog_FetchingProfileInformation": "Λήψη λεπτομερειών προφίλ.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Εάν το πρόγραμμα περιήγησής σας δεν εκκινήθηκε αυτόματα για να ολοκληρωθεί ο έλεγχος ταυτότητας:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "αρχικοποιείται",
     "AccountCreationDialog_PreparingFolders": "Προς το παρόν λαμβάνουμε πληροφορίες φακέλων.",
     "AccountCreationDialog_SigninIn": "Οι πληροφορίες λογαριασμού αποθηκεύονται.",
+    "Purchased": "Αγορασμένο",
     "AccountEditDialog_Message": "Όνομα Λογαριασμού",
     "AccountEditDialog_Title": "Επεξεργασία Λογαριασμού",
     "AccountPickerDialog_Title": "Επιλέξτε έναν λογαριασμό",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Αλλάξτε το όνομα του λογαριασμού στο Wino και ορίστε το επιθυμητό όνομα αποστολέα.",
     "AccountDetailsPage_ColorPicker_Title": "Χρώμα λογαριασμού",
     "AccountDetailsPage_ColorPicker_Description": "Αναθέστε ένα νέο χρώμα λογαριασμού για να χρωματίσετε το σύμβολο του στη λίστα.",
+    "AccountDetailsPage_TabGeneral": "Γενικά",
+    "AccountDetailsPage_TabMail": "Ταχυδρομείο",
+    "AccountDetailsPage_TabCalendar": "Ημερολόγιο",
+    "AccountDetailsPage_CalendarListDescription": "Επιλέξτε ένα ημερολόγιο για να ορίσετε τις ρυθμίσεις του.",
     "AddHyperlink": "Προσθήκη",
     "AppCloseBackgroundSynchronizationWarningTitle": "Συγχρονισμός Παρασκηνίου",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Η εφαρμογή δεν έχει οριστεί για εκκίνηση κατά την έναρξη των Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Λογαριασμός IMAP",
     "Busy": "Απασχολημένο",
     "Buttons_AddAccount": "Προσθήκη Λογαριασμού",
+    "Buttons_FixAccount": "Διόρθωση λογαριασμού",
     "Buttons_AddNewAlias": "Προσθήκη Νέου Ψευδώνυμου",
     "Buttons_Allow": "Αποδοχή",
+    "Buttons_Apply": "Εφαρμογή",
     "Buttons_ApplyTheme": "Εφαρμογή Θέματος",
     "Buttons_Browse": "Περιήγηση",
     "Buttons_Cancel": "Ακύρωση",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Επεξεργασία",
     "Buttons_EnableImageRendering": "Ενεργοποίηση",
     "Buttons_Multiselect": "Επιλογή Πολλαπλών",
+    "Buttons_Manage": "Διαχείριση",
     "Buttons_No": "Όχι",
     "Buttons_Open": "Άνοιγμα",
     "Buttons_Purchase": "Αγορά",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Αποθήκευση",
     "Buttons_SaveConfiguration": "Αποθήκευση Διαμόρφωσης",
     "Buttons_Send": "Αποστολή",
+    "Buttons_SendToServer": "Αποστολή στον διακομιστή",
     "Buttons_Share": "Κοινοποίηση",
     "Buttons_SignIn": "Σύνδεση",
     "Buttons_Sync": "Συγχρονισμός",
     "Buttons_SyncAliases": "Συγχρονισμός Ψευδώνυμων",
     "Buttons_TryAgain": "Προσπαθήστε ξανά",
     "Buttons_Yes": "Ναι",
+    "Sync_SynchronizingFolder": "Συγχρονισμός φακέλου {0} {1}%",
+    "Sync_DownloadedMessages": "Λήφθηκαν {0} μηνύματα από το {1}",
+    "SyncAction_Archiving": "Αρχειοθέτηση {0} μηνυμάτων",
+    "SyncAction_ClearingFlag": "Αφαίρεση σήματος από {0} μηνύματα",
+    "SyncAction_CreatingDraft": "Δημιουργία προσχεδίου",
+    "SyncAction_CreatingEvent": "Δημιουργία συμβάντος",
+    "SyncAction_Deleting": "Διαγραφή {0} μηνυμάτων",
+    "SyncAction_EmptyingFolder": "Άδειασμα φακέλου",
+    "SyncAction_MarkingAsRead": "Σήμανση {0} μηνυμάτων ως διαβασμένων",
+    "SyncAction_MarkingAsUnread": "Σήμανση {0} μηνυμάτων ως μη αναγνωσμένων",
+    "SyncAction_MarkingFolderAsRead": "Σήμανση φακέλου ως διαβασμένου",
+    "SyncAction_Moving": "Μετακίνηση {0} μηνυμάτων",
+    "SyncAction_MovingToFocused": "Μετακίνηση {0} μηνυμάτων στα Εστιασμένα",
+    "SyncAction_RenamingFolder": "Μετονομασία φακέλου",
+    "SyncAction_SendingMail": "Αποστολή μηνύματος",
+    "SyncAction_SettingFlag": "Σήμανση {0} μηνυμάτων με σημαία",
+    "SyncAction_SynchronizingAccount": "Συγχρονισμός {0}",
+    "SyncAction_SynchronizingAccounts": "Συγχρονισμός {0} λογαριασμών",
+    "SyncAction_SynchronizingCalendarData": "Συγχρονισμός δεδομένων ημερολογίου",
+    "SyncAction_SynchronizingCalendarEvents": "Συγχρονισμός συμβάντων ημερολογίου",
+    "SyncAction_SynchronizingCalendarMetadata": "Συγχρονισμός μεταδεδομένων ημερολογίου",
+    "SyncAction_Unarchiving": "Αποαρχειοθέτηση {0} μηνυμάτων",
     "CalendarAllDayEventSummary": "ολοήμερα συμβάντα",
     "CalendarDisplayOptions_Color": "Χρώμα",
     "CalendarDisplayOptions_Expand": "Επέκταση",
+    "CalendarEventResponse_Accept": "Αποδοχή",
+    "CalendarEventResponse_AcceptedResponse": "Αποδεκτό",
+    "CalendarEventResponse_Decline": "Απόρριψη",
+    "CalendarEventResponse_DeclinedResponse": "Απορρίφθηκε",
+    "CalendarEventResponse_NotResponded": "Δεν έχει απαντηθεί",
+    "CalendarEventResponse_Tentative": "Ενδεχόμενο",
+    "CalendarEventResponse_TentativeResponse": "Ενδεχόμενο",
+    "CalendarEventRsvpPanel_Accept": "Αποδοχή",
+    "CalendarEventRsvpPanel_AddMessage": "Προσθέστε ένα μήνυμα στην απάντησή σας... (προαιρετικό)",
+    "CalendarEventRsvpPanel_Decline": "Απόρριψη",
+    "CalendarEventRsvpPanel_Message": "Μήνυμα",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Αποστολή απαντητικού μηνύματος",
+    "CalendarEventRsvpPanel_Tentative": "Ενδεχόμενο",
+    "CalendarEventRsvpPanel_Title": "Επιλογές απάντησης",
+    "CalendarAttendeeStatus_Accepted": "Αποδεκτό",
+    "CalendarAttendeeStatus_Declined": "Απορριφθέν",
+    "CalendarAttendeeStatus_NeedsAction": "Απαιτεί ενέργεια",
+    "CalendarAttendeeStatus_Tentative": "Ενδεχόμενο",
+    "CalendarEventDetails_Attachments": "Συνημμένα",
+    "CalendarEventCompose_AddAttachment": "Προσθήκη συνημμένου",
+    "CalendarEventCompose_AllDay": "Ολοήμερο",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Τα συνημμένα δεν υποστηρίζονται για ημερολόγια CalDAV.",
+    "CalendarEventCompose_EndDate": "Ημερομηνία λήξης",
+    "CalendarEventCompose_EndTime": "Ώρα λήξης",
+    "CalendarEventCompose_Every": "κάθε",
+    "CalendarEventCompose_ForWeekdays": "για",
+    "CalendarEventCompose_FrequencyDay": "ημέρα",
+    "CalendarEventCompose_FrequencyDayPlural": "ημέρες",
+    "CalendarEventCompose_FrequencyMonth": "μήνας",
+    "CalendarEventCompose_FrequencyMonthPlural": "μήνες",
+    "CalendarEventCompose_FrequencyWeek": "εβδομάδα",
+    "CalendarEventCompose_FrequencyWeekPlural": "εβδομάδες",
+    "CalendarEventCompose_FrequencyYear": "έτος",
+    "CalendarEventCompose_FrequencyYearPlural": "έτη",
+    "CalendarEventCompose_Location": "Τοποθεσία",
+    "CalendarEventCompose_LocationPlaceholder": "Προσθέστε τοποθεσία",
+    "CalendarEventCompose_NewEventButton": "Νέο γεγονός",
+    "CalendarEventCompose_DefaultCalendarHint": "Μπορείτε να επιλέξετε ένα προεπιλεγμένο ημερολόγιο για νέα γεγονότα στις ρυθμίσεις Ημερολογίου.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Άνοιγμα ρυθμίσεων Ημερολογίου",
+    "CalendarEventCompose_NoCalendarsMessage": "Δεν υπάρχουν ακόμη διαθέσιμα ημερολόγια για τη δημιουργία γεγονότος.",
+    "CalendarEventCompose_NoCalendarsTitle": "Δεν υπάρχουν διαθέσιμα ημερολόγια",
+    "CalendarEventCompose_NoEndDate": "Δεν υπάρχει ημερομηνία λήξης",
+    "CalendarEventCompose_Notes": "Σημειώσεις",
+    "CalendarEventCompose_PickCalendarTitle": "Επιλέξτε ένα ημερολόγιο",
+    "CalendarEventCompose_Recurring": "Επαναλαμβανόμενο",
+    "CalendarEventCompose_RecurringSummary": "Συμβαίνει κάθε {0} {1}{2} {3} με ισχύ {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Συμβαίνει {0}{1} {2} με ισχύ {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Επανάληψη κάθε",
+    "CalendarEventCompose_SelectCalendar": "Επιλέξτε ημερολόγιο",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Συμβαίνει στις {0} {1}",
+    "CalendarEventCompose_StartDate": "Ημερομηνία έναρξης",
+    "CalendarEventCompose_StartTime": "Ώρα έναρξης",
+    "CalendarEventCompose_TimeRangeSummary": "από {0} έως {1}",
+    "CalendarEventCompose_Title": "Τίτλος γεγονότος",
+    "CalendarEventCompose_TitlePlaceholder": "Προσθέστε τίτλο",
+    "CalendarEventCompose_Until": "έως",
+    "CalendarEventCompose_UntilSummary": " μέχρι {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Η ημερομηνία λήξης ολόήμερου συμβάντος πρέπει να είναι μετά την ημερομηνία έναρξης.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Ένας ή περισσότεροι συμμετέχοντες έχουν μη έγκυρη διεύθυνση email.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Η ημερομηνία λήξης της επανάληψης πρέπει να είναι ίση ή μετά την ημερομηνία έναρξης του γεγονότος.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Η ώρα λήξης πρέπει να είναι αργότερη από την ώρα έναρξης.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Ένα ή περισσότερα συνημμένα δεν είναι πλέον διαθέσιμα: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Επιλέξτε ένα ημερολόγιο πριν τη δημιουργία του γεγονότος.",
+    "CalendarEventCompose_ValidationMissingTitle": "Πληκτρολογήστε έναν τίτλο γεγονότος πριν τη δημιουργία του γεγονότος.",
+    "CalendarEventCompose_ValidationTitle": "Ο έλεγχος εγκυρότητας του γεγονότος απέτυχε",
+    "CalendarEventCompose_WeekdaySummary": " στις {0}",
+    "CalendarEventCompose_Weekday_Friday": "Π",
+    "CalendarEventCompose_Weekday_Monday": "Δ",
+    "CalendarEventCompose_Weekday_Saturday": "Σ",
+    "CalendarEventCompose_Weekday_Sunday": "Κ",
+    "CalendarEventCompose_Weekday_Thursday": "Π",
+    "CalendarEventCompose_Weekday_Tuesday": "Τ",
+    "CalendarEventCompose_Weekday_Wednesday": "Τ",
+    "CalendarEventDetails_Details": "Λεπτομέρειες",
+    "CalendarEventDetails_EditSeries": "Επεξεργασία Σειράς",
+    "CalendarEventDetails_Editing": "Επεξεργασία",
+    "CalendarEventDetails_InviteSomeone": "Προσκάλεσε κάποιον",
+    "CalendarEventDetails_JoinOnline": "Συνδεθείτε online",
+    "CalendarEventDetails_Organizer": "Οργανωτής",
+    "CalendarEventDetails_People": "Συμμετέχοντες",
+    "CalendarEventDetails_ReadOnlyEvent": "Γεγονός μόνο ανάγνωσης",
+    "CalendarEventDetails_Reminder": "Υπενθύμιση",
+    "CalendarReminder_StartedHoursAgo": "Ξεκίνησε πριν από {0} ώρες",
+    "CalendarReminder_StartedMinutesAgo": "Ξεκίνησε πριν από {0} λεπτά",
+    "CalendarReminder_StartedNow": "Ξεκίνησε μόλις τώρα",
+    "CalendarReminder_StartingNow": "Ξεκινά τώρα",
+    "CalendarReminder_StartsInHours": "Ξεκινά σε {0} ώρες",
+    "CalendarReminder_StartsInMinutes": "Ξεκινά σε {0} λεπτά",
+    "CalendarReminder_SnoozeAction": "Αναβολή",
+    "CalendarReminder_SnoozeMinutesOption": "{0} λεπτά",
+    "CalendarEventDetails_ShowAs": "Εμφάνιση ως",
+    "CalendarShowAs_Free": "Ελεύθερο",
+    "CalendarShowAs_Tentative": "Ενδεχόμενο",
+    "CalendarShowAs_Busy": "Απασχολημένο",
+    "CalendarShowAs_OutOfOffice": "Εκτός Γραφείου",
+    "CalendarShowAs_WorkingElsewhere": "Εργάζεται αλλού",
     "CalendarItem_DetailsPopup_JoinOnline": "Συμμετοχή online",
     "CalendarItem_DetailsPopup_ViewEventButton": "Προβολή συμβάντος",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Προβολή σειράς",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "Το \"{0}\" αντιγράφηκε στο πρόχειρο.",
     "ClipboardTextCopied_Title": "Αντιγράφηκε",
     "ClipboardTextCopyFailed_Message": "Η αντιγραφή του {0} στο πρόχειρο απέτυχε.",
+    "ContactInfoBar_ErrorTitle": "Αποτυχία φόρτωσης πληροφοριών επαφής",
+    "ContactInfoBar_SuccessTitle": "Οι πληροφορίες επικοινωνίας φορτώθηκαν",
+    "ContactInfoBar_WarningTitle": "Οι πληροφορίες επικοινωνίας ενδέχεται να είναι ελλιπείς",
     "ComingSoon": "Έρχεται σύντομα...",
     "ComposerAttachmentsDragDropAttach_Message": "Επισύναψη",
     "ComposerAttachmentsDropZone_Message": "Τοποθετήστε το αρχείο σας εδώ",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Όνομα Συνδέσμου Λογαριασμού",
     "DialogMessage_DeleteAccountConfirmationMessage": "Διαγραφή {0};",
     "DialogMessage_DeleteAccountConfirmationTitle": "Όλα τα δεδομένα που σχετίζονται με αυτόν τον λογαριασμό θα διαγραφούν από το δίσκο οριστικά.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Διαγραφή προτύπου \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Διαγραφή προτύπου ηλεκτρονικού ταχυδρομείου",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Αυτό θα διαγράψει όλα τα γεγονότα της σειράς. Θέλετε να συνεχίσετε;",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Διαγραφή Επαναλαμβανόμενης Σειράς",
     "DialogMessage_DiscardDraftConfirmationMessage": "Αυτό το πρόχειρο θα απορριφθεί. Θέλετε να συνεχίσετε;",
     "DialogMessage_DiscardDraftConfirmationTitle": "Απόρριψη προχείρου",
     "DialogMessage_EmptySubjectConfirmation": "Χωρίς Θέμα",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Ανοιχτή λειτουργία",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Αποτυχία ρύθμισης φακέλων συστήματος",
+    "Exception_AccountNeedsAttention_Title": "Ο λογαριασμός χρειάζεται προσοχή",
+    "Exception_AccountNeedsAttention_Message": "'{0}' χρειάζεται την προσοχή σας για να συνεχίσετε.",
+    "Exception_WebView2RuntimeMissing_Message": "Το Wino Mail δεν μπόρεσε να βρει το runtime Microsoft Edge WebView2. Παρακαλούμε εγκαταστήστε ή επιδιορθώστε το runtime ώστε να αποδοθούν σωστά τα περιεχόμενα του μηνύματος.",
+    "Exception_WebView2RuntimeMissing_Title": "Απαιτείται το WebView2 runtime",
     "Exception_AuthenticationCanceled": "Η ταυτοποίηση ακυρώθηκε",
     "Exception_CustomThemeExists": "Αυτό το θέμα υπάρχει ήδη.",
     "Exception_CustomThemeMissingName": "Πρέπει να δώσετε ένα όνομα.",
     "Exception_CustomThemeMissingWallpaper": "Πρέπει να δώσετε μια προσαρμοσμένη εικόνα φόντου.",
     "Exception_FailedToSynchronizeAliases": "Αποτυχία συγχρονισμού ψευδωνύμων",
+    "Exception_FailedToSynchronizeCalendarData": "Αποτυχία συγχρονισμού δεδομένων ημερολογίου",
+    "Exception_FailedToSynchronizeCalendarEvents": "Αποτυχία συγχρονισμού συμβάντων ημερολογίου",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Αποτυχία συγχρονισμού λεπτομερειών ημερολογίου",
     "Exception_FailedToSynchronizeFolders": "Αποτυχία συγχρονισμού φακέλων",
     "Exception_FailedToSynchronizeProfileInformation": "Αποτυχία συγχρονισμού πληροφοριών προφίλ",
     "Exception_GoogleAuthCallbackNull": "Το Callback uri είναι κενό κατά την ενεργοποίηση.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Μετακίνηση στα Ανεπιθύμητα",
     "HoverActionOption_ToggleFlag": "Προσθήκη/ Αφαίρεση σημαίας",
     "HoverActionOption_ToggleRead": "Αναγνωσμένο / Μη Αναγνωσμένο",
+    "KeyboardShortcuts_FailedToReset": "Αποτυχία επαναφοράς συντομεύσεων πληκτρολογίου.",
+    "KeyboardShortcuts_FailedToUpdate": "Αποτυχία ενημέρωσης συντομεύσεων πληκτρολογίου",
+    "KeyboardShortcuts_MailoperationAction": "Ενέργεια",
+    "KeyboardShortcuts_Action": "Ενέργεια",
+    "KeyboardShortcuts_FailedToLoad": "Αποτυχία φόρτωσης συντομεύσεων πληκτρολογίου.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Παρακαλώ εισάγετε ένα πλήκτρο για τη συντόμευση.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Παρακαλώ επιλέξτε μια ενέργεια για τη συντόμευση.",
+    "KeyboardShortcuts_EnterKey": "Παρακαλώ εισάγετε ένα πλήκτρο για τη συντόμευση.",
+    "KeyboardShortcuts_SelectOperation": "Παρακαλώ επιλέξτε μια ενέργεια για τη συντόμευση.",
+    "KeyboardShortcuts_ShortcutInUse": "Αυτή η συντόμευση χρησιμοποιείται ήδη από άλλη συντόμευση.",
+    "KeyboardShortcuts_FailedToSave": "Αποτυχία αποθήκευσης της συντόμευσης.",
+    "KeyboardShortcuts_FailedToDelete": "Αποτυχία διαγραφής της συντόμευσης.",
+    "KeyboardShortcuts_PageDescription": "Ρύθμιση συντομεύσεων πληκτρολογίου για γρήγορες ενέργειες ηλεκτρονικού ταχυδρομείου. Πατήστε πλήκτρα όταν το πεδίο εισαγωγής πλήκτρων είναι επιλεγμένο για να καταγραφούν οι συντομεύσεις.",
+    "KeyboardShortcuts_Add": "Προσθήκη συντόμευσης",
+    "KeyboardShortcuts_EditTitle": "Επεξεργασία συντόμευσης πληκτρολογίου",
+    "KeyboardShortcuts_ResetToDefaults": "Επαναφορά στις προεπιλεγμένες ρυθμίσεις",
+    "KeyboardShortcuts_PressKeysHere": "Πατήστε τα πλήκτρα εδώ...",
+    "KeyboardShortcuts_KeyCombination": "Συνδυασμός πλήκτρων",
+    "KeyboardShortcuts_FocusArea": "Εστιάστε στο πεδίο από πάνω και πατήστε τον επιθυμητό συνδυασμό πλήκτρων",
+    "KeyboardShortcuts_Modifiers": "Πλήκτρα τροποποίησης",
+    "KeyboardShortcuts_Mode": "Λειτουργία",
+    "KeyboardShortcuts_ModeMail": "Αλληλογραφία",
+    "KeyboardShortcuts_ModeCalendar": "Ημερολόγιο",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Εναλλαγή ανάγνωσης/μη ανάγνωσης",
+    "KeyboardShortcuts_ActionToggleFlag": "Εναλλαγή σημαίας",
+    "KeyboardShortcuts_ActionToggleArchive": "Εναλλαγή αρχειοθέτησης/μη αρχειοθέτησης",
     "ImageRenderingDisabled": "Η αποτύπωση εικόνων είναι απενεργοποιημένη για αυτό το μήνυμα.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Μέθοδος επαλήθευσης",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Ασφάλεια σύνδεσης",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Όνομα χρήστη",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Χρησιμοποιήστε το ίδιο όνομα χρήστη και κωδικό πρόσβασης για την αποστολή email",
+    "ImapCalDavSettingsPage_TitleCreate": "Ρύθμιση IMAP και Ημερολογίου",
+    "ImapCalDavSettingsPage_TitleEdit": "Επεξεργασία ρυθμίσεων IMAP και Ημερολογίου",
+    "ImapCalDavSettingsPage_Subtitle": "Ρυθμίστε το IMAP/SMTP και προαιρετικό συγχρονισμό ημερολογίου για αυτόν τον λογαριασμό.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Βασική ρύθμιση",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Πληκτρολογήστε την ταυτότητα και τα διαπιστευτήριά σας. Το Wino μπορεί να προσπαθήσει να εντοπίσει αυτόματα τις ρυθμίσεις διακομιστή.",
+    "ImapCalDavSettingsPage_BasicTab": "Βασικό",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Ενεργοποίηση υποστήριξης ημερολογίου",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Αυτόματη εύρεση ρυθμίσεων αλληλογραφίας",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Οι ρυθμίσεις αλληλογραφίας εντοπίστηκαν και εφαρμόστηκαν.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Προχωρημένες ρυθμίσεις",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Εισάγετε ρυθμίσεις διακομιστή χειροκίνητα εάν η αυτόματη εύρεση είναι μη διαθέσιμη ή εσφαλμένη.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Προχωρημένες",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Ρύθμιση ημερολογίου",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Επιλέξτε πώς τα δεδομένα ημερολογίου θα λειτουργούν για αυτόν τον λογαριασμό IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Λειτουργία ημερολογίου",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Ασφάλεια σύνδεσης",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Μέθοδος αυθεντικοποίησης",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Απενεργοποιημένη",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Συγχρονισμός CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Μόνο το τοπικό ημερολόγιο",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Το ημερολόγιο είναι απενεργοποιημένο γι' αυτόν τον λογαριασμό.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Τα στοιχεία ημερολογίου συγχρονίζονται με τον διακομιστή CalDAV σας.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Τα στοιχεία ημερολογίου αποθηκεύονται μόνο σε αυτόν τον υπολογιστή και δεν συγχρονίζονται με το δίκτυο.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Πώς λειτουργεί το τοπικό ημερολόγιο",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Μόνο το τοπικό ημερολόγιο",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Το τοπικό ημερολόγιο διατηρεί όλα τα γεγονότα μόνο στον υπολογιστή σας. Τίποτα δεν συγχρονίζεται με το iCloud, Yahoo ή άλλο πάροχο.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "Διεύθυνση URL υπηρεσίας CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Όνομα χρήστη CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Κωδικός CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Η δοκιμή CalDAV απαιτείται μόνο όταν η λειτουργία ημερολογίου έχει οριστεί σε CalDAV συγχρονισμό.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "Απαιτείται διεύθυνση URL υπηρεσίας CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "Η διεύθυνση URL της υπηρεσίας CalDAV πρέπει να είναι απόλυτο URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Απαιτείται όνομα χρήστη CalDAV.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Απαιτείται κωδικός πρόσβασης CalDAV.",
+    "ImapCalDavSettingsPage_TestImapButton": "Δοκιμή σύνδεσης IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Δοκιμή σύνδεσης CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Η δοκιμή σύνδεσης IMAP ολοκληρώθηκε με επιτυχία.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Η δοκιμή σύνδεσης CalDAV ολοκληρώθηκε με επιτυχία.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Οι ρυθμίσεις λογαριασμού επαληθεύτηκαν και αποθηκεύτηκαν.",
+    "ImapCalDavSettingsPage_ICloudHint": "Χρησιμοποιήστε έναν κωδικό πρόσβασης εφαρμογής που παράγεται από τις ρυθμίσεις λογαριασμού Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Χρησιμοποιήστε έναν κωδικό πρόσβασης εφαρμογής από τις ρυθμίσεις ασφάλειας του λογαριασμού σας Yahoo.",
     "Info_AccountCreatedMessage": "Ο {0} δημιουργήθηκε",
     "Info_AccountCreatedTitle": "Δημιουργία Λογαριασμού",
     "Info_AccountCreationFailedTitle": "Αποτυχία Δημιουργίας Λογαριασμού",
     "Info_AccountDeletedMessage": "Ο {0} διαγράφηκε επιτυχώς.",
     "Info_AccountDeletedTitle": "Ο Λογαριασμός Διαγράφηκε",
     "Info_AccountIssueFixFailedTitle": "Αποτυχία",
+    "Info_AccountIssueFixImapMessage": "Ανοίξτε τη σελίδα ρυθμίσεων IMAP και ημερολογίου για να εισαγάγετε ξανά τα διαπιστευτήριά σας στον διακομιστή.",
+    "Info_AccountAttentionRequiredMessage": "Αυτός ο λογαριασμός χρειάζεται την προσοχή σας.",
+    "Info_AccountAttentionRequiredClickableMessage": "Κάντε κλικ για να διορθώσετε αυτόν τον λογαριασμό και να τον επανασυγχρονίσετε.",
+    "Info_AccountAttentionRequiredAction": "Διόρθωση",
+    "Info_AccountAttentionRequiredActionHint": "Κάντε κλικ στη Διόρθωση για να επιλύσετε αυτό το ζήτημα του λογαριασμού.",
     "Info_AccountIssueFixSuccessMessage": "Επιδιορθώθηκαν όλα τα ζητήματα λογαριασμού.",
     "Info_AccountIssueFixSuccessTitle": "Επιτυχία",
     "Info_AttachmentOpenFailedMessage": "Αδυναμία ανοίγματος αυτού του συνημμένου.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Αυτός ο φάκελος είναι απενεργοποιημένος για συγχρονισμό.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Απενεργοποιημένος Φάκελος",
     "Justify": "Στοίχιση",
+    "MenuUpdateAvailable": "Διαθέσιμη ενημέρωση",
     "Left": "Αριστερά",
     "Link": "Σύνδεσμος",
     "LinkedAccountsCreatePolicyMessage": "πρέπει να έχετε τουλάχιστον 2 λογαριασμούς για να δημιουργήσετε σύνδεσμο\nο σύνδεσμος θα αφαιρεθεί κατά την αποθήκευση",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Αφαίρεση από το αρχείο",
     "MailOperation_ViewMessageSource": "Προβολή προέλευσης μηνύματος",
     "MailOperation_Zoom": "Μεγέθυνση",
+    "MailsDragging": "Μετακίνηση {0} αντικειμένου(ων)",
     "MailsSelected": "Επιλέχθηκαν {0} αντικείμενα/-ο",
     "MarkFlagUnflag": "Σήμανση ως με/χωρίς επισήμανση",
     "MarkReadUnread": "Σήμανση ως αναγνωσμένο/μη αναγνωσμένο",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Νέα Αλληλογραφία",
     "Notifications_WinoUpdatedMessage": "Ρίξτε μια ματιά στη νέα έκδοση {0}",
     "Notifications_WinoUpdatedTitle": "Το Wino Mail έχει ενημερωθεί.",
+    "Notifications_StoreUpdateAvailableTitle": "Διαθέσιμη ενημέρωση",
+    "Notifications_StoreUpdateAvailableMessage": "Μια νεότερη έκδοση του Wino Mail είναι έτοιμη για εγκατάσταση από το Microsoft Store.",
     "OnlineSearchFailed_Message": "Αποτυχία εκτέλεσης αναζήτησης\n{0}\n\nΕμφάνιση μηνυμάτων εκτός σύνδεσης.",
     "OnlineSearchTry_Line1": "Δεν μπορείτε να βρείτε αυτό που ψάχνετε;",
     "OnlineSearchTry_Line2": "Δοκιμάστε την online αναζήτηση.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Μικρό",
     "Photos": "Φωτογραφίες",
     "PreparingFoldersMessage": "Προετοιμασία φακέλων",
-    "ProtocolLogAvailable_Message": "Τα αρχεία καταγραφής πρωτοκόλλου είναι διαθέσιμα για διαγνωστικά.",
     "ProviderDetail_Gmail_Description": "Λογαριασμός Google",
     "ProviderDetail_iCloud_Description": "Λογαριασμός Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Αναζήτηση",
     "SearchingIn": "Αναζήτηση σε",
     "SearchPivotName": "Αποτελέσματα",
+    "Settings_KeyboardShortcuts_Title": "Συντομεύσεις πληκτρολόγιου",
+    "Settings_KeyboardShortcuts_Description": "Διαχείριση συντομεύσεων πληκτρολογίου για γρήγορες ενέργειες στα μηνύματα.",
     "SettingConfigureSpecialFolders_Button": "Διαμόρφωση",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Διαμόρφωση IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Αλλάξτε τις ρυθμίσεις του διακομιστή εισερχομένων/εξερχομένων σας.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Ρυθμίσεις IMAP και ημερολογίου",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Ανοίξτε τη σελίδα ρυθμίσεων IMAP, SMTP και CalDAV για αυτόν τον λογαριασμό.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Άνοιγμα ρυθμίσεων",
     "SettingsAbout_Description": "Μάθετε περισσότερα για το Wino.",
     "SettingsAbout_Title": "Σχετικά",
     "SettingsAboutGithub_Description": "Μεταβείτε στο αποθετήριο GitHub για τον ανιχνευτή προβλημάτων.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Τοπικό",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Προεπιλεγμένη λειτουργία αναζήτησης",
+    "SettingsAppPreferences_ApplicationMode_Title": "Προεπιλεγμένη λειτουργία εφαρμογής",
+    "SettingsAppPreferences_ApplicationMode_Description": "Επιλέξτε σε ποια λειτουργία ανοίγει το Wino όταν δεν έχει οριστεί ρητά τύπος ενεργοποίησης.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Αλληλογραφία",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Ημερολόγιο",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Το Wino Mail θα συνεχίσει να εκτελείται στο παρασκήνιο. Θα ειδοποιηθείτε καθώς φτάνουν νέα μηνύματα.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Εκτέλεση στο παρασκήνιο",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Το Wino Mail θα συνεχίσει να εκτελείται στο συαρτάρι συστήματος. Διαθέσιμο για εκκίνηση κάνοντας κλικ σε ένα εικονίδιο. Θα ειδοποιηθείτε καθώς φτάνουν νέα μηνύματα.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Μοιραίο σφάλμα προέκυψε κατά την αλλαγή της λειτουργίας εκκίνησης για το Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Εκκίνηση σε ελαχιστοποίηση κατά την έναρξη των Windows",
     "SettingsAppPreferences_Title": "Προτιμήσεις Εφαρμογής",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Απόκρυψη του κουμπιού λογαριασμού Wino στη γραμμή τίτλου",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Απόκρυψη του κουμπιού προφίλ στη γραμμή τίτλου που ανοίγει το μενού λογαριασμού Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Ειδοποιήσεις ενημερώσεων Microsoft Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Εμφάνιση ειδοποιήσεων και ενεργειών στο υποσέλιδο όταν υπάρχει διαθέσιμη ενημέρωση του Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Ενέργειες AI",
+    "SettingsAppPreferences_AiActions_Description": "Επιλέξτε προεπιλεγμένες γλώσσες AI και πού θα αποθηκεύονται οι περιλήψεις.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Προεπιλεγμένη γλώσσα μετάφρασης",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Επιλέξτε την προεπιλεγμένη γλώσσα-στόχο που χρησιμοποιούν οι ενέργειες μετάφρασης AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Γλώσσα περίληψης",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Επιλέξτε την προτιμώμενη γλώσσα περίληψης για μελλοντικά αποτελέσματα περίληψης AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Προεπιλεγμένη διαδρομή αποθήκευσης περιλήψεων",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Επιλέξτε τον φάκελο που θα χρησιμοποιεί το Wino προεπιλεγμένα όταν αποθηκεύει AI περιλήψεις.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Χρησιμοποιήστε την προκαθορισμένη τοποθεσία αποθήκευσης του συστήματος",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Αυτός ο φάκελος δεν υπάρχει. Θα χρησιμοποιηθεί η προεπιλεγμένη τοποθεσία αποθήκευσης για τις περιλήψεις.",
     "SettingsAutoSelectNextItem_Description": "Επιλέξτε το επόμενο στοιχείο μετά τη διαγραφή ή τη μετακίνηση ενός μηνύματος.",
     "SettingsAutoSelectNextItem_Title": "Αυτόματη επιλογή επόμενου αντικειμένου",
     "SettingsAvailableThemes_Description": "Επιλέξτε ένα θέμα από τη δική σας συλλογή Wino που σάς αρέσει ή εφαρμόστε τα δικά σας θέματα.",
     "SettingsAvailableThemes_Title": "Διαθέσιμα Θέματα",
     "SettingsCalendarSettings_Description": "Αλλαγή της πρώτης ημέρας της εβδομάδας, ύψος κελιού ώρας και περισσότερα...",
     "SettingsCalendarSettings_Title": "Ρυθμίσεις Ημερολογίου",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Προεπιλεγμένη διάρκεια αναβολής υπενθύμισης ημερολογίου",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Ορίστε μια προεπιλεγμένη διάρκεια αναβολής υπενθύμισης ημερολογίου.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Μορφή κεφαλίδας ημέρας χρονικής προβολής",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Επιλέξτε πώς αποδίδονται οι κορυφαίες ετικέτες ημέρας στις προβολές ημέρας, εβδομάδας και εργάσιμης εβδομάδας. Χρησιμοποιήστε τα tokens μορφής ημερομηνίας όπως ddd, dd, MMM ή dddd.",
     "SettingsComposer_Title": "Συνθέτης",
     "SettingsComposerFont_Title": "Προεπιλεγμένη Γραμματοσειρά Συντάκτη",
     "SettingsComposerFontFamily_Description": "Αλλάξτε την προεπιλεγμένη οικογένεια γραμματοσειρών και το μέγεθος γραμματοσειράς για τη σύνταξη μηνυμάτων.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Κανάλι Discord",
     "SettingsEditLinkedInbox_Description": "Προσθήκη / κατάργηση λογαριασμών, μετονομασία ή διακοπή του συνδέσμου μεταξύ λογαριασμών.",
     "SettingsEditLinkedInbox_Title": "Επεξεργασία Συνδεδεμένων Εισερχομένων",
+    "SettingsWindowBackdrop_Title": "Φόντο παραθύρου",
+    "SettingsWindowBackdrop_Description": "Επιλέξτε ένα εφέ φόντου για τα παράθυρα του Wino.",
+    "SettingsWindowBackdrop_Disabled": "Η επιλογή φόντου παραθύρου είναι απενεργοποιημένη όταν το θέμα της εφαρμογής δεν είναι Προεπιλεγμένο.",
     "SettingsElementTheme_Description": "Επιλέξτε ένα θέμα των Windows για Wino",
     "SettingsElementTheme_Title": "Θέμα Στοιχείου",
     "SettingsElementThemeSelectionDisabled": "Η επιλογή θέματος βάσει στοιχείου είναι απενεργοποιημένη όταν το θέμα της εφαρμογής είναι άλλο εκτός του Προεπιλεγμένου.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Ψευδώνυμα",
     "SettingsEditAccountDetails_Title": "Επεξεργασία Στοιχείων Λογαριασμού",
     "SettingsEditAccountDetails_Description": "Αλλάξτε το όνομα λογαριασμού, το όνομα του αποστολέα και ορίστε ένα νέο χρώμα αν θέλετε.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Αλλαγές Αποθηκεύτηκαν",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Τα στοιχεία λογαριασμού σας έχουν ενημερωθεί επιτυχώς.",
     "SettingsManageLink_Description": "Μετακίνηση αντικειμένων για προσθήκη νέου συνδέσμου ή κατάργηση υπάρχοντος συνδέσμου.",
     "SettingsManageLink_Title": "Διαχείριση Συνδέσμου",
     "SettingsMarkAsRead_Description": "Αλλάξτε τι πρέπει να συμβεί στο επιλεγμένο αντικείμενο.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Ειδοποιήσεις",
     "SettingsNotificationsAndTaskbar_Description": "Αλλάξτε αν θα εμφανίζονται ειδοποιήσεις και σήμα γραμμής εργασιών για αυτόν τον λογαριασμό.",
     "SettingsNotificationsAndTaskbar_Title": "Ειδοποιήσεις & Γραμμή Εργασιών",
+    "SettingsHome_Title": "Αρχική",
+    "SettingsHome_SearchTitle": "Εύρεση ρυθμίσεων",
+    "SettingsHome_SearchDescription": "Αναζητήστε με λειτουργία, θέμα ή λέξη-κλειδί για να μεταβείτε άμεσα στη σωστή σελίδα ρυθμίσεων.",
+    "SettingsHome_SearchPlaceholder": "Αναζήτηση ρυθμίσεων",
+    "SettingsHome_SearchExamples": "Δοκιμάστε: θέμα, αποθήκευση, γλώσσα, υπογραφή",
+    "SettingsHome_QuickLinks_Title": "Γρήγοροι σύνδεσμοι",
+    "SettingsHome_QuickLinks_Description": "Μεταβείτε γρήγορα στις ρυθμίσεις που οι άνθρωποι συχνά αναζητούν.",
+    "SettingsHome_StorageCard_Description": "Δείτε πόσο τοπικό MIME περιεχόμενο διατηρεί το Wino σε αυτή τη συσκευή και καθαρίστε το όταν χρειάζεται.",
+    "SettingsHome_StorageEmptySummary": "Δεν εντοπίστηκε ακόμη περιεχόμενο MIME στην προσωρινή μνήμη.",
+    "SettingsHome_StorageLoading": "Ελέγχεται η τοπική χρήση MIME...",
+    "SettingsHome_Tips_Title": "Συμβουλές & κόλπα",
+    "SettingsHome_Tips_Description": "Μερικές μικρές αλλαγές μπορούν να κάνουν το Wino πολύ πιο προσωπικό.",
+    "SettingsHome_Tip_Theme": "Θέλετε σκούρα λειτουργία ή αλλαγές σε έμφαση; Ανοίξτε την Προσωποποίηση.",
+    "SettingsHome_Tip_Background": "Χρησιμοποιήστε τις Προτιμήσεις Εφαρμογής για να ορίσετε τη συμπεριφορά εκκίνησης και τον συγχρονισμό στο παρασκήνιο.",
+    "SettingsHome_Tip_Shortcuts": "Οι συντομεύσεις πληκτρολογίου σας βοηθούν να μετακινείστε πιο γρήγορα στα μηνύματα.",
+    "SettingsHome_Resources_Title": "Χρήσιμοι σύνδεσμοι",
+    "SettingsHome_Resources_Description": "Άνοιγμα πόρων έργου, πληροφοριών υποστήριξης και καναλιών διάθεσης.",
     "SettingsOptions_Title": "Ρυθμίσεις",
+    "SettingsOptions_GeneralSection": "Γενικά",
+    "SettingsOptions_MailSection": "Αλληλογραφία",
+    "SettingsOptions_CalendarSection": "Ημερολόγιο",
+    "SettingsOptions_MoreComingSoon": "Περισσότερες επιλογές σύντομα διαθέσιμες",
+    "SettingsOptions_HeroDescription": "Διαμορφώστε την εμπειρία Wino Mail",
+    "SettingsOptions_AccountsSummary": "{0} λογαριασμό(-οι) ρυθμισμένος(-οι)",
+    "SettingsSearch_ManageAccounts_Keywords": "λογαριασμός;λογαριασμοί;γραμματοκιβώτιο;γραμματοκιβώτια;ψευδώνυμο;ψευδώνυμα;προφίλ;διεύθυνση;διευθύνσεις",
+    "SettingsSearch_AppPreferences_Keywords": "εκκίνηση;υπόβαθρο;εκκίνηση;συγχρονισμός;ειδοποίηση;ειδοποιήσεις;αναζήτηση;περιοχή ειδοποιήσεων;προεπιλογές",
+    "SettingsSearch_LanguageTime_Keywords": "γλώσσα;ώρα;ρολόι;τοπικές ρυθμίσεις;περιοχή;μορφή;24 ώρες;24h",
+    "SettingsSearch_Personalization_Keywords": "θέμα;σκοτεινό;φωτεινό;εμφάνιση;έμφαση;χρωματισμός;λειτουργία;διάταξη;πυκνότητα",
+    "SettingsSearch_About_Keywords": "περί;έκδοση;ιστοσελίδα;ιδιωτικότητα;github;δωρεά;κατάστημα;υποστήριξη",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "συντόμευση;συντομεύσεις;hotkey;hotkeys;πληκτρολόγιο;κλειδιά",
+    "SettingsSearch_MessageList_Keywords": "μήνυμα;μηνύματα;λίστα;νήματα;νήματα;εικόνα προφίλ;προεπισκόπηση;αποστολέας",
+    "SettingsSearch_ReadComposePane_Keywords": "αναγνώστης;σύνταξη;συνθέτης;γραμματοσειρά;γραμματοσειρές;εξωτερικό περιεχόμενο;εμφάνιση;ανάγνωση",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "υπογραφή;υπογραφές;κρυπτογράφηση;πιστοποιητικό;πιστοποιητικά;S/MIME;S/MIME;ασφάλεια",
+    "SettingsSearch_Storage_Keywords": "αποθήκευση;προσωρινή μνήμη;προσωρινή αποθήκευση;MIME περιεχόμενο;δίσκος;χώρος;εκκαθάριση;καθαρισμός;τοπικά δεδομένα",
+    "SettingsSearch_CalendarSettings_Keywords": "Ημερολόγιο;εβδομάδα;ώρες;πρόγραμμα;γεγονός;γεγονότα",
     "SettingsPaneLengthReset_Description": "Επαναφέρετε το μέγεθος της λίστας μηνυμάτων στο πρωτότυπο αν έχετε προβλήματα με αυτό.",
     "SettingsPaneLengthReset_Title": "Επαναφορά Μεγέθους Λίστας Ταχυδρομείου",
     "SettingsPaypal_Description": "Δείξτε πολύ περισσότερη αγάπη ❤️ Όλες οι δωρεές εκτιμούνται.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Εμφάνιση μορφής ρολογιού σε 24ώρο",
     "SettingsPrivacyPolicy_Description": "Εξέταση πολιτικής απορρήτου.",
     "SettingsPrivacyPolicy_Title": "Πολιτική Απορρήτου",
+    "SettingsWebsite_Description": "Ανοίξτε τον ιστότοπο του Wino Mail.",
+    "SettingsWebsite_Title": "Ιστότοπος",
     "SettingsReadComposePane_Description": "Γραμματοσειρές, εξωτερικό περιεχόμενο.",
     "SettingsReadComposePane_Title": "Αναγνώστης & Συνθέτης",
     "SettingsReader_Title": "Αναγνώστης",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Εμφάνιση Κειμένου Προεπισκόπησης",
     "SettingsShowSenderPictures_Description": "Απόκρυψη/εμφάνιση της μικρογραφίας του αποστολέα.",
     "SettingsShowSenderPictures_Title": "Εμφάνιση Avatars Αποστολέα",
+    "SettingsEmailTemplates_Title": "Πρότυπα email",
+    "SettingsEmailTemplates_Description": "Διαχείριση προτύπων email",
+    "SettingsEmailTemplates_CreatePageTitle": "Νέο πρότυπο",
+    "SettingsEmailTemplates_EditPageTitle": "Επεξεργασία προτύπου",
+    "SettingsEmailTemplates_NewTemplateTitle": "Νέο πρότυπο",
+    "SettingsEmailTemplates_NewTemplateDescription": "Δημιουργία νέου προτύπου email",
+    "SettingsEmailTemplates_NameTitle": "Όνομα",
+    "SettingsEmailTemplates_NamePlaceholder": "Όνομα προτύπου",
+    "SettingsEmailTemplates_DescriptionTitle": "Περιγραφή",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Προαιρετική περιγραφή",
+    "SettingsEmailTemplates_ContentTitle": "Περιεχόμενο προτύπου",
+    "SettingsEmailTemplates_ContentDescription": "Επεξεργασία του περιεχομένου HTML για αυτό το πρότυπο.",
+    "SettingsEmailTemplates_NameRequired": "Απαιτείται το όνομα του προτύπου.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Αντικείμενο εκκίνησης",
     "SettingsStore_Description": "Δείξτε λίγη αγάπη ❤️",
     "SettingsStore_Title": "Αξιολόγηση στο Κατάστημα",
+    "SettingsStorage_Title": "Αποθήκευση",
+    "SettingsStorage_Description": "Σάρωση και διαχείριση της προσωρινής μνήμης MIME που αποθηκεύεται στον τοπικό φάκελο δεδομένων.",
+    "SettingsStorage_ScanFolder": "Σάρωση τοπικού φακέλου δεδομένων",
+    "SettingsStorage_NoLocalMimeDataFound": "Δεν βρέθηκαν τοπικά δεδομένα MIME.",
+    "SettingsStorage_NoAccountsFound": "Δεν βρέθηκαν λογαριασμοί.",
+    "SettingsStorage_TotalUsage": "Συνολική τοπική χρήση MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} χρησιμοποιείται στην τοπική μνήμη cache MIME",
+    "SettingsStorage_DeleteAll_Title": "Διαγραφή όλου του περιεχομένου MIME",
+    "SettingsStorage_DeleteAll_Description": "Διαγραφή ολόκληρου του φακέλου προσωρινής μνήμης MIME αυτού του λογαριασμού.",
+    "SettingsStorage_DeleteAll_Button": "Διαγραφή όλων",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Διαγραφή όλου του περιεχομένου MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Να διαγραφούν όλα τα τοπικά δεδομένα MIME για {0} ?",
+    "SettingsStorage_DeleteAll_Success": "Όλο το περιεχόμενο MIME διαγράφηκε.",
+    "SettingsStorage_DeleteOld_Title": "Διαγραφή παλιότερου περιεχομένου MIME",
+    "SettingsStorage_DeleteOld_Description": "Διαγραφή αρχείων MIME με βάση την ημερομηνία δημιουργίας μηνύματος στη τοπική βάση δεδομένων.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 μήνας",
+    "SettingsStorage_DeleteOld_3Months": "> 3 μήνες",
+    "SettingsStorage_DeleteOld_6Months": "> 6 μήνες",
+    "SettingsStorage_DeleteOld_1Year": "> 1 έτος",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Διαγραφή παλιότερου περιεχομένου MIME",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Να διαγραφούν τα τοπικά δεδομένα MIME που είναι παλιότερα από {0} για {1} ?",
+    "SettingsStorage_DeleteOld_Success": "Διαγράφηκαν {0} φάκελος/φάκελοι MIME που είναι παλιότεροι από {1}.",
+    "SettingsStorage_1Month": "1 μήνας",
+    "SettingsStorage_3Months": "3 μήνες",
+    "SettingsStorage_6Months": "6 μήνες",
+    "SettingsStorage_1Year": "1 έτος",
+    "SettingsStorage_Months": "{0} μήνες",
     "SettingsTaskbarBadge_Description": "Συμπερίληψη μη αναγνωσμένου αριθμού αλληλογραφίας στο εικονίδιο της γραμμής εργασιών.",
     "SettingsTaskbarBadge_Title": "Σήμα Γραμμής Εργασιών",
     "SettingsThreads_Description": "Οργάνωση μηνυμάτων σε νήματα συνομιλίας.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Δεν μπορείτε να αντιστοιχίσετε τον φάκελο Εισερχομένων σε οποιονδήποτε άλλο φάκελο συστήματος.",
     "SystemFolderConfigSetupSuccess_Message": "Οι φάκελοι συστήματος έχουν ρυθμιστεί επιτυχώς.",
     "SystemFolderConfigSetupSuccess_Title": "Ρύθμιση Φακέλων Συστήματος",
+    "SystemTrayMenu_ShowWino": "Άνοιγμα Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Άνοιγμα Wino Ημερολογίου",
+    "SystemTrayMenu_ExitWino": "Έξοδος",
     "TestingImapConnectionMessage": "Έλεγχος σύνδεσης διακομιστή...",
     "TitleBarServerDisconnectedButton_Description": "Το Wino αποσυνδέθηκε από το δίκτυο. Κάντε κλικ στην επιλογή επανασύνδεση για επαναφορά της σύνδεσης.",
     "TitleBarServerDisconnectedButton_Title": "χωρίς σύνδεση",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Αναβάθμιση σε Απεριόριστους Λογαριασμούς",
     "WinoUpgradeRemainingAccountsMessage": "Χρησιμοποιούνται {0} από τους {1} δωρεάν λογαριασμούς.",
     "Yesterday": "Χθες",
+    "Smime_ImportCertificates_Success": "Τα πιστοποιητικά εισήχθησαν επιτυχώς.",
+    "Smime_ImportCertificates_Error": "Σφάλμα εισαγωγής πιστοποιητικών: {0}",
+    "Smime_RemoveCertificates_Confirm": "Θέλετε πραγματικά να αφαιρέσετε τα πιστοποιητικά {0} ?",
+    "Smime_RemoveCertificates_Success": "Τα πιστοποιητικά αφαιρέθηκαν.",
+    "Smime_ExportCertificates_Success": "Τα πιστοποιητικά εξήχθησαν.",
+    "Smime_ExportCertificates_Error": "Σφάλμα εξαγωγής πιστοποιητικών.",
+    "Smime_CertificateDetails": "Θέμα: {0}\nΕκδότης: {1}\nΙσχύει από: {2}\nΙσχύει έως: {3}\nΔακτυλικό αποτύπωμα: {4}",
+    "Smime_CertificatePassword_Title": "Απαιτείται κωδικός πρόσβασης πιστοποιητικού",
+    "Smime_CertificatePassword_Placeholder": "Κωδικός πρόσβασης πιστοποιητικού για {0} (προαιρετικό)",
+    "Smime_Confirm_Title": "Επιβεβαίωση",
+    "Buttons_OK": "ΟΚ",
+    "Buttons_Refresh": "Ανανέωση",
+    "SettingsSignatureAndEncryption_Title": "Υπογραφή και Κρυπτογράφηση",
+    "SettingsSignatureAndEncryption_Description": "Διαχείριση πιστοποιητικών S/MIME για την υπογραφή και την κρυπτογράφηση email.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Τα πιστοποιητικά μου",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Προσωπικά πιστοποιητικά για υπογραφή και κρυπτογράφηση",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Πιστοποιητικά αποδέκτη",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Πιστοποιητικά αποδέκτη για αποκρυπτογράφηση",
+    "SettingsSignatureAndEncryption_NameColumn": "Όνομα",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Λήγει στις",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Δακτυλικό αποτύπωμα",
+    "Buttons_Remove": "Αφαίρεση",
+    "Buttons_Export": "Εξαγωγή",
+    "Buttons_Import": "Εισαγωγή",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Πιστοποιητικό Υπογραφής S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Πιστοποιητικό Κρυπτογράφησης S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Κανένα",
+    "SmimeSignaturesInMessage": "Υπογραφές σε αυτό το μήνυμα:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, έγκυρο έως {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Πληροφορίες πιστοποιητικού Υπογραφής S/MIME",
+    "SmimeCertificateInfoTitle": "Πληροφορίες πιστοποιητικού S/MIME",
+    "SmimeNoCertificateFileFound": "Δεν βρέθηκε αρχείο πιστοποιητικού",
+    "SmimeSaveCertificate": "Αποθήκευση πιστοποιητικού...",
+    "SmimeCertificate": "Πιστοποιητικό S/MIME",
+    "SmimeCertificateSavedTo": "Το πιστοποιητικό αποθηκεύτηκε στο {0}",
+    "SmimeSignedTooltip": "Αυτό το μήνυμα έχει υπογραφεί με πιστοποιητικό S/MIME. Κάντε κλικ για περισσότερες λεπτομέρειες",
+    "SmimeEncryptedTooltip": "Αυτό το μήνυμα είναι κρυπτογραφημένο με πιστοποιητικό S/MIME.",
+    "SmimeCertificateFileInfo": "Αρχείο: {0}",
+    "Composer_LightTheme": "Φωτεινό Θέμα",
+    "Composer_DarkTheme": "Σκοτεινό Θέμα",
+    "Composer_Outdent": "Αφαίρεση εσοχής",
+    "Composer_Indent": "Εσοχή",
+    "Composer_BulletList": "Λίστα κουκκίδων",
+    "Composer_OrderedList": "Αριθμημένη λίστα",
+    "Composer_Stroke": "Γραμμή",
+    "Composer_Bold": "Έντονο",
+    "Composer_Italic": "Πλάγια",
+    "Composer_Underline": "Υπογραμμισμένο",
+    "Composer_CcBcc": "Κοινοποίηση (Cc) & Κρυφή κοινοποίηση (Bcc)",
+    "Composer_EnableSmimeSignature": "Ενεργοποίηση/ απενεργοποίηση υπογραφής S/MIME",
+    "Composer_EnableSmimeEncryption": "Ενεργοποίηση/ απενεργοποίηση κρυπτογράφησης S/MIME",
+    "Composer_LocalDraftSyncInfo": "Αυτό το προσχέδιο είναι τοπικά μόνο. Ο Wino απέτυχε να το στείλει στον διακομιστή ηλεκτρονικού ταχυδρομείου σας. Κάντε κλικ για επανάληψη αποστολής στον διακομιστή.",
+    "Composer_CertificateExpires": "Λήγει στις: ",
+    "Composer_SmimeSignature": "Υπογραφή S/MIME",
+    "Composer_SmimeEncryption": "Κρυπτογράφηση S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Πρότυπα ηλεκτρονικού ταχυδρομείου",
+    "Composer_AiSummarize": "Περίληψη με AI",
+    "Composer_AiSummarizeDescription": "Εξαγάγετε τα κύρια σημεία, ενέργειες και αποφάσεις από αυτό το email.",
+    "Composer_AiTranslate": "Μετάφραση με AI",
+    "Composer_AiActions": "Ενέργειες AI",
+    "Composer_AiRewrite": "Αναδιατύπωση με AI",
+    "AiActions_CheckingStatus": "Έλεγχος πρόσβασης AI…",
+    "AiActions_SignedOutTitle": "Ξεκλειδώστε το Wino AI Pack",
+    "AiActions_SignedOutDescription": "Μεταφράστε, επαναγράψτε και συνοψίστε τα email με τη χρήση AI αφού συνδεθείτε στον λογαριασμό σας Wino και ενεργοποιήσετε το πρόσθετο AI Pack.",
+    "AiActions_NoPackTitle": "Απαιτείται το AI Pack",
+    "AiActions_NoPackDescription": "Έχετε συνδεθεί, αλλά το AI Pack δεν είναι ενεργό ακόμα. Αγοράστε το για να χρησιμοποιήσετε τα εργαλεία μετάφρασης AI, επαναδιατύπωσης και περίληψης του Wino.",
+    "AiActions_UsageSummary": "{0} από {1} πιστώσεις χρησιμοποιήθηκαν αυτό το μήνα.",
+    "Composer_AiRewritePolite": "Κάντε το ευγενικό",
+    "Composer_AiRewritePoliteDescription": "Μαλακώνει τη διατύπωση διατηρώντας τον ίδιο σκοπό.",
+    "Composer_AiRewriteAngry": "Κάντε το να φανεί οργισμένο",
+    "Composer_AiRewriteAngryDescription": "Χρησιμοποιεί έναν πιο αιχμηρό και επιθετικό τόνο.",
+    "Composer_AiRewriteHappy": "Κάνε το χαρούμενο",
+    "Composer_AiRewriteHappyDescription": "Προσθέτει πιο ζωντανό και ενθουσιώδες τόνο.",
+    "Composer_AiRewriteFormal": "Κάνε το πιο επίσημο",
+    "Composer_AiRewriteFormalDescription": "Κάνει το μήνυμα να ακούγεται πιο επαγγελματικό και δομημένο.",
+    "Composer_AiRewriteFriendly": "Κάνε το πιο φιλικό",
+    "Composer_AiRewriteFriendlyDescription": "Ζεσταίνει το μήνυμα με έναν πιο προσιτός τόνο.",
+    "Composer_AiRewriteShorter": "Κάνε το πιο σύντομο",
+    "Composer_AiRewriteShorterDescription": "Συμπυκνώνει το κείμενο και αφαιρεί περιττές λεπτομέρειες.",
+    "Composer_AiRewriteClearer": "Κάνε το σαφέστερο",
+    "Composer_AiRewriteClearerDescription": "Βελτιώνει την αναγνωσιμότητα και κάνει το μήνυμα ευκολότερο να ακολουθηθεί.",
+    "Composer_AiRewriteCustom": "Προσαρμοσμένο",
+    "Composer_AiRewriteCustomDescription": "Περιγράψτε τη δική σας πρόθεση επαναδιατύπωσης.",
+    "Composer_AiRewriteCustomPlaceholder": "Περιγράψτε πώς θέλετε το μήνυμα να ξαναγραφεί",
+    "Composer_AiRewriteMode": "Τόνος επαναδιατύπωσης",
+    "Composer_AiRewriteApply": "Εφαρμογή επαναδιατύπωσης",
+    "Composer_AiTranslateDialogTitle": "Μετάφραση με AI",
+    "Composer_AiTranslateDialogDescription": "Εισάγετε τη γλώσσα-στόχο ή τον κωδικό κουλτούρας, π.χ. en-US, tr-TR, de-DE ή fr-FR.",
+    "Composer_AiTranslateApply": "Μετάφρασε",
+    "Composer_AiTranslateLanguage": "Γλώσσα-στόχος",
+    "Composer_AiTranslateCustomPlaceholder": "Εισάγετε κωδικό κουλτούρας",
+    "Composer_AiTranslateLanguageEnglish": "Αγγλικά (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Τουρκικά (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Γερμανικά (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Γαλλικά (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Ισπανικά (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Ιταλικά (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Πορτογαλικά (Βραζιλίας) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Ολλανδικά (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Πολωνικά (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Ρωσικά (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Ιαπωνικά (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Κορεάτικά (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Κινέζικα, Απλοποιημένα (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Αραβικά (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Χίντι (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Άλλο...",
+    "Composer_AiBusyTitle": "AI is already working",
+    "Composer_AiBusyMessage": "Please wait for the current AI action to finish.",
+    "Composer_AiSignInRequired": "Sign in to your Wino Account to use AI features.",
+    "Composer_AiMissingHtml": "There is no message content to send to Wino AI yet.",
+    "Composer_AiQuotaUnavailable": "The AI result was applied.",
+    "Composer_AiAppliedMessage": "The AI result was applied to the composer. Use Undo if you want to revert it.",
+    "Composer_AiSummarizeSuccessTitle": "AI summary applied",
+    "Composer_AiTranslateSuccessTitle": "AI translation applied",
+    "Composer_AiRewriteSuccessTitle": "AI rewrite applied",
+    "Composer_AiErrorTitle": "AI action failed",
+    "Reader_AiAppliedMessage": "The AI result is now shown for this message. Reopen the message to view the original content again.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contacts",
+    "ContactsPage_AddContact": "Add Contact",
+    "ContactsPage_EditContact": "Edit Contact",
+    "ContactsPage_DeleteContact": "Delete Contact",
+    "ContactsPage_SearchPlaceholder": "Search contacts...",
+    "ContactsPage_NoContacts": "No contacts found",
+    "ContactsPage_ContactsCount": "{0} contacts",
+    "ContactsPage_SelectedContactsCount": "{0} selected",
+    "ContactsPage_DeleteSelectedContacts": "Delete Selected",
+    "ContactEditDialog_Title": "Edit Contact",
+    "ContactEditDialog_PhotoSection": "Photo",
+    "ContactEditDialog_ChoosePhoto": "Choose Photo",
+    "ContactEditDialog_RemovePhoto": "Remove Photo",
+    "ContactEditDialog_NameHeader": "Name",
+    "ContactEditDialog_NamePlaceholder": "Contact name",
+    "ContactEditDialog_EmailHeader": "Email Address",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Contact Information",
+    "ContactEditDialog_RootContactInfo": "This is a root contact associated with your accounts and cannot be deleted.",
+    "ContactEditDialog_OverriddenContactInfo": "This contact has been manually modified and will not be updated during synchronization.",
+    "ContactsPage_Subtitle": "Manage your email contacts and their information",
+    "ContactStatus_Account": "Account",
+    "ContactStatus_Modified": "Modified",
+    "ContactAction_Edit": "Edit contact",
+    "ContactAction_ChangePhoto": "Change photo",
+    "ContactAction_Delete": "Delete contact",
+    "ContactAction_Add": "Add Contact",
+    "ContactSelection_Selected": "selected",
+    "ContactSelection_SelectAll": "Select All",
+    "ContactSelection_Clear": "Clear Selection",
+    "ContactsPage_EmptyState": "No contacts to display",
+    "ContactsPage_AddFirstContact": "Add your first contact",
+    "ContactsPage_ContactsCountSuffix": "contacts",
+    "ContactsPane_NewContact": "New Contact",
+    "ContactsPane_DescriptionTitle": "Manage your contacts",
+    "ContactsPane_DescriptionBody": "Create contacts, rename them, update profile pictures, and keep saved details organized in one place.",
+    "ContactEditDialog_AddTitle": "Add Contact",
+    "ContactInfoBar_ContactAdded": "Contact added successfully.",
+    "ContactInfoBar_ContactUpdated": "Contact updated successfully.",
+    "ContactInfoBar_ContactsDeleted": "Contacts deleted successfully.",
+    "ContactInfoBar_ContactPhotoUpdated": "Contact photo updated successfully.",
+    "ContactInfoBar_FailedToLoadContacts": "Failed to load contacts: {0}",
+    "ContactInfoBar_FailedToAddContact": "Failed to add contact: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Failed to update contact: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Failed to delete contacts: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Failed to update photo: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Root contacts cannot be deleted.",
+    "ContactConfirmDialog_DeleteTitle": "Delete Contact",
+    "ContactConfirmDialog_DeleteMessage": "Are you sure you want to delete the contact '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Are you sure you want to delete {0} contact(s)?",
+    "ContactConfirmDialog_DeleteButton": "Delete",
+    "CalendarAccountSettings_Title": "Calendar Account Settings",
+    "CalendarAccountSettings_Description": "Διαχείριση ρυθμίσεων ημερολογίου για το {0}",
+    "CalendarAccountSettings_AccountColor": "Χρώμα Λογαριασμού",
+    "CalendarAccountSettings_AccountColorDescription": "Αλλάξτε το χρώμα προβολής για αυτόν τον λογαριασμό ημερολογίου",
+    "CalendarAccountSettings_SyncEnabled": "Ενεργοποίηση Συγχρονισμού",
+    "CalendarAccountSettings_SyncEnabledDescription": "Ενεργοποιήστε ή απενεργοποιήστε τον συγχρονισμό ημερολογίου για αυτόν τον λογαριασμό",
+    "CalendarAccountSettings_DefaultShowAs": "Προεπιλεγμένη Κατάσταση Διαθεσιμότητας",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Προεπιλεγμένη κατάσταση διαθεσιμότητας για νέα γεγονότα που δημιουργούνται με αυτόν τον λογαριασμό.",
+    "CalendarAccountSettings_PrimaryCalendar": "Κύριο Ημερολόγιο",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Ορίστε αυτό το ημερολόγιο ως κύριο ημερολόγιο για τον λογαριασμό.",
+    "CalendarSettings_NewEventBehavior_Header": "Συμπεριφορά του Κουμπιού Νέου Γεγονότος",
+    "CalendarSettings_NewEventBehavior_Description": "Επιλέξτε εάν το κουμπί Νέου Γεγονότος θα ζητά κάθε φορά ένα ημερολόγιο ή θα ανοίγει πάντοτε ένα συγκεκριμένο ημερολόγιο.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Ρωτήστε κάθε φορά.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Πάντα χρησιμοποιήστε συγκεκριμένο ημερολόγιο.",
+    "CalendarSettings_Rendering_Title": "Απεικόνιση",
+    "CalendarSettings_Rendering_Description": "Διαμορφώστε τη διάταξη του ημερολογίου και τη συμπεριφορά προβολής.",
+    "CalendarSettings_Notifications_Title": "Ειδοποιήσεις",
+    "CalendarSettings_Notifications_Description": "Επιλέξτε την προεπιλεγμένη υπενθύμιση και τη συμπεριφορά αναβολής.",
+    "CalendarSettings_Preferences_Title": "Προτιμήσεις",
+    "CalendarSettings_Preferences_Description": "Ορίστε πώς συμπεριφέρεται το κουμπί Νέου Γεγονότος.",
+    "WhatIsNew_GetStartedButton": "Ξεκινήστε",
+    "WhatIsNew_ContinueAnywayButton": "Συνεχίστε ούτως ή άλλως",
+    "WhatIsNew_PreparingForNewVersionButton": "Ετοιμασία για τη Νέα Έκδοση...",
+    "WhatIsNew_MigrationPreparing_Title": "Ετοιμάζοντας τα δεδομένα σας",
+    "WhatIsNew_MigrationPreparing_Description": "Η Wino εφαρμόζει μεταναστεύσεις ενημερώσεων. Περιμένετε καθώς ετοιμάζουμε τα δεδομένα του λογαριασμού σας για αυτήν την έκδοση.",
+    "WhatIsNew_MigrationFailedMessage": "Η εφαρμογή μεταναστεύσεων απέτυχε με κωδικό σφάλματος {0}. Μπορείτε να συνεχίσετε να χρησιμοποιείτε την εφαρμογή. Ωστόσο, αν παρουσιαστούν σοβαρά προβλήματα, παρακαλούμε επανεγκαταστήστε την εφαρμογή.",
+    "WhatIsNew_MigrationNotification_Title": "Το Wino Mail Ενημερώθηκε",
+    "WhatIsNew_MigrationNotification_Message": "Ανοίξτε την εφαρμογή για να ολοκληρώσετε την ενημέρωση και να δείτε τι καινούριο.",
+    "WelcomeWindow_Title": "Καλώς ορίσατε στο Wino Mail",
+    "WelcomeWindow_Subtitle": "Μια εγγενής εμπειρία Windows για το Mail και το Ημερολόγιο.",
+    "WelcomeWindow_WhatsNewTitle": "Τελευταίες αλλαγές",
+    "WelcomeWindow_FeaturesTitle": "Λειτουργίες",
+    "WelcomeWindow_WhatsNewTab": "Τι νέο υπάρχει",
+    "WelcomeWindow_FeaturesTab": "Λειτουργίες",
+    "WelcomeWindow_GetStartedButton": "Ξεκινήστε προσθέτοντας έναν λογαριασμό",
+    "WelcomeWindow_GetStartedDescription": "Προσθέστε τον λογαριασμό σας Outlook, Gmail ή IMAP για να ξεκινήσετε με το Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Εισαγωγή από τον λογαριασμό σας Wino",
+    "WelcomeWindow_ImportInProgress": "Εισαγωγή των συγχρονισμένων προτιμήσεων και λογαριασμών σας...",
+    "WelcomeWindow_ImportNoAccountsFound": "Δεν βρέθηκαν συγχρονισμένοι λογαριασμοί σε αυτόν τον λογαριασμό Wino. Εάν υπήρχαν προτιμήσεις, επαναφέρθηκαν. Χρησιμοποιήστε το Ξεκινήστε για να προσθέσετε έναν λογαριασμό χειροκίνητα.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} συγχρονισμένοι λογαριασμοί είναι ήδη διαθέσιμοι σε αυτήν τη συσκευή. Χρησιμοποιήστε το Ξεκινήστε για να προσθέσετε ακόμη έναν λογαριασμό χειροκίνητα εάν χρειάζεται.",
+    "WelcomeWindow_SetupTitle": "Ρυθμίστε τον λογαριασμό σας",
+    "WelcomeWindow_SetupSubtitle": "Επιλέξτε τον πάροχο email σας για να ξεκινήσετε",
+    "WelcomeWindow_AddAccountButton": "Προσθήκη λογαριασμού",
+    "WelcomeWindow_SkipForNow": "Παράλειψη προς το παρόν — Θα το ρυθμίσω αργότερα",
+    "WelcomeWindow_AppDescription": "Ένα γρήγορο, εστιασμένο inbox — επανασχεδιασμένο για Windows 11",
+    "WelcomeWizard_Step1Title": "Καλώς ήρθατε",
+    "SystemTrayMenu_Open": "Άνοιγμα",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Ρυθμίσεις συγχρονισμού",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Κρατήστε τις προτιμήσεις Wino συγχρονισμένες σε όλες τις συσκευές.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Ξεκλειδώστε τα πρόσθετα",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Πρόσβαση σε premium δυνατότητες όπως το Wino AI Pack.",
+    "WinoAccount_Management_Description": "Διαχειριστείτε τον λογαριασμό Wino, την πρόσβαση στο AI Pack, και τις συγχρονισμένες προτιμήσεις και λεπτομέρειες λογαριασμού.",
+    "WinoAccount_Management_SignedOutTitle": "Σύνδεση στο Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Συνδεθείτε ή δημιουργήστε λογαριασμό για να συγχρονίσετε το email σας, να έχετε πρόσβαση σε λειτουργίες AI και να διαχειριστείτε τις ρυθμίσεις σας σε όλες τις συσκευές.",
+    "WinoAccount_Management_ProfileSectionHeader": "Προφίλ",
+    "WinoAccount_Management_AddOnsSectionHeader": "Πρόσθετα Wino",
+    "WinoAccount_Management_DataSectionHeader": "Δεδομένα",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Ενέργειες λογαριασμού",
+    "WinoAccount_Management_AccountCardTitle": "Λογαριασμός",
+    "WinoAccount_Management_AccountCardDescription": "Η διεύθυνση email του λογαριασμού Wino σας και η τρέχουσα κατάσταση λογαριασμού.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Δείτε εάν το Wino AI Pack είναι ενεργό και πόση χρήση απομένει.",
+    "WinoAccount_Management_AiPackActive": "Το AI Pack είναι ενεργό",
+    "WinoAccount_Management_AiPackInactive": "Το AI Pack δεν είναι ενεργό",
+    "WinoAccount_Management_AiPackUsage": "{0} από {1} χρήσεις καταναλώθηκαν. {2} απομένουν.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Περίοδος χρέωσης: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Οι λεπτομέρειες χρήσης δεν είναι ακόμη διαθέσιμες.",
+    "WinoAccount_Management_AiPackBuyDescription": "Αγοράστε το Wino AI Pack για μετάφραση, επαναγραφή ή περίληψη emails με AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Ξεκλειδώστε το AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Ενισχύστε την ροή εργασίας email με εργαλεία τεχνητής νοημοσύνης. Μεταφράστε μηνύματα σε 50+ γλώσσες, βελτιώστε τη σαφήνεια και τον τόνο, και λάβετε απευθείας περιλήψεις μακρών συνομιλιών.",
+    "WinoAccount_Management_AiPackPromoPrice": "4,99 $ / μήνα",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 credits",
+    "WinoAccount_Management_AiPackGetButton": "Λήψη AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Εργαλεία με τεχνητή νοημοσύνη για μετάφραση, επαναγραφή και περίληψη ενέργειών στο Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, μετάφραση, επαναγραφή, περίληψη, παραγωγικότητα",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Απεριόριστοι Λογαριασμοί",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Αφαιρέστε τον περιορισμό λογαριασμών και προσθέστε όσους λογαριασμούς email χρειάζεστε.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "λογαριασμοί, απεριόριστο, premium, πρόσθετο",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Συνδεθείτε με τον λογαριασμό σας Wino για να ολοκληρώσετε την αγορά.",
+    "WinoAccount_Management_PurchaseStartFailed": "Η αγορά από το Microsoft Store δεν μπόρεσε να ολοκληρωθεί.",
+    "WinoAccount_Management_StoreSyncFailed": "Η αγορά σας ολοκληρώθηκε, αλλά το Wino δεν μπόρεσε ακόμη να ανανεώσει τα οφέλη του λογαριασμού σας. Προσπαθήστε ξανά σε λίγο.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Η συνδρομή σας είναι ενεργή",
+    "WinoAccount_Management_AiPackRenews": "Ανανεώνει {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Χρησιμοποιήθηκαν πιστώσεις αυτόν τον μήνα",
+    "WinoAccount_Management_AiPackResets": "Επαναφορές {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Προέκυψαν προβλήματα φόρτωσης του υπολοίπου χρήσης AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Μετάφραση",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Επαναγραφή",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Περίληψη",
+    "WinoAccount_Management_AddOnLoadFailed": "Προέκυψαν προβλήματα φόρτωσης αυτού του πρόσθετου.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Συγχρονισμός Προτιμήσεων και Λογαριασμών",
+    "WinoAccount_Management_SyncPreferencesDescription": "Εισαγάγετε ή εξάγετε τις προτιμήσεις Wino και τις λεπτομέρειες γραμματοκιβωτίου σας σε όλες τις συσκευές. Κωδικοί πρόσβασης, διαπιστευτήρια και άλλες ευαίσθητες πληροφορίες δεν συγχρονίζονται ποτέ.",
+    "WinoAccount_Management_SignOutTitle": "Αποσύνδεση",
+    "WinoAccount_Management_SignOutDescription": "Αποσυνδεθείτε από τον λογαριασμό σας σε αυτήν τη συσκευή",
+    "WinoAccount_Management_StatusLabel": "Κατάσταση: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Δεν υπάρχουν ακόμη συγχρονισμένα δεδομένα αποθηκευμένα γι' αυτόν τον λογαριασμό.",
+    "WinoAccount_Management_ExportSucceeded": "Τα επιλεγμένα δεδομένα Wino εξήχθησαν με επιτυχία.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Οι προτιμήσεις σας εξήχθησαν στο λογαριασμό σας Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Εξήχθησαν {0} λεπτομέρειες λογαριασμού στον λογαριασμό σας Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Εισήχθησαν συγχρονισμένα δεδομένα από τον λογαριασμό σας Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Εφαρμόστηκαν {0} συγχρονισμένες προτιμήσεις.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Εισήχθησαν {0} λογαριασμοί.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Απορρίφθηκαν {0} λογαριασμοί που ήδη υπάρχουν σε αυτήν τη συσκευή.",
+    "WinoAccount_Management_ImportPartial": "Εφαρμόστηκαν {0} συγχρονισμένες προτιμήσεις. {1} προτιμήσεις δεν μπόρεσαν να αποκατασταθούν.",
+    "WinoAccount_Management_ImportReloginReminder": "Οι κωδικοί πρόσβασης, τα διακριτικά και άλλες ευαίσθητες πληροφορίες δεν εισήχθησαν. Συνδεθείτε ξανά για κάθε λογαριασμό σε αυτήν τη συσκευή πριν τη χρήση.",
+    "WinoAccount_Management_SerializeFailed": "Το Wino δεν μπόρεσε να σειριαφοποιήσει τις τρέχουσες προτιμήσεις σας.",
+    "WinoAccount_Management_EmptyExport": "Δεν υπάρχουν τιμές προτιμήσεων προς εξαγωγή.",
+    "WinoAccount_Management_ImportEmpty": "Το πακέτο συγχρονισμένων δεδομένων δεν περιέχει τίποτα νέο προς επαναφορά.",
+    "WinoAccount_Management_ExportDialog_Title": "Εξαγωγή στο Λογαριασμό σας Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Επιλέξτε τι θέλετε να συγχρονίσετε στον Λογαριασμό σας Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Προτιμήσεις",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Λογαριασμοί",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Κωδικοί πρόσβασης, διακριτικά και άλλες ευαίσθητες πληροφορίες δεν συγχρονίζονται.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Οι εισαγόμενοι λογαριασμοί σε άλλον υπολογιστή θα χρειαστεί να συνδεθείτε ξανά πριν μπορέσουν να χρησιμοποιηθούν.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Εξάγονται τα επιλεγμένα δεδομένα Wino.",
+    "WinoAccount_Management_LoadFailed": "Το Wino δεν μπόρεσε να φορτώσει τις τελευταίες πληροφορίες του Λογαριασμού Wino.",
+    "WinoAccount_Management_ActionFailed": "Το αίτημα Λογαριασμού Wino δεν μπόρεσε να ολοκληρωθεί.",
+    "WinoAccount_SettingsSection_Title": "Λογαριασμός Wino",
+    "WinoAccount_SettingsSection_Description": "Δημιουργήστε ή συνδεθείτε σε έναν Λογαριασμό Wino χρησιμοποιώντας την υπηρεσία αυθεντικοποίησης του τοπικού σας υπολογιστή.",
+    "WinoAccount_RegisterButton_Title": "Εγγραφή λογαριασμού",
+    "WinoAccount_RegisterButton_Description": "Δημιουργήστε έναν Λογαριασμό Wino με διεύθυνση email και κωδικό πρόσβασης.",
+    "WinoAccount_RegisterButton_Action": "Άνοιγμα της εγγραφής",
+    "WinoAccount_LoginButton_Title": "Σύνδεση",
+    "WinoAccount_LoginButton_Description": "Συνδεθείτε σε υπάρχον Λογαριασμό Wino χρησιμοποιώντας διεύθυνση email και κωδικό πρόσβασης.",
+    "WinoAccount_LoginButton_Action": "Άνοιγμα σύνδεσης",
+    "WinoAccount_SignOutButton_Title": "Αποσύνδεση",
+    "WinoAccount_SignOutButton_Description": "Αφαιρέστε τη συνεδρία του Λογαριασμού Wino που αποθηκεύεται τοπικά.",
+    "WinoAccount_SignOutButton_Action": "Αποσύνδεση",
+    "WinoAccount_RegisterDialog_Title": "Δημιουργία Λογαριασμού Wino",
+    "WinoAccount_RegisterDialog_Description": "Δημιουργήστε Λογαριασμό Wino για να διατηρήσετε την εμπειρία Wino σε συγχρονισμό και να ξεκλειδώσετε τις προσθήκες με βάση τον λογαριασμό.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Δημιουργήστε τον Λογαριασμό σας στο Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Γιατί να δημιουργήσετε έναν;",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Εισαγωγή και εξαγωγή ρυθμίσεων σε πολλαπλές συσκευές",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Μετακινήστε τις προτιμήσεις Wino μεταξύ συσκευών χωρίς να χρειάζεται να επαναφέρετε τη ρύθμισή σας από την αρχή.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Πρόσβαση σε αποκλειστικές προσθήκες όπως το Wino AI Pack (με χρέωση)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Χρησιμοποιήστε έναν λογαριασμό για να ξεκλειδώσετε τις προχωρημένες δυνατότητες του Wino καθώς γίνονται διαθέσιμες.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Ο Λογαριασμός Wino είναι ξεχωριστός από τους λογαριασμούς email σας",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Οι λογαριασμοί email σας όπως Outlook, Gmail, IMAP ή άλλοι παραμένουν ακριβώς όπως είναι. Ένας Λογαριασμός Wino διαχειρίζεται μόνο δυνατότητες που αφορούν το Wino και προσθήκες ανά λογαριασμό.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Εγγραφή",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Ιδιωτικότητα και επεξεργασία API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Προαιρετικές προσθήκες όπως το Wino AI Pack ενδέχεται να αποστείλουν επιλεγμένο HTML περιεχόμενο ηλεκτρονικού ταχυδρομείου στην υπηρεσία Wino API μόνο όταν χρησιμοποιείτε αυτές τις λειτουργίες.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Διαβάστε την πολιτική απορρήτου.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Συμφωνώ με την πολιτική απορρήτου.",
+    "WinoAccount_LoginDialog_Title": "Σύνδεση στον Λογαριασμό Wino",
+    "WinoAccount_LoginDialog_Description": "Συνδεθείτε στον Λογαριασμό Wino σας για να συγχρονίσετε τις ρυθμίσεις Wino και να αποκτήσετε πρόσβαση σε δυνατότητες που βασίζονται σε λογαριασμό.",
+    "WinoAccount_LoginDialog_HeroTitle": "Καλωσήρθατε ξανά",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Τι σας προσφέρει η σύνδεση",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Χρησιμοποιήστε τον Λογαριασμό Wino για να συνεχίσετε τον συγχρονισμό ρυθμίσεων σε πολλές συσκευές και για πρόσβαση σε επί πληρωμή προσθήκες όπως το Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Αυτό δεν αποτελεί είσοδος στο λογαριασμό email σας",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Η σύνδεση εδώ δεν προσθέτει ή αντικαθιστά τους λογαριασμούς Outlook, Gmail ή IMAP στο Wino. Συνδεθείτε μόνο σε υπηρεσίες που αφορούν το Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Ξεχάσατε τον κωδικό σας;",
+    "WinoAccount_EmailLabel": "Ηλεκτρονική διεύθυνση",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Κωδικός πρόσβασης",
+    "WinoAccount_ConfirmPasswordLabel": "Επιβεβαίωση κωδικού",
+    "WinoAccount_ForgotPasswordDialog_Title": "Επαναφέρετε τον κωδικό σας",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Αποστολή email επαναφοράς κωδικού",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Επιστροφή στη σύνδεση",
+    "WinoAccount_ForgotPasswordDialog_Description": "Εισάγετε τη διεύθυνση email του Λογαριασμού Wino και θα σας στείλουμε σύνδεσμο επαναφοράς κωδικού εάν η διεύθυνση έχει εγγραφεί.",
+    "WinoAccount_Validation_EmailRequired": "Απαιτείται διεύθυνση email.",
+    "WinoAccount_Validation_PasswordRequired": "Απαιτείται κωδικός πρόσβασης.",
+    "WinoAccount_Validation_PasswordMismatch": "Οι κωδικοί πρόσβασης δεν ταιριάζουν.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Πρέπει να αποδεχτείτε την πολιτική απορρήτου πριν τη δημιουργία Λογαριασμού Wino.",
+    "WinoAccount_Error_InvalidCredentials": "Η διεύθυνση email ή ο κωδικός πρόσβασης είναι λάθος.",
+    "WinoAccount_Error_AccountLocked": "Αυτός ο λογαριασμός είναι προσωρινά κλειδωμένος.",
+    "WinoAccount_Error_AccountBanned": "Αυτός ο λογαριασμός έχει απαγορευτεί.",
+    "WinoAccount_Error_AccountSuspended": "Αυτός ο λογαριασμός έχει τεθεί σε αναστολή.",
+    "WinoAccount_Error_EmailNotConfirmed": "Παρακαλώ επιβεβαιώστε τη διεύθυνση email προτού συνδεθείτε.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Παρακαλώ επιβεβαιώστε τη διεύθυνση email προτού συνδεθείτε.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Ένα νέο email επιβεβαίωσης δεν βρίσκεται ακόμη διαθέσιμο.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Αυτό το αίτημα επιβεβαίωσης δεν ισχύει πλέον. Παρακαλώ προσπαθήστε να συνδεθείτε ξανά.",
+    "WinoAccount_Error_EmailNotRegistered": "Αυτή η διεύθυνση email δεν είναι εγγεγραμμένη.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Η συνεδρία σας δεν είναι πλέον έγκυρη. Παρακαλώ συνδεθείτε ξανά.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Αυτή η διεύθυνση email έχει ήδη εγγραφεί.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Απαιτείται διεύθυνση email για να ολοκληρωθεί η εξωτερική σύνδεση.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Το αίτημα εξωτερικής σύνδεσης είναι άκυρο.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Η κατάσταση εξωτερικής σύνδεσης είναι άκυρη ή έχει λήξει.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Ο κωδικός εξωτερικής σύνδεσης είναι άκυρος ή έχει λήξει.",
+    "WinoAccount_Error_AiPackRequired": "Απαιτείται ενεργή συνδρομή Wino AI Pack για αυτήν τη ενέργεια.",
+    "WinoAccount_Error_AiQuotaExceeded": "Ο περιορισμός χρήσης του Wino AI Pack για την τρέχουσα περίοδο χρέωσης έχει εξαντληθεί.",
+    "WinoAccount_Error_AiHtmlEmpty": "Δεν υπάρχει περιεχόμενο email προς επεξεργασία.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Αυτό το email είναι υπερβολικά μεγάλο για επεξεργασία από το Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Αυτή η γλώσσα δεν υποστηρίζεται. Δοκιμάστε έναν έγκυρο πολιτισμικό κωδικό όπως en-US ή tr-TR.",
+    "WinoAccount_Error_Forbidden": "Δεν έχετε άδεια να εκτελέσετε αυτήν την ενέργεια.",
+    "WinoAccount_Error_ValidationFailed": "Το αίτημα δεν είναι έγκυρο. Παρακαλώ ελέγξτε τις καταχωρημένες τιμές.",
+    "WinoAccount_RegisterSuccessMessage": "Η εγγραφή του Λογαριασμού Wino ολοκληρώθηκε για {0}.",
+    "WinoAccount_LoginSuccessMessage": "Συνδεθήκατε στον Λογαριασμό Wino ως {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Επιβεβαιώστε τη διεύθυνση email σας",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Στείλαμε ένα email επιβεβαίωσης στη διεύθυνση {0}. Παρακαλούμε επιβεβαιώστε το και προσπαθήστε να συνδεθείτε ξανά.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Απαιτείται επιβεβαίωση email",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Ακόμη περιμένουμε να επιβεβαιώσετε το {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Αποστολή εκ νέου email επιβεβαίωσης",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Μπορείτε να αποστείλετε εκ新的 email επιβεβαίωσης σε {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Μπορείτε να αποστείλετε εκ νέου το email επιβεβαίωσης τώρα.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Το email επιβεβαίωσης εστάλη εκ νέου",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Στείλαμε ένα ακόμη email επιβεβαίωσης στη διεύθυνση {0}. Παρακαλώ επιβεβαιώστε το και προσπαθήστε να συνδεθείτε ξανά.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Αποστολή email επαναφοράς κωδικού",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Σας έχουμε στείλει ένα μήνυμα επαναφοράς κωδικού στη διεύθυνση {0}. Ανοίξτε το μήνυμα για να ορίσετε έναν νέο κωδικό.",
+    "WinoAccount_ChangePassword_Title": "Αλλαγή κωδικού",
+    "WinoAccount_ChangePassword_Description": "Αποστολή email επαναφοράς κωδικού σε αυτόν τον Λογαριασμό Wino.",
+    "WinoAccount_ChangePassword_Action": "Αποστολή email επαναφοράς",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Θέλετε το Wino να στείλει ένα email επαναφοράς κωδικού πρόσβασης στο {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Αποσυνδεθήκατε από τον λογαριασμό Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Δεν υπάρχει ενεργός λογαριασμός Wino για αποσύνδεση.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Λογαριασμός Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Συνδεθείτε ή δημιουργήστε έναν λογαριασμό Wino για να διαχειριστείτε τη συνεδρία σας στο Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Κατάσταση: {0}",
+    "WelcomeWizard_Step2Title": "Προσθήκη Λογαριασμού",
+    "WelcomeWizard_Step3Title": "Ολοκλήρωση Ρύθμισης",
+    "ProviderSelection_Title": "Επιλέξτε τον πάροχο email σας",
+    "ProviderSelection_Subtitle": "Επιλέξτε έναν πάροχο παρακάτω για να προσθέσετε τον λογαριασμό email σας στο Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Όνομα Λογαριασμού",
+    "ProviderSelection_AccountNamePlaceholder": "π.χ. Προσωπικό, Εργασία",
+    "ProviderSelection_DisplayNameHeader": "Όνομα εμφάνισης",
+    "ProviderSelection_DisplayNamePlaceholder": "π.χ. John Doe",
+    "ProviderSelection_EmailHeader": "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου",
+    "ProviderSelection_EmailPlaceholder": "π.χ. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Κωδικός πρόσβασης εφαρμογής",
+    "ProviderSelection_AppPasswordHelp": "Πώς μπορώ να πάρω έναν κωδικό πρόσβασης για την εφαρμογή;",
+    "ProviderSelection_CalendarModeHeader": "Ενσωμάτωση Ημερολογίου",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Απενεργοποιημένο",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Δεν υπάρχει ενσωμάτωση ημερολογίου",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV Συγχρονισμός",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Τα γεγονότα του ημερολογίου σας συγχρονίζονται με τους διακομιστές της Apple μεταξύ των συσκευών σας.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Τα γεγονότα του ημερολογίου σας συγχρονίζονται με τους διακομιστές Yahoo ανάμεσα στις συσκευές σας.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Τοπικό ημερολόγιο",
+    "ProviderSelection_CalendarMode_LocalDescription": "Τα γεγονότα σας αποθηκεύονται μόνο στον υπολογιστή σας. Δεν υπάρχει σύνδεση με διακομιστές.",
+    "ProviderSelection_ClearColor": "Εκκαθάριση χρώματος",
+    "ProviderSelection_ContinueButton": "Συνέχεια",
+    "ProviderSelection_SpecialImap_Subtitle": "Εισάγετε τα διαπιστευτήρια του λογαριασμού σας για να συνδεθείτε.",
+    "AccountSetup_Title": "Ρύθμιση του λογαριασμού σας",
+    "AccountSetup_Step_Authenticating": "Ταυτοποίηση με {0}",
+    "AccountSetup_Step_TestingMailAuth": "Δοκιμή αυθεντικοποίησης ηλεκτρονικού ταχυδρομείου",
+    "AccountSetup_Step_SyncingFolders": "Συγχρονισμός μεταδεδομένων φακέλων",
+    "AccountSetup_Step_FetchingProfile": "Λήψη πληροφοριών προφίλ",
+    "AccountSetup_Step_DiscoveringCalDav": "Εύρεση ρυθμίσεων CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Δοκιμή αυθεντικοποίησης ημερολογίου",
+    "AccountSetup_Step_SavingAccount": "Αποθήκευση πληροφοριών λογαριασμού",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Λήψη μεταδεδομένων ημερολογίου",
+    "AccountSetup_Step_SyncingAliases": "Συγχρονισμός ψευδωνύμων",
+    "AccountSetup_Step_Finalizing": "Ολοκλήρωση ρύθμισης",
+    "AccountSetup_FailureMessage": "Η ρύθμιση απέτυχε. Μεταβείτε πίσω για να διορθώσετε τις ρυθμίσεις σας ή προσπαθήστε ξανά αργότερα.",
+    "AccountSetup_SuccessMessage": "Ο λογαριασμός σας έχει ρυθμιστεί με επιτυχία!",
+    "AccountSetup_GoBackButton": "Πίσω",
+    "AccountSetup_TryAgainButton": "Προσπαθήστε Ξανά",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Αυτόματη εύρεση απέτυχε. Παρακαλούμε εισάγετε χειροκίνητα τις ρυθμίσεις στην καρτέλα Σύνθετες."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index 8eccf7fa..0d2d0b54 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -1,4 +1,4 @@
-{
+{
     "AccountAlias_Column_Alias": "Alias",
     "AccountAlias_Column_IsPrimaryAlias": "Primary",
     "AccountAlias_Column_Verified": "Verified",
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "all done",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Fetching calendar details.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "initializing",
     "AccountCreationDialog_PreparingFolders": "We are getting folder information at the moment.",
     "AccountCreationDialog_SigninIn": "Account information is being saved.",
+    "Purchased": "Purchased",
     "AccountEditDialog_Message": "Account Name",
     "AccountEditDialog_Title": "Edit Account",
     "AccountPickerDialog_Title": "Pick an account",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "General",
+    "AccountDetailsPage_TabMail": "Mail",
+    "AccountDetailsPage_TabCalendar": "Calendar",
+    "AccountDetailsPage_CalendarListDescription": "Select a calendar to configure its settings",
     "AddHyperlink": "Add",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP Account",
     "Busy": "Busy",
     "Buttons_AddAccount": "Add Account",
+    "Buttons_FixAccount": "Fix Account",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Apply",
     "Buttons_ApplyTheme": "Apply Theme",
     "Buttons_Browse": "Browse",
     "Buttons_Cancel": "Cancel",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Edit",
     "Buttons_EnableImageRendering": "Enable",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Manage",
     "Buttons_No": "No",
     "Buttons_Open": "Open",
     "Buttons_Purchase": "Purchase",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Save",
     "Buttons_SaveConfiguration": "Save Configuration",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Send to server",
     "Buttons_Share": "Share",
     "Buttons_SignIn": "Sign In",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Try Again",
     "Buttons_Yes": "Yes",
+    "Sync_SynchronizingFolder": "Synchronizing {0} {1}%",
+    "Sync_DownloadedMessages": "Downloaded {0} messages from {1}",
+    "SyncAction_Archiving": "Archiving {0} mail(s)",
+    "SyncAction_ClearingFlag": "Unflagging {0} mail(s)",
+    "SyncAction_CreatingDraft": "Creating draft",
+    "SyncAction_CreatingEvent": "Creating event",
+    "SyncAction_Deleting": "Deleting {0} mail(s)",
+    "SyncAction_EmptyingFolder": "Emptying folder",
+    "SyncAction_MarkingAsRead": "Marking {0} mail(s) as read",
+    "SyncAction_MarkingAsUnread": "Marking {0} mail(s) as unread",
+    "SyncAction_MarkingFolderAsRead": "Marking folder as read",
+    "SyncAction_Moving": "Moving {0} mail(s)",
+    "SyncAction_MovingToFocused": "Moving {0} mail(s) to Focused",
+    "SyncAction_RenamingFolder": "Renaming folder",
+    "SyncAction_SendingMail": "Sending mail",
+    "SyncAction_SettingFlag": "Flagging {0} mail(s)",
+    "SyncAction_SynchronizingAccount": "Synchronizing {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronizing {0} account(s)",
+    "SyncAction_SynchronizingCalendarData": "Synchronizing calendar data",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronizing calendar events",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchronizing calendar metadata",
+    "SyncAction_Unarchiving": "Unarchiving {0} mail(s)",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Accept",
+    "CalendarEventResponse_AcceptedResponse": "Accepted",
+    "CalendarEventResponse_Decline": "Decline",
+    "CalendarEventResponse_DeclinedResponse": "Declined",
+    "CalendarEventResponse_NotResponded": "Not Responded",
+    "CalendarEventResponse_Tentative": "Tentative",
+    "CalendarEventResponse_TentativeResponse": "Tentative",
+    "CalendarEventRsvpPanel_Accept": "Accept",
+    "CalendarEventRsvpPanel_AddMessage": "Add a message to your response... (optional)",
+    "CalendarEventRsvpPanel_Decline": "Decline",
+    "CalendarEventRsvpPanel_Message": "Message",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Send a reply message",
+    "CalendarEventRsvpPanel_Tentative": "Tentative",
+    "CalendarEventRsvpPanel_Title": "Response Options",
+    "CalendarAttendeeStatus_Accepted": "Accepted",
+    "CalendarAttendeeStatus_Declined": "Declined",
+    "CalendarAttendeeStatus_NeedsAction": "Needs Action",
+    "CalendarAttendeeStatus_Tentative": "Tentative",
+    "CalendarEventDetails_Attachments": "Attachments",
+    "CalendarEventCompose_AddAttachment": "Add attachment",
+    "CalendarEventCompose_AllDay": "All Day",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Attachments are not supported for CalDAV calendars.",
+    "CalendarEventCompose_EndDate": "End date",
+    "CalendarEventCompose_EndTime": "End time",
+    "CalendarEventCompose_Every": "every",
+    "CalendarEventCompose_ForWeekdays": "for",
+    "CalendarEventCompose_FrequencyDay": "day",
+    "CalendarEventCompose_FrequencyDayPlural": "days",
+    "CalendarEventCompose_FrequencyMonth": "month",
+    "CalendarEventCompose_FrequencyMonthPlural": "months",
+    "CalendarEventCompose_FrequencyWeek": "week",
+    "CalendarEventCompose_FrequencyWeekPlural": "weeks",
+    "CalendarEventCompose_FrequencyYear": "year",
+    "CalendarEventCompose_FrequencyYearPlural": "years",
+    "CalendarEventCompose_Location": "Location",
+    "CalendarEventCompose_LocationPlaceholder": "Add a location",
+    "CalendarEventCompose_NewEventButton": "New Event",
+    "CalendarEventCompose_DefaultCalendarHint": "You can choose a default calendar for new events in Calendar settings.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Open Calendar settings",
+    "CalendarEventCompose_NoCalendarsMessage": "There are no calendars available for event creation yet.",
+    "CalendarEventCompose_NoCalendarsTitle": "No calendars available",
+    "CalendarEventCompose_NoEndDate": "No end date",
+    "CalendarEventCompose_Notes": "Notes",
+    "CalendarEventCompose_PickCalendarTitle": "Pick a calendar",
+    "CalendarEventCompose_Recurring": "Recurring",
+    "CalendarEventCompose_RecurringSummary": "Occurs every {0} {1}{2} {3} effective {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Occurs {0}{1} {2} effective {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repeat every",
+    "CalendarEventCompose_SelectCalendar": "Select calendar",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Occurs on {0} {1}",
+    "CalendarEventCompose_StartDate": "Start date",
+    "CalendarEventCompose_StartTime": "Start time",
+    "CalendarEventCompose_TimeRangeSummary": "from {0} to {1}",
+    "CalendarEventCompose_Title": "Event title",
+    "CalendarEventCompose_TitlePlaceholder": "Add a title",
+    "CalendarEventCompose_Until": "until",
+    "CalendarEventCompose_UntilSummary": " until {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "The all-day end date must be after the start date.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "One or more attendees have an invalid email address.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "The recurrence end date must be on or after the event start date.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "The end time must be later than the start time.",
+    "CalendarEventCompose_ValidationMissingAttachment": "One or more attachments are no longer available: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Select a calendar before creating the event.",
+    "CalendarEventCompose_ValidationMissingTitle": "Enter an event title before creating the event.",
+    "CalendarEventCompose_ValidationTitle": "Event validation failed",
+    "CalendarEventCompose_WeekdaySummary": " on {0}",
+    "CalendarEventCompose_Weekday_Friday": "F",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "S",
+    "CalendarEventCompose_Weekday_Sunday": "S",
+    "CalendarEventCompose_Weekday_Thursday": "T",
+    "CalendarEventCompose_Weekday_Tuesday": "T",
+    "CalendarEventCompose_Weekday_Wednesday": "W",
+    "CalendarEventDetails_Details": "Details",
+    "CalendarEventDetails_EditSeries": "Edit Series",
+    "CalendarEventDetails_Editing": "Editing",
+    "CalendarEventDetails_InviteSomeone": "Invite someone",
+    "CalendarEventDetails_JoinOnline": "Join Online",
+    "CalendarEventDetails_Organizer": "Organizer",
+    "CalendarEventDetails_People": "People",
+    "CalendarEventDetails_ReadOnlyEvent": "Read-only event",
+    "CalendarEventDetails_Reminder": "Reminder",
+    "CalendarReminder_StartedHoursAgo": "Started {0} hours ago",
+    "CalendarReminder_StartedMinutesAgo": "Started {0} minutes ago",
+    "CalendarReminder_StartedNow": "Started just now",
+    "CalendarReminder_StartingNow": "Starting now",
+    "CalendarReminder_StartsInHours": "Starts in {0} hours",
+    "CalendarReminder_StartsInMinutes": "Starts in {0} minutes",
+    "CalendarReminder_SnoozeAction": "Snooze",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutes",
+    "CalendarEventDetails_ShowAs": "Show as",
+    "CalendarShowAs_Free": "Free",
+    "CalendarShowAs_Tentative": "Tentative",
+    "CalendarShowAs_Busy": "Busy",
+    "CalendarShowAs_OutOfOffice": "Out of Office",
+    "CalendarShowAs_WorkingElsewhere": "Working Elsewhere",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copied to clipboard.",
     "ClipboardTextCopied_Title": "Copied",
     "ClipboardTextCopyFailed_Message": "Failed to copy {0} to clipboard.",
+    "ContactInfoBar_ErrorTitle": "Failed to load contact information",
+    "ContactInfoBar_SuccessTitle": "Contact information loaded",
+    "ContactInfoBar_WarningTitle": "Contact information might be incomplete",
     "ComingSoon": "Coming soon...",
     "ComposerAttachmentsDragDropAttach_Message": "Attach",
     "ComposerAttachmentsDropZone_Message": "Drop your files here",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Account Link Name",
     "DialogMessage_DeleteAccountConfirmationMessage": "Delete {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "All data associated with this account will be deleted from disk permanently.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Delete template \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Delete Email Template",
+    "DialogMessage_DeleteRecurringSeriesMessage": "This will delete all events in the series. Do you want to continue?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Delete Recurring Series",
     "DialogMessage_DiscardDraftConfirmationMessage": "This draft will be discarded. Do you want to continue?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Discard Draft",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Light mode",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "Account needs attention",
+    "Exception_AccountNeedsAttention_Message": "'{0}' requires your attention to continue working.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail could not find Microsoft Edge WebView2 Runtime. Please install or repair the runtime to render message content correctly.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2 runtime is required",
     "Exception_AuthenticationCanceled": "Authentication canceled",
     "Exception_CustomThemeExists": "This theme already exists.",
     "Exception_CustomThemeMissingName": "You must provide a name.",
     "Exception_CustomThemeMissingWallpaper": "You must provide a custom background image.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Failed to synchronize calendar data",
+    "Exception_FailedToSynchronizeCalendarEvents": "Failed to synchronize calendar events",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Failed to synchronize calendar details",
     "Exception_FailedToSynchronizeFolders": "Failed to synchronize folders",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Move to Junk",
     "HoverActionOption_ToggleFlag": "Flag / Unflag",
     "HoverActionOption_ToggleRead": "Read / Unread",
+    "KeyboardShortcuts_FailedToReset": "Failed to reset keyboard shortcuts.",
+    "KeyboardShortcuts_FailedToUpdate": "Failed to update keyboard shortcuts",
+    "KeyboardShortcuts_MailoperationAction": "Action",
+    "KeyboardShortcuts_Action": "Action",
+    "KeyboardShortcuts_FailedToLoad": "Failed to load keyboard shortcuts.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Please enter a key for the shortcut.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Please an action to perform for the shortcut.",
+    "KeyboardShortcuts_EnterKey": "Please enter a key for the shortcut.",
+    "KeyboardShortcuts_SelectOperation": "Please select an action for the shortcut.",
+    "KeyboardShortcuts_ShortcutInUse": "This shortcut is already in use by another s hortcut.",
+    "KeyboardShortcuts_FailedToSave": "Failed to save the shortcut.",
+    "KeyboardShortcuts_FailedToDelete": "Failed to delete the shortcut.",
+    "KeyboardShortcuts_PageDescription": "Set up keyboard shortcuts for quick mail operations. Press keys while focused on the key input field to capture shortcuts.",
+    "KeyboardShortcuts_Add": "Add shortcut",
+    "KeyboardShortcuts_EditTitle": "Edit Keyboard Shortcut",
+    "KeyboardShortcuts_ResetToDefaults": "Reset to Defaults",
+    "KeyboardShortcuts_PressKeysHere": "Press keys here...",
+    "KeyboardShortcuts_KeyCombination": "Key Combination",
+    "KeyboardShortcuts_FocusArea": "Focus the field above and press the desired key combination",
+    "KeyboardShortcuts_Modifiers": "Modifier Keys",
+    "KeyboardShortcuts_Mode": "App Mode",
+    "KeyboardShortcuts_ModeMail": "Mail",
+    "KeyboardShortcuts_ModeCalendar": "Calendar",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Toggle read/unread",
+    "KeyboardShortcuts_ActionToggleFlag": "Toggle flag",
+    "KeyboardShortcuts_ActionToggleArchive": "Toggle archive/unarchive",
     "ImageRenderingDisabled": "Image rendering is disabled for this message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Username",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP and Calendar Setup",
+    "ImapCalDavSettingsPage_TitleEdit": "Edit IMAP and Calendar Settings",
+    "ImapCalDavSettingsPage_Subtitle": "Configure IMAP/SMTP and optional calendar synchronization for this account.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Basic setup",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Enter your identity and credentials. Wino can try to detect server settings automatically.",
+    "ImapCalDavSettingsPage_BasicTab": "Basic",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Enable calendar support",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Autodiscover mail settings",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Mail settings discovered and applied.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Advanced configuration",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Enter server settings manually if autodiscovery is unavailable or incorrect.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Advanced",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Calendar setup",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Choose how calendar data should work for this IMAP account.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Calendar mode",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Connection security",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Authentication method",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Disabled",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV synchronization",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Local calendar only",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Calendar is disabled for this account.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Calendar items are synchronized with your CalDAV server.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Calendar items are stored only on this computer and are not synchronized to the network.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "How local calendar works",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Local calendar only",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Local calendar keeps all events only on your computer. Nothing is synchronized to iCloud, Yahoo, or any other provider.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV service URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV username",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV password",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV test is only required when calendar mode is set to CalDAV synchronization.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV service URL is required.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV service URL must be an absolute URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV username is required.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV password is required.",
+    "ImapCalDavSettingsPage_TestImapButton": "Test IMAP connection",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Test CalDAV connection",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP connection test succeeded.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV connection test succeeded.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Account settings validated and saved.",
+    "ImapCalDavSettingsPage_ICloudHint": "Use an app-specific password generated from your Apple account settings.",
+    "ImapCalDavSettingsPage_YahooHint": "Use an app password from your Yahoo account security settings.",
     "Info_AccountCreatedMessage": "{0} is created",
     "Info_AccountCreatedTitle": "Account Creation",
     "Info_AccountCreationFailedTitle": "Account Creation Failed",
     "Info_AccountDeletedMessage": "{0} is successfuly deleted.",
     "Info_AccountDeletedTitle": "Account Deleted",
     "Info_AccountIssueFixFailedTitle": "Failed",
+    "Info_AccountIssueFixImapMessage": "Open the IMAP and calendar settings page to enter your server credentials again.",
+    "Info_AccountAttentionRequiredMessage": "This account needs your attention.",
+    "Info_AccountAttentionRequiredClickableMessage": "Click to fix this account and resynchronize it.",
+    "Info_AccountAttentionRequiredAction": "Fix",
+    "Info_AccountAttentionRequiredActionHint": "Click Fix to resolve this account issue.",
     "Info_AccountIssueFixSuccessMessage": "Fixed all account issues.",
     "Info_AccountIssueFixSuccessTitle": "Success",
     "Info_AttachmentOpenFailedMessage": "Can't open this attachment.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "Update Available",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Unarchive",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Dragging {0} item(s)",
     "MailsSelected": "{0} item(s) selected",
     "MarkFlagUnflag": "Mark as flagged/unflagged",
     "MarkReadUnread": "Mark as read/unread",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "Update available",
+    "Notifications_StoreUpdateAvailableMessage": "A newer version of Wino Mail is ready to install from Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Small",
     "Photos": "Photos",
     "PreparingFoldersMessage": "Preparing folders",
-    "ProtocolLogAvailable_Message": "Protocol logs are available for diagnostics.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Keyboard Shortcuts",
+    "Settings_KeyboardShortcuts_Description": "Manage keyboard shortcuts for quick actions on the mails.",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP and calendar settings",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Open the dedicated IMAP, SMTP, and CalDAV settings page for this account.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Open settings",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Default application mode",
+    "SettingsAppPreferences_ApplicationMode_Description": "Choose which mode Wino opens in when no activation type explicitly sets it.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendar",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Hide Wino account button in title bar",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Hide the title bar profile button that opens the Wino account flyout.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Store update notifications",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Show notifications and footer actions when a Microsoft Store update is available.",
+    "SettingsAppPreferences_AiActions_Title": "AI actions",
+    "SettingsAppPreferences_AiActions_Description": "Choose default AI languages and where summaries should be saved.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Default translation language",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Pick the default target language used by AI translate actions.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Summarize language",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Choose the preferred summarize language for future AI summary output.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Default summary save path",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Choose the folder Wino should use by default when saving AI summaries.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Use the system default save location",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "This folder does not exist. The default save location will be used for summaries.",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Default snooze duration",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Set a default snooze duration for calendar reminder notifications.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Timed view day header format",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Choose how the top day labels are rendered in day, week, and work week views. Use date format tokens like ddd, dd, MMM, or dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Window Backdrop",
+    "SettingsWindowBackdrop_Description": "Select a backdrop effect for Wino windows.",
+    "SettingsWindowBackdrop_Disabled": "Window backdrop selection is disabled when application theme is selected other than Default.",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -576,11 +823,13 @@
     "SettingsMailSpacing_Description": "Adjust the spacing for listing mails.",
     "SettingsMailSpacing_Title": "Mail Spacing",
     "SettingsManageAccountSettings_Description": "Notifications, signatures, synchronization and other settings per account.",
-    "SettingsManageAccountSettings_Title": "Manage Account Settings",
+    "SettingsManageAccountSettings_Title": "Manage Accounts",
     "SettingsManageAliases_Description": "See e-mail aliases assigned for this account, update or delete them.",
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Changes Saved",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Your account details have been updated successfully.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Home",
+    "SettingsHome_SearchTitle": "Find a setting",
+    "SettingsHome_SearchDescription": "Search by feature, topic, or keyword to jump straight to the right settings page.",
+    "SettingsHome_SearchPlaceholder": "Search settings",
+    "SettingsHome_SearchExamples": "Try: theme, storage, language, signature",
+    "SettingsHome_QuickLinks_Title": "Quick links",
+    "SettingsHome_QuickLinks_Description": "Jump into the settings people reach for most often.",
+    "SettingsHome_StorageCard_Description": "See how much local MIME content Wino keeps on this device and clean it up when needed.",
+    "SettingsHome_StorageEmptySummary": "No cached MIME content detected yet.",
+    "SettingsHome_StorageLoading": "Checking local MIME usage...",
+    "SettingsHome_Tips_Title": "Tips & tricks",
+    "SettingsHome_Tips_Description": "A few small changes can make Wino feel much more personal.",
+    "SettingsHome_Tip_Theme": "Want dark mode or accent changes? Open Personalization.",
+    "SettingsHome_Tip_Background": "Use App Preferences to control startup behavior and background sync.",
+    "SettingsHome_Tip_Shortcuts": "Keyboard Shortcuts helps you move through mail faster.",
+    "SettingsHome_Resources_Title": "Helpful links",
+    "SettingsHome_Resources_Description": "Open project resources, support info, and release channels.",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "General",
+    "SettingsOptions_MailSection": "Mail",
+    "SettingsOptions_CalendarSection": "Calendar",
+    "SettingsOptions_MoreComingSoon": "More options coming soon",
+    "SettingsOptions_HeroDescription": "Customize your Wino Mail experience",
+    "SettingsOptions_AccountsSummary": "{0} account(s) configured",
+    "SettingsSearch_ManageAccounts_Keywords": "account;accounts;mailbox;mailboxes;alias;aliases;profile;address;addresses",
+    "SettingsSearch_AppPreferences_Keywords": "startup;background;launch;sync;notification;notifications;search;tray;defaults",
+    "SettingsSearch_LanguageTime_Keywords": "language;time;clock;locale;region;format;24 hour;24h",
+    "SettingsSearch_Personalization_Keywords": "theme;dark;light;appearance;accent;color;colour;mode;layout;density",
+    "SettingsSearch_About_Keywords": "about;version;website;privacy;github;donate;store;support",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "shortcut;shortcuts;hotkey;hotkeys;keyboard;keys",
+    "SettingsSearch_MessageList_Keywords": "message;messages;list;threading;threads;avatar;preview;sender",
+    "SettingsSearch_ReadComposePane_Keywords": "reader;compose;composer;font;fonts;external content;display;reading",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "signature;signatures;encryption;certificate;certificates;s mime;smime;security",
+    "SettingsSearch_Storage_Keywords": "storage;cache;caching;mime;disk;space;cleanup;clean up;local data",
+    "SettingsSearch_CalendarSettings_Keywords": "calendar;week;hours;schedule;event;events",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Open the Wino Mail website.",
+    "SettingsWebsite_Title": "Website",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "Email Templates",
+    "SettingsEmailTemplates_Description": "Manage e-mail templates",
+    "SettingsEmailTemplates_CreatePageTitle": "New template",
+    "SettingsEmailTemplates_EditPageTitle": "Edit template",
+    "SettingsEmailTemplates_NewTemplateTitle": "New template",
+    "SettingsEmailTemplates_NewTemplateDescription": "Create a new e-mail template",
+    "SettingsEmailTemplates_NameTitle": "Name",
+    "SettingsEmailTemplates_NamePlaceholder": "Template name",
+    "SettingsEmailTemplates_DescriptionTitle": "Description",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Optional description",
+    "SettingsEmailTemplates_ContentTitle": "Template content",
+    "SettingsEmailTemplates_ContentDescription": "Edit the HTML content for this template.",
+    "SettingsEmailTemplates_NameRequired": "Template name is required.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Storage",
+    "SettingsStorage_Description": "Scan and manage MIME cache stored in your local data folder.",
+    "SettingsStorage_ScanFolder": "Scan local data folder",
+    "SettingsStorage_NoLocalMimeDataFound": "No local MIME data found.",
+    "SettingsStorage_NoAccountsFound": "No accounts found.",
+    "SettingsStorage_TotalUsage": "Total local MIME usage: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} used in local MIME cache",
+    "SettingsStorage_DeleteAll_Title": "Delete all MIME content",
+    "SettingsStorage_DeleteAll_Description": "Delete this account's entire MIME cache folder.",
+    "SettingsStorage_DeleteAll_Button": "Delete all",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Delete all MIME content",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Delete all local MIME data for {0}?",
+    "SettingsStorage_DeleteAll_Success": "All MIME content was deleted.",
+    "SettingsStorage_DeleteOld_Title": "Delete old MIME content",
+    "SettingsStorage_DeleteOld_Description": "Delete MIME files based on mail creation date in local database.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 month",
+    "SettingsStorage_DeleteOld_3Months": "> 3 months",
+    "SettingsStorage_DeleteOld_6Months": "> 6 months",
+    "SettingsStorage_DeleteOld_1Year": "> 1 year",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Delete old MIME content",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Delete local MIME data older than {0} for {1}?",
+    "SettingsStorage_DeleteOld_Success": "Deleted {0} MIME folder(s) older than {1}.",
+    "SettingsStorage_1Month": "1 month",
+    "SettingsStorage_3Months": "3 months",
+    "SettingsStorage_6Months": "6 months",
+    "SettingsStorage_1Year": "1 year",
+    "SettingsStorage_Months": "{0} months",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Open Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Open Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Exit",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Certificates imported successfully.",
+    "Smime_ImportCertificates_Error": "Error importing certificates: {0}",
+    "Smime_RemoveCertificates_Confirm": "Do you really want to remove the certificates {0}?",
+    "Smime_RemoveCertificates_Success": "Certificates removed.",
+    "Smime_ExportCertificates_Success": "Certificates exported.",
+    "Smime_ExportCertificates_Error": "Error exporting certificates.",
+    "Smime_CertificateDetails": "Subject: {0}\nIssuer: {1}\nValid from: {2}\nValid to: {3}\nThumbprint: {4}",
+    "Smime_CertificatePassword_Title": "Certificate password required",
+    "Smime_CertificatePassword_Placeholder": "Certificate password for {0} (optional)",
+    "Smime_Confirm_Title": "Confirm",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Refresh",
+    "SettingsSignatureAndEncryption_Title": "Signature and Encryption",
+    "SettingsSignatureAndEncryption_Description": "Manage S/MIME certificates for signing and encrypting emails.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "My certificates",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Personal certificates for signing and encryption",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Recipient certificates",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Recipient certificates for decryption",
+    "SettingsSignatureAndEncryption_NameColumn": "Name",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Expires on",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Thumbprint",
+    "Buttons_Remove": "Remove",
+    "Buttons_Export": "Export",
+    "Buttons_Import": "Import",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/Mime Signing Certificate",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/Mime Encryption",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "None",
+    "SmimeSignaturesInMessage": "Signatures in this message:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, valid through {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME Signing Certificate Info",
+    "SmimeCertificateInfoTitle": "S/MIME Certificate Info",
+    "SmimeNoCertificateFileFound": "No certificate file found",
+    "SmimeSaveCertificate": "Save certificate...",
+    "SmimeCertificate": "S/MIME Certificate",
+    "SmimeCertificateSavedTo": "Certificate saved to {0}",
+    "SmimeSignedTooltip": "This message is signed with an S/Mime certificate. Click for more details",
+    "SmimeEncryptedTooltip": "This message is encrypted with an S/Mime certificate.",
+    "SmimeCertificateFileInfo": "File: {0}\nType: {1}\nSize: {2:N0} bytes",
+    "Composer_LightTheme": "Light Theme",
+    "Composer_DarkTheme": "Dark Theme",
+    "Composer_Outdent": "Outdent",
+    "Composer_Indent": "Indent",
+    "Composer_BulletList": "Bullet List",
+    "Composer_OrderedList": "Ordered List",
+    "Composer_Stroke": "Stroke",
+    "Composer_Bold": "Bold",
+    "Composer_Italic": "Italic",
+    "Composer_Underline": "Underline",
+    "Composer_CcBcc": "Cc & Bcc",
+    "Composer_EnableSmimeSignature": "Enable/disable S/MIME signature",
+    "Composer_EnableSmimeEncryption": "Enable/disable S/MIME encryption",
+    "Composer_LocalDraftSyncInfo": "This draft is local only. Wino failed to send it to your mail server. Click to retry sending it to the server.",
+    "Composer_CertificateExpires": "Expires on: ",
+    "Composer_SmimeSignature": "S/MIME Signature",
+    "Composer_SmimeEncryption": "S/MIME Encryption",
+    "Composer_EmailTemplatesPlaceholder": "E-mail templates",
+    "Composer_AiSummarize": "Summarize with AI",
+    "Composer_AiSummarizeDescription": "Extract key points, action items, and decisions from this email.",
+    "Composer_AiTranslate": "Translate with AI",
+    "Composer_AiActions": "AI Actions",
+    "Composer_AiRewrite": "Rewrite with AI",
+    "AiActions_CheckingStatus": "Checking AI access...",
+    "AiActions_SignedOutTitle": "Unlock Wino AI Pack",
+    "AiActions_SignedOutDescription": "Translate, rewrite, and summarize emails with AI after signing in to your Wino Account and activating the AI Pack add-on.",
+    "AiActions_NoPackTitle": "AI Pack required",
+    "AiActions_NoPackDescription": "You're signed in, but AI Pack is not active yet. Purchase it to use Wino's AI translation, rewrite, and summarize tools.",
+    "AiActions_UsageSummary": "{0} of {1} credits used this month.",
+    "Composer_AiRewritePolite": "Make it polite",
+    "Composer_AiRewritePoliteDescription": "Softens the wording while keeping the same intent.",
+    "Composer_AiRewriteAngry": "Make it angry",
+    "Composer_AiRewriteAngryDescription": "Uses a sharper and more confrontational tone.",
+    "Composer_AiRewriteHappy": "Make it happy",
+    "Composer_AiRewriteHappyDescription": "Adds a more upbeat and enthusiastic tone.",
+    "Composer_AiRewriteFormal": "Make it formal",
+    "Composer_AiRewriteFormalDescription": "Makes the message sound more professional and structured.",
+    "Composer_AiRewriteFriendly": "Make it friendly",
+    "Composer_AiRewriteFriendlyDescription": "Warms up the message with a more approachable tone.",
+    "Composer_AiRewriteShorter": "Make it shorter",
+    "Composer_AiRewriteShorterDescription": "Tightens the text and removes unnecessary detail.",
+    "Composer_AiRewriteClearer": "Make it clearer",
+    "Composer_AiRewriteClearerDescription": "Improves readability and makes the message easier to follow.",
+    "Composer_AiRewriteCustom": "Custom",
+    "Composer_AiRewriteCustomDescription": "Describe your own rewrite intention.",
+    "Composer_AiRewriteCustomPlaceholder": "Describe how you want the message rewritten",
+    "Composer_AiRewriteMode": "Rewrite tone",
+    "Composer_AiRewriteApply": "Apply rewrite",
+    "Composer_AiTranslateDialogTitle": "Translate with AI",
+    "Composer_AiTranslateDialogDescription": "Enter the target language or culture code, such as en-US, tr-TR, de-DE, or fr-FR.",
+    "Composer_AiTranslateApply": "Translate",
+    "Composer_AiTranslateLanguage": "Target language",
+    "Composer_AiTranslateCustomPlaceholder": "Enter culture code",
+    "Composer_AiTranslateLanguageEnglish": "English (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turkish (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "German (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "French (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spanish (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italian (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portuguese (Brazil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Dutch (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polish (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russian (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japanese (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korean (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinese, Simplified (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabic (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Other...",
+    "Composer_AiBusyTitle": "AI is already working",
+    "Composer_AiBusyMessage": "Please wait for the current AI action to finish.",
+    "Composer_AiSignInRequired": "Sign in to your Wino Account to use AI features.",
+    "Composer_AiMissingHtml": "There is no message content to send to Wino AI yet.",
+    "Composer_AiQuotaUnavailable": "The AI result was applied.",
+    "Composer_AiAppliedMessage": "The AI result was applied to the composer. Use Undo if you want to revert it.",
+    "Composer_AiSummarizeSuccessTitle": "AI summary applied",
+    "Composer_AiTranslateSuccessTitle": "AI translation applied",
+    "Composer_AiRewriteSuccessTitle": "AI rewrite applied",
+    "Composer_AiErrorTitle": "AI action failed",
+    "Reader_AiAppliedMessage": "The AI result is now shown for this message. Reopen the message to view the original content again.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contacts",
+    "ContactsPage_AddContact": "Add Contact",
+    "ContactsPage_EditContact": "Edit Contact",
+    "ContactsPage_DeleteContact": "Delete Contact",
+    "ContactsPage_SearchPlaceholder": "Search contacts...",
+    "ContactsPage_NoContacts": "No contacts found",
+    "ContactsPage_ContactsCount": "{0} contacts",
+    "ContactsPage_SelectedContactsCount": "{0} selected",
+    "ContactsPage_DeleteSelectedContacts": "Delete Selected",
+    "ContactEditDialog_Title": "Edit Contact",
+    "ContactEditDialog_PhotoSection": "Photo",
+    "ContactEditDialog_ChoosePhoto": "Choose Photo",
+    "ContactEditDialog_RemovePhoto": "Remove Photo",
+    "ContactEditDialog_NameHeader": "Name",
+    "ContactEditDialog_NamePlaceholder": "Contact name",
+    "ContactEditDialog_EmailHeader": "Email Address",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Contact Information",
+    "ContactEditDialog_RootContactInfo": "This is a root contact associated with your accounts and cannot be deleted.",
+    "ContactEditDialog_OverriddenContactInfo": "This contact has been manually modified and will not be updated during synchronization.",
+    "ContactsPage_Subtitle": "Manage your email contacts and their information",
+    "ContactStatus_Account": "Account",
+    "ContactStatus_Modified": "Modified",
+    "ContactAction_Edit": "Edit contact",
+    "ContactAction_ChangePhoto": "Change photo",
+    "ContactAction_Delete": "Delete contact",
+    "ContactAction_Add": "Add Contact",
+    "ContactSelection_Selected": "selected",
+    "ContactSelection_SelectAll": "Select All",
+    "ContactSelection_Clear": "Clear Selection",
+    "ContactsPage_EmptyState": "No contacts to display",
+    "ContactsPage_AddFirstContact": "Add your first contact",
+    "ContactsPage_ContactsCountSuffix": "contacts",
+    "ContactsPane_NewContact": "New Contact",
+    "ContactsPane_DescriptionTitle": "Manage your contacts",
+    "ContactsPane_DescriptionBody": "Create contacts, rename them, update profile pictures, and keep saved details organized in one place.",
+    "ContactEditDialog_AddTitle": "Add Contact",
+    "ContactInfoBar_ContactAdded": "Contact added successfully.",
+    "ContactInfoBar_ContactUpdated": "Contact updated successfully.",
+    "ContactInfoBar_ContactsDeleted": "Contacts deleted successfully.",
+    "ContactInfoBar_ContactPhotoUpdated": "Contact photo updated successfully.",
+    "ContactInfoBar_FailedToLoadContacts": "Failed to load contacts: {0}",
+    "ContactInfoBar_FailedToAddContact": "Failed to add contact: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Failed to update contact: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Failed to delete contacts: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Failed to update photo: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Root contacts cannot be deleted.",
+    "ContactConfirmDialog_DeleteTitle": "Delete Contact",
+    "ContactConfirmDialog_DeleteMessage": "Are you sure you want to delete the contact '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Are you sure you want to delete {0} contact(s)?",
+    "ContactConfirmDialog_DeleteButton": "Delete",
+    "CalendarAccountSettings_Title": "Calendar Account Settings",
+    "CalendarAccountSettings_Description": "Manage calendar settings for {0}",
+    "CalendarAccountSettings_AccountColor": "Account Color",
+    "CalendarAccountSettings_AccountColorDescription": "Change the display color for this calendar account",
+    "CalendarAccountSettings_SyncEnabled": "Enable Synchronization",
+    "CalendarAccountSettings_SyncEnabledDescription": "Enable or disable calendar synchronization for this account",
+    "CalendarAccountSettings_DefaultShowAs": "Default Show As Status",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Default availability status for new events created with this account",
+    "CalendarAccountSettings_PrimaryCalendar": "Primary Calendar",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Mark this calendar as the primary calendar for the account",
+    "CalendarSettings_NewEventBehavior_Header": "New Event button behavior",
+    "CalendarSettings_NewEventBehavior_Description": "Choose whether the New Event button should ask for a calendar each time or always open a specific calendar.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Ask each time.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Always use specific calendar.",
+    "CalendarSettings_Rendering_Title": "Rendering",
+    "CalendarSettings_Rendering_Description": "Configure calendar layout and display behavior.",
+    "CalendarSettings_Notifications_Title": "Notifications",
+    "CalendarSettings_Notifications_Description": "Choose default reminder and snooze behavior.",
+    "CalendarSettings_Preferences_Title": "Preferences",
+    "CalendarSettings_Preferences_Description": "Set how the New Event button behaves.",
+    "WhatIsNew_GetStartedButton": "Get Started",
+    "WhatIsNew_ContinueAnywayButton": "Continue anyway",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparing for new version...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparing your data",
+    "WhatIsNew_MigrationPreparing_Description": "Wino is applying update migrations. Please wait while we prepare your account data for this release.",
+    "WhatIsNew_MigrationFailedMessage": "Applying migrations failed with error code {0}. You may continue to use the application. However, if you encounter serious issues please re-install the application.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Updated",
+    "WhatIsNew_MigrationNotification_Message": "Open the app to complete the update and see what's new.",
+    "WelcomeWindow_Title": "Welcome to Wino Mail",
+    "WelcomeWindow_Subtitle": "A native Windows experience for Mail and Calendar.",
+    "WelcomeWindow_WhatsNewTitle": "Latest changes",
+    "WelcomeWindow_FeaturesTitle": "Features",
+    "WelcomeWindow_WhatsNewTab": "What's New",
+    "WelcomeWindow_FeaturesTab": "Features",
+    "WelcomeWindow_GetStartedButton": "Get started by adding an account",
+    "WelcomeWindow_GetStartedDescription": "Add your Outlook, Gmail, or IMAP account to get started with Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Import from your Wino Account",
+    "WelcomeWindow_ImportInProgress": "Importing your synchronized preferences and accounts...",
+    "WelcomeWindow_ImportNoAccountsFound": "No synced accounts were found in your Wino Account. If preferences were available, they were restored. Use Get started to add an account manually.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synced accounts are already available on this device. Use Get started to add another account manually if needed.",
+    "WelcomeWindow_SetupTitle": "Set up your account",
+    "WelcomeWindow_SetupSubtitle": "Choose your email provider to get started",
+    "WelcomeWindow_AddAccountButton": "Add account",
+    "WelcomeWindow_SkipForNow": "Skip for now — I'll set it up later",
+    "WelcomeWindow_AppDescription": "A fast, focused inbox — redesigned for Windows 11",
+    "WelcomeWizard_Step1Title": "Welcome",
+    "SystemTrayMenu_Open": "Open",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Sync settings",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Keep your Wino preferences in sync across devices.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Unlock add-ons",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Access premium features like Wino AI Pack.",
+    "WinoAccount_Management_Description": "Manage your Wino Account, AI Pack access, and synchronized preferences and account details.",
+    "WinoAccount_Management_SignedOutTitle": "Sign in to Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Sign in or create an account to sync your email, access AI features, and manage your settings across devices.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profile",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino Add-Ons",
+    "WinoAccount_Management_DataSectionHeader": "Data",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Account actions",
+    "WinoAccount_Management_AccountCardTitle": "Account",
+    "WinoAccount_Management_AccountCardDescription": "Your Wino Account email address and current account state.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "See whether Wino AI Pack is active and how much usage is left.",
+    "WinoAccount_Management_AiPackActive": "AI Pack is active",
+    "WinoAccount_Management_AiPackInactive": "AI Pack is not active",
+    "WinoAccount_Management_AiPackUsage": "{0} of {1} uses consumed. {2} remaining.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Billing period: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Usage details are not available yet.",
+    "WinoAccount_Management_AiPackBuyDescription": "Buy Wino AI Pack to translate, rewrite or summarize emails with AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Unlock AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Supercharge your email workflow with AI-powered tools. Translate messages into 50+ languages, rewrite for clarity and tone, and get instant summaries of long threads.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mo",
+    "WinoAccount_Management_AiPackPromoRequests": "1,000 credits",
+    "WinoAccount_Management_AiPackGetButton": "Get AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-powered tools for translate, rewrite, and summarize actions in Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, translate, rewrite, summarize, productivity",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Unlimited Accounts",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Remove the account limit and add as many mail accounts as you need.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "accounts, unlimited, premium, add-on",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Sign in with your Wino Account to complete this purchase.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino could not complete this Microsoft Store purchase.",
+    "WinoAccount_Management_StoreSyncFailed": "Your purchase finished, but Wino could not refresh your account benefits yet. Please try again in a moment.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Your subscription is active",
+    "WinoAccount_Management_AiPackRenews": "Renews {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Credits used this month",
+    "WinoAccount_Management_AiPackResets": "Resets {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "We had issues loading your AI usage balance.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Translate",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Rewrite",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Summarize",
+    "WinoAccount_Management_AddOnLoadFailed": "We had issues loading this add-on.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchronize Preferences and Accounts",
+    "WinoAccount_Management_SyncPreferencesDescription": "Import or export your Wino preferences and mailbox details across devices. Passwords, tokens, and other sensitive information are never synced.",
+    "WinoAccount_Management_SignOutTitle": "Sign out",
+    "WinoAccount_Management_SignOutDescription": "Sign out of your account on this device",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "There is no synchronized data stored for this account yet.",
+    "WinoAccount_Management_ExportSucceeded": "Your selected Wino data was exported successfully.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Your preferences were exported to your Wino Account.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exported {0} account details to your Wino Account.",
+    "WinoAccount_Management_ImportSucceeded": "Imported synchronized data from your Wino Account.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Applied {0} synchronized preferences.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Imported {0} accounts.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Skipped {0} accounts that already exist on this device.",
+    "WinoAccount_Management_ImportPartial": "Applied {0} synchronized preferences. {1} preferences could not be restored.",
+    "WinoAccount_Management_ImportReloginReminder": "Passwords, tokens, and other sensitive information were not imported. Sign in again for each account on this device before using it.",
+    "WinoAccount_Management_SerializeFailed": "Wino could not serialize your current preferences.",
+    "WinoAccount_Management_EmptyExport": "There are no preference values to export.",
+    "WinoAccount_Management_ImportEmpty": "The synchronized data payload does not contain anything new to restore.",
+    "WinoAccount_Management_ExportDialog_Title": "Export to your Wino Account",
+    "WinoAccount_Management_ExportDialog_Description": "Choose what you want to sync to your Wino Account.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferences",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Accounts",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Passwords, tokens, and other sensitive information are not synced.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Imported accounts on another PC will still need you to sign in again before they can be used.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exporting your selected Wino data...",
+    "WinoAccount_Management_LoadFailed": "Wino could not load the latest Wino Account information.",
+    "WinoAccount_Management_ActionFailed": "The Wino Account request could not be completed.",
+    "WinoAccount_SettingsSection_Title": "Wino Account",
+    "WinoAccount_SettingsSection_Description": "Create or sign in to a Wino Account using your localhost auth service.",
+    "WinoAccount_RegisterButton_Title": "Register account",
+    "WinoAccount_RegisterButton_Description": "Create a Wino Account with email and password.",
+    "WinoAccount_RegisterButton_Action": "Open registration",
+    "WinoAccount_LoginButton_Title": "Sign in",
+    "WinoAccount_LoginButton_Description": "Sign in to an existing Wino Account with email and password.",
+    "WinoAccount_LoginButton_Action": "Open login",
+    "WinoAccount_SignOutButton_Title": "Sign out",
+    "WinoAccount_SignOutButton_Description": "Remove the locally stored Wino Account session.",
+    "WinoAccount_SignOutButton_Action": "Sign out",
+    "WinoAccount_RegisterDialog_Title": "Create Wino Account",
+    "WinoAccount_RegisterDialog_Description": "Create a Wino Account to keep your Wino experience in sync and unlock account-based add-ons.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Create your Wino Account",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Why create one?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Import and export settings across devices",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Move your Wino preferences between devices without rebuilding your setup from scratch.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Access exclusive add-ons like Wino AI Pack (paid)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Use one account to unlock premium Wino features as they become available.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino Account is separate from your mail accounts",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Your Outlook, Gmail, IMAP, or other email accounts stay exactly as they are. A Wino Account only manages Wino-specific features and account-based add-ons.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Register",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacy and API processing",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Optional add-ons such as Wino AI Pack may send selected email HTML content to the Wino API service only when you use those features.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Read the privacy policy",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "I agree to the privacy policy.",
+    "WinoAccount_LoginDialog_Title": "Sign In to Wino Account",
+    "WinoAccount_LoginDialog_Description": "Sign in to your Wino Account to sync your Wino setup and access account-based features.",
+    "WinoAccount_LoginDialog_HeroTitle": "Welcome back",
+    "WinoAccount_LoginDialog_BenefitsTitle": "What signing in gives you",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Use your Wino Account to continue syncing settings across devices and to access paid add-ons such as Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "This is not your email mailbox sign-in",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Signing in here does not add or replace your Outlook, Gmail, or IMAP accounts in Wino. It only signs you in to Wino-specific services.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Forgot password?",
+    "WinoAccount_EmailLabel": "Email",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Password",
+    "WinoAccount_ConfirmPasswordLabel": "Confirm password",
+    "WinoAccount_ForgotPasswordDialog_Title": "Reset your password",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Send reset email",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Back to sign in",
+    "WinoAccount_ForgotPasswordDialog_Description": "Enter your Wino Account email address and we will send you a password reset link if the address is registered.",
+    "WinoAccount_Validation_EmailRequired": "Email is required.",
+    "WinoAccount_Validation_PasswordRequired": "Password is required.",
+    "WinoAccount_Validation_PasswordMismatch": "Passwords do not match.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "You must accept the privacy policy before creating a Wino Account.",
+    "WinoAccount_Error_InvalidCredentials": "The email address or password is incorrect.",
+    "WinoAccount_Error_AccountLocked": "This account is temporarily locked.",
+    "WinoAccount_Error_AccountBanned": "This account has been banned.",
+    "WinoAccount_Error_AccountSuspended": "This account has been suspended.",
+    "WinoAccount_Error_EmailNotConfirmed": "Please confirm your email address before signing in.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Please confirm your email address before signing in.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "A new confirmation email is not available yet.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "This confirmation request is no longer valid. Please try signing in again.",
+    "WinoAccount_Error_EmailNotRegistered": "This email address is not registered.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Your session is no longer valid. Please sign in again.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "This email address is already registered.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "An email address is required to complete external sign-in.",
+    "WinoAccount_Error_ExternalLoginInvalid": "The external sign-in request is invalid.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "The external sign-in state is invalid or expired.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "The external sign-in code is invalid or expired.",
+    "WinoAccount_Error_AiPackRequired": "An active Wino AI Pack subscription is required for this action.",
+    "WinoAccount_Error_AiQuotaExceeded": "Your AI Pack usage limit has been reached for the current billing period.",
+    "WinoAccount_Error_AiHtmlEmpty": "There is no email content to process.",
+    "WinoAccount_Error_AiHtmlTooLarge": "This email is too large to process with Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "That language is not supported. Try a valid culture code such as en-US or tr-TR.",
+    "WinoAccount_Error_Forbidden": "You do not have permission to perform this action.",
+    "WinoAccount_Error_ValidationFailed": "The request is invalid. Please review the entered values.",
+    "WinoAccount_RegisterSuccessMessage": "Wino Account registration completed for {0}.",
+    "WinoAccount_LoginSuccessMessage": "Signed in to Wino Account as {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirm your email address",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "We sent an email confirmation to {0}. Please confirm it and try signing in again.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Email confirmation required",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "We are still waiting for you to confirm {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Resend confirmation email",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "You can resend the confirmation email in {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "You can resend the confirmation email now.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Confirmation email resent",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "We sent another confirmation email to {0}. Please confirm it and try signing in again.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Password reset email sent",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "We sent a password reset email to {0}. Open that message to choose a new password.",
+    "WinoAccount_ChangePassword_Title": "Change password",
+    "WinoAccount_ChangePassword_Description": "Send a password reset email to this Wino Account.",
+    "WinoAccount_ChangePassword_Action": "Send reset email",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Do you want Wino to send a password reset email to {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Signed out from Wino Account {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "There is no active Wino Account to sign out.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino Account",
+    "WinoAccount_Titlebar_SignedOutDescription": "Sign in or create a Wino Account to manage your Wino session.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Add Account",
+    "WelcomeWizard_Step3Title": "Finish Setup",
+    "ProviderSelection_Title": "Choose your email provider",
+    "ProviderSelection_Subtitle": "Select a provider below to add your email account to Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Account Name",
+    "ProviderSelection_AccountNamePlaceholder": "e.g. Personal, Work",
+    "ProviderSelection_DisplayNameHeader": "Display Name",
+    "ProviderSelection_DisplayNamePlaceholder": "e.g. John Doe",
+    "ProviderSelection_EmailHeader": "E-mail Address",
+    "ProviderSelection_EmailPlaceholder": "e.g. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "App-Specific Password",
+    "ProviderSelection_AppPasswordHelp": "How do I get an app-specific password?",
+    "ProviderSelection_CalendarModeHeader": "Calendar Integration",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Disabled",
+    "ProviderSelection_CalendarMode_DisabledDescription": "No calendar integration",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV Synchronization",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Your calendar events are synced to Apple servers between your devices.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Your calendar events are synced to Yahoo servers between your devices.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Local calendar",
+    "ProviderSelection_CalendarMode_LocalDescription": "Your events are stored only on your computer. No server connectivity.",
+    "ProviderSelection_ClearColor": "Clear color",
+    "ProviderSelection_ContinueButton": "Continue",
+    "ProviderSelection_SpecialImap_Subtitle": "Enter your account credentials to connect.",
+    "AccountSetup_Title": "Setting up your account",
+    "AccountSetup_Step_Authenticating": "Authenticating with {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testing mail authentication",
+    "AccountSetup_Step_SyncingFolders": "Synchronizing folder metadata",
+    "AccountSetup_Step_FetchingProfile": "Fetching profile information",
+    "AccountSetup_Step_DiscoveringCalDav": "Discovering CalDAV settings",
+    "AccountSetup_Step_TestingCalendarAuth": "Testing calendar authentication",
+    "AccountSetup_Step_SavingAccount": "Saving account information",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Fetching calendar metadata",
+    "AccountSetup_Step_SyncingAliases": "Synchronizing aliases",
+    "AccountSetup_Step_Finalizing": "Finalizing setup",
+    "AccountSetup_FailureMessage": "Setup failed. Go back to fix your settings, or try again later.",
+    "AccountSetup_SuccessMessage": "Your account has been set up successfully!",
+    "AccountSetup_GoBackButton": "Go Back",
+    "AccountSetup_TryAgainButton": "Try Again",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Auto-discovery failed. Please enter settings manually in the Advanced tab."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/es_ES/resources.json b/Wino.Core.Domain/Translations/es_ES/resources.json
index 6857cbc7..b7a77f3c 100644
--- a/Wino.Core.Domain/Translations/es_ES/resources.json
+++ b/Wino.Core.Domain/Translations/es_ES/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Esta cuenta requiere la resincronización completa para continuar trabajando. Por favor, espera mientras Wino sincroniza tus mensajes...",
     "AccountContactNameYou": "Usted",
     "AccountCreationDialog_Completed": "todo hecho",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Obteniendo detalles del calendario.",
     "AccountCreationDialog_FetchingEvents": "Obteniendo eventos del calendario.",
     "AccountCreationDialog_FetchingProfileInformation": "Obteniendo información del perfil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Si su navegador no se ha abierto automáticamente para completar la autentificación:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "inicializando",
     "AccountCreationDialog_PreparingFolders": "Estamos obteniendo información de la carpeta en este momento.",
     "AccountCreationDialog_SigninIn": "La información de la cuenta se está guardando.",
+    "Purchased": "Comprado",
     "AccountEditDialog_Message": "Nombre de la Cuenta",
     "AccountEditDialog_Title": "Editar cuenta",
     "AccountPickerDialog_Title": "Elija una cuenta",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Cambie el nombre de la cuenta en Wino y establezca el nombre deseado del remitente.",
     "AccountDetailsPage_ColorPicker_Title": "Color de la cuenta",
     "AccountDetailsPage_ColorPicker_Description": "Asigna un nuevo color de cuenta para colorear su símbolo en la lista.",
+    "AccountDetailsPage_TabGeneral": "General",
+    "AccountDetailsPage_TabMail": "Correo",
+    "AccountDetailsPage_TabCalendar": "Calendario",
+    "AccountDetailsPage_CalendarListDescription": "Selecciona un calendario para configurar sus ajustes",
     "AddHyperlink": "Añadir",
     "AppCloseBackgroundSynchronizationWarningTitle": "Sincronización en segundo plano",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "La aplicación no está configurada para iniciarse con Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Cuenta IMAP",
     "Busy": "Ocupado/a",
     "Buttons_AddAccount": "Añadir Cuenta",
+    "Buttons_FixAccount": "Reparar cuenta",
     "Buttons_AddNewAlias": "Añadir nuevo alias",
     "Buttons_Allow": "Permitir",
+    "Buttons_Apply": "Aplicar",
     "Buttons_ApplyTheme": "Aplicar Tema",
     "Buttons_Browse": "Buscar",
     "Buttons_Cancel": "Cancelar",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Editar",
     "Buttons_EnableImageRendering": "Activar",
     "Buttons_Multiselect": "Selección múltiple",
+    "Buttons_Manage": "Gestionar",
     "Buttons_No": "No",
     "Buttons_Open": "Abrir",
     "Buttons_Purchase": "Comprar",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Guardar",
     "Buttons_SaveConfiguration": "Guardar Configuración",
     "Buttons_Send": "Enviar",
+    "Buttons_SendToServer": "Enviar al servidor",
     "Buttons_Share": "Compartir",
     "Buttons_SignIn": "Iniciar Sesión",
     "Buttons_Sync": "Sincronizar",
     "Buttons_SyncAliases": "Sincronizar alias",
     "Buttons_TryAgain": "Inténtalo de nuevo",
     "Buttons_Yes": "Sí",
+    "Sync_SynchronizingFolder": "Sincronizando {0} {1}%",
+    "Sync_DownloadedMessages": "Descargados {0} mensajes de {1}",
+    "SyncAction_Archiving": "Archivando {0} correo(s)",
+    "SyncAction_ClearingFlag": "Desmarcando {0} correo(s)",
+    "SyncAction_CreatingDraft": "Creando borrador",
+    "SyncAction_CreatingEvent": "Creando evento",
+    "SyncAction_Deleting": "Eliminando {0} correo(s)",
+    "SyncAction_EmptyingFolder": "Vaciando la carpeta",
+    "SyncAction_MarkingAsRead": "Marcando {0} correo(s) como leído",
+    "SyncAction_MarkingAsUnread": "Marcando {0} correo(s) como no leído",
+    "SyncAction_MarkingFolderAsRead": "Marcando la carpeta como leída",
+    "SyncAction_Moving": "Moviendo {0} correo(s)",
+    "SyncAction_MovingToFocused": "Moviendo {0} correo(s) a Enfocados",
+    "SyncAction_RenamingFolder": "Renombrando carpeta",
+    "SyncAction_SendingMail": "Enviando correo",
+    "SyncAction_SettingFlag": "Marcando {0} correo(s) con bandera",
+    "SyncAction_SynchronizingAccount": "Sincronizando {0}",
+    "SyncAction_SynchronizingAccounts": "Sincronizando {0} cuenta(s)",
+    "SyncAction_SynchronizingCalendarData": "Sincronizando datos del calendario",
+    "SyncAction_SynchronizingCalendarEvents": "Sincronizando eventos del calendario",
+    "SyncAction_SynchronizingCalendarMetadata": "Sincronizando metadatos del calendario",
+    "SyncAction_Unarchiving": "Desarchivando {0} correo(s)",
     "CalendarAllDayEventSummary": "eventos de todo el día",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expandir",
+    "CalendarEventResponse_Accept": "Aceptar",
+    "CalendarEventResponse_AcceptedResponse": "Aceptado",
+    "CalendarEventResponse_Decline": "Declinar",
+    "CalendarEventResponse_DeclinedResponse": "Declinado",
+    "CalendarEventResponse_NotResponded": "Sin responder",
+    "CalendarEventResponse_Tentative": "Provisional",
+    "CalendarEventResponse_TentativeResponse": "Provisional",
+    "CalendarEventRsvpPanel_Accept": "Aceptar",
+    "CalendarEventRsvpPanel_AddMessage": "Añadir un mensaje a tu respuesta... (opcional)",
+    "CalendarEventRsvpPanel_Decline": "Declinar",
+    "CalendarEventRsvpPanel_Message": "Mensaje",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Enviar mensaje de respuesta",
+    "CalendarEventRsvpPanel_Tentative": "Provisional",
+    "CalendarEventRsvpPanel_Title": "Opciones de respuesta",
+    "CalendarAttendeeStatus_Accepted": "Aceptado",
+    "CalendarAttendeeStatus_Declined": "Rechazado",
+    "CalendarAttendeeStatus_NeedsAction": "Necesita acción",
+    "CalendarAttendeeStatus_Tentative": "Provisional",
+    "CalendarEventDetails_Attachments": "Adjuntos",
+    "CalendarEventCompose_AddAttachment": "Añadir adjunto",
+    "CalendarEventCompose_AllDay": "Todo el día",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Los adjuntos no son compatibles con calendarios CalDAV.",
+    "CalendarEventCompose_EndDate": "Fecha de finalización",
+    "CalendarEventCompose_EndTime": "Hora de finalización",
+    "CalendarEventCompose_Every": "cada",
+    "CalendarEventCompose_ForWeekdays": "para",
+    "CalendarEventCompose_FrequencyDay": "día",
+    "CalendarEventCompose_FrequencyDayPlural": "días",
+    "CalendarEventCompose_FrequencyMonth": "mes",
+    "CalendarEventCompose_FrequencyMonthPlural": "meses",
+    "CalendarEventCompose_FrequencyWeek": "semana",
+    "CalendarEventCompose_FrequencyWeekPlural": "semanas",
+    "CalendarEventCompose_FrequencyYear": "año",
+    "CalendarEventCompose_FrequencyYearPlural": "años",
+    "CalendarEventCompose_Location": "Ubicación",
+    "CalendarEventCompose_LocationPlaceholder": "Añadir ubicación",
+    "CalendarEventCompose_NewEventButton": "Nuevo evento",
+    "CalendarEventCompose_DefaultCalendarHint": "Puedes seleccionar un calendario predeterminado para los nuevos eventos en la configuración del calendario.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Abrir la configuración del calendario",
+    "CalendarEventCompose_NoCalendarsMessage": "Aún no hay calendarios disponibles para crear un evento.",
+    "CalendarEventCompose_NoCalendarsTitle": "No hay calendarios disponibles",
+    "CalendarEventCompose_NoEndDate": "Sin fecha de finalización",
+    "CalendarEventCompose_Notes": "Notas",
+    "CalendarEventCompose_PickCalendarTitle": "Elegir un calendario",
+    "CalendarEventCompose_Recurring": "Recurrente",
+    "CalendarEventCompose_RecurringSummary": "Ocurre cada {0} {1}{2} {3} efectivo {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Ocurre {0}{1} {2} efectivo {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repite cada",
+    "CalendarEventCompose_SelectCalendar": "Seleccionar calendario",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Ocurre el {0} {1}",
+    "CalendarEventCompose_StartDate": "Fecha de inicio",
+    "CalendarEventCompose_StartTime": "Hora de inicio",
+    "CalendarEventCompose_TimeRangeSummary": "desde {0} hasta {1}",
+    "CalendarEventCompose_Title": "Título del evento",
+    "CalendarEventCompose_TitlePlaceholder": "Añadir un título",
+    "CalendarEventCompose_Until": "hasta",
+    "CalendarEventCompose_UntilSummary": " hasta {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "La fecha de finalización para todo el día debe ser posterior a la fecha de inicio.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Uno o más asistentes tienen una dirección de correo electrónico no válida.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "La fecha de finalización de la recurrencia debe ser igual o posterior a la fecha de inicio del evento.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "La hora de finalización debe ser posterior a la hora de inicio.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Uno o más adjuntos ya no están disponibles: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selecciona un calendario antes de crear el evento.",
+    "CalendarEventCompose_ValidationMissingTitle": "Introduce un título del evento antes de crear el evento.",
+    "CalendarEventCompose_ValidationTitle": "La validación del evento falló",
+    "CalendarEventCompose_WeekdaySummary": " en {0}",
+    "CalendarEventCompose_Weekday_Friday": "V",
+    "CalendarEventCompose_Weekday_Monday": "L",
+    "CalendarEventCompose_Weekday_Saturday": "S",
+    "CalendarEventCompose_Weekday_Sunday": "D",
+    "CalendarEventCompose_Weekday_Thursday": "J",
+    "CalendarEventCompose_Weekday_Tuesday": "M",
+    "CalendarEventCompose_Weekday_Wednesday": "X",
+    "CalendarEventDetails_Details": "Detalles",
+    "CalendarEventDetails_EditSeries": "Editar serie",
+    "CalendarEventDetails_Editing": "Editando",
+    "CalendarEventDetails_InviteSomeone": "Invitar a alguien",
+    "CalendarEventDetails_JoinOnline": "Unirse en línea",
+    "CalendarEventDetails_Organizer": "Organizador",
+    "CalendarEventDetails_People": "Personas",
+    "CalendarEventDetails_ReadOnlyEvent": "Evento de solo lectura",
+    "CalendarEventDetails_Reminder": "Recordatorio",
+    "CalendarReminder_StartedHoursAgo": "Hace {0} horas",
+    "CalendarReminder_StartedMinutesAgo": "Hace {0} minutos",
+    "CalendarReminder_StartedNow": "Acaba de empezar",
+    "CalendarReminder_StartingNow": "Comienza ahora",
+    "CalendarReminder_StartsInHours": "Comienza en {0} horas",
+    "CalendarReminder_StartsInMinutes": "Comienza en {0} minutos",
+    "CalendarReminder_SnoozeAction": "Posponer",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutos",
+    "CalendarEventDetails_ShowAs": "Mostrar como",
+    "CalendarShowAs_Free": "Libre",
+    "CalendarShowAs_Tentative": "Provisional",
+    "CalendarShowAs_Busy": "Ocupado",
+    "CalendarShowAs_OutOfOffice": "Fuera de la oficina",
+    "CalendarShowAs_WorkingElsewhere": "Trabajando en otro lugar",
     "CalendarItem_DetailsPopup_JoinOnline": "Unirse en línea",
     "CalendarItem_DetailsPopup_ViewEventButton": "Ver evento",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Ver serie",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copiado al portapapeles.",
     "ClipboardTextCopied_Title": "Copiado",
     "ClipboardTextCopyFailed_Message": "Error al copiar {0} al portapapeles.",
+    "ContactInfoBar_ErrorTitle": "Error al cargar la información de contacto",
+    "ContactInfoBar_SuccessTitle": "La información de contacto se ha cargado",
+    "ContactInfoBar_WarningTitle": "La información de contacto podría estar incompleta",
     "ComingSoon": "Próximamente...",
     "ComposerAttachmentsDragDropAttach_Message": "Adjuntar",
     "ComposerAttachmentsDropZone_Message": "Suelta tus archivos aquí",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nombre del enlace de cuenta",
     "DialogMessage_DeleteAccountConfirmationMessage": "¿Eliminar {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Todos los datos asociados a esta cuenta se eliminarán del disco permanentemente.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Eliminar la plantilla \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Eliminar plantilla de correo",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Esto eliminará todos los eventos de la serie. ¿Desea continuar?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Eliminar serie recurrente",
     "DialogMessage_DiscardDraftConfirmationMessage": "Este borrador se descartará. ¿Desea continuar?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Descartar borrador",
     "DialogMessage_EmptySubjectConfirmation": "Sin asunto",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Modo claro",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Error al configurar las carpetas del sistema",
+    "Exception_AccountNeedsAttention_Title": "La cuenta necesita atención",
+    "Exception_AccountNeedsAttention_Message": "'{0}' requiere su atención para continuar trabajando.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail no pudo encontrar Microsoft Edge WebView2 Runtime. Por favor, instale o repare el tiempo de ejecución para renderizar correctamente el contenido de los mensajes.",
+    "Exception_WebView2RuntimeMissing_Title": "Se requiere WebView2 runtime",
     "Exception_AuthenticationCanceled": "Autenticación cancelada",
     "Exception_CustomThemeExists": "Este tema ya existe.",
     "Exception_CustomThemeMissingName": "Debe proporcionar un nombre.",
     "Exception_CustomThemeMissingWallpaper": "Debe proporcionar una imagen de fondo personalizada.",
     "Exception_FailedToSynchronizeAliases": "Error al sincronizar los alias",
+    "Exception_FailedToSynchronizeCalendarData": "No se pudo sincronizar los datos del calendario.",
+    "Exception_FailedToSynchronizeCalendarEvents": "No se pudieron sincronizar los eventos del calendario.",
+    "Exception_FailedToSynchronizeCalendarMetadata": "No se pudieron sincronizar los detalles del calendario.",
     "Exception_FailedToSynchronizeFolders": "Error al sincronizar carpetas",
     "Exception_FailedToSynchronizeProfileInformation": "Error al sincronizar la información del perfil",
     "Exception_GoogleAuthCallbackNull": "Callback uri nulo al activarse.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Mover a Correo no deseado",
     "HoverActionOption_ToggleFlag": "Marcar / Desmarcar",
     "HoverActionOption_ToggleRead": "Leídos / Sin leer",
+    "KeyboardShortcuts_FailedToReset": "No se pudieron restablecer los atajos de teclado.",
+    "KeyboardShortcuts_FailedToUpdate": "No se pudieron actualizar los atajos de teclado.",
+    "KeyboardShortcuts_MailoperationAction": "Acción",
+    "KeyboardShortcuts_Action": "Acción",
+    "KeyboardShortcuts_FailedToLoad": "No se pudieron cargar los atajos de teclado.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Por favor, introduzca una tecla para el atajo.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Por favor, seleccione una acción para el atajo.",
+    "KeyboardShortcuts_EnterKey": "Por favor, introduzca una tecla para el atajo.",
+    "KeyboardShortcuts_SelectOperation": "Por favor, seleccione una acción para el atajo.",
+    "KeyboardShortcuts_ShortcutInUse": "Este atajo ya está en uso por otro atajo.",
+    "KeyboardShortcuts_FailedToSave": "No se pudo guardar el atajo.",
+    "KeyboardShortcuts_FailedToDelete": "No se pudo eliminar el atajo.",
+    "KeyboardShortcuts_PageDescription": "Configurar atajos de teclado para operaciones rápidas de correo. Presione las teclas mientras el foco está en el campo de entrada de teclas para capturar atajos.",
+    "KeyboardShortcuts_Add": "Añadir atajo",
+    "KeyboardShortcuts_EditTitle": "Editar atajo de teclado",
+    "KeyboardShortcuts_ResetToDefaults": "Restablecer a valores predeterminados",
+    "KeyboardShortcuts_PressKeysHere": "Presione las teclas aquí...",
+    "KeyboardShortcuts_KeyCombination": "Combinación de teclas",
+    "KeyboardShortcuts_FocusArea": "Coloque el foco en el campo de arriba y presione la combinación de teclas deseada",
+    "KeyboardShortcuts_Modifiers": "Teclas modificadoras",
+    "KeyboardShortcuts_Mode": "Modo de la aplicación",
+    "KeyboardShortcuts_ModeMail": "Correo",
+    "KeyboardShortcuts_ModeCalendar": "Calendario",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Alternar leído/no leído",
+    "KeyboardShortcuts_ActionToggleFlag": "Alternar bandera",
+    "KeyboardShortcuts_ActionToggleArchive": "Alternar archivar/desarchivar",
     "ImageRenderingDisabled": "El procesamiento de imágenes está desactivado para este mensaje.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Método de autenticación",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Seguridad de la conexión",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nombre de usuario",
     "IMAPSetupDialog_UsernamePlaceholder": "fulanomengano, fulanomengano@fabrikam.com, dominio/fulanomengano",
     "IMAPSetupDialog_UseSameConfig": "Usar el mismo correo y contraseña para enviar correos",
+    "ImapCalDavSettingsPage_TitleCreate": "Configuración de IMAP y Calendario",
+    "ImapCalDavSettingsPage_TitleEdit": "Editar configuración de IMAP y Calendario",
+    "ImapCalDavSettingsPage_Subtitle": "Configurar IMAP/SMTP y la sincronización de calendario opcional para esta cuenta.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Configuración básica",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Introduce tu identidad y credenciales. Wino puede intentar detectar la configuración del servidor automáticamente.",
+    "ImapCalDavSettingsPage_BasicTab": "Básico",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Habilitar soporte de calendario",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Descubrir automáticamente la configuración de correo",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "La configuración de correo se ha detectado y aplicado.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configuración avanzada",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Introduce manualmente la configuración del servidor si la detección automática no está disponible o es incorrecta.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avanzado",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configuración del calendario",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Elige cómo deben funcionar los datos del calendario para esta cuenta IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Modo de calendario",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Seguridad de la conexión",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Método de autenticación",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Desactivado",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronización CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Sólo calendario local",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "El calendario está desactivado para esta cuenta.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Los elementos del calendario se sincronizan con su servidor CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Los elementos del calendario se almacenan solo en este equipo y no se sincronizan con la red.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Cómo funciona el calendario local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Solo calendario local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "El calendario local mantiene todos los eventos solo en su ordenador. No se sincroniza con iCloud, Yahoo ni con ningún otro proveedor.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL del servicio CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nombre de usuario CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Contraseña CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "La prueba de CalDAV solo es necesaria cuando el modo de calendario está configurado en sincronización CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "Se requiere la URL del servicio CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "La URL del servicio CalDAV debe ser una URL absoluta.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Se requiere el nombre de usuario de CalDAV.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Se requiere la contraseña de CalDAV.",
+    "ImapCalDavSettingsPage_TestImapButton": "Probar conexión IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Probar conexión CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "La prueba de conexión IMAP se realizó con éxito.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "La prueba de conexión CalDAV se realizó con éxito.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "La configuración de la cuenta se ha validado y guardado.",
+    "ImapCalDavSettingsPage_ICloudHint": "Utilice una contraseña específica de la aplicación generada desde la configuración de su cuenta de Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Utilice una contraseña de aplicación desde la configuración de seguridad de su cuenta de Yahoo.",
     "Info_AccountCreatedMessage": "{0} se ha creado",
     "Info_AccountCreatedTitle": "Creación de una cuenta",
     "Info_AccountCreationFailedTitle": "Ocurrió un error al crear la cuenta",
     "Info_AccountDeletedMessage": "{0} eliminado correctamente.",
     "Info_AccountDeletedTitle": "Cuenta eliminada",
     "Info_AccountIssueFixFailedTitle": "Fallido",
+    "Info_AccountIssueFixImapMessage": "Abra la página de configuración de IMAP y calendario para volver a introducir las credenciales de su servidor.",
+    "Info_AccountAttentionRequiredMessage": "Esta cuenta necesita atención.",
+    "Info_AccountAttentionRequiredClickableMessage": "Haga clic para solucionar esta cuenta y volver a sincronizarla.",
+    "Info_AccountAttentionRequiredAction": "Solucionar",
+    "Info_AccountAttentionRequiredActionHint": "Haga clic en Solucionar para resolver este problema de la cuenta.",
     "Info_AccountIssueFixSuccessMessage": "Se han corregido todos los problemas de la cuenta.",
     "Info_AccountIssueFixSuccessTitle": "Correcto",
     "Info_AttachmentOpenFailedMessage": "No se puede abrir este adjunto.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Esta carpeta está desactivada para la sincronización.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Carpeta desactivada",
     "Justify": "Justificar",
+    "MenuUpdateAvailable": "Actualización disponible",
     "Left": "Izquierda",
     "Link": "Enlace",
     "LinkedAccountsCreatePolicyMessage": "debes tener al menos 2 cuentas para crear el enlace\nenlace se eliminará al guardar",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Desarchivar",
     "MailOperation_ViewMessageSource": "Ver fuente del mensaje",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Arrastrando {0} elemento(s)",
     "MailsSelected": "{0} artículo(s) seleccionado(s)",
     "MarkFlagUnflag": "Marcar como marcado/desmarcado",
     "MarkReadUnread": "Marcar como leído/no leído",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Mensajes nuevos",
     "Notifications_WinoUpdatedMessage": "Comprobar nueva versión {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail ha sido actualizado.",
+    "Notifications_StoreUpdateAvailableTitle": "Actualización disponible",
+    "Notifications_StoreUpdateAvailableMessage": "Una versión más reciente de Wino Mail está lista para instalar desde Microsoft Store.",
     "OnlineSearchFailed_Message": "Error al realizar la búsqueda\n{0}\n\nLista de correos sin conexión.",
     "OnlineSearchTry_Line1": "¿No encuentra lo que busca?",
     "OnlineSearchTry_Line2": "Prueba la búsqueda en línea.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Pequeño",
     "Photos": "Fotos",
     "PreparingFoldersMessage": "Preparando carpetas",
-    "ProtocolLogAvailable_Message": "Los registros de protocolo están disponibles para el diagnóstico.",
     "ProviderDetail_Gmail_Description": "Cuenta de Google",
     "ProviderDetail_iCloud_Description": "Cuenta de Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Buscar",
     "SearchingIn": "Buscando en",
     "SearchPivotName": "Resultados",
+    "Settings_KeyboardShortcuts_Title": "Atajos de teclado",
+    "Settings_KeyboardShortcuts_Description": "Gestione los atajos de teclado para acciones rápidas en los correos.",
     "SettingConfigureSpecialFolders_Button": "Configurar",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Configuración IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Cambie la configuración del servidor entrante/saliente.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Configuración de IMAP y calendario",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Abra la página de configuración dedicada de IMAP, SMTP y CalDAV para esta cuenta.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Abrir configuración",
     "SettingsAbout_Description": "Conoce más sobre Wino.",
     "SettingsAbout_Title": "Acerca de",
     "SettingsAboutGithub_Description": "Ir al rastreador de problemas en el repositorio de GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Conectado",
     "SettingsAppPreferences_SearchMode_Title": "Modo de búsqueda predeterminado",
+    "SettingsAppPreferences_ApplicationMode_Title": "Modo de aplicación predeterminado",
+    "SettingsAppPreferences_ApplicationMode_Description": "Elija en qué modo se abre Wino cuando no se establece explícitamente un tipo de activación.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Correo",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendario",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail seguirá funcionando en segundo plano. Se le notificará cuando lleguen nuevos correos.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Ejecutarse en segundo plano",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail funcionará en la bandeja del sistema. Se lanzará haciendo clic en un icono. Se notificará como llegan nuevos correos.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Error fatal al cambiar el modo de inicio para Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Ejecutar minimizado al iniciar Windows",
     "SettingsAppPreferences_Title": "Configuración de la aplicación",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Ocultar el botón de la cuenta de Wino en la barra de título",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Ocultar el botón de perfil en la barra de título que abre el panel desplegable de la cuenta de Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notificaciones de actualizaciones de Microsoft Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Mostrar notificaciones y acciones en el pie de página cuando haya una actualización de Microsoft Store disponible.",
+    "SettingsAppPreferences_AiActions_Title": "Acciones de IA",
+    "SettingsAppPreferences_AiActions_Description": "Elegir los idiomas de IA predeterminados y dónde guardar los resúmenes.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Idioma de traducción predeterminado",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Seleccione el lenguaje de destino predeterminado utilizado por las acciones de traducción IA.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Idioma de resumen",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Elija el idioma de resumen preferido para futuros resúmenes generados por IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Ruta de guardado de resúmenes predeterminada",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Elija la carpeta que Wino debe usar por defecto al guardar resúmenes de IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Usar la ubicación de guardado predeterminada del sistema",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Esta carpeta no existe. Se utilizará la ubicación de guardado predeterminada para los resúmenes.",
     "SettingsAutoSelectNextItem_Description": "Seleccione el siguiente elemento después de eliminar o mover un correo.",
     "SettingsAutoSelectNextItem_Title": "Auto seleccionar siguiente elemento",
     "SettingsAvailableThemes_Description": "Escoge un tema que te agrade desde la colección de Wino o aplica tus propios temas.",
     "SettingsAvailableThemes_Title": "Temas Disponibles",
     "SettingsCalendarSettings_Description": "Modifica el primer día de la semana, tamaño de la hora y más.",
     "SettingsCalendarSettings_Title": "Ajustes del calendario",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Duración predeterminada de posponer",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Establezca una duración predeterminada de posponer para las notificaciones de recordatorio del calendario.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formato de cabecera de día en la vista con horario",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Elija cómo se renderizan las etiquetas de los días en las vistas de día, semana y semana laboral. Use tokens de formato de fecha como ddd, dd, MMM o dddd.",
     "SettingsComposer_Title": "Editor",
     "SettingsComposerFont_Title": "Fuente por defecto para Escribir",
     "SettingsComposerFontFamily_Description": "Cambie el tamaño por defecto de la familia de fuentes y del tipo de letra para escribir correos.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Canal de Discord",
     "SettingsEditLinkedInbox_Description": "Añadir / quitar cuentas, renombrar o quitar vínculos entre cuentas.",
     "SettingsEditLinkedInbox_Title": "Editar bandeja de entrada vinculada",
+    "SettingsWindowBackdrop_Title": "Fondo de la ventana",
+    "SettingsWindowBackdrop_Description": "Seleccione un efecto de fondo para las ventanas de Wino.",
+    "SettingsWindowBackdrop_Disabled": "La selección de fondo de la ventana está deshabilitada cuando el tema de la aplicación sea diferente de Predeterminado.",
     "SettingsElementTheme_Description": "Escoge un tema de Windows para Wino",
     "SettingsElementTheme_Title": "Tema de elemento",
     "SettingsElementThemeSelectionDisabled": "La selección de elementos del tema se desactiva cuando el tema de la aplicación se selecciona de forma predeterminada.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Alias",
     "SettingsEditAccountDetails_Title": "Editar Detalles de Cuenta",
     "SettingsEditAccountDetails_Description": "Cambie el nombre de la cuenta, nombre del remitente y asigne un nuevo color si lo desea.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Cambios guardados",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Los detalles de la cuenta se han actualizado correctamente.",
     "SettingsManageLink_Description": "Mover elementos para añadir un nuevo enlace o eliminar el enlace existente.",
     "SettingsManageLink_Title": "Administrar enlaces",
     "SettingsMarkAsRead_Description": "Cambiar lo que debería pasar con el elemento seleccionado.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notificaciones",
     "SettingsNotificationsAndTaskbar_Description": "Cambiar si las notificaciones deben mostrarse y la insignia de la barra de tareas para esta cuenta.",
     "SettingsNotificationsAndTaskbar_Title": "Notificaciones y Barra de tareas",
+    "SettingsHome_Title": "Inicio",
+    "SettingsHome_SearchTitle": "Buscar una configuración",
+    "SettingsHome_SearchDescription": "Busque por función, tema o palabra clave para ir directamente a la página de configuración adecuada.",
+    "SettingsHome_SearchPlaceholder": "Buscar configuraciones",
+    "SettingsHome_SearchExamples": "Ejemplos: tema, almacenamiento, idioma, firma",
+    "SettingsHome_QuickLinks_Title": "Enlaces rápidos",
+    "SettingsHome_QuickLinks_Description": "Acceda directamente a las configuraciones a las que se accede con más frecuencia.",
+    "SettingsHome_StorageCard_Description": "Vea cuánto contenido MIME local guarda Wino en este dispositivo y límpielo cuando sea necesario.",
+    "SettingsHome_StorageEmptySummary": "Aún no se detecta contenido MIME en caché.",
+    "SettingsHome_StorageLoading": "Comprobando el uso de MIME local...",
+    "SettingsHome_Tips_Title": "Consejos y trucos",
+    "SettingsHome_Tips_Description": "Unos pequeños cambios pueden hacer que Wino se sienta mucho más personal.",
+    "SettingsHome_Tip_Theme": "¿Quieres modo oscuro o cambios de acento? Abre Personalización.",
+    "SettingsHome_Tip_Background": "Utilice Preferencias de la aplicación para controlar el inicio y la sincronización en segundo plano.",
+    "SettingsHome_Tip_Shortcuts": "Los atajos de teclado te permiten moverte por el correo más rápido.",
+    "SettingsHome_Resources_Title": "Enlaces útiles",
+    "SettingsHome_Resources_Description": "Abra recursos del proyecto, información de soporte y canales de lanzamiento.",
     "SettingsOptions_Title": "Ajustes",
+    "SettingsOptions_GeneralSection": "General",
+    "SettingsOptions_MailSection": "Correo",
+    "SettingsOptions_CalendarSection": "Calendario",
+    "SettingsOptions_MoreComingSoon": "Más opciones próximamente",
+    "SettingsOptions_HeroDescription": "Personalice su experiencia con Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} cuenta(s) configurada(s)",
+    "SettingsSearch_ManageAccounts_Keywords": "cuenta;cuentas;buzón;buzones;alias;alias(es);perfil;dirección;direcciones",
+    "SettingsSearch_AppPreferences_Keywords": "inicio;fondo;arranque;sincronización;notificación;notificaciones;búsqueda;bandeja;predeterminados",
+    "SettingsSearch_LanguageTime_Keywords": "idioma;hora;reloj;localidad;región;formato;24 horas;24h",
+    "SettingsSearch_Personalization_Keywords": "tema;oscuro;claro;apariencia;acento;color;color;modo;disposición;densidad",
+    "SettingsSearch_About_Keywords": "acerca;versión;sitio web;privacidad;github;donar;tienda;soporte",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "atajo;atajos;tecla;teclas;teclado;teclas",
+    "SettingsSearch_MessageList_Keywords": "mensaje;mensajes;lista;hilo;hilos;avatar;vista previa;remitente",
+    "SettingsSearch_ReadComposePane_Keywords": "lector;redactar;redactor;fuente;fuentes;contenido externo;visualización;lectura",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "firma;firmas;encriptación;certificado;certificados;S/MIME;SMIME;seguridad",
+    "SettingsSearch_Storage_Keywords": "almacenamiento;caché;caché;mime;disco;espacio;limpieza;limpiar;datos locales",
+    "SettingsSearch_CalendarSettings_Keywords": "calendario;semana;horas;programación;evento;eventos",
     "SettingsPaneLengthReset_Description": "Restablecer el tamaño de la lista de correo a original si tiene problemas.",
     "SettingsPaneLengthReset_Title": "Resetear tamaño de lista de correo",
     "SettingsPaypal_Description": "Muestre mucho más amor ❤️ Todas las donaciones se agradecen.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Mostrar formato de reloj en 24 horas",
     "SettingsPrivacyPolicy_Description": "Revisar la Política de Privacidad.",
     "SettingsPrivacyPolicy_Title": "Políticas de privacidad",
+    "SettingsWebsite_Description": "Abrir el sitio web de Wino Mail.",
+    "SettingsWebsite_Title": "Sitio web",
     "SettingsReadComposePane_Description": "Fuentes, contenido externo.",
     "SettingsReadComposePane_Title": "Lector y Editor",
     "SettingsReader_Title": "Lector",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Mostrar texto de vista previa",
     "SettingsShowSenderPictures_Description": "Ocultar/mostrar imágenes del remitente en miniatura.",
     "SettingsShowSenderPictures_Title": "Mostrar Avatares de Remitente",
+    "SettingsEmailTemplates_Title": "Plantillas de correo",
+    "SettingsEmailTemplates_Description": "Administrar plantillas de correo electrónico",
+    "SettingsEmailTemplates_CreatePageTitle": "Nueva plantilla",
+    "SettingsEmailTemplates_EditPageTitle": "Editar plantilla",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nueva plantilla",
+    "SettingsEmailTemplates_NewTemplateDescription": "Crear una nueva plantilla de correo electrónico",
+    "SettingsEmailTemplates_NameTitle": "Nombre",
+    "SettingsEmailTemplates_NamePlaceholder": "Nombre de la plantilla",
+    "SettingsEmailTemplates_DescriptionTitle": "Descripción",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descripción opcional",
+    "SettingsEmailTemplates_ContentTitle": "Contenido de la plantilla",
+    "SettingsEmailTemplates_ContentDescription": "Editar el contenido HTML de esta plantilla.",
+    "SettingsEmailTemplates_NameRequired": "Se requiere un nombre de plantilla.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Usar gravatar (si está disponible) como imagen del remitente",
     "SettingsEnableFavicons_Title": "Iconos de dominio (Faviconos)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Elemento de Inicio",
     "SettingsStore_Description": "Mostrar un poco de amor ❤️",
     "SettingsStore_Title": "Valorar en la tienda",
+    "SettingsStorage_Title": "Almacenamiento",
+    "SettingsStorage_Description": "Escanear y gestionar la caché MIME almacenada en su carpeta de datos locales.",
+    "SettingsStorage_ScanFolder": "Escanear la carpeta de datos locales",
+    "SettingsStorage_NoLocalMimeDataFound": "No se encontraron datos MIME locales.",
+    "SettingsStorage_NoAccountsFound": "No se encontraron cuentas.",
+    "SettingsStorage_TotalUsage": "Uso total local de MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} utilizado en la caché MIME local",
+    "SettingsStorage_DeleteAll_Title": "Eliminar todo el contenido MIME",
+    "SettingsStorage_DeleteAll_Description": "Eliminar la carpeta completa de caché MIME de esta cuenta.",
+    "SettingsStorage_DeleteAll_Button": "Eliminar todo",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Eliminar todo el contenido MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "¿Eliminar todos los datos MIME locales para {0}?",
+    "SettingsStorage_DeleteAll_Success": "Todo el contenido MIME ha sido eliminado.",
+    "SettingsStorage_DeleteOld_Title": "Eliminar contenido MIME antiguo",
+    "SettingsStorage_DeleteOld_Description": "Eliminar archivos MIME basados en la fecha de creación del correo en la base de datos local.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mes",
+    "SettingsStorage_DeleteOld_3Months": "> 3 meses",
+    "SettingsStorage_DeleteOld_6Months": "> 6 meses",
+    "SettingsStorage_DeleteOld_1Year": "> 1 año",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Eliminar contenido MIME antiguo",
+    "SettingsStorage_DeleteOld_Confirm_Message": "¿Eliminar datos MIME locales anteriores a {0} para {1}?",
+    "SettingsStorage_DeleteOld_Success": "Se eliminaron {0} carpeta(s) MIME anteriores a {1}.",
+    "SettingsStorage_1Month": "1 mes",
+    "SettingsStorage_3Months": "3 meses",
+    "SettingsStorage_6Months": "6 meses",
+    "SettingsStorage_1Year": "1 año",
+    "SettingsStorage_Months": "{0} meses",
     "SettingsTaskbarBadge_Description": "Incluye conteo de correo no leído en el icono de la barra de tareas.",
     "SettingsTaskbarBadge_Title": "Insignia de la barra de tareas",
     "SettingsThreads_Description": "Organizar mensajes en hilos de conversación.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "No puede asignar la bandeja de entrada a ninguna otra carpeta del sistema.",
     "SystemFolderConfigSetupSuccess_Message": "Carpetas del sistema configuradas correctamente.",
     "SystemFolderConfigSetupSuccess_Title": "Configurar Carpetas del Sistema",
+    "SystemTrayMenu_ShowWino": "Abrir Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Abrir Wino Calendario",
+    "SystemTrayMenu_ExitWino": "Salir",
     "TestingImapConnectionMessage": "Probando conexión con el servidor...",
     "TitleBarServerDisconnectedButton_Description": "Wino está desconectado de la red. Haga clic en reconectar para restaurar la conexión.",
     "TitleBarServerDisconnectedButton_Title": "sin conexión",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Actualizar a Cuentas Ilimitadas",
     "WinoUpgradeRemainingAccountsMessage": "{0} de {1} cuentas gratuitas usadas.",
     "Yesterday": "Ayer",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "Intervalo de sincronización de email",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervalo de sincronización automática de correo electrónico (minutos). Esta configuración se aplicará sólo después de reiniciar Wino Mail."
+    "Smime_ImportCertificates_Success": "Certificados importados con éxito.",
+    "Smime_ImportCertificates_Error": "Error al importar certificados: {0}",
+    "Smime_RemoveCertificates_Confirm": "¿Realmente desea quitar los certificados {0}?",
+    "Smime_RemoveCertificates_Success": "Certificados eliminados.",
+    "Smime_ExportCertificates_Success": "Certificados exportados.",
+    "Smime_ExportCertificates_Error": "Error al exportar certificados.",
+    "Smime_CertificateDetails": "Sujeto: {0}\\nEmisor: {1}\\nVálido desde: {2}\\nVálido hasta: {3}\\nHuella digital: {4}",
+    "Smime_CertificatePassword_Title": "Se requiere contraseña del certificado",
+    "Smime_CertificatePassword_Placeholder": "Contraseña del certificado para {0} (opcional)",
+    "Smime_Confirm_Title": "Confirmar",
+    "Buttons_OK": "Aceptar",
+    "Buttons_Refresh": "Actualizar",
+    "SettingsSignatureAndEncryption_Title": "Firma y cifrado",
+    "SettingsSignatureAndEncryption_Description": "Gestiona los certificados S/MIME para firmar y cifrar correos.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mis certificados",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificados personales para firmar y cifrar",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificados del destinatario",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificados del destinatario para descifrado",
+    "SettingsSignatureAndEncryption_NameColumn": "Nombre",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Expira el",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Huella digital",
+    "Buttons_Remove": "Eliminar",
+    "Buttons_Export": "Exportar",
+    "Buttons_Import": "Importar",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificado de firma S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Certificado de cifrado S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Ninguno",
+    "SmimeSignaturesInMessage": "Firmas en este mensaje:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, válido hasta {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Información del certificado de firma S/MIME",
+    "SmimeCertificateInfoTitle": "Información del certificado S/MIME",
+    "SmimeNoCertificateFileFound": "No se encontró ningún archivo de certificado",
+    "SmimeSaveCertificate": "Guardar certificado...",
+    "SmimeCertificate": "Certificado S/MIME",
+    "SmimeCertificateSavedTo": "Certificado guardado en {0}",
+    "SmimeSignedTooltip": "Este mensaje está firmado con un certificado S/MIME. Haga clic para ver más detalles",
+    "SmimeEncryptedTooltip": "Este mensaje está cifrado con un certificado S/MIME.",
+    "SmimeCertificateFileInfo": "Archivo: {0}\\nTipo: {1}\\nTamaño: {2:N0} bytes",
+    "Composer_LightTheme": "Tema claro",
+    "Composer_DarkTheme": "Tema oscuro",
+    "Composer_Outdent": "Quitar sangría",
+    "Composer_Indent": "Aumentar sangría",
+    "Composer_BulletList": "Lista con viñetas",
+    "Composer_OrderedList": "Lista numerada",
+    "Composer_Stroke": "Trazo",
+    "Composer_Bold": "Negrita",
+    "Composer_Italic": "Cursiva",
+    "Composer_Underline": "Subrayado",
+    "Composer_CcBcc": "CC y CCO",
+    "Composer_EnableSmimeSignature": "Activar/desactivar firma S/MIME",
+    "Composer_EnableSmimeEncryption": "Activar/desactivar cifrado S/MIME",
+    "Composer_LocalDraftSyncInfo": "Este borrador es local. Wino no pudo enviarlo a su servidor de correo. Haga clic para volver a intentarlo enviarlo al servidor.",
+    "Composer_CertificateExpires": "Expira el: ",
+    "Composer_SmimeSignature": "Firma S/MIME",
+    "Composer_SmimeEncryption": "Cifrado S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Plantillas de correo",
+    "Composer_AiSummarize": "Resumir con IA",
+    "Composer_AiSummarizeDescription": "Extrae puntos clave, acciones y decisiones de este correo.",
+    "Composer_AiTranslate": "Traducir con IA",
+    "Composer_AiActions": "Acciones de IA",
+    "Composer_AiRewrite": "Reescribir con IA",
+    "AiActions_CheckingStatus": "Comprobando acceso a IA...",
+    "AiActions_SignedOutTitle": "Desbloquear el paquete de IA de Wino",
+    "AiActions_SignedOutDescription": "Traduce, reescribe y resume correos con IA después de iniciar sesión en tu cuenta de Wino y activar el paquete IA.",
+    "AiActions_NoPackTitle": "Se requiere paquete IA",
+    "AiActions_NoPackDescription": "Ya has iniciado sesión, pero el paquete IA no está activo. Adquiérelo para usar las herramientas de traducción, reescritura y resumen con IA de Wino.",
+    "AiActions_UsageSummary": "{0} de {1} créditos usados este mes.",
+    "Composer_AiRewritePolite": "Hazlo más cortés",
+    "Composer_AiRewritePoliteDescription": "Suaviza el tono manteniendo la misma intención.",
+    "Composer_AiRewriteAngry": "Hazlo más enfadado",
+    "Composer_AiRewriteAngryDescription": "Utiliza un tono más áspero y confrontacional.",
+    "Composer_AiRewriteHappy": "Hazlo más alegre",
+    "Composer_AiRewriteHappyDescription": "Añade un tono más optimista y entusiasta.",
+    "Composer_AiRewriteFormal": "Hazlo formal",
+    "Composer_AiRewriteFormalDescription": "Hace que el mensaje suene más profesional y estructurado.",
+    "Composer_AiRewriteFriendly": "Hazlo más amigable",
+    "Composer_AiRewriteFriendlyDescription": "Dale al mensaje un tono más cercano.",
+    "Composer_AiRewriteShorter": "Hazlo más corto",
+    "Composer_AiRewriteShorterDescription": "Acorta el texto y elimina detalles innecesarios.",
+    "Composer_AiRewriteClearer": "Hazlo más claro",
+    "Composer_AiRewriteClearerDescription": "Mejora la legibilidad y facilita la comprensión del mensaje.",
+    "Composer_AiRewriteCustom": "Personalizado",
+    "Composer_AiRewriteCustomDescription": "Describe tu objetivo de reescritura.",
+    "Composer_AiRewriteCustomPlaceholder": "Describe cómo quieres que se reescriba el mensaje",
+    "Composer_AiRewriteMode": "Tono de reescritura",
+    "Composer_AiRewriteApply": "Aplicar reescritura",
+    "Composer_AiTranslateDialogTitle": "Traducir con IA",
+    "Composer_AiTranslateDialogDescription": "Introduce el código de idioma o cultura de destino, como en-US, tr-TR, de-DE o fr-FR.",
+    "Composer_AiTranslateApply": "Traducir",
+    "Composer_AiTranslateLanguage": "Idioma de destino",
+    "Composer_AiTranslateCustomPlaceholder": "Introduce el código de cultura",
+    "Composer_AiTranslateLanguageEnglish": "Inglés (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turco (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Alemán (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francés (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Español (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiano (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugués (Brasil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Neerlandés (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polaco (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Ruso (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonés (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coreano (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chino simplificado (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Árabe (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Otro...",
+    "Composer_AiBusyTitle": "La IA ya está trabajando",
+    "Composer_AiBusyMessage": "Por favor, espera a que termine la acción de IA actual.",
+    "Composer_AiSignInRequired": "Inicia sesión en tu cuenta de Wino para usar las funciones de IA.",
+    "Composer_AiMissingHtml": "Aún no hay contenido de mensaje para enviar a Wino AI.",
+    "Composer_AiQuotaUnavailable": "El resultado de IA fue aplicado.",
+    "Composer_AiAppliedMessage": "El resultado de IA se ha aplicado al compositor. Usa Deshacer si quieres revertirlo.",
+    "Composer_AiSummarizeSuccessTitle": "Resumen de IA aplicado",
+    "Composer_AiTranslateSuccessTitle": "Traducción de IA aplicada",
+    "Composer_AiRewriteSuccessTitle": "Reescritura con IA aplicada",
+    "Composer_AiErrorTitle": "La acción de IA falló",
+    "Reader_AiAppliedMessage": "El resultado de IA se muestra ahora para este mensaje. Reabre el mensaje para ver de nuevo el contenido original.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contactos",
+    "ContactsPage_AddContact": "Añadir contacto",
+    "ContactsPage_EditContact": "Editar contacto",
+    "ContactsPage_DeleteContact": "Eliminar contacto",
+    "ContactsPage_SearchPlaceholder": "Buscar contactos...",
+    "ContactsPage_NoContacts": "No se han encontrado contactos",
+    "ContactsPage_ContactsCount": "{0} contactos",
+    "ContactsPage_SelectedContactsCount": "{0} seleccionados",
+    "ContactsPage_DeleteSelectedContacts": "Eliminar seleccionados",
+    "ContactEditDialog_Title": "Editar contacto",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Elegir foto",
+    "ContactEditDialog_RemovePhoto": "Quitar foto",
+    "ContactEditDialog_NameHeader": "Nombre",
+    "ContactEditDialog_NamePlaceholder": "Nombre de contacto",
+    "ContactEditDialog_EmailHeader": "Correo electrónico",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Información de contacto",
+    "ContactEditDialog_RootContactInfo": "Este es un contacto raíz asociado a tus cuentas y no puede ser eliminado.",
+    "ContactEditDialog_OverriddenContactInfo": "Este contacto ha sido modificado manualmente y no se actualizará durante la sincronización.",
+    "ContactsPage_Subtitle": "Gestiona tus contactos de correo electrónico y su información",
+    "ContactStatus_Account": "Cuenta",
+    "ContactStatus_Modified": "Modificado",
+    "ContactAction_Edit": "Editar contacto",
+    "ContactAction_ChangePhoto": "Cambiar foto",
+    "ContactAction_Delete": "Eliminar contacto",
+    "ContactAction_Add": "Añadir contacto",
+    "ContactSelection_Selected": "seleccionado",
+    "ContactSelection_SelectAll": "Seleccionar todo",
+    "ContactSelection_Clear": "Borrar selección",
+    "ContactsPage_EmptyState": "No hay contactos para mostrar",
+    "ContactsPage_AddFirstContact": "Añade tu primer contacto",
+    "ContactsPage_ContactsCountSuffix": "contactos",
+    "ContactsPane_NewContact": "Nuevo contacto",
+    "ContactsPane_DescriptionTitle": "Gestiona tus contactos",
+    "ContactsPane_DescriptionBody": "Crea contactos, cámbiales el nombre, actualiza sus fotos de perfil y mantiene la información guardada organizada en un solo lugar.",
+    "ContactEditDialog_AddTitle": "Añadir contacto",
+    "ContactInfoBar_ContactAdded": "Contacto añadido con éxito.",
+    "ContactInfoBar_ContactUpdated": "Contacto actualizado con éxito.",
+    "ContactInfoBar_ContactsDeleted": "Contactos eliminados con éxito.",
+    "ContactInfoBar_ContactPhotoUpdated": "Foto de contacto actualizada con éxito.",
+    "ContactInfoBar_FailedToLoadContacts": "Error al cargar contactos: {0}",
+    "ContactInfoBar_FailedToAddContact": "Error al añadir contacto: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Error al actualizar contacto: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Error al eliminar contactos: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Error al actualizar la foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "No se pueden eliminar contactos raíz.",
+    "ContactConfirmDialog_DeleteTitle": "Eliminar contacto",
+    "ContactConfirmDialog_DeleteMessage": "¿Estás seguro de que quieres eliminar el contacto '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "¿Seguro que quieres eliminar {0} contacto(s)?",
+    "ContactConfirmDialog_DeleteButton": "Eliminar",
+    "CalendarAccountSettings_Title": "Configuración de la cuenta de calendario",
+    "CalendarAccountSettings_Description": "Gestiona la configuración de calendario para {0}",
+    "CalendarAccountSettings_AccountColor": "Color de la cuenta",
+    "CalendarAccountSettings_AccountColorDescription": "Cambiar el color de visualización para esta cuenta de calendario",
+    "CalendarAccountSettings_SyncEnabled": "Habilitar sincronización",
+    "CalendarAccountSettings_SyncEnabledDescription": "Activar o desactivar la sincronización del calendario para esta cuenta",
+    "CalendarAccountSettings_DefaultShowAs": "Estado de Disponibilidad Predeterminado",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Estado de disponibilidad predeterminado para los nuevos eventos creados con esta cuenta",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendario principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marcar este calendario como el calendario principal para la cuenta",
+    "CalendarSettings_NewEventBehavior_Header": "Comportamiento del botón de Nuevo Evento",
+    "CalendarSettings_NewEventBehavior_Description": "Elija si el botón Nuevo Evento debe pedir un calendario cada vez o abrir siempre un calendario específico.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Pedir cada vez.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Usar siempre un calendario específico.",
+    "CalendarSettings_Rendering_Title": "Renderizado",
+    "CalendarSettings_Rendering_Description": "Configurar la distribución del calendario y el comportamiento de visualización.",
+    "CalendarSettings_Notifications_Title": "Notificaciones",
+    "CalendarSettings_Notifications_Description": "Elegir la notificación predeterminada y el comportamiento de posposición.",
+    "CalendarSettings_Preferences_Title": "Preferencias",
+    "CalendarSettings_Preferences_Description": "Configurar el comportamiento del botón Nuevo Evento.",
+    "WhatIsNew_GetStartedButton": "Comenzar",
+    "WhatIsNew_ContinueAnywayButton": "Continuar de todas formas",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparando para la nueva versión...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparando sus datos",
+    "WhatIsNew_MigrationPreparing_Description": "Wino está aplicando migraciones de actualización. Por favor espere mientras preparamos los datos de su cuenta para esta versión.",
+    "WhatIsNew_MigrationFailedMessage": "La aplicación de migraciones falló con el código de error {0}. Puede seguir usando la aplicación. Sin embargo, si encuentra problemas graves, por favor vuelva a instalar la aplicación.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail actualizado",
+    "WhatIsNew_MigrationNotification_Message": "Abra la aplicación para completar la actualización y ver las novedades.",
+    "WelcomeWindow_Title": "Bienvenido a Wino Mail",
+    "WelcomeWindow_Subtitle": "Una experiencia nativa de Windows para Correo y Calendario.",
+    "WelcomeWindow_WhatsNewTitle": "Últimos cambios",
+    "WelcomeWindow_FeaturesTitle": "Funciones",
+    "WelcomeWindow_WhatsNewTab": "Novedades",
+    "WelcomeWindow_FeaturesTab": "Funciones",
+    "WelcomeWindow_GetStartedButton": "Comienza añadiendo una cuenta",
+    "WelcomeWindow_GetStartedDescription": "Agrega tu cuenta de Outlook, Gmail o IMAP para empezar a usar Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importar desde tu cuenta de Wino",
+    "WelcomeWindow_ImportInProgress": "Importando tus preferencias y cuentas sincronizadas...",
+    "WelcomeWindow_ImportNoAccountsFound": "No se encontraron cuentas sincronizadas en su Cuenta de Wino. Si las preferencias estaban disponibles, se restauraron. Usa Comenzar para añadir una cuenta manualmente.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} cuentas sincronizadas ya están disponibles en este dispositivo. Usa Comenzar para añadir otra cuenta manualmente si es necesario.",
+    "WelcomeWindow_SetupTitle": "Configura tu cuenta",
+    "WelcomeWindow_SetupSubtitle": "Elige tu proveedor de correo para empezar",
+    "WelcomeWindow_AddAccountButton": "Añadir cuenta",
+    "WelcomeWindow_SkipForNow": "Omitir por ahora — lo configuraré más tarde.",
+    "WelcomeWindow_AppDescription": "Una bandeja de entrada rápida y enfocada, rediseñada para Windows 11.",
+    "WelcomeWizard_Step1Title": "Bienvenido",
+    "SystemTrayMenu_Open": "Abrir",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Configuración de sincronización",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mantén tus preferencias de Wino sincronizadas entre dispositivos.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Desbloquear complementos",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accede a funciones premium como Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gestiona tu Cuenta de Wino, acceso a AI Pack y preferencias sincronizadas y detalles de la cuenta.",
+    "WinoAccount_Management_SignedOutTitle": "Inicia sesión en Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Inicia sesión o crea una cuenta para sincronizar tu correo, acceder a funciones de IA y gestionar tus ajustes entre dispositivos.",
+    "WinoAccount_Management_ProfileSectionHeader": "Perfil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Complementos de Wino",
+    "WinoAccount_Management_DataSectionHeader": "Datos",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Acciones de cuenta",
+    "WinoAccount_Management_AccountCardTitle": "Cuenta",
+    "WinoAccount_Management_AccountCardDescription": "La dirección de correo de tu cuenta de Wino y el estado actual de la cuenta.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Ver si Wino AI Pack está activo y cuánta utilización queda.",
+    "WinoAccount_Management_AiPackActive": "AI Pack está activo",
+    "WinoAccount_Management_AiPackInactive": "AI Pack no está activo",
+    "WinoAccount_Management_AiPackUsage": "{0} de {1} usos consumidos. Quedan {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Periodo de facturación: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Los detalles de uso aún no están disponibles.",
+    "WinoAccount_Management_AiPackBuyDescription": "Compra Wino AI Pack para traducir, reescribir o resumir correos con IA.",
+    "WinoAccount_Management_AiPackPromoTitle": "Desbloquear AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Potencia tu flujo de correo con herramientas impulsadas por IA. Traduce mensajes a más de 50 idiomas, reescribe para claridad y tono, y obtén resúmenes instantáneos de hilos largos.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mes",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 créditos",
+    "WinoAccount_Management_AiPackGetButton": "Obtener AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Herramientas impulsadas por IA para traducir, reescribir y resumir acciones en Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traducir, reescribir, resumir, productividad",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Cuentas ilimitadas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Elimina el límite de cuentas y añade tantas cuentas de correo como necesites.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "cuentas, ilimitadas, premium, complemento",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Inicia sesión con tu Cuenta de Wino para completar esta compra.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino no pudo completar esta compra en Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "La compra terminó, pero Wino no pudo actualizar aún los beneficios de su cuenta. Por favor, inténtelo de nuevo en un momento.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Tu suscripción está activa.",
+    "WinoAccount_Management_AiPackRenews": "Renueva {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Créditos usados este mes",
+    "WinoAccount_Management_AiPackResets": "Reinicios {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Tuvimos problemas al cargar tu saldo de uso de IA.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traducir",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Reescribir",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Resumir",
+    "WinoAccount_Management_AddOnLoadFailed": "Tuvimos problemas al cargar este complemento.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronizar Preferencias y Cuentas",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importa o exporta tus preferencias de Wino y los detalles de la bandeja de entrada entre dispositivos. Las contraseñas, tokens y otra información sensible nunca se sincronizan.",
+    "WinoAccount_Management_SignOutTitle": "Cerrar sesión",
+    "WinoAccount_Management_SignOutDescription": "Cerrar sesión de tu cuenta en este dispositivo",
+    "WinoAccount_Management_StatusLabel": "Estado: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Todavía no hay datos sincronizados almacenados para esta cuenta.",
+    "WinoAccount_Management_ExportSucceeded": "Los datos de Wino seleccionados se exportaron correctamente.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Tus preferencias se exportaron a tu Cuenta de Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Se exportaron {0} detalles de la cuenta a tu Cuenta de Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Se importaron los datos sincronizados desde tu Cuenta de Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Se aplicaron {0} preferencias sincronizadas.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Se importaron {0} cuentas.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Se omitieron {0} cuentas que ya existen en este dispositivo.",
+    "WinoAccount_Management_ImportPartial": "Se aplicaron {0} preferencias sincronizadas. No se pudieron restaurar {1} preferencias.",
+    "WinoAccount_Management_ImportReloginReminder": "Las contraseñas, tokens y otra información sensible no se importaron. Inicia sesión de nuevo en cada cuenta en este dispositivo antes de usarla.",
+    "WinoAccount_Management_SerializeFailed": "No se pudieron serializar tus preferencias actuales.",
+    "WinoAccount_Management_EmptyExport": "No hay valores de preferencias para exportar.",
+    "WinoAccount_Management_ImportEmpty": "La carga de datos sincronizados no contiene nada nuevo para restaurar.",
+    "WinoAccount_Management_ExportDialog_Title": "Exportar a tu cuenta de Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Elige qué quieres sincronizar con tu cuenta de Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferencias",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Cuentas",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Las contraseñas, los tokens y otra información sensible no se sincronizan.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Las cuentas importadas en otro PC seguirán requiriéndote iniciar sesión de nuevo antes de poder usarlas.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportando tus datos de Wino seleccionados...",
+    "WinoAccount_Management_LoadFailed": "No se pudo cargar la información más reciente de la cuenta de Wino.",
+    "WinoAccount_Management_ActionFailed": "No se pudo completar la solicitud de la cuenta de Wino.",
+    "WinoAccount_SettingsSection_Title": "Cuenta de Wino",
+    "WinoAccount_SettingsSection_Description": "Crea o inicia sesión en una cuenta de Wino usando tu servicio de autenticación local.",
+    "WinoAccount_RegisterButton_Title": "Registrar cuenta",
+    "WinoAccount_RegisterButton_Description": "Crea una cuenta de Wino con correo electrónico y contraseña.",
+    "WinoAccount_RegisterButton_Action": "Abrir registro",
+    "WinoAccount_LoginButton_Title": "Iniciar sesión",
+    "WinoAccount_LoginButton_Description": "Inicia sesión en una cuenta de Wino existente con correo electrónico y contraseña.",
+    "WinoAccount_LoginButton_Action": "Abrir inicio de sesión",
+    "WinoAccount_SignOutButton_Title": "Cerrar sesión",
+    "WinoAccount_SignOutButton_Description": "Eliminar la sesión de la cuenta de Wino almacenada localmente.",
+    "WinoAccount_SignOutButton_Action": "Cerrar sesión",
+    "WinoAccount_RegisterDialog_Title": "Crear cuenta de Wino",
+    "WinoAccount_RegisterDialog_Description": "Crea una cuenta de Wino para mantener tu experiencia de Wino sincronizada y desbloquear complementos basados en la cuenta.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Crea tu cuenta de Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "¿Por qué crear una?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importar y exportar configuraciones entre dispositivos",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Mueve tus preferencias de Wino entre dispositivos sin tener que reconstruir tu configuración desde cero.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Accede a complementos exclusivos como Wino AI Pack (de pago).",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Utiliza una sola cuenta para desbloquear funciones premium de Wino a medida que estén disponibles.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "La cuenta de Wino es independiente de tus cuentas de correo.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Tus cuentas de Outlook, Gmail, IMAP u otras cuentas de correo permanecen tal como están. Una cuenta de Wino solo gestiona funciones específicas de Wino y complementos basados en la cuenta.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrar",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacidad y procesamiento de API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Los complementos opcionales, como Wino AI Pack, pueden enviar contenido HTML de correo seleccionado al servicio API de Wino solo cuando use esas funciones.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Leer la política de privacidad",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Acepto la política de privacidad.",
+    "WinoAccount_LoginDialog_Title": "Inicia sesión en la cuenta de Wino",
+    "WinoAccount_LoginDialog_Description": "Inicia sesión en tu cuenta de Wino para sincronizar tu configuración de Wino y acceder a funciones basadas en la cuenta.",
+    "WinoAccount_LoginDialog_HeroTitle": "Bienvenido de nuevo",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Qué te ofrece iniciar sesión",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Utiliza tu cuenta de Wino para seguir sincronizando la configuración entre dispositivos y acceder a complementos de pago como Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Este no es el inicio de sesión de tu buzón de correo",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Iniciar sesión aquí no añade ni reemplaza tus cuentas de Outlook, Gmail o IMAP en Wino. Solo te permite iniciar sesión en servicios específicos de Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "¿Olvidaste la contraseña?",
+    "WinoAccount_EmailLabel": "Correo electrónico",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Contraseña",
+    "WinoAccount_ConfirmPasswordLabel": "Confirmar contraseña",
+    "WinoAccount_ForgotPasswordDialog_Title": "Restablecer la contraseña",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Enviar correo de restablecimiento",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Volver a iniciar sesión",
+    "WinoAccount_ForgotPasswordDialog_Description": "Introduce la dirección de correo de tu cuenta de Wino y te enviaremos un enlace para restablecer la contraseña si la dirección está registrada.",
+    "WinoAccount_Validation_EmailRequired": "Se requiere un correo electrónico.",
+    "WinoAccount_Validation_PasswordRequired": "Se requiere una contraseña.",
+    "WinoAccount_Validation_PasswordMismatch": "Las contraseñas no coinciden.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Debes aceptar la política de privacidad antes de crear una cuenta de Wino.",
+    "WinoAccount_Error_InvalidCredentials": "La dirección de correo o la contraseña son incorrectas.",
+    "WinoAccount_Error_AccountLocked": "Esta cuenta está temporalmente bloqueada.",
+    "WinoAccount_Error_AccountBanned": "Esta cuenta ha sido baneada.",
+    "WinoAccount_Error_AccountSuspended": "Esta cuenta ha sido suspendida.",
+    "WinoAccount_Error_EmailNotConfirmed": "Por favor confirma tu dirección de correo electrónico antes de iniciar sesión.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Por favor confirma tu dirección de correo electrónico antes de iniciar sesión.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Aún no está disponible un nuevo correo de confirmación.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Esta solicitud de confirmación ya no es válida. Por favor, intenta iniciar sesión de nuevo.",
+    "WinoAccount_Error_EmailNotRegistered": "Esta dirección de correo no está registrada.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Tu sesión ya no es válida. Por favor, inicia sesión de nuevo.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Esta dirección de correo ya está registrada.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Se necesita una dirección de correo para completar el inicio de sesión externo.",
+    "WinoAccount_Error_ExternalLoginInvalid": "La solicitud de inicio de sesión externo no es válida.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "El estado de inicio de sesión externo no es válido o ha caducado.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "El código de inicio de sesión externo es inválido o ha caducado.",
+    "WinoAccount_Error_AiPackRequired": "Se requiere una suscripción activa a Wino AI Pack para realizar esta acción.",
+    "WinoAccount_Error_AiQuotaExceeded": "Se ha alcanzado el límite de uso de AI Pack para el periodo de facturación actual.",
+    "WinoAccount_Error_AiHtmlEmpty": "No hay contenido de correo para procesar.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Este correo es demasiado grande para procesarlo con Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Ese idioma no es compatible. Prueba un código de cultura válido, como en-US o tr-TR.",
+    "WinoAccount_Error_Forbidden": "No tienes permiso para realizar esta acción.",
+    "WinoAccount_Error_ValidationFailed": "La solicitud es inválida. Por favor revisa los valores introducidos.",
+    "WinoAccount_RegisterSuccessMessage": "Registro de la cuenta de Wino completado para {0}.",
+    "WinoAccount_LoginSuccessMessage": "Has iniciado sesión en la cuenta de Wino como {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirma tu dirección de correo electrónico",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Enviamos una confirmación por correo a {0}. Por favor, confírmala e intenta iniciar sesión de nuevo.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Se requiere confirmación de correo",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Aún estamos esperando a que confirmes {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Reenviar correo de confirmación",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Puedes volver a enviar el correo de confirmación en {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Ya puedes volver a enviar el correo de confirmación.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Correo de confirmación reenviado",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Enviamos otro correo de confirmación a {0}. Por favor, confírmalo e intenta iniciar sesión de nuevo.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Correo de restablecimiento de contraseña enviado",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Hemos enviado un correo de restablecimiento de contraseña a {0}. Abre ese mensaje para elegir una nueva contraseña.",
+    "WinoAccount_ChangePassword_Title": "Cambiar contraseña",
+    "WinoAccount_ChangePassword_Description": "Enviar un correo de restablecimiento de contraseña a esta cuenta de Wino.",
+    "WinoAccount_ChangePassword_Action": "Enviar correo de restablecimiento",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "¿Quieres que Wino envíe un correo electrónico para restablecer la contraseña a {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Has cerrado sesión en la cuenta de Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "No hay ninguna cuenta de Wino activa para cerrar sesión.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Cuenta de Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Inicia sesión o crea una cuenta de Wino para gestionar tu sesión de Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Estado: {0}",
+    "WelcomeWizard_Step2Title": "Añadir cuenta",
+    "WelcomeWizard_Step3Title": "Finalizar configuración",
+    "ProviderSelection_Title": "Selecciona tu proveedor de correo",
+    "ProviderSelection_Subtitle": "Selecciona un proveedor a continuación para añadir tu cuenta de correo a Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nombre de la cuenta",
+    "ProviderSelection_AccountNamePlaceholder": "p. ej. Personal, Trabajo",
+    "ProviderSelection_DisplayNameHeader": "Nombre para mostrar",
+    "ProviderSelection_DisplayNamePlaceholder": "p. ej. John Doe",
+    "ProviderSelection_EmailHeader": "Correo electrónico",
+    "ProviderSelection_EmailPlaceholder": "p. ej. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Contraseña específica de la aplicación",
+    "ProviderSelection_AppPasswordHelp": "¿Cómo obtengo una contraseña específica para la aplicación?",
+    "ProviderSelection_CalendarModeHeader": "Integración de calendario",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Deshabilitado",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Sin integración de calendario",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronización CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Tus eventos del calendario se sincronizan entre tus dispositivos con los servidores de Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Tus eventos del calendario se sincronizan entre tus dispositivos con los servidores de Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendario local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Tus eventos se almacenan solo en tu ordenador. No hay conectividad con el servidor.",
+    "ProviderSelection_ClearColor": "Borrar color",
+    "ProviderSelection_ContinueButton": "Continuar",
+    "ProviderSelection_SpecialImap_Subtitle": "Introduce las credenciales de tu cuenta para conectar.",
+    "AccountSetup_Title": "Configurando tu cuenta",
+    "AccountSetup_Step_Authenticating": "Autenticando con {0}",
+    "AccountSetup_Step_TestingMailAuth": "Probando la autenticación del correo",
+    "AccountSetup_Step_SyncingFolders": "Sincronizando metadatos de carpetas",
+    "AccountSetup_Step_FetchingProfile": "Recuperando información del perfil",
+    "AccountSetup_Step_DiscoveringCalDav": "Descubriendo la configuración de CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Probando la autenticación del calendario",
+    "AccountSetup_Step_SavingAccount": "Guardando la información de la cuenta",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Recuperando metadatos del calendario",
+    "AccountSetup_Step_SyncingAliases": "Sincronizando alias",
+    "AccountSetup_Step_Finalizing": "Finalizando la configuración",
+    "AccountSetup_FailureMessage": "La configuración ha fallado. Regresa para corregir tus ajustes o inténtalo de nuevo más tarde.",
+    "AccountSetup_SuccessMessage": "¡Tu cuenta se ha configurado correctamente!",
+    "AccountSetup_GoBackButton": "Atrás",
+    "AccountSetup_TryAgainButton": "Inténtalo de nuevo",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "El autodescubrimiento ha fallado. Por favor, introduce la configuración manualmente en la pestaña Avanzada."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/fi_FI/resources.json b/Wino.Core.Domain/Translations/fi_FI/resources.json
index 238c42fe..47d6fa2f 100644
--- a/Wino.Core.Domain/Translations/fi_FI/resources.json
+++ b/Wino.Core.Domain/Translations/fi_FI/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "Valmis",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Haetaan kalenterin tietoja.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "valmistellaan",
     "AccountCreationDialog_PreparingFolders": "Valmistellaan kansioita",
     "AccountCreationDialog_SigninIn": "Tallennetaan tilin tietoja.",
+    "Purchased": "Ostettu",
     "AccountEditDialog_Message": "Tilin nimi",
     "AccountEditDialog_Title": "Muokkaa tiliä",
     "AccountPickerDialog_Title": "Valitse tili",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Yleinen",
+    "AccountDetailsPage_TabMail": "Sähköposti",
+    "AccountDetailsPage_TabCalendar": "Kalenteri",
+    "AccountDetailsPage_CalendarListDescription": "Valitse kalenteri määrittääksesi sen asetukset",
     "AddHyperlink": "Lisää",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP-tili",
     "Busy": "Busy",
     "Buttons_AddAccount": "Lisää tili",
+    "Buttons_FixAccount": "Korjaa tili",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Käytä",
     "Buttons_ApplyTheme": "Vaihda teemaa",
     "Buttons_Browse": "Selaa",
     "Buttons_Cancel": "Peruuta",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Muokkaa",
     "Buttons_EnableImageRendering": "Ota käyttöön",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Hallitse",
     "Buttons_No": "Ei",
     "Buttons_Open": "Avaa",
     "Buttons_Purchase": "Osta",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Tallenna",
     "Buttons_SaveConfiguration": "Tallenna asetukset",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Lähetä palvelimelle",
     "Buttons_Share": "Jaa",
     "Buttons_SignIn": "Kirjaudu sisään",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Yritä uudelleen",
     "Buttons_Yes": "Kyllä",
+    "Sync_SynchronizingFolder": "Synkronoidaan {0} {1}%",
+    "Sync_DownloadedMessages": "Ladattiin {0} viestiä kohteesta {1}",
+    "SyncAction_Archiving": "Arkistoidaan {0} sähköpostia",
+    "SyncAction_ClearingFlag": "Poistetaan lippumerkintä {0} sähköpostista",
+    "SyncAction_CreatingDraft": "Luodaan luonnos",
+    "SyncAction_CreatingEvent": "Luodaan tapahtuma",
+    "SyncAction_Deleting": "Poistetaan {0} sähköpostia",
+    "SyncAction_EmptyingFolder": "Tyhjennetään kansiota",
+    "SyncAction_MarkingAsRead": "Merkataan {0} sähköpostia luetuiksi",
+    "SyncAction_MarkingAsUnread": "Merkataan {0} sähköpostia lukemattomiksi",
+    "SyncAction_MarkingFolderAsRead": "Merkitään kansio luetuksi",
+    "SyncAction_Moving": "Siirretään {0} sähköpostia",
+    "SyncAction_MovingToFocused": "Siirretään {0} sähköpostia Focused-kansioon",
+    "SyncAction_RenamingFolder": "Kansion nimeäminen",
+    "SyncAction_SendingMail": "Lähetetään sähköpostia",
+    "SyncAction_SettingFlag": "Merkitään {0} sähköpostia lipulla",
+    "SyncAction_SynchronizingAccount": "Synkronoidaan {0}",
+    "SyncAction_SynchronizingAccounts": "Synkronoidaan {0} tiliä",
+    "SyncAction_SynchronizingCalendarData": "Synkronoidaan kalenteritietoja",
+    "SyncAction_SynchronizingCalendarEvents": "Synkronoidaan kalenteritapahtumia",
+    "SyncAction_SynchronizingCalendarMetadata": "Synkronoidaan kalenterimetatiedot",
+    "SyncAction_Unarchiving": "Palautetaan {0} sähköpostia arkistosta",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Hyväksy",
+    "CalendarEventResponse_AcceptedResponse": "Hyväksytty",
+    "CalendarEventResponse_Decline": "Hylkää",
+    "CalendarEventResponse_DeclinedResponse": "Hylätty",
+    "CalendarEventResponse_NotResponded": "Ei vastattu",
+    "CalendarEventResponse_Tentative": "Ehkä",
+    "CalendarEventResponse_TentativeResponse": "Ehkä",
+    "CalendarEventRsvpPanel_Accept": "Hyväksy",
+    "CalendarEventRsvpPanel_AddMessage": "Lisää viesti vastaukseen... (valinnainen)",
+    "CalendarEventRsvpPanel_Decline": "Hylkää",
+    "CalendarEventRsvpPanel_Message": "Viesti",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Lähetä vastausviesti",
+    "CalendarEventRsvpPanel_Tentative": "Ehkä",
+    "CalendarEventRsvpPanel_Title": "Vastausvaihtoehdot",
+    "CalendarAttendeeStatus_Accepted": "Hyväksytty",
+    "CalendarAttendeeStatus_Declined": "Hylätty",
+    "CalendarAttendeeStatus_NeedsAction": "Toimintaa tarvitaan",
+    "CalendarAttendeeStatus_Tentative": "Ehkä",
+    "CalendarEventDetails_Attachments": "Liitteet",
+    "CalendarEventCompose_AddAttachment": "Lisää liite",
+    "CalendarEventCompose_AllDay": "Koko päivä",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Liitteitä ei tueta CalDAV-kalentereille.",
+    "CalendarEventCompose_EndDate": "Loppupäivä",
+    "CalendarEventCompose_EndTime": "Loppuaika",
+    "CalendarEventCompose_Every": "joka",
+    "CalendarEventCompose_ForWeekdays": "päiville",
+    "CalendarEventCompose_FrequencyDay": "päivä",
+    "CalendarEventCompose_FrequencyDayPlural": "päivät",
+    "CalendarEventCompose_FrequencyMonth": "kuukausi",
+    "CalendarEventCompose_FrequencyMonthPlural": "kuukaudet",
+    "CalendarEventCompose_FrequencyWeek": "viikko",
+    "CalendarEventCompose_FrequencyWeekPlural": "viikot",
+    "CalendarEventCompose_FrequencyYear": "vuosi",
+    "CalendarEventCompose_FrequencyYearPlural": "vuodet",
+    "CalendarEventCompose_Location": "Sijainti",
+    "CalendarEventCompose_LocationPlaceholder": "Lisää sijainti",
+    "CalendarEventCompose_NewEventButton": "Uusi tapahtuma",
+    "CalendarEventCompose_DefaultCalendarHint": "Voit valita oletkalenterin uusille tapahtumille Kalenteriasetuksissa.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Avaa Kalenteriasetukset",
+    "CalendarEventCompose_NoCalendarsMessage": "Tällä hetkellä tapahtuman luomiseen ei ole käytettävissä kalentereita.",
+    "CalendarEventCompose_NoCalendarsTitle": "Ei käytettävissä olevia kalentereita",
+    "CalendarEventCompose_NoEndDate": "Ei päättymispäivää",
+    "CalendarEventCompose_Notes": "Muistiinpanot",
+    "CalendarEventCompose_PickCalendarTitle": "Valitse kalenteri",
+    "CalendarEventCompose_Recurring": "Toistuva",
+    "CalendarEventCompose_RecurringSummary": "Tapahtuu {0} {1}{2} {3} voimassa {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Tapahtuu {0}{1} {2} voimassa {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Toista joka",
+    "CalendarEventCompose_SelectCalendar": "Valitse kalenteri",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Tapahtuu {0} {1}",
+    "CalendarEventCompose_StartDate": "Alkupäivä",
+    "CalendarEventCompose_StartTime": "Alkamisaika",
+    "CalendarEventCompose_TimeRangeSummary": "alkaen {0} - {1}",
+    "CalendarEventCompose_Title": "Tapahtuman otsikko",
+    "CalendarEventCompose_TitlePlaceholder": "Lisää otsikko",
+    "CalendarEventCompose_Until": "asti",
+    "CalendarEventCompose_UntilSummary": "asti {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Koko päivän lopetuspäivän on oltava aloituspäivän jälkeen.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Yksi tai useampi osallistuja on virheellinen sähköpostiosoite.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Toistojen päättymispäivämäärän on oltava sama tai myöhemmin kuin tapahtuman aloituspäivä.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Loppuajan on oltava myöhemmin kuin alkamisaika.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Yksi tai useampi liite ei ole enää käytettävissä: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Valitse kalenteri ennen tapahtuman luomista.",
+    "CalendarEventCompose_ValidationMissingTitle": "Syötä tapahtuman otsikko ennen tapahtuman luomista.",
+    "CalendarEventCompose_ValidationTitle": "Tapahtuman vahvistus epäonnistui",
+    "CalendarEventCompose_WeekdaySummary": " {0}",
+    "CalendarEventCompose_Weekday_Friday": "P",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "La",
+    "CalendarEventCompose_Weekday_Sunday": "Su",
+    "CalendarEventCompose_Weekday_Thursday": "To",
+    "CalendarEventCompose_Weekday_Tuesday": "Ti",
+    "CalendarEventCompose_Weekday_Wednesday": "Ke",
+    "CalendarEventDetails_Details": "Yksityiskohdat",
+    "CalendarEventDetails_EditSeries": "Muokkaa sarjaa",
+    "CalendarEventDetails_Editing": "Muokataan",
+    "CalendarEventDetails_InviteSomeone": "Kutsu joku",
+    "CalendarEventDetails_JoinOnline": "Liity verkossa",
+    "CalendarEventDetails_Organizer": "Järjestäjä",
+    "CalendarEventDetails_People": "Henkilöt",
+    "CalendarEventDetails_ReadOnlyEvent": "Vain katsottava tapahtuma",
+    "CalendarEventDetails_Reminder": "Muistutus",
+    "CalendarReminder_StartedHoursAgo": "Aloitettu {0} tuntia sitten",
+    "CalendarReminder_StartedMinutesAgo": "Aloitettu {0} minuuttia sitten",
+    "CalendarReminder_StartedNow": "Aloitettu juuri nyt",
+    "CalendarReminder_StartingNow": "Käynnistyy nyt",
+    "CalendarReminder_StartsInHours": "Alkaa {0} tunnin kuluttua",
+    "CalendarReminder_StartsInMinutes": "Alkaa {0} minuutin kuluttua",
+    "CalendarReminder_SnoozeAction": "Myöhäistä",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minuuttia",
+    "CalendarEventDetails_ShowAs": "Näytä tilana",
+    "CalendarShowAs_Free": "Vapaa",
+    "CalendarShowAs_Tentative": "Ehdotettu",
+    "CalendarShowAs_Busy": "Varattu",
+    "CalendarShowAs_OutOfOffice": "Poissa toimistosta",
+    "CalendarShowAs_WorkingElsewhere": "Työssä muualla",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} kopioitu leikepöydälle.",
     "ClipboardTextCopied_Title": "Kopioitu",
     "ClipboardTextCopyFailed_Message": "{0} kopioiminen leikepöydälle epäonnistui.",
+    "ContactInfoBar_ErrorTitle": "Yhteystietojen lataus epäonnistui",
+    "ContactInfoBar_SuccessTitle": "Yhteystiedot ladattiin",
+    "ContactInfoBar_WarningTitle": "Yhteystiedot saattavat olla puutteelliset",
     "ComingSoon": "Tulossa pian...",
     "ComposerAttachmentsDragDropAttach_Message": "Liitä",
     "ComposerAttachmentsDropZone_Message": "Raahaa tiedostosi tähän",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Linkitettyjen tilien nimi",
     "DialogMessage_DeleteAccountConfirmationMessage": "Poistetaanko {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Kaikki tämän tilin tiedot poistetaan pysyvästi.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Poistetaanko sähköpostimalli \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Poista sähköpostimalli",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Tämä poistaa sarjan kaikki tapahtumat. Haluatko jatkaa?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Poista toistuva sarja",
     "DialogMessage_DiscardDraftConfirmationMessage": "Luonnos hylätään. Haluatko jatkaa?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Hylkää luonnos",
     "DialogMessage_EmptySubjectConfirmation": "Aihe puuttuu",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Vaalea teema",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "Tili vaatii huomiota",
+    "Exception_AccountNeedsAttention_Message": "'{0}' vaatii huomiotasi jatkaaksesi.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail ei löytänyt Microsoft Edge WebView2 -ajonaikaa. Asenna tai korjaa ajonaikaa, jotta viestin sisältö näkyy oikein.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2-ajonaika vaaditaan",
     "Exception_AuthenticationCanceled": "Tunnistautuminen peruutettu",
     "Exception_CustomThemeExists": "Teema on jo olemassa.",
     "Exception_CustomThemeMissingName": "Sinun on annettava nimi.",
     "Exception_CustomThemeMissingWallpaper": "Sinun on valittava taustakuva.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Kalenteritietojen synkronointi epäonnistui",
+    "Exception_FailedToSynchronizeCalendarEvents": "Kalenteritapahtumien synkronointi epäonnistui",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Kalenteritietojen synkronointi epäonnistui",
     "Exception_FailedToSynchronizeFolders": "Kansioiden synkronointi epäonnistui",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Siirrä roskakoriin",
     "HoverActionOption_ToggleFlag": "Merkitse / Poista merkintä",
     "HoverActionOption_ToggleRead": "Luettu / Lukematon",
+    "KeyboardShortcuts_FailedToReset": "Pikanäppäinten palauttaminen oletusasetuksiin epäonnistui",
+    "KeyboardShortcuts_FailedToUpdate": "Pikanäppäinten päivittäminen epäonnistui",
+    "KeyboardShortcuts_MailoperationAction": "Toiminto",
+    "KeyboardShortcuts_Action": "Toiminto",
+    "KeyboardShortcuts_FailedToLoad": "Pikanäppäinten lataaminen epäonnistui",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Syötä näppäin pikanäppäintä varten",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Valitse toiminto, joka suoritetaan pikanäppäimellä",
+    "KeyboardShortcuts_EnterKey": "Syötä näppäin pikanäppäintä varten",
+    "KeyboardShortcuts_SelectOperation": "Valitse pikanäppäimelle suoritettava toiminto",
+    "KeyboardShortcuts_ShortcutInUse": "Tämä pikanäppäin on jo käytössä toisen pikanäppäimen toimesta",
+    "KeyboardShortcuts_FailedToSave": "Pikanäppäimen tallennus epäonnistui",
+    "KeyboardShortcuts_FailedToDelete": "Pikanäppäimen poistaminen epäonnistui",
+    "KeyboardShortcuts_PageDescription": "Aseta pikanäppäimet nopeisiin sähköpostitoimintoihin. Paina näppäimiä, kun kohdistin on avaimen syöttökentässä, tallentaaksesi pikanäppäimet.",
+    "KeyboardShortcuts_Add": "Lisää pikanäppäin",
+    "KeyboardShortcuts_EditTitle": "Muokkaa pikanäppäintä",
+    "KeyboardShortcuts_ResetToDefaults": "Palauta oletusasetukset",
+    "KeyboardShortcuts_PressKeysHere": "Paina tässä näppäimiä...",
+    "KeyboardShortcuts_KeyCombination": "Näppäinyhdistelmä",
+    "KeyboardShortcuts_FocusArea": "Aseta kohdistus yllä olevaan kenttään ja paina haluttu näppäinyhdistelmä",
+    "KeyboardShortcuts_Modifiers": "Muut näppäimet",
+    "KeyboardShortcuts_Mode": "Sovellustila",
+    "KeyboardShortcuts_ModeMail": "Sähköposti",
+    "KeyboardShortcuts_ModeCalendar": "Kalenteri",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Vaihda luetuksi/lukemattomaksi",
+    "KeyboardShortcuts_ActionToggleFlag": "Vaihda merkintä",
+    "KeyboardShortcuts_ActionToggleArchive": "Vaihda arkistointi/poista arkisto",
     "ImageRenderingDisabled": "Image rendering is disabled for this message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Username",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP- ja Kalenteriasetukset",
+    "ImapCalDavSettingsPage_TitleEdit": "Muokkaa IMAP- ja Kalenteriasetuksia",
+    "ImapCalDavSettingsPage_Subtitle": "Määritä tälle tilille IMAP/SMTP ja mahdollinen kalenterin synkronointi.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Perusasetukset",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Anna henkilöllisyytesi ja tunnistetiedot. Wino voi yrittää tunnistaa palvelinasetukset automaattisesti.",
+    "ImapCalDavSettingsPage_BasicTab": "Perus",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Ota kalenterituki käyttöön",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Sähköpostiasetusten automaattinen haku",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Sähköpostiasetukset on löydetty ja otettu käyttöön.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Edistyneet asetukset",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Syötä palvelinasetukset manuaalisesti, jos autodiscovery ei ole käytettävissä tai on virheellinen.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Edistyneet",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Kalenteriasetukset",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Valitse, miten kalenteritiedot tulisi toimia tämän IMAP-tilin kanssa.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalenterin tila",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Yhteyden suojaus",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Tunnistustapa",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Pois käytöstä",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV-synkronointi",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Vain paikallinen kalenteri",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalenteri on pois käytöstä tältä tililtä.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Kalenteri-tapahtumat synkronoidaan CalDAV-palvelimen kanssa.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Kalenteri-tapahtumat tallennetaan vain tähän tietokoneeseen eikä niitä synkronoida verkkoon.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Miten paikallinen kalenteri toimii",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Vain paikallinen kalenteri",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Paikallinen kalenteri tallentaa kaikki tapahtumat vain tähän tietokoneeseen. Mitään ei synkronoida iCloudiin, Yahooon tai muihin palveluntarjoajiin.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV-palvelun URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV-käyttäjänimi",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV-salasana",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV-testi on tarpeellinen vain, kun kalenteritila on CalDAV-synkronointi.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV-palvelun URL on pakollinen.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV-palvelun URL on oltava absoluuttinen URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV-käyttäjätunnus on pakollinen.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV-salasana on pakollinen.",
+    "ImapCalDavSettingsPage_TestImapButton": "Testaa IMAP-yhteys",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Testaa CalDAV-yhteys",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP-yhteyden testaus onnistui.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV-yhteyden testaus onnistui.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Tilin asetukset vahvistettiin ja tallennettiin.",
+    "ImapCalDavSettingsPage_ICloudHint": "Käytä sovelluskohtaisesti luotua salasanaa Apple-tilisi asetuksista.",
+    "ImapCalDavSettingsPage_YahooHint": "Käytä sovelluskohtaisesti luotua salasanaa Yahoo-tilisi suojausasetuksista.",
     "Info_AccountCreatedMessage": "{0} is created",
     "Info_AccountCreatedTitle": "Tilin luominen",
     "Info_AccountCreationFailedTitle": "Tilin luominen epäonnistui",
     "Info_AccountDeletedMessage": "{0} poistettiin onnistuneesti.",
     "Info_AccountDeletedTitle": "Tili poistettu",
     "Info_AccountIssueFixFailedTitle": "Epäonnistui",
+    "Info_AccountIssueFixImapMessage": "Avaa IMAP- ja kalenteriasetussivun syöttääksesi palvelimesi tunnistetiedot uudelleen.",
+    "Info_AccountAttentionRequiredMessage": "Tämä tili vaatii huomiota.",
+    "Info_AccountAttentionRequiredClickableMessage": "Napsauta korjataksesi tämän tilin ja synkronoi se uudelleen.",
+    "Info_AccountAttentionRequiredAction": "Korjaa",
+    "Info_AccountAttentionRequiredActionHint": "Napsauta Korjaa ratkaistaksesi tämän tilin ongelman.",
     "Info_AccountIssueFixSuccessMessage": "Kaikki tiliongelmat korjattu.",
     "Info_AccountIssueFixSuccessTitle": "Onnistui",
     "Info_AttachmentOpenFailedMessage": "Tätä liitettä ei voi avata.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "Päivitys saatavilla",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Poista arkistointi",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoomaa",
+    "MailsDragging": "Vedetään {0} kohdetta",
     "MailsSelected": "{0} kohta(a) valittu",
     "MarkFlagUnflag": "Merkitse tai poista merkintä",
     "MarkReadUnread": "Merkitse luetuksi / lukemattomaksi",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Tarkasta uusi versio {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail on päivitetty.",
+    "Notifications_StoreUpdateAvailableTitle": "Päivitys saatavilla",
+    "Notifications_StoreUpdateAvailableMessage": "Uusin Wino Mail -versio on valmis asennettavaksi Microsoft Storesta.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Pieni",
     "Photos": "Kuvat",
     "PreparingFoldersMessage": "Valmistellaan kansioita",
-    "ProtocolLogAvailable_Message": "Protokolla lokit ovat saatavilla diagnostiikkaan.",
     "ProviderDetail_Gmail_Description": "Google-tili",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Pikanäppäimet",
+    "Settings_KeyboardShortcuts_Description": "Hallitse pikanäppäimiä nopeisiin toimiin sähköposteissa.",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP- ja kalenteriasetukset",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Avaa tämän tilin erillinen IMAP-, SMTP- ja CalDAV-asetussivu.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Avaa asetukset",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Sovelluksen oletustila",
+    "SettingsAppPreferences_ApplicationMode_Description": "Valitse, millä tilalla Wino avautuu, kun aktivointityyppiä ei ole määritetty.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Sähköposti",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalenteri",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Piilota otsikkorivillä oleva Wino-tilin profiilipainike.",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Piilota otsikkorivillä oleva profiilipainike, joka avaa Wino-tilin valikon.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Store-päivitysilmoitukset",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Näytä ilmoitukset ja alatunnisteen toiminnot, kun Microsoft Store -päivitys on saatavilla.",
+    "SettingsAppPreferences_AiActions_Title": "Tekoälytoiminnot",
+    "SettingsAppPreferences_AiActions_Description": "Valitse tekoälyn oletuskielet ja mihin yhteenvetoja tallennetaan.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Oletuskäännöksen kieli",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Valitse tekoälykäännösten oletuskieli.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Tiivistämisen kieli",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Valitse tulevia AI-tiivistystuloksia varten haluamasi tiivistyskieli.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Oletus tiivistelmien tallennuspaikka",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Valitse kansio, jota Wino käyttää oletuksena AI-tiivistelmien tallennuksessa.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Käytä järjestelmän oletustallennuspaikkaa",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Tätä kansiota ei ole olemassa. Tiivistelmien tallennuspaikkaa käytetään oletuksena.",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Oletussnooze-kesto",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Aseta oletusviive kalenterimuistutusten siirtotoiminnolle.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Ajastetun näkymän päivän otsikoiden muoto",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Valitse, miten päivän yläotsikot renderöidään päivän-, viikon- ja työviikkonäytöissä. Käytä päivämäärämuotojen tunnuksia kuten ddd, dd, MMM tai dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Ikkunan tausta",
+    "SettingsWindowBackdrop_Description": "Valitse Wino-ikkunoiden taustaefekti.",
+    "SettingsWindowBackdrop_Disabled": "Ikkunan taustavaikutuksen valinta on poistettu käytöstä, kun sovelluksen teema on muu kuin Oletus.",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Muutokset tallennettu",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Tilin tiedot on päivitetty onnistuneesti.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Koti",
+    "SettingsHome_SearchTitle": "Etsi asetus",
+    "SettingsHome_SearchDescription": "Hae ominaisuuden, aiheen tai avainsanan perusteella ja siirry suoraan oikealle asetussivulle.",
+    "SettingsHome_SearchPlaceholder": "Hae asetuksista",
+    "SettingsHome_SearchExamples": "Esimerkki: teema, tallennus, kieli, allekirjoitus",
+    "SettingsHome_QuickLinks_Title": "Nopeat linkit",
+    "SettingsHome_QuickLinks_Description": "Siirry nopeasti niihin asetuksiin, joita ihmiset käyttävät eniten.",
+    "SettingsHome_StorageCard_Description": "Näe, kuinka paljon paikallista MIME-sisältöä Wino pitää tässä laitteessa ja puhdista sitä tarvittaessa.",
+    "SettingsHome_StorageEmptySummary": "Ei välimuistin MIME-sisältöä havaittu vielä.",
+    "SettingsHome_StorageLoading": "Tarkistetaan paikallisen MIME-käytön määrää...",
+    "SettingsHome_Tips_Title": "Vinkit ja niksit",
+    "SettingsHome_Tips_Description": "Muutama pieni muutos voi tehdä Winosta paljon henkilökohtaisemman.",
+    "SettingsHome_Tip_Theme": "Haluatko tumma-tilan tai korostusvaihtoehtoja? Avaa Personointi.",
+    "SettingsHome_Tip_Background": "Käytä sovellusasetuksia hallitaksesi käynnistymistä ja taustasynkronointia.",
+    "SettingsHome_Tip_Shortcuts": "Pikanäppäimet auttavat liikkumaan sähköpostin läpi nopeammin.",
+    "SettingsHome_Resources_Title": "Hyödylliset linkit",
+    "SettingsHome_Resources_Description": "Avaa projektin resurssit, tuki-informaatio ja julkaisukanavat.",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "Yleiset",
+    "SettingsOptions_MailSection": "Sähköposti",
+    "SettingsOptions_CalendarSection": "Kalenteri",
+    "SettingsOptions_MoreComingSoon": "Lisäominaisuuksia tulossa pian",
+    "SettingsOptions_HeroDescription": "Mukauta Wino Mail -kokemustasi.",
+    "SettingsOptions_AccountsSummary": "{0} tiliä on määritetty",
+    "SettingsSearch_ManageAccounts_Keywords": "tili;tilit;postilaatikko;postilaatikot;aliaksia;profiili;osoite;osoitteet",
+    "SettingsSearch_AppPreferences_Keywords": "käynnistys;tausta;käynnistys;synkronointi;ilmoitukset;ilmoitukset;haku;järjestelmäpalkki;oletusarvot",
+    "SettingsSearch_LanguageTime_Keywords": "kieli;aika;kello;paikkakunta;alue;muoto;24 tuntia;24h",
+    "SettingsSearch_Personalization_Keywords": "teema;tumma;vaalea;ulkoasu;korostus;väri;väri;tila;asettelu;tiheys",
+    "SettingsSearch_About_Keywords": "tietoja;versio;verkkosivusto;tietosuoja;github;lahjoita;kauppa;tuki",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "pikakuvake;pikakuvakkeet;pikanäppäin;pikanäppäimet;näppäin;näppäimet",
+    "SettingsSearch_MessageList_Keywords": "viesti;viestit;luettelo;keskusteluketjut;ketjut;avatar;esikatselu;lähettäjä",
+    "SettingsSearch_ReadComposePane_Keywords": "lukija;laadi;laadi;fontti;fontit;ulkoisen sisällön;näyttö;luku",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "allekirjoitus;allekirjoitukset;salaus;sertifikaatti;sertifikaatit;S-MIME;turvallisuus",
+    "SettingsSearch_Storage_Keywords": "tallennustila;välimuisti;välimuistitus;mime;levy;tilaa;siivous;paikallinen data",
+    "SettingsSearch_CalendarSettings_Keywords": "kalenteri;viikko;tunnit;aikataulu;tapahtuma;tapahtumat",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Avaa Wino Mail -verkkosivusto.",
+    "SettingsWebsite_Title": "Verkkosivusto",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "Sähköpostimallit",
+    "SettingsEmailTemplates_Description": "Hallitse sähköpostimallipohjia",
+    "SettingsEmailTemplates_CreatePageTitle": "Uusi malli",
+    "SettingsEmailTemplates_EditPageTitle": "Muokkaa mallia",
+    "SettingsEmailTemplates_NewTemplateTitle": "Uusi malli",
+    "SettingsEmailTemplates_NewTemplateDescription": "Luo uusi sähköpostimalli",
+    "SettingsEmailTemplates_NameTitle": "Nimi",
+    "SettingsEmailTemplates_NamePlaceholder": "Mallin nimi",
+    "SettingsEmailTemplates_DescriptionTitle": "Kuvaus",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Valinnainen kuvaus",
+    "SettingsEmailTemplates_ContentTitle": "Mallin sisältö",
+    "SettingsEmailTemplates_ContentDescription": "Muokkaa tämän mallin HTML-sisältöä.",
+    "SettingsEmailTemplates_NameRequired": "Mallin nimi on pakollinen.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Tallennus",
+    "SettingsStorage_Description": "Skannaa ja hallitse paikalliseen data-kansioon tallennettu MIME-välimuisti.",
+    "SettingsStorage_ScanFolder": "Skannaa paikallisen data-kansion",
+    "SettingsStorage_NoLocalMimeDataFound": "Paikallista MIME-tietoa ei löytynyt.",
+    "SettingsStorage_NoAccountsFound": "Tilit eivät löytyneet.",
+    "SettingsStorage_TotalUsage": "Paikallinen MIME-käyttö yhteensä: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} käytetty paikallisessa MIME-välimuistissa",
+    "SettingsStorage_DeleteAll_Title": "Poista kaikki MIME-sisällöt",
+    "SettingsStorage_DeleteAll_Description": "Poista tämän tilin koko MIME-välimuistihakemisto.",
+    "SettingsStorage_DeleteAll_Button": "Poista kaikki",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Poista kaikki MIME-sisällöt",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Poista kaikki paikalliset MIME-tiedot tilille {0}?",
+    "SettingsStorage_DeleteAll_Success": "Kaikki MIME-sisällöt poistettiin.",
+    "SettingsStorage_DeleteOld_Title": "Poista vanhat MIME-sisällöt",
+    "SettingsStorage_DeleteOld_Description": "Poista MIME-tiedostoja sähköpostin luontipäivämäärän perusteella paikallisessa tietokannassa.",
+    "SettingsStorage_DeleteOld_1Month": "Yli 1 kuukausi",
+    "SettingsStorage_DeleteOld_3Months": "Yli 3 kuukautta",
+    "SettingsStorage_DeleteOld_6Months": "Yli 6 kuukautta",
+    "SettingsStorage_DeleteOld_1Year": "Yli 1 vuosi",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Poista vanhat MIME-sisällöt",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Poista paikalliset MIME-tiedot, jotka ovat vanhempia kuin {0} tilillä {1}?",
+    "SettingsStorage_DeleteOld_Success": "Poistettu {0} MIME-kansiota vanhempia kuin {1}.",
+    "SettingsStorage_1Month": "1 kuukausi",
+    "SettingsStorage_3Months": "3 kuukautta",
+    "SettingsStorage_6Months": "6 kuukautta",
+    "SettingsStorage_1Year": "1 vuosi",
+    "SettingsStorage_Months": "{0} kuukautta",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Avaa Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Avaa Wino Kalenteri",
+    "SystemTrayMenu_ExitWino": "Poistu",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Sertifikaatit tuotiin onnistuneesti.",
+    "Smime_ImportCertificates_Error": "Virhe sertifikaattien tuonnissa: {0}",
+    "Smime_RemoveCertificates_Confirm": "Haluatko todella poistaa sertifikaatit {0}?",
+    "Smime_RemoveCertificates_Success": "Sertifikaatit poistettu.",
+    "Smime_ExportCertificates_Success": "Sertifikaatit viety ulos.",
+    "Smime_ExportCertificates_Error": "Virhe sertifikaattien viennissä.",
+    "Smime_CertificateDetails": "Aihe: {0}\\nMyöntäjä: {1}\\nVoimassa alkaen: {2}\\nVoimassa asti: {3}\\nSormenjälki: {4}",
+    "Smime_CertificatePassword_Title": "Sertifikaatin salasana vaaditaan",
+    "Smime_CertificatePassword_Placeholder": "Sertifikaatin salasana kohteelle {0} (valinnainen)",
+    "Smime_Confirm_Title": "Vahvista",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Päivitä",
+    "SettingsSignatureAndEncryption_Title": "Allekirjoitus ja salaus",
+    "SettingsSignatureAndEncryption_Description": "Hallitse S/MIME-sertifikaatteja sähköpostien allekirjoittamiseen ja salaukseen.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Omat sertifikaatit",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Henkilökohtaiset sertifikaatit allekirjoittamiseen ja salaukseen",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Vastaanottajien sertifikaatit",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Vastaanottajien sertifikaatit salauksen purkuun",
+    "SettingsSignatureAndEncryption_NameColumn": "Nimi",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Vanhentuu",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Sormenjälki",
+    "Buttons_Remove": "Poista",
+    "Buttons_Export": "Vie",
+    "Buttons_Import": "Tuo",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME-allekirjoitussertifikaatti",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME-salaussertifikaatti",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Ei mitään",
+    "SmimeSignaturesInMessage": "Tämän viestin allekirjoitukset:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, voimassa {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME-allekirjoitussertifikaatin tiedot",
+    "SmimeCertificateInfoTitle": "S/MIME-sertifikaatin tiedot",
+    "SmimeNoCertificateFileFound": "Sertifikaatitiedostoa ei löytynyt",
+    "SmimeSaveCertificate": "Tallenna sertifikaatti...",
+    "SmimeCertificate": "S/MIME-sertifikaatti",
+    "SmimeCertificateSavedTo": "Sertifikaatti tallennettu kohteeseen {0}",
+    "SmimeSignedTooltip": "Tämä viesti on allekirjoitettu S/MIME-sertifikaatilla. Napsauta lisätietoja.",
+    "SmimeEncryptedTooltip": "Tämä viesti on salattu S/MIME-sertifikaatin avulla.",
+    "SmimeCertificateFileInfo": "Tiedosto: {0}",
+    "Composer_LightTheme": "Kevyt teema",
+    "Composer_DarkTheme": "Tumma teema",
+    "Composer_Outdent": "Poista sisennys",
+    "Composer_Indent": "Sisennä",
+    "Composer_BulletList": "Luettelomerkit",
+    "Composer_OrderedList": "Numeroitu lista",
+    "Composer_Stroke": "Viiva",
+    "Composer_Bold": "Lihavoitu",
+    "Composer_Italic": "Kursivoitu",
+    "Composer_Underline": "Alleviivaus",
+    "Composer_CcBcc": "Cc ja Bcc",
+    "Composer_EnableSmimeSignature": "Ota S/MIME-allekirjoitus käyttöön/poista käytöstä",
+    "Composer_EnableSmimeEncryption": "Ota S/MIME-salaus käyttöön/poista käytöstä",
+    "Composer_LocalDraftSyncInfo": "Tämä luonnos on vain paikallinen. Wino ei onnistunut lähettämään sitä sähköpostipalvelimellesi. Napsauta uudelleenlähettääksesi sen palvelimelle.",
+    "Composer_CertificateExpires": "Vanhentuu:",
+    "Composer_SmimeSignature": "S/MIME-allekirjoitus",
+    "Composer_SmimeEncryption": "S/MIME-salaus",
+    "Composer_EmailTemplatesPlaceholder": "Sähköpostimallit",
+    "Composer_AiSummarize": "Tiivistä tekoälyn avulla",
+    "Composer_AiSummarizeDescription": "Tuo tämän sähköpostin keskeiset kohdat, toimenpiteet ja päätökset.",
+    "Composer_AiTranslate": "Käännä tekoälyn avulla",
+    "Composer_AiActions": "Tekoälyn toimet",
+    "Composer_AiRewrite": "Uudelleenkirjoita tekoälyn avulla",
+    "AiActions_CheckingStatus": "Tarkistetaan tekoälyyn pääsyä...",
+    "AiActions_SignedOutTitle": "Poista Wino AI Packin lukitus",
+    "AiActions_SignedOutDescription": "Käännä, kirjoita ja tiivistä sähköposteja tekoälyn avulla kirjautumalla Wino-tilillesi ja aktivoimalla AI Pack -lisäosan.",
+    "AiActions_NoPackTitle": "AI Pack vaaditaan",
+    "AiActions_NoPackDescription": "Olet kirjautuneena sisään, mutta AI Pack ei ole vielä käytössä. Osta se käyttääksesi Wino'n tekoälyn käännöksiä, uudelleenkirjoitusta ja tiivistämistyökaluja.",
+    "AiActions_UsageSummary": "Tässä kuussa käytettyjen krediittien määrä: {0} / {1}",
+    "Composer_AiRewritePolite": "Tee siitä kohteliaampi",
+    "Composer_AiRewritePoliteDescription": "Lievittää sanamuotoa samalla säilyttäen saman tarkoituksen.",
+    "Composer_AiRewriteAngry": "Tee siitä vihaisen",
+    "Composer_AiRewriteAngryDescription": "Käyttää terävämpää ja konfrontatiivisempaa sävyä.",
+    "Composer_AiRewriteHappy": "Tee siitä iloinen",
+    "Composer_AiRewriteHappyDescription": "Lisää iloisemman ja innostuneemman sävyn.",
+    "Composer_AiRewriteFormal": "Tee siitä muodollinen",
+    "Composer_AiRewriteFormalDescription": "Saa viestin kuulostamaan ammattimaisemmalta ja jäsennellymmältä.",
+    "Composer_AiRewriteFriendly": "Tee siitä ystävällinen",
+    "Composer_AiRewriteFriendlyDescription": "Lämmittää viestiä lähestyttävämmällä sävyllä.",
+    "Composer_AiRewriteShorter": "Tee siitä lyhyempi",
+    "Composer_AiRewriteShorterDescription": "Tiivistää tekstin ja poistaa tarpeettomat yksityiskohdat.",
+    "Composer_AiRewriteClearer": "Tee siitä selkeämpi",
+    "Composer_AiRewriteClearerDescription": "Parantaa luettavuutta ja tekee viestistä helpommin seurattavan.",
+    "Composer_AiRewriteCustom": "Mukautettu",
+    "Composer_AiRewriteCustomDescription": "Kuvaile haluamasi uudelleenkirjoituksen tarkoitus.",
+    "Composer_AiRewriteCustomPlaceholder": "Kuvaile, miten haluat viestin kirjoitettavan uudelleen",
+    "Composer_AiRewriteMode": "Uudelleenkirjoituksen sävy",
+    "Composer_AiRewriteApply": "Käytä uudelleenkirjoitusta",
+    "Composer_AiTranslateDialogTitle": "Käännä tekoälyn avulla",
+    "Composer_AiTranslateDialogDescription": "Syötä kohdekieli tai kulttuurikoodi, kuten en-US, tr-TR, de-DE tai fr-FR.",
+    "Composer_AiTranslateApply": "Käännä",
+    "Composer_AiTranslateLanguage": "Kohdekieli",
+    "Composer_AiTranslateCustomPlaceholder": "Syötä kulttuurikoodi",
+    "Composer_AiTranslateLanguageEnglish": "Englanti (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turkki (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Saksa (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Ranska (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Espanja (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italia (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugali (Brasília) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Hollanti (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Puola (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Venäjä (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japani (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korea (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Kiina, yksinkertaistettu (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabia (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Muu...",
+    "Composer_AiBusyTitle": "AI on jo käynnissä",
+    "Composer_AiBusyMessage": "Odota, kunnes nykyinen AI-toiminto valmistuu.",
+    "Composer_AiSignInRequired": "Kirjaudu sisään Wino-tilillesi käyttääksesi AI-ominaisuuksia.",
+    "Composer_AiMissingHtml": "Wino AI:lle ei ole vielä viestisisältöä.",
+    "Composer_AiQuotaUnavailable": "AI-tulos on käytetty.",
+    "Composer_AiAppliedMessage": "AI-tulos lisättiin kirjoittimeen. Jos haluat kumota sen, käytä Kumoa.",
+    "Composer_AiSummarizeSuccessTitle": "AI-yhteenveto otettu käyttöön.",
+    "Composer_AiTranslateSuccessTitle": "AI-käännös otettu käyttöön.",
+    "Composer_AiRewriteSuccessTitle": "AI-uudelleenkirjoitus otettu käyttöön.",
+    "Composer_AiErrorTitle": "AI-toiminto epäonnistui.",
+    "Reader_AiAppliedMessage": "AI-tulos on nyt näytetty tässä viestissä. Avaa viesti uudelleen nähdäksesi alkuperäisen sisällön.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Yhteystiedot",
+    "ContactsPage_AddContact": "Lisää yhteystieto",
+    "ContactsPage_EditContact": "Muokkaa yhteystietoa",
+    "ContactsPage_DeleteContact": "Poista yhteystieto",
+    "ContactsPage_SearchPlaceholder": "Etsi yhteystietoja...",
+    "ContactsPage_NoContacts": "Yhteystietoja ei löytynyt",
+    "ContactsPage_ContactsCount": "{0} yhteystietoa",
+    "ContactsPage_SelectedContactsCount": "{0} valittua yhteystietoa",
+    "ContactsPage_DeleteSelectedContacts": "Poista valitut",
+    "ContactEditDialog_Title": "Muokkaa yhteystietoa",
+    "ContactEditDialog_PhotoSection": "Kuva",
+    "ContactEditDialog_ChoosePhoto": "Valitse kuva",
+    "ContactEditDialog_RemovePhoto": "Poista kuva",
+    "ContactEditDialog_NameHeader": "Nimi",
+    "ContactEditDialog_NamePlaceholder": "Yhteystiedon nimi",
+    "ContactEditDialog_EmailHeader": "Sähköpostiosoite",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Yhteystiedot",
+    "ContactEditDialog_RootContactInfo": "Tämä on tilillesi liittyvä pääyhteystieto, eikä sitä voi poistaa.",
+    "ContactEditDialog_OverriddenContactInfo": "Tätä yhteystietoa on muokattu manuaalisesti eikä sitä päivitetä synkronoinnin aikana.",
+    "ContactsPage_Subtitle": "Hallitse sähköpostiyhteystietojasi ja niiden tietoja",
+    "ContactStatus_Account": "Tili",
+    "ContactStatus_Modified": "Muokattu",
+    "ContactAction_Edit": "Muokkaa yhteystietoa",
+    "ContactAction_ChangePhoto": "Vaihda kuva",
+    "ContactAction_Delete": "Poista yhteystieto",
+    "ContactAction_Add": "Lisää yhteystieto",
+    "ContactSelection_Selected": "valittu",
+    "ContactSelection_SelectAll": "Valitse kaikki",
+    "ContactSelection_Clear": "Tyhjennä valinta",
+    "ContactsPage_EmptyState": "Näytettävissä ei ole yhteystietoja.",
+    "ContactsPage_AddFirstContact": "Lisää ensimmäinen yhteystietosi",
+    "ContactsPage_ContactsCountSuffix": "yhteystietoja",
+    "ContactsPane_NewContact": "Uusi yhteystieto",
+    "ContactsPane_DescriptionTitle": "Hallitse yhteystietojasi",
+    "ContactsPane_DescriptionBody": "Luo yhteystietoja, nimeä ne uudelleen, päivitä profiilikuvat ja pidä tallennetut tiedot järjestyksessä yhdessä paikassa.",
+    "ContactEditDialog_AddTitle": "Lisää yhteystieto",
+    "ContactInfoBar_ContactAdded": "Yhteystieto lisätty onnistuneesti.",
+    "ContactInfoBar_ContactUpdated": "Yhteystieto päivitetty onnistuneesti.",
+    "ContactInfoBar_ContactsDeleted": "Yhteystiedot poistettu onnistuneesti.",
+    "ContactInfoBar_ContactPhotoUpdated": "Yhteystietokuvan päivittäminen onnistui.",
+    "ContactInfoBar_FailedToLoadContacts": "Yhteystietojen lataaminen epäonnistui: {0}",
+    "ContactInfoBar_FailedToAddContact": "Yhteystiedon lisääminen epäonnistui: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Yhteystiedon päivittäminen epäonnistui: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Yhteystietojen poistaminen epäonnistui: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Kuvan päivittäminen epäonnistui: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Juuriyhteystietoja ei voi poistaa.",
+    "ContactConfirmDialog_DeleteTitle": "Poista yhteystieto",
+    "ContactConfirmDialog_DeleteMessage": "Oletko varma, että haluat poistaa yhteystiedon '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Oletko varma, että haluat poistaa {0} yhteystieto(a)?",
+    "ContactConfirmDialog_DeleteButton": "Poista",
+    "CalendarAccountSettings_Title": "Kalenteritilin asetukset",
+    "CalendarAccountSettings_Description": "Hallitse tilin {0} kalenteriasetuksia.",
+    "CalendarAccountSettings_AccountColor": "Tilin väri",
+    "CalendarAccountSettings_AccountColorDescription": "Muuta tämän kalenteritilin näyttöväriä.",
+    "CalendarAccountSettings_SyncEnabled": "Ota synkronointi käyttöön",
+    "CalendarAccountSettings_SyncEnabledDescription": "Ota kalenterin synkronointi käyttöön tai poista se käytöstä tälle tilille.",
+    "CalendarAccountSettings_DefaultShowAs": "Oletus Näytä tila",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Uusien tapahtumien oletusarvoinen saatavuustila tämän tilin kanssa.",
+    "CalendarAccountSettings_PrimaryCalendar": "Ensisijainen kalenteri",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Merkitse tämä kalenteri tilin ensisijaiseksi kalenteriksi.",
+    "CalendarSettings_NewEventBehavior_Header": "Uuden tapahtuman painikkeen käyttäytyminen",
+    "CalendarSettings_NewEventBehavior_Description": "Valitse, pitäisikö Uuden tapahtuman -painikkeen kysyä kalenteria joka kerta vai avata aina tietyn kalenterin.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Kysy joka kerta.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Käytä aina tiettyä kalenteria.",
+    "CalendarSettings_Rendering_Title": "Renderointi",
+    "CalendarSettings_Rendering_Description": "Määritä kalenterin asettelu ja näyttökäyttäytyminen.",
+    "CalendarSettings_Notifications_Title": "Ilmoitukset",
+    "CalendarSettings_Notifications_Description": "Valitse oletusmuistutusten ja torkutusten toimintatapa.",
+    "CalendarSettings_Preferences_Title": "Asetukset",
+    "CalendarSettings_Preferences_Description": "Määritä, miten Uuden tapahtuman -painike toimii.",
+    "WhatIsNew_GetStartedButton": "Aloita",
+    "WhatIsNew_ContinueAnywayButton": "Jatka silti",
+    "WhatIsNew_PreparingForNewVersionButton": "Valmistelemme uutta versiota...",
+    "WhatIsNew_MigrationPreparing_Title": "Tietojesi valmistelu",
+    "WhatIsNew_MigrationPreparing_Description": "Wino soveltaa päivitysmigraatioita. Odota, kun valmistelemme tilisi tiedot tämän version julkaisua varten.",
+    "WhatIsNew_MigrationFailedMessage": "Migraatioiden soveltaminen epäonnistui virhekoodilla {0}. Voit jatkaa sovelluksen käyttöä. Mikäli ilmenee vakavia ongelmia, asenna sovellus uudelleen.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Päivitetty",
+    "WhatIsNew_MigrationNotification_Message": "Avaa sovellus päivittääksesi sen loppuun ja nähdäksesi, mitä uutta on.",
+    "WelcomeWindow_Title": "Tervetuloa Wino Mailiin",
+    "WelcomeWindow_Subtitle": "Natiivi Windows-kokemus Mailille ja Kalenterille.",
+    "WelcomeWindow_WhatsNewTitle": "Viimeisimmät muutokset",
+    "WelcomeWindow_FeaturesTitle": "Ominaisuudet",
+    "WelcomeWindow_WhatsNewTab": "Mitä uutta",
+    "WelcomeWindow_FeaturesTab": "Ominaisuudet",
+    "WelcomeWindow_GetStartedButton": "Aloita lisäämällä tilin",
+    "WelcomeWindow_GetStartedDescription": "Lisää Outlook-, Gmail- tai IMAP-tili aloittaaksesi Wino Mailin käytön.",
+    "WelcomeWindow_ImportFromWinoAccount": "Tuo Wino-tililtäsi",
+    "WelcomeWindow_ImportInProgress": "Tuodaan synkronoitujen asetusten ja tilien tiedot...",
+    "WelcomeWindow_ImportNoAccountsFound": "Wino-tililläsi ei löytynyt synkronoituja tilejä. Jos asetukset olivat käytettävissä, ne palautettiin. Käytä Aloita tilin lisäämisen manuaalisesti.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synkronoitua tiliä on jo käytettävissä tässä laitteessa. Käytä Aloita tilin lisääminen manuaalisesti, jos tarvitset toisen tilin.",
+    "WelcomeWindow_SetupTitle": "Ota tilisi käyttöön",
+    "WelcomeWindow_SetupSubtitle": "Valitse sähköpostipalvelusi aloittaaksesi.",
+    "WelcomeWindow_AddAccountButton": "Lisää tili",
+    "WelcomeWindow_SkipForNow": "Hyppää hetkeksi — asennan sen myöhemmin.",
+    "WelcomeWindow_AppDescription": "Nopea, keskittynyt postilaatikko – uudelleen suunniteltu Windows 11:lle",
+    "WelcomeWizard_Step1Title": "Tervetuloa",
+    "SystemTrayMenu_Open": "Avaa",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Synkronointiasetukset",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Pidä Wino-asetuksesi synkronoituina useilla laitteilla.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Ota lisäosat käyttöön",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Pääsy premium-ominaisuuksiin, kuten Wino AI Pack.",
+    "WinoAccount_Management_Description": "Hallitse Wino-tiliä, AI Pack -käyttöoikeuksia sekä synkronoitujen asetusten ja tilitietojen hallintaa.",
+    "WinoAccount_Management_SignedOutTitle": "Kirjaudu sisään Wino Mailiin",
+    "WinoAccount_Management_SignedOutDescription": "Kirjaudu sisään tai luo tili synkronoidaaksesi sähköpostisi, käyttääksesi AI-ominaisuuksia ja hallinnoidaksesi asetuksiasi useilla laitteilla.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profiili",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino-lisäosat",
+    "WinoAccount_Management_DataSectionHeader": "Tiedot",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Tilin toiminnot",
+    "WinoAccount_Management_AccountCardTitle": "Tili",
+    "WinoAccount_Management_AccountCardDescription": "Wino-tilisi sähköpostiosoite ja nykyinen tilitila.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Näet, onko Wino AI Pack aktiivinen ja kuinka paljon käyttöä on jäljellä.",
+    "WinoAccount_Management_AiPackActive": "AI Pack on käytössä",
+    "WinoAccount_Management_AiPackInactive": "AI Pack ei ole käytössä",
+    "WinoAccount_Management_AiPackUsage": "{0} / {1} käyttökertaa käytetty. {2} jäljellä.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Laskutusjakso: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Käyttötietoja ei ole vielä saatavilla.",
+    "WinoAccount_Management_AiPackBuyDescription": "Osta Wino AI Pack kääntääksesi, uudelleenkirjoittaaksesi tai tiivistääksesi sähköposteja tekoälyn avulla.",
+    "WinoAccount_Management_AiPackPromoTitle": "Ota AI Pack käyttöön",
+    "WinoAccount_Management_AiPackPromoDescription": "Vahvista sähköpostityöskentelyä tekoälypohjaisilla työkaluilla. Käännä viestit yli 50 kielelle, kirjoita uudelleen selkeyden ja sävyn parantamiseksi sekä saat välittömät yhteenvetot pitkistä keskusteluista.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / kk",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 krediittiä",
+    "WinoAccount_Management_AiPackGetButton": "Hae AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-pohjaisia työkaluja kääntä-, uudelleenkirjoittamis- ja tiivistystoimintoja Wino Mailiin.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, kääntäminen, uudelleenkirjoittaminen, tiivistäminen, tuottavuus",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Rajoittamattomat tilit",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Poista tilirajoitus ja lisää haluamasi määrän sähköpostitilejä.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "tilit, rajoittamattomat, premium, lisäosa",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Kirjaudu sisään Wino-tililläsi tämän oston suorittamiseksi.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino ei voinut suorittaa tätä Microsoft Store -ostoa.",
+    "WinoAccount_Management_StoreSyncFailed": "Ostoksesi on valmis, mutta Wino ei voinut päivittää tilisi etuja vielä. Yritä uudelleen hetken kuluttua.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Tilaus on aktiivinen",
+    "WinoAccount_Management_AiPackRenews": "Uudistuu {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Tässä kuussa käytetyt krediitit",
+    "WinoAccount_Management_AiPackResets": "Nollaukset {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Emme voineet ladata AI-käyttösaldoasi.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Käännä",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Uudelleenkirjoita",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Tiivistä",
+    "WinoAccount_Management_AddOnLoadFailed": "Meillä ilmeni ongelmia tämän lisäosan lataamisessa.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synkronoi asetukset ja tilit",
+    "WinoAccount_Management_SyncPreferencesDescription": "Tuo tai vie Wino-asetuksesi ja postilaatikon tiedot eri laitteiden välillä. Salasanat, tokenit ja muut herkät tiedot eivät koskaan synkronoidu.",
+    "WinoAccount_Management_SignOutTitle": "Kirjaudu ulos",
+    "WinoAccount_Management_SignOutDescription": "Kirjaudu ulos tililtäsi tästä laitteesta",
+    "WinoAccount_Management_StatusLabel": "Tila: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Tälle tilille ei ole vielä tallennettu synkronoituja tietoja.",
+    "WinoAccount_Management_ExportSucceeded": "Valitut Wino-tietosi vietiin menestyksekkäällä.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Asetuksesi vietiin Wino-tilillesi.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Viedyt {0} tilin tiedot Wino-tilillesi.",
+    "WinoAccount_Management_ImportSucceeded": "Tuotiin synkronoituja tietoja Wino-tililtäsi.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Käytettiin {0} synkronoitua asetusta.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Tuotiin {0} tiliä.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Ohitettiin {0} tiliä, jotka ovat jo olemassa tässä laitteessa.",
+    "WinoAccount_Management_ImportPartial": "Sovellettu {0} synkronoituja asetuksia. {1} asetusta ei voitu palauttaa.",
+    "WinoAccount_Management_ImportReloginReminder": "Salasanat, tunnukset ja muut arkaluonteiset tiedot eivät synkronoidu. Kirjaudu uudelleen jokaiselle tilille tässä laitteessa ennen käyttöä.",
+    "WinoAccount_Management_SerializeFailed": "Wino ei voinut sarjoittaa nykyisiä asetuksiasi.",
+    "WinoAccount_Management_EmptyExport": "Ei siirrettäviä asetuksia.",
+    "WinoAccount_Management_ImportEmpty": "Synkronoidussa tiedoissa ei ole mitään palautettavaa.",
+    "WinoAccount_Management_ExportDialog_Title": "Vie tiedot Wino-tilillesi",
+    "WinoAccount_Management_ExportDialog_Description": "Valitse, mitä haluat synkronoida Wino-tilillesi.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Asetukset",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Tilit",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Salasanat, tunnukset ja muut arkaluonteiset tiedot eivät synkronoidu.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Toisella tietokoneella tuodut tilit vaativat vielä uudelleen kirjautumisen ennen kuin niitä voidaan käyttää.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Viedään valitut Wino-tiedot...",
+    "WinoAccount_Management_LoadFailed": "Wino ei voinut ladata uusinta Wino-tilin tietoa.",
+    "WinoAccount_Management_ActionFailed": "Wino-tilin pyyntöä ei voitu suorittaa.",
+    "WinoAccount_SettingsSection_Title": "Wino-tili",
+    "WinoAccount_SettingsSection_Description": "Luo Wino-tili tai kirjaudu sisään käyttämällä paikallista todentamispalvelua.",
+    "WinoAccount_RegisterButton_Title": "Rekisteröi tili",
+    "WinoAccount_RegisterButton_Description": "Luo Wino-tili sähköpostiosoitteella ja salasanalla.",
+    "WinoAccount_RegisterButton_Action": "Avaa rekisteröinti",
+    "WinoAccount_LoginButton_Title": "Kirjaudu sisään",
+    "WinoAccount_LoginButton_Description": "Kirjaudu sisään olemassa olevaan Wino-tiliin sähköpostiosoitteella ja salasanalla.",
+    "WinoAccount_LoginButton_Action": "Avaa kirjautuminen",
+    "WinoAccount_SignOutButton_Title": "Kirjaudu ulos",
+    "WinoAccount_SignOutButton_Description": "Poista paikallisesti tallennettu Wino-tilin istunto.",
+    "WinoAccount_SignOutButton_Action": "Kirjaudu ulos",
+    "WinoAccount_RegisterDialog_Title": "Luo Wino-tili",
+    "WinoAccount_RegisterDialog_Description": "Luo Wino-tili, jotta Wino-kokemuksesi pysyy synkronoituna ja avaa tilikohtaiset lisäosat.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Luo Wino-tilisi",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Miksi luoda tilin?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Tuo ja vie asetukset laitteiden välillä",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Siirrä Wino-asetuksesi laitteiden välillä ilman että joudut aloittamaan asennuksen alusta.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Pääsy eksklusiivisiin lisäosiin, kuten Wino AI Pack (maksullinen)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Käytä yhtä tiliä ottaaksesi käyttöön premium-Wino-ominaisuudet sitä mukaa kun ne tulevat saataville.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino-tili on erillinen sähköpostitileistäsi",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Outlook-, Gmail-, IMAP- tai muut sähköpostitilisi pysyvät sellaisina kuin ne ovat. Wino-tili hallinnoi vain Winoon liittyviä ominaisuuksia ja tilikohtaisia lisäosia.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Rekisteröidy",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Tietosuoja ja API-käsittely",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Valinnaiset lisäosat, kuten Wino AI Pack, voivat lähettää valitun sähköpostin HTML-sisällön Wino API -palveluun vain käytettäessä näitä ominaisuuksia.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Lue tietosuojakäytäntö",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Hyväksyn tietosuojakäytännön.",
+    "WinoAccount_LoginDialog_Title": "Kirjaudu Wino-tiliin",
+    "WinoAccount_LoginDialog_Description": "Kirjaudu Wino-tilillesi, jotta asetuksesi pysyvät synkronoituina ja voit käyttää tiliin perustuvia ominaisuuksia.",
+    "WinoAccount_LoginDialog_HeroTitle": "Tervetuloa takaisin",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Mitä sisäänkirjautuminen antaa sinulle",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Käytä Wino-tiliäsi jatkaaksesi asetusten synkronointia laitteiden välillä ja saadaksesi pääsyn maksullisiin lisäosiin, kuten Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Tämä ei ole sähköpostilaatikkosi tilin sisäänkirjautuminen",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Tässä kirjautuminen ei lisää eikä korvaa Outlook-, Gmail- tai IMAP-tilejä Winoon. Se kirjaa sinut vain Wino-spesifisiin palveluihin.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Unohditko salasanan?",
+    "WinoAccount_EmailLabel": "Sähköpostiosoite",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Salasana",
+    "WinoAccount_ConfirmPasswordLabel": "Vahvista salasana",
+    "WinoAccount_ForgotPasswordDialog_Title": "Nollaa salasanasi",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Lähetä palautussähköposti",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Takaisin sisäänkirjautumiseen",
+    "WinoAccount_ForgotPasswordDialog_Description": "Syötä Wino-tilisi sähköpostiosoite, ja lähetämme salasanan palautuslinkin, jos osoite on rekisteröity.",
+    "WinoAccount_Validation_EmailRequired": "Sähköpostiosoite on pakollinen.",
+    "WinoAccount_Validation_PasswordRequired": "Salasana on pakollinen.",
+    "WinoAccount_Validation_PasswordMismatch": "Salasanat eivät täsmää.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Sinun on hyväksyttävä tietosuojakäytäntö ennen Wino-tilin luomista.",
+    "WinoAccount_Error_InvalidCredentials": "Sähköpostiosoite tai salasana on virheellinen.",
+    "WinoAccount_Error_AccountLocked": "Tili on tilapäisesti lukittu.",
+    "WinoAccount_Error_AccountBanned": "Tili on estetty.",
+    "WinoAccount_Error_AccountSuspended": "Tili on keskeytetty.",
+    "WinoAccount_Error_EmailNotConfirmed": "Vahvista sähköpostiosoitteesi ennen sisäänkirjautumista.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Vahvista sähköpostiosoitteesi ennen sisäänkirjautumista.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Uusi vahvistussähköposti ei ole vielä saatavilla.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Tämä vahvistuspyyntö ei ole enää voimassa. Yritä kirjautua sisään uudelleen.",
+    "WinoAccount_Error_EmailNotRegistered": "Tämä sähköpostiosoite ei ole rekisteröity.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Istuntosi ei ole enää voimassa. Kirjaudu uudelleen.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Tämä sähköpostiosoite on jo rekisteröity.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Ulkoisen sisäänkirjautumisen toteuttamiseksi vaaditaan sähköpostiosoite.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Ulkoisen sisäänkirjautumisen pyyntö on virheellinen.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Ulkoisen sisäänkirjautumistilan arvo on virheellinen tai vanhentunut.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Ulkoisen sisäänkirjautumisen koodi on virheellinen tai vanhentunut.",
+    "WinoAccount_Error_AiPackRequired": "Tähän toimenpiteeseen vaaditaan voimassa oleva Wino AI Pack -tilaus.",
+    "WinoAccount_Error_AiQuotaExceeded": "Nykyisen laskutusjakson AI Packin käyttöraja on ylitetty.",
+    "WinoAccount_Error_AiHtmlEmpty": "Käsiteltävissä olevaa sähköpostisisältöä ei ole.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Tämä sähköposti on liian suuri käsitellä Wino AI:lla.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Tätä kieltä ei tueta. Kokeile kelvollista kulttuurikoodia kuten en-US tai tr-TR.",
+    "WinoAccount_Error_Forbidden": "Sinulla ei ole oikeuksia suorittaa tätä toimintoa.",
+    "WinoAccount_Error_ValidationFailed": "Pyyntö on virheellinen. Tarkista syötetyt arvot.",
+    "WinoAccount_RegisterSuccessMessage": "Wino-tilin rekisteröinti suoritettu tilille {0}.",
+    "WinoAccount_LoginSuccessMessage": "Kirjauduttu Wino-tiliin käyttäjänä {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Vahvista sähköpostiosoitteesi",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Lähetimme sähköpostivahvistuksen osoitteeseen {0}. Vahvista se ja yritä kirjautua sisään uudelleen.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Sähköpostivahvistus vaaditaan",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Odotamme edelleen, että vahvistat {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Lähetä vahvistusviesti uudelleen",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Vahvistusviestin uudelleenlähetys on mahdollista {0} kuluttua.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Nyt voit lähettää vahvistusviestin uudelleen.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Vahvistusviesti lähetetty uudelleen",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Lähetimme toisen vahvistusviestin osoitteeseen {0}. Vahvista se ja yritä kirjautua sisään uudelleen.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Salasanan palautusviesti lähetetty.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Lähetimme salasanan palautussähköpostin osoitteeseen {0}. Avaa viesti valitaksesi uuden salasanan.",
+    "WinoAccount_ChangePassword_Title": "Vaihda salasana",
+    "WinoAccount_ChangePassword_Description": "Lähetä salasanan palautussähköposti tälle Wino-tilille.",
+    "WinoAccount_ChangePassword_Action": "Lähetä palautussähköposti",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Haluatko, että Wino lähettää salasanan palautussähköpostin osoitteeseen {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Olet kirjautunut ulos Wino-tililtä {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Ei ole aktiivista Wino-tiliä, josta kirjautua ulos.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino-tili",
+    "WinoAccount_Titlebar_SignedOutDescription": "Kirjaudu sisään tai luo Wino-tili hallinnoidaksesi Wino-istuntoasi.",
+    "WinoAccount_Titlebar_SignedInStatus": "Tila: {0}",
+    "WelcomeWizard_Step2Title": "Lisää tili",
+    "WelcomeWizard_Step3Title": "Viimeistele asennus",
+    "ProviderSelection_Title": "Valitse sähköpostipalveluntarjoajasi",
+    "ProviderSelection_Subtitle": "Valitse alla oleva palveluntarjoaja lisätäksesi sähköpostitilisi Wino Mailiin.",
+    "ProviderSelection_AccountNameHeader": "Tilin nimi",
+    "ProviderSelection_AccountNamePlaceholder": "esim. Henkilökohtainen, Työ",
+    "ProviderSelection_DisplayNameHeader": "Näytettävä nimi",
+    "ProviderSelection_DisplayNamePlaceholder": "esim. John Doe",
+    "ProviderSelection_EmailHeader": "Sähköpostiosoite",
+    "ProviderSelection_EmailPlaceholder": "esim. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Sovelluskohtainen salasana",
+    "ProviderSelection_AppPasswordHelp": "Kuinka saan sovelluskohtaisen salasanan?",
+    "ProviderSelection_CalendarModeHeader": "Kalenterin integrointi",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Pois käytöstä",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Kalenterin integrointi ei ole käytössä.",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV-synkronointi",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Kalenteritapahtumasi synkronoidaan Apple-palvelinten välillä laitteidesi välillä.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Kalenteritapahtumasi synkronoidaan Yahoo-palvelimien välillä laitteidesi välillä.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Paikallinen kalenteri",
+    "ProviderSelection_CalendarMode_LocalDescription": "Tapahtumasi tallennetaan vain tietokoneellesi. Ei palvelinyhteyttä.",
+    "ProviderSelection_ClearColor": "Tyhjennä väri",
+    "ProviderSelection_ContinueButton": "Jatka",
+    "ProviderSelection_SpecialImap_Subtitle": "Anna tilin kirjautumistiedot yhdistääksesi sen.",
+    "AccountSetup_Title": "Tilin määrittäminen",
+    "AccountSetup_Step_Authenticating": "Vahvistetaan {0}:n kanssa",
+    "AccountSetup_Step_TestingMailAuth": "Tarkistetaan sähköpostin todentaminen",
+    "AccountSetup_Step_SyncingFolders": "Kansioiden metatietojen synkronointi",
+    "AccountSetup_Step_FetchingProfile": "Hakee profiilitietoja",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV-asetusten selvittäminen",
+    "AccountSetup_Step_TestingCalendarAuth": "Testataan kalenterin todennusta",
+    "AccountSetup_Step_SavingAccount": "Tallennetaan tilitiedot",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Haetaan kalenterimetatietoja",
+    "AccountSetup_Step_SyncingAliases": "Aliasien synkronointi",
+    "AccountSetup_Step_Finalizing": "Asetusten viimeistely",
+    "AccountSetup_FailureMessage": "Asetus epäonnistui. Palaa takaisin korjataksesi asetuksesi tai yritä uudelleen myöhemmin.",
+    "AccountSetup_SuccessMessage": "Tilisi on luotu onnistuneesti!",
+    "AccountSetup_GoBackButton": "Palaa takaisin",
+    "AccountSetup_TryAgainButton": "Yritä uudelleen",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automaattinen havaitseminen epäonnistui. Anna asetukset manuaalisesti Lisäasetukset-välilehdellä."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/fr_FR/resources.json b/Wino.Core.Domain/Translations/fr_FR/resources.json
index 427d902c..16b955db 100644
--- a/Wino.Core.Domain/Translations/fr_FR/resources.json
+++ b/Wino.Core.Domain/Translations/fr_FR/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Ce compte nécessite une resynchronisation complète pour continuer à fonctionner. Veuillez patienter pendant que Wino synchronise à nouveau vos messages...",
     "AccountContactNameYou": "Vous",
     "AccountCreationDialog_Completed": "tout est prêt",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Récupération des détails du calendrier.",
     "AccountCreationDialog_FetchingEvents": "Récupération des événements de l'agenda.",
     "AccountCreationDialog_FetchingProfileInformation": "Récupération des détails du profil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Si votre navigateur ne se lance pas automatiquement pour terminer l'authentification :",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "initialisation",
     "AccountCreationDialog_PreparingFolders": "Récupération des informations du dossier.",
     "AccountCreationDialog_SigninIn": "Enregistrement des informations du compte.",
+    "Purchased": "Acheté",
     "AccountEditDialog_Message": "Nom du compte",
     "AccountEditDialog_Title": "Modifier le compte",
     "AccountPickerDialog_Title": "Choisir un compte",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Modifiez le nom du compte dans Wino et définissez le nom de l'expéditeur désiré.",
     "AccountDetailsPage_ColorPicker_Title": "Couleur du compte",
     "AccountDetailsPage_ColorPicker_Description": "Attribuez une nouvelle couleur de compte pour coloriser son symbole dans la liste.",
+    "AccountDetailsPage_TabGeneral": "Général",
+    "AccountDetailsPage_TabMail": "Courrier",
+    "AccountDetailsPage_TabCalendar": "Calendrier",
+    "AccountDetailsPage_CalendarListDescription": "Sélectionnez un calendrier pour configurer ses paramètres.",
     "AddHyperlink": "Ajouter",
     "AppCloseBackgroundSynchronizationWarningTitle": "Synchronisation en arrière-plan",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "L'application n'a pas été configurée pour être lancée au démarrage de Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Compte IMAP",
     "Busy": "Occupé",
     "Buttons_AddAccount": "Ajouter un compte",
+    "Buttons_FixAccount": "Réparer le compte",
     "Buttons_AddNewAlias": "Ajouter un nouvel alias",
     "Buttons_Allow": "Autoriser",
+    "Buttons_Apply": "Appliquer",
     "Buttons_ApplyTheme": "Appliquer le thème",
     "Buttons_Browse": "Parcourir",
     "Buttons_Cancel": "Annuler",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Éditer",
     "Buttons_EnableImageRendering": "Activer",
     "Buttons_Multiselect": "Sélectionner",
+    "Buttons_Manage": "Gérer",
     "Buttons_No": "Non",
     "Buttons_Open": "Ouvrir",
     "Buttons_Purchase": "Acheter",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Enregistrer",
     "Buttons_SaveConfiguration": "Enregistrer la configuration",
     "Buttons_Send": "Envoyer",
+    "Buttons_SendToServer": "Envoyer au serveur",
     "Buttons_Share": "Partager",
     "Buttons_SignIn": "Connexion",
     "Buttons_Sync": "Synchroniser",
     "Buttons_SyncAliases": "Synchroniser les alias",
     "Buttons_TryAgain": "Réessayer",
     "Buttons_Yes": "Oui",
+    "Sync_SynchronizingFolder": "Synchronisation {0} {1}%",
+    "Sync_DownloadedMessages": "Messages téléchargés {0} de {1}",
+    "SyncAction_Archiving": "Archivage de {0} courrier(s)",
+    "SyncAction_ClearingFlag": "Suppression du drapeau pour {0} courrier(s)",
+    "SyncAction_CreatingDraft": "Création d'un brouillon",
+    "SyncAction_CreatingEvent": "Création d'un événement",
+    "SyncAction_Deleting": "Suppression de {0} courrier(s)",
+    "SyncAction_EmptyingFolder": "Vider le dossier",
+    "SyncAction_MarkingAsRead": "Marquage de {0} courrier(s) comme lu",
+    "SyncAction_MarkingAsUnread": "Marquage de {0} courrier(s) comme non lu",
+    "SyncAction_MarkingFolderAsRead": "Marquage du dossier comme lu",
+    "SyncAction_Moving": "Déplacement de {0} courrier(s)",
+    "SyncAction_MovingToFocused": "Déplacement de {0} courrier(s) vers Focused",
+    "SyncAction_RenamingFolder": "Renommer le dossier",
+    "SyncAction_SendingMail": "Envoi du courrier",
+    "SyncAction_SettingFlag": "Marquage du drapeau pour {0} courrier(s)",
+    "SyncAction_SynchronizingAccount": "Synchronisation de {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronisation de {0} compte(s)",
+    "SyncAction_SynchronizingCalendarData": "Synchronisation des données du calendrier",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronisation des événements du calendrier",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchronisation des métadonnées du calendrier",
+    "SyncAction_Unarchiving": "Désarchivage de {0} courrier(s)",
     "CalendarAllDayEventSummary": "événements d'une journée entière",
     "CalendarDisplayOptions_Color": "Couleur ",
     "CalendarDisplayOptions_Expand": "Agrandir",
+    "CalendarEventResponse_Accept": "Accepter",
+    "CalendarEventResponse_AcceptedResponse": "Accepté",
+    "CalendarEventResponse_Decline": "Refuser",
+    "CalendarEventResponse_DeclinedResponse": "Refusé",
+    "CalendarEventResponse_NotResponded": "Non répondu",
+    "CalendarEventResponse_Tentative": "Provisoire",
+    "CalendarEventResponse_TentativeResponse": "Provisoire",
+    "CalendarEventRsvpPanel_Accept": "Accepter",
+    "CalendarEventRsvpPanel_AddMessage": "Ajouter un message à votre réponse... (optionnel)",
+    "CalendarEventRsvpPanel_Decline": "Refuser",
+    "CalendarEventRsvpPanel_Message": "Message",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Envoyer un message de réponse",
+    "CalendarEventRsvpPanel_Tentative": "Provisoire",
+    "CalendarEventRsvpPanel_Title": "Options de réponse",
+    "CalendarAttendeeStatus_Accepted": "Accepté",
+    "CalendarAttendeeStatus_Declined": "Refusé",
+    "CalendarAttendeeStatus_NeedsAction": "Action requise",
+    "CalendarAttendeeStatus_Tentative": "Provisoire",
+    "CalendarEventDetails_Attachments": "Pièces jointes",
+    "CalendarEventCompose_AddAttachment": "Ajouter une pièce jointe",
+    "CalendarEventCompose_AllDay": "Toute la journée",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Les pièces jointes ne sont pas prises en charge pour les calendriers CalDAV.",
+    "CalendarEventCompose_EndDate": "Date de fin",
+    "CalendarEventCompose_EndTime": "Heure de fin",
+    "CalendarEventCompose_Every": "chaque",
+    "CalendarEventCompose_ForWeekdays": "pour",
+    "CalendarEventCompose_FrequencyDay": "jour",
+    "CalendarEventCompose_FrequencyDayPlural": "jours",
+    "CalendarEventCompose_FrequencyMonth": "mois",
+    "CalendarEventCompose_FrequencyMonthPlural": "mois",
+    "CalendarEventCompose_FrequencyWeek": "semaine",
+    "CalendarEventCompose_FrequencyWeekPlural": "semaines",
+    "CalendarEventCompose_FrequencyYear": "an",
+    "CalendarEventCompose_FrequencyYearPlural": "ans",
+    "CalendarEventCompose_Location": "Lieu",
+    "CalendarEventCompose_LocationPlaceholder": "Ajouter un lieu",
+    "CalendarEventCompose_NewEventButton": "Nouvel Événement",
+    "CalendarEventCompose_DefaultCalendarHint": "Vous pouvez choisir un calendrier par défaut pour les nouveaux événements dans les paramètres du calendrier.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Ouvrir les paramètres du calendrier",
+    "CalendarEventCompose_NoCalendarsMessage": "Aucun calendrier n'est disponible pour la création d'événements pour le moment.",
+    "CalendarEventCompose_NoCalendarsTitle": "Aucun calendrier disponible",
+    "CalendarEventCompose_NoEndDate": "Pas de date de fin",
+    "CalendarEventCompose_Notes": "Notes",
+    "CalendarEventCompose_PickCalendarTitle": "Choisir un calendrier",
+    "CalendarEventCompose_Recurring": "Récurrent",
+    "CalendarEventCompose_RecurringSummary": "Se produit tous les {0} {1}{2} {3} effectif {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Se produit {0}{1} {2} effectif {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Répéter tous les",
+    "CalendarEventCompose_SelectCalendar": "Sélectionner le calendrier",
+    "CalendarEventCompose_SingleOccurrenceSummary": "A lieu le {0} {1}",
+    "CalendarEventCompose_StartDate": "Date de début",
+    "CalendarEventCompose_StartTime": "Heure de début",
+    "CalendarEventCompose_TimeRangeSummary": "de {0} à {1}",
+    "CalendarEventCompose_Title": "Titre de l'événement",
+    "CalendarEventCompose_TitlePlaceholder": "Ajouter un titre",
+    "CalendarEventCompose_Until": "jusqu'à",
+    "CalendarEventCompose_UntilSummary": " jusqu'à {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "La date de fin de l'événement en plein jour doit être postérieure à la date de début.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Une ou plusieurs adresses e-mail des participants sont invalides.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "La date de fin de récurrence doit être égale ou postérieure à la date de début de l'événement.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "L'heure de fin doit être postérieure à l'heure de début.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Une ou plusieurs pièces jointes ne sont plus disponibles : {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Sélectionnez un calendrier avant de créer l'événement.",
+    "CalendarEventCompose_ValidationMissingTitle": "Saisissez un titre d'événement avant de créer l'événement.",
+    "CalendarEventCompose_ValidationTitle": "Échec de la validation de l'événement",
+    "CalendarEventCompose_WeekdaySummary": " le {0}",
+    "CalendarEventCompose_Weekday_Friday": "Vendredi",
+    "CalendarEventCompose_Weekday_Monday": "Lundi",
+    "CalendarEventCompose_Weekday_Saturday": "S",
+    "CalendarEventCompose_Weekday_Sunday": "S",
+    "CalendarEventCompose_Weekday_Thursday": "T",
+    "CalendarEventCompose_Weekday_Tuesday": "T",
+    "CalendarEventCompose_Weekday_Wednesday": "W",
+    "CalendarEventDetails_Details": "Détails",
+    "CalendarEventDetails_EditSeries": "Modifier la série",
+    "CalendarEventDetails_Editing": "Modification en cours",
+    "CalendarEventDetails_InviteSomeone": "Inviter quelqu'un",
+    "CalendarEventDetails_JoinOnline": "Rejoindre en ligne",
+    "CalendarEventDetails_Organizer": "Organisateur",
+    "CalendarEventDetails_People": "Participants",
+    "CalendarEventDetails_ReadOnlyEvent": "Événement en lecture seule",
+    "CalendarEventDetails_Reminder": "Rappel",
+    "CalendarReminder_StartedHoursAgo": "Démarré il y a {0} heures",
+    "CalendarReminder_StartedMinutesAgo": "Démarré il y a {0} minutes",
+    "CalendarReminder_StartedNow": "Démarré tout juste maintenant",
+    "CalendarReminder_StartingNow": "Démarrage en cours",
+    "CalendarReminder_StartsInHours": "Démarre dans {0} heures",
+    "CalendarReminder_StartsInMinutes": "Démarre dans {0} minutes",
+    "CalendarReminder_SnoozeAction": "Rappeler plus tard",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutes",
+    "CalendarEventDetails_ShowAs": "Afficher comme",
+    "CalendarShowAs_Free": "Libre",
+    "CalendarShowAs_Tentative": "Provisoire",
+    "CalendarShowAs_Busy": "Occupé",
+    "CalendarShowAs_OutOfOffice": "Hors du bureau",
+    "CalendarShowAs_WorkingElsewhere": "Travaillant ailleurs",
     "CalendarItem_DetailsPopup_JoinOnline": "Rejoindre en ligne",
     "CalendarItem_DetailsPopup_ViewEventButton": "Afficher l'événement",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Afficher les séries",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copié dans le presse-papiers.",
     "ClipboardTextCopied_Title": "Copié",
     "ClipboardTextCopyFailed_Message": "Échec de la copie de {0} dans le presse-papiers.",
+    "ContactInfoBar_ErrorTitle": "Échec du chargement des informations de contact",
+    "ContactInfoBar_SuccessTitle": "Informations de contact chargées",
+    "ContactInfoBar_WarningTitle": "Les informations de contact pourraient être incomplètes",
     "ComingSoon": "Bientôt disponible...",
     "ComposerAttachmentsDragDropAttach_Message": "Attacher",
     "ComposerAttachmentsDropZone_Message": "Déposez vos fichiers ici",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nom du lien des comptes liés",
     "DialogMessage_DeleteAccountConfirmationMessage": "Supprimer {0} ?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Toutes les données associées à ce compte seront définitivement supprimées du disque.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Supprimer le modèle \\\"{0}\\\" ?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Supprimer le modèle d’e-mail",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Cette action supprimera tous les événements de la série. Voulez-vous continuer ?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Supprimer la série récurrente",
     "DialogMessage_DiscardDraftConfirmationMessage": "Ce brouillon sera supprimé. Voulez-vous continuer ?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Supprimer le brouillon",
     "DialogMessage_EmptySubjectConfirmation": "Objet manquant",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Mode clair",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Impossible de configurer les dossiers système",
+    "Exception_AccountNeedsAttention_Title": "Le compte nécessite une attention",
+    "Exception_AccountNeedsAttention_Message": "'{0}' nécessite votre attention pour continuer à travailler.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail n'a pas pu trouver le runtime WebView2 de Microsoft Edge. Veuillez installer ou réparer le runtime pour afficher correctement le contenu des messages.",
+    "Exception_WebView2RuntimeMissing_Title": "Le runtime WebView2 est requis",
     "Exception_AuthenticationCanceled": "Authentification annulée",
     "Exception_CustomThemeExists": "Ce thème existe déjà.",
     "Exception_CustomThemeMissingName": "Vous devez indiquer un nom.",
     "Exception_CustomThemeMissingWallpaper": "Vous devez fournir une image d'arrière-plan personnalisée.",
     "Exception_FailedToSynchronizeAliases": "Impossible de synchroniser les alias",
+    "Exception_FailedToSynchronizeCalendarData": "Échec de la synchronisation des données du calendrier",
+    "Exception_FailedToSynchronizeCalendarEvents": "Échec de la synchronisation des événements du calendrier",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Échec de la synchronisation des métadonnées du calendrier",
     "Exception_FailedToSynchronizeFolders": "Échec de la synchronisation des dossiers",
     "Exception_FailedToSynchronizeProfileInformation": "Impossible de synchroniser les informations de profil",
     "Exception_GoogleAuthCallbackNull": "L'URL de rappel est nulle lors de l'activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Déplacer vers courriers indésirables",
     "HoverActionOption_ToggleFlag": "Marquer / Démarquer",
     "HoverActionOption_ToggleRead": "Lu / Non lu",
+    "KeyboardShortcuts_FailedToReset": "Échec de la réinitialisation des raccourcis clavier.",
+    "KeyboardShortcuts_FailedToUpdate": "Échec de la mise à jour des raccourcis clavier.",
+    "KeyboardShortcuts_MailoperationAction": "Action",
+    "KeyboardShortcuts_Action": "Action",
+    "KeyboardShortcuts_FailedToLoad": "Échec du chargement des raccourcis clavier.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Veuillez saisir une touche pour le raccourci.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Veuillez sélectionner une action à effectuer pour le raccourci.",
+    "KeyboardShortcuts_EnterKey": "Veuillez saisir une touche pour le raccourci.",
+    "KeyboardShortcuts_SelectOperation": "Veuillez sélectionner une action pour le raccourci.",
+    "KeyboardShortcuts_ShortcutInUse": "Ce raccourci est déjà utilisé par un autre raccourci.",
+    "KeyboardShortcuts_FailedToSave": "Échec de la sauvegarde du raccourci.",
+    "KeyboardShortcuts_FailedToDelete": "Échec de la suppression du raccourci.",
+    "KeyboardShortcuts_PageDescription": "Configurez des raccourcis clavier pour les opérations rapides de messagerie. Appuyez sur les touches lorsque le champ de saisie est actif pour capturer les raccourcis.",
+    "KeyboardShortcuts_Add": "Ajouter un raccourci",
+    "KeyboardShortcuts_EditTitle": "Modifier le raccourci clavier",
+    "KeyboardShortcuts_ResetToDefaults": "Réinitialiser les paramètres par défaut",
+    "KeyboardShortcuts_PressKeysHere": "Appuyez sur les touches ici...",
+    "KeyboardShortcuts_KeyCombination": "Combinaison de touches",
+    "KeyboardShortcuts_FocusArea": "Placez le curseur dans le champ ci-dessus et appuyez sur la combinaison de touches souhaitée",
+    "KeyboardShortcuts_Modifiers": "Touches modificateurs",
+    "KeyboardShortcuts_Mode": "Mode de l’application",
+    "KeyboardShortcuts_ModeMail": "Messagerie",
+    "KeyboardShortcuts_ModeCalendar": "Calendrier",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Basculer lu/non lu",
+    "KeyboardShortcuts_ActionToggleFlag": "Basculer le drapeau",
+    "KeyboardShortcuts_ActionToggleArchive": "Basculer l’archivage/désarchivage",
     "ImageRenderingDisabled": "L'affichage d'image est désactivé pour ce message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Méthode d’authentification",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Sécurité de la connexion",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nom d’utilisateur",
     "IMAPSetupDialog_UsernamePlaceholder": "jeandupont, jeandupont@exemple.fr, domaine/jeandupont",
     "IMAPSetupDialog_UseSameConfig": "Utiliser le même nom d'utilisateur et mot de passe pour envoyer un e-mail",
+    "ImapCalDavSettingsPage_TitleCreate": "Configuration IMAP et Calendrier",
+    "ImapCalDavSettingsPage_TitleEdit": "Modifier les paramètres IMAP et Calendrier",
+    "ImapCalDavSettingsPage_Subtitle": "Configurer IMAP/SMTP et la synchronisation optionnelle du calendrier pour ce compte.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Configuration de base",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Saisissez votre identité et vos identifiants. Wino peut tenter de détecter automatiquement les paramètres du serveur.",
+    "ImapCalDavSettingsPage_BasicTab": "Basique",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Activer la prise en charge du calendrier",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Découvrir automatiquement les paramètres du courrier",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Paramètres du courrier détectés et appliqués.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configuration avancée",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Saisissez manuellement les paramètres du serveur si la découverte automatique est indisponible ou incorrecte.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avancé",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configuration du calendrier",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Choisissez comment les données du calendrier doivent fonctionner pour ce compte IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Mode du calendrier",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Sécurité de la connexion",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Méthode d'authentification",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Désactivé",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Synchronisation CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Calendrier local uniquement",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Le calendrier est désactivé pour ce compte.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Les éléments du calendrier sont synchronisés avec votre serveur CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Les éléments du calendrier ne sont stockés que sur cet ordinateur et ne sont pas synchronisés sur le réseau.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Comment fonctionne le calendrier local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Calendrier local uniquement",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Le calendrier local conserve tous les événements uniquement sur votre ordinateur. Rien n'est synchronisé vers iCloud, Yahoo ou tout autre fournisseur.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL du service CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nom d'utilisateur CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Mot de passe CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Le test CalDAV n'est nécessaire que lorsque le mode calendrier est défini sur la synchronisation CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "L'URL du service CalDAV est requise.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "L'URL du service CalDAV doit être une URL absolue.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Le nom d'utilisateur CalDAV est requis.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Le mot de passe CalDAV est requis.",
+    "ImapCalDavSettingsPage_TestImapButton": "Tester la connexion IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Tester la connexion CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Le test de connexion IMAP a réussi.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Le test de connexion CalDAV a réussi.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Les paramètres du compte ont été validés et enregistrés.",
+    "ImapCalDavSettingsPage_ICloudHint": "Utilisez un mot de passe d’application généré à partir des paramètres de votre compte Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Utilisez un mot de passe d’application issu des paramètres de sécurité de votre compte Yahoo.",
     "Info_AccountCreatedMessage": "{0} a été créé",
     "Info_AccountCreatedTitle": "Création de compte",
     "Info_AccountCreationFailedTitle": "Échec de la création du compte",
     "Info_AccountDeletedMessage": "{0} a été supprimé avec succès.",
     "Info_AccountDeletedTitle": "Compte supprimé",
     "Info_AccountIssueFixFailedTitle": "Échec",
+    "Info_AccountIssueFixImapMessage": "Ouvrez la page des paramètres IMAP et calendrier pour saisir à nouveau vos identifiants de serveur.",
+    "Info_AccountAttentionRequiredMessage": "Ce compte nécessite votre attention.",
+    "Info_AccountAttentionRequiredClickableMessage": "Cliquez pour corriger ce compte et le resynchroniser.",
+    "Info_AccountAttentionRequiredAction": "Corriger",
+    "Info_AccountAttentionRequiredActionHint": "Cliquez sur Corriger pour résoudre ce problème de compte.",
     "Info_AccountIssueFixSuccessMessage": "Tous les problèmes de compte ont étés corrigés",
     "Info_AccountIssueFixSuccessTitle": "Succès",
     "Info_AttachmentOpenFailedMessage": "Impossible d'ouvrir la pièce-jointe.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Ce dossier est désactivé pour la synchronisation.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Dossier désactivé",
     "Justify": "Justifier",
+    "MenuUpdateAvailable": "Mise à jour disponible",
     "Left": "Gauche",
     "Link": "Lien",
     "LinkedAccountsCreatePolicyMessage": "vous devez avoir au moins 2 comptes pour lier des comptes\nle lien sera supprimé lors de la sauvegarde",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Désarchiver",
     "MailOperation_ViewMessageSource": "Voir la source du message",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Déplacement de {0} élément(s)",
     "MailsSelected": "{0} élément(s) sélectionné(s)",
     "MarkFlagUnflag": "Marquer ou Démarquer ce message",
     "MarkReadUnread": "Marquer comme lu/non lu",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Nouveau message",
     "Notifications_WinoUpdatedMessage": "Vérifier la nouvelle version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail a été mis à jour.",
+    "Notifications_StoreUpdateAvailableTitle": "Mise à jour disponible",
+    "Notifications_StoreUpdateAvailableMessage": "Une version plus récente de Wino Mail est prête à être installée depuis le Microsoft Store.",
     "OnlineSearchFailed_Message": "Impossible d'effectuer la recherche\n{0}\n\nListe des e-mails hors ligne.",
     "OnlineSearchTry_Line1": "Vous ne trouvez pas ce que vous cherchez ?",
     "OnlineSearchTry_Line2": "Essayez une recherche en ligne.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Petit",
     "Photos": "Images",
     "PreparingFoldersMessage": "Préparation des dossiers",
-    "ProtocolLogAvailable_Message": "Les journaux de protocole sont disponibles pour les diagnostics.",
     "ProviderDetail_Gmail_Description": "Compte Google",
     "ProviderDetail_iCloud_Description": "Compte iCloud d'Apple",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Rechercher",
     "SearchingIn": "Recherche dans",
     "SearchPivotName": "Résultats",
+    "Settings_KeyboardShortcuts_Title": "Raccourcis clavier",
+    "Settings_KeyboardShortcuts_Description": "Gérer les raccourcis clavier pour les actions rapides sur les mails.",
     "SettingConfigureSpecialFolders_Button": "Configurer",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Configuration IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Modifiez vos paramètres de serveur entrant/sortant.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Paramètres IMAP et calendrier",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Ouvrez la page de paramètres dédiée IMAP, SMTP et CalDAV pour ce compte.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Ouvrir les paramètres",
     "SettingsAbout_Description": "En savoir plus sur Wino.",
     "SettingsAbout_Title": "À propos",
     "SettingsAboutGithub_Description": "Ouvrir le gestionnaire de tickets du dépôt GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "En ligne",
     "SettingsAppPreferences_SearchMode_Title": "Mode de recherche par défaut",
+    "SettingsAppPreferences_ApplicationMode_Title": "Mode d'application par défaut",
+    "SettingsAppPreferences_ApplicationMode_Description": "Choisissez le mode d'ouverture par défaut de Wino lorsque aucun type d'activation n'est explicitement défini.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Courriel",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendrier",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail continuera à fonctionner en arrière-plan. Vous serez informé de l'arrivée de nouveaux courriers.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Exécuter en arrière-plan",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail fonctionne en permanence dans la barre d'état système. Il est possible de le lancer en cliquant sur une icône. Vous serez informé de l'arrivée de nouveaux messages.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Une erreur fatale s'est produite lors de la modification du mode de démarrage de Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Démarrage minimisé au démarrage de Windows",
     "SettingsAppPreferences_Title": "Préférences de l'application",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Masquer le bouton de profil dans la barre de titre",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Masquer le bouton de profil dans la barre de titre qui ouvre le volet du compte Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notifications de mise à jour du Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Afficher les notifications et les actions de bas de page lorsqu'une mise à jour du Microsoft Store est disponible.",
+    "SettingsAppPreferences_AiActions_Title": "Actions IA",
+    "SettingsAppPreferences_AiActions_Description": "Choisissez les langues IA par défaut et où les résumés doivent être enregistrés.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Langue de traduction par défaut",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Choisissez la langue cible par défaut utilisée par les actions de traduction IA.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Langue de résumé",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Choisissez la langue de résumé préférée pour les futures sorties de résumé IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Chemin par défaut pour l'enregistrement des résumés",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Choisissez le dossier que Wino doit utiliser par défaut lors de l'enregistrement des résumés IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Utiliser l'emplacement d'enregistrement système par défaut",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Ce dossier n'existe pas. L'emplacement d'enregistrement par défaut sera utilisé pour les résumés.",
     "SettingsAutoSelectNextItem_Description": "Sélectionnez l'élément suivant après avoir supprimé ou déplacé un courrier.",
     "SettingsAutoSelectNextItem_Title": "Sélection automatique de l'élément suivant",
     "SettingsAvailableThemes_Description": "Sélectionnez un thème de la collection de Wino selon vos goûts ou appliquez vos propres thèmes.",
     "SettingsAvailableThemes_Title": "Thèmes disponibles",
     "SettingsCalendarSettings_Description": "Changez le premier jour de la semaine, la hauteur des cellules...",
     "SettingsCalendarSettings_Title": "Paramètres de l'agenda",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Durée de rappel par défaut",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Définissez une durée de rappel par défaut pour les notifications de rappel du calendrier.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Format de l'en-tête jour en vue horaire",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Choisissez comment les libellés du jour en haut sont affichés dans les vues jour, semaine et semaine de travail. Utilisez des jetons de format de date tels que ddd, dd, MMM ou dddd.",
     "SettingsComposer_Title": "Éditeur",
     "SettingsComposerFont_Title": "Police par défaut du compositeur",
     "SettingsComposerFontFamily_Description": "Modifier la police et la taille par défaut lors de la composition des mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Canal Discord",
     "SettingsEditLinkedInbox_Description": "Ajouter / supprimer des comptes, renommer ou rompre le lien entre les comptes.",
     "SettingsEditLinkedInbox_Title": "Modifier la boîte de réception liée",
+    "SettingsWindowBackdrop_Title": "Arrière-plan de la fenêtre",
+    "SettingsWindowBackdrop_Description": "Sélectionnez un effet d'arrière-plan pour les fenêtres Wino.",
+    "SettingsWindowBackdrop_Disabled": "La sélection de l'arrière-plan des fenêtres est désactivée lorsque le thème de l'application est autre que Défaut.",
     "SettingsElementTheme_Description": "Sélectionnez un thème Windows pour Wino",
     "SettingsElementTheme_Title": "Thème de l'élément",
     "SettingsElementThemeSelectionDisabled": "La sélection du thème de l'élément est désactivée lorsque le thème de l'application sélectionné n'est pas le thème par défaut.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Alias",
     "SettingsEditAccountDetails_Title": "Modifier les détails du compte",
     "SettingsEditAccountDetails_Description": "Changez le nom du compte, le nom de l'expéditeur et attribuez une nouvelle couleur si vous le souhaitez.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Modifications enregistrées",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Les détails de votre compte ont été mis à jour avec succès.",
     "SettingsManageLink_Description": "Déplacer des éléments pour ajouter un nouveau lien ou supprimer un lien existant.",
     "SettingsManageLink_Title": "Gérer le lien",
     "SettingsMarkAsRead_Description": "Modifier ce qui doit arriver à l'élément sélectionné.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Choisir si les notifications et le badge de la barre des tâches doivent être affichées  pour ce compte.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Barre de tâches",
+    "SettingsHome_Title": "Accueil",
+    "SettingsHome_SearchTitle": "Trouver un paramètre",
+    "SettingsHome_SearchDescription": "Recherchez par fonctionnalité, sujet ou mot-clé pour accéder directement à la bonne page de paramètres.",
+    "SettingsHome_SearchPlaceholder": "Rechercher des paramètres",
+    "SettingsHome_SearchExamples": "Exemples: thème, stockage, langue, signature",
+    "SettingsHome_QuickLinks_Title": "Liens rapides",
+    "SettingsHome_QuickLinks_Description": "Accédez rapidement aux paramètres les plus utilisés.",
+    "SettingsHome_StorageCard_Description": "Vérifiez combien de contenu MIME local Wino conserve sur cet appareil et nettoyez-le si nécessaire.",
+    "SettingsHome_StorageEmptySummary": "Aucun contenu MIME mis en cache détecté pour le moment.",
+    "SettingsHome_StorageLoading": "Vérification de l'utilisation MIME locale...",
+    "SettingsHome_Tips_Title": "Astuces",
+    "SettingsHome_Tips_Description": "Quelques petits changements peuvent rendre Wino beaucoup plus personnel.",
+    "SettingsHome_Tip_Theme": "Vous voulez le mode sombre ou des changements d'accentuation ? Ouvrez Personnalisation.",
+    "SettingsHome_Tip_Background": "Utilisez les Préférences de l'application pour contrôler le comportement de démarrage et la synchronisation en arrière-plan.",
+    "SettingsHome_Tip_Shortcuts": "Les raccourcis clavier vous permettent de parcourir les mails plus rapidement.",
+    "SettingsHome_Resources_Title": "Liens utiles",
+    "SettingsHome_Resources_Description": "Ouvrez les ressources du projet, les informations de support et les canaux de publication.",
     "SettingsOptions_Title": "Paramètres",
+    "SettingsOptions_GeneralSection": "Général",
+    "SettingsOptions_MailSection": "Courrier",
+    "SettingsOptions_CalendarSection": "Calendrier",
+    "SettingsOptions_MoreComingSoon": "Plus d'options à venir",
+    "SettingsOptions_HeroDescription": "Personnalisez votre expérience Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} compte(s) configuré(s)",
+    "SettingsSearch_ManageAccounts_Keywords": "compte;comptes;Boîte aux lettres;Boîtes aux lettres;alias;aliases;profil;adresse;adresses",
+    "SettingsSearch_AppPreferences_Keywords": "démarrage;arrière-plan;lancement;synchronisation;notifications;recherche;plateau;paramètres par défaut",
+    "SettingsSearch_LanguageTime_Keywords": "langue;heure;horloge;paramètres régionaux;région;format;24 heures;24h",
+    "SettingsSearch_Personalization_Keywords": "thème;sombre;clair;apparence;accent;couleur;couleur;mode;disposition;densité",
+    "SettingsSearch_About_Keywords": "à propos;version;site web;confidentialité;github;faire un don;magasin;assistance",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "raccourci;raccourcis;raccourci clavier;raccourcis clavier;clavier;touches",
+    "SettingsSearch_MessageList_Keywords": "message;messages;liste;fil de discussion;fils de discussion;avatar;aperçu;expéditeur",
+    "SettingsSearch_ReadComposePane_Keywords": "lecteur;composer;éditeur;police;polices;contenu externe;affichage;lecture",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "signature;signatures;chiffrement;certificat;certificats;S/MIME;SMIME;sécurité",
+    "SettingsSearch_Storage_Keywords": "stockage;cache;mise en cache;MIME;disque;espace;nettoyage;nettoyer;données locales",
+    "SettingsSearch_CalendarSettings_Keywords": "calendrier;semaine;heures;planning;événement;événements",
     "SettingsPaneLengthReset_Description": "Réinitialisez la taille de la liste de courrier à sa valeur d'origine si vous rencontrez des problèmes.",
     "SettingsPaneLengthReset_Title": "Réinitialiser la taille de la liste des messages",
     "SettingsPaypal_Description": "Montrez-nous plus d'amour ❤️ Tous les dons sont appréciés.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Afficher le format horloge en 24 heures",
     "SettingsPrivacyPolicy_Description": "Examinez la politique de confidentialité.",
     "SettingsPrivacyPolicy_Title": "Politique de confidentialité",
+    "SettingsWebsite_Description": "Ouvrez le site Web de Wino Mail.",
+    "SettingsWebsite_Title": "Site Web",
     "SettingsReadComposePane_Description": "Polices, contenu externe.",
     "SettingsReadComposePane_Title": "Lecteur & Éditeur",
     "SettingsReader_Title": "Lecteur",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Afficher l'aperçu du texte",
     "SettingsShowSenderPictures_Description": "Masquer/afficher les vignettes des images de l'expéditeur.",
     "SettingsShowSenderPictures_Title": "Afficher l'avatar de l'expéditeur",
+    "SettingsEmailTemplates_Title": "Modèles d'e-mails",
+    "SettingsEmailTemplates_Description": "Gérer les modèles d'e-mails",
+    "SettingsEmailTemplates_CreatePageTitle": "Nouveau modèle",
+    "SettingsEmailTemplates_EditPageTitle": "Modifier le modèle",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nouveau modèle",
+    "SettingsEmailTemplates_NewTemplateDescription": "Créer un nouveau modèle d’e-mail",
+    "SettingsEmailTemplates_NameTitle": "Nom",
+    "SettingsEmailTemplates_NamePlaceholder": "Nom du modèle",
+    "SettingsEmailTemplates_DescriptionTitle": "Description",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Description optionnelle",
+    "SettingsEmailTemplates_ContentTitle": "Contenu du modèle",
+    "SettingsEmailTemplates_ContentDescription": "Modifier le contenu HTML de ce modèle.",
+    "SettingsEmailTemplates_NameRequired": "Le nom du modèle est requis.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Élément de démarrage",
     "SettingsStore_Description": "Montrer nous un peu d'amour ❤️",
     "SettingsStore_Title": "Évaluez l'application sur le store",
+    "SettingsStorage_Title": "Stockage",
+    "SettingsStorage_Description": "Analyser et gérer le cache MIME stocké dans votre dossier de données local.",
+    "SettingsStorage_ScanFolder": "Analyser le dossier de données local",
+    "SettingsStorage_NoLocalMimeDataFound": "Aucune donnée MIME locale trouvée.",
+    "SettingsStorage_NoAccountsFound": "Aucun compte trouvé.",
+    "SettingsStorage_TotalUsage": "Utilisation totale locale du cache MIME : {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} utilisé dans le cache MIME local",
+    "SettingsStorage_DeleteAll_Title": "Supprimer tout le contenu MIME",
+    "SettingsStorage_DeleteAll_Description": "Supprimer l'intégralité du dossier de cache MIME de ce compte.",
+    "SettingsStorage_DeleteAll_Button": "Supprimer tout",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Supprimer tout le contenu MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Supprimer toutes les données MIME locales pour {0} ?",
+    "SettingsStorage_DeleteAll_Success": "Tout le contenu MIME a été supprimé.",
+    "SettingsStorage_DeleteOld_Title": "Supprimer le contenu MIME ancien",
+    "SettingsStorage_DeleteOld_Description": "Supprimer les fichiers MIME en fonction de la date de création des e-mails dans la base de données locale.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mois",
+    "SettingsStorage_DeleteOld_3Months": "> 3 mois",
+    "SettingsStorage_DeleteOld_6Months": "> 6 mois",
+    "SettingsStorage_DeleteOld_1Year": "> 1 an",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Supprimer le contenu MIME ancien",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Supprimer les données MIME locales plus âgées que {0} pour {1} ?",
+    "SettingsStorage_DeleteOld_Success": "Dossier MIME {0} plus ancien que {1} supprimé.",
+    "SettingsStorage_1Month": "1 mois",
+    "SettingsStorage_3Months": "3 mois",
+    "SettingsStorage_6Months": "6 mois",
+    "SettingsStorage_1Year": "1 an",
+    "SettingsStorage_Months": "{0} mois",
     "SettingsTaskbarBadge_Description": "Inclure le nombre de messages non lus dans l'icône de la barre des tâches.",
     "SettingsTaskbarBadge_Title": "Badge de la barre de tâches",
     "SettingsThreads_Description": "Organiser les messages en fils de conversation.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Vous ne pouvez pas assigner de dossier de boîte de réception à un autre dossier système.",
     "SystemFolderConfigSetupSuccess_Message": "Les dossiers système sont configurés avec succès.",
     "SystemFolderConfigSetupSuccess_Title": "Configuration des dossiers système",
+    "SystemTrayMenu_ShowWino": "Ouvrir Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Ouvrir Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Quitter",
     "TestingImapConnectionMessage": "Test de la connexion au serveur...",
     "TitleBarServerDisconnectedButton_Description": "Wino est déconnecté du réseau. Cliquez sur reconnecter pour rétablir la connexion.",
     "TitleBarServerDisconnectedButton_Title": "pas de connexion",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Mettre à niveau vers des comptes illimités",
     "WinoUpgradeRemainingAccountsMessage": "{0} comptes gratuits utilisés sur {1}.",
     "Yesterday": "Hier",
+    "Smime_ImportCertificates_Success": "Certificats importés avec succès.",
+    "Smime_ImportCertificates_Error": "Erreur lors de l'importation des certificats : {0}",
+    "Smime_RemoveCertificates_Confirm": "Voulez-vous vraiment supprimer les certificats {0} ?",
+    "Smime_RemoveCertificates_Success": "Certificats supprimés.",
+    "Smime_ExportCertificates_Success": "Certificats exportés.",
+    "Smime_ExportCertificates_Error": "Erreur lors de l'exportation des certificats.",
+    "Smime_CertificateDetails": "Sujet : {0}\nÉmetteur : {1}\nValide à partir de : {2}\nValide jusqu'au : {3}\nEmpreinte : {4}",
+    "Smime_CertificatePassword_Title": "Mot de passe du certificat requis",
+    "Smime_CertificatePassword_Placeholder": "Mot de passe du certificat pour {0} (facultatif)",
+    "Smime_Confirm_Title": "Confirmer",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Actualiser",
+    "SettingsSignatureAndEncryption_Title": "Signature et chiffrement",
+    "SettingsSignatureAndEncryption_Description": "Gérer les certificats S/MIME pour la signature et le chiffrement des e-mails.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mes certificats",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificats personnels pour la signature et le chiffrement",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificats du destinataire",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificats du destinataire pour le décryptage",
+    "SettingsSignatureAndEncryption_NameColumn": "Nom",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Expire le",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Empreinte",
+    "Buttons_Remove": "Supprimer",
+    "Buttons_Export": "Exporter",
+    "Buttons_Import": "Importer",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificat de signature S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Certificat de chiffrement S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Aucun",
+    "SmimeSignaturesInMessage": "Signatures dans ce message :",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, valide jusqu'au {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Info du certificat de signature S/MIME",
+    "SmimeCertificateInfoTitle": "Info du certificat S/MIME",
+    "SmimeNoCertificateFileFound": "Aucun fichier de certificat trouvé",
+    "SmimeSaveCertificate": "Enregistrer le certificat...",
+    "SmimeCertificate": "Certificat S/MIME",
+    "SmimeCertificateSavedTo": "Certificat enregistré dans {0}",
+    "SmimeSignedTooltip": "Ce message est signé avec un certificat S/MIME. Cliquez pour plus de détails",
+    "SmimeEncryptedTooltip": "Ce message est chiffré avec un certificat S/MIME.",
+    "SmimeCertificateFileInfo": "Fichier : {0}",
+    "Composer_LightTheme": "Thème clair",
+    "Composer_DarkTheme": "Thème sombre",
+    "Composer_Outdent": "Réduire le retrait",
+    "Composer_Indent": "Ajouter un retrait",
+    "Composer_BulletList": "Liste à puces",
+    "Composer_OrderedList": "Liste numérotée",
+    "Composer_Stroke": "Trait",
+    "Composer_Bold": "Gras",
+    "Composer_Italic": "Italique",
+    "Composer_Underline": "Souligner",
+    "Composer_CcBcc": "Cc et Cci",
+    "Composer_EnableSmimeSignature": "Activer/désactiver la signature S/MIME",
+    "Composer_EnableSmimeEncryption": "Activer/désactiver le chiffrement S/MIME",
+    "Composer_LocalDraftSyncInfo": "Ce brouillon est uniquement local. Wino n'a pas pu l'envoyer à votre serveur de messagerie. Cliquez pour réessayer de l'envoyer au serveur.",
+    "Composer_CertificateExpires": "Expire le : ",
+    "Composer_SmimeSignature": "Signature S/MIME",
+    "Composer_SmimeEncryption": "Chiffrement S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Modèles d'e-mails",
+    "Composer_AiSummarize": "Résumer avec l'IA",
+    "Composer_AiSummarizeDescription": "Extraire les points clés, les éléments d'action et les décisions de ce courriel.",
+    "Composer_AiTranslate": "Traduire avec l'IA",
+    "Composer_AiActions": "Actions IA",
+    "Composer_AiRewrite": "Réécrire avec l'IA",
+    "AiActions_CheckingStatus": "Vérification de l'accès à l'IA...",
+    "AiActions_SignedOutTitle": "Déverrouiller le pack IA Wino",
+    "AiActions_SignedOutDescription": "Traduire, réécrire et résumer les e-mails avec l'IA après vous être connecté à votre compte Wino et avoir activé l'extension AI Pack.",
+    "AiActions_NoPackTitle": "Pack IA requis",
+    "AiActions_NoPackDescription": "Vous êtes connecté, mais le pack IA n'est pas encore actif. Achetez-le pour utiliser les outils de traduction, réécriture et résumé de Wino.",
+    "AiActions_UsageSummary": "{0} sur {1} crédits utilisés ce mois-ci.",
+    "Composer_AiRewritePolite": "Rendre plus poli",
+    "Composer_AiRewritePoliteDescription": "Adoucit le ton tout en conservant le même sens.",
+    "Composer_AiRewriteAngry": "Rendre plus agressif",
+    "Composer_AiRewriteAngryDescription": "Adopte un ton plus tranchant et plus agressif.",
+    "Composer_AiRewriteHappy": "Rendez-le heureux",
+    "Composer_AiRewriteHappyDescription": "Ajoute un ton plus optimiste et enthousiaste.",
+    "Composer_AiRewriteFormal": "Rendez-le formel.",
+    "Composer_AiRewriteFormalDescription": "Donne au message un ton plus professionnel et structuré.",
+    "Composer_AiRewriteFriendly": "Rendez-le plus convivial.",
+    "Composer_AiRewriteFriendlyDescription": "Rends le message plus chaleureux et accessible.",
+    "Composer_AiRewriteShorter": "Rendez-le plus court.",
+    "Composer_AiRewriteShorterDescription": "Raccourcit le texte et supprime les détails inutiles.",
+    "Composer_AiRewriteClearer": "Rendez-le plus clair.",
+    "Composer_AiRewriteClearerDescription": "Améliore la lisibilité et rend le message plus facile à suivre.",
+    "Composer_AiRewriteCustom": "Personnalisé",
+    "Composer_AiRewriteCustomDescription": "Décrivez votre intention de réécriture.",
+    "Composer_AiRewriteCustomPlaceholder": "Décrivez comment vous souhaitez que le message soit réécrit",
+    "Composer_AiRewriteMode": "Ton de réécriture",
+    "Composer_AiRewriteApply": "Appliquer la réécriture",
+    "Composer_AiTranslateDialogTitle": "Traduire avec l'IA",
+    "Composer_AiTranslateDialogDescription": "Saisissez la langue cible ou le code de culture, par exemple en-US, tr-TR, de-DE, ou fr-FR.",
+    "Composer_AiTranslateApply": "Traduire",
+    "Composer_AiTranslateLanguage": "Langue cible",
+    "Composer_AiTranslateCustomPlaceholder": "Entrez le code de culture",
+    "Composer_AiTranslateLanguageEnglish": "Anglais (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turc (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Allemand (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Français (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Espagnol (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italien (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugais (Brésil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Néerlandais (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polonais (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russe (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonais (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coréen (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinois simplifié (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabe (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Autres...",
+    "Composer_AiBusyTitle": "L'IA est déjà en cours d'exécution.",
+    "Composer_AiBusyMessage": "Veuillez patienter pendant que l'action IA en cours se termine.",
+    "Composer_AiSignInRequired": "Connectez-vous à votre compte Wino pour utiliser les fonctionnalités IA.",
+    "Composer_AiMissingHtml": "Il n'y a pas de contenu de message à envoyer à Wino IA pour le moment.",
+    "Composer_AiQuotaUnavailable": "Le résultat IA a été appliqué.",
+    "Composer_AiAppliedMessage": "Le résultat de l'IA a été appliqué au rédacteur. Utilisez Annuler si vous souhaitez revenir en arrière.",
+    "Composer_AiSummarizeSuccessTitle": "Résumé IA appliqué",
+    "Composer_AiTranslateSuccessTitle": "Traduction IA appliquée",
+    "Composer_AiRewriteSuccessTitle": "Réécriture IA appliquée",
+    "Composer_AiErrorTitle": "L'action IA a échoué.",
+    "Reader_AiAppliedMessage": "Le résultat IA est désormais affiché pour ce message. Réouvrez le message pour voir à nouveau le contenu original.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contacts",
+    "ContactsPage_AddContact": "Ajouter un contact",
+    "ContactsPage_EditContact": "Modifier le contact",
+    "ContactsPage_DeleteContact": "Supprimer le contact",
+    "ContactsPage_SearchPlaceholder": "Rechercher des contacts...",
+    "ContactsPage_NoContacts": "Aucun contact trouvé",
+    "ContactsPage_ContactsCount": "{0} contacts",
+    "ContactsPage_SelectedContactsCount": "{0} sélectionné",
+    "ContactsPage_DeleteSelectedContacts": "Supprimer les contacts sélectionnés",
+    "ContactEditDialog_Title": "Modifier le contact",
+    "ContactEditDialog_PhotoSection": "Photo",
+    "ContactEditDialog_ChoosePhoto": "Choisir une photo",
+    "ContactEditDialog_RemovePhoto": "Supprimer la photo",
+    "ContactEditDialog_NameHeader": "Nom",
+    "ContactEditDialog_NamePlaceholder": "Nom du contact",
+    "ContactEditDialog_EmailHeader": "Adresse e-mail",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Informations de contact",
+    "ContactEditDialog_RootContactInfo": "Ceci est un contact racine associé à vos comptes et ne peut pas être supprimé.",
+    "ContactEditDialog_OverriddenContactInfo": "Ce contact a été modifié manuellement et ne sera pas mis à jour lors de la synchronisation.",
+    "ContactsPage_Subtitle": "Gérez vos contacts e-mail et leurs informations.",
+    "ContactStatus_Account": "Compte",
+    "ContactStatus_Modified": "Modifié",
+    "ContactAction_Edit": "Modifier le contact",
+    "ContactAction_ChangePhoto": "Changer la photo",
+    "ContactAction_Delete": "Supprimer le contact",
+    "ContactAction_Add": "Ajouter un contact",
+    "ContactSelection_Selected": "sélectionné",
+    "ContactSelection_SelectAll": "Tout sélectionner",
+    "ContactSelection_Clear": "Effacer la sélection",
+    "ContactsPage_EmptyState": "Aucun contact à afficher",
+    "ContactsPage_AddFirstContact": "Ajouter votre premier contact",
+    "ContactsPage_ContactsCountSuffix": "contacts",
+    "ContactsPane_NewContact": "Nouveau contact",
+    "ContactsPane_DescriptionTitle": "Gérez vos contacts",
+    "ContactsPane_DescriptionBody": "Créez des contacts, renommez-les, mettez à jour les photos de profil et gardez les informations enregistrées organisées en un seul endroit.",
+    "ContactEditDialog_AddTitle": "Ajouter un contact",
+    "ContactInfoBar_ContactAdded": "Contact ajouté avec succès.",
+    "ContactInfoBar_ContactUpdated": "Contact mis à jour avec succès.",
+    "ContactInfoBar_ContactsDeleted": "Contacts supprimés avec succès.",
+    "ContactInfoBar_ContactPhotoUpdated": "Photo de contact mise à jour avec succès.",
+    "ContactInfoBar_FailedToLoadContacts": "Échec du chargement des contacts : {0}",
+    "ContactInfoBar_FailedToAddContact": "Échec de l'ajout du contact : {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Échec de la mise à jour du contact : {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Échec de la suppression des contacts : {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Échec de la mise à jour de la photo : {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Les contacts racine ne peuvent pas être supprimés.",
+    "ContactConfirmDialog_DeleteTitle": "Supprimer le contact",
+    "ContactConfirmDialog_DeleteMessage": "Êtes-vous sûr de vouloir supprimer le contact '{0}' ?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Êtes-vous sûr de vouloir supprimer {0} contact(s) ?",
+    "ContactConfirmDialog_DeleteButton": "Supprimer",
+    "CalendarAccountSettings_Title": "Paramètres du compte du calendrier",
+    "CalendarAccountSettings_Description": "Gérer les paramètres du calendrier pour {0}",
+    "CalendarAccountSettings_AccountColor": "Couleur du compte",
+    "CalendarAccountSettings_AccountColorDescription": "Changer la couleur d'affichage de ce compte de calendrier.",
+    "CalendarAccountSettings_SyncEnabled": "Activer la synchronisation",
+    "CalendarAccountSettings_SyncEnabledDescription": "Activer ou désactiver la synchronisation du calendrier pour ce compte",
+    "CalendarAccountSettings_DefaultShowAs": "État affiché par défaut",
+    "CalendarAccountSettings_DefaultShowAsDescription": "État de disponibilité par défaut pour les nouveaux événements créés avec ce compte",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendrier principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marquer ce calendrier comme calendrier principal pour le compte",
+    "CalendarSettings_NewEventBehavior_Header": "Comportement du bouton Nouveau Événement",
+    "CalendarSettings_NewEventBehavior_Description": "Choisissez si le bouton Nouveau Événement doit demander quel calendrier choisir à chaque fois ou ouvrir systématiquement un calendrier spécifique.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Demander à chaque fois.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Toujours utiliser un calendrier spécifique.",
+    "CalendarSettings_Rendering_Title": "Affichage",
+    "CalendarSettings_Rendering_Description": "Configurer la mise en page du calendrier et le comportement d'affichage.",
+    "CalendarSettings_Notifications_Title": "Notifications",
+    "CalendarSettings_Notifications_Description": "Choisir le rappel par défaut et le comportement de remise à plus tard.",
+    "CalendarSettings_Preferences_Title": "Préférences",
+    "CalendarSettings_Preferences_Description": "Définir le comportement du bouton Nouveau Événement.",
+    "WhatIsNew_GetStartedButton": "Commencer",
+    "WhatIsNew_ContinueAnywayButton": "Continuer quand même",
+    "WhatIsNew_PreparingForNewVersionButton": "Préparation de la nouvelle version...",
+    "WhatIsNew_MigrationPreparing_Title": "Préparation de vos données",
+    "WhatIsNew_MigrationPreparing_Description": "Wino applique les migrations de mise à jour. Veuillez patienter pendant que nous préparons vos données de compte pour cette version.",
+    "WhatIsNew_MigrationFailedMessage": "L'application des migrations a échoué avec le code d'erreur {0}. Vous pouvez continuer à utiliser l'application. Cependant, si vous rencontrez des problèmes graves, réinstallez l'application.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail mis à jour",
+    "WhatIsNew_MigrationNotification_Message": "Ouvrez l'application pour terminer la mise à jour et voir les nouveautés.",
+    "WelcomeWindow_Title": "Bienvenue sur Wino Mail",
+    "WelcomeWindow_Subtitle": "Une expérience Windows native pour Mail et Calendrier.",
+    "WelcomeWindow_WhatsNewTitle": "Dernières modifications",
+    "WelcomeWindow_FeaturesTitle": "Fonctionnalités",
+    "WelcomeWindow_WhatsNewTab": "Quoi de neuf",
+    "WelcomeWindow_FeaturesTab": "Fonctionnalités",
+    "WelcomeWindow_GetStartedButton": "Commencer en ajoutant un compte",
+    "WelcomeWindow_GetStartedDescription": "Ajoutez votre compte Outlook, Gmail ou IMAP pour commencer avec Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importer depuis votre compte Wino",
+    "WelcomeWindow_ImportInProgress": "Importation de vos préférences et comptes synchronisés...",
+    "WelcomeWindow_ImportNoAccountsFound": "Aucun compte synchronisé n'a été trouvé dans votre compte Wino. Si des préférences étaient disponibles, elles ont été restaurées. Utilisez Commencer pour ajouter manuellement un compte.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} comptes synchronisés sont déjà disponibles sur cet appareil. Utilisez Commencer pour en ajouter un autre manuellement si nécessaire.",
+    "WelcomeWindow_SetupTitle": "Configurer votre compte",
+    "WelcomeWindow_SetupSubtitle": "Choisissez votre fournisseur de messagerie pour commencer",
+    "WelcomeWindow_AddAccountButton": "Ajouter un compte",
+    "WelcomeWindow_SkipForNow": "Passer pour le moment — je le configurerai plus tard",
+    "WelcomeWindow_AppDescription": "Une boîte de réception rapide et ciblée — repensée pour Windows 11",
+    "WelcomeWizard_Step1Title": "Bienvenue",
+    "SystemTrayMenu_Open": "Ouvrir",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Paramètres de synchronisation",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Conservez vos préférences Wino synchronisées sur vos appareils.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Extensions Wino",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accédez à des fonctionnalités premium comme Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gérez votre compte Wino, l'accès à AI Pack et les préférences synchronisées ainsi que les détails du compte.",
+    "WinoAccount_Management_SignedOutTitle": "Connectez-vous à Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Connectez-vous ou créez un compte pour synchroniser vos e-mails, accéder aux fonctionnalités d'IA et gérer vos paramètres sur tous vos appareils.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Extensions Wino",
+    "WinoAccount_Management_DataSectionHeader": "Données",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Actions du compte",
+    "WinoAccount_Management_AccountCardTitle": "Compte",
+    "WinoAccount_Management_AccountCardDescription": "Adresse e-mail de votre compte Wino et état actuel du compte.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Voir si Wino AI Pack est actif et combien d'utilisation il reste.",
+    "WinoAccount_Management_AiPackActive": "AI Pack est actif",
+    "WinoAccount_Management_AiPackInactive": "AI Pack n'est pas actif",
+    "WinoAccount_Management_AiPackUsage": "{0} sur {1} utilisations consommées. {2} restantes.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Période de facturation : {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Les détails d'utilisation ne sont pas encore disponibles.",
+    "WinoAccount_Management_AiPackBuyDescription": "Achetez Wino AI Pack pour traduire, réécrire ou résumer les e-mails avec l'IA.",
+    "WinoAccount_Management_AiPackPromoTitle": "Déverrouiller AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Boostez votre flux de travail des e-mails avec des outils alimentés par l'IA. Traduisez les messages en plus de 50 langues, réécrivez-les pour plus de clarté et de tonalité, et obtenez des résumés instantanés des longs fils de discussion.",
+    "WinoAccount_Management_AiPackPromoPrice": "4,99 $ / mois",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 crédits",
+    "WinoAccount_Management_AiPackGetButton": "Obtenir AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Outils IA pour traduire, réécrire et résumer les actions dans Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traduire, réécrire, résumer, productivité",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Comptes illimités",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Supprimer la limite de comptes et ajouter autant de comptes de messagerie que nécessaire.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "comptes, illimités, premium, module complémentaire",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Connectez-vous avec votre compte Wino pour terminer cet achat.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino n'a pas pu terminer cet achat sur le Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Votre achat est terminé, mais Wino n'a pas encore pu actualiser vos avantages de compte. Réessayez dans un instant.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Votre abonnement est actif",
+    "WinoAccount_Management_AiPackRenews": "Renouvelle {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Crédits utilisés ce mois-ci",
+    "WinoAccount_Management_AiPackResets": "Réinitialisations {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Nous avons rencontré des problèmes lors du chargement de votre solde d'utilisation IA.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traduire",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Réécrire",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Résumer",
+    "WinoAccount_Management_AddOnLoadFailed": "Nous avons rencontré des problèmes lors du chargement de ce module complémentaire.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchroniser les préférences et les comptes",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importer ou exporter vos préférences Wino et les détails de votre boîte aux lettres sur plusieurs appareils. Les mots de passe, les jetons et d'autres informations sensibles ne sont jamais synchronisés.",
+    "WinoAccount_Management_SignOutTitle": "Se déconnecter",
+    "WinoAccount_Management_SignOutDescription": "Déconnectez-vous de votre compte sur cet appareil",
+    "WinoAccount_Management_StatusLabel": "Statut : {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Il n'y a pas encore de données synchronisées stockées pour ce compte.",
+    "WinoAccount_Management_ExportSucceeded": "Les données Wino sélectionnées ont été exportées avec succès.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Vos préférences ont été exportées vers votre compte Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Détails de {0} compte exportés vers votre compte Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Données synchronisées importées depuis votre compte Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "{0} préférences synchronisées appliquées.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importé {0} comptes.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Ignorés {0} comptes qui existent déjà sur cet appareil.",
+    "WinoAccount_Management_ImportPartial": "Préférences synchronisées appliquées : {0}. {1} préférences n'ont pas pu être restaurées.",
+    "WinoAccount_Management_ImportReloginReminder": "Les mots de passe, jetons et d'autres informations sensibles n'ont pas été importés. Veuillez vous reconnecter pour chaque compte sur cet appareil avant de l'utiliser.",
+    "WinoAccount_Management_SerializeFailed": "Wino n'a pas pu sérialiser vos préférences actuelles.",
+    "WinoAccount_Management_EmptyExport": "Il n'y a aucune valeur de préférence à exporter.",
+    "WinoAccount_Management_ImportEmpty": "La charge utile de données synchronisées ne contient rien de nouveau à restaurer.",
+    "WinoAccount_Management_ExportDialog_Title": "Exporter vers votre compte Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Choisissez ce que vous souhaitez synchroniser vers votre compte Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Préférences",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Comptes",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Les mots de passe, jetons et autres informations sensibles ne sont pas synchronisés.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Les comptes importés sur un autre PC devront quand même être reconnectés avant de pouvoir être utilisés.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportation de vos données Wino sélectionnées...",
+    "WinoAccount_Management_LoadFailed": "Wino n'a pas pu charger les dernières informations du compte Wino.",
+    "WinoAccount_Management_ActionFailed": "La requête du compte Wino n'a pas pu être complétée.",
+    "WinoAccount_SettingsSection_Title": "Compte Wino",
+    "WinoAccount_SettingsSection_Description": "Créez ou connectez-vous à un compte Wino en utilisant votre service d'authentification local.",
+    "WinoAccount_RegisterButton_Title": "Créer un compte",
+    "WinoAccount_RegisterButton_Description": "Créez un compte Wino avec un e-mail et un mot de passe.",
+    "WinoAccount_RegisterButton_Action": "Ouvrir l'inscription",
+    "WinoAccount_LoginButton_Title": "Se connecter",
+    "WinoAccount_LoginButton_Description": "Connectez‑vous à un compte Wino existant avec votre e-mail et votre mot de passe.",
+    "WinoAccount_LoginButton_Action": "Ouvrir la connexion",
+    "WinoAccount_SignOutButton_Title": "Se déconnecter",
+    "WinoAccount_SignOutButton_Description": "Supprimer la session de compte Wino stockée localement.",
+    "WinoAccount_SignOutButton_Action": "Se déconnecter",
+    "WinoAccount_RegisterDialog_Title": "Créer un compte Wino",
+    "WinoAccount_RegisterDialog_Description": "Créez un compte Wino pour synchroniser votre expérience Wino et débloquer les modules complémentaires basés sur le compte.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Créez votre compte Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Pourquoi en créer un ?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importer et exporter les paramètres sur différents appareils",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Déplacez vos préférences Wino entre les appareils sans avoir à reconstruire votre configuration à partir de zéro.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Accédez à des add-ons exclusifs tels que Wino AI Pack (payant)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Utilisez un seul compte pour déverrouiller les fonctionnalités premium de Wino au fur et à mesure de leur disponibilité.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Le compte Wino est distinct de vos comptes de messagerie",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Vos comptes de messagerie Outlook, Gmail, IMAP ou autres restent tels quels. Un compte Wino gère uniquement les fonctionnalités spécifiques à Wino et les modules complémentaires basés sur le compte.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "S'enregistrer",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Confidentialité et traitement API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Des modules complémentaires optionnels tels que Wino AI Pack peuvent envoyer le contenu HTML d'e-mails sélectionné au service API Wino uniquement lorsque vous utilisez ces fonctionnalités.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Lire la politique de confidentialité",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "J'accepte la politique de confidentialité.",
+    "WinoAccount_LoginDialog_Title": "Se connecter au compte Wino",
+    "WinoAccount_LoginDialog_Description": "Connectez-vous à votre compte Wino pour synchroniser votre configuration Wino et accéder aux fonctionnalités basées sur le compte.",
+    "WinoAccount_LoginDialog_HeroTitle": "Bon retour",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Ce que la connexion vous apporte",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Utilisez votre compte Wino pour continuer à synchroniser les paramètres entre les appareils et accéder à des modules complémentaires payants tels que Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Ce n'est pas la connexion à votre boîte mail",
+    "WinoAccount_LoginDialog_DifferenceDescription": "La connexion ici n'ajoute ni ne remplace vos comptes Outlook, Gmail ou IMAP dans Wino. Elle vous connecte uniquement aux services propres à Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Mot de passe oublié ?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "nom@example.com",
+    "WinoAccount_PasswordLabel": "Mot de passe",
+    "WinoAccount_ConfirmPasswordLabel": "Confirmer le mot de passe",
+    "WinoAccount_ForgotPasswordDialog_Title": "Réinitialiser votre mot de passe",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Envoyer l'e-mail de réinitialisation",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Retour à la connexion",
+    "WinoAccount_ForgotPasswordDialog_Description": "Saisissez l'adresse e-mail de votre compte Wino et nous vous enverrons un lien de réinitialisation du mot de passe si l'adresse est enregistrée.",
+    "WinoAccount_Validation_EmailRequired": "L'adresse e-mail est requise.",
+    "WinoAccount_Validation_PasswordRequired": "Le mot de passe est requis.",
+    "WinoAccount_Validation_PasswordMismatch": "Les mots de passe ne correspondent pas.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Vous devez accepter la politique de confidentialité avant de créer un compte Wino.",
+    "WinoAccount_Error_InvalidCredentials": "L'adresse e-mail ou le mot de passe est incorrect.",
+    "WinoAccount_Error_AccountLocked": "Ce compte est temporairement bloqué.",
+    "WinoAccount_Error_AccountBanned": "Ce compte a été banni.",
+    "WinoAccount_Error_AccountSuspended": "Ce compte a été suspendu.",
+    "WinoAccount_Error_EmailNotConfirmed": "Veuillez confirmer votre adresse e-mail avant de vous connecter.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Veuillez confirmer votre adresse e-mail avant de vous connecter.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Un nouvel e-mail de confirmation n'est pas encore disponible.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Cette demande de confirmation n'est plus valable. Veuillez réessayer de vous connecter.",
+    "WinoAccount_Error_EmailNotRegistered": "Cette adresse e-mail n'est pas enregistrée.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Votre session n'est plus valide. Veuillez vous reconnecter.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Cette adresse e-mail est déjà enregistrée.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Une adresse e-mail est requise pour terminer la connexion externe.",
+    "WinoAccount_Error_ExternalLoginInvalid": "La demande de connexion externe est invalide.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "L'état de la connexion externe est invalide ou expiré.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Le code de connexion externe est invalide ou expiré.",
+    "WinoAccount_Error_AiPackRequired": "Un abonnement actif au Wino AI Pack est requis pour cette action.",
+    "WinoAccount_Error_AiQuotaExceeded": "Votre limite d'utilisation du AI Pack a été atteinte pour la période de facturation en cours.",
+    "WinoAccount_Error_AiHtmlEmpty": "Il n'y a aucun contenu d'e-mail à traiter.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Cet e-mail est trop volumineux pour être traité par Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Cette langue n'est pas prise en charge. Essayez un code de culture valide tel que en-US ou tr-TR.",
+    "WinoAccount_Error_Forbidden": "Vous n'avez pas la permission d'effectuer cette action.",
+    "WinoAccount_Error_ValidationFailed": "La requête est invalide. Veuillez vérifier les valeurs saisies.",
+    "WinoAccount_RegisterSuccessMessage": "Enregistrement du compte Wino terminé pour {0}.",
+    "WinoAccount_LoginSuccessMessage": "Connecté au compte Wino en tant que {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirmer votre adresse e-mail",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Nous avons envoyé une confirmation par e-mail à {0}. Veuillez la confirmer et essayer de vous connecter à nouveau.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Confirmation de l'e-mail requise",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Nous vous attendons encore pour confirmer {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Renvoyer l'e-mail de confirmation",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Vous pouvez renvoyer l'e-mail de confirmation dans {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Vous pouvez renvoyer l'e-mail de confirmation dès maintenant.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "E-mail de confirmation renvoyé",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Nous avons envoyé un autre e-mail de confirmation à {0}. Veuillez le confirmer et réessayer de vous connecter.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "E-mail de réinitialisation du mot de passe envoyé",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Nous avons envoyé un e-mail de réinitialisation du mot de passe à {0}. Ouvrez ce message pour choisir un nouveau mot de passe.",
+    "WinoAccount_ChangePassword_Title": "Modifier le mot de passe",
+    "WinoAccount_ChangePassword_Description": "Envoyez un e-mail de réinitialisation du mot de passe à ce compte Wino.",
+    "WinoAccount_ChangePassword_Action": "Envoyer l'e-mail de réinitialisation",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Voulez-vous que Wino envoie un e-mail de réinitialisation du mot de passe à {0} ?",
+    "WinoAccount_SignOut_SuccessMessage": "Déconnecté du compte Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Aucun compte Wino actif à déconnecter.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Compte Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Connectez-vous ou créez un compte Wino pour gérer votre session Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Statut : {0}",
+    "WelcomeWizard_Step2Title": "Ajouter un compte",
+    "WelcomeWizard_Step3Title": "Terminer la configuration",
+    "ProviderSelection_Title": "Choisissez votre fournisseur de messagerie",
+    "ProviderSelection_Subtitle": "Sélectionnez un fournisseur ci-dessous pour ajouter votre compte de messagerie à Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nom du compte",
+    "ProviderSelection_AccountNamePlaceholder": "par ex. Personnel, Professionnel",
+    "ProviderSelection_DisplayNameHeader": "Nom affiché",
+    "ProviderSelection_DisplayNamePlaceholder": "par ex. John Doe",
+    "ProviderSelection_EmailHeader": "Adresse e-mail",
+    "ProviderSelection_EmailPlaceholder": "par ex. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Mot de passe spécifique à l’application",
+    "ProviderSelection_AppPasswordHelp": "Comment obtenir un mot de passe spécifique à l’application ?",
+    "ProviderSelection_CalendarModeHeader": "Intégration du calendrier",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Désactivé",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Aucune intégration de calendrier.",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Synchronisation CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Vos événements de calendrier sont synchronisés avec les serveurs Apple entre vos appareils.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Vos événements de calendrier sont synchronisés avec les serveurs Yahoo entre vos appareils.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendrier local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Vos événements sont stockés uniquement sur votre ordinateur. Pas de connexion au serveur.",
+    "ProviderSelection_ClearColor": "Effacer la couleur",
+    "ProviderSelection_ContinueButton": "Continuer",
+    "ProviderSelection_SpecialImap_Subtitle": "Saisissez vos identifiants de compte pour vous connecter.",
+    "AccountSetup_Title": "Configuration de votre compte",
+    "AccountSetup_Step_Authenticating": "Authentification avec {0}",
+    "AccountSetup_Step_TestingMailAuth": "Test d’authentification du courrier",
+    "AccountSetup_Step_SyncingFolders": "Synchronisation des métadonnées des dossiers",
+    "AccountSetup_Step_FetchingProfile": "Récupération des informations de profil",
+    "AccountSetup_Step_DiscoveringCalDav": "Découverte des paramètres CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Test d’authentification du calendrier",
+    "AccountSetup_Step_SavingAccount": "Enregistrement des informations du compte",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Récupération des métadonnées du calendrier",
+    "AccountSetup_Step_SyncingAliases": "Synchronisation des alias",
+    "AccountSetup_Step_Finalizing": "Finalisation de la configuration",
+    "AccountSetup_FailureMessage": "Échec de l’installation. Revenez en arrière pour corriger vos paramètres, ou réessayez plus tard.",
+    "AccountSetup_SuccessMessage": "Votre compte a été configuré avec succès.",
+    "AccountSetup_GoBackButton": "Retour",
+    "AccountSetup_TryAgainButton": "Réessayer",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "La détection automatique a échoué. Veuillez saisir les paramètres manuellement dans l’onglet Avancé."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/gl_ES/resources.json b/Wino.Core.Domain/Translations/gl_ES/resources.json
index 5a036ca6..516c5a15 100644
--- a/Wino.Core.Domain/Translations/gl_ES/resources.json
+++ b/Wino.Core.Domain/Translations/gl_ES/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "todo feito",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Obtendo datos do calendario.",
     "AccountCreationDialog_FetchingEvents": "Cargando os eventos do calendario.",
     "AccountCreationDialog_FetchingProfileInformation": "Cargando os detalles do perfil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Se o navegador non se iniciou automaticamente, complete a autenticación:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "iniciando",
     "AccountCreationDialog_PreparingFolders": "Neste intre estamos a obter información dos cartafois.",
     "AccountCreationDialog_SigninIn": "A información da conta estase a gardar.",
+    "Purchased": "Adquirido",
     "AccountEditDialog_Message": "Nome da conta",
     "AccountEditDialog_Title": "Editar conta",
     "AccountPickerDialog_Title": "Escolla unha conta",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Xeral",
+    "AccountDetailsPage_TabMail": "Correo",
+    "AccountDetailsPage_TabCalendar": "Calendario",
+    "AccountDetailsPage_CalendarListDescription": "Selecciona un calendario para configurar as súas configuracións.",
     "AddHyperlink": "Engadir",
     "AppCloseBackgroundSynchronizationWarningTitle": "Sincronización en segundo plano",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Conta IMAP",
     "Busy": "Busy",
     "Buttons_AddAccount": "Engadir conta",
+    "Buttons_FixAccount": "Arreglar conta",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Aplicar",
     "Buttons_ApplyTheme": "Aplicar tema",
     "Buttons_Browse": "Procurar",
     "Buttons_Cancel": "Anular",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Editar",
     "Buttons_EnableImageRendering": "Activar",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Xestionar",
     "Buttons_No": "Non",
     "Buttons_Open": "Abrir",
     "Buttons_Purchase": "Mercar",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Gardar",
     "Buttons_SaveConfiguration": "Gardar configuración",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Enviar ao servidor",
     "Buttons_Share": "Compartir",
     "Buttons_SignIn": "Iniciar sesión",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Téntao de novo",
     "Buttons_Yes": "Si",
+    "Sync_SynchronizingFolder": "Sincronizando {0} {1}%",
+    "Sync_DownloadedMessages": "Descargadas {0} mensaxes de {1}",
+    "SyncAction_Archiving": "Archivando {0} correo(s)",
+    "SyncAction_ClearingFlag": "Eliminando a marca de {0} correo(s)",
+    "SyncAction_CreatingDraft": "Creando un rascunho",
+    "SyncAction_CreatingEvent": "Creando evento",
+    "SyncAction_Deleting": "Eliminando {0} correo(s)",
+    "SyncAction_EmptyingFolder": "Vaciando a carpeta",
+    "SyncAction_MarkingAsRead": "Marcando {0} correo(s) como lido",
+    "SyncAction_MarkingAsUnread": "Marcando {0} correo(s) como non lido",
+    "SyncAction_MarkingFolderAsRead": "Marcando a carpeta como lida",
+    "SyncAction_Moving": "Movendo {0} correo(s)",
+    "SyncAction_MovingToFocused": "Movendo {0} correo(s) á Carpeta Enfocada",
+    "SyncAction_RenamingFolder": "Renomeando a carpeta",
+    "SyncAction_SendingMail": "Enviando correo",
+    "SyncAction_SettingFlag": "Marcando {0} correo(s) coa marca",
+    "SyncAction_SynchronizingAccount": "Sincronizando {0}",
+    "SyncAction_SynchronizingAccounts": "Sincronizando {0} conta(s)",
+    "SyncAction_SynchronizingCalendarData": "Sincronizando datos do calendario",
+    "SyncAction_SynchronizingCalendarEvents": "Sincronizando eventos do calendario",
+    "SyncAction_SynchronizingCalendarMetadata": "Sincronizando metadatos do calendario",
+    "SyncAction_Unarchiving": "Desarquivando {0} correo(s)",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Aceptar",
+    "CalendarEventResponse_AcceptedResponse": "Aceptado",
+    "CalendarEventResponse_Decline": "Rexeitar",
+    "CalendarEventResponse_DeclinedResponse": "Rexeitado",
+    "CalendarEventResponse_NotResponded": "Non respondido",
+    "CalendarEventResponse_Tentative": "Provisional",
+    "CalendarEventResponse_TentativeResponse": "Provisional",
+    "CalendarEventRsvpPanel_Accept": "Aceptar",
+    "CalendarEventRsvpPanel_AddMessage": "Engade unha mensaxe á túa resposta... (opcional)",
+    "CalendarEventRsvpPanel_Decline": "Rexeitar",
+    "CalendarEventRsvpPanel_Message": "Mensaxe",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Enviar unha mensaxe de resposta",
+    "CalendarEventRsvpPanel_Tentative": "Provisional",
+    "CalendarEventRsvpPanel_Title": "Opcións de resposta",
+    "CalendarAttendeeStatus_Accepted": "Aceptado",
+    "CalendarAttendeeStatus_Declined": "Rexeitado",
+    "CalendarAttendeeStatus_NeedsAction": "Precisa acción",
+    "CalendarAttendeeStatus_Tentative": "Provisional",
+    "CalendarEventDetails_Attachments": "Anexos",
+    "CalendarEventCompose_AddAttachment": "Engadir anexo",
+    "CalendarEventCompose_AllDay": "Todo o día",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Os anexos non son compatibles cos calendarios CalDAV.",
+    "CalendarEventCompose_EndDate": "Data de fin",
+    "CalendarEventCompose_EndTime": "Hora de fin",
+    "CalendarEventCompose_Every": "cada",
+    "CalendarEventCompose_ForWeekdays": "para",
+    "CalendarEventCompose_FrequencyDay": "día",
+    "CalendarEventCompose_FrequencyDayPlural": "días",
+    "CalendarEventCompose_FrequencyMonth": "mes",
+    "CalendarEventCompose_FrequencyMonthPlural": "meses",
+    "CalendarEventCompose_FrequencyWeek": "semana",
+    "CalendarEventCompose_FrequencyWeekPlural": "semanas",
+    "CalendarEventCompose_FrequencyYear": "ano",
+    "CalendarEventCompose_FrequencyYearPlural": "anos",
+    "CalendarEventCompose_Location": "Lugar",
+    "CalendarEventCompose_LocationPlaceholder": "Engadir un lugar",
+    "CalendarEventCompose_NewEventButton": "Novo Evento",
+    "CalendarEventCompose_DefaultCalendarHint": "Podes escoller un calendario por defecto para novos eventos nas configuracións do Calendario.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Abrir as configuracións do Calendario",
+    "CalendarEventCompose_NoCalendarsMessage": "Aínda non hai calendarios dispoñibles para crear eventos.",
+    "CalendarEventCompose_NoCalendarsTitle": "Non hai calendarios dispoñibles",
+    "CalendarEventCompose_NoEndDate": "Sen data de fin",
+    "CalendarEventCompose_Notes": "Notas",
+    "CalendarEventCompose_PickCalendarTitle": "Elixe un calendario",
+    "CalendarEventCompose_Recurring": "Recurrente",
+    "CalendarEventCompose_RecurringSummary": "Ocorre cada {0} {1}{2} {3} efectivo {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Ocorre {0}{1} {2} efectivo {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repetir cada",
+    "CalendarEventCompose_SelectCalendar": "Seleccionar calendario",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Ocorre en {0} {1}",
+    "CalendarEventCompose_StartDate": "Data de inicio",
+    "CalendarEventCompose_StartTime": "Hora de inicio",
+    "CalendarEventCompose_TimeRangeSummary": "de {0} a {1}",
+    "CalendarEventCompose_Title": "Título do evento",
+    "CalendarEventCompose_TitlePlaceholder": "Engadir un título",
+    "CalendarEventCompose_Until": "ata",
+    "CalendarEventCompose_UntilSummary": "  ata {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "A data de finalización de todo o día debe ser posterior á data de inicio.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Un ou máis asistentes teñen unha dirección de correo electrónico non válida.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "A data de finalización da recorrencia debe ser igual ou posterior á data de inicio do evento.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "A hora de finalización debe ser posterior á hora de inicio.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Unha ou máis anexos xa non están dispoñibles: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selecciona un calendario antes de crear o evento.",
+    "CalendarEventCompose_ValidationMissingTitle": "Introduce o título do evento antes de crear o evento.",
+    "CalendarEventCompose_ValidationTitle": "A validación do evento fallou",
+    "CalendarEventCompose_WeekdaySummary": "  en {0}",
+    "CalendarEventCompose_Weekday_Friday": "V",
+    "CalendarEventCompose_Weekday_Monday": "L",
+    "CalendarEventCompose_Weekday_Saturday": "S",
+    "CalendarEventCompose_Weekday_Sunday": "S",
+    "CalendarEventCompose_Weekday_Thursday": "T",
+    "CalendarEventCompose_Weekday_Tuesday": "T",
+    "CalendarEventCompose_Weekday_Wednesday": "W",
+    "CalendarEventDetails_Details": "Detalles",
+    "CalendarEventDetails_EditSeries": "Editar Séries",
+    "CalendarEventDetails_Editing": "Editando",
+    "CalendarEventDetails_InviteSomeone": "Invitar a alguén",
+    "CalendarEventDetails_JoinOnline": "Unirse en liña",
+    "CalendarEventDetails_Organizer": "Organizador",
+    "CalendarEventDetails_People": "Persoas",
+    "CalendarEventDetails_ReadOnlyEvent": "Evento de só lectura",
+    "CalendarEventDetails_Reminder": "Recordatorio",
+    "CalendarReminder_StartedHoursAgo": "Comezou hai {0} horas",
+    "CalendarReminder_StartedMinutesAgo": "Comezou hai {0} minutos",
+    "CalendarReminder_StartedNow": "Acaba de comezar",
+    "CalendarReminder_StartingNow": "Comeza agora",
+    "CalendarReminder_StartsInHours": "Comeza en {0} horas",
+    "CalendarReminder_StartsInMinutes": "Comeza en {0} minutos",
+    "CalendarReminder_SnoozeAction": "Sonear",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutos",
+    "CalendarEventDetails_ShowAs": "Mostrar como",
+    "CalendarShowAs_Free": "Livre",
+    "CalendarShowAs_Tentative": "Tentativo",
+    "CalendarShowAs_Busy": "Ocupado",
+    "CalendarShowAs_OutOfOffice": "Fóra da oficina",
+    "CalendarShowAs_WorkingElsewhere": "Traballando noutro lugar",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copiado ó portapapeis.",
     "ClipboardTextCopied_Title": "Copiado",
     "ClipboardTextCopyFailed_Message": "Produciuse un erro ao copiar {0} no portapapeis.",
+    "ContactInfoBar_ErrorTitle": "Error ao cargar a información de contacto",
+    "ContactInfoBar_SuccessTitle": "Información de contacto cargada",
+    "ContactInfoBar_WarningTitle": "A información de contacto pode estar incompleta",
     "ComingSoon": "Proximamente...",
     "ComposerAttachmentsDragDropAttach_Message": "Adxuntar",
     "ComposerAttachmentsDropZone_Message": "Solte os ficheiros aquí",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nome da conta vinculada",
     "DialogMessage_DeleteAccountConfirmationMessage": "Borrar {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Todos os datos asociados con esta conta serán borrados do disco permanentemente.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Eliminar a plantilla \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Eliminar plantilla de correo",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Isto eliminará todos os eventos da serie. Queres continuar?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Eliminar serie recurrente",
     "DialogMessage_DiscardDraftConfirmationMessage": "O borrador será eliminado. Quere continuar?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Eliminar borrador",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Modo claro",
     "Emoji": "Emoticonas",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "A conta precisa atención",
+    "Exception_AccountNeedsAttention_Message": "'{0}' require a túa atención para continuar a funcionar.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail non pode localizar o runtime WebView2 de Microsoft Edge. Por favor instale ou repare o runtime para renderizar o contido dos mensaxes correctamente.",
+    "Exception_WebView2RuntimeMissing_Title": "É necesario o runtime WebView2",
     "Exception_AuthenticationCanceled": "Cancelouse a autenticación",
     "Exception_CustomThemeExists": "Este tema xa existe.",
     "Exception_CustomThemeMissingName": "Debes proporcionar un nome.",
     "Exception_CustomThemeMissingWallpaper": "Debes proporcionar unha imaxe de fondo personalizada.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Falhou a sincronización dos datos do calendario",
+    "Exception_FailedToSynchronizeCalendarEvents": "Falhou a sincronización dos eventos do calendario",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Falhou a sincronización dos metadatos do calendario",
     "Exception_FailedToSynchronizeFolders": "Produciuse un erro ao sincronizar as carpetas",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "A uri de retrochamada é nula na activación.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Mover a correo lixo",
     "HoverActionOption_ToggleFlag": "Marcar / Desmarcar",
     "HoverActionOption_ToggleRead": "Ler / Desler",
+    "KeyboardShortcuts_FailedToReset": "Fallou ao restablecer os atallos de teclado.",
+    "KeyboardShortcuts_FailedToUpdate": "Fallou a actualización dos atallos de teclado.",
+    "KeyboardShortcuts_MailoperationAction": "Acción",
+    "KeyboardShortcuts_Action": "Acción",
+    "KeyboardShortcuts_FailedToLoad": "Fallou ao cargar os atallos de teclado.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Por favor, introduce unha tecla para o atallo.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Por favor, selecciona unha acción para o atallo.",
+    "KeyboardShortcuts_EnterKey": "Por favor, introduce unha tecla para o atallo.",
+    "KeyboardShortcuts_SelectOperation": "Por favor, selecciona unha acción para o atallo.",
+    "KeyboardShortcuts_ShortcutInUse": "Este atallo xa está en uso por outro atallo.",
+    "KeyboardShortcuts_FailedToSave": "Fallou ao gardar o atallo.",
+    "KeyboardShortcuts_FailedToDelete": "Fallou ao eliminar o atallo.",
+    "KeyboardShortcuts_PageDescription": "Configura os atallos de teclado para operacións rápidas de correo. Pulsa as teclas mentres o foco está no campo de entrada da tecla para capturar os atallos.",
+    "KeyboardShortcuts_Add": "Engadir atallo",
+    "KeyboardShortcuts_EditTitle": "Editar atallo de teclado",
+    "KeyboardShortcuts_ResetToDefaults": "Restablecer aos valores por defecto",
+    "KeyboardShortcuts_PressKeysHere": "Pulsa aquí as teclas...",
+    "KeyboardShortcuts_KeyCombination": "Combinación de teclas",
+    "KeyboardShortcuts_FocusArea": "Foca o campo superior e pulsa a combinación de teclas desexada.",
+    "KeyboardShortcuts_Modifiers": "Teclas modificadoras",
+    "KeyboardShortcuts_Mode": "Modo da aplicación",
+    "KeyboardShortcuts_ModeMail": "Correo",
+    "KeyboardShortcuts_ModeCalendar": "Calendario",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Alternar lido/non lido",
+    "KeyboardShortcuts_ActionToggleFlag": "Alternar bandeira",
+    "KeyboardShortcuts_ActionToggleArchive": "Alternar arquivar/desarquivar",
     "ImageRenderingDisabled": "A mostra de imaxes está desactivada para esta mensaxe.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nome de usuario",
     "IMAPSetupDialog_UsernamePlaceholder": "vicenterisco, vicenterisco@dominio.com, dominio/vicenterisco",
     "IMAPSetupDialog_UseSameConfig": "Usa o mesmo usuario e contrasinal para enviar correo",
+    "ImapCalDavSettingsPage_TitleCreate": "Configuración de IMAP e Calendario",
+    "ImapCalDavSettingsPage_TitleEdit": "Editar configuración de IMAP e Calendario",
+    "ImapCalDavSettingsPage_Subtitle": "Configura IMAP/SMTP e a sincronización de calendario opcional para esta conta.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Configuración básica",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Introduce a túa identidade e credenciais. Wino pode tentar detectar automaticamente a configuración do servidor.",
+    "ImapCalDavSettingsPage_BasicTab": "Básico",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Habilitar o soporte do calendario",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Descubrir automaticamente a configuración de correo",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Configuración de correo descuberta e aplicada.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configuración avanzada",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Introduce a configuración do servidor manualmente se a detección automática non está dispoñible ou é incorrecta.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avanzado",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configuración do calendario",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Elixa como deberían funcionar os datos do calendario para esta conta IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Modo do calendario",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Seguridade da conexión",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Método de autenticación",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Desactivado",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronización CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Só calendario local",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "O calendario está desactivado para esta conta.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Os elementos do calendario sincronízanse co teu servidor CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Os elementos do calendario só se gardan neste ordenador e non se sincronizan na rede.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Como funciona o calendario local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Só calendario local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "O calendario local garda todos os eventos só no teu ordenador. Non se sincroniza con iCloud, Yahoo nin calquera outro proveedor.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL do servizo CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nome de usuario CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Contrasinal CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "A proba de CalDAV só é necesaria cando o modo de calendario está establecido en sincronización CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "O URL do servizo CalDAV é obligatorio.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "O URL do servizo CalDAV debe ser un URL absoluto.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "O nome de usuario CalDAV é obrigatorio.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "A contrasinal CalDAV é obrigatorio.",
+    "ImapCalDavSettingsPage_TestImapButton": "Probar conexión IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Probar conexión CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Conexión IMAP probada con éxito.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Conexión CalDAV probada con éxito.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Axustes da conta validados e gardados.",
+    "ImapCalDavSettingsPage_ICloudHint": "Use unha contrasinal de aplicación xerado nas configuracións da súa conta de Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Use unha contrasinal de aplicación das configuracións de seguridade da súa conta de Yahoo.",
     "Info_AccountCreatedMessage": "{0} creouse",
     "Info_AccountCreatedTitle": "Creación de contas",
     "Info_AccountCreationFailedTitle": "A creación da conta fallou",
     "Info_AccountDeletedMessage": "{0} borrouse correctamente.",
     "Info_AccountDeletedTitle": "A conta borrouse",
     "Info_AccountIssueFixFailedTitle": "Fallou",
+    "Info_AccountIssueFixImapMessage": "Abra a páxina de configuración de IMAP e calendario para volver introducir as credenciais do servidor.",
+    "Info_AccountAttentionRequiredMessage": "Esta conta necesita a súa atención.",
+    "Info_AccountAttentionRequiredClickableMessage": "Prema para solucionar esta conta e re-sincronizala.",
+    "Info_AccountAttentionRequiredAction": "Solucionar",
+    "Info_AccountAttentionRequiredActionHint": "Prema Solucionar para resolver o problema desta conta.",
     "Info_AccountIssueFixSuccessMessage": "Solucionados todos os erros da conta.",
     "Info_AccountIssueFixSuccessTitle": "Éxito",
     "Info_AttachmentOpenFailedMessage": "Non se pode abrir este ficheiro adxunto.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "A sincronización está desactivada neste cartafol.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Cartafol desactivado",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "Actualización dispoñible",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Unarchive",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Arrastrando {0} elemento(s)",
     "MailsSelected": "{0} item(s) selected",
     "MarkFlagUnflag": "Mark as flagged/unflagged",
     "MarkReadUnread": "Mark as read/unread",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "Actualización dispoñible",
+    "Notifications_StoreUpdateAvailableMessage": "Hai unha versión máis recente de Wino Mail lista para instalar desde Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Small",
     "Photos": "Photos",
     "PreparingFoldersMessage": "Preparing folders",
-    "ProtocolLogAvailable_Message": "Protocol logs are available for diagnostics.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Atallos de teclado",
+    "Settings_KeyboardShortcuts_Description": "Xestiona as teclas de atallo para accións rápidas nos correos.",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Axustes de IMAP e calendario.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Abrir a páxina de axustes dedicada de IMAP, SMTP e CalDAV para esta conta.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Abrir axustes",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Modo da aplicación por defecto.",
+    "SettingsAppPreferences_ApplicationMode_Description": "Elixa o modo de apertura predeterminado de Wino cando non se define un tipo de activación.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Correo",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendario",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Ocultar o botón da conta de Wino na barra de título.",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Ocultar o botón de perfil na barra de título que abre o panel da conta de Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notificacións de actualización da Microsoft Store.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Mostrar notificacións e accións no rodapé cando haxa unha actualización da Microsoft Store disponível.",
+    "SettingsAppPreferences_AiActions_Title": "Accións de IA",
+    "SettingsAppPreferences_AiActions_Description": "Elixa os idiomas de IA predeterminados e onde se deben gardar os resumos.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Idioma de tradución por defecto.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Selecciona o idioma de destino predeterminado utilizado polas accións de tradución da IA.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Idioma de resumo.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Selecciona o idioma de resumo preferido para os futuros resumos da IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Ruta de almacenamento de resumos por defecto.",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Elixa a carpeta que Wino debe usar por defecto ao gardar os resumos da IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Usar a localización de almacenamento por defecto do sistema.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Esta carpeta non existe. Empregarase a ubicación de almacenamento por defecto para os resumos.",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Duración predeterminada de adiamento.",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Define unha duración predeterminada de adiamento para as notificacións de recordatorio do calendario.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formato da cabecera do día na vista temporal.",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Elixa como se renderizan as etiquetas do día nas vistas de día, semana e semana laboral. Usa tokens de formato de data como ddd, dd, MMM ou dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Fondo da xanela",
+    "SettingsWindowBackdrop_Description": "Selecciona un efecto de fondo para as ventás de Wino.",
+    "SettingsWindowBackdrop_Disabled": "A selección do fondo da ventá está desactivada cando o tema da aplicación é diferente de Predeterminado.",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Cambios gardados.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Os datos da súa conta foron actualizados correctamente.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Inicio",
+    "SettingsHome_SearchTitle": "Atopa unha configuración",
+    "SettingsHome_SearchDescription": "Busca por función, tema ou palabra clave para ir directamente á páxina de axustes correspondente.",
+    "SettingsHome_SearchPlaceholder": "Buscar configuracións",
+    "SettingsHome_SearchExamples": "Proba: tema, almacenamento, idioma, sinatura",
+    "SettingsHome_QuickLinks_Title": "Enlaces rápidos",
+    "SettingsHome_QuickLinks_Description": "Accede ás configuracións ás que se accode con maior frecuencia.",
+    "SettingsHome_StorageCard_Description": "Vexa canto contido MIME local se conserva neste dispositivo e elimínao cando sexa necesario.",
+    "SettingsHome_StorageEmptySummary": "Aínda non se detectou contido MIME almacenado en caché.",
+    "SettingsHome_StorageLoading": "Comprobando o uso local de MIME...",
+    "SettingsHome_Tips_Title": "Consellos e truques",
+    "SettingsHome_Tips_Description": "Algúns cambios pequenos poden facer que Wino sexa máis persoal.",
+    "SettingsHome_Tip_Theme": "Queres modo escuro ou cambios de acento? Abre a Personalización.",
+    "SettingsHome_Tip_Background": "Utilice Preferencias da Aplicación para controlar o comportamento de inicio e a sincronización en segundo plano.",
+    "SettingsHome_Tip_Shortcuts": "As teclas de atallo axúdanche a navegar polo correo máis rápido.",
+    "SettingsHome_Resources_Title": "Enlaces útiles",
+    "SettingsHome_Resources_Description": "Abrir recursos do proxecto, información de soporte e canles de lanzamento.",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "Xeral",
+    "SettingsOptions_MailSection": "Correo",
+    "SettingsOptions_CalendarSection": "Calendario",
+    "SettingsOptions_MoreComingSoon": "Máis opcións próximamente.",
+    "SettingsOptions_HeroDescription": "Personaliza a experiencia de Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} conta(s) configurada(s)",
+    "SettingsSearch_ManageAccounts_Keywords": "conta;contas;caixa de correo;caixas de correo;apelido;apelidos;perfil;enderezo;enderezos",
+    "SettingsSearch_AppPreferences_Keywords": "inicio;fondo;iniciar;sincronizar;notificación;notificacións;busca;bandeiña do sistema;predeterminados",
+    "SettingsSearch_LanguageTime_Keywords": "lingua;hora;relox;localidade;rexión;formato;24 horas;24h",
+    "SettingsSearch_Personalization_Keywords": "tema;escuro;claro;aparencia;acento;cor;cor;modo;deseño;densidade",
+    "SettingsSearch_About_Keywords": "acerca de;versión;páxina web;privacidade;GitHub;doar;tenda;axuda",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "atajo;atalos;tecla rápida;teclas rápidas;teclado;teclas",
+    "SettingsSearch_MessageList_Keywords": "mensaxe;mensaxes;lista;fíos;fíos;avatar;vista previa;remitente",
+    "SettingsSearch_ReadComposePane_Keywords": "lector;redactar;redactor;tipo de letra;tipos de letra;contido externo;visualización;lectura",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "sinatura;sinaturas;cifrado;certificado;certificados;s mime;smime;seguridade",
+    "SettingsSearch_Storage_Keywords": "armazenamento;cache;caché;MIME;disco;espazo;limpeza;limpar;datos locais",
+    "SettingsSearch_CalendarSettings_Keywords": "calendario;semana;horas;horario;evento;eventos",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Abrir o sitio web de Wino Mail.",
+    "SettingsWebsite_Title": "Sitio web",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "Plantillas de correo electrónico",
+    "SettingsEmailTemplates_Description": "Xestiona as plantillas de correo electrónico.",
+    "SettingsEmailTemplates_CreatePageTitle": "Nova plantilla",
+    "SettingsEmailTemplates_EditPageTitle": "Editar plantilla",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nova plantilla",
+    "SettingsEmailTemplates_NewTemplateDescription": "Crea unha nova plantilla de correo",
+    "SettingsEmailTemplates_NameTitle": "Nome",
+    "SettingsEmailTemplates_NamePlaceholder": "Nome da plantilla",
+    "SettingsEmailTemplates_DescriptionTitle": "Descripión",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descripión opcional",
+    "SettingsEmailTemplates_ContentTitle": "Contido da plantilla",
+    "SettingsEmailTemplates_ContentDescription": "Edita o contido HTML desta plantilla.",
+    "SettingsEmailTemplates_NameRequired": "O nome da plantilla é obrigatorio.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Armazenamento",
+    "SettingsStorage_Description": "Escanear e xestionar o caché MIME almacenado no cartafol de datos locais.",
+    "SettingsStorage_ScanFolder": "Escanea o cartafol de datos locais.",
+    "SettingsStorage_NoLocalMimeDataFound": "Non se atoparon datos MIME locais.",
+    "SettingsStorage_NoAccountsFound": "Non se atoparon contas.",
+    "SettingsStorage_TotalUsage": "Uso total local de MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} usado no caché MIME local.",
+    "SettingsStorage_DeleteAll_Title": "Eliminar todo o contido MIME.",
+    "SettingsStorage_DeleteAll_Description": "Eliminar a carpeta completa do caché MIME desta conta.",
+    "SettingsStorage_DeleteAll_Button": "Eliminar todo",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Eliminar todo o contido MIME.",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Eliminar todos os datos MIME locais para {0}?",
+    "SettingsStorage_DeleteAll_Success": "Todo o contido MIME foi eliminado.",
+    "SettingsStorage_DeleteOld_Title": "Eliminar contido MIME antigo.",
+    "SettingsStorage_DeleteOld_Description": "Eliminar ficheiros MIME baseados na data de creación dos correos na base de datos local.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mes",
+    "SettingsStorage_DeleteOld_3Months": "> 3 meses",
+    "SettingsStorage_DeleteOld_6Months": "> 6 meses",
+    "SettingsStorage_DeleteOld_1Year": "> 1 ano",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Eliminar contido MIME antigo.",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Eliminar datos MIME locais máis antigos que {0} para {1}?",
+    "SettingsStorage_DeleteOld_Success": "Eliminadas {0} carpetas MIME máis antigas que {1}.",
+    "SettingsStorage_1Month": "1 mes",
+    "SettingsStorage_3Months": "3 meses",
+    "SettingsStorage_6Months": "6 meses",
+    "SettingsStorage_1Year": "1 ano",
+    "SettingsStorage_Months": "{0} meses",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Abrir Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Abrir Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Saír",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Certificados importados con éxito.",
+    "Smime_ImportCertificates_Error": "Erro ao importar certificados: {0}",
+    "Smime_RemoveCertificates_Confirm": "Quere realmente eliminar os certificados {0}?",
+    "Smime_RemoveCertificates_Success": "Certificados eliminados.",
+    "Smime_ExportCertificates_Success": "Certificados exportados.",
+    "Smime_ExportCertificates_Error": "Erro ao exportar certificados.",
+    "Smime_CertificateDetails": "Suxeito: {0}\\nEmisor: {1}\\nVálido desde: {2}\\nVálido ata: {3}\\nHuella dactilar: {4}",
+    "Smime_CertificatePassword_Title": "Contrasinal do certificado obrigatorio",
+    "Smime_CertificatePassword_Placeholder": "Contrasinal do certificado para {0} (opcional)",
+    "Smime_Confirm_Title": "Confirmar",
+    "Buttons_OK": "Aceptar",
+    "Buttons_Refresh": "Actualizar",
+    "SettingsSignatureAndEncryption_Title": "Sinatura e cifrado",
+    "SettingsSignatureAndEncryption_Description": "Xestiona certificados S/MIME para asinatura e cifrado de correos.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Os meus certificados",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificados persoais para assinatura e cifrado.",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificados dos destinatarios",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificados dos destinatarios para descifrado.",
+    "SettingsSignatureAndEncryption_NameColumn": "Nome",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Expira en",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Huella dactilar",
+    "Buttons_Remove": "Eliminar",
+    "Buttons_Export": "Exportar",
+    "Buttons_Import": "Importar",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificado de assinatura S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Certificado de cifrado S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Ningún",
+    "SmimeSignaturesInMessage": "Sinaturas neste mensaxe:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, válido ata {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Información do certificado de assinatura S/MIME",
+    "SmimeCertificateInfoTitle": "Información do certificado S/MIME",
+    "SmimeNoCertificateFileFound": "Non se atopou ningún ficheiro de certificado.",
+    "SmimeSaveCertificate": "Gardar certificado...",
+    "SmimeCertificate": "Certificado S/MIME",
+    "SmimeCertificateSavedTo": "O certificado gardouse en {0}",
+    "SmimeSignedTooltip": "Este mensaxe está asinado con un certificado S/MIME. Clic para máis detalles",
+    "SmimeEncryptedTooltip": "Este mensaxe está cifrado con un certificado S/MIME.",
+    "SmimeCertificateFileInfo": "Ficheiro: {0}",
+    "Composer_LightTheme": "Tema claro",
+    "Composer_DarkTheme": "Tema escuro",
+    "Composer_Outdent": "Reducir sangría",
+    "Composer_Indent": "Aumentar sangría",
+    "Composer_BulletList": "Lista de viñetas",
+    "Composer_OrderedList": "Lista numerada",
+    "Composer_Stroke": "Trazo",
+    "Composer_Bold": "Negrita",
+    "Composer_Italic": "Cursiva",
+    "Composer_Underline": "Subliñado",
+    "Composer_CcBcc": "Cc e Bcc",
+    "Composer_EnableSmimeSignature": "Habilitar/ deshabilitar a sinatura S/MIME",
+    "Composer_EnableSmimeEncryption": "Habilitar/ deshabilitar o cifrado S/MIME",
+    "Composer_LocalDraftSyncInfo": "Este borrador é só local. O Wino non conseguiu envialo ao teu servidor de correo. Clica para tentar envialo de novo ao servidor.",
+    "Composer_CertificateExpires": "Expira en: ",
+    "Composer_SmimeSignature": "Assinatura S/MIME",
+    "Composer_SmimeEncryption": "Cifrado S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Plantillas de correo",
+    "Composer_AiSummarize": "Resumir con IA",
+    "Composer_AiSummarizeDescription": "Extrae puntos clave, accións e decisións deste correo.",
+    "Composer_AiTranslate": "Traducir con IA",
+    "Composer_AiActions": "Accións IA",
+    "Composer_AiRewrite": "Reescribe con IA",
+    "AiActions_CheckingStatus": "Comprobando o acceso á IA...",
+    "AiActions_SignedOutTitle": "Desbloquear o paquete AI de Wino",
+    "AiActions_SignedOutDescription": "Traducir, reescribir e resumir correos con IA despois de iniciar sesión na túa Conta Wino e activar o complemento AI Pack.",
+    "AiActions_NoPackTitle": "Precísase AI Pack",
+    "AiActions_NoPackDescription": "Iniciaste sesión, pero o AI Pack non está activo aínda. Cómprao para usar as ferramentas de tradución, reescritura e resumo de IA de Wino.",
+    "AiActions_UsageSummary": "{0} de {1} créditos usados este mes.",
+    "Composer_AiRewritePolite": "Faino máis educado",
+    "Composer_AiRewritePoliteDescription": "Ablanda a redacción mantendo o mesmo propósito.",
+    "Composer_AiRewriteAngry": "Faino enfadado",
+    "Composer_AiRewriteAngryDescription": "Emprega un ton máis agudo e confrontativo.",
+    "Composer_AiRewriteHappy": "Fai que sexa feliz",
+    "Composer_AiRewriteHappyDescription": "Engade un ton máis optimista e entusiástico.",
+    "Composer_AiRewriteFormal": "Fai que sexa formal",
+    "Composer_AiRewriteFormalDescription": "Fai que a mensaxe soe máis profesional e estruturada.",
+    "Composer_AiRewriteFriendly": "Fai que sexa amigable",
+    "Composer_AiRewriteFriendlyDescription": "Aporta un ton máis accesible á mensaxe.",
+    "Composer_AiRewriteShorter": "Fai que sexa máis curto",
+    "Composer_AiRewriteShorterDescription": "Condensa o texto e elimina detalles innecesarios.",
+    "Composer_AiRewriteClearer": "Fai que sexa máis claro",
+    "Composer_AiRewriteClearerDescription": "Melora a legibilidade e facilita a lectura da mensaxe.",
+    "Composer_AiRewriteCustom": "Personalizado",
+    "Composer_AiRewriteCustomDescription": "Describe a túa propia intención de reescritura.",
+    "Composer_AiRewriteCustomPlaceholder": "Describe como queres que a mensaxe sexa reescrita",
+    "Composer_AiRewriteMode": "Tono de reescritura",
+    "Composer_AiRewriteApply": "Aplicar a reescritura",
+    "Composer_AiTranslateDialogTitle": "Traducir con IA",
+    "Composer_AiTranslateDialogDescription": "Introduce a lingua ou código de cultura de destino, por exemplo, en-US, tr-TR, de-DE ou fr-FR.",
+    "Composer_AiTranslateApply": "Traducir",
+    "Composer_AiTranslateLanguage": "Idioma de destino",
+    "Composer_AiTranslateCustomPlaceholder": "Introduce o código de cultura",
+    "Composer_AiTranslateLanguageEnglish": "Inglés (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turco (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Alemán (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francés (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Español (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiano (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugués (Brasil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Holandés (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polaco (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Ruso (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Xaponés (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coreano (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinés, Simplificado (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Árabe (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Outro...",
+    "Composer_AiBusyTitle": "AIA xa está a funcionar",
+    "Composer_AiBusyMessage": "Por favor agarda a que remate a acción actual de IA.",
+    "Composer_AiSignInRequired": "Inicia sesión na túa conta Wino para usar as funcións de IA.",
+    "Composer_AiMissingHtml": "Ainda non hai contido de mensaxe para enviar á IA de Wino.",
+    "Composer_AiQuotaUnavailable": "O resultado da IA foi aplicado.",
+    "Composer_AiAppliedMessage": "O resultado da IA aplicouse ao compositor. Usa Desfacer se queres revertelo.",
+    "Composer_AiSummarizeSuccessTitle": "Resumo da IA aplicado.",
+    "Composer_AiTranslateSuccessTitle": "Tradución da IA aplicada.",
+    "Composer_AiRewriteSuccessTitle": "Reescritura da IA aplicada.",
+    "Composer_AiErrorTitle": "A acción da IA fallou.",
+    "Reader_AiAppliedMessage": "O resultado da IA móstrase agora nesta mensaxe. Reabre a mensaxe para ver de novo o contido orixinal.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contactos",
+    "ContactsPage_AddContact": "Engadir Contacto",
+    "ContactsPage_EditContact": "Editar Contacto",
+    "ContactsPage_DeleteContact": "Borrar Contacto",
+    "ContactsPage_SearchPlaceholder": "Buscar contactos...",
+    "ContactsPage_NoContacts": "Non se atoparon contactos",
+    "ContactsPage_ContactsCount": "{0} contactos",
+    "ContactsPage_SelectedContactsCount": "{0} seleccionados",
+    "ContactsPage_DeleteSelectedContacts": "Borrar seleccionados",
+    "ContactEditDialog_Title": "Editar Contacto",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Seleccionar Foto",
+    "ContactEditDialog_RemovePhoto": "Eliminar Foto",
+    "ContactEditDialog_NameHeader": "Nome",
+    "ContactEditDialog_NamePlaceholder": "Nome do contacto",
+    "ContactEditDialog_EmailHeader": "Enderezo de correo electrónico",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Información do contacto",
+    "ContactEditDialog_RootContactInfo": "Este é un contacto raíz asociado ás túas contas e non se pode eliminar.",
+    "ContactEditDialog_OverriddenContactInfo": "Este contacto foi modificado manualmente e non se actualizará durante a sincronización.",
+    "ContactsPage_Subtitle": "Xestiona os teus contactos de correo e a súa información.",
+    "ContactStatus_Account": "Conta",
+    "ContactStatus_Modified": "Modificado",
+    "ContactAction_Edit": "Editar contacto",
+    "ContactAction_ChangePhoto": "Cambiar foto",
+    "ContactAction_Delete": "Eliminar contacto",
+    "ContactAction_Add": "Engadir contacto",
+    "ContactSelection_Selected": "seleccionado",
+    "ContactSelection_SelectAll": "Seleccionar todo",
+    "ContactSelection_Clear": "Borrar selección",
+    "ContactsPage_EmptyState": "Non hai contactos para amosar",
+    "ContactsPage_AddFirstContact": "Engade o teu primeiro contacto",
+    "ContactsPage_ContactsCountSuffix": "contactos",
+    "ContactsPane_NewContact": "Novo contacto",
+    "ContactsPane_DescriptionTitle": "Xestiona os teus contactos",
+    "ContactsPane_DescriptionBody": "Crea contactos, renóminalos, actualiza as fotos de perfil e mantén organizados os datos gardados nun só lugar.",
+    "ContactEditDialog_AddTitle": "Engadir contacto",
+    "ContactInfoBar_ContactAdded": "Contacto engadido correctamente.",
+    "ContactInfoBar_ContactUpdated": "Contacto actualizado correctamente.",
+    "ContactInfoBar_ContactsDeleted": "Contactos eliminados correctamente.",
+    "ContactInfoBar_ContactPhotoUpdated": "Foto do contacto actualizada correctamente.",
+    "ContactInfoBar_FailedToLoadContacts": "Erro ao cargar os contactos: {0}",
+    "ContactInfoBar_FailedToAddContact": "Erro ao engadir contacto: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Erro ao actualizar o contacto: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Erro ao borrar os contactos: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Erro ao actualizar a foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Non se poden eliminar os contactos raíz.",
+    "ContactConfirmDialog_DeleteTitle": "Eliminar contacto",
+    "ContactConfirmDialog_DeleteMessage": "Está seguro de que quere eliminar o contacto '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Está seguro de que quere eliminar {0} contacto(s)?",
+    "ContactConfirmDialog_DeleteButton": "Eliminar",
+    "CalendarAccountSettings_Title": "Configuración da conta de calendario",
+    "CalendarAccountSettings_Description": "Xestiona a configuración do calendario para {0}",
+    "CalendarAccountSettings_AccountColor": "Cor da conta",
+    "CalendarAccountSettings_AccountColorDescription": "Mudar a cor de visualización desta conta de calendario",
+    "CalendarAccountSettings_SyncEnabled": "Habilitar a sincronización",
+    "CalendarAccountSettings_SyncEnabledDescription": "Habilitar ou deshabilitar a sincronización do calendario para esta conta",
+    "CalendarAccountSettings_DefaultShowAs": "Estado por defecto de Mostrar como",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Estado de dispoñibilidade por defecto para novos eventos creados con esta conta",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendario principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marcar este calendario como o calendario principal da conta",
+    "CalendarSettings_NewEventBehavior_Header": "Comportamento do botón Novo evento",
+    "CalendarSettings_NewEventBehavior_Description": "Elixe se o botón Novo evento debe pedir un calendario cada vez ou abrir sempre un calendario específico",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Preguntar cada vez",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Sempre usar un calendario específico",
+    "CalendarSettings_Rendering_Title": "Renderizado",
+    "CalendarSettings_Rendering_Description": "Configurar o deseño do calendario e o comportamento de visualización",
+    "CalendarSettings_Notifications_Title": "Notificacións",
+    "CalendarSettings_Notifications_Description": "Elixe o comportamento por defecto para recordatorios e para o adiamento",
+    "CalendarSettings_Preferences_Title": "Preferencias",
+    "CalendarSettings_Preferences_Description": "Define como funciona o botón Novo evento",
+    "WhatIsNew_GetStartedButton": "Comeza",
+    "WhatIsNew_ContinueAnywayButton": "Continuar de todas as formas",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparándose para a nova versión...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparando os teus dados",
+    "WhatIsNew_MigrationPreparing_Description": "Wino está a aplicar migracións de actualización. Por favor, agarda mentres preparamos os teus datos da conta para esta versión",
+    "WhatIsNew_MigrationFailedMessage": "Ao aplicar as migracións fallou co código de erro {0}. Pode continuar a usar a aplicación. Non obstante, se atopas problemas graves, por favor reinstale a aplicación",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail actualizado",
+    "WhatIsNew_MigrationNotification_Message": "Abre a aplicación para completar a actualización e ver as novidades",
+    "WelcomeWindow_Title": "Benvido a Wino Mail",
+    "WelcomeWindow_Subtitle": "Una experiencia nativa de Windows para Mail e Calendario",
+    "WelcomeWindow_WhatsNewTitle": "Últimos cambios",
+    "WelcomeWindow_FeaturesTitle": "Características",
+    "WelcomeWindow_WhatsNewTab": "Novidades",
+    "WelcomeWindow_FeaturesTab": "Características",
+    "WelcomeWindow_GetStartedButton": "Comeza engadindo unha conta",
+    "WelcomeWindow_GetStartedDescription": "Engade a túa conta de Outlook, Gmail ou IMAP para comezar a usar Wino Mail",
+    "WelcomeWindow_ImportFromWinoAccount": "Importar desde a túa Conta Wino",
+    "WelcomeWindow_ImportInProgress": "Importando as túas preferencias e contas sincronizadas...",
+    "WelcomeWindow_ImportNoAccountsFound": "Non se atoparon contas sincronizadas na túa Conta Wino. Se as preferencias estaban dispoñibles, foron restauradas. Usa Comeza para engadir unha conta manualmente",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} contas sincronizadas xa están dispoñibles neste dispositivo. Usa Comeza para engadir outra conta manualmente se é necesario",
+    "WelcomeWindow_SetupTitle": "Configura a túa conta",
+    "WelcomeWindow_SetupSubtitle": "Elixe o teu provedor de correo para comezar",
+    "WelcomeWindow_AddAccountButton": "Engadir conta",
+    "WelcomeWindow_SkipForNow": "Omitir por agora — configúrolo máis tarde",
+    "WelcomeWindow_AppDescription": "Una caixa de entrada rápida e focalizada — redeseñada para Windows 11",
+    "WelcomeWizard_Step1Title": "Benvido",
+    "SystemTrayMenu_Open": "Abrir",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Configuración de sincronización",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mantén as túas preferencias de Wino en sincronía entre dispositivos",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Desbloquear complementos",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accede ás funcións premium como o Pacote IA de Wino",
+    "WinoAccount_Management_Description": "Xestiona a túa Conta Wino, o acceso ao Pacote IA e as preferencias sincronizadas e os detalles da conta",
+    "WinoAccount_Management_SignedOutTitle": "Inicia sesión en Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Inicia sesión ou crea unha conta para sincronizar o teu correo, acceder ás funcións de IA e xestionar as túas configuracións entre dispositivos",
+    "WinoAccount_Management_ProfileSectionHeader": "Perfil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Complementos Wino",
+    "WinoAccount_Management_DataSectionHeader": "Datos",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Accións da conta",
+    "WinoAccount_Management_AccountCardTitle": "Conta",
+    "WinoAccount_Management_AccountCardDescription": "O teu enderezo de correo da Conta Wino e o estado actual da conta",
+    "WinoAccount_Management_AiPackCardTitle": "Pacote IA",
+    "WinoAccount_Management_AiPackCardDescription": "Comprobe se o Pacote IA de Wino está activo e cantas utilizacións quedan",
+    "WinoAccount_Management_AiPackActive": "O Pacote IA está activo",
+    "WinoAccount_Management_AiPackInactive": "O Pacote IA non está activo",
+    "WinoAccount_Management_AiPackUsage": "{0} de {1} usos consumidos. Quedan {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Período de facturación: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Os detalles de uso aínda non están dispoñibles",
+    "WinoAccount_Management_AiPackBuyDescription": "Compre o Pacote IA de Wino para traducir, reescribir e resumir correos con IA",
+    "WinoAccount_Management_AiPackPromoTitle": "Desbloquear Pacote IA",
+    "WinoAccount_Management_AiPackPromoDescription": "Impulsa o teu fluxo de correo con ferramentas potenciadas por IA. Traducir mensaxes a máis de 50 idiomas, reescribir para maior claridade e tonalidade, e obter resumos instantáneos de fíos longos",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mes",
+    "WinoAccount_Management_AiPackPromoRequests": "1,000 créditos",
+    "WinoAccount_Management_AiPackGetButton": "Obter Pacote IA",
+    "WinoAddOn_AI_PACK_Name": "Pacote IA de Wino",
+    "WinoAddOn_AI_PACK_Description": "Ferramentas alimentadas por IA para traducir, reescribir e resumir accións en Wino Mail",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traducir, reescribir, resumir, produtividade",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Contas ilimitadas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Quita o límite de contas e engade as contas de correo que precises",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "contas, ilimitadas, premium, complemento",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Inicia sesión coa túa Conta Wino para completar esta compra",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino non puido completar esta compra da Microsoft Store",
+    "WinoAccount_Management_StoreSyncFailed": "A compra finalizou, pero Wino non puido actualizar os beneficios da túa conta aínda. Por favor, tenta de novo nun momento",
+    "WinoAccount_Management_AiPackSubscriptionActive": "A túa subscrición está activa",
+    "WinoAccount_Management_AiPackRenews": "Renova {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Créditos usados este mes",
+    "WinoAccount_Management_AiPackResets": "Reinicios {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Tivemos problemas ao cargar o saldo de uso de IA",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traducir",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Reescribir",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Resumir",
+    "WinoAccount_Management_AddOnLoadFailed": "Tivemos problemas ao cargar este complemento",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronizar Preferencias e Contas",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importa ou exporta as túas preferencias de Wino e os detalles da caixa de correo entre dispositivos. Contrasinais, tokens e outra información sensible nunca se sincronizan",
+    "WinoAccount_Management_SignOutTitle": "Pechar sesión",
+    "WinoAccount_Management_SignOutDescription": "Pecha a sesión da túa conta neste dispositivo",
+    "WinoAccount_Management_StatusLabel": "Estado: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Ainda non hai datos sincronizados almacenados para esta conta",
+    "WinoAccount_Management_ExportSucceeded": "Os datos de Wino seleccionados exportáronse con éxito",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "As túas preferencias exportáronse para a túa Conta Wino",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exportados {0} detalles de conta á túa Conta Wino",
+    "WinoAccount_Management_ImportSucceeded": "Datos sincronizados importados desde a túa Conta Wino",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Aplicadas {0} preferencias sincronizadas",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importáronse {0} contas.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Ignoráronse {0} contas que xa existen neste dispositivo.",
+    "WinoAccount_Management_ImportPartial": "Aplicáronse {0} preferencias sincronizadas. {1} preferencias non se puideron restaurar.",
+    "WinoAccount_Management_ImportReloginReminder": "Contrasinais, tokens e outra información sensíbel non foron importados. Inicie sesión de novo para cada conta neste dispositivo antes de usala.",
+    "WinoAccount_Management_SerializeFailed": "Wino non conseguiu serializar as túas preferencias actuais.",
+    "WinoAccount_Management_EmptyExport": "Non hai valores de preferencias para exportar.",
+    "WinoAccount_Management_ImportEmpty": "O paquete de datos sincronizados non contén nada novo para restaurar.",
+    "WinoAccount_Management_ExportDialog_Title": "Exportar á túa Conta Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Escolle o que desexes sincronizar coa túa Conta Wino",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferencias",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Contas",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Contrasinais, tokens e outra información sensible non se sincronizan.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "As contas importadas noutro PC seguirán a necesitar que inicies sesión de novo antes de poder usalas.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportando os datos de Wino seleccionados",
+    "WinoAccount_Management_LoadFailed": "Wino non conseguiu carregar a información máis recente da Conta Wino.",
+    "WinoAccount_Management_ActionFailed": "A solicitude da Conta Wino non puido completarse.",
+    "WinoAccount_SettingsSection_Title": "Conta Wino",
+    "WinoAccount_SettingsSection_Description": "Crea ou inicia sesión nunha Conta Wino usando o teu servizo de autentificación local.",
+    "WinoAccount_RegisterButton_Title": "Rexistrar conta",
+    "WinoAccount_RegisterButton_Description": "Crea unha Conta Wino cun correo electrónico e contrasinal.",
+    "WinoAccount_RegisterButton_Action": "Abrir rexistro",
+    "WinoAccount_LoginButton_Title": "Iniciar sesión",
+    "WinoAccount_LoginButton_Description": "Inicia sesión nunha Conta Wino existente cun correo electrónico e contrasinal.",
+    "WinoAccount_LoginButton_Action": "Abrir sesión",
+    "WinoAccount_SignOutButton_Title": "Cerrar sesión",
+    "WinoAccount_SignOutButton_Description": "Eliminar a sesión da Conta Wino almacenada localmente.",
+    "WinoAccount_SignOutButton_Action": "Cerrar sesión",
+    "WinoAccount_RegisterDialog_Title": "Crear Conta Wino",
+    "WinoAccount_RegisterDialog_Description": "Crea unha Conta Wino para manter a túa experiencia Wino sincronizada e desbloquear complementos baseados na conta.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Crea a túa Conta Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Por que crear unha?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importa e exporta configuración entre dispositivos",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Mova as túas preferencias de Wino entre dispositivos sen ter que volver a configurar todo desde cero.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Accede a complementos exclusivos como Wino AI Pack (pagado).",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Utiliza unha conta para desbloquear as características premium de Wino conforme estean dispoñibles.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "A Conta Wino é independente das túas contas de correo.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "As túas contas de Outlook, Gmail, IMAP ou outras contas de correo permanecen exactamente como están. Unha Conta Wino só xestiona características específicas de Wino e complementos baseados na conta.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Rexistrar",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacidade e procesamento da API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Complementos opcionais, como Wino AI Pack, poden enviar o contido HTML seleccionado de correo electrónico ao servizo Wino API só cando uses esas funcións.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Ler a política de privacidade",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Acepto a política de privacidade",
+    "WinoAccount_LoginDialog_Title": "Inicia sesión na Conta Wino",
+    "WinoAccount_LoginDialog_Description": "Inicia sesión na túa Conta Wino para sincronizar a túa configuración de Wino e acceder ás características baseadas na conta.",
+    "WinoAccount_LoginDialog_HeroTitle": "Benvido de novo",
+    "WinoAccount_LoginDialog_BenefitsTitle": "O que che proporciona iniciar sesión",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Utiliza a túa Conta Wino para seguir a sincronización das configuracións entre dispositivos e acceder a complementos pagados como Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Este inicio de sesión non é o da túa caixa de correo",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Ao iniciar sesión aquí, non engádese nin substitúense as túas contas de Outlook, Gmail, IMAP ou outras no Wino. Só inicia sesión nos servizos específicos de Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "¿Esqueciches o contrasinal?",
+    "WinoAccount_EmailLabel": "Correo electrónico",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Contrasinal",
+    "WinoAccount_ConfirmPasswordLabel": "Confirmar contrasinal",
+    "WinoAccount_ForgotPasswordDialog_Title": "Restablece o teu contrasinal",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Enviar correo de restablecemento",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Volver a iniciar sesión",
+    "WinoAccount_ForgotPasswordDialog_Description": "Introduce o correo da túa Conta Wino e enviaremos unha ligazón de restablecemento de contrasinal se a dirección está rexistrada.",
+    "WinoAccount_Validation_EmailRequired": "O correo electrónico é obrigatorio.",
+    "WinoAccount_Validation_PasswordRequired": "O contrasinal é obrigatorio.",
+    "WinoAccount_Validation_PasswordMismatch": "As contrasinais non coinciden.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Debe aceptar a política de privacidade antes de crear unha Conta Wino.",
+    "WinoAccount_Error_InvalidCredentials": "O enderezo de correo electrónico ou o contrasinal son incorrectos.",
+    "WinoAccount_Error_AccountLocked": "Esta conta está bloqueada temporalmente.",
+    "WinoAccount_Error_AccountBanned": "Esta conta foi banida.",
+    "WinoAccount_Error_AccountSuspended": "Esta conta foi suspendida.",
+    "WinoAccount_Error_EmailNotConfirmed": "Por favor, confirma o teu enderezo de correo antes de iniciar sesión.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Por favor, confirma o teu enderezo de correo antes de iniciar sesión.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Aínda non está dispoñible un novo correo de confirmación.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Esta solicitude de confirmación xa non é válida. Por favor, inténtao iniciar sesión de novo.",
+    "WinoAccount_Error_EmailNotRegistered": "Este enderezo de correo non está rexistrado.",
+    "WinoAccount_Error_RefreshTokenInvalid": "A túa sesión xa non é válida. Por favor, inicia sesión de novo.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Este enderezo de correo xa está rexistrado.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "É necesario un enderezo de correo para completar o inicio de sesión externo.",
+    "WinoAccount_Error_ExternalLoginInvalid": "A solicitude de inicio de sesión externo é inválida.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "O estado do inicio de sesión externo é inválido ou expirou.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "O código de inicio de sesión externo é inválido ou expirou.",
+    "WinoAccount_Error_AiPackRequired": "É necesaria unha suscrición activa de Wino AI Pack para esta acción.",
+    "WinoAccount_Error_AiQuotaExceeded": "O límite de uso de Wino AI Pack foi alcanzado para o actual período de facturación.",
+    "WinoAccount_Error_AiHtmlEmpty": "Non hai contido de correo para procesar.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Este correo é demasiado grande para ser procesado polo Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Ese idioma non é compatible. Proba cun código de cultura válido como en-US ou tr-TR.",
+    "WinoAccount_Error_Forbidden": "Non ten permiso para realizar esta acción.",
+    "WinoAccount_Error_ValidationFailed": "A solicitude é inválida. Por favor, revisa os valores introducidos.",
+    "WinoAccount_RegisterSuccessMessage": "O rexistro da Conta Wino completouse para {0}.",
+    "WinoAccount_LoginSuccessMessage": "Iniciaste sesión na Conta Wino como {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirma o teu enderezo de correo",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Enviamos unha confirmación por correo a {0}. Por favor confírmalo e inténtao iniciar sesión de novo.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Se require confirmación de correo",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Seguimos a aguardar a que confirmes {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Reenviar correo de confirmación",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Podes reenviar o correo de confirmación en {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Podes reenviar o correo de confirmación agora.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Correo de confirmación reenviado",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Enviamos unha confirmación por correo a {0}. Por favor confírmalo e inténtao iniciar sesión de novo.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Correo de restablecemento de contrasinal enviado",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Enviámosche un correo de restablecemento de contrasinal a {0}. Abre ese correo para escoller unha nova contrasinal.",
+    "WinoAccount_ChangePassword_Title": "Cambiar contrasinal",
+    "WinoAccount_ChangePassword_Description": "Enviar un correo de restablecemento de contrasinal a esta Conta Wino.",
+    "WinoAccount_ChangePassword_Action": "Enviar correo de restablecemento.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "¿Queres que Wino envíe un correo de restablecemento da contrasinal a {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Saiu da Conta Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Non hai unha Conta Wino activa para pechar sesión.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Conta Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Inicia sesión ou crea unha Conta Wino para xestionar a túa sesión de Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Estado: {0}",
+    "WelcomeWizard_Step2Title": "Engadir conta",
+    "WelcomeWizard_Step3Title": "Rematar a configuración",
+    "ProviderSelection_Title": "Elixe o teu provedor de correo",
+    "ProviderSelection_Subtitle": "Selecciona un provedor a continuación para engadir a túa conta de correo a Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nome da conta",
+    "ProviderSelection_AccountNamePlaceholder": "p. ex. Persoal, Laboral",
+    "ProviderSelection_DisplayNameHeader": "Nome para amosar",
+    "ProviderSelection_DisplayNamePlaceholder": "p. ex. John Doe",
+    "ProviderSelection_EmailHeader": "Enderezo de correo electrónico",
+    "ProviderSelection_EmailPlaceholder": "p. ex. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Contraseña específica da aplicación",
+    "ProviderSelection_AppPasswordHelp": "Como podo obter unha contrasinal específica da aplicación?",
+    "ProviderSelection_CalendarModeHeader": "Integración do calendario",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Desactivado",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Sen integración de calendario",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronización CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Os teus eventos de calendario están sincronizados cos servidores de Apple entre os teus dispositivos.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Os teus eventos de calendario están sincronizados cos servidores de Yahoo entre os teus dispositivos.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendario local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Os teus eventos só se gardan no teu ordenador. Non hai conexión co servidor.",
+    "ProviderSelection_ClearColor": "Cor limpa",
+    "ProviderSelection_ContinueButton": "Continuar",
+    "ProviderSelection_SpecialImap_Subtitle": "Introduce as credenciais da túa conta para conectarte.",
+    "AccountSetup_Title": "Configurando a túa conta",
+    "AccountSetup_Step_Authenticating": "Autenticando con {0}",
+    "AccountSetup_Step_TestingMailAuth": "Probas de autenticación de correo",
+    "AccountSetup_Step_SyncingFolders": "Sincronizando metadatos de carpetas",
+    "AccountSetup_Step_FetchingProfile": "Obtendo información do perfil",
+    "AccountSetup_Step_DiscoveringCalDav": "Descubrindo as configuración de CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Probas de autenticación do calendario",
+    "AccountSetup_Step_SavingAccount": "Gardar a información da conta",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Obtendo metadatos do calendario",
+    "AccountSetup_Step_SyncingAliases": "Sincronizando alias",
+    "AccountSetup_Step_Finalizing": "Rematando a configuración",
+    "AccountSetup_FailureMessage": "A configuración fallou. Volva atrás para corrixir os seus axustes, ou inténtao de novo máis tarde.",
+    "AccountSetup_SuccessMessage": "A túa conta está configurada con éxito!",
+    "AccountSetup_GoBackButton": "Volver",
+    "AccountSetup_TryAgainButton": "Proba de novo",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Falhou o autodescubrimento. Introduza axustes manualmente na pestana Avanzadas."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/id_ID/resources.json b/Wino.Core.Domain/Translations/id_ID/resources.json
index 36e07978..a6e79adc 100644
--- a/Wino.Core.Domain/Translations/id_ID/resources.json
+++ b/Wino.Core.Domain/Translations/id_ID/resources.json
@@ -4,10 +4,11 @@
     "AccountAlias_Column_Verified": "Terverifikasi",
     "AccountAlias_Disclaimer_FirstLine": "Wino hanya dapat mengimpor alias untuk akun Gmail Anda.",
     "AccountAlias_Disclaimer_SecondLine": "Jika Anda ingin menggunakan alias untuk akun Outlook atau IMAP, mohon tambahkan sendiri.",
-    "AccountCacheReset_Title": "Setel Ulang Tembolok Akun",
-    "AccountCacheReset_Message": "Akun ini memerlukan penyelarasan ulang keseluruhan untuk dapat lanjut berjalan. Mohon menunggu selagi Wino menyelaraskan pesan Anda...",
+    "AccountCacheReset_Title": "Account Cache Reset",
+    "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "Anda",
     "AccountCreationDialog_Completed": "semua selesai",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Mengambil metadata kalender.",
     "AccountCreationDialog_FetchingEvents": "Mengambil acara kalender.",
     "AccountCreationDialog_FetchingProfileInformation": "Mengambil rincian profil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Jika peramban web Anda tidak terbuka secara otomatis:",
@@ -17,15 +18,20 @@
     "AccountCreationDialog_Initializing": "memulai",
     "AccountCreationDialog_PreparingFolders": "Kami sedang mendapatkan informasi folder.",
     "AccountCreationDialog_SigninIn": "Informasi akun sedang disimpan.",
+    "Purchased": "Dibeli",
     "AccountEditDialog_Message": "Nama Akun",
     "AccountEditDialog_Title": "Sunting Akun",
     "AccountPickerDialog_Title": "Pilih akun",
     "AccountSettingsDialog_AccountName": "Nama Tampilan Pengirim",
     "AccountSettingsDialog_AccountNamePlaceholder": "misal: Budi Susilo",
-    "AccountDetailsPage_Title": "Info akun",
-    "AccountDetailsPage_Description": "Ubah nama akun di Wino dan atur nama pengirim yang diinkan.",
-    "AccountDetailsPage_ColorPicker_Title": "Warna akun",
-    "AccountDetailsPage_ColorPicker_Description": "Berikan warna untuk akun agar mudah ditemukan di daftar.",
+    "AccountDetailsPage_Title": "Account info",
+    "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
+    "AccountDetailsPage_ColorPicker_Title": "Account color",
+    "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Umum",
+    "AccountDetailsPage_TabMail": "Surel",
+    "AccountDetailsPage_TabCalendar": "Kalender",
+    "AccountDetailsPage_CalendarListDescription": "Pilih kalender untuk mengonfigurasi pengaturannya",
     "AddHyperlink": "Tambahkan",
     "AppCloseBackgroundSynchronizationWarningTitle": "Penyelarasan Latar Belakang",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Aplikasi tidak diatur untuk berjalan saat Windows dimulai.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Akun IMAP",
     "Busy": "Sibuk",
     "Buttons_AddAccount": "Tambahkan Akun",
+    "Buttons_FixAccount": "Perbaiki Akun",
     "Buttons_AddNewAlias": "Tambahkan Alias Baru",
     "Buttons_Allow": "Izinkan",
+    "Buttons_Apply": "Terapkan",
     "Buttons_ApplyTheme": "Terapkan Tema",
     "Buttons_Browse": "Telusuri",
     "Buttons_Cancel": "Batal",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Ubah",
     "Buttons_EnableImageRendering": "Nyalakan",
     "Buttons_Multiselect": "Pilih Beberapa",
+    "Buttons_Manage": "Kelola",
     "Buttons_No": "Tidak",
     "Buttons_Open": "Buka",
     "Buttons_Purchase": "Beli",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Simpan",
     "Buttons_SaveConfiguration": "Simpan Pengaturan",
     "Buttons_Send": "Kirim",
+    "Buttons_SendToServer": "Kirim ke server",
     "Buttons_Share": "Bagikan",
     "Buttons_SignIn": "Masuk",
     "Buttons_Sync": "Selaraskan",
     "Buttons_SyncAliases": "Selaraskan Alias",
     "Buttons_TryAgain": "Coba Lagi",
     "Buttons_Yes": "Ya",
+    "Sync_SynchronizingFolder": "Sinkronisasi {0} {1}%",
+    "Sync_DownloadedMessages": "{0} pesan telah diunduh dari {1}",
+    "SyncAction_Archiving": "Mengarsipkan {0} surel",
+    "SyncAction_ClearingFlag": "Menghapus penanda pada {0} surel",
+    "SyncAction_CreatingDraft": "Membuat draf",
+    "SyncAction_CreatingEvent": "Membuat acara",
+    "SyncAction_Deleting": "Menghapus {0} surel",
+    "SyncAction_EmptyingFolder": "Mengosongkan folder",
+    "SyncAction_MarkingAsRead": "Menandai {0} surel sebagai telah dibaca",
+    "SyncAction_MarkingAsUnread": "Menandai {0} surel sebagai belum dibaca",
+    "SyncAction_MarkingFolderAsRead": "Menandai folder sebagai telah dibaca",
+    "SyncAction_Moving": "Memindahkan {0} surel",
+    "SyncAction_MovingToFocused": "Memindahkan {0} surel ke Fokus",
+    "SyncAction_RenamingFolder": "Mengganti nama folder",
+    "SyncAction_SendingMail": "Mengirim surel",
+    "SyncAction_SettingFlag": "Menandai {0} surel dengan bendera",
+    "SyncAction_SynchronizingAccount": "Menyinkronkan {0}",
+    "SyncAction_SynchronizingAccounts": "Menyinkronkan {0} akun",
+    "SyncAction_SynchronizingCalendarData": "Menyinkronkan data kalender",
+    "SyncAction_SynchronizingCalendarEvents": "Menyinkronkan acara kalender",
+    "SyncAction_SynchronizingCalendarMetadata": "Menyinkronkan metadata kalender",
+    "SyncAction_Unarchiving": "Mengembalikan {0} surel dari arsip",
     "CalendarAllDayEventSummary": "acara sepanjang hari",
     "CalendarDisplayOptions_Color": "Warna",
     "CalendarDisplayOptions_Expand": "Perluas",
+    "CalendarEventResponse_Accept": "Terima",
+    "CalendarEventResponse_AcceptedResponse": "Diterima",
+    "CalendarEventResponse_Decline": "Tolak",
+    "CalendarEventResponse_DeclinedResponse": "Ditolak",
+    "CalendarEventResponse_NotResponded": "Belum menanggapi",
+    "CalendarEventResponse_Tentative": "Tentatif",
+    "CalendarEventResponse_TentativeResponse": "Tentatif",
+    "CalendarEventRsvpPanel_Accept": "Terima",
+    "CalendarEventRsvpPanel_AddMessage": "Tambahkan pesan ke tanggapan Anda... (opsional)",
+    "CalendarEventRsvpPanel_Decline": "Tolak",
+    "CalendarEventRsvpPanel_Message": "Pesan",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Kirim balasan pesan",
+    "CalendarEventRsvpPanel_Tentative": "Tentatif",
+    "CalendarEventRsvpPanel_Title": "Pilihan Tanggapan",
+    "CalendarAttendeeStatus_Accepted": "Diterima",
+    "CalendarAttendeeStatus_Declined": "Ditolak",
+    "CalendarAttendeeStatus_NeedsAction": "Perlu tindakan",
+    "CalendarAttendeeStatus_Tentative": "Tentatif",
+    "CalendarEventDetails_Attachments": "Lampiran",
+    "CalendarEventCompose_AddAttachment": "Tambahkan lampiran",
+    "CalendarEventCompose_AllDay": "Sepanjang hari",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Lampiran tidak didukung untuk kalender CalDAV.",
+    "CalendarEventCompose_EndDate": "Tanggal selesai",
+    "CalendarEventCompose_EndTime": "Waktu selesai",
+    "CalendarEventCompose_Every": "setiap",
+    "CalendarEventCompose_ForWeekdays": "untuk",
+    "CalendarEventCompose_FrequencyDay": "hari",
+    "CalendarEventCompose_FrequencyDayPlural": "hari",
+    "CalendarEventCompose_FrequencyMonth": "bulan",
+    "CalendarEventCompose_FrequencyMonthPlural": "bulan",
+    "CalendarEventCompose_FrequencyWeek": "minggu",
+    "CalendarEventCompose_FrequencyWeekPlural": "minggu",
+    "CalendarEventCompose_FrequencyYear": "tahun",
+    "CalendarEventCompose_FrequencyYearPlural": "tahun",
+    "CalendarEventCompose_Location": "Lokasi",
+    "CalendarEventCompose_LocationPlaceholder": "Tambahkan lokasi",
+    "CalendarEventCompose_NewEventButton": "Acara Baru",
+    "CalendarEventCompose_DefaultCalendarHint": "Anda dapat memilih kalender default untuk acara baru di Pengaturan Kalender.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Buka Pengaturan Kalender",
+    "CalendarEventCompose_NoCalendarsMessage": "Belum ada kalender yang tersedia untuk membuat acara.",
+    "CalendarEventCompose_NoCalendarsTitle": "Tidak ada kalender tersedia",
+    "CalendarEventCompose_NoEndDate": "Tidak ada tanggal selesai",
+    "CalendarEventCompose_Notes": "Catatan",
+    "CalendarEventCompose_PickCalendarTitle": "Pilih kalender",
+    "CalendarEventCompose_Recurring": "Berulang",
+    "CalendarEventCompose_RecurringSummary": "Terjadi setiap {0} {1}{2} {3} berlaku {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Terjadi {0}{1} {2} berlaku {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Ulangi setiap",
+    "CalendarEventCompose_SelectCalendar": "Pilih kalender",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Terjadi pada {0} {1}",
+    "CalendarEventCompose_StartDate": "Tanggal mulai",
+    "CalendarEventCompose_StartTime": "Waktu mulai",
+    "CalendarEventCompose_TimeRangeSummary": "dari {0} hingga {1}",
+    "CalendarEventCompose_Title": "Judul acara",
+    "CalendarEventCompose_TitlePlaceholder": "Tambahkan judul",
+    "CalendarEventCompose_Until": "sampai",
+    "CalendarEventCompose_UntilSummary": " hingga {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Tanggal akhir untuk acara sepanjang hari harus setelah tanggal mulai.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Salah satu atau lebih peserta memiliki alamat email yang tidak valid.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Tanggal akhir pengulangan harus sama dengan atau setelah tanggal mulai acara.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Waktu selesai harus lebih lama daripada waktu mulai.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Satu atau lebih lampiran tidak lagi tersedia: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Pilih kalender sebelum membuat acara.",
+    "CalendarEventCompose_ValidationMissingTitle": "Masukkan judul acara sebelum membuat acara.",
+    "CalendarEventCompose_ValidationTitle": "Validasi acara gagal",
+    "CalendarEventCompose_WeekdaySummary": " pada {0}",
+    "CalendarEventCompose_Weekday_Friday": "F",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "Sab",
+    "CalendarEventCompose_Weekday_Sunday": "Min",
+    "CalendarEventCompose_Weekday_Thursday": "Kam",
+    "CalendarEventCompose_Weekday_Tuesday": "Sel",
+    "CalendarEventCompose_Weekday_Wednesday": "Rab",
+    "CalendarEventDetails_Details": "Rincian",
+    "CalendarEventDetails_EditSeries": "Ubah Seri",
+    "CalendarEventDetails_Editing": "Menyunting",
+    "CalendarEventDetails_InviteSomeone": "Undang orang lain",
+    "CalendarEventDetails_JoinOnline": "Gabung Online",
+    "CalendarEventDetails_Organizer": "Penyelenggara",
+    "CalendarEventDetails_People": "Orang",
+    "CalendarEventDetails_ReadOnlyEvent": "Acara hanya baca",
+    "CalendarEventDetails_Reminder": "Pengingat",
+    "CalendarReminder_StartedHoursAgo": "Dimulai {0} jam yang lalu",
+    "CalendarReminder_StartedMinutesAgo": "Dimulai {0} menit yang lalu",
+    "CalendarReminder_StartedNow": "Baru saja dimulai",
+    "CalendarReminder_StartingNow": "Mulai sekarang",
+    "CalendarReminder_StartsInHours": "Dimulai dalam {0} jam",
+    "CalendarReminder_StartsInMinutes": "Dimulai dalam {0} menit",
+    "CalendarReminder_SnoozeAction": "Tunda",
+    "CalendarReminder_SnoozeMinutesOption": "{0} menit",
+    "CalendarEventDetails_ShowAs": "Tampilkan sebagai",
+    "CalendarShowAs_Free": "Tersedia",
+    "CalendarShowAs_Tentative": "Sementara",
+    "CalendarShowAs_Busy": "Sibuk",
+    "CalendarShowAs_OutOfOffice": "Di luar kantor",
+    "CalendarShowAs_WorkingElsewhere": "Bekerja di tempat lain",
     "CalendarItem_DetailsPopup_JoinOnline": "Bergabung secara daring",
     "CalendarItem_DetailsPopup_ViewEventButton": "Lihat acara",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Lihat seri",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} disalin ke papan klip.",
     "ClipboardTextCopied_Title": "Disalin",
     "ClipboardTextCopyFailed_Message": "Gagal menyalin {0} ke papan klip.",
+    "ContactInfoBar_ErrorTitle": "Gagal memuat informasi kontak",
+    "ContactInfoBar_SuccessTitle": "Informasi kontak dimuat",
+    "ContactInfoBar_WarningTitle": "Informasi kontak mungkin tidak lengkap",
     "ComingSoon": "Segera datang...",
     "ComposerAttachmentsDragDropAttach_Message": "Lampirkan",
     "ComposerAttachmentsDropZone_Message": "Jatuhkan berkas Anda di sini",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nama Tautan Akun",
     "DialogMessage_DeleteAccountConfirmationMessage": "Hapus {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Semua data terkait akun ini akan dihapus secara permanen dari penyimpanan.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Hapus template \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Hapus Email Template",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Ini akan menghapus semua acara dalam seri ini. Anda ingin melanjutkan?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Hapus Seri Berulang",
     "DialogMessage_DiscardDraftConfirmationMessage": "Konsep ini akan dibuang. Apakah Anda ingin melanjutkan?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Buang Konsep",
     "DialogMessage_EmptySubjectConfirmation": "Tidak Ada Perihal",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Mode terang",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Gagal menyiapkan folder sistem",
+    "Exception_AccountNeedsAttention_Title": "Akun membutuhkan perhatian",
+    "Exception_AccountNeedsAttention_Message": "'{0}' memerlukan perhatian Anda untuk melanjutkan.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail tidak dapat menemukan runtime Microsoft Edge WebView2. Harap pasang atau perbaiki runtime untuk menampilkan isi pesan dengan benar.",
+    "Exception_WebView2RuntimeMissing_Title": "Runtime WebView2 diperlukan",
     "Exception_AuthenticationCanceled": "Otentikasi dibatalkan",
     "Exception_CustomThemeExists": "Tema ini sudah ada.",
     "Exception_CustomThemeMissingName": "Anda harus memberikan nama.",
     "Exception_CustomThemeMissingWallpaper": "Anda harus memberikan gambar latar Anda sendiri.",
     "Exception_FailedToSynchronizeAliases": "Gagal menyelaraskan alias",
+    "Exception_FailedToSynchronizeCalendarData": "Gagal menyinkronkan data kalender",
+    "Exception_FailedToSynchronizeCalendarEvents": "Gagal menyinkronkan peristiwa kalender",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Gagal menyinkronkan detail kalender",
     "Exception_FailedToSynchronizeFolders": "Gagal menyelaraskan folder",
     "Exception_FailedToSynchronizeProfileInformation": "Gagal menyelaraskan informasi profil",
     "Exception_GoogleAuthCallbackNull": "Alamat panggilan menghasilkan balasan kosong.",
@@ -188,7 +330,7 @@
     "Exception_ImapClientPoolFailed": "Gagal IMAP Client Pool.",
     "Exception_InboxNotAvailable": "Gagal menyiapkan folder akun.",
     "Exception_InvalidSystemFolderConfiguration": "Pengaturan folder sistem tidak valid. Mohon periksa pengaturan dan coba lagi.",
-    "Exception_InvalidMultiAccountMoveTarget": "Anda tidak dapat memindahkan item yang berada di akun yang berbeda di akun tertaut.",
+    "Exception_InvalidMultiAccountMoveTarget": "You can't move multiple items that belong to different accounts in linked account.",
     "Exception_MailProcessing": "Surel ini sedang diproses. Harap coba lagi nanti.",
     "Exception_MissingAlias": "Alias utama tidak ada untuk akun ini. Gagal membuat draf.",
     "Exception_NullAssignedAccount": "Akun yang diberikan kosong",
@@ -221,33 +363,59 @@
     "GeneralTitle_Error": "Galat",
     "GeneralTitle_Info": "Informasi",
     "GeneralTitle_Warning": "Peringatan",
-    "GmailServiceDisabled_Title": "Galat Gmail",
-    "GmailServiceDisabled_Message": "Akun Google Workspace Anda sepertinya tidak mengizinkan Gmail. Mohon hubungi administrator akun Google Workspace Anda untuk mengizinkan Gmail.",
-    "GmailArchiveFolderNameOverride": "Asip",
+    "GmailServiceDisabled_Title": "Gmail Error",
+    "GmailServiceDisabled_Message": "Your Google Workspace account seems to be disabled for Gmail service. Please contact your administrator to enable Gmail service for your account.",
+    "GmailArchiveFolderNameOverride": "Archive",
     "HoverActionOption_Archive": "Arsipkan",
     "HoverActionOption_Delete": "Hapus",
     "HoverActionOption_MoveJunk": "Pindahkan ke Sampah",
     "HoverActionOption_ToggleFlag": "Tandai / Hapus Tanda",
     "HoverActionOption_ToggleRead": "Baca / Belum Dibaca",
+    "KeyboardShortcuts_FailedToReset": "Gagal mereset pintasan keyboard.",
+    "KeyboardShortcuts_FailedToUpdate": "Gagal memperbarui pintasan keyboard",
+    "KeyboardShortcuts_MailoperationAction": "Aksi",
+    "KeyboardShortcuts_Action": "Aksi",
+    "KeyboardShortcuts_FailedToLoad": "Gagal memuat pintasan keyboard.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Harap masukkan tombol untuk pintasan.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Pilih sebuah aksi untuk pintasan.",
+    "KeyboardShortcuts_EnterKey": "Harap masukkan tombol untuk pintasan.",
+    "KeyboardShortcuts_SelectOperation": "Pilih sebuah aksi untuk pintasan.",
+    "KeyboardShortcuts_ShortcutInUse": "Pintasan ini sudah digunakan oleh pintasan lain.",
+    "KeyboardShortcuts_FailedToSave": "Gagal menyimpan pintasan.",
+    "KeyboardShortcuts_FailedToDelete": "Gagal menghapus pintasan.",
+    "KeyboardShortcuts_PageDescription": "Mengatur pintasan keyboard untuk operasi email cepat. Tekan tombol saat fokus pada bidang input tombol untuk menangkap pintasan.",
+    "KeyboardShortcuts_Add": "Tambahkan pintasan",
+    "KeyboardShortcuts_EditTitle": "Ubah Pintasan Keyboard",
+    "KeyboardShortcuts_ResetToDefaults": "Kembalikan ke Default",
+    "KeyboardShortcuts_PressKeysHere": "Tekan tombol di sini...",
+    "KeyboardShortcuts_KeyCombination": "Kombinasi tombol",
+    "KeyboardShortcuts_FocusArea": "Fokuskan bidang di atas dan tekan kombinasi tombol yang diinginkan",
+    "KeyboardShortcuts_Modifiers": "Tombol modifier",
+    "KeyboardShortcuts_Mode": "Mode Aplikasi",
+    "KeyboardShortcuts_ModeMail": "Email",
+    "KeyboardShortcuts_ModeCalendar": "Kalender",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Ganti telah dibaca/belum dibaca",
+    "KeyboardShortcuts_ActionToggleFlag": "Ganti tanda",
+    "KeyboardShortcuts_ActionToggleArchive": "Ganti arsipkan/batalkan arsip",
     "ImageRenderingDisabled": "Pemuatan gambar dimatikan untuk pesan ini.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Metode otentikasi",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Keamanan sambungan",
-    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "Metode otentikasi diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationConnectionSecurityRequired": "Jenis keamanan sambungan diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationDisplayNameRequired": "Nama tampilan diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationEmailInvalid": "Mohon masukkan alamat surel yang benar",
-    "IMAPAdvancedSetupDialog_ValidationEmailRequired": "Alamat surel diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationErrorTitle": "Mohon periksa:",
-    "IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid": "Port masuk harus antara 1-65535",
-    "IMAPAdvancedSetupDialog_ValidationIncomingPortRequired": "Port peladen masuk diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationIncomingServerRequired": "Alamat peladen masuk diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired": "Sandi peladen keluar diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid": "Port keluar harus antara 1-65535",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired": "Port peladen keluar diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired": "Alamat peladen keluar diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired": "Nama pengguna peladen keluar diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationPasswordRequired": "Sandi diperlukan",
-    "IMAPAdvancedSetupDialog_ValidationUsernameRequired": "Nama pengguna diperlukan",
+    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "Authentication method is required",
+    "IMAPAdvancedSetupDialog_ValidationConnectionSecurityRequired": "Connection security type is required",
+    "IMAPAdvancedSetupDialog_ValidationDisplayNameRequired": "Display name is required",
+    "IMAPAdvancedSetupDialog_ValidationEmailInvalid": "Please enter a valid email address",
+    "IMAPAdvancedSetupDialog_ValidationEmailRequired": "Email address is required",
+    "IMAPAdvancedSetupDialog_ValidationErrorTitle": "Please check the following:",
+    "IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid": "Incoming port must be between 1-65535",
+    "IMAPAdvancedSetupDialog_ValidationIncomingPortRequired": "Incoming server port is required",
+    "IMAPAdvancedSetupDialog_ValidationIncomingServerRequired": "Incoming server address is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired": "Outgoing server password is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid": "Outgoing port must be between 1-65535",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired": "Outgoing server port is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired": "Outgoing server address is required",
+    "IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired": "Outgoing server username is required",
+    "IMAPAdvancedSetupDialog_ValidationPasswordRequired": "Password is required",
+    "IMAPAdvancedSetupDialog_ValidationUsernameRequired": "Username is required",
     "ImapAuthenticationMethod_Auto": "Otomatis",
     "ImapAuthenticationMethod_CramMD5": "CRAM-MD5",
     "ImapAuthenticationMethod_DigestMD5": "DIGEST-MD5",
@@ -260,11 +428,11 @@
     "ImapConnectionSecurity_SslTls": "SSL/TLS",
     "ImapConnectionSecurity_StartTls": "STARTTLS",
     "IMAPSetupDialog_AccountType": "Jenis akun",
-    "IMAPSetupDialog_ValidationSuccess_Title": "Berhasil",
-    "IMAPSetupDialog_ValidationSuccess_Message": "Validasi berhasil",
-    "IMAPSetupDialog_SaveImapSuccess_Title": "Berhasil",
-    "IMAPSetupDialog_SaveImapSuccess_Message": "Pengaturan IMAP berhasil disimpan.",
-    "IMAPSetupDialog_ValidationFailed_Title": "Validasi peladen IMAP gagal.",
+    "IMAPSetupDialog_ValidationSuccess_Title": "Success",
+    "IMAPSetupDialog_ValidationSuccess_Message": "Validation successful",
+    "IMAPSetupDialog_SaveImapSuccess_Title": "Success",
+    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP settings saved successfuly.",
+    "IMAPSetupDialog_ValidationFailed_Title": "IMAP Server validation failed.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "Peladen ini meminta pertukaran SSL untuk melanjutkan. Mohon pastikan rincian sertifikat di bawah ini.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "Izinkan pertukaran untuk melanjutkan mengatur akun Anda.",
     "IMAPSetupDialog_CertificateDenied": "Pengguna tidak mengotorisasi pertukaran sertifikat.",
@@ -279,8 +447,8 @@
     "IMAPSetupDialog_DisplayNamePlaceholder": "misal: Budi Susilo",
     "IMAPSetupDialog_IncomingMailServer": "Peladen email masuk",
     "IMAPSetupDialog_IncomingMailServerPort": "Port",
-    "IMAPSetupDialog_IMAPSettings": "Pengaturan Peladen IMAP",
-    "IMAPSetupDialog_SMTPSettings": "Pengaturan Peladen SMTP",
+    "IMAPSetupDialog_IMAPSettings": "IMAP Server Settings",
+    "IMAPSetupDialog_SMTPSettings": "SMTP Server Settings",
     "IMAPSetupDialog_MailAddress": "Alamat surel",
     "IMAPSetupDialog_MailAddressPlaceholder": "nama@contoh.com",
     "IMAPSetupDialog_OutgoingMailServer": "Peladen surel keluar (SMTP)",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nama Pengguna",
     "IMAPSetupDialog_UsernamePlaceholder": "budisusilo, budisusilo@contoh.com, domain/budisusilo",
     "IMAPSetupDialog_UseSameConfig": "Gunakan nama pengguna dan kata sandi yang sama untuk mengirim surel",
+    "ImapCalDavSettingsPage_TitleCreate": "Pengaturan IMAP dan Kalender",
+    "ImapCalDavSettingsPage_TitleEdit": "Ubah Pengaturan IMAP dan Kalender",
+    "ImapCalDavSettingsPage_Subtitle": "Atur IMAP/SMTP dan sinkronisasi kalender opsional untuk akun ini.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Pengaturan dasar",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Masukkan identitas dan kredensial Anda. Wino dapat mencoba mendeteksi pengaturan server secara otomatis.",
+    "ImapCalDavSettingsPage_BasicTab": "Dasar",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Aktifkan dukungan kalender",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Cari otomatis pengaturan email",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Pengaturan email ditemukan dan diterapkan.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Konfigurasi lanjutan",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Masukkan pengaturan server secara manual jika autodiscovery tidak tersedia atau tidak benar.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Lanjutan",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Pengaturan Kalender",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Pilih bagaimana data kalender seharusnya bekerja untuk akun IMAP ini.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Mode Kalender",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Keamanan koneksi",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Metode otentikasi",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Dinonaktifkan",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sinkronisasi CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Hanya kalender lokal",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalender dinonaktifkan untuk akun ini.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Item kalender disinkronkan dengan server CalDAV Anda.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Item kalender disimpan hanya di komputer ini dan tidak disinkronkan ke jaringan.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Cara kerja kalender lokal",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Kalender lokal saja",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Kalender lokal menyimpan semua acara hanya di komputer Anda. Tidak ada yang disinkronkan ke iCloud, Yahoo, atau penyedia lainnya.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL layanan CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nama pengguna CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Kata sandi CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Pengujian CalDAV diperlukan hanya jika mode kalender diatur ke sinkronisasi CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL layanan CalDAV diperlukan.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL layanan CalDAV harus berupa URL absolut.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Nama pengguna CalDAV diperlukan.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Kata sandi CalDAV diperlukan.",
+    "ImapCalDavSettingsPage_TestImapButton": "Uji koneksi IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Uji koneksi CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Pengujian koneksi IMAP berhasil.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Pengujian koneksi CalDAV berhasil.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Pengaturan akun telah divalidasi dan disimpan.",
+    "ImapCalDavSettingsPage_ICloudHint": "Gunakan kata sandi khusus aplikasi yang dihasilkan dari pengaturan akun Apple Anda.",
+    "ImapCalDavSettingsPage_YahooHint": "Gunakan kata sandi aplikasi dari pengaturan keamanan akun Yahoo Anda.",
     "Info_AccountCreatedMessage": "{0} telah dibuat",
     "Info_AccountCreatedTitle": "Buat Akun",
     "Info_AccountCreationFailedTitle": "Gagal Membuat Akun",
     "Info_AccountDeletedMessage": "{0} berhasil dihapus.",
     "Info_AccountDeletedTitle": "Akun Dihapus",
     "Info_AccountIssueFixFailedTitle": "Gagal",
+    "Info_AccountIssueFixImapMessage": "Buka halaman pengaturan IMAP dan kalender untuk memasukkan kredensial server Anda lagi.",
+    "Info_AccountAttentionRequiredMessage": "Akun ini memerlukan perhatian Anda.",
+    "Info_AccountAttentionRequiredClickableMessage": "Klik untuk memperbaiki akun ini dan melakukan sinkronisasi ulang.",
+    "Info_AccountAttentionRequiredAction": "Perbaiki",
+    "Info_AccountAttentionRequiredActionHint": "Klik Perbaiki untuk menyelesaikan masalah akun ini.",
     "Info_AccountIssueFixSuccessMessage": "Semua masalah akun diperbaiki.",
     "Info_AccountIssueFixSuccessTitle": "Berhasil",
     "Info_AttachmentOpenFailedMessage": "Tidak dapat membuka lampiran ini.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Penyelarasan folder ini dimatikan.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Folder yang Dimatikan",
     "Justify": "Rata kiri kanan",
+    "MenuUpdateAvailable": "Pembaruan Tersedia",
     "Left": "Kiri",
     "Link": "Tautan",
     "LinkedAccountsCreatePolicyMessage": "Anda harus memiliki paling sedikit 2 akun untuk membuat tautan\nTautan akan dihapus",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Batalkan arsip",
     "MailOperation_ViewMessageSource": "Lihat sumber pesan",
     "MailOperation_Zoom": "Perbesaran",
+    "MailsDragging": "Menggeser {0} item",
     "MailsSelected": "{0} item dipilih",
     "MarkFlagUnflag": "Berikan/batal berikan tanda",
     "MarkReadUnread": "Tandai sudah/belum dibaca",
@@ -434,9 +650,11 @@
     "Notifications_MultipleNotificationsTitle": "Pesan Baru",
     "Notifications_WinoUpdatedMessage": "Versi baru terpasang {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail telah diperbarui.",
-    "OnlineSearchFailed_Message": "Gagal mencari\n{0}\n\nSurel luring ditampilkan.",
-    "OnlineSearchTry_Line1": "Tidak dapat menemukan yang Anda cari?",
-    "OnlineSearchTry_Line2": "Coba pencarian daring.",
+    "Notifications_StoreUpdateAvailableTitle": "Pembaruan Tersedia",
+    "Notifications_StoreUpdateAvailableMessage": "Versi Wino Mail yang lebih baru siap diinstal dari Microsoft Store.",
+    "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
+    "OnlineSearchTry_Line1": "Can't find what you are looking for?",
+    "OnlineSearchTry_Line2": "Try online search.",
     "Other": "Lainnya",
     "PaneLengthOption_Default": "Bawaan",
     "PaneLengthOption_ExtraLarge": "Ekstra Besar",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Kecil",
     "Photos": "Foto",
     "PreparingFoldersMessage": "Menyiapkan folder",
-    "ProtocolLogAvailable_Message": "Catatan log protokol kini tersedia untuk pengawakutuan.",
     "ProviderDetail_Gmail_Description": "Akun Google",
     "ProviderDetail_iCloud_Description": "Akun iCloud Apple",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Cari",
     "SearchingIn": "Mencari di",
     "SearchPivotName": "Hasil",
+    "Settings_KeyboardShortcuts_Title": "Pintasan Keyboard",
+    "Settings_KeyboardShortcuts_Description": "Kelola pintasan keyboard untuk tindakan cepat pada surel.",
     "SettingConfigureSpecialFolders_Button": "Atur",
-    "SettingsEditAccountDetails_IMAPConfiguration_Title": "Pengaturan IMAP/SMTP",
-    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Ubah pengaturan peladen masuk/keluar.",
+    "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
+    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Pengaturan IMAP dan kalender",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Buka halaman pengaturan khusus IMAP, SMTP, dan CalDAV untuk akun ini.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Buka pengaturan",
     "SettingsAbout_Description": "Lebih lanjut tentang Wino.",
     "SettingsAbout_Title": "Tentang",
     "SettingsAboutGithub_Description": "Pergi ke pelacak masalah di repository GitHub.",
@@ -486,10 +708,14 @@
     "SettingsAppPreferences_CloseBehavior_Description": "Apa yang harus terjadi ketika Anda menutup aplikasi?",
     "SettingsAppPreferences_CloseBehavior_Title": "Perilaku saat menutup aplikasi",
     "SettingsAppPreferences_Description": "Pengaturan umum untuk Wino Mail.",
-    "SettingsAppPreferences_SearchMode_Description": "Atur apakah Winno harus mencari di tembolok secara luring atau daring. Pencarian luring selalu lebih cepat. Anda dapat melakukan pencarian daring jika surel yang Anda cari tidak muncul di hasil pencarian.",
-    "SettingsAppPreferences_SearchMode_Local": "Luring",
-    "SettingsAppPreferences_SearchMode_Online": "Daring",
-    "SettingsAppPreferences_SearchMode_Title": "Modus pencarian bawaan",
+    "SettingsAppPreferences_SearchMode_Description": "Set whether Wino should check fetched mails first while doing a search or ask your mail server online. Local search is always faster and you can always do an online search if your mail is not in the results.",
+    "SettingsAppPreferences_SearchMode_Local": "Local",
+    "SettingsAppPreferences_SearchMode_Online": "Online",
+    "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Mode aplikasi bawaan",
+    "SettingsAppPreferences_ApplicationMode_Description": "Pilih mode aplikasi bawaan saat tidak ada tipe aktivasi yang ditetapkan secara eksplisit.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Surel",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalender",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail akan tetap berjalan di latar belakang. Pemberitahuan surel baru akan tetap berfungsi.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Jalankan di latar belakang",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail akan tetap berjalan di baki sistem. Anda dapat membuka Wino Mail dengan mengeklik ikon. Pemberitahuan surel baru akan tetap berfungsi.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Galat kritis terjadi saat mengubah modus mulai untuk Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Mulai dan minimalkan saat menyalakan Windows",
     "SettingsAppPreferences_Title": "Pengaturan Aplikasi",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Sembunyikan tombol akun Wino di bilah judul",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Sembunyikan tombol profil di bilah judul yang membuka flyout akun Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Pemberitahuan pembaruan toko",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Tampilkan pemberitahuan dan tindakan footer saat pembaruan Microsoft Store tersedia.",
+    "SettingsAppPreferences_AiActions_Title": "Tindakan AI",
+    "SettingsAppPreferences_AiActions_Description": "Pilih bahasa AI bawaan dan tempat ringkasan disimpan.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Bahasa terjemahan bawaan",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Pilih bahasa target default yang digunakan oleh tindakan terjemahan AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Bahasa ringkasan",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Pilih bahasa yang akan digunakan untuk ringkasan keluaran AI di masa mendatang.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Lokasi penyimpanan ringkasan bawaan",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Pilih folder yang akan digunakan Wino secara default saat menyimpan ringkasan AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Gunakan lokasi penyimpanan default sistem",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Folder ini tidak ada. Lokasi penyimpanan default akan digunakan untuk ringkasan.",
     "SettingsAutoSelectNextItem_Description": "Pilih item berikutnya setelah Anda menghapus atau memindahkan surel.",
     "SettingsAutoSelectNextItem_Title": "Pilih item berikutnya secara otomatis",
     "SettingsAvailableThemes_Description": "Pilih sebuah tema atau buat tema Anda sendiri.",
     "SettingsAvailableThemes_Title": "Tema yang Tersedia",
     "SettingsCalendarSettings_Description": "Ubah hari pertama dalam pekan, tinggi kotak jam, dan lain-lain...",
     "SettingsCalendarSettings_Title": "Pengaturan Kalender",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Durasi snooze bawaan",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Atur durasi snooze bawaan untuk pemberitahuan pengingat kalender.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Format header hari tampilan terjadwal",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Pilih bagaimana label hari teratas dirender pada tampilan hari, minggu, dan minggu kerja. Gunakan token format tanggal seperti ddd, dd, MMM, atau dddd.",
     "SettingsComposer_Title": "Bidang penulisan",
     "SettingsComposerFont_Title": "Fon Bawaan",
     "SettingsComposerFontFamily_Description": "Ubah fon bawaan dan ukuran fon saat menulis surel.",
@@ -521,16 +765,19 @@
     "SettingsCustomTheme_Title": "Tema Khusus",
     "SettingsDeleteAccount_Description": "Hapus semua surel dan informasi tentang akun ini.",
     "SettingsDeleteAccount_Title": "Hapus akun ini",
-    "SettingsDeleteProtection_Description": "Haruskah Wino selalu meminta persetujuan setiap kali Anda menghapus permanen surel dengan tombol Shift + Del?",
+    "SettingsDeleteProtection_Description": "Should Wino ask you for confirmation every time you try to permanently delete a mail using Shift + Del keys?",
     "SettingsDeleteProtection_Title": "Perlindungan Hapus Permanen",
     "SettingsDiagnostics_Description": "Untuk pengembang",
-    "SettingsDiagnostics_DiagnosticId_Description": "Bagikan ID ini ke para pengembang saat diminta untuk mendapatkan bantuan masalah yang dialami di Wino Mail.",
-    "SettingsDiagnostics_DiagnosticId_Title": "ID Pengawakutuan",
+    "SettingsDiagnostics_DiagnosticId_Description": "Share this ID with the developers when asked to get help for the issues you experience in Wino Mail.",
+    "SettingsDiagnostics_DiagnosticId_Title": "Diagnostic ID",
     "SettingsDiagnostics_Title": "Diagnostik",
     "SettingsDiscord_Description": "Dapatkan pemberuan pengembangan, gabung dengan obrolan pengembangan dan berikan masukan.",
     "SettingsDiscord_Title": "Saluran Discord",
     "SettingsEditLinkedInbox_Description": "Tambah/hapus akun, ubah nama, atau hapus tautan antara akun.",
     "SettingsEditLinkedInbox_Title": "Sunting Kotak Masuk Tertaut",
+    "SettingsWindowBackdrop_Title": "Latar belakang jendela",
+    "SettingsWindowBackdrop_Description": "Pilih efek latar belakang untuk jendela Wino.",
+    "SettingsWindowBackdrop_Disabled": "Pemilihan latar belakang jendela dinonaktifkan saat tema aplikasi dipilih selain Default.",
     "SettingsElementTheme_Description": "Pilih tema Windows untuk Wino",
     "SettingsElementTheme_Title": "Tema Elemen",
     "SettingsElementThemeSelectionDisabled": "Pilihan tema elemen dimatikan saat tema aplikasi bawaan tidak dipilih.",
@@ -579,8 +826,10 @@
     "SettingsManageAccountSettings_Title": "Kelole Pengaturan Akun",
     "SettingsManageAliases_Description": "Lihat, perbarui, dan hapus alias untuk akun ini.",
     "SettingsManageAliases_Title": "Alias",
-    "SettingsEditAccountDetails_Title": "Sunting rincian akun",
-    "SettingsEditAccountDetails_Description": "Ubah nama akun, nama pengirim, dan atur warna akun.",
+    "SettingsEditAccountDetails_Title": "Edit Account Details",
+    "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Perubahan Disimpan",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Rincian akun Anda telah berhasil diperbarui.",
     "SettingsManageLink_Description": "Pindahkan item untuk menambahkan tautan baru atau hapus tautan yang sudah ada.",
     "SettingsManageLink_Title": "Kelola Tautan",
     "SettingsMarkAsRead_Description": "Ubah apa yang terjadi ke item yang dipilih.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Pemberitahuan",
     "SettingsNotificationsAndTaskbar_Description": "Ubah apakah pemberitahuan dan lencana bilah tugas harus ditampilkan untuk akun ini.",
     "SettingsNotificationsAndTaskbar_Title": "Pemberitahuan & Bilah Tugas",
+    "SettingsHome_Title": "Beranda",
+    "SettingsHome_SearchTitle": "Cari pengaturan",
+    "SettingsHome_SearchDescription": "Cari berdasarkan fitur, topik, atau kata kunci untuk langsung menuju halaman pengaturan yang tepat.",
+    "SettingsHome_SearchPlaceholder": "Cari pengaturan",
+    "SettingsHome_SearchExamples": "Coba: tema, penyimpanan, bahasa, tanda tangan",
+    "SettingsHome_QuickLinks_Title": "Tautan cepat",
+    "SettingsHome_QuickLinks_Description": "Langsung ke pengaturan yang paling sering diakses.",
+    "SettingsHome_StorageCard_Description": "Lihat berapa banyak konten MIME lokal yang disimpan Wino di perangkat ini dan bersihkan jika diperlukan.",
+    "SettingsHome_StorageEmptySummary": "Belum ada konten MIME yang di-cache.",
+    "SettingsHome_StorageLoading": "Memeriksa penggunaan MIME lokal...",
+    "SettingsHome_Tips_Title": "Tips & Trik",
+    "SettingsHome_Tips_Description": "Beberapa perubahan kecil dapat membuat Wino terasa jauh lebih personal.",
+    "SettingsHome_Tip_Theme": "Ingin mode gelap atau perubahan aksen? Buka Personalisasi.",
+    "SettingsHome_Tip_Background": "Gunakan Preferensi Aplikasi untuk mengontrol perilaku startup dan sinkronisasi latar belakang.",
+    "SettingsHome_Tip_Shortcuts": "Pintasan keyboard membantu Anda menavigasi surel lebih cepat.",
+    "SettingsHome_Resources_Title": "Tautan yang berguna",
+    "SettingsHome_Resources_Description": "Buka sumber daya proyek, info dukungan, dan saluran rilis.",
     "SettingsOptions_Title": "Pengaturan",
+    "SettingsOptions_GeneralSection": "Umum",
+    "SettingsOptions_MailSection": "Surel",
+    "SettingsOptions_CalendarSection": "Kalender",
+    "SettingsOptions_MoreComingSoon": "Opsi lain akan datang segera",
+    "SettingsOptions_HeroDescription": "Sesuaikan pengalaman Wino Mail Anda.",
+    "SettingsOptions_AccountsSummary": "{0} akun yang dikonfigurasi",
+    "SettingsSearch_ManageAccounts_Keywords": "akun;akun;kotak surat;kotak surat;alias;alias;profil;alamat;alamat",
+    "SettingsSearch_AppPreferences_Keywords": "awal;latar belakang;peluncuran;sinkronisasi;notifikasi;notifikasi;pencarian;ikon baki;bawaan",
+    "SettingsSearch_LanguageTime_Keywords": "bahasa;waktu;jam;locale;wilayah;format;24 jam;24 jam",
+    "SettingsSearch_Personalization_Keywords": "tema;gelap;terang;penampilan;aksen;warna;warna;mode;tata letak;kepadatan",
+    "SettingsSearch_About_Keywords": "tentang;versi;situs web;privasi;github;donasi;toko;dukungan",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "pintasan;pintasan;tombol pintas;tombol pintas;papan ketik;tombol",
+    "SettingsSearch_MessageList_Keywords": "pesan;pesan;daftar;percabangan;utas;avatar;pratinjau;pengirim",
+    "SettingsSearch_ReadComposePane_Keywords": "pembaca;menulis;penyusun;font;font;konten eksternal;tampilan;membaca",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "tanda tangan;tanda tangan;enkripsi;sertifikat;sertifikat;s mime;smime;keamanan",
+    "SettingsSearch_Storage_Keywords": "penyimpanan;cache;caching;mime;disk;ruang;pembersihan;bersihkan;data lokal",
+    "SettingsSearch_CalendarSettings_Keywords": "kalender;minggu;jam;jadwal;acara;acara",
     "SettingsPaneLengthReset_Description": "Atur ukuran daftar email me bawaan.",
     "SettingsPaneLengthReset_Title": "Atur Ulang Ukuran Daftar Surel",
     "SettingsPaypal_Description": "Berikan lebih banyak cinta ❤️ Semua sumbangan sangat kami hargai.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Gunakan Format 24 Jam",
     "SettingsPrivacyPolicy_Description": "Tinjau kebijakan privasi.",
     "SettingsPrivacyPolicy_Title": "Kebijakan Privasi",
+    "SettingsWebsite_Description": "Buka situs Wino Mail.",
+    "SettingsWebsite_Title": "Situs",
     "SettingsReadComposePane_Description": "Fon, konten eksternal.",
     "SettingsReadComposePane_Title": "Pembaca dan Bidang Penulisan",
     "SettingsReader_Title": "Pembaca",
@@ -625,11 +910,24 @@
     "SettingsShowPreviewText_Title": "Tampilkan Teks Pratinjau",
     "SettingsShowSenderPictures_Description": "Sembunyikan/tampilkan foto pengirim.",
     "SettingsShowSenderPictures_Title": "Tampilkan Foto Pengirim",
+    "SettingsEmailTemplates_Title": "Template Email",
+    "SettingsEmailTemplates_Description": "Kelola template email",
+    "SettingsEmailTemplates_CreatePageTitle": "Template baru",
+    "SettingsEmailTemplates_EditPageTitle": "Edit template",
+    "SettingsEmailTemplates_NewTemplateTitle": "Template baru",
+    "SettingsEmailTemplates_NewTemplateDescription": "Buat template email baru",
+    "SettingsEmailTemplates_NameTitle": "Nama",
+    "SettingsEmailTemplates_NamePlaceholder": "Nama template",
+    "SettingsEmailTemplates_DescriptionTitle": "Deskripsi",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Deskripsi opsional",
+    "SettingsEmailTemplates_ContentTitle": "Konten template",
+    "SettingsEmailTemplates_ContentDescription": "Edit konten HTML untuk template ini.",
+    "SettingsEmailTemplates_NameRequired": "Nama template diperlukan.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
-    "SettingsEnableGravatarAvatars_Description": "Gunakan gravatar sebagai foto pengirim jika tersedia",
-    "SettingsEnableFavicons_Title": "Ikon Domain (Favicons)",
-    "SettingsEnableFavicons_Description": "Gunakan favicon domain sebagai foto pengirim jika tersedia",
-    "SettingsMailList_ClearAvatarsCache_Button": "Hapus avatar di tembolok",
+    "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
+    "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
+    "SettingsEnableFavicons_Description": "Use domain favicons (if available) as sender picture",
+    "SettingsMailList_ClearAvatarsCache_Button": "Clear cached avatars",
     "SettingsSignature_AddCustomSignature_Button": "Tambah tanda tangan",
     "SettingsSignature_AddCustomSignature_Title": "Tambahkan tanda tangan khusus",
     "SettingsSignature_DeleteSignature_Title": "Hapus tanda tangan",
@@ -645,14 +943,41 @@
     "SettingsStartupItem_Title": "Akun Utama",
     "SettingsStore_Description": "Berikan sedikit cinta ❤️",
     "SettingsStore_Title": "Nilai di Microsoft Store",
+    "SettingsStorage_Title": "Penyimpanan",
+    "SettingsStorage_Description": "Pindai dan kelola cache MIME yang disimpan di folder data lokal Anda.",
+    "SettingsStorage_ScanFolder": "Pindai folder data lokal",
+    "SettingsStorage_NoLocalMimeDataFound": "Tidak ada data MIME lokal yang ditemukan.",
+    "SettingsStorage_NoAccountsFound": "Tidak ada akun yang ditemukan.",
+    "SettingsStorage_TotalUsage": "Total penggunaan MIME lokal: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} digunakan dalam cache MIME lokal",
+    "SettingsStorage_DeleteAll_Title": "Hapus semua konten MIME",
+    "SettingsStorage_DeleteAll_Description": "Hapus seluruh folder cache MIME untuk akun ini.",
+    "SettingsStorage_DeleteAll_Button": "Hapus semua",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Hapus semua konten MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Hapus semua data MIME lokal untuk {0}?",
+    "SettingsStorage_DeleteAll_Success": "Semua konten MIME telah dihapus.",
+    "SettingsStorage_DeleteOld_Title": "Hapus konten MIME lama",
+    "SettingsStorage_DeleteOld_Description": "Hapus berkas MIME berdasarkan tanggal pembuatan email di basis data lokal.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 bulan",
+    "SettingsStorage_DeleteOld_3Months": "> 3 bulan",
+    "SettingsStorage_DeleteOld_6Months": "> 6 bulan",
+    "SettingsStorage_DeleteOld_1Year": "> 1 tahun",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Hapus konten MIME lama",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Hapus data MIME lokal yang lebih lama dari {0} untuk {1}?",
+    "SettingsStorage_DeleteOld_Success": "Berhasil menghapus {0} folder MIME yang lebih lama dari {1}.",
+    "SettingsStorage_1Month": "1 bulan",
+    "SettingsStorage_3Months": "3 bulan",
+    "SettingsStorage_6Months": "6 bulan",
+    "SettingsStorage_1Year": "1 tahun",
+    "SettingsStorage_Months": "{0} bulan",
     "SettingsTaskbarBadge_Description": "Tampilkan jumlah surel belum dibaca di ikon bilah tugas.",
     "SettingsTaskbarBadge_Title": "Lencana Bilah Tugas",
     "SettingsThreads_Description": "Kelompokkan pesan menjadi utas.",
     "SettingsThreads_Title": "Utas Percakapan",
     "SettingsUnlinkAccounts_Description": "Hapus tautan antara akun. Ini tidak akan menghapus akun Anda.",
     "SettingsUnlinkAccounts_Title": "Lepaskan Tautan Akun",
-    "SettingsMailRendering_ActionLabels_Title": "Label aksi",
-    "SettingsMailRendering_ActionLabels_Description": "Tampilkan label aksi.",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
     "SignatureDeleteDialog_Message": "Apakah Anda yakin ingin menghapus tanda tangan \"{0}\"?",
     "SignatureDeleteDialog_Title": "Hapus tanda tangan",
     "SignatureEditorDialog_SignatureName_Placeholder": "Beri nama tanda tangan",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Anda tidak dapat menetapkan folder Kotak Masuk ke folder sistem yang lain.",
     "SystemFolderConfigSetupSuccess_Message": "Folder sistem berhasil diatur.",
     "SystemFolderConfigSetupSuccess_Title": "Persiapan Folder Sistem",
+    "SystemTrayMenu_ShowWino": "Buka Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Buka Wino Kalender",
+    "SystemTrayMenu_ExitWino": "Keluar",
     "TestingImapConnectionMessage": "Menguji sambungan peladen...",
     "TitleBarServerDisconnectedButton_Description": "Wino tidak tersambung ke jaringan. Klik sambungkan kembali untuk mencoba melanjutkan sambungan.",
     "TitleBarServerDisconnectedButton_Title": "tiada sambungan",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Tingkatkan ke Akun Tak Terbatas",
     "WinoUpgradeRemainingAccountsMessage": "{0} dari {1} akun gratis digunakan.",
     "Yesterday": "Kemarin",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "Jangka waktu penyelarasan surel",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Jangka waktu penyelarasan surel dalam menit. Pengaturan ini akan diterapkan setelah memulai ulang Wino mail."
+    "Smime_ImportCertificates_Success": "Sertifikat berhasil diimpor.",
+    "Smime_ImportCertificates_Error": "Gagal mengimpor sertifikat: {0}",
+    "Smime_RemoveCertificates_Confirm": "Apakah Anda benar-benar ingin menghapus sertifikat {0}?",
+    "Smime_RemoveCertificates_Success": "Sertifikat dihapus.",
+    "Smime_ExportCertificates_Success": "Sertifikat berhasil diekspor.",
+    "Smime_ExportCertificates_Error": "Gagal mengekspor sertifikat.",
+    "Smime_CertificateDetails": "Subjek: {0}\nPenerbit: {1}\nBerlaku sejak: {2}\nBerlaku hingga: {3}\nJejak Sidik Jari: {4}",
+    "Smime_CertificatePassword_Title": "Kata sandi sertifikat diperlukan",
+    "Smime_CertificatePassword_Placeholder": "Kata sandi sertifikat untuk {0} (opsional)",
+    "Smime_Confirm_Title": "Konfirmasi",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Segarkan",
+    "SettingsSignatureAndEncryption_Title": "Tanda Tangan dan Enkripsi",
+    "SettingsSignatureAndEncryption_Description": "Kelola sertifikat S/MIME untuk menandatangani dan mengenkripsi email.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Sertifikat saya",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Sertifikat pribadi untuk penandatanganan dan enkripsi",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Sertifikat Penerima",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Sertifikat penerima untuk dekripsi",
+    "SettingsSignatureAndEncryption_NameColumn": "Nama",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Kadaluarsa pada",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Jejak Sidik Jari",
+    "Buttons_Remove": "Hapus",
+    "Buttons_Export": "Ekspor",
+    "Buttons_Import": "Impor",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Sertifikat Penandatangan S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Sertifikat Enkripsi S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Tidak ada",
+    "SmimeSignaturesInMessage": "Tanda tangan dalam pesan ini:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, berlaku hingga {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Info Sertifikat Penandatangan S/MIME",
+    "SmimeCertificateInfoTitle": "Informasi Sertifikat S/MIME",
+    "SmimeNoCertificateFileFound": "Tidak ditemukan berkas sertifikat",
+    "SmimeSaveCertificate": "Simpan sertifikat...",
+    "SmimeCertificate": "S/MIME Sertifikat",
+    "SmimeCertificateSavedTo": "Sertifikat disimpan ke {0}",
+    "SmimeSignedTooltip": "Pesan ini ditandatangani dengan sertifikat S/MIME. Klik untuk detail lebih lanjut",
+    "SmimeEncryptedTooltip": "Pesan ini dienkripsi dengan sertifikat S/MIME.",
+    "SmimeCertificateFileInfo": "Berkas: {0}",
+    "Composer_LightTheme": "Tema Terang",
+    "Composer_DarkTheme": "Tema Gelap",
+    "Composer_Outdent": "Kurangi Indentasi",
+    "Composer_Indent": "Indentasi",
+    "Composer_BulletList": "Daftar Peluru",
+    "Composer_OrderedList": "Daftar Terurut",
+    "Composer_Stroke": "Garis",
+    "Composer_Bold": "Tebal",
+    "Composer_Italic": "Miring",
+    "Composer_Underline": "Garis bawah",
+    "Composer_CcBcc": "CC & BCC",
+    "Composer_EnableSmimeSignature": "Aktifkan/matikan tanda tangan S/MIME",
+    "Composer_EnableSmimeEncryption": "Aktifkan/matikan enkripsi S/MIME",
+    "Composer_LocalDraftSyncInfo": "Draf ini hanya lokal. Wino gagal mengirimkannya ke server email Anda. Klik untuk mencoba mengirimkannya ke server.",
+    "Composer_CertificateExpires": "Kadaluarsa pada: ",
+    "Composer_SmimeSignature": "Tanda tangan S/MIME",
+    "Composer_SmimeEncryption": "Enkripsi S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Template email",
+    "Composer_AiSummarize": "Ringkas dengan AI",
+    "Composer_AiSummarizeDescription": "Ekstrak poin-poin utama, item tindakan, dan keputusan dari email ini.",
+    "Composer_AiTranslate": "Terjemahkan dengan AI",
+    "Composer_AiActions": "Tindakan AI",
+    "Composer_AiRewrite": "Tulis ulang dengan AI",
+    "AiActions_CheckingStatus": "Memeriksa akses AI...",
+    "AiActions_SignedOutTitle": "Buka Paket AI Wino",
+    "AiActions_SignedOutDescription": "Terjemahkan, tulis ulang, dan rangkum email menggunakan AI setelah masuk ke Akun Wino Anda dan mengaktifkan add-on Paket AI.",
+    "AiActions_NoPackTitle": "Diperlukan Paket AI",
+    "AiActions_NoPackDescription": "Anda telah masuk, tetapi Paket AI belum aktif. Beli paketnya untuk menggunakan alat terjemahan AI, penulisan ulang, dan rangkuman AI Wino.",
+    "AiActions_UsageSummary": "{0} dari {1} kredit telah digunakan bulan ini.",
+    "Composer_AiRewritePolite": "Jadikan lebih sopan",
+    "Composer_AiRewritePoliteDescription": "Membuat kata-kata lebih halus tanpa mengubah maksudnya.",
+    "Composer_AiRewriteAngry": "Buat marah",
+    "Composer_AiRewriteAngryDescription": "Menggunakan nada yang lebih tajam dan konfrontatif.",
+    "Composer_AiRewriteHappy": "Ubah menjadi ceria",
+    "Composer_AiRewriteHappyDescription": "Menambahkan nada yang lebih ceria dan antusias.",
+    "Composer_AiRewriteFormal": "Ubah menjadi formal",
+    "Composer_AiRewriteFormalDescription": "Membuat pesan terdengar lebih profesional dan terstruktur.",
+    "Composer_AiRewriteFriendly": "Ubah menjadi ramah",
+    "Composer_AiRewriteFriendlyDescription": "Membuat pesan terdengar lebih ramah dan mudah didekati.",
+    "Composer_AiRewriteShorter": "Ubah menjadi lebih singkat",
+    "Composer_AiRewriteShorterDescription": "Memadatkan teks dan menghilangkan detail yang tidak perlu.",
+    "Composer_AiRewriteClearer": "Jadikan lebih jelas",
+    "Composer_AiRewriteClearerDescription": "Meningkatkan keterbacaan dan membuat pesan lebih mudah diikuti.",
+    "Composer_AiRewriteCustom": "Kustom",
+    "Composer_AiRewriteCustomDescription": "Gambarkan maksud penulisan ulang Anda sendiri.",
+    "Composer_AiRewriteCustomPlaceholder": "Gambarkan bagaimana Anda ingin pesan ditulis ulang",
+    "Composer_AiRewriteMode": "Nada penulisan ulang",
+    "Composer_AiRewriteApply": "Terapkan penulisan ulang",
+    "Composer_AiTranslateDialogTitle": "Terjemahkan dengan AI",
+    "Composer_AiTranslateDialogDescription": "Masukkan bahasa target atau kode budaya, seperti en-US, tr-TR, de-DE, atau fr-FR.",
+    "Composer_AiTranslateApply": "Terjemahkan",
+    "Composer_AiTranslateLanguage": "Bahasa target",
+    "Composer_AiTranslateCustomPlaceholder": "Masukkan kode budaya",
+    "Composer_AiTranslateLanguageEnglish": "Inggris (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turki (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Jerman (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Prancis (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spanyol (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italia (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugis Brasil (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Belanda (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polandia (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rusia (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Jepang (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korea (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Cina Sederhana (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arab (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Lainnya...",
+    "Composer_AiBusyTitle": "AI sedang bekerja",
+    "Composer_AiBusyMessage": "Harap tunggu hingga aksi AI saat ini selesai.",
+    "Composer_AiSignInRequired": "Masuk ke akun Wino Anda untuk menggunakan fitur AI.",
+    "Composer_AiMissingHtml": "Belum ada konten pesan untuk dikirim ke Wino AI.",
+    "Composer_AiQuotaUnavailable": "Hasil AI telah diterapkan.",
+    "Composer_AiAppliedMessage": "Hasil AI telah diterapkan pada penyusun. Gunakan Undo jika Anda ingin membatalkan.",
+    "Composer_AiSummarizeSuccessTitle": "Ringkasan AI diterapkan",
+    "Composer_AiTranslateSuccessTitle": "Terjemahan AI diterapkan",
+    "Composer_AiRewriteSuccessTitle": "Penulisan ulang AI diterapkan",
+    "Composer_AiErrorTitle": "Aksi AI gagal",
+    "Reader_AiAppliedMessage": "Hasil AI sekarang ditampilkan untuk pesan ini. Buka kembali pesan tersebut untuk melihat konten aslinya lagi.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontak",
+    "ContactsPage_AddContact": "Tambahkan Kontak",
+    "ContactsPage_EditContact": "Ubah Kontak",
+    "ContactsPage_DeleteContact": "Hapus Kontak",
+    "ContactsPage_SearchPlaceholder": "Cari kontak...",
+    "ContactsPage_NoContacts": "Tidak ada kontak yang ditemukan",
+    "ContactsPage_ContactsCount": "{0} kontak",
+    "ContactsPage_SelectedContactsCount": "{0} terpilih",
+    "ContactsPage_DeleteSelectedContacts": "Hapus yang Dipilih",
+    "ContactEditDialog_Title": "Ubah Kontak",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Pilih Foto",
+    "ContactEditDialog_RemovePhoto": "Hapus Foto",
+    "ContactEditDialog_NameHeader": "Nama",
+    "ContactEditDialog_NamePlaceholder": "Nama kontak",
+    "ContactEditDialog_EmailHeader": "Alamat Email",
+    "ContactEditDialog_EmailPlaceholder": "contoh@domain.com",
+    "ContactEditDialog_InfoSection": "Informasi Kontak",
+    "ContactEditDialog_RootContactInfo": "Kontak akar ini terkait dengan akun Anda dan tidak dapat dihapus.",
+    "ContactEditDialog_OverriddenContactInfo": "Kontak ini telah dimodifikasi secara manual dan tidak akan diperbarui selama sinkronisasi.",
+    "ContactsPage_Subtitle": "Kelola kontak email Anda dan informasinya",
+    "ContactStatus_Account": "Akun",
+    "ContactStatus_Modified": "Dimodifikasi",
+    "ContactAction_Edit": "Ubah kontak",
+    "ContactAction_ChangePhoto": "Ubah foto",
+    "ContactAction_Delete": "Hapus kontak",
+    "ContactAction_Add": "Tambahkan Kontak",
+    "ContactSelection_Selected": "terpilih",
+    "ContactSelection_SelectAll": "Pilih semua",
+    "ContactSelection_Clear": "Kosongkan Pemilihan",
+    "ContactsPage_EmptyState": "Tidak ada kontak untuk ditampilkan",
+    "ContactsPage_AddFirstContact": "Tambahkan kontak pertama Anda",
+    "ContactsPage_ContactsCountSuffix": "kontak",
+    "ContactsPane_NewContact": "Kontak Baru",
+    "ContactsPane_DescriptionTitle": "Kelola kontak Anda",
+    "ContactsPane_DescriptionBody": "Buat kontak, ganti namanya, perbarui foto profil, dan atur detail yang tersimpan di satu tempat.",
+    "ContactEditDialog_AddTitle": "Tambahkan Kontak",
+    "ContactInfoBar_ContactAdded": "Kontak berhasil ditambahkan.",
+    "ContactInfoBar_ContactUpdated": "Kontak berhasil diperbarui.",
+    "ContactInfoBar_ContactsDeleted": "Kontak berhasil dihapus.",
+    "ContactInfoBar_ContactPhotoUpdated": "Foto kontak berhasil diperbarui.",
+    "ContactInfoBar_FailedToLoadContacts": "Gagal memuat kontak: {0}",
+    "ContactInfoBar_FailedToAddContact": "Gagal menambahkan kontak: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Gagal memperbarui kontak: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Gagal menghapus kontak: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Gagal memperbarui foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Kontak akar tidak dapat dihapus.",
+    "ContactConfirmDialog_DeleteTitle": "Hapus Kontak",
+    "ContactConfirmDialog_DeleteMessage": "Anda yakin ingin menghapus kontak '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Anda yakin ingin menghapus {0} kontak?",
+    "ContactConfirmDialog_DeleteButton": "Hapus",
+    "CalendarAccountSettings_Title": "Pengaturan Akun Kalender",
+    "CalendarAccountSettings_Description": "Kelola pengaturan kalender untuk {0}",
+    "CalendarAccountSettings_AccountColor": "Warna Akun",
+    "CalendarAccountSettings_AccountColorDescription": "Ubah warna tampilan untuk akun kalender ini",
+    "CalendarAccountSettings_SyncEnabled": "Aktifkan Sinkronisasi",
+    "CalendarAccountSettings_SyncEnabledDescription": "Aktifkan atau nonaktifkan sinkronisasi kalender untuk akun ini",
+    "CalendarAccountSettings_DefaultShowAs": "Status Tampilkan Secara Default",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Status ketersediaan default untuk acara baru yang dibuat dengan akun ini",
+    "CalendarAccountSettings_PrimaryCalendar": "Kalender Utama",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Tandai kalender ini sebagai kalender utama untuk akun tersebut.",
+    "CalendarSettings_NewEventBehavior_Header": "Perilaku tombol Acara Baru",
+    "CalendarSettings_NewEventBehavior_Description": "Pilih apakah tombol Acara Baru harus menanyakan kalender setiap kali atau selalu membuka kalender tertentu.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Tanyakan setiap kali.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Selalu gunakan kalender tertentu.",
+    "CalendarSettings_Rendering_Title": "Penataan",
+    "CalendarSettings_Rendering_Description": "Atur tata letak kalender dan perilaku tampilan.",
+    "CalendarSettings_Notifications_Title": "Pemberitahuan",
+    "CalendarSettings_Notifications_Description": "Pilih pengingat default dan perilaku tunda.",
+    "CalendarSettings_Preferences_Title": "Preferensi",
+    "CalendarSettings_Preferences_Description": "Atur bagaimana tombol Acara Baru berperilaku.",
+    "WhatIsNew_GetStartedButton": "Mulai",
+    "WhatIsNew_ContinueAnywayButton": "Lanjutkan saja",
+    "WhatIsNew_PreparingForNewVersionButton": "Sedang mempersiapkan versi baru...",
+    "WhatIsNew_MigrationPreparing_Title": "Menyiapkan data Anda",
+    "WhatIsNew_MigrationPreparing_Description": "Wino sedang menerapkan migrasi pembaruan. Harap tunggu sambil kami menyiapkan data akun Anda untuk rilis ini.",
+    "WhatIsNew_MigrationFailedMessage": "Gagal menerapkan migrasi dengan kode galat {0}. Anda dapat terus menggunakan aplikasi tersebut. Namun, jika Anda mengalami masalah serius silakan instal ulang aplikasi.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Diperbarui",
+    "WhatIsNew_MigrationNotification_Message": "Buka aplikasi untuk menyelesaikan pembaruan dan melihat apa yang baru.",
+    "WelcomeWindow_Title": "Selamat datang di Wino Mail",
+    "WelcomeWindow_Subtitle": "Pengalaman asli Windows untuk Mail dan Kalender.",
+    "WelcomeWindow_WhatsNewTitle": "Perubahan Terbaru",
+    "WelcomeWindow_FeaturesTitle": "Fitur",
+    "WelcomeWindow_WhatsNewTab": "Apa yang Baru",
+    "WelcomeWindow_FeaturesTab": "Fitur",
+    "WelcomeWindow_GetStartedButton": "Mulai dengan menambahkan akun",
+    "WelcomeWindow_GetStartedDescription": "Tambahkan akun Outlook, Gmail, atau IMAP Anda untuk memulai dengan Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Impor dari Akun Wino Anda",
+    "WelcomeWindow_ImportInProgress": "Mengimpor preferensi dan akun yang tersinkronkan...",
+    "WelcomeWindow_ImportNoAccountsFound": "Tidak ada akun yang tersinkronisasi ditemukan di Akun Wino Anda. Jika preferensi tersedia, mereka telah dipulihkan. Gunakan Mulai untuk menambahkan akun secara manual.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} akun yang tersinkronisasi sudah tersedia di perangkat ini. Gunakan Mulai untuk menambahkan akun lain secara manual jika diperlukan.",
+    "WelcomeWindow_SetupTitle": "Siapkan akun Anda",
+    "WelcomeWindow_SetupSubtitle": "Pilih penyedia email Anda untuk memulai",
+    "WelcomeWindow_AddAccountButton": "Tambahkan akun",
+    "WelcomeWindow_SkipForNow": "Lewati untuk sekarang — saya akan mengaturnya nanti",
+    "WelcomeWindow_AppDescription": "Kotak masuk yang cepat dan fokus — dirancang ulang untuk Windows 11",
+    "WelcomeWizard_Step1Title": "Selamat datang",
+    "SystemTrayMenu_Open": "Buka",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Pengaturan Sinkronisasi",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Jaga preferensi Wino Anda tetap sinkron di berbagai perangkat.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Aktifkan Add-ons",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Akses fitur premium seperti Wino AI Pack.",
+    "WinoAccount_Management_Description": "Kelola Akun Wino Anda, akses AI Pack, serta preferensi yang tersinkron dan detail akun.",
+    "WinoAccount_Management_SignedOutTitle": "Masuk ke Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Masuk atau buat akun untuk menyinkronkan email Anda, mengakses fitur AI, dan mengelola pengaturan di beberapa perangkat.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Add-Ons Wino",
+    "WinoAccount_Management_DataSectionHeader": "Data",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Aksi Akun",
+    "WinoAccount_Management_AccountCardTitle": "Akun",
+    "WinoAccount_Management_AccountCardDescription": "Alamat email Akun Wino Anda dan status akun saat ini.",
+    "WinoAccount_Management_AiPackCardTitle": "Paket AI",
+    "WinoAccount_Management_AiPackCardDescription": "Lihat apakah Paket AI Wino aktif dan berapa banyak penggunaan yang tersisa.",
+    "WinoAccount_Management_AiPackActive": "Paket AI aktif",
+    "WinoAccount_Management_AiPackInactive": "Paket AI tidak aktif",
+    "WinoAccount_Management_AiPackUsage": "{0} dari {1} penggunaan telah terpakai. {2} tersisa.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Periode penagihan: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Rincian penggunaan belum tersedia.",
+    "WinoAccount_Management_AiPackBuyDescription": "Beli Paket AI Wino untuk menerjemahkan, menulis ulang, atau merangkum email menggunakan AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Aktifkan Paket AI",
+    "WinoAccount_Management_AiPackPromoDescription": "Tingkatkan alur kerja email Anda dengan alat bertenaga AI. Terjemahkan pesan ke lebih dari 50 bahasa, tulis ulang untuk kejelasan dan nada, dan dapatkan ringkasan instan dari utasan panjang.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / bln",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 kredit",
+    "WinoAccount_Management_AiPackGetButton": "Dapatkan Paket AI",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Alat bertenaga AI untuk menerjemahkan, menulis ulang, dan merangkum tindakan di Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, terjemahan, menulis ulang, merangkum, produktivitas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Akun Tak Terbatas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Hapus batas akun dan tambahkan sebanyak mungkin akun email yang Anda perlukan.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "akun, tak terbatas, premium, add-on",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Masuk dengan Akun Wino Anda untuk menyelesaikan pembelian ini.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino tidak dapat menyelesaikan pembelian ini di Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Pembelian Anda selesai, tetapi Wino belum dapat menyegarkan manfaat akun Anda. Silakan coba lagi sebentar.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Langganan Anda aktif",
+    "WinoAccount_Management_AiPackRenews": "Pembaruan {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Kredit digunakan bulan ini",
+    "WinoAccount_Management_AiPackResets": "Pengaturan ulang {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Kami mengalami masalah memuat saldo penggunaan AI Anda.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Terjemahkan",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Tulis Ulang",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Ringkas",
+    "WinoAccount_Management_AddOnLoadFailed": "Kami mengalami masalah memuat add-on ini.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sinkronkan Preferensi dan Akun",
+    "WinoAccount_Management_SyncPreferencesDescription": "Impor atau ekspor preferensi Wino Anda dan detail kotak masuk di berbagai perangkat. Kata sandi, token, dan informasi sensitif lainnya tidak pernah disinkronkan.",
+    "WinoAccount_Management_SignOutTitle": "Keluar",
+    "WinoAccount_Management_SignOutDescription": "Keluar dari akun Anda di perangkat ini",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Belum ada data tersinkron untuk akun ini.",
+    "WinoAccount_Management_ExportSucceeded": "Data Wino yang Anda pilih berhasil diekspor.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Preferensi Anda telah diekspor ke Akun Wino Anda.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Mengekspor detail akun {0} ke Akun Wino Anda.",
+    "WinoAccount_Management_ImportSucceeded": "Data tersinkron yang diimpor dari Akun Wino Anda.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Berhasil menerapkan {0} preferensi tersinkron.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Berhasil mengimpor {0} akun.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Mengabaikan {0} akun yang sudah ada di perangkat ini.",
+    "WinoAccount_Management_ImportPartial": "Menerapkan {0} preferensi yang tersinkronisasi. {1} preferensi tidak dapat dipulihkan.",
+    "WinoAccount_Management_ImportReloginReminder": "Kata sandi, token, dan informasi sensitif lainnya tidak diimpor. Masuk lagi untuk setiap akun di perangkat ini sebelum menggunakannya.",
+    "WinoAccount_Management_SerializeFailed": "Wino tidak dapat menyerialisasikan preferensi Anda saat ini.",
+    "WinoAccount_Management_EmptyExport": "Tidak ada nilai preferensi yang dapat diekspor.",
+    "WinoAccount_Management_ImportEmpty": "Payload data yang disinkronkan tidak berisi apa pun yang baru untuk dipulihkan.",
+    "WinoAccount_Management_ExportDialog_Title": "Ekspor ke Akun Wino Anda",
+    "WinoAccount_Management_ExportDialog_Description": "Pilih apa yang ingin Anda sinkronkan ke Akun Wino Anda.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferensi",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Akun",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Kata sandi, token, dan informasi sensitif lainnya tidak disinkronkan.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Akun yang diimpor di PC lain masih perlu Anda masuk lagi sebelum dapat digunakan.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Sedang mengekspor data Wino yang Anda pilih...",
+    "WinoAccount_Management_LoadFailed": "Wino tidak dapat memuat informasi Akun Wino terbaru.",
+    "WinoAccount_Management_ActionFailed": "Permintaan Akun Wino tidak dapat diselesaikan.",
+    "WinoAccount_SettingsSection_Title": "Akun Wino",
+    "WinoAccount_SettingsSection_Description": "Buat atau masuk ke Akun Wino menggunakan layanan otentikasi localhost Anda.",
+    "WinoAccount_RegisterButton_Title": "Daftarkan akun",
+    "WinoAccount_RegisterButton_Description": "Buat Akun Wino dengan email dan kata sandi.",
+    "WinoAccount_RegisterButton_Action": "Buka pendaftaran",
+    "WinoAccount_LoginButton_Title": "Masuk",
+    "WinoAccount_LoginButton_Description": "Masuk ke Akun Wino yang sudah ada dengan email dan kata sandi.",
+    "WinoAccount_LoginButton_Action": "Buka masuk",
+    "WinoAccount_SignOutButton_Title": "Keluar",
+    "WinoAccount_SignOutButton_Description": "Hapus sesi Akun Wino yang tersimpan secara lokal.",
+    "WinoAccount_SignOutButton_Action": "Keluar",
+    "WinoAccount_RegisterDialog_Title": "Buat Akun Wino",
+    "WinoAccount_RegisterDialog_Description": "Buat Akun Wino untuk menjaga sinkronisasi pengalaman Wino Anda dan membuka add-on berbasis akun.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Buat Akun Wino Anda",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Mengapa membuatnya?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Impor dan ekspor pengaturan antar perangkat",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Pindahkan preferensi Wino Anda antar perangkat tanpa membangun ulang pengaturan Anda dari awal.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Akses add-on eksklusif seperti Wino AI Pack (berbayar)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Gunakan satu akun untuk membuka fitur premium Wino saat tersedia.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Akun Wino terpisah dari akun email Anda",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Outlook, Gmail, IMAP, atau akun email lainnya tetap seperti adanya. Akun Wino hanya mengelola fitur khusus Wino dan add-on berbasis akun.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Daftar",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privasi dan pemrosesan API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Add-on opsional seperti Wino AI Pack mungkin mengirim konten HTML email terpilih ke layanan API Wino hanya saat Anda menggunakan fitur tersebut.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Baca kebijakan privasi",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Saya setuju dengan kebijakan privasi.",
+    "WinoAccount_LoginDialog_Title": "Masuk ke Akun Wino",
+    "WinoAccount_LoginDialog_Description": "Masuk ke Akun Wino Anda untuk menyinkronkan pengaturan Wino Anda dan mengakses fitur berbasis akun.",
+    "WinoAccount_LoginDialog_HeroTitle": "Selamat datang kembali",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Apa yang didapat saat masuk",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Gunakan Akun Wino Anda untuk terus menyinkronkan pengaturan antar perangkat dan mengakses add-on berbayar seperti Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Ini bukan masuk ke akun email Anda",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Masuk di sini tidak menambahkan atau menggantikan akun Outlook, Gmail, atau IMAP Anda di Wino. Ini hanya membuat Anda masuk ke layanan khusus Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Lupa kata sandi?",
+    "WinoAccount_EmailLabel": "Email",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Kata sandi",
+    "WinoAccount_ConfirmPasswordLabel": "Konfirmasi kata sandi",
+    "WinoAccount_ForgotPasswordDialog_Title": "Atur ulang kata sandi Anda",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Kirim email reset",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Kembali ke masuk",
+    "WinoAccount_ForgotPasswordDialog_Description": "Masukkan alamat email Akun Wino Anda dan kami akan mengirimkan tautan reset kata sandi jika alamatnya terdaftar.",
+    "WinoAccount_Validation_EmailRequired": "Email diperlukan.",
+    "WinoAccount_Validation_PasswordRequired": "Kata sandi diperlukan.",
+    "WinoAccount_Validation_PasswordMismatch": "Kata sandi tidak cocok.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Anda harus menerima kebijakan privasi sebelum membuat Akun Wino.",
+    "WinoAccount_Error_InvalidCredentials": "Alamat email atau kata sandi tidak benar.",
+    "WinoAccount_Error_AccountLocked": "Akun ini dikunci sementara.",
+    "WinoAccount_Error_AccountBanned": "Akun ini telah diblokir.",
+    "WinoAccount_Error_AccountSuspended": "Akun ini telah ditangguhkan.",
+    "WinoAccount_Error_EmailNotConfirmed": "Harap konfirmasi alamat email Anda sebelum masuk.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Harap konfirmasi alamat email Anda sebelum masuk.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Email konfirmasi baru belum tersedia.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Permintaan konfirmasi ini tidak lagi valid. Silakan coba masuk kembali.",
+    "WinoAccount_Error_EmailNotRegistered": "Alamat email ini belum terdaftar.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Sesi Anda tidak lagi valid. Silakan masuk lagi.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Alamat email ini sudah terdaftar.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Sebuah alamat email diperlukan untuk melengkapi masuk eksternal.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Permintaan masuk eksternal tidak valid.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Status masuk eksternal tidak valid atau kedaluwarsa.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Kode masuk eksternal tidak valid atau kedaluwarsa.",
+    "WinoAccount_Error_AiPackRequired": "langganan Wino AI Pack aktif diperlukan untuk tindakan ini.",
+    "WinoAccount_Error_AiQuotaExceeded": "Batas penggunaan AI Pack Anda telah tercapai untuk periode penagihan saat ini.",
+    "WinoAccount_Error_AiHtmlEmpty": "Tidak ada isi email yang akan diproses.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Email ini terlalu besar untuk diproses dengan Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Bahasa tersebut tidak didukung. Coba kode budaya yang valid seperti en-US atau tr-TR.",
+    "WinoAccount_Error_Forbidden": "Anda tidak memiliki izin untuk melakukan tindakan ini.",
+    "WinoAccount_Error_ValidationFailed": "Permintaan tidak valid. Silakan tinjau nilai yang dimasukkan.",
+    "WinoAccount_RegisterSuccessMessage": "Pendaftaran Akun Wino selesai untuk {0}.",
+    "WinoAccount_LoginSuccessMessage": "Masuk ke Akun Wino sebagai {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Konfirmasi alamat email Anda",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Kami telah mengirim konfirmasi email ke {0}. Harap konfirmasi itu dan coba masuk kembali.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Diperlukan konfirmasi email",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Kami masih menunggu Anda untuk mengonfirmasi {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Kirim ulang email konfirmasi",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Anda bisa mengirim ulang email konfirmasi dalam {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Anda sekarang bisa mengirim ulang email konfirmasi.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Email konfirmasi telah terkirim ulang",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Kami mengirim email konfirmasi lagi ke {0}. Harap konfirmasi itu dan coba masuk kembali.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Email reset kata sandi telah dikirim",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Kami telah mengirim email reset kata sandi ke {0}. Buka pesan itu untuk memilih kata sandi baru.",
+    "WinoAccount_ChangePassword_Title": "Ubah kata sandi",
+    "WinoAccount_ChangePassword_Description": "Kirim email reset kata sandi ke Akun Wino ini.",
+    "WinoAccount_ChangePassword_Action": "Kirim email reset",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Apakah Anda ingin Wino mengirimkan email reset kata sandi ke {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Anda telah keluar dari Akun Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Tidak ada Akun Wino aktif untuk keluar.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Akun Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Masuk atau buat Akun Wino untuk mengelola sesi Wino Anda.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Tambahkan Akun",
+    "WelcomeWizard_Step3Title": "Selesaikan Pengaturan",
+    "ProviderSelection_Title": "Pilih penyedia email Anda",
+    "ProviderSelection_Subtitle": "Pilih penyedia di bawah ini untuk menambahkan akun email Anda ke Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nama Akun",
+    "ProviderSelection_AccountNamePlaceholder": "contoh: Pribadi, Kerja",
+    "ProviderSelection_DisplayNameHeader": "Nama Tampilan",
+    "ProviderSelection_DisplayNamePlaceholder": "contoh: John Doe",
+    "ProviderSelection_EmailHeader": "Alamat Email",
+    "ProviderSelection_EmailPlaceholder": "contoh: johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Kata Sandi Khusus Aplikasi",
+    "ProviderSelection_AppPasswordHelp": "Bagaimana cara mendapatkan kata sandi khusus aplikasi?",
+    "ProviderSelection_CalendarModeHeader": "Integrasi Kalender",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Dinonaktifkan",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Tidak ada integrasi kalender",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sinkronisasi CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Peristiwa kalender Anda disinkronkan ke server Apple di antara perangkat Anda.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Peristiwa kalender Anda disinkronkan ke server Yahoo di antara perangkat Anda.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Kalender lokal",
+    "ProviderSelection_CalendarMode_LocalDescription": "Acara Anda disimpan hanya di komputer Anda. Tidak ada koneksi ke server.",
+    "ProviderSelection_ClearColor": "Hapus warna",
+    "ProviderSelection_ContinueButton": "Lanjutkan",
+    "ProviderSelection_SpecialImap_Subtitle": "Masukkan kredensial akun Anda untuk terhubung.",
+    "AccountSetup_Title": "Mengatur Akun Anda",
+    "AccountSetup_Step_Authenticating": "Mengotentikasi dengan {0}",
+    "AccountSetup_Step_TestingMailAuth": "Menguji autentikasi email",
+    "AccountSetup_Step_SyncingFolders": "Sinkronisasi metadata folder",
+    "AccountSetup_Step_FetchingProfile": "Mengambil informasi profil",
+    "AccountSetup_Step_DiscoveringCalDav": "Menemukan pengaturan CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Menguji autentikasi kalender",
+    "AccountSetup_Step_SavingAccount": "Menyimpan informasi akun",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Mengambil metadata kalender",
+    "AccountSetup_Step_SyncingAliases": "Sinkronisasi alias",
+    "AccountSetup_Step_Finalizing": "Menyelesaikan pengaturan",
+    "AccountSetup_FailureMessage": "Pengaturan gagal. Kembali ke sebelumnya untuk memperbaiki pengaturan Anda, atau coba lagi nanti.",
+    "AccountSetup_SuccessMessage": "Akun Anda telah berhasil diatur!",
+    "AccountSetup_GoBackButton": "Kembali",
+    "AccountSetup_TryAgainButton": "Coba Lagi",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Penemuan otomatis gagal. Silakan masukkan pengaturan secara manual di tab Lanjutan."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/it_IT/resources.json b/Wino.Core.Domain/Translations/it_IT/resources.json
index 2bc3c650..12080a54 100644
--- a/Wino.Core.Domain/Translations/it_IT/resources.json
+++ b/Wino.Core.Domain/Translations/it_IT/resources.json
@@ -6,26 +6,32 @@
     "AccountAlias_Disclaimer_SecondLine": "Se vuoi usare alias per il tuo account Outlook o IMAP, aggiungili da te.",
     "AccountCacheReset_Title": "Ripristino cache account",
     "AccountCacheReset_Message": "Questo account richiede la ri-sincronizzazione completa per continuare a funzionare. Attendere mentre Wino ri-sincronizza i messaggi…",
-    "AccountContactNameYou": "Te",
-    "AccountCreationDialog_Completed": "tutto fatto",
-    "AccountCreationDialog_FetchingEvents": "Eventi calendario in recupero.",
-    "AccountCreationDialog_FetchingProfileInformation": "Dati del profilo in recupero.",
+    "AccountContactNameYou": "Tu",
+    "AccountCreationDialog_Completed": "fatto",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Recupero dettagli del calendario.",
+    "AccountCreationDialog_FetchingEvents": "Recupero eventi calendario.",
+    "AccountCreationDialog_FetchingProfileInformation": "Recupero dettagli profilo.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Se il browser non è stato avviato automaticamente per completare l'autenticazione:",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row1": "1) Clicca il pulsante qui sotto per copiare l'indirizzo di autenticazione",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row2": "2) Avvia il tuo browser web (Edge, Chrome, Firefox ecc…)",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row2": "2) Avvia il tuo browser web (Edge, Chrome, Firefox ecc...)",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row3": "3) Incolla l'indirizzo copiato e vai al sito web per completare l'autenticazione manualmente.",
     "AccountCreationDialog_Initializing": "inizializzazione",
     "AccountCreationDialog_PreparingFolders": "Stiamo ricevendo informazioni sulle cartelle al momento.",
-    "AccountCreationDialog_SigninIn": "Informazioni dell'account in salvataggio.",
+    "AccountCreationDialog_SigninIn": "Le informazioni dell'account sono in fase di salvataggio.",
+    "Purchased": "Acquistato",
     "AccountEditDialog_Message": "Nome account",
     "AccountEditDialog_Title": "Modifica account",
     "AccountPickerDialog_Title": "Scegli un account",
-    "AccountSettingsDialog_AccountName": "Nome visualizzato del mittente",
+    "AccountSettingsDialog_AccountName": "Nome visualizzato mittente",
     "AccountSettingsDialog_AccountNamePlaceholder": "es. Mario Rossi",
     "AccountDetailsPage_Title": "Informazioni account",
     "AccountDetailsPage_Description": "Modifica il nome dell'account in Wino e imposta il nome del mittente desiderato.",
     "AccountDetailsPage_ColorPicker_Title": "Colore account",
     "AccountDetailsPage_ColorPicker_Description": "Assegna un nuovo colore all'account per colorare il suo simbolo nella lista.",
+    "AccountDetailsPage_TabGeneral": "Generale",
+    "AccountDetailsPage_TabMail": "Posta",
+    "AccountDetailsPage_TabCalendar": "Calendario",
+    "AccountDetailsPage_CalendarListDescription": "Seleziona un calendario per configurarne le impostazioni.",
     "AddHyperlink": "Aggiungi",
     "AppCloseBackgroundSynchronizationWarningTitle": "Sincronizzazione dietro le quinte",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "L'applicazione non è stata impostata per avviarsi all'avvio di Windows.",
@@ -33,22 +39,24 @@
     "AppCloseStartupLaunchDisabledWarningMessageThirdLine": "Vuoi andare alla pagina Preferenze dell'app per abilitarla?",
     "AppCloseTerminateBehaviorWarningMessageFirstLine": "Stai terminando Wino Mail e il comportamento di chiusura dell'app è impostato su 'Termina'.",
     "AppCloseTerminateBehaviorWarningMessageSecondLine": "Questo fermerà tutte le sincronizzazioni e le notifiche dietro le quinte.",
-    "AppCloseTerminateBehaviorWarningMessageThirdLine": "Vuoi andare alle preferenze dell'app per impostare Wino Mail per essere eseguito minimizzato o dietro le quinte?",
-    "AutoDiscoveryProgressMessage": "Ricerca impostazioni posta…",
+    "AppCloseTerminateBehaviorWarningMessageThirdLine": "Vuoi andare alle preferenze dell'app per impostare Wino Mail da eseguire minimizzato o dietro le quinte?",
+    "AutoDiscoveryProgressMessage": "Ricerca delle impostazioni della posta...",
     "BasicIMAPSetupDialog_AdvancedConfiguration": "Configurazione avanzata",
-    "BasicIMAPSetupDialog_CredentialLocalMessage": "Le tue credenziali saranno memorizzate solo localmente nel tuo computer.",
+    "BasicIMAPSetupDialog_CredentialLocalMessage": "Le tue credenziali verranno memorizzate solo localmente sul tuo computer.",
     "BasicIMAPSetupDialog_Description": "Alcuni account richiedono fasi aggiuntive per accedere",
     "BasicIMAPSetupDialog_DisplayName": "Nome visualizzato",
     "BasicIMAPSetupDialog_DisplayNamePlaceholder": "es. Mario Rossi",
     "BasicIMAPSetupDialog_LearnMore": "Scopri di più",
     "BasicIMAPSetupDialog_MailAddress": "Indirizzo e-mail",
-    "BasicIMAPSetupDialog_MailAddressPlaceholder": "mariorossi@esempio.com",
+    "BasicIMAPSetupDialog_MailAddressPlaceholder": "johndoe@fabrikam.com",
     "BasicIMAPSetupDialog_Password": "Parola d'accesso",
     "BasicIMAPSetupDialog_Title": "Account IMAP",
     "Busy": "Occupato",
     "Buttons_AddAccount": "Aggiungi account",
+    "Buttons_FixAccount": "Ripara account",
     "Buttons_AddNewAlias": "Aggiungi nuovo alias",
     "Buttons_Allow": "Consenti",
+    "Buttons_Apply": "Applica",
     "Buttons_ApplyTheme": "Applica tema",
     "Buttons_Browse": "Sfoglia",
     "Buttons_Cancel": "Annulla",
@@ -60,8 +68,9 @@
     "Buttons_Deny": "Nega",
     "Buttons_Discard": "Scarta",
     "Buttons_Edit": "Modifica",
-    "Buttons_EnableImageRendering": "Abilita",
+    "Buttons_EnableImageRendering": "Attiva",
     "Buttons_Multiselect": "Seleziona multipli",
+    "Buttons_Manage": "Gestisci",
     "Buttons_No": "No",
     "Buttons_Open": "Apri",
     "Buttons_Purchase": "Acquista",
@@ -70,46 +79,168 @@
     "Buttons_Save": "Salva",
     "Buttons_SaveConfiguration": "Salva configurazione",
     "Buttons_Send": "Invia",
+    "Buttons_SendToServer": "Invia al server",
     "Buttons_Share": "Condividi",
     "Buttons_SignIn": "Accedi",
     "Buttons_Sync": "Sincronizza",
     "Buttons_SyncAliases": "Sincronizza alias",
-    "Buttons_TryAgain": "Tenta ancora",
+    "Buttons_TryAgain": "Riprova",
     "Buttons_Yes": "Sì",
+    "Sync_SynchronizingFolder": "Sincronizzazione della cartella {0} {1}%",
+    "Sync_DownloadedMessages": "Scaricati {0} messaggi da {1}",
+    "SyncAction_Archiving": "Archiviazione di {0} messaggi",
+    "SyncAction_ClearingFlag": "Rimuovere flag da {0} messaggi",
+    "SyncAction_CreatingDraft": "Creazione bozza",
+    "SyncAction_CreatingEvent": "Creazione evento",
+    "SyncAction_Deleting": "Eliminazione di {0} messaggi",
+    "SyncAction_EmptyingFolder": "Svuotamento della cartella",
+    "SyncAction_MarkingAsRead": "Contrassegnando {0} messaggi come letti",
+    "SyncAction_MarkingAsUnread": "Contrassegnando {0} messaggi come non letti",
+    "SyncAction_MarkingFolderAsRead": "Contrassegnando la cartella come letta",
+    "SyncAction_Moving": "Spostamento di {0} messaggi",
+    "SyncAction_MovingToFocused": "Spostamento di {0} messaggi in Concentrato",
+    "SyncAction_RenamingFolder": "Rinomina cartella",
+    "SyncAction_SendingMail": "Invio di posta",
+    "SyncAction_SettingFlag": "Contrassegno di {0} messaggi",
+    "SyncAction_SynchronizingAccount": "Sincronizzazione di {0}",
+    "SyncAction_SynchronizingAccounts": "Sincronizzazione di {0} account",
+    "SyncAction_SynchronizingCalendarData": "Sincronizzazione dei dati del calendario",
+    "SyncAction_SynchronizingCalendarEvents": "Sincronizzazione degli eventi del calendario",
+    "SyncAction_SynchronizingCalendarMetadata": "Sincronizzazione dei metadati del calendario",
+    "SyncAction_Unarchiving": "Estrazione dall'archivio di {0} messaggi",
     "CalendarAllDayEventSummary": "eventi giornalieri",
     "CalendarDisplayOptions_Color": "Colore",
     "CalendarDisplayOptions_Expand": "Espandi",
+    "CalendarEventResponse_Accept": "Accetta",
+    "CalendarEventResponse_AcceptedResponse": "Accettato",
+    "CalendarEventResponse_Decline": "Rifiuta",
+    "CalendarEventResponse_DeclinedResponse": "Rifiutato",
+    "CalendarEventResponse_NotResponded": "Non risposto",
+    "CalendarEventResponse_Tentative": "Provvisorio",
+    "CalendarEventResponse_TentativeResponse": "Provvisorio",
+    "CalendarEventRsvpPanel_Accept": "Accetta",
+    "CalendarEventRsvpPanel_AddMessage": "Aggiungi un messaggio alla tua risposta... (facoltativo)",
+    "CalendarEventRsvpPanel_Decline": "Rifiuta",
+    "CalendarEventRsvpPanel_Message": "Messaggio",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Invia una risposta",
+    "CalendarEventRsvpPanel_Tentative": "Provvisorio",
+    "CalendarEventRsvpPanel_Title": "Opzioni di risposta",
+    "CalendarAttendeeStatus_Accepted": "Accettato",
+    "CalendarAttendeeStatus_Declined": "Rifiutato",
+    "CalendarAttendeeStatus_NeedsAction": "Richiede azione",
+    "CalendarAttendeeStatus_Tentative": "Provvisorio",
+    "CalendarEventDetails_Attachments": "Allegati",
+    "CalendarEventCompose_AddAttachment": "Aggiungi allegato",
+    "CalendarEventCompose_AllDay": "Tutto il giorno",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Gli allegati non sono supportati per i calendari CalDAV.",
+    "CalendarEventCompose_EndDate": "Data di fine",
+    "CalendarEventCompose_EndTime": "Orario di fine",
+    "CalendarEventCompose_Every": "ogni",
+    "CalendarEventCompose_ForWeekdays": "per",
+    "CalendarEventCompose_FrequencyDay": "giorno",
+    "CalendarEventCompose_FrequencyDayPlural": "giorni",
+    "CalendarEventCompose_FrequencyMonth": "mese",
+    "CalendarEventCompose_FrequencyMonthPlural": "mesi",
+    "CalendarEventCompose_FrequencyWeek": "settimana",
+    "CalendarEventCompose_FrequencyWeekPlural": "settimane",
+    "CalendarEventCompose_FrequencyYear": "anno",
+    "CalendarEventCompose_FrequencyYearPlural": "anni",
+    "CalendarEventCompose_Location": "Luogo",
+    "CalendarEventCompose_LocationPlaceholder": "Aggiungi luogo",
+    "CalendarEventCompose_NewEventButton": "Nuovo evento",
+    "CalendarEventCompose_DefaultCalendarHint": "Puoi scegliere un calendario predefinito per i nuovi eventi nelle impostazioni del Calendario.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Apri impostazioni del Calendario",
+    "CalendarEventCompose_NoCalendarsMessage": "Non ci sono calendari disponibili per la creazione di eventi al momento.",
+    "CalendarEventCompose_NoCalendarsTitle": "Nessun calendario disponibile",
+    "CalendarEventCompose_NoEndDate": "Nessuna data di fine",
+    "CalendarEventCompose_Notes": "Note",
+    "CalendarEventCompose_PickCalendarTitle": "Scegli un calendario",
+    "CalendarEventCompose_Recurring": "Ricorrente",
+    "CalendarEventCompose_RecurringSummary": "Si verifica ogni {0} {1}{2} {3} effettivo {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Si verifica {0}{1} {2} effettivo {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Ripeti ogni",
+    "CalendarEventCompose_SelectCalendar": "Seleziona calendario",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Si verifica il {0} {1}",
+    "CalendarEventCompose_StartDate": "Data di inizio",
+    "CalendarEventCompose_StartTime": "Orario di inizio",
+    "CalendarEventCompose_TimeRangeSummary": "da {0} a {1}",
+    "CalendarEventCompose_Title": "Titolo evento",
+    "CalendarEventCompose_TitlePlaceholder": "Aggiungi un titolo",
+    "CalendarEventCompose_Until": "fino a",
+    "CalendarEventCompose_UntilSummary": "  fino a {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "La data di fine dell'intera giornata deve essere successiva a quella di inizio.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Uno o più partecipanti hanno un indirizzo email non valido.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "La data di fine della ricorrenza deve essere uguale o successiva alla data di inizio dell'evento.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "L'orario di fine deve essere successivo all'orario di inizio.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Uno o più allegati non sono più disponibili: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Seleziona un calendario prima di creare l'evento.",
+    "CalendarEventCompose_ValidationMissingTitle": "Inserisci un titolo per l'evento prima di crearlo.",
+    "CalendarEventCompose_ValidationTitle": "Validazione dell'evento fallita",
+    "CalendarEventCompose_WeekdaySummary": "  il {0}",
+    "CalendarEventCompose_Weekday_Friday": "V",
+    "CalendarEventCompose_Weekday_Monday": "L",
+    "CalendarEventCompose_Weekday_Saturday": "Sab",
+    "CalendarEventCompose_Weekday_Sunday": "Dom",
+    "CalendarEventCompose_Weekday_Thursday": "Gio",
+    "CalendarEventCompose_Weekday_Tuesday": "Mar",
+    "CalendarEventCompose_Weekday_Wednesday": "Mer",
+    "CalendarEventDetails_Details": "Dettagli",
+    "CalendarEventDetails_EditSeries": "Modifica serie",
+    "CalendarEventDetails_Editing": "Modifica in corso",
+    "CalendarEventDetails_InviteSomeone": "Invita qualcuno",
+    "CalendarEventDetails_JoinOnline": "Partecipa online",
+    "CalendarEventDetails_Organizer": "Organizzatore",
+    "CalendarEventDetails_People": "Persone",
+    "CalendarEventDetails_ReadOnlyEvent": "Evento di sola lettura",
+    "CalendarEventDetails_Reminder": "Promemoria",
+    "CalendarReminder_StartedHoursAgo": "Iniziato {0} ore fa",
+    "CalendarReminder_StartedMinutesAgo": "Iniziato {0} minuti fa",
+    "CalendarReminder_StartedNow": "Iniziato ora",
+    "CalendarReminder_StartingNow": "Inizio ora",
+    "CalendarReminder_StartsInHours": "Inizia tra {0} ore",
+    "CalendarReminder_StartsInMinutes": "Inizia tra {0} minuti",
+    "CalendarReminder_SnoozeAction": "Rimanda",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minuti",
+    "CalendarEventDetails_ShowAs": "Mostra come",
+    "CalendarShowAs_Free": "Disponibile",
+    "CalendarShowAs_Tentative": "Provvisorio",
+    "CalendarShowAs_Busy": "Occupato",
+    "CalendarShowAs_OutOfOffice": "Fuori dall'ufficio",
+    "CalendarShowAs_WorkingElsewhere": "Lavorando altrove",
     "CalendarItem_DetailsPopup_JoinOnline": "Unisciti in rete",
     "CalendarItem_DetailsPopup_ViewEventButton": "Vedi evento",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Vedi serie",
-    "CalendarItemAllDay": "in giornata",
+    "CalendarItemAllDay": "la giornata",
     "CategoriesFolderNameOverride": "Categorie",
-    "Center": "Centro",
+    "Center": "Centra",
     "ClipboardTextCopied_Message": "{0} copiato negli Appunti.",
     "ClipboardTextCopied_Title": "Copiato",
-    "ClipboardTextCopyFailed_Message": "Impossibile copiare {0} negli Appunti.",
-    "ComingSoon": "In arrivo…",
+    "ClipboardTextCopyFailed_Message": "Impossibile copiare {0} negli Aappunti.",
+    "ContactInfoBar_ErrorTitle": "Impossibile caricare le informazioni di contatto",
+    "ContactInfoBar_SuccessTitle": "Informazioni di contatto caricate",
+    "ContactInfoBar_WarningTitle": "Le informazioni di contatto potrebbero essere incomplete",
+    "ComingSoon": "Prossimamente...",
     "ComposerAttachmentsDragDropAttach_Message": "Allega",
-    "ComposerAttachmentsDropZone_Message": "Rilascia i tuoi file qui",
+    "ComposerAttachmentsDropZone_Message": "Trascina qui i tuoi file",
     "ComposerFrom": "Da: ",
-    "ComposerImagesDropZone_Message": "Rilascia le tue immagini qui",
+    "ComposerImagesDropZone_Message": "Trascina qui le tue immagini",
     "ComposerSubject": "Oggetto: ",
     "ComposerTo": "A: ",
-    "ComposerToPlaceholder": "batti Invio per immettere gli indirizzi",
+    "ComposerToPlaceholder": "clicca Invio per inserire gli indirizzi",
     "CreateAccountAliasDialog_AliasAddress": "Indirizzo",
     "CreateAccountAliasDialog_AliasAddressPlaceholder": "es. support@miodominio.com",
-    "CreateAccountAliasDialog_Description": "Assicurati che il tuo server in uscita permetta l'invio di e-mail da questo alias.",
+    "CreateAccountAliasDialog_Description": "Assicurati che il tuo server in uscita permetta di inviare e-mail da questo alias.",
     "CreateAccountAliasDialog_ReplyToAddress": "Indirizzo per le risposte",
     "CreateAccountAliasDialog_ReplyToAddressPlaceholder": "admin@miodominio.com",
     "CreateAccountAliasDialog_Title": "Crea alias dell'account",
     "CustomThemeBuilder_AccentColorDescription": "Imposta un colore principale personalizzato, se vuoi. Non selezionando un colore, sarà usato il colore principale di Windows.",
     "CustomThemeBuilder_AccentColorTitle": "Colore principale",
     "CustomThemeBuilder_PickColor": "Scegli",
-    "CustomThemeBuilder_ThemeNameDescription": "Nome unico del tuo tema personale.",
+    "CustomThemeBuilder_ThemeNameDescription": "Nome unico del tuo tema personalizzato.",
     "CustomThemeBuilder_ThemeNameTitle": "Nome tema",
     "CustomThemeBuilder_Title": "Creatore temi personalizzati",
-    "CustomThemeBuilder_WallpaperDescription": "Imposta uno sfondo personale per Wino",
-    "CustomThemeBuilder_WallpaperTitle": "Imposta sfondo personale",
+    "CustomThemeBuilder_WallpaperDescription": "Imposta uno sfondo personalizzato per Wino",
+    "CustomThemeBuilder_WallpaperTitle": "Imposta sfondo personalizzato",
     "Dialog_DontAskAgain": "Non chiedere più",
     "DialogMessage_AccountLimitMessage": "Hai raggiunto il limite di creazione degli account.\nVuoi acquistare il componente aggiuntivo 'Account illimitati' per continuare?",
     "DialogMessage_AccountLimitTitle": "Raggiunto limite account",
@@ -121,7 +252,7 @@
     "DialogMessage_AliasNotSelectedTitle": "Alias mancante",
     "DialogMessage_CantDeleteRootAliasMessage": "L'alias radice non può essere eliminato. Questa è la tua identità principale associata alla configurazione del tuo account.",
     "DialogMessage_CantDeleteRootAliasTitle": "Impossibile eliminare alias",
-    "DialogMessage_CleanupFolderMessage": "Vuoi eliminare definitivamente tutte le e-mail in questa cartella?",
+    "DialogMessage_CleanupFolderMessage": "Vuoi eliminare definitivamente tutti i messaggi in questa cartella?",
     "DialogMessage_CleanupFolderTitle": "Svuota cartella",
     "DialogMessage_ComposerMissingRecipientMessage": "Il messaggio non ha destinatari.",
     "DialogMessage_ComposerValidationFailedTitle": "Convalida non riuscita",
@@ -129,23 +260,27 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nome account collegato",
     "DialogMessage_DeleteAccountConfirmationMessage": "Eliminare {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "I dati associati a questo account saranno permanentemente eliminati dal disco.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Elimina il modello '{0}'?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Elimina modello di email",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Questo eliminerà tutti gli eventi della serie. Vuoi continuare?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Elimina serie ricorrente",
     "DialogMessage_DiscardDraftConfirmationMessage": "Questa bozza sarà scartata. Vuoi continuare?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Scarta bozza",
     "DialogMessage_EmptySubjectConfirmation": "Oggetto mancante",
     "DialogMessage_EmptySubjectConfirmationMessage": "Il messaggio non ha oggetto. Vuoi continuare?",
-    "DialogMessage_EnableStartupLaunchDeniedMessage": "È possibile abilitare l'auto-avvio da Impostazioni -> Preferenze app.",
+    "DialogMessage_EnableStartupLaunchDeniedMessage": "È possibile abilitare l'avvio da Impostazioni -> Preferenze app.",
     "DialogMessage_EnableStartupLaunchMessage": "Permetti a Wino Mail di lanciarsi automaticamente minimizzato all'avvio di Windows per non perdere alcuna notifica.\n\nVuoi abilitare il lancio all'avvio?",
     "DialogMessage_EnableStartupLaunchTitle": "Abilita auto-avvio",
     "DialogMessage_HardDeleteConfirmationMessage": "Eliminazione permanente",
     "DialogMessage_HardDeleteConfirmationTitle": "I messaggi saranno eliminati definitivamente. Vuoi continuare?",
     "DialogMessage_InvalidAliasMessage": "Questo alias non è valido. Assicurati che tutti gli indirizzi dell'alias siano indirizzi e-mail validi.",
     "DialogMessage_InvalidAliasTitle": "Alias non valido",
-    "DialogMessage_NoAccountsForCreateMailMessage": "Non hai alcun account dal quale creare messaggi.",
+    "DialogMessage_NoAccountsForCreateMailMessage": "Non hai alcun account per creare messaggi.",
     "DialogMessage_NoAccountsForCreateMailTitle": "Account mancante",
-    "DialogMessage_PrintingFailedMessage": "Impossibile stampare di quest'e-mail. Risultato: {0}",
+    "DialogMessage_PrintingFailedMessage": "Stampa di questa e-mail non riuscita. Risultato: {0}",
     "DialogMessage_PrintingFailedTitle": "Non riuscita",
     "DialogMessage_PrintingSuccessMessage": "La posta è inviata alla stampante.",
-    "DialogMessage_PrintingSuccessTitle": "Riuscito",
+    "DialogMessage_PrintingSuccessTitle": "Fatto",
     "DialogMessage_RenameFolderMessage": "Inserisci un nuovo nome per questa cartella",
     "DialogMessage_RenameFolderTitle": "Rinomina cartella",
     "DialogMessage_RenameLinkedAccountsMessage": "Inserisci un nuovo nome per l'account collegato",
@@ -153,7 +288,7 @@
     "DialogMessage_UnlinkAccountsConfirmationMessage": "Questa operazione non eliminerà i tuoi account, ma interromperà solo il collegamento verso le connessioni alla cartella condivisa. Vuoi continuare?",
     "DialogMessage_UnlinkAccountsConfirmationTitle": "Scollega account",
     "DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton": "Vai al sito",
-    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "Per smettere di ricevere messaggi da {0}, vai al sito web per disiscriverti.",
+    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "Per smettere di ricevere messaggi da {0}, vai sul loro sito web per disiscriverti.",
     "DialogMessage_UnsubscribeConfirmationMailtoMessage": "Vuoi smettere di ricevere messaggi da {0}? Wino annullerà la tua iscrizione inviando una e-mail dal tuo account e-mail a {1}.",
     "DialogMessage_UnsubscribeConfirmationOneClickMessage": "Vuoi smettere di ricevere messaggi da {0}?",
     "DialogMessage_UnsubscribeConfirmationTitle": "Disiscriviti",
@@ -167,16 +302,23 @@
     "EditorToolbarOption_None": "Nessuno",
     "EditorToolbarOption_Options": "Opzioni",
     "EditorTooltip_WebViewEditor": "Usa editor di visualizzazione web",
-    "ElementTheme_Dark": "Modalità scura",
+    "ElementTheme_Dark": "Tema scuro",
     "ElementTheme_Default": "Usa le impostazioni di sistema",
-    "ElementTheme_Light": "Modalità chiara",
+    "ElementTheme_Light": "Tema chiaro",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Impossibile configurare le cartelle di sistema",
+    "Exception_AccountNeedsAttention_Title": "L'account richiede attenzione",
+    "Exception_AccountNeedsAttention_Message": "'{0}' richiede la tua attenzione per continuare a lavorare.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail non è riuscito a trovare Microsoft Edge WebView2 Runtime. Si prega di installare o riparare il runtime per rendere correttamente il contenuto dei messaggi.",
+    "Exception_WebView2RuntimeMissing_Title": "Il runtime WebView2 è richiesto",
     "Exception_AuthenticationCanceled": "Autenticazione annullata",
     "Exception_CustomThemeExists": "Questo tema esiste già.",
     "Exception_CustomThemeMissingName": "Devi fornire un nome.",
-    "Exception_CustomThemeMissingWallpaper": "Devi fornire un'immagine di sfondo personale.",
+    "Exception_CustomThemeMissingWallpaper": "Devi fornire un'immagine di sfondo personalizzata.",
     "Exception_FailedToSynchronizeAliases": "Impossibile sincronizzare gli alias",
+    "Exception_FailedToSynchronizeCalendarData": "Impossibile sincronizzare i dati del calendario",
+    "Exception_FailedToSynchronizeCalendarEvents": "Impossibile sincronizzare gli eventi del calendario",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Impossibile sincronizzare i metadati del calendario",
     "Exception_FailedToSynchronizeFolders": "Sincronizzazione cartelle non riuscita",
     "Exception_FailedToSynchronizeProfileInformation": "Impossibile sincronizzare le informazioni del profilo",
     "Exception_GoogleAuthCallbackNull": "Il Callback uri è nullo all'attivazione.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Sposta in Indesiderata",
     "HoverActionOption_ToggleFlag": "Contrassegno sì/no",
     "HoverActionOption_ToggleRead": "Già letto / Da leggere",
+    "KeyboardShortcuts_FailedToReset": "Impossibile reimpostare le scorciatoie da tastiera.",
+    "KeyboardShortcuts_FailedToUpdate": "Impossibile aggiornare le scorciatoie da tastiera",
+    "KeyboardShortcuts_MailoperationAction": "Azione",
+    "KeyboardShortcuts_Action": "Azione",
+    "KeyboardShortcuts_FailedToLoad": "Impossibile caricare le scorciatoie da tastiera.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Inserisci una combinazione di tasti per la scorciatoia.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Seleziona un'azione da associare alla scorciatoia.",
+    "KeyboardShortcuts_EnterKey": "Premi un tasto per la scorciatoia.",
+    "KeyboardShortcuts_SelectOperation": "Seleziona un'azione per la scorciatoia.",
+    "KeyboardShortcuts_ShortcutInUse": "Questa scorciatoia è già in uso da un'altra scorciatoia.",
+    "KeyboardShortcuts_FailedToSave": "Impossibile salvare la scorciatoia.",
+    "KeyboardShortcuts_FailedToDelete": "Impossibile eliminare la scorciatoia.",
+    "KeyboardShortcuts_PageDescription": "Configura scorciatoie da tastiera per operazioni rapide sulla posta. Premi i tasti mentre è focalizzato sul campo di input della scorciatoia per catturare le combinazioni.",
+    "KeyboardShortcuts_Add": "Aggiungi scorciatoia",
+    "KeyboardShortcuts_EditTitle": "Modifica scorciatoia da tastiera",
+    "KeyboardShortcuts_ResetToDefaults": "Ripristina impostazioni predefinite",
+    "KeyboardShortcuts_PressKeysHere": "Premi qui i tasti...",
+    "KeyboardShortcuts_KeyCombination": "Combinazione di tasti",
+    "KeyboardShortcuts_FocusArea": "Porta il focus sul campo qui sopra e premi la combinazione di tasti desiderata",
+    "KeyboardShortcuts_Modifiers": "Tasti modificatori",
+    "KeyboardShortcuts_Mode": "Modalità dell'app",
+    "KeyboardShortcuts_ModeMail": "Posta",
+    "KeyboardShortcuts_ModeCalendar": "Calendario",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Alterna letto/non letto",
+    "KeyboardShortcuts_ActionToggleFlag": "Alterna flag",
+    "KeyboardShortcuts_ActionToggleArchive": "Archivia/disarchivia",
     "ImageRenderingDisabled": "La visualizzazione dell'immagine è disabilitata per questo messaggio.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Metodo di autenticazione",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Sicurezza della connessione",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nome utente",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Usa lo stesso nome utente e la stessa parola d'accesso per l'invio di e-mail",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP e Calendario",
+    "ImapCalDavSettingsPage_TitleEdit": "Modifica impostazioni IMAP e calendario",
+    "ImapCalDavSettingsPage_Subtitle": "Configura IMAP/SMTP e la sincronizzazione opzionale del calendario per questo account.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Impostazioni di base",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Inserisci la tua identità e le credenziali. Wino può tentare di rilevare automaticamente le impostazioni del server.",
+    "ImapCalDavSettingsPage_BasicTab": "Base",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Attiva supporto calendario",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Scoperta automatica delle impostazioni di posta",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Impostazioni della posta rilevate e applicate.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configurazione avanzata",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Inserire manualmente le impostazioni del server se la scoperta automatica non è disponibile o è errata.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avanzate",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configurazione calendario",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Scegli come i dati del calendario dovrebbero operare per questo account IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Modalità calendario",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Sicurezza connessione",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Metodo di autenticazione",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Disabilitato",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronizzazione CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Solo calendario locale",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Il calendario è disabilitato per questo account.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Gli elementi del calendario sono sincronizzati con il tuo server CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Gli elementi del calendario sono archiviati solo sul tuo computer e non sono sincronizzati in rete.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Come funziona il calendario locale",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Solo calendario locale",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Il calendario locale mantiene tutti gli eventi solo sul tuo computer. Nulla viene sincronizzato con iCloud, Yahoo o altri fornitori.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL del servizio CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nome utente CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Password CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Il test CalDAV è richiesto solo quando la modalità calendario è impostata su sincronizzazione CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "È richiesto l'URL del servizio CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "L'URL del servizio CalDAV deve essere un URL assoluto.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Il nome utente CalDAV è obbligatorio.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "La password CalDAV è obbligatoria.",
+    "ImapCalDavSettingsPage_TestImapButton": "Test connessione IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Test connessione CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Il test della connessione IMAP è riuscito.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Il test della connessione CalDAV è riuscito.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Impostazioni dell'account verificate e salvate.",
+    "ImapCalDavSettingsPage_ICloudHint": "Usa una password specifica per l'app generata dalle impostazioni del tuo account Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Usa una password per l'app dalle impostazioni di sicurezza del tuo account Yahoo.",
     "Info_AccountCreatedMessage": "{0} è stato creato",
     "Info_AccountCreatedTitle": "Creazione account",
     "Info_AccountCreationFailedTitle": "Creazione account non riuscita",
     "Info_AccountDeletedMessage": "{0} è stato eliminato correttamente.",
     "Info_AccountDeletedTitle": "Account eliminato",
     "Info_AccountIssueFixFailedTitle": "Non riuscito",
+    "Info_AccountIssueFixImapMessage": "Apri la pagina delle impostazioni IMAP e calendario per inserire nuovamente le credenziali del server.",
+    "Info_AccountAttentionRequiredMessage": "Questo account necessita della tua attenzione.",
+    "Info_AccountAttentionRequiredClickableMessage": "Fai clic per risolvere questo account e sincronizzarlo di nuovo.",
+    "Info_AccountAttentionRequiredAction": "Correggi",
+    "Info_AccountAttentionRequiredActionHint": "Fai clic su Correggi per risolvere questo problema dell'account.",
     "Info_AccountIssueFixSuccessMessage": "Risolti tutti i problemi dell'account.",
     "Info_AccountIssueFixSuccessTitle": "Fatto",
     "Info_AttachmentOpenFailedMessage": "Non è possibile aprire questo allegato.",
@@ -362,7 +576,7 @@
     "Info_SyncFailedTitle": "Sincronizzazione non riuscita",
     "Info_UnsubscribeErrorMessage": "Impossibile annullare l'iscrizione",
     "Info_UnsubscribeLinkInvalidMessage": "Questo collegamento di disiscrizione non è valido. Impossibile disiscriversi dalla lista.",
-    "Info_UnsubscribeLinkInvalidTitle": "URI disiscrizione non valido",
+    "Info_UnsubscribeLinkInvalidTitle": "URL disiscrizione non valido",
     "Info_UnsubscribeSuccessMessage": "Iscrizione a {0} annullata con successo.",
     "Info_UnsupportedFunctionalityDescription": "Questa funzionalità non è stata ancora implementata.",
     "Info_UnsupportedFunctionalityTitle": "Non supportato",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Questa cartella è disabilitata per la sincronizzazione.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Cartella disabilitata",
     "Justify": "Giustifica",
+    "MenuUpdateAvailable": "Aggiornamento disponibile",
     "Left": "Sinistra",
     "Link": "Collegamento",
     "LinkedAccountsCreatePolicyMessage": "devi avere almeno 2 account per creare il collegamento\nil collegamento sarà rimosso al salvataggio",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Sposta da archivio",
     "MailOperation_ViewMessageSource": "Vedi sorgente messaggio",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Trascinando {0} elemento/i",
     "MailsSelected": "{0} elemento/i selezionato/i",
     "MarkFlagUnflag": "Segna come contrassegnato/non contrassegnato",
     "MarkReadUnread": "Segna come letto/da leggere",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Nuova posta",
     "Notifications_WinoUpdatedMessage": "Controlla la nuova versione {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail è stato aggiornato.",
+    "Notifications_StoreUpdateAvailableTitle": "Aggiornamento disponibile",
+    "Notifications_StoreUpdateAvailableMessage": "È disponibile una versione più recente di Wino Mail, pronta per l'installazione dal Microsoft Store.",
     "OnlineSearchFailed_Message": "Esecuzione della ricerca non riuscita\n{0}\n\nnell'elenco delle e-mail fuori rete.",
     "OnlineSearchTry_Line1": "Nessuna risposta adeguata trovata?",
     "OnlineSearchTry_Line2": "Prova la ricerca in rete.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Piccolo",
     "Photos": "Foto",
     "PreparingFoldersMessage": "Preparazione cartelle",
-    "ProtocolLogAvailable_Message": "I registri del protocollo sono disponibili per la diagnostica.",
     "ProviderDetail_Gmail_Description": "Account Google",
     "ProviderDetail_iCloud_Description": "Account iCloud Apple",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Cerca",
     "SearchingIn": "Ricerca in",
     "SearchPivotName": "Risultati",
+    "Settings_KeyboardShortcuts_Title": "Scorciatoie da tastiera",
+    "Settings_KeyboardShortcuts_Description": "Gestisci le scorciatoie da tastiera per azioni rapide sulle email.",
     "SettingConfigureSpecialFolders_Button": "Configura",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Configurazione IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Cambia le impostazioni del server in entrata/uscita.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Impostazioni IMAP e calendario",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Apri la pagina dedicata alle impostazioni IMAP, SMTP e CalDAV per questo account.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Apri impostazioni",
     "SettingsAbout_Description": "Scopri di più su Wino.",
     "SettingsAbout_Title": "Informaz.",
     "SettingsAboutGithub_Description": "Vai all'issue tracker del repository GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Locale",
     "SettingsAppPreferences_SearchMode_Online": "In rete",
     "SettingsAppPreferences_SearchMode_Title": "Modalità di ricerca predefinita",
+    "SettingsAppPreferences_ApplicationMode_Title": "Modalità predefinita dell'applicazione",
+    "SettingsAppPreferences_ApplicationMode_Description": "Scegli in quale modalità si aprirà Wino quando non è specificato un tipo di attivazione.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Posta",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendario",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail continuerà a essere in esecuzione dietro le quinte. Sarai avvisato quando arrivano nuovi messaggi.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Esegui dietro le quinte",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail continuerà a funzionare nell'area di notifica. Disponibile per il lancio cliccando un'icona. Sarai avvisato quando arrivano nuovi messaggi.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Si è verificato un errore fatale modificando la modalità di avvio per Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Avvia minimizzato all'avvio di Windows",
     "SettingsAppPreferences_Title": "Preferenze dell'app",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Nascondi il pulsante dell'account Wino nella barra del titolo",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Nascondi il pulsante profilo nella barra del titolo che apre il menu dell'account Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notifiche di aggiornamento del Microsoft Store.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Mostra notifiche e azioni a piè di pagina quando è disponibile un aggiornamento dal Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Azioni AI",
+    "SettingsAppPreferences_AiActions_Description": "Scegli le lingue predefinite per l'IA e dove dovrebbero essere salvati i riassunti.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Lingua di traduzione predefinita",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Seleziona la lingua di destinazione predefinita utilizzata dalle azioni di traduzione AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Lingua di riepilogo",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Seleziona la lingua preferita per i riassunti futuri generati dall'IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Percorso di salvataggio predefinito per i riassunti",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Scegli la cartella che Wino dovrebbe utilizzare per impostazione predefinita quando salva i riassunti generati dall'IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Usa la posizione di salvataggio di sistema predefinita",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Questa cartella non esiste. Verrà utilizzata la posizione di salvataggio predefinita per i riassunti.",
     "SettingsAutoSelectNextItem_Description": "Seleziona l'elemento successivo dopo aver eliminato o spostato un messaggio.",
     "SettingsAutoSelectNextItem_Title": "Auto-seleziona l'elemento successivo",
     "SettingsAvailableThemes_Description": "Seleziona un tema dalla collezione di Wino di tuo gusto o applica i tuoi temi.",
     "SettingsAvailableThemes_Title": "Temi disponibili",
     "SettingsCalendarSettings_Description": "Cambia primo giorno della settimana, altezza della cella dell'ora e altro…",
     "SettingsCalendarSettings_Title": "Impostazioni calendario",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Durata predefinita del posticipo",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Imposta una durata predefinita per il posticipo delle notifiche promemoria del calendario.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formato intestazione giorno vista temporizzata",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Scegli come le etichette dei giorni in alto vengono visualizzate nelle viste giorno, settimana e settimana lavorativa. Usa token di formato data come ddd, dd, MMM o dddd.",
     "SettingsComposer_Title": "Compositore",
     "SettingsComposerFont_Title": "Carattere predefinito compositore",
     "SettingsComposerFontFamily_Description": "Cambia famiglia caratteri e dimensione carattere predefiniti per la scrittura dei messaggi.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Canale Discord",
     "SettingsEditLinkedInbox_Description": "Aggiungi/rimuovi account, rinomina o interrompi il collegamento tra gli account.",
     "SettingsEditLinkedInbox_Title": "Modifica In arrivo collegata",
+    "SettingsWindowBackdrop_Title": "Sfondo della finestra",
+    "SettingsWindowBackdrop_Description": "Seleziona un effetto di sfondo per le finestre di Wino.",
+    "SettingsWindowBackdrop_Disabled": "La selezione dello sfondo della finestra è disabilitata quando il tema dell'applicazione è diverso da Predefinito.",
     "SettingsElementTheme_Description": "Seleziona un tema di Windows per Wino",
     "SettingsElementTheme_Title": "Tema elemento",
     "SettingsElementThemeSelectionDisabled": "La selezione del tema dell'elemento è disabilitata quando un tema dell'applicazione diverso da quello predefinito è selezionato.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Alias",
     "SettingsEditAccountDetails_Title": "Modifica dettagli account",
     "SettingsEditAccountDetails_Description": "Cambia il nome dell'account, il nome del mittente e - se vuoi - assegnagli un nuovo colore.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Modifiche salvate",
+    "EditAccountDetailsPage_SaveSuccess_Message": "I dettagli dell'account sono stati aggiornati con successo.",
     "SettingsManageLink_Description": "Sposta gli elementi per aggiungere un nuovo collegamento o rimuovi un collegamento esistente.",
     "SettingsManageLink_Title": "Gestisci collegamento",
     "SettingsMarkAsRead_Description": "Cambia cosa dovrebbe accadere all'elemento selezionato.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifiche",
     "SettingsNotificationsAndTaskbar_Description": "Cambia se le notifiche devono essere visualizzate e distintivo della barra delle attività per questo account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifiche e barra delle attività",
+    "SettingsHome_Title": "Home",
+    "SettingsHome_SearchTitle": "Trova un'impostazione",
+    "SettingsHome_SearchDescription": "Cerca per funzione, argomento o parola chiave per andare direttamente alla pagina delle impostazioni corretta.",
+    "SettingsHome_SearchPlaceholder": "Cerca impostazioni",
+    "SettingsHome_SearchExamples": "Prova: tema, archiviazione, lingua, firma",
+    "SettingsHome_QuickLinks_Title": "Collegamenti rapidi",
+    "SettingsHome_QuickLinks_Description": "Accedi rapidamente alle impostazioni che le persone cercano più spesso.",
+    "SettingsHome_StorageCard_Description": "Vedi quanta contenuto MIME locale Wino conserva su questo dispositivo e puliscilo quando necessario.",
+    "SettingsHome_StorageEmptySummary": "Nessun contenuto MIME memorizzato nella cache rilevato finora.",
+    "SettingsHome_StorageLoading": "Verificando l'utilizzo MIME locale...",
+    "SettingsHome_Tips_Title": "Consigli e trucchi",
+    "SettingsHome_Tips_Description": "Qualche piccola modifica può rendere Wino molto più personale.",
+    "SettingsHome_Tip_Theme": "Vuoi modalità scura o cambiamenti di accento? Apri Personalizzazione.",
+    "SettingsHome_Tip_Background": "Usa Preferenze dell'app per controllare l'avvio e la sincronizzazione in background.",
+    "SettingsHome_Tip_Shortcuts": "Le scorciatoie da tastiera ti aiutano a muoverti tra le email più rapidamente.",
+    "SettingsHome_Resources_Title": "Collegamenti utili",
+    "SettingsHome_Resources_Description": "Apri risorse del progetto, informazioni di supporto e canali di rilascio.",
     "SettingsOptions_Title": "Impostazioni",
+    "SettingsOptions_GeneralSection": "Generale",
+    "SettingsOptions_MailSection": "Posta",
+    "SettingsOptions_CalendarSection": "Calendario",
+    "SettingsOptions_MoreComingSoon": "Altre opzioni in arrivo",
+    "SettingsOptions_HeroDescription": "Personalizza la tua esperienza con Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} account configurati",
+    "SettingsSearch_ManageAccounts_Keywords": "account;account;casella di posta;caselle di posta;alias;alias;profilo;indirizzo;indirizzi",
+    "SettingsSearch_AppPreferences_Keywords": "avvio;in background;lancio;sincronizzazione;notifiche;notifiche;ricerca;area di notifica;predefiniti",
+    "SettingsSearch_LanguageTime_Keywords": "lingua;tempo;orologio;locale;regione;formato;24 ore;24h",
+    "SettingsSearch_Personalization_Keywords": "tema;scuro;chiaro;aspetto;accento;colore;colore;modalità;layout;densità",
+    "SettingsSearch_About_Keywords": "informazioni;versione;sito web;privacy;github;donazioni;negozio;supporto",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "scorciatoia;scorciatoie;tasti rapidi;tasti rapidi;tastiera;tasti",
+    "SettingsSearch_MessageList_Keywords": "messaggio;messaggi;elenco;conversazioni;conversazioni;avatar;anteprima;mittente",
+    "SettingsSearch_ReadComposePane_Keywords": "lettore;componi;compositore;carattere;caratteri;contenuto esterno;visualizzazione;lettura",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "firma;firme;crittografia;certificato;certificati;S/MIME;S/MIME;sicurezza",
+    "SettingsSearch_Storage_Keywords": "archiviazione;cache;memorizzazione nella cache;MIME;disco;spazio;pulizia;ripulire;dati locali",
+    "SettingsSearch_CalendarSettings_Keywords": "calendario;settimana;ore;orario;evento;eventi",
     "SettingsPaneLengthReset_Description": "Reimposta la dimensione dell'elenco di posta all'originale se hai problemi con esso.",
     "SettingsPaneLengthReset_Title": "Reimposta dimensione elenco posta",
     "SettingsPaypal_Description": "Mostra molto più amore ❤️ Tutte le donazioni sono apprezzate.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Mostra orologio in formato 24 ore",
     "SettingsPrivacyPolicy_Description": "Verifica la politica di riservatezza.",
     "SettingsPrivacyPolicy_Title": "Politica di riservatezza",
+    "SettingsWebsite_Description": "Apri il sito web di Wino Mail.",
+    "SettingsWebsite_Title": "Sito web",
     "SettingsReadComposePane_Description": "Caratteri, contenuto esterno.",
     "SettingsReadComposePane_Title": "Lettore e compositore",
     "SettingsReader_Title": "Lettore",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Mostra testo di anteprima",
     "SettingsShowSenderPictures_Description": "Mostra/nascondi le miniature delle immagini del mittente.",
     "SettingsShowSenderPictures_Title": "Mostra avatar mittente",
+    "SettingsEmailTemplates_Title": "Modelli di email",
+    "SettingsEmailTemplates_Description": "Gestisci i modelli di e-mail",
+    "SettingsEmailTemplates_CreatePageTitle": "Nuovo modello",
+    "SettingsEmailTemplates_EditPageTitle": "Modifica modello",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nuovo modello",
+    "SettingsEmailTemplates_NewTemplateDescription": "Crea un nuovo modello di e-mail",
+    "SettingsEmailTemplates_NameTitle": "Nome",
+    "SettingsEmailTemplates_NamePlaceholder": "Nome del modello",
+    "SettingsEmailTemplates_DescriptionTitle": "Descrizione",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descrizione opzionale",
+    "SettingsEmailTemplates_ContentTitle": "Contenuto del modello",
+    "SettingsEmailTemplates_ContentDescription": "Modifica il contenuto HTML di questo modello.",
+    "SettingsEmailTemplates_NameRequired": "Il nome del modello è obbligatorio.",
     "SettingsEnableGravatarAvatars_Title": "Personificatore",
     "SettingsEnableGravatarAvatars_Description": "Usa il personificatore (se disponibile) come immagine del mittente",
     "SettingsEnableFavicons_Title": "Icone del dominio (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Elemento Iniziale",
     "SettingsStore_Description": "Mostra un po' di amore ❤️",
     "SettingsStore_Title": "Valuta nel negozio",
+    "SettingsStorage_Title": "Archiviazione",
+    "SettingsStorage_Description": "Scansiona e gestisci la cache MIME memorizzata nella tua cartella dati locale.",
+    "SettingsStorage_ScanFolder": "Scansiona la cartella dati locale",
+    "SettingsStorage_NoLocalMimeDataFound": "Nessun dato MIME locale trovato.",
+    "SettingsStorage_NoAccountsFound": "Nessun account trovato.",
+    "SettingsStorage_TotalUsage": "Uso totale della cache MIME locale: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} utilizzati nella cache MIME locale.",
+    "SettingsStorage_DeleteAll_Title": "Elimina tutto il contenuto MIME",
+    "SettingsStorage_DeleteAll_Description": "Elimina l'intera cartella cache MIME di questo account.",
+    "SettingsStorage_DeleteAll_Button": "Elimina tutto",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Elimina tutto il contenuto MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Eliminare tutti i dati MIME locali per {0}?",
+    "SettingsStorage_DeleteAll_Success": "Tutti i contenuti MIME sono stati eliminati.",
+    "SettingsStorage_DeleteOld_Title": "Elimina contenuti MIME vecchi",
+    "SettingsStorage_DeleteOld_Description": "Elimina i file MIME in base alla data di creazione dell'e-mail nel database locale.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mese",
+    "SettingsStorage_DeleteOld_3Months": "> 3 mesi",
+    "SettingsStorage_DeleteOld_6Months": "> 6 mesi",
+    "SettingsStorage_DeleteOld_1Year": "> 1 anno",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Elimina contenuti MIME vecchi",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Eliminare i dati MIME locali più vecchi di {0} per {1}?",
+    "SettingsStorage_DeleteOld_Success": "Eliminate {0} cartella MIME più vecchie di {1}.",
+    "SettingsStorage_1Month": "1 mese",
+    "SettingsStorage_3Months": "3 mesi",
+    "SettingsStorage_6Months": "6 mesi",
+    "SettingsStorage_1Year": "1 anno",
+    "SettingsStorage_Months": "{0} mesi",
     "SettingsTaskbarBadge_Description": "Includi conteggio dei messaggi non letti nell'icona della barra delle attività.",
     "SettingsTaskbarBadge_Title": "In barra attività come",
     "SettingsThreads_Description": "Organizza i messaggi in gruppi di conversazione.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Non puoi assegnare la cartella In arrivo a nessun'altra cartella di sistema.",
     "SystemFolderConfigSetupSuccess_Message": "Le cartelle di sistema sono configurate correttamente.",
     "SystemFolderConfigSetupSuccess_Title": "Configurazione cartelle di sistema",
+    "SystemTrayMenu_ShowWino": "Apri Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Apri Wino Calendario",
+    "SystemTrayMenu_ExitWino": "Esci",
     "TestingImapConnectionMessage": "Verifica connessione del server...",
     "TitleBarServerDisconnectedButton_Description": "Wino è disconnesso dalla rete. Clicca di nuovo per ripristinare la connessione.",
     "TitleBarServerDisconnectedButton_Title": "nessuna connessione",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Aggiorna ad account illimitati",
     "WinoUpgradeRemainingAccountsMessage": "{0} di {1} account gratuiti usati.",
     "Yesterday": "Ieri",
+    "Smime_ImportCertificates_Success": "Certificati importati correttamente.",
+    "Smime_ImportCertificates_Error": "Errore durante l'importazione dei certificati: {0}",
+    "Smime_RemoveCertificates_Confirm": "Vuoi davvero rimuovere i certificati {0}?",
+    "Smime_RemoveCertificates_Success": "Certificati rimossi.",
+    "Smime_ExportCertificates_Success": "Certificati esportati.",
+    "Smime_ExportCertificates_Error": "Errore durante l'esportazione dei certificati.",
+    "Smime_CertificateDetails": "Soggetto: {0}\nEmittente: {1}\nValido da: {2}\nValido fino a: {3}\nImpronta: {4}",
+    "Smime_CertificatePassword_Title": "Password del certificato obbligatoria",
+    "Smime_CertificatePassword_Placeholder": "Password del certificato per {0} (opzionale)",
+    "Smime_Confirm_Title": "Conferma",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Aggiorna",
+    "SettingsSignatureAndEncryption_Title": "Firma e Crittografia",
+    "SettingsSignatureAndEncryption_Description": "Gestisci certificati S/MIME per firmare e cifrare le email.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "I miei certificati",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificati personali per la firma e la cifratura",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificati del destinatario",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificati dei destinatari per decrittazione",
+    "SettingsSignatureAndEncryption_NameColumn": "Nome",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Scadenza",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Impronta digitale",
+    "Buttons_Remove": "Rimuovi",
+    "Buttons_Export": "Esporta",
+    "Buttons_Import": "Importa",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificato di firma S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Crittografia S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Nessuno",
+    "SmimeSignaturesInMessage": "Firme in questo messaggio:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, valido dal {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informazioni sul certificato di firma S/MIME",
+    "SmimeCertificateInfoTitle": "Informazioni sul certificato S/MIME",
+    "SmimeNoCertificateFileFound": "Nessun file di certificato trovato",
+    "SmimeSaveCertificate": "Salva certificato...",
+    "SmimeCertificate": "Certificato S/MIME",
+    "SmimeCertificateSavedTo": "Certificato salvato in {0}",
+    "SmimeSignedTooltip": "Questo messaggio è firmato con un certificato S/MIME. Clicca per ulteriori dettagli",
+    "SmimeEncryptedTooltip": "Questo messaggio è cifrato con un certificato S/MIME.",
+    "SmimeCertificateFileInfo": "File: {0}",
+    "Composer_LightTheme": "Tema Chiaro",
+    "Composer_DarkTheme": "Tema Scuro",
+    "Composer_Outdent": "Riduci rientro",
+    "Composer_Indent": "Aumenta rientro",
+    "Composer_BulletList": "Elenco puntato",
+    "Composer_OrderedList": "Elenco numerato",
+    "Composer_Stroke": "Tratto",
+    "Composer_Bold": "Grassetto",
+    "Composer_Italic": "Corsivo",
+    "Composer_Underline": "Sottolinea",
+    "Composer_CcBcc": "Cc e Bcc",
+    "Composer_EnableSmimeSignature": "Attiva/disattiva firma S/MIME",
+    "Composer_EnableSmimeEncryption": "Attiva/disattiva cifratura S/MIME",
+    "Composer_LocalDraftSyncInfo": "Questa bozza è locale. Wino non è riuscito a inviarla al server di posta. Fare clic per ritentare l'invio al server.",
+    "Composer_CertificateExpires": "Scadenza: ",
+    "Composer_SmimeSignature": "Firma S/MIME",
+    "Composer_SmimeEncryption": "Crittografia S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Modelli di e-mail",
+    "Composer_AiSummarize": "Riepiloga con l'IA",
+    "Composer_AiSummarizeDescription": "Estrai i punti chiave, le azioni e le decisioni da questa email.",
+    "Composer_AiTranslate": "Traduci con l'IA",
+    "Composer_AiActions": "Azioni IA",
+    "Composer_AiRewrite": "Riformula con l'IA",
+    "AiActions_CheckingStatus": "Verifica l'accesso all'IA...",
+    "AiActions_SignedOutTitle": "Sblocca Wino AI Pack",
+    "AiActions_SignedOutDescription": "Traduci, riscrivi e riassumi le email con l'IA dopo aver effettuato l'accesso al tuo account Wino e attivato l'add-on AI Pack.",
+    "AiActions_NoPackTitle": "AI Pack richiesto",
+    "AiActions_NoPackDescription": "Hai effettuato l'accesso, ma l'AI Pack non è attivo ancora. Acquistalo per utilizzare gli strumenti di traduzione, riscrittura e riassunto con IA di Wino.",
+    "AiActions_UsageSummary": "{0} di {1} crediti usati questo mese.",
+    "Composer_AiRewritePolite": "Rendilo più cortese",
+    "Composer_AiRewritePoliteDescription": "Rende la formulazione meno rigida mantenendo lo stesso intento.",
+    "Composer_AiRewriteAngry": "Rendilo arrabbiato",
+    "Composer_AiRewriteAngryDescription": "Usa un tono più tagliante e conflittuale.",
+    "Composer_AiRewriteHappy": "Rendilo felice",
+    "Composer_AiRewriteHappyDescription": "Aggiunge un tono più vivace ed entusiasta.",
+    "Composer_AiRewriteFormal": "Rendi formale",
+    "Composer_AiRewriteFormalDescription": "Rende il messaggio più professionale e strutturato.",
+    "Composer_AiRewriteFriendly": "Rendi amichevole",
+    "Composer_AiRewriteFriendlyDescription": "Rende il messaggio più accessibile e cordiale.",
+    "Composer_AiRewriteShorter": "Rendi più breve",
+    "Composer_AiRewriteShorterDescription": "Accorcia il testo e rimuove dettagli superflui.",
+    "Composer_AiRewriteClearer": "Rendi più chiaro",
+    "Composer_AiRewriteClearerDescription": "Migliora la leggibilità e rende il messaggio più facile da seguire.",
+    "Composer_AiRewriteCustom": "Personalizzato",
+    "Composer_AiRewriteCustomDescription": "Descrivi la tua intenzione di riscrittura.",
+    "Composer_AiRewriteCustomPlaceholder": "Descrivi come vuoi che il messaggio venga riscritto",
+    "Composer_AiRewriteMode": "Riformula il tono",
+    "Composer_AiRewriteApply": "Applica la riscrittura",
+    "Composer_AiTranslateDialogTitle": "Traduci con l'IA",
+    "Composer_AiTranslateDialogDescription": "Inserisci la lingua di destinazione o il codice culturale, come en-US, tr-TR, de-DE o fr-FR.",
+    "Composer_AiTranslateApply": "Traduci",
+    "Composer_AiTranslateLanguage": "Lingua di destinazione",
+    "Composer_AiTranslateCustomPlaceholder": "Inserisci il codice culturale",
+    "Composer_AiTranslateLanguageEnglish": "Inglese (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turco (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Tedesco (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francese (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spagnolo (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiano (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portoghese (Brasile) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Olandese (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polacco (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russo (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Giapponese (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coreano (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Cinese semplificato (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabo (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Altro...",
+    "Composer_AiBusyTitle": "L'IA è già in funzione",
+    "Composer_AiBusyMessage": "Attendere il completamento dell'azione IA in corso.",
+    "Composer_AiSignInRequired": "Accedi al tuo account Wino per utilizzare le funzionalità IA.",
+    "Composer_AiMissingHtml": "Non ci sono contenuti nel messaggio da inviare a Wino IA.",
+    "Composer_AiQuotaUnavailable": "Il risultato IA è stato applicato.",
+    "Composer_AiAppliedMessage": "Il risultato dell'IA è stato applicato al composer. Usa Annulla se vuoi ripristinarlo.",
+    "Composer_AiSummarizeSuccessTitle": "Riepilogo IA applicato",
+    "Composer_AiTranslateSuccessTitle": "Traduzione IA applicata",
+    "Composer_AiRewriteSuccessTitle": "Riformulazione IA applicata",
+    "Composer_AiErrorTitle": "Azione IA non riuscita",
+    "Reader_AiAppliedMessage": "Il risultato IA è ora mostrato per questo messaggio. Riapri il messaggio per visualizzare nuovamente il contenuto originale.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Intervallo sincronizzazione e-mail",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervallo di sincronizzazione automatica delle e-mail (minuti). Questa impostazione sarà applicata solo dopo il riavvio di Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervallo di sincronizzazione automatica delle e-mail (minuti). Questa impostazione sarà applicata solo dopo il riavvio di Wino Mail.",
+    "ContactsPage_Title": "Contatti",
+    "ContactsPage_AddContact": "Aggiungi contatto",
+    "ContactsPage_EditContact": "Modifica contatto",
+    "ContactsPage_DeleteContact": "Elimina contatto",
+    "ContactsPage_SearchPlaceholder": "Cerca contatti...",
+    "ContactsPage_NoContacts": "Nessun contatto trovato",
+    "ContactsPage_ContactsCount": "{0} contatti",
+    "ContactsPage_SelectedContactsCount": "{0} selezionati",
+    "ContactsPage_DeleteSelectedContacts": "Elimina selezionati",
+    "ContactEditDialog_Title": "Modifica contatto",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Scegli foto",
+    "ContactEditDialog_RemovePhoto": "Rimuovi foto",
+    "ContactEditDialog_NameHeader": "Nome",
+    "ContactEditDialog_NamePlaceholder": "Nome contatto",
+    "ContactEditDialog_EmailHeader": "Indirizzo email",
+    "ContactEditDialog_EmailPlaceholder": "contatto@example.com",
+    "ContactEditDialog_InfoSection": "Informazioni sul contatto",
+    "ContactEditDialog_RootContactInfo": "Questo è un contatto principale associato ai tuoi account e non può essere eliminato.",
+    "ContactEditDialog_OverriddenContactInfo": "Questo contatto è stato modificato manualmente e non verrà aggiornato durante la sincronizzazione.",
+    "ContactsPage_Subtitle": "Gestisci i tuoi contatti email e le relative informazioni.",
+    "ContactStatus_Account": "Account",
+    "ContactStatus_Modified": "Modificato",
+    "ContactAction_Edit": "Modifica contatto",
+    "ContactAction_ChangePhoto": "Cambia foto",
+    "ContactAction_Delete": "Elimina contatto",
+    "ContactAction_Add": "Aggiungi contatto",
+    "ContactSelection_Selected": "selezionato",
+    "ContactSelection_SelectAll": "Seleziona tutto",
+    "ContactSelection_Clear": "Cancella selezione",
+    "ContactsPage_EmptyState": "Nessun contatto da visualizzare",
+    "ContactsPage_AddFirstContact": "Aggiungi il tuo primo contatto",
+    "ContactsPage_ContactsCountSuffix": "contatti",
+    "ContactsPane_NewContact": "Nuovo contatto",
+    "ContactsPane_DescriptionTitle": "Gestisci i tuoi contatti",
+    "ContactsPane_DescriptionBody": "Crea contatti, rinominali, aggiorna le foto profilo e conserva in un unico posto i dettagli salvati.",
+    "ContactEditDialog_AddTitle": "Aggiungi contatto",
+    "ContactInfoBar_ContactAdded": "Contatto aggiunto con successo.",
+    "ContactInfoBar_ContactUpdated": "Contatto aggiornato con successo.",
+    "ContactInfoBar_ContactsDeleted": "Contatti eliminati con successo.",
+    "ContactInfoBar_ContactPhotoUpdated": "Foto del contatto aggiornata con successo.",
+    "ContactInfoBar_FailedToLoadContacts": "Impossibile caricare i contatti: {0}",
+    "ContactInfoBar_FailedToAddContact": "Impossibile aggiungere il contatto: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Impossibile aggiornare il contatto: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Impossibile eliminare i contatti: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Impossibile aggiornare la foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "I contatti principali non possono essere eliminati.",
+    "ContactConfirmDialog_DeleteTitle": "Elimina contatto",
+    "ContactConfirmDialog_DeleteMessage": "Sei sicuro di voler eliminare il contatto '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Sei sicuro di voler eliminare {0} contatto(i)?",
+    "ContactConfirmDialog_DeleteButton": "Elimina",
+    "CalendarAccountSettings_Title": "Impostazioni account calendario",
+    "CalendarAccountSettings_Description": "Gestisci le impostazioni del calendario per {0}",
+    "CalendarAccountSettings_AccountColor": "Colore dell'account",
+    "CalendarAccountSettings_AccountColorDescription": "Modifica il colore di visualizzazione per questo account calendario",
+    "CalendarAccountSettings_SyncEnabled": "Abilita la sincronizzazione",
+    "CalendarAccountSettings_SyncEnabledDescription": "Abilita o disabilita la sincronizzazione del calendario per questo account",
+    "CalendarAccountSettings_DefaultShowAs": "Disponibilità predefinita",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Stato di disponibilità predefinito per i nuovi eventi creati con questo account",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendario principale",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Segna questo calendario come calendario principale per l'account",
+    "CalendarSettings_NewEventBehavior_Header": "Comportamento del pulsante Nuovo Evento",
+    "CalendarSettings_NewEventBehavior_Description": "Scegli se il pulsante Nuovo Evento deve chiedere quale calendario utilizzare ogni volta o aprire sempre un calendario specifico.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Chiedi ogni volta.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Usa sempre un calendario specifico.",
+    "CalendarSettings_Rendering_Title": "Visualizzazione",
+    "CalendarSettings_Rendering_Description": "Configura la disposizione del calendario e il comportamento di visualizzazione.",
+    "CalendarSettings_Notifications_Title": "Notifiche",
+    "CalendarSettings_Notifications_Description": "Imposta promemoria e comportamento di posticipo predefiniti.",
+    "CalendarSettings_Preferences_Title": "Preferenze",
+    "CalendarSettings_Preferences_Description": "Imposta il comportamento del pulsante Nuovo Evento.",
+    "WhatIsNew_GetStartedButton": "Inizia",
+    "WhatIsNew_ContinueAnywayButton": "Continua comunque",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparazione per una nuova versione...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparazione dei tuoi dati",
+    "WhatIsNew_MigrationPreparing_Description": "Wino sta applicando migrazioni di aggiornamento. Attendere mentre prepariamo i dati del tuo account per questa versione.",
+    "WhatIsNew_MigrationFailedMessage": "L'applicazione delle migrazioni è fallita con il codice di errore {0}. Puoi continuare a utilizzare l'applicazione. Tuttavia, se incontri problemi gravi, reinstalla l'app.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Aggiornato",
+    "WhatIsNew_MigrationNotification_Message": "Apri l'app per completare l'aggiornamento e vedere cosa c'è di nuovo.",
+    "WelcomeWindow_Title": "Benvenuto in Wino Mail",
+    "WelcomeWindow_Subtitle": "Un'esperienza nativa di Windows per Posta e Calendario.",
+    "WelcomeWindow_WhatsNewTitle": "Ultime modifiche",
+    "WelcomeWindow_FeaturesTitle": "Funzionalità",
+    "WelcomeWindow_WhatsNewTab": "Novità",
+    "WelcomeWindow_FeaturesTab": "Funzionalità",
+    "WelcomeWindow_GetStartedButton": "Inizia aggiungendo un account",
+    "WelcomeWindow_GetStartedDescription": "Aggiungi il tuo account Outlook, Gmail o IMAP per iniziare a usare Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importa dal tuo account Wino",
+    "WelcomeWindow_ImportInProgress": "Importazione delle preferenze e degli account sincronizzati in corso...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nessun account sincronizzato è stato trovato nel tuo account Wino. Se erano disponibili le preferenze, sono state ripristinate. Usa Inizia per aggiungere manualmente un account.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} account sincronizzati sono già disponibili su questo dispositivo. Usa Inizia per aggiungere manualmente un altro account se necessario.",
+    "WelcomeWindow_SetupTitle": "Configura il tuo account",
+    "WelcomeWindow_SetupSubtitle": "Scegli il tuo provider di posta per iniziare",
+    "WelcomeWindow_AddAccountButton": "Aggiungi account",
+    "WelcomeWindow_SkipForNow": "Salta per ora — lo configurerò più tardi",
+    "WelcomeWindow_AppDescription": "Una posta in arrivo veloce e focalizzata — riprogettata per Windows 11",
+    "WelcomeWizard_Step1Title": "Benvenuto",
+    "SystemTrayMenu_Open": "Apri",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Sincronizza impostazioni",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mantieni le preferenze di Wino sincronizzate su più dispositivi.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Sblocca componenti aggiuntivi",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accedi a funzionalità premium come Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gestisci il tuo account Wino, l'accesso all'AI Pack e le preferenze sincronizzate e i dettagli dell'account.",
+    "WinoAccount_Management_SignedOutTitle": "Accedi a Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Accedi o crea un account per sincronizzare la tua posta, accedere alle funzionalità AI e gestire le impostazioni su più dispositivi.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profilo",
+    "WinoAccount_Management_AddOnsSectionHeader": "Componenti aggiuntivi Wino",
+    "WinoAccount_Management_DataSectionHeader": "Dati",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Azioni dell'account",
+    "WinoAccount_Management_AccountCardTitle": "Account",
+    "WinoAccount_Management_AccountCardDescription": "Indirizzo email dell'account Wino e stato attuale dell'account.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Vedi se Wino AI Pack è attivo e quanto utilizzo è rimasto.",
+    "WinoAccount_Management_AiPackActive": "AI Pack è attivo",
+    "WinoAccount_Management_AiPackInactive": "AI Pack non è attivo",
+    "WinoAccount_Management_AiPackUsage": "{0} di {1} utilizzi consumati. Rimangono {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Periodo di fatturazione: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "I dettagli sull'utilizzo non sono ancora disponibili.",
+    "WinoAccount_Management_AiPackBuyDescription": "Acquista Wino AI Pack per tradurre, riscrivere o riassumere le email con l'IA.",
+    "WinoAccount_Management_AiPackPromoTitle": "Sblocca AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Potenzia notevolmente il flusso di lavoro delle email con strumenti basati sull'IA. Traduci i messaggi in oltre 50 lingue, riscrivi per chiarezza e tono e ottieni sommari istantanei di lunghe conversazioni.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mese",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 crediti",
+    "WinoAccount_Management_AiPackGetButton": "Ottieni AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Strumenti basati sull'IA per tradurre, riscrivere e riassumere azioni in Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traduci, riscrivi, riassumi, produttività",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Account illimitati",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Rimuovi il limite di account e aggiungi quanti account di posta ti servono.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "account, illimitato, premium, componente aggiuntivo",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Accedi con il tuo account Wino per completare questo acquisto.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino non è riuscito a completare questo acquisto sul Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "L'acquisto è stato completato, ma Wino non è riuscito a aggiornare i benefici dell'account. Prova di nuovo tra un momento.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "La tua sottoscrizione è attiva",
+    "WinoAccount_Management_AiPackRenews": "Si rinnova {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Crediti utilizzati questo mese",
+    "WinoAccount_Management_AiPackResets": "Ripristini {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Si è verificato un problema nel caricamento del tuo saldo di utilizzo IA.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traduci",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Riformula",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Riepiloga",
+    "WinoAccount_Management_AddOnLoadFailed": "Si sono verificati problemi nel caricamento di questo componente aggiuntivo.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronizza Preferenze e Account",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importa o esporta le tue preferenze Wino e i dettagli della casella di posta su più dispositivi. Password, token e altre informazioni sensibili non vengono mai sincronizzate.",
+    "WinoAccount_Management_SignOutTitle": "Esci",
+    "WinoAccount_Management_SignOutDescription": "Esci dal tuo account su questo dispositivo",
+    "WinoAccount_Management_StatusLabel": "Stato: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Non sono presenti dati sincronizzati per questo account.",
+    "WinoAccount_Management_ExportSucceeded": "I dati Wino selezionati sono stati esportati con successo.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Le tue preferenze sono state esportate nel tuo account Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Esportati {0} dettagli dell'account nel tuo Wino Account.",
+    "WinoAccount_Management_ImportSucceeded": "Dati sincronizzati importati dal tuo account Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Applicate {0} preferenze sincronizzate.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importati {0} account.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Sono stati saltati {0} account già presenti su questo dispositivo.",
+    "WinoAccount_Management_ImportPartial": "Applicate {0} preferenze sincronizzate. {1} preferenze non sono state ripristinate.",
+    "WinoAccount_Management_ImportReloginReminder": "Le password, i token e altre informazioni sensibili non sono state importate. Effettua l'accesso di nuovo per ogni account su questo dispositivo prima di utilizzarlo.",
+    "WinoAccount_Management_SerializeFailed": "Wino non è riuscito a serializzare le tue preferenze correnti.",
+    "WinoAccount_Management_EmptyExport": "Non ci sono valori di preferenza da esportare.",
+    "WinoAccount_Management_ImportEmpty": "Il payload dei dati sincronizzati non contiene nulla di nuovo da ripristinare.",
+    "WinoAccount_Management_ExportDialog_Title": "Esporta nel tuo account Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Scegli cosa vuoi sincronizzare nel tuo account Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferenze",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Account",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Le password, i token e altre informazioni sensibili non sono sincronizzati.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Gli account importati su un altro PC richiederanno comunque di effettuare nuovamente l'accesso prima che possano essere utilizzati.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Esportazione dei dati Wino selezionati in corso...",
+    "WinoAccount_Management_LoadFailed": "Impossibile caricare le ultime informazioni dell'Account Wino.",
+    "WinoAccount_Management_ActionFailed": "La richiesta dell'Account Wino non può essere completata.",
+    "WinoAccount_SettingsSection_Title": "Account Wino",
+    "WinoAccount_SettingsSection_Description": "Crea o accedi a un account Wino utilizzando il tuo servizio di autenticazione locale.",
+    "WinoAccount_RegisterButton_Title": "Registra account",
+    "WinoAccount_RegisterButton_Description": "Crea un account Wino con email e password.",
+    "WinoAccount_RegisterButton_Action": "Apri registrazione",
+    "WinoAccount_LoginButton_Title": "Accedi",
+    "WinoAccount_LoginButton_Description": "Accedi a un account Wino esistente con email e password.",
+    "WinoAccount_LoginButton_Action": "Apri accesso",
+    "WinoAccount_SignOutButton_Title": "Esci",
+    "WinoAccount_SignOutButton_Description": "Rimuovi la sessione dell'account Wino memorizzata localmente.",
+    "WinoAccount_SignOutButton_Action": "Disconnetti",
+    "WinoAccount_RegisterDialog_Title": "Crea account Wino",
+    "WinoAccount_RegisterDialog_Description": "Crea un account Wino per mantenere sincronizzata la tua esperienza Wino e sbloccare componenti aggiuntivi basati sull'account.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Crea il tuo account Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Perché crearne uno?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importa ed esporta le impostazioni tra dispositivi",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Sposta le preferenze Wino tra dispositivi senza dover ricreare la configurazione da zero.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Accedi a componenti aggiuntivi esclusivi come Wino AI Pack (a pagamento)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Usa un account per sbloccare le funzionalità premium di Wino man mano che diventano disponibili.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "L'account Wino è separato dai tuoi account di posta",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "I tuoi account Outlook, Gmail, IMAP o altri account di posta restano esattamente come sono. Un account Wino gestisce solo funzionalità specifiche di Wino e componenti aggiuntivi basati sull'account.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrati",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacy e elaborazione API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Componenti aggiuntivi opzionali come Wino AI Pack possono inviare contenuti HTML selezionati delle email al servizio API di Wino solo quando usi tali funzionalità.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Leggi l'informativa sulla privacy",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Accetto l'informativa sulla privacy.",
+    "WinoAccount_LoginDialog_Title": "Accedi a Wino Account",
+    "WinoAccount_LoginDialog_Description": "Accedi al tuo account Wino per sincronizzare la tua configurazione Wino e accedere a funzionalità basate sull'account.",
+    "WinoAccount_LoginDialog_HeroTitle": "Bentornato",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Cosa ti offre l'accesso",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Usa il tuo account Wino per continuare a sincronizzare le impostazioni tra i dispositivi e per accedere a componenti aggiuntivi a pagamento come Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Questo non è l'accesso alla tua casella di posta",
+    "WinoAccount_LoginDialog_DifferenceDescription": "L'accesso qui non aggiunge né sostituisce i tuoi account Outlook, Gmail o IMAP in Wino. Ti autentica solo per i servizi specifici di Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Password dimenticata?",
+    "WinoAccount_EmailLabel": "Email",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Password",
+    "WinoAccount_ConfirmPasswordLabel": "Conferma password",
+    "WinoAccount_ForgotPasswordDialog_Title": "Reimposta la password",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Invia email di reimpostazione",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Torna all'accesso",
+    "WinoAccount_ForgotPasswordDialog_Description": "Inserisci l'indirizzo email del tuo account Wino e ti invieremo un link per reimpostare la password se l'indirizzo è registrato.",
+    "WinoAccount_Validation_EmailRequired": "Email obbligatoria.",
+    "WinoAccount_Validation_PasswordRequired": "La password è obbligatoria.",
+    "WinoAccount_Validation_PasswordMismatch": "Le password non corrispondono.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "È necessario accettare l'informativa sulla privacy prima di creare un account Wino.",
+    "WinoAccount_Error_InvalidCredentials": "L'indirizzo email o la password non sono corretti.",
+    "WinoAccount_Error_AccountLocked": "Questo account è temporaneamente bloccato.",
+    "WinoAccount_Error_AccountBanned": "Questo account è stato bannato.",
+    "WinoAccount_Error_AccountSuspended": "Questo account è stato sospeso.",
+    "WinoAccount_Error_EmailNotConfirmed": "Si prega di confermare l'indirizzo email prima di accedere.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Si prega di confermare l'indirizzo email prima di accedere.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Una nuova email di conferma non è ancora disponibile.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Questa richiesta di conferma non è più valida. Prova ad accedere di nuovo.",
+    "WinoAccount_Error_EmailNotRegistered": "Questo indirizzo email non è registrato.",
+    "WinoAccount_Error_RefreshTokenInvalid": "La tua sessione non è più valida. Effettua nuovamente l'accesso.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Questo indirizzo email è già registrato.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "È necessario un indirizzo email per completare l'accesso esterno.",
+    "WinoAccount_Error_ExternalLoginInvalid": "La richiesta di accesso esterno non è valida.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Lo stato di autenticazione esterna non è valido o scaduto.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Il codice di autenticazione esterna non è valido o è scaduto.",
+    "WinoAccount_Error_AiPackRequired": "È prevista una sottoscrizione attiva a Wino AI Pack per questa azione.",
+    "WinoAccount_Error_AiQuotaExceeded": "Hai raggiunto il limite di utilizzo di AI Pack per il periodo di fatturazione corrente.",
+    "WinoAccount_Error_AiHtmlEmpty": "Non c'è contenuto email da elaborare.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Questa email è troppo grande per essere processata con Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Questa lingua non è supportata. Prova un codice culturale valido come en-US o tr-TR.",
+    "WinoAccount_Error_Forbidden": "Non hai l'autorizzazione per eseguire questa azione.",
+    "WinoAccount_Error_ValidationFailed": "La richiesta non è valida. Si prega di controllare i valori inseriti.",
+    "WinoAccount_RegisterSuccessMessage": "Registrazione dell'account Wino completata per {0}.",
+    "WinoAccount_LoginSuccessMessage": "Hai effettuato l'accesso a Wino Account come {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Conferma il tuo indirizzo email",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Abbiamo inviato una conferma via email a {0}. Confermala e prova ad accedere di nuovo.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Conferma email richiesta",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Stiamo ancora aspettando che tu confermi {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Riprova invio email di conferma",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Puoi rinviare l'email di conferma tra {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Ora puoi inviare nuovamente l'email di conferma.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Email di conferma inviata nuovamente",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Abbiamo inviato un'altra email di conferma a {0}. Confermala e prova ad accedere di nuovo.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Email per reimpostare la password inviata",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Abbiamo inviato un'email per reimpostare la password a {0}. Apri quel messaggio per scegliere una nuova password.",
+    "WinoAccount_ChangePassword_Title": "Cambia password",
+    "WinoAccount_ChangePassword_Description": "Invia un'email di reimpostazione della password a questo account Wino.",
+    "WinoAccount_ChangePassword_Action": "Invia email di reimpostazione",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Vuoi che Wino invii un'email di reimpostazione della password a {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Sei uscito dall'account Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Non esiste alcun account Wino attivo da disconnettere.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Account Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Accedi o crea un account Wino per gestire la tua sessione Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Stato: {0}",
+    "WelcomeWizard_Step2Title": "Aggiungi account",
+    "WelcomeWizard_Step3Title": "Completa la configurazione",
+    "ProviderSelection_Title": "Scegli il provider di posta elettronica",
+    "ProviderSelection_Subtitle": "Seleziona un provider qui sotto per aggiungere il tuo account di posta a Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nome account",
+    "ProviderSelection_AccountNamePlaceholder": "ad es. Personale, Lavoro",
+    "ProviderSelection_DisplayNameHeader": "Nome visualizzato",
+    "ProviderSelection_DisplayNamePlaceholder": "es. John Doe",
+    "ProviderSelection_EmailHeader": "Indirizzo e-mail",
+    "ProviderSelection_EmailPlaceholder": "es. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Password specifica per l'app",
+    "ProviderSelection_AppPasswordHelp": "Come posso ottenere una password specifica per l'app?",
+    "ProviderSelection_CalendarModeHeader": "Integrazione del calendario",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Disattivato",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Nessuna integrazione del calendario",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronizzazione CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Gli eventi del tuo calendario sono sincronizzati sui server Apple tra i tuoi dispositivi.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Gli eventi del tuo calendario sono sincronizzati sui server Yahoo tra i tuoi dispositivi.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendario locale",
+    "ProviderSelection_CalendarMode_LocalDescription": "I tuoi eventi sono memorizzati solo sul tuo computer. Nessuna connessione al server.",
+    "ProviderSelection_ClearColor": "Cancella colore",
+    "ProviderSelection_ContinueButton": "Continua",
+    "ProviderSelection_SpecialImap_Subtitle": "Inserisci le credenziali del tuo account per connetterti.",
+    "AccountSetup_Title": "Configurazione del tuo account",
+    "AccountSetup_Step_Authenticating": "Autenticazione in corso con {0}",
+    "AccountSetup_Step_TestingMailAuth": "Test dell'autenticazione della posta",
+    "AccountSetup_Step_SyncingFolders": "Sincronizzazione dei metadati delle cartelle",
+    "AccountSetup_Step_FetchingProfile": "Recupero delle informazioni del profilo",
+    "AccountSetup_Step_DiscoveringCalDav": "Scoperta delle impostazioni CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Test dell'autenticazione del calendario",
+    "AccountSetup_Step_SavingAccount": "Salvataggio delle informazioni dell'account",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Recupero dei metadati del calendario",
+    "AccountSetup_Step_SyncingAliases": "Sincronizzazione degli alias",
+    "AccountSetup_Step_Finalizing": "Finalizzazione della configurazione",
+    "AccountSetup_FailureMessage": "Configurazione non riuscita. Torna indietro per correggere le impostazioni o riprova più tardi.",
+    "AccountSetup_SuccessMessage": "Il tuo account è stato configurato con successo!",
+    "AccountSetup_GoBackButton": "Torna indietro",
+    "AccountSetup_TryAgainButton": "Riprova",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Rilevamento automatico non riuscito. Si prega di inserire manualmente le impostazioni nella scheda Avanzate."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/ja_JP/resources.json b/Wino.Core.Domain/Translations/ja_JP/resources.json
index 11497101..cae70cf4 100644
--- a/Wino.Core.Domain/Translations/ja_JP/resources.json
+++ b/Wino.Core.Domain/Translations/ja_JP/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "完了",
+    "AccountCreationDialog_FetchingCalendarMetadata": "カレンダーの詳細を取得しています。",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "初期化中",
     "AccountCreationDialog_PreparingFolders": "現在フォルダ情報を取得中です。",
     "AccountCreationDialog_SigninIn": "アカウント情報を保存しています。",
+    "Purchased": "購入済み",
     "AccountEditDialog_Message": "アカウント名",
     "AccountEditDialog_Title": "アカウントの編集",
     "AccountPickerDialog_Title": "アカウントを選択",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "一般",
+    "AccountDetailsPage_TabMail": "メール",
+    "AccountDetailsPage_TabCalendar": "カレンダー",
+    "AccountDetailsPage_CalendarListDescription": "設定を構成するカレンダーを選択してください。",
     "AddHyperlink": "追加",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAPアカウント",
     "Busy": "Busy",
     "Buttons_AddAccount": "アカウントを追加",
+    "Buttons_FixAccount": "アカウントを修正",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "適用",
     "Buttons_ApplyTheme": "テーマを適用",
     "Buttons_Browse": "閲覧",
     "Buttons_Cancel": "キャンセル",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "編集",
     "Buttons_EnableImageRendering": "有効化",
     "Buttons_Multiselect": "複数選択",
+    "Buttons_Manage": "管理",
     "Buttons_No": "いいえ",
     "Buttons_Open": "開く",
     "Buttons_Purchase": "購入",
@@ -70,15 +79,134 @@
     "Buttons_Save": "保存",
     "Buttons_SaveConfiguration": "設定を保存",
     "Buttons_Send": "送信",
+    "Buttons_SendToServer": "サーバーに送信",
     "Buttons_Share": "シェアする",
     "Buttons_SignIn": "サインイン",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "やり直す",
     "Buttons_Yes": "はい",
+    "Sync_SynchronizingFolder": "同期中 {0} {1}",
+    "Sync_DownloadedMessages": "ダウンロード済み {0} 件のメッセージから {1}",
+    "SyncAction_Archiving": "{0} 通のメールをアーカイブしています",
+    "SyncAction_ClearingFlag": "{0} 通のメールのフラグを解除しています",
+    "SyncAction_CreatingDraft": "下書きを作成しています",
+    "SyncAction_CreatingEvent": "イベントを作成しています",
+    "SyncAction_Deleting": "{0} 通のメールを削除しています",
+    "SyncAction_EmptyingFolder": "フォルダーを空にしています",
+    "SyncAction_MarkingAsRead": "{0} 通のメールを既読にしています",
+    "SyncAction_MarkingAsUnread": "{0} 通のメールを未読にしています",
+    "SyncAction_MarkingFolderAsRead": "フォルダーを既読としてマークしています",
+    "SyncAction_Moving": "{0} 通のメールを移動しています",
+    "SyncAction_MovingToFocused": "{0} 通のメールを Focused に移動しています",
+    "SyncAction_RenamingFolder": "フォルダー名を変更しています",
+    "SyncAction_SendingMail": "メールを送信しています",
+    "SyncAction_SettingFlag": "{0} 通のメールにフラグを設定しています",
+    "SyncAction_SynchronizingAccount": "{0} を同期しています",
+    "SyncAction_SynchronizingAccounts": "{0} アカウントを同期しています",
+    "SyncAction_SynchronizingCalendarData": "カレンダーデータを同期しています",
+    "SyncAction_SynchronizingCalendarEvents": "カレンダーイベントを同期しています",
+    "SyncAction_SynchronizingCalendarMetadata": "カレンダーのメタデータを同期しています",
+    "SyncAction_Unarchiving": "{0} 通のメールを復元しています",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "承諾",
+    "CalendarEventResponse_AcceptedResponse": "承諾しました",
+    "CalendarEventResponse_Decline": "辞退",
+    "CalendarEventResponse_DeclinedResponse": "辞退しました",
+    "CalendarEventResponse_NotResponded": "未回答",
+    "CalendarEventResponse_Tentative": "仮承諾",
+    "CalendarEventResponse_TentativeResponse": "仮承諾",
+    "CalendarEventRsvpPanel_Accept": "承諾",
+    "CalendarEventRsvpPanel_AddMessage": "返答にメッセージを追加...（任意）",
+    "CalendarEventRsvpPanel_Decline": "辞退",
+    "CalendarEventRsvpPanel_Message": "メッセージ",
+    "CalendarEventRsvpPanel_SendReplyMessage": "返信メッセージを送信",
+    "CalendarEventRsvpPanel_Tentative": "仮承諾",
+    "CalendarEventRsvpPanel_Title": "回答オプション",
+    "CalendarAttendeeStatus_Accepted": "承諾済み",
+    "CalendarAttendeeStatus_Declined": "辞退済み",
+    "CalendarAttendeeStatus_NeedsAction": "対応が必要",
+    "CalendarAttendeeStatus_Tentative": "仮承諾",
+    "CalendarEventDetails_Attachments": "添付ファイル",
+    "CalendarEventCompose_AddAttachment": "添付ファイルを追加",
+    "CalendarEventCompose_AllDay": "終日",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "CalDAV カレンダーでは添付ファイルはサポートされていません。",
+    "CalendarEventCompose_EndDate": "終了日",
+    "CalendarEventCompose_EndTime": "終了時刻",
+    "CalendarEventCompose_Every": "毎",
+    "CalendarEventCompose_ForWeekdays": "平日",
+    "CalendarEventCompose_FrequencyDay": "日",
+    "CalendarEventCompose_FrequencyDayPlural": "日",
+    "CalendarEventCompose_FrequencyMonth": "月",
+    "CalendarEventCompose_FrequencyMonthPlural": "ヶ月",
+    "CalendarEventCompose_FrequencyWeek": "週",
+    "CalendarEventCompose_FrequencyWeekPlural": "週間",
+    "CalendarEventCompose_FrequencyYear": "年",
+    "CalendarEventCompose_FrequencyYearPlural": "年",
+    "CalendarEventCompose_Location": "場所",
+    "CalendarEventCompose_LocationPlaceholder": "場所を追加",
+    "CalendarEventCompose_NewEventButton": "新規イベント",
+    "CalendarEventCompose_DefaultCalendarHint": "カレンダー設定で新規イベントのデフォルト カレンダーを選択できます。",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "カレンダー設定を開く",
+    "CalendarEventCompose_NoCalendarsMessage": "イベント作成のためのカレンダーはまだありません。",
+    "CalendarEventCompose_NoCalendarsTitle": "利用可能なカレンダーがありません",
+    "CalendarEventCompose_NoEndDate": "終了日なし",
+    "CalendarEventCompose_Notes": "メモ",
+    "CalendarEventCompose_PickCalendarTitle": "カレンダーを選択",
+    "CalendarEventCompose_Recurring": "繰り返し",
+    "CalendarEventCompose_RecurringSummary": "毎 {0} {1}{2} {3} 有効 {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "発生します {0}{1} {2} 有効 {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "毎回",
+    "CalendarEventCompose_SelectCalendar": "カレンダーを選択",
+    "CalendarEventCompose_SingleOccurrenceSummary": " {0} {1} に発生します",
+    "CalendarEventCompose_StartDate": "開始日",
+    "CalendarEventCompose_StartTime": "開始時刻",
+    "CalendarEventCompose_TimeRangeSummary": " {0} から {1}",
+    "CalendarEventCompose_Title": "イベント名",
+    "CalendarEventCompose_TitlePlaceholder": "タイトルを追加",
+    "CalendarEventCompose_Until": "until",
+    "CalendarEventCompose_UntilSummary": "  まで {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "終日イベントの終了日は開始日より後でなければなりません。",
+    "CalendarEventCompose_ValidationInvalidAttendee": "1名以上の出席者のメールアドレスが無効です。",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "繰り返しの終了日はイベント開始日と同日またはそれ以降でなければなりません。",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "終了時刻は開始時刻より後でなければなりません。",
+    "CalendarEventCompose_ValidationMissingAttachment": "1つ以上の添付ファイルが利用できなくなっています: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "イベントを作成する前にカレンダーを選択してください。",
+    "CalendarEventCompose_ValidationMissingTitle": "イベントを作成する前にイベントタイトルを入力してください。",
+    "CalendarEventCompose_ValidationTitle": "イベントの検証に失敗しました",
+    "CalendarEventCompose_WeekdaySummary": "  on {0}",
+    "CalendarEventCompose_Weekday_Friday": "金",
+    "CalendarEventCompose_Weekday_Monday": "月",
+    "CalendarEventCompose_Weekday_Saturday": "土",
+    "CalendarEventCompose_Weekday_Sunday": "日",
+    "CalendarEventCompose_Weekday_Thursday": "木",
+    "CalendarEventCompose_Weekday_Tuesday": "火",
+    "CalendarEventCompose_Weekday_Wednesday": "水",
+    "CalendarEventDetails_Details": "詳細",
+    "CalendarEventDetails_EditSeries": "シリーズを編集",
+    "CalendarEventDetails_Editing": "編集中",
+    "CalendarEventDetails_InviteSomeone": "招待する",
+    "CalendarEventDetails_JoinOnline": "オンラインで参加",
+    "CalendarEventDetails_Organizer": "主催者",
+    "CalendarEventDetails_People": "参加者",
+    "CalendarEventDetails_ReadOnlyEvent": "読み取り専用イベント",
+    "CalendarEventDetails_Reminder": "リマインダー",
+    "CalendarReminder_StartedHoursAgo": "{0}時間前に開始しました",
+    "CalendarReminder_StartedMinutesAgo": "{0}分前に開始しました",
+    "CalendarReminder_StartedNow": "今しがた開始しました",
+    "CalendarReminder_StartingNow": "今、開始しています",
+    "CalendarReminder_StartsInHours": "{0}時間後に開始します",
+    "CalendarReminder_StartsInMinutes": "{0}分後に開始します",
+    "CalendarReminder_SnoozeAction": "スヌーズ",
+    "CalendarReminder_SnoozeMinutesOption": "{0}分",
+    "CalendarEventDetails_ShowAs": "表示方法",
+    "CalendarShowAs_Free": "空き",
+    "CalendarShowAs_Tentative": "暫定",
+    "CalendarShowAs_Busy": "予定あり",
+    "CalendarShowAs_OutOfOffice": "不在",
+    "CalendarShowAs_WorkingElsewhere": "別の場所で作業中",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copied to clipboard.",
     "ClipboardTextCopied_Title": "Copied",
     "ClipboardTextCopyFailed_Message": "Failed to copy {0} to clipboard.",
+    "ContactInfoBar_ErrorTitle": "連絡先情報の読み込みに失敗しました",
+    "ContactInfoBar_SuccessTitle": "連絡先情報を読み込みました",
+    "ContactInfoBar_WarningTitle": "連絡先情報が不完全の場合があります",
     "ComingSoon": "近日公開",
     "ComposerAttachmentsDragDropAttach_Message": "Attach",
     "ComposerAttachmentsDropZone_Message": "Drop your files here",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "アカウントリンク名",
     "DialogMessage_DeleteAccountConfirmationMessage": "{0} を削除しますか？",
     "DialogMessage_DeleteAccountConfirmationTitle": "このアカウントに関連付けられたすべてのデータは永久にディスクから削除されます。",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "テンプレート \"{0}\" を削除しますか?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "電子メールテンプレートを削除",
+    "DialogMessage_DeleteRecurringSeriesMessage": "これによりシリーズのすべてのイベントが削除されます。続行しますか？",
+    "DialogMessage_DeleteRecurringSeriesTitle": "繰り返しシリーズを削除",
     "DialogMessage_DiscardDraftConfirmationMessage": "この下書きは破棄されます。続行しますか？",
     "DialogMessage_DiscardDraftConfirmationTitle": "下書きを破棄",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "ライトモード",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "アカウントの対応が必要です",
+    "Exception_AccountNeedsAttention_Message": "'{0}' の対応が必要です。作業を続行するには対応してください。",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail は Microsoft Edge WebView2 ランタイムを見つけられませんでした。メッセージ内容を正しく表示するには、ランタイムをインストールまたは修復してください。",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2 ランタイムが必要です",
     "Exception_AuthenticationCanceled": "Authentication canceled",
     "Exception_CustomThemeExists": "This theme already exists.",
     "Exception_CustomThemeMissingName": "You must provide a name.",
     "Exception_CustomThemeMissingWallpaper": "You must provide a custom background image.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "カレンダーデータの同期に失敗しました",
+    "Exception_FailedToSynchronizeCalendarEvents": "カレンダーイベントの同期に失敗しました",
+    "Exception_FailedToSynchronizeCalendarMetadata": "カレンダーの詳細の同期に失敗しました",
     "Exception_FailedToSynchronizeFolders": "Failed to synchronize folders",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Move to Junk",
     "HoverActionOption_ToggleFlag": "Flag / Unflag",
     "HoverActionOption_ToggleRead": "Read / Unread",
+    "KeyboardShortcuts_FailedToReset": "キーボードショートカットのリセットに失敗しました。",
+    "KeyboardShortcuts_FailedToUpdate": "キーボードショートカットの更新に失敗しました",
+    "KeyboardShortcuts_MailoperationAction": "アクション",
+    "KeyboardShortcuts_Action": "アクション",
+    "KeyboardShortcuts_FailedToLoad": "キーボードショートカットの読み込みに失敗しました。",
+    "KeyboardShortcuts_EnterKeyForShortcut": "ショートカットのキーを入力してください。",
+    "KeyboardShortcuts_SelectOperationForShortcut": "ショートカットで実行するアクションを選択してください。",
+    "KeyboardShortcuts_EnterKey": "ショートカットのキーを入力してください。",
+    "KeyboardShortcuts_SelectOperation": "ショートカットのアクションを選択してください。",
+    "KeyboardShortcuts_ShortcutInUse": "このショートカットはすでに別のショートカットで使用されています。",
+    "KeyboardShortcuts_FailedToSave": "ショートカットの保存に失敗しました。",
+    "KeyboardShortcuts_FailedToDelete": "ショートカットの削除に失敗しました。",
+    "KeyboardShortcuts_PageDescription": "迅速なメール操作のためのキーボードショートカットを設定します。キー入力フィールドにフォーカスしている間にキーを押すとショートカットを取得します。",
+    "KeyboardShortcuts_Add": "ショートカットを追加",
+    "KeyboardShortcuts_EditTitle": "キーボードショートカットを編集",
+    "KeyboardShortcuts_ResetToDefaults": "デフォルトにリセット",
+    "KeyboardShortcuts_PressKeysHere": "ここにキーを押してください...",
+    "KeyboardShortcuts_KeyCombination": "キーの組み合わせ",
+    "KeyboardShortcuts_FocusArea": "上のフィールドにフォーカスして、希望のキーの組み合わせを押してください",
+    "KeyboardShortcuts_Modifiers": "修飾キー",
+    "KeyboardShortcuts_Mode": "アプリモード",
+    "KeyboardShortcuts_ModeMail": "メール",
+    "KeyboardShortcuts_ModeCalendar": "カレンダー",
+    "KeyboardShortcuts_ActionToggleReadUnread": "既読/未読を切り替え",
+    "KeyboardShortcuts_ActionToggleFlag": "フラグを切り替え",
+    "KeyboardShortcuts_ActionToggleArchive": "アーカイブ/復元を切り替え",
     "ImageRenderingDisabled": "Image rendering is disabled for this message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Username",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAPとカレンダーの設定",
+    "ImapCalDavSettingsPage_TitleEdit": "IMAPとカレンダーの設定を編集",
+    "ImapCalDavSettingsPage_Subtitle": "このアカウントのIMAP/SMTPと任意のカレンダー同期を設定します。",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "基本設定",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "アイデンティティと資格情報を入力してください。Winoはサーバ設定を自動的に検出しようとします。",
+    "ImapCalDavSettingsPage_BasicTab": "基本",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "カレンダー機能を有効にする",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "メール設定を自動検出",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "メール設定が検出され、適用されました。",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "高度な設定",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "自動検出が利用できない場合や正しくない場合は、サーバ設定を手動で入力してください。",
+    "ImapCalDavSettingsPage_AdvancedTab": "上級",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "カレンダー設定",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "このIMAPアカウントのカレンダーデータの扱いを選択してください。",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "カレンダーモード",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "接続のセキュリティ",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "認証方法",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "無効",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV 同期",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "ローカルカレンダーのみ",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "このアカウントではカレンダーは無効です。",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "カレンダー項目はCalDAVサーバーと同期されます。",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "カレンダー項目はこのコンピュータのみに保存され、ネットワークへは同期されません。",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "ローカルカレンダーの仕組み",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "ローカルカレンダーのみ",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "ローカルカレンダーはすべてのイベントをコンピュータのみに保存します。iCloud、Yahoo、その他の提供者へは同期されません。",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAVサービスURL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV ユーザー名",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV パスワード",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAVのテストは、カレンダーモードがCalDAV同期に設定されている場合にのみ必要です。",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAVサービスURLが必要です。",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAVサービスURLは絶対URLである必要があります。",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV ユーザー名が必須です。",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV パスワードが必須です。",
+    "ImapCalDavSettingsPage_TestImapButton": "IMAP 接続をテスト",
+    "ImapCalDavSettingsPage_TestCalDavButton": "CalDAV 接続をテスト",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP 接続のテストに成功しました。",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV 接続のテストに成功しました。",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "アカウント設定を検証して保存しました。",
+    "ImapCalDavSettingsPage_ICloudHint": "Apple アカウント設定で生成したアプリ用パスワードを使用してください。",
+    "ImapCalDavSettingsPage_YahooHint": "Yahoo アカウントのセキュリティ設定からアプリ用パスワードを使用してください。",
     "Info_AccountCreatedMessage": "{0} is created",
     "Info_AccountCreatedTitle": "Account Creation",
     "Info_AccountCreationFailedTitle": "Account Creation Failed",
     "Info_AccountDeletedMessage": "{0} is successfuly deleted.",
     "Info_AccountDeletedTitle": "Account Deleted",
     "Info_AccountIssueFixFailedTitle": "Failed",
+    "Info_AccountIssueFixImapMessage": "IMAP およびカレンダーの設定ページを開き、再度サーバーの認証情報を入力してください。",
+    "Info_AccountAttentionRequiredMessage": "このアカウントは対応が必要です。",
+    "Info_AccountAttentionRequiredClickableMessage": "このアカウントを修正して再同期するにはクリックしてください。",
+    "Info_AccountAttentionRequiredAction": "修正",
+    "Info_AccountAttentionRequiredActionHint": "このアカウントの問題を解決するには、修正をクリックしてください。",
     "Info_AccountIssueFixSuccessMessage": "Fixed all account issues.",
     "Info_AccountIssueFixSuccessTitle": "Success",
     "Info_AttachmentOpenFailedMessage": "Can't open this attachment.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "更新が利用可能です",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Unarchive",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "{0} 件をドラッグ中",
     "MailsSelected": "{0} item(s) selected",
     "MarkFlagUnflag": "Mark as flagged/unflagged",
     "MarkReadUnread": "Mark as read/unread",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "更新が利用可能です",
+    "Notifications_StoreUpdateAvailableMessage": "Microsoft Store から新しいバージョンの Wino Mail をインストールできます。",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Small",
     "Photos": "Photos",
     "PreparingFoldersMessage": "Preparing folders",
-    "ProtocolLogAvailable_Message": "Protocol logs are available for diagnostics.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "キーボードショートカット",
+    "Settings_KeyboardShortcuts_Description": "メールのクイック操作用キーボードショートカットを管理します。",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP およびカレンダー設定",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "このアカウント用の専用の IMAP、SMTP、CalDAV 設定ページを開きます。",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "設定を開く",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "デフォルトのアプリケーションモード",
+    "SettingsAppPreferences_ApplicationMode_Description": "アクティベーションのタイプが明示的に設定されていない場合に、Wino が開くモードを選択します。",
+    "SettingsAppPreferences_ApplicationMode_Mail": "メール",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "カレンダー",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "タイトルバーの Wino アカウントボタンを非表示にする",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Wino アカウントのドロップダウンを開くタイトルバーのプロフィールボタンを非表示にします。",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "ストアの更新通知",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Microsoft Store の更新が利用可能なときに通知とフッターのアクションを表示します。",
+    "SettingsAppPreferences_AiActions_Title": "AI アクション",
+    "SettingsAppPreferences_AiActions_Description": "デフォルトの AI 言語と要約を保存する場所を選択します。",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "デフォルトの翻訳言語",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "AI 翻訳アクションで使用されるデフォルトのターゲット言語を選択します。",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "要約言語",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "今後の AI 要約出力に使用する推奨要約言語を選択します。",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "デフォルトの要約保存先",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "AI 要約を保存する際に Wino がデフォルトで使用するフォルダを選択します。",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "システムの既定の保存場所を使用",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "このフォルダは存在しません。要約のデフォルト保存場所を使用します。",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "デフォルトのスヌーズ期間",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "カレンダーリマインダー通知のデフォルトのスヌーズ期間を設定します。",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "時間表示日ヘッダの形式",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "日表示、週表示、勤務週表示で上部の日ラベルの表示方法を選択します。ddd、dd、MMM、dddd などの日付フォーマットトークンを使用します。",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "ウィンドウの背景",
+    "SettingsWindowBackdrop_Description": "Wino ウィンドウに適用する背景効果を選択します。",
+    "SettingsWindowBackdrop_Disabled": "デフォルト以外のアプリテーマが選択されている場合、ウィンドウの背景の選択は無効です。",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "変更を保存しました",
+    "EditAccountDetailsPage_SaveSuccess_Message": "アカウントの詳細が正常に更新されました。",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "ホーム",
+    "SettingsHome_SearchTitle": "設定を探す",
+    "SettingsHome_SearchDescription": "機能、トピック、キーワードで検索して、適切な設定ページへ直接ジャンプします。",
+    "SettingsHome_SearchPlaceholder": "設定を検索",
+    "SettingsHome_SearchExamples": "例: テーマ、ストレージ、言語、署名",
+    "SettingsHome_QuickLinks_Title": "クイックリンク",
+    "SettingsHome_QuickLinks_Description": "よく使われる設定へすぐ移動します。",
+    "SettingsHome_StorageCard_Description": "このデバイスにローカルに保存されている MIME コンテンツの量を確認し、必要に応じて整理します。",
+    "SettingsHome_StorageEmptySummary": "まだキャッシュした MIME コンテンツは検出されていません。",
+    "SettingsHome_StorageLoading": "ローカル MIME 使用状況を確認しています...",
+    "SettingsHome_Tips_Title": "ヒントとコツ",
+    "SettingsHome_Tips_Description": "いくつかの小さな変更で Wino をよりパーソナルに感じられるようになります。",
+    "SettingsHome_Tip_Theme": "ダークモードやアクセントの変更をしますか？ パーソナライズを開いてください。",
+    "SettingsHome_Tip_Background": "起動時の動作とバックグラウンド同期を制御するには、アプリ設定を使用してください。",
+    "SettingsHome_Tip_Shortcuts": "キーボードショートカットを使うと、メールの操作がより速くなります。",
+    "SettingsHome_Resources_Title": "役立つリンク",
+    "SettingsHome_Resources_Description": "プロジェクトのリソース、サポート情報、リリースチャンネルを開きます。",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "一般",
+    "SettingsOptions_MailSection": "メール",
+    "SettingsOptions_CalendarSection": "カレンダー",
+    "SettingsOptions_MoreComingSoon": "追加のオプションは近日公開予定",
+    "SettingsOptions_HeroDescription": "Wino Mail の体験をカスタマイズ",
+    "SettingsOptions_AccountsSummary": "{0} アカウントが設定されています。",
+    "SettingsSearch_ManageAccounts_Keywords": "アカウント;アカウント;メールボックス;メールボックス;エイリアス;エイリアス;プロフィール;アドレス;アドレス",
+    "SettingsSearch_AppPreferences_Keywords": "起動;バックグラウンド;同期;通知;通知;検索;トレイ;デフォルト",
+    "SettingsSearch_LanguageTime_Keywords": "言語;時刻;時計;ロケール;地域;形式;24時間;24h",
+    "SettingsSearch_Personalization_Keywords": "テーマ;ダーク;ライト;外観;アクセント;カラー;モード;レイアウト;密度",
+    "SettingsSearch_About_Keywords": "情報;バージョン;ウェブサイト;プライバシー;GitHub;寄付;ストア;サポート",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "ショートカット;ショートカット;ホットキー;ホットキー;キーボード;キー",
+    "SettingsSearch_MessageList_Keywords": "メッセージ;メッセージ;リスト;スレッド;スレッド;アバター;プレビュー;差出人",
+    "SettingsSearch_ReadComposePane_Keywords": "リーダー;作成;作成者;フォント;フォント;外部コンテンツ;表示;読み取り",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "署名;署名;暗号化;証明書;証明書;S/MIME;SMIME;セキュリティ",
+    "SettingsSearch_Storage_Keywords": "ストレージ;キャッシュ;キャッシュ;MIME;ディスク;容量;クリーンアップ;クリーンアップ;ローカルデータ",
+    "SettingsSearch_CalendarSettings_Keywords": "カレンダー;週;時間;予定;イベント;イベント",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Wino Mail のウェブサイトを開きます。",
+    "SettingsWebsite_Title": "ウェブサイト",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "メールテンプレート",
+    "SettingsEmailTemplates_Description": "メールテンプレートを管理",
+    "SettingsEmailTemplates_CreatePageTitle": "新しいテンプレート",
+    "SettingsEmailTemplates_EditPageTitle": "テンプレートを編集",
+    "SettingsEmailTemplates_NewTemplateTitle": "新しいテンプレート",
+    "SettingsEmailTemplates_NewTemplateDescription": "新しいメール テンプレートを作成",
+    "SettingsEmailTemplates_NameTitle": "名前",
+    "SettingsEmailTemplates_NamePlaceholder": "テンプレート名",
+    "SettingsEmailTemplates_DescriptionTitle": "説明",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "任意の説明",
+    "SettingsEmailTemplates_ContentTitle": "テンプレート内容",
+    "SettingsEmailTemplates_ContentDescription": "このテンプレートの HTML コンテンツを編集",
+    "SettingsEmailTemplates_NameRequired": "テンプレート名は必須です。",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "ストレージ",
+    "SettingsStorage_Description": "ローカルデータフォルダに格納された MIME キャッシュをスキャンして管理します。",
+    "SettingsStorage_ScanFolder": "ローカルデータフォルダをスキャン",
+    "SettingsStorage_NoLocalMimeDataFound": "ローカル MIME データが見つかりません。",
+    "SettingsStorage_NoAccountsFound": "アカウントが見つかりません。",
+    "SettingsStorage_TotalUsage": "ローカル MIME 使用量の合計: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} がローカル MIME キャッシュで使用されています",
+    "SettingsStorage_DeleteAll_Title": "すべての MIME コンテンツを削除",
+    "SettingsStorage_DeleteAll_Description": "このアカウントの MIME キャッシュフォルダー全体を削除します。",
+    "SettingsStorage_DeleteAll_Button": "すべて削除",
+    "SettingsStorage_DeleteAll_Confirm_Title": "すべての MIME コンテンツを削除",
+    "SettingsStorage_DeleteAll_Confirm_Message": "{0} のローカル MIME データをすべて削除しますか？",
+    "SettingsStorage_DeleteAll_Success": "すべての MIME コンテンツを削除しました。",
+    "SettingsStorage_DeleteOld_Title": "古い MIME コンテンツを削除",
+    "SettingsStorage_DeleteOld_Description": "ローカルデータベースのメール作成日に基づいて MIME ファイルを削除します。",
+    "SettingsStorage_DeleteOld_1Month": "1か月以上",
+    "SettingsStorage_DeleteOld_3Months": "3か月以上",
+    "SettingsStorage_DeleteOld_6Months": "6か月以上",
+    "SettingsStorage_DeleteOld_1Year": "1年以上",
+    "SettingsStorage_DeleteOld_Confirm_Title": "古い MIME コンテンツを削除",
+    "SettingsStorage_DeleteOld_Confirm_Message": "{1} のローカル MIME データを {0} より古いものとして削除しますか？",
+    "SettingsStorage_DeleteOld_Success": "{1} より古い {0} 個の MIME フォルダーを削除しました。",
+    "SettingsStorage_1Month": "1か月",
+    "SettingsStorage_3Months": "3か月",
+    "SettingsStorage_6Months": "6か月",
+    "SettingsStorage_1Year": "1年",
+    "SettingsStorage_Months": "{0} か月",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Wino Mail を開く",
+    "SystemTrayMenu_ShowWinoCalendar": "Wino カレンダーを開く",
+    "SystemTrayMenu_ExitWino": "終了",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "証明書のインポートに成功しました。",
+    "Smime_ImportCertificates_Error": "証明書のインポート中にエラーが発生しました: {0}",
+    "Smime_RemoveCertificates_Confirm": "{0} の証明書を本当に削除しますか？",
+    "Smime_RemoveCertificates_Success": "証明書を削除しました。",
+    "Smime_ExportCertificates_Success": "証明書をエクスポートしました。",
+    "Smime_ExportCertificates_Error": "証明書のエクスポート中にエラーが発生しました。",
+    "Smime_CertificateDetails": "件名: {0}\\n発行者: {1}\\n有効開始: {2}\\n有効期限: {3}\\nサムプリント: {4}",
+    "Smime_CertificatePassword_Title": "証明書のパスワードが必要です",
+    "Smime_CertificatePassword_Placeholder": "{0} の証明書のパスワード（任意）",
+    "Smime_Confirm_Title": "確認",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "更新",
+    "SettingsSignatureAndEncryption_Title": "署名と暗号化",
+    "SettingsSignatureAndEncryption_Description": "メールの署名と暗号化のための S/MIME 証明書を管理します。",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "自分の証明書",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "署名と暗号化の個人証明書",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "受信者の証明書",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "復号用の受信者証明書",
+    "SettingsSignatureAndEncryption_NameColumn": "名前",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "有効期限",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "サムプリント",
+    "Buttons_Remove": "削除",
+    "Buttons_Export": "エクスポート",
+    "Buttons_Import": "インポート",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME 署名証明書",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME 暗号化",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "なし",
+    "SmimeSignaturesInMessage": "このメッセージの署名:",
+    "SmimeSignatureEntry": "• {0} {1}（{2}、有効期限 {3} - {4}）",
+    "SmimeSigningCertificateInfoTitle": "S/MIME 署名証明書情報",
+    "SmimeCertificateInfoTitle": "S/MIME 証明書情報",
+    "SmimeNoCertificateFileFound": "証明書ファイルが見つかりません",
+    "SmimeSaveCertificate": "証明書を保存...",
+    "SmimeCertificate": "S/MIME 証明書",
+    "SmimeCertificateSavedTo": "証明書は {0} に保存されました",
+    "SmimeSignedTooltip": "このメッセージは S/MIME 証明書で署名されています。詳細を見るにはクリックしてください",
+    "SmimeEncryptedTooltip": "このメッセージは S/MIME 証明書で暗号化されています。",
+    "SmimeCertificateFileInfo": "ファイル: {0}",
+    "Composer_LightTheme": "ライトテーマ",
+    "Composer_DarkTheme": "ダークテーマ",
+    "Composer_Outdent": "インデントを減らす",
+    "Composer_Indent": "インデントを追加",
+    "Composer_BulletList": "箇条書き",
+    "Composer_OrderedList": "番号付きリスト",
+    "Composer_Stroke": "ストローク",
+    "Composer_Bold": "太字",
+    "Composer_Italic": "斜体",
+    "Composer_Underline": "下線",
+    "Composer_CcBcc": "Cc と Bcc",
+    "Composer_EnableSmimeSignature": "S/MIME 署名の有効化/無効化",
+    "Composer_EnableSmimeEncryption": "S/MIME 暗号化の有効化/無効化",
+    "Composer_LocalDraftSyncInfo": "この下書きはローカルのみです。Wino がこの下書きをメールサーバーへ送信できませんでした。サーバーへ再送信するにはクリックしてください。",
+    "Composer_CertificateExpires": "有効期限: ",
+    "Composer_SmimeSignature": "S/MIME 署名",
+    "Composer_SmimeEncryption": "S/MIME 暗号化",
+    "Composer_EmailTemplatesPlaceholder": "メール テンプレート",
+    "Composer_AiSummarize": "AI で要約",
+    "Composer_AiSummarizeDescription": "このメールから要点、アクション項目、決定事項を抽出します。",
+    "Composer_AiTranslate": "AI で翻訳",
+    "Composer_AiActions": "AI アクション",
+    "Composer_AiRewrite": "AI で言い換え",
+    "AiActions_CheckingStatus": "AI アクセスを確認しています...",
+    "AiActions_SignedOutTitle": "Wino AI パックのロックを解除",
+    "AiActions_SignedOutDescription": "Wino ア카ウントにサインインし、AI パックのアドオンを有効にした後、AI を使用してメールを翻訳・リライト・要約します。",
+    "AiActions_NoPackTitle": "AI パックが必要です",
+    "AiActions_NoPackDescription": "サインインしていますが、AI パックはまだ有効になっていません。Wino の AI 翻訳、リライト、要約機能を使用するには購入してください。",
+    "AiActions_UsageSummary": "今月は {0} / {1} クレジットを使用しました。",
+    "Composer_AiRewritePolite": "丁寧に書き直す",
+    "Composer_AiRewritePoliteDescription": "意図を変えず、表現を柔らかくします。",
+    "Composer_AiRewriteAngry": "怒りっぽく書く",
+    "Composer_AiRewriteAngryDescription": "より鋭く、対立的な口調を使用します。",
+    "Composer_AiRewriteHappy": "明るいトーンにする",
+    "Composer_AiRewriteHappyDescription": "より明るく、熱意のあるトーンを追加します",
+    "Composer_AiRewriteFormal": "フォーマルな表現にする",
+    "Composer_AiRewriteFormalDescription": "メッセージをより専門的で整理された表現にします",
+    "Composer_AiRewriteFriendly": "親しみやすいトーンにする",
+    "Composer_AiRewriteFriendlyDescription": "より親しみやすいトーンでメッセージを温かくします",
+    "Composer_AiRewriteShorter": "短くする",
+    "Composer_AiRewriteShorterDescription": "文章を簡潔にし、不要な詳細を削除します",
+    "Composer_AiRewriteClearer": "よりわかりやすくする",
+    "Composer_AiRewriteClearerDescription": "読みやすさを高め、メッセージの理解をより容易にします",
+    "Composer_AiRewriteCustom": "カスタム",
+    "Composer_AiRewriteCustomDescription": "自分の書き換え意図を説明してください",
+    "Composer_AiRewriteCustomPlaceholder": "メッセージをどのように書き換えたいかを説明してください",
+    "Composer_AiRewriteMode": "トーンの書き換え",
+    "Composer_AiRewriteApply": "書き換えを適用",
+    "Composer_AiTranslateDialogTitle": "AIで翻訳",
+    "Composer_AiTranslateDialogDescription": "ターゲット言語またはカルチャコードを en-US、tr-TR、de-DE、fr-FR などの形式で入力してください",
+    "Composer_AiTranslateApply": "翻訳",
+    "Composer_AiTranslateLanguage": "対象言語",
+    "Composer_AiTranslateCustomPlaceholder": "カルチャコードを入力してください",
+    "Composer_AiTranslateLanguageEnglish": "英語 (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "トルコ語 (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "ドイツ語 (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "フランス語 (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "スペイン語 (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "イタリア語 (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "ポルトガル語（ブラジル） (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "オランダ語 (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "ポーランド語 (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "ロシア語 (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "日本語 (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "韓国語 (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "中国語（簡体字）(zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "アラビア語 (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "ヒンディー語 (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "その他...",
+    "Composer_AiBusyTitle": "AIはすでに処理中です",
+    "Composer_AiBusyMessage": "現在のAI処理が完了するのを待ってください",
+    "Composer_AiSignInRequired": "AI機能を利用するには、Winoアカウントにサインインしてください",
+    "Composer_AiMissingHtml": "Wino AIに送信するメッセージ内容がまだありません",
+    "Composer_AiQuotaUnavailable": "AIの結果が適用されました",
+    "Composer_AiAppliedMessage": "AIの結果が作成エディタに適用されました。元に戻すには取り消しを使ってください",
+    "Composer_AiSummarizeSuccessTitle": "AI要約を適用しました",
+    "Composer_AiTranslateSuccessTitle": "AI翻訳を適用しました",
+    "Composer_AiRewriteSuccessTitle": "AI書き換えを適用しました",
+    "Composer_AiErrorTitle": "AIの処理に失敗しました",
+    "Reader_AiAppliedMessage": "このメッセージにAIの結果が表示されました。元の内容を再度表示するには、メッセージを再度開いてください",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "連絡先",
+    "ContactsPage_AddContact": "連絡先を追加",
+    "ContactsPage_EditContact": "連絡先を編集",
+    "ContactsPage_DeleteContact": "連絡先を削除",
+    "ContactsPage_SearchPlaceholder": "連絡先を検索...",
+    "ContactsPage_NoContacts": "連絡先が見つかりません",
+    "ContactsPage_ContactsCount": "{0} 件の連絡先",
+    "ContactsPage_SelectedContactsCount": "{0}件が選択されています",
+    "ContactsPage_DeleteSelectedContacts": "選択した連絡先を削除",
+    "ContactEditDialog_Title": "連絡先を編集",
+    "ContactEditDialog_PhotoSection": "写真",
+    "ContactEditDialog_ChoosePhoto": "写真を選択",
+    "ContactEditDialog_RemovePhoto": "写真を削除",
+    "ContactEditDialog_NameHeader": "名前",
+    "ContactEditDialog_NamePlaceholder": "連絡先名",
+    "ContactEditDialog_EmailHeader": "メールアドレス",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "連絡先情報",
+    "ContactEditDialog_RootContactInfo": "これはあなたのアカウントに関連付けられたルート連絡先です。削除できません",
+    "ContactEditDialog_OverriddenContactInfo": "この連絡先は手動で変更されており、同期時には更新されません",
+    "ContactsPage_Subtitle": "メールの連絡先と情報を管理します",
+    "ContactStatus_Account": "アカウント",
+    "ContactStatus_Modified": "変更済み",
+    "ContactAction_Edit": "連絡先を編集",
+    "ContactAction_ChangePhoto": "写真を変更",
+    "ContactAction_Delete": "連絡先を削除",
+    "ContactAction_Add": "連絡先を追加",
+    "ContactSelection_Selected": "選択済み",
+    "ContactSelection_SelectAll": "すべて選択",
+    "ContactSelection_Clear": "選択をクリア",
+    "ContactsPage_EmptyState": "表示する連絡先がありません",
+    "ContactsPage_AddFirstContact": "最初の連絡先を追加",
+    "ContactsPage_ContactsCountSuffix": "件",
+    "ContactsPane_NewContact": "新しい連絡先",
+    "ContactsPane_DescriptionTitle": "連絡先を管理する",
+    "ContactsPane_DescriptionBody": "連絡先を作成し、名前を変更し、プロフィール写真を更新し、保存済みの詳細を1か所に整理します",
+    "ContactEditDialog_AddTitle": "連絡先を追加",
+    "ContactInfoBar_ContactAdded": "連絡先を追加しました",
+    "ContactInfoBar_ContactUpdated": "連絡先を更新しました",
+    "ContactInfoBar_ContactsDeleted": "連絡先を削除しました",
+    "ContactInfoBar_ContactPhotoUpdated": "連絡先の写真を更新しました",
+    "ContactInfoBar_FailedToLoadContacts": "連絡先の読み込みに失敗しました: {0}",
+    "ContactInfoBar_FailedToAddContact": "連絡先の追加に失敗しました: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "連絡先の更新に失敗しました: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "連絡先の削除に失敗しました: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "写真の更新に失敗しました: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "ルート連絡先は削除できません",
+    "ContactConfirmDialog_DeleteTitle": "連絡先を削除",
+    "ContactConfirmDialog_DeleteMessage": "以下の連絡先 '{0}' を削除してもよろしいですか？",
+    "ContactConfirmDialog_DeleteMultipleMessage": "{0} 件の連絡先を削除してもよろしいですか？",
+    "ContactConfirmDialog_DeleteButton": "削除",
+    "CalendarAccountSettings_Title": "カレンダーアカウント設定",
+    "CalendarAccountSettings_Description": "{0} のカレンダー設定を管理します",
+    "CalendarAccountSettings_AccountColor": "アカウントの色",
+    "CalendarAccountSettings_AccountColorDescription": "このカレンダーアカウントの表示色を変更します。",
+    "CalendarAccountSettings_SyncEnabled": "同期を有効にする",
+    "CalendarAccountSettings_SyncEnabledDescription": "このアカウントのカレンダー同期を有効または無効にします。",
+    "CalendarAccountSettings_DefaultShowAs": "デフォルト表示ステータス",
+    "CalendarAccountSettings_DefaultShowAsDescription": "このアカウントで作成される新しいイベントのデフォルト可用性ステータス。",
+    "CalendarAccountSettings_PrimaryCalendar": "メインカレンダー",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "このカレンダーをアカウントのメインカレンダーとして設定します。",
+    "CalendarSettings_NewEventBehavior_Header": "新規イベントボタンの動作",
+    "CalendarSettings_NewEventBehavior_Description": "新規イベントボタンを押すと毎回カレンダーを選択するか、特定のカレンダーを常に開くかを選択します。",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "都度確認する",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "常に特定のカレンダーを使用する。",
+    "CalendarSettings_Rendering_Title": "レンダリング",
+    "CalendarSettings_Rendering_Description": "カレンダーのレイアウトと表示動作を設定します。",
+    "CalendarSettings_Notifications_Title": "通知",
+    "CalendarSettings_Notifications_Description": "デフォルトのリマインダーとスヌーズ動作を選択します。",
+    "CalendarSettings_Preferences_Title": "設定",
+    "CalendarSettings_Preferences_Description": "新規イベントボタンの動作を設定します。",
+    "WhatIsNew_GetStartedButton": "はじめる",
+    "WhatIsNew_ContinueAnywayButton": "とにかく続行",
+    "WhatIsNew_PreparingForNewVersionButton": "新しいバージョンの準備中...",
+    "WhatIsNew_MigrationPreparing_Title": "データを準備しています",
+    "WhatIsNew_MigrationPreparing_Description": "Wino は更新のマイグレーションを適用しています。今回のリリースの準備のため、アカウントデータの準備が完了するまでお待ちください。",
+    "WhatIsNew_MigrationFailedMessage": "マイグレーションの適用がエラーコード {0} で失敗しました。引き続きアプリケーションを使用できます。ただし重大な問題が発生した場合は、アプリを再インストールしてください。",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail が更新されました",
+    "WhatIsNew_MigrationNotification_Message": "アップデートを完了して新機能を確認するには、アプリを開いてください。",
+    "WelcomeWindow_Title": "Wino Mail へようこそ",
+    "WelcomeWindow_Subtitle": "メールとカレンダーのネイティブなWindows体験。",
+    "WelcomeWindow_WhatsNewTitle": "最新の変更点",
+    "WelcomeWindow_FeaturesTitle": "機能",
+    "WelcomeWindow_WhatsNewTab": "新機能",
+    "WelcomeWindow_FeaturesTab": "機能",
+    "WelcomeWindow_GetStartedButton": "アカウントを追加して始める",
+    "WelcomeWindow_GetStartedDescription": "Wino Mail を始めるには、Outlook、Gmail、または IMAP アカウントを追加してください。",
+    "WelcomeWindow_ImportFromWinoAccount": "Wino アカウントからインポート",
+    "WelcomeWindow_ImportInProgress": "同期された設定とアカウントをインポートしています...",
+    "WelcomeWindow_ImportNoAccountsFound": "Wino アカウントに同期されたアカウントは見つかりませんでした。設定が利用可能だった場合、それらは復元されました。アカウントを手動で追加するには、はじめるを使ってください。",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} 個の同期済みアカウントはすでにこのデバイスにあります。必要に応じて、別のアカウントを手動で追加するにははじめるを使用してください。",
+    "WelcomeWindow_SetupTitle": "アカウントの設定",
+    "WelcomeWindow_SetupSubtitle": "開始するにはメールプロバイダを選択してください",
+    "WelcomeWindow_AddAccountButton": "アカウントを追加",
+    "WelcomeWindow_SkipForNow": "とりあえずスキップ — 後で設定します",
+    "WelcomeWindow_AppDescription": "高速で集中できる受信箱 — Windows 11 向けに再設計されています。",
+    "WelcomeWizard_Step1Title": "ようこそ",
+    "SystemTrayMenu_Open": "開く",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "同期設定",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Wino の設定をデバイス間で同期します。",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "アドオンを有効化",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Wino AI Pack のようなプレミアム機能にアクセスできます。",
+    "WinoAccount_Management_Description": "Wino アカウント、AI Pack へのアクセス、同期設定とアカウントの詳細を管理します。",
+    "WinoAccount_Management_SignedOutTitle": "Wino Mail にサインイン",
+    "WinoAccount_Management_SignedOutDescription": "メールを同期し、AI機能にアクセスし、デバイス間で設定を管理するにはサインインするかアカウントを作成してください。",
+    "WinoAccount_Management_ProfileSectionHeader": "プロフィール",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino アドオン",
+    "WinoAccount_Management_DataSectionHeader": "データ",
+    "WinoAccount_Management_AccountActionsSectionHeader": "アカウント操作",
+    "WinoAccount_Management_AccountCardTitle": "アカウント",
+    "WinoAccount_Management_AccountCardDescription": "Wino アカウントのメールアドレスと現在のアカウント状態。",
+    "WinoAccount_Management_AiPackCardTitle": "AIパック",
+    "WinoAccount_Management_AiPackCardDescription": "Wino AI Pack が有効かどうかと残りの使用量を確認します。",
+    "WinoAccount_Management_AiPackActive": "AIパックは有効です",
+    "WinoAccount_Management_AiPackInactive": "AIパックは有効ではありません",
+    "WinoAccount_Management_AiPackUsage": "{1} のうち {0} 使用済み。残り {2}。",
+    "WinoAccount_Management_AiPackBillingPeriod": "請求期間: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "使用量の詳細はまだ利用できません。",
+    "WinoAccount_Management_AiPackBuyDescription": "AI を使ってメールを翻訳・書き換え・要約するには、Wino AI Pack を購入してください。",
+    "WinoAccount_Management_AiPackPromoTitle": "AI Pack をアンロック",
+    "WinoAccount_Management_AiPackPromoDescription": "AI 機能を搭載したツールでメール作業を強化します。50言語以上への翻訳、明確さとトーンのための書換え、長いスレッドの即時要約を提供します。",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99/月",
+    "WinoAccount_Management_AiPackPromoRequests": "1,000 クレジット",
+    "WinoAccount_Management_AiPackGetButton": "AI Packを入手",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Wino Mail で翻訳、書き換え、要約を行うAI搭載ツールです。",
+    "WinoAddOn_AI_PACK_Keywords": "AI、翻訳、書き換え、要約、生産性",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "無制限アカウント",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "アカウントの上限を解除し、必要なだけメールアカウントを追加できます。",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "アカウント、無制限、プレミアム、アドオン",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "この購入を完了するには Wino アカウントにサインインしてください。",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino はこの Microsoft Store の購入を完了できませんでした。",
+    "WinoAccount_Management_StoreSyncFailed": "購入は完了しましたが、Wino はまだアカウントの特典を更新できませんでした。少ししてからもう一度お試しください。",
+    "WinoAccount_Management_AiPackSubscriptionActive": "サブスクリプションは有効です",
+    "WinoAccount_Management_AiPackRenews": "更新日: {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "今月使用済みクレジット",
+    "WinoAccount_Management_AiPackResets": "リセット {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "AI 使用量の残高を読み込む際に問題が発生しました。",
+    "WinoAccount_Management_AiPackFeatureTranslate": "翻訳",
+    "WinoAccount_Management_AiPackFeatureRewrite": "書き換え",
+    "WinoAccount_Management_AiPackFeatureSummarize": "要約",
+    "WinoAccount_Management_AddOnLoadFailed": "このアドオンの読み込みに問題が発生しました。",
+    "WinoAccount_Management_SyncPreferencesTitle": "設定とアカウントの同期",
+    "WinoAccount_Management_SyncPreferencesDescription": "Wino の設定とメールボックスの詳細をデバイス間でインポートまたはエクスポートします。パスワード、トークン、その他の機密情報は同期されません。",
+    "WinoAccount_Management_SignOutTitle": "サインアウト",
+    "WinoAccount_Management_SignOutDescription": "このデバイスでアカウントからサインアウトします",
+    "WinoAccount_Management_StatusLabel": "ステータス: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "このアカウントにはまだ同期されたデータが保存されていません。",
+    "WinoAccount_Management_ExportSucceeded": "選択した Wino データが正常にエクスポートされました。",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "設定が Wino アカウントにエクスポートされました。",
+    "WinoAccount_Management_ExportAccountsSucceeded": "{0} 件のアカウントの詳細を Wino アカウントにエクスポートしました。",
+    "WinoAccount_Management_ImportSucceeded": "Wino アカウントから同期データをインポートしました。",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "{0} 個の同期済み設定を適用しました。",
+    "WinoAccount_Management_ImportAccountsSucceeded": "{0} 件のアカウントをインポートしました。",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "このデバイスですでに存在する {0} 件のアカウントをスキップしました。",
+    "WinoAccount_Management_ImportPartial": "{0} 件の同期設定を適用しました。{1} 件の設定は復元できませんでした。",
+    "WinoAccount_Management_ImportReloginReminder": "パスワード、トークン、その他の機密情報はインポートされませんでした。このデバイス上の各アカウントについて、使用前に再度サインインしてください。",
+    "WinoAccount_Management_SerializeFailed": "Wino は現在の設定をシリアライズできませんでした。",
+    "WinoAccount_Management_EmptyExport": "エクスポートする設定値がありません。",
+    "WinoAccount_Management_ImportEmpty": "同期データのペイロードには復元する新しい情報が含まれていません。",
+    "WinoAccount_Management_ExportDialog_Title": "Wino アカウントへエクスポート",
+    "WinoAccount_Management_ExportDialog_Description": "Wino アカウントに同期する内容を選択してください。",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "設定",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "アカウント",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "パスワード、トークン、その他の機密情報は同期されません。",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "他のPCでインポートされたアカウントを使用するには、再度サインインする必要があります。",
+    "WinoAccount_Management_ExportDialog_InProgress": "選択した Wino データをエクスポートしています...",
+    "WinoAccount_Management_LoadFailed": "Wino は最新の Wino アカウント情報を読み込めませんでした。",
+    "WinoAccount_Management_ActionFailed": "Wino アカウントのリクエストを完了できませんでした。",
+    "WinoAccount_SettingsSection_Title": "Wino アカウント",
+    "WinoAccount_SettingsSection_Description": "ローカルホストの認証サービスを使用して、Wino アカウントを作成またはサインインします。",
+    "WinoAccount_RegisterButton_Title": "アカウントを登録",
+    "WinoAccount_RegisterButton_Description": "メールアドレスとパスワードで Wino アカウントを作成します。",
+    "WinoAccount_RegisterButton_Action": "登録画面を開く",
+    "WinoAccount_LoginButton_Title": "サインイン",
+    "WinoAccount_LoginButton_Description": "メールアドレスとパスワードで既存の Wino アカウントにサインインします。",
+    "WinoAccount_LoginButton_Action": "ログイン画面を開く",
+    "WinoAccount_SignOutButton_Title": "サインアウト",
+    "WinoAccount_SignOutButton_Description": "ローカルに保存された Wino アカウントセッションを削除します。",
+    "WinoAccount_SignOutButton_Action": "サインアウト",
+    "WinoAccount_RegisterDialog_Title": "Wino アカウントを作成",
+    "WinoAccount_RegisterDialog_Description": "Wino の体験を同期させ、アカウントベースのアドオンを利用するために Wino アカウントを作成します。",
+    "WinoAccount_RegisterDialog_HeroTitle": "Wino アカウントを作成しましょう",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "なぜ作成するのですか？",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "デバイス間で設定をインポート・エクスポート",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "セットアップを一から再構築することなく、Wino の設定をデバイス間で移動します。",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Wino AI Pack などの独占アドオンにアクセスできます（有料）",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "1 つのアカウントでプレミアム機能をアンロックします。",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino アカウントはメールアカウントとは別のものです",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Outlook、Gmail、IMAP、その他のメールアカウントはそのままです。Wino アカウントは Wino 固有の機能とアカウントベースのアドオンのみを管理します。",
+    "WinoAccount_RegisterDialog_PrimaryButton": "登録",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "プライバシーと API 処理",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Wino AI Pack などのオプションのアドオンは、これらの機能を使用する場合にのみ、選択されたメール HTML コンテンツを Wino API サービスへ送信することがあります。",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "プライバシーポリシーを読む",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "プライバシーポリシーに同意します。",
+    "WinoAccount_LoginDialog_Title": "Wino アカウントにサインイン",
+    "WinoAccount_LoginDialog_Description": "Wino アカウントにサインインして、Wino の設定を同期し、アカウントベースの機能にアクセスします。",
+    "WinoAccount_LoginDialog_HeroTitle": "おかえりなさい",
+    "WinoAccount_LoginDialog_BenefitsTitle": "サインインで得られる機能",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Wino アカウントを使用して、デバイス間の設定を引き続き同期し、Wino AI Pack のような有料アドオンにアクセスします。",
+    "WinoAccount_LoginDialog_DifferenceTitle": "これはメールボックスのサインインではありません。",
+    "WinoAccount_LoginDialog_DifferenceDescription": "ここでサインインしても、Outlook、Gmail、IMAP のアカウントを Wino に追加または置換することはありません。Wino 専用のサービスにサインインするだけです。",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "パスワードをお忘れですか？",
+    "WinoAccount_EmailLabel": "メールアドレス",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "パスワード",
+    "WinoAccount_ConfirmPasswordLabel": "パスワードの確認",
+    "WinoAccount_ForgotPasswordDialog_Title": "パスワードをリセット",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "リセット用のメールを送信",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "サインイン画面へ戻る",
+    "WinoAccount_ForgotPasswordDialog_Description": "Wino アカウントのメールアドレスを入力すると、登録済みのアドレスであればパスワードリセットリンクを送信します。",
+    "WinoAccount_Validation_EmailRequired": "メールアドレスが必要です。",
+    "WinoAccount_Validation_PasswordRequired": "パスワードが必要です。",
+    "WinoAccount_Validation_PasswordMismatch": "パスワードが一致しません。",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Wino アカウントを作成する前に、プライバシーポリシーに同意する必要があります。",
+    "WinoAccount_Error_InvalidCredentials": "メールアドレスまたはパスワードが正しくありません。",
+    "WinoAccount_Error_AccountLocked": "このアカウントは一時的にロックされています。",
+    "WinoAccount_Error_AccountBanned": "このアカウントは利用停止となっています。",
+    "WinoAccount_Error_AccountSuspended": "このアカウントは一時停止されています。",
+    "WinoAccount_Error_EmailNotConfirmed": "サインインする前にメールアドレスを確認してください。",
+    "WinoAccount_Error_EmailConfirmationRequired": "サインインする前にメールアドレスの確認をしてください。",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "新しい確認メールはまだ利用できません。",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "この確認リクエストは有効ではありません。再度サインインをお試しください。",
+    "WinoAccount_Error_EmailNotRegistered": "このメールアドレスは登録されていません。",
+    "WinoAccount_Error_RefreshTokenInvalid": "セッションが有効ではなくなりました。もう一度サインインしてください。",
+    "WinoAccount_Error_EmailAlreadyRegistered": "このメールアドレスはすでに登録されています。",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "外部サインインを完了するにはメールアドレスが必要です。",
+    "WinoAccount_Error_ExternalLoginInvalid": "外部サインインのリクエストが無効です。",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "外部サインインの状態が無効または期限切れです。",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "外部サインインのコードが無効または期限切れです。",
+    "WinoAccount_Error_AiPackRequired": "この操作には有効な Wino AI Pack の購読が必要です。",
+    "WinoAccount_Error_AiQuotaExceeded": "現在の請求期間の AI Pack 使用制限を超えました。",
+    "WinoAccount_Error_AiHtmlEmpty": "処理するメールHTMLコンテンツがありません。",
+    "WinoAccount_Error_AiHtmlTooLarge": "このメールは Wino AI で処理するには大きすぎます。",
+    "WinoAccount_Error_AiUnsupportedLanguage": "その言語はサポートされていません。有効なカルチャコードとして en-US や tr-TR を試してください。",
+    "WinoAccount_Error_Forbidden": "この操作を実行する権限がありません。",
+    "WinoAccount_Error_ValidationFailed": "リクエストが無効です。入力した値を確認してください。",
+    "WinoAccount_RegisterSuccessMessage": "{0} の Wino アカウント登録が完了しました。",
+    "WinoAccount_LoginSuccessMessage": "{0} として Wino アカウントにサインインしました。",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "メールアドレスを確認してください",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "私たちは {0} 宛てにメール確認を送りました。確認を完了してから、再度サインインしてください。",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "メールアドレスの確認が必要です。",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "まだ {0} の確認を完了していません。",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "確認メールを再送信",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "{0} 後に確認メールを再送信できます。",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "今すぐ確認メールを再送信できます。",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "確認メールを再送信しました",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "再度確認メールを {0} 宛てに送信しました。確認を完了してから、再度サインインしてください。",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "パスワードリセットメールを送信しました",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "{0} 宛にパスワードリセットメールを送りました。そのメッセージを開いて新しいパスワードを選択してください。",
+    "WinoAccount_ChangePassword_Title": "パスワードを変更",
+    "WinoAccount_ChangePassword_Description": "この Wino アカウントにパスワードリセットメールを送信します。",
+    "WinoAccount_ChangePassword_Action": "リセットメールを送信",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Wino から {0} にパスワードリセットのメールを送信しますか？",
+    "WinoAccount_SignOut_SuccessMessage": "Wino アカウント {0} からサインアウトしました。",
+    "WinoAccount_SignOut_NoAccountMessage": "サインアウトするアカウントが現在アクティブではありません。",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino アカウント",
+    "WinoAccount_Titlebar_SignedOutDescription": "Wino セッションを管理するには、サインインするか Wino アカウントを作成してください。",
+    "WinoAccount_Titlebar_SignedInStatus": "ステータス: {0}",
+    "WelcomeWizard_Step2Title": "アカウントの追加",
+    "WelcomeWizard_Step3Title": "設定を完了",
+    "ProviderSelection_Title": "メールプロバイダを選択",
+    "ProviderSelection_Subtitle": "以下のプロバイダを選択して、Wino Mail にメールアカウントを追加します。",
+    "ProviderSelection_AccountNameHeader": "アカウント名",
+    "ProviderSelection_AccountNamePlaceholder": "例: Personal、Work",
+    "ProviderSelection_DisplayNameHeader": "表示名",
+    "ProviderSelection_DisplayNamePlaceholder": "例: John Doe",
+    "ProviderSelection_EmailHeader": "メールアドレス",
+    "ProviderSelection_EmailPlaceholder": "例: johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "アプリ専用パスワード",
+    "ProviderSelection_AppPasswordHelp": "アプリ専用パスワードはどうやって取得しますか？",
+    "ProviderSelection_CalendarModeHeader": "カレンダー統合",
+    "ProviderSelection_CalendarMode_DisabledTitle": "無効",
+    "ProviderSelection_CalendarMode_DisabledDescription": "カレンダー統合はありません",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV 同期",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "カレンダーのイベントはデバイス間で Apple のサーバーと同期されます。",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "カレンダーのイベントはデバイス間で Yahoo のサーバーと同期されます。",
+    "ProviderSelection_CalendarMode_LocalTitle": "ローカルカレンダー",
+    "ProviderSelection_CalendarMode_LocalDescription": "イベントはあなたのコンピューターのみに保存されます。サーバー接続はありません。",
+    "ProviderSelection_ClearColor": "色をクリア",
+    "ProviderSelection_ContinueButton": "次へ",
+    "ProviderSelection_SpecialImap_Subtitle": "接続するには、アカウントの認証情報を入力してください。",
+    "AccountSetup_Title": "アカウントを設定しています",
+    "AccountSetup_Step_Authenticating": "{0} で認証中",
+    "AccountSetup_Step_TestingMailAuth": "メール認証をテストしています",
+    "AccountSetup_Step_SyncingFolders": "フォルダのメタデータを同期しています",
+    "AccountSetup_Step_FetchingProfile": "プロフィール情報を取得しています",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV 設定を検出しています",
+    "AccountSetup_Step_TestingCalendarAuth": "カレンダー認証をテストしています",
+    "AccountSetup_Step_SavingAccount": "アカウント情報を保存しています",
+    "AccountSetup_Step_FetchingCalendarMetadata": "カレンダーのメタデータを取得しています",
+    "AccountSetup_Step_SyncingAliases": "エイリアスを同期しています",
+    "AccountSetup_Step_Finalizing": "設定を完了しています",
+    "AccountSetup_FailureMessage": "設定の適用に失敗しました。設定を修正するには戻るか、後でもう一度お試しください。",
+    "AccountSetup_SuccessMessage": "アカウントが正常に設定されました！",
+    "AccountSetup_GoBackButton": "戻る",
+    "AccountSetup_TryAgainButton": "再試行",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "自動検出に失敗しました。詳細設定タブで手動で設定を入力してください。"
 }
-
-
diff --git a/Wino.Core.Domain/Translations/lt_LT/resources.json b/Wino.Core.Domain/Translations/lt_LT/resources.json
index 8eccf7fa..dea35f3c 100644
--- a/Wino.Core.Domain/Translations/lt_LT/resources.json
+++ b/Wino.Core.Domain/Translations/lt_LT/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "all done",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Gaunama kalendoriaus informacija.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "initializing",
     "AccountCreationDialog_PreparingFolders": "We are getting folder information at the moment.",
     "AccountCreationDialog_SigninIn": "Account information is being saved.",
+    "Purchased": "Įsigyta",
     "AccountEditDialog_Message": "Account Name",
     "AccountEditDialog_Title": "Edit Account",
     "AccountPickerDialog_Title": "Pick an account",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Bendri",
+    "AccountDetailsPage_TabMail": "Paštas",
+    "AccountDetailsPage_TabCalendar": "Kalendorius",
+    "AccountDetailsPage_CalendarListDescription": "Pasirinkite kalendorių, kad sukonfigūruotumėte jo nustatymus.",
     "AddHyperlink": "Add",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP Account",
     "Busy": "Busy",
     "Buttons_AddAccount": "Add Account",
+    "Buttons_FixAccount": "Pataisyti paskyrą",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Taikyti",
     "Buttons_ApplyTheme": "Apply Theme",
     "Buttons_Browse": "Browse",
     "Buttons_Cancel": "Cancel",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Edit",
     "Buttons_EnableImageRendering": "Enable",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Tvarkyti",
     "Buttons_No": "No",
     "Buttons_Open": "Open",
     "Buttons_Purchase": "Purchase",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Save",
     "Buttons_SaveConfiguration": "Save Configuration",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Siųsti į serverį",
     "Buttons_Share": "Share",
     "Buttons_SignIn": "Sign In",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Try Again",
     "Buttons_Yes": "Yes",
+    "Sync_SynchronizingFolder": "Sinchronizuojama {0} {1}%",
+    "Sync_DownloadedMessages": "Atsisiųsta {0} pranešimų iš {1}",
+    "SyncAction_Archiving": "Archyvuojama {0} laiškų",
+    "SyncAction_ClearingFlag": "Šalinama vėliava iš {0} laiškų",
+    "SyncAction_CreatingDraft": "Kuriamas juodraštis",
+    "SyncAction_CreatingEvent": "Kuriamas įvykis",
+    "SyncAction_Deleting": "Ištrinami {0} laiškai",
+    "SyncAction_EmptyingFolder": "Ištuštinamas aplankas",
+    "SyncAction_MarkingAsRead": "Žymima kaip skaityta {0} laiškų",
+    "SyncAction_MarkingAsUnread": "Žymima kaip neperskaitytas {0} laiškų",
+    "SyncAction_MarkingFolderAsRead": "Žymimas aplankas kaip skaitytas",
+    "SyncAction_Moving": "Perkeliama {0} laiškų",
+    "SyncAction_MovingToFocused": "Perkeliama {0} laiškų į Focused",
+    "SyncAction_RenamingFolder": "Aplanko pavadinimo keitimas",
+    "SyncAction_SendingMail": "Laiškai siunčiami",
+    "SyncAction_SettingFlag": "Žymima {0} laiškų vėliava",
+    "SyncAction_SynchronizingAccount": "Sinchronizuojama {0}",
+    "SyncAction_SynchronizingAccounts": "Sinchronizuojama {0} paskyra(-ų)",
+    "SyncAction_SynchronizingCalendarData": "Sinchronizuojami kalendoriaus duomenys",
+    "SyncAction_SynchronizingCalendarEvents": "Sinchronizuojami kalendoriaus įvykiai",
+    "SyncAction_SynchronizingCalendarMetadata": "Sinchronizuojami kalendoriaus metaduomenys",
+    "SyncAction_Unarchiving": "Išarchyvuojama {0} laiškų",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Priimti",
+    "CalendarEventResponse_AcceptedResponse": "Priimta",
+    "CalendarEventResponse_Decline": "Atmesti",
+    "CalendarEventResponse_DeclinedResponse": "Atmesta",
+    "CalendarEventResponse_NotResponded": "Neatsakyta",
+    "CalendarEventResponse_Tentative": "Laikinas",
+    "CalendarEventResponse_TentativeResponse": "Laikinas atsakymas",
+    "CalendarEventRsvpPanel_Accept": "Priimti",
+    "CalendarEventRsvpPanel_AddMessage": "Pridėkite atsakymui pranešimą... (neprivalomas)",
+    "CalendarEventRsvpPanel_Decline": "Atmesti",
+    "CalendarEventRsvpPanel_Message": "Pranešimas",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Siųsti atsakymo žinutę",
+    "CalendarEventRsvpPanel_Tentative": "Laikinas",
+    "CalendarEventRsvpPanel_Title": "Atsakymo parinktys",
+    "CalendarAttendeeStatus_Accepted": "Priimtas",
+    "CalendarAttendeeStatus_Declined": "Atmestas",
+    "CalendarAttendeeStatus_NeedsAction": "Reikia veiksmo",
+    "CalendarAttendeeStatus_Tentative": "Laikinas",
+    "CalendarEventDetails_Attachments": "Priedai",
+    "CalendarEventCompose_AddAttachment": "Pridėti priedą",
+    "CalendarEventCompose_AllDay": "Visą dieną",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Priedai nepalaikomi CalDAV kalendoriuose.",
+    "CalendarEventCompose_EndDate": "Pabaigos data",
+    "CalendarEventCompose_EndTime": "Pabaigos laikas",
+    "CalendarEventCompose_Every": "kas",
+    "CalendarEventCompose_ForWeekdays": "už",
+    "CalendarEventCompose_FrequencyDay": "diena",
+    "CalendarEventCompose_FrequencyDayPlural": "dienos",
+    "CalendarEventCompose_FrequencyMonth": "mėnuo",
+    "CalendarEventCompose_FrequencyMonthPlural": "mėnesiai",
+    "CalendarEventCompose_FrequencyWeek": "savaitė",
+    "CalendarEventCompose_FrequencyWeekPlural": "savaitės",
+    "CalendarEventCompose_FrequencyYear": "metai",
+    "CalendarEventCompose_FrequencyYearPlural": "metai",
+    "CalendarEventCompose_Location": "Vieta",
+    "CalendarEventCompose_LocationPlaceholder": "Pridėkite vietą",
+    "CalendarEventCompose_NewEventButton": "Naujas įvykis",
+    "CalendarEventCompose_DefaultCalendarHint": "Galite pasirinkti numatytąjį kalendorių naujiems įvykiams Kalendoriaus nustatymuose.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Atidaryti Kalendoriaus nustatymus",
+    "CalendarEventCompose_NoCalendarsMessage": "Kol kas nėra kalendorių, skirtų įvykių kūrimui.",
+    "CalendarEventCompose_NoCalendarsTitle": "Nėra prieinamų kalendorių",
+    "CalendarEventCompose_NoEndDate": "Nėra pabaigos datos",
+    "CalendarEventCompose_Notes": "Pastabos",
+    "CalendarEventCompose_PickCalendarTitle": "Pasirinkite kalendorių",
+    "CalendarEventCompose_Recurring": "Pasikartojantis",
+    "CalendarEventCompose_RecurringSummary": "Pasikartojantis įvykis įvyksta kas {0} {1}{2} {3} veiksmingas {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Vyksta {0}{1} {2} veiksmingas {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Kartoti kas",
+    "CalendarEventCompose_SelectCalendar": "Pasirinkite kalendorių",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Įvyksta {0} {1}",
+    "CalendarEventCompose_StartDate": "Pradžios data",
+    "CalendarEventCompose_StartTime": "Pradžios laikas",
+    "CalendarEventCompose_TimeRangeSummary": "nuo {0} iki {1}",
+    "CalendarEventCompose_Title": "Įvykio pavadinimas",
+    "CalendarEventCompose_TitlePlaceholder": "Pridėti pavadinimą",
+    "CalendarEventCompose_Until": "iki",
+    "CalendarEventCompose_UntilSummary": " iki {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Visos dienos pabaigos data turi būti vėlesnė už pradžios datą.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Vienas arba keli dalyviai turi neteisingą el. pašto adresą.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Pasikartojimo pabaigos data turi būti lygi arba vėlesnė už įvykio pradžios datą.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Pabaigos laikas turi būti vėlesnis už pradžios laiką.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Vienas ar daugiau priedų nebėra pasiekiami: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Prieš kuriant įvykį, pasirinkite kalendorių.",
+    "CalendarEventCompose_ValidationMissingTitle": "Prieš kuriant įvykį įveskite įvykio pavadinimą.",
+    "CalendarEventCompose_ValidationTitle": "Įvykio patvirtinimas nepavyko",
+    "CalendarEventCompose_WeekdaySummary": " {0}",
+    "CalendarEventCompose_Weekday_Friday": "Penktadienis",
+    "CalendarEventCompose_Weekday_Monday": "Pirmadienis",
+    "CalendarEventCompose_Weekday_Saturday": "Šeštadienis",
+    "CalendarEventCompose_Weekday_Sunday": "Sekmadienis",
+    "CalendarEventCompose_Weekday_Thursday": "Ketvirtadienis",
+    "CalendarEventCompose_Weekday_Tuesday": "Antradienis",
+    "CalendarEventCompose_Weekday_Wednesday": "Trečiadienis",
+    "CalendarEventDetails_Details": "Detalės",
+    "CalendarEventDetails_EditSeries": "Redaguoti seriją",
+    "CalendarEventDetails_Editing": "Redaguojama",
+    "CalendarEventDetails_InviteSomeone": "Pakvieskite ką nors",
+    "CalendarEventDetails_JoinOnline": "Prisijungti internetu",
+    "CalendarEventDetails_Organizer": "Organizatorius",
+    "CalendarEventDetails_People": "Žmonės",
+    "CalendarEventDetails_ReadOnlyEvent": "Tik skaitomas įvykis",
+    "CalendarEventDetails_Reminder": "Priminimas",
+    "CalendarReminder_StartedHoursAgo": "Prasidėjo prieš {0} valandų",
+    "CalendarReminder_StartedMinutesAgo": "Prasidėjo prieš {0} minučių",
+    "CalendarReminder_StartedNow": "Prasidėjo dabar",
+    "CalendarReminder_StartingNow": "Pradedama dabar",
+    "CalendarReminder_StartsInHours": "Pradės veikti po {0} valandų",
+    "CalendarReminder_StartsInMinutes": "Pradės veikti po {0} minučių",
+    "CalendarReminder_SnoozeAction": "Atidėti",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minučių",
+    "CalendarEventDetails_ShowAs": "Rodyti kaip",
+    "CalendarShowAs_Free": "Laisvas",
+    "CalendarShowAs_Tentative": "Laikinas",
+    "CalendarShowAs_Busy": "Užimtas",
+    "CalendarShowAs_OutOfOffice": "Iš biuro",
+    "CalendarShowAs_WorkingElsewhere": "Dirba kitur",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copied to clipboard.",
     "ClipboardTextCopied_Title": "Copied",
     "ClipboardTextCopyFailed_Message": "Failed to copy {0} to clipboard.",
+    "ContactInfoBar_ErrorTitle": "Nepavyko įkelti kontaktų informacijos",
+    "ContactInfoBar_SuccessTitle": "Kontaktų informacija įkelta",
+    "ContactInfoBar_WarningTitle": "Kontaktų informacija gali būti nepilna",
     "ComingSoon": "Coming soon...",
     "ComposerAttachmentsDragDropAttach_Message": "Attach",
     "ComposerAttachmentsDropZone_Message": "Drop your files here",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Account Link Name",
     "DialogMessage_DeleteAccountConfirmationMessage": "Delete {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "All data associated with this account will be deleted from disk permanently.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Ar ištrinti šabloną \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Ištrinti el. pašto šabloną",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Tai ištrins visus įvykius serijoje. Ar norite tęsti?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Ištrinti pakartojančią seriją",
     "DialogMessage_DiscardDraftConfirmationMessage": "This draft will be discarded. Do you want to continue?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Discard Draft",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Light mode",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Failed to setup system folders",
+    "Exception_AccountNeedsAttention_Title": "Paskyra reikalauja dėmesio",
+    "Exception_AccountNeedsAttention_Message": "'{0}' reikia jūsų dėmesio, kad galėtumėte tęsti darbą.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail nepavyko rasti Microsoft Edge WebView2 Runtime. Prašome įdiegti arba atnaujinti vykdymo laiką, kad pranešimų turinys būtų teisingai atvaizduojamas.",
+    "Exception_WebView2RuntimeMissing_Title": "Reikalingas WebView2 vykdymo laikas",
     "Exception_AuthenticationCanceled": "Authentication canceled",
     "Exception_CustomThemeExists": "This theme already exists.",
     "Exception_CustomThemeMissingName": "You must provide a name.",
     "Exception_CustomThemeMissingWallpaper": "You must provide a custom background image.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Nepavyko sinchronizuoti kalendoriaus duomenų",
+    "Exception_FailedToSynchronizeCalendarEvents": "Nepavyko sinchronizuoti kalendoriaus įvykių",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Nepavyko sinchronizuoti kalendoriaus detalių",
     "Exception_FailedToSynchronizeFolders": "Failed to synchronize folders",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null on activation.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Move to Junk",
     "HoverActionOption_ToggleFlag": "Flag / Unflag",
     "HoverActionOption_ToggleRead": "Read / Unread",
+    "KeyboardShortcuts_FailedToReset": "Nepavyko atstatyti klavišų trumpinių.",
+    "KeyboardShortcuts_FailedToUpdate": "Nepavyko atnaujinti klavišų trumpinių",
+    "KeyboardShortcuts_MailoperationAction": "Veiksmas",
+    "KeyboardShortcuts_Action": "Veiksmas",
+    "KeyboardShortcuts_FailedToLoad": "Nepavyko užkrauti klavišų trumpinių.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Įveskite klavišą trumpiniui.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Prašome pasirinkti veiksmą, kurį atlikti trumpiniui.",
+    "KeyboardShortcuts_EnterKey": "Įveskite klavišą trumpiniui.",
+    "KeyboardShortcuts_SelectOperation": "Prašome pasirinkti veiksmą trumpiniui.",
+    "KeyboardShortcuts_ShortcutInUse": "Šis trumpinys jau naudojamas kitu trumpiniu.",
+    "KeyboardShortcuts_FailedToSave": "Nepavyko išsaugoti trumpinio.",
+    "KeyboardShortcuts_FailedToDelete": "Nepavyko ištrinti trumpinio.",
+    "KeyboardShortcuts_PageDescription": "Nustatykite klavišų trumpinius greitiems pašto veiksmams. Paspauskite klavišus, kai fokusuojate į lauką klavišo įvedimui, kad įrašytumėte trumpinius.",
+    "KeyboardShortcuts_Add": "Pridėti trumpinį",
+    "KeyboardShortcuts_EditTitle": "Redaguoti klavišų trumpinį",
+    "KeyboardShortcuts_ResetToDefaults": "Atstatyti numatytąsias reikšmes",
+    "KeyboardShortcuts_PressKeysHere": "Spauskite čia klavišus...",
+    "KeyboardShortcuts_KeyCombination": "Klavišų derinys",
+    "KeyboardShortcuts_FocusArea": "Sukelkite fokusavimą į viršuje esantį lauką ir paspauskite norimą klavišų derinį",
+    "KeyboardShortcuts_Modifiers": "Modifikavimo klavišai",
+    "KeyboardShortcuts_Mode": "Programos režimas",
+    "KeyboardShortcuts_ModeMail": "Paštas",
+    "KeyboardShortcuts_ModeCalendar": "Kalendorius",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Perjungti skaitytą/neskaitytą",
+    "KeyboardShortcuts_ActionToggleFlag": "Perjungti žymę",
+    "KeyboardShortcuts_ActionToggleArchive": "Archyvuoti / Iš archyvo",
     "ImageRenderingDisabled": "Image rendering is disabled for this message.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authentication method",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Connection security",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Username",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use the same username and password for sending email",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP ir kalendoriaus nustatymas",
+    "ImapCalDavSettingsPage_TitleEdit": "Redaguoti IMAP ir Kalendoriaus nustatymus",
+    "ImapCalDavSettingsPage_Subtitle": "Konfigūruokite IMAP/SMTP ir pasirenkamą kalendoriaus sinchronizaciją šiai paskyrai.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Pagrindinis nustatymas",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Įveskite savo tapatybę ir prisijungimo duomenis. Wino gali bandyti automatiškai nustatyti serverio nustatymus.",
+    "ImapCalDavSettingsPage_BasicTab": "Pagrindinis",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Įgalinti kalendoriaus palaikymą",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Automatinis pašto nustatymų nustatymas",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Pašto nustatymai buvo atrasti ir pritaikyti.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Išplėstinis nustatymas",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Rankiniu būdu įveskite serverio nustatymus, jei automatinis nustatymas nėra pasiekiamas arba neteisingas.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Išplėstinis",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Kalendoriaus nustatymai",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Pasirinkite, kaip kalendoriaus duomenys turėtų veikti šiai IMAP paskyrai.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalendoriaus režimas",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Ryšio saugumas",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Autentifikavimo metodas",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Išjungta",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV sinchronizacija",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Tik vietinis kalendorius",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalendorius išjungtas šiai paskyrai.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Kalendoriaus įrašai sinchronizuojami su jūsų CalDAV serveriu.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Kalendoriaus įrašai saugomi tik šiame kompiuteryje ir nėra sinchronizuojami su tinklu.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Kaip veikia vietinis kalendorius",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Tik vietinis kalendorius",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Vietinis kalendorius saugo visus įvykius tik jūsų kompiuteryje. Nieko nėra sinchronizuojama su iCloud, Yahoo ar bet kuriuo kitu teikėju.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV paslaugos URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV vartotojo vardas",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV slaptažodis",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV testavimas reikalingas tik tuo atveju, kai kalendoriaus režimas nustatytas į CalDAV sinchronizaciją.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV paslaugos URL yra privalomas.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV paslaugos URL turi būti absoliutus URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV naudotojo vardas yra privalomas.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV slaptažodis yra privalomas.",
+    "ImapCalDavSettingsPage_TestImapButton": "Išbandyti IMAP ryšį",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Išbandyti CalDAV ryšį",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP ryšio patikrinimas sėkmingas.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV ryšio patikrinimas sėkmingas.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Paskyros nustatymai patvirtinti ir išsaugoti.",
+    "ImapCalDavSettingsPage_ICloudHint": "Naudokite programos specifinį slaptažodį, sugeneruotą jūsų Apple paskyros nustatymuose.",
+    "ImapCalDavSettingsPage_YahooHint": "Naudokite programos slaptažodį iš Yahoo paskyros saugumo nustatymų.",
     "Info_AccountCreatedMessage": "{0} is created",
     "Info_AccountCreatedTitle": "Account Creation",
     "Info_AccountCreationFailedTitle": "Account Creation Failed",
     "Info_AccountDeletedMessage": "{0} is successfuly deleted.",
     "Info_AccountDeletedTitle": "Account Deleted",
     "Info_AccountIssueFixFailedTitle": "Failed",
+    "Info_AccountIssueFixImapMessage": "Atidarykite IMAP ir kalendoriaus nustatymų puslapį ir dar kartą įveskite serverio prisijungimo duomenis.",
+    "Info_AccountAttentionRequiredMessage": "Šiai paskyrai reikia dėmesio.",
+    "Info_AccountAttentionRequiredClickableMessage": "Spustelėkite, kad ištaisytumėte šią paskyrą ir vėl ją sinchronizuotumėte.",
+    "Info_AccountAttentionRequiredAction": "Ištaisyti",
+    "Info_AccountAttentionRequiredActionHint": "Spustelėkite Ištaisyti, kad išspręstumėte šią paskyros problemą.",
     "Info_AccountIssueFixSuccessMessage": "Fixed all account issues.",
     "Info_AccountIssueFixSuccessTitle": "Success",
     "Info_AttachmentOpenFailedMessage": "Can't open this attachment.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "This folder is disabled for synchronization.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Disabled Folder",
     "Justify": "Justify",
+    "MenuUpdateAvailable": "Atnaujinimas prieinamas.",
     "Left": "Left",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "you must have at least 2 accounts to create link\nlink will be removed on save",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Unarchive",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Vilkimas {0} elemento(-ų)",
     "MailsSelected": "{0} item(s) selected",
     "MarkFlagUnflag": "Mark as flagged/unflagged",
     "MarkReadUnread": "Mark as read/unread",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Checkout new version {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail has been updated.",
+    "Notifications_StoreUpdateAvailableTitle": "Parduotuvės atnaujinimas prieinamas.",
+    "Notifications_StoreUpdateAvailableMessage": "Naujesnė Wino Mail versija paruošta įdiegti per Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Small",
     "Photos": "Photos",
     "PreparingFoldersMessage": "Preparing folders",
-    "ProtocolLogAvailable_Message": "Protocol logs are available for diagnostics.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Search",
     "SearchingIn": "Searching in",
     "SearchPivotName": "Results",
+    "Settings_KeyboardShortcuts_Title": "Klaviatūros trumpiniai",
+    "Settings_KeyboardShortcuts_Description": "Tvarkykite klaviatūros trumpinius greitiems veiksmams el. laiškuose.",
     "SettingConfigureSpecialFolders_Button": "Configure",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP ir kalendoriaus nustatymai",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Atidarykite šiai paskyrai skirtą IMAP, SMTP ir CalDAV nustatymų puslapį.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Atidaryti nustatymus",
     "SettingsAbout_Description": "Learn more about Wino.",
     "SettingsAbout_Title": "About",
     "SettingsAboutGithub_Description": "Go to issue tracker GitHub repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Numatytasis programos režimas",
+    "SettingsAppPreferences_ApplicationMode_Description": "Pasirinkite, kuriame režime Wino atsidarys, kai aiškiai nebus nustatytas aktyvacijos tipas.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Paštas",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalendorius",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail will keep running in the background. You will be notified as new mails arrive.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Slėpti pavadinimo juostos profilio mygtuką",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Slėpti pavadinimo juostos profilio mygtuką, kuris atveria Wino paskyros išskleidžiamąjį langą.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Parduotuvės atnaujinimų pranešimai",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Rodyti pranešimus ir veiksmus apačioje, kai Microsoft Store bus prieinamas atnaujinimas.",
+    "SettingsAppPreferences_AiActions_Title": "Dirbtinio intelekto veiksmai",
+    "SettingsAppPreferences_AiActions_Description": "Pasirinkite numatytas AI kalbas ir kur turėtų būti saugomos santraukos.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Numatomoji vertimo kalba",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Pasirinkite numatytąją tikslinę kalbą, kuri bus naudojama AI vertimo veiksmuose.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Santraukos kalba",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Pasirinkite pageidaujamą santraukos kalbą ateities AI santraukų išvestims.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Numatytasis santraukų saugojimo kelias",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Pasirinkite aplanką, kurį Wino naudos kaip numatytąjį saugojant AI santraukas.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Naudokite sistemos numatytąją saugojimo vietą.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Šis aplankas neegzistuoja. Santraukoms bus naudojama numatytoji saugojimo vieta.",
     "SettingsAutoSelectNextItem_Description": "Select the next item after you delete or move a mail.",
     "SettingsAutoSelectNextItem_Title": "Auto select next item",
     "SettingsAvailableThemes_Description": "Select a theme from Wino's own collection for your taste or apply your own themes.",
     "SettingsAvailableThemes_Title": "Available Themes",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Numatytoji užmiego trukmė",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Nustatykite numatytąją užmiego trukmę priminimams apie įvykius.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Laiko rodymo dienos antraštės formatas",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Pasirinkite, kaip viršutinės dienos žymės rodomos dienos, savaitės ir darbo savaitės peržiūrose. Naudokite datos formato ženklus, tokius kaip ddd, dd, MMM arba dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Default Composer Font",
     "SettingsComposerFontFamily_Description": "Change the default font family and font size for composing mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Channel",
     "SettingsEditLinkedInbox_Description": "Add / remove accounts, rename or break the link between accounts.",
     "SettingsEditLinkedInbox_Title": "Edit Linked Inbox",
+    "SettingsWindowBackdrop_Title": "Langų fono efektas",
+    "SettingsWindowBackdrop_Description": "Pasirinkite Wino langų fono efektą.",
+    "SettingsWindowBackdrop_Disabled": "Langų fono pasirinkimas išjungtas, kai programa tema yra pasirinkta kita nei Numatytoji.",
     "SettingsElementTheme_Description": "Select a Windows theme for Wino",
     "SettingsElementTheme_Title": "Element Theme",
     "SettingsElementThemeSelectionDisabled": "Element theme selection is disabled when application theme is selected other than Default.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Pakeitimai išsaugoti",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Jūsų paskyros duomenys sėkmingai atnaujinti.",
     "SettingsManageLink_Description": "Move items to add new link or remove existing link.",
     "SettingsManageLink_Title": "Manage Link",
     "SettingsMarkAsRead_Description": "Change what should happen to the selected item.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notifications",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Pagrindinis",
+    "SettingsHome_SearchTitle": "Raskite nustatymą",
+    "SettingsHome_SearchDescription": "Ieškokite pagal funkciją, temą ar raktažodį ir tiesiog pereikite į tinkamą nustatymų puslapį.",
+    "SettingsHome_SearchPlaceholder": "Ieškoti nustatymų",
+    "SettingsHome_SearchExamples": "Pavyzdžiui: tema, saugykla, kalba, parašas",
+    "SettingsHome_QuickLinks_Title": "Greitos nuorodos",
+    "SettingsHome_QuickLinks_Description": "Pereikite prie nustatymų, kuriuos žmonės dažniausiai pasiekia.",
+    "SettingsHome_StorageCard_Description": "Sužinokite, kiek vietinio MIME turinio Wino saugo šiame įrenginyje, ir, prireikus, išvalykite jį.",
+    "SettingsHome_StorageEmptySummary": "Šiuo metu nerandama jokio talpykloje saugomo MIME turinio.",
+    "SettingsHome_StorageLoading": "Tikrinama vietinio MIME naudojimo būsena...",
+    "SettingsHome_Tips_Title": "Patarimai ir gudrybės",
+    "SettingsHome_Tips_Description": "Keletas nedidelių pakeitimų gali padaryti, kad Wino jaustųsi daug asmeniškesnė.",
+    "SettingsHome_Tip_Theme": "Norite tamsaus režimo ar akcentų pakeitimų? Atidarykite Personalizavimą.",
+    "SettingsHome_Tip_Background": "Naudokite programos nuostatas, kad valdytumėte paleidimo elgseną ir fono sinchronizaciją.",
+    "SettingsHome_Tip_Shortcuts": "Klaviatūros trumpiniai padeda greičiau judėti tarp el. laiškų.",
+    "SettingsHome_Resources_Title": "Naudingos nuorodos",
+    "SettingsHome_Resources_Description": "Atidarykite projekto išteklius, palaikymo informaciją ir leidimo kanalus.",
     "SettingsOptions_Title": "Settings",
+    "SettingsOptions_GeneralSection": "Bendra",
+    "SettingsOptions_MailSection": "Paštas",
+    "SettingsOptions_CalendarSection": "Kalendorius",
+    "SettingsOptions_MoreComingSoon": "Daugiau parinkčių bus netrukus.",
+    "SettingsOptions_HeroDescription": "Pritaikykite Wino Mail patirtį.",
+    "SettingsOptions_AccountsSummary": "{0} paskyra(-ų) sukonfigūruota",
+    "SettingsSearch_ManageAccounts_Keywords": "paskyra;paskyrų;pašto dėžutė;pašto dėžutės;slapyvardis;slapyvardžiai;profilis;adresas;adresai",
+    "SettingsSearch_AppPreferences_Keywords": "pradinis paleidimas; fonas; paleidimas; sinchronizavimas; pranešimas; pranešimai; paieška; dėklas; numatytieji nustatymai",
+    "SettingsSearch_LanguageTime_Keywords": "kalba;laikas;laikrodis;lokalė;regionas;formatas;24 val.;24val.",
+    "SettingsSearch_Personalization_Keywords": "tema;tamsus;šviesus;išvaizda;akcentas;spalva;spalva;režimas;išdėstymas;tankis",
+    "SettingsSearch_About_Keywords": "apie;versija;svetainė;privatumas;GitHub;paaukokite;parduotuvė;pagalba",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "trumpinys;trumpiniai;mygtukas;mygtukai;klavišas;klavišai",
+    "SettingsSearch_MessageList_Keywords": "žinutė;žinutės;sąrašas;gijos;gijos;avataras;peržiūra;siuntėjas",
+    "SettingsSearch_ReadComposePane_Keywords": "skaitytojas;kurti;redaktorius;šriftas;šriftai;išorinis turinys;atvaizdavimas;skaitymas",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "parašas;parašai;šifravimas;sertifikatas;sertifikatai;S/MIME;S/MIME;saugumas",
+    "SettingsSearch_Storage_Keywords": "saugykla;talpykla;talpyklavimas;MIME;disko;vietos;valymas;valyti;vietiniai duomenys",
+    "SettingsSearch_CalendarSettings_Keywords": "kalendorius;savaitė;valandos;tvarkaraštis;įvykis;įvykiai",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Show much more love ❤️ All donations are appreciated.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Display Clock Format in 24 Hours",
     "SettingsPrivacyPolicy_Description": "Review privacy policy.",
     "SettingsPrivacyPolicy_Title": "Privacy Policy",
+    "SettingsWebsite_Description": "Atidarykite Wino Mail svetainę.",
+    "SettingsWebsite_Title": "Svetainė",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Show Preview Text",
     "SettingsShowSenderPictures_Description": "Hide/show the thumbnail sender pictures.",
     "SettingsShowSenderPictures_Title": "Show Sender Avatars",
+    "SettingsEmailTemplates_Title": "El. pašto šablonai",
+    "SettingsEmailTemplates_Description": "Tvarkykite el. pašto šablonus",
+    "SettingsEmailTemplates_CreatePageTitle": "Naujas šablonas",
+    "SettingsEmailTemplates_EditPageTitle": "Redaguoti šabloną",
+    "SettingsEmailTemplates_NewTemplateTitle": "Naujas šablonas",
+    "SettingsEmailTemplates_NewTemplateDescription": "Sukurkite naują el. pašto šabloną",
+    "SettingsEmailTemplates_NameTitle": "Pavadinimas",
+    "SettingsEmailTemplates_NamePlaceholder": "Šablono pavadinimas",
+    "SettingsEmailTemplates_DescriptionTitle": "Aprašymas",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Nebūtinas aprašas",
+    "SettingsEmailTemplates_ContentTitle": "Šablono turinys",
+    "SettingsEmailTemplates_ContentDescription": "Redaguokite HTML turinį šio šablono.",
+    "SettingsEmailTemplates_NameRequired": "Šablono pavadinimas yra privalomas.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Startup Item",
     "SettingsStore_Description": "Show some love ❤️",
     "SettingsStore_Title": "Rate in Store",
+    "SettingsStorage_Title": "Saugykla",
+    "SettingsStorage_Description": "Skenuokite ir valdykite MIME talpyklą, saugomą jūsų vietiniame duomenų aplanke.",
+    "SettingsStorage_ScanFolder": "Skenuokite vietinį duomenų aplanką",
+    "SettingsStorage_NoLocalMimeDataFound": "Nerasta vietinių MIME duomenų.",
+    "SettingsStorage_NoAccountsFound": "Nerasta paskyrų.",
+    "SettingsStorage_TotalUsage": "Viso vietinio MIME naudojimo: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} naudojama vietinėje MIME talpyloje",
+    "SettingsStorage_DeleteAll_Title": "Ištrinti visą MIME turinį",
+    "SettingsStorage_DeleteAll_Description": "Ištrinti šios paskyros visą MIME talpyklos aplanką.",
+    "SettingsStorage_DeleteAll_Button": "Ištrinti viską",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Ištrinti visą MIME turinį",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Ar tikrai norite ištrinti visus vietinius MIME duomenis {0}?",
+    "SettingsStorage_DeleteAll_Success": "Visas MIME turinys buvo ištrintas.",
+    "SettingsStorage_DeleteOld_Title": "Ištrinti senus MIME duomenis",
+    "SettingsStorage_DeleteOld_Description": "Ištrinti MIME failus pagal laiško kūrimo datą vietinėje duomenų bazėje.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mėnuo",
+    "SettingsStorage_DeleteOld_3Months": "> 3 mėnesiai",
+    "SettingsStorage_DeleteOld_6Months": "> 6 mėnesiai",
+    "SettingsStorage_DeleteOld_1Year": "> 1 metai",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Ištrinti senus MIME duomenis",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Ar tikrai norite ištrinti vietinius MIME duomenis, senesnius nei {0} paskyrai {1}?",
+    "SettingsStorage_DeleteOld_Success": "Ištrinta {0} MIME aplankas(-ų), senesnių nei {1}.",
+    "SettingsStorage_1Month": "1 mėnuo",
+    "SettingsStorage_3Months": "3 mėnesiai",
+    "SettingsStorage_6Months": "6 mėnesiai",
+    "SettingsStorage_1Year": "1 metai",
+    "SettingsStorage_Months": "{0} mėnesiai",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Organize messages into conversation threads.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "You can't assign Inbox folder to any other system folder.",
     "SystemFolderConfigSetupSuccess_Message": "System folders are successfully configured.",
     "SystemFolderConfigSetupSuccess_Title": "System Folders Setup",
+    "SystemTrayMenu_ShowWino": "Atidaryti Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Atidaryti Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Išjungti",
     "TestingImapConnectionMessage": "Testing server connection...",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerDisconnectedButton_Title": "no connection",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade to Unlimited Accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} out of {1} free accounts used.",
     "Yesterday": "Yesterday",
+    "Smime_ImportCertificates_Success": "Sertifikatai sėkmingai importuoti.",
+    "Smime_ImportCertificates_Error": "Klaida importuojant sertifikatus: {0}",
+    "Smime_RemoveCertificates_Confirm": "Ar tikrai norite pašalinti sertifikatus {0}?",
+    "Smime_RemoveCertificates_Success": "Sertifikatai pašalinti.",
+    "Smime_ExportCertificates_Success": "Sertifikatai eksportuoti.",
+    "Smime_ExportCertificates_Error": "Klaida eksportuojant sertifikatus.",
+    "Smime_CertificateDetails": "Tema: {0}\nIšdavėjas: {1}\nGalioja nuo: {2}\nGalioja iki: {3}\nPiršto atspaudas: {4}",
+    "Smime_CertificatePassword_Title": "Sertifikato slaptažodis reikalingas",
+    "Smime_CertificatePassword_Placeholder": "Sertifikato slaptažodis {0} (nebūtina)",
+    "Smime_Confirm_Title": "Patvirtinti",
+    "Buttons_OK": "Gerai",
+    "Buttons_Refresh": "Atnaujinti",
+    "SettingsSignatureAndEncryption_Title": "Parašas ir šifravimas",
+    "SettingsSignatureAndEncryption_Description": "Tvarkykite S/MIME sertifikatus el. paštu parašams ir šifravimui.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mano sertifikatai",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Asmeniniai sertifikatai parašams ir šifravimui",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Gavėjo sertifikatai",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Gavėjo sertifikatai dešifravimui",
+    "SettingsSignatureAndEncryption_NameColumn": "Pavadinimas",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Galioja iki",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Piršto atspaudas",
+    "Buttons_Remove": "Ištrinti",
+    "Buttons_Export": "Eksportuoti",
+    "Buttons_Import": "Importuoti",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME parašymo sertifikatas",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME šifravimo sertifikatas",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Nėra",
+    "SmimeSignaturesInMessage": "Šio pranešimo parašai:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, galioja iki {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME parašymo sertifikato informacija",
+    "SmimeCertificateInfoTitle": "S/MIME sertifikato informacija",
+    "SmimeNoCertificateFileFound": "Nerastas sertifikato failas",
+    "SmimeSaveCertificate": "Išsaugoti sertifikatą...",
+    "SmimeCertificate": "S/MIME sertifikatas",
+    "SmimeCertificateSavedTo": "Sertifikatas išsaugotas į {0}",
+    "SmimeSignedTooltip": "Šis pranešimas yra pasirašytas S/MIME sertifikatu. Spustelėkite norėdami gauti daugiau informacijos",
+    "SmimeEncryptedTooltip": "Šis pranešimas yra užšifruotas naudojant S/MIME sertifikatą.",
+    "SmimeCertificateFileInfo": "Failas: {0}",
+    "Composer_LightTheme": "Šviesi tema",
+    "Composer_DarkTheme": "Tamsi tema",
+    "Composer_Outdent": "Išlyginti įtrauką",
+    "Composer_Indent": "Padidinti įtrauką",
+    "Composer_BulletList": "Žymėjimo sąrašas",
+    "Composer_OrderedList": "Numeruotas sąrašas",
+    "Composer_Stroke": "Brūkšnys",
+    "Composer_Bold": "Paryškintas",
+    "Composer_Italic": "Kursyvas",
+    "Composer_Underline": "Pabraukta",
+    "Composer_CcBcc": "Cc ir Bcc",
+    "Composer_EnableSmimeSignature": "Įjungti/Išjungti S/MIME parašą",
+    "Composer_EnableSmimeEncryption": "Įjungti/Išjungti S/MIME šifravimą",
+    "Composer_LocalDraftSyncInfo": "Šis juodraštis yra tik vietinis. Wino nepavyko išsiųsti jo į jūsų pašto serverį. Spustelėkite, kad išsiųstumėte į serverį iš naujo.",
+    "Composer_CertificateExpires": "Galioja iki: ",
+    "Composer_SmimeSignature": "S/MIME parašas",
+    "Composer_SmimeEncryption": "S/MIME šifravimas",
+    "Composer_EmailTemplatesPlaceholder": "El. pašto šablonai",
+    "Composer_AiSummarize": "Apibendrinti su AI",
+    "Composer_AiSummarizeDescription": "Ištraukite pagrindines mintis, veiksmų punktus ir sprendimus iš šio el. laiško.",
+    "Composer_AiTranslate": "Išversti su AI",
+    "Composer_AiActions": "AI veiksmai",
+    "Composer_AiRewrite": "Perrašyti su AI",
+    "AiActions_CheckingStatus": "Tikrinama prieiga prie AI...",
+    "AiActions_SignedOutTitle": "Atrakinkite Wino AI paketą",
+    "AiActions_SignedOutDescription": "Išverskite, perrašykite ir apibendrinkite el. laiškus naudodami AI prisijungę prie savo Wino paskyros ir aktyvavę AI Pack papildinį.",
+    "AiActions_NoPackTitle": "Reikia AI paketo",
+    "AiActions_NoPackDescription": "Jūs esate prisijungęs, tačiau AI paketas dar neveikia. Įsigykite jį, kad naudotumėte Wino AI vertimo, perrašymo ir santraukos įrankius.",
+    "AiActions_UsageSummary": "{0} iš {1} kreditų šį mėnesį panaudota.",
+    "Composer_AiRewritePolite": "Padarykite mandagų toną",
+    "Composer_AiRewritePoliteDescription": "Švelnina formuluotę išlaikant tą patį tikslą.",
+    "Composer_AiRewriteAngry": "Padarykite piktą toną",
+    "Composer_AiRewriteAngryDescription": "Naudojamas aštresnis ir konfrontacinis tonas.",
+    "Composer_AiRewriteHappy": "Padarykite jį laimingą",
+    "Composer_AiRewriteHappyDescription": "Prideda optimistiškesnį ir entuziastingesnį toną.",
+    "Composer_AiRewriteFormal": "Paverskite toną oficialiu.",
+    "Composer_AiRewriteFormalDescription": "Paverskite žinutę profesionaliau ir struktūriškai.",
+    "Composer_AiRewriteFriendly": "Paverskite toną draugiškesniu.",
+    "Composer_AiRewriteFriendlyDescription": "Prideda šiltą, draugiškesnį toną.",
+    "Composer_AiRewriteShorter": "Trumpinkite.",
+    "Composer_AiRewriteShorterDescription": "Supaprastina tekstą ir pašalina nereikalingas detales.",
+    "Composer_AiRewriteClearer": "Padarykite aiškesnį.",
+    "Composer_AiRewriteClearerDescription": "Pagerina skaitomumą ir padaro žinutę lengviau suprantamą.",
+    "Composer_AiRewriteCustom": "Individualus",
+    "Composer_AiRewriteCustomDescription": "Apibūdinkite savo perrašymo tikslą.",
+    "Composer_AiRewriteCustomPlaceholder": "Apibūdinkite, kaip norite, kad žinutė būtų perrašyta",
+    "Composer_AiRewriteMode": "Toną perrašyti",
+    "Composer_AiRewriteApply": "Pritaikyti perrašymą.",
+    "Composer_AiTranslateDialogTitle": "Išversti su AI",
+    "Composer_AiTranslateDialogDescription": "Įveskite tikslinę kalbą arba kultūros kodą, pvz., en-US, tr-TR, de-DE ar fr-FR.",
+    "Composer_AiTranslateApply": "Išversti",
+    "Composer_AiTranslateLanguage": "Tikslinė kalba",
+    "Composer_AiTranslateCustomPlaceholder": "Įveskite kultūros kodą",
+    "Composer_AiTranslateLanguageEnglish": "Anglų (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turkų (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Vokiečių (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Prancūzų (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Ispanų (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italų (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Brazilijos portugalų (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Olandų (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Lenkų (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rusų (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonų (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korėjiečių (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Kinų (supaprastinta, zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabų (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Kita...",
+    "Composer_AiBusyTitle": "Dirbtinis intelektas jau veikia.",
+    "Composer_AiBusyMessage": "Palaukite, kol baigsis dabartinis AI veiksmas.",
+    "Composer_AiSignInRequired": "Prisijunkite prie savo Wino paskyros, kad naudotumėte AI funkcijas.",
+    "Composer_AiMissingHtml": "Dar nėra žinutės turinio, kurį būtų galima siųsti Wino AI.",
+    "Composer_AiQuotaUnavailable": "AI rezultatas buvo pritaikytas.",
+    "Composer_AiAppliedMessage": "AI rezultatas buvo pritaikytas kompozitoriui. Jei norite grąžinti pakeitimus, naudokite Atšaukti.",
+    "Composer_AiSummarizeSuccessTitle": "AI santrauka pritaikyta.",
+    "Composer_AiTranslateSuccessTitle": "AI vertimas pritaikytas.",
+    "Composer_AiRewriteSuccessTitle": "AI perrašymas pritaikytas.",
+    "Composer_AiErrorTitle": "AI veiksmas nepavyko.",
+    "Reader_AiAppliedMessage": "AI rezultatas dabar rodomas šiame pranešime. Iš naujo atidarykite pranešimą, kad pamatytumėte originalų turinį.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontaktai",
+    "ContactsPage_AddContact": "Pridėti kontaktą",
+    "ContactsPage_EditContact": "Redaguoti kontaktą",
+    "ContactsPage_DeleteContact": "Ištrinti kontaktą",
+    "ContactsPage_SearchPlaceholder": "Ieškoti kontaktų...",
+    "ContactsPage_NoContacts": "Kontaktų nėra.",
+    "ContactsPage_ContactsCount": "{0} kontaktai",
+    "ContactsPage_SelectedContactsCount": "{0} pasirinktas",
+    "ContactsPage_DeleteSelectedContacts": "Ištrinti pasirinktus kontaktus",
+    "ContactEditDialog_Title": "Redaguoti kontaktą",
+    "ContactEditDialog_PhotoSection": "Nuotrauka",
+    "ContactEditDialog_ChoosePhoto": "Pasirinkti nuotrauką",
+    "ContactEditDialog_RemovePhoto": "Ištrinti nuotrauką",
+    "ContactEditDialog_NameHeader": "Vardas",
+    "ContactEditDialog_NamePlaceholder": "Kontakto vardas",
+    "ContactEditDialog_EmailHeader": "El. pašto adresas",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Kontaktinė informacija",
+    "ContactEditDialog_RootContactInfo": "Tai yra pagrindinis kontaktas, susijęs su jūsų paskyromis, kurio ištrinti negalima.",
+    "ContactEditDialog_OverriddenContactInfo": "Šis kontaktas buvo rankiniu būdu pakeistas ir sinchronizacijos metu nebus atnaujinamas.",
+    "ContactsPage_Subtitle": "Tvarkykite savo el. pašto kontaktus ir jų informaciją",
+    "ContactStatus_Account": "Paskyra",
+    "ContactStatus_Modified": "Redaguotas",
+    "ContactAction_Edit": "Redaguoti kontaktą",
+    "ContactAction_ChangePhoto": "Pakeisti nuotrauką",
+    "ContactAction_Delete": "Ištrinti kontaktą",
+    "ContactAction_Add": "Pridėti kontaktą",
+    "ContactSelection_Selected": "pasirinktas",
+    "ContactSelection_SelectAll": "Pasirinkti visus",
+    "ContactSelection_Clear": "Išvalyti pasirinkimą",
+    "ContactsPage_EmptyState": "Kontaktų nėra.",
+    "ContactsPage_AddFirstContact": "Pridėkite savo pirmąjį kontaktą.",
+    "ContactsPage_ContactsCountSuffix": "kontaktai",
+    "ContactsPane_NewContact": "Naujas kontaktas",
+    "ContactsPane_DescriptionTitle": "Tvarkykite savo kontaktus",
+    "ContactsPane_DescriptionBody": "Kurkite kontaktus, pervardykite juos, atnaujinkite profilio nuotraukas ir visus išsaugotus duomenis laikykite vienoje vietoje.",
+    "ContactEditDialog_AddTitle": "Pridėti kontaktą",
+    "ContactInfoBar_ContactAdded": "Kontaktas sėkmingai pridėtas.",
+    "ContactInfoBar_ContactUpdated": "Kontaktas sėkmingai atnaujintas.",
+    "ContactInfoBar_ContactsDeleted": "Kontaktai sėkmingai ištrinti.",
+    "ContactInfoBar_ContactPhotoUpdated": "Kontaktinė nuotrauka sėkmingai atnaujinta.",
+    "ContactInfoBar_FailedToLoadContacts": "Nepavyko įkelti kontaktų: {0}",
+    "ContactInfoBar_FailedToAddContact": "Nepavyko pridėti kontakto: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Nepavyko atnaujinti kontakto: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Nepavyko ištrinti kontaktų: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Nepavyko atnaujinti nuotraukos: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Pagrindiniai kontaktai negali būti ištrinti.",
+    "ContactConfirmDialog_DeleteTitle": "Ištrinti kontaktą",
+    "ContactConfirmDialog_DeleteMessage": "Ar tikrai norite ištrinti kontaktą '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Ar tikrai norite ištrinti {0} kontaktą(-ų)?",
+    "ContactConfirmDialog_DeleteButton": "Ištrinti",
+    "CalendarAccountSettings_Title": "Kalendoriaus paskyros nustatymai",
+    "CalendarAccountSettings_Description": "Valdykite kalendoriaus nustatymus {0}.",
+    "CalendarAccountSettings_AccountColor": "Kalendoriaus paskyros spalva",
+    "CalendarAccountSettings_AccountColorDescription": "Keiskite šios kalendoriaus paskyros rodymo spalvą",
+    "CalendarAccountSettings_SyncEnabled": "Įgalinti sinchronizaciją",
+    "CalendarAccountSettings_SyncEnabledDescription": "Įgalinti arba išjungti šios paskyros kalendoriaus sinchronizavimą",
+    "CalendarAccountSettings_DefaultShowAs": "Numatytas rodomas statusas",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Numatytas prieinamumo statusas naujiems įvykiams, kuriuos kuriate su šia paskyra.",
+    "CalendarAccountSettings_PrimaryCalendar": "Pagrindinis kalendorius",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Pažymėkite šį kalendorių kaip pagrindinį paskyros kalendorių",
+    "CalendarSettings_NewEventBehavior_Header": "Naujo įvykio mygtuko elgsena",
+    "CalendarSettings_NewEventBehavior_Description": "Pasirinkite, ar mygtukas Naujasis įvykis turėtų prašyti kalendoriaus kiekvieną kartą, ar visada atidaryti konkretų kalendorių.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Klausti kiekvieną kartą.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Visada naudoti konkretų kalendorių.",
+    "CalendarSettings_Rendering_Title": "Atvaizdavimas",
+    "CalendarSettings_Rendering_Description": "Nustatykite kalendoriaus išdėstymo ir rodymo elgesį.",
+    "CalendarSettings_Notifications_Title": "Pranešimai",
+    "CalendarSettings_Notifications_Description": "Pasirinkite numatytą priminimo ir atidėjimo elgesį.",
+    "CalendarSettings_Preferences_Title": "Nustatymai",
+    "CalendarSettings_Preferences_Description": "Nustatykite, kaip veiks Naujo įvykio mygtukas.",
+    "WhatIsNew_GetStartedButton": "Pradėti",
+    "WhatIsNew_ContinueAnywayButton": "Tęsti bet kokiu atveju",
+    "WhatIsNew_PreparingForNewVersionButton": "Ruošiama naujai versijai...",
+    "WhatIsNew_MigrationPreparing_Title": "Paruošiami jūsų duomenys",
+    "WhatIsNew_MigrationPreparing_Description": "Wino taiko atnaujinimo migracijas. Palaukite, kol paruošime jūsų paskyros duomenis šiai versijai.",
+    "WhatIsNew_MigrationFailedMessage": "Migracijų taikymas nepavyko su klaidos kodu {0}. Galite toliau naudoti programą. Tačiau jei kiltų rimtų problemų, prašome iš naujo įdiegti programą.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail atnaujinta",
+    "WhatIsNew_MigrationNotification_Message": "Atidarykite programą, kad užbaigtumėte atnaujinimą ir pamatytumėte naujienas.",
+    "WelcomeWindow_Title": "Sveiki atvykę į Wino Mail",
+    "WelcomeWindow_Subtitle": "Natyvi Windows patirtis paštui ir kalendoriui.",
+    "WelcomeWindow_WhatsNewTitle": "Naujienos",
+    "WelcomeWindow_FeaturesTitle": "Funkcijos",
+    "WelcomeWindow_WhatsNewTab": "Naujienos",
+    "WelcomeWindow_FeaturesTab": "Funkcijos",
+    "WelcomeWindow_GetStartedButton": "Pradėti pridėdami paskyrą",
+    "WelcomeWindow_GetStartedDescription": "Pridėkite paskyrą Outlook, Gmail arba IMAP, kad pradėtumėte naudotis Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importuoti iš jūsų Wino paskyros",
+    "WelcomeWindow_ImportInProgress": "Importuojami jūsų sinchronizuoti nustatymai ir paskyros...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nerasta sinchronizuotų paskyrų jūsų Wino paskyroje. Jei buvo nustatymų, jie buvo atstatyti. Naudokite Pradėti, kad pridėtumėte paskyrą rankiniu būdu.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} sinchronizuotų paskyrų jau yra šiame įrenginyje. Jei reikia, naudokite Pradėti, kad pridėtumėte dar vieną paskyrą rankiniu būdu.",
+    "WelcomeWindow_SetupTitle": "Nustatykite savo paskyrą",
+    "WelcomeWindow_SetupSubtitle": "Pasirinkite el. pašto teikėją, kad pradėtumėte",
+    "WelcomeWindow_AddAccountButton": "Pridėti paskyrą",
+    "WelcomeWindow_SkipForNow": "Praleisti dabar — sukonfigūruosiu vėliau",
+    "WelcomeWindow_AppDescription": "Greita, sutelkta pašto dėžutė — pritaikyta Windows 11",
+    "WelcomeWizard_Step1Title": "Sveiki",
+    "SystemTrayMenu_Open": "Atidaryti",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Sinchronizavimo nustatymai",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Laikykite savo Wino nustatymus sinchronizuotus tarp įrenginių.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Atrakinti papildinius",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Gaukite prieigą prie premium funkcijų, pvz., Wino AI Pack.",
+    "WinoAccount_Management_Description": "Tvarkykite savo Wino paskyrą, AI Pack prieigą ir sinchronizuotus nustatymus bei paskyros duomenis.",
+    "WinoAccount_Management_SignedOutTitle": "Prisijunkite prie Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Prisijunkite arba sukurkite paskyrą, kad sinchronizuotumėte el. laiškus, gautumėte prieigą prie AI funkcijų ir valdytumėte nustatymus tarp įrenginių.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profilis",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino papildiniai",
+    "WinoAccount_Management_DataSectionHeader": "Duomenys",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Paskyros veiksmai",
+    "WinoAccount_Management_AccountCardTitle": "Paskyra",
+    "WinoAccount_Management_AccountCardDescription": "Jūsų Wino paskyros el. pašto adresas ir esama paskyros būsena.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Paketas",
+    "WinoAccount_Management_AiPackCardDescription": "Pasižiūrėkite, ar Wino AI Paketas yra aktyvus ir kiek liko naudojimo.",
+    "WinoAccount_Management_AiPackActive": "AI Paketas yra aktyvus",
+    "WinoAccount_Management_AiPackInactive": "AI Paketas nėra aktyvus",
+    "WinoAccount_Management_AiPackUsage": "{0} iš {1} naudojimų panaudota. Liko {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Apmokėjimo periodas: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Naudojimo duomenys dar nėra prieinami.",
+    "WinoAccount_Management_AiPackBuyDescription": "Pirkite Wino AI Pack, kad galėtumėte versti, perrašyti ar santraukti el. laiškus su AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Atrakinti AI Paketą",
+    "WinoAccount_Management_AiPackPromoDescription": "Pagerinkite el. pašto darbą su AI įrankiais. Išversti žinutes į daugiau nei 50 kalbų, perrašyti jas aiškiai ir tinkamai tonui, ir gauti trumpas santraukas iš ilgesnių pokalbių.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mėn",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 kreditų",
+    "WinoAccount_Management_AiPackGetButton": "Gauti AI paketą",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI pagrindu veikiantys įrankiai vertimams, perrašymams ir santraukoms Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, vertimas, perrašymas, santraukos, produktyvumas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Neribotos paskyros",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Šalina paskyrų apribojimą ir leidžia pridėti tiek el. pašto paskyrų, kiek reikia.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "paskyros, neribotos, premium, priedas",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Prisijunkite prie savo Wino paskyros, kad užbaigtumėte šią pirkimo operaciją.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino negalėjo užbaigti šios Microsoft Store pirkimo operacijos.",
+    "WinoAccount_Management_StoreSyncFailed": "Pirkimas baigėsi, bet Wino dar negali atnaujinti jūsų paskyros naudų. Bandykite dar kartą po akimirkos.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Jūsų prenumerata veikia",
+    "WinoAccount_Management_AiPackRenews": "Atnaujinama {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Šį mėnesį panaudoti kreditai",
+    "WinoAccount_Management_AiPackResets": "Atstatymai {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Kilo problemų įkeliant jūsų AI naudojimo balansą.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Išversti",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Perrašyti",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Santraukuoti",
+    "WinoAccount_Management_AddOnLoadFailed": "Kilo problemų įkeliant šį papildinį.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sinchronizuoti Nustatymus ir Paskyras",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importuokite arba eksportuokite savo Wino nustatymus ir pašto dėžutės duomenis tarp įrenginių. Slaptažodžiai, tokenai ir kita jautri informacija niekada nesinchronizuojama.",
+    "WinoAccount_Management_SignOutTitle": "Atsijungti",
+    "WinoAccount_Management_SignOutDescription": "Atsijunkite nuo savo paskyros šiame įrenginyje",
+    "WinoAccount_Management_StatusLabel": "Būsena: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Šiai paskyrai dar nėra saugomų sinchronizuotų duomenų.",
+    "WinoAccount_Management_ExportSucceeded": "Pasirinkti Wino duomenys buvo sėkmingai eksportuoti.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Jūsų nustatymai buvo eksportuoti į jūsų Wino paskyrą.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Eksportuota {0} paskyros informacija į jūsų Wino paskyrą.",
+    "WinoAccount_Management_ImportSucceeded": "Importuoti sinchronizuoti duomenys iš jūsų Wino paskyros.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Pritaikyta {0} sinchronizuotų nustatymų.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importuotos {0} paskyros.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Praleista {0} paskyrų, kurios jau egzistuoja šiame įrenginyje.",
+    "WinoAccount_Management_ImportPartial": "Pritaikytos {0} sinchronizuotos nuostatos. {1} nuostatos negalėjo būti atkurtos.",
+    "WinoAccount_Management_ImportReloginReminder": "Slaptažodžiai, tokenai ir kita jautri informacija nebuvo importuota. Prisijunkite iš naujo prie kiekvienos paskyros šiame įrenginyje prieš naudodamiesi.",
+    "WinoAccount_Management_SerializeFailed": "Wino negalėjo serializuoti jūsų dabartinių nuostatų.",
+    "WinoAccount_Management_EmptyExport": "Nėra nuostatų reikšmių eksportuoti.",
+    "WinoAccount_Management_ImportEmpty": "Sinchronizuotas duomenų paketas neturi nieko naujo, ką atkurti.",
+    "WinoAccount_Management_ExportDialog_Title": "Eksportuoti į savo Wino paskyrą.",
+    "WinoAccount_Management_ExportDialog_Description": "Pasirinkite, ką norite sinchronizuoti su savo Wino paskyra.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Nuostatos",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Paskyros",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Slaptažodžiai, tokenai ir kita jautri informacija nėra sinchronizuojama.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Importuotos paskyros kituose kompiuteriuose vis tiek reikės prisijungti iš naujo prieš jų naudojimą.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Eksportuojami jūsų pasirinkti Wino duomenys...",
+    "WinoAccount_Management_LoadFailed": "Wino negalėjo įkelti naujausios Wino paskyros informacijos.",
+    "WinoAccount_Management_ActionFailed": "Prašymas Wino paskyrai negalėjo būti užbaigtas.",
+    "WinoAccount_SettingsSection_Title": "Wino paskyra",
+    "WinoAccount_SettingsSection_Description": "Sukurkite arba prisijunkite prie Wino paskyros naudodami savo vietinį autentifikavimo paslaugą.",
+    "WinoAccount_RegisterButton_Title": "Registruoti paskyrą",
+    "WinoAccount_RegisterButton_Description": "Sukurkite Wino paskyrą su el. pašto adresu ir slaptažodžiu.",
+    "WinoAccount_RegisterButton_Action": "Atidaryti registraciją",
+    "WinoAccount_LoginButton_Title": "Prisijungti",
+    "WinoAccount_LoginButton_Description": "Prisijunkite prie esamos Wino paskyros naudodami el. paštą ir slaptažodį.",
+    "WinoAccount_LoginButton_Action": "Atidaryti prisijungimą",
+    "WinoAccount_SignOutButton_Title": "Atsijungti",
+    "WinoAccount_SignOutButton_Description": "Ištrinti vietoje saugomą Wino paskyros seansą.",
+    "WinoAccount_SignOutButton_Action": "Atsijungti",
+    "WinoAccount_RegisterDialog_Title": "Sukurti Wino paskyrą",
+    "WinoAccount_RegisterDialog_Description": "Sukurkite Wino paskyrą, kad jūsų Wino patirtis būtų sinchronizuota ir būtų įjungti paskyros pagrindu veikiantys papildiniai.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Sukurti savo Wino paskyrą",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Kodėl sukurti vieną paskyrą?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importavimas ir eksportavimas tarp įrenginių",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Perkelkite savo Wino nuostatas tarp įrenginių be naujo konfigūravimo nuo nulio.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Gaukite prieigą prie išskirtinių papildinių, pvz., Wino AI Pack (mokama).",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Naudokite vieną paskyrą, kad atrakintumėte premium Wino funkcijas jų atsiradimo metu.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino paskyra yra atskira nuo jūsų pašto paskyrų",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Jūsų Outlook, Gmail, IMAP ar kitos el. pašto paskyros lieka tokios, kokios yra. Wino paskyra valdo tik Wino specifines funkcijas ir paskyros pagrindu veikiančius papildinius.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registruotis",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privatumas ir API duomenų apdorojimas",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Pasirenkami papildiniai, tokie kaip Wino AI Pack, gali siųsti pasirinktą el. pašto HTML turinį į Wino API paslaugą tik naudodamiesi šiomis funkcijomis.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Skaityti privatumo politiką",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Aš sutinku su privatumo politika.",
+    "WinoAccount_LoginDialog_Title": "Prisijungti prie Wino paskyros",
+    "WinoAccount_LoginDialog_Description": "Prisijunkite prie Wino paskyros, kad sinchronizuotumėte savo Wino nustatymus ir gautumėte prieigą prie paskyros pagrindu veikiančių funkcijų.",
+    "WinoAccount_LoginDialog_HeroTitle": "Sveiki sugrįžę",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Ką suteikia prisijungimas",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Naudokite savo Wino paskyrą, kad toliau sinchronizuotumėte nustatymus tarp įrenginių ir gautumėte prieigą prie mokamų papildinių, tokių kaip Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Tai nėra prisijungimas prie jūsų el. pašto dėžutės",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Prisijungimas čia neprideda ar nepakeičia jūsų Outlook, Gmail ar IMAP paskyrų Wino. Jis tik prisijungia prie Wino specifinių paslaugų.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Pamiršote slaptažodį?",
+    "WinoAccount_EmailLabel": "El. paštas",
+    "WinoAccount_EmailPlaceholder": "vardas@example.com",
+    "WinoAccount_PasswordLabel": "Slaptažodis",
+    "WinoAccount_ConfirmPasswordLabel": "Patvirtinti slaptažodį",
+    "WinoAccount_ForgotPasswordDialog_Title": "Atstatyti slaptažodį",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Išsiųsti slaptažodžio atstatymo el. laišką",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Grįžti prie prisijungimo",
+    "WinoAccount_ForgotPasswordDialog_Description": "Įveskite savo Wino paskyros el. pašto adresą, o mes išsiųsime slaptažodžio atstatymo nuorodą, jeigu adresas yra užregistruotas.",
+    "WinoAccount_Validation_EmailRequired": "El. paštas yra privalomas.",
+    "WinoAccount_Validation_PasswordRequired": "Slaptažodis yra privalomas.",
+    "WinoAccount_Validation_PasswordMismatch": "Slaptažodžiai nesutampa.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Prieš kuriant Wino paskyrą turite sutikti su privatumo politika.",
+    "WinoAccount_Error_InvalidCredentials": "El. pašto adresas arba slaptažodis yra neteisingi.",
+    "WinoAccount_Error_AccountLocked": "Ši paskyra laikina užblokuota.",
+    "WinoAccount_Error_AccountBanned": "Ši paskyra buvo uždrausta.",
+    "WinoAccount_Error_AccountSuspended": "Ši paskyra buvo sustabdyta.",
+    "WinoAccount_Error_EmailNotConfirmed": "Prašome patvirtinti el. pašto adresą prieš prisijungiant.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Prašome patvirtinti el. pašto adresą prieš prisijungiant.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Naujas patvirtinimo el. laiškas dar nėra prieinamas.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Šis patvirtinimo prašymas jau nebegalioja. Bandykite prisijungti iš naujo.",
+    "WinoAccount_Error_EmailNotRegistered": "Šis el. pašto adresas nėra užregistruotas.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Jūsų sesija jau nebegalioja. Prašome prisijungti iš naujo.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Šis el. pašto adresas jau yra užregistruotas.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Norint užbaigti išorinį prisijungimą, reikia el. pašto adreso.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Išorinis prisijungimo prašymas yra neteisingas.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Išorinė prisijungimo būsena yra neteisinga arba pasibaigusi.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Išorinis prisijungimo kodas yra neteisingas arba pasibaigęs.",
+    "WinoAccount_Error_AiPackRequired": "Šiai veiksmui reikalinga aktyvi Wino AI Pack prenumerata.",
+    "WinoAccount_Error_AiQuotaExceeded": "Jūsų AI Pack naudojimo limitas šiam apmokėjimo laikotarpiui yra išnaudotas.",
+    "WinoAccount_Error_AiHtmlEmpty": "Nėra el. pašto turinio, kurį apdoroti.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Šis el. laiškas per didelis, kad būtų apdorotas su Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Ši kalba nepalaikoma. Pabandykite tinkamą kultūros kodą, pvz., en-US arba tr-TR.",
+    "WinoAccount_Error_Forbidden": "Neturite teisės atlikti šį veiksmą.",
+    "WinoAccount_Error_ValidationFailed": "Prašymas yra neteisingas. Prašome peržiūrėti įvestas reikšmes.",
+    "WinoAccount_RegisterSuccessMessage": "Wino paskyros registracija atlikta {0}.",
+    "WinoAccount_LoginSuccessMessage": "Prisijungta prie Wino paskyros kaip {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Patvirtinkite savo el. pašto adresą",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Mes išsiuntėme el. pašto patvirtinimą į {0}. Prašome patvirtinti jį ir bandykite prisijungti iš naujo.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Reikia el. pašto patvirtinimo.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Laukiame, kol patvirtinsite {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Išsiųsti patvirtinimo el. laišką iš naujo",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Patvirtinimo el. laišką galite išsiųsti po {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Dabar galite išsiųsti patvirtinimo el. laišką iš naujo.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Patvirtinimo el. laiškas išsiųstas iš naujo.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Mes išsiuntėme dar vieną patvirtinimo el. laišką į {0}. Prašome patvirtinti jį ir bandykite prisijungti iš naujo.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Slaptažodžio atstatymo el. laiškas išsiųstas",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Mes išsiuntėme slaptažodžio atstatymo el. laišką į {0}. Atidarykite tą pranešimą ir pasirinkite naują slaptažodį.",
+    "WinoAccount_ChangePassword_Title": "Pakeisti slaptažodį",
+    "WinoAccount_ChangePassword_Description": "Siųsti slaptažodžio atstatymo el. laišką šiai Wino paskyrai.",
+    "WinoAccount_ChangePassword_Action": "Išsiųsti atstatymo el. laišką",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Ar norite, kad Wino išsiųstų slaptažodžio atkūrimo el. laišką adresu {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Atsijungta nuo Wino paskyros {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Nėra aktyvios Wino paskyros, iš kurios atsijungti.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino paskyra",
+    "WinoAccount_Titlebar_SignedOutDescription": "Prisijunkite arba sukurkite Wino paskyrą, kad valdytumėte savo Wino sesiją.",
+    "WinoAccount_Titlebar_SignedInStatus": "Būsena: {0}",
+    "WelcomeWizard_Step2Title": "Pridėti paskyrą",
+    "WelcomeWizard_Step3Title": "Nustatymo užbaigimas",
+    "ProviderSelection_Title": "Pasirinkite savo el. pašto teikėją",
+    "ProviderSelection_Subtitle": "Pasirinkite teikėją žemiau, kad pridėtumėte savo el. pašto paskyrą prie Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Paskyros pavadinimas",
+    "ProviderSelection_AccountNamePlaceholder": "pvz. Asmeninė, Darbo",
+    "ProviderSelection_DisplayNameHeader": "Rodomas vardas",
+    "ProviderSelection_DisplayNamePlaceholder": "pvz. Jonas Doe",
+    "ProviderSelection_EmailHeader": "El. pašto adresas",
+    "ProviderSelection_EmailPlaceholder": "pvz. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Programos specifinis slaptažodis",
+    "ProviderSelection_AppPasswordHelp": "Kaip gauti programos specifinį slaptažodį?",
+    "ProviderSelection_CalendarModeHeader": "Kalendoriaus integracija",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Išjungta",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Nėra kalendoriaus integracijos",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV sinchronizavimas",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Jūsų kalendoriaus įvykiai sinchronizuojami su Apple serveriais tarp įrenginių.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Jūsų kalendoriaus įvykiai sinchronizuojami su Yahoo serveriais tarp įrenginių.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Vietinis kalendorius",
+    "ProviderSelection_CalendarMode_LocalDescription": "Jūsų įvykiai saugomi tik jūsų kompiuteryje. Nėra ryšio su serveriais.",
+    "ProviderSelection_ClearColor": "Išvalyti spalvą",
+    "ProviderSelection_ContinueButton": "Tęsti",
+    "ProviderSelection_SpecialImap_Subtitle": "Įveskite savo paskyros prisijungimo duomenis, kad prisijungtumėte.",
+    "AccountSetup_Title": "Jūsų paskyros nustatymas",
+    "AccountSetup_Step_Authenticating": "Autentifikuojama su {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testuojama el. pašto autentifikacija",
+    "AccountSetup_Step_SyncingFolders": "Sinchronizuojami aplankų metaduomenys",
+    "AccountSetup_Step_FetchingProfile": "Gaunama profilio informacija",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV nustatymų aptikimas",
+    "AccountSetup_Step_TestingCalendarAuth": "Kalendoriaus autentifikacija testuojama",
+    "AccountSetup_Step_SavingAccount": "Išsaugoma paskyros informacija",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Gaunami kalendoriaus metaduomenys",
+    "AccountSetup_Step_SyncingAliases": "Aliasai sinchronizuojami",
+    "AccountSetup_Step_Finalizing": "Nustatymo užbaigimas",
+    "AccountSetup_FailureMessage": "Nustatymas nepavyko. Grįžkite atgal, kad ištaisytumėte nustatymus, arba bandykite vėliau.",
+    "AccountSetup_SuccessMessage": "Jūsų paskyra sėkmingai sukurta!",
+    "AccountSetup_GoBackButton": "Grįžti",
+    "AccountSetup_TryAgainButton": "Bandykite dar kartą",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatinis aptikimas nepavyko. Įveskite nustatymus rankiniu būdu Išplėstiniame skirtuke."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/nl_NL/resources.json b/Wino.Core.Domain/Translations/nl_NL/resources.json
index 6c7c8f1a..f6480a62 100644
--- a/Wino.Core.Domain/Translations/nl_NL/resources.json
+++ b/Wino.Core.Domain/Translations/nl_NL/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Dit account moet opnieuw gesynchroniseerd worden om te blijven werken. Wacht totdat Wino uw berichten opnieuw heeft gesynchroniseerd...",
     "AccountContactNameYou": "U",
     "AccountCreationDialog_Completed": "Alles is gereed",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Kalendergegevens ophalen.",
     "AccountCreationDialog_FetchingEvents": "Agenda gebeurtenissen aan het ophalen.",
     "AccountCreationDialog_FetchingProfileInformation": "Profielgegevens aan het ophalen.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Indien uw browser niet automatisch opstart om de authenticatie te voltooien:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "Bezig met initialiseren",
     "AccountCreationDialog_PreparingFolders": "Map gegevens worden momenteel ontvangen.",
     "AccountCreationDialog_SigninIn": "Accountinformatie wordt opgeslagen.",
+    "Purchased": "Aangekocht",
     "AccountEditDialog_Message": "Accountnaam",
     "AccountEditDialog_Title": "Account bewerken",
     "AccountPickerDialog_Title": "Kies een account",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Wijzig de accountnaam in Wino en stel de gewenste naam van de afzender in.",
     "AccountDetailsPage_ColorPicker_Title": "Account kleur",
     "AccountDetailsPage_ColorPicker_Description": "Wijs een nieuwe account kleur toe om het bijbehorende symbool in de lijst in te kleuren.",
+    "AccountDetailsPage_TabGeneral": "Algemeen",
+    "AccountDetailsPage_TabMail": "E-mail",
+    "AccountDetailsPage_TabCalendar": "Kalender",
+    "AccountDetailsPage_CalendarListDescription": "Selecteer een kalender om de instellingen ervan te configureren.",
     "AddHyperlink": "Toevoegen",
     "AppCloseBackgroundSynchronizationWarningTitle": "Achtergrondsynchronisatie",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Applicatie is niet ingesteld om te laden bij het opstarten van Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP-account",
     "Busy": "Bezig",
     "Buttons_AddAccount": "Account toevoegen",
+    "Buttons_FixAccount": "Account repareren",
     "Buttons_AddNewAlias": "Alias toevoegen",
     "Buttons_Allow": "Toestaan",
+    "Buttons_Apply": "Toepassen",
     "Buttons_ApplyTheme": "Thema toepassen",
     "Buttons_Browse": "Bladeren",
     "Buttons_Cancel": "Annuleren",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Bewerken",
     "Buttons_EnableImageRendering": "Inschakelen",
     "Buttons_Multiselect": "Meerdere selecteren",
+    "Buttons_Manage": "Beheren",
     "Buttons_No": "Nee",
     "Buttons_Open": "Openen",
     "Buttons_Purchase": "Aanschaffen",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Opslaan",
     "Buttons_SaveConfiguration": "Configuratie opslaan",
     "Buttons_Send": "Verzenden",
+    "Buttons_SendToServer": "Naar server verzenden",
     "Buttons_Share": "Delen",
     "Buttons_SignIn": "Aanmelden",
     "Buttons_Sync": "Synchroniseren",
     "Buttons_SyncAliases": "Aliassen synchroniseren",
     "Buttons_TryAgain": "Probeer opnieuw",
     "Buttons_Yes": "Ja",
+    "Sync_SynchronizingFolder": "Synchroniseren van {0} {1}%",
+    "Sync_DownloadedMessages": "Gedownloade {0} berichten van {1}",
+    "SyncAction_Archiving": "Archiveren van {0} e-mail(s)",
+    "SyncAction_ClearingFlag": "Vlag verwijderen voor {0} e-mail(s)",
+    "SyncAction_CreatingDraft": "Concept aanmaken",
+    "SyncAction_CreatingEvent": "Evenement aanmaken",
+    "SyncAction_Deleting": "Verwijderen van {0} e-mail(s)",
+    "SyncAction_EmptyingFolder": "Map legen",
+    "SyncAction_MarkingAsRead": "Markeren van {0} e-mail(s) als gelezen",
+    "SyncAction_MarkingAsUnread": "Markeren van {0} e-mail(s) als ongelezen",
+    "SyncAction_MarkingFolderAsRead": "Map als gelezen markeren",
+    "SyncAction_Moving": "Verplaatsen van {0} e-mail(s)",
+    "SyncAction_MovingToFocused": "Verplaatsen van {0} e-mail(s) naar Focused",
+    "SyncAction_RenamingFolder": "Map hernoemen",
+    "SyncAction_SendingMail": "Mail verzenden",
+    "SyncAction_SettingFlag": "Vlag toewijzen aan {0} e-mail(s)",
+    "SyncAction_SynchronizingAccount": "Synchroniseren van {0}",
+    "SyncAction_SynchronizingAccounts": "Synchroniseren van {0} account(en)",
+    "SyncAction_SynchronizingCalendarData": "Synchroniseren van kalendergegevens",
+    "SyncAction_SynchronizingCalendarEvents": "Synchroniseren van kalendergebeurtenissen",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchroniseren van kalendermetadata",
+    "SyncAction_Unarchiving": "Uitpakken van {0} e-mail(s)",
     "CalendarAllDayEventSummary": "Gebeurtenissen die de hele dag duren",
     "CalendarDisplayOptions_Color": "Kleur",
     "CalendarDisplayOptions_Expand": "Uitklappen",
+    "CalendarEventResponse_Accept": "Accepteren",
+    "CalendarEventResponse_AcceptedResponse": "Geaccepteerd",
+    "CalendarEventResponse_Decline": "Afwijzen",
+    "CalendarEventResponse_DeclinedResponse": "Afgewezen",
+    "CalendarEventResponse_NotResponded": "Nog niet gereageerd",
+    "CalendarEventResponse_Tentative": "Tentatief",
+    "CalendarEventResponse_TentativeResponse": "Tentatief",
+    "CalendarEventRsvpPanel_Accept": "Accepteren",
+    "CalendarEventRsvpPanel_AddMessage": "Voeg een bericht toe aan uw antwoord... (optioneel)",
+    "CalendarEventRsvpPanel_Decline": "Afwijzen",
+    "CalendarEventRsvpPanel_Message": "Bericht",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Antwoordbericht verzenden",
+    "CalendarEventRsvpPanel_Tentative": "Tentatief",
+    "CalendarEventRsvpPanel_Title": "Antwoordopties",
+    "CalendarAttendeeStatus_Accepted": "Geaccepteerd",
+    "CalendarAttendeeStatus_Declined": "Afgewezen",
+    "CalendarAttendeeStatus_NeedsAction": "Actie vereist",
+    "CalendarAttendeeStatus_Tentative": "Tentatief",
+    "CalendarEventDetails_Attachments": "Bijlagen",
+    "CalendarEventCompose_AddAttachment": "Bijlage toevoegen",
+    "CalendarEventCompose_AllDay": "Hele dag",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Bijlagen worden niet ondersteund voor CalDAV-kalenders.",
+    "CalendarEventCompose_EndDate": "Einddatum",
+    "CalendarEventCompose_EndTime": "Eindtijd",
+    "CalendarEventCompose_Every": "elke",
+    "CalendarEventCompose_ForWeekdays": "voor",
+    "CalendarEventCompose_FrequencyDay": "dag",
+    "CalendarEventCompose_FrequencyDayPlural": "dagen",
+    "CalendarEventCompose_FrequencyMonth": "maand",
+    "CalendarEventCompose_FrequencyMonthPlural": "maanden",
+    "CalendarEventCompose_FrequencyWeek": "week",
+    "CalendarEventCompose_FrequencyWeekPlural": "weken",
+    "CalendarEventCompose_FrequencyYear": "jaar",
+    "CalendarEventCompose_FrequencyYearPlural": "jaren",
+    "CalendarEventCompose_Location": "Locatie",
+    "CalendarEventCompose_LocationPlaceholder": "Voeg een locatie toe",
+    "CalendarEventCompose_NewEventButton": "Nieuw evenement",
+    "CalendarEventCompose_DefaultCalendarHint": "U kunt een standaardkalender kiezen voor nieuwe gebeurtenissen in de Kalenderinstellingen.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Kalenderinstellingen openen",
+    "CalendarEventCompose_NoCalendarsMessage": "Er zijn nog geen kalenders beschikbaar voor het aanmaken van een gebeurtenis.",
+    "CalendarEventCompose_NoCalendarsTitle": "Geen kalenders beschikbaar",
+    "CalendarEventCompose_NoEndDate": "Geen einddatum",
+    "CalendarEventCompose_Notes": "Notities",
+    "CalendarEventCompose_PickCalendarTitle": "Kies een kalender",
+    "CalendarEventCompose_Recurring": "Terugkerend",
+    "CalendarEventCompose_RecurringSummary": "Komt elke {0} {1}{2} {3} van kracht {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Komt {0}{1} {2} van kracht {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Herhaal elke",
+    "CalendarEventCompose_SelectCalendar": "Kalender selecteren",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Komt op {0} {1}",
+    "CalendarEventCompose_StartDate": "Startdatum",
+    "CalendarEventCompose_StartTime": "Starttijd",
+    "CalendarEventCompose_TimeRangeSummary": "van {0} tot {1}",
+    "CalendarEventCompose_Title": "Evenementtitel",
+    "CalendarEventCompose_TitlePlaceholder": "Voeg een titel toe",
+    "CalendarEventCompose_Until": "tot",
+    "CalendarEventCompose_UntilSummary": "  tot {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "De einddatum voor de hele dag moet na de startdatum liggen.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Een of meer genodigden hebben een ongeldig e-mailadres.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "De einddatum van de herhaling moet gelijk aan of groter dan de startdatum van het evenement.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "De eindtijd moet later zijn dan de starttijd.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Een of meer bijlagen zijn niet langer beschikbaar: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selecteer een kalender voordat u het evenement aanmaakt.",
+    "CalendarEventCompose_ValidationMissingTitle": "Voer een evenementtitel in voordat u het evenement aanmaakt.",
+    "CalendarEventCompose_ValidationTitle": "Evenementvalidatie mislukt",
+    "CalendarEventCompose_WeekdaySummary": "  op {0}",
+    "CalendarEventCompose_Weekday_Friday": "V",
+    "CalendarEventCompose_Weekday_Monday": "M",
+    "CalendarEventCompose_Weekday_Saturday": "Za",
+    "CalendarEventCompose_Weekday_Sunday": "Zo",
+    "CalendarEventCompose_Weekday_Thursday": "Do",
+    "CalendarEventCompose_Weekday_Tuesday": "Di",
+    "CalendarEventCompose_Weekday_Wednesday": "Wo",
+    "CalendarEventDetails_Details": "Details",
+    "CalendarEventDetails_EditSeries": "Serie bewerken",
+    "CalendarEventDetails_Editing": "Bewerken",
+    "CalendarEventDetails_InviteSomeone": "Iemand uitnodigen",
+    "CalendarEventDetails_JoinOnline": "Online deelnemen",
+    "CalendarEventDetails_Organizer": "Organisator",
+    "CalendarEventDetails_People": "Personen",
+    "CalendarEventDetails_ReadOnlyEvent": "Alleen-lezen evenement",
+    "CalendarEventDetails_Reminder": "Herinnering",
+    "CalendarReminder_StartedHoursAgo": "{0} uur geleden gestart",
+    "CalendarReminder_StartedMinutesAgo": "{0} minuten geleden gestart",
+    "CalendarReminder_StartedNow": "Zojuist gestart",
+    "CalendarReminder_StartingNow": "Wordt nu gestart.",
+    "CalendarReminder_StartsInHours": "Start in {0} uur",
+    "CalendarReminder_StartsInMinutes": "Start in {0} minuten",
+    "CalendarReminder_SnoozeAction": "Uitstellen",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minuten",
+    "CalendarEventDetails_ShowAs": "Weergeven als",
+    "CalendarShowAs_Free": "Vrij",
+    "CalendarShowAs_Tentative": "Voorlopig",
+    "CalendarShowAs_Busy": "Bezet",
+    "CalendarShowAs_OutOfOffice": "Buiten kantoor",
+    "CalendarShowAs_WorkingElsewhere": "Werkend op een andere locatie",
     "CalendarItem_DetailsPopup_JoinOnline": "Online aanmelden",
     "CalendarItem_DetailsPopup_ViewEventButton": "Gebeurtenis weergeven",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Series weergeven",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} is naar het klembord gekopieerd.",
     "ClipboardTextCopied_Title": "Gekopieerd",
     "ClipboardTextCopyFailed_Message": "Kopiëren van {0} naar het klembord mislukt.",
+    "ContactInfoBar_ErrorTitle": "Laden van contactgegevens mislukt",
+    "ContactInfoBar_SuccessTitle": "Contactgegevens geladen",
+    "ContactInfoBar_WarningTitle": "Contactgegevens kunnen onvolledig zijn",
     "ComingSoon": "Binnenkort beschikbaar...",
     "ComposerAttachmentsDragDropAttach_Message": "Bijlage toevoegen",
     "ComposerAttachmentsDropZone_Message": "Sleep uw bestanden hier naartoe",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Naam van accountkoppeling",
     "DialogMessage_DeleteAccountConfirmationMessage": "{0} verwijderen?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Alle gegevens die gekoppeld zijn aan dit account worden permanent verwijderd.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Sjabloon \"{0}\" verwijderen?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "E-mail-sjabloon verwijderen",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Dit verwijdert alle gebeurtenissen uit de serie. Wilt u doorgaan?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Doorlopende serie verwijderen",
     "DialogMessage_DiscardDraftConfirmationMessage": "Dit concept zal worden verwijderd. Wilt u doorgaan?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Concept verwijderen",
     "DialogMessage_EmptySubjectConfirmation": "Onderwerp ontbreekt",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Lichte modus",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Instellen van systeemmappen mislukt",
+    "Exception_AccountNeedsAttention_Title": "Account vereist aandacht",
+    "Exception_AccountNeedsAttention_Message": "'{0}' vereist uw aandacht om verder te werken.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail kon de Microsoft Edge WebView2-runtime niet vinden. Installeer of herstel de runtime zodat de berichtinhoud correct wordt weergegeven.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2-runtime is vereist",
     "Exception_AuthenticationCanceled": "Authenticatie geannuleerd",
     "Exception_CustomThemeExists": "Dit thema bestaat al.",
     "Exception_CustomThemeMissingName": "U moet een naam invullen.",
     "Exception_CustomThemeMissingWallpaper": "U moet een aangepaste achtergrondafbeelding invoeren.",
     "Exception_FailedToSynchronizeAliases": "Synchroniseren van aliassen mislukt",
+    "Exception_FailedToSynchronizeCalendarData": "Kan kalendergegevens niet synchroniseren",
+    "Exception_FailedToSynchronizeCalendarEvents": "Kan kalendergebeurtenissen niet synchroniseren",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Kan kalenderdetails niet synchroniseren",
     "Exception_FailedToSynchronizeFolders": "Synchroniseren van mappen mislukt",
     "Exception_FailedToSynchronizeProfileInformation": "Synchroniseren van profielinformatie mislukt",
     "Exception_GoogleAuthCallbackNull": "Callback uri is null bij het activeren.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Verplaats naar Ongewenst",
     "HoverActionOption_ToggleFlag": "Markeren / Niet markeren",
     "HoverActionOption_ToggleRead": "Gelezen / Ongelezen",
+    "KeyboardShortcuts_FailedToReset": "Kan sneltoetsen niet terugzetten.",
+    "KeyboardShortcuts_FailedToUpdate": "Kan sneltoetsen niet bijwerken",
+    "KeyboardShortcuts_MailoperationAction": "Actie",
+    "KeyboardShortcuts_Action": "Actie",
+    "KeyboardShortcuts_FailedToLoad": "Kan sneltoetsen niet laden.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Voer alstublieft een toets in voor de sneltoets.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Kies alstublieft een actie voor de sneltoets.",
+    "KeyboardShortcuts_EnterKey": "Voer alstublieft een toets in voor de sneltoets.",
+    "KeyboardShortcuts_SelectOperation": "Selecteer alstublieft een actie voor de sneltoets.",
+    "KeyboardShortcuts_ShortcutInUse": "Deze snelkoppeling wordt al gebruikt door een andere snelkoppeling.",
+    "KeyboardShortcuts_FailedToSave": "Kan de sneltoets niet opslaan.",
+    "KeyboardShortcuts_FailedToDelete": "Kan de sneltoets niet verwijderen.",
+    "KeyboardShortcuts_PageDescription": "Stel sneltoetsen in voor snelle e-mailbewerkingen. Druk op toetsen terwijl het invoerveld voor de toets ingedrukt is om sneltoetsen vast te leggen.",
+    "KeyboardShortcuts_Add": "Sneltoets toevoegen",
+    "KeyboardShortcuts_EditTitle": "Sneltoets bewerken",
+    "KeyboardShortcuts_ResetToDefaults": "Reset naar standaardwaarden",
+    "KeyboardShortcuts_PressKeysHere": "Druk hier op toetsen...",
+    "KeyboardShortcuts_KeyCombination": "Toetscombinatie",
+    "KeyboardShortcuts_FocusArea": "Zet de focus op het bovenstaande veld en druk op de gewenste toetsencombinatie",
+    "KeyboardShortcuts_Modifiers": "Modifiertoetsen",
+    "KeyboardShortcuts_Mode": "App-modus",
+    "KeyboardShortcuts_ModeMail": "E-mail",
+    "KeyboardShortcuts_ModeCalendar": "Agenda",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Gelezen/ongelezen wisselen",
+    "KeyboardShortcuts_ActionToggleFlag": "Vlag schakelen",
+    "KeyboardShortcuts_ActionToggleArchive": "Archief aan/uitzetten",
     "ImageRenderingDisabled": "Afbeeldingsweergave is voor dit bericht uitgeschakeld.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Authenticatiemethode",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Beveiliging van verbinding",
@@ -262,8 +430,8 @@
     "IMAPSetupDialog_AccountType": "Accounttype",
     "IMAPSetupDialog_ValidationSuccess_Title": "Voltooid",
     "IMAPSetupDialog_ValidationSuccess_Message": "Validatie voltooid",
-    "IMAPSetupDialog_SaveImapSuccess_Title": "Voltooid",
-    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP-instellingen zijn succesvol opgeslagen.",
+    "IMAPSetupDialog_SaveImapSuccess_Title": "Success",
+    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP settings saved successfuly.",
     "IMAPSetupDialog_ValidationFailed_Title": "Validatie van IMAP-server is mislukt.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "Deze server vraagt naar een SSL-verificatie om door te kunnen gaan. Bevestig de certificaatdetails hieronder.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "Verificatie toestaan om door te gaan met het instellen van uw account.",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Gebruikersnaam",
     "IMAPSetupDialog_UsernamePlaceholder": "jansmit, jansmit@fabrikam.com, domein/jansmit",
     "IMAPSetupDialog_UseSameConfig": "Dezelfde gebruikersnaam en wachtwoord gebruiken voor het verzenden van e-mail",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP- en Kalenderinstellingen",
+    "ImapCalDavSettingsPage_TitleEdit": "IMAP- en Kalenderinstellingen bewerken",
+    "ImapCalDavSettingsPage_Subtitle": "IMAP/SMTP en optionele kalender-synchronisatie voor dit account configureren.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Basisinstellingen",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Voer uw identiteit en inloggegevens in. Wino kan proberen serverinstellingen automatisch te detecteren.",
+    "ImapCalDavSettingsPage_BasicTab": "Basis",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Kalenderondersteuning inschakelen",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Mailinstellingen automatisch ontdekken",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Mailinstellingen gevonden en toegepast.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Geavanceerde configuratie",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Voer handmatig serverinstellingen in als autodiscovery niet beschikbaar of onjuist is.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Geavanceerd",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Kalenderconfiguratie",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Kies hoe kalendergegevens moeten werken voor dit IMAP-account.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Kalendermodus",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Verbindingsbeveiliging",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Authenticatiemethode",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Uitgeschakeld",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV-synchronisatie",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Alleen lokale kalender",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalender is uitgeschakeld voor dit account.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Kalenderitems worden gesynchroniseerd met uw CalDAV-server.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Kalenderitems worden alleen op deze computer opgeslagen en worden niet gesynchroniseerd met het netwerk.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Hoe de lokale kalender werkt",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Alleen lokale kalender",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "De lokale kalender bewaart alle gebeurtenissen uitsluitend op uw computer. Niets wordt gesynchroniseerd met iCloud, Yahoo of een andere provider.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV-service-URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV-gebruikersnaam",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV-wachtwoord",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV-test is alleen vereist wanneer Kalendermodus is ingesteld op CalDAV-synchronisatie.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV-service-URL is vereist.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV-service-URL moet een absolute URL zijn.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV-gebruikersnaam is vereist.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV-wachtwoord is vereist.",
+    "ImapCalDavSettingsPage_TestImapButton": "IMAP-verbinding testen",
+    "ImapCalDavSettingsPage_TestCalDavButton": "CalDAV-verbinding testen",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP-verbinding is geslaagd.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV-verbinding is geslaagd.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Accountinstellingen gevalideerd en opgeslagen.",
+    "ImapCalDavSettingsPage_ICloudHint": "Gebruik een app-wachtwoord dat is gegenereerd via uw Apple-accountinstellingen.",
+    "ImapCalDavSettingsPage_YahooHint": "Gebruik een app-wachtwoord uit de beveiligingsinstellingen van uw Yahoo-account.",
     "Info_AccountCreatedMessage": "{0} is aangemaakt",
     "Info_AccountCreatedTitle": "Account aanmaken",
     "Info_AccountCreationFailedTitle": "Aanmaken van account is mislukt",
     "Info_AccountDeletedMessage": "{0} is succesvol verwijderd.",
     "Info_AccountDeletedTitle": "Account verwijderd",
     "Info_AccountIssueFixFailedTitle": "Mislukt",
+    "Info_AccountIssueFixImapMessage": "Open de IMAP- en kalenderinstellingenpagina om uw serverinloggegevens opnieuw in te voeren.",
+    "Info_AccountAttentionRequiredMessage": "Deze account heeft uw aandacht nodig.",
+    "Info_AccountAttentionRequiredClickableMessage": "Klik om dit account te herstellen en opnieuw te synchroniseren.",
+    "Info_AccountAttentionRequiredAction": "Oplossen",
+    "Info_AccountAttentionRequiredActionHint": "Klik op Oplossen om dit accountprobleem op te lossen.",
     "Info_AccountIssueFixSuccessMessage": "Alle accountproblemen zijn opgelost.",
     "Info_AccountIssueFixSuccessTitle": "Gelukt",
     "Info_AttachmentOpenFailedMessage": "Deze bijlage kan niet geopend worden.",
@@ -354,9 +568,9 @@
     "Info_ReviewUnknownErrorTitle": "Onbekende fout",
     "Info_ReviewUpdatedMessage": "Hartelijk dank voor de bijgewerkte beoordeling.",
     "Info_SignatureDisabledMessage": "Handtekening voor dit account uitschakelen",
-    "Info_SignatureDisabledTitle": "Voltooid",
+    "Info_SignatureDisabledTitle": "Gelukt",
     "Info_SignatureSavedMessage": "Nieuwe handtekening is opgeslagen",
-    "Info_SignatureSavedTitle": "Voltooid",
+    "Info_SignatureSavedTitle": "Gelukt",
     "Info_SyncCanceledMessage": "Geannuleerd",
     "Info_SyncCanceledTitle": "Synchronisatie",
     "Info_SyncFailedTitle": "Synchronisatie is mislukt",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Synchronisatie is uitgeschakeld voor deze map.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Uitgeschakelde map",
     "Justify": "Uitvullen",
+    "MenuUpdateAvailable": "Update beschikbaar",
     "Left": "Links",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "U moet tenminste 2 accounts hebben om een koppeling te maken.\nDe koppeling zal verwijderd worden bij het opslaan.",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Niet meer archiveren",
     "MailOperation_ViewMessageSource": "Berichtbron weergeven",
     "MailOperation_Zoom": "Zoom",
+    "MailsDragging": "Bezig met het verslepen van {0} item(s)",
     "MailsSelected": "{0} item(s) geselecteerd",
     "MarkFlagUnflag": "Vlag toevoegen/verwijderen",
     "MarkReadUnread": "Markeren als gelezen/ongelezen",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Nieuwe berichten",
     "Notifications_WinoUpdatedMessage": "Bekijk de nieuwe versie {0}",
     "Notifications_WinoUpdatedTitle": "Wino-Mail is bijgewerkt.",
+    "Notifications_StoreUpdateAvailableTitle": "Update beschikbaar",
+    "Notifications_StoreUpdateAvailableMessage": "Een nieuwere versie van Wino Mail is klaar om te installeren vanaf de Microsoft Store.",
     "OnlineSearchFailed_Message": "{0} zoeken is mislukt\n\nOffline e-mails worden weergegeven.",
     "OnlineSearchTry_Line1": "Kunt u niet vinden wat u zoekt?",
     "OnlineSearchTry_Line2": "Probeer online zoeken.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Klein",
     "Photos": "Foto’s",
     "PreparingFoldersMessage": "Mappen voorbereiden",
-    "ProtocolLogAvailable_Message": "Protocol logs zijn beschikbaar voor diagnose.",
     "ProviderDetail_Gmail_Description": "Google Account",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Zoeken",
     "SearchingIn": "Zoeken in",
     "SearchPivotName": "Resultaten",
+    "Settings_KeyboardShortcuts_Title": "Sneltoetsen",
+    "Settings_KeyboardShortcuts_Description": "Beheer sneltoetsen voor snelle acties in de e-mails.",
     "SettingConfigureSpecialFolders_Button": "Configureer",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMPT Configuratie",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Wijzig uw inkomende/uitgaande serverinstellingen.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP- en kalenderinstellingen",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Open de speciale IMAP-, SMTP- en CalDAV-instellingenpagina voor dit account.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Instellingen openen",
     "SettingsAbout_Description": "Meer informatie over Wino.",
     "SettingsAbout_Title": "Over",
     "SettingsAboutGithub_Description": "Ga naar de Issue Tracker in de GitHub-repository.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Lokaal",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Standaard zoekmethode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Standaardtoepassingsmodus",
+    "SettingsAppPreferences_ApplicationMode_Description": "Kies in welke modus Wino opent wanneer geen activatiemodus expliciet is ingesteld.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "E-mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalender",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail zal op de achtergrond blijven draaien. U wordt op de hoogte gebracht wanneer er nieuwe e-mails binnenkomen.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Op de achtergrond uitvoeren",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail zal in het systeemvak blijven draaien en laden als u op het icoon klikt. U wordt op de hoogte gebracht wanneer er nieuwe e-mails binnenkomen.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatale fout tijdens het wijzigen van de opstartmethode voor Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Geminimaliseerd starten bij opstarten van Windows",
     "SettingsAppPreferences_Title": "App voorkeuren",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Verberg Wino-accountknop in de titelbalk.",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Verberg de profielknop in de titelbalk die het Wino-account-uitklapmenu opent.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Store-updatemeldingen",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Toon meldingen en footer-acties wanneer er een Microsoft Store-update beschikbaar is.",
+    "SettingsAppPreferences_AiActions_Title": "AI-acties",
+    "SettingsAppPreferences_AiActions_Description": "Kies de standaard AI-talen en waar samenvattingen moeten worden opgeslagen.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Standaard doeltaal",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Kies de standaard doeltaal die door AI-vertalingacties wordt gebruikt.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Samenvatteltaal",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Kies de gewenste samenvatteltaal voor toekomstige AI-samenvattingen.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Standaard opslagpad voor samenvattingen",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Kies de map die Wino standaard moet gebruiken bij het opslaan van AI-samenvattingen.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Gebruik de standaardlocatie van het systeem.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Deze map bestaat niet. De standaardopslaglocatie wordt gebruikt voor samenvattingen.",
     "SettingsAutoSelectNextItem_Description": "Selecteer het volgende item nadat u een e-mail hebt verwijderd of verplaatst.",
     "SettingsAutoSelectNextItem_Title": "Volgende item automatisch selecteren",
     "SettingsAvailableThemes_Description": "Selecteer een thema uit Wino’s collectie of pas uw eigen thema's toe.",
     "SettingsAvailableThemes_Title": "Beschikbare thema's",
     "SettingsCalendarSettings_Description": "Wijzig de eerste weekdag, vakhoogte voor uren en meer...",
     "SettingsCalendarSettings_Title": "Agenda instellingen",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Standaard snooze-duur",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Stel een standaard snooze-duur in voor kalenderherinneringsmeldingen.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formaat van de dagkop in de tijdweergave",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Kies hoe de bovenste daglabels worden weergegeven in dag-, week- en werkweekweergaven. Gebruik datumopmaaktekens zoals ddd, dd, MMM of dddd.",
     "SettingsComposer_Title": "Opsteller",
     "SettingsComposerFont_Title": "Standaard lettertype voor opstellen",
     "SettingsComposerFontFamily_Description": "Wijzig de standaard lettertype en lettergrootte voor het opstellen van e-mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord-kanaal",
     "SettingsEditLinkedInbox_Description": "Accounts toevoegen, verwijderen, hernoemen of de koppeling tussen accounts verbreken.",
     "SettingsEditLinkedInbox_Title": "Gekoppelde Inbox bewerken",
+    "SettingsWindowBackdrop_Title": "Vensterachtergrond",
+    "SettingsWindowBackdrop_Description": "Kies een achtergrondeffect voor Wino-vensters.",
+    "SettingsWindowBackdrop_Disabled": "Het kiezen van de vensterachtergrond is uitgeschakeld wanneer een applicatiethema anders dan Standaard is geselecteerd.",
     "SettingsElementTheme_Description": "Selecteer een Windows-thema voor Wino",
     "SettingsElementTheme_Title": "Thema modus",
     "SettingsElementThemeSelectionDisabled": "Thema modus selectie is uitgeschakeld wanneer een niet-standaard thema is geselecteerd.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliassen",
     "SettingsEditAccountDetails_Title": "Bewerk accountdetails",
     "SettingsEditAccountDetails_Description": "Wijzig accountnaam, naam van afzender en wijs een kleur toe indien gewenst.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Wijzigingen opgeslagen",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Uw accountgegevens zijn succesvol bijgewerkt.",
     "SettingsManageLink_Description": "Verplaats items naar een nieuwe koppeling of verwijder een bestaande koppeling.",
     "SettingsManageLink_Title": "Koppeling beheren",
     "SettingsMarkAsRead_Description": "Wijzig wat er met geselecteerde items moet gebeuren.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Meldingen",
     "SettingsNotificationsAndTaskbar_Description": "Bepaal of meldingen en de taakbalk badge weergegeven moeten worden voor dit account.",
     "SettingsNotificationsAndTaskbar_Title": "Meldingen en taakbalk",
+    "SettingsHome_Title": "Start",
+    "SettingsHome_SearchTitle": "Zoek een instelling",
+    "SettingsHome_SearchDescription": "Zoek op functie, onderwerp of trefwoord om direct naar de juiste instellingenpagina te springen.",
+    "SettingsHome_SearchPlaceholder": "Zoek instellingen",
+    "SettingsHome_SearchExamples": "Probeer: thema, opslag, taal, handtekening",
+    "SettingsHome_QuickLinks_Title": "Snelle links",
+    "SettingsHome_QuickLinks_Description": "Ga rechtstreeks naar de instellingen die het vaakst worden gebruikt.",
+    "SettingsHome_StorageCard_Description": "Bekijk hoeveel lokale MIME-inhoud Wino op dit apparaat bewaart en ruim het op indien nodig.",
+    "SettingsHome_StorageEmptySummary": "Nog geen gecacheerde MIME-inhoud gedetecteerd.",
+    "SettingsHome_StorageLoading": "Lokaal MIME-gebruik wordt gecontroleerd...",
+    "SettingsHome_Tips_Title": "Tips en trucs",
+    "SettingsHome_Tips_Description": "Een paar kleine wijzigingen kunnen Wino veel persoonlijker laten aanvoelen.",
+    "SettingsHome_Tip_Theme": "Wil je de donkere modus of accentkleuren wijzigen? Open Personalisatie.",
+    "SettingsHome_Tip_Background": "Gebruik App-voorkeuren om het opstartgedrag en de achtergrondsynchronisatie te regelen.",
+    "SettingsHome_Tip_Shortcuts": "Sneltoetsen helpen je sneller door e-mails te navigeren.",
+    "SettingsHome_Resources_Title": "Handige links",
+    "SettingsHome_Resources_Description": "Open projectbronnen, ondersteuningsinformatie en releasekanalen.",
     "SettingsOptions_Title": "Instellingen",
+    "SettingsOptions_GeneralSection": "Algemeen",
+    "SettingsOptions_MailSection": "E-mail",
+    "SettingsOptions_CalendarSection": "Kalender",
+    "SettingsOptions_MoreComingSoon": "Meer opties komen binnenkort beschikbaar.",
+    "SettingsOptions_HeroDescription": "Pas uw Wino Mail-ervaring aan.",
+    "SettingsOptions_AccountsSummary": "{0} account(en) geconfigureerd",
+    "SettingsSearch_ManageAccounts_Keywords": "account;accounts;postvak;postvakken;alias;aliassen;profiel;adres;adressen",
+    "SettingsSearch_AppPreferences_Keywords": "opstart;achtergrond;start;synchronisatie;melding;meldingen;zoeken;systeemvak;standaardinstellingen",
+    "SettingsSearch_LanguageTime_Keywords": "taal;tijd;klok;locale;regio;formaat;24-uurs;24u",
+    "SettingsSearch_Personalization_Keywords": "thema;donker;licht;uiterlijk;accent;kleur;kleur;modus;indeling;dichtheid",
+    "SettingsSearch_About_Keywords": "over;versie;website;privacy;github;doneren;winkel;ondersteuning",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "toets;toetsen;hotkey;hotkeys;toetsenbord;sleutels",
+    "SettingsSearch_MessageList_Keywords": "bericht;berichten;lijst;gesprekken;conversaties;avatar;voorbeeld;afzender",
+    "SettingsSearch_ReadComposePane_Keywords": "lezer;opstellen;opsteller;lettertype;lettertypen;externe inhoud;weergave;lezen",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "handtekening;handtekeningen;versleuteling;certificaat;certificaten;smime;beveiliging",
+    "SettingsSearch_Storage_Keywords": "opslag;cache;caching;mime;schijfruimte;ruimte;opruimen;opschonen;lokale gegevens",
+    "SettingsSearch_CalendarSettings_Keywords": "kalender;week;uren;planning;evenement;evenementen",
     "SettingsPaneLengthReset_Description": "Reset de grootte van de e-maillijst naar de originele staat als u problemen hiermee ondervindt.",
     "SettingsPaneLengthReset_Title": "Grootte van e-maillijst herstellen",
     "SettingsPaypal_Description": "Toon veel meer liefde ❤️ Alle donaties worden gewaardeerd.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Tijd in 24-uursnotatie weergeven",
     "SettingsPrivacyPolicy_Description": "Privacybeleid bekijken",
     "SettingsPrivacyPolicy_Title": "Privacybeleid",
+    "SettingsWebsite_Description": "Open de Wino Mail-website.",
+    "SettingsWebsite_Title": "Website",
     "SettingsReadComposePane_Description": "Lettertypen, externe inhoud.",
     "SettingsReadComposePane_Title": "Lezer & Opsteller",
     "SettingsReader_Title": "Lezer",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Voorbeeldtekst weergeven",
     "SettingsShowSenderPictures_Description": "Verberg/toon miniatuurafbeeldingen van afzender.",
     "SettingsShowSenderPictures_Title": "Avatars van afzenders tonen",
+    "SettingsEmailTemplates_Title": "E-mailtemplates",
+    "SettingsEmailTemplates_Description": "Beheer e-mailtemplates",
+    "SettingsEmailTemplates_CreatePageTitle": "Nieuw sjabloon",
+    "SettingsEmailTemplates_EditPageTitle": "Sjabloon bewerken",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nieuw sjabloon",
+    "SettingsEmailTemplates_NewTemplateDescription": "Maak een nieuw e-mailsjabloon.",
+    "SettingsEmailTemplates_NameTitle": "Naam",
+    "SettingsEmailTemplates_NamePlaceholder": "Naam van het sjabloon",
+    "SettingsEmailTemplates_DescriptionTitle": "Beschrijving",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Optionele beschrijving",
+    "SettingsEmailTemplates_ContentTitle": "Sjablooninhoud",
+    "SettingsEmailTemplates_ContentDescription": "Bewerk de HTML-inhoud voor dit sjabloon.",
+    "SettingsEmailTemplates_NameRequired": "Naam van sjabloon is vereist.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Gebruik gravatar als foto voor afzender (indien beschikbaar)",
     "SettingsEnableFavicons_Title": "Domein iconen (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Opstart account",
     "SettingsStore_Description": "Toon wat liefde ❤️",
     "SettingsStore_Title": "Beoordeel in Store",
+    "SettingsStorage_Title": "Opslag",
+    "SettingsStorage_Description": "Scan en beheer MIME-cache die is opgeslagen in uw lokale gegevensmap.",
+    "SettingsStorage_ScanFolder": "Scan lokale gegevensmap",
+    "SettingsStorage_NoLocalMimeDataFound": "Geen lokale MIME-gegevens gevonden.",
+    "SettingsStorage_NoAccountsFound": "Geen accounts gevonden.",
+    "SettingsStorage_TotalUsage": "Totaal lokaal MIME-gebruik: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} gebruikt in de lokale MIME-cache",
+    "SettingsStorage_DeleteAll_Title": "Verwijder alle MIME-inhoud",
+    "SettingsStorage_DeleteAll_Description": "Verwijder de hele MIME-cache-map van dit account.",
+    "SettingsStorage_DeleteAll_Button": "Alle verwijderen",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Alle MIME-inhoud verwijderen",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Verwijder alle lokale MIME-gegevens voor {0}?",
+    "SettingsStorage_DeleteAll_Success": "Alle MIME-inhoud is verwijderd.",
+    "SettingsStorage_DeleteOld_Title": "Verwijder oud MIME-inhoud",
+    "SettingsStorage_DeleteOld_Description": "Verwijder MIME-bestanden op basis van de aanmaakdatum van e-mail in de lokale database.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 maand",
+    "SettingsStorage_DeleteOld_3Months": "> 3 maanden",
+    "SettingsStorage_DeleteOld_6Months": "> 6 maanden",
+    "SettingsStorage_DeleteOld_1Year": "> 1 jaar",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Verwijder oud MIME-inhoud",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Verwijder lokale MIME-gegevens ouder dan {0} voor {1}?",
+    "SettingsStorage_DeleteOld_Success": "Verwijderd {0} MIME-map(pen) ouder dan {1}.",
+    "SettingsStorage_1Month": "1 maand",
+    "SettingsStorage_3Months": "3 maanden",
+    "SettingsStorage_6Months": "6 maanden",
+    "SettingsStorage_1Year": "1 jaar",
+    "SettingsStorage_Months": "{0} maanden",
     "SettingsTaskbarBadge_Description": "Includeer aantal ongelezen e-mails in taakbalkpictogram.",
     "SettingsTaskbarBadge_Title": "Taakbalk badge",
     "SettingsThreads_Description": "Voeg berichten samen tot gesprekken.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "U kunt de map Inbox niet aan een andere systeemmap toewijzen.",
     "SystemFolderConfigSetupSuccess_Message": "Systeemmappen zijn succesvol geconfigureerd.",
     "SystemFolderConfigSetupSuccess_Title": "Systeemmappen instellen",
+    "SystemTrayMenu_ShowWino": "Wino Mail openen",
+    "SystemTrayMenu_ShowWinoCalendar": "Wino Calendar openen",
+    "SystemTrayMenu_ExitWino": "Afsluiten",
     "TestingImapConnectionMessage": "Bezig met testen van serververbinding...",
     "TitleBarServerDisconnectedButton_Description": "Wino is van de netwerkverbinding verbroken. Klik op opnieuw verbinden om de verbinding te herstellen.",
     "TitleBarServerDisconnectedButton_Title": "Geen verbinding",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgraden naar Onbeperkte aantal accounts",
     "WinoUpgradeRemainingAccountsMessage": "{0} van de {1} gratis accounts gebruikt.",
     "Yesterday": "Gisteren",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "E-mail synchronisatie-interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatische e-mail synchronisatie-interval (minuten). Deze instelling zal alleen toegepast worden na herstarten van Wino Mail."
+    "Smime_ImportCertificates_Success": "Certificaten succesvol geïmporteerd.",
+    "Smime_ImportCertificates_Error": "Fout bij het importeren van certificaten: {0}",
+    "Smime_RemoveCertificates_Confirm": "Wilt u werkelijk de certificaten {0} verwijderen?",
+    "Smime_RemoveCertificates_Success": "Certificaten verwijderd.",
+    "Smime_ExportCertificates_Success": "Certificaten geëxporteerd.",
+    "Smime_ExportCertificates_Error": "Fout bij het exporteren van certificaten.",
+    "Smime_CertificateDetails": "Onderwerp: {0}\\nUitgevende instantie: {1}\\nGeldig vanaf: {2}\\nGeldig tot: {3}\\nVingerafdruk: {4}",
+    "Smime_CertificatePassword_Title": "Certificaatwachtwoord vereist",
+    "Smime_CertificatePassword_Placeholder": "Certificaatwachtwoord voor {0} (optioneel)",
+    "Smime_Confirm_Title": "Bevestigen",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Vernieuwen",
+    "SettingsSignatureAndEncryption_Title": "Handtekening en Versleuteling",
+    "SettingsSignatureAndEncryption_Description": "Beheer S/MIME-certificaten voor het ondertekenen en versleutelen van e-mails.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Mijn certificaten",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Persoonlijke certificaten voor ondertekenen en versleutelen",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificaten van ontvangers",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificaten van ontvangers voor ontcijfering",
+    "SettingsSignatureAndEncryption_NameColumn": "Naam",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Verloopt op",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Vingerafdruk",
+    "Buttons_Remove": "Verwijderen",
+    "Buttons_Export": "Exporteer",
+    "Buttons_Import": "Importeren",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME-handtekeningcertificaat",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME-encryptiecertificaat",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Geen",
+    "SmimeSignaturesInMessage": "Handtekeningen in dit bericht:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, geldig tot {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informatie over S/MIME-handtekeningcertificaat",
+    "SmimeCertificateInfoTitle": "Informatie over S/MIME-certificaat",
+    "SmimeNoCertificateFileFound": "Geen certificaatbestand gevonden",
+    "SmimeSaveCertificate": "Bewaar certificaat...",
+    "SmimeCertificate": "S/MIME-certificaat",
+    "SmimeCertificateSavedTo": "Certificaat opgeslagen naar {0}",
+    "SmimeSignedTooltip": "Dit bericht is ondertekend met een S/MIME-certificaat. Klik voor meer details",
+    "SmimeEncryptedTooltip": "Dit bericht is versleuteld met een S/MIME-certificaat.",
+    "SmimeCertificateFileInfo": "Bestand: {0}\\nType: {1}\\nGrootte: {2:N0} bytes",
+    "Composer_LightTheme": "Licht Thema",
+    "Composer_DarkTheme": "Donker Thema",
+    "Composer_Outdent": "Uitinspringen",
+    "Composer_Indent": "Inspringen",
+    "Composer_BulletList": "Opsommingstekens",
+    "Composer_OrderedList": "Genummerde lijst",
+    "Composer_Stroke": "Lijn",
+    "Composer_Bold": "Vet",
+    "Composer_Italic": "Cursief",
+    "Composer_Underline": "Onderstrepen",
+    "Composer_CcBcc": "Cc en Bcc",
+    "Composer_EnableSmimeSignature": "S/MIME-handtekening in- of uitschakelen",
+    "Composer_EnableSmimeEncryption": "S/MIME-versleuteling in- of uitschakelen",
+    "Composer_LocalDraftSyncInfo": "Dit concept is lokaal. Wino kon het niet naar uw mailserver verzenden. Klik om het opnieuw te verzenden.",
+    "Composer_CertificateExpires": "Verloopt op: ",
+    "Composer_SmimeSignature": "S/MIME-handtekening",
+    "Composer_SmimeEncryption": "S/MIME-versleuteling",
+    "Composer_EmailTemplatesPlaceholder": "E-mail-sjablonen",
+    "Composer_AiSummarize": "Samenvatten met AI",
+    "Composer_AiSummarizeDescription": "Haal belangrijke punten, actiepunten en beslissingen uit deze e-mail.",
+    "Composer_AiTranslate": "Vertaal met AI",
+    "Composer_AiActions": "AI-acties",
+    "Composer_AiRewrite": "Herschrijven met AI",
+    "AiActions_CheckingStatus": "AI-toegang controleren...",
+    "AiActions_SignedOutTitle": "Wino AI-pack ontgrendelen",
+    "AiActions_SignedOutDescription": "Vertaal, herschrijf en vat e-mails samen met AI nadat u bent ingelogd op uw Wino-account en de AI Pack-add-on hebt geactiveerd.",
+    "AiActions_NoPackTitle": "AI Pack vereist",
+    "AiActions_NoPackDescription": "U bent ingelogd, maar AI Pack is nog niet actief. Koop het om de AI-vertaling, herschrijf- en samenvattingshulpmiddelen van Wino te gebruiken.",
+    "AiActions_UsageSummary": "{0} van {1} credits deze maand gebruikt.",
+    "Composer_AiRewritePolite": "Maak het beleefder",
+    "Composer_AiRewritePoliteDescription": "Verzacht de formulering terwijl de bedoeling hetzelfde blijft.",
+    "Composer_AiRewriteAngry": "Maak het boos",
+    "Composer_AiRewriteAngryDescription": "Gebruikt een scherpere en confronterende toon.",
+    "Composer_AiRewriteHappy": "Maak het vrolijk",
+    "Composer_AiRewriteHappyDescription": "Voegt een vrolijkere en enthousiastere toon toe.",
+    "Composer_AiRewriteFormal": "Maak het formeel",
+    "Composer_AiRewriteFormalDescription": "Geeft het bericht een professionelere en gestructureerdere toon.",
+    "Composer_AiRewriteFriendly": "Maak het vriendelijk",
+    "Composer_AiRewriteFriendlyDescription": "Maakt de boodschap warmer en toegankelijker.",
+    "Composer_AiRewriteShorter": "Maak het korter",
+    "Composer_AiRewriteShorterDescription": "Verkort de tekst en verwijdert onnodige details.",
+    "Composer_AiRewriteClearer": "Maak het duidelijker",
+    "Composer_AiRewriteClearerDescription": "Verbetert de leesbaarheid en maakt het bericht gemakkelijker te volgen.",
+    "Composer_AiRewriteCustom": "Aangepast",
+    "Composer_AiRewriteCustomDescription": "Beschrijf je eigen herschrijvingsdoel.",
+    "Composer_AiRewriteCustomPlaceholder": "Beschrijf hoe je wilt dat het bericht herschreven wordt",
+    "Composer_AiRewriteMode": "Herschrijf toon",
+    "Composer_AiRewriteApply": "Herschrijf toepassen",
+    "Composer_AiTranslateDialogTitle": "Vertalen met AI",
+    "Composer_AiTranslateDialogDescription": "Voer de doeltaal of cultuurcode in, zoals en-US, tr-TR, de-DE of fr-FR.",
+    "Composer_AiTranslateApply": "Vertalen",
+    "Composer_AiTranslateLanguage": "Doeltaal",
+    "Composer_AiTranslateCustomPlaceholder": "Voer cultuurcode in",
+    "Composer_AiTranslateLanguageEnglish": "Engels (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turks (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Duits (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Frans (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spaans (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiaans (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugees (Brazilië) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Nederlands (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Pools (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russisch (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japans (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Koreaans (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinees, Vereenvoudigd (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabisch (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Overig...",
+    "Composer_AiBusyTitle": "AI is al bezig",
+    "Composer_AiBusyMessage": "Wacht alstublieft tot de huidige AI-actie is voltooid.",
+    "Composer_AiSignInRequired": "Meld u aan bij uw Wino-account om AI-functies te gebruiken.",
+    "Composer_AiMissingHtml": "Er is nog geen berichtinhoud om naar Wino AI te sturen.",
+    "Composer_AiQuotaUnavailable": "Het AI-resultaat is toegepast.",
+    "Composer_AiAppliedMessage": "Het AI-resultaat is toegepast op de composer. Gebruik Ongedaan maken als u het wilt terugdraaien.",
+    "Composer_AiSummarizeSuccessTitle": "AI-samenvatting toegepast",
+    "Composer_AiTranslateSuccessTitle": "AI-vertaling toegepast",
+    "Composer_AiRewriteSuccessTitle": "AI-herschrijving toegepast",
+    "Composer_AiErrorTitle": "AI-actie mislukt",
+    "Reader_AiAppliedMessage": "Het AI-resultaat wordt nu weergegeven voor dit bericht. Open het bericht opnieuw om de oorspronkelijke inhoud weer te geven.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contactpersonen",
+    "ContactsPage_AddContact": "Contact toevoegen",
+    "ContactsPage_EditContact": "Contact bewerken",
+    "ContactsPage_DeleteContact": "Contact verwijderen",
+    "ContactsPage_SearchPlaceholder": "Zoek contactpersonen...",
+    "ContactsPage_NoContacts": "Geen contactpersonen gevonden",
+    "ContactsPage_ContactsCount": "{0} contactpersonen",
+    "ContactsPage_SelectedContactsCount": "{0} geselecteerd",
+    "ContactsPage_DeleteSelectedContacts": "Geselecteerde verwijderen",
+    "ContactEditDialog_Title": "Contact bewerken",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Foto kiezen",
+    "ContactEditDialog_RemovePhoto": "Foto verwijderen",
+    "ContactEditDialog_NameHeader": "Naam",
+    "ContactEditDialog_NamePlaceholder": "Contactnaam",
+    "ContactEditDialog_EmailHeader": "E-mailadres",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Contactinformatie",
+    "ContactEditDialog_RootContactInfo": "Dit is een hoofdcontact dat aan uw accounts is gekoppeld en kan niet worden verwijderd.",
+    "ContactEditDialog_OverriddenContactInfo": "Dit contact is handmatig gewijzigd en zal tijdens synchronisatie niet worden bijgewerkt.",
+    "ContactsPage_Subtitle": "Beheer uw e-mailcontactpersonen en hun informatie",
+    "ContactStatus_Account": "Account",
+    "ContactStatus_Modified": "Aangepast",
+    "ContactAction_Edit": "Contact bewerken",
+    "ContactAction_ChangePhoto": "Foto wijzigen",
+    "ContactAction_Delete": "Contact verwijderen",
+    "ContactAction_Add": "Contact toevoegen",
+    "ContactSelection_Selected": "geselecteerd",
+    "ContactSelection_SelectAll": "Alles selecteren",
+    "ContactSelection_Clear": "Selectie wissen",
+    "ContactsPage_EmptyState": "Geen contactpersonen om weer te geven",
+    "ContactsPage_AddFirstContact": "Voeg uw eerste contact toe",
+    "ContactsPage_ContactsCountSuffix": "contactpersonen",
+    "ContactsPane_NewContact": "Nieuw contact",
+    "ContactsPane_DescriptionTitle": "Beheer uw contacten",
+    "ContactsPane_DescriptionBody": "Maak contacten aan, hernoem ze, werk profielfoto's bij en houd opgeslagen details georganiseerd op één plek.",
+    "ContactEditDialog_AddTitle": "Contact toevoegen",
+    "ContactInfoBar_ContactAdded": "Contact succesvol toegevoegd.",
+    "ContactInfoBar_ContactUpdated": "Contact succesvol bijgewerkt.",
+    "ContactInfoBar_ContactsDeleted": "Contactpersonen succesvol verwijderd.",
+    "ContactInfoBar_ContactPhotoUpdated": "Contactfoto succesvol bijgewerkt.",
+    "ContactInfoBar_FailedToLoadContacts": "Mislukt om contactpersonen te laden: {0}",
+    "ContactInfoBar_FailedToAddContact": "Fout bij het toevoegen van contact: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Fout bij het bijwerken van contact: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Fout bij het verwijderen van contactpersonen: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Fout bij het bijwerken van foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Hoofdcontacten kunnen niet worden verwijderd.",
+    "ContactConfirmDialog_DeleteTitle": "Contact verwijderen",
+    "ContactConfirmDialog_DeleteMessage": "Weet u zeker dat u het contact '{0}' wilt verwijderen?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Weet u zeker dat u {0} contactpersoon(en) wilt verwijderen?",
+    "ContactConfirmDialog_DeleteButton": "Verwijderen",
+    "CalendarAccountSettings_Title": "Kalenderaccountinstellingen",
+    "CalendarAccountSettings_Description": "Beheer kalenderinstellingen voor {0}",
+    "CalendarAccountSettings_AccountColor": "Accountkleur",
+    "CalendarAccountSettings_AccountColorDescription": "Wijzig de weergavekleur voor dit kalenderaccount",
+    "CalendarAccountSettings_SyncEnabled": "Synchronisatie inschakelen",
+    "CalendarAccountSettings_SyncEnabledDescription": "Schakel kalendersynchronisatie in of uit voor dit account.",
+    "CalendarAccountSettings_DefaultShowAs": "Standaard Beschikbaarheidsstatus",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Standaard beschikbaarheidsstatus voor nieuwe gebeurtenissen die met dit account zijn aangemaakt.",
+    "CalendarAccountSettings_PrimaryCalendar": "Primaire kalender",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Markeer deze kalender als de primaire kalender voor het account.",
+    "CalendarSettings_NewEventBehavior_Header": "Gedrag van de knop Nieuwe gebeurtenis",
+    "CalendarSettings_NewEventBehavior_Description": "Kies of de knop Nieuwe gebeurtenis bij elke klik om een kalender moet vragen of altijd een specifieke kalender moet openen.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Vraag elke keer.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Gebruik altijd een specifieke kalender.",
+    "CalendarSettings_Rendering_Title": "Weergave",
+    "CalendarSettings_Rendering_Description": "Kalenderindeling en weergave-instellingen configureren.",
+    "CalendarSettings_Notifications_Title": "Notificaties",
+    "CalendarSettings_Notifications_Description": "Kies standaard herinnerings- en uitstelgedrag.",
+    "CalendarSettings_Preferences_Title": "Voorkeuren",
+    "CalendarSettings_Preferences_Description": "Stel in hoe de Nieuwe gebeurtenis-knop zich gedraagt.",
+    "WhatIsNew_GetStartedButton": "Beginnen met het toevoegen van een account.",
+    "WhatIsNew_ContinueAnywayButton": "Toch doorgaan",
+    "WhatIsNew_PreparingForNewVersionButton": "Voorbereiden op nieuwe versie...",
+    "WhatIsNew_MigrationPreparing_Title": "Uw gegevens aan het voorbereiden",
+    "WhatIsNew_MigrationPreparing_Description": "Wino past update-migraties toe. Even geduld terwijl we uw accountgegevens voor deze release voorbereiden.",
+    "WhatIsNew_MigrationFailedMessage": "Het toepassen van migraties is mislukt met foutcode {0}. U kunt de applicatie blijven gebruiken. Als u echter ernstige problemen ondervindt, installeer de toepassing opnieuw.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail is bijgewerkt",
+    "WhatIsNew_MigrationNotification_Message": "Open de app om de update te voltooien en te zien wat er nieuw is.",
+    "WelcomeWindow_Title": "Welkom bij Wino Mail",
+    "WelcomeWindow_Subtitle": "Een native Windows-ervaring voor Mail en Kalender.",
+    "WelcomeWindow_WhatsNewTitle": "Laatste wijzigingen",
+    "WelcomeWindow_FeaturesTitle": "Functies",
+    "WelcomeWindow_WhatsNewTab": "Wat is nieuw",
+    "WelcomeWindow_FeaturesTab": "Functies",
+    "WelcomeWindow_GetStartedButton": "Beginnen met het toevoegen van een account.",
+    "WelcomeWindow_GetStartedDescription": "Voeg uw Outlook-, Gmail- of IMAP-account toe om aan de slag te gaan met Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importeren vanuit uw Wino-account",
+    "WelcomeWindow_ImportInProgress": "Uw gesynchroniseerde voorkeuren en accounts worden geïmporteerd...",
+    "WelcomeWindow_ImportNoAccountsFound": "Er zijn geen gesynchroniseerde accounts gevonden in uw Wino-account. Als er voorkeuren beschikbaar waren, zijn ze hersteld. Gebruik Aan de slag om handmatig een account toe te voegen.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} gesynchroniseerde accounts zijn al beschikbaar op dit apparaat. Gebruik Aan de slag om indien nodig handmatig nog een account toe te voegen.",
+    "WelcomeWindow_SetupTitle": "Uw account instellen.",
+    "WelcomeWindow_SetupSubtitle": "Kies uw e-mailprovider om aan de slag te gaan.",
+    "WelcomeWindow_AddAccountButton": "Account toevoegen",
+    "WelcomeWindow_SkipForNow": "Voor nu overslaan — ik stel het later in.",
+    "WelcomeWindow_AppDescription": "Een snelle, gefocuste inbox — opnieuw ontworpen voor Windows 11",
+    "WelcomeWizard_Step1Title": "Welkom",
+    "SystemTrayMenu_Open": "Open",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Synchronisatie-instellingen",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Houd uw Wino-voorkeuren gesynchroniseerd tussen apparaten.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Add-ons ontgrendelen",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Toegang tot premiumfuncties zoals Wino AI Pack.",
+    "WinoAccount_Management_Description": "Beheer uw Wino-account, AI Pack-toegang, en gesynchroniseerde voorkeuren en accountgegevens.",
+    "WinoAccount_Management_SignedOutTitle": "Inloggen bij Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Log in of maak een account aan om uw e-mail te synchroniseren, toegang te krijgen tot AI-functies en uw instellingen tussen apparaten te beheren.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profiel",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino Add-ons",
+    "WinoAccount_Management_DataSectionHeader": "Gegevens",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Accountacties",
+    "WinoAccount_Management_AccountCardTitle": "Account",
+    "WinoAccount_Management_AccountCardDescription": "Uw Wino-account e-mailadres en huidige accountstatus.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Zie of Wino AI Pack actief is en hoeveel gebruik er nog over is.",
+    "WinoAccount_Management_AiPackActive": "AI Pack is actief",
+    "WinoAccount_Management_AiPackInactive": "AI Pack is niet actief",
+    "WinoAccount_Management_AiPackUsage": "{0} van {1} gebruiken verbruikt. {2} resterend.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Factureringsperiode: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Gegevens over het gebruik zijn nog niet beschikbaar.",
+    "WinoAccount_Management_AiPackBuyDescription": "Koop Wino AI Pack om e-mails te vertalen, te herschrijven of samen te vatten met AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "AI Pack ontgrendelen",
+    "WinoAccount_Management_AiPackPromoDescription": "Versnel uw e-mailworkflow met AI-gedreven hulpmiddelen. Vertaal berichten naar meer dan 50 talen, herschrijf voor duidelijkheid en toon, en krijg directe samenvattingen van lange draadjes.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mnd",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 credits",
+    "WinoAccount_Management_AiPackGetButton": "AI Pack verkrijgen",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-gedreven tools voor vertalen, herschrijven en samenvatten acties in Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, vertalen, herschrijven, samenvatten, productiviteit",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Onbeperkte accounts",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Verwijder de accountlimiet en voeg zoveel e-mailaccounts toe als je nodig hebt.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "accounts, onbeperkt, premium, add-on",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Meld u aan met uw Wino-account om deze aankoop te voltooien.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino kon deze aankoop via Microsoft Store niet voltooien.",
+    "WinoAccount_Management_StoreSyncFailed": "Uw aankoop is voltooid, maar Wino kon uw accountvoordelen nog niet vernieuwen. Probeer het over een moment opnieuw.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Uw abonnement is actief",
+    "WinoAccount_Management_AiPackRenews": "Verlengt {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Credits deze maand gebruikt",
+    "WinoAccount_Management_AiPackResets": "Reset {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "We hebben problemen bij het laden van uw AI-gebruikbalans.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Vertalen",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Herschrijven",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Samenvatten",
+    "WinoAccount_Management_AddOnLoadFailed": "We hebben problemen bij het laden van deze add-on.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchroniseer Voorkeuren en Accounts",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importeer of exporteer uw Wino-voorkeuren en mailboxgegevens over apparaten. Wachtwoorden, tokens en andere gevoelige informatie worden nooit gesynchroniseerd.",
+    "WinoAccount_Management_SignOutTitle": "Uitloggen",
+    "WinoAccount_Management_SignOutDescription": "Uitloggen van uw account op dit apparaat",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Er zijn nog geen gesynchroniseerde gegevens opgeslagen voor dit account.",
+    "WinoAccount_Management_ExportSucceeded": "Uw geselecteerde Wino-gegevens zijn succesvol geëxporteerd.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Uw voorkeuren zijn geëxporteerd naar uw Wino-account.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exporteerde {0} accountgegevens naar uw Wino-account.",
+    "WinoAccount_Management_ImportSucceeded": "Gesynchroniseerde gegevens uit uw Wino-account geïmporteerd.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Toegepaste {0} gesynchroniseerde voorkeuren.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Geïmporteerde {0} accounts.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Overgeslagen {0} accounts die al op dit apparaat bestaan.",
+    "WinoAccount_Management_ImportPartial": "Toegepaste {0} gesynchroniseerde voorkeuren. {1} voorkeuren konden niet worden hersteld.",
+    "WinoAccount_Management_ImportReloginReminder": "Wachtwoorden, tokens en andere gevoelige informatie zijn niet geïmporteerd. Log opnieuw in voor elk account op dit apparaat voordat u het gebruikt.",
+    "WinoAccount_Management_SerializeFailed": "Wino kon uw huidige voorkeuren niet serialiseren.",
+    "WinoAccount_Management_EmptyExport": "Er zijn geen voorkeuren om te exporteren.",
+    "WinoAccount_Management_ImportEmpty": "De gesynchroniseerde gegevenspayload bevat geen nieuwe items om te herstellen.",
+    "WinoAccount_Management_ExportDialog_Title": "Exporteer naar uw Wino-account",
+    "WinoAccount_Management_ExportDialog_Description": "Kies wat u wilt synchroniseren met uw Wino-account.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Voorkeuren",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Accounts",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Wachtwoorden, tokens en andere gevoelige informatie worden niet gesynchroniseerd.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Geïmporteerde accounts op een andere pc vereisen nog steeds dat u zich opnieuw aanmeldt voordat ze kunnen worden gebruikt.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Uw geselecteerde Wino-gegevens worden geëxporteerd...",
+    "WinoAccount_Management_LoadFailed": "Wino kon de nieuwste Wino Account-informatie niet laden.",
+    "WinoAccount_Management_ActionFailed": "Het Wino Account-verzoek kon niet worden voltooid.",
+    "WinoAccount_SettingsSection_Title": "Wino-account",
+    "WinoAccount_SettingsSection_Description": "Maak een Wino-account aan of meld u aan bij een Wino-account met uw localhost-authenticatieservice.",
+    "WinoAccount_RegisterButton_Title": "Account registreren",
+    "WinoAccount_RegisterButton_Description": "Maak een Wino-account aan met e-mail en wachtwoord.",
+    "WinoAccount_RegisterButton_Action": "Registratie openen",
+    "WinoAccount_LoginButton_Title": "Inloggen",
+    "WinoAccount_LoginButton_Description": "Meld u aan bij uw Wino-account om uw Wino-setup te synchroniseren en toegang te krijgen tot accountgebonden functies.",
+    "WinoAccount_LoginButton_Action": "Inloggen openen",
+    "WinoAccount_SignOutButton_Title": "Uitloggen",
+    "WinoAccount_SignOutButton_Description": "Verwijder de lokaal opgeslagen Wino-account-sessie.",
+    "WinoAccount_SignOutButton_Action": "Uitloggen",
+    "WinoAccount_RegisterDialog_Title": "Wino-account aanmaken",
+    "WinoAccount_RegisterDialog_Description": "Maak een Wino-account aan om uw Wino-ervaring gesynchroniseerd te houden en accountgebonden add-ons te ontgrendelen.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Maak uw Wino-account aan",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Waarom er één aanmaken?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Instellingen tussen apparaten importeren en exporteren.",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Verplaats uw Wino-voorkeuren tussen apparaten zonder uw installatie vanaf nul opnieuw te hoeven opbouwen.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Toegang tot exclusieve add-ons zoals Wino AI Pack (betaald)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Gebruik één account om premiumfuncties van Wino te ontgrendelen zodra ze beschikbaar komen.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino-account is gescheiden van uw e-mailaccounts.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Uw Outlook-, Gmail-, IMAP-, of andere e-mailaccounts blijven zoals ze zijn. Een Wino-account beheert alleen Wino-specifieke functies en accountgebonden add-ons.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registreren",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacy en API-verwerking",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Optionele add-ons zoals Wino AI Pack kunnen geselecteerde HTML-inhoud van e-mails verzenden naar de Wino API-service wanneer u deze functies gebruikt.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Lees het privacybeleid",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Ik ga akkoord met het privacybeleid.",
+    "WinoAccount_LoginDialog_Title": "Inloggen bij Wino-account",
+    "WinoAccount_LoginDialog_Description": "Meld u aan bij uw Wino-account om uw Wino-setup te synchroniseren en toegang te krijgen tot accountgebonden functies.",
+    "WinoAccount_LoginDialog_HeroTitle": "Welkom terug",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Wat aanmelden u oplevert.",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Gebruik uw Wino-account om instellingen tussen apparaten te blijven synchroniseren en toegang te krijgen tot betaalde add-ons zoals Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Dit is niet de aanmelding voor uw e-mailaccount.",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Inloggen hier voegt uw Outlook-, Gmail-, of IMAP-accounts niet toe of vervangt ze in Wino. U meldt zich hiermee alleen aan bij Wino-specifieke services.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Wachtwoord vergeten?",
+    "WinoAccount_EmailLabel": "E-mailadres",
+    "WinoAccount_EmailPlaceholder": "naam@voorbeeld.nl",
+    "WinoAccount_PasswordLabel": "Wachtwoord",
+    "WinoAccount_ConfirmPasswordLabel": "Wachtwoord bevestigen",
+    "WinoAccount_ForgotPasswordDialog_Title": "Wachtwoord opnieuw instellen",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Wachtwoordherstelfe-mail verzenden",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Terug naar aanmelden",
+    "WinoAccount_ForgotPasswordDialog_Description": "Voer het Wino-account-e-mailadres in en wij sturen u een wachtwoordherstellink als het adres is geregistreerd.",
+    "WinoAccount_Validation_EmailRequired": "E-mail is vereist.",
+    "WinoAccount_Validation_PasswordRequired": "Wachtwoord is vereist.",
+    "WinoAccount_Validation_PasswordMismatch": "Wachtwoorden komen niet overeen.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "U moet het privacybeleid accepteren voordat u een Wino-account aanmaakt.",
+    "WinoAccount_Error_InvalidCredentials": "Het e-mailadres of wachtwoord is onjuist.",
+    "WinoAccount_Error_AccountLocked": "Dit account is tijdelijk geblokkeerd.",
+    "WinoAccount_Error_AccountBanned": "Dit account is verbannen.",
+    "WinoAccount_Error_AccountSuspended": "Dit account is geschorst.",
+    "WinoAccount_Error_EmailNotConfirmed": "Bevestig uw e-mailadres voordat u zich aanmeldt.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Bevestig uw e-mailadres voordat u zich aanmeldt.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Een nieuwe bevestigingsmail is nog niet beschikbaar.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Deze bevestigingsverzoek is niet meer geldig. Probeer opnieuw aan te melden.",
+    "WinoAccount_Error_EmailNotRegistered": "Dit e-mailadres is niet geregistreerd.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Uw sessie is niet langer geldig. Meld u opnieuw aan.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Dit e-mailadres is al geregistreerd.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Een e-mailadres is vereist om externe aanmelding te voltooien.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Het externe aanmeldingsverzoek is ongeldig.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "De externe aanmeldingstoestand is ongeldig of verlopen.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "De externe aanmeldcode is ongeldig of verlopen.",
+    "WinoAccount_Error_AiPackRequired": "Voor deze actie is een actief Wino AI Pack-abonnement vereist.",
+    "WinoAccount_Error_AiQuotaExceeded": "Uw AI Pack-gebruikslimiet is bereikt voor de huidige factureringsperiode.",
+    "WinoAccount_Error_AiHtmlEmpty": "Er is geen e-mailinhoud om te verwerken.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Deze e-mail is te groot om met Wino AI te verwerken.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Die taal wordt niet ondersteund. Probeer een geldige cultuurcode zoals en-US of tr-TR.",
+    "WinoAccount_Error_Forbidden": "U heeft geen toestemming om deze handeling uit te voeren.",
+    "WinoAccount_Error_ValidationFailed": "Het verzoek is ongeldig. Controleer de ingevoerde waarden.",
+    "WinoAccount_RegisterSuccessMessage": "Wino-accountregistratie voltooid voor {0}.",
+    "WinoAccount_LoginSuccessMessage": "Ingelogd bij Wino-account als {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Bevestig uw e-mailadres",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "We hebben een e-mailbevestiging verzonden naar {0}. Bevestig deze en probeer u opnieuw aan te melden.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "E-mailbevestiging vereist",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "We wachten nog op bevestiging van {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Bevestigingsmail opnieuw verzenden",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "U kunt de bevestigingsmail opnieuw verzenden in {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "U kunt nu de bevestigingsmail opnieuw verzenden.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Bevestigingsmail opnieuw verzonden",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "We hebben nog een bevestigingsmail verzonden naar {0}. Bevestig deze en probeer u zich opnieuw aan te melden.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Wachtwoordherstelfe-mail verzonden",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "We hebben een wachtwoordherstelfe-mail verzonden naar {0}. Open dat bericht om een nieuw wachtwoord te kiezen.",
+    "WinoAccount_ChangePassword_Title": "Wachtwoord wijzigen",
+    "WinoAccount_ChangePassword_Description": "Stuur een wachtwoordherstelfe-mail naar dit Wino-account.",
+    "WinoAccount_ChangePassword_Action": "Reset-e-mail verzenden",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Wilt u Wino een wachtwoordreset-e-mail sturen naar {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Uitgelogd bij Wino Account {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Er is geen actieve Wino Account om af te melden.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino Account",
+    "WinoAccount_Titlebar_SignedOutDescription": "Inloggen of maak een Wino Account aan om uw Wino-sessie te beheren.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Account toevoegen",
+    "WelcomeWizard_Step3Title": "Configuratie voltooien",
+    "ProviderSelection_Title": "Kies uw e-mailprovider",
+    "ProviderSelection_Subtitle": "Selecteer hieronder een provider om uw e-mailaccount toe te voegen aan Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Accountnaam",
+    "ProviderSelection_AccountNamePlaceholder": "bijv. Persoonlijk, Werk",
+    "ProviderSelection_DisplayNameHeader": "Weergavenaam",
+    "ProviderSelection_DisplayNamePlaceholder": "bijv. John Doe",
+    "ProviderSelection_EmailHeader": "E-mailadres",
+    "ProviderSelection_EmailPlaceholder": "bijv. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "App-specifiek wachtwoord",
+    "ProviderSelection_AppPasswordHelp": "Hoe krijg ik een app-specifiek wachtwoord?",
+    "ProviderSelection_CalendarModeHeader": "Kalenderintegratie",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Uitgeschakeld",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Geen kalenderintegratie",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV-synchronisatie",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Uw agenda-evenementen worden tussen uw apparaten gesynchroniseerd met Apple-servers.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Uw agenda-evenementen worden tussen uw apparaten gesynchroniseerd met Yahoo-servers.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokale kalender",
+    "ProviderSelection_CalendarMode_LocalDescription": "Uw afspraken worden alleen op uw computer opgeslagen. Geen verbinding met een server.",
+    "ProviderSelection_ClearColor": "Kleur wissen",
+    "ProviderSelection_ContinueButton": "Doorgaan",
+    "ProviderSelection_SpecialImap_Subtitle": "Voer uw accountgegevens in om verbinding te maken.",
+    "AccountSetup_Title": "Uw account wordt ingesteld.",
+    "AccountSetup_Step_Authenticating": "Authenticatie met {0}",
+    "AccountSetup_Step_TestingMailAuth": "Mailauthenticatie testen",
+    "AccountSetup_Step_SyncingFolders": "Mapmetagegevens synchroniseren",
+    "AccountSetup_Step_FetchingProfile": "Profielinformatie ophalen",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV-instellingen ontdekken",
+    "AccountSetup_Step_TestingCalendarAuth": "Kalenderauthenticatie testen",
+    "AccountSetup_Step_SavingAccount": "Accountinformatie opslaan",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Kalendermetadata ophalen",
+    "AccountSetup_Step_SyncingAliases": "Aliassen synchroniseren",
+    "AccountSetup_Step_Finalizing": "Configuratie afronden",
+    "AccountSetup_FailureMessage": "Het instellen van uw account is mislukt. Ga terug om uw instellingen te corrigeren, of probeer het later opnieuw.",
+    "AccountSetup_SuccessMessage": "Uw account is succesvol ingesteld!",
+    "AccountSetup_GoBackButton": "Ga terug",
+    "AccountSetup_TryAgainButton": "Opnieuw proberen",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatische detectie mislukt. Voer de instellingen handmatig in op het tabblad Geavanceerd."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/pl_PL/resources.json b/Wino.Core.Domain/Translations/pl_PL/resources.json
index 412ebbab..5e150da5 100644
--- a/Wino.Core.Domain/Translations/pl_PL/resources.json
+++ b/Wino.Core.Domain/Translations/pl_PL/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "To konto wymaga ponownej pełnej synchronizacji, aby kontynuować pracę. Poczekaj, aż Wino zsynchronizuje ponownie Twoje wiadomości...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "gotowe",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Pobieranie informacji o kalendarzu.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Pobieranie danych profilu.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Jeśli Twoja przeglądarka nie uruchomiła się automatycznie, aby ukończyć uwierzytelnienie:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "inicjowanie",
     "AccountCreationDialog_PreparingFolders": "Trwa pobieranie informacji o folderach.",
     "AccountCreationDialog_SigninIn": "Zapisywanie danych konta.",
+    "Purchased": "Kupione",
     "AccountEditDialog_Message": "Nazwa konta",
     "AccountEditDialog_Title": "Edytuj konto",
     "AccountPickerDialog_Title": "Wybierz konto",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Ogólne",
+    "AccountDetailsPage_TabMail": "Poczta",
+    "AccountDetailsPage_TabCalendar": "Kalendarz",
+    "AccountDetailsPage_CalendarListDescription": "Wybierz kalendarz, aby skonfigurować jego ustawienia.",
     "AddHyperlink": "Dodaj",
     "AppCloseBackgroundSynchronizationWarningTitle": "Synchronizacja w tle",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Aplikacja nie została ustawiona do uruchamiania przy starcie systemu Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Konto IMAP",
     "Busy": "Zajęty",
     "Buttons_AddAccount": "Dodaj konto",
+    "Buttons_FixAccount": "Napraw konto",
     "Buttons_AddNewAlias": "Dodaj nowy alias",
     "Buttons_Allow": "Zezwól",
+    "Buttons_Apply": "Zastosuj",
     "Buttons_ApplyTheme": "Zastosuj motyw",
     "Buttons_Browse": "Przeglądaj",
     "Buttons_Cancel": "Anuluj",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Edytuj",
     "Buttons_EnableImageRendering": "Włącz",
     "Buttons_Multiselect": "Wybierz wielokrotnie",
+    "Buttons_Manage": "Zarządzaj",
     "Buttons_No": "Nie",
     "Buttons_Open": "Otwórz",
     "Buttons_Purchase": "Kup",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Zapisz",
     "Buttons_SaveConfiguration": "Zapisz konfigurację",
     "Buttons_Send": "Wyślij",
+    "Buttons_SendToServer": "Wyślij do serwera",
     "Buttons_Share": "Udostępnij",
     "Buttons_SignIn": "Zaloguj się",
     "Buttons_Sync": "Synchronizuj",
     "Buttons_SyncAliases": "Synchronizuj aliasy",
     "Buttons_TryAgain": "Spróbuj ponownie",
     "Buttons_Yes": "Tak",
+    "Sync_SynchronizingFolder": "Trwa synchronizacja {0} {1}%",
+    "Sync_DownloadedMessages": "Pobrano {0} wiadomości z {1}",
+    "SyncAction_Archiving": "Archiwizowanie {0} wiadomości e-mail",
+    "SyncAction_ClearingFlag": "Cofanie flagi dla {0} wiadomości",
+    "SyncAction_CreatingDraft": "Tworzenie szkicu",
+    "SyncAction_CreatingEvent": "Tworzenie wydarzenia",
+    "SyncAction_Deleting": "Usuwanie {0} wiadomości",
+    "SyncAction_EmptyingFolder": "Opróżnianie folderu",
+    "SyncAction_MarkingAsRead": "Oznaczanie {0} wiadomości jako przeczytanych",
+    "SyncAction_MarkingAsUnread": "Oznaczanie {0} wiadomości jako nieprzeczytanych",
+    "SyncAction_MarkingFolderAsRead": "Oznaczanie folderu jako przeczytanego",
+    "SyncAction_Moving": "Przenoszenie {0} wiadomości",
+    "SyncAction_MovingToFocused": "Przenoszenie {0} wiadomości do Zakładki Skupione",
+    "SyncAction_RenamingFolder": "Zmienianie nazwy folderu",
+    "SyncAction_SendingMail": "Wysyłanie wiadomości e-mail",
+    "SyncAction_SettingFlag": "Ustawianie flagi {0} wiadomości",
+    "SyncAction_SynchronizingAccount": "Synchronizowanie {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronizowanie {0} kont",
+    "SyncAction_SynchronizingCalendarData": "Synchronizowanie danych kalendarza",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronizowanie wydarzeń kalendarza",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchronizowanie metadanych kalendarza",
+    "SyncAction_Unarchiving": "Przywracanie {0} wiadomości z archiwum",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Akceptuj",
+    "CalendarEventResponse_AcceptedResponse": "Zaakceptowano",
+    "CalendarEventResponse_Decline": "Odrzuć",
+    "CalendarEventResponse_DeclinedResponse": "Odrzucono",
+    "CalendarEventResponse_NotResponded": "Brak odpowiedzi",
+    "CalendarEventResponse_Tentative": "Wstępny",
+    "CalendarEventResponse_TentativeResponse": "Wstępny",
+    "CalendarEventRsvpPanel_Accept": "Akceptuj",
+    "CalendarEventRsvpPanel_AddMessage": "Dodaj wiadomość do odpowiedzi... (opcjonalnie)",
+    "CalendarEventRsvpPanel_Decline": "Odrzuć",
+    "CalendarEventRsvpPanel_Message": "Wiadomość",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Wyślij wiadomość odpowiedzi",
+    "CalendarEventRsvpPanel_Tentative": "Wstępny",
+    "CalendarEventRsvpPanel_Title": "Opcje odpowiedzi",
+    "CalendarAttendeeStatus_Accepted": "Zaakceptowano",
+    "CalendarAttendeeStatus_Declined": "Odrzucono",
+    "CalendarAttendeeStatus_NeedsAction": "Wymaga akcji",
+    "CalendarAttendeeStatus_Tentative": "Wstępny",
+    "CalendarEventDetails_Attachments": "Załączniki",
+    "CalendarEventCompose_AddAttachment": "Dodaj załącznik",
+    "CalendarEventCompose_AllDay": "Całodniowe",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Załączniki nie są obsługiwane w kalendarzach CalDAV.",
+    "CalendarEventCompose_EndDate": "Data zakończenia",
+    "CalendarEventCompose_EndTime": "Czas zakończenia",
+    "CalendarEventCompose_Every": "co",
+    "CalendarEventCompose_ForWeekdays": "dla",
+    "CalendarEventCompose_FrequencyDay": "dzień",
+    "CalendarEventCompose_FrequencyDayPlural": "dni",
+    "CalendarEventCompose_FrequencyMonth": "miesiąc",
+    "CalendarEventCompose_FrequencyMonthPlural": "miesięcy",
+    "CalendarEventCompose_FrequencyWeek": "tydzień",
+    "CalendarEventCompose_FrequencyWeekPlural": "tygodni",
+    "CalendarEventCompose_FrequencyYear": "rok",
+    "CalendarEventCompose_FrequencyYearPlural": "lat",
+    "CalendarEventCompose_Location": "Lokalizacja",
+    "CalendarEventCompose_LocationPlaceholder": "Dodaj lokalizację",
+    "CalendarEventCompose_NewEventButton": "Nowe wydarzenie",
+    "CalendarEventCompose_DefaultCalendarHint": "Możesz wybrać domyślny kalendarz dla nowych wydarzeń w ustawieniach kalendarza.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Otwórz ustawienia kalendarza",
+    "CalendarEventCompose_NoCalendarsMessage": "Na razie nie ma dostępnych kalendarzy do tworzenia wydarzeń.",
+    "CalendarEventCompose_NoCalendarsTitle": "Brak dostępnych kalendarzy",
+    "CalendarEventCompose_NoEndDate": "Brak daty zakończenia",
+    "CalendarEventCompose_Notes": "Notatki",
+    "CalendarEventCompose_PickCalendarTitle": "Wybierz kalendarz",
+    "CalendarEventCompose_Recurring": "Powtarzające się",
+    "CalendarEventCompose_RecurringSummary": "Występuje co {0} {1}{2} {3} skuteczne {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Występuje {0}{1} {2} skuteczne {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Powtarzaj co",
+    "CalendarEventCompose_SelectCalendar": "Wybierz kalendarz",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Występuje w {0} {1}",
+    "CalendarEventCompose_StartDate": "Data rozpoczęcia",
+    "CalendarEventCompose_StartTime": "Czas rozpoczęcia",
+    "CalendarEventCompose_TimeRangeSummary": "od {0} do {1}",
+    "CalendarEventCompose_Title": "Tytuł wydarzenia",
+    "CalendarEventCompose_TitlePlaceholder": "Dodaj tytuł",
+    "CalendarEventCompose_Until": "do",
+    "CalendarEventCompose_UntilSummary": "  do {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Data zakończenia dnia całodniowego musi być późniejsza niż data rozpoczęcia.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Co najmniej jeden uczestnik ma nieprawidłowy adres e-mail.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Data zakończenia powtarzania musi być równa lub późniejsza niż data rozpoczęcia wydarzenia.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Czas zakończenia musi być późniejszy niż czas rozpoczęcia.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Jedna lub więcej załączników nie jest już dostępnych: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Wybierz kalendarz przed utworzeniem wydarzenia.",
+    "CalendarEventCompose_ValidationMissingTitle": "Wprowadź tytuł wydarzenia przed utworzeniem wydarzenia.",
+    "CalendarEventCompose_ValidationTitle": "Walidacja tytułu nie powiodła się",
+    "CalendarEventCompose_WeekdaySummary": "  w {0}",
+    "CalendarEventCompose_Weekday_Friday": "Pt",
+    "CalendarEventCompose_Weekday_Monday": "Pn",
+    "CalendarEventCompose_Weekday_Saturday": "So",
+    "CalendarEventCompose_Weekday_Sunday": "Nd",
+    "CalendarEventCompose_Weekday_Thursday": "Cz",
+    "CalendarEventCompose_Weekday_Tuesday": "Wt",
+    "CalendarEventCompose_Weekday_Wednesday": "Śr",
+    "CalendarEventDetails_Details": "Szczegóły",
+    "CalendarEventDetails_EditSeries": "Edytuj serię",
+    "CalendarEventDetails_Editing": "Edytowanie",
+    "CalendarEventDetails_InviteSomeone": "Zaprosić kogoś",
+    "CalendarEventDetails_JoinOnline": "Dołącz online",
+    "CalendarEventDetails_Organizer": "Organizator",
+    "CalendarEventDetails_People": "Osoby",
+    "CalendarEventDetails_ReadOnlyEvent": "Wydarzenie tylko do odczytu",
+    "CalendarEventDetails_Reminder": "Przypomnienie",
+    "CalendarReminder_StartedHoursAgo": "Rozpoczęto {0} godzin temu",
+    "CalendarReminder_StartedMinutesAgo": "Rozpoczęto {0} minut temu",
+    "CalendarReminder_StartedNow": "Właśnie rozpoczęto",
+    "CalendarReminder_StartingNow": "Rozpoczyna się teraz",
+    "CalendarReminder_StartsInHours": "Zaczyna się za {0} godzin",
+    "CalendarReminder_StartsInMinutes": "Zaczyna się za {0} minut",
+    "CalendarReminder_SnoozeAction": "Przypomnij później",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minut",
+    "CalendarEventDetails_ShowAs": "Pokaż jako",
+    "CalendarShowAs_Free": "Wolny",
+    "CalendarShowAs_Tentative": "Wstępny",
+    "CalendarShowAs_Busy": "Zajęty",
+    "CalendarShowAs_OutOfOffice": "Poza biurem",
+    "CalendarShowAs_WorkingElsewhere": "Pracuję w innym miejscu",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} skopiowano do schowka.",
     "ClipboardTextCopied_Title": "Skopiowane",
     "ClipboardTextCopyFailed_Message": "Nie udało się skopiować {0} do schowka.",
+    "ContactInfoBar_ErrorTitle": "Nie udało się załadować informacji kontaktowych",
+    "ContactInfoBar_SuccessTitle": "Informacje kontaktowe załadowane",
+    "ContactInfoBar_WarningTitle": "Informacje kontaktowe mogą być niekompletne",
     "ComingSoon": "Już wkrótce...",
     "ComposerAttachmentsDragDropAttach_Message": "Załącz",
     "ComposerAttachmentsDropZone_Message": "Upuść pliki tutaj",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nazwa połączonego konta",
     "DialogMessage_DeleteAccountConfirmationMessage": "Usunąć {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Wszystkie dane powiązane z tym kontem zostaną trwale usunięte z dysku.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Usuń szablon \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Usuń szablon e-mail",
+    "DialogMessage_DeleteRecurringSeriesMessage": "To usunie wszystkie zdarzenia z serii. Czy chcesz kontynuować?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Usuń serię cykliczną",
     "DialogMessage_DiscardDraftConfirmationMessage": "Ta wersja robocza zostanie odrzucona. Czy chcesz kontynuować?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Porzuć wersje roboczą",
     "DialogMessage_EmptySubjectConfirmation": "Brak tematu",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Tryb jasny",
     "Emoji": "Emotikony",
     "Error_FailedToSetupSystemFolders_Title": "Nie udało się skonfigurować folderów systemowych",
+    "Exception_AccountNeedsAttention_Title": "Konto wymaga uwagi",
+    "Exception_AccountNeedsAttention_Message": "'{0}' wymaga Twojej uwagi, aby kontynuować pracę.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail nie mógł odnaleźć środowiska WebView2 firmy Microsoft Edge. Proszę zainstalować lub naprawić to środowisko, aby prawidłowo renderować treść wiadomości.",
+    "Exception_WebView2RuntimeMissing_Title": "Wymagane środowisko WebView2",
     "Exception_AuthenticationCanceled": "Anulowano uwierzytelnianie",
     "Exception_CustomThemeExists": "Ten motyw już istnieje.",
     "Exception_CustomThemeMissingName": "Musisz podać nazwę.",
     "Exception_CustomThemeMissingWallpaper": "Musisz podać niestandardowy obraz tła.",
     "Exception_FailedToSynchronizeAliases": "Nie udało się zsynchronizować aliasów",
+    "Exception_FailedToSynchronizeCalendarData": "Nie udało się zsynchronizować danych kalendarza",
+    "Exception_FailedToSynchronizeCalendarEvents": "Nie udało się zsynchronizować zdarzeń kalendarza",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Nie udało się zsynchronizować szczegółów kalendarza",
     "Exception_FailedToSynchronizeFolders": "Nie udało się zsynchronizować folderów",
     "Exception_FailedToSynchronizeProfileInformation": "Nie udało się zsynchronizować informacji o profilu",
     "Exception_GoogleAuthCallbackNull": "Adres uri wywołania zwrotnego jest pusty przy aktywacji.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Przenieś do wiadomości-śmieci",
     "HoverActionOption_ToggleFlag": "Oflaguj / Usuń flagę",
     "HoverActionOption_ToggleRead": "Przeczytane / Nieprzeczytane",
+    "KeyboardShortcuts_FailedToReset": "Nie udało się zresetować skrótów klawiaturowych.",
+    "KeyboardShortcuts_FailedToUpdate": "Nie udało się zaktualizować skrótów klawiaturowych.",
+    "KeyboardShortcuts_MailoperationAction": "Akcja",
+    "KeyboardShortcuts_Action": "Akcja",
+    "KeyboardShortcuts_FailedToLoad": "Nie udało się załadować skrótów klawiaturowych.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Proszę wprowadzić klawisz dla skrótu.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Wybierz akcję do wykonania dla skrótu.",
+    "KeyboardShortcuts_EnterKey": "Proszę wprowadzić klawisz dla skrótu.",
+    "KeyboardShortcuts_SelectOperation": "Proszę wybrać akcję dla skrótu.",
+    "KeyboardShortcuts_ShortcutInUse": "Ten skrót jest już używany przez inny skrót.",
+    "KeyboardShortcuts_FailedToSave": "Nie udało się zapisać skrótu.",
+    "KeyboardShortcuts_FailedToDelete": "Nie udało się usunąć skrótu.",
+    "KeyboardShortcuts_PageDescription": "Skonfiguruj skróty klawiaturowe dla szybkich operacji poczty. Naciśnij klawisze, gdy fokus znajduje się w polu wejścia klawisza, aby przechwycić skróty.",
+    "KeyboardShortcuts_Add": "Dodaj skrót",
+    "KeyboardShortcuts_EditTitle": "Edytuj skrót klawiaturowy",
+    "KeyboardShortcuts_ResetToDefaults": "Przywróć domyślne",
+    "KeyboardShortcuts_PressKeysHere": "Naciśnij tutaj klawisze...",
+    "KeyboardShortcuts_KeyCombination": "Kombinacja klawiszy",
+    "KeyboardShortcuts_FocusArea": "Skup fokus na polu powyżej i naciśnij żądaną kombinację klawiszy",
+    "KeyboardShortcuts_Modifiers": "Klawisze modyfikujące",
+    "KeyboardShortcuts_Mode": "Tryb aplikacji",
+    "KeyboardShortcuts_ModeMail": "Poczta",
+    "KeyboardShortcuts_ModeCalendar": "Kalendarz",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Przełączanie między przeczytanym a nieprzeczytanym",
+    "KeyboardShortcuts_ActionToggleFlag": "Przełącz flagę",
+    "KeyboardShortcuts_ActionToggleArchive": "Przełącz archiwizację/wyarchiwizuj",
     "ImageRenderingDisabled": "Wyświetlanie obrazów jest wyłączone dla tej wiadomości.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Metoda autoryzacji",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Zabezpieczenia dot. połączenia",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nazwa użytkownika",
     "IMAPSetupDialog_UsernamePlaceholder": "jankowalski, jankowalski@jakasdomena.com, domena/jankowalski",
     "IMAPSetupDialog_UseSameConfig": "Użyj tej samej nazwy użytkownika i hasła dla poczty wychodzącej",
+    "ImapCalDavSettingsPage_TitleCreate": "Konfiguracja IMAP i Kalendarza",
+    "ImapCalDavSettingsPage_TitleEdit": "Edytuj ustawienia IMAP i kalendarza",
+    "ImapCalDavSettingsPage_Subtitle": "Skonfiguruj IMAP/SMTP i opcjonalną synchronizację kalendarza dla tego konta.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Podstawowa konfiguracja",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Wprowadź swoją tożsamość i dane uwierzytelniające. Wino może spróbować automatycznie wykryć ustawienia serwera.",
+    "ImapCalDavSettingsPage_BasicTab": "Podstawowy",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Włącz obsługę kalendarza",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Automatyczne wykrywanie ustawień poczty",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Ustawienia poczty zostały wykryte i zastosowane.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Zaawansowana konfiguracja",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Wprowadź ręcznie ustawienia serwera, jeśli automatyczne wykrywanie nie jest dostępne lub nieprawidłowe.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Zaawansowany",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Ustawienia kalendarza",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Wybierz, jak dane kalendarza będą działać dla tego konta IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Tryb kalendarza",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Bezpieczeństwo połączenia",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Metoda uwierzytelniania",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Wyłączony",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Synchronizacja CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Tylko kalendarz lokalny",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalendarz jest wyłączony dla tego konta.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Elementy kalendarza są synchronizowane z Twoim serwerem CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Elementy kalendarza są przechowywane wyłącznie na tym komputerze i nie są synchronizowane z siecią.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Jak działa kalendarz lokalny",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Tylko kalendarz lokalny",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Kalendarz lokalny przechowuje wszystkie zdarzenia wyłącznie na Twoim komputerze. Nic nie synchronizuje się z iCloud, Yahoo ani innym dostawcą.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL usługi CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nazwa użytkownika CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Hasło CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Test CalDAV jest wymagany tylko wtedy, gdy tryb kalendarza ustawiony jest na synchronizację CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "Wymagany jest URL usługi CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL usługi CalDAV musi być bezwzględny.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Wymagana jest nazwa użytkownika CalDAV.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Wymagane jest hasło CalDAV.",
+    "ImapCalDavSettingsPage_TestImapButton": "Testuj połączenie IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Testuj połączenie CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Test połączenia IMAP zakończony pomyślnie.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Test połączenia CalDAV zakończony pomyślnie.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Ustawienia konta zweryfikowane i zapisane.",
+    "ImapCalDavSettingsPage_ICloudHint": "Użyj hasła specyficznego dla aplikacji wygenerowanego w ustawieniach konta Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Użyj hasła aplikacji z ustawień zabezpieczeń konta Yahoo.",
     "Info_AccountCreatedMessage": "Utworzono {0}",
     "Info_AccountCreatedTitle": "Tworzenie konta",
     "Info_AccountCreationFailedTitle": "Tworzenie konta nie powiodło się",
     "Info_AccountDeletedMessage": "Usunięto {0}.",
     "Info_AccountDeletedTitle": "Konto usunięte",
     "Info_AccountIssueFixFailedTitle": "Nie powiodło się",
+    "Info_AccountIssueFixImapMessage": "Otwórz stronę ustawień IMAP i kalendarza, aby ponownie wprowadzić dane serwera.",
+    "Info_AccountAttentionRequiredMessage": "To konto wymaga Twojej uwagi.",
+    "Info_AccountAttentionRequiredClickableMessage": "Kliknij, aby naprawić to konto i ponownie zsynchronizować.",
+    "Info_AccountAttentionRequiredAction": "Napraw",
+    "Info_AccountAttentionRequiredActionHint": "Kliknij Napraw, aby rozwiązać ten problem z kontem.",
     "Info_AccountIssueFixSuccessMessage": "Naprawiono wszystkie problemy z kontem.",
     "Info_AccountIssueFixSuccessTitle": "Zakończono pomyślnie",
     "Info_AttachmentOpenFailedMessage": "Nie można otworzyć tego załącznika.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Ten folder jest wyłączony z synchronizacji.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Katalog niesynchronizowany",
     "Justify": "Wyjustuj",
+    "MenuUpdateAvailable": "Dostępna aktualizacja",
     "Left": "Wyrównaj do lewej",
     "Link": "Odnośnik",
     "LinkedAccountsCreatePolicyMessage": "musisz mieć co najmniej 2 konta, aby je połączyć\npołączenie zostanie usunięte przy zapisywaniu",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Odarchiwizuj",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Powiększ",
+    "MailsDragging": "Przenoszenie {0} elementu(-ów)",
     "MailsSelected": "{0} zaznaczonych elementów",
     "MarkFlagUnflag": "Oznacz jako oflagowane/nieoflagowane",
     "MarkReadUnread": "Oznacz jako przeczytane/nieprzeczytane",
@@ -431,10 +647,12 @@
     "NoMessageCrieteria": "Żadne wiadomości nie spełniają kryteriów wyszukiwania",
     "NoMessageEmptyFolder": "Ten katalog jest pusty",
     "Notifications_MultipleNotificationsMessage": "Masz {0} nowych wiadomości.",
-    "Notifications_MultipleNotificationsTitle": "Nowa wiadomość",
+    "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Sprawdź nową wersję {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail został zaktualizowany.",
-    "OnlineSearchFailed_Message": "Nie udało się wykonać wyszukiwania\n{0}\n\nWyświetlanie wiadomości offline.",
+    "Notifications_StoreUpdateAvailableTitle": "Aktualizacja dostępna",
+    "Notifications_StoreUpdateAvailableMessage": "Nowsza wersja Wino Mail jest gotowa do zainstalowania w Microsoft Store.",
+    "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
     "Other": "Inne",
@@ -446,28 +664,32 @@
     "PaneLengthOption_Small": "Mała",
     "Photos": "Zdjęcia",
     "PreparingFoldersMessage": "Przygotowywanie folderów",
-    "ProtocolLogAvailable_Message": "Rejestry protokołów są dostępne do diagnostyki.",
     "ProviderDetail_Gmail_Description": "Konto Google",
-    "ProviderDetail_iCloud_Description": "Konto Apple iCloud",
+    "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
     "ProviderDetail_IMAP_Description": "Serwer IMAP/SMTP",
     "ProviderDetail_IMAP_Title": "Serwer IMAP",
-    "ProviderDetail_Yahoo_Description": "Konto Yahoo",
+    "ProviderDetail_Yahoo_Description": "Yahoo Account",
     "ProviderDetail_Yahoo_Title": "Yahoo Mail",
-    "QuickEventDialog_EventName": "Nazwa wydarzenia",
-    "QuickEventDialog_IsAllDay": "Cały dzień",
-    "QuickEventDialog_Location": "Miejsce",
-    "QuickEventDialog_RemindMe": "Przypomnij mi",
-    "QuickEventDialogMoreDetailsButtonText": "Szczegóły",
+    "QuickEventDialog_EventName": "Event name",
+    "QuickEventDialog_IsAllDay": "All day",
+    "QuickEventDialog_Location": "Location",
+    "QuickEventDialog_RemindMe": "Remind me",
+    "QuickEventDialogMoreDetailsButtonText": "More details",
     "Reader_SaveAllAttachmentButtonText": "Zapisz wszystkie załączniki",
     "Results": "Wyniki",
     "Right": "Wyrównaj do prawej",
     "SearchBarPlaceholder": "Szukaj",
     "SearchingIn": "Szukanie w",
     "SearchPivotName": "Wyniki",
+    "Settings_KeyboardShortcuts_Title": "Skróty klawiszowe",
+    "Settings_KeyboardShortcuts_Description": "Zarządzaj skrótami klawiszowymi do szybkich akcji w wiadomościach.",
     "SettingConfigureSpecialFolders_Button": "Konfiguruj",
-    "SettingsEditAccountDetails_IMAPConfiguration_Title": "Ustawienia IMAP/SMTP",
-    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Zmień ustawienia serwera przychodzenia/wychodzącego.",
+    "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
+    "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Ustawienia IMAP i kalendarza",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Otwórz dedykowaną stronę ustawień IMAP, SMTP i CalDAV dla tego konta.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Otwórz ustawienia",
     "SettingsAbout_Description": "Dowiedz się więcej o Wino.",
     "SettingsAbout_Title": "O aplikacji",
     "SettingsAboutGithub_Description": "Przejdź do repozytorium trackera zgłoszeń GitHub.",
@@ -486,10 +708,14 @@
     "SettingsAppPreferences_CloseBehavior_Description": "Co powinno się wydarzyć po zamknięciu aplikacji?",
     "SettingsAppPreferences_CloseBehavior_Title": "Zachowanie zamknięcia aplikacji",
     "SettingsAppPreferences_Description": "Ustawienia ogólne / preferencje dla Wino Mail.",
-    "SettingsAppPreferences_SearchMode_Description": "Ustaw, czy Wino ma najpierw sprawdzać pobrane wiadomości podczas wyszukiwania, czy też zapytać o nie bezpośrednio serwer pocztowy online. Wyszukiwanie lokalne jest zawsze szybsze, a w razie potrzeby możesz wykonać wyszukiwanie online, jeśli Twoja wiadomość nie pojawi się w wynikach.",
-    "SettingsAppPreferences_SearchMode_Local": "Na tym urządzeniu",
+    "SettingsAppPreferences_SearchMode_Description": "Set whether Wino should check fetched mails first while doing a search or ask your mail server online. Local search is always faster and you can always do an online search if your mail is not in the results.",
+    "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
-    "SettingsAppPreferences_SearchMode_Title": "Domyślny tryb wyszukiwania",
+    "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Domyślny tryb aplikacji",
+    "SettingsAppPreferences_ApplicationMode_Description": "Wybierz tryb uruchamiania Wino, gdy żaden typ aktywacji nie jest jawnie ustawiony.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Poczta",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalendarz",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail będzie nadal działać w tle. Zostaniesz powiadomiony, gdy pojawią się nowe wiadomości.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Działanie w tle",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail będzie nadal działać w zasobniku systemowym. Aplikacja będzie dostępna do uruchomienia klikając na ikonę. Zostaniesz powiadomiony o pojawieniu się nowych wiadomości.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Wystąpił błąd krytyczny podczas zmiany trybu uruchamiania Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Uruchom zminimalizowany przy starcie Windowsa",
     "SettingsAppPreferences_Title": "Preferencje Aplikacji",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Ukryj przycisk konta Wino na pasku tytułu",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Ukryj przycisk profilu na pasku tytułu, który otwiera wysuwane menu konta Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Powiadomienia o aktualizacjach sklepu",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Pokaż powiadomienia i akcje w stopce, gdy dostępna jest aktualizacja Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Działania AI",
+    "SettingsAppPreferences_AiActions_Description": "Wybierz domyślne języki AI i miejsce zapisywania streszczeń.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Domyślny język tłumaczenia",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Wybierz domyślny język docelowy używany przez akcje tłumaczenia AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Język podsumowania",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Wybierz preferowany język podsumowań dla przyszłych wyników AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Domyślna ścieżka zapisywania streszczeń",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Wybierz folder, który Wino ma używać domyślnie do zapisywania streszczeń AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Użyj domyślnej lokalizacji zapisu systemu",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Ten folder nie istnieje. Zostanie użyta domyślna lokalizacja zapisu dla streszczeń.",
     "SettingsAutoSelectNextItem_Description": "Wybierz następny element po usunięciu lub przesunięciu wiadomości.",
     "SettingsAutoSelectNextItem_Title": "Automatycznie wybierz następny element",
     "SettingsAvailableThemes_Description": "Wybierz motyw z kolekcji Wino wedle uznania lub zastosuj własne motywy.",
     "SettingsAvailableThemes_Title": "Dostępne motywy",
-    "SettingsCalendarSettings_Description": "Zmień pierwszy dzień tygodnia, wysokość komórki godziny i inne...",
-    "SettingsCalendarSettings_Title": "Ustawienia kalendarza",
+    "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
+    "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Domyślny czas odroczenia",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Ustaw domyślny czas odroczenia powiadomień przypomnień kalendarza.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Format nagłówka dnia w widoku z czasem",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Wybierz, jak będą renderowane górne etykiety dni w widokach dzień, tydzień i tydzień roboczy. Używaj tokenów formatu daty takich jak ddd, dd, MMM lub dddd.",
     "SettingsComposer_Title": "Edytor",
     "SettingsComposerFont_Title": "Domyślna czcionka przy pisaniu wiadomości",
     "SettingsComposerFontFamily_Description": "Zmień domyślny rozmiar czcionki i czcionki dla pisanej wiadomości.",
@@ -521,16 +765,19 @@
     "SettingsCustomTheme_Title": "Własny motyw",
     "SettingsDeleteAccount_Description": "Usuń wszystkie e-maile i dane uwierzytelniające powiązane z tym kontem.",
     "SettingsDeleteAccount_Title": "Usuń to konto",
-    "SettingsDeleteProtection_Description": "Czy Wino powinno poprosić Cię o potwierdzenie za każdym razem, gdy próbujesz trwale usunąć wiadomość używając klawiszy Shift + Del?",
+    "SettingsDeleteProtection_Description": "Should Wino ask you for confirmation every time you try to permanently delete a mail using Shift + Del keys?",
     "SettingsDeleteProtection_Title": "Ochrona przed trwałym usunięciem",
     "SettingsDiagnostics_Description": "Dla programistów",
-    "SettingsDiagnostics_DiagnosticId_Description": "Udostępnij ten identyfikator deweloperom, gdy zostaniesz poproszony o pomoc w rozwiązaniu problemów, które napotykasz w Wino Mail.",
-    "SettingsDiagnostics_DiagnosticId_Title": "ID diagnostyczne",
+    "SettingsDiagnostics_DiagnosticId_Description": "Share this ID with the developers when asked to get help for the issues you experience in Wino Mail.",
+    "SettingsDiagnostics_DiagnosticId_Title": "Diagnostic ID",
     "SettingsDiagnostics_Title": "Diagnostyka",
     "SettingsDiscord_Description": "Otrzymuj regularne informacje dotyczące rozwoju aplikacji, dołącz do dyskusji o roadmapie i przedstawiaj opinie.",
     "SettingsDiscord_Title": "Kanał Discord",
     "SettingsEditLinkedInbox_Description": "Dodaj / usuń konta, zmień nazwę lub zerwij powiązanie między kontami.",
     "SettingsEditLinkedInbox_Title": "Edytuj połączoną skrzynkę odbiorczą",
+    "SettingsWindowBackdrop_Title": "Tło okna",
+    "SettingsWindowBackdrop_Description": "Wybierz efekt tła dla okien Wino.",
+    "SettingsWindowBackdrop_Disabled": "Wybór tła okna jest wyłączony, gdy motyw aplikacji nie jest ustawiony na Domyślny.",
     "SettingsElementTheme_Description": "Wybierz motyw Windows dla Wino",
     "SettingsElementTheme_Title": "Motyw elementu",
     "SettingsElementThemeSelectionDisabled": "Wybór motywu elementu jest wyłączony, gdy wybrany motyw aplikacji jest inny niż Domyślny.",
@@ -569,7 +816,7 @@
     "SettingsLinkedAccountsSave_Description": "Modyfikuj bieżące połączenie z nowymi kontami.",
     "SettingsLinkedAccountsSave_Title": "Zapisz zmiany",
     "SettingsLoadImages_Title": "Automatycznie wczytuj obrazy",
-    "SettingsLoadPlaintextLinks_Title": "Konwertuj zwykłe (tekstowe) linki na klikalne linki",
+    "SettingsLoadPlaintextLinks_Title": "Convert plaintext links to clickable links",
     "SettingsLoadStyles_Title": "Automatycznie wczytuj style",
     "SettingsMailListActionBar_Description": "Ukryj/pokaż pasek akcji na górze listy wiadomości.",
     "SettingsMailListActionBar_Title": "Pokaż akcje listy maili",
@@ -579,8 +826,10 @@
     "SettingsManageAccountSettings_Title": "Zarządzaj ustawieniami konta",
     "SettingsManageAliases_Description": "Zobacz aliasy e-mail przypisane do tego konta, zaktualizuj lub usuń je.",
     "SettingsManageAliases_Title": "Aliasy",
-    "SettingsEditAccountDetails_Title": "Edytuj szczegóły konta",
-    "SettingsEditAccountDetails_Description": "Zmień nazwę konta, nazwę nadawcy i przypisz nowy kolor, jeśli chcesz.",
+    "SettingsEditAccountDetails_Title": "Edit Account Details",
+    "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Zmiany zapisane",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Dane konta zostały pomyślnie zaktualizowane.",
     "SettingsManageLink_Description": "Przenieś elementy, aby dodać nowe połączenie lub usunąć istniejące połączenie.",
     "SettingsManageLink_Title": "Zarządzaj połączeniem kont",
     "SettingsMarkAsRead_Description": "Zmień, co powinno się stać z zaznaczonym elementem.",
@@ -594,9 +843,43 @@
     "SettingsNoAccountSetupMessage": "Nie skonfigurowano jeszcze żadnych kont.",
     "SettingsNotifications_Description": "Włącz lub wyłącz powiadomienia dla tego konta.",
     "SettingsNotifications_Title": "Powiadomienia",
-    "SettingsNotificationsAndTaskbar_Description": "Zmień, czy powiadomienia mają być wyświetlane oraz czy ma być pokazywana plakietka na pasku zadań dla tego konta.",
-    "SettingsNotificationsAndTaskbar_Title": "Powiadomienia i Pasek zadań",
+    "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
+    "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Strona główna",
+    "SettingsHome_SearchTitle": "Znajdź ustawienie",
+    "SettingsHome_SearchDescription": "Wyszukaj według funkcji, tematu lub słowa kluczowego, aby przejść bezpośrednio do właściwej strony ustawień.",
+    "SettingsHome_SearchPlaceholder": "Szukaj ustawień",
+    "SettingsHome_SearchExamples": "Przykłady: motyw, przechowywanie, język, podpis",
+    "SettingsHome_QuickLinks_Title": "Szybkie linki",
+    "SettingsHome_QuickLinks_Description": "Szybki dostęp do ustawień, do których ludzie najczęściej sięgają.",
+    "SettingsHome_StorageCard_Description": "Zobacz, ile lokalnych treści MIME gromadzi Wino na tym urządzeniu i oczyść je w razie potrzeby.",
+    "SettingsHome_StorageEmptySummary": "Na razie nie wykryto żadnych danych MIME w pamięci podręcznej.",
+    "SettingsHome_StorageLoading": "Sprawdzanie lokalnego użycia MIME...",
+    "SettingsHome_Tips_Title": "Wskazówki i sztuczki",
+    "SettingsHome_Tips_Description": "Kilka drobnych zmian może sprawić, że Wino stanie się bardziej osobiste.",
+    "SettingsHome_Tip_Theme": "Chcesz tryb ciemny lub zmiany akcentów? Otwórz Personalizację.",
+    "SettingsHome_Tip_Background": "Użyj preferencji aplikacji, aby kontrolować uruchamianie i synchronizację w tle.",
+    "SettingsHome_Tip_Shortcuts": "Skróty klawiszowe pomagają szybciej przeglądać wiadomości.",
+    "SettingsHome_Resources_Title": "Przydatne linki",
+    "SettingsHome_Resources_Description": "Otwórz zasoby projektu, informacje wsparcia i kanały wydań.",
     "SettingsOptions_Title": "Ustawienia",
+    "SettingsOptions_GeneralSection": "Ogólne",
+    "SettingsOptions_MailSection": "Poczta",
+    "SettingsOptions_CalendarSection": "Kalendarz",
+    "SettingsOptions_MoreComingSoon": "Więcej opcji wkrótce",
+    "SettingsOptions_HeroDescription": "Dostosuj swoje doświadczenie z Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} konto(-ów) skonfigurowane",
+    "SettingsSearch_ManageAccounts_Keywords": "konto;konta;skrzynka;skrzynki;alias;aliasy;profil;adres;adresy",
+    "SettingsSearch_AppPreferences_Keywords": "uruchamianie;tło;uruchamianie;synchronizacja;powiadomienie;powiadomienia;wyszukiwanie;tray;domyślne",
+    "SettingsSearch_LanguageTime_Keywords": "język;czas;zegar;lokalizacja;region;format;24 godziny;24h",
+    "SettingsSearch_Personalization_Keywords": "motyw;ciemny;jasny;wygląd;akcent;kolor;kolor;tryb;układ;gęstość",
+    "SettingsSearch_About_Keywords": "o;wersja;strona;prywatność;GitHub;dotacje;sklep;wsparcie",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "skrót;skróty;hotkey;hotkeys;klawisz;klawisze",
+    "SettingsSearch_MessageList_Keywords": "wiadomość;wiadomości;lista;wątki;wątki;avatar;podgląd;nadawca",
+    "SettingsSearch_ReadComposePane_Keywords": "czytnik;komponowanie;kompozytor;czcionka;czcionki;zawartość zewnętrzna;wyświetlanie;czytanie",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "podpis;podpisy;szyfrowanie;certyfikat;certyfikaty;S/MIME;S/MIME;bezpieczeństwo",
+    "SettingsSearch_Storage_Keywords": "przechowywanie;pamięć podręczna;buforowanie;MIME;dysk;przestrzeń;czyszczenie;wyczyść;dane lokalne",
+    "SettingsSearch_CalendarSettings_Keywords": "kalendarz;tydzień;godziny;harmonogram;wydarzenie;wydarzenia",
     "SettingsPaneLengthReset_Description": "Zresetuj rozmiar listy mailowej do oryginalnego, jeśli masz problemy z nim.",
     "SettingsPaneLengthReset_Title": "Zresetuj rozmiar listy pocztowej",
     "SettingsPaypal_Description": "Okaż dużo więcej miłości ❤️ Za wszystkie darowizny dziękuję.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Wyświetl czas w formacie 24-godzinnym",
     "SettingsPrivacyPolicy_Description": "Zapoznaj się z Polityką prywatności.",
     "SettingsPrivacyPolicy_Title": "Politykę prywatności",
+    "SettingsWebsite_Description": "Otwórz stronę Wino Mail.",
+    "SettingsWebsite_Title": "Strona internetowa",
     "SettingsReadComposePane_Description": "Czcionki, treści zewnętrzne.",
     "SettingsReadComposePane_Title": "Czytelnik i edytor",
     "SettingsReader_Title": "Czytelnik",
@@ -625,11 +910,24 @@
     "SettingsShowPreviewText_Title": "Pokaż podgląd tekstu",
     "SettingsShowSenderPictures_Description": "Ukryj/pokaż miniaturki zdjęć nadawcy.",
     "SettingsShowSenderPictures_Title": "Pokaż awatary nadawcy",
+    "SettingsEmailTemplates_Title": "Szablony e-mail",
+    "SettingsEmailTemplates_Description": "Zarządzaj szablonami wiadomości e-mail.",
+    "SettingsEmailTemplates_CreatePageTitle": "Nowy szablon",
+    "SettingsEmailTemplates_EditPageTitle": "Edytuj szablon",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nowy szablon",
+    "SettingsEmailTemplates_NewTemplateDescription": "Utwórz nowy szablon e-mail",
+    "SettingsEmailTemplates_NameTitle": "Nazwa",
+    "SettingsEmailTemplates_NamePlaceholder": "Nazwa szablonu",
+    "SettingsEmailTemplates_DescriptionTitle": "Opis",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Opcjonalny opis",
+    "SettingsEmailTemplates_ContentTitle": "Treść szablonu",
+    "SettingsEmailTemplates_ContentDescription": "Edytuj zawartość HTML tego szablonu.",
+    "SettingsEmailTemplates_NameRequired": "Nazwa szablonu jest wymagana.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
-    "SettingsEnableGravatarAvatars_Description": "Użyj gravatara (jeśli dostępny) jako zdjęcia nadawcy",
-    "SettingsEnableFavicons_Title": "Ikony domen (Favicons)",
-    "SettingsEnableFavicons_Description": "Użyj gravatara (jeśli dostępny) jako zdjęcia nadawcy",
-    "SettingsMailList_ClearAvatarsCache_Button": "Wyczyść cache awatarów",
+    "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
+    "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
+    "SettingsEnableFavicons_Description": "Use domain favicons (if available) as sender picture",
+    "SettingsMailList_ClearAvatarsCache_Button": "Clear cached avatars",
     "SettingsSignature_AddCustomSignature_Button": "Dodaj podpis",
     "SettingsSignature_AddCustomSignature_Title": "Dodaj własny podpis",
     "SettingsSignature_DeleteSignature_Title": "Usuń podpis",
@@ -645,14 +943,41 @@
     "SettingsStartupItem_Title": "Obiekt startowy",
     "SettingsStore_Description": "Okaż trochę miłości ❤️",
     "SettingsStore_Title": "Oceń w sklepie",
-    "SettingsTaskbarBadge_Description": "Dołącz licznik nieprzeczytanych wiadomości do paska zadań.",
+    "SettingsStorage_Title": "Przechowywanie",
+    "SettingsStorage_Description": "Skanuj i zarządzaj pamięcią podręczną MIME przechowywaną w lokalnym folderze danych.",
+    "SettingsStorage_ScanFolder": "Skanuj lokalny folder danych",
+    "SettingsStorage_NoLocalMimeDataFound": "Nie znaleziono lokalnych danych MIME.",
+    "SettingsStorage_NoAccountsFound": "Nie znaleziono kont.",
+    "SettingsStorage_TotalUsage": "Całkowite użycie MIME lokalnie: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} użyte w lokalnej pamięci podręcznej MIME",
+    "SettingsStorage_DeleteAll_Title": "Usuń całą zawartość MIME",
+    "SettingsStorage_DeleteAll_Description": "Usuń cały folder pamięci podręcznej MIME dla tego konta.",
+    "SettingsStorage_DeleteAll_Button": "Usuń wszystkie",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Usuń całą zawartość MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Czy usunąć wszystkie lokalne dane MIME dla {0}?",
+    "SettingsStorage_DeleteAll_Success": "Wszystkie treści MIME zostały usunięte.",
+    "SettingsStorage_DeleteOld_Title": "Usuń stare zawartości MIME",
+    "SettingsStorage_DeleteOld_Description": "Usuń pliki MIME na podstawie daty utworzenia wiadomości w lokalnej bazie danych.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 miesiąc",
+    "SettingsStorage_DeleteOld_3Months": "> 3 miesiące",
+    "SettingsStorage_DeleteOld_6Months": "> 6 miesięcy",
+    "SettingsStorage_DeleteOld_1Year": "> 1 rok",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Usuń stare zawartości MIME",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Czy usunąć lokalne dane MIME starsze niż {0} dla {1}?",
+    "SettingsStorage_DeleteOld_Success": "Usunięto {0} folder(y) MIME starszych niż {1}.",
+    "SettingsStorage_1Month": "1 miesiąc",
+    "SettingsStorage_3Months": "3 miesiące",
+    "SettingsStorage_6Months": "6 miesięcy",
+    "SettingsStorage_1Year": "1 rok",
+    "SettingsStorage_Months": "{0} miesięcy",
+    "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Ikona paska zadań",
     "SettingsThreads_Description": "Organizuj wiadomości w wątki konwersacji.",
     "SettingsThreads_Title": "Wątkowanie konwersacji",
     "SettingsUnlinkAccounts_Description": "Usuń łącze pomiędzy kontami. To nie spowoduje usunięcie Twoich kont.",
     "SettingsUnlinkAccounts_Title": "Odłącz konto",
-    "SettingsMailRendering_ActionLabels_Title": "Etykiety działań",
-    "SettingsMailRendering_ActionLabels_Description": "Pokaż etykiety działań.",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
     "SignatureDeleteDialog_Message": "Czy na pewno chcesz usunąć podpis \"{0}\"?",
     "SignatureDeleteDialog_Title": "Usuń podpis",
     "SignatureEditorDialog_SignatureName_Placeholder": "Nazwij swój podpis",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Nie można przypisać folderu skrzynki odbiorczej do innego folderu systemowego.",
     "SystemFolderConfigSetupSuccess_Message": "Foldery systemowe zostały pomyślnie skonfigurowane.",
     "SystemFolderConfigSetupSuccess_Title": "Konfiguracja folderów systemowych",
+    "SystemTrayMenu_ShowWino": "Otwórz Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Otwórz Kalendarz Wino",
+    "SystemTrayMenu_ExitWino": "Zamknij",
     "TestingImapConnectionMessage": "Testowanie połączenia z serwerem...",
     "TitleBarServerDisconnectedButton_Description": "Wino jest odłączone od sieci. Kliknij 'połącz ponownie', aby przywrócić połączenie.",
     "TitleBarServerDisconnectedButton_Title": "brak połączenia",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Ulepsz do nielimitowanych kont",
     "WinoUpgradeRemainingAccountsMessage": "Wykorzystano {0} z {1} darmowych kont.",
     "Yesterday": "Wczoraj",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "Interwał synchronizacji poczty",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Interwał automatycznej synchronizacji wiadomości e-mail (minuty). To ustawienie zostanie zastosowane dopiero po ponownym uruchomieniu aplikacji Wino Mail."
+    "Smime_ImportCertificates_Success": "Certyfikaty zaimportowano pomyślnie.",
+    "Smime_ImportCertificates_Error": "Błąd przy imporcie certyfikatów: {0}",
+    "Smime_RemoveCertificates_Confirm": "Czy na pewno chcesz usunąć certyfikaty {0}?",
+    "Smime_RemoveCertificates_Success": "Certyfikaty zostały usunięte.",
+    "Smime_ExportCertificates_Success": "Certyfikaty wyeksportowano.",
+    "Smime_ExportCertificates_Error": "Błąd eksportowania certyfikatów.",
+    "Smime_CertificateDetails": "Podmiot: {0}\nWystawca: {1}\nWażny od: {2}\nWażny do: {3}\nOdcisk palca: {4}",
+    "Smime_CertificatePassword_Title": "Wymagane hasło do certyfikatu",
+    "Smime_CertificatePassword_Placeholder": "Hasło certyfikatu dla {0} (opcjonalnie)",
+    "Smime_Confirm_Title": "Potwierdź",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Odśwież",
+    "SettingsSignatureAndEncryption_Title": "Podpisywanie i szyfrowanie",
+    "SettingsSignatureAndEncryption_Description": "Zarządzaj certyfikatami S/MIME do podpisywania i szyfrowania wiadomości e-mail.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Moje certyfikaty",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certyfikaty osobiste do podpisywania i szyfrowania",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certyfikaty odbiorców",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certyfikaty odbiorców do odszyfrowywania",
+    "SettingsSignatureAndEncryption_NameColumn": "Nazwa",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Wygasa dnia",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Odcisk palca",
+    "Buttons_Remove": "Usuń",
+    "Buttons_Export": "Eksportuj",
+    "Buttons_Import": "Importuj",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certyfikat podpisu S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Certyfikat szyfrowania S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Brak",
+    "SmimeSignaturesInMessage": "Podpisy w tej wiadomości:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, ważny do {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informacje o certyfikacie podpisu S/MIME",
+    "SmimeCertificateInfoTitle": "Informacje o certyfikacie S/MIME",
+    "SmimeNoCertificateFileFound": "Nie znaleziono pliku certyfikatu",
+    "SmimeSaveCertificate": "Zapisz certyfikat...",
+    "SmimeCertificate": "Certyfikat S/MIME",
+    "SmimeCertificateSavedTo": "Certyfikat zapisany w {0}",
+    "SmimeSignedTooltip": "Ta wiadomość jest podpisana certyfikatem S/MIME. Kliknij, aby uzyskać więcej szczegółów",
+    "SmimeEncryptedTooltip": "Ta wiadomość jest zaszyfrowana certyfikatem S/MIME.",
+    "SmimeCertificateFileInfo": "Plik: {0}\nTyp: {1}\nRozmiar: {2:N0} bajtów",
+    "Composer_LightTheme": "Jasny motyw",
+    "Composer_DarkTheme": "Ciemny motyw",
+    "Composer_Outdent": "Cofnij wcięcie",
+    "Composer_Indent": "Wcięcie",
+    "Composer_BulletList": "Listy punktowane",
+    "Composer_OrderedList": "Listy numerowane",
+    "Composer_Stroke": "Obrys",
+    "Composer_Bold": "Pogrubienie",
+    "Composer_Italic": "Kursywa",
+    "Composer_Underline": "Podkreślenie",
+    "Composer_CcBcc": "DW i UDW",
+    "Composer_EnableSmimeSignature": "Włącz/wyłącz podpis S/MIME",
+    "Composer_EnableSmimeEncryption": "Włącz/wyłącz szyfrowanie S/MIME",
+    "Composer_LocalDraftSyncInfo": "Ten szkic jest wyłącznie lokalny. Wino nie udało się go wysłać na serwer pocztowy. Kliknij, aby ponownie spróbować wysłać go na serwer.",
+    "Composer_CertificateExpires": "Wygasa:",
+    "Composer_SmimeSignature": "Podpis S/MIME",
+    "Composer_SmimeEncryption": "Szyfrowanie S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Szablony wiadomości e-mail",
+    "Composer_AiSummarize": "Streszczaj AI",
+    "Composer_AiSummarizeDescription": "Wyodrębnia kluczowe punkty, zadania do wykonania i decyzje z tej wiadomości.",
+    "Composer_AiTranslate": "Tłumacz za pomocą AI",
+    "Composer_AiActions": "Działania AI",
+    "Composer_AiRewrite": "Przepisz za pomocą AI",
+    "AiActions_CheckingStatus": "Sprawdzanie dostępu do AI...",
+    "AiActions_SignedOutTitle": "Odblokuj pakiet Wino AI",
+    "AiActions_SignedOutDescription": "Tłumaczenie, przepisywanie i streszczanie wiadomości za pomocą AI po zalogowaniu do konta Wino i aktywacji dodatku AI Pack.",
+    "AiActions_NoPackTitle": "Wymagany pakiet AI",
+    "AiActions_NoPackDescription": "Jesteś zalogowany, ale pakiet AI nie jest jeszcze aktywny. Wykup go, aby korzystać z tłumaczenia, przepisywania i streszczania AI w Wino.",
+    "AiActions_UsageSummary": "{0} z {1} kredytów wykorzystano w tym miesiącu.",
+    "Composer_AiRewritePolite": "Uczyń to grzeczniejszym",
+    "Composer_AiRewritePoliteDescription": "Złagodza ton, zachowując ten sam sens.",
+    "Composer_AiRewriteAngry": "Uczyń to agresywnym",
+    "Composer_AiRewriteAngryDescription": "Używa ostrzejszego i bardziej konfrontacyjnego tonu.",
+    "Composer_AiRewriteHappy": "Spraw, by to było radosne.",
+    "Composer_AiRewriteHappyDescription": "Dodaje ton bardziej pogodny i entuzjastyczny.",
+    "Composer_AiRewriteFormal": "Uczyń to formalnym",
+    "Composer_AiRewriteFormalDescription": "Sprawia, że wiadomość brzmi bardziej profesjonalnie i jest bardziej uporządkowana.",
+    "Composer_AiRewriteFriendly": "Spraw, by to było przyjazne.",
+    "Composer_AiRewriteFriendlyDescription": "Sprawia, że wiadomość staje się bardziej przyjazna.",
+    "Composer_AiRewriteShorter": "Uczyń to krótsze",
+    "Composer_AiRewriteShorterDescription": "Skraca tekst i usuwa zbędne szczegóły.",
+    "Composer_AiRewriteClearer": "Spraw, by to było jaśniejsze.",
+    "Composer_AiRewriteClearerDescription": "Poprawia czytelność i sprawia, że wiadomość jest łatwiejsza do zrozumienia.",
+    "Composer_AiRewriteCustom": "Własne",
+    "Composer_AiRewriteCustomDescription": "Opisz własny cel przepisu.",
+    "Composer_AiRewriteCustomPlaceholder": "Opisz, jak chcesz, aby wiadomość została przepisana",
+    "Composer_AiRewriteMode": "Ton przepisu",
+    "Composer_AiRewriteApply": "Zastosuj przepisanie",
+    "Composer_AiTranslateDialogTitle": "Tłumacz z AI",
+    "Composer_AiTranslateDialogDescription": "Wprowadź docelowy język lub kod kultury, np. en-US, tr-TR, de-DE lub fr-FR.",
+    "Composer_AiTranslateApply": "Przetłumacz",
+    "Composer_AiTranslateLanguage": "Język docelowy",
+    "Composer_AiTranslateCustomPlaceholder": "Wprowadź kod kultury",
+    "Composer_AiTranslateLanguageEnglish": "Angielski (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turecki (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Niemiecki (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francuski (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Hiszpański (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Włoski (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugalski (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Niderlandzki (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polski (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rosyjski (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japoński (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Koreański (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chiński, uproszczony (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabski (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Inne...",
+    "Composer_AiBusyTitle": "AI już działa",
+    "Composer_AiBusyMessage": "Proszę poczekać, aż zakończy się bieżąca operacja AI.",
+    "Composer_AiSignInRequired": "Zaloguj się na konto Wino, aby korzystać z funkcji AI.",
+    "Composer_AiMissingHtml": "Nie ma jeszcze treści wiadomości do wysłania do Wino AI.",
+    "Composer_AiQuotaUnavailable": "Wynik AI został zastosowany.",
+    "Composer_AiAppliedMessage": "Wynik AI został zastosowany w komponencie. Użyj Cofnij, jeśli chcesz cofnąć zmianę.",
+    "Composer_AiSummarizeSuccessTitle": "Podsumowanie AI zostało zastosowane.",
+    "Composer_AiTranslateSuccessTitle": "Tłumaczenie AI zostało zastosowane.",
+    "Composer_AiRewriteSuccessTitle": "Przepis AI został zastosowany.",
+    "Composer_AiErrorTitle": "Akcja AI nie powiodła się.",
+    "Reader_AiAppliedMessage": "Wynik AI jest teraz wyświetlany dla tej wiadomości. Otwórz ponownie wiadomość, aby ponownie zobaczyć oryginalną treść.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontakty",
+    "ContactsPage_AddContact": "Dodaj kontakt",
+    "ContactsPage_EditContact": "Edytuj kontakt",
+    "ContactsPage_DeleteContact": "Usuń kontakt",
+    "ContactsPage_SearchPlaceholder": "Wyszukaj kontakty...",
+    "ContactsPage_NoContacts": "Nie znaleziono kontaktów",
+    "ContactsPage_ContactsCount": "{0} kontaktów",
+    "ContactsPage_SelectedContactsCount": "{0} wybranych",
+    "ContactsPage_DeleteSelectedContacts": "Usuń wybrane",
+    "ContactEditDialog_Title": "Edytuj kontakt",
+    "ContactEditDialog_PhotoSection": "Zdjęcie",
+    "ContactEditDialog_ChoosePhoto": "Wybierz zdjęcie",
+    "ContactEditDialog_RemovePhoto": "Usuń zdjęcie",
+    "ContactEditDialog_NameHeader": "Nazwa",
+    "ContactEditDialog_NamePlaceholder": "Nazwa kontaktu",
+    "ContactEditDialog_EmailHeader": "Adres e-mail",
+    "ContactEditDialog_EmailPlaceholder": "kontakt@example.com",
+    "ContactEditDialog_InfoSection": "Informacje kontaktowe",
+    "ContactEditDialog_RootContactInfo": "To jest główny kontakt powiązany z twoimi kontami i nie może być usunięty.",
+    "ContactEditDialog_OverriddenContactInfo": "Ten kontakt został ręcznie zmodyfikowany i nie będzie aktualizowany podczas synchronizacji.",
+    "ContactsPage_Subtitle": "Zarządzaj kontaktami e-mail i ich informacjami",
+    "ContactStatus_Account": "Konto",
+    "ContactStatus_Modified": "Zmodyfikowano",
+    "ContactAction_Edit": "Edytuj kontakt",
+    "ContactAction_ChangePhoto": "Zmień zdjęcie",
+    "ContactAction_Delete": "Usuń kontakt",
+    "ContactAction_Add": "Dodaj kontakt",
+    "ContactSelection_Selected": "wybrane",
+    "ContactSelection_SelectAll": "Zaznacz wszystko",
+    "ContactSelection_Clear": "Wyczyść zaznaczenie",
+    "ContactsPage_EmptyState": "Brak kontaktów do wyświetlenia",
+    "ContactsPage_AddFirstContact": "Dodaj swój pierwszy kontakt",
+    "ContactsPage_ContactsCountSuffix": "kontakty",
+    "ContactsPane_NewContact": "Nowy kontakt",
+    "ContactsPane_DescriptionTitle": "Zarządzaj swoimi kontaktami",
+    "ContactsPane_DescriptionBody": "Utwórz kontakty, nadaj im nazwy, zaktualizuj zdjęcia profilowe i przechowuj zapisane dane w jednym miejscu.",
+    "ContactEditDialog_AddTitle": "Dodaj kontakt",
+    "ContactInfoBar_ContactAdded": "Kontakt dodano pomyślnie.",
+    "ContactInfoBar_ContactUpdated": "Kontakt zaktualizowano pomyślnie.",
+    "ContactInfoBar_ContactsDeleted": "Kontakty zostały usunięte pomyślnie.",
+    "ContactInfoBar_ContactPhotoUpdated": "Zdjęcie kontaktu zostało pomyślnie zaktualizowane.",
+    "ContactInfoBar_FailedToLoadContacts": "Nie udało się załadować kontaktów: {0}",
+    "ContactInfoBar_FailedToAddContact": "Nie udało się dodać kontaktu: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Nie udało się zaktualizować kontaktu: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Nie udało się usunąć kontaktów: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Nie udało się zaktualizować zdjęcia: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Kontakty główne nie mogą zostać usunięte.",
+    "ContactConfirmDialog_DeleteTitle": "Usuń kontakt",
+    "ContactConfirmDialog_DeleteMessage": "Czy na pewno chcesz usunąć kontakt '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Czy na pewno chcesz usunąć {0} kontaktów?",
+    "ContactConfirmDialog_DeleteButton": "Usuń",
+    "CalendarAccountSettings_Title": "Ustawienia konta kalendarza",
+    "CalendarAccountSettings_Description": "Zarządzaj ustawieniami kalendarza dla {0}",
+    "CalendarAccountSettings_AccountColor": "Kolor konta",
+    "CalendarAccountSettings_AccountColorDescription": "Zmień kolor wyświetlania dla tego konta kalendarza",
+    "CalendarAccountSettings_SyncEnabled": "Włącz synchronizację",
+    "CalendarAccountSettings_SyncEnabledDescription": "Włącz lub wyłącz synchronizację kalendarza dla tego konta",
+    "CalendarAccountSettings_DefaultShowAs": "Domyślny status dostępności",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Domyślny status dostępności dla nowych wydarzeń utworzonych tym kontem",
+    "CalendarAccountSettings_PrimaryCalendar": "Kalendarz główny",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Ustaw ten kalendarz jako główny kalendarz dla konta",
+    "CalendarSettings_NewEventBehavior_Header": "Zachowanie przycisku Nowe wydarzenie",
+    "CalendarSettings_NewEventBehavior_Description": "Wybierz, czy przycisk Nowe wydarzenie powinien pytać o kalendarz za każdym razem, czy zawsze otwierać określony kalendarz.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Pytaj za każdym razem.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Zawsze używaj określonego kalendarza.",
+    "CalendarSettings_Rendering_Title": "Renderowanie",
+    "CalendarSettings_Rendering_Description": "Skonfiguruj układ kalendarza i sposób wyświetlania.",
+    "CalendarSettings_Notifications_Title": "Powiadomienia",
+    "CalendarSettings_Notifications_Description": "Wybierz domyślne przypomnienie i sposób odraczania.",
+    "CalendarSettings_Preferences_Title": "Preferencje",
+    "CalendarSettings_Preferences_Description": "Ustaw, jak działa przycisk Nowe wydarzenie.",
+    "WhatIsNew_GetStartedButton": "Zacznij",
+    "WhatIsNew_ContinueAnywayButton": "Kontynuuj mimo wszystko",
+    "WhatIsNew_PreparingForNewVersionButton": "Przygotowywanie nowej wersji...",
+    "WhatIsNew_MigrationPreparing_Title": "Przygotowywanie danych",
+    "WhatIsNew_MigrationPreparing_Description": "Wino stosuje migracje aktualizacji. Proszę poczekać, aż przygotujemy dane Twojego konta na tę wersję.",
+    "WhatIsNew_MigrationFailedMessage": "Wykonanie migracji zakończyło się błędem kod {0}. Możesz kontynuować korzystanie z aplikacji. Jeśli napotkasz poważne problemy, ponownie zainstaluj aplikację.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Zaktualizowany",
+    "WhatIsNew_MigrationNotification_Message": "Otwórz aplikację, aby zakończyć aktualizację i zobaczyć nowości.",
+    "WelcomeWindow_Title": "Witamy w Wino Mail",
+    "WelcomeWindow_Subtitle": "Natywne doświadczenie Windows dla Poczty i Kalendarza.",
+    "WelcomeWindow_WhatsNewTitle": "Najnowsze zmiany",
+    "WelcomeWindow_FeaturesTitle": "Funkcje",
+    "WelcomeWindow_WhatsNewTab": "Co nowego",
+    "WelcomeWindow_FeaturesTab": "Funkcje",
+    "WelcomeWindow_GetStartedButton": "Rozpocznij od dodania konta",
+    "WelcomeWindow_GetStartedDescription": "Dodaj swoje konta Outlook, Gmail lub IMAP, aby rozpocząć z Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importuj z konta Wino",
+    "WelcomeWindow_ImportInProgress": "Importowanie zsynchronizowanych ustawień i kont...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nie znaleziono zsynchronizowanych kont w Twoim koncie Wino. Jeśli ustawienia były dostępne, zostały przywrócone. Aby dodać konto ręcznie, użyj Rozpocznij.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} zsynchronizowanych kont są już dostępne na tym urządzeniu. Aby dodać inne konto ręcznie, jeśli to potrzebne, użyj Rozpocznij.",
+    "WelcomeWindow_SetupTitle": "Skonfiguruj swoje konto",
+    "WelcomeWindow_SetupSubtitle": "Wybierz dostawcę poczty e-mail, aby rozpocząć",
+    "WelcomeWindow_AddAccountButton": "Dodaj konto",
+    "WelcomeWindow_SkipForNow": "Później pominę — skonfiguruję to później",
+    "WelcomeWindow_AppDescription": "Szybka i skupiona skrzynka odbiorcza — przeprojektowana dla Windows 11",
+    "WelcomeWizard_Step1Title": "Witaj",
+    "SystemTrayMenu_Open": "Otwórz",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Ustawienia synchronizacji",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Utrzymuj preferencje Wino w synchronizacji między urządzeniami.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Odblokuj dodatki",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Uzyskaj dostęp do funkcji premium, takich jak Pakiet AI Wino.",
+    "WinoAccount_Management_Description": "Zarządzaj kontem Wino, dostępem do Pakietu AI oraz zsynchronizowanymi preferencjami i szczegółami konta.",
+    "WinoAccount_Management_SignedOutTitle": "Zaloguj się do Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Zaloguj się lub utwórz konto, aby synchronizować e-maile, uzyskać dostęp do funkcji AI i zarządzać ustawieniami między urządzeniami.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Dodatki Wino",
+    "WinoAccount_Management_DataSectionHeader": "Dane",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Działania konta",
+    "WinoAccount_Management_AccountCardTitle": "Konto",
+    "WinoAccount_Management_AccountCardDescription": "Adres e-mail konta Wino i bieżący stan konta.",
+    "WinoAccount_Management_AiPackCardTitle": "Pakiet AI",
+    "WinoAccount_Management_AiPackCardDescription": "Sprawdź, czy Pakiet AI Wino jest aktywny i ile pozostało użycia.",
+    "WinoAccount_Management_AiPackActive": "Pakiet AI Wino jest aktywny",
+    "WinoAccount_Management_AiPackInactive": "Pakiet AI Wino nie jest aktywny",
+    "WinoAccount_Management_AiPackUsage": "{0} z {1} użyć zużyto. {2} pozostało.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Okres rozliczeniowy: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Szczegóły użycia nie są jeszcze dostępne.",
+    "WinoAccount_Management_AiPackBuyDescription": "Kup Pakiet AI Wino, aby tłumaczyć, przepisywać lub streszczać e-maile za pomocą AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Odblokuj Pakiet AI",
+    "WinoAccount_Management_AiPackPromoDescription": "Przyspiesz swój przepływ pracy z e-mailami dzięki narzędziom opartym na AI. Tłumacz wiadomości na ponad 50 języków, przepisuj dla jasności i tonu, oraz uzyskuj natychmiastowe streszczenia długich wątków.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mies.",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 kredytów",
+    "WinoAccount_Management_AiPackGetButton": "Pobierz Pakiet AI",
+    "WinoAddOn_AI_PACK_Name": "Pakiet AI Wino",
+    "WinoAddOn_AI_PACK_Description": "Narzędzia z AI do tłumaczenia, przepisywania i streszczania wiadomości w Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, tłumaczenie, przepisywanie, streszczanie, produktywność",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Nielimitowane konta",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Usuń ograniczenie kont i dodawaj dowolną liczbę kont pocztowych.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "konta, nieograniczony, premium, dodatek",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Zaloguj się na swoje konto Wino, aby ukończyć ten zakup.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino nie mógł zakończyć tego zakupu w Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Zakup zakończony, ale Wino nie mógł odświeżyć korzyści konta. Spróbuj ponownie za chwilę.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Twoja subskrypcja jest aktywna",
+    "WinoAccount_Management_AiPackRenews": "Odnowienie {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Wykorzystane kredyty w tym miesiącu",
+    "WinoAccount_Management_AiPackResets": "Reset {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Wystąpiły problemy z wczytywaniem salda użycia AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Tłumaczenie",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Przepisanie",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Streszczenie",
+    "WinoAccount_Management_AddOnLoadFailed": "Wystąpiły problemy z wczytywaniem tego dodatku.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchronizuj Preferencje i Konta",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importuj lub eksportuj swoje preferencje Wino i dane skrzynki pocztowej między urządzeniami. Hasła, tokeny i inne wrażliwe informacje nigdy nie są synchronizowane.",
+    "WinoAccount_Management_SignOutTitle": "Wyloguj się",
+    "WinoAccount_Management_SignOutDescription": "Wyloguj się ze swojego konta na tym urządzeniu",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Na razie nie przechowujemy zsynchronizowanych danych dla tego konta.",
+    "WinoAccount_Management_ExportSucceeded": "Wybrane dane Wino zostały pomyślnie wyeksportowane.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Twoje preferencje zostały wyeksportowane do konta Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Wyeksportowano {0} szczegółów konta do Twojego konta Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Zaimportowano zsynchronizowane dane z konta Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Zastosowano {0} zsynchronizowanych preferencji.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Zaimportowano {0} kont.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Pominięto {0} kont, które już istnieją na tym urządzeniu.",
+    "WinoAccount_Management_ImportPartial": "Zastosowano {0} zsynchronizowanych preferencji. {1} ustawień nie udało się przywrócić.",
+    "WinoAccount_Management_ImportReloginReminder": "Hasła, tokeny i inne wrażliwe dane nie zostały zaimportowane. Zaloguj się ponownie dla każdego konta na tym urządzeniu przed użyciem.",
+    "WinoAccount_Management_SerializeFailed": "Wino nie mógł zapisać Twoich bieżących ustawień.",
+    "WinoAccount_Management_EmptyExport": "Brak wartości preferencji do eksportu.",
+    "WinoAccount_Management_ImportEmpty": "Przesył zsynchronizowanych danych nie zawiera nic nowego do przywrócenia.",
+    "WinoAccount_Management_ExportDialog_Title": "Eksport do konta Wino.",
+    "WinoAccount_Management_ExportDialog_Description": "Wybierz, co chcesz zsynchronizować z kontem Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferencje",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Konta",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Hasła, tokeny i inne wrażliwe dane nie są synchronizowane.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Zaimportowane konta na innym komputerze będą nadal wymagały ponownego zalogowania przed użyciem.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Eksportowanie wybranych danych Wino...",
+    "WinoAccount_Management_LoadFailed": "Nie udało się załadować najnowszych informacji o koncie Wino.",
+    "WinoAccount_Management_ActionFailed": "Żądanie konta Wino nie mogło zostać zakończone.",
+    "WinoAccount_SettingsSection_Title": "Konto Wino",
+    "WinoAccount_SettingsSection_Description": "Utwórz lub zaloguj się na konto Wino, używając usługi uwierzytelniania na lokalnym hoście.",
+    "WinoAccount_RegisterButton_Title": "Zarejestruj konto",
+    "WinoAccount_RegisterButton_Description": "Utwórz konto Wino za pomocą adresu e-mail i hasła.",
+    "WinoAccount_RegisterButton_Action": "Otwórz rejestrację",
+    "WinoAccount_LoginButton_Title": "Zaloguj się",
+    "WinoAccount_LoginButton_Description": "Zaloguj się na istniejące konto Wino za pomocą adresu e-mail i hasła.",
+    "WinoAccount_LoginButton_Action": "Otwórz logowanie",
+    "WinoAccount_SignOutButton_Title": "Wyloguj się",
+    "WinoAccount_SignOutButton_Description": "Usuń lokalnie zapisaną sesję konta Wino.",
+    "WinoAccount_SignOutButton_Action": "Wyloguj się",
+    "WinoAccount_RegisterDialog_Title": "Utwórz konto Wino",
+    "WinoAccount_RegisterDialog_Description": "Utwórz konto Wino, aby utrzymać synchronizację środowiska Wino i uzyskać dostęp do dodatków opartych na kontach.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Utwórz swoje konto Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Dlaczego warto je utworzyć?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importuj i eksportuj ustawienia między urządzeniami",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Przenieś swoje preferencje Wino między urządzeniami bez konieczności przebudowywania konfiguracji od zera.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Dostęp do ekskluzywnych dodatków, takich jak Wino AI Pack (płatny).",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Użyj jednego konta, aby odblokować funkcje premium Wino, gdy będą dostępne.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Konto Wino jest oddzielne od Twoich kont e-mail.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Twoje konta Outlook, Gmail, IMAP lub inne konta e-mail pozostają takie, jakie są. Konto Wino obsługuje wyłącznie funkcje Wino i dodatki oparte na kontach.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Zarejestruj",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Prywatność i przetwarzanie danych API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Opcjonalne dodatki, takie jak Wino AI Pack, mogą wysyłać wybrane treści HTML wiadomości e-mail do usługi Wino API tylko wtedy, gdy korzystasz z tych funkcji.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Przeczytaj politykę prywatności.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Zgadzam się na politykę prywatności.",
+    "WinoAccount_LoginDialog_Title": "Zaloguj się do konta Wino",
+    "WinoAccount_LoginDialog_Description": "Zaloguj się na swoje konto Wino, aby zsynchronizować ustawienia Wino i uzyskać dostęp do funkcji opartych na koncie.",
+    "WinoAccount_LoginDialog_HeroTitle": "Witaj ponownie",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Co daje logowanie",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Użyj konta Wino, aby kontynuować synchronizację ustawień między urządzeniami i uzyskać dostęp do płatnych dodatków, takich jak Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "To nie jest logowanie do Twojej skrzynki e-mail.",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Logowanie tutaj nie dodaje ani nie zastępuje Twoich kont Outlook, Gmail lub IMAP w Wino. Służy wyłącznie do zalogowania Cię do usług specyficznych dla Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Zapomniałeś hasła?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Hasło",
+    "WinoAccount_ConfirmPasswordLabel": "Potwierdź hasło",
+    "WinoAccount_ForgotPasswordDialog_Title": "Zresetuj hasło.",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Wyślij e-mail z resetem hasła.",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Wróć do logowania",
+    "WinoAccount_ForgotPasswordDialog_Description": "Wprowadź adres e-mail konta Wino, a my wyślemy Ci link do zresetowania hasła, jeśli adres jest zarejestrowany.",
+    "WinoAccount_Validation_EmailRequired": "Wymagany jest adres e-mail.",
+    "WinoAccount_Validation_PasswordRequired": "Wymagane jest hasło.",
+    "WinoAccount_Validation_PasswordMismatch": "Hasła nie pasują.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Musisz zaakceptować politykę prywatności, zanim utworzysz konto Wino.",
+    "WinoAccount_Error_InvalidCredentials": "Adres e-mail lub hasło jest nieprawidłowe.",
+    "WinoAccount_Error_AccountLocked": "Konto jest tymczasowo zablokowane.",
+    "WinoAccount_Error_AccountBanned": "Konto zostało zablokowane.",
+    "WinoAccount_Error_AccountSuspended": "Konto zostało zawieszone.",
+    "WinoAccount_Error_EmailNotConfirmed": "Proszę potwierdzić adres e-mail przed zalogowaniem.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Proszę potwierdzić adres e-mail przed zalogowaniem.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Nowy e-mail potwierdzający nie jest jeszcze dostępny.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "To żądanie potwierdzające nie jest już ważne. Spróbuj ponownie zalogować się.",
+    "WinoAccount_Error_EmailNotRegistered": "Ten adres e-mail nie jest zarejestrowany.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Twoja sesja nie jest już ważna. Proszę zaloguj się ponownie.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Ten adres e-mail jest już zarejestrowany.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Wymagany jest adres e-mail do zakończenia zewnętrznego logowania.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Żądanie zewnętrznego logowania jest nieprawidłowe.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Stan zewnętrznego logowania jest nieprawidłowy lub wygasł.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Kod zewnętrznego logowania jest nieprawidłowy lub wygasł.",
+    "WinoAccount_Error_AiPackRequired": "Wymagana jest aktywna subskrypcja Wino AI Pack do wykonania tej czynności.",
+    "WinoAccount_Error_AiQuotaExceeded": "Limit użycia Wino AI Pack w bieżącym okresie rozliczeniowym został wyczerpany.",
+    "WinoAccount_Error_AiHtmlEmpty": "Brak treści e-mail do przetworzenia.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Ten e-mail jest zbyt duży, aby go przetworzyć za pomocą Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Ten język nie jest obsługiwany. Spróbuj użyć prawidłowego kodu kultury, na przykład en-US lub tr-TR.",
+    "WinoAccount_Error_Forbidden": "Nie masz uprawnień do wykonania tej czynności.",
+    "WinoAccount_Error_ValidationFailed": "Żądanie jest nieprawidłowe. Sprawdź wprowadzone wartości.",
+    "WinoAccount_RegisterSuccessMessage": "Rejestracja konta Wino zakończona dla {0}.",
+    "WinoAccount_LoginSuccessMessage": "Zalogowano do konta Wino jako {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Potwierdź swój adres e-mail.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Wysłano potwierdzenie e-maila na {0}. Proszę potwierdzić je i spróbować ponownie się zalogować.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Wymagane potwierdzenie adresu e-mail",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Wciąż czekamy na potwierdzenie {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Wyślij ponownie e-mail potwierdzający.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Możesz ponownie wysłać e-mail potwierdzający za {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Możesz teraz ponownie wysłać e-mail potwierdzający.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "E-mail potwierdzający wysłany ponownie.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Wysłano kolejny e-mail potwierdzający na {0}. Proszę potwierdzić go i spróbować ponownie się zalogować.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Wysłano e-mail z resetem hasła.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Wysłaliśmy e-mail z resetem hasła na {0}. Otwórz tę wiadomość, aby wybrać nowe hasło.",
+    "WinoAccount_ChangePassword_Title": "Zmień hasło",
+    "WinoAccount_ChangePassword_Description": "Wyślij e-mail z resetem hasła na to konto Wino.",
+    "WinoAccount_ChangePassword_Action": "Wyślij e-mail z resetem hasła.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Czy Wino ma wysłać wiadomość e-mail z resetowaniem hasła na {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Wylogowano z konta Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Nie ma aktywnego konta Wino, z którego można się wylogować.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Konto Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Zaloguj się lub utwórz konto Wino, aby zarządzać sesją Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Dodaj konto",
+    "WelcomeWizard_Step3Title": "Zakończ konfigurację",
+    "ProviderSelection_Title": "Wybierz dostawcę poczty e-mail",
+    "ProviderSelection_Subtitle": "Wybierz dostawcę poniżej, aby dodać swoje konto e-mail do Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nazwa konta",
+    "ProviderSelection_AccountNamePlaceholder": "np. Osobiste, Służbowe",
+    "ProviderSelection_DisplayNameHeader": "Nazwa wyświetlana",
+    "ProviderSelection_DisplayNamePlaceholder": "np. Jan Kowalski",
+    "ProviderSelection_EmailHeader": "Adres e-mail",
+    "ProviderSelection_EmailPlaceholder": "np. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Hasło specyficzne dla aplikacji",
+    "ProviderSelection_AppPasswordHelp": "Jak uzyskać hasło specyficzne dla aplikacji?",
+    "ProviderSelection_CalendarModeHeader": "Integracja kalendarza",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Wyłączone",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Brak integracji kalendarza",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Synchronizacja CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Twoje wydarzenia kalendarza są synchronizowane z serwerami Apple między Twoimi urządzeniami.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Twoje wydarzenia kalendarza są synchronizowane z serwerami Yahoo między Twoimi urządzeniami.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokalny kalendarz",
+    "ProviderSelection_CalendarMode_LocalDescription": "Twoje wydarzenia są przechowywane wyłącznie na tym komputerze. Brak połączenia z serwerem.",
+    "ProviderSelection_ClearColor": "Wyczyść kolor",
+    "ProviderSelection_ContinueButton": "Kontynuuj",
+    "ProviderSelection_SpecialImap_Subtitle": "Wprowadź dane konta, aby połączyć.",
+    "AccountSetup_Title": "Konfigurowanie konta",
+    "AccountSetup_Step_Authenticating": "Uwierzytelnianie z {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testowanie uwierzytelniania poczty",
+    "AccountSetup_Step_SyncingFolders": "Synchronizowanie metadanych folderów",
+    "AccountSetup_Step_FetchingProfile": "Pobieranie informacji o profilu",
+    "AccountSetup_Step_DiscoveringCalDav": "Wykrywanie ustawień CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Testowanie uwierzytelniania kalendarza",
+    "AccountSetup_Step_SavingAccount": "Zapisywanie informacji o koncie",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Pobieranie metadanych kalendarza",
+    "AccountSetup_Step_SyncingAliases": "Synchronizowanie aliasów",
+    "AccountSetup_Step_Finalizing": "Finalizowanie konfiguracji",
+    "AccountSetup_FailureMessage": "Konfiguracja nie powiodła się. Wróć, aby naprawić ustawienia, albo spróbuj ponownie później.",
+    "AccountSetup_SuccessMessage": "Twoje konto zostało pomyślnie skonfigurowane!",
+    "AccountSetup_GoBackButton": "Wstecz",
+    "AccountSetup_TryAgainButton": "Spróbuj ponownie",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Wykrywanie automatyczne nie powiodło się. Wprowadź ustawienia ręcznie w zakładce Zaawansowane."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/pt_BR/resources.json b/Wino.Core.Domain/Translations/pt_BR/resources.json
index 43dc9c08..5c9bfeef 100644
--- a/Wino.Core.Domain/Translations/pt_BR/resources.json
+++ b/Wino.Core.Domain/Translations/pt_BR/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Esta conta requer re-sincronização completa para continuar funcionando. Por favor, aguarde enquanto o Wino re-sincroniza suas mensagens...",
     "AccountContactNameYou": "Você",
     "AccountCreationDialog_Completed": "Tudo pronto",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Obtendo detalhes do calendário.",
     "AccountCreationDialog_FetchingEvents": "Buscando eventos na agenda.",
     "AccountCreationDialog_FetchingProfileInformation": "Obtendo detalhes do perfil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Se seu navegador não foi iniciado automaticamente para concluir a autenticação:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "iniciando",
     "AccountCreationDialog_PreparingFolders": "Estamos recebendo informações sobre as pastas no momento.",
     "AccountCreationDialog_SigninIn": "Informações da conta estão sendo salvas.",
+    "Purchased": "Comprado",
     "AccountEditDialog_Message": "Nome da Conta",
     "AccountEditDialog_Title": "Editar Conta",
     "AccountPickerDialog_Title": "Escolha uma conta",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Altere o nome da conta no Wino e defina o nome do remetente desejado.",
     "AccountDetailsPage_ColorPicker_Title": "Cor da conta",
     "AccountDetailsPage_ColorPicker_Description": "Atribua uma nova cor da conta para colorir seu símbolo na lista.",
+    "AccountDetailsPage_TabGeneral": "Geral",
+    "AccountDetailsPage_TabMail": "Email",
+    "AccountDetailsPage_TabCalendar": "Calendário",
+    "AccountDetailsPage_CalendarListDescription": "Selecione um calendário para configurar suas configurações.",
     "AddHyperlink": "Adicionar",
     "AppCloseBackgroundSynchronizationWarningTitle": "Sincronização em segundo plano",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "O aplicativo não foi configurado para iniciar com o Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Conta IMAP",
     "Busy": "Ocupado(a)",
     "Buttons_AddAccount": "Adicionar Conta",
+    "Buttons_FixAccount": "Corrigir Conta",
     "Buttons_AddNewAlias": "Adicionar Novo Apelido",
     "Buttons_Allow": "Permitir",
+    "Buttons_Apply": "Aplicar",
     "Buttons_ApplyTheme": "Aplicar Tema",
     "Buttons_Browse": "Navegar",
     "Buttons_Cancel": "Cancelar",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Editar",
     "Buttons_EnableImageRendering": "Habilitar",
     "Buttons_Multiselect": "Selecionar Vários",
+    "Buttons_Manage": "Gerenciar",
     "Buttons_No": "Não",
     "Buttons_Open": "Abrir",
     "Buttons_Purchase": "Comprar",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Salvar",
     "Buttons_SaveConfiguration": "Salvar Configuração",
     "Buttons_Send": "Enviar",
+    "Buttons_SendToServer": "Enviar para o servidor",
     "Buttons_Share": "Compartilhar",
     "Buttons_SignIn": "Entrar",
     "Buttons_Sync": "Sincronizar",
     "Buttons_SyncAliases": "Sincronizar Apelidos",
     "Buttons_TryAgain": "Tentar Novamente",
     "Buttons_Yes": "Sim",
+    "Sync_SynchronizingFolder": "Sincronizando {0} {1}%",
+    "Sync_DownloadedMessages": "Baixadas {0} mensagens de {1}",
+    "SyncAction_Archiving": "Arquivando {0} e-mail(s)",
+    "SyncAction_ClearingFlag": "Desmarcando a bandeira de {0} e-mail(s)",
+    "SyncAction_CreatingDraft": "Criando rascunho",
+    "SyncAction_CreatingEvent": "Criando evento",
+    "SyncAction_Deleting": "Excluindo {0} e-mail(s)",
+    "SyncAction_EmptyingFolder": "Esvaziando pasta",
+    "SyncAction_MarkingAsRead": "Marcando {0} e-mail(s) como lidos",
+    "SyncAction_MarkingAsUnread": "Marcando {0} e-mail(s) como não lidos",
+    "SyncAction_MarkingFolderAsRead": "Marcando pasta como lida",
+    "SyncAction_Moving": "Movendo {0} e-mail(s)",
+    "SyncAction_MovingToFocused": "Movendo {0} e-mail(s) para Focused",
+    "SyncAction_RenamingFolder": "Renomeando pasta",
+    "SyncAction_SendingMail": "Enviando e-mail",
+    "SyncAction_SettingFlag": "Sinalizando {0} e-mail(s)",
+    "SyncAction_SynchronizingAccount": "Sincronizando {0}",
+    "SyncAction_SynchronizingAccounts": "Sincronizando {0} conta(s)",
+    "SyncAction_SynchronizingCalendarData": "Sincronizando dados do calendário",
+    "SyncAction_SynchronizingCalendarEvents": "Sincronizando eventos do calendário",
+    "SyncAction_SynchronizingCalendarMetadata": "Sincronizando metadados do calendário",
+    "SyncAction_Unarchiving": "Desarquivando {0} e-mail(s)",
     "CalendarAllDayEventSummary": "eventos do dia todo",
     "CalendarDisplayOptions_Color": "Cor",
     "CalendarDisplayOptions_Expand": "Expandir",
+    "CalendarEventResponse_Accept": "Aceitar",
+    "CalendarEventResponse_AcceptedResponse": "Aceito",
+    "CalendarEventResponse_Decline": "Recusar",
+    "CalendarEventResponse_DeclinedResponse": "Recusado",
+    "CalendarEventResponse_NotResponded": "Ainda não respondido",
+    "CalendarEventResponse_Tentative": "Provisório",
+    "CalendarEventResponse_TentativeResponse": "Provisório",
+    "CalendarEventRsvpPanel_Accept": "Aceitar",
+    "CalendarEventRsvpPanel_AddMessage": "Adicionar uma mensagem à sua resposta... (opcional)",
+    "CalendarEventRsvpPanel_Decline": "Recusar",
+    "CalendarEventRsvpPanel_Message": "Mensagem",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Enviar mensagem de resposta",
+    "CalendarEventRsvpPanel_Tentative": "Provisório",
+    "CalendarEventRsvpPanel_Title": "Opções de resposta",
+    "CalendarAttendeeStatus_Accepted": "Aceito",
+    "CalendarAttendeeStatus_Declined": "Recusado",
+    "CalendarAttendeeStatus_NeedsAction": "Requer ação",
+    "CalendarAttendeeStatus_Tentative": "Provisório",
+    "CalendarEventDetails_Attachments": "Anexos",
+    "CalendarEventCompose_AddAttachment": "Adicionar anexo",
+    "CalendarEventCompose_AllDay": "O dia todo",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Anexos não são suportados para calendários CalDAV.",
+    "CalendarEventCompose_EndDate": "Data de término",
+    "CalendarEventCompose_EndTime": "Hora de término",
+    "CalendarEventCompose_Every": "a cada",
+    "CalendarEventCompose_ForWeekdays": "para",
+    "CalendarEventCompose_FrequencyDay": "dia",
+    "CalendarEventCompose_FrequencyDayPlural": "dias",
+    "CalendarEventCompose_FrequencyMonth": "mês",
+    "CalendarEventCompose_FrequencyMonthPlural": "meses",
+    "CalendarEventCompose_FrequencyWeek": "semana",
+    "CalendarEventCompose_FrequencyWeekPlural": "semanas",
+    "CalendarEventCompose_FrequencyYear": "ano",
+    "CalendarEventCompose_FrequencyYearPlural": "anos",
+    "CalendarEventCompose_Location": "Local",
+    "CalendarEventCompose_LocationPlaceholder": "Adicionar um local",
+    "CalendarEventCompose_NewEventButton": "Novo evento",
+    "CalendarEventCompose_DefaultCalendarHint": "Você pode escolher um calendário padrão para novos eventos nas configurações do Calendário.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Abrir configurações do Calendário",
+    "CalendarEventCompose_NoCalendarsMessage": "Ainda não há calendários disponíveis para a criação de eventos.",
+    "CalendarEventCompose_NoCalendarsTitle": "Nenhum calendário disponível",
+    "CalendarEventCompose_NoEndDate": "Sem data de término",
+    "CalendarEventCompose_Notes": "Notas",
+    "CalendarEventCompose_PickCalendarTitle": "Escolha um calendário",
+    "CalendarEventCompose_Recurring": "Recorrente",
+    "CalendarEventCompose_RecurringSummary": "Ocorre a cada {0} {1}{2} {3} efetivo {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Ocorre {0}{1} {2} efetivo {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repita a cada",
+    "CalendarEventCompose_SelectCalendar": "Selecionar calendário",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Ocorre em {0} {1}",
+    "CalendarEventCompose_StartDate": "Data de início",
+    "CalendarEventCompose_StartTime": "Hora de início",
+    "CalendarEventCompose_TimeRangeSummary": "de {0} até {1}",
+    "CalendarEventCompose_Title": "Título do evento",
+    "CalendarEventCompose_TitlePlaceholder": "Adicionar um título",
+    "CalendarEventCompose_Until": "até",
+    "CalendarEventCompose_UntilSummary": "  até {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "A data de término do dia inteiro deve ser posterior à data de início.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Um ou mais participantes têm um endereço de e-mail inválido.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "A data de término da recorrência deve ser igual ou posterior à data de início do evento.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "A hora de término deve ser posterior à hora de início.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Um ou mais anexos não estão mais disponíveis: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selecione um calendário antes de criar o evento.",
+    "CalendarEventCompose_ValidationMissingTitle": "Digite um título de evento antes de criar o evento.",
+    "CalendarEventCompose_ValidationTitle": "Validação do evento falhou",
+    "CalendarEventCompose_WeekdaySummary": " em {0}",
+    "CalendarEventCompose_Weekday_Friday": "Sexta-feira",
+    "CalendarEventCompose_Weekday_Monday": "Segunda-feira",
+    "CalendarEventCompose_Weekday_Saturday": "Sáb",
+    "CalendarEventCompose_Weekday_Sunday": "Dom",
+    "CalendarEventCompose_Weekday_Thursday": "Qui",
+    "CalendarEventCompose_Weekday_Tuesday": "Ter",
+    "CalendarEventCompose_Weekday_Wednesday": "Qua",
+    "CalendarEventDetails_Details": "Detalhes",
+    "CalendarEventDetails_EditSeries": "Editar Série",
+    "CalendarEventDetails_Editing": "Editando",
+    "CalendarEventDetails_InviteSomeone": "Convidar alguém",
+    "CalendarEventDetails_JoinOnline": "Entrar online",
+    "CalendarEventDetails_Organizer": "Organizador",
+    "CalendarEventDetails_People": "Pessoas",
+    "CalendarEventDetails_ReadOnlyEvent": "Evento somente leitura",
+    "CalendarEventDetails_Reminder": "Lembrete",
+    "CalendarReminder_StartedHoursAgo": "Iniciado há {0} horas",
+    "CalendarReminder_StartedMinutesAgo": "Iniciado há {0} minutos",
+    "CalendarReminder_StartedNow": "Iniciado agora",
+    "CalendarReminder_StartingNow": "Iniciando agora",
+    "CalendarReminder_StartsInHours": "Começa em {0} horas",
+    "CalendarReminder_StartsInMinutes": "Começa em {0} minutos",
+    "CalendarReminder_SnoozeAction": "Adiar",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minutos",
+    "CalendarEventDetails_ShowAs": "Mostrar como",
+    "CalendarShowAs_Free": "Livre",
+    "CalendarShowAs_Tentative": "Provisório",
+    "CalendarShowAs_Busy": "Ocupado",
+    "CalendarShowAs_OutOfOffice": "Fora do escritório",
+    "CalendarShowAs_WorkingElsewhere": "Trabalhando em outro local",
     "CalendarItem_DetailsPopup_JoinOnline": "Participar online",
     "CalendarItem_DetailsPopup_ViewEventButton": "Ver evento",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Ver serie",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} Copiado para a área de transferência.",
     "ClipboardTextCopied_Title": "Copiado",
     "ClipboardTextCopyFailed_Message": "Falhou ao copiar {0} para a área de transferência.",
+    "ContactInfoBar_ErrorTitle": "Falha ao carregar informações de contato",
+    "ContactInfoBar_SuccessTitle": "Informações de contato carregadas com sucesso",
+    "ContactInfoBar_WarningTitle": "As informações de contato podem estar incompletas",
     "ComingSoon": "Em breve...",
     "ComposerAttachmentsDragDropAttach_Message": "Anexar",
     "ComposerAttachmentsDropZone_Message": "Solte seus arquivos aqui",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nome do vínculo da conta",
     "DialogMessage_DeleteAccountConfirmationMessage": "Excluir {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Todos os dados associados a esta conta serão excluídos do disco permanentemente.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Excluir modelo \\\"{0}\\\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Excluir Modelo de Email",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Isso excluirá todos os eventos da série. Deseja continuar?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Excluir Série Recorrente",
     "DialogMessage_DiscardDraftConfirmationMessage": "Este rascunho será descartado. Você quer continuar?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Descartar Rascunho",
     "DialogMessage_EmptySubjectConfirmation": "Faltando Assunto",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Modo claro",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Falha ao configurar pastas de sistema",
+    "Exception_AccountNeedsAttention_Title": "Conta requer atenção",
+    "Exception_AccountNeedsAttention_Message": "'{0}' requer sua atenção para continuar funcionando.",
+    "Exception_WebView2RuntimeMissing_Message": "O Wino Mail não conseguiu localizar o runtime WebView2 do Microsoft Edge. Por favor, instale ou repare o runtime para renderizar o conteúdo das mensagens corretamente.",
+    "Exception_WebView2RuntimeMissing_Title": "É necessário o runtime WebView2",
     "Exception_AuthenticationCanceled": "Autenticação cancelada",
     "Exception_CustomThemeExists": "Este tema já existe.",
     "Exception_CustomThemeMissingName": "Você deve escrever um nome.",
     "Exception_CustomThemeMissingWallpaper": "Você deve fornecer uma imagem de fundo personalizada.",
     "Exception_FailedToSynchronizeAliases": "Falha ao sincronizar apelidos",
+    "Exception_FailedToSynchronizeCalendarData": "Falha ao sincronizar dados do calendário",
+    "Exception_FailedToSynchronizeCalendarEvents": "Falha ao sincronizar eventos do calendário",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Falha ao sincronizar os metadados do calendário",
     "Exception_FailedToSynchronizeFolders": "Erro ao sincronizar pastas",
     "Exception_FailedToSynchronizeProfileInformation": "Falha ao sincronizar as informações do perfil",
     "Exception_GoogleAuthCallbackNull": "Callback uri é 'null' na ativação.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Mover para Lixeira",
     "HoverActionOption_ToggleFlag": "Sinalizar / Não sinalizar",
     "HoverActionOption_ToggleRead": "Lido / Não lido",
+    "KeyboardShortcuts_FailedToReset": "Falha ao redefinir atalhos de teclado.",
+    "KeyboardShortcuts_FailedToUpdate": "Falha ao atualizar atalhos de teclado",
+    "KeyboardShortcuts_MailoperationAction": "Ação",
+    "KeyboardShortcuts_Action": "Ação",
+    "KeyboardShortcuts_FailedToLoad": "Falha ao carregar atalhos de teclado.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Por favor, digite uma tecla para o atalho.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Por favor, selecione uma ação para o atalho.",
+    "KeyboardShortcuts_EnterKey": "Por favor, digite uma tecla para o atalho.",
+    "KeyboardShortcuts_SelectOperation": "Por favor, selecione uma ação para o atalho.",
+    "KeyboardShortcuts_ShortcutInUse": "Este atalho já está em uso por outro atalho.",
+    "KeyboardShortcuts_FailedToSave": "Falha ao salvar o atalho.",
+    "KeyboardShortcuts_FailedToDelete": "Falha ao excluir o atalho.",
+    "KeyboardShortcuts_PageDescription": "Configure atalhos de teclado para operações rápidas de e-mail. Pressione teclas enquanto o foco estiver no campo de entrada da tecla para capturar os atalhos.",
+    "KeyboardShortcuts_Add": "Adicionar atalho",
+    "KeyboardShortcuts_EditTitle": "Editar Atalho de Teclado",
+    "KeyboardShortcuts_ResetToDefaults": "Redefinir para Padrões",
+    "KeyboardShortcuts_PressKeysHere": "Pressione as teclas aqui...",
+    "KeyboardShortcuts_KeyCombination": "Combinação de teclas",
+    "KeyboardShortcuts_FocusArea": "Foque no campo acima e pressione a combinação de teclas desejada",
+    "KeyboardShortcuts_Modifiers": "Teclas modificadoras",
+    "KeyboardShortcuts_Mode": "Modo do aplicativo",
+    "KeyboardShortcuts_ModeMail": "E-mail",
+    "KeyboardShortcuts_ModeCalendar": "Calendário",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Alternar lido/não lido",
+    "KeyboardShortcuts_ActionToggleFlag": "Alternar sinalizador",
+    "KeyboardShortcuts_ActionToggleArchive": "Alternar arquivar/desarquivar",
     "ImageRenderingDisabled": "A renderização de imagem está desabilitada para esta mensagem.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Método de autenticação",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Segurança de Conexão",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nome de Usuário",
     "IMAPSetupDialog_UsernamePlaceholder": "joaosilva, joaosilva@fabrikam.com, dominio/johndoe",
     "IMAPSetupDialog_UseSameConfig": "Use o mesmo nome de usuário e senha para enviar e-mail",
+    "ImapCalDavSettingsPage_TitleCreate": "Configuração de IMAP e Calendário",
+    "ImapCalDavSettingsPage_TitleEdit": "Editar Configurações de IMAP e Calendário",
+    "ImapCalDavSettingsPage_Subtitle": "Configure IMAP/SMTP e a sincronização opcional do calendário para esta conta.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Configuração básica",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Digite sua identidade e credenciais. O Wino pode tentar detectar as configurações do servidor automaticamente.",
+    "ImapCalDavSettingsPage_BasicTab": "Básico",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Habilitar suporte ao calendário",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Descoberta automática de configurações de e-mail",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Configurações de e-mail encontradas e aplicadas.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configuração Avançada",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Digite as configurações do servidor manualmente se a descoberta automática não estiver disponível ou estiver incorreta.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avançado",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configuração do calendário",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Escolha como os dados do calendário devem funcionar para esta conta IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Modo do calendário",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Segurança da conexão",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Método de autenticação",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Desativado",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronização CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Somente calendário local",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "O calendário está desativado para esta conta.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Os itens do calendário são sincronizados com seu servidor CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Os itens do calendário são armazenados apenas neste computador e não são sincronizados com a rede.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Como funciona o calendário local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Apenas calendário local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "O calendário local mantém todos os eventos apenas no seu computador. Nada é sincronizado com iCloud, Yahoo ou qualquer outro provedor.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL do serviço CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Nome de usuário CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Senha CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "O teste CalDAV é necessário apenas quando o modo de calendário estiver configurado para sincronização CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL do serviço CalDAV é obrigatório.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "A URL do serviço CalDAV deve ser uma URL absoluta.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "O nome de usuário do CalDAV é obrigatório.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "A senha do CalDAV é obrigatória.",
+    "ImapCalDavSettingsPage_TestImapButton": "Testar conexão IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Testar conexão CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Teste de conexão IMAP bem-sucedido.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Teste de conexão CalDAV bem-sucedido.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Configurações da conta validadas e salvas.",
+    "ImapCalDavSettingsPage_ICloudHint": "Use uma senha específica de aplicativo gerada nas configurações da sua conta Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Use uma senha de aplicativo nas configurações de segurança da sua conta Yahoo.",
     "Info_AccountCreatedMessage": "{0} foi criado",
     "Info_AccountCreatedTitle": "Criação de Conta",
     "Info_AccountCreationFailedTitle": "Erro na criação da conta",
     "Info_AccountDeletedMessage": "{0} foi excluído com sucesso.",
     "Info_AccountDeletedTitle": "Conta excluída",
     "Info_AccountIssueFixFailedTitle": "Falhou",
+    "Info_AccountIssueFixImapMessage": "Abra a página de configurações de IMAP e calendário para inserir novamente as credenciais do servidor.",
+    "Info_AccountAttentionRequiredMessage": "Esta conta requer sua atenção.",
+    "Info_AccountAttentionRequiredClickableMessage": "Clique para corrigir esta conta e ressincronizá-la.",
+    "Info_AccountAttentionRequiredAction": "Corrigir",
+    "Info_AccountAttentionRequiredActionHint": "Clique em Corrigir para resolver este problema da conta.",
     "Info_AccountIssueFixSuccessMessage": "Corrigido todos os problemas da conta.",
     "Info_AccountIssueFixSuccessTitle": "Sucesso",
     "Info_AttachmentOpenFailedMessage": "Não foi possível abrir este anexo.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Esta pasta está desabilitada para sincronização.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Pasta desabilitada",
     "Justify": "Justificado",
+    "MenuUpdateAvailable": "Atualização disponível",
     "Left": "Esquerda",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "você precisa ter pelo menos 2 contas para criar o vinculo\no vinculo será removido ao salvar",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Desarquivar",
     "MailOperation_ViewMessageSource": "Ver fonte da mensagem",
     "MailOperation_Zoom": "Ampliar/Reduzir",
+    "MailsDragging": "Arrastando {0} item(s)",
     "MailsSelected": "{0} item(s) selecionado(s)",
     "MarkFlagUnflag": "Marcar como sinalizado/não sinalizado",
     "MarkReadUnread": "Marcar como lido/não lido",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Novo E-mail",
     "Notifications_WinoUpdatedMessage": "Veja a nova versão {0}",
     "Notifications_WinoUpdatedTitle": "O Wino Mail foi atualizado.",
+    "Notifications_StoreUpdateAvailableTitle": "Atualização disponível",
+    "Notifications_StoreUpdateAvailableMessage": "Uma versão mais recente do Wino Mail está pronta para instalar na Microsoft Store.",
     "OnlineSearchFailed_Message": "Falha ao realizar a pesquisa\n{0}\n\nlistando e-mails offline.",
     "OnlineSearchTry_Line1": "Não conseguiu encontrar o que estava procurando?",
     "OnlineSearchTry_Line2": "Experimente a pesquisa online.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Pequeno",
     "Photos": "Fotos",
     "PreparingFoldersMessage": "Preparando pastas",
-    "ProtocolLogAvailable_Message": "Os registros do protocolo estão disponíveis para diagnósticos.",
     "ProviderDetail_Gmail_Description": "Conta do Google",
     "ProviderDetail_iCloud_Description": "Conta Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Pesquisar",
     "SearchingIn": "Pesquisar em",
     "SearchPivotName": "Resultados",
+    "Settings_KeyboardShortcuts_Title": "Atalhos de Teclado",
+    "Settings_KeyboardShortcuts_Description": "Gerencie atalhos de teclado para ações rápidas nas mensagens.",
     "SettingConfigureSpecialFolders_Button": "Configurar",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Configuração IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Altere suas configurações do servidor de entrada/saída.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Configurações de IMAP e CalDAV",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Abra a página de configurações dedicada de IMAP, SMTP e CalDAV para esta conta.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Abrir configurações",
     "SettingsAbout_Description": "Saiba mais sobre o Wino.",
     "SettingsAbout_Title": "Sobre",
     "SettingsAboutGithub_Description": "Ir para o repositório GitHub do rastreador de problemas.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Modo de busca padrão",
+    "SettingsAppPreferences_ApplicationMode_Title": "Modo padrão do aplicativo",
+    "SettingsAppPreferences_ApplicationMode_Description": "Escolha em que modo o Wino abre quando nenhum tipo de ativação estiver explicitamente definido.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "E-mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendário",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "O Wino Mail continuará em execução em segundo plano. Você será notificado quando chegarem novos e-mails.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Executar em segundo plano",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "O Wino Mail continuará em execução na bandeja do sistema. Disponível para iniciar clicando no ícone. Você será notificado assim que novos e-mails chegaram.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Ocorreu um erro fatal ao alterar o modo de inicialização do Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Iniciar minimizado na inicialização do Windows",
     "SettingsAppPreferences_Title": "Preferências do Aplicativo",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Ocultar o botão do perfil na barra de título",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Ocultar o botão de perfil na barra de título que abre o menu suspenso da conta do Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notificações de atualização da Microsoft Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Exibir notificações e ações no rodapé quando houver uma atualização disponível da Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Ações de IA",
+    "SettingsAppPreferences_AiActions_Description": "Escolha os idiomas padrão da IA e onde os resumos devem ser salvos.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Idioma de tradução padrão",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Selecione o idioma de destino padrão usado pelas ações de tradução por IA.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Idioma de resumo",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Escolha o idioma de resumo preferido para os resumos gerados pela IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Caminho padrão para salvar resumos",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Escolha a pasta que o Wino deve usar como padrão ao salvar resumos de IA.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Usar o local de salvamento padrão do sistema",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Essa pasta não existe. O local de salvamento padrão será usado para os resumos.",
     "SettingsAutoSelectNextItem_Description": "Selecione o próximo item depois de excluir ou mover um e-mail.",
     "SettingsAutoSelectNextItem_Title": "Selecionar automaticamente o próximo item",
     "SettingsAvailableThemes_Description": "Selecione um tema da própria coleção do Wino para o seu gosto ou aplique seus próprios temas.",
     "SettingsAvailableThemes_Title": "Temas Disponíveis",
     "SettingsCalendarSettings_Description": "Alterar o primeiro dia da semana, altura da célula da hora e mais...",
     "SettingsCalendarSettings_Title": "Configurações do calendário",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Duração padrão do soneca",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Defina uma duração padrão de soneca para as notificações de lembrete do calendário.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formato do cabeçalho do dia na visualização com horário",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Escolha como os rótulos dos dias no topo são renderizados nas visualizações de dia, semana e semana de trabalho. Use tokens de formato de data como ddd, dd, MMM ou dddd.",
     "SettingsComposer_Title": "Compositor",
     "SettingsComposerFont_Title": "Fonte padrão do compositor",
     "SettingsComposerFontFamily_Description": "Altere a família de fontes padrão e o tamanho da fonte para escrever e-mails.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Canal do Discord",
     "SettingsEditLinkedInbox_Description": "Adicionar/remover contas, renomear ou quebrar o vínculo entre contas.",
     "SettingsEditLinkedInbox_Title": "Editar caixa de entrada vinculada",
+    "SettingsWindowBackdrop_Title": "Plano de Fundo da Janela",
+    "SettingsWindowBackdrop_Description": "Selecione um efeito de plano de fundo para as janelas do Wino.",
+    "SettingsWindowBackdrop_Disabled": "A seleção de plano de fundo da janela está desativada quando o tema da aplicação for diferente de Padrão.",
     "SettingsElementTheme_Description": "Selecione um tema do Windows para o Wino",
     "SettingsElementTheme_Title": "Tema do Elemento",
     "SettingsElementThemeSelectionDisabled": "Seleção de tema de elemento está desabilitada quando o tema da aplicação é selecionado diferente do padrão.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Apelidos",
     "SettingsEditAccountDetails_Title": "Editar dados da conta",
     "SettingsEditAccountDetails_Description": "Alterar nome da conta, nome do remetente e atribuir uma nova cor, se quiser.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Alterações salvas",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Os detalhes da sua conta foram atualizados com sucesso.",
     "SettingsManageLink_Description": "Mova os itens para adicionar um novo vínculo ou remover o vínculo existente.",
     "SettingsManageLink_Title": "Gerenciar Vinculo",
     "SettingsMarkAsRead_Description": "Altere o que deve acontecer com o item selecionado.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notificações",
     "SettingsNotificationsAndTaskbar_Description": "Alterar se as notificações devem ser exibidas e ícone na barra de tarefas para esta conta.",
     "SettingsNotificationsAndTaskbar_Title": "Notificações & Barra de Tarefas",
+    "SettingsHome_Title": "Início",
+    "SettingsHome_SearchTitle": "Encontre uma configuração",
+    "SettingsHome_SearchDescription": "Pesquise por recurso, tópico ou palavra-chave para ir direto à página de configurações correta.",
+    "SettingsHome_SearchPlaceholder": "Pesquisar configurações",
+    "SettingsHome_SearchExamples": "Exemplos: tema, armazenamento, idioma, assinatura",
+    "SettingsHome_QuickLinks_Title": "Links rápidos",
+    "SettingsHome_QuickLinks_Description": "Acesse rapidamente as configurações que as pessoas mais usam.",
+    "SettingsHome_StorageCard_Description": "Veja quanto conteúdo MIME local o Wino mantém neste dispositivo e limpe-o quando necessário.",
+    "SettingsHome_StorageEmptySummary": "Nenhum conteúdo MIME em cache detectado ainda.",
+    "SettingsHome_StorageLoading": "Verificando o uso local de MIME...",
+    "SettingsHome_Tips_Title": "Dicas e truques",
+    "SettingsHome_Tips_Description": "Algumas pequenas mudanças podem tornar o Wino muito mais pessoal.",
+    "SettingsHome_Tip_Theme": "Quer modo escuro ou alterações de acento? Abra Personalização.",
+    "SettingsHome_Tip_Background": "Use as Preferências do Aplicativo para controlar o comportamento de inicialização e a sincronização em segundo plano.",
+    "SettingsHome_Tip_Shortcuts": "Atalhos de teclado ajudam você a navegar pelo e-mail mais rapidamente.",
+    "SettingsHome_Resources_Title": "Links úteis",
+    "SettingsHome_Resources_Description": "Abra recursos do projeto, informações de suporte e canais de lançamento.",
     "SettingsOptions_Title": "Configurações",
+    "SettingsOptions_GeneralSection": "Geral",
+    "SettingsOptions_MailSection": "E-mail",
+    "SettingsOptions_CalendarSection": "Calendário",
+    "SettingsOptions_MoreComingSoon": "Mais opções chegando em breve",
+    "SettingsOptions_HeroDescription": "Personalize sua experiência com o Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} conta(s) configurada(s)",
+    "SettingsSearch_ManageAccounts_Keywords": "conta;contas;caixa de correio;caixas de correio;apelido;apelidos;perfil;endereço;endereços",
+    "SettingsSearch_AppPreferences_Keywords": "inicialização;fundo;iniciar;sincronização;notificação;notificações;pesquisa;bandeja;padrões",
+    "SettingsSearch_LanguageTime_Keywords": "idioma;hora;horário;localidade;região;formato;24 horas;24h",
+    "SettingsSearch_Personalization_Keywords": "tema;escuro;claro;aparência;cor de destaque;cor;cores;layout;densidade",
+    "SettingsSearch_About_Keywords": "sobre;versão;site;privacidade;GitHub;doar;loja;suporte",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "atalho;atalhos;atalho;atalhos;teclado;teclas",
+    "SettingsSearch_MessageList_Keywords": "mensagem;mensagens;lista;encadeamento;conversas;avatar;pré-visualização;remetente",
+    "SettingsSearch_ReadComposePane_Keywords": "leitor;compor;redator;fonte;fontes;conteúdo externo;exibição;leitura",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "assinatura;assinaturas;criptografia;certificado;certificados;S/MIME;S/MIME;segurança",
+    "SettingsSearch_Storage_Keywords": "armazenamento;cache;cache;mime;disco;espaço;limpeza;limpar;dados locais",
+    "SettingsSearch_CalendarSettings_Keywords": "calendário;semana;horas;programação;evento;eventos",
     "SettingsPaneLengthReset_Description": "Redefina o tamanho da lista de e-mails para o padrão se você estiver com problemas.",
     "SettingsPaneLengthReset_Title": "Redefinir tamanho da lista de e-mails",
     "SettingsPaypal_Description": "Mostre muito mais amor ❤️ Todas as doações são apreciadas.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Exibir o formato do relógio em 24 horas",
     "SettingsPrivacyPolicy_Description": "Revise a política de privacidade.",
     "SettingsPrivacyPolicy_Title": "Política de Privacidade",
+    "SettingsWebsite_Description": "Abrir o site do Wino Mail.",
+    "SettingsWebsite_Title": "Site",
     "SettingsReadComposePane_Description": "Fontes, conteúdo externo.",
     "SettingsReadComposePane_Title": "Leitor & Compositor",
     "SettingsReader_Title": "Leitor",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Mostrar Pré-visualização de Texto",
     "SettingsShowSenderPictures_Description": "Ocultar/exibir imagens do remetente da miniatura.",
     "SettingsShowSenderPictures_Title": "Mostrar Avatares de Remetentes",
+    "SettingsEmailTemplates_Title": "Modelos de e-mail",
+    "SettingsEmailTemplates_Description": "Gerenciar modelos de e-mail",
+    "SettingsEmailTemplates_CreatePageTitle": "Novo modelo",
+    "SettingsEmailTemplates_EditPageTitle": "Editar modelo",
+    "SettingsEmailTemplates_NewTemplateTitle": "Novo modelo",
+    "SettingsEmailTemplates_NewTemplateDescription": "Criar um novo modelo de e-mail",
+    "SettingsEmailTemplates_NameTitle": "Nome",
+    "SettingsEmailTemplates_NamePlaceholder": "Nome do modelo",
+    "SettingsEmailTemplates_DescriptionTitle": "Descrição",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descrição opcional",
+    "SettingsEmailTemplates_ContentTitle": "Conteúdo do modelo",
+    "SettingsEmailTemplates_ContentDescription": "Edite o conteúdo HTML deste modelo.",
+    "SettingsEmailTemplates_NameRequired": "O nome do modelo é obrigatório.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Usar gravatar (se disponível) como imagem do remetente",
     "SettingsEnableFavicons_Title": "Ícones de domínio (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Item de inicialização",
     "SettingsStore_Description": "Mostre um pouco de amor ❤️",
     "SettingsStore_Title": "Avalie na Loja",
+    "SettingsStorage_Title": "Armazenamento",
+    "SettingsStorage_Description": "Digitalizar e gerenciar o cache MIME armazenado na sua pasta de dados local.",
+    "SettingsStorage_ScanFolder": "Digitalizar a pasta de dados locais",
+    "SettingsStorage_NoLocalMimeDataFound": "Nenhum dado MIME local encontrado.",
+    "SettingsStorage_NoAccountsFound": "Nenhuma conta encontrada.",
+    "SettingsStorage_TotalUsage": "Uso total local de MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} utilizado(s) no cache MIME local",
+    "SettingsStorage_DeleteAll_Title": "Excluir todo o conteúdo MIME",
+    "SettingsStorage_DeleteAll_Description": "Excluir toda a pasta de cache MIME desta conta.",
+    "SettingsStorage_DeleteAll_Button": "Excluir tudo",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Excluir todo o conteúdo MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Excluir todos os dados MIME locais para {0}?",
+    "SettingsStorage_DeleteAll_Success": "Todo o conteúdo MIME foi excluído.",
+    "SettingsStorage_DeleteOld_Title": "Excluir conteúdo MIME antigo",
+    "SettingsStorage_DeleteOld_Description": "Excluir arquivos MIME com base na data de criação dos e-mails no banco de dados local.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mês",
+    "SettingsStorage_DeleteOld_3Months": "> 3 meses",
+    "SettingsStorage_DeleteOld_6Months": "> 6 meses",
+    "SettingsStorage_DeleteOld_1Year": "> 1 ano",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Excluir conteúdo MIME antigo",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Excluir dados MIME locais com mais de {0} para {1}?",
+    "SettingsStorage_DeleteOld_Success": "Excluídas {0} pasta(s) MIME mais antigas que {1}.",
+    "SettingsStorage_1Month": "1 mês",
+    "SettingsStorage_3Months": "3 meses",
+    "SettingsStorage_6Months": "6 meses",
+    "SettingsStorage_1Year": "1 ano",
+    "SettingsStorage_Months": "{0} meses",
     "SettingsTaskbarBadge_Description": "Incluir contagem de emails não lidos no ícone da barra de tarefas.",
     "SettingsTaskbarBadge_Title": "Ícone da Barra de Tarefas",
     "SettingsThreads_Description": "Organizar mensagens em tópicos de conversa.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Você não pode atribuir a pasta Caixa de entrada para outra pasta do sistema.",
     "SystemFolderConfigSetupSuccess_Message": "Pastas do sistema configuradas com sucesso.",
     "SystemFolderConfigSetupSuccess_Title": "Configuração de pastas do sistema",
+    "SystemTrayMenu_ShowWino": "Abrir Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Abrir Wino Calendário",
+    "SystemTrayMenu_ExitWino": "Sair",
     "TestingImapConnectionMessage": "Testando conexão do servidor...",
     "TitleBarServerDisconnectedButton_Description": "Wino está desconectado da rede. Clique em reconectar para restaurar a conexão.",
     "TitleBarServerDisconnectedButton_Title": "Sem conexão",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Atualizar para Contas Ilimitadas",
     "WinoUpgradeRemainingAccountsMessage": "{0} de {1} contas gratuitas usadas.",
     "Yesterday": "Ontem",
+    "Smime_ImportCertificates_Success": "Certificados importados com sucesso.",
+    "Smime_ImportCertificates_Error": "Erro ao importar certificados: {0}",
+    "Smime_RemoveCertificates_Confirm": "Você realmente deseja remover os certificados {0}?",
+    "Smime_RemoveCertificates_Success": "Certificados removidos.",
+    "Smime_ExportCertificates_Success": "Certificados exportados.",
+    "Smime_ExportCertificates_Error": "Erro ao exportar certificados.",
+    "Smime_CertificateDetails": "Assunto: {0}\\nEmissor: {1}\\nVálido de: {2}\\nVálido até: {3}\\nImpressão digital: {4}",
+    "Smime_CertificatePassword_Title": "Senha do certificado obrigatória",
+    "Smime_CertificatePassword_Placeholder": "Senha do certificado para {0} (opcional)",
+    "Smime_Confirm_Title": "Confirmar",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Atualizar",
+    "SettingsSignatureAndEncryption_Title": "Assinatura e Criptografia",
+    "SettingsSignatureAndEncryption_Description": "Gerenciar certificados S/MIME para assinar e criptografar e-mails.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Meus certificados",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificados pessoais para assinatura e criptografia",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificados do destinatário",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificados de destinatário para descriptografia",
+    "SettingsSignatureAndEncryption_NameColumn": "Nome",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Vence em",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Impressão digital",
+    "Buttons_Remove": "Remover",
+    "Buttons_Export": "Exportar",
+    "Buttons_Import": "Importar",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificado de assinatura S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Criptografia S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Nenhum",
+    "SmimeSignaturesInMessage": "Assinaturas nesta mensagem:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, válido até {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informação do Certificado de Assinatura S/MIME",
+    "SmimeCertificateInfoTitle": "Informação do Certificado S/MIME",
+    "SmimeNoCertificateFileFound": "Nenhum arquivo de certificado encontrado",
+    "SmimeSaveCertificate": "Salvar certificado...",
+    "SmimeCertificate": "Certificado S/MIME",
+    "SmimeCertificateSavedTo": "Certificado salvo em {0}",
+    "SmimeSignedTooltip": "Esta mensagem está assinada com um certificado S/MIME. Clique para ver mais detalhes",
+    "SmimeEncryptedTooltip": "Esta mensagem está criptografada com um certificado S/MIME.",
+    "SmimeCertificateFileInfo": "Arquivo: {0}\\nTipo: {1}\\nTamanho: {2:N0} bytes",
+    "Composer_LightTheme": "Tema Claro",
+    "Composer_DarkTheme": "Tema Escuro",
+    "Composer_Outdent": "Diminuir recuo",
+    "Composer_Indent": "Aumentar recuo",
+    "Composer_BulletList": "Lista com marcadores",
+    "Composer_OrderedList": "Lista numerada",
+    "Composer_Stroke": "Traço",
+    "Composer_Bold": "Negrito",
+    "Composer_Italic": "Itálico",
+    "Composer_Underline": "Sublinhado",
+    "Composer_CcBcc": "Cc e Cco",
+    "Composer_EnableSmimeSignature": "Ativar/desativar assinatura S/MIME",
+    "Composer_EnableSmimeEncryption": "Ativar/desativar criptografia S/MIME",
+    "Composer_LocalDraftSyncInfo": "Este rascunho é apenas local. O Wino não conseguiu enviá-lo para o servidor de e-mail. Clique para tentar enviá-lo novamente ao servidor.",
+    "Composer_CertificateExpires": "Vence em: ",
+    "Composer_SmimeSignature": "Assinatura S/MIME",
+    "Composer_SmimeEncryption": "Criptografia S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Modelos de e-mail",
+    "Composer_AiSummarize": "Resumir com IA",
+    "Composer_AiSummarizeDescription": "Extrair pontos-chave, itens de ação e decisões deste e-mail.",
+    "Composer_AiTranslate": "Traduzir com IA",
+    "Composer_AiActions": "Ações de IA",
+    "Composer_AiRewrite": "Reescrever com IA",
+    "AiActions_CheckingStatus": "Verificando o acesso à IA...",
+    "AiActions_SignedOutTitle": "Desbloquear o Pacote de IA do Wino",
+    "AiActions_SignedOutDescription": "Traduza, reescreva e resuma e-mails com IA após fazer login em sua Conta Wino e ativar o complemento Pacote de IA.",
+    "AiActions_NoPackTitle": "Pacote de IA necessário",
+    "AiActions_NoPackDescription": "Você está conectado, mas o Pacote de IA ainda não está ativo. Compre-o para usar as ferramentas de tradução, reescrita e resumos com IA do Wino.",
+    "AiActions_UsageSummary": "{0} de {1} créditos usados neste mês.",
+    "Composer_AiRewritePolite": "Tornar mais polido",
+    "Composer_AiRewritePoliteDescription": "Suaviza a redação mantendo a mesma intenção.",
+    "Composer_AiRewriteAngry": "Tornar mais agressivo",
+    "Composer_AiRewriteAngryDescription": "Usa um tom mais áspero e confrontacional.",
+    "Composer_AiRewriteHappy": "Torne-o feliz",
+    "Composer_AiRewriteHappyDescription": "Adiciona um tom mais otimista e entusiasmado.",
+    "Composer_AiRewriteFormal": "Torne-o formal",
+    "Composer_AiRewriteFormalDescription": "Faz com que a mensagem soe mais profissional e estruturada.",
+    "Composer_AiRewriteFriendly": "Torne-o mais amigável",
+    "Composer_AiRewriteFriendlyDescription": "Aquece a mensagem com um tom mais acessível.",
+    "Composer_AiRewriteShorter": "Torne-o mais curto",
+    "Composer_AiRewriteShorterDescription": "Torna o texto mais curto e remove detalhes desnecessários.",
+    "Composer_AiRewriteClearer": "Torne-o mais claro",
+    "Composer_AiRewriteClearerDescription": "Melhora a legibilidade e torna a mensagem mais fácil de entender.",
+    "Composer_AiRewriteCustom": "Personalizado",
+    "Composer_AiRewriteCustomDescription": "Descreva sua intenção de reescrita.",
+    "Composer_AiRewriteCustomPlaceholder": "Descreva como você quer que a mensagem seja reescrita",
+    "Composer_AiRewriteMode": "Tom da reescrita",
+    "Composer_AiRewriteApply": "Aplicar reescrita",
+    "Composer_AiTranslateDialogTitle": "Traduzir com IA",
+    "Composer_AiTranslateDialogDescription": "Digite o idioma-alvo ou código de cultura, como en-US, tr-TR, de-DE ou fr-FR.",
+    "Composer_AiTranslateApply": "Traduzir",
+    "Composer_AiTranslateLanguage": "Idioma-alvo",
+    "Composer_AiTranslateCustomPlaceholder": "Digite o código de cultura",
+    "Composer_AiTranslateLanguageEnglish": "Inglês (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turco (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Alemão (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francês (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Espanhol (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiano (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Português (Brasil) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Holandês (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Polonês (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Russo (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonês (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coreano (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chinês, Simplificado (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Árabe (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Outro...",
+    "Composer_AiBusyTitle": "A IA já está em funcionamento.",
+    "Composer_AiBusyMessage": "Por favor, aguarde a conclusão da ação atual da IA.",
+    "Composer_AiSignInRequired": "Faça login na sua Conta Wino para usar os recursos de IA.",
+    "Composer_AiMissingHtml": "Ainda não há conteúdo de mensagem para enviar para a IA do Wino.",
+    "Composer_AiQuotaUnavailable": "O resultado da IA foi aplicado.",
+    "Composer_AiAppliedMessage": "O resultado da IA foi aplicado ao compositor. Use Desfazer se quiser reverter.",
+    "Composer_AiSummarizeSuccessTitle": "Resumo da IA aplicado",
+    "Composer_AiTranslateSuccessTitle": "Tradução da IA aplicada",
+    "Composer_AiRewriteSuccessTitle": "Reescrita da IA aplicada",
+    "Composer_AiErrorTitle": "Ação da IA falhou",
+    "Reader_AiAppliedMessage": "O resultado da IA é exibido para esta mensagem. Reabra a mensagem para ver o conteúdo original novamente.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Intervalo de sincronização de e-mail",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervalo de sincronização automática de e-mails (minutos). Esta configuração será aplicada apenas após reiniciar o Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Intervalo de sincronização automática de e-mails (minutos). Esta configuração será aplicada apenas após reiniciar o Wino Mail.",
+    "ContactsPage_Title": "Contatos",
+    "ContactsPage_AddContact": "Adicionar Contato",
+    "ContactsPage_EditContact": "Editar Contato",
+    "ContactsPage_DeleteContact": "Excluir Contato",
+    "ContactsPage_SearchPlaceholder": "Pesquisar contatos...",
+    "ContactsPage_NoContacts": "Nenhum contato encontrado",
+    "ContactsPage_ContactsCount": "{0} contatos",
+    "ContactsPage_SelectedContactsCount": "{0} selecionado(s)",
+    "ContactsPage_DeleteSelectedContacts": "Excluir Selecionados",
+    "ContactEditDialog_Title": "Editar Contato",
+    "ContactEditDialog_PhotoSection": "Foto",
+    "ContactEditDialog_ChoosePhoto": "Escolher Foto",
+    "ContactEditDialog_RemovePhoto": "Remover Foto",
+    "ContactEditDialog_NameHeader": "Nome",
+    "ContactEditDialog_NamePlaceholder": "Nome do contato",
+    "ContactEditDialog_EmailHeader": "Endereço de E-mail",
+    "ContactEditDialog_EmailPlaceholder": "contato@exemplo.com",
+    "ContactEditDialog_InfoSection": "Informações de Contato",
+    "ContactEditDialog_RootContactInfo": "Este é um contato raiz associado às suas contas e não pode ser excluído.",
+    "ContactEditDialog_OverriddenContactInfo": "Este contato foi modificado manualmente e não será atualizado durante a sincronização.",
+    "ContactsPage_Subtitle": "Gerencie seus contatos de e-mail e as informações deles.",
+    "ContactStatus_Account": "Conta",
+    "ContactStatus_Modified": "Modificado",
+    "ContactAction_Edit": "Editar contato",
+    "ContactAction_ChangePhoto": "Alterar foto",
+    "ContactAction_Delete": "Excluir contato",
+    "ContactAction_Add": "Adicionar Contato",
+    "ContactSelection_Selected": "Selecionado",
+    "ContactSelection_SelectAll": "Selecionar Tudo",
+    "ContactSelection_Clear": "Limpar Seleção",
+    "ContactsPage_EmptyState": "Nenhum contato para exibir",
+    "ContactsPage_AddFirstContact": "Adicione seu primeiro contato",
+    "ContactsPage_ContactsCountSuffix": "contatos",
+    "ContactsPane_NewContact": "Novo Contato",
+    "ContactsPane_DescriptionTitle": "Gerencie seus contatos",
+    "ContactsPane_DescriptionBody": "Crie contatos, renomeie-os, atualize fotos de perfil e mantenha dados salvos organizados em um só local.",
+    "ContactEditDialog_AddTitle": "Adicionar Contato",
+    "ContactInfoBar_ContactAdded": "Contato adicionado com sucesso.",
+    "ContactInfoBar_ContactUpdated": "Contato atualizado com sucesso.",
+    "ContactInfoBar_ContactsDeleted": "Contatos excluídos com sucesso.",
+    "ContactInfoBar_ContactPhotoUpdated": "Foto de contato atualizada com sucesso.",
+    "ContactInfoBar_FailedToLoadContacts": "Falha ao carregar contatos: {0}",
+    "ContactInfoBar_FailedToAddContact": "Falha ao adicionar contato: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Falha ao atualizar contato: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Falha ao excluir contatos: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Falha ao atualizar a foto: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Contatos raiz não podem ser excluídos.",
+    "ContactConfirmDialog_DeleteTitle": "Excluir Contato",
+    "ContactConfirmDialog_DeleteMessage": "Tem certeza de que deseja excluir o contato '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Tem certeza de que deseja excluir {0} contato(s)?",
+    "ContactConfirmDialog_DeleteButton": "Excluir",
+    "CalendarAccountSettings_Title": "Configurações da Conta de Calendário",
+    "CalendarAccountSettings_Description": "Gerencie as configurações de calendário para {0}",
+    "CalendarAccountSettings_AccountColor": "Cor da Conta",
+    "CalendarAccountSettings_AccountColorDescription": "Altere a cor de exibição desta conta de calendário.",
+    "CalendarAccountSettings_SyncEnabled": "Ativar sincronização",
+    "CalendarAccountSettings_SyncEnabledDescription": "Ative ou desative a sincronização do calendário para esta conta.",
+    "CalendarAccountSettings_DefaultShowAs": "Estado de disponibilidade padrão",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Estado de disponibilidade padrão para novos eventos criados com esta conta.",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendário principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marque este calendário como o calendário principal para a conta.",
+    "CalendarSettings_NewEventBehavior_Header": "Comportamento do botão Novo Evento",
+    "CalendarSettings_NewEventBehavior_Description": "Escolha se o botão Novo Evento deve pedir um calendário a cada vez ou abrir sempre um calendário específico.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Perguntar a cada vez.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Sempre usar calendário específico.",
+    "CalendarSettings_Rendering_Title": "Renderização",
+    "CalendarSettings_Rendering_Description": "Configure o layout do calendário e o comportamento de exibição.",
+    "CalendarSettings_Notifications_Title": "Notificações",
+    "CalendarSettings_Notifications_Description": "Escolha o lembrete padrão e o comportamento de adiar.",
+    "CalendarSettings_Preferences_Title": "Preferências",
+    "CalendarSettings_Preferences_Description": "Defina como o botão Novo Evento se comporta.",
+    "WhatIsNew_GetStartedButton": "Começar",
+    "WhatIsNew_ContinueAnywayButton": "Continuar mesmo assim.",
+    "WhatIsNew_PreparingForNewVersionButton": "Preparando para a nova versão...",
+    "WhatIsNew_MigrationPreparing_Title": "Preparando seus dados",
+    "WhatIsNew_MigrationPreparing_Description": "O Wino está aplicando migrações de atualização. Por favor, aguarde enquanto preparamos os dados da sua conta para esta versão.",
+    "WhatIsNew_MigrationFailedMessage": "Falha ao aplicar migrações com o código de erro {0}. Você pode continuar usando o aplicativo. No entanto, se encontrar problemas sérios, reinstale o aplicativo.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Atualizado",
+    "WhatIsNew_MigrationNotification_Message": "Abra o aplicativo para concluir a atualização e ver as novidades.",
+    "WelcomeWindow_Title": "Bem-vindo ao Wino Mail",
+    "WelcomeWindow_Subtitle": "Uma experiência nativa do Windows para Mail e Calendário.",
+    "WelcomeWindow_WhatsNewTitle": "Últimas alterações",
+    "WelcomeWindow_FeaturesTitle": "Recursos",
+    "WelcomeWindow_WhatsNewTab": "Novidades",
+    "WelcomeWindow_FeaturesTab": "Recursos",
+    "WelcomeWindow_GetStartedButton": "Comece adicionando uma conta",
+    "WelcomeWindow_GetStartedDescription": "Adicione sua conta do Outlook, Gmail ou IMAP para começar com o Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importar da sua Conta Wino",
+    "WelcomeWindow_ImportInProgress": "Importando suas preferências e contas sincronizadas...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nenhuma conta sincronizada foi encontrada na sua Conta Wino. Se havia preferências disponíveis, elas foram restauradas. Use Começar para adicionar uma conta manualmente.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} contas sincronizadas já estão disponíveis neste dispositivo. Use Começar para adicionar outra conta manualmente, se necessário.",
+    "WelcomeWindow_SetupTitle": "Configurar sua conta",
+    "WelcomeWindow_SetupSubtitle": "Escolha seu provedor de e-mail para começar",
+    "WelcomeWindow_AddAccountButton": "Adicionar conta",
+    "WelcomeWindow_SkipForNow": "Pular por enquanto — vou configurar mais tarde",
+    "WelcomeWindow_AppDescription": "Uma caixa de entrada rápida e focada — redesenhada para o Windows 11",
+    "WelcomeWizard_Step1Title": "Bem-vindo",
+    "SystemTrayMenu_Open": "Abrir",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Configurações de sincronização",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mantenha suas preferências do Wino sincronizadas entre dispositivos.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Desbloquear complementos",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Acesse recursos premium como o Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gerencie sua Conta Wino, acesso ao AI Pack e preferências sincronizadas e detalhes da conta.",
+    "WinoAccount_Management_SignedOutTitle": "Entrar no Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Faça login ou crie uma conta para sincronizar seus e-mails, acessar recursos de IA e gerenciar suas configurações entre dispositivos.",
+    "WinoAccount_Management_ProfileSectionHeader": "Perfil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Complementos Wino",
+    "WinoAccount_Management_DataSectionHeader": "Dados",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Ações da conta",
+    "WinoAccount_Management_AccountCardTitle": "Conta",
+    "WinoAccount_Management_AccountCardDescription": "Endereço de e-mail da Conta Wino e o estado atual da conta.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Veja se o Wino AI Pack está ativo e quanto uso resta.",
+    "WinoAccount_Management_AiPackActive": "AI Pack está ativo.",
+    "WinoAccount_Management_AiPackInactive": "AI Pack não está ativo.",
+    "WinoAccount_Management_AiPackUsage": "{0} de {1} usos consumidos. {2} restantes.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Período de cobrança: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Os detalhes de uso ainda não estão disponíveis.",
+    "WinoAccount_Management_AiPackBuyDescription": "Compre o Wino AI Pack para traduzir, reescrever ou resumir e-mails com IA.",
+    "WinoAccount_Management_AiPackPromoTitle": "Desbloquear AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Acelere seu fluxo de e-mails com ferramentas alimentadas por IA. Traduza mensagens para 50+ idiomas, reescreva para clareza e tom, e obtenha resumos instantâneos de longas conversas.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4,99 / mês",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 créditos",
+    "WinoAccount_Management_AiPackGetButton": "Obter AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Ferramentas alimentadas por IA para traduzir, reescrever e resumir ações no Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "IA, traduzir, reescrever, resumir, produtividade",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Contas ilimitadas",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Remover o limite de contas e adicionar quantas contas de e-mail você precisar.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "contas, ilimitadas, premium, complemento",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Faça login com sua Conta Wino para concluir esta compra.",
+    "WinoAccount_Management_PurchaseStartFailed": "O Wino não pôde concluir esta compra na Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Sua compra foi concluída, mas o Wino não conseguiu atualizar seus benefícios de conta ainda. Tente novamente em instantes.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Sua assinatura está ativa",
+    "WinoAccount_Management_AiPackRenews": "Renova em {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Créditos usados neste mês",
+    "WinoAccount_Management_AiPackResets": "Reinicializações {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Houve problemas ao carregar o saldo de uso de IA.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traduzir",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Reescrever",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Resumir",
+    "WinoAccount_Management_AddOnLoadFailed": "Tivemos problemas ao carregar este complemento.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronizar Preferências e Contas",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importe ou exporte suas preferências Wino e detalhes da caixa de correio entre dispositivos. Senhas, tokens e outras informações sensíveis nunca são sincronizados.",
+    "WinoAccount_Management_SignOutTitle": "Sair",
+    "WinoAccount_Management_SignOutDescription": "Sair da sua conta neste dispositivo",
+    "WinoAccount_Management_StatusLabel": "Status: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Ainda não há dados sincronizados armazenados para esta conta.",
+    "WinoAccount_Management_ExportSucceeded": "Seus dados Wino selecionados foram exportados com sucesso.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Suas preferências foram exportadas para sua Conta Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Foram exportados {0} detalhes de conta para a sua Conta Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Dados sincronizados importados da sua Conta Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Foram aplicadas {0} preferências sincronizadas.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Foram importadas {0} contas.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Foram puladas {0} contas que já existem neste dispositivo.",
+    "WinoAccount_Management_ImportPartial": "Foram aplicadas {0} preferências sincronizadas. {1} preferências não puderam ser restauradas.",
+    "WinoAccount_Management_ImportReloginReminder": "Senhas, tokens e outras informações sensíveis não foram importadas. Faça login novamente para cada conta neste dispositivo antes de usá-las.",
+    "WinoAccount_Management_SerializeFailed": "O Wino não pôde serializar suas preferências atuais.",
+    "WinoAccount_Management_EmptyExport": "Não há valores de preferência para exportar.",
+    "WinoAccount_Management_ImportEmpty": "A carga de dados sincronizados não contém nada novo para restaurar.",
+    "WinoAccount_Management_ExportDialog_Title": "Exportar para a sua Conta Wino",
+    "WinoAccount_Management_ExportDialog_Description": "Escolha o que deseja sincronizar com a sua Conta Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Preferências",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Contas",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Senhas, tokens e outras informações sensíveis não são sincronizados.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Contas importadas em outro PC ainda precisarão que você faça login novamente antes que possam ser usadas.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportando seus dados Wino selecionados...",
+    "WinoAccount_Management_LoadFailed": "Não foi possível carregar as informações mais recentes da Conta Wino.",
+    "WinoAccount_Management_ActionFailed": "A solicitação da Conta Wino não pôde ser concluída.",
+    "WinoAccount_SettingsSection_Title": "Conta Wino",
+    "WinoAccount_SettingsSection_Description": "Crie ou faça login em uma Conta Wino usando seu serviço de autenticação local.",
+    "WinoAccount_RegisterButton_Title": "Cadastrar conta",
+    "WinoAccount_RegisterButton_Description": "Crie uma Conta Wino com e-mail e senha.",
+    "WinoAccount_RegisterButton_Action": "Abrir cadastro",
+    "WinoAccount_LoginButton_Title": "Entrar",
+    "WinoAccount_LoginButton_Description": "Faça login em uma Conta Wino existente com e-mail e senha.",
+    "WinoAccount_LoginButton_Action": "Abrir login",
+    "WinoAccount_SignOutButton_Title": "Sair",
+    "WinoAccount_SignOutButton_Description": "Remover a sessão da Conta Wino armazenada localmente.",
+    "WinoAccount_SignOutButton_Action": "Sair",
+    "WinoAccount_RegisterDialog_Title": "Criar Conta Wino",
+    "WinoAccount_RegisterDialog_Description": "Crie uma Conta Wino para manter sua experiência Wino sincronizada e desbloquear complementos baseados em conta.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Crie sua Conta Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Por que criar uma?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Importar e exportar configurações entre dispositivos",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Transfira suas preferências do Wino entre dispositivos sem precisar reconstruir sua configuração do zero.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Acesse extensões exclusivas, como o Wino AI Pack (pago)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Use uma Conta para desbloquear recursos premium do Wino conforme ficarem disponíveis.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "A Conta Wino é separada de suas contas de e-mail",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Suas contas de e-mail, como Outlook, Gmail, IMAP ou outras, permanecem exatamente como estão. Uma Conta Wino gerencia apenas recursos específicos do Wino e extensões baseadas em conta.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Cadastrar",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Privacidade e processamento de API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Complementos opcionais, como o Wino AI Pack, podem enviar conteúdo HTML de e-mails selecionados para o serviço de API do Wino apenas quando você usar esses recursos.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Leia a política de privacidade",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Concordo com a política de privacidade.",
+    "WinoAccount_LoginDialog_Title": "Entrar na Conta Wino",
+    "WinoAccount_LoginDialog_Description": "Faça login na sua Conta Wino para sincronizar sua configuração do Wino e acessar recursos baseados em conta.",
+    "WinoAccount_LoginDialog_HeroTitle": "Bem-vindo de volta",
+    "WinoAccount_LoginDialog_BenefitsTitle": "O que o login oferece",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Use sua Conta Wino para continuar sincronizando as configurações entre dispositivos e acessar extensões pagas, como o Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Este não é o login da sua caixa de e-mail",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Entrar aqui não adiciona nem substitui suas contas do Outlook, Gmail ou IMAP no Wino. Ele apenas faz você entrar em serviços específicos do Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Esqueceu a senha?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Senha",
+    "WinoAccount_ConfirmPasswordLabel": "Confirmar senha",
+    "WinoAccount_ForgotPasswordDialog_Title": "Redefinir sua senha",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Enviar e-mail de redefinição",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Voltar ao login",
+    "WinoAccount_ForgotPasswordDialog_Description": "Digite o endereço de e-mail da sua Conta Wino e enviaremos um link de redefinição de senha se o endereço estiver registrado.",
+    "WinoAccount_Validation_EmailRequired": "O e-mail é obrigatório.",
+    "WinoAccount_Validation_PasswordRequired": "A senha é obrigatória.",
+    "WinoAccount_Validation_PasswordMismatch": "As senhas não correspondem.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Você precisa aceitar a política de privacidade antes de criar uma Conta Wino.",
+    "WinoAccount_Error_InvalidCredentials": "O endereço de e-mail ou a senha estão incorretos.",
+    "WinoAccount_Error_AccountLocked": "Esta conta está temporariamente bloqueada.",
+    "WinoAccount_Error_AccountBanned": "Esta conta foi banida.",
+    "WinoAccount_Error_AccountSuspended": "Esta conta foi suspensa.",
+    "WinoAccount_Error_EmailNotConfirmed": "Por favor, confirme seu endereço de e-mail antes de entrar.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Por favor, confirme seu endereço de e-mail antes de entrar.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Um novo e-mail de confirmação ainda não está disponível.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Esta solicitação de confirmação não é mais válida. Por favor, tente entrar novamente.",
+    "WinoAccount_Error_EmailNotRegistered": "Este endereço de e-mail não está registrado.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Sua sessão não é mais válida. Faça login novamente.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Este endereço de e-mail já está cadastrado.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Um endereço de e-mail é necessário para concluir o login externo.",
+    "WinoAccount_Error_ExternalLoginInvalid": "A solicitação de login externo é inválida.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "O estado de autenticação externa é inválido ou expirado.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "O código de autenticação externo é inválido ou expirado.",
+    "WinoAccount_Error_AiPackRequired": "Uma assinatura ativa do Wino AI Pack é necessária para esta ação.",
+    "WinoAccount_Error_AiQuotaExceeded": "Seu limite de uso do Wino AI Pack foi atingido no período de cobrança atual.",
+    "WinoAccount_Error_AiHtmlEmpty": "Não há conteúdo de e-mail para processar.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Este e-mail é grande demais para ser processado pelo Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Esse idioma não é suportado. Tente um código de cultura válido, como en-US ou tr-TR.",
+    "WinoAccount_Error_Forbidden": "Você não tem permissão para realizar esta ação.",
+    "WinoAccount_Error_ValidationFailed": "A requisição é inválida. Por favor, revise os valores inseridos.",
+    "WinoAccount_RegisterSuccessMessage": "O registro da Conta Wino foi concluído para {0}.",
+    "WinoAccount_LoginSuccessMessage": "Conectado à Conta Wino como {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Confirme seu endereço de e-mail",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Enviamos uma confirmação por e-mail para {0}. Por favor confirme-a e tente fazer login novamente.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Confirmação de e-mail necessária",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Ainda estamos aguardando você confirmar {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Reenviar e-mail de confirmação",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Você pode reenviar o e-mail de confirmação em {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Você pode reenviar o e-mail de confirmação agora.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "E-mail de confirmação reenviado",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Enviamos outro e-mail de confirmação para {0}. Por favor confirme-o e tente fazer login novamente.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "E-mail de redefinição de senha enviado",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Enviamos um e-mail de redefinição de senha para {0}. Abra essa mensagem para escolher uma nova senha.",
+    "WinoAccount_ChangePassword_Title": "Alterar senha",
+    "WinoAccount_ChangePassword_Description": "Envie um e-mail de redefinição de senha para esta Conta Wino.",
+    "WinoAccount_ChangePassword_Action": "Enviar e-mail de redefinição",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Você quer que o Wino envie um e-mail de redefinição de senha para {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Desconectado da Conta Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Não há nenhuma Conta Wino ativa para sair.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Conta Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Faça login ou crie uma Conta Wino para gerenciar sua sessão do Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Status: {0}",
+    "WelcomeWizard_Step2Title": "Adicionar Conta",
+    "WelcomeWizard_Step3Title": "Concluir Configuração",
+    "ProviderSelection_Title": "Escolha seu provedor de e-mail",
+    "ProviderSelection_Subtitle": "Selecione um provedor abaixo para adicionar sua conta de e-mail ao Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nome da Conta",
+    "ProviderSelection_AccountNamePlaceholder": "ex.: Pessoal, Trabalho",
+    "ProviderSelection_DisplayNameHeader": "Nome para exibição",
+    "ProviderSelection_DisplayNamePlaceholder": "ex.: João da Silva",
+    "ProviderSelection_EmailHeader": "Endereço de E-mail",
+    "ProviderSelection_EmailPlaceholder": "ex.: joaodoe@exemplo.com",
+    "ProviderSelection_AppPasswordHeader": "Senha de aplicativo",
+    "ProviderSelection_AppPasswordHelp": "Como obtenho uma senha de aplicativo?",
+    "ProviderSelection_CalendarModeHeader": "Integração de Calendário",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Desativado",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Sem integração de calendário",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronização CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Seus eventos de calendário são sincronizados com os servidores da Apple entre seus dispositivos.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Seus eventos de calendário são sincronizados com os servidores Yahoo entre seus dispositivos.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendário local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Seus eventos ficam armazenados apenas no seu computador. Sem conectividade com o servidor.",
+    "ProviderSelection_ClearColor": "Limpar cor",
+    "ProviderSelection_ContinueButton": "Continuar",
+    "ProviderSelection_SpecialImap_Subtitle": "Informe as credenciais da sua conta para conectar.",
+    "AccountSetup_Title": "Configurando sua conta",
+    "AccountSetup_Step_Authenticating": "Autenticando com {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testando autenticação de e-mail",
+    "AccountSetup_Step_SyncingFolders": "Sincronizando metadados de pastas",
+    "AccountSetup_Step_FetchingProfile": "Buscando informações de perfil",
+    "AccountSetup_Step_DiscoveringCalDav": "Descobrindo configurações do CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Testando autenticação de calendário",
+    "AccountSetup_Step_SavingAccount": "Salvando informações da conta",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Buscando metadados do calendário",
+    "AccountSetup_Step_SyncingAliases": "Sincronizando aliases",
+    "AccountSetup_Step_Finalizing": "Finalizando configuração",
+    "AccountSetup_FailureMessage": "Falha na configuração. Volte para corrigir suas configurações ou tente novamente mais tarde.",
+    "AccountSetup_SuccessMessage": "Sua conta foi configurada com sucesso!",
+    "AccountSetup_GoBackButton": "Voltar",
+    "AccountSetup_TryAgainButton": "Tentar novamente",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "A descoberta automática falhou. Por favor, insira as configurações manualmente na guia Avançado."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/ro_RO/resources.json b/Wino.Core.Domain/Translations/ro_RO/resources.json
index e9f62ce5..aaafc202 100644
--- a/Wino.Core.Domain/Translations/ro_RO/resources.json
+++ b/Wino.Core.Domain/Translations/ro_RO/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Acest cont necesită resincronizare completă pentru a continua să funcționeze. Vă rugăm să așteptați în timp ce Wino vă resincronizează mesajele...",
     "AccountContactNameYou": "Dvs.",
     "AccountCreationDialog_Completed": "toate terminate",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Se preiau detalii despre calendar.",
     "AccountCreationDialog_FetchingEvents": "Preluare evenimente calendar.",
     "AccountCreationDialog_FetchingProfileInformation": "Preluare detalii de profil.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "În cazul în care browser-ul dvs. nu a fost lansat automat pentru a finaliza autentificarea:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "se inițializează",
     "AccountCreationDialog_PreparingFolders": "Obținem informații despre folder în acest moment.",
     "AccountCreationDialog_SigninIn": "Informațiile contului sunt salvate.",
+    "Purchased": "Achiziționat",
     "AccountEditDialog_Message": "Nume Cont",
     "AccountEditDialog_Title": "Editare Cont",
     "AccountPickerDialog_Title": "Alegeți un cont",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Schimbați numele contului în Wino și setați numele dorit al expeditorului.",
     "AccountDetailsPage_ColorPicker_Title": "Culoarea contului",
     "AccountDetailsPage_ColorPicker_Description": "Atribuiți o nouă culoare a contului pentru a-i colora simbolul în listă.",
+    "AccountDetailsPage_TabGeneral": "General",
+    "AccountDetailsPage_TabMail": "Email",
+    "AccountDetailsPage_TabCalendar": "Calendar",
+    "AccountDetailsPage_CalendarListDescription": "Selectați un calendar pentru a-i configura setările.",
     "AddHyperlink": "Adăugare",
     "AppCloseBackgroundSynchronizationWarningTitle": "Sincronizare în Fundal",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Aplicația nu a fost setată să pornească la pornirea Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Cont IMAP",
     "Busy": "Ocupat",
     "Buttons_AddAccount": "Adăugare Cont",
+    "Buttons_FixAccount": "Remediază contul",
     "Buttons_AddNewAlias": "Adăugare Alias Nou",
     "Buttons_Allow": "Permite",
+    "Buttons_Apply": "Aplică",
     "Buttons_ApplyTheme": "Aplicați Tema",
     "Buttons_Browse": "Răsfoire",
     "Buttons_Cancel": "Anulare",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Editare",
     "Buttons_EnableImageRendering": "Activare",
     "Buttons_Multiselect": "Selectare Multiplă",
+    "Buttons_Manage": "Gestionează",
     "Buttons_No": "Nu",
     "Buttons_Open": "Deschidere",
     "Buttons_Purchase": "Achiziționare",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Salvare",
     "Buttons_SaveConfiguration": "Salvare Configurație",
     "Buttons_Send": "Trimitere",
+    "Buttons_SendToServer": "Trimite către server",
     "Buttons_Share": "Partajare",
     "Buttons_SignIn": "Conectare",
     "Buttons_Sync": "Sincronizare",
     "Buttons_SyncAliases": "Sincronizați Aliasurile",
     "Buttons_TryAgain": "Încercați din Nou",
     "Buttons_Yes": "Da",
+    "Sync_SynchronizingFolder": "Se sincronizează {0} {1}%",
+    "Sync_DownloadedMessages": "Au fost descărcate {0} mesaje din {1}",
+    "SyncAction_Archiving": "Arhivare {0} mesaj(e)",
+    "SyncAction_ClearingFlag": "Eliminarea steagului {0} mesaj(e)",
+    "SyncAction_CreatingDraft": "Creare schiță",
+    "SyncAction_CreatingEvent": "Creare eveniment",
+    "SyncAction_Deleting": "Ștergerea {0} mesaj(e)",
+    "SyncAction_EmptyingFolder": "Golește folderul",
+    "SyncAction_MarkingAsRead": "Marcare {0} mesaj(e) ca citite",
+    "SyncAction_MarkingAsUnread": "Marcare {0} mesaj(e) ca necitite",
+    "SyncAction_MarkingFolderAsRead": "Marcare folderului ca citit",
+    "SyncAction_Moving": "Mutarea {0} mesaj(e)",
+    "SyncAction_MovingToFocused": "Mutarea {0} mesaj(e) către Focused",
+    "SyncAction_RenamingFolder": "Redenumire folder",
+    "SyncAction_SendingMail": "Trimitere e-mail",
+    "SyncAction_SettingFlag": "Atribuirea steagului {0} mesaj(e)",
+    "SyncAction_SynchronizingAccount": "Se sincronizează {0}",
+    "SyncAction_SynchronizingAccounts": "Se sincronizează {0} cont(e)",
+    "SyncAction_SynchronizingCalendarData": "Se sincronizează datele calendarului",
+    "SyncAction_SynchronizingCalendarEvents": "Se sincronizează evenimentele din calendar",
+    "SyncAction_SynchronizingCalendarMetadata": "Se sincronizează metadatele calendarului",
+    "SyncAction_Unarchiving": "Dezarchivarea {0} mesaj(e)",
     "CalendarAllDayEventSummary": "evenimente pe tot parcursul zilei",
     "CalendarDisplayOptions_Color": "Culoare",
     "CalendarDisplayOptions_Expand": "Extindere",
+    "CalendarEventResponse_Accept": "Acceptă",
+    "CalendarEventResponse_AcceptedResponse": "Acceptat",
+    "CalendarEventResponse_Decline": "Refuză",
+    "CalendarEventResponse_DeclinedResponse": "Refuzat",
+    "CalendarEventResponse_NotResponded": "Nu a răspuns",
+    "CalendarEventResponse_Tentative": "Tentativ",
+    "CalendarEventResponse_TentativeResponse": "Tentativ",
+    "CalendarEventRsvpPanel_Accept": "Acceptă",
+    "CalendarEventRsvpPanel_AddMessage": "Adaugă un mesaj la răspunsul tău... (opțional)",
+    "CalendarEventRsvpPanel_Decline": "Refuză",
+    "CalendarEventRsvpPanel_Message": "Mesaj",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Trimite un mesaj de răspuns",
+    "CalendarEventRsvpPanel_Tentative": "Tentativ",
+    "CalendarEventRsvpPanel_Title": "Opțiuni de răspuns",
+    "CalendarAttendeeStatus_Accepted": "Acceptat",
+    "CalendarAttendeeStatus_Declined": "Refuzat",
+    "CalendarAttendeeStatus_NeedsAction": "Are nevoie de acțiune",
+    "CalendarAttendeeStatus_Tentative": "Tentativ",
+    "CalendarEventDetails_Attachments": "Atașamente",
+    "CalendarEventCompose_AddAttachment": "Adaugă atașament",
+    "CalendarEventCompose_AllDay": "Toată ziua",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Atașamentele nu sunt suportate pentru calendarele CalDAV.",
+    "CalendarEventCompose_EndDate": "Data de încheiere",
+    "CalendarEventCompose_EndTime": "Ora de încheiere",
+    "CalendarEventCompose_Every": "fiecare",
+    "CalendarEventCompose_ForWeekdays": "pentru",
+    "CalendarEventCompose_FrequencyDay": "zi",
+    "CalendarEventCompose_FrequencyDayPlural": "zile",
+    "CalendarEventCompose_FrequencyMonth": "lună",
+    "CalendarEventCompose_FrequencyMonthPlural": "luni",
+    "CalendarEventCompose_FrequencyWeek": "săptămână",
+    "CalendarEventCompose_FrequencyWeekPlural": "săptămâni",
+    "CalendarEventCompose_FrequencyYear": "an",
+    "CalendarEventCompose_FrequencyYearPlural": "ani",
+    "CalendarEventCompose_Location": "Locație",
+    "CalendarEventCompose_LocationPlaceholder": "Adaugă o locație",
+    "CalendarEventCompose_NewEventButton": "Eveniment nou",
+    "CalendarEventCompose_DefaultCalendarHint": "Puteți alege un calendar implicit pentru evenimentele noi în setările Calendarului.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Deschide setările Calendarului",
+    "CalendarEventCompose_NoCalendarsMessage": "Nu există calendare disponibile pentru crearea unui eveniment.",
+    "CalendarEventCompose_NoCalendarsTitle": "Niciun calendar disponibil",
+    "CalendarEventCompose_NoEndDate": "Fără dată de încheiere",
+    "CalendarEventCompose_Notes": "Notițe",
+    "CalendarEventCompose_PickCalendarTitle": "Alege un calendar",
+    "CalendarEventCompose_Recurring": "Recurent",
+    "CalendarEventCompose_RecurringSummary": "Are loc la fiecare {0} {1}{2} {3} în vigoare {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Are loc {0}{1} {2} în vigoare {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Repetă la fiecare",
+    "CalendarEventCompose_SelectCalendar": "Selectează calendarul",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Are loc pe {0} {1}",
+    "CalendarEventCompose_StartDate": "Data de începere",
+    "CalendarEventCompose_StartTime": "Ora de început",
+    "CalendarEventCompose_TimeRangeSummary": "de la {0} până la {1}",
+    "CalendarEventCompose_Title": "Titlul evenimentului",
+    "CalendarEventCompose_TitlePlaceholder": "Adaugă un titlu",
+    "CalendarEventCompose_Until": "până",
+    "CalendarEventCompose_UntilSummary": " până {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Data de încheiere pentru intervalul de o zi întreagă trebuie să fie după data de început.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Unul sau mai mulți participanți au o adresă de email invalidă.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Data de încheiere a repetării trebuie să fie egală sau după data de început a evenimentului.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Ora de încheiere trebuie să fie mai târziu decât ora de început.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Unul sau mai multe atașamente nu mai sunt disponibile: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Selectați un calendar înainte de a crea evenimentul.",
+    "CalendarEventCompose_ValidationMissingTitle": "Introduceți un titlu pentru eveniment înainte de a crea evenimentul.",
+    "CalendarEventCompose_ValidationTitle": "Validarea evenimentului a eșuat.",
+    "CalendarEventCompose_WeekdaySummary": " pe {0}",
+    "CalendarEventCompose_Weekday_Friday": "V",
+    "CalendarEventCompose_Weekday_Monday": "L",
+    "CalendarEventCompose_Weekday_Saturday": "S",
+    "CalendarEventCompose_Weekday_Sunday": "D",
+    "CalendarEventCompose_Weekday_Thursday": "J",
+    "CalendarEventCompose_Weekday_Tuesday": "M",
+    "CalendarEventCompose_Weekday_Wednesday": "M",
+    "CalendarEventDetails_Details": "Detalii",
+    "CalendarEventDetails_EditSeries": "Editează seria",
+    "CalendarEventDetails_Editing": "Editare",
+    "CalendarEventDetails_InviteSomeone": "Invită pe cineva",
+    "CalendarEventDetails_JoinOnline": "Conectează-te online",
+    "CalendarEventDetails_Organizer": "Organizator",
+    "CalendarEventDetails_People": "Persoane",
+    "CalendarEventDetails_ReadOnlyEvent": "Eveniment doar pentru citire",
+    "CalendarEventDetails_Reminder": "Notificare",
+    "CalendarReminder_StartedHoursAgo": "Au trecut {0} ore",
+    "CalendarReminder_StartedMinutesAgo": "Au trecut {0} minute",
+    "CalendarReminder_StartedNow": "A început chiar acum",
+    "CalendarReminder_StartingNow": "Începe acum",
+    "CalendarReminder_StartsInHours": "Începe în {0} ore",
+    "CalendarReminder_StartsInMinutes": "Începe în {0} minute",
+    "CalendarReminder_SnoozeAction": "Amână",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minute",
+    "CalendarEventDetails_ShowAs": "Afișează ca",
+    "CalendarShowAs_Free": "Liber",
+    "CalendarShowAs_Tentative": "Tentativ",
+    "CalendarShowAs_Busy": "Ocupat",
+    "CalendarShowAs_OutOfOffice": "În afara biroului",
+    "CalendarShowAs_WorkingElsewhere": "Lucrez în altă locație",
     "CalendarItem_DetailsPopup_JoinOnline": "Alăturați-vă online",
     "CalendarItem_DetailsPopup_ViewEventButton": "Vizualizare eveniment",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Vizualizare serie",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} copiat în clipboard.",
     "ClipboardTextCopied_Title": "Copiat",
     "ClipboardTextCopyFailed_Message": "Nu s-a putut copia {0} în clipboard.",
+    "ContactInfoBar_ErrorTitle": "Nu s-a putut încărca informațiile de contact",
+    "ContactInfoBar_SuccessTitle": "Informațiile de contact au fost încărcate",
+    "ContactInfoBar_WarningTitle": "Informațiile de contact ar putea fi incomplete",
     "ComingSoon": "În curând...",
     "ComposerAttachmentsDragDropAttach_Message": "Atașare",
     "ComposerAttachmentsDropZone_Message": "Plasați-vă fișierele aici",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Nume Link Cont",
     "DialogMessage_DeleteAccountConfirmationMessage": "Ștergeți {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Toate datele asociate acestui cont vor fi șterse definitiv de pe disc.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Ștergeți șablonul \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Ștergeți șablonul de e-mail",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Aceasta va șterge toate evenimentele din seria respectivă. Doriți să continuați?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Șterge seria repetitivă",
     "DialogMessage_DiscardDraftConfirmationMessage": "Această schiță va fi eliminat. Doriți să continuați?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Eliminare Schiță",
     "DialogMessage_EmptySubjectConfirmation": "Subiect Lipsă",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Mod luminos",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Configurarea folderelor de sistem a eșuat",
+    "Exception_AccountNeedsAttention_Title": "Contul are nevoie de atenție",
+    "Exception_AccountNeedsAttention_Message": "'{0}' necesită atenția dumneavoastră pentru a continua lucrul.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail nu a putut găsi WebView2 Runtime-ul Microsoft Edge. Vă rugăm să instalați sau să reparați runtime-ul pentru a reda conținutul mesajului corect.",
+    "Exception_WebView2RuntimeMissing_Title": "Este necesar WebView2 Runtime",
     "Exception_AuthenticationCanceled": "Autentificare anulată",
     "Exception_CustomThemeExists": "Această temă există deja.",
     "Exception_CustomThemeMissingName": "Trebuie să furnizați un nume.",
     "Exception_CustomThemeMissingWallpaper": "Trebuie să furnizați o imagine de fundal personalizată.",
     "Exception_FailedToSynchronizeAliases": "Sincronizarea aliasurilor a eșuat",
+    "Exception_FailedToSynchronizeCalendarData": "Nu s-a reușit sincronizarea datelor calendarului",
+    "Exception_FailedToSynchronizeCalendarEvents": "Nu s-a reușit sincronizarea evenimentelor din calendar",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Nu s-a reușit sincronizarea detaliilor calendarului",
     "Exception_FailedToSynchronizeFolders": "Sincronizarea folderelor a eșuat",
     "Exception_FailedToSynchronizeProfileInformation": "Sincronizarea informațiilor de profil a eșuat",
     "Exception_GoogleAuthCallbackNull": "Callback uri este nul la activare.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Mutare în Gunoi",
     "HoverActionOption_ToggleFlag": "Semnalizare / Desemnalizare",
     "HoverActionOption_ToggleRead": "Citit / Necitit",
+    "KeyboardShortcuts_FailedToReset": "Nu s-a putut resetarea scurtăturilor de la tastatură.",
+    "KeyboardShortcuts_FailedToUpdate": "Nu s-a putut actualizarea scurtăturilor de la tastatură.",
+    "KeyboardShortcuts_MailoperationAction": "Acțiune",
+    "KeyboardShortcuts_Action": "Acțiune",
+    "KeyboardShortcuts_FailedToLoad": "Nu s-a putut încărcarea scurtăturilor de la tastatură.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Vă rugăm să introduceți o tastă pentru scurtătură.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Vă rugăm să selectați o acțiune pentru scurtătură.",
+    "KeyboardShortcuts_EnterKey": "Vă rugăm să introduceți o tastă pentru scurtătură.",
+    "KeyboardShortcuts_SelectOperation": "Vă rugăm să selectați o acțiune pentru scurtătură.",
+    "KeyboardShortcuts_ShortcutInUse": "Această scurtătură este deja utilizată de o altă scurtătură.",
+    "KeyboardShortcuts_FailedToSave": "Nu s-a putut salva scurtătura.",
+    "KeyboardShortcuts_FailedToDelete": "Nu s-a putut șterge scurtătura.",
+    "KeyboardShortcuts_PageDescription": "Configurează scurtăturile de tastatură pentru operațiile rapide cu e-mail. Apăsați tastele în timp ce câmpul de introducere a tastei este focalizat pentru a captura scurtăturile.",
+    "KeyboardShortcuts_Add": "Adaugă scurtătură",
+    "KeyboardShortcuts_EditTitle": "Editează scurtătura de tastatură",
+    "KeyboardShortcuts_ResetToDefaults": "Resetează la valorile implicite",
+    "KeyboardShortcuts_PressKeysHere": "Apăsați tastele aici...",
+    "KeyboardShortcuts_KeyCombination": "Combinație de taste",
+    "KeyboardShortcuts_FocusArea": "Focalizați câmpul de mai sus și apăsați combinația de taste dorită",
+    "KeyboardShortcuts_Modifiers": "Taste modificatoare",
+    "KeyboardShortcuts_Mode": "Modul aplicație",
+    "KeyboardShortcuts_ModeMail": "E-mail",
+    "KeyboardShortcuts_ModeCalendar": "Calendar",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Comută citit/necitit",
+    "KeyboardShortcuts_ActionToggleFlag": "Comută steag",
+    "KeyboardShortcuts_ActionToggleArchive": "Arhivează/Dezarhivează",
     "ImageRenderingDisabled": "Randarea imaginilor este dezactivată pentru acest mesaj.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Metodă de autentificare",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Securitatea conexiunii",
@@ -262,8 +430,8 @@
     "IMAPSetupDialog_AccountType": "Tip cont",
     "IMAPSetupDialog_ValidationSuccess_Title": "Succes",
     "IMAPSetupDialog_ValidationSuccess_Message": "Validare reușită",
-    "IMAPSetupDialog_SaveImapSuccess_Title": "Succes",
-    "IMAPSetupDialog_SaveImapSuccess_Message": "Setări IMAP salvate cu succes.",
+    "IMAPSetupDialog_SaveImapSuccess_Title": "Success",
+    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP settings saved successfuly.",
     "IMAPSetupDialog_ValidationFailed_Title": "Validarea serverului IMAP a eșuat.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "Acest server solicită un SSL handshake pentru a continua. Vă rugăm să confirmați detaliile certificatului de mai jos.",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "Permiteți handshake-ului să continue configurarea contului.",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Nume de utilizator",
     "IMAPSetupDialog_UsernamePlaceholder": "andreipopescu, andreipopescu@fabikam.com, domeniu/andreipopescu",
     "IMAPSetupDialog_UseSameConfig": "Utilizați același nume de utilizator și aceeași parolă pentru trimiterea de e-mail",
+    "ImapCalDavSettingsPage_TitleCreate": "Configurare IMAP și Calendar",
+    "ImapCalDavSettingsPage_TitleEdit": "Editează setările IMAP și Calendar",
+    "ImapCalDavSettingsPage_Subtitle": "Configurează IMAP/SMTP și sincronizarea calendarului pentru acest cont.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Setări de bază",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Introduceți identitatea și acreditările dvs. Wino poate încerca să detecteze automat setările serverului.",
+    "ImapCalDavSettingsPage_BasicTab": "De bază",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Activează suportul pentru calendar",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Autodetectează setările de e-mail",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Setările de e-mail au fost descoperite și aplicate.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Configurare avansată",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Introduceți manual setările serverului dacă detectarea automată nu este disponibilă sau este incorectă.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Avansat",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Configurare calendar",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Alegeți cum ar trebui să funcționeze datele calendarului pentru acest cont IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Mod calendar",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Securitatea conexiunii",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Metoda de autentificare",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Dezactivat",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Sincronizarea CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Doar calendar local",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Calendarul este dezactivat pentru acest cont.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Elementele calendarului sunt sincronizate cu serverul CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Elementele calendarului sunt stocate doar pe acest calculator și nu sunt sincronizate în rețea.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Cum funcționează calendarul local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Doar calendar local",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Calendarul local păstrează toate evenimentele doar pe calculatorul dvs. Niciunul dintre ele nu este sincronizat cu iCloud, Yahoo sau alt furnizor.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL-ul serviciului CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Numele de utilizator CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Parola CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Testul CalDAV este necesar doar atunci când modul calendar este setat la sincronizarea CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL-ul serviciului CalDAV este necesar.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL-ul serviciului CalDAV trebuie să fie un URL absolut.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Numele de utilizator CalDAV este obligatoriu.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Parola CalDAV este obligatorie.",
+    "ImapCalDavSettingsPage_TestImapButton": "Testează conexiunea IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Testează conexiunea CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Testul conexiunii IMAP a reușit.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Testul conexiunii CalDAV a reușit.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Setările contului au fost validate și salvate.",
+    "ImapCalDavSettingsPage_ICloudHint": "Folosiți o parolă de aplicație generată din setările contului dvs. Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Folosiți o parolă de aplicație din setările de securitate ale contului Yahoo.",
     "Info_AccountCreatedMessage": "{0} este creat",
     "Info_AccountCreatedTitle": "Creare Cont",
     "Info_AccountCreationFailedTitle": "Crearea contului a eșuat",
     "Info_AccountDeletedMessage": "{0} a fost șters cu succes.",
     "Info_AccountDeletedTitle": "Cont Șters",
     "Info_AccountIssueFixFailedTitle": "Eșuat",
+    "Info_AccountIssueFixImapMessage": "Deschideți pagina de setări IMAP și calendar pentru a introduce din nou acreditările serverului.",
+    "Info_AccountAttentionRequiredMessage": "Acest cont necesită atenția dumneavoastră.",
+    "Info_AccountAttentionRequiredClickableMessage": "Faceți clic pentru a repara acest cont și a-l resincroniza.",
+    "Info_AccountAttentionRequiredAction": "Remediază",
+    "Info_AccountAttentionRequiredActionHint": "Faceți clic pe Remediază pentru a rezolva această problemă a contului.",
     "Info_AccountIssueFixSuccessMessage": "Au fost rezolvate toate problemele contului.",
     "Info_AccountIssueFixSuccessTitle": "Succes",
     "Info_AttachmentOpenFailedMessage": "Nu se poate deschide acest atașament.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Acest folder este dezactivat pentru sincronizare.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Folder Dezactivat",
     "Justify": "Justificare",
+    "MenuUpdateAvailable": "Actualizare disponibilă",
     "Left": "Stânga",
     "Link": "Link",
     "LinkedAccountsCreatePolicyMessage": "trebuie să aveți cel puțin 2 conturi pentru a crea un link\nlink-ul va fi eliminat la salvare",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Dezarhivare",
     "MailOperation_ViewMessageSource": "Vizualizați sursa mesajului",
     "MailOperation_Zoom": "Mărește",
+    "MailsDragging": "Se trag {0} element(e)",
     "MailsSelected": "{0} element(e) selectate",
     "MarkFlagUnflag": "Marcare ca semnazizat/nesemnalizat",
     "MarkReadUnread": "Marcare ca citit/necitit",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Mesaj E-Mail Nou",
     "Notifications_WinoUpdatedMessage": "Verificați versiunea nouă {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail a fost actualizat.",
+    "Notifications_StoreUpdateAvailableTitle": "Actualizare disponibilă",
+    "Notifications_StoreUpdateAvailableMessage": "O versiune mai nouă de Wino Mail este pregătită pentru instalare din Microsoft Store.",
     "OnlineSearchFailed_Message": "Nu s-a reușit căutarea\n{0}\n\nSe listează e-mail-urile offline.",
     "OnlineSearchTry_Line1": "Nu găsiți ceea ce căutați?",
     "OnlineSearchTry_Line2": "Încercați căutarea online.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Mic",
     "Photos": "Fotografii",
     "PreparingFoldersMessage": "Se pregătesc folderele",
-    "ProtocolLogAvailable_Message": "Jurnalele de protocol sunt disponibile pentru diagnostice.",
     "ProviderDetail_Gmail_Description": "Cont Google",
     "ProviderDetail_iCloud_Description": "Cont Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Căutare",
     "SearchingIn": "Se caută în",
     "SearchPivotName": "Rezultate",
+    "Settings_KeyboardShortcuts_Title": "Scurtături de tastatură",
+    "Settings_KeyboardShortcuts_Description": "Gestionează scurtăturile de tastatură pentru acțiuni rapide în e-mailuri.",
     "SettingConfigureSpecialFolders_Button": "Configurare",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Configurație IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Modificați setările serverului de intrare/ieșire.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Setări IMAP și calendar",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Deschideți pagina dedicată de setări IMAP, SMTP și CalDAV pentru acest cont.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Deschideți setările",
     "SettingsAbout_Description": "Aflați mai multe despre Wino.",
     "SettingsAbout_Title": "Despre",
     "SettingsAboutGithub_Description": "Mergeți la tracker-ul de probleme al repozitoriului GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Modul de căutare implicit",
+    "SettingsAppPreferences_ApplicationMode_Title": "Mod implicit al aplicației",
+    "SettingsAppPreferences_ApplicationMode_Description": "Alegeți modul în care Wino se deschide atunci când nu este specificat un tip de activare.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "E-mail",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Calendar",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail va continua să ruleze în fundal. Veți fi anunțat pe măsură ce sosesc e-mailuri noi.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Rulare în fundal",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail va continua să ruleze în zona de notificări. Disponibil pentru lansare făcând clic pe o pictogramă. Veți fi anunțat pe măsură ce sosesc e-mailuri noi.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "A apărut o eroare fatală la schimbarea modului de pornire pentru Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Pornire minimizată la pornirea Windows",
     "SettingsAppPreferences_Title": "Preferințe Aplicație",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Ascundeți butonul contului Wino din bara de titlu",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Ascundeți butonul de profil din bara de titlu care deschide meniul contului Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Notificări despre actualizările din Microsoft Store",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Afișează notificări și acțiuni în subsol atunci când este disponibilă o actualizare din Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Acțiuni AI",
+    "SettingsAppPreferences_AiActions_Description": "Alegeți limbile AI implicite și locul în care rezumatele ar trebui să fie salvate.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Limba de traducere implicită",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Alegeți limba țintă implicită utilizată de acțiunile de traducere AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Limba rezumării",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Alegeți limba de rezumat preferată pentru ieșirea viitoare a rezumatelor AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Calea implicită de salvare a rezumatelor",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Alegeți directorul implicit pe care Wino ar trebui să-l folosească la salvarea rezumatelor AI.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Folosiți locația implicită de salvare a sistemului",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Acest folder nu există. Pentru rezumate va fi folosită locația implicită de salvare.",
     "SettingsAutoSelectNextItem_Description": "Selectați următorul element după ce ștergeți sau mutați un e-mail.",
     "SettingsAutoSelectNextItem_Title": "Selectați automat următorul element",
     "SettingsAvailableThemes_Description": "Selectați o temă din colecția Wino pentru gustul dvs. sau aplicați propriile teme.",
     "SettingsAvailableThemes_Title": "Teme Disponibile",
     "SettingsCalendarSettings_Description": "Modificați prima zi a săptămânii, înălțimea celulei de oră și multe altele...",
     "SettingsCalendarSettings_Title": "Setări Calendar",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Durata implicită de amânare",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Stabiliți o durată implicită de amânare pentru notificările de reamintire din calendar.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formatul antetului zilei în vizualizarea temporizată.",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Alegeți cum sunt afișate etichetele zilei în vizualizările pentru zi, săptămână și săptămâna de lucru. Folosiți tokenuri de format ale datei precum ddd, dd, MMM sau dddd.",
     "SettingsComposer_Title": "Compozitor",
     "SettingsComposerFont_Title": "Font Compozitor Implicit",
     "SettingsComposerFontFamily_Description": "Modificați familia de fonturi implicite și dimensiunea fontului pentru compunerea e-mail-urilor.",
@@ -521,7 +765,7 @@
     "SettingsCustomTheme_Title": "Temă Personalizată",
     "SettingsDeleteAccount_Description": "Ștergeți toate e-mail-urile și acreditările asociate cu acest cont.",
     "SettingsDeleteAccount_Title": "Ștergeți acest cont",
-    "SettingsDeleteProtection_Description": "Ar trebui ca Wino să vă ceară o confirmare de fiecare dată când încercați să ștergeți definitiv un e-mail folosind tastele Shift + Del?",
+    "SettingsDeleteProtection_Description": "Should Wino ask you for confirmation every time you try to permanently delete a mail using Shift + Del keys?",
     "SettingsDeleteProtection_Title": "Protecție Ștergere Permanentă",
     "SettingsDiagnostics_Description": "Pentru dezvoltatori",
     "SettingsDiagnostics_DiagnosticId_Description": "Partajați acest ID cu dezvoltatorii atunci când le cereți ajutor pentru problemele pe care le întâmpinați în Wino Mail.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Canal Discord",
     "SettingsEditLinkedInbox_Description": "Adăugați/eliminați conturi, redenumiți sau rupeți legătura dintre conturi.",
     "SettingsEditLinkedInbox_Title": "Editați Inboxul Asociat",
+    "SettingsWindowBackdrop_Title": "Fundalul ferestrei",
+    "SettingsWindowBackdrop_Description": "Alegeți un efect de fundal pentru ferestrele Wino.",
+    "SettingsWindowBackdrop_Disabled": "Selecția fundalului ferestrei este dezactivată dacă tema aplicației este setată la ceva altceva decât Implicit.",
     "SettingsElementTheme_Description": "Selectați o temă Windows pentru Wino",
     "SettingsElementTheme_Title": "Temă Element",
     "SettingsElementThemeSelectionDisabled": "Selectarea temei elementului este dezactivată atunci când tema aplicației este selectată diferită de Implicită.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliasuri",
     "SettingsEditAccountDetails_Title": "Editați detaliile contului",
     "SettingsEditAccountDetails_Description": "Schimbați numele contului, numele expeditorului și atribuiți o nouă culoare dacă doriți.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Modificările au fost salvate.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Detaliile contului dvs. au fost actualizate cu succes.",
     "SettingsManageLink_Description": "Mutați elementele pentru a adăuga un link nou sau pentru a elimina link-ul existent.",
     "SettingsManageLink_Title": "Gestionare Link",
     "SettingsMarkAsRead_Description": "Schimbați ceea ce ar trebui să se întâmple cu elementul selectat.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Notificări",
     "SettingsNotificationsAndTaskbar_Description": "Modificați dacă notificările trebuie afișate și insigna din bara de activități pentru acest cont.",
     "SettingsNotificationsAndTaskbar_Title": "Notificări și Bara de activități",
+    "SettingsHome_Title": "Acasă",
+    "SettingsHome_SearchTitle": "Găsește o setare",
+    "SettingsHome_SearchDescription": "Căutați după funcționalitate, subiect sau cuvânt cheie pentru a naviga direct la pagina corectă de setări.",
+    "SettingsHome_SearchPlaceholder": "Caută setări",
+    "SettingsHome_SearchExamples": "Exemple: temă, stocare, limbă, semnătură",
+    "SettingsHome_QuickLinks_Title": "Linkuri rapide",
+    "SettingsHome_QuickLinks_Description": "Accesați rapid setările cele mai utilizate.",
+    "SettingsHome_StorageCard_Description": "Vedeți cât conținut MIME local reține Wino pe acest dispozitiv și curățați-l când este necesar.",
+    "SettingsHome_StorageEmptySummary": "Încă nu a fost detectat conținut MIME în cache.",
+    "SettingsHome_StorageLoading": "Se verifică utilizarea MIME locală...",
+    "SettingsHome_Tips_Title": "Sfaturi și trucuri",
+    "SettingsHome_Tips_Description": "Câteva modificări mări pot face ca Wino să se simtă mult mai personal.",
+    "SettingsHome_Tip_Theme": "Doriți modul întunecat sau schimbări de nuanțe? Deschideți Personalizarea.",
+    "SettingsHome_Tip_Background": "Folosiți Preferințele aplicației pentru a controla comportamentul de pornire și sincronizarea în fundal.",
+    "SettingsHome_Tip_Shortcuts": "Scurtăturile de la tastatură vă ajută să navigați prin e-mail mai rapid.",
+    "SettingsHome_Resources_Title": "Linkuri utile",
+    "SettingsHome_Resources_Description": "Deschideți resursele proiectului, informații de suport și canale de lansare.",
     "SettingsOptions_Title": "Setări",
+    "SettingsOptions_GeneralSection": "General",
+    "SettingsOptions_MailSection": "E-mail",
+    "SettingsOptions_CalendarSection": "Calendar",
+    "SettingsOptions_MoreComingSoon": "Mai multe opțiuni în curând",
+    "SettingsOptions_HeroDescription": "Personalizați experiența dvs. Wino Mail",
+    "SettingsOptions_AccountsSummary": "{0} cont configurat(e)",
+    "SettingsSearch_ManageAccounts_Keywords": "cont;conturi;cutii poștale;cutii poștale;alias;aliasuri;profil;adresă;adrese",
+    "SettingsSearch_AppPreferences_Keywords": "pornire;fundal;lansare;sincronizare;notificări;căutare;zonă de notificări;implicit",
+    "SettingsSearch_LanguageTime_Keywords": "limbă;timp;ceas;locală;regiune;format;24 de ore;24h",
+    "SettingsSearch_Personalization_Keywords": "temă;întunecat;deschis;aspect;accent;culoare;mod;aranjament;densitate",
+    "SettingsSearch_About_Keywords": "despre;versiune;site;confidențialitate;github;donează;magazin;suport",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "scurtătură;scurtături;tastă rapidă;tastatură;taste;hotkey;hotkeys",
+    "SettingsSearch_MessageList_Keywords": "mesaj;mesaje;listă;șir de mesaje;șiruri;avatar;previzualizare;expeditor",
+    "SettingsSearch_ReadComposePane_Keywords": "cititor;compunere;compozitor;font;fonturi;conținut extern;afișare;lectură",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "semnătură;semnături;criptare;certificat;certificate;S/MIME;smime;securitate",
+    "SettingsSearch_Storage_Keywords": "stocare;cache;caching;mime;disc;spațiu;curățare;curățați;date locale",
+    "SettingsSearch_CalendarSettings_Keywords": "calendar;săptămână;ore;program;eveniment;evenimente",
     "SettingsPaneLengthReset_Description": "Resetați dimensiunea listei de e-mail la dimensiunea originală dacă aveți probleme cu aceasta.",
     "SettingsPaneLengthReset_Title": "Resetați Dimensiunea Listei de E-Mail",
     "SettingsPaypal_Description": "Arătați mult mai multă dragoste ❤️ Toate donațiile sunt apreciate.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Afișează formatul ceasului în 24 de ore",
     "SettingsPrivacyPolicy_Description": "Consultați politica de confidențialitate.",
     "SettingsPrivacyPolicy_Title": "Politica de confidențialitate",
+    "SettingsWebsite_Description": "Deschideți site-ul Wino Mail.",
+    "SettingsWebsite_Title": "Site",
     "SettingsReadComposePane_Description": "Fonturi, conținut extern.",
     "SettingsReadComposePane_Title": "Cititor și Compozitor",
     "SettingsReader_Title": "Cititor",
@@ -625,11 +910,24 @@
     "SettingsShowPreviewText_Title": "Afișează textul de previzualizare",
     "SettingsShowSenderPictures_Description": "Ascundeți/afișați miniaturi imagini expeditor.",
     "SettingsShowSenderPictures_Title": "Afișați avatarele expeditorului",
+    "SettingsEmailTemplates_Title": "Șabloane de e-mail",
+    "SettingsEmailTemplates_Description": "Gestionează șabloanele de e-mail",
+    "SettingsEmailTemplates_CreatePageTitle": "Șablon nou",
+    "SettingsEmailTemplates_EditPageTitle": "Editează șablonul",
+    "SettingsEmailTemplates_NewTemplateTitle": "Șablon nou",
+    "SettingsEmailTemplates_NewTemplateDescription": "Creează un nou șablon de e-mail",
+    "SettingsEmailTemplates_NameTitle": "Nume",
+    "SettingsEmailTemplates_NamePlaceholder": "Nume șablon",
+    "SettingsEmailTemplates_DescriptionTitle": "Descriere",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Descriere opțională",
+    "SettingsEmailTemplates_ContentTitle": "Conținutul șablonului",
+    "SettingsEmailTemplates_ContentDescription": "Modificați conținutul HTML pentru acest șablon.",
+    "SettingsEmailTemplates_NameRequired": "Numele șablonului este obligatoriu.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
-    "SettingsEnableGravatarAvatars_Description": "Folosiți gravatar (dacă este disponibil) ca imagine a expeditorului",
-    "SettingsEnableFavicons_Title": "Pictograme domeniu (Favicons)",
-    "SettingsEnableFavicons_Description": "Folosiți favicon-uri de domeniu (dacă sunt disponibile) ca imagine a expeditorului",
-    "SettingsMailList_ClearAvatarsCache_Button": "Șterge avatarele din cache",
+    "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
+    "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
+    "SettingsEnableFavicons_Description": "Use domain favicons (if available) as sender picture",
+    "SettingsMailList_ClearAvatarsCache_Button": "Clear cached avatars",
     "SettingsSignature_AddCustomSignature_Button": "Adăugare semnătură",
     "SettingsSignature_AddCustomSignature_Title": "Adăugare semnătură personalizată",
     "SettingsSignature_DeleteSignature_Title": "Ștergere semnătură",
@@ -645,14 +943,41 @@
     "SettingsStartupItem_Title": "Element de Pornire",
     "SettingsStore_Description": "Arătați puțină dragoste ❤️",
     "SettingsStore_Title": "Evaluați în Store",
+    "SettingsStorage_Title": "Stocare",
+    "SettingsStorage_Description": "Scanează și gestionează cache-ul MIME stocat în folderul local de date.",
+    "SettingsStorage_ScanFolder": "Scanează folderul local de date",
+    "SettingsStorage_NoLocalMimeDataFound": "Nu s-au găsit date MIME locale.",
+    "SettingsStorage_NoAccountsFound": "Nu s-au găsit conturi.",
+    "SettingsStorage_TotalUsage": "Utilizare totală MIME locală: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} folosit în cache-ul MIME local",
+    "SettingsStorage_DeleteAll_Title": "Ștergeți întregul conținut MIME",
+    "SettingsStorage_DeleteAll_Description": "Ștergeți întregul dosar cache MIME al acestui cont.",
+    "SettingsStorage_DeleteAll_Button": "Ștergeți tot",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Ștergeți întregul conținut MIME",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Ștergeți toate datele MIME locale pentru {0}?",
+    "SettingsStorage_DeleteAll_Success": "Toate conținuturile MIME au fost șterse.",
+    "SettingsStorage_DeleteOld_Title": "Ștergeți conținut MIME vechi",
+    "SettingsStorage_DeleteOld_Description": "Ștergeți fișiere MIME în funcție de data de creare a mesajelor din baza locală de date.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 lună",
+    "SettingsStorage_DeleteOld_3Months": "> 3 luni",
+    "SettingsStorage_DeleteOld_6Months": "> 6 luni",
+    "SettingsStorage_DeleteOld_1Year": "> 1 an",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Ștergeți conținut MIME vechi",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Ștergeți datele MIME locale mai vechi decât {0} pentru {1}?",
+    "SettingsStorage_DeleteOld_Success": "Au fost șterse {0} foldere MIME mai vechi decât {1}.",
+    "SettingsStorage_1Month": "1 lună",
+    "SettingsStorage_3Months": "3 luni",
+    "SettingsStorage_6Months": "6 luni",
+    "SettingsStorage_1Year": "1 an",
+    "SettingsStorage_Months": "{0} luni",
     "SettingsTaskbarBadge_Description": "Include numărul de email-uri necitite în pictograma de pe bara de activități.",
     "SettingsTaskbarBadge_Title": "Insignă Bară de activități",
     "SettingsThreads_Description": "Organizați mesajele în fire de conversație.",
     "SettingsThreads_Title": "Aranjare mesaje în conversație",
     "SettingsUnlinkAccounts_Description": "Eliminați legătura dintre conturi. Acest lucru nu va șterge conturile dvs.",
     "SettingsUnlinkAccounts_Title": "Deasociere Conturi",
-    "SettingsMailRendering_ActionLabels_Title": "Etichete de acțiune",
-    "SettingsMailRendering_ActionLabels_Description": "Afișare etichete de acțiune.",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
     "SignatureDeleteDialog_Message": "Sigur doriți să ștergeți semnătura „{0}”?",
     "SignatureDeleteDialog_Title": "Ștergeți semnătura",
     "SignatureEditorDialog_SignatureName_Placeholder": "Numiți-vă semnătura",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Nu puteți atribui folderul Inbox oricărui alt folder de sistem.",
     "SystemFolderConfigSetupSuccess_Message": "Folderele de sistem sunt configurate cu succes.",
     "SystemFolderConfigSetupSuccess_Title": "Configurare Fosare de Sistem",
+    "SystemTrayMenu_ShowWino": "Deschide Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Deschide calendarul Wino",
+    "SystemTrayMenu_ExitWino": "Ieșiți",
     "TestingImapConnectionMessage": "Se testează conexiunea la server...",
     "TitleBarServerDisconnectedButton_Description": "Wino este deconectat de la rețea. Faceți clic pe reconectare pentru a restabili conexiunea.",
     "TitleBarServerDisconnectedButton_Title": "nicio conexiune",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Upgrade la Conturi Nelimitate",
     "WinoUpgradeRemainingAccountsMessage": "{0} din {1} conturi gratuite folosite.",
     "Yesterday": "Ieri",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "Interval sincronizare e-mail",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Interval automat de sincronizare e-mail (minute). Această setare va fi aplicată numai după repornirea Wino Mail."
+    "Smime_ImportCertificates_Success": "Certificatele au fost importate cu succes.",
+    "Smime_ImportCertificates_Error": "Eroare la importarea certificatelor: {0}",
+    "Smime_RemoveCertificates_Confirm": "Chiar doriți să eliminați certificatele {0}?",
+    "Smime_RemoveCertificates_Success": "Certificatele au fost eliminate.",
+    "Smime_ExportCertificates_Success": "Certificatele au fost exportate.",
+    "Smime_ExportCertificates_Error": "Eroare la exportarea certificatelor.",
+    "Smime_CertificateDetails": "Subiect: {0}\nEmitent: {1}\nValabil de la: {2}\nValabil până la: {3}\nAmprentă: {4}",
+    "Smime_CertificatePassword_Title": "Parola certificatului este obligatorie",
+    "Smime_CertificatePassword_Placeholder": "Parola certificatului pentru {0} (opțional)",
+    "Smime_Confirm_Title": "Confirmare",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Actualizează",
+    "SettingsSignatureAndEncryption_Title": "Semnătură și criptare",
+    "SettingsSignatureAndEncryption_Description": "Gestionează certificate S/MIME pentru semnarea și criptarea e-mailurilor.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Certificatele mele",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Certificate personale pentru semnare și criptare",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certificatele destinatarilor",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certificatele destinatarilor pentru decriptare",
+    "SettingsSignatureAndEncryption_NameColumn": "Nume",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Expiră la",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Amprentă",
+    "Buttons_Remove": "Șterge",
+    "Buttons_Export": "Exportă",
+    "Buttons_Import": "Importă",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Certificat de semnătură S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Certificat de criptare S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Niciunul",
+    "SmimeSignaturesInMessage": "Semnăturile din acest mesaj:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, valabil până la {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informații despre certificatul de semnătură S/MIME",
+    "SmimeCertificateInfoTitle": "Informații despre certificatul S/MIME",
+    "SmimeNoCertificateFileFound": "Nu a fost găsit niciun fișier de certificat",
+    "SmimeSaveCertificate": "Salvează certificatul...",
+    "SmimeCertificate": "Certificat S/MIME",
+    "SmimeCertificateSavedTo": "Certificatul a fost salvat în {0}",
+    "SmimeSignedTooltip": "Acest mesaj este semnat cu un certificat S/MIME. Faceți clic pentru mai multe detalii",
+    "SmimeEncryptedTooltip": "Acest mesaj este criptat cu un certificat S/MIME.",
+    "SmimeCertificateFileInfo": "Fișier: {0}",
+    "Composer_LightTheme": "Temă deschisă",
+    "Composer_DarkTheme": "Temă Întunecată",
+    "Composer_Outdent": "Scade indentarea",
+    "Composer_Indent": "Indentează",
+    "Composer_BulletList": "Listă cu buline",
+    "Composer_OrderedList": "Listă numerotată",
+    "Composer_Stroke": "Tăiere cu linie",
+    "Composer_Bold": "Îngroșat",
+    "Composer_Italic": "Cursiv",
+    "Composer_Underline": "Subliniază",
+    "Composer_CcBcc": "Cc & Bcc",
+    "Composer_EnableSmimeSignature": "Activează/ Dezactivează semnătura S/MIME",
+    "Composer_EnableSmimeEncryption": "Activează/ Dezactivează criptarea S/MIME",
+    "Composer_LocalDraftSyncInfo": "Acest draft este local doar. Wino nu a reușit să-l trimită către serverul tău de e-mail. Fă clic pentru a încerca din nou trimiterea către server.",
+    "Composer_CertificateExpires": "Expiră la: ",
+    "Composer_SmimeSignature": "Semnătură S/MIME",
+    "Composer_SmimeEncryption": "Criptare S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Șabloane de e-mail",
+    "Composer_AiSummarize": "Rezumă cu AI",
+    "Composer_AiSummarizeDescription": "Extrage ideile principale, pașii de acțiune și deciziile din acest e-mail.",
+    "Composer_AiTranslate": "Translatează cu AI",
+    "Composer_AiActions": "Acțiuni AI",
+    "Composer_AiRewrite": "Rescrie cu AI",
+    "AiActions_CheckingStatus": "Se verifică accesul AI...",
+    "AiActions_SignedOutTitle": "Deblochează pachetul Wino AI",
+    "AiActions_SignedOutDescription": "Translatează, rescrie și rezumă e-mailuri cu AI după ce te autentifici în contul tău Wino și activezi pachetul AI.",
+    "AiActions_NoPackTitle": "Pachetul AI este necesar",
+    "AiActions_NoPackDescription": "Ești conectat, dar pachetul AI nu este încă activ. Achiziționează-l pentru a folosi instrumentele AI de traducere, rescriere și rezumare ale Wino.",
+    "AiActions_UsageSummary": "{0} din {1} credite utilizate în această lună.",
+    "Composer_AiRewritePolite": "Fă-l politicos",
+    "Composer_AiRewritePoliteDescription": "Îmblânzește formularea păstrând același scop.",
+    "Composer_AiRewriteAngry": "Fă-l furios",
+    "Composer_AiRewriteAngryDescription": "Folosește un ton mai dur și mai confruntațional.",
+    "Composer_AiRewriteHappy": "Fă-l să fie fericit",
+    "Composer_AiRewriteHappyDescription": "Adaugă un ton mai optimist și mai entuziast.",
+    "Composer_AiRewriteFormal": "Fă-l să fie formal",
+    "Composer_AiRewriteFormalDescription": "Face mesajul să pară mai profesional și mai structurat.",
+    "Composer_AiRewriteFriendly": "Fă-l să fie prietenos",
+    "Composer_AiRewriteFriendlyDescription": "Încălzește mesajul cu un ton mai accesibil.",
+    "Composer_AiRewriteShorter": "Fă-l să fie mai scurt",
+    "Composer_AiRewriteShorterDescription": "Îmbunătățește concizia textului și elimină detaliile inutile.",
+    "Composer_AiRewriteClearer": "Fă-l să fie mai clar",
+    "Composer_AiRewriteClearerDescription": "Îmbunătățește lizibilitatea și face mesajul mai ușor de urmărit.",
+    "Composer_AiRewriteCustom": "Personalizat",
+    "Composer_AiRewriteCustomDescription": "Descrie scopul tău pentru rescriere.",
+    "Composer_AiRewriteCustomPlaceholder": "Descrie cum vrei să fie rescris mesajul.",
+    "Composer_AiRewriteMode": "Ton de rescriere",
+    "Composer_AiRewriteApply": "Aplică rescrierea",
+    "Composer_AiTranslateDialogTitle": "Traducere cu AI",
+    "Composer_AiTranslateDialogDescription": "Introduceți limba țintă sau codul de cultură, de exemplu en-US, tr-TR, de-DE sau fr-FR.",
+    "Composer_AiTranslateApply": "Tradu",
+    "Composer_AiTranslateLanguage": "Limba țintă",
+    "Composer_AiTranslateCustomPlaceholder": "Introduceți codul de cultură",
+    "Composer_AiTranslateLanguageEnglish": "Engleză (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turcă (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Germană (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Franceză (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Spaniolă (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Italiană (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portugheză (Brazilia) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Olandeză (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Poloneză (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rusă (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japoneză (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Coreeană (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Chineză, Simplificată (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arabă (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hindi (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Altele...",
+    "Composer_AiBusyTitle": "AI este deja în lucru",
+    "Composer_AiBusyMessage": "Vă rugăm să așteptați finalizarea acțiunii curente AI.",
+    "Composer_AiSignInRequired": "Conectați-vă la contul Wino pentru a utiliza funcțiile AI.",
+    "Composer_AiMissingHtml": "Încă nu există conținut de mesaj de trimis către Wino AI.",
+    "Composer_AiQuotaUnavailable": "Rezultatul AI a fost aplicat.",
+    "Composer_AiAppliedMessage": "Rezultatul AI a fost aplicat în editorul de compoziție. Folosiți Anulează dacă doriți să reveniți.",
+    "Composer_AiSummarizeSuccessTitle": "Rezumat AI aplicat",
+    "Composer_AiTranslateSuccessTitle": "Traducere AI aplicată",
+    "Composer_AiRewriteSuccessTitle": "Rescriere AI aplicată",
+    "Composer_AiErrorTitle": "Acțiunea AI a eșuat.",
+    "Reader_AiAppliedMessage": "Rezultatul AI este acum afișat pentru acest mesaj. Redeschideți mesajul pentru a vizualiza din nou conținutul original.",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Contacte",
+    "ContactsPage_AddContact": "Adaugă contact",
+    "ContactsPage_EditContact": "Editează contactul",
+    "ContactsPage_DeleteContact": "Șterge contactul",
+    "ContactsPage_SearchPlaceholder": "Caută contacte...",
+    "ContactsPage_NoContacts": "Nu există contacte de afișat.",
+    "ContactsPage_ContactsCount": "{0} contacte",
+    "ContactsPage_SelectedContactsCount": "{0} contacte selectate",
+    "ContactsPage_DeleteSelectedContacts": "Șterge contactele selectate",
+    "ContactEditDialog_Title": "Editează contactul",
+    "ContactEditDialog_PhotoSection": "Poză",
+    "ContactEditDialog_ChoosePhoto": "Alege poza",
+    "ContactEditDialog_RemovePhoto": "Șterge poza",
+    "ContactEditDialog_NameHeader": "Nume",
+    "ContactEditDialog_NamePlaceholder": "Numele contactului",
+    "ContactEditDialog_EmailHeader": "Adresă de e-mail",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Informații de contact",
+    "ContactEditDialog_RootContactInfo": "Acest contact este asociat cu conturile dvs. și nu poate fi șters.",
+    "ContactEditDialog_OverriddenContactInfo": "Acest contact a fost modificat manual și nu va fi actualizat în timpul sincronizării.",
+    "ContactsPage_Subtitle": "Gestionează contactele dvs. de e-mail și informațiile lor.",
+    "ContactStatus_Account": "Cont",
+    "ContactStatus_Modified": "Modificat",
+    "ContactAction_Edit": "Editează contactul",
+    "ContactAction_ChangePhoto": "Schimbă poza",
+    "ContactAction_Delete": "Șterge contactul",
+    "ContactAction_Add": "Adaugă contact",
+    "ContactSelection_Selected": "selectat",
+    "ContactSelection_SelectAll": "Selectează toate",
+    "ContactSelection_Clear": "Golește selecția",
+    "ContactsPage_EmptyState": "Nu există contacte de afișat.",
+    "ContactsPage_AddFirstContact": "Adaugă primul contact",
+    "ContactsPage_ContactsCountSuffix": "contacte",
+    "ContactsPane_NewContact": "Contact nou",
+    "ContactsPane_DescriptionTitle": "Gestionează contactele tale.",
+    "ContactsPane_DescriptionBody": "Creați contacte, redenumiți-le, actualizați imaginile de profil și păstrați detaliile salvate organizate într-un singur loc.",
+    "ContactEditDialog_AddTitle": "Adaugă contact",
+    "ContactInfoBar_ContactAdded": "Contactul a fost adăugat cu succes.",
+    "ContactInfoBar_ContactUpdated": "Contactul a fost actualizat cu succes.",
+    "ContactInfoBar_ContactsDeleted": "Contactele au fost șterse cu succes.",
+    "ContactInfoBar_ContactPhotoUpdated": "Fotografia contactului a fost actualizată cu succes.",
+    "ContactInfoBar_FailedToLoadContacts": "Încărcarea contactelor a eșuat: {0}",
+    "ContactInfoBar_FailedToAddContact": "Nu s-a putut adăuga contactul: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Nu s-a putut actualiza contactul: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Nu s-au putut șterge contactele: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Nu s-a putut actualiza poza: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Contactele principale nu pot fi șterse.",
+    "ContactConfirmDialog_DeleteTitle": "Șterge contactul",
+    "ContactConfirmDialog_DeleteMessage": "Sigur doriți să ștergeți contactul '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Sigur doriți să ștergeți {0} contacte?",
+    "ContactConfirmDialog_DeleteButton": "Șterge",
+    "CalendarAccountSettings_Title": "Setări cont calendar",
+    "CalendarAccountSettings_Description": "Gestionează setările calendarului pentru {0}",
+    "CalendarAccountSettings_AccountColor": "Culoare contului",
+    "CalendarAccountSettings_AccountColorDescription": "Schimbă culoarea de afișare a acestui cont de calendar.",
+    "CalendarAccountSettings_SyncEnabled": "Activează sincronizarea",
+    "CalendarAccountSettings_SyncEnabledDescription": "Activează sau dezactivează sincronizarea calendarului pentru acest cont.",
+    "CalendarAccountSettings_DefaultShowAs": "Stare implicită de afișare",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Stare de disponibilitate implicită pentru noile evenimente create cu acest cont.",
+    "CalendarAccountSettings_PrimaryCalendar": "Calendar principal",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Marchează acest calendar ca calendarul principal pentru cont.",
+    "CalendarSettings_NewEventBehavior_Header": "Comportamentul butonului Eveniment nou",
+    "CalendarSettings_NewEventBehavior_Description": "Alege dacă butonul 'Eveniment nou' ar trebui să ceară un calendar de fiecare dată sau să deschidă întotdeauna un calendar specific.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Întreabă de fiecare dată.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Întotdeauna folosește un calendar specific.",
+    "CalendarSettings_Rendering_Title": "Redare",
+    "CalendarSettings_Rendering_Description": "Configurează aspectul calendarului și comportamentul de afișare.",
+    "CalendarSettings_Notifications_Title": "Notificări",
+    "CalendarSettings_Notifications_Description": "Alege comportamentul implicit pentru mementouri și amânări.",
+    "CalendarSettings_Preferences_Title": "Preferințe",
+    "CalendarSettings_Preferences_Description": "Setează cum se comportă butonul 'Eveniment nou'.",
+    "WhatIsNew_GetStartedButton": "Începe",
+    "WhatIsNew_ContinueAnywayButton": "Continuă oricum",
+    "WhatIsNew_PreparingForNewVersionButton": "Se pregătește pentru noua versiune...",
+    "WhatIsNew_MigrationPreparing_Title": "Pregătirea datelor",
+    "WhatIsNew_MigrationPreparing_Description": "Wino aplică migrațiile de actualizare. Vă rugăm să așteptați în timp ce pregătim datele contului dvs. pentru această versiune.",
+    "WhatIsNew_MigrationFailedMessage": "Aplicarea migrațiilor a eșuat cu codul de eroare {0}. Puteți continua să folosiți aplicația. Totuși, dacă întâmpinați probleme grave, vă rugăm să reinstalați aplicația.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Actualizat",
+    "WhatIsNew_MigrationNotification_Message": "Deschideți aplicația pentru a finaliza actualizarea și a vedea noutățile.",
+    "WelcomeWindow_Title": "Bine ați venit la Wino Mail",
+    "WelcomeWindow_Subtitle": "O experiență nativă Windows pentru Mail și Calendar.",
+    "WelcomeWindow_WhatsNewTitle": "Ultimele modificări",
+    "WelcomeWindow_FeaturesTitle": "Funcționalități",
+    "WelcomeWindow_WhatsNewTab": "Ce e nou",
+    "WelcomeWindow_FeaturesTab": "Caracteristici",
+    "WelcomeWindow_GetStartedButton": "Începe",
+    "WelcomeWindow_GetStartedDescription": "Adăugați contul dvs. Outlook, Gmail sau IMAP pentru a începe cu Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importă din contul tău Wino",
+    "WelcomeWindow_ImportInProgress": "Se importă preferințele și conturile sincronizate...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nu au fost găsite conturi sincronizate în contul tău Wino. Dacă preferințele erau disponibile, acestea au fost restaurate. Folosește Începe pentru a adăuga un cont manual.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} conturi sincronizate sunt deja disponibile pe acest dispozitiv. Folosește Începe pentru a adăuga manual un alt cont, dacă este necesar.",
+    "WelcomeWindow_SetupTitle": "Configurarea contului tău",
+    "WelcomeWindow_SetupSubtitle": "Alege-ți furnizorul de e-mail pentru a începe.",
+    "WelcomeWindow_AddAccountButton": "Adaugă cont",
+    "WelcomeWindow_SkipForNow": "Sari pentru moment — Îl voi configura mai târziu.",
+    "WelcomeWindow_AppDescription": "O căsuță de e-mail agilă și concentrată — reproiectată pentru Windows 11.",
+    "WelcomeWizard_Step1Title": "Bine ați venit",
+    "SystemTrayMenu_Open": "Deschide",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Setări de sincronizare",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Mențineți preferințele Wino sincronizate pe toate dispozitivele.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Deblochează add-ons",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Accesează funcții premium precum Wino AI Pack.",
+    "WinoAccount_Management_Description": "Gestionează Contul Wino, accesul la AI Pack și preferințele sincronizate și detaliile contului.",
+    "WinoAccount_Management_SignedOutTitle": "Conectează-te la Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Conectează-te sau creează un cont pentru a sincroniza emailul tău, a accesa funcțiile AI și a-ți gestiona setările între dispozitive.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Extensii Wino",
+    "WinoAccount_Management_DataSectionHeader": "Date",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Acțiuni ale contului",
+    "WinoAccount_Management_AccountCardTitle": "Cont",
+    "WinoAccount_Management_AccountCardDescription": "Adresa de email a contului Wino și starea curentă a contului.",
+    "WinoAccount_Management_AiPackCardTitle": "Pachet AI",
+    "WinoAccount_Management_AiPackCardDescription": "Vezi dacă Pachet AI Wino este activ și cât mai este disponibil din utilizare.",
+    "WinoAccount_Management_AiPackActive": "Pachet AI este activ",
+    "WinoAccount_Management_AiPackInactive": "Pachet AI nu este activ",
+    "WinoAccount_Management_AiPackUsage": "{0} din {1} utilizări consumate. {2} rămase.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Perioadă de facturare: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Detalii despre utilizare nu sunt disponibile încă.",
+    "WinoAccount_Management_AiPackBuyDescription": "Cumpără Wino AI Pack pentru a traduce, rescrie sau rezuma emailuri cu ajutorul AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Deblochează AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Accelerează fluxul de lucru al e-mailurilor cu uneltele AI. Tradu mesajele în peste 50 de limbi, rescrie pentru claritate și tonalitate, și obține rezumate instantanee ale firurilor lungi.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / lună",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 credite",
+    "WinoAccount_Management_AiPackGetButton": "Obține AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Unelte alimentate de AI pentru traducere, rescriere și rezumare acțiuni în Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, traducere, rescrie, rezumă, productivitate",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Conturi nelimitate",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Elimină limita de conturi și adaugă cât de multe conturi de e-mail ai nevoie.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "conturi, nelimitate, premium, extensie",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Conectează-te cu Contul Wino pentru a finaliza această achiziție.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino nu a putut finaliza această achiziție în Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Achiziția ta s-a finalizat, dar Wino nu a putut să actualizeze încă beneficiile contului tău. Te rugăm să încerci din nou într-un moment.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Abonamentul tău este activ",
+    "WinoAccount_Management_AiPackRenews": "Se reînnoiește {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Credite utilizate în această lună",
+    "WinoAccount_Management_AiPackResets": "Resetează {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Au apărut probleme la încărcarea soldului de utilizare AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Traducere",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Rescriere",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Rezumat",
+    "WinoAccount_Management_AddOnLoadFailed": "Am întâmpinat probleme la încărcarea acestui add-on.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Sincronizează Preferințe și Conturi",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importă sau exportă preferințele Wino și detaliile căsuței de email între dispozitive. Parolele, tokenurile și alte informații sensibile nu sunt sincronizate niciodată.",
+    "WinoAccount_Management_SignOutTitle": "Deconectare",
+    "WinoAccount_Management_SignOutDescription": "Deconectează-te de la contul tău pe acest dispozitiv",
+    "WinoAccount_Management_StatusLabel": "Stare: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Încă nu există date sincronizate stocate pentru acest cont.",
+    "WinoAccount_Management_ExportSucceeded": "Datele Wino selectate au fost exportate cu succes.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Preferințele tale au fost exportate în contul tău Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Detalii de cont exportate în contul tău Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Datele sincronizate din contul tău Wino au fost importate.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Au fost aplicate {0} preferințe sincronizate.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "/** placeholder **/",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "/** placeholder **/",
+    "WinoAccount_Management_ImportPartial": "/** placeholder **/",
+    "WinoAccount_Management_ImportReloginReminder": "/** placeholder **/",
+    "WinoAccount_Management_SerializeFailed": "/** placeholder **/",
+    "WinoAccount_Management_EmptyExport": "/** placeholder **/",
+    "WinoAccount_Management_ImportEmpty": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_Title": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_Description": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "/** placeholder **/",
+    "WinoAccount_Management_ExportDialog_InProgress": "/** placeholder **/",
+    "WinoAccount_Management_LoadFailed": "/** placeholder **/",
+    "WinoAccount_Management_ActionFailed": "/** placeholder **/",
+    "WinoAccount_SettingsSection_Title": "/** placeholder **/",
+    "WinoAccount_SettingsSection_Description": "/** placeholder **/",
+    "WinoAccount_RegisterButton_Title": "/** placeholder **/",
+    "WinoAccount_RegisterButton_Description": "/** placeholder **/",
+    "WinoAccount_RegisterButton_Action": "/** placeholder **/",
+    "WinoAccount_LoginButton_Title": "/** placeholder **/",
+    "WinoAccount_LoginButton_Description": "/** placeholder **/",
+    "WinoAccount_LoginButton_Action": "/** placeholder **/",
+    "WinoAccount_SignOutButton_Title": "/** placeholder **/",
+    "WinoAccount_SignOutButton_Description": "/** placeholder **/",
+    "WinoAccount_SignOutButton_Action": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_Title": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_Description": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_HeroTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_PrimaryButton": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "/** placeholder **/",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "/** placeholder **/",
+    "WinoAccount_LoginDialog_Title": "/** placeholder **/",
+    "WinoAccount_LoginDialog_Description": "/** placeholder **/",
+    "WinoAccount_LoginDialog_HeroTitle": "/** placeholder **/",
+    "WinoAccount_LoginDialog_BenefitsTitle": "/** placeholder **/",
+    "WinoAccount_LoginDialog_BenefitsDescription": "/** placeholder **/",
+    "WinoAccount_LoginDialog_DifferenceTitle": "/** placeholder **/",
+    "WinoAccount_LoginDialog_DifferenceDescription": "/** placeholder **/",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "/** placeholder **/",
+    "WinoAccount_EmailLabel": "/** placeholder **/",
+    "WinoAccount_EmailPlaceholder": "/** placeholder **/",
+    "WinoAccount_PasswordLabel": "/** placeholder **/",
+    "WinoAccount_ConfirmPasswordLabel": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_Title": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_Description": "/** placeholder **/",
+    "WinoAccount_Validation_EmailRequired": "/** placeholder **/",
+    "WinoAccount_Validation_PasswordRequired": "/** placeholder **/",
+    "WinoAccount_Validation_PasswordMismatch": "/** placeholder **/",
+    "WinoAccount_Validation_PrivacyConsentRequired": "/** placeholder **/",
+    "WinoAccount_Error_InvalidCredentials": "/** placeholder **/",
+    "WinoAccount_Error_AccountLocked": "/** placeholder **/",
+    "WinoAccount_Error_AccountBanned": "/** placeholder **/",
+    "WinoAccount_Error_AccountSuspended": "/** placeholder **/",
+    "WinoAccount_Error_EmailNotConfirmed": "/** placeholder **/",
+    "WinoAccount_Error_EmailConfirmationRequired": "/** placeholder **/",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "/** placeholder **/",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "/** placeholder **/",
+    "WinoAccount_Error_EmailNotRegistered": "/** placeholder **/",
+    "WinoAccount_Error_RefreshTokenInvalid": "/** placeholder **/",
+    "WinoAccount_Error_EmailAlreadyRegistered": "/** placeholder **/",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "/** placeholder **/",
+    "WinoAccount_Error_ExternalLoginInvalid": "/** placeholder **/",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "/** placeholder **/",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "/** placeholder **/",
+    "WinoAccount_Error_AiPackRequired": "/** placeholder **/",
+    "WinoAccount_Error_AiQuotaExceeded": "/** placeholder **/",
+    "WinoAccount_Error_AiHtmlEmpty": "/** placeholder **/",
+    "WinoAccount_Error_AiHtmlTooLarge": "/** placeholder **/",
+    "WinoAccount_Error_AiUnsupportedLanguage": "/** placeholder **/",
+    "WinoAccount_Error_Forbidden": "/** placeholder **/",
+    "WinoAccount_Error_ValidationFailed": "/** placeholder **/",
+    "WinoAccount_RegisterSuccessMessage": "/** placeholder **/",
+    "WinoAccount_LoginSuccessMessage": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "/** placeholder **/",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "/** placeholder **/",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "/** placeholder **/",
+    "WinoAccount_ChangePassword_Title": "/** placeholder **/",
+    "WinoAccount_ChangePassword_Description": "/** placeholder **/",
+    "WinoAccount_ChangePassword_Action": "/** placeholder **/",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Doriți ca Wino să trimită un e-mail de resetare a parolei către {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Deconectat de la contul Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Nu există niciun cont Wino activ pentru a vă deconecta.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Contul Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Conectați-vă sau creați un Cont Wino pentru a gestiona sesiunea Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Stare: {0}",
+    "WelcomeWizard_Step2Title": "Adăugați cont",
+    "WelcomeWizard_Step3Title": "Finalizați configurarea",
+    "ProviderSelection_Title": "Alegeți furnizorul de e-mail",
+    "ProviderSelection_Subtitle": "Selectați un furnizor mai jos pentru a adăuga contul dvs. de e-mail în Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Nume cont",
+    "ProviderSelection_AccountNamePlaceholder": "ex. Personal, Birou",
+    "ProviderSelection_DisplayNameHeader": "Nume afișat",
+    "ProviderSelection_DisplayNamePlaceholder": "ex. John Doe",
+    "ProviderSelection_EmailHeader": "Adresă de e-mail",
+    "ProviderSelection_EmailPlaceholder": "ex. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Parolă specifică aplicației",
+    "ProviderSelection_AppPasswordHelp": "Cum pot obține o parolă specifică aplicației?",
+    "ProviderSelection_CalendarModeHeader": "Integrare calendar",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Dezactivat",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Nicio integrare a calendarului",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Sincronizare CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Evenimentele din calendar sunt sincronizate cu serverele Apple între dispozitivele dvs.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Evenimentele din calendar sunt sincronizate cu serverele Yahoo între dispozitivele dvs.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Calendar local",
+    "ProviderSelection_CalendarMode_LocalDescription": "Evenimentele dvs. sunt stocate doar pe calculatorul dvs. Fără conectivitate la server.",
+    "ProviderSelection_ClearColor": "Șterge culoarea",
+    "ProviderSelection_ContinueButton": "Continuă",
+    "ProviderSelection_SpecialImap_Subtitle": "Introduceți acreditările contului dvs. pentru a vă conecta.",
+    "AccountSetup_Title": "Configurarea contului",
+    "AccountSetup_Step_Authenticating": "Autentificare cu {0}",
+    "AccountSetup_Step_TestingMailAuth": "Se testează autentificarea e-mailului",
+    "AccountSetup_Step_SyncingFolders": "Sincronizarea metadatelor dosarelor",
+    "AccountSetup_Step_FetchingProfile": "Preluarea informațiilor despre profil",
+    "AccountSetup_Step_DiscoveringCalDav": "Descoperirea setărilor CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Testarea autentificării calendarului",
+    "AccountSetup_Step_SavingAccount": "Salvarea informațiilor despre cont",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Preluarea metadatelor calendarului",
+    "AccountSetup_Step_SyncingAliases": "Sincronizarea aliasurilor",
+    "AccountSetup_Step_Finalizing": "Finalizarea configurării",
+    "AccountSetup_FailureMessage": "Configurarea a eșuat. Întoarceți-vă pentru a modifica setările sau încercați din nou mai târziu.",
+    "AccountSetup_SuccessMessage": "Contul dvs. a fost configurat cu succes!",
+    "AccountSetup_GoBackButton": "Înapoi",
+    "AccountSetup_TryAgainButton": "Încercați din nou",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Descoperirea automată a eșuat. Vă rugăm să introduceți manual setările în fila Avansată."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/ru_RU/resources.json b/Wino.Core.Domain/Translations/ru_RU/resources.json
index 529b8fbe..a3f17863 100644
--- a/Wino.Core.Domain/Translations/ru_RU/resources.json
+++ b/Wino.Core.Domain/Translations/ru_RU/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "This account requires full re-sychronization to continue working. Please wait while Wino re-synchronizes your messages...",
     "AccountContactNameYou": "You",
     "AccountCreationDialog_Completed": "все готово",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Получение сведений о календаре.",
     "AccountCreationDialog_FetchingEvents": "Fetching calendar events.",
     "AccountCreationDialog_FetchingProfileInformation": "Fetching profile details.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "If your browser did not launch automatically to complete authentication:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "инициализация",
     "AccountCreationDialog_PreparingFolders": "На данный момент мы получаем информацию о папках.",
     "AccountCreationDialog_SigninIn": "Данные учетной записи сохраняются.",
+    "Purchased": "Куплено",
     "AccountEditDialog_Message": "Имя пользователя",
     "AccountEditDialog_Title": "Редактировать учетную запись",
     "AccountPickerDialog_Title": "Выберите учетную запись",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Change the name of the account in Wino and set desired sender name.",
     "AccountDetailsPage_ColorPicker_Title": "Account color",
     "AccountDetailsPage_ColorPicker_Description": "Assign a new account color to colorize its symbol in the list.",
+    "AccountDetailsPage_TabGeneral": "Общие",
+    "AccountDetailsPage_TabMail": "Почта",
+    "AccountDetailsPage_TabCalendar": "Календарь",
+    "AccountDetailsPage_CalendarListDescription": "Выберите календарь, чтобы настроить его параметры.",
     "AddHyperlink": "Добавить",
     "AppCloseBackgroundSynchronizationWarningTitle": "Background Synchronization",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Application has not been set to launch on Windows startup.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Учетная запись IMAP",
     "Busy": "Busy",
     "Buttons_AddAccount": "Добавить учетную запись",
+    "Buttons_FixAccount": "Исправить учетную запись",
     "Buttons_AddNewAlias": "Add New Alias",
     "Buttons_Allow": "Allow",
+    "Buttons_Apply": "Применить",
     "Buttons_ApplyTheme": "Применить тему",
     "Buttons_Browse": "Обзор",
     "Buttons_Cancel": "Отмена",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Редактировать",
     "Buttons_EnableImageRendering": "Включить",
     "Buttons_Multiselect": "Select Multiple",
+    "Buttons_Manage": "Управлять",
     "Buttons_No": "Нет",
     "Buttons_Open": "Открыть",
     "Buttons_Purchase": "Купить",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Сохранить",
     "Buttons_SaveConfiguration": "Сохранить конфигурацию",
     "Buttons_Send": "Send",
+    "Buttons_SendToServer": "Отправить на сервер",
     "Buttons_Share": "Поделиться",
     "Buttons_SignIn": "Войти",
     "Buttons_Sync": "Synchronize",
     "Buttons_SyncAliases": "Synchronize Aliases",
     "Buttons_TryAgain": "Повторить",
     "Buttons_Yes": "Да",
+    "Sync_SynchronizingFolder": "Синхронизация {0} {1}%",
+    "Sync_DownloadedMessages": "Загружено {0} сообщений из {1}",
+    "SyncAction_Archiving": "Архивирование {0} писем",
+    "SyncAction_ClearingFlag": "Снятие флага с {0} писем",
+    "SyncAction_CreatingDraft": "Создание черновика",
+    "SyncAction_CreatingEvent": "Создание события",
+    "SyncAction_Deleting": "Удаление {0} писем",
+    "SyncAction_EmptyingFolder": "Очистка папки",
+    "SyncAction_MarkingAsRead": "Пометка {0} писем как прочитанных",
+    "SyncAction_MarkingAsUnread": "Пометка {0} писем как непрочитанных",
+    "SyncAction_MarkingFolderAsRead": "Пометка папки как прочитанной",
+    "SyncAction_Moving": "Перемещение {0} писем",
+    "SyncAction_MovingToFocused": "Перемещение {0} писем в Focused",
+    "SyncAction_RenamingFolder": "Переименование папки",
+    "SyncAction_SendingMail": "Отправка письма",
+    "SyncAction_SettingFlag": "Установка флага на {0} писем",
+    "SyncAction_SynchronizingAccount": "Синхронизация {0}",
+    "SyncAction_SynchronizingAccounts": "Синхронизация {0} учетной записи(ей)",
+    "SyncAction_SynchronizingCalendarData": "Синхронизация данных календаря",
+    "SyncAction_SynchronizingCalendarEvents": "Синхронизация событий календаря",
+    "SyncAction_SynchronizingCalendarMetadata": "Синхронизация метаданных календаря",
+    "SyncAction_Unarchiving": "Разархивирование {0} писем",
     "CalendarAllDayEventSummary": "all-day events",
     "CalendarDisplayOptions_Color": "Color",
     "CalendarDisplayOptions_Expand": "Expand",
+    "CalendarEventResponse_Accept": "Принять",
+    "CalendarEventResponse_AcceptedResponse": "Принято",
+    "CalendarEventResponse_Decline": "Отклонить",
+    "CalendarEventResponse_DeclinedResponse": "Отклонено",
+    "CalendarEventResponse_NotResponded": "Без ответа",
+    "CalendarEventResponse_Tentative": "Предварительный",
+    "CalendarEventResponse_TentativeResponse": "Предварительный",
+    "CalendarEventRsvpPanel_Accept": "Принять",
+    "CalendarEventRsvpPanel_AddMessage": "Добавить сообщение к вашему ответу... (необязательно)",
+    "CalendarEventRsvpPanel_Decline": "Отклонить",
+    "CalendarEventRsvpPanel_Message": "Сообщение",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Отправить ответное сообщение",
+    "CalendarEventRsvpPanel_Tentative": "Предварительный",
+    "CalendarEventRsvpPanel_Title": "Варианты ответа",
+    "CalendarAttendeeStatus_Accepted": "Принято",
+    "CalendarAttendeeStatus_Declined": "Отклонено",
+    "CalendarAttendeeStatus_NeedsAction": "Требуется действие",
+    "CalendarAttendeeStatus_Tentative": "Предварительный",
+    "CalendarEventDetails_Attachments": "Вложения",
+    "CalendarEventCompose_AddAttachment": "Добавить вложение",
+    "CalendarEventCompose_AllDay": "Весь день",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Вложения не поддерживаются для календарей CalDAV.",
+    "CalendarEventCompose_EndDate": "Дата окончания",
+    "CalendarEventCompose_EndTime": "Время окончания",
+    "CalendarEventCompose_Every": "каждый",
+    "CalendarEventCompose_ForWeekdays": "для",
+    "CalendarEventCompose_FrequencyDay": "день",
+    "CalendarEventCompose_FrequencyDayPlural": "дней",
+    "CalendarEventCompose_FrequencyMonth": "месяц",
+    "CalendarEventCompose_FrequencyMonthPlural": "месяцев",
+    "CalendarEventCompose_FrequencyWeek": "неделя",
+    "CalendarEventCompose_FrequencyWeekPlural": "недель",
+    "CalendarEventCompose_FrequencyYear": "год",
+    "CalendarEventCompose_FrequencyYearPlural": "лет",
+    "CalendarEventCompose_Location": "Местоположение",
+    "CalendarEventCompose_LocationPlaceholder": "Добавить место",
+    "CalendarEventCompose_NewEventButton": "Новое событие",
+    "CalendarEventCompose_DefaultCalendarHint": "Вы можете выбрать календарь по умолчанию для новых событий в настройках календаря.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Открыть настройки календаря",
+    "CalendarEventCompose_NoCalendarsMessage": "Пока нет доступных календарей для создания события.",
+    "CalendarEventCompose_NoCalendarsTitle": "Нет доступных календарей",
+    "CalendarEventCompose_NoEndDate": "Нет даты окончания",
+    "CalendarEventCompose_Notes": "Заметки",
+    "CalendarEventCompose_PickCalendarTitle": "Выберите календарь",
+    "CalendarEventCompose_Recurring": "Повторяющееся",
+    "CalendarEventCompose_RecurringSummary": "Происходит каждые {0} {1}{2} {3}, действует {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Происходит {0}{1} {2} эффективно {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Повторять каждые",
+    "CalendarEventCompose_SelectCalendar": "Выберите календарь",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Происходит в {0} {1}",
+    "CalendarEventCompose_StartDate": "Дата начала",
+    "CalendarEventCompose_StartTime": "Время начала",
+    "CalendarEventCompose_TimeRangeSummary": "с {0} по {1}",
+    "CalendarEventCompose_Title": "Заголовок события",
+    "CalendarEventCompose_TitlePlaceholder": "Добавьте заголовок",
+    "CalendarEventCompose_Until": "до",
+    "CalendarEventCompose_UntilSummary": " до {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Дата окончания события на весь день должна быть позже даты начала.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "У одного или нескольких участников неверный адрес электронной почты.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Дата окончания повторения должна быть равна или позже даты начала события.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Время окончания должно быть позже времени начала.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Одно или несколько вложений больше не доступны: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Выберите календарь перед созданием события.",
+    "CalendarEventCompose_ValidationMissingTitle": "Введите заголовок события перед созданием события.",
+    "CalendarEventCompose_ValidationTitle": "Проверка заголовка события не выполнена.",
+    "CalendarEventCompose_WeekdaySummary": " на {0}",
+    "CalendarEventCompose_Weekday_Friday": "Пт",
+    "CalendarEventCompose_Weekday_Monday": "Пн",
+    "CalendarEventCompose_Weekday_Saturday": "Сб",
+    "CalendarEventCompose_Weekday_Sunday": "Вс",
+    "CalendarEventCompose_Weekday_Thursday": "Чт",
+    "CalendarEventCompose_Weekday_Tuesday": "Вт",
+    "CalendarEventCompose_Weekday_Wednesday": "Ср",
+    "CalendarEventDetails_Details": "Детали",
+    "CalendarEventDetails_EditSeries": "Редактировать серию",
+    "CalendarEventDetails_Editing": "Редактирование",
+    "CalendarEventDetails_InviteSomeone": "Пригласить кого-нибудь",
+    "CalendarEventDetails_JoinOnline": "Присоединиться онлайн",
+    "CalendarEventDetails_Organizer": "Организатор",
+    "CalendarEventDetails_People": "Люди",
+    "CalendarEventDetails_ReadOnlyEvent": "Событие только для чтения",
+    "CalendarEventDetails_Reminder": "Напоминание",
+    "CalendarReminder_StartedHoursAgo": "Началось {0} часов назад",
+    "CalendarReminder_StartedMinutesAgo": "Началось {0} минут назад",
+    "CalendarReminder_StartedNow": "Началось прямо сейчас",
+    "CalendarReminder_StartingNow": "Начинается сейчас",
+    "CalendarReminder_StartsInHours": "Начинается через {0} часов",
+    "CalendarReminder_StartsInMinutes": "Начинается через {0} минут",
+    "CalendarReminder_SnoozeAction": "Отложить",
+    "CalendarReminder_SnoozeMinutesOption": "{0} минут",
+    "CalendarEventDetails_ShowAs": "Показывать как",
+    "CalendarShowAs_Free": "Свободно",
+    "CalendarShowAs_Tentative": "Возможно",
+    "CalendarShowAs_Busy": "Занято",
+    "CalendarShowAs_OutOfOffice": "Вне офиса",
+    "CalendarShowAs_WorkingElsewhere": "Работает в другом месте",
     "CalendarItem_DetailsPopup_JoinOnline": "Join online",
     "CalendarItem_DetailsPopup_ViewEventButton": "View event",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "View series",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} скопировано в буфер обмена.",
     "ClipboardTextCopied_Title": "Скопировано",
     "ClipboardTextCopyFailed_Message": "Не удалось скопировать {0} в буфер обмена.",
+    "ContactInfoBar_ErrorTitle": "Не удалось загрузить контактную информацию",
+    "ContactInfoBar_SuccessTitle": "Контактная информация загружена",
+    "ContactInfoBar_WarningTitle": "Контактная информация может быть неполной",
     "ComingSoon": "Скоро...",
     "ComposerAttachmentsDragDropAttach_Message": "Вложить",
     "ComposerAttachmentsDropZone_Message": "Вы можете просто перетащить файл сюда",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Название связки учетных записей",
     "DialogMessage_DeleteAccountConfirmationMessage": "Удалить {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Все данные, связанные с этой учетной записью, будут окончательно удалены с диска.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Удалить шаблон \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Удалить шаблон электронной почты",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Это удалит все события в серии. Продолжить?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Удалить повторяющуюся серию",
     "DialogMessage_DiscardDraftConfirmationMessage": "Этот черновик будет удален. Вы хотите продолжить?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Удалить черновик",
     "DialogMessage_EmptySubjectConfirmation": "Missing Subject",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Светлая тема",
     "Emoji": "Эмодзи",
     "Error_FailedToSetupSystemFolders_Title": "Не удалось настроить системные папки",
+    "Exception_AccountNeedsAttention_Title": "Аккаунту требуется внимание",
+    "Exception_AccountNeedsAttention_Message": "'{0}' требует вашего внимания, чтобы продолжить работу.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail не удалось найти рантайм Microsoft Edge WebView2. Пожалуйста, установите или исправьте рантайм, чтобы корректно отображать содержимое сообщения.",
+    "Exception_WebView2RuntimeMissing_Title": "Требуется рантайм WebView2",
     "Exception_AuthenticationCanceled": "Аутентификация отменена",
     "Exception_CustomThemeExists": "Такая тема уже существует.",
     "Exception_CustomThemeMissingName": "Необходимо указать название.",
     "Exception_CustomThemeMissingWallpaper": "Необходимо предоставить пользовательское фоновое изображение.",
     "Exception_FailedToSynchronizeAliases": "Failed to synchronize aliases",
+    "Exception_FailedToSynchronizeCalendarData": "Не удалось синхронизировать данные календаря",
+    "Exception_FailedToSynchronizeCalendarEvents": "Не удалось синхронизировать события календаря",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Не удалось синхронизировать детали календаря",
     "Exception_FailedToSynchronizeFolders": "Не удалось синхронизировать папки",
     "Exception_FailedToSynchronizeProfileInformation": "Failed to synchronize profile information",
     "Exception_GoogleAuthCallbackNull": "Callback uri пустой при активации.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Переместить в мусор",
     "HoverActionOption_ToggleFlag": "Флаг / Убрать флаг",
     "HoverActionOption_ToggleRead": "Прочитанное / Непрочитанное",
+    "KeyboardShortcuts_FailedToReset": "Не удалось сбросить сочетания клавиш.",
+    "KeyboardShortcuts_FailedToUpdate": "Не удалось обновить сочетания клавиш",
+    "KeyboardShortcuts_MailoperationAction": "Действие",
+    "KeyboardShortcuts_Action": "Действие",
+    "KeyboardShortcuts_FailedToLoad": "Не удалось загрузить сочетания клавиш.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Пожалуйста, введите клавишу для сочетания.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Пожалуйста, выберите действие для сочетания.",
+    "KeyboardShortcuts_EnterKey": "Пожалуйста, введите клавишу для сочетания.",
+    "KeyboardShortcuts_SelectOperation": "Пожалуйста, выберите действие для сочетания.",
+    "KeyboardShortcuts_ShortcutInUse": "Это сочетание клавиш уже используется другим сочетанием.",
+    "KeyboardShortcuts_FailedToSave": "Не удалось сохранить сочетание клавиш.",
+    "KeyboardShortcuts_FailedToDelete": "Не удалось удалить сочетание клавиш.",
+    "KeyboardShortcuts_PageDescription": "Настройка сочетаний клавиш для быстрого выполнения операций с почтой. Нажимайте клавиши, когда фокус в поле ввода клавиши, чтобы зафиксировать сочетания.",
+    "KeyboardShortcuts_Add": "Добавить сочетание клавиш",
+    "KeyboardShortcuts_EditTitle": "Редактировать сочетание клавиш",
+    "KeyboardShortcuts_ResetToDefaults": "Сбросить до значений по умолчанию",
+    "KeyboardShortcuts_PressKeysHere": "Нажмите здесь клавиши...",
+    "KeyboardShortcuts_KeyCombination": "Комбинация клавиш",
+    "KeyboardShortcuts_FocusArea": "Переключите фокус на поле выше и нажмите требуемую комбинацию клавиш",
+    "KeyboardShortcuts_Modifiers": "Клавиши-модификаторы",
+    "KeyboardShortcuts_Mode": "Режим приложения",
+    "KeyboardShortcuts_ModeMail": "Почта",
+    "KeyboardShortcuts_ModeCalendar": "Календарь",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Переключать прочитано/не прочитано",
+    "KeyboardShortcuts_ActionToggleFlag": "Переключить флаг",
+    "KeyboardShortcuts_ActionToggleArchive": "Архивировать/Разархивировать",
     "ImageRenderingDisabled": "Отображение изображений отключено для этого сообщения.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Метод авторизации",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Безопасность соединения",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Имя пользователя",
     "IMAPSetupDialog_UsernamePlaceholder": "иваниванов, ivanivanov@fabrikam.com, домен/иваниванов",
     "IMAPSetupDialog_UseSameConfig": "Используйте то же имя пользователя и пароль для отправки электронной почты",
+    "ImapCalDavSettingsPage_TitleCreate": "Настройка IMAP и календаря",
+    "ImapCalDavSettingsPage_TitleEdit": "Редактировать настройки IMAP и календаря",
+    "ImapCalDavSettingsPage_Subtitle": "Настроить IMAP/SMTP и необязательную синхронизацию календаря для этой учетной записи.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Базовая настройка",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Введите свои данные и учетные данные. Wino может попробовать автоматически определить параметры сервера.",
+    "ImapCalDavSettingsPage_BasicTab": "Основное",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Включить поддержку календаря",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Автонастройка параметров почты",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Параметры почты найдены и применены.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Расширенная конфигурация",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Введите параметры сервера вручную, если автообнаружение недоступно или неверно.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Расширенные",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Настройка календаря",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Выберите, как данные календаря должны работать для этой учетной записи IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Режим календаря",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Безопасность соединения",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Метод аутентификации",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Отключено",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Синхронизация CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Только локальный календарь",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Календарь отключен для этой учетной записи.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Элементы календаря синхронизируются с вашим сервером CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Элементы календаря хранятся только на этом компьютере и не синхронизируются с сетью.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Как работает локальный календарь",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Только локальный календарь",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Локальный календарь хранит все события только на вашем компьютере. Ничего не синхронизируется с iCloud, Yahoo или любым другим провайдером.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL сервиса CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Имя пользователя CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Пароль CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Проверка CalDAV требуется только если режим календаря установлен на синхронизацию CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL сервиса CalDAV обязателен.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL сервиса CalDAV должен быть абсолютным.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Имя пользователя CalDAV обязательно.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Пароль CalDAV обязателен.",
+    "ImapCalDavSettingsPage_TestImapButton": "Проверить соединение IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Проверить соединение CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Проверка соединения IMAP выполнена успешно.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Проверка соединения CalDAV выполнена успешно.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Настройки учетной записи проверены и сохранены.",
+    "ImapCalDavSettingsPage_ICloudHint": "Используйте пароль для приложений, созданный в настройках вашей учетной записи Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Используйте пароль для приложений из настроек безопасности учетной записи Yahoo.",
     "Info_AccountCreatedMessage": "{0} создано",
     "Info_AccountCreatedTitle": "Создание учетной записи",
     "Info_AccountCreationFailedTitle": "Не удалось создать учетную запись",
     "Info_AccountDeletedMessage": "{0} успешно удалён.",
     "Info_AccountDeletedTitle": "Учетная запись удалена",
     "Info_AccountIssueFixFailedTitle": "Ошибка",
+    "Info_AccountIssueFixImapMessage": "Откройте страницу настроек IMAP и календаря и повторно введите данные сервера.",
+    "Info_AccountAttentionRequiredMessage": "Эта учетная запись требует внимания.",
+    "Info_AccountAttentionRequiredClickableMessage": "Нажмите, чтобы исправить эту учетную запись и повторно синхронизировать её.",
+    "Info_AccountAttentionRequiredAction": "Исправить",
+    "Info_AccountAttentionRequiredActionHint": "Нажмите «Исправить», чтобы устранить проблему этой учетной записи.",
     "Info_AccountIssueFixSuccessMessage": "Исправлены все проблемы с учетной записью.",
     "Info_AccountIssueFixSuccessTitle": "Успешно",
     "Info_AttachmentOpenFailedMessage": "Не удается открыть это вложение.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Эта папка отключена для синхронизации.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Папка отключена",
     "Justify": "Выравнять",
+    "MenuUpdateAvailable": "Обновление доступно.",
     "Left": "Слева",
     "Link": "Связать",
     "LinkedAccountsCreatePolicyMessage": "Для создания связки у вас должно быть не менее 2 учетных записей\nсвязка будет удалена при сохранении",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Вернуть из архива",
     "MailOperation_ViewMessageSource": "View message source",
     "MailOperation_Zoom": "Масштаб",
+    "MailsDragging": "Перетаскивание {0} элемента(ов)",
     "MailsSelected": "Выбрано бесед: {0}",
     "MarkFlagUnflag": "Пометить как помеченное/неотмеченное",
     "MarkReadUnread": "Пометить как прочитанное/непрочитанное",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "New Mail",
     "Notifications_WinoUpdatedMessage": "Ознакомьтесь с новой версией {0}",
     "Notifications_WinoUpdatedTitle": "Почта Wino обновлена.",
+    "Notifications_StoreUpdateAvailableTitle": "Обновление доступно.",
+    "Notifications_StoreUpdateAvailableMessage": "Новая версия Wino Mail готова к установке в Microsoft Store.",
     "OnlineSearchFailed_Message": "Failed to perform search\n{0}\n\nListing offline mails.",
     "OnlineSearchTry_Line1": "Can't find what you are looking for?",
     "OnlineSearchTry_Line2": "Try online search.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Маленькая",
     "Photos": "Фотографии",
     "PreparingFoldersMessage": "Подготовка папок",
-    "ProtocolLogAvailable_Message": "Протокольные журналы доступны для диагностики.",
     "ProviderDetail_Gmail_Description": "Учетная запись Google",
     "ProviderDetail_iCloud_Description": "Apple iCloud Account",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Поиск",
     "SearchingIn": "Поиск в",
     "SearchPivotName": "Результаты",
+    "Settings_KeyboardShortcuts_Title": "Горячие клавиши",
+    "Settings_KeyboardShortcuts_Description": "Настройте сочетания клавиш для быстрых действий над письмами.",
     "SettingConfigureSpecialFolders_Button": "Настроить",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Configuration",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Change your incoming/outgoing server settings.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Настройки IMAP и CalDAV",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Откройте страницу настроек IMAP, SMTP и CalDAV для этой учетной записи.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Открыть настройки",
     "SettingsAbout_Description": "Узнать больше о Wino.",
     "SettingsAbout_Title": "О программе",
     "SettingsAboutGithub_Description": "Перейти к трекеру задач репозитория GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Local",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Default search mode",
+    "SettingsAppPreferences_ApplicationMode_Title": "Режим приложения по умолчанию",
+    "SettingsAppPreferences_ApplicationMode_Description": "Выберите режим запуска Wino по умолчанию, если явный тип активации не задан.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Почта",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Календарь",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail продолжит работу в фоновом режиме. При поступлении новых сообщений вы будете уведомлены.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Run in the background",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail will keep running on the system tray. Available to launch by clicking on an icon. You will be notified as new mails arrive.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Fatal error occurred while changing the startup mode for Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Start minimized on Windows startup",
     "SettingsAppPreferences_Title": "App Preferences",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Скрыть кнопку аккаунта Wino в панели заголовка",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Скрыть кнопку профиля в панели заголовка, которая открывает выпадающее меню учетной записи Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Уведомления об обновлениях магазина",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Показывать уведомления и действия в нижнем колонтитуле, когда доступно обновление Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Действия ИИ",
+    "SettingsAppPreferences_AiActions_Description": "Выберите языки ИИ по умолчанию и место сохранения сводок.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Язык перевода по умолчанию",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Выберите языки перевода по умолчанию, которые будут использоваться в действиях перевода ИИ.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Язык суммирования",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Выберите предпочитаемый язык суммирования для будущего вывода сводок ИИ.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Путь сохранения сводок по умолчанию.",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Выберите папку, которую Wino будет использовать по умолчанию для сохранения сводок ИИ.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Использовать место сохранения по умолчанию в системе",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Эта папка не существует. По умолчанию будет использоваться место сохранения для сводок.",
     "SettingsAutoSelectNextItem_Description": "Выбирать следующий элемент после удаления или перемещения письма.",
     "SettingsAutoSelectNextItem_Title": "Автовыбор следующего элемента",
     "SettingsAvailableThemes_Description": "Выберите тему из коллекции Wino на свой вкус или используйте свои собственные темы.",
     "SettingsAvailableThemes_Title": "Доступные темы",
     "SettingsCalendarSettings_Description": "Change first day of week, hour cell height and more...",
     "SettingsCalendarSettings_Title": "Calendar Settings",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Продолжительность повторного откладывания по умолчанию.",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Установите продолжительность повторного отложенного напоминания по умолчанию.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Формат заголовка дня во временном виде.",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Выберите, как будут отображаться верхние ярлыки дней в режимах дневного, недельного и рабочей недели. Используйте токены формата даты, такие как ddd, dd, MMM или dddd.",
     "SettingsComposer_Title": "Composer",
     "SettingsComposerFont_Title": "Шрифт редактора по умолчанию",
     "SettingsComposerFontFamily_Description": "Измените семейство и размер шрифта по умолчанию при написании писем.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Канал Discord",
     "SettingsEditLinkedInbox_Description": "Добавляйте/удаляйте учетные записи, переименовывайте или разрывайте связь между ними.",
     "SettingsEditLinkedInbox_Title": "Редактировать связанную папку \"Входящие\"",
+    "SettingsWindowBackdrop_Title": "Фон окна",
+    "SettingsWindowBackdrop_Description": "Выберите эффект фона для окон Wino.",
+    "SettingsWindowBackdrop_Disabled": "Выбор фона окна отключён, если тема приложения выбрана не по умолчанию.",
     "SettingsElementTheme_Description": "Выберите тему Windows для Wino",
     "SettingsElementTheme_Title": "Режим темы",
     "SettingsElementThemeSelectionDisabled": "Выбор режима темы не работает, если выбрана тема приложения, отличная от темы \"По умолчанию\".",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliases",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Изменения сохранены.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Данные вашей учетной записи успешно обновлены.",
     "SettingsManageLink_Description": "Перемещайте элементы, чтобы добавить новую или удалить существующую привязку.",
     "SettingsManageLink_Title": "Управление привязкой",
     "SettingsMarkAsRead_Description": "Выберите, что должно произойти с выбранным элементом.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Уведомления",
     "SettingsNotificationsAndTaskbar_Description": "Change whether notifications should be displayed and taskbar badge for this account.",
     "SettingsNotificationsAndTaskbar_Title": "Notifications & Taskbar",
+    "SettingsHome_Title": "Главная",
+    "SettingsHome_SearchTitle": "Найти настройку",
+    "SettingsHome_SearchDescription": "Поиск по функции, теме или ключевому слову для быстрого перехода к нужной странице настроек.",
+    "SettingsHome_SearchPlaceholder": "Поиск настроек",
+    "SettingsHome_SearchExamples": "Попробуйте: тема, хранилище, язык, подпись",
+    "SettingsHome_QuickLinks_Title": "Быстрые ссылки",
+    "SettingsHome_QuickLinks_Description": "Перейдите к настройкам, к которым чаще всего обращаются пользователи.",
+    "SettingsHome_StorageCard_Description": "Посмотрите, сколько локального MIME-контента хранит Wino на этом устройстве, и при необходимости очистите его.",
+    "SettingsHome_StorageEmptySummary": "Кэшированного MIME-контента пока не обнаружено.",
+    "SettingsHome_StorageLoading": "Проверяем использование локального MIME...",
+    "SettingsHome_Tips_Title": "Советы и подсказки",
+    "SettingsHome_Tips_Description": "Небольшие изменения могут сделать использование Wino намного более персональным.",
+    "SettingsHome_Tip_Theme": "Хотите темный режим или изменения акцентов? Откройте Персонализация.",
+    "SettingsHome_Tip_Background": "Используйте настройки приложения для управления запуском и фоновой синхронизацией.",
+    "SettingsHome_Tip_Shortcuts": "Горячие клавиши помогут быстрее работать с почтой.",
+    "SettingsHome_Resources_Title": "Полезные ссылки",
+    "SettingsHome_Resources_Description": "Откройте ресурсы проекта, справку и каналы выпуска.",
     "SettingsOptions_Title": "Параметры",
+    "SettingsOptions_GeneralSection": "Общие",
+    "SettingsOptions_MailSection": "Почта",
+    "SettingsOptions_CalendarSection": "Календарь",
+    "SettingsOptions_MoreComingSoon": "Скоро будут доступны дополнительные параметры.",
+    "SettingsOptions_HeroDescription": "Настройте свой опыт использования Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} учетная запись(и) настроена(ы).",
+    "SettingsSearch_ManageAccounts_Keywords": "учётная запись;учётные записи;почтовый ящик;почтовые ящики;псевдоним;псевдонимы;профиль;адрес;адреса",
+    "SettingsSearch_AppPreferences_Keywords": "запуск;фон;запуск;синхронизация;уведомления;уведомления;поиск;системный трей;значения по умолчанию",
+    "SettingsSearch_LanguageTime_Keywords": "язык;время;часы;локаль;регион;формат;24 часа;24ч",
+    "SettingsSearch_Personalization_Keywords": "тема;темный;светлый;внешний вид;акцент;цвет;цвет;режим;раскладка;плотность",
+    "SettingsSearch_About_Keywords": "о;версия;веб-сайт;конфиденциальность;github;пожертвовать;магазин;поддержка",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "ярлык;ярлыки;горячий ярлык;горячие клавиши;клавиатура;клавиши",
+    "SettingsSearch_MessageList_Keywords": "сообщение;сообщения;список;обсуждения;ветви;аватар;предпросмотр;отправитель",
+    "SettingsSearch_ReadComposePane_Keywords": "просмотр;составление;составитель;шрифт;шрифты;внешний контент;отображение;чтение",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "подпись;подписи;шифрование;сертификат;сертификаты;S/MIME;S/MIME;безопасность",
+    "SettingsSearch_Storage_Keywords": "хранение;кэш;кэширование;MIME;диск;место на диске;очистка;очистить;локальные данные",
+    "SettingsSearch_CalendarSettings_Keywords": "календарь;неделя;часы;расписание;событие;события",
     "SettingsPaneLengthReset_Description": "Reset the size of the mail list to original if you have issues with it.",
     "SettingsPaneLengthReset_Title": "Reset Mail List Size",
     "SettingsPaypal_Description": "Проявите больше любви ❤️ Все пожертвования высоко ценятся.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "24-часовой формат отображения времени",
     "SettingsPrivacyPolicy_Description": "Ознакомьтесь с политикой конфиденциальности.",
     "SettingsPrivacyPolicy_Title": "Политика конфиденциальности",
+    "SettingsWebsite_Description": "Откройте сайт Wino Mail.",
+    "SettingsWebsite_Title": "Сайт",
     "SettingsReadComposePane_Description": "Fonts, external content.",
     "SettingsReadComposePane_Title": "Reader & Composer",
     "SettingsReader_Title": "Reader",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Показать текст предпросмотра",
     "SettingsShowSenderPictures_Description": "Скрыть/показать миниатюру изображения отправителя.",
     "SettingsShowSenderPictures_Title": "Показывать аватары отправителя",
+    "SettingsEmailTemplates_Title": "Шаблоны электронной почты",
+    "SettingsEmailTemplates_Description": "Управление шаблонами электронной почты.",
+    "SettingsEmailTemplates_CreatePageTitle": "Новый шаблон",
+    "SettingsEmailTemplates_EditPageTitle": "Редактировать шаблон",
+    "SettingsEmailTemplates_NewTemplateTitle": "Новый шаблон",
+    "SettingsEmailTemplates_NewTemplateDescription": "Создайте новый шаблон электронной почты",
+    "SettingsEmailTemplates_NameTitle": "Название",
+    "SettingsEmailTemplates_NamePlaceholder": "Название шаблона",
+    "SettingsEmailTemplates_DescriptionTitle": "Описание",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Дополнительное описание (необязательно).",
+    "SettingsEmailTemplates_ContentTitle": "Содержимое шаблона",
+    "SettingsEmailTemplates_ContentDescription": "Измените HTML-содержимое этого шаблона.",
+    "SettingsEmailTemplates_NameRequired": "Требуется имя шаблона.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Элемент при запуске",
     "SettingsStore_Description": "Проявите любовь ❤️",
     "SettingsStore_Title": "Оценить в магазине приложений",
+    "SettingsStorage_Title": "Хранение",
+    "SettingsStorage_Description": "Сканировать и управлять кэшом MIME, сохраненным в вашей локальной папке данных.",
+    "SettingsStorage_ScanFolder": "Сканировать локальную папку данных",
+    "SettingsStorage_NoLocalMimeDataFound": "Локальные MIME-данные не найдены.",
+    "SettingsStorage_NoAccountsFound": "Учетные записи не найдены.",
+    "SettingsStorage_TotalUsage": "Общее использование локального MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} используется в локальном кэше MIME.",
+    "SettingsStorage_DeleteAll_Title": "Удалить весь MIME-контент",
+    "SettingsStorage_DeleteAll_Description": "Удалить всю папку кэша MIME этой учетной записи.",
+    "SettingsStorage_DeleteAll_Button": "Удалить всё",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Удалить весь MIME-контент",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Удалить локальные MIME-данные для {0}?",
+    "SettingsStorage_DeleteAll_Success": "Все MIME-данные были удалены.",
+    "SettingsStorage_DeleteOld_Title": "Удалить старый MIME-контент",
+    "SettingsStorage_DeleteOld_Description": "Удалить MIME-файлы на основе даты создания письма в локальной базе данных.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 месяц",
+    "SettingsStorage_DeleteOld_3Months": "> 3 месяца",
+    "SettingsStorage_DeleteOld_6Months": "> 6 месяцев",
+    "SettingsStorage_DeleteOld_1Year": "> 1 год",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Удалить старый MIME-контент",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Удалить локальные MIME-данные старше {0} для {1}?",
+    "SettingsStorage_DeleteOld_Success": "Удалено {0} папок MIME, старше {1}.",
+    "SettingsStorage_1Month": "1 месяц",
+    "SettingsStorage_3Months": "3 месяца",
+    "SettingsStorage_6Months": "6 месяцев",
+    "SettingsStorage_1Year": "1 год",
+    "SettingsStorage_Months": "{0} месяцев",
     "SettingsTaskbarBadge_Description": "Include unread mail count in taskbar icon.",
     "SettingsTaskbarBadge_Title": "Taskbar Badge",
     "SettingsThreads_Description": "Организуйте сообщения в беседы.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Вы не можете назначить папку \"Входящие\" другой системной папке.",
     "SystemFolderConfigSetupSuccess_Message": "Системные папки успешно настроены.",
     "SystemFolderConfigSetupSuccess_Title": "Настройка системных папок",
+    "SystemTrayMenu_ShowWino": "Открыть Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Открыть Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Выход",
     "TestingImapConnectionMessage": "Проверка соединения с сервером...",
     "TitleBarServerDisconnectedButton_Description": "Wino отключён от сети. Нажмите \"переподключиться\" для восстановления соединения.",
     "TitleBarServerDisconnectedButton_Title": "нет соединения",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Улучшить до неограниченного количества учетных записей",
     "WinoUpgradeRemainingAccountsMessage": "Использовано {0} из {1} бесплатных учетных записей.",
     "Yesterday": "Вчера",
+    "Smime_ImportCertificates_Success": "Сертификаты успешно импортированы.",
+    "Smime_ImportCertificates_Error": "Ошибка импорта сертификатов: {0}",
+    "Smime_RemoveCertificates_Confirm": "Вы действительно хотите удалить сертификаты {0}?",
+    "Smime_RemoveCertificates_Success": "Сертификаты удалены.",
+    "Smime_ExportCertificates_Success": "Сертификаты экспортированы.",
+    "Smime_ExportCertificates_Error": "Ошибка экспорта сертификатов.",
+    "Smime_CertificateDetails": "Субъект: {0}\nИздатель: {1}\nДействителен с: {2}\nДействителен по: {3}\nОтпечаток: {4}",
+    "Smime_CertificatePassword_Title": "Требуется пароль к сертификату",
+    "Smime_CertificatePassword_Placeholder": "Пароль к сертификату для {0} (необязательно)",
+    "Smime_Confirm_Title": "Подтвердить",
+    "Buttons_OK": "ОК",
+    "Buttons_Refresh": "Обновить",
+    "SettingsSignatureAndEncryption_Title": "Подпись и шифрование",
+    "SettingsSignatureAndEncryption_Description": "Управление сертификатами S/MIME для подписания и шифрования электронной почты.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Мои сертификаты",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Личные сертификаты для подписания и шифрования",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Сертификаты получателей",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Сертификаты получателей для расшифрования",
+    "SettingsSignatureAndEncryption_NameColumn": "Имя",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Истекает",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Отпечаток",
+    "Buttons_Remove": "Удалить",
+    "Buttons_Export": "Экспорт",
+    "Buttons_Import": "Импорт",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Сертификат подписи S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Сертификат шифрования S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Нет",
+    "SmimeSignaturesInMessage": "Подписи в этом сообщении:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, срок действия: {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Информация о сертификате подписи S/MIME",
+    "SmimeCertificateInfoTitle": "Информация о сертификате S/MIME",
+    "SmimeNoCertificateFileFound": "Файл сертификата не найден",
+    "SmimeSaveCertificate": "Сохранить сертификат...",
+    "SmimeCertificate": "Сертификат S/MIME",
+    "SmimeCertificateSavedTo": "Сертификат сохранен в {0}",
+    "SmimeSignedTooltip": "Это сообщение подписано сертификатом S/MIME. Нажмите для получения дополнительных сведений.",
+    "SmimeEncryptedTooltip": "Это сообщение зашифровано сертификатом S/MIME.",
+    "SmimeCertificateFileInfo": "Файл: {0}",
+    "Composer_LightTheme": "Светлая тема",
+    "Composer_DarkTheme": "Тёмная тема",
+    "Composer_Outdent": "Уменьшить отступ",
+    "Composer_Indent": "Увеличить отступ",
+    "Composer_BulletList": "Маркированный список",
+    "Composer_OrderedList": "Нумерованный список",
+    "Composer_Stroke": "Линия",
+    "Composer_Bold": "Жирный",
+    "Composer_Italic": "Курсив",
+    "Composer_Underline": "Подчеркивание",
+    "Composer_CcBcc": "Копия и скрытая копия",
+    "Composer_EnableSmimeSignature": "Включить/выключить подпись S/MIME",
+    "Composer_EnableSmimeEncryption": "Включить/выключить шифрование S/MIME",
+    "Composer_LocalDraftSyncInfo": "Этот черновик локальный. Wino не смог отправить его на ваш почтовый сервер. Нажмите, чтобы повторно отправить его на сервер.",
+    "Composer_CertificateExpires": "Истекает: ",
+    "Composer_SmimeSignature": "Подпись S/MIME",
+    "Composer_SmimeEncryption": "Шифрование S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Шаблоны электронной почты",
+    "Composer_AiSummarize": "Сформировать резюме с помощью ИИ",
+    "Composer_AiSummarizeDescription": "Извлечь ключевые моменты, задачи и принятые решения из этого письма.",
+    "Composer_AiTranslate": "Перевести с помощью ИИ",
+    "Composer_AiActions": "Действия ИИ",
+    "Composer_AiRewrite": "Переписать с помощью ИИ",
+    "AiActions_CheckingStatus": "Проверяем доступ к ИИ...",
+    "AiActions_SignedOutTitle": "Разблокировать пакет Wino AI",
+    "AiActions_SignedOutDescription": "Перевод, переработка и резюмирование писем с помощью искусственного интеллекта после входа в учетную запись Wino и активации дополнения AI Pack.",
+    "AiActions_NoPackTitle": "Требуется пакет AI",
+    "AiActions_NoPackDescription": "Вы вошли в систему, но пакет AI не активен. Приобретите его, чтобы использовать инструменты перевода, переработки и резюмирования Wino с помощью ИИ.",
+    "AiActions_UsageSummary": "{0} из {1} кредитов потрачено в этом месяце.",
+    "Composer_AiRewritePolite": "Сделать вежливым",
+    "Composer_AiRewritePoliteDescription": "Смягчает формулировку, сохраняя тот же смысл.",
+    "Composer_AiRewriteAngry": "Сделать агрессивным",
+    "Composer_AiRewriteAngryDescription": "Использует более резкий и конфронтационный тон.",
+    "Composer_AiRewriteHappy": "Сделайте это более радостным",
+    "Composer_AiRewriteHappyDescription": "Добавляет более радостный и воодушевляющий тон.",
+    "Composer_AiRewriteFormal": "Сделайте это формальным.",
+    "Composer_AiRewriteFormalDescription": "Придаёт сообщению более профессиональный и структурированный вид.",
+    "Composer_AiRewriteFriendly": "Сделайте это дружелюбным.",
+    "Composer_AiRewriteFriendlyDescription": "Придаёт сообщению более дружелюбный и доступный тон.",
+    "Composer_AiRewriteShorter": "Сделайте это короче.",
+    "Composer_AiRewriteShorterDescription": "Укорачивает текст и удаляет лишние детали.",
+    "Composer_AiRewriteClearer": "Сделайте это яснее.",
+    "Composer_AiRewriteClearerDescription": "Улучшает читаемость и делает сообщение более понятным.",
+    "Composer_AiRewriteCustom": "Пользовательский",
+    "Composer_AiRewriteCustomDescription": "Опишите, как вы хотите переписать текст.",
+    "Composer_AiRewriteCustomPlaceholder": "Опишите, как вы хотите переписать сообщение.",
+    "Composer_AiRewriteMode": "Переписать тон",
+    "Composer_AiRewriteApply": "Применить переформулировку.",
+    "Composer_AiTranslateDialogTitle": "Перевод с помощью ИИ",
+    "Composer_AiTranslateDialogDescription": "Введите целевой язык или код культуры, например en-US, tr-TR, de-DE или fr-FR.",
+    "Composer_AiTranslateApply": "Перевести",
+    "Composer_AiTranslateLanguage": "Целевой язык",
+    "Composer_AiTranslateCustomPlaceholder": "Введите код культуры",
+    "Composer_AiTranslateLanguageEnglish": "Английский (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Турецкий (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Немецкий (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Французский (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Испанский (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Итальянский (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Португальский (Бразилия) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Нидерландский (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Польский (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Русский (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Японский (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Корейский (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Китайский упрощенный (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Арабский (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Хинди (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Другое...",
+    "Composer_AiBusyTitle": "ИИ уже работает",
+    "Composer_AiBusyMessage": "Пожалуйста, подождите завершения текущего действия ИИ.",
+    "Composer_AiSignInRequired": "Войдите в свою учетную запись Wino, чтобы использовать функции ИИ.",
+    "Composer_AiMissingHtml": "Пока нет содержимого сообщения для отправки в Wino AI.",
+    "Composer_AiQuotaUnavailable": "Результат ИИ применён.",
+    "Composer_AiAppliedMessage": "Результат ИИ применён к редактору письма. Используйте Отмену, чтобы вернуть исходное состояние.",
+    "Composer_AiSummarizeSuccessTitle": "Сводка ИИ применена.",
+    "Composer_AiTranslateSuccessTitle": "Перевод ИИ применён.",
+    "Composer_AiRewriteSuccessTitle": "Переписывание ИИ применено.",
+    "Composer_AiErrorTitle": "Ошибка выполнения действия ИИ.",
+    "Reader_AiAppliedMessage": "Результат ИИ теперь отображается для этого сообщения. Откройте сообщение заново, чтобы увидеть исходное содержимое.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Контакты",
+    "ContactsPage_AddContact": "Добавить контакт",
+    "ContactsPage_EditContact": "Редактировать контакт",
+    "ContactsPage_DeleteContact": "Удалить контакт",
+    "ContactsPage_SearchPlaceholder": "Поиск контактов...",
+    "ContactsPage_NoContacts": "Контакты не найдены.",
+    "ContactsPage_ContactsCount": "{0} контактов",
+    "ContactsPage_SelectedContactsCount": "Выбрано {0}",
+    "ContactsPage_DeleteSelectedContacts": "Удалить выбранные",
+    "ContactEditDialog_Title": "Редактировать контакт",
+    "ContactEditDialog_PhotoSection": "Фото",
+    "ContactEditDialog_ChoosePhoto": "Выбрать фото",
+    "ContactEditDialog_RemovePhoto": "Удалить фото",
+    "ContactEditDialog_NameHeader": "Имя",
+    "ContactEditDialog_NamePlaceholder": "Имя контакта",
+    "ContactEditDialog_EmailHeader": "Адрес электронной почты",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Контактная информация",
+    "ContactEditDialog_RootContactInfo": "Это корневой контакт, связанный с вашими учетными записями, и его нельзя удалить.",
+    "ContactEditDialog_OverriddenContactInfo": "Этот контакт был вручную изменён и не будет обновляться во время синхронизации.",
+    "ContactsPage_Subtitle": "Управляйте своими контактами электронной почты и их информацией.",
+    "ContactStatus_Account": "Аккаунт",
+    "ContactStatus_Modified": "Изменён",
+    "ContactAction_Edit": "Редактировать контакт",
+    "ContactAction_ChangePhoto": "Изменить фото",
+    "ContactAction_Delete": "Удалить контакт",
+    "ContactAction_Add": "Добавить контакт",
+    "ContactSelection_Selected": "Выбрано",
+    "ContactSelection_SelectAll": "Выбрать все",
+    "ContactSelection_Clear": "Очистить",
+    "ContactsPage_EmptyState": "Нет контактов для отображения.",
+    "ContactsPage_AddFirstContact": "Добавьте ваш первый контакт.",
+    "ContactsPage_ContactsCountSuffix": "контактов",
+    "ContactsPane_NewContact": "Новый контакт",
+    "ContactsPane_DescriptionTitle": "Управляйте своими контактами",
+    "ContactsPane_DescriptionBody": "Создавайте контакты, переименовывайте их, обновляйте фотографии профиля и держите сохраненные данные в одном месте.",
+    "ContactEditDialog_AddTitle": "Добавить контакт",
+    "ContactInfoBar_ContactAdded": "Контакт успешно добавлен.",
+    "ContactInfoBar_ContactUpdated": "Контакт успешно обновлён.",
+    "ContactInfoBar_ContactsDeleted": "Контакты успешно удалены.",
+    "ContactInfoBar_ContactPhotoUpdated": "Фотография контакта успешно обновлена.",
+    "ContactInfoBar_FailedToLoadContacts": "Не удалось загрузить контакты: {0}",
+    "ContactInfoBar_FailedToAddContact": "Не удалось добавить контакт: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Не удалось обновить контакт: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Не удалось удалить контакты: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Не удалось обновить фото: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Корневые контакты нельзя удалить.",
+    "ContactConfirmDialog_DeleteTitle": "Удалить контакт",
+    "ContactConfirmDialog_DeleteMessage": "Вы уверены, что хотите удалить контакт '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Вы уверены, что хотите удалить {0} контакт(ов)?",
+    "ContactConfirmDialog_DeleteButton": "Удалить",
+    "CalendarAccountSettings_Title": "Настройки учетной записи календаря",
+    "CalendarAccountSettings_Description": "Управляйте настройками календаря для {0}",
+    "CalendarAccountSettings_AccountColor": "Цвет учетной записи",
+    "CalendarAccountSettings_AccountColorDescription": "Изменить цвет отображения для этой учетной записи календаря.",
+    "CalendarAccountSettings_SyncEnabled": "Включить синхронизацию",
+    "CalendarAccountSettings_SyncEnabledDescription": "Включить или отключить синхронизацию календаря для этой учетной записи",
+    "CalendarAccountSettings_DefaultShowAs": "Статус доступности по умолчанию",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Статус доступности по умолчанию для новых событий, создаваемых этой учетной записью",
+    "CalendarAccountSettings_PrimaryCalendar": "Основной календарь",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Пометить этот календарь как основной календарь для учетной записи",
+    "CalendarSettings_NewEventBehavior_Header": "Поведение кнопки Новое событие",
+    "CalendarSettings_NewEventBehavior_Description": "Выберите, должна ли кнопка Новое событие запрашивать календарь каждый раз или всегда открывать конкретный календарь.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Спрашивать каждый раз.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Всегда использовать конкретный календарь.",
+    "CalendarSettings_Rendering_Title": "Отображение",
+    "CalendarSettings_Rendering_Description": "Настройте разметку календаря и поведение отображения.",
+    "CalendarSettings_Notifications_Title": "Уведомления",
+    "CalendarSettings_Notifications_Description": "Выберите поведение напоминаний и откладывания по умолчанию.",
+    "CalendarSettings_Preferences_Title": "Настройки",
+    "CalendarSettings_Preferences_Description": "Укажите поведение кнопки Новое событие.",
+    "WhatIsNew_GetStartedButton": "Начать",
+    "WhatIsNew_ContinueAnywayButton": "Продолжить все равно",
+    "WhatIsNew_PreparingForNewVersionButton": "Подготовка новой версии...",
+    "WhatIsNew_MigrationPreparing_Title": "Подготовка ваших данных",
+    "WhatIsNew_MigrationPreparing_Description": "Wino применяет миграции обновления. Пожалуйста, подождите, пока мы подготовим данные вашей учетной записи к этому выпуску.",
+    "WhatIsNew_MigrationFailedMessage": "Не удалось применить миграции. Код ошибки {0}. Вы всё ещё можете использовать приложение. Однако если вы столкнетесь с серьезными проблемами, переустановите приложение.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail обновлено",
+    "WhatIsNew_MigrationNotification_Message": "Откройте приложение, чтобы завершить обновление и увидеть, что нового.",
+    "WelcomeWindow_Title": "Добро пожаловать в Wino Mail",
+    "WelcomeWindow_Subtitle": "Нативный опыт Mail и календаря на Windows.",
+    "WelcomeWindow_WhatsNewTitle": "Последние изменения",
+    "WelcomeWindow_FeaturesTitle": "Функции",
+    "WelcomeWindow_WhatsNewTab": "Что нового",
+    "WelcomeWindow_FeaturesTab": "Функции",
+    "WelcomeWindow_GetStartedButton": "Начать, добавив учетную запись",
+    "WelcomeWindow_GetStartedDescription": "Добавьте учетную запись Outlook, Gmail или IMAP, чтобы начать работу с Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Импорт из вашей учетной записи Wino",
+    "WelcomeWindow_ImportInProgress": "Импорт синхронизированных настроек и учетных записей...",
+    "WelcomeWindow_ImportNoAccountsFound": "В вашей учетной записи Wino не найдено синхронизированных учетных записей. Если настройки были доступны, они были восстановлены. Используйте Начать, чтобы добавить учетную запись вручную.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} синхронизированных учетных записей уже доступны на этом устройстве. При необходимости используйте Начать, чтобы вручную добавить еще одну учетную запись.",
+    "WelcomeWindow_SetupTitle": "Настройте свою учетную запись",
+    "WelcomeWindow_SetupSubtitle": "Выберите вашего поставщика электронной почты, чтобы начать.",
+    "WelcomeWindow_AddAccountButton": "Добавить учетную запись",
+    "WelcomeWindow_SkipForNow": "Пропустить пока — настрою позже",
+    "WelcomeWindow_AppDescription": "Быстрый, сфокусированный почтовый ящик — переработан для Windows 11.",
+    "WelcomeWizard_Step1Title": "Добро пожаловать",
+    "SystemTrayMenu_Open": "Открыть",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Синхронизация настроек",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Сохраняйте настройки Wino синхронизированными между устройствами.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Разблокировать дополнения",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Получайте доступ к премиум-функциям, таким как Wino AI Pack.",
+    "WinoAccount_Management_Description": "Управляйте своей учетной записью Wino, доступом к AI Pack и синхронизированными настройками и данными учетной записи.",
+    "WinoAccount_Management_SignedOutTitle": "Войдите в Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Войдите в учетную запись или создайте её, чтобы синхронизировать почту, получить доступ к функциям AI и управлять настройками на разных устройствах.",
+    "WinoAccount_Management_ProfileSectionHeader": "Профиль",
+    "WinoAccount_Management_AddOnsSectionHeader": "Дополнения Wino",
+    "WinoAccount_Management_DataSectionHeader": "Данные",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Действия с учетной записью",
+    "WinoAccount_Management_AccountCardTitle": "Учетная запись",
+    "WinoAccount_Management_AccountCardDescription": "Адрес электронной почты вашей учетной записи Wino и текущее состояние учетной записи.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Проверьте, активен ли Wino AI Pack и сколько осталось использования.",
+    "WinoAccount_Management_AiPackActive": "Wino AI Pack активен",
+    "WinoAccount_Management_AiPackInactive": "Wino AI Pack не активен",
+    "WinoAccount_Management_AiPackUsage": "{0} из {1} использовано. Осталось {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Период оплаты: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Данные об использовании еще недоступны.",
+    "WinoAccount_Management_AiPackBuyDescription": "Купите Wino AI Pack, чтобы переводить, перерабатывать или суммировать письма с помощью AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Разблокировать AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Ускорьте работу с почтой с помощью инструментов на базе AI. Переводите сообщения на более чем 50 языков, перерабатывайте текст для ясности и тона, и получайте мгновенные конспекты длинных переписок.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / мес",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 кредитов",
+    "WinoAccount_Management_AiPackGetButton": "Получить AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "AI-powered tools for translate, rewrite, and summarize actions in Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, translate, rewrite, summarize, productivity",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Unlimited Accounts",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Remove the account limit and add as many mail accounts as you need.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "accounts, unlimited, premium, add-on",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Sign in with your Wino Account to complete this purchase.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino не смог завершить эту покупку в Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Покупка завершена, но Wino не может обновить преимущества вашей учетной записи. Попробуйте еще раз через мгновение.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Ваша подписка активна",
+    "WinoAccount_Management_AiPackRenews": "Продлевается {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Использовано кредитов в этом месяце",
+    "WinoAccount_Management_AiPackResets": "Сбросы {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Не удалось загрузить баланс использования AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Перевод",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Переписать",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Суммировать",
+    "WinoAccount_Management_AddOnLoadFailed": "Не удалось загрузить это дополнение.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Синхронизировать настройки и учетные записи",
+    "WinoAccount_Management_SyncPreferencesDescription": "Импортируйте или экспортируйте ваши настройки Wino и данные почтового ящика на разных устройствах. Пароли, токены и другая конфиденциальная информация никогда не синхронизируются.",
+    "WinoAccount_Management_SignOutTitle": "Выйти",
+    "WinoAccount_Management_SignOutDescription": "Выйдите из своей учетной записи на этом устройстве",
+    "WinoAccount_Management_StatusLabel": "Статус: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Для этой учетной записи синхронизированные данные еще не сохранены.",
+    "WinoAccount_Management_ExportSucceeded": "Выбранные данные Wino успешно экспортированы.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Ваши настройки экспортированы в вашу учетную запись Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Экспортировано {0} сведений об учетной записи в вашу учетную запись Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Импортированы синхронизированные данные из вашей учетной записи Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Применено {0} синхронизированных настроек.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Импортировано {0} учетных записей.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Пропущено {0} учетных записей, которые уже существуют на этом устройстве.",
+    "WinoAccount_Management_ImportPartial": "Применено {0} синхронизированных настроек. Не удалось восстановить {1} настроек.",
+    "WinoAccount_Management_ImportReloginReminder": "Пароли, токены и другая конфиденциальная информация не были импортированы. Войдите снова для каждой учетной записи на этом устройстве перед использованием.",
+    "WinoAccount_Management_SerializeFailed": "Wino не смог сериализовать ваши текущие настройки.",
+    "WinoAccount_Management_EmptyExport": "Нет значений настроек, которые можно экспортировать.",
+    "WinoAccount_Management_ImportEmpty": "Пакет синхронизованных данных не содержит ничего нового для восстановления.",
+    "WinoAccount_Management_ExportDialog_Title": "Экспорт в ваш аккаунт Wino.",
+    "WinoAccount_Management_ExportDialog_Description": "Выберите, что вы хотите синхронизировать с вашим аккаунтом Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Настройки",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Учетные записи",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Пароли, токены и другие конфиденциальные данные не синхронизируются.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Импортированные на другом ПК учетные записи по-прежнему потребуют повторного входа в систему перед использованием.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Выполняется экспорт выбранных данных Wino...",
+    "WinoAccount_Management_LoadFailed": "Не удалось загрузить последнюю информацию об учетной записи Wino.",
+    "WinoAccount_Management_ActionFailed": "Запрос к учетной записи Wino не удалось выполнить.",
+    "WinoAccount_SettingsSection_Title": "Учетная запись Wino",
+    "WinoAccount_SettingsSection_Description": "Создайте учетную запись Wino или войдите в неё, используя ваш локальный сервис аутентификации.",
+    "WinoAccount_RegisterButton_Title": "Зарегистрировать учетную запись",
+    "WinoAccount_RegisterButton_Description": "Создайте учетную запись Wino с электронной почтой и паролем.",
+    "WinoAccount_RegisterButton_Action": "Открыть регистрацию",
+    "WinoAccount_LoginButton_Title": "Войти",
+    "WinoAccount_LoginButton_Description": "Войдите в существующую учетную запись Wino с электронной почтой и паролем.",
+    "WinoAccount_LoginButton_Action": "Открыть вход",
+    "WinoAccount_SignOutButton_Title": "Выйти",
+    "WinoAccount_SignOutButton_Description": "Удалить локально сохраненную сессию учетной записи Wino.",
+    "WinoAccount_SignOutButton_Action": "Выйти",
+    "WinoAccount_RegisterDialog_Title": "Создать учетную запись Wino",
+    "WinoAccount_RegisterDialog_Description": "Создайте учетную запись Wino, чтобы синхронизировать ваш опыт использования Wino и разблокировать дополнения, зависящие от учетной записи.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Создайте учетную запись Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Зачем создавать учетную запись?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Импорт и экспорт настроек между устройствами",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Переносите настройки Wino между устройствами, не восстанавливая конфигурацию с нуля.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Доступ к эксклюзивным дополнениям, таким как Wino AI Pack (платно)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Используйте одну учетную запись, чтобы разблокировать премиум-функции Wino по мере их появления.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Учетная запись Wino отделена от ваших почтовых учетных записей",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Ваши учетные записи Outlook, Gmail, IMAP и другие почтовые учетные записи останутся без изменений. Учетная запись Wino управляет только функциями Wino и дополнениями, привязанными к учетной записи.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Зарегистрироваться",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Конфиденциальность и обработка API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Необязательные дополнения, такие как Wino AI Pack, могут отправлять выбранное HTML-содержимое писем в сервис Wino API только при использовании этих функций.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Прочитайте политику конфиденциальности.",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Я согласен с политикой конфиденциальности.",
+    "WinoAccount_LoginDialog_Title": "Войдите в учетную запись Wino",
+    "WinoAccount_LoginDialog_Description": "Войдите в свою учетную запись Wino, чтобы синхронизировать настройки Wino и получить доступ к функциям, зависящим от учетной записи.",
+    "WinoAccount_LoginDialog_HeroTitle": "С возвращением",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Преимущества входа",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Используйте учетную запись Wino, чтобы продолжать синхронизацию настроек между устройствами и иметь доступ к платным дополнениям, таким как Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Это не вход в вашу электронную почтовую учетную запись",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Вход здесь не добавляет и не заменяет ваши учетные записи Outlook, Gmail, IMAP и другие в Wino. Вход здесь выполняет вход только в сервисы, связанные с учетной записью Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Забыли пароль?",
+    "WinoAccount_EmailLabel": "Электронная почта",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Пароль",
+    "WinoAccount_ConfirmPasswordLabel": "Подтвердите пароль",
+    "WinoAccount_ForgotPasswordDialog_Title": "Сброс пароля",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Отправить письмо для сброса пароля",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Вернуться к входу",
+    "WinoAccount_ForgotPasswordDialog_Description": "Введите адрес электронной почты вашей учетной записи Wino, и мы отправим вам ссылку для сброса пароля, если адрес зарегистрирован.",
+    "WinoAccount_Validation_EmailRequired": "Электронная почта обязательна.",
+    "WinoAccount_Validation_PasswordRequired": "Пароль обязателен.",
+    "WinoAccount_Validation_PasswordMismatch": "Пароли не совпадают.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Перед созданием учетной записи Wino вы должны принять политику конфиденциальности.",
+    "WinoAccount_Error_InvalidCredentials": "Адрес электронной почты или пароль неверны.",
+    "WinoAccount_Error_AccountLocked": "Эта учетная запись временно заблокирована.",
+    "WinoAccount_Error_AccountBanned": "Эта учетная запись заблокирована.",
+    "WinoAccount_Error_AccountSuspended": "Эта учетная запись приостановлена.",
+    "WinoAccount_Error_EmailNotConfirmed": "Пожалуйста, подтвердите адрес электронной почты перед входом.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Необходимо подтвердить адрес электронной почты перед входом.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Новое письмо для подтверждения пока недоступно.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Этот запрос на подтверждение больше не действителен. Пожалуйста, попробуйте войти снова.",
+    "WinoAccount_Error_EmailNotRegistered": "Этот адрес электронной почты не зарегистрирован.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Ваша сессия больше не действительна. Пожалуйста, войдите снова.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Этот адрес электронной почты уже зарегистрирован.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Для завершения внешней аутентификации требуется адрес электронной почты.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Запрос внешней аутентификации недействителен.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Состояние внешней аутентификации недействительно или истекло.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Код внешней аутентификации недействителен или истек.",
+    "WinoAccount_Error_AiPackRequired": "Требуется активная подписка на Wino AI Pack для выполнения этого действия.",
+    "WinoAccount_Error_AiQuotaExceeded": "Ваш лимит использования Wino AI Pack достигнут за текущий платежный период.",
+    "WinoAccount_Error_AiHtmlEmpty": "Нет содержимого письма электронной почты для обработки.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Это письмо слишком большое для обработки с помощью Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Этот язык не поддерживается. Попробуйте действительный код культуры, например en-US или tr-TR.",
+    "WinoAccount_Error_Forbidden": "У вас нет разрешения на выполнение этого действия.",
+    "WinoAccount_Error_ValidationFailed": "Запрос недействителен. Пожалуйста, проверьте введенные значения.",
+    "WinoAccount_RegisterSuccessMessage": "Регистрация учетной записи Wino завершена для {0}.",
+    "WinoAccount_LoginSuccessMessage": "Вы вошли в учетную запись Wino как {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Подтвердите адрес электронной почты.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Мы отправили подтверждение на электронную почту {0}. Подтвердите его и попробуйте войти снова.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Необходимо подтверждение электронной почты.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Мы всё ещё ожидаем подтверждения {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Выслать повторно письмо для подтверждения.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Вы можете повторно отправить письмо для подтверждения через {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Вы можете отправить письмо для подтверждения прямо сейчас.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Письмо для подтверждения отправлено повторно.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Мы отправили ещё одно письмо для подтверждения на {0}. Подтвердите его и попробуйте войти снова.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Письмо для сброса пароля отправлено.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Мы отправили письмо для сброса пароля на {0}. Откройте его, чтобы установить новый пароль.",
+    "WinoAccount_ChangePassword_Title": "Изменить пароль",
+    "WinoAccount_ChangePassword_Description": "Отправить письмо для сброса пароля на эту учетную запись Wino.",
+    "WinoAccount_ChangePassword_Action": "Отправить письмо для сброса пароля.",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Вы хотите, чтобы Wino отправил письмо для сброса пароля на {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Вы вышли из учетной записи Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Нет активной учетной записи Wino, из которой можно выйти.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Учетная запись Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Войдите в учетную запись Wino или создайте её, чтобы управлять вашей сессией Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Статус: {0}",
+    "WelcomeWizard_Step2Title": "Добавить учетную запись",
+    "WelcomeWizard_Step3Title": "Завершение настройки",
+    "ProviderSelection_Title": "Выберите поставщика электронной почты",
+    "ProviderSelection_Subtitle": "Выберите ниже поставщика, чтобы добавить вашу учетную запись электронной почты в Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Имя учетной записи",
+    "ProviderSelection_AccountNamePlaceholder": "например, Личное, Рабочее",
+    "ProviderSelection_DisplayNameHeader": "Отображаемое имя",
+    "ProviderSelection_DisplayNamePlaceholder": "например, Иван Иванов",
+    "ProviderSelection_EmailHeader": "Адрес электронной почты",
+    "ProviderSelection_EmailPlaceholder": "например, johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Пароль приложения",
+    "ProviderSelection_AppPasswordHelp": "Как получить пароль приложения?",
+    "ProviderSelection_CalendarModeHeader": "Интеграция календаря",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Отключено",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Нет интеграции календаря",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Синхронизация CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Ваши события календаря синхронизируются с серверами Apple между вашими устройствами.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Ваши события календаря синхронизируются с серверами Yahoo между вашими устройствами.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Локальный календарь",
+    "ProviderSelection_CalendarMode_LocalDescription": "Ваши события хранятся только на вашем компьютере. Соединение с сервером отсутствует.",
+    "ProviderSelection_ClearColor": "Очистить цвет",
+    "ProviderSelection_ContinueButton": "Продолжить",
+    "ProviderSelection_SpecialImap_Subtitle": "Введите данные учетной записи, чтобы подключиться.",
+    "AccountSetup_Title": "Настройка вашей учетной записи",
+    "AccountSetup_Step_Authenticating": "Аутентификация с {0}",
+    "AccountSetup_Step_TestingMailAuth": "Тестирование аутентификации почты",
+    "AccountSetup_Step_SyncingFolders": "Синхронизация метаданных папок",
+    "AccountSetup_Step_FetchingProfile": "Получение информации о профиле",
+    "AccountSetup_Step_DiscoveringCalDav": "Обнаружение настроек CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Тестирование аутентификации календаря",
+    "AccountSetup_Step_SavingAccount": "Сохранение информации об учетной записи",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Получение метаданных календаря",
+    "AccountSetup_Step_SyncingAliases": "Синхронизация алиасов",
+    "AccountSetup_Step_Finalizing": "Завершение настройки",
+    "AccountSetup_FailureMessage": "Не удалось настроить. Вернитесь назад, чтобы исправить настройки, или попробуйте позже.",
+    "AccountSetup_SuccessMessage": "Ваша учетная запись успешно настроена!",
+    "AccountSetup_GoBackButton": "Назад",
+    "AccountSetup_TryAgainButton": "Попробовать ещё раз",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Не удалось автоматически обнаружить настройки. Пожалуйста, введите настройки вручную во вкладке Расширенные."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/sk_SK/resources.json b/Wino.Core.Domain/Translations/sk_SK/resources.json
index c3b5bc54..917ed1ec 100644
--- a/Wino.Core.Domain/Translations/sk_SK/resources.json
+++ b/Wino.Core.Domain/Translations/sk_SK/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Tento účet si vyžaduje znova úplnú synchronizáciu, aby mohol ďalej fungovať. Počkajte, prosím, kým Wino znovu zosynchronizuje vaše správy…",
     "AccountContactNameYou": "Vy",
     "AccountCreationDialog_Completed": "hotovo",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Načítavam údaje o kalendári.",
     "AccountCreationDialog_FetchingEvents": "Načítavajú sa udalosti kalendára.",
     "AccountCreationDialog_FetchingProfileInformation": "Načítavajú sa podrobnosti o profile.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Ak sa prehliadač nespustil automaticky a nedokončil overovanie:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "inicializácia",
     "AccountCreationDialog_PreparingFolders": "Práve získavame informácie o priečinkoch.",
     "AccountCreationDialog_SigninIn": "Informácie o účte sa ukladajú.",
+    "Purchased": "Zakúpené",
     "AccountEditDialog_Message": "Názov účtu",
     "AccountEditDialog_Title": "Upraviť účet",
     "AccountPickerDialog_Title": "Vyberte účet",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Zmena názvu účtu vo Wino a nastavenie požadovaného názvu odosielateľa.",
     "AccountDetailsPage_ColorPicker_Title": "Farba účtu",
     "AccountDetailsPage_ColorPicker_Description": "Priradenie farby novému účtu na zafarbenie jeho symbolu v zozname.",
+    "AccountDetailsPage_TabGeneral": "Všeobecné",
+    "AccountDetailsPage_TabMail": "Pošta",
+    "AccountDetailsPage_TabCalendar": "Kalendár",
+    "AccountDetailsPage_CalendarListDescription": "Vyberte kalendár na konfiguráciu jeho nastavení.",
     "AddHyperlink": "Pridať",
     "AppCloseBackgroundSynchronizationWarningTitle": "Synchronizácia na pozadí",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Aplikácia sa nebude spúšťať pri spustení systému Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Účet IMAP",
     "Busy": "Zaneprázdnený",
     "Buttons_AddAccount": "Pridať účet",
+    "Buttons_FixAccount": "Opraviť účet",
     "Buttons_AddNewAlias": "Pridať nový alias",
     "Buttons_Allow": "Zapnúť",
+    "Buttons_Apply": "Použiť",
     "Buttons_ApplyTheme": "Použiť motív",
     "Buttons_Browse": "Prehľadávať",
     "Buttons_Cancel": "Zrušiť",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Upraviť",
     "Buttons_EnableImageRendering": "Zapnúť",
     "Buttons_Multiselect": "Vybrať viac",
+    "Buttons_Manage": "Spravovať",
     "Buttons_No": "Nie",
     "Buttons_Open": "Otvoriť",
     "Buttons_Purchase": "Kúpiť",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Uložiť",
     "Buttons_SaveConfiguration": "Uložiť konfiguráciu",
     "Buttons_Send": "Odoslať",
+    "Buttons_SendToServer": "Odoslať na server",
     "Buttons_Share": "Zdielať",
     "Buttons_SignIn": "Prihlásiť sa",
     "Buttons_Sync": "Synchronizovať",
     "Buttons_SyncAliases": "Synchronizovať aliasy",
     "Buttons_TryAgain": "Skúsiť znova",
     "Buttons_Yes": "Áno",
+    "Sync_SynchronizingFolder": "Synchronizujem {0} {1}%",
+    "Sync_DownloadedMessages": "Stiahnuté {0} správ zo {1}",
+    "SyncAction_Archiving": "Archivujem {0} e-mailov",
+    "SyncAction_ClearingFlag": "Odznačujem {0} e-mailov",
+    "SyncAction_CreatingDraft": "Vytváram návrh",
+    "SyncAction_CreatingEvent": "Vytváram udalosť",
+    "SyncAction_Deleting": "Odstraňujem {0} e-mailov",
+    "SyncAction_EmptyingFolder": "Vyprázdňujem priečinok",
+    "SyncAction_MarkingAsRead": "Označujem {0} e-mailov ako prečítané",
+    "SyncAction_MarkingAsUnread": "Označujem {0} e-mailov ako neprečítané",
+    "SyncAction_MarkingFolderAsRead": "Označujem priečinok ako prečítaný",
+    "SyncAction_Moving": "Presúvam {0} e-mailov",
+    "SyncAction_MovingToFocused": "Presúvam {0} e-mailov do priečinka Focused",
+    "SyncAction_RenamingFolder": "Premenúvam názov priečinka",
+    "SyncAction_SendingMail": "Odosielam e-mail",
+    "SyncAction_SettingFlag": "Značím {0} e-mailov ako dôležité",
+    "SyncAction_SynchronizingAccount": "Synchronizujem {0}",
+    "SyncAction_SynchronizingAccounts": "Synchronizujem {0} účet(ov)",
+    "SyncAction_SynchronizingCalendarData": "Synchronizujem údaje kalendára",
+    "SyncAction_SynchronizingCalendarEvents": "Synchronizujem udalosti kalendára",
+    "SyncAction_SynchronizingCalendarMetadata": "Synchronizujem metadáta kalendára",
+    "SyncAction_Unarchiving": "Rozbaľujem {0} e-mailov",
     "CalendarAllDayEventSummary": "celodenné udalosti",
     "CalendarDisplayOptions_Color": "Farba",
     "CalendarDisplayOptions_Expand": "Rozšíriť",
+    "CalendarEventResponse_Accept": "Prijať",
+    "CalendarEventResponse_AcceptedResponse": "Prijaté",
+    "CalendarEventResponse_Decline": "Odmietnuť",
+    "CalendarEventResponse_DeclinedResponse": "Odmietnuté",
+    "CalendarEventResponse_NotResponded": "Neodpovedané",
+    "CalendarEventResponse_Tentative": "Predbežné",
+    "CalendarEventResponse_TentativeResponse": "Predbežná odpoveď",
+    "CalendarEventRsvpPanel_Accept": "Prijať",
+    "CalendarEventRsvpPanel_AddMessage": "Pridajte správu k vašej odpovedi... (nepovinné)",
+    "CalendarEventRsvpPanel_Decline": "Odmietnuť",
+    "CalendarEventRsvpPanel_Message": "Správa",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Odošlite odpovednú správu",
+    "CalendarEventRsvpPanel_Tentative": "Predbežné",
+    "CalendarEventRsvpPanel_Title": "Možnosti odpovede",
+    "CalendarAttendeeStatus_Accepted": "Prijaté",
+    "CalendarAttendeeStatus_Declined": "Odmietnuté",
+    "CalendarAttendeeStatus_NeedsAction": "Vyžaduje akciu",
+    "CalendarAttendeeStatus_Tentative": "Predbežné",
+    "CalendarEventDetails_Attachments": "Prílohy",
+    "CalendarEventCompose_AddAttachment": "Pridať prílohu",
+    "CalendarEventCompose_AllDay": "Celý deň",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Prílohy nie sú podporované pre kalendáre CalDAV.",
+    "CalendarEventCompose_EndDate": "Dátum konca",
+    "CalendarEventCompose_EndTime": "Čas konca",
+    "CalendarEventCompose_Every": "každý",
+    "CalendarEventCompose_ForWeekdays": "pre",
+    "CalendarEventCompose_FrequencyDay": "deň",
+    "CalendarEventCompose_FrequencyDayPlural": "dni",
+    "CalendarEventCompose_FrequencyMonth": "mesiac",
+    "CalendarEventCompose_FrequencyMonthPlural": "mesiace",
+    "CalendarEventCompose_FrequencyWeek": "týždeň",
+    "CalendarEventCompose_FrequencyWeekPlural": "týždne",
+    "CalendarEventCompose_FrequencyYear": "rok",
+    "CalendarEventCompose_FrequencyYearPlural": "roky",
+    "CalendarEventCompose_Location": "Miesto",
+    "CalendarEventCompose_LocationPlaceholder": "Pridajte miesto",
+    "CalendarEventCompose_NewEventButton": "Nová udalosť",
+    "CalendarEventCompose_DefaultCalendarHint": "V nastaveniach kalendára môžete vybrať predvolený kalendár pre nové udalosti.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Otvoriť nastavenia Kalendára",
+    "CalendarEventCompose_NoCalendarsMessage": "Pre vytváranie udalostí zatiaľ nie sú k dispozícii žiadne kalendáre.",
+    "CalendarEventCompose_NoCalendarsTitle": "Nie sú k dispozícii žiadne kalendáre",
+    "CalendarEventCompose_NoEndDate": "Bez koncového dátumu",
+    "CalendarEventCompose_Notes": "Poznámky",
+    "CalendarEventCompose_PickCalendarTitle": "Vyberte kalendár",
+    "CalendarEventCompose_Recurring": "Opakujúce sa",
+    "CalendarEventCompose_RecurringSummary": "Vyskytuje sa každých {0} {1}{2} {3} platných {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Vyskytuje sa {0}{1} {2} platné {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Opakovať každých",
+    "CalendarEventCompose_SelectCalendar": "Vybrať kalendár",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Vyskytuje sa {0} {1}",
+    "CalendarEventCompose_StartDate": "Dátum začiatku",
+    "CalendarEventCompose_StartTime": "Čas začiatku",
+    "CalendarEventCompose_TimeRangeSummary": "od {0} do {1}",
+    "CalendarEventCompose_Title": "Názov udalosti",
+    "CalendarEventCompose_TitlePlaceholder": "Pridajte názov",
+    "CalendarEventCompose_Until": "až do",
+    "CalendarEventCompose_UntilSummary": " až {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Dátum konca pre celodennú udalosť musí byť po dátume začiatku.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Jeden alebo viac účastníkov má neplatnú e-mailovú adresu.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Dátum ukončenia opakovania musí byť rovný alebo neskorší ako dátum začiatku udalosti.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Čas konca musí byť neskorší ako čas začiatku.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Jeden alebo viac príloh už nie je k dispozícii: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Vyberte kalendár pred vytvorením udalosti.",
+    "CalendarEventCompose_ValidationMissingTitle": "Zadajte názov udalosti pred vytvorením udalosti.",
+    "CalendarEventCompose_ValidationTitle": "Overenie udalosti zlyhalo",
+    "CalendarEventCompose_WeekdaySummary": " v {0}",
+    "CalendarEventCompose_Weekday_Friday": "Piatok",
+    "CalendarEventCompose_Weekday_Monday": "Pondelok",
+    "CalendarEventCompose_Weekday_Saturday": "Sobota",
+    "CalendarEventCompose_Weekday_Sunday": "Nedeľa",
+    "CalendarEventCompose_Weekday_Thursday": "Štvrtok",
+    "CalendarEventCompose_Weekday_Tuesday": "Utorok",
+    "CalendarEventCompose_Weekday_Wednesday": "Streda",
+    "CalendarEventDetails_Details": "Podrobnosti",
+    "CalendarEventDetails_EditSeries": "Upraviť sériu",
+    "CalendarEventDetails_Editing": "Úpravy",
+    "CalendarEventDetails_InviteSomeone": "Pozvať niekoho",
+    "CalendarEventDetails_JoinOnline": "Pripojiť sa online",
+    "CalendarEventDetails_Organizer": "Organizátor",
+    "CalendarEventDetails_People": "Ľudia",
+    "CalendarEventDetails_ReadOnlyEvent": "Udalosť iba na čítanie",
+    "CalendarEventDetails_Reminder": "Pripomienka",
+    "CalendarReminder_StartedHoursAgo": "Začalo pred {0} hodinami",
+    "CalendarReminder_StartedMinutesAgo": "Začalo pred {0} minútami",
+    "CalendarReminder_StartedNow": "Začalo práve teraz",
+    "CalendarReminder_StartingNow": "Začíname teraz",
+    "CalendarReminder_StartsInHours": "Začína sa za {0} hodín",
+    "CalendarReminder_StartsInMinutes": "Začína sa za {0} minút",
+    "CalendarReminder_SnoozeAction": "Odložiť",
+    "CalendarReminder_SnoozeMinutesOption": "{0} minút",
+    "CalendarEventDetails_ShowAs": "Zobraziť ako",
+    "CalendarShowAs_Free": "Voľný",
+    "CalendarShowAs_Tentative": "Predpokladaný",
+    "CalendarShowAs_Busy": "Zaneprázdnený",
+    "CalendarShowAs_OutOfOffice": "Mimo kancelárie",
+    "CalendarShowAs_WorkingElsewhere": "Pracuje inde",
     "CalendarItem_DetailsPopup_JoinOnline": "Pripojiť online",
     "CalendarItem_DetailsPopup_ViewEventButton": "Zobraziť udalosť",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Zobraziť sériu",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} skopírované do schránky.",
     "ClipboardTextCopied_Title": "Skopírované",
     "ClipboardTextCopyFailed_Message": "{0} sa nepodarilo skopírovať do schránky.",
+    "ContactInfoBar_ErrorTitle": "Nepodarilo sa načítať kontaktné informácie",
+    "ContactInfoBar_SuccessTitle": "Kontaktné informácie načítané",
+    "ContactInfoBar_WarningTitle": "Kontaktné informácie môžu byť neúplné",
     "ComingSoon": "Už čoskoro…",
     "ComposerAttachmentsDragDropAttach_Message": "Priložiť",
     "ComposerAttachmentsDropZone_Message": "Sem presuňte súbory",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Názov prepojeného účtu",
     "DialogMessage_DeleteAccountConfirmationMessage": "Odstrániť {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Všetky údaje spojené s týmto účtom budú z disku natrvalo odstránené.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Odstrániť šablónu \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Odstrániť e-mailovú šablónu",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Týmto sa odstránia všetky udalosti zo série. Chcete pokračovať?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Odstrániť opakovanú sériu",
     "DialogMessage_DiscardDraftConfirmationMessage": "Tento koncept sa zahodí. Chcete pokračovať?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Zrušiť koncept",
     "DialogMessage_EmptySubjectConfirmation": "Chýbajúci predmet",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Svetlý režim",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Nepodarilo sa nastaviť systémové priečinky",
+    "Exception_AccountNeedsAttention_Title": "Účet si vyžaduje pozornosť",
+    "Exception_AccountNeedsAttention_Message": "'{0}' vyžaduje vašu pozornosť, aby ste mohli pokračovať v práci.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail nenašiel runtime Microsoft Edge WebView2. Nainštalujte alebo opravte runtime, aby sa obsah správne zobrazoval.",
+    "Exception_WebView2RuntimeMissing_Title": "Vyžaduje sa runtime WebView2",
     "Exception_AuthenticationCanceled": "Overenie bolo zrušené",
     "Exception_CustomThemeExists": "Tento motív už existuje.",
     "Exception_CustomThemeMissingName": "Musíte zadať názov.",
     "Exception_CustomThemeMissingWallpaper": "Musíte zadať vlastný obrázok pozadia.",
     "Exception_FailedToSynchronizeAliases": "Nepodarilo sa synchronizovať aliasy",
+    "Exception_FailedToSynchronizeCalendarData": "Nepodarilo sa synchronizovať údaje kalendára",
+    "Exception_FailedToSynchronizeCalendarEvents": "Nepodarilo sa synchronizovať udalosti kalendára",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Nepodarilo sa synchronizovať podrobnosti kalendára",
     "Exception_FailedToSynchronizeFolders": "Nepodarilo sa synchronizovať priečinky",
     "Exception_FailedToSynchronizeProfileInformation": "Nepodarilo sa synchronizovať informácie o profile",
     "Exception_GoogleAuthCallbackNull": "Callback URL je pri aktivácii null.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Presunúť do Nevyžiadaná pošta",
     "HoverActionOption_ToggleFlag": "Označiť/Zrušiť označenie",
     "HoverActionOption_ToggleRead": "Prečítané/Neprečítané",
+    "KeyboardShortcuts_FailedToReset": "Nepodarilo sa resetovať klávesové skratky.",
+    "KeyboardShortcuts_FailedToUpdate": "Nepodarilo sa aktualizovať klávesové skratky.",
+    "KeyboardShortcuts_MailoperationAction": "Akcia",
+    "KeyboardShortcuts_Action": "Akcia",
+    "KeyboardShortcuts_FailedToLoad": "Nepodarilo sa načítať klávesové skratky.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Prosím zadajte klávesu pre skratku.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Prosím zvoľte akciu, ktorú má skratka vykonať.",
+    "KeyboardShortcuts_EnterKey": "Prosím zadajte klávesu pre skratku.",
+    "KeyboardShortcuts_SelectOperation": "Prosím vyberte akciu pre skratku.",
+    "KeyboardShortcuts_ShortcutInUse": "Táto skratka je už použitá inou skratkou.",
+    "KeyboardShortcuts_FailedToSave": "Nepodarilo sa uložiť skratku.",
+    "KeyboardShortcuts_FailedToDelete": "Nepodarilo sa odstrániť skratku.",
+    "KeyboardShortcuts_PageDescription": "Nastavte klávesové skratky pre rýchle operácie s poštou. Stlačte klávesy, keď je zamerané pole pre zadanie kláves, aby sa skratky zachytili.",
+    "KeyboardShortcuts_Add": "Pridať skratku",
+    "KeyboardShortcuts_EditTitle": "Upraviť klávesovú skratku",
+    "KeyboardShortcuts_ResetToDefaults": "Obnoviť predvolený stav",
+    "KeyboardShortcuts_PressKeysHere": "Stlačte sem klávesy...",
+    "KeyboardShortcuts_KeyCombination": "Klávesová kombinácia",
+    "KeyboardShortcuts_FocusArea": "Zamerajte vyššie uvedené pole a stlačte požadovanú kombináciu kláves",
+    "KeyboardShortcuts_Modifiers": "Modifikačné klávesy",
+    "KeyboardShortcuts_Mode": "Mód aplikácie",
+    "KeyboardShortcuts_ModeMail": "E-mail",
+    "KeyboardShortcuts_ModeCalendar": "Kalendár",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Prepnúť prečítané/neprečítané",
+    "KeyboardShortcuts_ActionToggleFlag": "Prepnúť vlajku",
+    "KeyboardShortcuts_ActionToggleArchive": "Prepnúť archivovať/odarchivovať",
     "ImageRenderingDisabled": "Zobrazovanie obrázkov je pre túto správu vypnuté.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Metóda overovania",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Zabezpečenie pripojenia",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Používateľské meno",
     "IMAPSetupDialog_UsernamePlaceholder": "jan.novak, jan.novak@mai.sk, mail.sk/jan.novak",
     "IMAPSetupDialog_UseSameConfig": "Na odosielanie správy použiť rovnaké používateľské meno a heslo",
+    "ImapCalDavSettingsPage_TitleCreate": "Nastavenie IMAP a Kalendára",
+    "ImapCalDavSettingsPage_TitleEdit": "Upraviť nastavenia IMAP a Kalendára",
+    "ImapCalDavSettingsPage_Subtitle": "Nastavte IMAP/SMTP a voliteľnú synchronizáciu kalendára pre tento účet.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Základné nastavenie",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Zadajte svoju identitu a poverenia. Wino sa môže pokúsiť automaticky zistiť nastavenia servera.",
+    "ImapCalDavSettingsPage_BasicTab": "Základné",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Povoliť podporu kalendára",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Automatické zistenie nastavenia pošty",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Nastavenia pošty zistené a aplikované.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Pokročilé nastavenia",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Zadajte nastavenia servera manuálne, ak automatické zistenie nie je k dispozícii alebo je nesprávne.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Pokročilé",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Nastavenie kalendára",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Vyberte, ako by mali údaje kalendára fungovať pre tento účet IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Režim kalendára",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Zabezpečenie spojenia",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Metóda overenia",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Vypnutý",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV synchronizácia",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Iba miestny kalendár",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Kalendár je pre tento účet zakázaný.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Položky kalendára sú synchronizované so serverom CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Položky kalendára sa ukladajú iba na tomto počítači a nie sú synchronizované cez sieť.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Ako funguje miestny kalendár",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Iba miestny kalendár",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Miestny kalendár uchováva všetky udalosti iba na vašom počítači. Žiadna synchronizácia s iCloud, Yahoo ani s iným poskytovateľom.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL služby CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Prihlasovacie meno CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV heslo",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Test CalDAV sa vyžaduje iba vtedy, keď je režim kalendára nastavený na synchronizáciu CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "URL služby CalDAV je povinný.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL služby CalDAV musí byť absolútny URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV prihlasovacie meno je povinné.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV heslo je povinné.",
+    "ImapCalDavSettingsPage_TestImapButton": "Otestovať pripojenie k IMAP",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Otestovať pripojenie k CalDAV",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Test pripojenia IMAP bol úspešný.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Test pripojenia CalDAV bol úspešný.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Nastavenia účtu boli overené a uložené.",
+    "ImapCalDavSettingsPage_ICloudHint": "Použite heslo špecifické pre aplikáciu vygenerované v nastaveniach vášho účtu Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Použite heslo pre aplikáciu zo zabezpečenia svojho účtu Yahoo.",
     "Info_AccountCreatedMessage": "Vytvorený účet {0}",
     "Info_AccountCreatedTitle": "Vytvorenie účtu",
     "Info_AccountCreationFailedTitle": "Vytvorenie účtu zlyhalo",
     "Info_AccountDeletedMessage": "Účet {0} bol úspešne odstránený.",
     "Info_AccountDeletedTitle": "Účet bol odstránený",
     "Info_AccountIssueFixFailedTitle": "Oprava zlyhala",
+    "Info_AccountIssueFixImapMessage": "Otvorte stránku nastavenia IMAP a kalendára a zadajte znovu prihlasovacie údaje servera.",
+    "Info_AccountAttentionRequiredMessage": "Tento účet vyžaduje vašu pozornosť.",
+    "Info_AccountAttentionRequiredClickableMessage": "Kliknite pre opravu tohto účtu a jeho opätovnú synchronizáciu.",
+    "Info_AccountAttentionRequiredAction": "Opraviť",
+    "Info_AccountAttentionRequiredActionHint": "Kliknite na Opraviť, aby sa vyriešil problém s týmto účtom.",
     "Info_AccountIssueFixSuccessMessage": "Boli opravené všetky problémy s účtom.",
     "Info_AccountIssueFixSuccessTitle": "Úspešné",
     "Info_AttachmentOpenFailedMessage": "Túto prílohu sa nepodarilo otvoriť.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Synchronizácia tohto priečinka je zakázaná.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Nesynchronizovaný priečinok",
     "Justify": "Do bloku",
+    "MenuUpdateAvailable": "Dostupná aktualizácia",
     "Left": "Doľava",
     "Link": "Prepojiť",
     "LinkedAccountsCreatePolicyMessage": "na vytvorenie prepojenia musíte mať aspoň 2 účty\nprepojenie bude po uložení odstránené",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Obnoviť z archívu",
     "MailOperation_ViewMessageSource": "Zobraziť zdroj správy",
     "MailOperation_Zoom": "Priblížiť",
+    "MailsDragging": "Presúvam {0} položku(y)",
     "MailsSelected": "Označené položky: {0}",
     "MarkFlagUnflag": "Označiť ako označené/neoznačené",
     "MarkReadUnread": "Označiť ako prečítané/neprečítané",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Nová pošta",
     "Notifications_WinoUpdatedMessage": "Pozrite si novú verziu {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail bol aktualizovaný.",
+    "Notifications_StoreUpdateAvailableTitle": "Dostupná aktualizácia",
+    "Notifications_StoreUpdateAvailableMessage": "Novšia verzia aplikácie Wino Mail je pripravená na inštaláciu cez Microsoft Store.",
     "OnlineSearchFailed_Message": "Nepodarilo sa vyhľadať\n{0}\n\nZoznam správ offline.",
     "OnlineSearchTry_Line1": "Nenašli ste, čo ste hľadali?",
     "OnlineSearchTry_Line2": "Vyskúšajte online vyhľadávanie.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Malé",
     "Photos": "Fotografie",
     "PreparingFoldersMessage": "Príprava priečinkov",
-    "ProtocolLogAvailable_Message": "Logy protokolu sú pripravené na diagnostiku.",
     "ProviderDetail_Gmail_Description": "Účet Google",
     "ProviderDetail_iCloud_Description": "Účet Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Hľadať",
     "SearchingIn": "Vyhľadávanie v",
     "SearchPivotName": "Výsledky",
+    "Settings_KeyboardShortcuts_Title": "Klávesové skratky",
+    "Settings_KeyboardShortcuts_Description": "Spravujte klávesové skratky pre rýchle akcie na e-mailoch.",
     "SettingConfigureSpecialFolders_Button": "Konfigurovať",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Konfigurácia IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Zmena nastavenia prichádzajúceho/odchádzajúceho servera.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Nastavenia IMAP a kalendára",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Otvorte vyhradenú stránku nastavenia IMAP, SMTP a CalDAV pre tento účet.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Otvoriť nastavenia",
     "SettingsAbout_Description": "Ďalšie informácie o Wino.",
     "SettingsAbout_Title": "O aplikácii",
     "SettingsAboutGithub_Description": "Prejsť na systém sledovania chýb repozitára na Githube.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Lokálne",
     "SettingsAppPreferences_SearchMode_Online": "Online",
     "SettingsAppPreferences_SearchMode_Title": "Predvolený režim vyhľadávania",
+    "SettingsAppPreferences_ApplicationMode_Title": "Predvolený režim aplikácie",
+    "SettingsAppPreferences_ApplicationMode_Description": "Vyberte režim, v ktorom sa Wino otvorí, ak nie je explicitne určený žiadny typ aktivácie.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Pošta",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Kalendár",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Aplikácia Wino Mail bude naďalej bežať na pozadí. Budete upozornení na príchod novej pošty.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "​​Spustiť na pozadí",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Aplikácia Wino Mail zostane spustená na paneli úloh. Spustí sa kliknutím na ikonu. Budete upozornení na príchod novej pošty.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Pri zmene režimu spustenia pre Wino Mail sa vyskytla závažná chyba.",
     "SettingsAppPreferences_StartupBehavior_Title": "Spustiť minimalizované pri spustení Windowsu",
     "SettingsAppPreferences_Title": "Predvoľby aplikácie",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Skryť tlačidlo účtu Wino v titulnom riadku.",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Skryť tlačidlo profilu v titulnom riadku, ktoré otvára vysúvací panel účtu Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Oznámenia o aktualizáciách obchodu",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Zobraziť upozornenia a akcie na päte stránky, keď je k dispozícii aktualizácia z obchodu Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "AI akcie",
+    "SettingsAppPreferences_AiActions_Description": "Vyberte predvolené jazyky AI a miesto, kam sa majú ukladať súhrny.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Predvolený jazyk pre preklad",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Vyberte predvolený cieľový jazyk používaný akciami prekladu AI.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Jazyk zhrnutia",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Zvoľte preferovaný jazyk pre budúce výstupy AI zhrnutia.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Predvolená cesta na uloženie súhrnov",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Vyberte priečinok, ktorý by Wino mal používať ako predvolený pri ukladaní AI súhrnov.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Použiť predvolenú polohu ukladania v systéme.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Tento priečinok neexistuje. Predvolená poloha uloženia bude použitá pre súhrny.",
     "SettingsAutoSelectNextItem_Description": "Po odstránení alebo presunutí pošty vybrať ďalšiu položku.",
     "SettingsAutoSelectNextItem_Title": "Automaticky vybrať ďalšiu položku",
     "SettingsAvailableThemes_Description": "Vyberte motív z vlastnej kolekcie Wino podľa svojho vkusu alebo použite vlastné motívy.",
     "SettingsAvailableThemes_Title": "Dostupné motívy",
     "SettingsCalendarSettings_Description": "Zmena prvého dňa v týždni, výška bunky hodiny a ďalšie…",
     "SettingsCalendarSettings_Title": "Nastavenia kalendára",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Predvolená dĺžka odloženia pripomienky",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Nastavte predvolenú dĺžku odloženia pre upozornenia pripomienok kalendára.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Formát hlavičky dňa v časovom zobrazení",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Vyberte, ako sa horné štítky dní zobrazujú v zobrazeniach deň, týždeň a pracovný týždeň. Použite tokeny formátu dátumu ako ddd, dd, MMM alebo dddd.",
     "SettingsComposer_Title": "Editor",
     "SettingsComposerFont_Title": "Predvolené písmo editora",
     "SettingsComposerFontFamily_Description": "Zmena predvolenej rodiny písma a veľkosť písma pri písaní správ.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Kanál Discord",
     "SettingsEditLinkedInbox_Description": "Pridať/odstrániť účty, premenovať alebo zrušiť prepojenie medzi účtami.",
     "SettingsEditLinkedInbox_Title": "Upraviť prepojenie priečinka doručenej pošty",
+    "SettingsWindowBackdrop_Title": "Pozadie okna",
+    "SettingsWindowBackdrop_Description": "Vyberte efekt pozadia pre okná Wino.",
+    "SettingsWindowBackdrop_Disabled": "Výber pozadia okna je zakázaný, keď sa zvolí iný motív aplikácie ako Predvolený.",
     "SettingsElementTheme_Description": "Vyberte Windows motív pre Wino",
     "SettingsElementTheme_Title": "Motív prvku",
     "SettingsElementThemeSelectionDisabled": "Výber motívu prvku je zakázaný, ak je vybraný iný motív aplikácie ako predvolený.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Aliasy",
     "SettingsEditAccountDetails_Title": "Úprava podrobností o účte",
     "SettingsEditAccountDetails_Description": "Zmeňte názov účtu, meno odosielateľa a priraďte novú farbu, ak chcete.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Zmeny uložené.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Údaje o účte boli úspešne aktualizované.",
     "SettingsManageLink_Description": "Presunutím položiek môžete pridať nové prepojenie alebo odstrániť existujúce prepojenie.",
     "SettingsManageLink_Title": "Správa prepojení",
     "SettingsMarkAsRead_Description": "Zmena toho, čo sa má stať s vybranou položkou.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Oznámenia",
     "SettingsNotificationsAndTaskbar_Description": "Zmena zobrazenia oznámení a odznaku na paneli úloh pre tento účet.",
     "SettingsNotificationsAndTaskbar_Title": "Oznámenia a panel úloh",
+    "SettingsHome_Title": "Domov",
+    "SettingsHome_SearchTitle": "Nájsť nastavenie",
+    "SettingsHome_SearchDescription": "Hľadajte podľa funkcie, témy alebo kľúčového slova a rýchlo sa dostanete na správnu stránku nastavení.",
+    "SettingsHome_SearchPlaceholder": "Hľadať nastavenia",
+    "SettingsHome_SearchExamples": "Skúste: téma, úložisko, jazyk, podpis",
+    "SettingsHome_QuickLinks_Title": "Rýchle odkazy",
+    "SettingsHome_QuickLinks_Description": "Prejdite na nastavenia, ku ktorým majú používatelia najčastejší prístup.",
+    "SettingsHome_StorageCard_Description": "Zistite, koľko lokálneho MIME obsahu Wino uchováva na tomto zariadení a podľa potreby ho vymažte.",
+    "SettingsHome_StorageEmptySummary": "Žiadny cache MIME obsahu zatiaľ nebol zistený.",
+    "SettingsHome_StorageLoading": "Prebieha kontrola lokálneho MIME obsahu...",
+    "SettingsHome_Tips_Title": "Tipy a triky",
+    "SettingsHome_Tips_Description": "Niekoľko malých zmien môže spraviť Wino oveľa osobnejším.",
+    "SettingsHome_Tip_Theme": "Chcete tmavý režim alebo zmeny farieb? Otvorte Personalizáciu.",
+    "SettingsHome_Tip_Background": "Použite nastavenia aplikácie na riadenie spúšťania a synchronizácie na pozadí.",
+    "SettingsHome_Tip_Shortcuts": "Klávesové skratky vám pomáhajú rýchlejšie prechádzať po pošte.",
+    "SettingsHome_Resources_Title": "Užitočné odkazy",
+    "SettingsHome_Resources_Description": "Otvorte zdroje projektu, informácie o podpore a kanály vydania.",
     "SettingsOptions_Title": "Nastavenia",
+    "SettingsOptions_GeneralSection": "Všeobecné",
+    "SettingsOptions_MailSection": "Pošta",
+    "SettingsOptions_CalendarSection": "Kalendár",
+    "SettingsOptions_MoreComingSoon": "Ďalšie možnosti čoskoro",
+    "SettingsOptions_HeroDescription": "Prispôsobte si skúsenosť s Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} účtov nakonfigurovaných",
+    "SettingsSearch_ManageAccounts_Keywords": "účet;účty;poštová schránka;poštové schránky;alias;aliasy;profil;adresa;adresy",
+    "SettingsSearch_AppPreferences_Keywords": "štartovanie;pozadie;spustenie;synchronizácia;upozornenia;upozornenia;vyhľadávanie;panel;predvolené",
+    "SettingsSearch_LanguageTime_Keywords": "jazyk;čas;hodiny;lokalita;región;formát;24 hodín;24h",
+    "SettingsSearch_Personalization_Keywords": "téma;tmavý;svetlý;vzhľad;akcent;farba;farba;režim;rozloženie;hustota",
+    "SettingsSearch_About_Keywords": "o;verzia;webstránka;súkromie;github;prispieť;obchod;podpora",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "skratka;skratky;klávesová skratka;klávesové skratky;klávesy",
+    "SettingsSearch_MessageList_Keywords": "správa;správy;zoznam;vlákno;vlákna;avatar;náhľad;odosielateľ",
+    "SettingsSearch_ReadComposePane_Keywords": "čitateľ;skladanie;editor;písmo;písma;externý obsah;zobrazenie;čítanie",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "podpis;podpisy;šifrovanie;certifikát;certifikáty;smime;smime;bezpečnosť",
+    "SettingsSearch_Storage_Keywords": "úložisko;cache;kešovanie;mime;disk;miesto;čistenie;vyčistiť;lokálne dáta",
+    "SettingsSearch_CalendarSettings_Keywords": "kalendár;týždeň;hodiny;harmonogram;udalosti",
     "SettingsPaneLengthReset_Description": "Ak máte problém so zoznamom správ, obnovte ho na predvolenú veľkosť.",
     "SettingsPaneLengthReset_Title": "Obnoviť veľkosť zoznamu správ",
     "SettingsPaypal_Description": "Prejavte oveľa viac lásky ❤️ Všetky dary sú vítané.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Zobraziť 24-hodinový formát času",
     "SettingsPrivacyPolicy_Description": "Prečítajte si Ochranu osobných údajov.",
     "SettingsPrivacyPolicy_Title": "Ochrany osobných údajov",
+    "SettingsWebsite_Description": "Otvorte webovú stránku Wino Mail.",
+    "SettingsWebsite_Title": "Webstránka",
     "SettingsReadComposePane_Description": "Písmo, externý obsah.",
     "SettingsReadComposePane_Title": "Prehliadač a editor",
     "SettingsReader_Title": "Prehliadač",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Zobraziť náhľad textu",
     "SettingsShowSenderPictures_Description": "Skryť/zobraziť miniatúry obrázkov odosielateľa.",
     "SettingsShowSenderPictures_Title": "Zobraziť avatary odosielateľa",
+    "SettingsEmailTemplates_Title": "Šablóny e-mailov",
+    "SettingsEmailTemplates_Description": "Spravujte šablóny e-mailov.",
+    "SettingsEmailTemplates_CreatePageTitle": "Nová šablóna",
+    "SettingsEmailTemplates_EditPageTitle": "Upraviť šablónu",
+    "SettingsEmailTemplates_NewTemplateTitle": "Nová šablóna",
+    "SettingsEmailTemplates_NewTemplateDescription": "Vytvorte novú šablónu e-mailu.",
+    "SettingsEmailTemplates_NameTitle": "Názov",
+    "SettingsEmailTemplates_NamePlaceholder": "Názov šablóny",
+    "SettingsEmailTemplates_DescriptionTitle": "Popis",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Voliteľný popis",
+    "SettingsEmailTemplates_ContentTitle": "Obsah šablóny",
+    "SettingsEmailTemplates_ContentDescription": "Upravte HTML obsah pre túto šablónu.",
+    "SettingsEmailTemplates_NameRequired": "Názov šablóny je povinný.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Účet po spustení",
     "SettingsStore_Description": "Ukážte trochu lásky ❤️",
     "SettingsStore_Title": "Hodnotenie v Microsoft Store",
+    "SettingsStorage_Title": "Úložisko",
+    "SettingsStorage_Description": "Skenovať a spravovať MIME cache uloženú vo vašom lokálnom dátovom priečinku.",
+    "SettingsStorage_ScanFolder": "Skenovať lokálny dátový priečinok",
+    "SettingsStorage_NoLocalMimeDataFound": "Neboli nájdené žiadne lokálne MIME dáta.",
+    "SettingsStorage_NoAccountsFound": "Neboli nájdené žiadne účty.",
+    "SettingsStorage_TotalUsage": "Celkové lokálne používanie MIME: {0}",
+    "SettingsStorage_AccountUsageDescription": "Použité {0} v lokálnom MIME cache.",
+    "SettingsStorage_DeleteAll_Title": "Odstrániť všetok MIME obsah",
+    "SettingsStorage_DeleteAll_Description": "Odstrániť celú zložku MIME cache pre tento účet.",
+    "SettingsStorage_DeleteAll_Button": "Odstrániť všetko",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Odstrániť všetok MIME obsah",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Odstrániť všetky lokálne MIME dáta pre {0}?",
+    "SettingsStorage_DeleteAll_Success": "Všetok MIME obsah bol odstránený.",
+    "SettingsStorage_DeleteOld_Title": "Odstrániť starý MIME obsah",
+    "SettingsStorage_DeleteOld_Description": "Odstrániť MIME súbory na základe dátumu vytvorenia správy v lokálnej databáze.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 mesiac",
+    "SettingsStorage_DeleteOld_3Months": "> 3 mesiacov",
+    "SettingsStorage_DeleteOld_6Months": "> 6 mesiacov",
+    "SettingsStorage_DeleteOld_1Year": "> 1 rok",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Odstrániť starý MIME obsah",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Odstrániť lokálne MIME dáta staršie ako {0} pre {1}?",
+    "SettingsStorage_DeleteOld_Success": "Odstránené {0} MIME priečinok(ov) starších ako {1}.",
+    "SettingsStorage_1Month": "1 mesiac",
+    "SettingsStorage_3Months": "3 mesiace",
+    "SettingsStorage_6Months": "6 mesiacov",
+    "SettingsStorage_1Year": "1 rok",
+    "SettingsStorage_Months": "{0} mesiacov",
     "SettingsTaskbarBadge_Description": "Zahrnúť počet neprečítaných správ do ikony na paneli úloh.",
     "SettingsTaskbarBadge_Title": "Odznak na paneli úloh",
     "SettingsThreads_Description": "Usporiadanie správ do konverzácií.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Priečinok Doručená pošta nemôžete priradiť k žiadnemu inému systémovému priečinku.",
     "SystemFolderConfigSetupSuccess_Message": "Systémové priečinky sú úspešne nakonfigurované.",
     "SystemFolderConfigSetupSuccess_Title": "Nastavenie systémových priečinkov",
+    "SystemTrayMenu_ShowWino": "Otvoriť Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Otvoriť Wino Kalendár",
+    "SystemTrayMenu_ExitWino": "Ukončiť",
     "TestingImapConnectionMessage": "Testovanie pripojenia k serveru…",
     "TitleBarServerDisconnectedButton_Description": "Wino je odpojený od siete. Kliknutím na tlačidlo obnoviť pripojenie obnovte pripojenie.",
     "TitleBarServerDisconnectedButton_Title": "žiadne pripojenie",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Navýšiť na neobmedzený počet",
     "WinoUpgradeRemainingAccountsMessage": "Využitie bezplatných účtov: {0}/{1}.",
     "Yesterday": "Včera",
+    "Smime_ImportCertificates_Success": "Certifikáty úspešne importované.",
+    "Smime_ImportCertificates_Error": "Chyba pri importe certifikátov: {0}",
+    "Smime_RemoveCertificates_Confirm": "Naozaj chcete odstrániť certifikáty {0}?",
+    "Smime_RemoveCertificates_Success": "Certifikáty odstránené.",
+    "Smime_ExportCertificates_Success": "Certifikáty exportované.",
+    "Smime_ExportCertificates_Error": "Chyba pri exporte certifikátov.",
+    "Smime_CertificateDetails": "Predmet: {0}\nVydavateľ: {1}\nPlatné od: {2}\nPlatné do: {3}\nOtlačok: {4}",
+    "Smime_CertificatePassword_Title": "Heslo certifikátu je vyžadované",
+    "Smime_CertificatePassword_Placeholder": "Heslo certifikátu pre {0} (nepovinné)",
+    "Smime_Confirm_Title": "Potvrdiť",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Obnoviť",
+    "SettingsSignatureAndEncryption_Title": "Podpis a šifrovanie",
+    "SettingsSignatureAndEncryption_Description": "Spravovať certifikáty S/MIME pre podpisovanie a šifrovanie e-mailov.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Moje certifikáty",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Osobné certifikáty pre podpisovanie a šifrovanie",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Certifikáty príjemcov",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Certifikáty príjemcov na dešifrovanie",
+    "SettingsSignatureAndEncryption_NameColumn": "Názov",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Dátum expirácie",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Otlačok",
+    "Buttons_Remove": "Odstrániť",
+    "Buttons_Export": "Exportovať",
+    "Buttons_Import": "Importovať",
+    "SettingsSignatureAndEncryption_SigningCertificate": "Podpisovací certifikát S/MIME",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "Šifrovací certifikát S/MIME",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Žiadny",
+    "SmimeSignaturesInMessage": "Podpisy v tejto správe:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, platný do {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Informácie o podpisovacom certifikáte S/MIME",
+    "SmimeCertificateInfoTitle": "Informácie o certifikáte S/MIME",
+    "SmimeNoCertificateFileFound": "Nebol nájdený súbor certifikátu",
+    "SmimeSaveCertificate": "Uložiť certifikát...",
+    "SmimeCertificate": "Certifikát S/MIME",
+    "SmimeCertificateSavedTo": "Certifikát uložený do {0}",
+    "SmimeSignedTooltip": "Táto správa je podpísaná certifikátom S/MIME. Kliknite pre viac podrobností",
+    "SmimeEncryptedTooltip": "Táto správa je šifrovaná certifikátom S/MIME.",
+    "SmimeCertificateFileInfo": "Súbor: {0}\nTyp: {1}\nVeľkosť: {2:N0} bajtov",
+    "Composer_LightTheme": "Svetlá téma",
+    "Composer_DarkTheme": "Tmavá téma",
+    "Composer_Outdent": "Znížiť odsadenie",
+    "Composer_Indent": "Odsadiť",
+    "Composer_BulletList": "Zoznam odrážok",
+    "Composer_OrderedList": "Číslovaný zoznam",
+    "Composer_Stroke": "Čiara",
+    "Composer_Bold": "Tučné",
+    "Composer_Italic": "Kurzíva",
+    "Composer_Underline": "Podčiarknuté",
+    "Composer_CcBcc": "Kópia (Cc) a skrytá kópia (Bcc)",
+    "Composer_EnableSmimeSignature": "Povoliť/Zakázať podpis S/MIME",
+    "Composer_EnableSmimeEncryption": "Povoliť/Zakázať šifrovanie S/MIME",
+    "Composer_LocalDraftSyncInfo": "Tento koncept je iba lokálny. Wino sa nepodarilo odoslať na váš poštový server. Kliknite pre opätovné odoslanie na server.",
+    "Composer_CertificateExpires": "Vyprší dňa: ",
+    "Composer_SmimeSignature": "Podpis S/MIME",
+    "Composer_SmimeEncryption": "Šifrovanie S/MIME",
+    "Composer_EmailTemplatesPlaceholder": "Šablóny e-mailov",
+    "Composer_AiSummarize": "Zhrnúť pomocou AI",
+    "Composer_AiSummarizeDescription": "Získajte kľúčové body, akčné úlohy a rozhodnutia z tohto e-mailu.",
+    "Composer_AiTranslate": "Preložiť pomocou AI",
+    "Composer_AiActions": "AI akcie",
+    "Composer_AiRewrite": "Prepísať pomocou AI",
+    "AiActions_CheckingStatus": "Kontrolujem prístup k AI...",
+    "AiActions_SignedOutTitle": "Odomknúť Wino AI balík",
+    "AiActions_SignedOutDescription": "Prekladať, prepisovať a zhrňovať e-maily pomocou AI po prihlásení do svojho účtu Wino a aktivovaní doplnku AI Pack.",
+    "AiActions_NoPackTitle": "AI balík vyžadovaný",
+    "AiActions_NoPackDescription": "Ste prihlásený, ale AI balík ešte nie je aktívny. Kúpte si ho, aby ste mohli používať nástroje Wino AI pre preklad, prepísanie a zhrnutie e-mailov.",
+    "AiActions_UsageSummary": "{0} z {1} kreditov použitých tento mesiac.",
+    "Composer_AiRewritePolite": "Urob to zdvorilé",
+    "Composer_AiRewritePoliteDescription": "Zjemní formuláciu pri zachovaní rovnakého zámeru.",
+    "Composer_AiRewriteAngry": "Urob to agresívne",
+    "Composer_AiRewriteAngryDescription": "Používa ostrejší a konfrontačný tón.",
+    "Composer_AiRewriteHappy": "Urob to veselým",
+    "Composer_AiRewriteHappyDescription": "Pridá viac pozitívny a nadšenejší tón.",
+    "Composer_AiRewriteFormal": "Urob to formálne.",
+    "Composer_AiRewriteFormalDescription": "Znie správu profesionálnejšie a štruktúrovanejšie.",
+    "Composer_AiRewriteFriendly": "Urob to priateľskejším.",
+    "Composer_AiRewriteFriendlyDescription": "Zjemní správu a pridá priateľskejší tón.",
+    "Composer_AiRewriteShorter": "Urob to stručnejšie.",
+    "Composer_AiRewriteShorterDescription": "Zostrí text a odstráni zbytočné detaily.",
+    "Composer_AiRewriteClearer": "Urob to jasnejším.",
+    "Composer_AiRewriteClearerDescription": "Zlepší čitateľnosť a uľahčí pochopenie správy.",
+    "Composer_AiRewriteCustom": "Vlastné",
+    "Composer_AiRewriteCustomDescription": "Popíšte, aký prepis chcete.",
+    "Composer_AiRewriteCustomPlaceholder": "Popíšte, ako chcete správu prepísať.",
+    "Composer_AiRewriteMode": "Prepis tónu",
+    "Composer_AiRewriteApply": "Aplikovať prepis",
+    "Composer_AiTranslateDialogTitle": "Preložiť pomocou AI",
+    "Composer_AiTranslateDialogDescription": "Zadajte cieľový jazyk alebo kultúrny kód, napr. en-US, tr-TR, de-DE alebo fr-FR.",
+    "Composer_AiTranslateApply": "Preložiť",
+    "Composer_AiTranslateLanguage": "Cieľový jazyk",
+    "Composer_AiTranslateCustomPlaceholder": "Zadajte kultúrny kód",
+    "Composer_AiTranslateLanguageEnglish": "Angličtina (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Turečtina (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Nemecký (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Francúzština (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Španielčina (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Taliančina (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "portugalčina (Brazília) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "holandčina (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "poľština (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "ruština (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "japončina (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "kórejčina (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "čínština, zjednodušená (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "arabčina (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "hindčina (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Iné...",
+    "Composer_AiBusyTitle": "AI už pracuje",
+    "Composer_AiBusyMessage": "Prosím, počkajte, kým sa dokončí aktuálna AI akcia.",
+    "Composer_AiSignInRequired": "Prihláste sa do svojho konta Wino, aby ste mohli používať funkcie AI.",
+    "Composer_AiMissingHtml": "Zatiaľ neexistuje žiadny obsah správy na odoslanie do Wino AI.",
+    "Composer_AiQuotaUnavailable": "Výsledok AI bol použitý.",
+    "Composer_AiAppliedMessage": "Výsledok AI bol aplikovaný do editora. Ak chcete vrátiť zmenu, použite Zrušiť.",
+    "Composer_AiSummarizeSuccessTitle": "AI súhrn aplikovaný",
+    "Composer_AiTranslateSuccessTitle": "AI preklad aplikovaný",
+    "Composer_AiRewriteSuccessTitle": "AI prepis aplikovaný",
+    "Composer_AiErrorTitle": "AI akcia zlyhala",
+    "Reader_AiAppliedMessage": "Výsledok AI je pre túto správu teraz zobrazený. Znovu otvorením správy zobrazíte pôvodný obsah.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kontakty",
+    "ContactsPage_AddContact": "Pridať kontakt",
+    "ContactsPage_EditContact": "Upraviť kontakt",
+    "ContactsPage_DeleteContact": "Odstrániť kontakt",
+    "ContactsPage_SearchPlaceholder": "Hľadať kontakty...",
+    "ContactsPage_NoContacts": "Žiadne kontakty na zobrazenie",
+    "ContactsPage_ContactsCount": "{0} kontaktov",
+    "ContactsPage_SelectedContactsCount": "{0} vybratých",
+    "ContactsPage_DeleteSelectedContacts": "Odstrániť vybrané",
+    "ContactEditDialog_Title": "Upraviť kontakt",
+    "ContactEditDialog_PhotoSection": "Fotka",
+    "ContactEditDialog_ChoosePhoto": "Vybrať fotku",
+    "ContactEditDialog_RemovePhoto": "Odstrániť fotku",
+    "ContactEditDialog_NameHeader": "Meno",
+    "ContactEditDialog_NamePlaceholder": "Meno kontaktu",
+    "ContactEditDialog_EmailHeader": "Emailová adresa",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Informácie o kontakte",
+    "ContactEditDialog_RootContactInfo": "Toto je koreňový kontakt spojený s vašimi kontami a nie je možné ho zmazať.",
+    "ContactEditDialog_OverriddenContactInfo": "Tento kontakt bol ručne upravený a počas synchronizácie sa nebude aktualizovať.",
+    "ContactsPage_Subtitle": "Spravujte svoje e-mailové kontakty a ich informácie",
+    "ContactStatus_Account": "Účet",
+    "ContactStatus_Modified": "Upravený",
+    "ContactAction_Edit": "Upraviť kontakt",
+    "ContactAction_ChangePhoto": "Zmeniť foto",
+    "ContactAction_Delete": "Odstrániť kontakt",
+    "ContactAction_Add": "Pridať kontakt",
+    "ContactSelection_Selected": "označené",
+    "ContactSelection_SelectAll": "Vybrať všetko",
+    "ContactSelection_Clear": "Vyčistiť výber",
+    "ContactsPage_EmptyState": "Žiadne kontakty na zobrazenie",
+    "ContactsPage_AddFirstContact": "Pridajte svoj prvý kontakt",
+    "ContactsPage_ContactsCountSuffix": "kontakty",
+    "ContactsPane_NewContact": "Nový kontakt",
+    "ContactsPane_DescriptionTitle": "Spravovať svoje kontakty",
+    "ContactsPane_DescriptionBody": "Vytvárajte kontakty, premenovávajte ich, aktualizujte profilové fotky a majte uložené údaje usporiadané na jednom mieste.",
+    "ContactEditDialog_AddTitle": "Pridať kontakt",
+    "ContactInfoBar_ContactAdded": "Kontakt bol úspešne pridaný.",
+    "ContactInfoBar_ContactUpdated": "Kontakt bol úspešne aktualizovaný.",
+    "ContactInfoBar_ContactsDeleted": "Kontakty boli úspešne odstránené.",
+    "ContactInfoBar_ContactPhotoUpdated": "Fotka kontaktu bola úspešne aktualizovaná.",
+    "ContactInfoBar_FailedToLoadContacts": "Nepodarilo sa načítať kontakty: {0}",
+    "ContactInfoBar_FailedToAddContact": "Nepodarilo sa pridať kontakt: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Nepodarilo sa aktualizovať kontakt: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Nepodarilo sa odstrániť kontakty: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Nepodarilo sa aktualizovať fotku: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Koreňové kontakty sa nedajú odstrániť.",
+    "ContactConfirmDialog_DeleteTitle": "Odstrániť kontakt",
+    "ContactConfirmDialog_DeleteMessage": "Ste si istí, že chcete odstrániť kontakt '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Ste si istí, že chcete odstrániť {0} kontaktov?",
+    "ContactConfirmDialog_DeleteButton": "Odstrániť",
+    "CalendarAccountSettings_Title": "Nastavenia kalendára účtu",
+    "CalendarAccountSettings_Description": "Spravujte nastavenia kalendára pre {0}",
+    "CalendarAccountSettings_AccountColor": "Farba účtu",
+    "CalendarAccountSettings_AccountColorDescription": "Zmeňte zobrazovaciu farbu pre tento kalendárny účet",
+    "CalendarAccountSettings_SyncEnabled": "Povoliť synchronizáciu",
+    "CalendarAccountSettings_SyncEnabledDescription": "Povoliť alebo zakázať synchronizáciu kalendára pre tento účet",
+    "CalendarAccountSettings_DefaultShowAs": "Predvolený stav dostupnosti",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Predvolený stav dostupnosti pre nové udalosti vytvorené s týmto účtom",
+    "CalendarAccountSettings_PrimaryCalendar": "Hlavný kalendár",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Označte tento kalendár ako hlavný kalendár pre účet",
+    "CalendarSettings_NewEventBehavior_Header": "Správanie tlačidla Nová udalosť",
+    "CalendarSettings_NewEventBehavior_Description": "Vyberte, či tlačidlo Nová udalosť by malo zakaždým žiadať kalendár, alebo by malo vždy otvárať špecifický kalendár.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Spýtať sa vždy.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Vždy použiť konkrétny kalendár.",
+    "CalendarSettings_Rendering_Title": "Zobrazenie",
+    "CalendarSettings_Rendering_Description": "Nastavte rozloženie kalendára a spôsob zobrazenia.",
+    "CalendarSettings_Notifications_Title": "Upozornenia",
+    "CalendarSettings_Notifications_Description": "Zvoľte predvolené pripomínanie a správanie pri odkladaní.",
+    "CalendarSettings_Preferences_Title": "Predvoľby",
+    "CalendarSettings_Preferences_Description": "Nastavte, ako má tlačidlo Nová udalosť fungovať.",
+    "WhatIsNew_GetStartedButton": "Začať",
+    "WhatIsNew_ContinueAnywayButton": "Pokračovať aj tak.",
+    "WhatIsNew_PreparingForNewVersionButton": "Príprava na novú verziu...",
+    "WhatIsNew_MigrationPreparing_Title": "Pripravujeme vaše údaje",
+    "WhatIsNew_MigrationPreparing_Description": "Wino aplikuje migračné aktualizácie. Počkajte prosím, kým pripravíme údaje vášho účtu pre túto verziu.",
+    "WhatIsNew_MigrationFailedMessage": "Aplikácia migračných aktualizácií zlyhala s chybovým kódom {0}. Môžete ďalej používať aplikáciu. Ak však narazíte na vážne problémy, nainštalujte aplikáciu znova.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail je aktualizovaný",
+    "WhatIsNew_MigrationNotification_Message": "Otvorte aplikáciu, aby ste dokončili aktualizáciu a zobrazili novinky.",
+    "WelcomeWindow_Title": "Vitajte v Wino Mail",
+    "WelcomeWindow_Subtitle": "Nativné Windows prostredie pre Poštu a Kalendár.",
+    "WelcomeWindow_WhatsNewTitle": "Najnovšie zmeny",
+    "WelcomeWindow_FeaturesTitle": "Funkcie",
+    "WelcomeWindow_WhatsNewTab": "Čo je nové",
+    "WelcomeWindow_FeaturesTab": "Funkcie",
+    "WelcomeWindow_GetStartedButton": "Začať pridaním účtu",
+    "WelcomeWindow_GetStartedDescription": "Pridajte svoj účet Outlook, Gmail alebo IMAP a začnite používať Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Importovať zo svojho Wino účtu",
+    "WelcomeWindow_ImportInProgress": "Importujem synchronizované preferencie a účty...",
+    "WelcomeWindow_ImportNoAccountsFound": "Nenašli sa žiadne synchronizované účty vo vašom Wino účte. Ak boli k dispozícii preferencie, boli obnovené. Použite možnosť Začať na manuálne pridanie účtu.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} synchronizovaných účtov je už k dispozícii na tomto zariadení. Ak potrebujete, použite možnosť Začať na ručné pridanie ďalšieho účtu.",
+    "WelcomeWindow_SetupTitle": "Nastavte si svoj účet",
+    "WelcomeWindow_SetupSubtitle": "Vyberte poskytovateľa e-mailu a začnite.",
+    "WelcomeWindow_AddAccountButton": "Pridať účet",
+    "WelcomeWindow_SkipForNow": "Preskočiť na teraz — nastavím to neskôr.",
+    "WelcomeWindow_AppDescription": "Rýchly, sústredený inbox — prepracovaný pre Windows 11.",
+    "WelcomeWizard_Step1Title": "Vitajte",
+    "SystemTrayMenu_Open": "Otvoriť",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Nastavenia synchronizácie",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Udržujte svoje nastavenia Wino synchronizované naprieč zariadeniami.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Odomknúť doplnky",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Získajte prístup k prémiovým funkciám, ako napríklad Wino AI Pack.",
+    "WinoAccount_Management_Description": "Spravujte svoj účet Wino, prístup k AI Pack a synchronizované preferencie a údaje o účte.",
+    "WinoAccount_Management_SignedOutTitle": "Prihláste sa do Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Prihláste sa alebo vytvorte účet na synchronizáciu e-mailov, prístup k AI funkciám a správu nastavení naprieč zariadeniami.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Doplnky Wino",
+    "WinoAccount_Management_DataSectionHeader": "Údaje",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Akcie účtu",
+    "WinoAccount_Management_AccountCardTitle": "Účet",
+    "WinoAccount_Management_AccountCardDescription": "E-mailová adresa vášho účtu Wino a aktuálny stav účtu.",
+    "WinoAccount_Management_AiPackCardTitle": "AI balík",
+    "WinoAccount_Management_AiPackCardDescription": "Zistite, či je Wino AI balík aktívny a koľko využitia zostáva.",
+    "WinoAccount_Management_AiPackActive": "AI balík je aktívny",
+    "WinoAccount_Management_AiPackInactive": "AI balík nie je aktívny",
+    "WinoAccount_Management_AiPackUsage": "{0} z {1} použití bolo spotrebovaných. Zostáva {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Fakturačné obdobie: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Podrobnosti o využívaní AI ešte nie sú k dispozícii.",
+    "WinoAccount_Management_AiPackBuyDescription": "Kúpte Wino AI Pack, aby ste mohli prekladať, prepisovať alebo zhrňovať e-maily pomocou AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Odomknúť AI balík",
+    "WinoAccount_Management_AiPackPromoDescription": "Vylepšite svoje pracovné postupy e-mailov s nástrojmi poháňanými AI. Prekladajte správy do viac ako 50 jazykov, prepisujte pre jasnosť a tón a získajte okamžité zhrnutia dlhých konverzácií.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mesiac",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 kreditov",
+    "WinoAccount_Management_AiPackGetButton": "Získať AI balík",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Balík",
+    "WinoAddOn_AI_PACK_Description": "Nástroje poháňané AI na preklad, prepisovanie a zhrnutie akcií v Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, preklad, prepisovanie, zhrnutie, produktivita",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Neobmedzené účty",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Odstráňte obmedzenie účtov a pridajte toľko e-mailových účtov, koľko potrebujete.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "účty, neobmedzené, prémiové, doplnok",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Prihláste sa cez svoj účet Wino na dokončenie nákupu.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino nemohlo dokončiť tento nákup v Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Nákup bol dokončený, no Wino nemôže obnoviť výhody účtu. Skúste to prosím o chvíľu znova.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Predplatné je aktívne",
+    "WinoAccount_Management_AiPackRenews": "Obnovuje sa {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Využité kredity tento mesiac",
+    "WinoAccount_Management_AiPackResets": "Resetov {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Nepodarilo sa načítať stav používania AI.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Preklad",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Prepisovanie",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Zhrnutie",
+    "WinoAccount_Management_AddOnLoadFailed": "Pri načítaní tohto doplnku došlo k problémom.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Synchronizovať predvoľby a účty",
+    "WinoAccount_Management_SyncPreferencesDescription": "Importujte alebo exportujte svoje predvoľby Wino a podrobnosti poštovej schránky naprieč zariadeniami. Heslá, tokeny a ďalšie citlivé informácie sa nikdy nesynchronizujú.",
+    "WinoAccount_Management_SignOutTitle": "Odhlásiť sa",
+    "WinoAccount_Management_SignOutDescription": "Odhláste sa zo svojho účtu na tomto zariadení",
+    "WinoAccount_Management_StatusLabel": "Stav: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Pre tento účet ešte nie sú uložené žiadne synchronizované údaje.",
+    "WinoAccount_Management_ExportSucceeded": "Vybrané údaje Wino boli úspešne exportované.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Vaše predvoľby boli exportované do vášho Wino účtu.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Exportované {0} podrobnosti účtu do vášho Wino účtu.",
+    "WinoAccount_Management_ImportSucceeded": "Synchronizované údaje z vášho Wino účtu boli importované.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Aplikované {0} synchronizované predvoľby.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Importované {0} účty.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Vynechané {0} účtov, ktoré už na tomto zariadení existujú.",
+    "WinoAccount_Management_ImportPartial": "Použité bolo {0} synchronizovaných predvolieb. {1} predvolieb sa nepodarilo obnoviť.",
+    "WinoAccount_Management_ImportReloginReminder": "Heslá, tokeny a ďalšie citlivé údaje neboli importované. Na každom účte na tomto zariadení sa pred použitím znova prihláste.",
+    "WinoAccount_Management_SerializeFailed": "Wino nemohol serializovať vaše aktuálne predvoľby.",
+    "WinoAccount_Management_EmptyExport": "Nie sú žiadne hodnoty predvolieb na export.",
+    "WinoAccount_Management_ImportEmpty": "Synchronizované dáta neobsahujú nič nové na obnovenie.",
+    "WinoAccount_Management_ExportDialog_Title": "Export do vášho Wino účtu",
+    "WinoAccount_Management_ExportDialog_Description": "Vyberte, čo chcete synchronizovať so svojím Wino účtom.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Predvoľby",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Účty",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Heslá, tokeny a ďalšie citlivé údaje nie sú synchronizované.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Importované účty na inom PC budú vyžadovať opätovné prihlásenie pred ich použitím.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Exportujem vybrané údaje Wino.",
+    "WinoAccount_Management_LoadFailed": "Wino nemohol načítať najnovšie informácie o Wino účte.",
+    "WinoAccount_Management_ActionFailed": "Žiadosť o Wino účet nemohla byť dokončená.",
+    "WinoAccount_SettingsSection_Title": "Wino účet",
+    "WinoAccount_SettingsSection_Description": "Vytvorte alebo sa prihláste do Wino účtu pomocou lokálnej autentifikačnej služby.",
+    "WinoAccount_RegisterButton_Title": "Registrovať účet",
+    "WinoAccount_RegisterButton_Description": "Vytvorte účet Wino s e-mailom a heslom.",
+    "WinoAccount_RegisterButton_Action": "Otvoriť registráciu",
+    "WinoAccount_LoginButton_Title": "Prihlásiť sa",
+    "WinoAccount_LoginButton_Description": "Prihláste sa do existujúceho Wino účtu pomocou e-mailu a hesla.",
+    "WinoAccount_LoginButton_Action": "Otvoriť prihlásenie",
+    "WinoAccount_SignOutButton_Title": "Odhlásiť sa",
+    "WinoAccount_SignOutButton_Description": "Odstrániť lokálne uloženú reláciu účtu Wino.",
+    "WinoAccount_SignOutButton_Action": "Odhlásiť sa",
+    "WinoAccount_RegisterDialog_Title": "Vytvoriť Wino účet",
+    "WinoAccount_RegisterDialog_Description": "Vytvorte Wino účet, aby bol váš Wino zážitok v synchronizácii a aby ste získali prístup k doplnkom založeným na účte.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Vytvorte si svoj Wino účet",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Prečo si ho vytvoriť?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Import a export nastavení naprieč zariadeniami",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Presúvajte svoje Wino predvoľby medzi zariadeniami bez nutnosti znovu zostavovať nastavenia od začiatku.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Získajte prístup k exkluzívnym doplnkom ako Wino AI Pack (platené)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Použite jeden účet na odomknutie prémiových funkcií Wino, keď budú dostupné.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino účet je samostatný od vašich e-mailových účtov",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Vaše účty Outlook, Gmail, IMAP alebo iné e-mailové účty zostávajú presne také, aké sú. Wino účet spravuje iba funkcie špecifické pre Wino a doplnky založené na účte.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Registrovať",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Ochrana súkromia a spracovanie API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Voliteľné doplnky, ako napríklad Wino AI Pack, môžu pri použití týchto funkcií posielať vybrané HTML obsah e-mailov do služby Wino API.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Prečítajte si zásady ochrany osobných údajov",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Súhlasím so zásadami ochrany osobných údajov.",
+    "WinoAccount_LoginDialog_Title": "Prihlásiť sa do Wino účtu",
+    "WinoAccount_LoginDialog_Description": "Prihláste sa do svojho Wino účtu, aby ste synchronizovali svoje nastavenia a mali prístup k funkciám založeným na účte.",
+    "WinoAccount_LoginDialog_HeroTitle": "Vitajte späť",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Čo vám prihlásenie prináša",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Použite svoj Wino účet na pokračovanie synchronizácie nastavení naprieč zariadeniami a na prístup k plateným doplnkom, ako je Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Toto nie je prihlásenie do vášho e-mailového účtu",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Prihlásenie sa sem nepridáva ani nenahrádza vaše účty Outlook, Gmail alebo IMAP vo Wino. Prihlási vás iba do služieb špecifických pre Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Zabudli ste heslo?",
+    "WinoAccount_EmailLabel": "E-mail",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Heslo",
+    "WinoAccount_ConfirmPasswordLabel": "Potvrdiť heslo",
+    "WinoAccount_ForgotPasswordDialog_Title": "Obnoviť heslo",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Odoslať e-mail na resetovanie hesla",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Späť na prihlásenie",
+    "WinoAccount_ForgotPasswordDialog_Description": "Zadajte e-mailovú adresu Vášho Wino účtu a my Vám pošleme odkaz na obnovenie hesla, ak je adresa registrovaná.",
+    "WinoAccount_Validation_EmailRequired": "E-mail je povinný.",
+    "WinoAccount_Validation_PasswordRequired": "Heslo je povinné.",
+    "WinoAccount_Validation_PasswordMismatch": "Heslá sa nezhodujú.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Pred vytvorením Wino účtu musíte súhlasiť so zásadami ochrany osobných údajov.",
+    "WinoAccount_Error_InvalidCredentials": "E-mailová adresa alebo heslo nie sú správne.",
+    "WinoAccount_Error_AccountLocked": "Tento účet je dočasne uzamknutý.",
+    "WinoAccount_Error_AccountBanned": "Tento účet bol zablokovaný.",
+    "WinoAccount_Error_AccountSuspended": "Tento účet bol pozastavený.",
+    "WinoAccount_Error_EmailNotConfirmed": "Prosím potvrďte svoju e-mailovú adresu pred prihlásením.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Prosím potvrďte svoju e-mailovú adresu pred prihlásením.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Nový overovací e-mail ešte nie je k dispozícii.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Požiadavka na potvrdenie už nie je platná. Skúste sa prosím znova prihlásiť.",
+    "WinoAccount_Error_EmailNotRegistered": "Táto e-mailová adresa nie je registrovaná.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Váš session už nie je platná. Prosím, prihláste sa znovu.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Táto e-mailová adresa je už zaregistrovaná.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "E-mailová adresa je potrebná na dokončenie externého prihlásenia.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Žiadosť o externé prihlásenie je neplatná.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Stav externého prihlásenia je neplatný alebo vypršal.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Externý sign-in kód je neplatný alebo vypršal.",
+    "WinoAccount_Error_AiPackRequired": "Pre túto akciu je vyžadované aktívne predplatné Wino AI Pack.",
+    "WinoAccount_Error_AiQuotaExceeded": "Váš limit využívania AI Pack bol vyčerpaný pre aktuálne fakturačné obdobie.",
+    "WinoAccount_Error_AiHtmlEmpty": "Nie je žiadny obsah e-mailu na spracovanie.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Tento e-mail je príliš veľký na spracovanie pomocou Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Tento jazyk nie je podporovaný. Skúste platný kultúrny kód, napríklad en-US alebo tr-TR.",
+    "WinoAccount_Error_Forbidden": "Nemáte oprávnenie na vykonanie tejto akcie.",
+    "WinoAccount_Error_ValidationFailed": "Žiadosť je neplatná. Skontrolujte zadané hodnoty.",
+    "WinoAccount_RegisterSuccessMessage": "Registrácia Wino účtu bola dokončená pre {0}.",
+    "WinoAccount_LoginSuccessMessage": "Prihlásený do Wino účtu ako {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Potvrďte svoju e-mailovú adresu",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Poslali sme potvrdenie e-mailu na {0}. Prosím potvrďte ho a skúste sa znovu prihlásiť.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Potvrdenie e-mailu je vyžadované",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Stále čakáme na potvrdenie {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Odoslať znovu potvrdzovací e-mail.",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Potvrdzovací e-mail môžete znovu odoslať za {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Teraz môžete odoslať potvrdzovací e-mail znova.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Potvrdzovací e-mail bol odoslaný znovu.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Poslali sme ďalší potvrdzovací e-mail na {0}. Prosím potvrďte ho a skúste sa prihlásiť znovu.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "E-mail na resetovanie hesla bol odoslaný.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Odoslali sme e-mail na resetovanie hesla na {0}. Otvorte tú správu a vyberte nové heslo.",
+    "WinoAccount_ChangePassword_Title": "Zmeniť heslo",
+    "WinoAccount_ChangePassword_Description": "Odošlite e-mail na resetovanie hesla na tento Wino účet.",
+    "WinoAccount_ChangePassword_Action": "Odoslať e-mail na resetovanie hesla",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Chcete, aby Wino poslalo e-mail na obnovenie hesla na {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Boli ste odhlásení z účtu Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Nie je k dispozícii žiadny aktívny účet Wino na odhlásenie.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Účet Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Prihláste sa alebo si vytvorte účet Wino a spravujte svoju reláciu Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Stav: {0}",
+    "WelcomeWizard_Step2Title": "Pridať účet",
+    "WelcomeWizard_Step3Title": "Dokončiť nastavenie",
+    "ProviderSelection_Title": "Vyberte si svojho poskytovateľa e-mailu",
+    "ProviderSelection_Subtitle": "Vyberte nižšie uvedeného poskytovateľa a pridajte svoj e-mailový účet do Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Názov účtu",
+    "ProviderSelection_AccountNamePlaceholder": "napr. Osobný, Práca",
+    "ProviderSelection_DisplayNameHeader": "Zobrazené meno",
+    "ProviderSelection_DisplayNamePlaceholder": "napr. Ján Novak",
+    "ProviderSelection_EmailHeader": "E-mailová adresa",
+    "ProviderSelection_EmailPlaceholder": "napr. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Heslo pre aplikáciu",
+    "ProviderSelection_AppPasswordHelp": "Ako získať heslo pre aplikáciu?",
+    "ProviderSelection_CalendarModeHeader": "Integrácia kalendára",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Vypnuté",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Žiadna integrácia kalendára",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Synchronizácia CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Vaše udalosti v kalendári sa medzi vašimi zariadeniami synchronizujú so servermi Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Vaše udalosti v kalendári sa medzi vašimi zariadeniami synchronizujú so servermi Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Lokálny kalendár",
+    "ProviderSelection_CalendarMode_LocalDescription": "Vaše udalosti sú uložené iba vo vašom počítači. Žiadne pripojenie k serveru.",
+    "ProviderSelection_ClearColor": "Vymazať farbu",
+    "ProviderSelection_ContinueButton": "Pokračovať",
+    "ProviderSelection_SpecialImap_Subtitle": "Zadajte prihlasovacie údaje k účtu pre pripojenie.",
+    "AccountSetup_Title": "Nastavovanie účtu",
+    "AccountSetup_Step_Authenticating": "Overovanie s {0}",
+    "AccountSetup_Step_TestingMailAuth": "Testujem autentifikáciu pošty",
+    "AccountSetup_Step_SyncingFolders": "Synchronizujem metadáty priečinkov",
+    "AccountSetup_Step_FetchingProfile": "Načítavam informácie z profilu",
+    "AccountSetup_Step_DiscoveringCalDav": "Objavujem nastavenia CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Testujem autentifikáciu kalendára",
+    "AccountSetup_Step_SavingAccount": "Ukladám informácie o účte",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Načítavam metadáty kalendára",
+    "AccountSetup_Step_SyncingAliases": "Synchronizujem aliasy",
+    "AccountSetup_Step_Finalizing": "Dokončujem nastavenie",
+    "AccountSetup_FailureMessage": "Nastavenie zlyhalo. Vráťte sa späť a opravte nastavenia, alebo to skúste neskôr.",
+    "AccountSetup_SuccessMessage": "Váš účet bol úspešne nastavený!",
+    "AccountSetup_GoBackButton": "Vrátiť sa späť",
+    "AccountSetup_TryAgainButton": "Skúsiť znova",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Automatické vyhľadávanie zlyhalo. Zadajte nastavenia ručne na karte Rozšírené."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/tr_TR/resources.json b/Wino.Core.Domain/Translations/tr_TR/resources.json
index bda12315..e3cfd510 100644
--- a/Wino.Core.Domain/Translations/tr_TR/resources.json
+++ b/Wino.Core.Domain/Translations/tr_TR/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Bu hesabın kullanılabilmesi için tekrar senkronize edilmesi gerekiyor. Lütfen Wino mesajlarınızı senkronize ederken bekleyiniz...",
     "AccountContactNameYou": "Siz",
     "AccountCreationDialog_Completed": "hepsi tamam",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Takvim ayrıntıları getiriliyor.",
     "AccountCreationDialog_FetchingEvents": "Etkinlikler indiriliyor.",
     "AccountCreationDialog_FetchingProfileInformation": "Profil detayları yükleniyor.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Eğer tarayıcınız otomatik olarak açılmadıysa:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "başlatılıyor",
     "AccountCreationDialog_PreparingFolders": "Klasör bilgileri yükleniyor.",
     "AccountCreationDialog_SigninIn": "Hesap bilgileri kaydediliyor.",
+    "Purchased": "Satın Alındı",
     "AccountEditDialog_Message": "Hesap Adı",
     "AccountEditDialog_Title": "Hesabı Düzenle",
     "AccountPickerDialog_Title": "Bir hesap seçiniz",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Hesabınızın adını ve gönderilen kişi ismini değiştirin.",
     "AccountDetailsPage_ColorPicker_Title": "Hesap rengi",
     "AccountDetailsPage_ColorPicker_Description": "Hesabınıza yeni bir renk atayarak diğerlerinden ayrı görünmesini sağlayabilirsiniz.",
+    "AccountDetailsPage_TabGeneral": "Genel",
+    "AccountDetailsPage_TabMail": "Posta",
+    "AccountDetailsPage_TabCalendar": "Takvim",
+    "AccountDetailsPage_CalendarListDescription": "Ayarlarını yapılandırmak için bir takvim seçin.",
     "AddHyperlink": "Ekle",
     "AppCloseBackgroundSynchronizationWarningTitle": "Arkaplan Senkronizasyonu",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Uygulama Windows açılırken çalıştırılacak şekilde ayarlanmadı.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP Hesabı",
     "Busy": "Meşgul",
     "Buttons_AddAccount": "Hesap Ekle",
+    "Buttons_FixAccount": "Hesabı Düzelt",
     "Buttons_AddNewAlias": "Yenii Rumuz Ekle",
     "Buttons_Allow": "İzin ver",
+    "Buttons_Apply": "Uygula",
     "Buttons_ApplyTheme": "Temayı Uygula",
     "Buttons_Browse": "Gözat",
     "Buttons_Cancel": "İptal Et",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Düzenle",
     "Buttons_EnableImageRendering": "Etkinleştir",
     "Buttons_Multiselect": "Çoklu Seç",
+    "Buttons_Manage": "Yönet",
     "Buttons_No": "Hayır",
     "Buttons_Open": "Aç",
     "Buttons_Purchase": "Satın Al",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Kaydet",
     "Buttons_SaveConfiguration": "Ayarları Kaydet",
     "Buttons_Send": "Gönder",
+    "Buttons_SendToServer": "Sunucuya gönder",
     "Buttons_Share": "Paylaş",
     "Buttons_SignIn": "Oturum Aç",
     "Buttons_Sync": "Senkronize et",
     "Buttons_SyncAliases": "Rumuzları Eşitle",
     "Buttons_TryAgain": "Tekrar Dene",
     "Buttons_Yes": "Evet",
+    "Sync_SynchronizingFolder": "Senkronize ediliyor: {0} {1}%",
+    "Sync_DownloadedMessages": "{1} adresinden indirilen {0} mesaj",
+    "SyncAction_Archiving": " {0} posta arşivleniyor.",
+    "SyncAction_ClearingFlag": "{0} posta için işaret kaldırılıyor.",
+    "SyncAction_CreatingDraft": "Taslak oluşturuluyor",
+    "SyncAction_CreatingEvent": "Etkinlik oluşturuluyor",
+    "SyncAction_Deleting": "{0} posta siliniyor.",
+    "SyncAction_EmptyingFolder": "Klasör boşaltılıyor",
+    "SyncAction_MarkingAsRead": "{0} posta okunmuş olarak işaretleniyor.",
+    "SyncAction_MarkingAsUnread": "{0} posta okunmamış olarak işaretleniyor.",
+    "SyncAction_MarkingFolderAsRead": "Klasör okunmuş olarak işaretleniyor",
+    "SyncAction_Moving": "{0} posta taşınıyor",
+    "SyncAction_MovingToFocused": "{0} posta Odaklı klasöre taşınıyor",
+    "SyncAction_RenamingFolder": "Klasör yeniden adlandırılıyor",
+    "SyncAction_SendingMail": "Posta gönderiliyor",
+    "SyncAction_SettingFlag": "{0} posta için işaret belirleniyor.",
+    "SyncAction_SynchronizingAccount": "{0} hesabı senkronize ediliyor",
+    "SyncAction_SynchronizingAccounts": "{0} hesaplar senkronize ediliyor",
+    "SyncAction_SynchronizingCalendarData": "Takvim verileri senkronize ediliyor",
+    "SyncAction_SynchronizingCalendarEvents": "Takvim etkinlikleri senkronize ediliyor",
+    "SyncAction_SynchronizingCalendarMetadata": "Takvim meta verileri senkronize ediliyor",
+    "SyncAction_Unarchiving": "{0} posta arşivinden çıkarılıyor.",
     "CalendarAllDayEventSummary": "tüm gün etkinlikleri",
     "CalendarDisplayOptions_Color": "Renk",
     "CalendarDisplayOptions_Expand": "Genişlet",
+    "CalendarEventResponse_Accept": "Kabul",
+    "CalendarEventResponse_AcceptedResponse": "Kabul edildi",
+    "CalendarEventResponse_Decline": "Reddet",
+    "CalendarEventResponse_DeclinedResponse": "Reddedildi",
+    "CalendarEventResponse_NotResponded": "Yanıtlanmadı",
+    "CalendarEventResponse_Tentative": "Geçici",
+    "CalendarEventResponse_TentativeResponse": "Geçici",
+    "CalendarEventRsvpPanel_Accept": "Kabul",
+    "CalendarEventRsvpPanel_AddMessage": "Yanıtınıza bir mesaj ekleyin... (isteğe bağlı)",
+    "CalendarEventRsvpPanel_Decline": "Reddet",
+    "CalendarEventRsvpPanel_Message": "Mesaj",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Yanıt mesajını gönder",
+    "CalendarEventRsvpPanel_Tentative": "Geçici",
+    "CalendarEventRsvpPanel_Title": "Yanıt Seçenekleri",
+    "CalendarAttendeeStatus_Accepted": "Kabul edildi",
+    "CalendarAttendeeStatus_Declined": "Reddedildi",
+    "CalendarAttendeeStatus_NeedsAction": "İşlem Gerekiyor",
+    "CalendarAttendeeStatus_Tentative": "Geçici",
+    "CalendarEventDetails_Attachments": "Ekler",
+    "CalendarEventCompose_AddAttachment": "Ek Ekle",
+    "CalendarEventCompose_AllDay": "Tüm Gün",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "CalDAV takvimleri için ekler desteklenmiyor.",
+    "CalendarEventCompose_EndDate": "Bitiş tarihi",
+    "CalendarEventCompose_EndTime": "Bitiş saati",
+    "CalendarEventCompose_Every": "her",
+    "CalendarEventCompose_ForWeekdays": "için",
+    "CalendarEventCompose_FrequencyDay": "gün",
+    "CalendarEventCompose_FrequencyDayPlural": "günler",
+    "CalendarEventCompose_FrequencyMonth": "ay",
+    "CalendarEventCompose_FrequencyMonthPlural": "aylar",
+    "CalendarEventCompose_FrequencyWeek": "hafta",
+    "CalendarEventCompose_FrequencyWeekPlural": "haftalar",
+    "CalendarEventCompose_FrequencyYear": "yıl",
+    "CalendarEventCompose_FrequencyYearPlural": "yıllar",
+    "CalendarEventCompose_Location": "Konum",
+    "CalendarEventCompose_LocationPlaceholder": "Bir konum ekleyin",
+    "CalendarEventCompose_NewEventButton": "Yeni Etkinlik",
+    "CalendarEventCompose_DefaultCalendarHint": "Takvim ayarlarında yeni etkinlikler için varsayılan bir takvim seçebilirsiniz.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Takvim ayarlarını aç",
+    "CalendarEventCompose_NoCalendarsMessage": "Etkinlik oluşturmak için henüz kullanılabilir takvim yok.",
+    "CalendarEventCompose_NoCalendarsTitle": "Kullanılabilir takvim yok",
+    "CalendarEventCompose_NoEndDate": "Bitiş tarihi yok",
+    "CalendarEventCompose_Notes": "Notlar",
+    "CalendarEventCompose_PickCalendarTitle": "Bir takvim seçin",
+    "CalendarEventCompose_Recurring": "Yinelenen",
+    "CalendarEventCompose_RecurringSummary": "Her {0} {1}{2} {3} geçerli {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Oluşur {0}{1} {2} geçerli {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Her seferinde tekrarla",
+    "CalendarEventCompose_SelectCalendar": "Takvim seçin",
+    "CalendarEventCompose_SingleOccurrenceSummary": " {0} {1} üzerinde gerçekleşir",
+    "CalendarEventCompose_StartDate": "Başlangıç tarihi",
+    "CalendarEventCompose_StartTime": "Başlangıç saati",
+    "CalendarEventCompose_TimeRangeSummary": "{0} ile {1} arasında",
+    "CalendarEventCompose_Title": "Etkinlik başlığı",
+    "CalendarEventCompose_TitlePlaceholder": "Bir başlık ekleyin",
+    "CalendarEventCompose_Until": "kadar",
+    "CalendarEventCompose_UntilSummary": "  kadar {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Tüm gün için bitiş tarihi başlangıç tarihinden sonra olmalıdır.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Bir veya daha fazla katılımcının geçersiz bir e-posta adresi var.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Yinelenme son tarihi, etkinlik başlangıç tarihinden sonra veya ona eşit olmalıdır.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Bitiş saati, başlangıç saatinden daha geç olmalıdır.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Bir veya daha fazla ek artık mevcut değil: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Etkinliği oluşturmadan önce bir takvim seçin.",
+    "CalendarEventCompose_ValidationMissingTitle": "Etkinlik başlığını girin.",
+    "CalendarEventCompose_ValidationTitle": "Etkinlik doğrulaması başarısız oldu",
+    "CalendarEventCompose_WeekdaySummary": "  {0} üzerinde",
+    "CalendarEventCompose_Weekday_Friday": "C",
+    "CalendarEventCompose_Weekday_Monday": "P",
+    "CalendarEventCompose_Weekday_Saturday": "Cumartesi",
+    "CalendarEventCompose_Weekday_Sunday": "Pazar",
+    "CalendarEventCompose_Weekday_Thursday": "Perşembe",
+    "CalendarEventCompose_Weekday_Tuesday": "Salı",
+    "CalendarEventCompose_Weekday_Wednesday": "Çarşamba",
+    "CalendarEventDetails_Details": "Detaylar",
+    "CalendarEventDetails_EditSeries": "Seriyi Düzenle",
+    "CalendarEventDetails_Editing": "Düzenleniyor",
+    "CalendarEventDetails_InviteSomeone": "Birini davet et",
+    "CalendarEventDetails_JoinOnline": "Çevrimiçi Katıl",
+    "CalendarEventDetails_Organizer": "Organizatör",
+    "CalendarEventDetails_People": "Kişiler",
+    "CalendarEventDetails_ReadOnlyEvent": "Salt okunur etkinlik",
+    "CalendarEventDetails_Reminder": "Hatırlatma",
+    "CalendarReminder_StartedHoursAgo": "{0} saat önce başladı",
+    "CalendarReminder_StartedMinutesAgo": "{0} dakika önce başladı",
+    "CalendarReminder_StartedNow": "Şimdi başladı",
+    "CalendarReminder_StartingNow": "Şu anda başlıyor",
+    "CalendarReminder_StartsInHours": "{0} saat sonra başlıyor",
+    "CalendarReminder_StartsInMinutes": "{0} dakika sonra başlıyor",
+    "CalendarReminder_SnoozeAction": "Ertele",
+    "CalendarReminder_SnoozeMinutesOption": "{0} dakika",
+    "CalendarEventDetails_ShowAs": "Durum olarak göster",
+    "CalendarShowAs_Free": "Boş",
+    "CalendarShowAs_Tentative": "Geçici",
+    "CalendarShowAs_Busy": "Meşgul",
+    "CalendarShowAs_OutOfOffice": "Ofis Dışında",
+    "CalendarShowAs_WorkingElsewhere": "Başka bir yerde çalışıyor",
     "CalendarItem_DetailsPopup_JoinOnline": "Çevrimiçi katıl",
     "CalendarItem_DetailsPopup_ViewEventButton": "Etkinliği gör",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Etkinlik serisini gör",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "\"{0}\" panoya kopyalandı.",
     "ClipboardTextCopied_Title": "Kopyalandı",
     "ClipboardTextCopyFailed_Message": "{0} kopyalanamadı.",
+    "ContactInfoBar_ErrorTitle": "Kişi bilgileri yüklenemedi",
+    "ContactInfoBar_SuccessTitle": "Kişi bilgileri yüklendi",
+    "ContactInfoBar_WarningTitle": "Kişi bilgileri eksik olabilir",
     "ComingSoon": "Yakında...",
     "ComposerAttachmentsDragDropAttach_Message": "Ekle",
     "ComposerAttachmentsDropZone_Message": "Dosyaları buraya bırakabilirisiniz",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Hesap Bağlantı Adı",
     "DialogMessage_DeleteAccountConfirmationMessage": "{0} silinsin mi?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Bu hesapla ilgili her şey bilgisayarınızdan silinecektir.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Şablonu \"{0}\" silmek istiyor musunuz?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "E-posta Şablonunu Sil",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Bu işlem serideki tüm etkinlikleri silecek. Devam etmek istiyor musunuz?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Tekrarlayan Seriyi Sil",
     "DialogMessage_DiscardDraftConfirmationMessage": "Taslak yoksayılacaktır. Devam etmek istiyor musunuz?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Taslağı Sil",
     "DialogMessage_EmptySubjectConfirmation": "Konu Eksik",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Aydınlık mod",
     "Emoji": "Emoji",
     "Error_FailedToSetupSystemFolders_Title": "Sistem klasörleri ayarlanamadı",
+    "Exception_AccountNeedsAttention_Title": "Hesap Dikkat Gerektiriyor",
+    "Exception_AccountNeedsAttention_Message": "'{0}' devam etmek için dikkatinize ihtiyaç duyuyor.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail, Microsoft Edge WebView2 Runtime'ını bulamadı. İçeriği doğru şekilde görüntülemek için lütfen runtime'ı kurun veya onarın.",
+    "Exception_WebView2RuntimeMissing_Title": "WebView2 Çalışma Zamanı Gerekli",
     "Exception_AuthenticationCanceled": "Kimlik doğrulama iptal edildi",
     "Exception_CustomThemeExists": "Bu tema zaten mevcut.",
     "Exception_CustomThemeMissingName": "Bir isim giirmelisiniz.",
     "Exception_CustomThemeMissingWallpaper": "Bir arkaplan resmi tanımlamalısınız.",
     "Exception_FailedToSynchronizeAliases": "Rumuzlar eşitlenemedi",
+    "Exception_FailedToSynchronizeCalendarData": "Takvim verileri senkronize edilemedi",
+    "Exception_FailedToSynchronizeCalendarEvents": "Takvim etkinlikleri senkronize edilemedi",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Takvim bilgileri senkronize edilemedi",
     "Exception_FailedToSynchronizeFolders": "Klasörler eşitlenemedi",
     "Exception_FailedToSynchronizeProfileInformation": "Profil bilgisi eşitlenemedi",
     "Exception_GoogleAuthCallbackNull": "Yeniden yönlendirme adresi aktifleştirme sırasında null.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Spam'e taşı",
     "HoverActionOption_ToggleFlag": "Bayrak ekle / kaldır",
     "HoverActionOption_ToggleRead": "Okundu / okunmadı",
+    "KeyboardShortcuts_FailedToReset": "Klavye kısayolları sıfırlanamadı.",
+    "KeyboardShortcuts_FailedToUpdate": "Klavye kısayolları güncellenemedi",
+    "KeyboardShortcuts_MailoperationAction": "İşlem",
+    "KeyboardShortcuts_Action": "İşlem",
+    "KeyboardShortcuts_FailedToLoad": "Klavye kısayolları yüklenemedi.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Kısayol için bir tuşa basınız.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Kısayol için bir işlem seçiniz.",
+    "KeyboardShortcuts_EnterKey": "Kısayol için bir tuşa basınız.",
+    "KeyboardShortcuts_SelectOperation": "Kısayol için bir işlem seçiniz.",
+    "KeyboardShortcuts_ShortcutInUse": "Bu kısayol zaten başka bir kısayol tarafından kullanılıyor.",
+    "KeyboardShortcuts_FailedToSave": "Kısayol kaydedilemedi.",
+    "KeyboardShortcuts_FailedToDelete": "Kısayol silinemedi.",
+    "KeyboardShortcuts_PageDescription": "Hızlı e-posta işlemleri için klavye kısayollarını ayarlayın. Kısayol tuşlarını yakalamak için anahtar girdi alanına odaklanırken tuşlara basın.",
+    "KeyboardShortcuts_Add": "Kısayol Ekle",
+    "KeyboardShortcuts_EditTitle": "Klavye Kısayolunu Düzenle",
+    "KeyboardShortcuts_ResetToDefaults": "Varsayılanlara Sıfırla",
+    "KeyboardShortcuts_PressKeysHere": "Buraya tuşlara basın...",
+    "KeyboardShortcuts_KeyCombination": "Tuş Kombinasyonu",
+    "KeyboardShortcuts_FocusArea": "Yukarıdaki alanı odaklayın ve istenen tuş kombinasyonunu basın.",
+    "KeyboardShortcuts_Modifiers": "Mod Tuşları",
+    "KeyboardShortcuts_Mode": "Mod",
+    "KeyboardShortcuts_ModeMail": "Posta",
+    "KeyboardShortcuts_ModeCalendar": "Takvim",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Okundu/Okunmadı durumunu değiştir",
+    "KeyboardShortcuts_ActionToggleFlag": "Bayrağı değiştir",
+    "KeyboardShortcuts_ActionToggleArchive": "Arşiv durumunu değiştir",
     "ImageRenderingDisabled": "Bu mesaj için resimler devre dışı bırakıldı.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Oturum Açma yöntemi",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Bağlantı güvenliği",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Kullanıcı Adı",
     "IMAPSetupDialog_UsernamePlaceholder": "johndoe, johndoe@fabrikam.com, domain/johndoe",
     "IMAPSetupDialog_UseSameConfig": "E-Posta göndermek için aynı ayarları kullan",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP ve Takvim Kurulumu",
+    "ImapCalDavSettingsPage_TitleEdit": "IMAP ve Takvim Ayarlarını Düzenle",
+    "ImapCalDavSettingsPage_Subtitle": "Bu hesap için IMAP/SMTP ve isteğe bağlı takvim senkronizasyonunu yapılandırın.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Temel kurulum",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Kullanıcı kimliğinizi ve kimlik bilgilerinizi girin. Wino sunucu ayarlarını otomatik olarak algılamaya çalışabilir.",
+    "ImapCalDavSettingsPage_BasicTab": "Temel",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Takvim desteğini etkinleştir",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Posta ayarlarını otomatik keşfet",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Posta ayarları bulundu ve uygulandı.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Gelişmiş yapılandırma",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Otomatik keşif kullanılamıyorsa veya hatalıysa sunucu ayarlarını manuel olarak girin.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Gelişmiş",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Takvim kurulumu",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Bu IMAP hesabı için takvim verilerinin nasıl çalışacağını seçin.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Takvim modu",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Bağlantı güvenliği",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Doğrulama yöntemi",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Devre dışı",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV senkronizasyonu",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Yalnızca Yerel Takvim",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Bu hesap için takvim devre dışı.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Takvim öğeleri CalDAV sunucunuzla senkronize edilir.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Takvim öğeleri yalnızca bu bilgisayarda saklanır ve ağa senkronize edilmez.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Yerel takvim nasıl çalışır",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Yalnızca Yerel Takvim",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Yerel takvim tüm etkinlikleri yalnızca bilgisayarınızda tutar. Hiçbir şey iCloud, Yahoo veya herhangi bir sağlayıcıya senkronize edilmez.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV hizmeti URL'si",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV kullanıcı adı",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV şifresi",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "CalDAV testi yalnızca takvim modu CalDAV senkronizasyonu olarak ayarlandığında gerekir.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "CalDAV hizmeti URL'si gereklidir.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV hizmeti URL'si mutlak URL olmalıdır.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV kullanıcı adı gerekli.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV parolası gerekli.",
+    "ImapCalDavSettingsPage_TestImapButton": "IMAP bağlantısını test et.",
+    "ImapCalDavSettingsPage_TestCalDavButton": "CalDAV bağlantısını test et.",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP bağlantı testi başarıyla gerçekleştirildi.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV bağlantı testi başarıyla gerçekleştirildi.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Hesap ayarları doğrulandı ve kaydedildi.",
+    "ImapCalDavSettingsPage_ICloudHint": "Apple hesabı ayarlarından oluşturulan uygulama özel şifresini kullanın.",
+    "ImapCalDavSettingsPage_YahooHint": "Yahoo hesap güvenlik ayarlarından bir uygulama şifresi kullanın.",
     "Info_AccountCreatedMessage": "{0} oluşturuldu",
     "Info_AccountCreatedTitle": "Hesap Oluşturma",
     "Info_AccountCreationFailedTitle": "Hesap oluşturulamadı",
     "Info_AccountDeletedMessage": "{0} başarıyla silindi.",
     "Info_AccountDeletedTitle": "Hesap Silindi",
     "Info_AccountIssueFixFailedTitle": "Başarısız oldu",
+    "Info_AccountIssueFixImapMessage": "IMAP ve takvim ayarları sayfasını açın ve sunucu kimlik bilgilerinizi yeniden girin.",
+    "Info_AccountAttentionRequiredMessage": "Bu hesap için dikkatiniz gerekli.",
+    "Info_AccountAttentionRequiredClickableMessage": "Bu hesabı düzeltmek ve yeniden senkronize etmek için tıklayın.",
+    "Info_AccountAttentionRequiredAction": "Düzelt",
+    "Info_AccountAttentionRequiredActionHint": "Bu hesap sorununu çözmek için Düzelt'e tıklayın.",
     "Info_AccountIssueFixSuccessMessage": "Bütün hesap sorunları giderildi.",
     "Info_AccountIssueFixSuccessTitle": "Başarılı",
     "Info_AttachmentOpenFailedMessage": "Bu eklenti açılamıyor.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Bu klasör için senkronizasyon kapatıldı.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Pasif Klasör",
     "Justify": "Yasla",
+    "MenuUpdateAvailable": "Güncelleme mevcut.",
     "Left": "Sol",
     "Link": "Bağlantı",
     "LinkedAccountsCreatePolicyMessage": "hesap bağlantısı oluşturabilmeniz için en az 2 adet hesap gerekli\nkaydet'e basıldığında hesap bağlantısı silinecektir",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Arşivden çıkar",
     "MailOperation_ViewMessageSource": "Posta kaynağını göster",
     "MailOperation_Zoom": "Yakınlaştır",
+    "MailsDragging": "{0} öğe sürükleniyor",
     "MailsSelected": "{0} seçili",
     "MarkFlagUnflag": "Bayrak ekle/kaldır",
     "MarkReadUnread": "Okundu/okunmadı olarak işaretle",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Yeni E-Posta",
     "Notifications_WinoUpdatedMessage": "{0} sürümünü deneyin",
     "Notifications_WinoUpdatedTitle": "Wino Mail güncellendi.",
+    "Notifications_StoreUpdateAvailableTitle": "Güncelleme mevcut",
+    "Notifications_StoreUpdateAvailableMessage": "Microsoft Store'dan kuruluma hazır daha yeni bir Wino Mail sürümü mevcut.",
     "OnlineSearchFailed_Message": "Çevrimiçi arama yapılamadı\n{0}\n\nÇevrimdışı postalar görüntüleniyor.",
     "OnlineSearchTry_Line1": "Aradığınızı bulamadınız mı?",
     "OnlineSearchTry_Line2": "Çevrimiçi aramayı deneyin.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Küçük",
     "Photos": "Fotoğraflar",
     "PreparingFoldersMessage": "Klasörler hazırlanıyor",
-    "ProtocolLogAvailable_Message": "Protocol logları hata ayıklama için mevcut.",
     "ProviderDetail_Gmail_Description": "Google Hesabı",
     "ProviderDetail_iCloud_Description": "Apple iCloud Hesabı",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Ara",
     "SearchingIn": "Aranıyor",
     "SearchPivotName": "Sonuçlar",
+    "Settings_KeyboardShortcuts_Title": "Klavye Kısayolları",
+    "Settings_KeyboardShortcuts_Description": "Postalar için hızlı işlemler amacıyla klavye kısayollarını yönetin.",
     "SettingConfigureSpecialFolders_Button": "Ayarla",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP Ayarları",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Gelen ve giden sunucu ayarlarınızı değiştirebilirsiniz.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP ve takvim ayarları",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Bu hesap için özel IMAP, SMTP ve CalDAV ayarları sayfasını açın.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Ayarları aç",
     "SettingsAbout_Description": "Wino hakkında daha fazla bilgi edinin.",
     "SettingsAbout_Title": "Hakkında",
     "SettingsAboutGithub_Description": "GitHub'daki hatalar bölümüne gidin.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Çevrimdışı",
     "SettingsAppPreferences_SearchMode_Online": "Çevrimiçi",
     "SettingsAppPreferences_SearchMode_Title": "Varsayılan arama modu",
+    "SettingsAppPreferences_ApplicationMode_Title": "Varsayılan uygulama modu",
+    "SettingsAppPreferences_ApplicationMode_Description": "Etkinleştirme türü açıkça belirlenmediğinde Wino'nun açılacağı varsayılan modu seçin.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Posta",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Takvim",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail arkaplanda çalışmaya devam edecektir. Yeni e-postalar için bildirim almaya devam edeceksiniz.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Arkaplanda çalışmaya devam et",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Uygulama sistem saatinin yanında çalışmaya arkaplanda devam edecektir. Yeni e-postalar geldiğinide bildirim almaya devam edeceksiniz.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Açılış modu ayarlanırken bilinmeyen bir hata oluştu.",
     "SettingsAppPreferences_StartupBehavior_Title": "Windows açıldığında saatin yanında küçültülmüş başlat",
     "SettingsAppPreferences_Title": "Uygulama Seçenekleri",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Başlık çubuğunda Wino hesap düğmesini gizle",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Wino hesap açılır menüsünü açan başlık çubuğu profil düğmesini gizleyin.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Mağaza güncelleme bildirimleri",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Bir Microsoft Store güncellemesi mevcut olduğunda bildirimleri ve altbilgi işlemlerini gösterin.",
+    "SettingsAppPreferences_AiActions_Title": "Yapay Zeka işlemleri",
+    "SettingsAppPreferences_AiActions_Description": "Yapay zeka işlemleri için varsayılan dilleri ve özetlerin nerede kaydedileceğini seçin.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Varsayılan çeviri dili",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Yapay zeka çeviri işlemlerinde kullanılacak varsayılan hedef dili seçin.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Özetleme dili",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Gelecek yapay zeka özet çıktısı için tercih edilen özetleme dilini seçin.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Varsayılan özet kaydetme yolu",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Yapay zeka özetlerini kaydederken Wino'nun varsayılan olarak kullanacağı klasörü seçin.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Sistem varsayılan kaydetme konumunu kullanın",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Bu klasör mevcut değil. Özetler için varsayılan kaydetme konumu kullanılacaktır.",
     "SettingsAutoSelectNextItem_Description": "Bir mesajı sildikten sonra sonrakini otomatik olarak seç.",
     "SettingsAutoSelectNextItem_Title": "Sonraki mesajı otomatik seç",
     "SettingsAvailableThemes_Description": "Tercihlerinize göre Wino için varolan bir tema seçini ya da yeni tema oluşturun.",
     "SettingsAvailableThemes_Title": "Mevcut Temalar",
     "SettingsCalendarSettings_Description": "Haftanın başlanıç günü, hücre yüksekliği gibi ayarlar...",
     "SettingsCalendarSettings_Title": "Takvim Ayarları",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Varsayılan erteleme süresi",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Takvim hatırlatıcı bildirimleri için varsayılan erteleme süresi ayarlayın.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Zamanlı görünüm gün başlığı biçimi",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Gün, hafta ve iş haftası görünümlerinde üst gün etiketlerinin nasıl gösterileceğini seçin. ddd, dd, MMM veya dddd gibi tarih biçimleme tokenlerini kullanın.",
     "SettingsComposer_Title": "Editör",
     "SettingsComposerFont_Title": "Varsayılan Editör Yazı Tipi",
     "SettingsComposerFontFamily_Description": "E-posta oluştururken kullanılan yazı tipini değiştirin.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Discord Kanalı",
     "SettingsEditLinkedInbox_Description": "Hesap ekle / kaldır, yeniden adlandır ya da varolan bağlantıyı kaldır.",
     "SettingsEditLinkedInbox_Title": "Bağlı Hesabı Düzenle",
+    "SettingsWindowBackdrop_Title": "Pencere Arka Planı",
+    "SettingsWindowBackdrop_Description": "Wino pencereleri için bir perde etkisi seçin.",
+    "SettingsWindowBackdrop_Disabled": "Uygulama teması Varsayılan dışında bir tema seçildiğinde pencere arka planı seçimi devre dışı bırakılır.",
     "SettingsElementTheme_Description": "Wino için bir Windows teması seçin",
     "SettingsElementTheme_Title": "Element Teması",
     "SettingsElementThemeSelectionDisabled": "Uygulama teması 'Varsayılan' dışında ayarlandığında element temaları aktif değildir.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Rumuzlar",
     "SettingsEditAccountDetails_Title": "Hesap Detaylarını Düzenle",
     "SettingsEditAccountDetails_Description": "Hesabınızın adını ve gönderilen kişi adını değiştirerek yeni bir renk atayabilirsiniz.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Değişiklikler Kaydedildi",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Hesap bilgileriniz başarıyla güncellendi.",
     "SettingsManageLink_Description": "Hesapları sürükleyeren bağlantı oluşturun ya da kaldırın.",
     "SettingsManageLink_Title": "Bağlantıyı yönet",
     "SettingsMarkAsRead_Description": "Seçilen e-postaya ne olacağını seçin.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Bildirimler",
     "SettingsNotificationsAndTaskbar_Description": "Bu hesap için bildirim ve sistem çubuğu ayarlarını değiştirin.",
     "SettingsNotificationsAndTaskbar_Title": "Bildirimler ve Sistem Çubuğu",
+    "SettingsHome_Title": "Ana Sayfa",
+    "SettingsHome_SearchTitle": "Bir ayar bulun",
+    "SettingsHome_SearchDescription": "Özellik, konu veya anahtar kelimeye göre arayın ve doğru ayarlar sayfasına doğrudan gidin.",
+    "SettingsHome_SearchPlaceholder": "Ayarları ara",
+    "SettingsHome_SearchExamples": "Deneyin: tema, depolama, dil, imza",
+    "SettingsHome_QuickLinks_Title": "Hızlı bağlantılar",
+    "SettingsHome_QuickLinks_Description": "Kullanıcıların en çok başvurduğu ayarlara hızlıca ulaşın.",
+    "SettingsHome_StorageCard_Description": "Bu cihazda Wino'nun yerel MIME içeriğini ne kadar tuttuğunu görün ve gerektiğinde temizleyin.",
+    "SettingsHome_StorageEmptySummary": "Henüz önbelleğe alınmış MIME içeriği tespit edilmedi.",
+    "SettingsHome_StorageLoading": "Yerel MIME kullanımı kontrol ediliyor...",
+    "SettingsHome_Tips_Title": "İpuçları ve püf noktaları",
+    "SettingsHome_Tips_Description": "Birkaç küçük değişiklik, Wino'yu çok daha kişisel hissettirir.",
+    "SettingsHome_Tip_Theme": "Koyu mod veya vurgu renklerini değiştirmek mı istiyorsunuz? Kişiselleştirme'yi açın.",
+    "SettingsHome_Tip_Background": "Başlangıç davranışını ve arka plan senkronizasyonunu yönetmek için Uygulama Tercihlerini kullanın.",
+    "SettingsHome_Tip_Shortcuts": "Klavye kısayolları, postaları daha hızlı gezmenize yardımcı olur.",
+    "SettingsHome_Resources_Title": "Yararlı bağlantılar",
+    "SettingsHome_Resources_Description": "Proje kaynaklarını, destek bilgilerini ve sürüm kanallarını açın.",
     "SettingsOptions_Title": "Ayarlar",
+    "SettingsOptions_GeneralSection": "Genel",
+    "SettingsOptions_MailSection": "Posta",
+    "SettingsOptions_CalendarSection": "Takvim",
+    "SettingsOptions_MoreComingSoon": "Daha fazla seçenek yakında",
+    "SettingsOptions_HeroDescription": "Wino Mail deneyiminizi özelleştirin.",
+    "SettingsOptions_AccountsSummary": "{0} hesap(lar) yapılandırıldı.",
+    "SettingsSearch_ManageAccounts_Keywords": "hesap;hesaplar;posta kutusu;posta kutuları;takma ad;takma adlar;profil;adres;adresler",
+    "SettingsSearch_AppPreferences_Keywords": "başlatma;arka plan;başlatma;senkronizasyon;bildirimin;bildirimler;arama;bildirim alanı;varsayılanlar",
+    "SettingsSearch_LanguageTime_Keywords": "dil;zaman;saat;yerel ayar;bölge;biçim;24 saat;24 saat",
+    "SettingsSearch_Personalization_Keywords": "tema;koyu;açık;görünüm;vurgu;renk;renk;mod;düzen;yogunluk",
+    "SettingsSearch_About_Keywords": "hakkında;sürüm;web sitesi;gizlilik;GitHub;bağış;mağaza;destek",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "kısayol;kısayollar;kısayol;kısayollar;klavye;tuşlar",
+    "SettingsSearch_MessageList_Keywords": "mesaj;mesajlar;liste;İleti zincirleme;konular;profil resmi;önizleme;gönderen",
+    "SettingsSearch_ReadComposePane_Keywords": "okuyucu;oluşturucu;yazı tipi;yazı tipleri;harici içerik;görüntüleme;okuma",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "imza;imzalar;şifreleme;sertifika;sertifikalar;S/MIME;S/MIME;güvenlik",
+    "SettingsSearch_Storage_Keywords": "depolama;önbellek;önbellekleme;MIME;disk;alan;temizle;temizle;yerel veriler",
+    "SettingsSearch_CalendarSettings_Keywords": "takvim;hafta;saatler;plan;etkinlik;etkinlikler",
     "SettingsPaneLengthReset_Description": "Eğer problem yaşıyorsanız mesaj listesi geniişliğini sıfırlayın.",
     "SettingsPaneLengthReset_Title": "Mesaj Listesi Genişliğini Sıfırla",
     "SettingsPaypal_Description": "Daha fazla destek ol ❤️. Bağışlarınız için teşekkürler.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "24 saatlik format",
     "SettingsPrivacyPolicy_Description": "Giiizliilik sözleşmesine gözat.",
     "SettingsPrivacyPolicy_Title": "Gizlilik Politikası",
+    "SettingsWebsite_Description": "Wino Mail web sitesini açın.",
+    "SettingsWebsite_Title": "Web Sitesi",
     "SettingsReadComposePane_Description": "Yazı tipi, dış bağlantılar.",
     "SettingsReadComposePane_Title": "Okuyucu ve Editör",
     "SettingsReader_Title": "Okuyucu",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Önizleme",
     "SettingsShowSenderPictures_Description": "Gönderen resmini göster/gösterme.",
     "SettingsShowSenderPictures_Title": "Gönderen Resimleri",
+    "SettingsEmailTemplates_Title": "E-posta Şablonları",
+    "SettingsEmailTemplates_Description": "E-posta şablonlarını yönetin.",
+    "SettingsEmailTemplates_CreatePageTitle": "Yeni şablon",
+    "SettingsEmailTemplates_EditPageTitle": "Şablonu düzenle",
+    "SettingsEmailTemplates_NewTemplateTitle": "Yeni şablon",
+    "SettingsEmailTemplates_NewTemplateDescription": "Yeni bir e-posta şablonu oluşturun",
+    "SettingsEmailTemplates_NameTitle": "İsim",
+    "SettingsEmailTemplates_NamePlaceholder": "Şablon adı",
+    "SettingsEmailTemplates_DescriptionTitle": "Açıklama",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "İsteğe bağlı açıklama",
+    "SettingsEmailTemplates_ContentTitle": "Şablon içeriği",
+    "SettingsEmailTemplates_ContentDescription": "Bu şablon için HTML içeriğini düzenleyin.",
+    "SettingsEmailTemplates_NameRequired": "Şablon adı gereklidir.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Başlangıç Hesabı",
     "SettingsStore_Description": "Biraz sevgi gösterin ❤️",
     "SettingsStore_Title": "Mağaza'da Puanla",
+    "SettingsStorage_Title": "Depolama",
+    "SettingsStorage_Description": "Yerel veri klasörünüzde depolanan MIME önbelleğini tara ve yönetin.",
+    "SettingsStorage_ScanFolder": "Yerel veri klasörünü tara",
+    "SettingsStorage_NoLocalMimeDataFound": "Yerel MIME verisi bulunamadı.",
+    "SettingsStorage_NoAccountsFound": "Kayıtlı hesap bulunamadı.",
+    "SettingsStorage_TotalUsage": "Toplam yerel MIME kullanımı: {0}",
+    "SettingsStorage_AccountUsageDescription": "{0} yerel MIME önbelleğinde kullanılıyor.",
+    "SettingsStorage_DeleteAll_Title": "Tüm MIME içeriğini sil",
+    "SettingsStorage_DeleteAll_Description": "Bu hesabın tüm MIME önbellek klasörünü sil.",
+    "SettingsStorage_DeleteAll_Button": "Tümü Sil",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Tüm MIME içeriğini sil",
+    "SettingsStorage_DeleteAll_Confirm_Message": "{0} için tüm yerel MIME verisini silmek istiyor musunuz?",
+    "SettingsStorage_DeleteAll_Success": "Tüm MIME içeriği silindi.",
+    "SettingsStorage_DeleteOld_Title": "Eski MIME içeriğini sil",
+    "SettingsStorage_DeleteOld_Description": "Yerel veritabanındaki e-posta oluşturma tarihine göre MIME dosyalarını sil.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 ay",
+    "SettingsStorage_DeleteOld_3Months": "> 3 ay",
+    "SettingsStorage_DeleteOld_6Months": "> 6 ay",
+    "SettingsStorage_DeleteOld_1Year": "> 1 yıl",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Eski MIME içeriğini sil",
+    "SettingsStorage_DeleteOld_Confirm_Message": "{1} için {0} süresinden daha eski olan yerel MIME verisini silmek istiyor musunuz?",
+    "SettingsStorage_DeleteOld_Success": "{1} süresinden daha eski olan {0} MIME klasörü silindi.",
+    "SettingsStorage_1Month": "1 ay",
+    "SettingsStorage_3Months": "3 ay",
+    "SettingsStorage_6Months": "6 ay",
+    "SettingsStorage_1Year": "1 yıl",
+    "SettingsStorage_Months": "{0} ay",
     "SettingsTaskbarBadge_Description": "Okunmamış posta sayısını sistem çubuğu balonuna ekle.",
     "SettingsTaskbarBadge_Title": "Sistem Çubuğu Balonu",
     "SettingsThreads_Description": "Bağlı mesajları tek bir liste halinde kategorize eder.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Gelen Kutusu'nu başka bir sistem klasörü olarak seçemezsiniz.",
     "SystemFolderConfigSetupSuccess_Message": "Sistem klasörleri başarıyla ayarlandı.",
     "SystemFolderConfigSetupSuccess_Title": "Sistem Klasörleri Ayarlaması",
+    "SystemTrayMenu_ShowWino": "Wino Postalarını Aç",
+    "SystemTrayMenu_ShowWinoCalendar": "Wino Takvimini Aç",
+    "SystemTrayMenu_ExitWino": "Çıkış",
     "TestingImapConnectionMessage": "Sunucu bağlantısı kontrol ediliyor...",
     "TitleBarServerDisconnectedButton_Description": "Wino'nun sunucu bağlantısı yok. Tekrar bağlan'a basarak bağlantıyı onarınız.",
     "TitleBarServerDisconnectedButton_Title": "bağlantı yok",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Sınırsız Hesaba Yükselt",
     "WinoUpgradeRemainingAccountsMessage": "{1} hesabın {0} tanesi kullanıldı.",
     "Yesterday": "Dün",
+    "Smime_ImportCertificates_Success": "Sertifikalar başarıyla içe aktarıldı.",
+    "Smime_ImportCertificates_Error": "Sertifikalar içe aktarılırken hata: {0}",
+    "Smime_RemoveCertificates_Confirm": "{0} sertifikalarını gerçekten kaldırmak istiyor musunuz?",
+    "Smime_RemoveCertificates_Success": "Sertifikalar kaldırıldı.",
+    "Smime_ExportCertificates_Success": "Sertifikalar dışa aktarıldı.",
+    "Smime_ExportCertificates_Error": "Sertifikalar dışa aktarılırken hata.",
+    "Smime_CertificateDetails": "Konu: {0}\nVerici: {1}\nGeçerlilik Başlangıcı: {2}\nGeçerlilik Bitişi: {3}\nParmak izi: {4}",
+    "Smime_CertificatePassword_Title": "Sertifika parolası gerekli",
+    "Smime_CertificatePassword_Placeholder": "{0} için sertifika parolası (isteğe bağlı)",
+    "Smime_Confirm_Title": "Onayla",
+    "Buttons_OK": "OK",
+    "Buttons_Refresh": "Yenile",
+    "SettingsSignatureAndEncryption_Title": "İmza ve Şifreleme",
+    "SettingsSignatureAndEncryption_Description": "E-postaları imzalamak ve şifrelemek için S/MIME sertifikalarını yönetin.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Benim sertifikalarım",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "İmzalama ve şifreleme için kişisel sertifikalar",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Alıcı sertifikaları",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Açma için alıcı sertifikaları",
+    "SettingsSignatureAndEncryption_NameColumn": "İsim",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Sona erer",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Parmak izi",
+    "Buttons_Remove": "Kaldır",
+    "Buttons_Export": "Dışa aktar",
+    "Buttons_Import": "İçe aktar",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/Mime İmzalama Sertifikası",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME Şifreleme",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Yok",
+    "SmimeSignaturesInMessage": "Bu mesajdaki imzalar:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, geçerli {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "S/MIME İmzalama Sertifikası Bilgisi",
+    "SmimeCertificateInfoTitle": "S/MIME Sertifikası Bilgisi",
+    "SmimeNoCertificateFileFound": "Hiç sertifika dosyası bulunamadı.",
+    "SmimeSaveCertificate": "Sertifikayı kaydet...",
+    "SmimeCertificate": "S/MIME Sertifikası",
+    "SmimeCertificateSavedTo": "Sertifika {0}'e kaydedildi",
+    "SmimeSignedTooltip": "Bu mesaj S/MIME sertifikası ile imzalanmıştır. Ayrıntılar için tıklayın.",
+    "SmimeEncryptedTooltip": "Bu mesaj S/MIME sertifikası ile şifrelenmiştir.",
+    "SmimeCertificateFileInfo": "Dosya: {0}",
+    "Composer_LightTheme": "Açık Tema",
+    "Composer_DarkTheme": "Koyu Tema",
+    "Composer_Outdent": "Girintiyi azalt",
+    "Composer_Indent": "Girinti ekle",
+    "Composer_BulletList": "Noktalı Liste",
+    "Composer_OrderedList": "Numaralı Liste",
+    "Composer_Stroke": "Çizgi",
+    "Composer_Bold": "Kalın",
+    "Composer_Italic": "İtalik",
+    "Composer_Underline": "Altı Çizili",
+    "Composer_CcBcc": "Cc ve Bcc",
+    "Composer_EnableSmimeSignature": "S/MIME imzasını etkinleştir/kapat",
+    "Composer_EnableSmimeEncryption": "S/MIME şifrelemesini etkinleştir/kapat",
+    "Composer_LocalDraftSyncInfo": "Bu taslak yalnızca yerel. Wino bunu posta sunucunuza göndermeyi başaramadı. Sunucuya göndermeyi yeniden denemek için tıklayın.",
+    "Composer_CertificateExpires": "Sona eriyor: ",
+    "Composer_SmimeSignature": "S/MIME İmza",
+    "Composer_SmimeEncryption": "S/MIME Şifreleme",
+    "Composer_EmailTemplatesPlaceholder": "E-posta şablonları",
+    "Composer_AiSummarize": "Yapay zeka ile özetle",
+    "Composer_AiSummarizeDescription": "Bu e-postadan ana noktaları, eylem adımlarını ve kararları çıkarın.",
+    "Composer_AiTranslate": "Yapay zeka ile çevir",
+    "Composer_AiActions": "Yapay Zeka Eylemleri",
+    "Composer_AiRewrite": "Yapay zeka ile yeniden yaz",
+    "AiActions_CheckingStatus": "Yapay zeka erişimi kontrol ediliyor...",
+    "AiActions_SignedOutTitle": "Wino AI Paketi Kilidi Aç",
+    "AiActions_SignedOutDescription": "Wino Hesabınıza giriş yapıp AI Paket eklentisini etkinleştirdikten sonra e-postaları AI ile çevirin, yeniden yazın ve özetleyin.",
+    "AiActions_NoPackTitle": "AI Paketi gerekli",
+    "AiActions_NoPackDescription": "Giriş yaptınız, ancak AI Paketi henüz etkin değil. Wino'nun AI çeviri, yeniden yazma ve özetleme araçlarını kullanmak için satın alın.",
+    "AiActions_UsageSummary": "Bu ay kullanılan kredi: {0} / {1} kredi.",
+    "Composer_AiRewritePolite": "Daha nazik hale getir",
+    "Composer_AiRewritePoliteDescription": "Aynı amacı koruyarak ifadeyi yumuşatır.",
+    "Composer_AiRewriteAngry": "Kızgın hale getir",
+    "Composer_AiRewriteAngryDescription": "Daha keskin ve daha çatışmacı bir üslup kullanır.",
+    "Composer_AiRewriteHappy": "Mutlu hale getir",
+    "Composer_AiRewriteHappyDescription": "Daha neşeli ve hevesli bir ton ekler.",
+    "Composer_AiRewriteFormal": "Resmi hale getir",
+    "Composer_AiRewriteFormalDescription": "Mesajı daha profesyonel ve yapılandırılmış bir şekilde ifade eder.",
+    "Composer_AiRewriteFriendly": "Dostane hale getir",
+    "Composer_AiRewriteFriendlyDescription": "Mesajı daha samimi bir tonla daha yakın hale getirir.",
+    "Composer_AiRewriteShorter": "Kısa hale getir",
+    "Composer_AiRewriteShorterDescription": "Metni kısaltır ve gereksiz ayrıntıları çıkarır.",
+    "Composer_AiRewriteClearer": "Daha net hale getir",
+    "Composer_AiRewriteClearerDescription": "Okunabilirliği artırır ve mesajı daha kolay takip edilebilir hale getirir.",
+    "Composer_AiRewriteCustom": "Özel",
+    "Composer_AiRewriteCustomDescription": "Kendi yeniden yazım amacınızı tanımlayın.",
+    "Composer_AiRewriteCustomPlaceholder": "Mesajın nasıl yeniden yazılmasını istediğinizi tanımlayın.",
+    "Composer_AiRewriteMode": "Ton yeniden yaz",
+    "Composer_AiRewriteApply": "Yeniden yazımı uygula",
+    "Composer_AiTranslateDialogTitle": "Yapay Zeka ile Çevir",
+    "Composer_AiTranslateDialogDescription": "Hedef dili veya kültür kodunu girin, örneğin en-US, tr-TR, de-DE veya fr-FR.",
+    "Composer_AiTranslateApply": "Çevir",
+    "Composer_AiTranslateLanguage": "Hedef dil",
+    "Composer_AiTranslateCustomPlaceholder": "Kültür kodunu girin",
+    "Composer_AiTranslateLanguageEnglish": "İngilizce (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Türkçe (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Almanca (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Fransızca (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "İspanyolca (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "İtalyanca (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Portekizce (Brezilya) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Felemenkçe (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Lehçe (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Rusça (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Japonca (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Korece (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Çince, Basitleştirilmiş (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Arapça (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Hintçe (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Diğer...",
+    "Composer_AiBusyTitle": "Yapay Zeka zaten çalışıyor",
+    "Composer_AiBusyMessage": "Mevcut Yapay Zeka işlemi tamamlanana kadar lütfen bekleyin.",
+    "Composer_AiSignInRequired": "AI özelliklerini kullanmak için Wino hesabınıza giriş yapın.",
+    "Composer_AiMissingHtml": "Henüz Wino AI'ye gönderilecek bir mesaj içeriği yok.",
+    "Composer_AiQuotaUnavailable": "Yapay zeka sonucu uygulandı.",
+    "Composer_AiAppliedMessage": "Yapay zeka sonucu kompozitöre uygulandı. Geri almak istersen Geri Al'ı kullan.",
+    "Composer_AiSummarizeSuccessTitle": "AI özeti uygulandı",
+    "Composer_AiTranslateSuccessTitle": "AI çevirisi uygulandı",
+    "Composer_AiRewriteSuccessTitle": "AI yeniden yazımı uygulandı",
+    "Composer_AiErrorTitle": "Yapay zeka işlemi başarısız oldu",
+    "Reader_AiAppliedMessage": "Bu mesaj için yapay zeka sonucu artık gösteriliyor. Orijinal içeriği görmek için mesajı yeniden açın.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Kişiler",
+    "ContactsPage_AddContact": "Kişi Ekle",
+    "ContactsPage_EditContact": "Kişiyi Düzenle",
+    "ContactsPage_DeleteContact": "Kişi Sil",
+    "ContactsPage_SearchPlaceholder": "Kişileri ara...",
+    "ContactsPage_NoContacts": "Kişi bulunamadı",
+    "ContactsPage_ContactsCount": "{0} kişiler",
+    "ContactsPage_SelectedContactsCount": "{0} seçili",
+    "ContactsPage_DeleteSelectedContacts": "Seçili Kişileri Sil",
+    "ContactEditDialog_Title": "Kişiyi Düzenle",
+    "ContactEditDialog_PhotoSection": "Fotoğraf",
+    "ContactEditDialog_ChoosePhoto": "Fotoğraf Seç",
+    "ContactEditDialog_RemovePhoto": "Fotoğrafı Kaldır",
+    "ContactEditDialog_NameHeader": "İsim",
+    "ContactEditDialog_NamePlaceholder": "Kişi adı",
+    "ContactEditDialog_EmailHeader": "E-posta Adresi",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "İletişim Bilgisi",
+    "ContactEditDialog_RootContactInfo": "Bu kök kişi hesaplarınızla ilişkilidir ve silinemez.",
+    "ContactEditDialog_OverriddenContactInfo": "Bu iletişim manuel olarak değiştirilmiştir ve senkronizasyon sırasında güncellenmeyecektir.",
+    "ContactsPage_Subtitle": "E-posta kişilerinizi ve bilgilerini yönetin",
+    "ContactStatus_Account": "Hesap",
+    "ContactStatus_Modified": "Değiştirildi",
+    "ContactAction_Edit": "Kişiyi Düzenle",
+    "ContactAction_ChangePhoto": "Fotoğrafı Değiştir",
+    "ContactAction_Delete": "Kişi Sil",
+    "ContactAction_Add": "Kişi Ekle",
+    "ContactSelection_Selected": "seçili",
+    "ContactSelection_SelectAll": "Tümünü Seç",
+    "ContactSelection_Clear": "Seçimi Temizle",
+    "ContactsPage_EmptyState": "Gösterilecek iletişim yok",
+    "ContactsPage_AddFirstContact": "İlk kişiyi ekleyin",
+    "ContactsPage_ContactsCountSuffix": "kişiler",
+    "ContactsPane_NewContact": "Yeni Kişi",
+    "ContactsPane_DescriptionTitle": "Kişilerinizi yönetin",
+    "ContactsPane_DescriptionBody": "Kişiler oluşturun, bunları yeniden adlandırın, profil resimlerini güncelleyin ve kaydedilmiş bilgileri tek bir yerde düzenli tutun.",
+    "ContactEditDialog_AddTitle": "Kişi Ekle",
+    "ContactInfoBar_ContactAdded": "Kişi başarıyla eklendi.",
+    "ContactInfoBar_ContactUpdated": "Kişi başarıyla güncellendi.",
+    "ContactInfoBar_ContactsDeleted": "Kişiler başarıyla silindi.",
+    "ContactInfoBar_ContactPhotoUpdated": "Kişi fotoğrafı başarıyla güncellendi.",
+    "ContactInfoBar_FailedToLoadContacts": "Kişiler yüklenemedi: {0}",
+    "ContactInfoBar_FailedToAddContact": "Kişi eklenemedi: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Kişi güncellenemedi: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Kişiler silinemedi: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Fotoğraf güncellenemedi: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Kök kişiler silinemez.",
+    "ContactConfirmDialog_DeleteTitle": "Kişiyi Sil",
+    "ContactConfirmDialog_DeleteMessage": "Kişi '{0}' silmek istediğinize emin misiniz?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "{0} adet kişi silmek istediğinizden emin misiniz?",
+    "ContactConfirmDialog_DeleteButton": "Sil",
+    "CalendarAccountSettings_Title": "Takvim Hesabı Ayarları",
+    "CalendarAccountSettings_Description": "{0} için takvim ayarlarını yönetin.",
+    "CalendarAccountSettings_AccountColor": "Hesap Rengi",
+    "CalendarAccountSettings_AccountColorDescription": "Bu takvim hesabı için görüntülenen rengi değiştirin.",
+    "CalendarAccountSettings_SyncEnabled": "Senkronizasyonu Etkinleştir",
+    "CalendarAccountSettings_SyncEnabledDescription": "Bu hesap için takvim senkronizasyonunu etkinleştirin veya devre dışı bırakın.",
+    "CalendarAccountSettings_DefaultShowAs": "Varsayılan Gösterim Durumu",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Bu hesap ile oluşturulan yeni etkinlikler için varsayılan kullanılabilirlik durumunu belirtin.",
+    "CalendarAccountSettings_PrimaryCalendar": "Birincil Takvim",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Bu takvimi hesabın birincil takvimi olarak işaretleyin.",
+    "CalendarSettings_NewEventBehavior_Header": "Yeni Etkinlik düğmesi davranışı",
+    "CalendarSettings_NewEventBehavior_Description": "Yeni Etkinlik düğmesinin her seferinde bir takvim sorup sormayacağını mı yoksa her zaman belirli bir takvimi mi açacağını seçin.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Her seferinde sor.",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Her zaman belirli bir takvimi kullan.",
+    "CalendarSettings_Rendering_Title": "Görüntüleme",
+    "CalendarSettings_Rendering_Description": "Takvim yerleşimini ve görüntüleme davranışını yapılandırın.",
+    "CalendarSettings_Notifications_Title": "Bildirimler",
+    "CalendarSettings_Notifications_Description": "Varsayılan hatırlatma ve erteleme davranışını seçin.",
+    "CalendarSettings_Preferences_Title": "Tercihler",
+    "CalendarSettings_Preferences_Description": "Yeni Etkinlik düğmesinin nasıl davrandığını ayarlayın.",
+    "WhatIsNew_GetStartedButton": "Başla",
+    "WhatIsNew_ContinueAnywayButton": "Her ne olursa olsun devam et",
+    "WhatIsNew_PreparingForNewVersionButton": "Yeni sürüm için hazırlanıyor...",
+    "WhatIsNew_MigrationPreparing_Title": "Verileriniz hazırlanıyor",
+    "WhatIsNew_MigrationPreparing_Description": "Wino güncelleme geçişlerini uyguluyor. Bu sürüm için hesap verilerinizi hazırlarken lütfen bekleyin.",
+    "WhatIsNew_MigrationFailedMessage": "Geçişler hata kodu {0} ile uygulanamadı. Uygulamayı kullanmaya devam edebilirsiniz. Ancak ciddi problemlerle karşılaşırsanız lütfen uygulamayı yeniden yükleyin.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail Güncellendi",
+    "WhatIsNew_MigrationNotification_Message": "Güncellemeyi tamamlamak ve yeni özellikleri görmek için uygulamayı açın.",
+    "WelcomeWindow_Title": "Wino Mail'e Hoş Geldiniz",
+    "WelcomeWindow_Subtitle": "Posta ve Takvim için yerel Windows deneyimi.",
+    "WelcomeWindow_WhatsNewTitle": "Son Değişiklikler",
+    "WelcomeWindow_FeaturesTitle": "Özellikler",
+    "WelcomeWindow_WhatsNewTab": "Neler Yeni",
+    "WelcomeWindow_FeaturesTab": "Özellikler",
+    "WelcomeWindow_GetStartedButton": "Bir hesap ekleyerek başlayın",
+    "WelcomeWindow_GetStartedDescription": "Wino Mail'e başlamak için Outlook, Gmail veya IMAP hesabınızı ekleyin.",
+    "WelcomeWindow_ImportFromWinoAccount": "Wino Hesabınızdan İçe Aktar",
+    "WelcomeWindow_ImportInProgress": "Senkronize edilmiş tercihleriniz ve hesaplarınız içe aktarılıyor...",
+    "WelcomeWindow_ImportNoAccountsFound": "Wino Hesabınızda senkronize edilen hesap bulunamadı. Tercihler mevcutsa geri yüklendi. Bir hesabı manuel olarak eklemek için Başla'ya tıklayın.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} senkronize edilmiş hesap bu cihazda zaten mevcut. Gerekirse başka bir hesap eklemek için Başla'ya tıklayın.",
+    "WelcomeWindow_SetupTitle": "Hesabınızı Kurun",
+    "WelcomeWindow_SetupSubtitle": "Başlamak için e-posta sağlayıcınızı seçin",
+    "WelcomeWindow_AddAccountButton": "Hesap Ekle",
+    "WelcomeWindow_SkipForNow": "Şimdilik atla — Daha sonra kuracağım.",
+    "WelcomeWindow_AppDescription": "Hızlı, odaklı bir gelen kutusu — Windows 11 için yeniden tasarlandı",
+    "WelcomeWizard_Step1Title": "Hoşgeldiniz",
+    "SystemTrayMenu_Open": "Aç",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Senkronizasyon Ayarları",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Wino tercihlerinizi cihazlar arasında senkronize edin.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Eklentileri Aç",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Wino AI Paketi gibi premium özelliklere erişin.",
+    "WinoAccount_Management_Description": "Wino Hesabınızı, AI Pack erişimini ve senkronize tercihler ile hesap ayrıntılarını yönetin.",
+    "WinoAccount_Management_SignedOutTitle": "Wino Mail'e giriş yapın",
+    "WinoAccount_Management_SignedOutDescription": "Postanızı senkronize etmek ve Yapay Zeka özelliklerine erişmek ve ayarlarınızı cihazlar arasında yönetmek için oturum açın veya bir hesap oluşturun.",
+    "WinoAccount_Management_ProfileSectionHeader": "Profil",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino Eklentileri",
+    "WinoAccount_Management_DataSectionHeader": "Veri",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Hesap işlemleri",
+    "WinoAccount_Management_AccountCardTitle": "Hesap",
+    "WinoAccount_Management_AccountCardDescription": "Wino Hesabınızın e-posta adresi ve mevcut hesap durumu.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Paketi",
+    "WinoAccount_Management_AiPackCardDescription": "Wino AI Paketi'nin etkin olup olmadığını ve kullanılabilir kullanım miktarını görün.",
+    "WinoAccount_Management_AiPackActive": "AI Paketi etkin",
+    "WinoAccount_Management_AiPackInactive": "AI Paketi etkin değil",
+    "WinoAccount_Management_AiPackUsage": "{0} kullanımdan {1} kullanım tüketildi. Kalan {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Faturalama dönemi: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Kullanım ayrıntıları şu anda mevcut değil.",
+    "WinoAccount_Management_AiPackBuyDescription": "E-postaları AI ile çevirmek, yeniden yazmak veya özetlemek için Wino AI Paketi'ni satın alın.",
+    "WinoAccount_Management_AiPackPromoTitle": "AI Paketi Kilidini Kaldır",
+    "WinoAccount_Management_AiPackPromoDescription": "Mesajları 50'den fazla dile çevirin, netlik ve ton için yeniden yazın ve uzun e-posta zincirlerinin anlık özetlerini alın.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / mo",
+    "WinoAccount_Management_AiPackPromoRequests": "1.000 kredi",
+    "WinoAccount_Management_AiPackGetButton": "AI Paketi Al",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Paketi",
+    "WinoAddOn_AI_PACK_Description": "Wino Mail için çevirmek, yeniden yazmak ve özetlemek işlemlerinde AI destekli araçlar.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, çeviri, yeniden yazma, özetleme, verimlilik",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Sınırsız Hesaplar",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "İhtiyacınız olan kadar e-posta hesabı ekleyin ve hesap sınırını kaldırın.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "hesaplar, sınırsız, premium, eklenti",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Bu satınımı tamamlamak için Wino Hesabınızla oturum açın.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino bu Microsoft Store satın alımını tamamlayamadı.",
+    "WinoAccount_Management_StoreSyncFailed": "Satın alımınız tamamlandı, ancak Wino hesap avantajlarınızı henüz yenileyemedi. Lütfen bir süre sonra tekrar deneyin.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Aboneliğiniz aktif",
+    "WinoAccount_Management_AiPackRenews": "Yenileniyor {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Bu ay kullanılan krediler",
+    "WinoAccount_Management_AiPackResets": "Sıfırlamalar {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "AI kullanım bakiyenizin yüklenmesinde sorun yaşadık.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Çevir",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Yeniden Yaz",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Özetle",
+    "WinoAccount_Management_AddOnLoadFailed": "Bu eklentinin yüklenmesi sırasında sorun yaşadık.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Tercihleri ve Hesapları Senkronize Et",
+    "WinoAccount_Management_SyncPreferencesDescription": "Wino tercihlerinizi ve posta kutusu ayrıntılarınızı cihazlar arasında içe aktarın veya dışa aktarın. Şifreler, belirteçler ve diğer hassas bilgiler asla senkronize edilmez.",
+    "WinoAccount_Management_SignOutTitle": "Çıkış Yap",
+    "WinoAccount_Management_SignOutDescription": "Bu cihazdaki hesabınızdan çıkış yapın",
+    "WinoAccount_Management_StatusLabel": "Durum: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Bu hesap için henüz senkronize edilmiş veri bulunmuyor.",
+    "WinoAccount_Management_ExportSucceeded": "Seçili Wino verileri başarıyla dışa aktarıldı.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Tercihleriniz Wino Hesabınıza aktarıldı.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "{0} hesap ayrıntısı Wino Hesabınıza aktarıldı.",
+    "WinoAccount_Management_ImportSucceeded": "Wino Hesabınızdan senkronize edilen veriler içe aktarıldı.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "{0} senkronize tercih uygulandı.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "{0} hesap içe aktarıldı.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Bu cihazda zaten mevcut olan {0} adet hesap atlandı.",
+    "WinoAccount_Management_ImportPartial": "{0} senkronize edilmiş ayar uygulandı. {1} ayar geri yüklenemedi.",
+    "WinoAccount_Management_ImportReloginReminder": "Şifreler, erişim belirteçleri ve diğer hassas bilgiler içe aktarılmadı. Bu cihazdaki her hesap için bunları kullanmadan önce yeniden oturum açın.",
+    "WinoAccount_Management_SerializeFailed": "Wino mevcut ayarlarınızı serileştiremedi.",
+    "WinoAccount_Management_EmptyExport": "Dışa aktarılacak hiçbir ayar değeri yok.",
+    "WinoAccount_Management_ImportEmpty": "Geri yüklemek için senkronize edilmiş veri yükünde yeni bir şey yok.",
+    "WinoAccount_Management_ExportDialog_Title": "Wino Hesabınıza Dışa Aktar",
+    "WinoAccount_Management_ExportDialog_Description": "Wino Hesabınıza hangi öğeleri senkronize etmek istediğinizi seçin.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Ayarlar",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Hesaplar",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Şifreler, erişim belirteçleri ve diğer hassas bilgiler senkronize edilmez.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Başka bir PC'de içe aktarılan hesaplar, kullanılabilir hale gelmeden önce yine oturum açmanızı gerektirecek.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Seçili Wino verileri dışa aktarılıyor...",
+    "WinoAccount_Management_LoadFailed": "Wino en son Wino Hesap bilgilerini yükleyemedi.",
+    "WinoAccount_Management_ActionFailed": "Wino Hesap isteği tamamlanamadı.",
+    "WinoAccount_SettingsSection_Title": "Wino Hesabı",
+    "WinoAccount_SettingsSection_Description": "Yerel oturum açma hizmetinizi kullanarak bir Wino Hesabı oluşturun veya oturum açın.",
+    "WinoAccount_RegisterButton_Title": "Hesap Oluştur",
+    "WinoAccount_RegisterButton_Description": "E-posta ve şifre ile Wino Hesabı oluşturun.",
+    "WinoAccount_RegisterButton_Action": "Kayıt sayfasını aç",
+    "WinoAccount_LoginButton_Title": "Giriş Yap",
+    "WinoAccount_LoginButton_Description": "E-posta ve şifre ile mevcut Wino Hesabınıza giriş yapın.",
+    "WinoAccount_LoginButton_Action": "Giriş sayfasını aç",
+    "WinoAccount_SignOutButton_Title": "Çıkış Yap",
+    "WinoAccount_SignOutButton_Description": "Yerel olarak saklanan Wino Hesap oturumunu kaldır.",
+    "WinoAccount_SignOutButton_Action": "Çıkış Yap",
+    "WinoAccount_RegisterDialog_Title": "Wino Hesabı Oluştur",
+    "WinoAccount_RegisterDialog_Description": "Wino deneyiminizi senkronize tutmak ve hesap tabanlı ek özellikleri kullanabilmek için bir Wino Hesabı oluşturun.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Wino Hesabınızı Oluşturun",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Neden bir hesap oluşturalım?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Ayarları cihazlar arasında içe aktarın ve dışa aktarın.",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Kurulumunuzu baştan kurmadan Wino ayarlarını cihazlar arasında taşıyın.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Wino AI Pack (ücretli) gibi özel eklentilere erişim",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Bir hesapla mevcut olduğunda premium Wino özelliklerini kullanıma açın.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino Hesabı, e-posta hesaplarınızdan bağımsızdır.",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Outlook, Gmail, IMAP veya diğer e-posta hesaplarınız olduğu gibi kalır. Wino Hesabı yalnızca Wino'ya özgü özellikleri ve hesap tabanlı ek özellikleri yönetir.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Kayıt Ol",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Gizlilik ve API İşleme",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Wino AI Pack gibi isteğe bağlı eklentiler, bu özellikleri kullandığınızda yalnızca seçili e-posta HTML içeriğini Wino API hizmetine gönderebilir.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Gizlilik Politikası'nı Oku",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Gizlilik politikasını kabul ediyorum.",
+    "WinoAccount_LoginDialog_Title": "Wino Hesabına Giriş Yap",
+    "WinoAccount_LoginDialog_Description": "Wino Hesabınıza giriş yaparak Wino kurulumunuzu senkronize edin ve hesap tabanlı özelliklere erişin.",
+    "WinoAccount_LoginDialog_HeroTitle": "Tekrar Hoşgeldiniz",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Giriş Yapmanın Sunduğu Avantajlar",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Wino Hesabınızı kullanarak cihazlar arasında ayarları senkronize etmeye devam edin ve Wino AI Pack gibi ücretli eklentilere erişin.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Bu, e-posta posta kutunuz için oturum açma değildir.",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Burada oturum açmak, Wino'daki Outlook, Gmail veya IMAP hesaplarınızı eklemez veya değiştirmez. Sadece Wino'ya özgü hizmetlere giriş yapmanızı sağlar.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Şifrenizi mi unuttunuz?",
+    "WinoAccount_EmailLabel": "E-posta",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Şifre",
+    "WinoAccount_ConfirmPasswordLabel": "Şifreyi Doğrula",
+    "WinoAccount_ForgotPasswordDialog_Title": "Şifrenizi Sıfırlayın",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Şifre sıfırlama e-postası gönder",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Girişe geri dön",
+    "WinoAccount_ForgotPasswordDialog_Description": "Wino Hesap e-posta adresinizi girin; adres kayıtlıysa size bir şifre sıfırlama bağlantısı göndereceğiz.",
+    "WinoAccount_Validation_EmailRequired": "E-posta gerekli.",
+    "WinoAccount_Validation_PasswordRequired": "Şifre gerekli.",
+    "WinoAccount_Validation_PasswordMismatch": "Şifreler eşleşmiyor.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Wino Hesabı oluşturmadan önce gizlilik politikasını kabul etmelisiniz.",
+    "WinoAccount_Error_InvalidCredentials": "E-posta adresi veya şifre yanlış.",
+    "WinoAccount_Error_AccountLocked": "Bu hesap geçici olarak kilitlidir.",
+    "WinoAccount_Error_AccountBanned": "Bu hesap yasaklandı.",
+    "WinoAccount_Error_AccountSuspended": "Bu hesap askıya alındı.",
+    "WinoAccount_Error_EmailNotConfirmed": "Giriş yapmadan önce e-posta adresinizi doğrulayın.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Giriş yapmadan önce e-posta adresinizi doğrulayın.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Yeni bir onay e-postası henüz mevcut değil.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Bu onay isteği artık geçerli değildir. Lütfen tekrar giriş yapmayı deneyin.",
+    "WinoAccount_Error_EmailNotRegistered": "Bu e-posta adresi kayıtlı değildir.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Oturumunuz artık geçerli değildir. Lütfen tekrar oturum açın.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Bu e-posta adresi zaten kayıtlı.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Harici oturum açmayı tamamlamak için bir e-posta adresine ihtiyaç vardır.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Harici oturum açma isteği geçersiz.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Harici oturum açma durumu geçersiz veya süresi dolmuş.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Harici oturum açma kodu geçersiz veya süresi dolmuş.",
+    "WinoAccount_Error_AiPackRequired": "Bu işlem için aktif bir Wino AI Pack aboneliği gereklidir.",
+    "WinoAccount_Error_AiQuotaExceeded": "Geçerli faturalandırma döneminde AI Pack kullanımınızın sınırı aşıldı.",
+    "WinoAccount_Error_AiHtmlEmpty": "İşlenecek e-posta içeriği yok.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Bu e-posta, Wino AI ile işlemek için çok büyük.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Bu dil desteklenmiyor. Geçerli bir kültür kodu olarak en-US veya tr-TR deneyin.",
+    "WinoAccount_Error_Forbidden": "Bu işlemi gerçekleştirme izniniz yok.",
+    "WinoAccount_Error_ValidationFailed": "İstek geçersiz. Lütfen girilen değerleri inceleyin.",
+    "WinoAccount_RegisterSuccessMessage": "{0} için Wino Hesabı kaydı tamamlandı.",
+    "WinoAccount_LoginSuccessMessage": "{0} olarak Wino Hesabınıza giriş yapıldı.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "E-posta adresinizi doğrulayın.",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "{0} adresine bir e-posta onayı gönderdik. Lütfen onaylayın ve tekrar giriş yapmayı deneyin.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "E-posta onayı gerekiyor.",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "{0} adresini doğrulamanızı hâlâ bekliyoruz.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Onay e-postasını yeniden gönder",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Onay e-postasını {0} içinde yeniden gönderebilirsiniz.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Şimdi onay e-postasını yeniden gönderebilirsiniz.",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Onay e-postası yeniden gönderildi.",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Yine {0} adresine bir onay e-postası gönderdik. Lütfen onaylayın ve tekrar giriş yapmayı deneyin.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Şifre sıfırlama e-postası gönderildi.",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "{0} adresine bir şifre sıfırlama e-postası gönderdik. Bu mesajı açın ve yeni bir şifre belirleyin.",
+    "WinoAccount_ChangePassword_Title": "Şifreyi Değiştir",
+    "WinoAccount_ChangePassword_Description": "Bu Wino Hesabına bir şifre sıfırlama e-postası gönderin.",
+    "WinoAccount_ChangePassword_Action": "Şifre sıfırlama e-posta gönder",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Wino'nun {0} adresine şifre sıfırlama e-postası göndermesini istiyor musunuz?",
+    "WinoAccount_SignOut_SuccessMessage": "Wino Hesabı {0}'ndan çıkış yapıldı.",
+    "WinoAccount_SignOut_NoAccountMessage": "Çıkış yapılacak aktif bir Wino Hesabı bulunmuyor.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino Hesabı",
+    "WinoAccount_Titlebar_SignedOutDescription": "Wino oturumunuzu yönetmek için Wino Hesabınıza giriş yapın veya bir Wino Hesabı oluşturun.",
+    "WinoAccount_Titlebar_SignedInStatus": "Durum: {0}",
+    "WelcomeWizard_Step2Title": "Hesap Ekle",
+    "WelcomeWizard_Step3Title": "Kurulumu Tamamla",
+    "ProviderSelection_Title": "E-posta sağlayıcınızı seçin",
+    "ProviderSelection_Subtitle": "Aşağıdaki sağlayıcıyı seçerek e-posta hesabınızı Wino Mail'e ekleyin.",
+    "ProviderSelection_AccountNameHeader": "Hesap Adı",
+    "ProviderSelection_AccountNamePlaceholder": "örn. Kişisel, İş",
+    "ProviderSelection_DisplayNameHeader": "Görünen Ad",
+    "ProviderSelection_DisplayNamePlaceholder": "örn. John Doe",
+    "ProviderSelection_EmailHeader": "E-posta Adresi",
+    "ProviderSelection_EmailPlaceholder": "örn. johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Uygulama İçin Özel Şifre",
+    "ProviderSelection_AppPasswordHelp": "Uygulama için özel bir şifre nasıl alırım?",
+    "ProviderSelection_CalendarModeHeader": "Takvim Entegrasyonu",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Devre Dışı",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Takvim entegrasyonu yok",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV Senkronizasyonu",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Takvim etkinlikleriniz cihazlarınız arasında Apple sunucularına senkronize edilir.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Takvim etkinlikleriniz cihazlarınız arasında Yahoo sunucularına senkronize edilir.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Yerel takvim",
+    "ProviderSelection_CalendarMode_LocalDescription": "Etkinlikleriniz yalnızca bilgisayarınızda saklanır. Sunucu bağlantısı yok.",
+    "ProviderSelection_ClearColor": "Rengi temizle",
+    "ProviderSelection_ContinueButton": "Devam Et",
+    "ProviderSelection_SpecialImap_Subtitle": "Bağlanmak için hesabınızın kimlik bilgilerini girin.",
+    "AccountSetup_Title": "Hesabınız Kuruluyor",
+    "AccountSetup_Step_Authenticating": "{0} ile kimlik doğrulama yapılıyor",
+    "AccountSetup_Step_TestingMailAuth": "E-posta kimlik doğrulaması test ediliyor.",
+    "AccountSetup_Step_SyncingFolders": "Klasör meta verilerini senkronize ediliyor.",
+    "AccountSetup_Step_FetchingProfile": "Profil bilgileri alınıyor.",
+    "AccountSetup_Step_DiscoveringCalDav": "CalDAV ayarları keşfediliyor.",
+    "AccountSetup_Step_TestingCalendarAuth": "Takvim kimlik doğrulaması test ediliyor.",
+    "AccountSetup_Step_SavingAccount": "Hesap bilgileri kaydediliyor.",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Takvim meta verileri alınıyor.",
+    "AccountSetup_Step_SyncingAliases": "Takma adlar senkronize ediliyor.",
+    "AccountSetup_Step_Finalizing": "Kurulumu tamamlanıyor.",
+    "AccountSetup_FailureMessage": "Kurulum başarısız oldu. Ayarlarınızı düzeltmek için geri gidin veya daha sonra tekrar deneyin.",
+    "AccountSetup_SuccessMessage": "Hesabınız başarıyla kuruldu!",
+    "AccountSetup_GoBackButton": "Geri Dön",
+    "AccountSetup_TryAgainButton": "Tekrar Dene",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Otomatik keşif başarısız oldu. Gelişmiş sekmede ayarları manuel olarak girin."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/uk_UA/resources.json b/Wino.Core.Domain/Translations/uk_UA/resources.json
index 6bc82f76..2a81aafd 100644
--- a/Wino.Core.Domain/Translations/uk_UA/resources.json
+++ b/Wino.Core.Domain/Translations/uk_UA/resources.json
@@ -8,6 +8,7 @@
     "AccountCacheReset_Message": "Для цього облікового запису необхідно повністю пересинхронізувати ваші повідомлення. Будь ласка, дочекайтеся, поки Wino синхронізує ваші повідомлення...",
     "AccountContactNameYou": "Ви",
     "AccountCreationDialog_Completed": "все готово",
+    "AccountCreationDialog_FetchingCalendarMetadata": "Отримання відомостей календаря.",
     "AccountCreationDialog_FetchingEvents": "Події календаря завантажуються.",
     "AccountCreationDialog_FetchingProfileInformation": "Деталі профілю завантажуються.",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "Якщо Ваш браузер не запустився автоматично для закінчення автентифікації:",
@@ -17,6 +18,7 @@
     "AccountCreationDialog_Initializing": "ініціалізація",
     "AccountCreationDialog_PreparingFolders": "Ми зараз отримуємо інформацію про теки.",
     "AccountCreationDialog_SigninIn": "Дані облікового запису зберігаються.",
+    "Purchased": "Куплено",
     "AccountEditDialog_Message": "Назва облікового запису",
     "AccountEditDialog_Title": "Редагувати обліковий запис",
     "AccountPickerDialog_Title": "Оберіть обліковий запис",
@@ -26,6 +28,10 @@
     "AccountDetailsPage_Description": "Змініть ім'я облікового запису у Wino і встановіть бажане ім'я відправника.",
     "AccountDetailsPage_ColorPicker_Title": "Колір облікового запису",
     "AccountDetailsPage_ColorPicker_Description": "Встановіть новий колір облікового запису для його символу в списку.",
+    "AccountDetailsPage_TabGeneral": "Загальне",
+    "AccountDetailsPage_TabMail": "Пошта",
+    "AccountDetailsPage_TabCalendar": "Календар",
+    "AccountDetailsPage_CalendarListDescription": "Виберіть календар, щоб налаштувати його параметри.",
     "AddHyperlink": "Додати",
     "AppCloseBackgroundSynchronizationWarningTitle": "Фонова синхронізація",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "Програму не налаштовано на автозапуск під час запуску Windows.",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "Обліковий запис IMAP",
     "Busy": "Зайнятий",
     "Buttons_AddAccount": "Додати обліковий запис",
+    "Buttons_FixAccount": "Виправити обліковий запис",
     "Buttons_AddNewAlias": "Додати новий псевдонім",
     "Buttons_Allow": "Дозволити",
+    "Buttons_Apply": "Застосувати",
     "Buttons_ApplyTheme": "Застосувати тему",
     "Buttons_Browse": "Огляд",
     "Buttons_Cancel": "Скасувати",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "Редагувати",
     "Buttons_EnableImageRendering": "Увімкнути",
     "Buttons_Multiselect": "Обрати кілька",
+    "Buttons_Manage": "Керувати",
     "Buttons_No": "Ні",
     "Buttons_Open": "Відкрити",
     "Buttons_Purchase": "Купити",
@@ -70,15 +79,134 @@
     "Buttons_Save": "Зберегти",
     "Buttons_SaveConfiguration": "Зберегти конфігурацію",
     "Buttons_Send": "Надіслати",
+    "Buttons_SendToServer": "Надіслати на сервер",
     "Buttons_Share": "Поділитись",
     "Buttons_SignIn": "Увійти",
     "Buttons_Sync": "Синхронізувати",
     "Buttons_SyncAliases": "Синхронізувати псевдоніми",
     "Buttons_TryAgain": "Спробувати ще раз",
     "Buttons_Yes": "Так",
+    "Sync_SynchronizingFolder": "Синхронізується {0} {1}%",
+    "Sync_DownloadedMessages": "Завантажено {0} повідомлень з {1}",
+    "SyncAction_Archiving": "Архівування {0} лист(ів)",
+    "SyncAction_ClearingFlag": "Зняття позначки з {0} лист(ів)",
+    "SyncAction_CreatingDraft": "Створення чернетки",
+    "SyncAction_CreatingEvent": "Створення події",
+    "SyncAction_Deleting": "Видалення {0} лист(ів)",
+    "SyncAction_EmptyingFolder": "Очищення папки",
+    "SyncAction_MarkingAsRead": "Позначення {0} лист(ів) як прочитаних",
+    "SyncAction_MarkingAsUnread": "Позначення {0} лист(ів) як непрочитаних",
+    "SyncAction_MarkingFolderAsRead": "Позначення папки як прочитаної",
+    "SyncAction_Moving": "Переміщення {0} лист(ів)",
+    "SyncAction_MovingToFocused": "Переміщення {0} лист(ів) до Focused",
+    "SyncAction_RenamingFolder": "Перейменування папки",
+    "SyncAction_SendingMail": "Надсилання листа",
+    "SyncAction_SettingFlag": "Позначення {0} лист(ів) прапорцем",
+    "SyncAction_SynchronizingAccount": "Синхронізується {0}",
+    "SyncAction_SynchronizingAccounts": "Синхронізується {0} обліковий запис(и)",
+    "SyncAction_SynchronizingCalendarData": "Синхронізуються дані календаря",
+    "SyncAction_SynchronizingCalendarEvents": "Синхронізуються події календаря",
+    "SyncAction_SynchronizingCalendarMetadata": "Синхронізуються метадані календаря",
+    "SyncAction_Unarchiving": "Розархівування {0} лист(ів)",
     "CalendarAllDayEventSummary": "події на увесь день",
     "CalendarDisplayOptions_Color": "Колір",
     "CalendarDisplayOptions_Expand": "Розгорнути",
+    "CalendarEventResponse_Accept": "Прийняти",
+    "CalendarEventResponse_AcceptedResponse": "Прийнято",
+    "CalendarEventResponse_Decline": "Відхилити",
+    "CalendarEventResponse_DeclinedResponse": "Відхилено",
+    "CalendarEventResponse_NotResponded": "Без відповіді",
+    "CalendarEventResponse_Tentative": "Попередньо",
+    "CalendarEventResponse_TentativeResponse": "Попередньо",
+    "CalendarEventRsvpPanel_Accept": "Прийняти",
+    "CalendarEventRsvpPanel_AddMessage": "Додати повідомлення до вашої відповіді... (необов'язково)",
+    "CalendarEventRsvpPanel_Decline": "Відхилити",
+    "CalendarEventRsvpPanel_Message": "Повідомлення",
+    "CalendarEventRsvpPanel_SendReplyMessage": "Надіслати відповідь",
+    "CalendarEventRsvpPanel_Tentative": "Попередньо",
+    "CalendarEventRsvpPanel_Title": "Опції відповіді",
+    "CalendarAttendeeStatus_Accepted": "Прийнято",
+    "CalendarAttendeeStatus_Declined": "Відхилено",
+    "CalendarAttendeeStatus_NeedsAction": "Потрібна дія",
+    "CalendarAttendeeStatus_Tentative": "Попередньо",
+    "CalendarEventDetails_Attachments": "Вкладення",
+    "CalendarEventCompose_AddAttachment": "Додати вкладення",
+    "CalendarEventCompose_AllDay": "Увесь день",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "Вкладення не підтримуються для календарів CalDAV.",
+    "CalendarEventCompose_EndDate": "Дата завершення",
+    "CalendarEventCompose_EndTime": "Час завершення",
+    "CalendarEventCompose_Every": "кожен",
+    "CalendarEventCompose_ForWeekdays": "для",
+    "CalendarEventCompose_FrequencyDay": "день",
+    "CalendarEventCompose_FrequencyDayPlural": "днів",
+    "CalendarEventCompose_FrequencyMonth": "місяць",
+    "CalendarEventCompose_FrequencyMonthPlural": "місяців",
+    "CalendarEventCompose_FrequencyWeek": "тиждень",
+    "CalendarEventCompose_FrequencyWeekPlural": "тижнів",
+    "CalendarEventCompose_FrequencyYear": "рік",
+    "CalendarEventCompose_FrequencyYearPlural": "років",
+    "CalendarEventCompose_Location": "Місцезнаходження",
+    "CalendarEventCompose_LocationPlaceholder": "Додати місцезнаходження",
+    "CalendarEventCompose_NewEventButton": "Нова подія",
+    "CalendarEventCompose_DefaultCalendarHint": "Ви можете вибрати календар за замовчуванням для нових подій у налаштуваннях календаря.",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "Відкрити налаштування календаря",
+    "CalendarEventCompose_NoCalendarsMessage": "Наразі немає доступних календарів для створення події.",
+    "CalendarEventCompose_NoCalendarsTitle": "Немає доступних календарів",
+    "CalendarEventCompose_NoEndDate": "Немає дати завершення",
+    "CalendarEventCompose_Notes": "Примітки",
+    "CalendarEventCompose_PickCalendarTitle": "Виберіть календар",
+    "CalendarEventCompose_Recurring": "Повторюваний",
+    "CalendarEventCompose_RecurringSummary": "Відбувається кожні {0} {1}{2} {3} дійсні {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "Відбувається {0}{1} {2} дійсні {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "Повторювати кожні",
+    "CalendarEventCompose_SelectCalendar": "Вибрати календар",
+    "CalendarEventCompose_SingleOccurrenceSummary": "Відбувається {0} {1}",
+    "CalendarEventCompose_StartDate": "Дата початку",
+    "CalendarEventCompose_StartTime": "Час початку",
+    "CalendarEventCompose_TimeRangeSummary": "від {0} до {1}",
+    "CalendarEventCompose_Title": "Назва події",
+    "CalendarEventCompose_TitlePlaceholder": "Додати назву",
+    "CalendarEventCompose_Until": "до",
+    "CalendarEventCompose_UntilSummary": " до {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "Дата завершення події на увесь день має бути після дати початку.",
+    "CalendarEventCompose_ValidationInvalidAttendee": "Одна або кілька учасників мають некоректну адресу електронної пошти.",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "Дата закінчення повторюваності повинна бути рівною або більшою за дату початку події.",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "Кінцевий час повинен бути пізніше за час початку.",
+    "CalendarEventCompose_ValidationMissingAttachment": "Одне або кілька вкладень більше не доступні: {0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "Виберіть календар перед створенням події.",
+    "CalendarEventCompose_ValidationMissingTitle": "Введіть назву події перед створенням події.",
+    "CalendarEventCompose_ValidationTitle": "Перевірка події не вдалася.",
+    "CalendarEventCompose_WeekdaySummary": " на {0}",
+    "CalendarEventCompose_Weekday_Friday": "Пт",
+    "CalendarEventCompose_Weekday_Monday": "Пн",
+    "CalendarEventCompose_Weekday_Saturday": "Сб",
+    "CalendarEventCompose_Weekday_Sunday": "Нд",
+    "CalendarEventCompose_Weekday_Thursday": "Чт",
+    "CalendarEventCompose_Weekday_Tuesday": "Вт",
+    "CalendarEventCompose_Weekday_Wednesday": "Ср",
+    "CalendarEventDetails_Details": "Деталі",
+    "CalendarEventDetails_EditSeries": "Редагувати серію",
+    "CalendarEventDetails_Editing": "Редагування",
+    "CalendarEventDetails_InviteSomeone": "Запросити когось",
+    "CalendarEventDetails_JoinOnline": "Приєднатися онлайн",
+    "CalendarEventDetails_Organizer": "Організатор",
+    "CalendarEventDetails_People": "Учасники",
+    "CalendarEventDetails_ReadOnlyEvent": "Подія лише для читання",
+    "CalendarEventDetails_Reminder": "Нагадування",
+    "CalendarReminder_StartedHoursAgo": "Розпочато {0} годин тому",
+    "CalendarReminder_StartedMinutesAgo": "Розпочато {0} хвилин тому",
+    "CalendarReminder_StartedNow": "Розпочато лише зараз",
+    "CalendarReminder_StartingNow": "Починається зараз",
+    "CalendarReminder_StartsInHours": "Починається через {0} годин",
+    "CalendarReminder_StartsInMinutes": "Починається через {0} хвилин",
+    "CalendarReminder_SnoozeAction": "Відкласти",
+    "CalendarReminder_SnoozeMinutesOption": "{0} хвилин",
+    "CalendarEventDetails_ShowAs": "Показати як",
+    "CalendarShowAs_Free": "Вільно",
+    "CalendarShowAs_Tentative": "Попередньо",
+    "CalendarShowAs_Busy": "Зайнятий",
+    "CalendarShowAs_OutOfOffice": "За межами офісу",
+    "CalendarShowAs_WorkingElsewhere": "Працює в іншому місці",
     "CalendarItem_DetailsPopup_JoinOnline": "Приєднатись онлайн",
     "CalendarItem_DetailsPopup_ViewEventButton": "Переглянути подію",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "Переглянути послідовність",
@@ -88,6 +216,9 @@
     "ClipboardTextCopied_Message": "{0} скопійовано до буфера обміну.",
     "ClipboardTextCopied_Title": "Скопійовано",
     "ClipboardTextCopyFailed_Message": "Не вдалося скопіювати {0} в буфер обміну.",
+    "ContactInfoBar_ErrorTitle": "Не вдалося завантажити контактну інформацію",
+    "ContactInfoBar_SuccessTitle": "Контактна інформація завантажена",
+    "ContactInfoBar_WarningTitle": "Контактна інформація може бути неповною",
     "ComingSoon": "Незабаром...",
     "ComposerAttachmentsDragDropAttach_Message": "Прикріпити",
     "ComposerAttachmentsDropZone_Message": "Перетягніть файли сюди",
@@ -129,6 +260,10 @@
     "DialogMessage_CreateLinkedAccountTitle": "Назва зв'язки облікових записів",
     "DialogMessage_DeleteAccountConfirmationMessage": "Видалити {0}?",
     "DialogMessage_DeleteAccountConfirmationTitle": "Усі дані, пов'язані з цим обліковим записом, будуть видалені з диска назавжди.",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "Видалити шаблон \"{0}\"?",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "Видалити шаблон електронної пошти",
+    "DialogMessage_DeleteRecurringSeriesMessage": "Це видалить усі події з серії. Продовжити?",
+    "DialogMessage_DeleteRecurringSeriesTitle": "Видалити повторювану серію",
     "DialogMessage_DiscardDraftConfirmationMessage": "Цю чернетку буде відкинуто. Продовжити?",
     "DialogMessage_DiscardDraftConfirmationTitle": "Відкинути чернетку",
     "DialogMessage_EmptySubjectConfirmation": "Теми не вказано",
@@ -172,11 +307,18 @@
     "ElementTheme_Light": "Світлий режим",
     "Emoji": "Емодзі",
     "Error_FailedToSetupSystemFolders_Title": "Не вдалося налаштувати системні теки",
+    "Exception_AccountNeedsAttention_Title": "Обліковий запис потребує уваги",
+    "Exception_AccountNeedsAttention_Message": "'{0}' потребує вашої уваги для продовження роботи.",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail не вдалося знайти середовище виконання WebView2 від Microsoft Edge. Встановіть або відновіть середовище виконання, щоб правильно відображати вміст повідомлення.",
+    "Exception_WebView2RuntimeMissing_Title": "Потрібне середовище виконання WebView2",
     "Exception_AuthenticationCanceled": "Автентифікацію скасовано",
     "Exception_CustomThemeExists": "Ця тема вже існує.",
     "Exception_CustomThemeMissingName": "Необхідно вказати ім'я.",
     "Exception_CustomThemeMissingWallpaper": "Необхідно надати власне фонове зображення.",
     "Exception_FailedToSynchronizeAliases": "Не вдалося синхронізувати псевдоніми",
+    "Exception_FailedToSynchronizeCalendarData": "Не вдалося синхронізувати дані календаря",
+    "Exception_FailedToSynchronizeCalendarEvents": "Не вдалося синхронізувати події календаря",
+    "Exception_FailedToSynchronizeCalendarMetadata": "Не вдалося синхронізувати деталі календаря",
     "Exception_FailedToSynchronizeFolders": "Не вдалося синхронізувати теки",
     "Exception_FailedToSynchronizeProfileInformation": "Не вдалося синхронізувати дані профілю",
     "Exception_GoogleAuthCallbackNull": "Callback uri дорівнює null при активації.",
@@ -229,6 +371,32 @@
     "HoverActionOption_MoveJunk": "Перемістити до Небажаних",
     "HoverActionOption_ToggleFlag": "Відмітити / Прибрати помітку",
     "HoverActionOption_ToggleRead": "Прочитане / Непрочитане",
+    "KeyboardShortcuts_FailedToReset": "Не вдалося скинути ярлики клавіатури.",
+    "KeyboardShortcuts_FailedToUpdate": "Не вдалося оновити ярлики клавіатури",
+    "KeyboardShortcuts_MailoperationAction": "Дія",
+    "KeyboardShortcuts_Action": "Дія",
+    "KeyboardShortcuts_FailedToLoad": "Не вдалося завантажити ярлики клавіатури.",
+    "KeyboardShortcuts_EnterKeyForShortcut": "Будь ласка, введіть клавішу для ярлика.",
+    "KeyboardShortcuts_SelectOperationForShortcut": "Будь ласка, оберіть дію для ярлика.",
+    "KeyboardShortcuts_EnterKey": "Будь ласка, введіть клавішу для ярлика.",
+    "KeyboardShortcuts_SelectOperation": "Будь ласка, оберіть дію для ярлика.",
+    "KeyboardShortcuts_ShortcutInUse": "Цей ярлик уже використовується іншим ярликом.",
+    "KeyboardShortcuts_FailedToSave": "Не вдалося зберегти ярлик.",
+    "KeyboardShortcuts_FailedToDelete": "Не вдалося видалити ярлик.",
+    "KeyboardShortcuts_PageDescription": "Налаштуйте ярлики клавіатури для швидких операцій з поштою. Натискайте клавіші, коли фокус знаходиться у полі вводу клавіші, щоб зафіксувати ярлики.",
+    "KeyboardShortcuts_Add": "Додати ярлик",
+    "KeyboardShortcuts_EditTitle": "Редагувати ярлик клавіатури",
+    "KeyboardShortcuts_ResetToDefaults": "Скинути за замовчуванням",
+    "KeyboardShortcuts_PressKeysHere": "Натискайте клавіші тут...",
+    "KeyboardShortcuts_KeyCombination": "Комбінація клавіш",
+    "KeyboardShortcuts_FocusArea": "Перемістіть фокус у поле вище та натисніть потрібну комбінацію клавіш",
+    "KeyboardShortcuts_Modifiers": "Модифікатори клавіш",
+    "KeyboardShortcuts_Mode": "Режим застосунку",
+    "KeyboardShortcuts_ModeMail": "Пошта",
+    "KeyboardShortcuts_ModeCalendar": "Календар",
+    "KeyboardShortcuts_ActionToggleReadUnread": "Переключити читане/не читане",
+    "KeyboardShortcuts_ActionToggleFlag": "Переключити прапорець",
+    "KeyboardShortcuts_ActionToggleArchive": "Переключити архів/розархівувати",
     "ImageRenderingDisabled": "Показ зображень вимкнено для цього повідомлення.",
     "ImapAdvancedSetupDialog_AuthenticationMethod": "Метод автентифікації",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "Безпека підключення",
@@ -295,12 +463,58 @@
     "IMAPSetupDialog_Username": "Ім'я користувача",
     "IMAPSetupDialog_UsernamePlaceholder": "marjanatkachenko, marjanatkachenko@fabrikam.com, domain/marjanatkachenko",
     "IMAPSetupDialog_UseSameConfig": "Використовувати ті самі ім'я користувача та пароль для надсилання пошти",
+    "ImapCalDavSettingsPage_TitleCreate": "Налаштування IMAP та календаря",
+    "ImapCalDavSettingsPage_TitleEdit": "Редагувати налаштування IMAP та календаря",
+    "ImapCalDavSettingsPage_Subtitle": "Налаштувати IMAP/SMTP та необов'язкову синхронізацію календаря для цього облікового запису.",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "Базова конфігурація",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "Введіть ваші дані для входу та облікові дані. Wino може спробувати автоматично визначити параметри сервера.",
+    "ImapCalDavSettingsPage_BasicTab": "Базове",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "Увімкнути підтримку календаря",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "Автоматичне визначення налаштувань пошти",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "Налаштування пошти знайдено та застосовано.",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "Розширена конфігурація",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "Введіть параметри сервера вручну, якщо автоматичне визначення недоступне або неправильне.",
+    "ImapCalDavSettingsPage_AdvancedTab": "Розширено",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "Налаштування календаря",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "Виберіть, як дані календаря повинні працювати з цим обліковим записом IMAP.",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "Режим календаря",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "Захист з'єднання",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "Метод автентифікації",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "Вимкнено",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "Синхронізація CalDAV",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "Локальний календар лише",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "Календар вимкнено для цього облікового запису.",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "Елементи календаря синхронізуються з вашим сервером CalDAV.",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "Елементи календаря зберігаються тільки на цьому комп'ютері і не синхронізуються з мережею.",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "Як працює локальний календар",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "Локальний календар лише",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "Локальний календар зберігає всі події лише на вашому комп'ютері. Нічого не синхронізується з iCloud, Yahoo або будь-яким іншим постачальником.",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "URL сервісу CalDAV",
+    "ImapCalDavSettingsPage_CalDavUsername": "Ім'я користувача CalDAV",
+    "ImapCalDavSettingsPage_CalDavPassword": "Пароль CalDAV",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "Тест CalDAV потрібен лише тоді, коли режим календаря встановлено на синхронізацію CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "Потрібен URL сервісу CalDAV.",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "URL сервісу CalDAV має бути абсолютним URL.",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "Потрібне ім'я користувача CalDAV.",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "Потрібен пароль CalDAV.",
+    "ImapCalDavSettingsPage_TestImapButton": "Перевірити з'єднання IMAP.",
+    "ImapCalDavSettingsPage_TestCalDavButton": "Перевірити з'єднання CalDAV.",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "Тест з'єднання IMAP успішно виконано.",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "Тест з'єднання CalDAV успішно виконано.",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "Налаштування облікового запису перевірено та збережено.",
+    "ImapCalDavSettingsPage_ICloudHint": "Використовуйте пароль для програми, згенерований у налаштуваннях вашого облікового запису Apple.",
+    "ImapCalDavSettingsPage_YahooHint": "Використовуйте пароль для програми з налаштувань безпеки вашого облікового запису Yahoo.",
     "Info_AccountCreatedMessage": "{0} створено",
     "Info_AccountCreatedTitle": "Створення облікового запису",
     "Info_AccountCreationFailedTitle": "Не вдалося створити обліковий запис",
     "Info_AccountDeletedMessage": "{0} успішно видалено.",
     "Info_AccountDeletedTitle": "Обліковий запис видалено",
     "Info_AccountIssueFixFailedTitle": "Не вдалося",
+    "Info_AccountIssueFixImapMessage": "Відкрийте сторінку з налаштуваннями IMAP та календаря, щоб знову ввести дані сервера.",
+    "Info_AccountAttentionRequiredMessage": "Цьому обліковому запису потрібна ваша увага.",
+    "Info_AccountAttentionRequiredClickableMessage": "Клацніть, щоб виправити цей обліковий запис і повторно синхронізувати його.",
+    "Info_AccountAttentionRequiredAction": "Виправити",
+    "Info_AccountAttentionRequiredActionHint": "Натисніть Виправити, щоб вирішити проблему з цим обліковим записом.",
     "Info_AccountIssueFixSuccessMessage": "Виправлено всі проблеми з обліковим записом.",
     "Info_AccountIssueFixSuccessTitle": "Виконано",
     "Info_AttachmentOpenFailedMessage": "Не вдається відкрити вкладення.",
@@ -370,6 +584,7 @@
     "InfoBarMessage_SynchronizationDisabledFolder": "Ця тека відключена для синхронізації.",
     "InfoBarTitle_SynchronizationDisabledFolder": "Відключена тека",
     "Justify": "Вирівняти",
+    "MenuUpdateAvailable": "Доступне оновлення",
     "Left": "Ліворуч",
     "Link": "Посилання",
     "LinkedAccountsCreatePolicyMessage": "потрібно мати хоча б 2 облікові записи, щоб створити зв'язку\nзв'язку буде видалено при збереженні",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "Розархівувати",
     "MailOperation_ViewMessageSource": "Переглянути джерело повідомлення",
     "MailOperation_Zoom": "Масштабувати",
+    "MailsDragging": "Перетягується {0} елемент(ів)",
     "MailsSelected": "Елементів обрано: {0}",
     "MarkFlagUnflag": "Позначити відміченим/невідміченим",
     "MarkReadUnread": "Позначити прочитаним/непрочитаним",
@@ -434,6 +650,8 @@
     "Notifications_MultipleNotificationsTitle": "Свіжа пошта",
     "Notifications_WinoUpdatedMessage": "Погляньте на нову версію {0}",
     "Notifications_WinoUpdatedTitle": "Wino Mail було оновлено.",
+    "Notifications_StoreUpdateAvailableTitle": "Доступне оновлення",
+    "Notifications_StoreUpdateAvailableMessage": "Нова версія Wino Mail готова до встановлення через Microsoft Store.",
     "OnlineSearchFailed_Message": "Не вдалося виконати пошук\n{0}\n\nПоказ офлайн-повідомлень.",
     "OnlineSearchTry_Line1": "Не знайшли, що шукали?",
     "OnlineSearchTry_Line2": "Спробуйте онлайн-пошук.",
@@ -446,7 +664,6 @@
     "PaneLengthOption_Small": "Мала",
     "Photos": "Фото",
     "PreparingFoldersMessage": "Підготовка тек",
-    "ProtocolLogAvailable_Message": "Лоґи протоколів доступні для діагностики.",
     "ProviderDetail_Gmail_Description": "Обліковий запис Google",
     "ProviderDetail_iCloud_Description": "Обліковий запис Apple iCloud",
     "ProviderDetail_iCloud_Title": "iCloud",
@@ -465,9 +682,14 @@
     "SearchBarPlaceholder": "Пошук",
     "SearchingIn": "Пошук в",
     "SearchPivotName": "Результати",
+    "Settings_KeyboardShortcuts_Title": "Гарячі клавіші",
+    "Settings_KeyboardShortcuts_Description": "Керуйте гарячими клавішами для швидких дій з листами.",
     "SettingConfigureSpecialFolders_Button": "Налаштувати",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "Налаштування IMAP/SMTP",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "Змінити налаштування сервера вхідної/вихідної пошти.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "Налаштування IMAP та календаря",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "Відкрийте спеціальну сторінку налаштувань IMAP, SMTP та CalDAV для цього облікового запису.",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "Відкрити налаштування",
     "SettingsAbout_Description": "Дізнатися більше про Wino.",
     "SettingsAbout_Title": "Про програму",
     "SettingsAboutGithub_Description": "Перейти до трекера задач репозиторія GitHub.",
@@ -490,6 +712,10 @@
     "SettingsAppPreferences_SearchMode_Local": "Локальний",
     "SettingsAppPreferences_SearchMode_Online": "Онлайн",
     "SettingsAppPreferences_SearchMode_Title": "Типовий режим пошуку",
+    "SettingsAppPreferences_ApplicationMode_Title": "Режим застосунку за замовчуванням",
+    "SettingsAppPreferences_ApplicationMode_Description": "Виберіть режим запуску Wino за замовчуванням, якщо явний тип активації не задано.",
+    "SettingsAppPreferences_ApplicationMode_Mail": "Пошта",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "Календар",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail продовжуватиме працювати у фоновому режимі. Ви отримуватимете сповіщення про нові листи.",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "Працювати у фоні",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail продовжуватиме працювати у системному лотку. Ви зможете відкрити його, натиснувши на іконку. Ви отримуватимете сповіщення про нові листи.",
@@ -506,12 +732,30 @@
     "SettingsAppPreferences_StartupBehavior_FatalError": "Критична помилка виникла під час зміни режиму автозапуску для Wino Mail.",
     "SettingsAppPreferences_StartupBehavior_Title": "Запускати в згорнутому стані при запуску Windows",
     "SettingsAppPreferences_Title": "Параметри програми",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "Приховати кнопку облікового запису Wino на панелі заголовка",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "Приховати кнопку профіля на панелі заголовка, яка відкриває випадаюче меню облікового запису Wino.",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "Сповіщення про оновлення магазину",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "Показувати сповіщення та дії внизу, коли доступне оновлення Microsoft Store.",
+    "SettingsAppPreferences_AiActions_Title": "Дії ШІ",
+    "SettingsAppPreferences_AiActions_Description": "Виберіть мови ШІ за замовчуванням та де зберігати підсумки.",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "Мова перекладу за замовчуванням",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "Виберіть мову перекладу за замовчуванням, яку використають дії перекладу ШІ.",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "Мова підсумовування",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "Виберіть бажану мову підсумування для майбутнього виводу резюме ШІ.",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "Шлях збереження підсумків за замовчуванням",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "Виберіть папку, яку Wino використовуватиме за замовчуванням для збереження підсумків ШІ.",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "Використовуйте системне місце збереження за замовчуванням.",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "Ця папка не існує. За замовчуванням буде використано місце збереження для підсумків.",
     "SettingsAutoSelectNextItem_Description": "Обирати наступний елемент після видалення або переміщення листа.",
     "SettingsAutoSelectNextItem_Title": "Автовибір наступного елемента",
     "SettingsAvailableThemes_Description": "Оберіть тему з колекції Wino на свій смак або застосуйте власні теми.",
     "SettingsAvailableThemes_Title": "Доступні теми",
     "SettingsCalendarSettings_Description": "Змінити перший день тижня, висоту клітинок годин і багато іншого...",
     "SettingsCalendarSettings_Title": "Параметри календаря",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "Тривалість відкладення за замовчуванням",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "Встановіть тривалість відкладення за замовчуванням для сповіщень про нагадування в календарі.",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "Формат заголовка дня у вигляді з часовою прив'язкою",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "Виберіть, як верхні позначки дня відображаються в режимах день, тиждень та робочий тиждень. Використовуйте токени формату дати, такі як ddd, dd, MMM або dddd.",
     "SettingsComposer_Title": "Редактор",
     "SettingsComposerFont_Title": "Типовий шрифт редактора",
     "SettingsComposerFontFamily_Description": "Змінити типову сім'ю шрифтів і розмір шрифту для написання листів.",
@@ -531,6 +775,9 @@
     "SettingsDiscord_Title": "Канал у Discord",
     "SettingsEditLinkedInbox_Description": "Додати / видалити облікові записи, перейменувати або розірвати зв'язку між обліковими записами.",
     "SettingsEditLinkedInbox_Title": "Редагувати зв'язану скриньку",
+    "SettingsWindowBackdrop_Title": "Фон вікна",
+    "SettingsWindowBackdrop_Description": "Виберіть ефект фону для вікон Wino.",
+    "SettingsWindowBackdrop_Disabled": "Вибір фону вікна недоступний, якщо вибрана тема програми відмінна від за замовчуванням.",
     "SettingsElementTheme_Description": "Оберіть тему Windows для Wino",
     "SettingsElementTheme_Title": "Колірний режим",
     "SettingsElementThemeSelectionDisabled": "Вибір колірного режиму вимкнено, коли обрана нетипова тема програми.",
@@ -581,6 +828,8 @@
     "SettingsManageAliases_Title": "Псевдоніми",
     "SettingsEditAccountDetails_Title": "Редагувати деталі облікового запису",
     "SettingsEditAccountDetails_Description": "Змініть ім'я облікового запису, ім'я відправника та призначте новий колір, якщо хочете.",
+    "EditAccountDetailsPage_SaveSuccess_Title": "Зміни збережено.",
+    "EditAccountDetailsPage_SaveSuccess_Message": "Дані облікового запису успішно оновлено.",
     "SettingsManageLink_Description": "Перемістіть елементи, щоб додати нову зв'язку або видалити наявну зв'язку.",
     "SettingsManageLink_Title": "Керування зв'язкою",
     "SettingsMarkAsRead_Description": "Змініть те, що має статися з обраним листом.",
@@ -596,7 +845,41 @@
     "SettingsNotifications_Title": "Сповіщення",
     "SettingsNotificationsAndTaskbar_Description": "Змінити, чи повинні показуватися сповіщення і значок на панелі завдань для цього облікового запису.",
     "SettingsNotificationsAndTaskbar_Title": "Сповіщення та панель завдань",
+    "SettingsHome_Title": "Головна",
+    "SettingsHome_SearchTitle": "Знайдіть параметр",
+    "SettingsHome_SearchDescription": "Пошук за ознакою, темою або ключовим словом для негайного переходу до потрібної сторінки налаштувань.",
+    "SettingsHome_SearchPlaceholder": "Пошук у налаштуваннях",
+    "SettingsHome_SearchExamples": "Спробуйте: тема, зберігання, мова, підпис",
+    "SettingsHome_QuickLinks_Title": "Швидкі посилання",
+    "SettingsHome_QuickLinks_Description": "Перейдіть до налаштувань, до яких люди звертаються найчастіше.",
+    "SettingsHome_StorageCard_Description": "Перегляньте, скільки локального MIME-змісту зберігає Wino на цьому пристрої, та очистіть його за потреби.",
+    "SettingsHome_StorageEmptySummary": "Ще не виявлено кешованого MIME-змісту.",
+    "SettingsHome_StorageLoading": "Перевіряємо використання локального MIME...",
+    "SettingsHome_Tips_Title": "Поради та хитрощі",
+    "SettingsHome_Tips_Description": "Кілька невеликих змін можуть зробити Wino більш персоналізованим.",
+    "SettingsHome_Tip_Theme": "Хочете темний режим або зміни акцентів? Відкрийте Персоналізацію.",
+    "SettingsHome_Tip_Background": "Використовуйте параметри застосунку для керування запуском та фоновою синхронізацією.",
+    "SettingsHome_Tip_Shortcuts": "Гарячі клавіші допомагають швидше переміщатися між листами.",
+    "SettingsHome_Resources_Title": "Корисні посилання",
+    "SettingsHome_Resources_Description": "Відкрийте ресурси проекту, інформацію підтримки та канали випуску.",
     "SettingsOptions_Title": "Налаштування",
+    "SettingsOptions_GeneralSection": "Загальні",
+    "SettingsOptions_MailSection": "Пошта",
+    "SettingsOptions_CalendarSection": "Календар",
+    "SettingsOptions_MoreComingSoon": "Інші параметри з'являться незабаром.",
+    "SettingsOptions_HeroDescription": "Налаштуйте свій досвід використання Wino Mail.",
+    "SettingsOptions_AccountsSummary": "{0} обліковий запис(и) налаштовано",
+    "SettingsSearch_ManageAccounts_Keywords": "обліковий запис;облікові записи;поштова скринька;поштові скриньки;псевдонім;псевдоніми;профіль;адреса;адреси",
+    "SettingsSearch_AppPreferences_Keywords": "запуск;фоном;запуск;синхронізація;сповіщення;сповіщення;пошук;панель трея;за замовчуванням",
+    "SettingsSearch_LanguageTime_Keywords": "мова;час;годинник;локаль;регіон;формат;24-годинний;24г",
+    "SettingsSearch_Personalization_Keywords": "тема;темний;світлий;зовнішній вигляд;акцент;колір;колір;режим;розкладка;щільність",
+    "SettingsSearch_About_Keywords": "про;версія;веб-сайт;конфіденційність;GitHub;пожертвування;магазин;підтримка",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "гаряча клавіша;гарячі клавіші;гаряча клавіша;гарячі клавіші;клавіатура;клавіші",
+    "SettingsSearch_MessageList_Keywords": "повідомлення;повідомлення;список;потоки;потоки;аватар;попередній перегляд;відправник",
+    "SettingsSearch_ReadComposePane_Keywords": "читач;скласти;композитор;шрифт;шрифти;зовнішній вміст;відображення;читання",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "підпис;підписи;шифрування;сертифікат;сертифікати;S/MIME;SMIME;безпека",
+    "SettingsSearch_Storage_Keywords": "збереження;кеш;кешування;MIME;диск;місце;очистка;очистити;локальні дані",
+    "SettingsSearch_CalendarSettings_Keywords": "календар;тиждень;години;розклад;подія;події",
     "SettingsPaneLengthReset_Description": "Скинути розмір списку листів до початкового, якщо з ним є проблеми.",
     "SettingsPaneLengthReset_Title": "Скинути розмір списку листів",
     "SettingsPaypal_Description": "Покажіть ще більше любові ❤️ Ми вдячні за всі пожертви.",
@@ -610,6 +893,8 @@
     "SettingsPrefer24HourClock_Title": "Показувати час у 24-годинному форматі",
     "SettingsPrivacyPolicy_Description": "Переглянути політику конфіденційності.",
     "SettingsPrivacyPolicy_Title": "Політика конфіденційності",
+    "SettingsWebsite_Description": "Відкрити веб-сайт Wino Mail.",
+    "SettingsWebsite_Title": "Веб-сайт",
     "SettingsReadComposePane_Description": "Шрифти, зовнішній вміст.",
     "SettingsReadComposePane_Title": "Переглядач і Редактор",
     "SettingsReader_Title": "Переглядач",
@@ -625,6 +910,19 @@
     "SettingsShowPreviewText_Title": "Попередній перегляд тексту",
     "SettingsShowSenderPictures_Description": "Приховувати/показувати аватарки відправників.",
     "SettingsShowSenderPictures_Title": "Аватарки відправників",
+    "SettingsEmailTemplates_Title": "Шаблони електронної пошти",
+    "SettingsEmailTemplates_Description": "Керуйте шаблонами електронної пошти",
+    "SettingsEmailTemplates_CreatePageTitle": "Новий шаблон",
+    "SettingsEmailTemplates_EditPageTitle": "Редагувати шаблон",
+    "SettingsEmailTemplates_NewTemplateTitle": "Новий шаблон",
+    "SettingsEmailTemplates_NewTemplateDescription": "Створити новий шаблон електронної пошти",
+    "SettingsEmailTemplates_NameTitle": "Назва",
+    "SettingsEmailTemplates_NamePlaceholder": "Назва шаблону",
+    "SettingsEmailTemplates_DescriptionTitle": "Опис",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "Необов'язковий опис",
+    "SettingsEmailTemplates_ContentTitle": "Зміст шаблону",
+    "SettingsEmailTemplates_ContentDescription": "Редагуйте HTML-зміст цього шаблона.",
+    "SettingsEmailTemplates_NameRequired": "Потрібна назва шаблону.",
     "SettingsEnableGravatarAvatars_Title": "Gravatar",
     "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
     "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
@@ -645,6 +943,33 @@
     "SettingsStartupItem_Title": "Обліковий запис для запуску",
     "SettingsStore_Description": "Покажіть свою любов ❤️",
     "SettingsStore_Title": "Оцініть у Store",
+    "SettingsStorage_Title": "Зберігання",
+    "SettingsStorage_Description": "Сканування та керування кешем MIME, що зберігається у вашій локальній папці даних.",
+    "SettingsStorage_ScanFolder": "Сканувати локальну папку даних",
+    "SettingsStorage_NoLocalMimeDataFound": "Локальні MIME-дані не знайдено.",
+    "SettingsStorage_NoAccountsFound": "Не знайдено облікових записів.",
+    "SettingsStorage_TotalUsage": "Загальне використання локальних MIME-даних: {0}",
+    "SettingsStorage_AccountUsageDescription": "Використано {0} у локальному кеші MIME.",
+    "SettingsStorage_DeleteAll_Title": "Видалити весь MIME-вміст",
+    "SettingsStorage_DeleteAll_Description": "Видалити повністю кеш MIME цього облікового запису.",
+    "SettingsStorage_DeleteAll_Button": "Видалити все",
+    "SettingsStorage_DeleteAll_Confirm_Title": "Видалити весь MIME-вміст",
+    "SettingsStorage_DeleteAll_Confirm_Message": "Видалити всі локальні MIME-дані для {0}?",
+    "SettingsStorage_DeleteAll_Success": "Усі MIME-дані були видалені.",
+    "SettingsStorage_DeleteOld_Title": "Видалити старі MIME-дані",
+    "SettingsStorage_DeleteOld_Description": "Видалити MIME-файли за датою створення листа в локальній базі даних.",
+    "SettingsStorage_DeleteOld_1Month": "> 1 місяць",
+    "SettingsStorage_DeleteOld_3Months": "> 3 місяці",
+    "SettingsStorage_DeleteOld_6Months": "> 6 місяців",
+    "SettingsStorage_DeleteOld_1Year": "> 1 рік",
+    "SettingsStorage_DeleteOld_Confirm_Title": "Видалити старий MIME-вміст",
+    "SettingsStorage_DeleteOld_Confirm_Message": "Видалити локальні MIME-дані старіші за {0} для {1}?",
+    "SettingsStorage_DeleteOld_Success": "Видалено {0} MIME-папку(-и), старіші за {1}.",
+    "SettingsStorage_1Month": "1 місяць",
+    "SettingsStorage_3Months": "3 місяці",
+    "SettingsStorage_6Months": "6 місяців",
+    "SettingsStorage_1Year": "1 рік",
+    "SettingsStorage_Months": "{0} місяців",
     "SettingsTaskbarBadge_Description": "Показувати кількість непрочитаних у значку на панелі завдань.",
     "SettingsTaskbarBadge_Title": "Значок на панелі завдань",
     "SettingsThreads_Description": "Організуйте повідомлення в ланцюжки розмов.",
@@ -683,6 +1008,9 @@
     "SystemFolderConfigDialogValidation_InboxSelected": "Ви не можете призначати теку Вхідні до будь-якої іншої системної теки.",
     "SystemFolderConfigSetupSuccess_Message": "Системні теки успішно налаштовані.",
     "SystemFolderConfigSetupSuccess_Title": "Налаштування системних тек",
+    "SystemTrayMenu_ShowWino": "Відкрити Wino Mail",
+    "SystemTrayMenu_ShowWinoCalendar": "Відкрити Wino Calendar",
+    "SystemTrayMenu_ExitWino": "Вийти",
     "TestingImapConnectionMessage": "Перевірка підключення до сервера...",
     "TitleBarServerDisconnectedButton_Description": "Wino відключено від мережі. Натисніть кнопку \"Перепідключитися\", щоб відновити підключення.",
     "TitleBarServerDisconnectedButton_Title": "немає з'єднання",
@@ -699,8 +1027,422 @@
     "WinoUpgradeMessage": "Оновити до необмеженої кількості облікових записів",
     "WinoUpgradeRemainingAccountsMessage": "{0} з {1} безкоштовних облікових записів використано.",
     "Yesterday": "Вчора",
+    "Smime_ImportCertificates_Success": "Сертифікати успішно імпортовано.",
+    "Smime_ImportCertificates_Error": "Помилка імпорту сертифікатів: {0}",
+    "Smime_RemoveCertificates_Confirm": "Дійсно хочете видалити сертифікати {0}?",
+    "Smime_RemoveCertificates_Success": "Сертифікати видалено.",
+    "Smime_ExportCertificates_Success": "Сертифікати експортовано.",
+    "Smime_ExportCertificates_Error": "Помилка експорту сертифікатів.",
+    "Smime_CertificateDetails": "Суб'єкт: {0}\nВидавець: {1}\nДійсний з: {2}\nДійсний до: {3}\nВідбиток: {4}",
+    "Smime_CertificatePassword_Title": "Потрібен пароль сертифіката",
+    "Smime_CertificatePassword_Placeholder": "Пароль сертифіката для {0} (необов'язковий)",
+    "Smime_Confirm_Title": "Підтвердити",
+    "Buttons_OK": "ОК",
+    "Buttons_Refresh": "Оновити",
+    "SettingsSignatureAndEncryption_Title": "Підпис та шифрування",
+    "SettingsSignatureAndEncryption_Description": "Керування сертифікатами S/MIME для підписання та шифрування електронних листів.",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "Мої сертифікати",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "Особисті сертифікати для підписання та шифрування",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "Сертифікати одержувачів",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "Сертифікати одержувачів для розшифрування",
+    "SettingsSignatureAndEncryption_NameColumn": "Ім'я",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "Закінчується",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "Відбиток",
+    "Buttons_Remove": "Видалити",
+    "Buttons_Export": "Експорт",
+    "Buttons_Import": "Імпорт",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME сертифікат підпису",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME сертифікат шифрування",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "Немає",
+    "SmimeSignaturesInMessage": "Підписи в цьому листі:",
+    "SmimeSignatureEntry": "• {0} {1} ({2}, дійсний до {3} - {4})",
+    "SmimeSigningCertificateInfoTitle": "Інформація про S/MIME-сертифікат підпису",
+    "SmimeCertificateInfoTitle": "Інформація про S/MIME-сертифікат",
+    "SmimeNoCertificateFileFound": "Файл сертифіката не знайдено",
+    "SmimeSaveCertificate": "Зберегти сертифікат...",
+    "SmimeCertificate": "S/MIME-сертифікат",
+    "SmimeCertificateSavedTo": "Сертифікат збережено до {0}",
+    "SmimeSignedTooltip": "Цьому повідомленню підписано за допомогою S/MIME-сертифіката. Натисніть, щоб переглянути деталі.",
+    "SmimeEncryptedTooltip": "Цьому повідомленню використано S/MIME-сертифікат для шифрування.",
+    "SmimeCertificateFileInfo": "Файл: {0}",
+    "Composer_LightTheme": "Світла тема",
+    "Composer_DarkTheme": "Темна тема",
+    "Composer_Outdent": "Зменшити відступ",
+    "Composer_Indent": "Збільшити відступ",
+    "Composer_BulletList": "Маркерований список",
+    "Composer_OrderedList": "Нумерований список",
+    "Composer_Stroke": "Обводка",
+    "Composer_Bold": "Жирний",
+    "Composer_Italic": "Курсив",
+    "Composer_Underline": "Підкреслення",
+    "Composer_CcBcc": "Копія (Cc) та прихована копія (Bcc)",
+    "Composer_EnableSmimeSignature": "Увімкнути/вимкнути підпис S/MIME",
+    "Composer_EnableSmimeEncryption": "Увімкнути/вимкнути шифрування S/MIME",
+    "Composer_LocalDraftSyncInfo": "Ця чернетка зберігається локально. Wino не вдалося надіслати її на ваш поштовий сервер. Натисніть, щоб повторити відправлення на сервер.",
+    "Composer_CertificateExpires": "Закінчується: ",
+    "Composer_SmimeSignature": "S/MIME підпис",
+    "Composer_SmimeEncryption": "S/MIME шифрування",
+    "Composer_EmailTemplatesPlaceholder": "Шаблони електронної пошти",
+    "Composer_AiSummarize": "Підсумуйте за допомогою ШІ",
+    "Composer_AiSummarizeDescription": "Виділити основні пункти, завдання та рішення з цього електронного листа.",
+    "Composer_AiTranslate": "Перекласти за допомогою ШІ",
+    "Composer_AiActions": "Дії ШІ",
+    "Composer_AiRewrite": "Переписати за допомогою ШІ",
+    "AiActions_CheckingStatus": "Перевіряю доступ до ШІ...",
+    "AiActions_SignedOutTitle": "Розблокувати пакет Wino AI",
+    "AiActions_SignedOutDescription": "Перекладайте, переписуйте та підсумовуйте електронні листи за допомогою ШІ після входу в обліковий запис Wino та активації надбудови AI Pack.",
+    "AiActions_NoPackTitle": "Потрібен пакет AI",
+    "AiActions_NoPackDescription": "Ви увійшли, але пакет AI ще не активний. Придбайте його, щоб користуватися інструментами перекладу, переписування та підсумовування від Wino за допомогою ШІ.",
+    "AiActions_UsageSummary": "{0} з {1} кредитів використано цього місяця.",
+    "Composer_AiRewritePolite": "Зробити ввічливішим",
+    "Composer_AiRewritePoliteDescription": "Пом'якшує формулювання, зберігаючи той же зміст.",
+    "Composer_AiRewriteAngry": "Зробити більш різким",
+    "Composer_AiRewriteAngryDescription": "Використовує більш різкий та конфронтаційний тон.",
+    "Composer_AiRewriteHappy": "Зробити його щасливим",
+    "Composer_AiRewriteHappyDescription": "Додає більш піднесений та завзятий тон.",
+    "Composer_AiRewriteFormal": "Зробити його більш офіційним",
+    "Composer_AiRewriteFormalDescription": "Зміцнює повідомлення більш професійним та структурованим.",
+    "Composer_AiRewriteFriendly": "Зробити більш дружнім",
+    "Composer_AiRewriteFriendlyDescription": "Надає повідомленню більш дружелюбного тону.",
+    "Composer_AiRewriteShorter": "Зробити коротшим",
+    "Composer_AiRewriteShorterDescription": "Стискає текст і прибирає зайві деталі.",
+    "Composer_AiRewriteClearer": "Зробити його яснішим",
+    "Composer_AiRewriteClearerDescription": "Покращує читабельність та робить повідомлення легшим для сприйняття.",
+    "Composer_AiRewriteCustom": "Користувацьке",
+    "Composer_AiRewriteCustomDescription": "Опишіть свої наміри щодо переформулювання.",
+    "Composer_AiRewriteCustomPlaceholder": "Опишіть, як ви хочете переформулювати повідомлення",
+    "Composer_AiRewriteMode": "Змінити тон",
+    "Composer_AiRewriteApply": "Застосувати переформулювання.",
+    "Composer_AiTranslateDialogTitle": "Перекласти за допомогою ШІ",
+    "Composer_AiTranslateDialogDescription": "Введіть цільову мову або код культури, наприклад en-US, tr-TR, de-DE або fr-FR.",
+    "Composer_AiTranslateApply": "Перекласти",
+    "Composer_AiTranslateLanguage": "Цільова мова",
+    "Composer_AiTranslateCustomPlaceholder": "Введіть код культури",
+    "Composer_AiTranslateLanguageEnglish": "Англійська (en-US)",
+    "Composer_AiTranslateLanguageTurkish": "Турецька (tr-TR)",
+    "Composer_AiTranslateLanguageGerman": "Німецька (de-DE)",
+    "Composer_AiTranslateLanguageFrench": "Французька (fr-FR)",
+    "Composer_AiTranslateLanguageSpanish": "Іспанська (es-ES)",
+    "Composer_AiTranslateLanguageItalian": "Італійська (it-IT)",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "Португальська (Бразилія) (pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "Нідерландська (nl-NL)",
+    "Composer_AiTranslateLanguagePolish": "Польська (pl-PL)",
+    "Composer_AiTranslateLanguageRussian": "Російська (ru-RU)",
+    "Composer_AiTranslateLanguageJapanese": "Японська (ja-JP)",
+    "Composer_AiTranslateLanguageKorean": "Корейська (ko-KR)",
+    "Composer_AiTranslateLanguageChineseSimplified": "Китайська, спрощена (zh-CN)",
+    "Composer_AiTranslateLanguageArabic": "Арабська (ar-SA)",
+    "Composer_AiTranslateLanguageHindi": "Хінді (hi-IN)",
+    "Composer_AiTranslateLanguageOther": "Інше...",
+    "Composer_AiBusyTitle": "ШІ вже працює",
+    "Composer_AiBusyMessage": "Будь ласка, зачекайте, доки поточна дія ШІ завершиться.",
+    "Composer_AiSignInRequired": "Увійдіть у свій обліковий запис Wino, щоб використати функції ШІ.",
+    "Composer_AiMissingHtml": "Поки що немає вмісту повідомлення для відправлення до Wino AI.",
+    "Composer_AiQuotaUnavailable": "Результат ШІ застосовано.",
+    "Composer_AiAppliedMessage": "Результат ШІ застосовано до редактора. Використайте Відмінити, щоб повернути зміни.",
+    "Composer_AiSummarizeSuccessTitle": "Підсумок ШІ застосовано.",
+    "Composer_AiTranslateSuccessTitle": "Переклад ШІ застосовано.",
+    "Composer_AiRewriteSuccessTitle": "Переформулювання ШІ застосовано.",
+    "Composer_AiErrorTitle": "Помилка дії ШІ.",
+    "Reader_AiAppliedMessage": "Результат ШІ тепер відображається для цього повідомлення. Відкрийте повідомлення знову, щоб переглянути оригінальний вміст.",
     "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail."
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "Контакти",
+    "ContactsPage_AddContact": "Додати контакт",
+    "ContactsPage_EditContact": "Редагувати контакт",
+    "ContactsPage_DeleteContact": "Видалити контакт",
+    "ContactsPage_SearchPlaceholder": "Пошук контактів...",
+    "ContactsPage_NoContacts": "Контакти не знайдено",
+    "ContactsPage_ContactsCount": "{0} контакт(ів)",
+    "ContactsPage_SelectedContactsCount": "{0} обраний(і)",
+    "ContactsPage_DeleteSelectedContacts": "Видалити обрані",
+    "ContactEditDialog_Title": "Редагувати контакт",
+    "ContactEditDialog_PhotoSection": "Фото",
+    "ContactEditDialog_ChoosePhoto": "Вибрати фото",
+    "ContactEditDialog_RemovePhoto": "Видалити фото",
+    "ContactEditDialog_NameHeader": "Ім'я",
+    "ContactEditDialog_NamePlaceholder": "Ім'я контакту",
+    "ContactEditDialog_EmailHeader": "Електронна адреса",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "Інформація контакту",
+    "ContactEditDialog_RootContactInfo": "Це кореневий контакт, пов'язаний з вашими обліковими записами, і його не можна видалити.",
+    "ContactEditDialog_OverriddenContactInfo": "Цей контакт було вручну змінено і під час синхронізації він не оновлюватиметься.",
+    "ContactsPage_Subtitle": "Керуйте контактами електронної пошти та їхньою інформацією.",
+    "ContactStatus_Account": "Обліковий запис",
+    "ContactStatus_Modified": "Змінено",
+    "ContactAction_Edit": "Редагувати контакт",
+    "ContactAction_ChangePhoto": "Змінити фото",
+    "ContactAction_Delete": "Видалити контакт",
+    "ContactAction_Add": "Додати контакт",
+    "ContactSelection_Selected": "обраний",
+    "ContactSelection_SelectAll": "Вибрати все",
+    "ContactSelection_Clear": "Очистити виділення",
+    "ContactsPage_EmptyState": "Немає контактів для відображення",
+    "ContactsPage_AddFirstContact": "Додайте ваш перший контакт",
+    "ContactsPage_ContactsCountSuffix": "контакти",
+    "ContactsPane_NewContact": "Новий контакт",
+    "ContactsPane_DescriptionTitle": "Керуйте своїми контактами",
+    "ContactsPane_DescriptionBody": "Створюйте контакти, перейменовуйте їх, оновлюйте зображення профілю та зберігайте збережені дані в одному місці.",
+    "ContactEditDialog_AddTitle": "Додати контакт",
+    "ContactInfoBar_ContactAdded": "Контакт успішно додано.",
+    "ContactInfoBar_ContactUpdated": "Контакт успішно оновлено.",
+    "ContactInfoBar_ContactsDeleted": "Контакти успішно видалено.",
+    "ContactInfoBar_ContactPhotoUpdated": "Фото контакту успішно оновлено.",
+    "ContactInfoBar_FailedToLoadContacts": "Не вдалося завантажити контакти: {0}",
+    "ContactInfoBar_FailedToAddContact": "Не вдалося додати контакт: {0}",
+    "ContactInfoBar_FailedToUpdateContact": "Не вдалося оновити контакт: {0}",
+    "ContactInfoBar_FailedToDeleteContacts": "Не вдалося видалити контакти: {0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "Не вдалося оновити фото: {0}",
+    "ContactInfoBar_CannotDeleteRoot": "Не можна видалити корневі контакти.",
+    "ContactConfirmDialog_DeleteTitle": "Видалити контакт",
+    "ContactConfirmDialog_DeleteMessage": "Ви впевнені, що хочете видалити контакт '{0}'?",
+    "ContactConfirmDialog_DeleteMultipleMessage": "Ви впевнені, що хочете видалити {0} контакт(ів)?",
+    "ContactConfirmDialog_DeleteButton": "Видалити",
+    "CalendarAccountSettings_Title": "Налаштування облікового запису календаря",
+    "CalendarAccountSettings_Description": "Керуйте налаштуваннями календаря для {0}",
+    "CalendarAccountSettings_AccountColor": "Колір облікового запису",
+    "CalendarAccountSettings_AccountColorDescription": "Змінити відображуваний колір для цього календарного облікового запису",
+    "CalendarAccountSettings_SyncEnabled": "Увімкнути синхронізацію",
+    "CalendarAccountSettings_SyncEnabledDescription": "Увімкнути або вимкнути синхронізацію календаря для цього облікового запису",
+    "CalendarAccountSettings_DefaultShowAs": "Статус відображення за замовчуванням",
+    "CalendarAccountSettings_DefaultShowAsDescription": "Статус доступності за замовчуванням для нових подій, створених за допомогою цього облікового запису",
+    "CalendarAccountSettings_PrimaryCalendar": "Основний календар",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "Позначити цей календар як основний календар для облікового запису",
+    "CalendarSettings_NewEventBehavior_Header": "Поведінка кнопки створення події",
+    "CalendarSettings_NewEventBehavior_Description": "Виберіть, чи кнопка створення події має запитувати календар щоразу, або завжди відкривати певний календар.",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "Запитувати кожного разу",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "Завжди використовувати певний календар.",
+    "CalendarSettings_Rendering_Title": "Відображення",
+    "CalendarSettings_Rendering_Description": "Налаштуйте макет календаря та поведінку відображення.",
+    "CalendarSettings_Notifications_Title": "Сповіщення",
+    "CalendarSettings_Notifications_Description": "Виберіть поведінку за замовчуванням для нагадувань та відкладання.",
+    "CalendarSettings_Preferences_Title": "Налаштування",
+    "CalendarSettings_Preferences_Description": "Встановіть, як має працювати кнопка створення події.",
+    "WhatIsNew_GetStartedButton": "Почати",
+    "WhatIsNew_ContinueAnywayButton": "Продовжити все одно",
+    "WhatIsNew_PreparingForNewVersionButton": "Підготовка до нової версії...",
+    "WhatIsNew_MigrationPreparing_Title": "Підготовка ваших даних",
+    "WhatIsNew_MigrationPreparing_Description": "Wino застосовує міграції оновлення. Будь ласка, зачекайте, поки ми підготуємо дані вашого облікового запису для цього випуску.",
+    "WhatIsNew_MigrationFailedMessage": "Застосування міграцій завершилося помилкою {0}. Ви можете продовжувати використовувати застосунок. Однак, якщо виникнуть серйозні проблеми, повторно встановіть застосунок.",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail оновлено",
+    "WhatIsNew_MigrationNotification_Message": "Відкрийте застосунок, щоб завершити оновлення та переглянути зміни.",
+    "WelcomeWindow_Title": "Ласкаво просимо до Wino Mail",
+    "WelcomeWindow_Subtitle": "Нативний досвід Windows для пошти та календаря.",
+    "WelcomeWindow_WhatsNewTitle": "Останні зміни",
+    "WelcomeWindow_FeaturesTitle": "Функції",
+    "WelcomeWindow_WhatsNewTab": "Що нового",
+    "WelcomeWindow_FeaturesTab": "Функції",
+    "WelcomeWindow_GetStartedButton": "Почати, додавши обліковий запис",
+    "WelcomeWindow_GetStartedDescription": "Додайте ваш Outlook, Gmail або IMAP обліковий запис, щоб почати з Wino Mail.",
+    "WelcomeWindow_ImportFromWinoAccount": "Імпортувати з вашого облікового запису Wino",
+    "WelcomeWindow_ImportInProgress": "Імпорт ваших синхронізованих налаштувань та облікових записів...",
+    "WelcomeWindow_ImportNoAccountsFound": "У вашому обліковому записі Wino не знайдено синхронізованих облікових записів. Якщо налаштування були доступні, вони відновлені. Використайте 'Почати', щоб додати обліковий запис вручну.",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} синхронізованих облікових записів вже доступні на цьому пристрої. Використайте 'Почати', щоб додати ще один обліковий запис вручну, якщо потрібно.",
+    "WelcomeWindow_SetupTitle": "Налаштуйте ваш обліковий запис",
+    "WelcomeWindow_SetupSubtitle": "Виберіть ваш постачальник пошти, щоб почати.",
+    "WelcomeWindow_AddAccountButton": "Додати обліковий запис",
+    "WelcomeWindow_SkipForNow": "Пропустити зараз — налаштувати пізніше",
+    "WelcomeWindow_AppDescription": "Швидкий, сфокусований вхідний ящик — перероблений для Windows 11",
+    "WelcomeWizard_Step1Title": "Ласкаво просимо",
+    "SystemTrayMenu_Open": "Відкрити",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "Синхронізація налаштувань",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "Налаштування Wino синхронізуються між пристроями.",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "Розблокувати надбудови",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "Доступ до преміум-функцій, таких як Wino AI Pack.",
+    "WinoAccount_Management_Description": "Управляйте обліковим записом Wino, доступом до AI Pack та синхронізованими налаштуваннями й даними облікового запису.",
+    "WinoAccount_Management_SignedOutTitle": "Увійдіть до Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "Увійдіть або створіть обліковий запис, щоб синхронізувати пошту, отримати доступ до функцій з штучним інтелектом та керувати налаштуваннями на всіх пристроях.",
+    "WinoAccount_Management_ProfileSectionHeader": "Профіль",
+    "WinoAccount_Management_AddOnsSectionHeader": "Надбудови Wino",
+    "WinoAccount_Management_DataSectionHeader": "Дані",
+    "WinoAccount_Management_AccountActionsSectionHeader": "Дії з обліковим записом",
+    "WinoAccount_Management_AccountCardTitle": "Обліковий запис",
+    "WinoAccount_Management_AccountCardDescription": "Електронна адреса вашого облікового запису Wino та поточний стан облікового запису.",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "Перевірте, чи активний Wino AI Pack та скільки залишилося використань.",
+    "WinoAccount_Management_AiPackActive": "AI Pack активний",
+    "WinoAccount_Management_AiPackInactive": "AI Pack неактивний",
+    "WinoAccount_Management_AiPackUsage": "{0} з {1} використано. Залишилось {2}.",
+    "WinoAccount_Management_AiPackBillingPeriod": "Період оплати: {0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "Деталі використання ще відсутні.",
+    "WinoAccount_Management_AiPackBuyDescription": "Купіть Wino AI Pack, щоб перекладати, переформулювати або підсумовувати електронні листи за допомогою AI.",
+    "WinoAccount_Management_AiPackPromoTitle": "Розблокувати AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "Підвищуйте ефективність обробки електронної пошти за допомогою інструментів на основі штучного інтелекту. Перекладайте повідомлення на понад 50 мов, переформулюйте для ясності та тону, а також миттєві підсумки довгих ланцюжків листування.",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / міс.",
+    "WinoAccount_Management_AiPackPromoRequests": "1 000 кредитів",
+    "WinoAccount_Management_AiPackGetButton": "Отримати AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "Інструменти на базі штучного інтелекту для перекладу, переформулювання та стислих підсумків дій у Wino Mail.",
+    "WinoAddOn_AI_PACK_Keywords": "AI, переклад, переформулювати, підсумовувати, продуктивність",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "Необмежені облікові записи",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "Видалити обмеження на облікові записи та додати стільки поштових облікових записів, скільки потрібно.",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "облікові записи, необмежені, преміум, надбудова",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "Увійдіть у свій обліковий запис Wino, щоб завершити покупку.",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino не зміг завершити це придбання в Microsoft Store.",
+    "WinoAccount_Management_StoreSyncFailed": "Покупка завершена, але Wino не зміг оновити переваги облікового запису. Спробуйте ще раз через мить.",
+    "WinoAccount_Management_AiPackSubscriptionActive": "Ваша підписка активна",
+    "WinoAccount_Management_AiPackRenews": "Поновлюється {0:d}",
+    "WinoAccount_Management_AiPackRequestsUsed": "Кредити використано цього місяця",
+    "WinoAccount_Management_AiPackResets": "Скидання {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "Під час завантаження балансу використання AI сталася помилка.",
+    "WinoAccount_Management_AiPackFeatureTranslate": "Переклад",
+    "WinoAccount_Management_AiPackFeatureRewrite": "Переформулювати",
+    "WinoAccount_Management_AiPackFeatureSummarize": "Підсумувати",
+    "WinoAccount_Management_AddOnLoadFailed": "Не вдалося завантажити це доповнення.",
+    "WinoAccount_Management_SyncPreferencesTitle": "Синхронізація налаштувань та облікових записів",
+    "WinoAccount_Management_SyncPreferencesDescription": "Імпортуйте або експортуйте ваші налаштування Wino та дані поштової скриньки між пристроями. Паролі, токени та іншу чутливу інформацію ніколи не синхронізуються.",
+    "WinoAccount_Management_SignOutTitle": "Вийти",
+    "WinoAccount_Management_SignOutDescription": "Вийдіть з облікового запису на цьому пристрої",
+    "WinoAccount_Management_StatusLabel": "Статус: {0}",
+    "WinoAccount_Management_NoRemoteSettings": "Для цього облікового запису ще немає синхронізованих даних.",
+    "WinoAccount_Management_ExportSucceeded": "Ваші обрані дані Wino успішно експортувалися.",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "Ваші налаштування були експортовані до вашого облікового запису Wino.",
+    "WinoAccount_Management_ExportAccountsSucceeded": "Експортовано {0} відомостей облікових записів до вашого облікового запису Wino.",
+    "WinoAccount_Management_ImportSucceeded": "Імпортовано синхронізовані дані з вашого облікового запису Wino.",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "Застосовано {0} синхронізованих налаштувань.",
+    "WinoAccount_Management_ImportAccountsSucceeded": "Імпортовано {0} облікових записів.",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "Пропущено {0} облікових записів, які вже існують на цьому пристрої.",
+    "WinoAccount_Management_ImportPartial": "Застосовано {0} синхронізованих налаштувань. {1} налаштувань не вдалося відновити.",
+    "WinoAccount_Management_ImportReloginReminder": "Паролі, токени та іншу чутливу інформацію не імпортовано. Увійдіть знову в кожен обліковий запис на цьому пристрої перед використанням.",
+    "WinoAccount_Management_SerializeFailed": "Wino не зміг серіалізувати ваші поточні налаштування.",
+    "WinoAccount_Management_EmptyExport": "Немає значень налаштувань для експорту.",
+    "WinoAccount_Management_ImportEmpty": "Синхронізований пакет даних не містить нічого нового для відновлення.",
+    "WinoAccount_Management_ExportDialog_Title": "Експорт до вашого облікового запису Wino.",
+    "WinoAccount_Management_ExportDialog_Description": "Виберіть те, що ви хочете синхронізувати з вашим обліковим записом Wino.",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "Налаштування",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "Облікові записи",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "Паролі, токени та інша чутлива інформація не синхронізуються.",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "Імпортовані облікові записи на іншому ПК все ще потребуватимуть повторного входу перед їх використанням.",
+    "WinoAccount_Management_ExportDialog_InProgress": "Експорт ваших вибраних даних Wino...",
+    "WinoAccount_Management_LoadFailed": "Не вдалося завантажити останню інформацію про обліковий запис Wino.",
+    "WinoAccount_Management_ActionFailed": "Запит до облікового запису Wino не вдалося виконати.",
+    "WinoAccount_SettingsSection_Title": "Обліковий запис Wino",
+    "WinoAccount_SettingsSection_Description": "Створіть або увійдіть до облікового запису Wino за допомогою локального сервісу автентифікації.",
+    "WinoAccount_RegisterButton_Title": "Зареєструвати обліковий запис",
+    "WinoAccount_RegisterButton_Description": "Створіть обліковий запис Wino за допомогою електронної пошти та пароля.",
+    "WinoAccount_RegisterButton_Action": "Відкрити реєстрацію",
+    "WinoAccount_LoginButton_Title": "Увійти",
+    "WinoAccount_LoginButton_Description": "Увійдіть до існуючого облікового запису Wino за допомогою електронної пошти та пароля.",
+    "WinoAccount_LoginButton_Action": "Відкрити вхід",
+    "WinoAccount_SignOutButton_Title": "Вийти",
+    "WinoAccount_SignOutButton_Description": "Видалити локальну сесію облікового запису Wino.",
+    "WinoAccount_SignOutButton_Action": "Вийти",
+    "WinoAccount_RegisterDialog_Title": "Створити обліковий запис Wino",
+    "WinoAccount_RegisterDialog_Description": "Створіть обліковий запис Wino, щоб синхронізувати свій досвід використання Wino та розблокувати розширення, що залежать від облікового запису.",
+    "WinoAccount_RegisterDialog_HeroTitle": "Створіть свій обліковий запис Wino",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "Навіщо створювати обліковий запис?",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "Імпорт та експорт налаштувань між пристроями",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "Переміщайте свої налаштування Wino між пристроями без повторного налаштування.",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "Доступ до ексклюзивних розширень, таких як Wino AI Pack (платно)",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "Використовуйте один обліковий запис, щоб розблоковувати преміум-функції Wino по мірі їх появи.",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino Account відокремлений від ваших поштових облікових записів",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "Ваші облікові записи Outlook, Gmail, IMAP або інші електронні поштові облікові записи залишаються такими, як є. Обліковий запис Wino керує лише функціями, пов’язаними з Wino, та розширеннями на основі облікового запису.",
+    "WinoAccount_RegisterDialog_PrimaryButton": "Зареєструвати",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "Політика приватності та обробка API",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "Необов'язкові розширення, такі як Wino AI Pack, можуть надсилати вибраний HTML-вміст електронної пошти до сервісу Wino API тільки за умови використання цих функцій.",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "Прочитати політику конфіденційності",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "Я згоден з політикою конфіденційності.",
+    "WinoAccount_LoginDialog_Title": "Увійти до облікового запису Wino",
+    "WinoAccount_LoginDialog_Description": "Увійдіть до свого облікового запису Wino, щоб синхронізувати налаштування Wino та отримати доступ до функцій на основі облікового запису.",
+    "WinoAccount_LoginDialog_HeroTitle": "Ласкаво просимо знову",
+    "WinoAccount_LoginDialog_BenefitsTitle": "Що дає вхід у обліковий запис",
+    "WinoAccount_LoginDialog_BenefitsDescription": "Використовуйте свій обліковий запис Wino, щоб продовжувати синхронізувати налаштування між пристроями та отримати доступ до платних доповнень, таких як Wino AI Pack.",
+    "WinoAccount_LoginDialog_DifferenceTitle": "Це не вхід до вашої поштової скриньки",
+    "WinoAccount_LoginDialog_DifferenceDescription": "Увійдення тут не додає і не замінює ваші облікові записи Outlook, Gmail, IMAP або інші облікові записи в Wino. Воно лише входить у сервіси, пов’язані з Wino.",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "Забули пароль?",
+    "WinoAccount_EmailLabel": "Електронна пошта",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "Пароль",
+    "WinoAccount_ConfirmPasswordLabel": "Підтвердити пароль",
+    "WinoAccount_ForgotPasswordDialog_Title": "Скинути пароль",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "Надіслати лист із скиданням пароля",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "Повернутися до входу",
+    "WinoAccount_ForgotPasswordDialog_Description": "Введіть адресу електронної пошти вашого облікового запису Wino, і ми надішлемо посилання для скидання пароля, якщо така адреса зареєстрована.",
+    "WinoAccount_Validation_EmailRequired": "Електронна адреса обов'язкова.",
+    "WinoAccount_Validation_PasswordRequired": "Пароль обов'язковий.",
+    "WinoAccount_Validation_PasswordMismatch": "Паролі не збігаються.",
+    "WinoAccount_Validation_PrivacyConsentRequired": "Потрібно прийняти політику конфіденційності перед створенням облікового запису Wino.",
+    "WinoAccount_Error_InvalidCredentials": "Неправильна електронна адреса або пароль.",
+    "WinoAccount_Error_AccountLocked": "Цей обліковий запис тимчасово заблокований.",
+    "WinoAccount_Error_AccountBanned": "Цей обліковий запис заблоковано.",
+    "WinoAccount_Error_AccountSuspended": "Цей обліковий запис призупинено.",
+    "WinoAccount_Error_EmailNotConfirmed": "Будь ласка, підтвердіть свою електронну адресу перед входом.",
+    "WinoAccount_Error_EmailConfirmationRequired": "Будь ласка, підтвердіть свою електронну адресу перед входом.",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "Нове електронне повідомлення з підтвердженням ще недоступне.",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "Цей запит на підтвердження більше не дійсний. Будь ласка, спробуйте увійти знову.",
+    "WinoAccount_Error_EmailNotRegistered": "Ця електронна адреса не зареєстрована.",
+    "WinoAccount_Error_RefreshTokenInvalid": "Сесія більше не дійсна. Будь ласка, увійдіть знову.",
+    "WinoAccount_Error_EmailAlreadyRegistered": "Ця електронна адреса вже зареєстрована.",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "Адреса електронної пошти потрібна для завершення зовнішнього входу.",
+    "WinoAccount_Error_ExternalLoginInvalid": "Запит зовнішнього входу недійсний.",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "Стан зовнішнього входу недійсний або закінчився.",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "Код зовнішнього входу недійсний або закінчився.",
+    "WinoAccount_Error_AiPackRequired": "Потрібна активна підписка на Wino AI Pack для виконання цієї дії.",
+    "WinoAccount_Error_AiQuotaExceeded": "Ліміт використання пакета Wino AI досягнуто за поточний платіжний період.",
+    "WinoAccount_Error_AiHtmlEmpty": "Немає вмісту електронної пошти для обробки.",
+    "WinoAccount_Error_AiHtmlTooLarge": "Ця електронна пошта занадто велика для обробки за допомогою Wino AI.",
+    "WinoAccount_Error_AiUnsupportedLanguage": "Ця мова не підтримується. Спробуйте дійсний код культури, наприклад en-US або tr-TR.",
+    "WinoAccount_Error_Forbidden": "У вас немає дозволу на виконання цієї дії.",
+    "WinoAccount_Error_ValidationFailed": "Запит недійсний. Будь ласка, перегляньте введені значення.",
+    "WinoAccount_RegisterSuccessMessage": "Реєстрація облікового запису Wino завершена для {0}.",
+    "WinoAccount_LoginSuccessMessage": "Увійдено до облікового запису Wino як {0}.",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "Підтвердіть вашу електронну адресу",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "Ми надіслали підтвердження електронної пошти на {0}. Підтвердіть його та повторіть спробу входу.",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "Потрібне підтвердження електронної пошти",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "Ми все ще чекаємо, поки ви підтвердите {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "Надіслати повторно лист з підтвердженням",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "Ви зможете надіслати повторно підтвердження електронної адреси через {0}.",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "Тепер ви можете надіслати повторно підтвердження",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "Письмо з підтвердженням повторно надіслано",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "Ми надіслали ще одне підтвердження на {0}. Будь ласка, підтвердіть його та спробуйте увійти знову.",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "Лист із скиданням пароля надіслано",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "Ми надіслали листа зі скиданням пароля на {0}. Відкрийте це повідомлення, щоб обрати новий пароль.",
+    "WinoAccount_ChangePassword_Title": "Зміна пароля",
+    "WinoAccount_ChangePassword_Description": "Надіслати листа зі скиданням пароля на цей обліковий запис Wino.",
+    "WinoAccount_ChangePassword_Action": "Надіслати лист зі скиданням пароля",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "Чи хочете ви, щоб Wino надіслало електронного листа для скидання пароля на {0}?",
+    "WinoAccount_SignOut_SuccessMessage": "Ви вийшли з облікового запису Wino {0}.",
+    "WinoAccount_SignOut_NoAccountMessage": "Немає активного облікового запису Wino, з якого можна вийти.",
+    "WinoAccount_Titlebar_SignedOutTitle": "Обліковий запис Wino",
+    "WinoAccount_Titlebar_SignedOutDescription": "Увійдіть або створіть обліковий запис Wino, щоб керувати сеансом Wino.",
+    "WinoAccount_Titlebar_SignedInStatus": "Статус: {0}",
+    "WelcomeWizard_Step2Title": "Додати обліковий запис",
+    "WelcomeWizard_Step3Title": "Завершити налаштування",
+    "ProviderSelection_Title": "Виберіть постачальника електронної пошти",
+    "ProviderSelection_Subtitle": "Виберіть постачальника нижче, щоб додати свій обліковий ящик електронної пошти до Wino Mail.",
+    "ProviderSelection_AccountNameHeader": "Назва облікового запису",
+    "ProviderSelection_AccountNamePlaceholder": "наприклад, Особистий, Робочий",
+    "ProviderSelection_DisplayNameHeader": "Відображуване ім'я",
+    "ProviderSelection_DisplayNamePlaceholder": "наприклад, Іван Іванов",
+    "ProviderSelection_EmailHeader": "Електронна адреса",
+    "ProviderSelection_EmailPlaceholder": "наприклад, johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "Пароль для застосунку",
+    "ProviderSelection_AppPasswordHelp": "Як отримати пароль для застосунку?",
+    "ProviderSelection_CalendarModeHeader": "Інтеграція календаря",
+    "ProviderSelection_CalendarMode_DisabledTitle": "Вимкнено",
+    "ProviderSelection_CalendarMode_DisabledDescription": "Немає інтеграції календаря",
+    "ProviderSelection_CalendarMode_CalDavTitle": "Синхронізація CalDAV",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "Ваші події календаря синхронізуються між пристроями з серверами Apple.",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "Ваші події календаря синхронізуються між вашими пристроями через сервери Yahoo.",
+    "ProviderSelection_CalendarMode_LocalTitle": "Локальний календар",
+    "ProviderSelection_CalendarMode_LocalDescription": "Ваші події зберігаються лише на вашому комп'ютері. Без з'єднання з сервером.",
+    "ProviderSelection_ClearColor": "Очистити колір",
+    "ProviderSelection_ContinueButton": "Продовжити",
+    "ProviderSelection_SpecialImap_Subtitle": "Введіть дані облікового запису, щоб підключитися.",
+    "AccountSetup_Title": "Налаштування вашого облікового запису",
+    "AccountSetup_Step_Authenticating": "Аутентифікація з {0}",
+    "AccountSetup_Step_TestingMailAuth": "Перевірка автентифікації пошти",
+    "AccountSetup_Step_SyncingFolders": "Синхронізація метаданих папок",
+    "AccountSetup_Step_FetchingProfile": "Отримання інформації профілю",
+    "AccountSetup_Step_DiscoveringCalDav": "Виявлення налаштувань CalDAV",
+    "AccountSetup_Step_TestingCalendarAuth": "Перевірка автентифікації календаря",
+    "AccountSetup_Step_SavingAccount": "Збереження інформації облікового запису",
+    "AccountSetup_Step_FetchingCalendarMetadata": "Отримання метаданих календаря",
+    "AccountSetup_Step_SyncingAliases": "Синхронізація псевдонімів",
+    "AccountSetup_Step_Finalizing": "Завершення налаштування",
+    "AccountSetup_FailureMessage": "Налаштування не вдалося. Поверніться назад, щоб виправити налаштування, або спробуйте ще пізніше.",
+    "AccountSetup_SuccessMessage": "Ваш обліковий запис успішно налаштовано!",
+    "AccountSetup_GoBackButton": "Назад",
+    "AccountSetup_TryAgainButton": "Спробуйте ще раз",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "Автоматичне виявлення не вдалося. Будь ласка, введіть налаштування вручну на вкладці Розширені."
 }
-
-
diff --git a/Wino.Core.Domain/Translations/zh_CN/resources.json b/Wino.Core.Domain/Translations/zh_CN/resources.json
index 83dc9164..56ff14fc 100644
--- a/Wino.Core.Domain/Translations/zh_CN/resources.json
+++ b/Wino.Core.Domain/Translations/zh_CN/resources.json
@@ -4,28 +4,34 @@
     "AccountAlias_Column_Verified": "已验证",
     "AccountAlias_Disclaimer_FirstLine": "Wino 只能从 Gmail 账户导入别名。",
     "AccountAlias_Disclaimer_SecondLine": "如果想要为 Outlook 和 IMAP 账户使用别名，请自行添加。",
-    "AccountCacheReset_Title": "重置账户缓存",
-    "AccountCacheReset_Message": "此帐户需要完全重新同步才能继续工作。请等待 Wino 重新同步你的消息…",
-    "AccountContactNameYou": "你",
+    "AccountCacheReset_Title": "账户缓存重置",
+    "AccountCacheReset_Message": "此帐户需要完全重新同步才能继续工作。请等待 Wino 重新同步您的消息……",
+    "AccountContactNameYou": "您",
     "AccountCreationDialog_Completed": "已完成",
+    "AccountCreationDialog_FetchingCalendarMetadata": "正在获取日历详情。",
     "AccountCreationDialog_FetchingEvents": "正在获取日历事件。",
-    "AccountCreationDialog_FetchingProfileInformation": "正在获取账户资料详情。",
-    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "如果你的浏览器没有自动启动以完成身份验证：",
+    "AccountCreationDialog_FetchingProfileInformation": "正在获取用户资料详情。",
+    "AccountCreationDialog_GoogleAuthHelpClipboardText_Row0": "如果浏览器没有自动打开完成身份验证：",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row1": "1) 点击下面的按钮复制身份验证地址",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row2": "2) 启动浏览器 (Edge、Chrome、Firefox 等)",
     "AccountCreationDialog_GoogleAuthHelpClipboardText_Row3": "3) 粘贴复制的地址并访问以手动完成认证。",
     "AccountCreationDialog_Initializing": "正在初始化",
     "AccountCreationDialog_PreparingFolders": "我们正在获取文件夹信息。",
     "AccountCreationDialog_SigninIn": "正在保存账户信息。",
+    "Purchased": "已购买",
     "AccountEditDialog_Message": "账户名称",
     "AccountEditDialog_Title": "编辑账户",
     "AccountPickerDialog_Title": "选择账户",
     "AccountSettingsDialog_AccountName": "发件人名称",
-    "AccountSettingsDialog_AccountNamePlaceholder": "例如：John Doe",
+    "AccountSettingsDialog_AccountNamePlaceholder": "例如: John Doe",
     "AccountDetailsPage_Title": "账户信息",
     "AccountDetailsPage_Description": "更改 Wino 中的账户名称与所需的发件人名称。",
     "AccountDetailsPage_ColorPicker_Title": "账户颜色",
     "AccountDetailsPage_ColorPicker_Description": "指定账户在列表中显示的颜色。",
+    "AccountDetailsPage_TabGeneral": "常规",
+    "AccountDetailsPage_TabMail": "邮件",
+    "AccountDetailsPage_TabCalendar": "日历",
+    "AccountDetailsPage_CalendarListDescription": "选择日历以配置其设置",
     "AddHyperlink": "添加",
     "AppCloseBackgroundSynchronizationWarningTitle": "后台同步",
     "AppCloseStartupLaunchDisabledWarningMessageFirstLine": "应用尚未设置为随 Windows 自启。",
@@ -33,10 +39,10 @@
     "AppCloseStartupLaunchDisabledWarningMessageThirdLine": "是否前往应用设置页面启用它？",
     "AppCloseTerminateBehaviorWarningMessageFirstLine": "正在停止 Wino Mail，应用关闭行为已被设置为「终止进程」。",
     "AppCloseTerminateBehaviorWarningMessageSecondLine": "将停止所有后台同步和通知。",
-    "AppCloseTerminateBehaviorWarningMessageThirdLine": "是否前往应用设置，设置 Wino Mail 为最小化或后台运行？",
-    "AutoDiscoveryProgressMessage": "正在搜索邮件设置……",
+    "AppCloseTerminateBehaviorWarningMessageThirdLine": "是否前往应用设置中将 Wino Mail 设置为最小化或后台运行？",
+    "AutoDiscoveryProgressMessage": "正在搜索邮件设置…",
     "BasicIMAPSetupDialog_AdvancedConfiguration": "高级设置",
-    "BasicIMAPSetupDialog_CredentialLocalMessage": "你的凭据将仅在本地存储在你的计算机上。",
+    "BasicIMAPSetupDialog_CredentialLocalMessage": "您的凭据将仅存储在您的计算机上。",
     "BasicIMAPSetupDialog_Description": "部分账户需要额外的登录步骤",
     "BasicIMAPSetupDialog_DisplayName": "显示名称",
     "BasicIMAPSetupDialog_DisplayNamePlaceholder": "例如 John Doe",
@@ -47,8 +53,10 @@
     "BasicIMAPSetupDialog_Title": "IMAP 账户",
     "Busy": "正忙",
     "Buttons_AddAccount": "添加账户",
+    "Buttons_FixAccount": "修复账户",
     "Buttons_AddNewAlias": "添加新别名",
     "Buttons_Allow": "允许",
+    "Buttons_Apply": "应用",
     "Buttons_ApplyTheme": "应用主题",
     "Buttons_Browse": "浏览",
     "Buttons_Cancel": "取消",
@@ -62,6 +70,7 @@
     "Buttons_Edit": "编辑",
     "Buttons_EnableImageRendering": "启用",
     "Buttons_Multiselect": "批量选择",
+    "Buttons_Manage": "管理",
     "Buttons_No": "否",
     "Buttons_Open": "打开",
     "Buttons_Purchase": "购买",
@@ -70,48 +79,170 @@
     "Buttons_Save": "保存",
     "Buttons_SaveConfiguration": "保存设置",
     "Buttons_Send": "发送",
+    "Buttons_SendToServer": "发送到服务器",
     "Buttons_Share": "分享",
     "Buttons_SignIn": "登录",
     "Buttons_Sync": "同步",
     "Buttons_SyncAliases": "同步别名",
     "Buttons_TryAgain": "重试",
     "Buttons_Yes": "是",
+    "Sync_SynchronizingFolder": "正在同步 {0} {1}%",
+    "Sync_DownloadedMessages": "已从 {1} 下载 {0} 条消息",
+    "SyncAction_Archiving": "正在归档 {0} 封邮件",
+    "SyncAction_ClearingFlag": "取消标记 {0} 封邮件",
+    "SyncAction_CreatingDraft": "正在创建草稿",
+    "SyncAction_CreatingEvent": "正在创建日历事件",
+    "SyncAction_Deleting": "正在删除 {0} 封邮件",
+    "SyncAction_EmptyingFolder": "正在清空文件夹",
+    "SyncAction_MarkingAsRead": "将 {0} 封邮件标记为已读",
+    "SyncAction_MarkingAsUnread": "将 {0} 封邮件标记为未读",
+    "SyncAction_MarkingFolderAsRead": "将文件夹标记为已读",
+    "SyncAction_Moving": "正在移动 {0} 封邮件",
+    "SyncAction_MovingToFocused": "将 {0} 封邮件移动到专注收件箱",
+    "SyncAction_RenamingFolder": "正在重命名文件夹",
+    "SyncAction_SendingMail": "正在发送邮件",
+    "SyncAction_SettingFlag": "为 {0} 封邮件设置旗标",
+    "SyncAction_SynchronizingAccount": "正在同步 {0}",
+    "SyncAction_SynchronizingAccounts": "正在同步 {0} 个账户",
+    "SyncAction_SynchronizingCalendarData": "正在同步日历数据",
+    "SyncAction_SynchronizingCalendarEvents": "正在同步日历事件",
+    "SyncAction_SynchronizingCalendarMetadata": "正在同步日历元数据",
+    "SyncAction_Unarchiving": "正在解除归档 {0} 封邮件",
     "CalendarAllDayEventSummary": "全天事件",
     "CalendarDisplayOptions_Color": "颜色",
     "CalendarDisplayOptions_Expand": "展开",
+    "CalendarEventResponse_Accept": "接受",
+    "CalendarEventResponse_AcceptedResponse": "已接受",
+    "CalendarEventResponse_Decline": "拒绝",
+    "CalendarEventResponse_DeclinedResponse": "已拒绝",
+    "CalendarEventResponse_NotResponded": "未回应",
+    "CalendarEventResponse_Tentative": "暂定",
+    "CalendarEventResponse_TentativeResponse": "暂定",
+    "CalendarEventRsvpPanel_Accept": "接受",
+    "CalendarEventRsvpPanel_AddMessage": "在回复中添加消息...（可选）",
+    "CalendarEventRsvpPanel_Decline": "拒绝",
+    "CalendarEventRsvpPanel_Message": "消息",
+    "CalendarEventRsvpPanel_SendReplyMessage": "发送回复消息",
+    "CalendarEventRsvpPanel_Tentative": "暂定",
+    "CalendarEventRsvpPanel_Title": "回复选项",
+    "CalendarAttendeeStatus_Accepted": "已接受",
+    "CalendarAttendeeStatus_Declined": "已拒绝",
+    "CalendarAttendeeStatus_NeedsAction": "需要操作",
+    "CalendarAttendeeStatus_Tentative": "暂定",
+    "CalendarEventDetails_Attachments": "附件",
+    "CalendarEventCompose_AddAttachment": "添加附件",
+    "CalendarEventCompose_AllDay": "整天",
+    "CalendarEventCompose_AttachmentsNotSupportedForCalDav": "CalDAV 日历不支持附件。",
+    "CalendarEventCompose_EndDate": "结束日期",
+    "CalendarEventCompose_EndTime": "结束时间",
+    "CalendarEventCompose_Every": "每",
+    "CalendarEventCompose_ForWeekdays": "持续",
+    "CalendarEventCompose_FrequencyDay": "天",
+    "CalendarEventCompose_FrequencyDayPlural": "天",
+    "CalendarEventCompose_FrequencyMonth": "月",
+    "CalendarEventCompose_FrequencyMonthPlural": "月",
+    "CalendarEventCompose_FrequencyWeek": "周",
+    "CalendarEventCompose_FrequencyWeekPlural": "周",
+    "CalendarEventCompose_FrequencyYear": "年",
+    "CalendarEventCompose_FrequencyYearPlural": "年",
+    "CalendarEventCompose_Location": "地点",
+    "CalendarEventCompose_LocationPlaceholder": "添加地点",
+    "CalendarEventCompose_NewEventButton": "新建事件",
+    "CalendarEventCompose_DefaultCalendarHint": "您可以在日历设置中为新事件选择默认日历。",
+    "CalendarEventCompose_DefaultCalendarSettingsLink": "打开日历设置",
+    "CalendarEventCompose_NoCalendarsMessage": "当前没有可用于创建事件的日历。",
+    "CalendarEventCompose_NoCalendarsTitle": "没有可用日历",
+    "CalendarEventCompose_NoEndDate": "无结束日期",
+    "CalendarEventCompose_Notes": "备注",
+    "CalendarEventCompose_PickCalendarTitle": "选择日历",
+    "CalendarEventCompose_Recurring": "重复",
+    "CalendarEventCompose_RecurringSummary": "每 {0} {1}{2} {3} 生效 {4}{5}",
+    "CalendarEventCompose_RecurringSummarySmart": "发生 {0}{1} {2} 生效 {3}{4}",
+    "CalendarEventCompose_RepeatEvery": "每隔",
+    "CalendarEventCompose_SelectCalendar": "选择日历",
+    "CalendarEventCompose_SingleOccurrenceSummary": "在 {0} {1} 发生",
+    "CalendarEventCompose_StartDate": "开始日期",
+    "CalendarEventCompose_StartTime": "开始时间",
+    "CalendarEventCompose_TimeRangeSummary": "从 {0} 到 {1}",
+    "CalendarEventCompose_Title": "事件标题",
+    "CalendarEventCompose_TitlePlaceholder": "添加标题",
+    "CalendarEventCompose_Until": "until",
+    "CalendarEventCompose_UntilSummary": " until {0}",
+    "CalendarEventCompose_ValidationInvalidAllDayRange": "全天结束日期必须晚于开始日期。",
+    "CalendarEventCompose_ValidationInvalidAttendee": "一个或多个与会者的电子邮件地址无效。",
+    "CalendarEventCompose_ValidationInvalidRecurrenceEnd": "重复结束日期必须晚于或等于事件开始日期。",
+    "CalendarEventCompose_ValidationInvalidTimeRange": "结束时间必须晚于开始时间。",
+    "CalendarEventCompose_ValidationMissingAttachment": "一个或多个附件不再可用：{0}",
+    "CalendarEventCompose_ValidationMissingCalendar": "在创建事件之前请选择日历。",
+    "CalendarEventCompose_ValidationMissingTitle": "在创建事件之前请输入事件标题。",
+    "CalendarEventCompose_ValidationTitle": "事件验证失败",
+    "CalendarEventCompose_WeekdaySummary": " 在 {0}",
+    "CalendarEventCompose_Weekday_Friday": "五",
+    "CalendarEventCompose_Weekday_Monday": "一",
+    "CalendarEventCompose_Weekday_Saturday": "六",
+    "CalendarEventCompose_Weekday_Sunday": "日",
+    "CalendarEventCompose_Weekday_Thursday": "四",
+    "CalendarEventCompose_Weekday_Tuesday": "二",
+    "CalendarEventCompose_Weekday_Wednesday": "三",
+    "CalendarEventDetails_Details": "详情",
+    "CalendarEventDetails_EditSeries": "编辑系列",
+    "CalendarEventDetails_Editing": "正在编辑",
+    "CalendarEventDetails_InviteSomeone": "邀请某人",
+    "CalendarEventDetails_JoinOnline": "在线参加",
+    "CalendarEventDetails_Organizer": "组织者",
+    "CalendarEventDetails_People": "参与者",
+    "CalendarEventDetails_ReadOnlyEvent": "只读事件",
+    "CalendarEventDetails_Reminder": "提醒",
+    "CalendarReminder_StartedHoursAgo": "已开始 {0} 小时前",
+    "CalendarReminder_StartedMinutesAgo": "已开始 {0} 分钟前",
+    "CalendarReminder_StartedNow": "刚刚开始",
+    "CalendarReminder_StartingNow": "现在开始",
+    "CalendarReminder_StartsInHours": "将在 {0} 小时后开始",
+    "CalendarReminder_StartsInMinutes": "将在 {0} 分钟后开始",
+    "CalendarReminder_SnoozeAction": "稍后提醒",
+    "CalendarReminder_SnoozeMinutesOption": "{0} 分钟",
+    "CalendarEventDetails_ShowAs": "显示为",
+    "CalendarShowAs_Free": "空闲",
+    "CalendarShowAs_Tentative": "暂定",
+    "CalendarShowAs_Busy": "忙碌",
+    "CalendarShowAs_OutOfOffice": "外出",
+    "CalendarShowAs_WorkingElsewhere": "在其他地方工作",
     "CalendarItem_DetailsPopup_JoinOnline": "在线加入",
     "CalendarItem_DetailsPopup_ViewEventButton": "查看事件",
     "CalendarItem_DetailsPopup_ViewSeriesButton": "查看系列",
     "CalendarItemAllDay": "全天",
     "CategoriesFolderNameOverride": "分类",
     "Center": "中心",
-    "ClipboardTextCopied_Message": "{0} 已复制到剪贴板。",
+    "ClipboardTextCopied_Message": "{0} 已复制到剪贴板",
     "ClipboardTextCopied_Title": "已复制",
     "ClipboardTextCopyFailed_Message": "无法将 {0} 复制到剪贴板。",
-    "ComingSoon": "即将到来…",
+    "ContactInfoBar_ErrorTitle": "无法加载联系信息",
+    "ContactInfoBar_SuccessTitle": "联系信息已加载",
+    "ContactInfoBar_WarningTitle": "联系信息可能不完整",
+    "ComingSoon": "即将到来...",
     "ComposerAttachmentsDragDropAttach_Message": "附件",
     "ComposerAttachmentsDropZone_Message": "将文件拖放至此",
-    "ComposerFrom": "从： ",
+    "ComposerFrom": "来自： ",
     "ComposerImagesDropZone_Message": "将图片拖放至此",
     "ComposerSubject": "主题： ",
-    "ComposerTo": "到： ",
+    "ComposerTo": "至： ",
     "ComposerToPlaceholder": "点击输入地址",
     "CreateAccountAliasDialog_AliasAddress": "地址",
     "CreateAccountAliasDialog_AliasAddressPlaceholder": "示例：support@mydomain.com",
-    "CreateAccountAliasDialog_Description": "请确保你的出站邮件服务器允许从该别名发送邮件。",
+    "CreateAccountAliasDialog_Description": "请确保出站邮件服务器允许使用该别名发送邮件。",
     "CreateAccountAliasDialog_ReplyToAddress": "回复地址",
     "CreateAccountAliasDialog_ReplyToAddressPlaceholder": "admin@mydomain.com",
     "CreateAccountAliasDialog_Title": "创建账户别名",
-    "CustomThemeBuilder_AccentColorDescription": "设置自定义主题颜色。如果未选择颜色将使用 Windows 默认颜色。",
-    "CustomThemeBuilder_AccentColorTitle": "主题颜色",
+    "CustomThemeBuilder_AccentColorDescription": "设置自定义颜色。若未选择颜色，将使用 Windows 默认颜色。",
+    "CustomThemeBuilder_AccentColorTitle": "主题色",
     "CustomThemeBuilder_PickColor": "选择",
     "CustomThemeBuilder_ThemeNameDescription": "自定义主题的名称。",
     "CustomThemeBuilder_ThemeNameTitle": "主题名称",
     "CustomThemeBuilder_Title": "自定义主题生成器",
-    "CustomThemeBuilder_WallpaperDescription": "为 Wino 设置自定义壁纸",
+    "CustomThemeBuilder_WallpaperDescription": "为Wino设置自定义壁纸",
     "CustomThemeBuilder_WallpaperTitle": "设置自定义壁纸",
     "Dialog_DontAskAgain": "不再询问",
-    "DialogMessage_AccountLimitMessage": "你已达到免费用户可创建账户数量上限（3个）。\n是否购买支持作者以“解除可创建账户数量上限”？",
+    "DialogMessage_AccountLimitMessage": "您已达到免费用户可创建账户数量上限（3个）。\n是否购买支持作者以“解除可创建账户数量上限”？",
     "DialogMessage_AccountLimitTitle": "已达到账户限制",
     "DialogMessage_AliasCreatedMessage": "成功创建新别名",
     "DialogMessage_AliasCreatedTitle": "创建新别名",
@@ -119,7 +250,7 @@
     "DialogMessage_AliasExistsTitle": "别名已存在",
     "DialogMessage_AliasNotSelectedMessage": "在发送消息前必须选择一个别名。",
     "DialogMessage_AliasNotSelectedTitle": "别名未找到",
-    "DialogMessage_CantDeleteRootAliasMessage": "根别名无法被删除。该名称和你的账户设置关联的主要标识。",
+    "DialogMessage_CantDeleteRootAliasMessage": "根别名无法被删除。该名称是与账户设置关联的主要标识。",
     "DialogMessage_CantDeleteRootAliasTitle": "无法删除别名",
     "DialogMessage_CleanupFolderMessage": "您想永久删除此文件夹中的所有邮件吗？",
     "DialogMessage_CleanupFolderTitle": "清空文件夹",
@@ -128,13 +259,17 @@
     "DialogMessage_CreateLinkedAccountMessage": "给这个新链接命名。账户将在此名称下合并。",
     "DialogMessage_CreateLinkedAccountTitle": "账户链接名称",
     "DialogMessage_DeleteAccountConfirmationMessage": "删除 {0}？",
-    "DialogMessage_DeleteAccountConfirmationTitle": "所有与此账户相关的数据将从磁盘上永久删除。",
+    "DialogMessage_DeleteAccountConfirmationTitle": "与此账户相关的所有数据将从磁盘上永久删除。",
+    "DialogMessage_DeleteEmailTemplateConfirmationMessage": "删除模板 \"{0}\"？",
+    "DialogMessage_DeleteEmailTemplateConfirmationTitle": "删除邮件模板",
+    "DialogMessage_DeleteRecurringSeriesMessage": "这将删除系列中的所有事件。是否继续？",
+    "DialogMessage_DeleteRecurringSeriesTitle": "删除重复系列",
     "DialogMessage_DiscardDraftConfirmationMessage": "草稿将被删除。你想要继续吗？",
-    "DialogMessage_DiscardDraftConfirmationTitle": "丢弃草稿",
-    "DialogMessage_EmptySubjectConfirmation": "缺少主题",
-    "DialogMessage_EmptySubjectConfirmationMessage": "邮件没有主题。你想要继续吗？",
-    "DialogMessage_EnableStartupLaunchDeniedMessage": "可以在「设置」->「应用偏好」中启用自启动。",
-    "DialogMessage_EnableStartupLaunchMessage": "让 Wino Mail 在 Windows 开机时自动最小化启动以不错过任何通知。\n\n想要启用自启动吗？",
+    "DialogMessage_DiscardDraftConfirmationTitle": "舍弃草稿",
+    "DialogMessage_EmptySubjectConfirmation": "缺少标题",
+    "DialogMessage_EmptySubjectConfirmationMessage": "邮件没有主题。您想要继续吗？",
+    "DialogMessage_EnableStartupLaunchDeniedMessage": "可以在「设置」-「应用设置」中启用自启动。",
+    "DialogMessage_EnableStartupLaunchMessage": "让 Wino Mail 随 Windows 自启，不错过任何通知。\n\n想要启用自启动吗？",
     "DialogMessage_EnableStartupLaunchTitle": "启用自启动",
     "DialogMessage_HardDeleteConfirmationMessage": "永久删除",
     "DialogMessage_HardDeleteConfirmationTitle": "邮件将被永久删除。是否继续？",
@@ -150,12 +285,12 @@
     "DialogMessage_RenameFolderTitle": "重命名文件夹",
     "DialogMessage_RenameLinkedAccountsMessage": "输入链接账户的新名称",
     "DialogMessage_RenameLinkedAccountsTitle": "重命名已链接账户",
-    "DialogMessage_UnlinkAccountsConfirmationMessage": "此操作不会删除你的账户，只会断开共享文件夹的连接。你是否想要继续？",
+    "DialogMessage_UnlinkAccountsConfirmationMessage": "此操作不会删除您的账户，只会断开共享文件夹的连接。是否继续？",
     "DialogMessage_UnlinkAccountsConfirmationTitle": "取消链接账户",
     "DialogMessage_UnsubscribeConfirmationGoToWebsiteConfirmButton": "前往网站",
-    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "要停止从 {0} 获取消息，请前往他们的网站取消订阅。",
-    "DialogMessage_UnsubscribeConfirmationMailtoMessage": "你想要停止从 {0} 获取消息吗？ Wino 将通过向 {1} 发送一封电子邮件以取消订阅。",
-    "DialogMessage_UnsubscribeConfirmationOneClickMessage": "你想要停止从 {0} 处获取信息吗？",
+    "DialogMessage_UnsubscribeConfirmationGoToWebsiteMessage": "要停止从 {0} 处获取消息，请前往他们的网站退订。",
+    "DialogMessage_UnsubscribeConfirmationMailtoMessage": "您想要停止从 {0} 处获取消息吗？ Wino将通过向 {1} 发送一封电子邮件以取消订阅。",
+    "DialogMessage_UnsubscribeConfirmationOneClickMessage": "您想要停止从 {0} 处获取信息吗？",
     "DialogMessage_UnsubscribeConfirmationTitle": "取消订阅",
     "DiscordChannelDisclaimerMessage": "Wino 没有自己的 Discord 服务器，但在 Developer Sanctuary 服务器上设有专门的 wino-mail 频道。如果要获取有关 Wino 的更新，请加入 Developer Sanctuary 服务器，并关注 Community Projects下的 wino-mail 频道。\n\n因为 Discord 不支持频道邀请，所以你需要通过网页加入频道。",
     "DiscordChannelDisclaimerTitle": "重要的 Discord 信息",
@@ -170,34 +305,41 @@
     "ElementTheme_Dark": "深色模式",
     "ElementTheme_Default": "使用系统设置",
     "ElementTheme_Light": "浅色模式",
-    "Emoji": "表情符号",
+    "Emoji": "表情",
     "Error_FailedToSetupSystemFolders_Title": "无法设置系统文件夹",
-    "Exception_AuthenticationCanceled": "授权已取消",
+    "Exception_AccountNeedsAttention_Title": "账户需要关注",
+    "Exception_AccountNeedsAttention_Message": "'{0}' 需要您的关注以继续工作。",
+    "Exception_WebView2RuntimeMissing_Message": "Wino Mail 无法找到 Microsoft Edge WebView2 运行时。请安装或修复运行时以正确呈现消息内容。",
+    "Exception_WebView2RuntimeMissing_Title": "需要 WebView2 运行时",
+    "Exception_AuthenticationCanceled": "身份验证已取消",
     "Exception_CustomThemeExists": "此主题已经存在。",
-    "Exception_CustomThemeMissingName": "你必须提供名称。",
-    "Exception_CustomThemeMissingWallpaper": "你必须提供自定义背景图像。",
+    "Exception_CustomThemeMissingName": "您必须提供名称。",
+    "Exception_CustomThemeMissingWallpaper": "您必须提供自定义背景图像。",
     "Exception_FailedToSynchronizeAliases": "别名同步失败",
+    "Exception_FailedToSynchronizeCalendarData": "同步日历数据失败",
+    "Exception_FailedToSynchronizeCalendarEvents": "同步日历事件失败",
+    "Exception_FailedToSynchronizeCalendarMetadata": "日历详情同步失败",
     "Exception_FailedToSynchronizeFolders": "同步文件夹失败",
-    "Exception_FailedToSynchronizeProfileInformation": "同步个人资料信息失败",
-    "Exception_GoogleAuthCallbackNull": "回调 uri 在激活时为空。",
+    "Exception_FailedToSynchronizeProfileInformation": "个人资料信息同步失败。",
+    "Exception_GoogleAuthCallbackNull": "Callback uri 在激活时无效。",
     "Exception_GoogleAuthCorruptedCode": "授权响应不正确。",
-    "Exception_GoogleAuthError": "OAuth 授权错误：{0}",
+    "Exception_GoogleAuthError": "OAuth 授权错误: {0}",
     "Exception_GoogleAuthInvalidResponse": "收到无效状态请求 ({0})",
     "Exception_GoogleAuthorizationCodeExchangeFailed": "授权代码交换失败。",
-    "Exception_ImapAutoDiscoveryFailed": "找不到邮箱设置。",
+    "Exception_ImapAutoDiscoveryFailed": "找不到邮箱配置。",
     "Exception_ImapClientPoolFailed": "IMAP 客户端池失败。",
     "Exception_InboxNotAvailable": "无法设置账户文件夹。",
-    "Exception_InvalidSystemFolderConfiguration": "系统文件夹配置无效。请检查配置然后重试。",
-    "Exception_InvalidMultiAccountMoveTarget": "你不能移动多个来源于不同被链接的账户的项目。",
-    "Exception_MailProcessing": "该邮件仍在处理中。请等待几秒后再试。",
-    "Exception_MissingAlias": "该账户没有主别名。草稿创建失败。",
+    "Exception_InvalidSystemFolderConfiguration": "系统文件夹配置无效。请检查配置，然后重试。",
+    "Exception_InvalidMultiAccountMoveTarget": "这些项目来源于不同账户，无法同时删除。",
+    "Exception_MailProcessing": "该邮件仍在处理中。请稍等几秒后再试。",
+    "Exception_MissingAlias": "该账户没有主要别名。草稿创建失败。",
     "Exception_NullAssignedAccount": "分配的账户为空",
     "Exception_NullAssignedFolder": "分配的文件夹为空",
-    "Exception_SynchronizerFailureHTTP": "处理响应失败，HTTP 代码：{0}",
+    "Exception_SynchronizerFailureHTTP": "处理响应失败，HTTP 错误代码: {0}",
     "Exception_TokenGenerationFailed": "令牌生成失败",
     "Exception_TokenInfoRetrivalFailed": "获取令牌信息失败。",
     "Exception_UnknowErrorDuringAuthentication": "身份验证时发生未知错误",
-    "Exception_UnsupportedAction": "请求处理器不支持活动 {0}",
+    "Exception_UnsupportedAction": "请求处理器不支持 {0} 操作。",
     "Exception_UnsupportedProvider": "不支持该提供商。",
     "Exception_UnsupportedSynchronizerOperation": "{0} 不支持此操作",
     "Exception_UserCancelSystemFolderSetupDialog": "用户取消了配置系统文件夹的对话框。",
@@ -215,24 +357,50 @@
     "FolderOperation_MarkAllAsRead": "全部标记为已读",
     "FolderOperation_Move": "移动",
     "FolderOperation_None": "无",
-    "FolderOperation_Pin": "固定",
+    "FolderOperation_Pin": "置顶",
     "FolderOperation_Rename": "重命名",
-    "FolderOperation_Unpin": "取消固定",
+    "FolderOperation_Unpin": "取消置顶",
     "GeneralTitle_Error": "错误",
     "GeneralTitle_Info": "信息",
     "GeneralTitle_Warning": "警告",
-    "GmailServiceDisabled_Title": "Gmail 错误",
-    "GmailServiceDisabled_Message": "你的 Google Workspace 账户似乎已禁用 Gmail 服务。请联系你的管理员以为你的账户启用 Gmail 服务。",
+    "GmailServiceDisabled_Title": "Gmail 出错",
+    "GmailServiceDisabled_Message": "你的 Google Workspace 账户似乎无法使用 Gmail 服务。如需启用，请联系该账户的管理员。",
     "GmailArchiveFolderNameOverride": "归档",
     "HoverActionOption_Archive": "归档",
     "HoverActionOption_Delete": "删除",
     "HoverActionOption_MoveJunk": "移至垃圾箱",
     "HoverActionOption_ToggleFlag": "标记/取消标记",
     "HoverActionOption_ToggleRead": "已读/未读",
-    "ImageRenderingDisabled": "已禁用渲染此消息的图像。",
-    "ImapAdvancedSetupDialog_AuthenticationMethod": "身份授权方法",
+    "KeyboardShortcuts_FailedToReset": "重置快捷键失败。",
+    "KeyboardShortcuts_FailedToUpdate": "更新快捷键失败",
+    "KeyboardShortcuts_MailoperationAction": "操作",
+    "KeyboardShortcuts_Action": "操作",
+    "KeyboardShortcuts_FailedToLoad": "加载快捷键失败。",
+    "KeyboardShortcuts_EnterKeyForShortcut": "请输入快捷键。",
+    "KeyboardShortcuts_SelectOperationForShortcut": "请选择要对该快捷键执行的操作。",
+    "KeyboardShortcuts_EnterKey": "请输入快捷键。",
+    "KeyboardShortcuts_SelectOperation": "请选择快捷键的操作。",
+    "KeyboardShortcuts_ShortcutInUse": "此快捷键已被其他快捷键使用。",
+    "KeyboardShortcuts_FailedToSave": "保存快捷键失败。",
+    "KeyboardShortcuts_FailedToDelete": "删除快捷键失败。",
+    "KeyboardShortcuts_PageDescription": "设置快捷键以便快速进行邮件操作。将焦点放在按键输入字段上时按下所需的按键组合。",
+    "KeyboardShortcuts_Add": "添加快捷键",
+    "KeyboardShortcuts_EditTitle": "编辑快捷键",
+    "KeyboardShortcuts_ResetToDefaults": "重置为默认值",
+    "KeyboardShortcuts_PressKeysHere": "在此处按下按键...",
+    "KeyboardShortcuts_KeyCombination": "按键组合",
+    "KeyboardShortcuts_FocusArea": "将焦点放在上面的字段并按下所需的按键组合",
+    "KeyboardShortcuts_Modifiers": "修饰键",
+    "KeyboardShortcuts_Mode": "应用模式",
+    "KeyboardShortcuts_ModeMail": "邮件",
+    "KeyboardShortcuts_ModeCalendar": "日历",
+    "KeyboardShortcuts_ActionToggleReadUnread": "切换已读/未读",
+    "KeyboardShortcuts_ActionToggleFlag": "切换标记",
+    "KeyboardShortcuts_ActionToggleArchive": "切换存档/取消存档",
+    "ImageRenderingDisabled": "此邮件的图像渲染已禁用。",
+    "ImapAdvancedSetupDialog_AuthenticationMethod": "身份验证方法",
     "ImapAdvancedSetupDialog_ConnectionSecurity": "连接安全性",
-    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "必须填写授权方式",
+    "IMAPAdvancedSetupDialog_ValidationAuthMethodRequired": "必须填写验证方式",
     "IMAPAdvancedSetupDialog_ValidationConnectionSecurityRequired": "必须填写连接安全类型",
     "IMAPAdvancedSetupDialog_ValidationDisplayNameRequired": "必须填写显示名称",
     "IMAPAdvancedSetupDialog_ValidationEmailInvalid": "请输入有效的邮箱地址",
@@ -262,21 +430,21 @@
     "IMAPSetupDialog_AccountType": "账户名称",
     "IMAPSetupDialog_ValidationSuccess_Title": "成功",
     "IMAPSetupDialog_ValidationSuccess_Message": "验证成功",
-    "IMAPSetupDialog_SaveImapSuccess_Title": "成功",
-    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP 设置保存成功。",
+    "IMAPSetupDialog_SaveImapSuccess_Title": "Success",
+    "IMAPSetupDialog_SaveImapSuccess_Message": "IMAP settings saved successfuly.",
     "IMAPSetupDialog_ValidationFailed_Title": "IMAP 服务器验证失败。",
     "IMAPSetupDialog_CertificateAllowanceRequired_Row0": "该服务器正在请求 SSL 握手以继续。请确认下方的证书详情。",
-    "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "允许握手以继续设置你的账户。",
+    "IMAPSetupDialog_CertificateAllowanceRequired_Row1": "允许握手并继续设置账户。",
     "IMAPSetupDialog_CertificateDenied": "用户未授权使用该证书握手。",
     "IMAPSetupDialog_CertificateIssuer": "颁发者",
     "IMAPSetupDialog_CertificateSubject": "主题",
-    "IMAPSetupDialog_CertificateValidFrom": "有效起始于",
-    "IMAPSetupDialog_CertificateValidTo": "有效截止于",
+    "IMAPSetupDialog_CertificateValidFrom": "有效日期起始于",
+    "IMAPSetupDialog_CertificateValidTo": "有效日期截止于",
     "IMAPSetupDialog_CertificateView": "查看证书",
-    "IMAPSetupDialog_ConnectionFailedMessage": "IMAP 连接失败。",
+    "IMAPSetupDialog_ConnectionFailedMessage": "IMAP 连接失败",
     "IMAPSetupDialog_ConnectionFailedTitle": "连接失败",
     "IMAPSetupDialog_DisplayName": "显示名称",
-    "IMAPSetupDialog_DisplayNamePlaceholder": "例如：John Doe",
+    "IMAPSetupDialog_DisplayNamePlaceholder": "例如 John Doe",
     "IMAPSetupDialog_IncomingMailServer": "收件邮件服务器",
     "IMAPSetupDialog_IncomingMailServerPort": "端口",
     "IMAPSetupDialog_IMAPSettings": "IMAP 服务器设置",
@@ -286,21 +454,67 @@
     "IMAPSetupDialog_OutgoingMailServer": "发送 (SMTP) 邮件服务器",
     "IMAPSetupDialog_OutgoingMailServerPassword": "发送服务器密码",
     "IMAPSetupDialog_OutgoingMailServerPort": "端口",
-    "IMAPSetupDialog_OutgoingMailServerRequireAuthentication": "发送服务器需要授权",
+    "IMAPSetupDialog_OutgoingMailServerRequireAuthentication": "发送服务器需要身份验证",
     "IMAPSetupDialog_OutgoingMailServerUsername": "发送服务器用户名",
     "IMAPSetupDialog_Password": "密码",
     "IMAPSetupDialog_RequireSSLForIncomingMail": "接收邮件需要 SSL",
     "IMAPSetupDialog_RequireSSLForOutgoingMail": "接收邮件需要 SSL",
-    "IMAPSetupDialog_Title": "高级 IMAP 选项",
+    "IMAPSetupDialog_Title": "IMAP 高级选项",
     "IMAPSetupDialog_Username": "用户名",
     "IMAPSetupDialog_UsernamePlaceholder": "示例：johndoe, johndoe@fabrikam.com, domain/johndoe",
-    "IMAPSetupDialog_UseSameConfig": "使用同一用户名和密码发送电子邮件",
+    "IMAPSetupDialog_UseSameConfig": "发送电子邮件时使用同一用户名和密码",
+    "ImapCalDavSettingsPage_TitleCreate": "IMAP 与日历设置",
+    "ImapCalDavSettingsPage_TitleEdit": "编辑 IMAP 与日历设置",
+    "ImapCalDavSettingsPage_Subtitle": "为此账户配置 IMAP/SMTP 及可选的日历同步。",
+    "ImapCalDavSettingsPage_BasicSectionTitle": "基础设置",
+    "ImapCalDavSettingsPage_BasicSectionDescription": "输入您的身份信息和凭据。Wino 可以尝试自动检测服务器设置。",
+    "ImapCalDavSettingsPage_BasicTab": "基础",
+    "ImapCalDavSettingsPage_EnableCalendarSupport": "启用日历支持",
+    "ImapCalDavSettingsPage_AutoDiscoverButton": "自动发现邮件设置",
+    "ImapCalDavSettingsPage_AutoDiscoverySuccessMessage": "邮件设置已发现并应用。",
+    "ImapCalDavSettingsPage_AdvancedSectionTitle": "高级配置",
+    "ImapCalDavSettingsPage_AdvancedSectionDescription": "如果自动发现不可用或不正确，请手动输入服务器设置。",
+    "ImapCalDavSettingsPage_AdvancedTab": "高级",
+    "ImapCalDavSettingsPage_CalendarSectionTitle": "日历设置",
+    "ImapCalDavSettingsPage_CalendarSectionDescription": "选择日历数据在此 IMAP 账户中的工作方式。",
+    "ImapCalDavSettingsPage_CalendarModeHeader": "日历模式",
+    "ImapCalDavSettingsPage_ConnectionSecurityHeader": "连接安全",
+    "ImapCalDavSettingsPage_AuthenticationMethodHeader": "身份验证方法",
+    "ImapCalDavSettingsPage_CalendarModeDisabled": "已禁用",
+    "ImapCalDavSettingsPage_CalendarModeCalDav": "CalDAV 同步",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnly": "仅本地日历",
+    "ImapCalDavSettingsPage_CalendarModeDisabledDescription": "此账户的日历已被禁用。",
+    "ImapCalDavSettingsPage_CalendarModeCalDavDescription": "日历条目将与您的 CalDAV 服务器同步。",
+    "ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription": "日历条目仅存储在此计算机上，不会同步到网络。",
+    "ImapCalDavSettingsPage_LocalCalendarLearnMore": "本地日历如何工作",
+    "ImapCalDavSettingsPage_LocalCalendarDialogTitle": "仅本地日历",
+    "ImapCalDavSettingsPage_LocalCalendarDialogMessage": "本地日历将所有事件仅保存在您的计算机上。不会同步到 iCloud、Yahoo 或任何其他提供商。",
+    "ImapCalDavSettingsPage_CalDavServiceUrl": "CalDAV 服务 URL",
+    "ImapCalDavSettingsPage_CalDavUsername": "CalDAV 用户名",
+    "ImapCalDavSettingsPage_CalDavPassword": "CalDAV 密码",
+    "ImapCalDavSettingsPage_CalDavNotRequiredMessage": "仅在日历模式设置为 CalDAV 同步时才需要 CalDAV 测试。",
+    "ImapCalDavSettingsPage_CalDavUrlRequired": "需要 CalDAV 服务 URL。",
+    "ImapCalDavSettingsPage_CalDavUrlInvalid": "CalDAV 服务 URL 必须是一个绝对 URL。",
+    "ImapCalDavSettingsPage_CalDavUsernameRequired": "CalDAV 用户名是必填项。",
+    "ImapCalDavSettingsPage_CalDavPasswordRequired": "CalDAV 密码是必填项。",
+    "ImapCalDavSettingsPage_TestImapButton": "测试 IMAP 连接",
+    "ImapCalDavSettingsPage_TestCalDavButton": "测试 CalDAV 连接",
+    "ImapCalDavSettingsPage_ImapTestSuccessMessage": "IMAP 连接测试成功。",
+    "ImapCalDavSettingsPage_CalDavTestSuccessMessage": "CalDAV 连接测试成功。",
+    "ImapCalDavSettingsPage_SaveSuccessMessage": "账户设置已验证并保存。",
+    "ImapCalDavSettingsPage_ICloudHint": "使用在 Apple ID 设置中生成的应用专用密码。",
+    "ImapCalDavSettingsPage_YahooHint": "使用 Yahoo 账户安全设置中的应用密码。",
     "Info_AccountCreatedMessage": "{0} 已创建",
     "Info_AccountCreatedTitle": "创建账户",
     "Info_AccountCreationFailedTitle": "账户创建失败",
     "Info_AccountDeletedMessage": "{0} 已成功删除。",
     "Info_AccountDeletedTitle": "账户已删除",
     "Info_AccountIssueFixFailedTitle": "失败",
+    "Info_AccountIssueFixImapMessage": "打开 IMAP 和日历设置页面，重新输入您的服务器凭据。",
+    "Info_AccountAttentionRequiredMessage": "此账户需要您的关注。",
+    "Info_AccountAttentionRequiredClickableMessage": "点击以修复此账户并重新同步。",
+    "Info_AccountAttentionRequiredAction": "修复",
+    "Info_AccountAttentionRequiredActionHint": "点击修复以解决此账户问题。",
     "Info_AccountIssueFixSuccessMessage": "已修复所有账户问题。",
     "Info_AccountIssueFixSuccessTitle": "成功",
     "Info_AttachmentOpenFailedMessage": "无法打开此附件。",
@@ -309,11 +523,11 @@
     "Info_AttachmentSaveFailedTitle": "失败",
     "Info_AttachmentSaveSuccessMessage": "附件已保存。",
     "Info_AttachmentSaveSuccessTitle": "附件已保存",
-    "Info_BackgroundExecutionDeniedMessage": "应用的后台运行被拒绝。这可能会影响后台同步和实时通知。",
+    "Info_BackgroundExecutionDeniedMessage": "应用的后台运行被禁止。这可能会影响后台同步和实时通知。",
     "Info_BackgroundExecutionDeniedTitle": "后台执行被拒绝",
     "Info_BackgroundExecutionUnknownErrorMessage": "注册后台同步器时发生未知异常。",
     "Info_BackgroundExecutionUnknownErrorTitle": "后台执行失败",
-    "Info_CantDeletePrimaryAliasMessage": "主要别名无法被删除。请在删除前修改别名",
+    "Info_CantDeletePrimaryAliasMessage": "主要别名无法被删除。请在删除前修改别名。",
     "Info_ComposerMissingMIMEMessage": "无法找到 MIME 文件。同步可能有帮助。",
     "Info_ComposerMissingMIMETitle": "失败",
     "Info_ContactExistsMessage": "此联系人已经在收件人列表中。",
@@ -325,7 +539,7 @@
     "Info_FileLaunchFailedTitle": "无法启动文件",
     "Info_InvalidAddressMessage": "{0} 不是有效的电子邮件地址。",
     "Info_InvalidAddressTitle": "无效地址",
-    "Info_InvalidMoveTargetMessage": "你不能将选中的邮件移动到此文件夹。",
+    "Info_InvalidMoveTargetMessage": "您不能将选中的邮件移动到此文件夹。",
     "Info_InvalidMoveTargetTitle": "无效的移动目标",
     "Info_LogsNotFoundMessage": "没有可共享的日志。",
     "Info_LogsNotFoundTitle": "未找到日志",
@@ -338,21 +552,21 @@
     "Info_MessageCorruptedTitle": "错误",
     "Info_MissingFolderMessage": "此账户不存在 {0}。",
     "Info_MissingFolderTitle": "缺少文件夹",
-    "Info_PDFSaveFailedTitle": "保存 PDF 文件失败",
+    "Info_PDFSaveFailedTitle": "保存PDF文件失败",
     "Info_PDFSaveSuccessMessage": "PDF 文件已保存到 {0}",
     "Info_PDFSaveSuccessTitle": "成功",
     "Info_PurchaseExistsMessage": "看起来这个产品已经被购买了。",
     "Info_PurchaseExistsTitle": "产品已购买",
-    "Info_PurchaseThankYouMessage": "感谢你",
+    "Info_PurchaseThankYouMessage": "感谢您",
     "Info_PurchaseThankYouTitle": "购买成功",
     "Info_RequestCreationFailedTitle": "请求创建失败",
-    "Info_ReviewNetworkErrorMessage": "你的评论有一个网络问题。",
+    "Info_ReviewNetworkErrorMessage": "您的评论有一个网络问题。",
     "Info_ReviewNetworkErrorTitle": "网络问题",
-    "Info_ReviewNewMessage": "感谢所有反馈。谢谢你的评论！",
+    "Info_ReviewNewMessage": "感谢所有反馈。谢谢您的评论！",
     "Info_ReviewSuccessTitle": "谢谢",
-    "Info_ReviewUnknownErrorMessage": "你的评论有一个未知的问题。({0})",
+    "Info_ReviewUnknownErrorMessage": "您的评论有一个未知的问题。({0})",
     "Info_ReviewUnknownErrorTitle": "未知错误",
-    "Info_ReviewUpdatedMessage": "感谢你的最新评论。",
+    "Info_ReviewUpdatedMessage": "感谢您的最新评论。",
     "Info_SignatureDisabledMessage": "已禁用此账户的签名",
     "Info_SignatureDisabledTitle": "成功",
     "Info_SignatureSavedMessage": "已保存新签名",
@@ -363,16 +577,17 @@
     "Info_UnsubscribeErrorMessage": "取消订阅失败",
     "Info_UnsubscribeLinkInvalidMessage": "此退订链接无效。取消订阅列表失败。",
     "Info_UnsubscribeLinkInvalidTitle": "无效的取消订阅 Uri",
-    "Info_UnsubscribeSuccessMessage": "成功取消了来自 {0} 的订阅。",
+    "Info_UnsubscribeSuccessMessage": "成功取消了来自 {0} 处的订阅！",
     "Info_UnsupportedFunctionalityDescription": "此功能尚未实现。",
     "Info_UnsupportedFunctionalityTitle": "不支持",
     "InfoBarAction_Enable": "启用",
     "InfoBarMessage_SynchronizationDisabledFolder": "此文件夹已禁用同步。",
     "InfoBarTitle_SynchronizationDisabledFolder": "已禁用文件夹",
     "Justify": "对齐",
+    "MenuUpdateAvailable": "有更新可用",
     "Left": "左侧",
     "Link": "链接",
-    "LinkedAccountsCreatePolicyMessage": "你必须拥有至少 2 个账户才能创建链接\n链接将在保存时删除",
+    "LinkedAccountsCreatePolicyMessage": "您必须拥有至少 2 个账户才能创建链接\n链接将在保存时删除",
     "LinkedAccountsTitle": "已绑定的账户",
     "MailItemNoSubject": "无主题",
     "MailOperation_AlwaysMoveFocused": "总是移动到重点。",
@@ -386,10 +601,10 @@
     "MailOperation_Forward": "转发",
     "MailOperation_Ignore": "忽略",
     "MailOperation_LightEditor": "浅色",
-    "MailOperation_MarkAsJunk": "标记为垃圾",
+    "MailOperation_MarkAsJunk": "标记为垃圾邮件",
     "MailOperation_MarkAsRead": "标记为已读",
     "MailOperation_MarkAsUnread": "标记为未读",
-    "MailOperation_MarkNotJunk": "标记为非垃圾",
+    "MailOperation_MarkNotJunk": "标记为非垃圾邮件",
     "MailOperation_Move": "移动",
     "MailOperation_MoveFocused": "移动到重点",
     "MailOperation_MoveJunk": "移至垃圾箱",
@@ -403,6 +618,7 @@
     "MailOperation_Unarchive": "取消归档",
     "MailOperation_ViewMessageSource": "查看消息来源",
     "MailOperation_Zoom": "缩放",
+    "MailsDragging": "正在拖动 {0} 项",
     "MailsSelected": "已选择 {0} 项",
     "MarkFlagUnflag": "标记为已标记/未标记",
     "MarkReadUnread": "标记为已读/未读",
@@ -430,12 +646,14 @@
     "NoMailSelected": "未选择任何邮件",
     "NoMessageCrieteria": "没有符合搜索条件的邮件",
     "NoMessageEmptyFolder": "此文件夹为空",
-    "Notifications_MultipleNotificationsMessage": "你有 {0} 条新消息。",
+    "Notifications_MultipleNotificationsMessage": "您有 {0} 条新消息。",
     "Notifications_MultipleNotificationsTitle": "新邮件",
     "Notifications_WinoUpdatedMessage": "检查新版本 {0}",
-    "Notifications_WinoUpdatedTitle": "Wino Mail 已更新。",
+    "Notifications_WinoUpdatedTitle": "Wino 邮件已更新。",
+    "Notifications_StoreUpdateAvailableTitle": "有可用更新",
+    "Notifications_StoreUpdateAvailableMessage": "较新版本的 Wino Mail 已准备好从 Microsoft Store 安装。",
     "OnlineSearchFailed_Message": "无法执行搜索\n{0}\n\n列出的是离线邮件。",
-    "OnlineSearchTry_Line1": "找不到你想要的？",
+    "OnlineSearchTry_Line1": "还是找不到您想要的？",
     "OnlineSearchTry_Line2": "请尝试在线搜索。",
     "Other": "其他",
     "PaneLengthOption_Default": "默认",
@@ -446,8 +664,7 @@
     "PaneLengthOption_Small": "小",
     "Photos": "图片",
     "PreparingFoldersMessage": "正在准备文件夹",
-    "ProtocolLogAvailable_Message": "协议诊断日志已可用。",
-    "ProviderDetail_Gmail_Description": "Google 账户",
+    "ProviderDetail_Gmail_Description": "Google 账号",
     "ProviderDetail_iCloud_Description": "Apple iCloud 帐户",
     "ProviderDetail_iCloud_Title": "iCloud",
     "ProviderDetail_IMAP_Description": "自定义 IMAP/SMTP 服务器",
@@ -465,31 +682,40 @@
     "SearchBarPlaceholder": "搜索",
     "SearchingIn": "搜索于",
     "SearchPivotName": "结果",
+    "Settings_KeyboardShortcuts_Title": "快捷键",
+    "Settings_KeyboardShortcuts_Description": "管理邮件的快捷键以实现快速操作。",
     "SettingConfigureSpecialFolders_Button": "配置",
     "SettingsEditAccountDetails_IMAPConfiguration_Title": "IMAP/SMTP 配置",
     "SettingsEditAccountDetails_IMAPConfiguration_Description": "更改您的收件 / 发件服务器设置。",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Title": "IMAP 与日历设置",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Description": "打开此账户的专用 IMAP、SMTP 和 CalDAV 设置页面。",
+    "SettingsEditAccountDetails_ImapCalDavSettings_Action": "打开设置",
     "SettingsAbout_Description": "了解更多关于 Wino 的信息。",
     "SettingsAbout_Title": "关于",
-    "SettingsAboutGithub_Description": "转到 GitHub 仓库以跟踪议题。",
+    "SettingsAboutGithub_Description": "转到 GitHub 仓库以跟踪 issues。",
     "SettingsAboutGithub_Title": "GitHub",
     "SettingsAboutVersion": "版本 ",
     "SettingsAboutWinoDescription": "Windows 系列设备的轻量邮件客户端。",
     "SettingsAccentColor_Description": "更改应用的主题颜色",
     "SettingsAccentColor_Title": "主题颜色",
-    "SettingsAccentColor_UseWindowsAccentColor": "使用 Windows 主题颜色",
-    "SettingsAccountManagementAppendMessage_Description": "在草稿发送后在发送文件夹中创建邮件的副本。 如果你在发送文件夹中没有看到你的邮件，请启用此功能。",
+    "SettingsAccentColor_UseWindowsAccentColor": "使用 Windows 主题色",
+    "SettingsAccountManagementAppendMessage_Description": "在草稿发送后在发送文件夹中创建邮件的副本。 如果您在发送文件夹中没有看到您的邮件，请启用此功能。",
     "SettingsAccountManagementAppendMessage_Title": "添加邮件到已发送文件夹",
     "SettingsAccountName_Description": "更改账户名称。",
     "SettingsAccountName_Title": "账户名称",
     "SettingsApplicationTheme_Description": "根据你的喜好，用不同的自定义应用主题来个性化 Wino。",
     "SettingsApplicationTheme_Title": "应用主题",
-    "SettingsAppPreferences_CloseBehavior_Description": "当你关闭应用时应该怎么做？",
+    "SettingsAppPreferences_CloseBehavior_Description": "当关闭应用时 Wino Mail 应该怎么做？",
     "SettingsAppPreferences_CloseBehavior_Title": "应用关闭后行为",
-    "SettingsAppPreferences_Description": "Wino Mail 的常规/首选项设置。",
-    "SettingsAppPreferences_SearchMode_Description": "设置在搜索时是先检查本地邮件还是请求远程服务器。本地搜索通常更快，而且当本地搜索找不到邮件时，你也可以再进行在线搜索。",
+    "SettingsAppPreferences_Description": "Wino Mail 的常规 / 首选项设置",
+    "SettingsAppPreferences_SearchMode_Description": "设置在搜索时是先检查本地邮件还是请求远程服务器。本地搜索通常更快，而且当本地搜索找不到邮件时，您也可以再进行在线搜索。",
     "SettingsAppPreferences_SearchMode_Local": "本地",
     "SettingsAppPreferences_SearchMode_Online": "在线",
     "SettingsAppPreferences_SearchMode_Title": "默认搜索模式",
+    "SettingsAppPreferences_ApplicationMode_Title": "默认应用模式",
+    "SettingsAppPreferences_ApplicationMode_Description": "当未显式设置激活类型时，选择 Wino 打开的默认模式。",
+    "SettingsAppPreferences_ApplicationMode_Mail": "邮件",
+    "SettingsAppPreferences_ApplicationMode_Calendar": "日历",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Description": "Wino Mail 将在后台运行。当收到新邮件时将推送通知。",
     "SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title": "后台运行",
     "SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Description": "Wino Mail 将在系统托盘上继续运行。点击托盘图标时将启动应用。当收到新邮件时将推送通知。",
@@ -498,31 +724,49 @@
     "SettingsAppPreferences_ServerBackgroundingMode_Terminate_Title": "终止进程",
     "SettingsAppPreferences_StartupBehavior_Description": "允许 Wino Mail 随 Windows 最小化自启动。总是允许接收应用通知。",
     "SettingsAppPreferences_StartupBehavior_Disable": "禁用",
-    "SettingsAppPreferences_StartupBehavior_Disabled": "Wino Mail 将不会随 Windows 启动时自启。可能会导致重启系统后错过邮件通知。",
+    "SettingsAppPreferences_StartupBehavior_Disabled": "Wino Mail 将不会随 Windows 自动。可能会导致重启系统后错过邮件通知。",
     "SettingsAppPreferences_StartupBehavior_DisabledByPolicy": "管理员或组策略禁止了应用随 Windows 自启动，因此 Wino Mail 无法随 Windows 自启动。",
-    "SettingsAppPreferences_StartupBehavior_DisabledByUser": "请前往「应用」->「启动」以允许 Wino Mail 随 Windows 自启动。",
+    "SettingsAppPreferences_StartupBehavior_DisabledByUser": "请前往「任务管理器 」-「启动应用」标签以允许 Wino Mail 随 Windows 自启动。",
     "SettingsAppPreferences_StartupBehavior_Enable": "启用",
-    "SettingsAppPreferences_StartupBehavior_Enabled": "Wino Mail 成功设置为随 Windows 自启动。",
+    "SettingsAppPreferences_StartupBehavior_Enabled": "Wino 成功设置为随 Windows 自启动。",
     "SettingsAppPreferences_StartupBehavior_FatalError": "更改 Wino Mail 启动模式发生严重错误。",
     "SettingsAppPreferences_StartupBehavior_Title": "随 Windows 启动并最小化应用",
     "SettingsAppPreferences_Title": "应用设置",
+    "SettingsAppPreferences_HideWinoAccountButton_Title": "在标题栏隐藏 Wino 账户按钮",
+    "SettingsAppPreferences_HideWinoAccountButton_Description": "隐藏在标题栏中用于打开 Wino 账户弹出菜单的个人资料按钮。",
+    "SettingsAppPreferences_StoreUpdateNotifications_Title": "商店更新通知",
+    "SettingsAppPreferences_StoreUpdateNotifications_Description": "在 Microsoft Store 有更新时显示通知和页脚操作。",
+    "SettingsAppPreferences_AiActions_Title": "AI 操作",
+    "SettingsAppPreferences_AiActions_Description": "选择默认 AI 语言及摘要应保存的位置。",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Title": "默认翻译语言",
+    "SettingsAppPreferences_AiDefaultTranslationLanguage_Description": "选择 AI 翻译操作使用的默认目标语言。",
+    "SettingsAppPreferences_AiSummarizeLanguage_Title": "摘要语言",
+    "SettingsAppPreferences_AiSummarizeLanguage_Description": "选择未来 AI 摘要输出的首选摘要语言。",
+    "SettingsAppPreferences_AiSummarySavePath_Title": "默认摘要保存路径",
+    "SettingsAppPreferences_AiSummarySavePath_Description": "选择 Wino 保存 AI 摘要时应使用的默认文件夹。",
+    "SettingsAppPreferences_AiSummarySavePath_Placeholder": "使用系统默认的保存位置",
+    "SettingsAppPreferences_AiSummarySavePath_InvalidHint": "此文件夹不存在。将使用默认摘要保存位置。",
     "SettingsAutoSelectNextItem_Description": "选择删除或移动邮件后的下一个项目。",
     "SettingsAutoSelectNextItem_Title": "自动选择下一个项目",
-    "SettingsAvailableThemes_Description": "从 Wino 的自带收藏中选择一个符合你口味的主题，或应用你自己的主题。",
-    "SettingsAvailableThemes_Title": "可用主题",
+    "SettingsAvailableThemes_Description": "从 Wino 的自带收藏中选择一个符合您口味的主题，或应用您自己的主题。",
+    "SettingsAvailableThemes_Title": "可用的主题",
     "SettingsCalendarSettings_Description": "更改一周的第一天、小时单元格高度，等等…",
     "SettingsCalendarSettings_Title": "日历设置",
+    "CalendarSettings_DefaultSnoozeDuration_Header": "默认延迟提醒时长",
+    "CalendarSettings_DefaultSnoozeDuration_Description": "为日历提醒通知设置默认延迟时长。",
+    "CalendarSettings_TimedDayHeaderFormat_Header": "带时间的日视图头部格式",
+    "CalendarSettings_TimedDayHeaderFormat_Description": "选择在日、周和工作周视图中顶部日期标签的呈现方式。使用日期格式标记，如 ddd、dd、MMM 或 dddd。",
     "SettingsComposer_Title": "编辑器",
-    "SettingsComposerFont_Title": "默认编辑字体",
-    "SettingsComposerFontFamily_Description": "更改编辑邮件时的默认字体和字体大小。",
-    "SettingsConfigureSpecialFolders_Description": "设置具有特殊功能的文件夹。如收件箱、草稿箱、归档等文件夹对于 Wino 正常运行是必要的。",
+    "SettingsComposerFont_Title": "默认撰写字体",
+    "SettingsComposerFontFamily_Description": "更改撰写邮件时的默认字体和字体大小。",
+    "SettingsConfigureSpecialFolders_Description": "设置具有特殊功能的文件夹。如收件箱、草稿箱、存档等文件夹，对于Wino正常运行是至关重要的。",
     "SettingsConfigureSpecialFolders_Title": "配置系统文件夹",
-    "SettingsCustomTheme_Description": "用自定义壁纸和主题颜色创建你自己定义的主题。",
+    "SettingsCustomTheme_Description": "用自定义壁纸和主题色创建您自己的自定义主题。",
     "SettingsCustomTheme_Title": "自定义主题",
     "SettingsDeleteAccount_Description": "删除与此账户关联的所有电子邮件和凭据。",
     "SettingsDeleteAccount_Title": "删除此账户",
-    "SettingsDeleteProtection_Description": "每次你尝试使用 Shift + Del 永久删除邮件时，Wino 应该向你确认吗？",
-    "SettingsDeleteProtection_Title": "永久删除保护",
+    "SettingsDeleteProtection_Description": "Should Wino ask you for confirmation every time you try to permanently delete a mail using Shift + Del keys?",
+    "SettingsDeleteProtection_Title": "永久性删除保护",
     "SettingsDiagnostics_Description": "开发者选项",
     "SettingsDiagnostics_DiagnosticId_Description": "如需联系开发人员请求帮助，请提供此 ID。",
     "SettingsDiagnostics_DiagnosticId_Title": "诊断 ID",
@@ -531,22 +775,25 @@
     "SettingsDiscord_Title": "Discord 频道",
     "SettingsEditLinkedInbox_Description": "添加/删除账户，重命名或断开账户之间的链接。",
     "SettingsEditLinkedInbox_Title": "编辑已链接收件箱",
+    "SettingsWindowBackdrop_Title": "窗口背景",
+    "SettingsWindowBackdrop_Description": "为 Wino 窗口选择背景效果。",
+    "SettingsWindowBackdrop_Disabled": "当应用主题不是默认时，窗口背景选择被禁用。",
     "SettingsElementTheme_Description": "为 Wino 选择一个 Windows 主题",
     "SettingsElementTheme_Title": "元素主题",
     "SettingsElementThemeSelectionDisabled": "当选择的应用主题不是默认主题时，元素主题选择将被禁用。",
     "SettingsEnableHoverActions_Title": "启用悬停动作",
     "SettingsEnableIMAPLogs_Description": "启用此选项可提供在设置 IMAP 服务器过程中遇到的 IMAP 连接问题的详细信息。",
     "SettingsEnableIMAPLogs_Title": "启用 IMAP 协议日志",
-    "SettingsEnableLogs_Description": "我可能需要日志来分析你在 GitHub 中打开的问题。 所有日志都不会公开你的凭据或敏感信息。",
+    "SettingsEnableLogs_Description": "我可能需要日志来分析您在 GitHub 中打开的问题。 所有日志都不会公开您的凭据或敏感信息。",
     "SettingsEnableLogs_Title": "启用日志",
     "SettingsEnableSignature": "启用签名",
     "SettingsExpandOnStartup_Description": "设置 Wino 是否应该在启动时展开此账户的文件夹。",
     "SettingsExpandOnStartup_Title": "启动时展开菜单",
     "SettingsExternalContent_Description": "在渲染邮件时管理外部内容设置。",
     "SettingsExternalContent_Title": "外部内容",
-    "SettingsFocusedInbox_Description": "设置是否应将收件箱分为重点和其他两部分 。",
+    "SettingsFocusedInbox_Description": "设置是否应将收件箱分为两部分 - 重点和其他。",
     "SettingsFocusedInbox_Title": "重点收件箱",
-    "SettingsFolderMenuStyle_Description": "控制账户文件夹是否应嵌套在账户菜单中。 如果你喜欢 Windows 邮件中的旧菜单，关闭此选项",
+    "SettingsFolderMenuStyle_Description": "控制账户文件夹是否应嵌套在账户菜单中。 如果您喜欢Windows邮件中的旧菜单，关闭此选项",
     "SettingsFolderMenuStyle_Title": "创建内部文件夹",
     "SettingsFolderOptions_Description": "更改个人文件夹设置，如启用/禁用同步或显示/隐藏未读标志。",
     "SettingsFolderOptions_Title": "文件夹设置",
@@ -554,7 +801,7 @@
     "SettingsFolderSync_Title": "文件夹同步",
     "SettingsFontFamily_Title": "字体",
     "SettingsFontPreview_Title": "预览",
-    "SettingsFontSize_Title": "文字大小",
+    "SettingsFontSize_Title": "字体大小",
     "SettingsHoverActionCenter": "中心动作",
     "SettingsHoverActionLeft": "左侧动作",
     "SettingsHoverActionRight": "右侧动作",
@@ -562,14 +809,14 @@
     "SettingsHoverActions_Title": "悬停动作",
     "SettingsLanguage_Description": "更改 Wino 的显示语言。",
     "SettingsLanguage_Title": "显示语言",
-    "SettingsLanguageTime_Description": "Wino 显示语言，首选时间格式。",
+    "SettingsLanguageTime_Description": "Wino 显示语言，首选时间格式",
     "SettingsLanguageTime_Title": "语言和时间",
-    "SettingsLinkAccounts_Description": "合并多个账户为一个。在同一个收件箱内查看邮件。",
+    "SettingsLinkAccounts_Description": "将多个账户合并为一个。在同一个收件箱内查看所有邮件。",
     "SettingsLinkAccounts_Title": "创建链接账户",
     "SettingsLinkedAccountsSave_Description": "修改当前与新账户的链接。",
     "SettingsLinkedAccountsSave_Title": "保存更改",
     "SettingsLoadImages_Title": "自动加载图片",
-    "SettingsLoadPlaintextLinks_Title": "转换纯文本链接为可点击链接",
+    "SettingsLoadPlaintextLinks_Title": "将纯文本链接转换为可点击链接",
     "SettingsLoadStyles_Title": "自动加载样式",
     "SettingsMailListActionBar_Description": "隐藏/显示消息列表顶部操作栏。",
     "SettingsMailListActionBar_Title": "显示邮件列表操作",
@@ -577,10 +824,12 @@
     "SettingsMailSpacing_Title": "邮件间距",
     "SettingsManageAccountSettings_Description": "每个账户的通知、签名、同步等设置。",
     "SettingsManageAccountSettings_Title": "管理账户设置",
-    "SettingsManageAliases_Description": "查看分配给该账户的电子邮箱地址，更新或删除别名。",
+    "SettingsManageAliases_Description": "查看分配给该账户的电子邮箱地址，可更新或删除别名。",
     "SettingsManageAliases_Title": "别名",
     "SettingsEditAccountDetails_Title": "编辑账户信息",
-    "SettingsEditAccountDetails_Description": "你可以按喜好调整账户名称、发件人名称和账户颜色。",
+    "SettingsEditAccountDetails_Description": "您可以按喜好调整账户名称、发件人名称和账户颜色。",
+    "EditAccountDetailsPage_SaveSuccess_Title": "已保存更改",
+    "EditAccountDetailsPage_SaveSuccess_Message": "您的账户详细信息已成功更新。",
     "SettingsManageLink_Description": "移动项目以添加新链接或删除现有链接。",
     "SettingsManageLink_Title": "管理账户链接",
     "SettingsMarkAsRead_Description": "更改应对选定项目进行何种操作。",
@@ -590,46 +839,95 @@
     "SettingsMarkAsRead_Title": "标记为已读",
     "SettingsMarkAsRead_WhenSelected": "选中时",
     "SettingsMessageList_Description": "更改邮件列表中的消息应如何组织。",
-    "SettingsMessageList_Title": "消息列表",
-    "SettingsNoAccountSetupMessage": "你尚未设置任何账户。",
+    "SettingsMessageList_Title": "邮件列表",
+    "SettingsNoAccountSetupMessage": "您尚未设置任何账户。",
     "SettingsNotifications_Description": "开启或关闭此账户的通知。",
     "SettingsNotifications_Title": "通知",
     "SettingsNotificationsAndTaskbar_Description": "更改是否应显示此帐户的通知和任务栏徽标。",
     "SettingsNotificationsAndTaskbar_Title": "通知与任务栏",
+    "SettingsHome_Title": "首页",
+    "SettingsHome_SearchTitle": "查找设置",
+    "SettingsHome_SearchDescription": "按功能、主题或关键词进行搜索，直接跳转到正确的设置页面。",
+    "SettingsHome_SearchPlaceholder": "搜索设置",
+    "SettingsHome_SearchExamples": "示例：主题、存储、语言、签名",
+    "SettingsHome_QuickLinks_Title": "快速链接",
+    "SettingsHome_QuickLinks_Description": "直达用户最常用的设置。",
+    "SettingsHome_StorageCard_Description": "查看 Wino 在此设备上保留的本地 MIME 内容量，并在需要时清理。",
+    "SettingsHome_StorageEmptySummary": "尚未检测到缓存的 MIME 内容。",
+    "SettingsHome_StorageLoading": "正在检查本地 MIME 使用情况...",
+    "SettingsHome_Tips_Title": "提示与技巧",
+    "SettingsHome_Tips_Description": "一些小改动就能让 Wino 更具个性。",
+    "SettingsHome_Tip_Theme": "想要暗黑模式或强调色变更？打开个性化设置。",
+    "SettingsHome_Tip_Background": "使用应用偏好设置来控制启动行为和后台同步。",
+    "SettingsHome_Tip_Shortcuts": "键盘快捷键可帮助你更快地浏览邮件。",
+    "SettingsHome_Resources_Title": "有用的链接",
+    "SettingsHome_Resources_Description": "打开项目资源、支持信息和发布通道。",
     "SettingsOptions_Title": "设置",
-    "SettingsPaneLengthReset_Description": "如果你遇到问题，可以将邮件列表重置至原始大小。",
+    "SettingsOptions_GeneralSection": "常规",
+    "SettingsOptions_MailSection": "邮件",
+    "SettingsOptions_CalendarSection": "日历",
+    "SettingsOptions_MoreComingSoon": "更多选项敬请期待",
+    "SettingsOptions_HeroDescription": "定制您的 Wino Mail 体验",
+    "SettingsOptions_AccountsSummary": "{0} 个账户已配置",
+    "SettingsSearch_ManageAccounts_Keywords": "账户;账户;邮箱;邮箱;别名;别名;个人资料;地址;地址",
+    "SettingsSearch_AppPreferences_Keywords": "启动;后台;启动;同步;通知;通知;搜索;托盘;默认值",
+    "SettingsSearch_LanguageTime_Keywords": "语言;时间;时钟;区域设置;区域;格式;24 小时制;24h",
+    "SettingsSearch_Personalization_Keywords": "主题;深色;浅色;外观;强调色;颜色;颜色;模式;布局;密度",
+    "SettingsSearch_About_Keywords": "关于;版本;网站;隐私;GitHub;捐赠;商店;支持",
+    "SettingsSearch_KeyboardShortcuts_Keywords": "快捷键;快捷键;热键;热键;键盘;按键",
+    "SettingsSearch_MessageList_Keywords": "消息;消息;列表;线程;线程;头像;预览;发件人",
+    "SettingsSearch_ReadComposePane_Keywords": "阅读器;撰写;撰写器;字体;字体;外部内容;显示;阅读",
+    "SettingsSearch_SignatureAndEncryption_Keywords": "签名;签名;加密;证书;证书;S/MIME;S/MIME;安全",
+    "SettingsSearch_Storage_Keywords": "存储;缓存;缓存;MIME;磁盘;空间;清理;清理;本地数据",
+    "SettingsSearch_CalendarSettings_Keywords": "日历;周;时;日程;事件;事件",
+    "SettingsPaneLengthReset_Description": "如果遇到问题，可以将邮件列表重置至原始大小。",
     "SettingsPaneLengthReset_Title": "重置邮件列表大小",
     "SettingsPaypal_Description": "展示更多的爱吧 ❤️ 我们感激所有的捐赠。",
     "SettingsPaypal_Title": "通过 PayPal 捐赠",
-    "SettingsPersonalization_Description": "按照你喜欢的方式改变 Wino 的外观。",
+    "SettingsPersonalization_Description": "按照您喜欢的方式更改 Wino 的外观。",
     "SettingsPersonalization_Title": "个性化",
     "SettingsPersonalizationMailDisplayCompactMode": "紧凑模式",
     "SettingsPersonalizationMailDisplayMediumMode": "中等模式",
     "SettingsPersonalizationMailDisplaySpaciousMode": "宽敞模式",
     "SettingsPrefer24HourClock_Description": "邮件接收时间将显示为 24 小时制，而不是 12 小时制(上午/下午)",
-    "SettingsPrefer24HourClock_Title": "使用 24 小时制时钟格式",
+    "SettingsPrefer24HourClock_Title": "使用 24 小时制时间格式",
     "SettingsPrivacyPolicy_Description": "查看隐私政策。",
     "SettingsPrivacyPolicy_Title": "隐私政策",
+    "SettingsWebsite_Description": "打开 Wino Mail 网站。",
+    "SettingsWebsite_Title": "网站",
     "SettingsReadComposePane_Description": "字体与外部内容。",
     "SettingsReadComposePane_Title": "阅读器和编辑器",
     "SettingsReader_Title": "阅读器",
     "SettingsReaderFont_Title": "默认阅读字体",
-    "SettingsReaderFontFamily_Description": "更改阅读邮件的默认字体和文字大小。",
+    "SettingsReaderFontFamily_Description": "更改阅读邮件的默认字体和字体大小。",
     "SettingsRenameMergeAccount_Description": "更改链接账户的显示名称。",
     "SettingsRenameMergeAccount_Title": "重命名",
-    "SettingsReorderAccounts_Description": "改变账户在列表中的顺序。",
-    "SettingsReorderAccounts_Title": "重新排列账账户",
-    "SettingsSemanticZoom_Description": "这将允许你点击消息列表中的标题并转到指定日期",
+    "SettingsReorderAccounts_Description": "改变账号在账号列表中的顺序。",
+    "SettingsReorderAccounts_Title": "重新排列账号",
+    "SettingsSemanticZoom_Description": "这将允许您点击消息列表中的标题并转到指定日期",
     "SettingsSemanticZoom_Title": "为日期标题启用语义缩放",
     "SettingsShowPreviewText_Description": "隐藏/显示预览文本。",
     "SettingsShowPreviewText_Title": "显示预览文本",
     "SettingsShowSenderPictures_Description": "隐藏/显示缩略图发件人图片。",
     "SettingsShowSenderPictures_Title": "显示发件人头像",
-    "SettingsEnableGravatarAvatars_Title": "Gravator 头像",
-    "SettingsEnableGravatarAvatars_Description": "使用 Gravatar (如果可用) 作为发件人图片",
-    "SettingsEnableFavicons_Title": "域图标 (Favicons)",
-    "SettingsEnableFavicons_Description": "使用域图标 (Favicons) 作为发件人图片",
-    "SettingsMailList_ClearAvatarsCache_Button": "清除缓存的头像",
+    "SettingsEmailTemplates_Title": "邮件模板",
+    "SettingsEmailTemplates_Description": "管理电子邮件模板",
+    "SettingsEmailTemplates_CreatePageTitle": "新模板",
+    "SettingsEmailTemplates_EditPageTitle": "编辑模板",
+    "SettingsEmailTemplates_NewTemplateTitle": "新模板",
+    "SettingsEmailTemplates_NewTemplateDescription": "创建一个新的电子邮件模板",
+    "SettingsEmailTemplates_NameTitle": "名称",
+    "SettingsEmailTemplates_NamePlaceholder": "模板名称",
+    "SettingsEmailTemplates_DescriptionTitle": "描述",
+    "SettingsEmailTemplates_DescriptionPlaceholder": "可选描述",
+    "SettingsEmailTemplates_ContentTitle": "模板内容",
+    "SettingsEmailTemplates_ContentDescription": "编辑此模板的 HTML 内容。",
+    "SettingsEmailTemplates_NameRequired": "模板名称是必填项。",
+    "SettingsEnableGravatarAvatars_Title": "Gravatar",
+    "SettingsEnableGravatarAvatars_Description": "Use gravatar (if available) as sender picture",
+    "SettingsEnableFavicons_Title": "Domain icons (Favicons)",
+    "SettingsEnableFavicons_Description": "Use domain favicons (if available) as sender picture",
+    "SettingsMailList_ClearAvatarsCache_Button": "Clear cached avatars",
     "SettingsSignature_AddCustomSignature_Button": "添加签名",
     "SettingsSignature_AddCustomSignature_Title": "添加自定义签名",
     "SettingsSignature_DeleteSignature_Title": "删除签名",
@@ -645,44 +943,74 @@
     "SettingsStartupItem_Title": "启动项",
     "SettingsStore_Description": "展示更多的爱❤️",
     "SettingsStore_Title": "在商店中评分",
+    "SettingsStorage_Title": "存储",
+    "SettingsStorage_Description": "在本地数据文件夹中扫描并管理 MIME 缓存。",
+    "SettingsStorage_ScanFolder": "扫描本地数据文件夹",
+    "SettingsStorage_NoLocalMimeDataFound": "未找到本地 MIME 数据。",
+    "SettingsStorage_NoAccountsFound": "未找到账户。",
+    "SettingsStorage_TotalUsage": "本地 MIME 总使用量：{0}",
+    "SettingsStorage_AccountUsageDescription": "{0} 已用于本地 MIME 缓存",
+    "SettingsStorage_DeleteAll_Title": "删除所有 MIME 内容",
+    "SettingsStorage_DeleteAll_Description": "删除此账户的整个 MIME 缓存文件夹。",
+    "SettingsStorage_DeleteAll_Button": "删除所有",
+    "SettingsStorage_DeleteAll_Confirm_Title": "删除所有 MIME 内容",
+    "SettingsStorage_DeleteAll_Confirm_Message": "是否删除 {0} 的本地 MIME 数据？",
+    "SettingsStorage_DeleteAll_Success": "所有 MIME 内容已被删除。",
+    "SettingsStorage_DeleteOld_Title": "删除旧的 MIME 内容",
+    "SettingsStorage_DeleteOld_Description": "根据本地数据库中的邮件创建日期删除 MIME 文件。",
+    "SettingsStorage_DeleteOld_1Month": "> 1 个月",
+    "SettingsStorage_DeleteOld_3Months": "> 3 个月",
+    "SettingsStorage_DeleteOld_6Months": "> 6 个月",
+    "SettingsStorage_DeleteOld_1Year": "> 1 年",
+    "SettingsStorage_DeleteOld_Confirm_Title": "删除旧的 MIME 内容",
+    "SettingsStorage_DeleteOld_Confirm_Message": "是否删除 {1} 的本地 MIME 数据，且早于 {0}？",
+    "SettingsStorage_DeleteOld_Success": "已删除 {0} 个早于 {1} 的 MIME 文件夹。",
+    "SettingsStorage_1Month": "1 个月",
+    "SettingsStorage_3Months": "3 个月",
+    "SettingsStorage_6Months": "6 个月",
+    "SettingsStorage_1Year": "1 年",
+    "SettingsStorage_Months": "{0} 个月",
     "SettingsTaskbarBadge_Description": "在任务栏图标中包含未读邮件数量。",
     "SettingsTaskbarBadge_Title": "任务栏徽标",
-    "SettingsThreads_Description": "将邮件组织成对话线。",
-    "SettingsThreads_Title": "线性对话",
-    "SettingsUnlinkAccounts_Description": "删除账户之间的链接。这不会删除你的账户。",
+    "SettingsThreads_Description": "将邮件组织成对话主题。",
+    "SettingsThreads_Title": "邮件会话",
+    "SettingsUnlinkAccounts_Description": "删除账户之间的链接。这不会删除您的账户。",
     "SettingsUnlinkAccounts_Title": "取消链接账户",
-    "SettingsMailRendering_ActionLabels_Title": "活动标签",
-    "SettingsMailRendering_ActionLabels_Description": "显示活动标签。",
+    "SettingsMailRendering_ActionLabels_Title": "Action labels",
+    "SettingsMailRendering_ActionLabels_Description": "Show action labels.",
     "SignatureDeleteDialog_Message": "确定要删除签名「{0}」吗？",
     "SignatureDeleteDialog_Title": "删除签名",
-    "SignatureEditorDialog_SignatureName_Placeholder": "命名签名",
+    "SignatureEditorDialog_SignatureName_Placeholder": "为签名命名",
     "SignatureEditorDialog_SignatureName_TitleEdit": "当前签名：{0}",
     "SignatureEditorDialog_SignatureName_TitleNew": "签名名称",
     "SignatureEditorDialog_Title": "签名编辑器",
     "SortingOption_Date": "按日期",
     "SortingOption_Name": "按名称",
-    "StoreRatingDialog_MessageFirstLine": "所有反馈都值得赞赏，它们将来会使 Wino 变得更好。你想要在 Microsoft Store 给 Wino 打分吗？",
-    "StoreRatingDialog_MessageSecondLine": "你想在 Microsoft Store 中给 Wino Mail 打分吗？",
+    "StoreRatingDialog_MessageFirstLine": "所有反馈都值得赞赏，它们将来会使 Wino 变得更好。您想要在 Microsoft Store 给 Wino 打分吗？",
+    "StoreRatingDialog_MessageSecondLine": "您想在 Microsoft Store 中给 Wino Mail 打分吗？",
     "StoreRatingDialog_Title": "喜欢 Wino 吗？",
     "SynchronizationFolderReport_Failed": "同步失败",
     "SynchronizationFolderReport_Success": "已是最新",
-    "SystemFolderConfigDialog_ArchiveFolderDescription": "已归档的邮件将被移至此处。",
+    "SystemFolderConfigDialog_ArchiveFolderDescription": "已存档的邮件将被移至此处。",
     "SystemFolderConfigDialog_ArchiveFolderHeader": "归档文件夹",
     "SystemFolderConfigDialog_DeletedFolderDescription": "已删除的邮件将被移至此处。",
     "SystemFolderConfigDialog_DeletedFolderHeader": "已删除文件夹",
     "SystemFolderConfigDialog_DraftFolderDescription": "将在这里撰写新邮件/回复。",
     "SystemFolderConfigDialog_DraftFolderHeader": "草稿文件夹",
     "SystemFolderConfigDialog_JunkFolderDescription": "所有垃圾邮件都在这里。",
-    "SystemFolderConfigDialog_JunkFolderHeader": "垃圾文件夹",
+    "SystemFolderConfigDialog_JunkFolderHeader": "垃圾邮件文件夹",
     "SystemFolderConfigDialog_MessageFirstLine": "此 IMAP 服务器不支持 SPECIAL-USE 扩展，因此 Wino 无法正确设置系统文件夹。",
     "SystemFolderConfigDialog_MessageSecondLine": "请为特定功能选择相应的文件夹。",
     "SystemFolderConfigDialog_SentFolderDescription": "发送的邮件将被存储在该文件夹中。",
     "SystemFolderConfigDialog_SentFolderHeader": "已发送文件夹",
     "SystemFolderConfigDialog_Title": "配置系统文件夹",
     "SystemFolderConfigDialogValidation_DuplicateSystemFolders": "某些系统文件夹在配置中不止一次被使用。",
-    "SystemFolderConfigDialogValidation_InboxSelected": "你不能将收件箱设置为任何其他系统文件夹。",
+    "SystemFolderConfigDialogValidation_InboxSelected": "您不能将收件箱设置为任何其他系统文件夹。",
     "SystemFolderConfigSetupSuccess_Message": "系统文件夹配置成功。",
     "SystemFolderConfigSetupSuccess_Title": "系统文件夹设置",
+    "SystemTrayMenu_ShowWino": "打开 Wino 邮件",
+    "SystemTrayMenu_ShowWinoCalendar": "打开 Wino 日历",
+    "SystemTrayMenu_ExitWino": "退出",
     "TestingImapConnectionMessage": "正在测试服务器连接...",
     "TitleBarServerDisconnectedButton_Description": "Wino 已断开网络连接。点击「重新连接」重试。",
     "TitleBarServerDisconnectedButton_Title": "无网络连接",
@@ -691,16 +1019,430 @@
     "Today": "今天",
     "UnknownAddress": "未知地址",
     "UnknownDateHeader": "未知日期",
-    "UnknownGroupAddress": "未知邮件组地址",
+    "UnknownGroupAddress": "未知邮件群组地址",
     "UnknownSender": "未知发件人",
     "Unsubscribe": "取消订阅",
     "ViewContactDetails": "查看详情",
-    "WinoUpgradeDescription": "Wino 免费提供 3 个账户。如果你需要同时使用 3 个以上的账户，请升级",
-    "WinoUpgradeMessage": "升级为无限制账户数",
+    "WinoUpgradeDescription": "Wino 免费使用 3 个邮件账户。如果您需要同时使用 3 个以上的账户，请升级。",
+    "WinoUpgradeMessage": "升级为无限账户数",
     "WinoUpgradeRemainingAccountsMessage": "已使用 {0} 个免费账户，共 {1} 个。",
     "Yesterday": "昨天",
-    "SettingsAppPreferences_EmailSyncInterval_Title": "电子邮件同步间隔",
-    "SettingsAppPreferences_EmailSyncInterval_Description": "自动电子邮件同步间隔 (分钟)。此设置仅在重启 Wino Mail 后才会应用。"
+    "Smime_ImportCertificates_Success": "证书导入成功。",
+    "Smime_ImportCertificates_Error": "导入证书时出错：{0}",
+    "Smime_RemoveCertificates_Confirm": "您确定要删除证书 {0} 吗？",
+    "Smime_RemoveCertificates_Success": "证书已移除。",
+    "Smime_ExportCertificates_Success": "证书已导出。",
+    "Smime_ExportCertificates_Error": "导出证书时出错。",
+    "Smime_CertificateDetails": "主题：{0}\\n颁发者：{1}\\n有效期起始：{2}\\n有效期结束：{3}\\n指纹：{4}",
+    "Smime_CertificatePassword_Title": "需要证书密码",
+    "Smime_CertificatePassword_Placeholder": "{0} 的证书密码（可选）",
+    "Smime_Confirm_Title": "确认",
+    "Buttons_OK": "确定",
+    "Buttons_Refresh": "刷新",
+    "SettingsSignatureAndEncryption_Title": "签名和加密",
+    "SettingsSignatureAndEncryption_Description": "管理用于签名和加密电子邮件的 S/MIME 证书。",
+    "SettingsSignatureAndEncryption_MyCertificatesHeader": "我的证书",
+    "SettingsSignatureAndEncryption_MyCertificatesDescription": "用于签名和加密的个人证书",
+    "SettingsSignatureAndEncryption_RecipientCertificatesHeader": "收件人证书",
+    "SettingsSignatureAndEncryption_RecipientCertificatesDescription": "用于解密的收件人证书",
+    "SettingsSignatureAndEncryption_NameColumn": "名称",
+    "SettingsSignatureAndEncryption_ExpiresColumn": "到期日",
+    "SettingsSignatureAndEncryption_ThumbprintColumn": "指纹",
+    "Buttons_Remove": "移除",
+    "Buttons_Export": "导出",
+    "Buttons_Import": "导入",
+    "SettingsSignatureAndEncryption_SigningCertificate": "S/MIME 签名证书",
+    "SettingsSignatureAndEncryption_EncryptionCertificate": "S/MIME 加密",
+    "SettingsSignatureAndEncryption_SigningCertificatePlaceholder": "无",
+    "SmimeSignaturesInMessage": "此消息中的签名：",
+    "SmimeSignatureEntry": "• {0} {1}（{2}，有效期至 {3} - {4}）",
+    "SmimeSigningCertificateInfoTitle": "S/MIME 签名证书信息",
+    "SmimeCertificateInfoTitle": "S/MIME 证书信息",
+    "SmimeNoCertificateFileFound": "未找到证书文件",
+    "SmimeSaveCertificate": "保存证书…",
+    "SmimeCertificate": "S/MIME 证书",
+    "SmimeCertificateSavedTo": "证书已保存至 {0}",
+    "SmimeSignedTooltip": "此消息已使用 S/MIME 证书签名。点击查看详细信息",
+    "SmimeEncryptedTooltip": "此消息使用 S/MIME 证书进行加密。",
+    "SmimeCertificateFileInfo": "文件：{0}",
+    "Composer_LightTheme": "浅色主题",
+    "Composer_DarkTheme": "深色主题",
+    "Composer_Outdent": "减少缩进",
+    "Composer_Indent": "缩进",
+    "Composer_BulletList": "项目符号列表",
+    "Composer_OrderedList": "有序列表",
+    "Composer_Stroke": "描边",
+    "Composer_Bold": "粗体",
+    "Composer_Italic": "斜体",
+    "Composer_Underline": "下划线",
+    "Composer_CcBcc": "抄送与密送",
+    "Composer_EnableSmimeSignature": "启用/禁用 S/MIME 签名",
+    "Composer_EnableSmimeEncryption": "启用/禁用 S/MIME 加密",
+    "Composer_LocalDraftSyncInfo": "此草稿仅限本地。Wino 无法将其发送到您的邮件服务器。点击可重试发送到服务器。",
+    "Composer_CertificateExpires": "到期日：",
+    "Composer_SmimeSignature": "S/MIME 签名",
+    "Composer_SmimeEncryption": "S/MIME 加密",
+    "Composer_EmailTemplatesPlaceholder": "电子邮件模板",
+    "Composer_AiSummarize": "使用 AI 总结",
+    "Composer_AiSummarizeDescription": "提取此电子邮件中的要点、行动项和决议。",
+    "Composer_AiTranslate": "使用 AI 翻译",
+    "Composer_AiActions": "AI 操作",
+    "Composer_AiRewrite": "使用 AI 重写",
+    "AiActions_CheckingStatus": "正在检查 AI 访问权限…",
+    "AiActions_SignedOutTitle": "解锁 Wino AI 套件",
+    "AiActions_SignedOutDescription": "在登录您的 Wino 帐户并激活 AI 套件插件后，使用 AI 翻译、重写和摘要电子邮件。",
+    "AiActions_NoPackTitle": "需要 AI 套件",
+    "AiActions_NoPackDescription": "您已登录，但 AI 套件尚未激活。购买后即可使用 Wino 的 AI 翻译、重写和摘要工具。",
+    "AiActions_UsageSummary": "{0} / {1} 积分本月已使用。",
+    "Composer_AiRewritePolite": "使其更有礼貌",
+    "Composer_AiRewritePoliteDescription": "在保持相同意图的前提下软化措辞。",
+    "Composer_AiRewriteAngry": "让措辞更愤怒",
+    "Composer_AiRewriteAngryDescription": "使用更尖锐、更具对抗性的语气。",
+    "Composer_AiRewriteHappy": "让它更开心",
+    "Composer_AiRewriteHappyDescription": "添加更积极热情的语气。",
+    "Composer_AiRewriteFormal": "让它更正式",
+    "Composer_AiRewriteFormalDescription": "使信息听起来更专业、结构化。",
+    "Composer_AiRewriteFriendly": "让它更友好",
+    "Composer_AiRewriteFriendlyDescription": "用更友好、易于接近的语气让信息更亲切。",
+    "Composer_AiRewriteShorter": "让它更简短",
+    "Composer_AiRewriteShorterDescription": "缩短文本并去除不必要的细节。",
+    "Composer_AiRewriteClearer": "让它更清晰",
+    "Composer_AiRewriteClearerDescription": "提升可读性，使信息更易于理解。",
+    "Composer_AiRewriteCustom": "自定义",
+    "Composer_AiRewriteCustomDescription": "描述你希望的改写意图。",
+    "Composer_AiRewriteCustomPlaceholder": "描述你希望如何改写信息",
+    "Composer_AiRewriteMode": "改写语气",
+    "Composer_AiRewriteApply": "应用改写",
+    "Composer_AiTranslateDialogTitle": "使用AI翻译",
+    "Composer_AiTranslateDialogDescription": "输入目标语言或地区代码，如 en-US、tr-TR、de-DE 或 fr-FR。",
+    "Composer_AiTranslateApply": "翻译",
+    "Composer_AiTranslateLanguage": "目标语言",
+    "Composer_AiTranslateCustomPlaceholder": "输入区域代码",
+    "Composer_AiTranslateLanguageEnglish": "英语（en-US）",
+    "Composer_AiTranslateLanguageTurkish": "土耳其语（tr-TR）",
+    "Composer_AiTranslateLanguageGerman": "德语（de-DE）",
+    "Composer_AiTranslateLanguageFrench": "法语（fr-FR）",
+    "Composer_AiTranslateLanguageSpanish": "西班牙语（es-ES）",
+    "Composer_AiTranslateLanguageItalian": "意大利语（it-IT）",
+    "Composer_AiTranslateLanguagePortugueseBrazil": "葡萄牙语（巴西）(pt-BR)",
+    "Composer_AiTranslateLanguageDutch": "荷兰语（nl-NL）",
+    "Composer_AiTranslateLanguagePolish": "波兰语（pl-PL）",
+    "Composer_AiTranslateLanguageRussian": "俄语（ru-RU）",
+    "Composer_AiTranslateLanguageJapanese": "日语（ja-JP）",
+    "Composer_AiTranslateLanguageKorean": "韩语（ko-KR）",
+    "Composer_AiTranslateLanguageChineseSimplified": "简体中文（zh-CN）",
+    "Composer_AiTranslateLanguageArabic": "阿拉伯语（ar-SA）",
+    "Composer_AiTranslateLanguageHindi": "印地语（hi-IN）",
+    "Composer_AiTranslateLanguageOther": "其他…",
+    "Composer_AiBusyTitle": "AI 已在工作中",
+    "Composer_AiBusyMessage": "请等待当前 AI 操作完成。",
+    "Composer_AiSignInRequired": "请登录 Wino 账号以使用 AI 功能。",
+    "Composer_AiMissingHtml": "目前还没有要发送给 Wino AI 的消息内容。",
+    "Composer_AiQuotaUnavailable": "AI 结果已应用。",
+    "Composer_AiAppliedMessage": "AI 结果已应用到编辑器。若要还原，请使用撤销。",
+    "Composer_AiSummarizeSuccessTitle": "AI 摘要已应用",
+    "Composer_AiTranslateSuccessTitle": "AI 翻译已应用",
+    "Composer_AiRewriteSuccessTitle": "AI 改写已应用",
+    "Composer_AiErrorTitle": "AI 操作失败",
+    "Reader_AiAppliedMessage": "AI 结果现已显示在此消息中。重新打开消息以查看原始内容。",
+    "SettingsAppPreferences_EmailSyncInterval_Title": "Email sync interval",
+    "SettingsAppPreferences_EmailSyncInterval_Description": "Automatic email synchronization interval (minutes). This setting will be applied only after restarting Wino Mail.",
+    "ContactsPage_Title": "联系人",
+    "ContactsPage_AddContact": "添加联系人",
+    "ContactsPage_EditContact": "编辑联系人",
+    "ContactsPage_DeleteContact": "删除联系人",
+    "ContactsPage_SearchPlaceholder": "搜索联系人...",
+    "ContactsPage_NoContacts": "未找到联系人",
+    "ContactsPage_ContactsCount": "{0} 联系人",
+    "ContactsPage_SelectedContactsCount": "已选择 {0}",
+    "ContactsPage_DeleteSelectedContacts": "删除所选",
+    "ContactEditDialog_Title": "编辑联系人",
+    "ContactEditDialog_PhotoSection": "照片",
+    "ContactEditDialog_ChoosePhoto": "选择照片",
+    "ContactEditDialog_RemovePhoto": "删除照片",
+    "ContactEditDialog_NameHeader": "姓名",
+    "ContactEditDialog_NamePlaceholder": "联系人姓名",
+    "ContactEditDialog_EmailHeader": "电子邮件地址",
+    "ContactEditDialog_EmailPlaceholder": "contact@example.com",
+    "ContactEditDialog_InfoSection": "联系信息",
+    "ContactEditDialog_RootContactInfo": "这是与您的账户相关联的根联系人，无法删除。",
+    "ContactEditDialog_OverriddenContactInfo": "此联系人已被手动修改，在同步过程中不会更新。",
+    "ContactsPage_Subtitle": "管理您的电子邮件联系人及其信息",
+    "ContactStatus_Account": "账户",
+    "ContactStatus_Modified": "已修改",
+    "ContactAction_Edit": "编辑联系人",
+    "ContactAction_ChangePhoto": "更改照片",
+    "ContactAction_Delete": "删除联系人",
+    "ContactAction_Add": "添加联系人",
+    "ContactSelection_Selected": "已选中",
+    "ContactSelection_SelectAll": "全选",
+    "ContactSelection_Clear": "清除选中",
+    "ContactsPage_EmptyState": "无联系人可显示",
+    "ContactsPage_AddFirstContact": "添加您的第一个联系人",
+    "ContactsPage_ContactsCountSuffix": "联系人",
+    "ContactsPane_NewContact": "新联系人",
+    "ContactsPane_DescriptionTitle": "管理您的联系人",
+    "ContactsPane_DescriptionBody": "创建联系人、重命名、更新个人资料图片，并在一个地方整理已保存的详细信息。",
+    "ContactEditDialog_AddTitle": "添加联系人",
+    "ContactInfoBar_ContactAdded": "联系人已成功添加。",
+    "ContactInfoBar_ContactUpdated": "联系人已成功更新。",
+    "ContactInfoBar_ContactsDeleted": "联系人已成功删除。",
+    "ContactInfoBar_ContactPhotoUpdated": "联系人照片已成功更新。",
+    "ContactInfoBar_FailedToLoadContacts": "加载联系人失败：{0}",
+    "ContactInfoBar_FailedToAddContact": "添加联系人失败：{0}",
+    "ContactInfoBar_FailedToUpdateContact": "更新联系人失败：{0}",
+    "ContactInfoBar_FailedToDeleteContacts": "删除联系人失败：{0}",
+    "ContactInfoBar_FailedToUpdatePhoto": "更新照片失败：{0}",
+    "ContactInfoBar_CannotDeleteRoot": "无法删除根联系人。",
+    "ContactConfirmDialog_DeleteTitle": "删除联系人",
+    "ContactConfirmDialog_DeleteMessage": "您确定要删除联系人 '{0}' 吗？",
+    "ContactConfirmDialog_DeleteMultipleMessage": "您确定要删除 {0} 个联系人吗？",
+    "ContactConfirmDialog_DeleteButton": "删除",
+    "CalendarAccountSettings_Title": "日历账户设置",
+    "CalendarAccountSettings_Description": "为 {0} 管理日历设置",
+    "CalendarAccountSettings_AccountColor": "账户颜色",
+    "CalendarAccountSettings_AccountColorDescription": "更改此日历帐户的显示颜色",
+    "CalendarAccountSettings_SyncEnabled": "启用同步",
+    "CalendarAccountSettings_SyncEnabledDescription": "为此账户启用或禁用日历同步",
+    "CalendarAccountSettings_DefaultShowAs": "默认显示状态",
+    "CalendarAccountSettings_DefaultShowAsDescription": "使用此账户创建的新事件的默认可用性状态",
+    "CalendarAccountSettings_PrimaryCalendar": "主日历",
+    "CalendarAccountSettings_PrimaryCalendarDescription": "将此日历标记为该账户的主日历",
+    "CalendarSettings_NewEventBehavior_Header": "新建事件按钮行为",
+    "CalendarSettings_NewEventBehavior_Description": "选择新建事件按钮在每次创建时是否要询问日历，还是始终打开特定日历。",
+    "CalendarSettings_NewEventBehavior_AskEachTime": "每次询问。",
+    "CalendarSettings_NewEventBehavior_AlwaysUseSpecificCalendar": "始终使用特定日历。",
+    "CalendarSettings_Rendering_Title": "渲染",
+    "CalendarSettings_Rendering_Description": "配置日历的布局和显示行为。",
+    "CalendarSettings_Notifications_Title": "通知",
+    "CalendarSettings_Notifications_Description": "选择默认的提醒与打盹行为。",
+    "CalendarSettings_Preferences_Title": "偏好设置",
+    "CalendarSettings_Preferences_Description": "设置新建事件按钮的行为。",
+    "WhatIsNew_GetStartedButton": "开始使用",
+    "WhatIsNew_ContinueAnywayButton": "仍然继续",
+    "WhatIsNew_PreparingForNewVersionButton": "正在为新版本做准备...",
+    "WhatIsNew_MigrationPreparing_Title": "正在准备您的数据",
+    "WhatIsNew_MigrationPreparing_Description": "Wino 正在应用更新迁移。请稍等，我们正在为此版本准备您的账户数据。",
+    "WhatIsNew_MigrationFailedMessage": "应用迁移失败，错误代码 {0}。您仍然可以继续使用应用程序。然而，如遇严重问题，请重新安装应用程序。",
+    "WhatIsNew_MigrationNotification_Title": "Wino Mail 已更新",
+    "WhatIsNew_MigrationNotification_Message": "打开应用以完成更新并查看新功能。",
+    "WelcomeWindow_Title": "欢迎使用 Wino Mail",
+    "WelcomeWindow_Subtitle": "面向邮件和日历的原生 Windows 体验。",
+    "WelcomeWindow_WhatsNewTitle": "最新变更",
+    "WelcomeWindow_FeaturesTitle": "功能",
+    "WelcomeWindow_WhatsNewTab": "更新内容",
+    "WelcomeWindow_FeaturesTab": "功能",
+    "WelcomeWindow_GetStartedButton": "开始添加账户",
+    "WelcomeWindow_GetStartedDescription": "添加您的 Outlook、Gmail 或 IMAP 账户来开始使用 Wino Mail。",
+    "WelcomeWindow_ImportFromWinoAccount": "从您的 Wino 账户导入",
+    "WelcomeWindow_ImportInProgress": "正在导入同步的偏好设置和账户...",
+    "WelcomeWindow_ImportNoAccountsFound": "在 Wino 账户中未找到同步的账户。如果存在偏好设置，它们已被还原。使用“开始使用”手动添加账户。",
+    "WelcomeWindow_ImportDuplicateAccountsSkipped": "{0} 同步账户已在此设备上可用。如有需要，请使用“开始使用”手动再添加一个账户。",
+    "WelcomeWindow_SetupTitle": "设置您的账户",
+    "WelcomeWindow_SetupSubtitle": "选择您的电子邮件提供商以开始。",
+    "WelcomeWindow_AddAccountButton": "添加账户",
+    "WelcomeWindow_SkipForNow": "暂时跳过 —— 稍后设置",
+    "WelcomeWindow_AppDescription": "快速、专注的收件箱，专为 Windows 11 重新设计",
+    "WelcomeWizard_Step1Title": "欢迎",
+    "SystemTrayMenu_Open": "打开",
+    "WinoAccount_Titlebar_SyncBenefitTitle": "同步设置",
+    "WinoAccount_Titlebar_SyncBenefitDescription": "在设备之间同步您的 Wino 偏好设置。",
+    "WinoAccount_Titlebar_AddonsBenefitTitle": "解锁附加组件",
+    "WinoAccount_Titlebar_AddonsBenefitDescription": "访问高级功能，如 Wino AI Pack。",
+    "WinoAccount_Management_Description": "管理您的 Wino 账户、AI Pack 访问权限，以及同步的偏好设置和账户详细信息。",
+    "WinoAccount_Management_SignedOutTitle": "登录 Wino Mail",
+    "WinoAccount_Management_SignedOutDescription": "登录或创建账户以同步您的邮件、使用 AI 功能，并在设备之间管理设置。",
+    "WinoAccount_Management_ProfileSectionHeader": "个人资料",
+    "WinoAccount_Management_AddOnsSectionHeader": "Wino 附加组件",
+    "WinoAccount_Management_DataSectionHeader": "数据",
+    "WinoAccount_Management_AccountActionsSectionHeader": "账户操作",
+    "WinoAccount_Management_AccountCardTitle": "账户",
+    "WinoAccount_Management_AccountCardDescription": "您的 Wino 账户邮箱地址和当前账户状态。",
+    "WinoAccount_Management_AiPackCardTitle": "AI Pack",
+    "WinoAccount_Management_AiPackCardDescription": "查看 Wino AI Pack 是否处于激活状态以及剩余多少用量。",
+    "WinoAccount_Management_AiPackActive": "AI Pack 已激活",
+    "WinoAccount_Management_AiPackInactive": "AI Pack 未激活",
+    "WinoAccount_Management_AiPackUsage": "{0} / {1} 次已使用。剩余 {2}。",
+    "WinoAccount_Management_AiPackBillingPeriod": "计费期：{0:d} - {1:d}",
+    "WinoAccount_Management_AiPackUnknownUsage": "用量详情尚不可用。",
+    "WinoAccount_Management_AiPackBuyDescription": "购买 Wino AI Pack，可使用 AI 进行邮件翻译、改写或摘要。",
+    "WinoAccount_Management_AiPackPromoTitle": "解锁 AI Pack",
+    "WinoAccount_Management_AiPackPromoDescription": "使用 AI 驱动的工具，为您的邮件工作流提速。将邮件翻译成 50 多种语言，改写以提高清晰度和语气，并获得长邮件对话的即时摘要。",
+    "WinoAccount_Management_AiPackPromoPrice": "$4.99 / 月",
+    "WinoAccount_Management_AiPackPromoRequests": "1,000 积分",
+    "WinoAccount_Management_AiPackGetButton": "获取 AI Pack",
+    "WinoAddOn_AI_PACK_Name": "Wino AI Pack",
+    "WinoAddOn_AI_PACK_Description": "用于在 Wino Mail 中进行翻译、改写和摘要操作的 AI 驱动工具。",
+    "WinoAddOn_AI_PACK_Keywords": "AI、翻译、改写、摘要、生产力",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Name": "无限账户",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Description": "移除账户数量限制，您可以添加任意数量的邮箱账户。",
+    "WinoAddOn_UNLIMITED_ACCOUNTS_Keywords": "账户、无限、高级、插件",
+    "WinoAccount_Management_PurchaseRequiresSignIn": "使用您的 Wino 账户登录以完成此购买。",
+    "WinoAccount_Management_PurchaseStartFailed": "Wino 无法完成此 Microsoft Store 购买。",
+    "WinoAccount_Management_StoreSyncFailed": "购买已完成，但 Wino 尚无法刷新您的账户权限。请稍后再尝试。",
+    "WinoAccount_Management_AiPackSubscriptionActive": "您的订阅处于激活状态",
+    "WinoAccount_Management_AiPackRenews": "将于 {0:d} 续订",
+    "WinoAccount_Management_AiPackRequestsUsed": "本月已用积分",
+    "WinoAccount_Management_AiPackResets": "重置 {0:d}",
+    "WinoAccount_Management_AiPackUsageLoadFailed": "加载 AI 使用余额时出现问题。",
+    "WinoAccount_Management_AiPackFeatureTranslate": "翻译",
+    "WinoAccount_Management_AiPackFeatureRewrite": "改写",
+    "WinoAccount_Management_AiPackFeatureSummarize": "摘要",
+    "WinoAccount_Management_AddOnLoadFailed": "加载此附加组件时出现问题。",
+    "WinoAccount_Management_SyncPreferencesTitle": "同步偏好设置和账户",
+    "WinoAccount_Management_SyncPreferencesDescription": "跨设备导入或导出您的 Wino 偏好设置和邮箱详细信息。密码、令牌及其他敏感信息从不同步。",
+    "WinoAccount_Management_SignOutTitle": "登出",
+    "WinoAccount_Management_SignOutDescription": "在此设备上退出您的账户",
+    "WinoAccount_Management_StatusLabel": "状态：{0}",
+    "WinoAccount_Management_NoRemoteSettings": "此账户尚未存储任何同步数据。",
+    "WinoAccount_Management_ExportSucceeded": "您选择的 Wino 数据已成功导出。",
+    "WinoAccount_Management_ExportPreferencesSucceeded": "您的偏好设置已导出到您的 Wino 账户。",
+    "WinoAccount_Management_ExportAccountsSucceeded": "已将 {0} 条账户信息导出到您的 Wino 账户。",
+    "WinoAccount_Management_ImportSucceeded": "已从您的 Wino 账户导入同步数据。",
+    "WinoAccount_Management_ImportPreferencesSucceeded": "应用了 {0} 条同步偏好设置。",
+    "WinoAccount_Management_ImportAccountsSucceeded": "已导入 {0} 个账户。",
+    "WinoAccount_Management_ImportDuplicateAccountsSkipped": "已跳过 {0} 个在此设备上已存在的账户。",
+    "WinoAccount_Management_ImportPartial": "已应用 {0} 条同步偏好设置。 {1} 条偏好设置无法还原。",
+    "WinoAccount_Management_ImportReloginReminder": "未导入密码、令牌及其他敏感信息。在使用前，请在此设备上为每个账户重新登录。",
+    "WinoAccount_Management_SerializeFailed": "Wino 无法序列化您当前的偏好设置。",
+    "WinoAccount_Management_EmptyExport": "没有可导出的偏好设置值。",
+    "WinoAccount_Management_ImportEmpty": "同步的数据负载不包含任何可还原的新内容。",
+    "WinoAccount_Management_ExportDialog_Title": "导出到您的 Wino 账户",
+    "WinoAccount_Management_ExportDialog_Description": "选择要同步到您的 Wino 账户的内容。",
+    "WinoAccount_Management_ExportDialog_IncludePreferences": "偏好设置",
+    "WinoAccount_Management_ExportDialog_IncludeAccounts": "账户",
+    "WinoAccount_Management_ExportDialog_AccountsDisclaimer": "密码、令牌和其他敏感信息不会同步。",
+    "WinoAccount_Management_ExportDialog_AccountsRelogin": "在另一台电脑上导入的账户仍需要您再次登录后才能使用。",
+    "WinoAccount_Management_ExportDialog_InProgress": "正在导出您选择的 Wino 数据...",
+    "WinoAccount_Management_LoadFailed": "无法加载最新的 Wino 账户信息。",
+    "WinoAccount_Management_ActionFailed": "Wino 账户请求无法完成。",
+    "WinoAccount_SettingsSection_Title": "Wino 账户",
+    "WinoAccount_SettingsSection_Description": "使用本地身份验证服务创建或登录 Wino 账户。",
+    "WinoAccount_RegisterButton_Title": "注册账户",
+    "WinoAccount_RegisterButton_Description": "使用电子邮件和密码创建 Wino 账户。",
+    "WinoAccount_RegisterButton_Action": "打开注册",
+    "WinoAccount_LoginButton_Title": "登录",
+    "WinoAccount_LoginButton_Description": "使用电子邮件和密码登录到现有的 Wino 账户。",
+    "WinoAccount_LoginButton_Action": "打开登录",
+    "WinoAccount_SignOutButton_Title": "登出",
+    "WinoAccount_SignOutButton_Description": "移除本地存储的 Wino 账户会话。",
+    "WinoAccount_SignOutButton_Action": "登出",
+    "WinoAccount_RegisterDialog_Title": "创建 Wino 账户",
+    "WinoAccount_RegisterDialog_Description": "创建 Wino 账户以保持 Wino 体验同步并解锁基于账户的插件。",
+    "WinoAccount_RegisterDialog_HeroTitle": "创建您的 Wino 账户",
+    "WinoAccount_RegisterDialog_BenefitsTitle": "为什么要创建一个？",
+    "WinoAccount_RegisterDialog_BenefitSyncTitle": "在设备之间导入和导出设置",
+    "WinoAccount_RegisterDialog_BenefitSyncDescription": "在设备之间移动您的 Wino 偏好设置，而无需从头重新配置。",
+    "WinoAccount_RegisterDialog_BenefitAiTitle": "获取独家插件，如 Wino AI Pack（付费）",
+    "WinoAccount_RegisterDialog_BenefitAiDescription": "使用一个账户在功能可用时解锁高级 Wino 功能。",
+    "WinoAccount_RegisterDialog_DifferenceTitle": "Wino 账户与您的邮箱账户分开",
+    "WinoAccount_RegisterDialog_DifferenceDescription": "您的 Outlook、Gmail、IMAP 或其他邮件账户将保持原样。Wino 账户仅管理 Wino 特定功能和基于账户的附加组件。",
+    "WinoAccount_RegisterDialog_PrimaryButton": "注册",
+    "WinoAccount_RegisterDialog_PrivacyTitle": "隐私与 API 处理",
+    "WinoAccount_RegisterDialog_PrivacyDescription": "可选附加组件（如 Wino AI Pack）可能仅在您使用这些功能时，将所选的电子邮件 HTML 内容发送至 Wino API 服务。",
+    "WinoAccount_RegisterDialog_PrivacyLinkText": "阅读隐私政策",
+    "WinoAccount_RegisterDialog_PrivacyCheckbox": "我同意隐私政策。",
+    "WinoAccount_LoginDialog_Title": "登录 Wino 账户",
+    "WinoAccount_LoginDialog_Description": "登录 Wino 账户以同步您的 Wino 设置并访问基于账户的功能。",
+    "WinoAccount_LoginDialog_HeroTitle": "欢迎回来",
+    "WinoAccount_LoginDialog_BenefitsTitle": "登录带来的好处",
+    "WinoAccount_LoginDialog_BenefitsDescription": "使用您的 Wino 账户在设备之间继续同步设置，并访问如 Wino AI Pack 这样的付费附加组件。",
+    "WinoAccount_LoginDialog_DifferenceTitle": "这不是您邮箱账户的登录入口",
+    "WinoAccount_LoginDialog_DifferenceDescription": "在此处登录不会向 Wino 添加或替换您的 Outlook、Gmail、IMAP 等账户。它只用于登录 Wino 专有服务。",
+    "WinoAccount_LoginDialog_ForgotPasswordLink": "忘记密码？",
+    "WinoAccount_EmailLabel": "邮箱",
+    "WinoAccount_EmailPlaceholder": "name@example.com",
+    "WinoAccount_PasswordLabel": "密码",
+    "WinoAccount_ConfirmPasswordLabel": "确认密码",
+    "WinoAccount_ForgotPasswordDialog_Title": "重置密码",
+    "WinoAccount_ForgotPasswordDialog_PrimaryButton": "发送重置邮件",
+    "WinoAccount_ForgotPasswordDialog_BackToSignIn": "返回登录",
+    "WinoAccount_ForgotPasswordDialog_Description": "输入您的 Wino 账户邮箱地址，如果已注册，我们将发送密码重置链接。",
+    "WinoAccount_Validation_EmailRequired": "必须填写邮箱。",
+    "WinoAccount_Validation_PasswordRequired": "必须填写密码。",
+    "WinoAccount_Validation_PasswordMismatch": "两次输入的密码不一致。",
+    "WinoAccount_Validation_PrivacyConsentRequired": "在创建 Wino 账户之前，您必须同意隐私政策。",
+    "WinoAccount_Error_InvalidCredentials": "邮箱地址或密码不正确。",
+    "WinoAccount_Error_AccountLocked": "此账户暂时被锁定。",
+    "WinoAccount_Error_AccountBanned": "此账户已被禁用。",
+    "WinoAccount_Error_AccountSuspended": "此账户已被暂停。",
+    "WinoAccount_Error_EmailNotConfirmed": "在登录前请确认您的邮箱地址。",
+    "WinoAccount_Error_EmailConfirmationRequired": "在登录前请确认您的邮箱地址。",
+    "WinoAccount_Error_EmailConfirmationResendNotAvailable": "尚无法重新发送确认邮件。",
+    "WinoAccount_Error_EmailConfirmationResendInvalid": "此确认请求已失效。请尝试再次登录。",
+    "WinoAccount_Error_EmailNotRegistered": "此邮箱地址未注册。",
+    "WinoAccount_Error_RefreshTokenInvalid": "您的会话已无效。请重新登录。",
+    "WinoAccount_Error_EmailAlreadyRegistered": "此邮箱地址已被注册。",
+    "WinoAccount_Error_ExternalLoginEmailRequired": "完成外部登录需要提供一个邮箱地址。",
+    "WinoAccount_Error_ExternalLoginInvalid": "外部登录请求无效。",
+    "WinoAccount_Error_ExternalAuthStateInvalid": "外部登录状态无效或已过期。",
+    "WinoAccount_Error_ExternalAuthCodeInvalid": "外部登录代码无效或已过期。",
+    "WinoAccount_Error_AiPackRequired": "执行此操作需要有效的 Wino AI Pack 订阅。",
+    "WinoAccount_Error_AiQuotaExceeded": "本计费周期内，您的 AI Pack 使用额度已用尽。",
+    "WinoAccount_Error_AiHtmlEmpty": "没有要处理的邮件内容。",
+    "WinoAccount_Error_AiHtmlTooLarge": "此邮件过大，无法通过 Wino AI 处理。",
+    "WinoAccount_Error_AiUnsupportedLanguage": "该语言不受支持。请尝试使用有效的区域代码，例如 en-US 或 tr-TR。",
+    "WinoAccount_Error_Forbidden": "您没有执行此操作的权限。",
+    "WinoAccount_Error_ValidationFailed": "请求无效。请检查输入的值。",
+    "WinoAccount_RegisterSuccessMessage": "为 {0} 完成 Wino 账户注册。",
+    "WinoAccount_LoginSuccessMessage": "已以 {0} 登录 Wino 账户。",
+    "WinoAccount_EmailConfirmationSentDialog_Title": "请确认您的邮箱地址",
+    "WinoAccount_EmailConfirmationSentDialog_Message": "我们已向 {0} 发送了邮箱确认。请确认后再尝试登录。",
+    "WinoAccount_EmailConfirmationPendingDialog_Title": "需要邮箱确认",
+    "WinoAccount_EmailConfirmationPendingDialog_Message": "我们仍在等待您确认 {0}。",
+    "WinoAccount_EmailConfirmationPendingDialog_ResendButton": "重新发送确认邮件",
+    "WinoAccount_EmailConfirmationPendingDialog_Countdown": "您可以在 {0} 之后重新发送确认邮件。",
+    "WinoAccount_EmailConfirmationPendingDialog_ReadyToResend": "现在可以重新发送确认邮件。",
+    "WinoAccount_EmailConfirmationResentDialog_Title": "确认邮件已重新发送",
+    "WinoAccount_EmailConfirmationResentDialog_Message": "我们已向 {0} 发送了另一封确认邮件。请确认后再次尝试登录。",
+    "WinoAccount_ForgotPasswordDialog_SuccessTitle": "密码重置邮件已发送",
+    "WinoAccount_ForgotPasswordDialog_SuccessMessage": "我们已向 {0} 发送了密码重置邮件。打开该邮件以设置新密码。",
+    "WinoAccount_ChangePassword_Title": "修改密码",
+    "WinoAccount_ChangePassword_Description": "向此 Wino 账户发送密码重置邮件。",
+    "WinoAccount_ChangePassword_Action": "发送重置邮件",
+    "WinoAccount_ChangePassword_ConfirmationMessage": "您是否希望 Wino 向 {0} 发送密码重置邮件？",
+    "WinoAccount_SignOut_SuccessMessage": "已从 Wino 账户 {0} 登出。",
+    "WinoAccount_SignOut_NoAccountMessage": "当前没有活动的 Wino 账户可供登出。",
+    "WinoAccount_Titlebar_SignedOutTitle": "Wino 账户",
+    "WinoAccount_Titlebar_SignedOutDescription": "请登录或创建 Wino 账户以管理您的 Wino 会话。",
+    "WinoAccount_Titlebar_SignedInStatus": "状态：{0}",
+    "WelcomeWizard_Step2Title": "添加账户",
+    "WelcomeWizard_Step3Title": "完成设置",
+    "ProviderSelection_Title": "选择您的电子邮件提供商",
+    "ProviderSelection_Subtitle": "在下方选择一个提供商，以将您的电子邮件账户添加到 Wino Mail。",
+    "ProviderSelection_AccountNameHeader": "账户名",
+    "ProviderSelection_AccountNamePlaceholder": "例如 个人、工作",
+    "ProviderSelection_DisplayNameHeader": "显示名称",
+    "ProviderSelection_DisplayNamePlaceholder": "例如 约翰·多伊",
+    "ProviderSelection_EmailHeader": "电子邮件地址",
+    "ProviderSelection_EmailPlaceholder": "例如 johndoe@example.com",
+    "ProviderSelection_AppPasswordHeader": "应用专用密码",
+    "ProviderSelection_AppPasswordHelp": "如何获取应用专用密码？",
+    "ProviderSelection_CalendarModeHeader": "日历集成",
+    "ProviderSelection_CalendarMode_DisabledTitle": "已禁用",
+    "ProviderSelection_CalendarMode_DisabledDescription": "没有日历集成",
+    "ProviderSelection_CalendarMode_CalDavTitle": "CalDAV 同步",
+    "ProviderSelection_CalendarMode_CalDavDescription_Apple": "您的日历事件会在设备之间同步到 Apple 的服务器。",
+    "ProviderSelection_CalendarMode_CalDavDescription_Yahoo": "您的日历事件会在设备之间同步到 Yahoo 的服务器。",
+    "ProviderSelection_CalendarMode_LocalTitle": "本地日历",
+    "ProviderSelection_CalendarMode_LocalDescription": "您的事件仅存储在本地计算机上。没有服务器连接。",
+    "ProviderSelection_ClearColor": "清除颜色",
+    "ProviderSelection_ContinueButton": "继续",
+    "ProviderSelection_SpecialImap_Subtitle": "请输入您的账户凭据以连接。",
+    "AccountSetup_Title": "正在设置您的账户",
+    "AccountSetup_Step_Authenticating": "正在使用 {0} 进行身份验证",
+    "AccountSetup_Step_TestingMailAuth": "正在测试邮箱身份验证",
+    "AccountSetup_Step_SyncingFolders": "正在同步文件夹元数据",
+    "AccountSetup_Step_FetchingProfile": "正在获取个人资料信息",
+    "AccountSetup_Step_DiscoveringCalDav": "正在发现 CalDAV 设置",
+    "AccountSetup_Step_TestingCalendarAuth": "正在测试日历身份验证",
+    "AccountSetup_Step_SavingAccount": "正在保存账户信息",
+    "AccountSetup_Step_FetchingCalendarMetadata": "正在获取日历元数据",
+    "AccountSetup_Step_SyncingAliases": "正在同步别名",
+    "AccountSetup_Step_Finalizing": "正在完成设置",
+    "AccountSetup_FailureMessage": "设置失败。返回上一步以修正设置，或稍后再试。",
+    "AccountSetup_SuccessMessage": "您的账户已成功设置！",
+    "AccountSetup_GoBackButton": "返回",
+    "AccountSetup_TryAgainButton": "再试一次",
+    "ImapCalDavSettings_AutoDiscoveryFailed": "自动发现失败。请在高级选项卡中手动输入设置。"
 }
-
-
diff --git a/Wino.Core.Domain/Translator.cs b/Wino.Core.Domain/Translator.cs
index 1fc2fb4c..9ada00c6 100644
--- a/Wino.Core.Domain/Translator.cs
+++ b/Wino.Core.Domain/Translator.cs
@@ -7,4 +7,7 @@ namespace Wino.Core.Domain;
 /// All translations generated automatically by the source generator.
 /// </summary>
 [TranslatorGen]
-public partial class Translator;
+public partial class Translator
+{
+    public static string GetTranslatedString(string key) => Resources.GetTranslatedString(key);
+}
diff --git a/Wino.Core.Domain/Validation/CalendarEventComposeResultValidator.cs b/Wino.Core.Domain/Validation/CalendarEventComposeResultValidator.cs
new file mode 100644
index 00000000..5e722f6f
--- /dev/null
+++ b/Wino.Core.Domain/Validation/CalendarEventComposeResultValidator.cs
@@ -0,0 +1,73 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Net.Mail;
+using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Core.Domain.Validation;
+
+public sealed class CalendarEventComposeResultValidator
+{
+    public void Validate(CalendarEventComposeResult result)
+    {
+        ArgumentNullException.ThrowIfNull(result);
+
+        if (result.CalendarId == Guid.Empty)
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationMissingCalendar);
+
+        if (result.AccountId == Guid.Empty)
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationMissingCalendar);
+
+        if (string.IsNullOrWhiteSpace(result.Title))
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationMissingTitle);
+
+        if (result.EndDate <= result.StartDate)
+        {
+            var message = result.IsAllDay
+                ? Translator.CalendarEventCompose_ValidationInvalidAllDayRange
+                : Translator.CalendarEventCompose_ValidationInvalidTimeRange;
+
+            throw new CalendarEventComposeValidationException(message);
+        }
+
+        var missingAttachments = result.Attachments
+            .Where(attachment => string.IsNullOrWhiteSpace(attachment.FilePath) || !File.Exists(attachment.FilePath))
+            .Select(attachment => attachment.FileName)
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+        if (missingAttachments.Count > 0)
+        {
+            throw new CalendarEventComposeValidationException(
+                string.Format(Translator.CalendarEventCompose_ValidationMissingAttachment, string.Join(", ", missingAttachments)));
+        }
+
+        var invalidAttendee = result.Attendees
+            .FirstOrDefault(attendee => string.IsNullOrWhiteSpace(attendee.Email) || !IsValidEmailAddress(attendee.Email.Trim()));
+
+        if (invalidAttendee != null)
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationInvalidAttendee);
+
+        var duplicateAttendeeGroups = result.Attendees
+            .Where(attendee => !string.IsNullOrWhiteSpace(attendee.Email))
+            .GroupBy(attendee => attendee.Email.Trim(), StringComparer.OrdinalIgnoreCase)
+            .FirstOrDefault(group => group.Count() > 1);
+
+        if (duplicateAttendeeGroups != null)
+            throw new CalendarEventComposeValidationException(Translator.CalendarEventCompose_ValidationInvalidAttendee);
+    }
+
+    private static bool IsValidEmailAddress(string address)
+    {
+        try
+        {
+            var parsedAddress = new MailAddress(address);
+            return parsedAddress.Address.Equals(address, StringComparison.OrdinalIgnoreCase);
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
diff --git a/Wino.Core.Domain/Wino.Core.Domain.csproj b/Wino.Core.Domain/Wino.Core.Domain.csproj
index f34bd83b..c17ec515 100644
--- a/Wino.Core.Domain/Wino.Core.Domain.csproj
+++ b/Wino.Core.Domain/Wino.Core.Domain.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<Compile Remove="Models\Communication\**" />
@@ -57,8 +59,8 @@
 		<PackageReference Include="MimeKit" />
 		<PackageReference Include="MailKit" />
 		<PackageReference Include="sqlite-net-pcl" />
-		<PackageReference Include="System.Text.Json" />
 		<PackageReference Include="TimePeriodLibrary.NET" />
+		<PackageReference Include="Wino.Mail.Contracts" />
 	</ItemGroup>
 	<ItemGroup>
 		<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
@@ -70,4 +72,4 @@
 		<!-- Source Generators -->
 		<ProjectReference Include="..\Wino.SourceGenerators\Wino.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 	</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Wino.Core.Tests/CalendarPageViewModelTests.cs b/Wino.Core.Tests/CalendarPageViewModelTests.cs
new file mode 100644
index 00000000..95239be5
--- /dev/null
+++ b/Wino.Core.Tests/CalendarPageViewModelTests.cs
@@ -0,0 +1,300 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using CommunityToolkit.Mvvm.Collections;
+using FluentAssertions;
+using Itenso.TimePeriod;
+using Moq;
+using Wino.Calendar.ViewModels;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Xunit;
+
+namespace Wino.Core.Tests;
+
+public class CalendarPageViewModelTests
+{
+    [Fact]
+    public async Task ApplyDisplayRequestAsync_UpdatesVisibleRangeAndThreePeriodLoadWindow()
+    {
+        var settings = CreateSettings(firstDayOfWeek: DayOfWeek.Monday);
+        var today = new DateOnly(2026, 3, 20);
+        var preferencesService = CreatePreferencesService(settings);
+        var calendarService = new Mock<ICalendarService>();
+        ITimePeriod? requestedPeriod = null;
+
+        calendarService
+            .Setup(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()))
+            .Callback<IAccountCalendar, ITimePeriod>((_, period) => requestedPeriod = period)
+            .ReturnsAsync([]);
+
+        var viewModel = CreateViewModel(calendarService.Object, preferencesService.Object, today);
+        var request = new CalendarDisplayRequest(CalendarDisplayType.Week, new DateOnly(2026, 3, 18));
+
+        await viewModel.ApplyDisplayRequestAsync(request);
+
+        viewModel.CurrentVisibleRange.StartDate.Should().Be(new DateOnly(2026, 3, 16));
+        viewModel.CurrentVisibleRange.EndDate.Should().Be(new DateOnly(2026, 3, 22));
+        viewModel.LoadedDateWindow.StartDate.Should().Be(new DateTime(2026, 3, 9));
+        viewModel.LoadedDateWindow.EndDate.Should().Be(new DateTime(2026, 3, 30));
+        viewModel.VisibleDateRangeText.Should().Be("March 16 - March 22");
+
+        requestedPeriod.Should().NotBeNull();
+        requestedPeriod!.Start.Should().Be(new DateTime(2026, 3, 9));
+        requestedPeriod.End.Should().Be(new DateTime(2026, 3, 30));
+        calendarService.Verify(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task ApplyDisplayRequestAsync_DoesNotReloadWhenResolvedRangeIsUnchanged()
+    {
+        var settings = CreateSettings();
+        var preferencesService = CreatePreferencesService(settings);
+        var calendarService = new Mock<ICalendarService>();
+
+        calendarService
+            .Setup(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()))
+            .ReturnsAsync([]);
+
+        var viewModel = CreateViewModel(calendarService.Object, preferencesService.Object, new DateOnly(2026, 3, 20));
+        var request = new CalendarDisplayRequest(CalendarDisplayType.Day, new DateOnly(2026, 3, 20));
+
+        await viewModel.ApplyDisplayRequestAsync(request);
+        await viewModel.ApplyDisplayRequestAsync(request);
+
+        calendarService.Verify(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task ReloadCurrentVisibleRangeAsync_RecomputesWhenCalendarSettingsChange()
+    {
+        var currentSettings = CreateSettings(firstDayOfWeek: DayOfWeek.Monday);
+        var preferencesService = CreatePreferencesService(() => currentSettings);
+        var calendarService = new Mock<ICalendarService>();
+
+        calendarService
+            .Setup(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()))
+            .ReturnsAsync([]);
+
+        var viewModel = CreateViewModel(calendarService.Object, preferencesService.Object, new DateOnly(2026, 3, 20));
+        var request = new CalendarDisplayRequest(CalendarDisplayType.Week, new DateOnly(2026, 3, 18));
+
+        await viewModel.ApplyDisplayRequestAsync(request);
+        viewModel.CurrentVisibleRange.StartDate.Should().Be(new DateOnly(2026, 3, 16));
+
+        currentSettings = CreateSettings(firstDayOfWeek: DayOfWeek.Sunday);
+        await viewModel.ReloadCurrentVisibleRangeAsync();
+
+        viewModel.CurrentVisibleRange.StartDate.Should().Be(new DateOnly(2026, 3, 15));
+        calendarService.Verify(service => service.GetCalendarEventsAsync(It.IsAny<IAccountCalendar>(), It.IsAny<ITimePeriod>()), Times.Exactly(2));
+    }
+
+    [Fact]
+    public async Task ApplyDisplayRequestAsync_LoadsOnlyActiveCalendars()
+    {
+        var settings = CreateSettings();
+        var preferencesService = CreatePreferencesService(settings);
+        var calendarService = new Mock<ICalendarService>();
+
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Primary",
+            SenderName = "Primary",
+            Address = "primary@example.com",
+            ProviderType = MailProviderType.Outlook
+        };
+
+        var visibleCalendar = CreateCalendar(account, "Visible calendar");
+        var hiddenCalendar = CreateCalendar(account, "Hidden calendar");
+        var visibleCalendarViewModel = new AccountCalendarViewModel(account, visibleCalendar);
+        var hiddenCalendarViewModel = new AccountCalendarViewModel(account, hiddenCalendar);
+        hiddenCalendarViewModel.IsChecked = false;
+
+        calendarService
+            .Setup(service => service.GetCalendarEventsAsync(It.Is<IAccountCalendar>(calendar => calendar.Id == visibleCalendar.Id), It.IsAny<ITimePeriod>()))
+            .ReturnsAsync([
+                new CalendarItem
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarId = visibleCalendar.Id,
+                    StartDate = new DateTime(2026, 3, 20, 9, 0, 0),
+                    DurationInSeconds = TimeSpan.FromMinutes(30).TotalSeconds,
+                    Title = "Visible event"
+                }
+            ]);
+
+        calendarService
+            .Setup(service => service.GetCalendarEventsAsync(It.Is<IAccountCalendar>(calendar => calendar.Id == hiddenCalendar.Id), It.IsAny<ITimePeriod>()))
+            .ReturnsAsync([
+                new CalendarItem
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarId = hiddenCalendar.Id,
+                    StartDate = new DateTime(2026, 3, 20, 10, 0, 0),
+                    DurationInSeconds = TimeSpan.FromMinutes(30).TotalSeconds,
+                    Title = "Hidden event"
+                }
+            ]);
+
+        var accountCalendarStateService = new FakeAccountCalendarStateService(
+            [visibleCalendarViewModel, hiddenCalendarViewModel],
+            [visibleCalendarViewModel]);
+
+        var viewModel = CreateViewModel(calendarService.Object, preferencesService.Object, new DateOnly(2026, 3, 20), accountCalendarStateService);
+
+        await viewModel.ApplyDisplayRequestAsync(new CalendarDisplayRequest(CalendarDisplayType.Day, new DateOnly(2026, 3, 20)));
+
+        viewModel.CalendarItems.Should().ContainSingle(item => item.CalendarItem.CalendarId == visibleCalendar.Id);
+        calendarService.Verify(service => service.GetCalendarEventsAsync(It.Is<IAccountCalendar>(calendar => calendar.Id == visibleCalendar.Id), It.IsAny<ITimePeriod>()), Times.Once);
+        calendarService.Verify(service => service.GetCalendarEventsAsync(It.Is<IAccountCalendar>(calendar => calendar.Id == hiddenCalendar.Id), It.IsAny<ITimePeriod>()), Times.Never);
+    }
+
+    private static CalendarPageViewModel CreateViewModel(
+        ICalendarService calendarService,
+        IPreferencesService preferencesService,
+        DateOnly today)
+    {
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Primary",
+            SenderName = "Primary",
+            Address = "primary@example.com",
+            ProviderType = MailProviderType.Outlook
+        };
+
+        var calendar = CreateCalendar(account, "Calendar");
+        var accountCalendarViewModel = new AccountCalendarViewModel(account, calendar);
+        var accountCalendarStateService = new FakeAccountCalendarStateService([accountCalendarViewModel]);
+
+        return CreateViewModel(calendarService, preferencesService, today, accountCalendarStateService);
+    }
+
+    private static CalendarPageViewModel CreateViewModel(
+        ICalendarService calendarService,
+        IPreferencesService preferencesService,
+        DateOnly today,
+        IAccountCalendarStateService accountCalendarStateService)
+    {
+        var statePersistenceService = new Mock<IStatePersistanceService>();
+        statePersistenceService.SetupAllProperties();
+        statePersistenceService.Object.ApplicationMode = WinoApplicationMode.Calendar;
+        statePersistenceService.Object.CalendarDisplayType = CalendarDisplayType.Week;
+
+        return new CalendarPageViewModel(
+            statePersistenceService.Object,
+            calendarService,
+            Mock.Of<INavigationService>(),
+            Mock.Of<IKeyPressService>(),
+            Mock.Of<INativeAppService>(),
+            accountCalendarStateService,
+            preferencesService,
+            Mock.Of<IWinoRequestDelegator>(),
+            Mock.Of<IMailDialogService>(),
+            new TestDateContextProvider("en-US", today),
+            new CalendarRangeTextFormatter());
+    }
+
+    private static AccountCalendar CreateCalendar(MailAccount account, string name)
+        => new()
+        {
+            Id = Guid.NewGuid(),
+            AccountId = account.Id,
+            Name = name,
+            RemoteCalendarId = "calendar",
+            SynchronizationDeltaToken = string.Empty,
+            TextColorHex = "#000000",
+            BackgroundColorHex = "#ffffff",
+            TimeZone = TimeZoneInfo.Utc.Id,
+            IsExtended = true,
+            IsPrimary = true,
+            IsSynchronizationEnabled = true
+        };
+
+    private static Mock<IPreferencesService> CreatePreferencesService(CalendarSettings settings)
+        => CreatePreferencesService(() => settings);
+
+    private static Mock<IPreferencesService> CreatePreferencesService(Func<CalendarSettings> settingsFactory)
+    {
+        var preferencesService = new Mock<IPreferencesService>();
+        preferencesService.Setup(service => service.GetCurrentCalendarSettings()).Returns(settingsFactory);
+        return preferencesService;
+    }
+
+    private static CalendarSettings CreateSettings(
+        DayOfWeek firstDayOfWeek = DayOfWeek.Monday,
+        DayOfWeek workWeekStart = DayOfWeek.Monday,
+        DayOfWeek workWeekEnd = DayOfWeek.Friday,
+        string cultureName = "en-US")
+    {
+        return new CalendarSettings(
+            firstDayOfWeek,
+            [DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday],
+            true,
+            workWeekStart,
+            workWeekEnd,
+            TimeSpan.FromHours(9),
+            TimeSpan.FromHours(18),
+            64,
+            DayHeaderDisplayType.TwentyFourHour,
+            CultureInfo.GetCultureInfo(cultureName));
+    }
+
+    private sealed class FakeAccountCalendarStateService : IAccountCalendarStateService
+    {
+        private readonly List<AccountCalendarViewModel> _calendars;
+        private readonly List<AccountCalendarViewModel> _activeCalendars;
+        private readonly ObservableCollection<GroupedAccountCalendarViewModel> _groupedCalendars = [];
+
+        public FakeAccountCalendarStateService(IEnumerable<AccountCalendarViewModel> calendars, IEnumerable<AccountCalendarViewModel>? activeCalendars = null)
+        {
+            _calendars = calendars.ToList();
+            _activeCalendars = (activeCalendars ?? _calendars.Where(calendar => calendar.IsChecked)).ToList();
+            GroupedAccountCalendars = new ReadOnlyObservableCollection<GroupedAccountCalendarViewModel>(_groupedCalendars);
+        }
+
+        public IDispatcher Dispatcher { get; set; } = null!;
+        public ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; }
+
+        public event EventHandler<GroupedAccountCalendarViewModel>? CollectiveAccountGroupSelectionStateChanged
+        {
+            add { }
+            remove { }
+        }
+
+        public event EventHandler<AccountCalendarViewModel>? AccountCalendarSelectionStateChanged
+        {
+            add { }
+            remove { }
+        }
+
+        public event PropertyChangedEventHandler? PropertyChanged
+        {
+            add { }
+            remove { }
+        }
+
+        public IEnumerable<AccountCalendarViewModel> ActiveCalendars => _activeCalendars;
+        public IEnumerable<AccountCalendarViewModel> AllCalendars => _calendars;
+        public ReadOnlyObservableGroupedCollection<MailAccount, AccountCalendarViewModel> GroupedCalendars { get; set; } = null!;
+
+        public void AddGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar) => _groupedCalendars.Add(groupedAccountCalendar);
+        public void RemoveGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar) => _groupedCalendars.Remove(groupedAccountCalendar);
+        public void ClearGroupedAccountCalendars() => _groupedCalendars.Clear();
+        public void AddAccountCalendar(AccountCalendarViewModel accountCalendar) => _calendars.Add(accountCalendar);
+        public void RemoveAccountCalendar(AccountCalendarViewModel accountCalendar) => _calendars.Remove(accountCalendar);
+    }
+
+    private sealed class TestDateContextProvider(string cultureName, DateOnly today) : IDateContextProvider
+    {
+        public CultureInfo Culture => CultureInfo.GetCultureInfo(cultureName);
+        public TimeZoneInfo TimeZone => TimeZoneInfo.Utc;
+        public DateOnly GetToday() => today;
+    }
+}
diff --git a/Wino.Core.Tests/CalendarRangeResolverTests.cs b/Wino.Core.Tests/CalendarRangeResolverTests.cs
new file mode 100644
index 00000000..20b8e3fe
--- /dev/null
+++ b/Wino.Core.Tests/CalendarRangeResolverTests.cs
@@ -0,0 +1,190 @@
+using System.Globalization;
+using FluentAssertions;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+using Xunit;
+
+namespace Wino.Core.Tests;
+
+public class CalendarRangeResolverTests
+{
+    [Fact]
+    public void Resolve_Day_ReturnsAnchorDateOnly()
+    {
+        var settings = CreateSettings();
+        var today = new DateOnly(2026, 3, 20);
+
+        var range = CalendarRangeResolver.Resolve(new CalendarDisplayRequest(CalendarDisplayType.Day, today), settings, today);
+
+        range.StartDate.Should().Be(today);
+        range.EndDate.Should().Be(today);
+        range.DayCount.Should().Be(1);
+        range.ContainsToday.Should().BeTrue();
+        range.Dates.Should().ContainSingle().Which.Should().Be(today);
+    }
+
+    [Fact]
+    public void Resolve_Week_HonorsConfiguredFirstDayOfWeek()
+    {
+        var settings = CreateSettings(firstDayOfWeek: DayOfWeek.Sunday);
+        var anchor = new DateOnly(2026, 3, 18);
+
+        var range = CalendarRangeResolver.Resolve(new CalendarDisplayRequest(CalendarDisplayType.Week, anchor), settings, today: anchor);
+
+        range.StartDate.Should().Be(new DateOnly(2026, 3, 15));
+        range.EndDate.Should().Be(new DateOnly(2026, 3, 21));
+        range.DayCount.Should().Be(7);
+    }
+
+    [Fact]
+    public void Resolve_WorkWeek_UsesConfiguredBounds()
+    {
+        var settings = CreateSettings(
+            firstDayOfWeek: DayOfWeek.Sunday,
+            workWeekStart: DayOfWeek.Monday,
+            workWeekEnd: DayOfWeek.Thursday);
+        var anchor = new DateOnly(2026, 3, 18);
+
+        var range = CalendarRangeResolver.Resolve(new CalendarDisplayRequest(CalendarDisplayType.WorkWeek, anchor), settings, today: anchor);
+
+        range.StartDate.Should().Be(new DateOnly(2026, 3, 16));
+        range.EndDate.Should().Be(new DateOnly(2026, 3, 19));
+        range.DayCount.Should().Be(4);
+    }
+
+    [Fact]
+    public void Resolve_Month_CoversEntireAnchorMonth()
+    {
+        var settings = CreateSettings();
+        var anchor = new DateOnly(2026, 2, 14);
+
+        var range = CalendarRangeResolver.Resolve(new CalendarDisplayRequest(CalendarDisplayType.Month, anchor), settings, today: anchor);
+
+        range.StartDate.Should().Be(new DateOnly(2026, 2, 1));
+        range.EndDate.Should().Be(new DateOnly(2026, 2, 28));
+        range.DayCount.Should().Be(28);
+        range.SpansSingleMonth.Should().BeTrue();
+    }
+
+    [Theory]
+    [InlineData(CalendarDisplayType.Day, 2026, 3, 18, 2026, 3, 19, 2026, 3, 17)]
+    [InlineData(CalendarDisplayType.Week, 2026, 3, 18, 2026, 3, 25, 2026, 3, 11)]
+    [InlineData(CalendarDisplayType.WorkWeek, 2026, 3, 18, 2026, 3, 25, 2026, 3, 11)]
+    [InlineData(CalendarDisplayType.Month, 2026, 3, 18, 2026, 4, 18, 2026, 2, 18)]
+    public void Navigate_MovesExactlyOnePeriod(
+        CalendarDisplayType displayType,
+        int year,
+        int month,
+        int day,
+        int nextYear,
+        int nextMonth,
+        int nextDay,
+        int previousYear,
+        int previousMonth,
+        int previousDay)
+    {
+        var settings = CreateSettings();
+        var today = new DateOnly(2026, 3, 20);
+        var current = CalendarRangeResolver.Resolve(
+            new CalendarDisplayRequest(displayType, new DateOnly(year, month, day)),
+            settings,
+            today);
+
+        var next = CalendarRangeResolver.Navigate(current, 1, settings, today);
+        var previous = CalendarRangeResolver.Navigate(current, -1, settings, today);
+
+        next.AnchorDate.Should().Be(new DateOnly(nextYear, nextMonth, nextDay));
+        previous.AnchorDate.Should().Be(new DateOnly(previousYear, previousMonth, previousDay));
+    }
+
+    [Fact]
+    public void ChangeDisplayType_FromMonth_UsesTodayWhenTodayIsInsideCurrentMonth()
+    {
+        var settings = CreateSettings();
+        var today = new DateOnly(2026, 3, 20);
+        var monthRange = CalendarRangeResolver.Resolve(
+            new CalendarDisplayRequest(CalendarDisplayType.Month, new DateOnly(2026, 3, 5)),
+            settings,
+            today);
+
+        var dayRange = CalendarRangeResolver.ChangeDisplayType(monthRange, CalendarDisplayType.Day, settings, today);
+
+        dayRange.AnchorDate.Should().Be(today);
+        dayRange.StartDate.Should().Be(today);
+        dayRange.EndDate.Should().Be(today);
+    }
+
+    [Fact]
+    public void Formatter_Day_UsesMonthDayPattern()
+    {
+        var formatter = new CalendarRangeTextFormatter();
+        var range = new VisibleDateRange(
+            CalendarDisplayType.Day,
+            new DateOnly(2026, 3, 20),
+            new DateOnly(2026, 3, 20),
+            new DateOnly(2026, 3, 20),
+            new DateOnly(2026, 3, 20),
+            1,
+            true,
+            true,
+            [new DateOnly(2026, 3, 20)]);
+
+        var text = formatter.Format(range, new TestDateContextProvider("en-US", today: new DateOnly(2026, 3, 20)));
+
+        text.Should().Be("March 20");
+    }
+
+    [Fact]
+    public void Formatter_Range_UsesCultureMonthDayPattern()
+    {
+        var formatter = new CalendarRangeTextFormatter();
+        var range = new VisibleDateRange(
+            CalendarDisplayType.Week,
+            new DateOnly(2026, 3, 20),
+            new DateOnly(2026, 3, 16),
+            new DateOnly(2026, 3, 22),
+            new DateOnly(2026, 3, 20),
+            7,
+            true,
+            true,
+            [
+                new DateOnly(2026, 3, 16),
+                new DateOnly(2026, 3, 17),
+                new DateOnly(2026, 3, 18),
+                new DateOnly(2026, 3, 19),
+                new DateOnly(2026, 3, 20),
+                new DateOnly(2026, 3, 21),
+                new DateOnly(2026, 3, 22)
+            ]);
+
+        var text = formatter.Format(range, new TestDateContextProvider("de-DE", today: new DateOnly(2026, 3, 20)));
+
+        text.Should().Be("16. März - 22. März");
+    }
+
+    private static CalendarSettings CreateSettings(
+        DayOfWeek firstDayOfWeek = DayOfWeek.Monday,
+        DayOfWeek workWeekStart = DayOfWeek.Monday,
+        DayOfWeek workWeekEnd = DayOfWeek.Friday,
+        string cultureName = "en-US")
+    {
+        return new CalendarSettings(
+            firstDayOfWeek,
+            [DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Friday],
+            true,
+            workWeekStart,
+            workWeekEnd,
+            TimeSpan.FromHours(9),
+            TimeSpan.FromHours(18),
+            64,
+            DayHeaderDisplayType.TwentyFourHour,
+            CultureInfo.GetCultureInfo(cultureName));
+    }
+
+    private sealed class TestDateContextProvider(string cultureName, DateOnly today) : IDateContextProvider
+    {
+        public CultureInfo Culture => CultureInfo.GetCultureInfo(cultureName);
+        public TimeZoneInfo TimeZone => TimeZoneInfo.Utc;
+        public DateOnly GetToday() => today;
+    }
+}
diff --git a/Wino.Core.Tests/CalendarRangeTextFormatterTests.cs b/Wino.Core.Tests/CalendarRangeTextFormatterTests.cs
new file mode 100644
index 00000000..8c302e64
--- /dev/null
+++ b/Wino.Core.Tests/CalendarRangeTextFormatterTests.cs
@@ -0,0 +1,103 @@
+using System.Linq;
+using FluentAssertions;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+using Xunit;
+
+namespace Wino.Core.Tests;
+
+public class CalendarRangeTextFormatterTests
+{
+    private static readonly CalendarRangeTextFormatter Formatter = new();
+    private static readonly TestDateContextProvider DateContextProvider = new("en-US", new DateOnly(2026, 3, 24));
+
+    [Fact]
+    public void Format_ReturnsMonthDay_ForSingleDate()
+    {
+        var range = CreateRange(
+            CalendarDisplayType.Day,
+            anchorDate: new DateOnly(2026, 3, 6),
+            startDate: new DateOnly(2026, 3, 6),
+            endDate: new DateOnly(2026, 3, 6));
+
+        Formatter.Format(range, DateContextProvider).Should().Be("March 6");
+    }
+
+    [Fact]
+    public void Format_ReturnsFullRange_ForDatesInSameMonth()
+    {
+        var range = CreateRange(
+            CalendarDisplayType.Week,
+            anchorDate: new DateOnly(2026, 3, 6),
+            startDate: new DateOnly(2026, 3, 3),
+            endDate: new DateOnly(2026, 3, 10));
+
+        Formatter.Format(range, DateContextProvider).Should().Be("March 3 - 10");
+    }
+
+    [Fact]
+    public void Format_ReturnsFullRange_ForDatesInDifferentMonths()
+    {
+        var range = CreateRange(
+            CalendarDisplayType.Week,
+            anchorDate: new DateOnly(2026, 4, 2),
+            startDate: new DateOnly(2026, 3, 30),
+            endDate: new DateOnly(2026, 4, 7));
+
+        Formatter.Format(range, DateContextProvider).Should().Be("March 30 - April 7");
+    }
+
+    [Fact]
+    public void Format_ReturnsAnchorMonth_WhenVisibleRangeSpansMonthGrid()
+    {
+        var range = CreateRange(
+            CalendarDisplayType.Month,
+            anchorDate: new DateOnly(2026, 3, 12),
+            startDate: new DateOnly(2026, 2, 23),
+            endDate: new DateOnly(2026, 4, 5));
+
+        Formatter.Format(range, DateContextProvider).Should().Be("March 2026");
+    }
+
+    [Fact]
+    public void Format_ReturnsAnchorMonth_WhenVisibleRangeHasExactlyTwentyEightDays()
+    {
+        var range = CreateRange(
+            CalendarDisplayType.Month,
+            anchorDate: new DateOnly(2026, 2, 14),
+            startDate: new DateOnly(2026, 2, 1),
+            endDate: new DateOnly(2026, 2, 28));
+
+        Formatter.Format(range, DateContextProvider).Should().Be("February 2026");
+    }
+
+    private static VisibleDateRange CreateRange(
+        CalendarDisplayType displayType,
+        DateOnly anchorDate,
+        DateOnly startDate,
+        DateOnly endDate)
+    {
+        var dayCount = endDate.DayNumber - startDate.DayNumber + 1;
+        var dates = Enumerable.Range(0, dayCount)
+                              .Select(offset => startDate.AddDays(offset))
+                              .ToArray();
+
+        return new VisibleDateRange(
+            displayType,
+            anchorDate,
+            startDate,
+            endDate,
+            anchorDate,
+            dayCount,
+            ContainsToday: false,
+            SpansSingleMonth: startDate.Month == endDate.Month && startDate.Year == endDate.Year,
+            Dates: dates);
+    }
+
+    private sealed class TestDateContextProvider(string cultureName, DateOnly today) : IDateContextProvider
+    {
+        public System.Globalization.CultureInfo Culture => System.Globalization.CultureInfo.GetCultureInfo(cultureName);
+        public TimeZoneInfo TimeZone => TimeZoneInfo.Utc;
+        public DateOnly GetToday() => today;
+    }
+}
diff --git a/Wino.Core.Tests/CalendarReminderSnoozeOptionsTests.cs b/Wino.Core.Tests/CalendarReminderSnoozeOptionsTests.cs
new file mode 100644
index 00000000..561e3024
--- /dev/null
+++ b/Wino.Core.Tests/CalendarReminderSnoozeOptionsTests.cs
@@ -0,0 +1,48 @@
+using FluentAssertions;
+using Wino.Core.Domain;
+using Xunit;
+
+namespace Wino.Core.Tests;
+
+public class CalendarReminderSnoozeOptionsTests
+{
+    [Fact]
+    public void GetAllowedSnoozeMinutes_WhenDefaultIs15AndReminderIs15_Excludes30()
+    {
+        var options = CalendarReminderSnoozeOptions.GetAllowedSnoozeMinutes(
+            reminderDurationInSeconds: 15 * 60,
+            defaultReminderDurationInSeconds: 15 * 60);
+
+        options.Should().Equal(5, 10, 15);
+    }
+
+    [Fact]
+    public void GetAllowedSnoozeMinutes_WhenReminderIs5AndDefaultIs15_DoesNotPassEventStart()
+    {
+        var options = CalendarReminderSnoozeOptions.GetAllowedSnoozeMinutes(
+            reminderDurationInSeconds: 5 * 60,
+            defaultReminderDurationInSeconds: 15 * 60);
+
+        options.Should().Equal(5);
+    }
+
+    [Fact]
+    public void GetAllowedSnoozeMinutes_WhenDefaultReminderIsNone_UsesReminderDurationOnly()
+    {
+        var options = CalendarReminderSnoozeOptions.GetAllowedSnoozeMinutes(
+            reminderDurationInSeconds: 30 * 60,
+            defaultReminderDurationInSeconds: 0);
+
+        options.Should().Equal(5, 10, 15, 30);
+    }
+
+    [Fact]
+    public void GetAllowedSnoozeMinutes_WhenReminderIsUnderFiveMinutes_ReturnsNoOptions()
+    {
+        var options = CalendarReminderSnoozeOptions.GetAllowedSnoozeMinutes(
+            reminderDurationInSeconds: 60,
+            defaultReminderDurationInSeconds: 15 * 60);
+
+        options.Should().BeEmpty();
+    }
+}
diff --git a/Wino.Core.Tests/GlobalUsings.cs b/Wino.Core.Tests/GlobalUsings.cs
new file mode 100644
index 00000000..29ee885e
--- /dev/null
+++ b/Wino.Core.Tests/GlobalUsings.cs
@@ -0,0 +1,4 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Threading.Tasks;
diff --git a/Wino.Core.Tests/Helpers/InMemoryDatabaseService.cs b/Wino.Core.Tests/Helpers/InMemoryDatabaseService.cs
new file mode 100644
index 00000000..2c027196
--- /dev/null
+++ b/Wino.Core.Tests/Helpers/InMemoryDatabaseService.cs
@@ -0,0 +1,69 @@
+using SQLite;
+using System.IO;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Services;
+
+namespace Wino.Core.Tests.Helpers;
+
+/// <summary>
+/// In-memory database service for testing purposes.
+/// Creates a temporary SQLite database in memory that is destroyed after tests complete.
+/// </summary>
+public class InMemoryDatabaseService : IDatabaseService
+{
+    private readonly string _databasePath;
+    public SQLiteAsyncConnection Connection { get; private set; }
+
+    public InMemoryDatabaseService()
+    {
+        // Use a unique temporary file per test instance for stable async access.
+        _databasePath = Path.Combine(Path.GetTempPath(), $"wino-tests-{Guid.NewGuid():N}.db");
+        Connection = new SQLiteAsyncConnection(_databasePath);
+    }
+
+    public async Task InitializeAsync()
+    {
+        await CreateTablesAsync();
+    }
+
+    private async Task CreateTablesAsync()
+    {
+        // Keep table creation sequential for in-memory SQLite to avoid connection contention.
+        await Connection.CreateTableAsync<MailCopy>();
+        await Connection.CreateTableAsync<MailItemFolder>();
+        await Connection.CreateTableAsync<MailAccount>();
+        await Connection.CreateTableAsync<AccountContact>();
+        await Connection.CreateTableAsync<CustomServerInformation>();
+        await Connection.CreateTableAsync<AccountSignature>();
+        await Connection.CreateTableAsync<MergedInbox>();
+        await Connection.CreateTableAsync<MailAccountPreferences>();
+        await Connection.CreateTableAsync<MailAccountAlias>();
+        await Connection.CreateTableAsync<Thumbnail>();
+        await Connection.CreateTableAsync<ContactGroup>();
+        await Connection.CreateTableAsync<ContactGroupMember>();
+        await Connection.CreateTableAsync<KeyboardShortcut>();
+        await Connection.CreateTableAsync<AccountCalendar>();
+        await Connection.CreateTableAsync<CalendarEventAttendee>();
+        await Connection.CreateTableAsync<CalendarItem>();
+        await Connection.CreateTableAsync<CalendarAttachment>();
+        await Connection.CreateTableAsync<Reminder>();
+        await Connection.CreateTableAsync<MailInvitationCalendarMapping>();
+        await Connection.CreateTableAsync<WinoAccount>();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (Connection != null)
+        {
+            await Connection.CloseAsync();
+            Connection = null!;
+        }
+
+        if (File.Exists(_databasePath))
+        {
+            File.Delete(_databasePath);
+        }
+    }
+}
diff --git a/Wino.Core.Tests/Models/HtmlPreviewVisitorTests.cs b/Wino.Core.Tests/Models/HtmlPreviewVisitorTests.cs
new file mode 100644
index 00000000..7fe2b080
--- /dev/null
+++ b/Wino.Core.Tests/Models/HtmlPreviewVisitorTests.cs
@@ -0,0 +1,76 @@
+using Xunit;
+using FluentAssertions;
+using MimeKit;
+using Wino.Core.Domain.Models.MailItem;
+
+namespace Wino.Core.Tests.Models;
+
+public class HtmlPreviewVisitorTests
+{
+    [Fact]
+    public void HtmlPreviewVisitor_Should_Remove_Blocked_Tags_And_Event_Attributes()
+    {
+        // Arrange
+        var html = """
+            <html>
+                <body onload="alert('x')">
+                    <h1 onclick="evil()">hello</h1>
+                    <script>alert('xss')</script>
+                    <iframe src="https://malicious.example"></iframe>
+                    <object data="https://malicious.example/file.swf"></object>
+                    <img src="https://cdn.example/image.png" onerror="steal()" />
+                </body>
+            </html>
+            """;
+
+        var message = new MimeMessage();
+        message.Body = new TextPart("html") { Text = html };
+
+        var visitor = new HtmlPreviewVisitor(Path.GetTempPath());
+
+        // Act
+        message.Accept(visitor);
+        var output = visitor.HtmlBody;
+
+        // Assert
+        output.Should().NotContain("<script", "script tags must be blocked in rendered html");
+        output.Should().NotContain("<iframe", "iframe tags must be blocked in rendered html");
+        output.Should().NotContain("<object", "object tags must be blocked in rendered html");
+        output.Should().NotContain("onload=", "event handler attributes must be stripped");
+        output.Should().NotContain("onclick=", "event handler attributes must be stripped");
+        output.Should().NotContain("onerror=", "event handler attributes must be stripped");
+        output.Should().Contain("oncontextmenu=\"return false;\"", "body context-menu suppression should be kept");
+    }
+
+    [Fact]
+    public void HtmlPreviewVisitor_Should_Sanitize_Dangerous_Url_Attributes()
+    {
+        // Arrange
+        var html = """
+            <html>
+                <body>
+                    <a id="safe-link" href="https://contoso.com/path">safe</a>
+                    <a id="js-link" href="javascript:alert('xss')">bad</a>
+                    <img id="svg-script" src="data:text/html;base64,PHNjcmlwdD5hbGVydCgxKTwvc2NyaXB0Pg==" />
+                    <img id="allowed" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB" />
+                </body>
+            </html>
+            """;
+
+        var message = new MimeMessage();
+        message.Body = new TextPart("html") { Text = html };
+
+        var visitor = new HtmlPreviewVisitor(Path.GetTempPath());
+
+        // Act
+        message.Accept(visitor);
+        var output = visitor.HtmlBody;
+
+        // Assert
+        output.Should().Contain("id=\"safe-link\" href=\"https://contoso.com/path\"", "http/https links should be preserved");
+        output.Should().Contain("id=\"js-link\"", "the element should remain");
+        output.Should().NotContain("href=\"javascript:", "javascript URLs must be removed");
+        output.Should().Contain("id=\"allowed\" src=\"data:image/png;base64", "safe image data URLs should be preserved");
+        output.Should().NotContain("id=\"svg-script\" src=\"data:text/html", "non-image data URLs should be removed");
+    }
+}
diff --git a/Wino.Core.Tests/Services/AccountServiceTests.cs b/Wino.Core.Tests/Services/AccountServiceTests.cs
new file mode 100644
index 00000000..69c69dfd
--- /dev/null
+++ b/Wino.Core.Tests/Services/AccountServiceTests.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Linq;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Misc;
+using Wino.Core.Tests.Helpers;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public class AccountServiceTests : IAsyncLifetime
+{
+    private InMemoryDatabaseService _databaseService = null!;
+    private AccountService _accountService = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+        _accountService = CreateService(_databaseService);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task CreateAccountAsync_ImapLocalOnly_CreatesSinglePrimaryDefaultCalendar()
+    {
+        var accountId = Guid.NewGuid();
+        var account = CreateImapAccount(accountId);
+        var server = new CustomServerInformation
+        {
+            Id = Guid.NewGuid(),
+            AccountId = accountId,
+            CalendarSupportMode = ImapCalendarSupportMode.LocalOnly
+        };
+
+        await _accountService.CreateAccountAsync(account, server);
+
+        var calendars = await _databaseService.Connection.Table<Wino.Core.Domain.Entities.Calendar.AccountCalendar>()
+            .Where(a => a.AccountId == accountId)
+            .ToListAsync();
+
+        calendars.Should().HaveCount(1);
+        calendars[0].IsPrimary.Should().BeTrue();
+        calendars[0].Name.Should().Be(Translator.AccountDetailsPage_TabCalendar);
+        ColorHelpers.GetFlatColorPalette().Should().Contain(calendars[0].BackgroundColorHex);
+    }
+
+    [Fact]
+    public async Task CreateAccountAsync_ImapCalDav_DoesNotCreateDefaultLocalCalendar()
+    {
+        var accountId = Guid.NewGuid();
+        var account = CreateImapAccount(accountId);
+        var server = new CustomServerInformation
+        {
+            Id = Guid.NewGuid(),
+            AccountId = accountId,
+            CalendarSupportMode = ImapCalendarSupportMode.CalDav
+        };
+
+        await _accountService.CreateAccountAsync(account, server);
+
+        var calendars = await _databaseService.Connection.Table<Wino.Core.Domain.Entities.Calendar.AccountCalendar>()
+            .Where(a => a.AccountId == accountId)
+            .ToListAsync();
+
+        calendars.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task CreateAccountAsync_ImapLocalOnly_AssignsDistinctCalendarColorsAcrossAccounts()
+    {
+        var firstAccountId = Guid.NewGuid();
+        var secondAccountId = Guid.NewGuid();
+
+        await _accountService.CreateAccountAsync(
+            CreateImapAccount(firstAccountId),
+            new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                AccountId = firstAccountId,
+                CalendarSupportMode = ImapCalendarSupportMode.LocalOnly
+            });
+
+        await _accountService.CreateAccountAsync(
+            CreateImapAccount(secondAccountId),
+            new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                AccountId = secondAccountId,
+                CalendarSupportMode = ImapCalendarSupportMode.LocalOnly
+            });
+
+        var calendars = await _databaseService.Connection.Table<Wino.Core.Domain.Entities.Calendar.AccountCalendar>()
+            .OrderBy(a => a.AccountId)
+            .ToListAsync();
+
+        calendars.Should().HaveCount(2);
+        calendars.Select(a => a.BackgroundColorHex).Should().OnlyHaveUniqueItems();
+        calendars.Should().OnlyContain(a => ColorHelpers.GetFlatColorPalette().Contains(a.BackgroundColorHex));
+    }
+
+    [Fact]
+    public void FlatCalendarPalette_ProvidesAtLeastFiftyDistinctColors()
+    {
+        ColorHelpers.GetFlatColorPalette()
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .Count()
+            .Should()
+            .BeGreaterThanOrEqualTo(50);
+    }
+
+    private static MailAccount CreateImapAccount(Guid accountId)
+    {
+        return new MailAccount
+        {
+            Id = accountId,
+            Name = "IMAP Test Account",
+            Address = "imap@test.local",
+            SenderName = "IMAP Test",
+            ProviderType = MailProviderType.IMAP4
+        };
+    }
+
+    private static AccountService CreateService(InMemoryDatabaseService databaseService)
+    {
+        var signatureService = new Mock<ISignatureService>();
+        signatureService
+            .Setup(a => a.CreateDefaultSignatureAsync(It.IsAny<Guid>()))
+            .ReturnsAsync((Guid accountId) => new AccountSignature
+            {
+                Id = Guid.NewGuid(),
+                MailAccountId = accountId,
+                Name = "Default",
+                HtmlBody = string.Empty
+            });
+
+        var authenticationProvider = new Mock<IAuthenticationProvider>();
+        var mimeFileService = new Mock<IMimeFileService>();
+        var contactPictureFileService = new Mock<IContactPictureFileService>();
+
+        var preferencesService = new Mock<IPreferencesService>();
+        preferencesService.SetupProperty(a => a.StartupEntityId);
+
+        return new AccountService(
+            databaseService,
+            signatureService.Object,
+            authenticationProvider.Object,
+            mimeFileService.Object,
+            preferencesService.Object,
+            contactPictureFileService.Object);
+    }
+}
diff --git a/Wino.Core.Tests/Services/AutoDiscoveryServiceTests.cs b/Wino.Core.Tests/Services/AutoDiscoveryServiceTests.cs
new file mode 100644
index 00000000..fd1dd8c1
--- /dev/null
+++ b/Wino.Core.Tests/Services/AutoDiscoveryServiceTests.cs
@@ -0,0 +1,221 @@
+using System.Net;
+using System.Net.Http.Headers;
+using System.Text;
+using FluentAssertions;
+using Wino.Core.Domain.Models.AutoDiscovery;
+using Wino.Core.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public class AutoDiscoveryServiceTests
+{
+    [Fact]
+    public async Task GetAutoDiscoverySettings_UsesThunderbirdAutoconfig_WhenAvailable()
+    {
+        var handler = new StubHttpMessageHandler(request =>
+        {
+            var uri = request.RequestUri!.ToString();
+
+            if (uri.StartsWith("https://autoconfig.example.com/mail/config-v1.1.xml", StringComparison.OrdinalIgnoreCase))
+            {
+                return CreateXmlResponse("""
+                    <clientConfig version="1.1">
+                      <emailProvider id="example.com">
+                        <incomingServer type="imap">
+                          <hostname>imap.example.com</hostname>
+                          <port>993</port>
+                          <socketType>SSL</socketType>
+                          <username>%EMAILLOCALPART%</username>
+                        </incomingServer>
+                        <outgoingServer type="smtp">
+                          <hostname>smtp.example.com</hostname>
+                          <port>587</port>
+                          <socketType>STARTTLS</socketType>
+                          <username>%EMAILADDRESS%</username>
+                        </outgoingServer>
+                      </emailProvider>
+                    </clientConfig>
+                    """, request);
+            }
+
+            return CreateStatusResponse(HttpStatusCode.NotFound, request);
+        });
+
+        using var client = new HttpClient(handler);
+        var sut = new AutoDiscoveryService(client);
+
+        var settings = await sut.GetAutoDiscoverySettings(new AutoDiscoveryMinimalSettings
+        {
+            Email = "user@example.com",
+            DisplayName = "User",
+            Password = "secret"
+        });
+
+        settings.Should().NotBeNull();
+        settings!.Domain.Should().Be("example.com");
+        settings.GetImapSettings()!.Address.Should().Be("imap.example.com");
+        settings.GetImapSettings()!.Username.Should().Be("user");
+        settings.GetSmptpSettings()!.Address.Should().Be("smtp.example.com");
+        settings.GetSmptpSettings()!.Username.Should().Be("user@example.com");
+        handler.RequestedUris.Should().NotContain(uri => uri.Contains("emailsettings.firetrust.com", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public async Task GetAutoDiscoverySettings_FallsBackToFiretrust_WhenThunderbirdMethodsFail()
+    {
+        var handler = new StubHttpMessageHandler(request =>
+        {
+            var uri = request.RequestUri!.ToString();
+
+            if (uri.StartsWith("https://emailsettings.firetrust.com/settings?q=", StringComparison.OrdinalIgnoreCase))
+            {
+                return CreateJsonResponse("""
+                    {
+                      "domain": "example.com",
+                      "settings": [
+                        {
+                          "protocol": "IMAP",
+                          "address": "imap.firetrust.example.com",
+                          "port": 993,
+                          "secure": "SSL",
+                          "username": "user@example.com"
+                        },
+                        {
+                          "protocol": "SMTP",
+                          "address": "smtp.firetrust.example.com",
+                          "port": 587,
+                          "secure": "STARTTLS",
+                          "username": "user@example.com"
+                        }
+                      ]
+                    }
+                    """, request);
+            }
+
+            if (uri.StartsWith("https://dns.google/resolve", StringComparison.OrdinalIgnoreCase))
+            {
+                return CreateJsonResponse("{\"Status\":0}", request);
+            }
+
+            return CreateStatusResponse(HttpStatusCode.NotFound, request);
+        });
+
+        using var client = new HttpClient(handler);
+        var sut = new AutoDiscoveryService(client);
+
+        var settings = await sut.GetAutoDiscoverySettings(new AutoDiscoveryMinimalSettings
+        {
+            Email = "user@example.com"
+        });
+
+        settings.Should().NotBeNull();
+        settings!.GetImapSettings()!.Address.Should().Be("imap.firetrust.example.com");
+        settings.GetSmptpSettings()!.Address.Should().Be("smtp.firetrust.example.com");
+        handler.RequestedUris.Should().Contain(uri => uri.Contains("emailsettings.firetrust.com", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public async Task DiscoverCalDavServiceUriAsync_ReturnsKnownYahooEndpoint()
+    {
+        var sut = new AutoDiscoveryService(new HttpClient(new StubHttpMessageHandler(_ => throw new InvalidOperationException("No network call expected"))));
+
+        var uri = await sut.DiscoverCalDavServiceUriAsync("user@yahoo.com");
+
+        uri.Should().Be(new Uri("https://caldav.calendar.yahoo.com/"));
+    }
+
+    [Fact]
+    public async Task DiscoverCalDavServiceUriAsync_ResolvesWellKnownRedirect()
+    {
+        var handler = new StubHttpMessageHandler(request =>
+        {
+            var uri = request.RequestUri!.ToString();
+
+            if (uri.Equals("https://calendar.example.com/.well-known/caldav", StringComparison.OrdinalIgnoreCase))
+            {
+                var response = CreateStatusResponse(HttpStatusCode.Found, request);
+                response.Headers.Location = new Uri("https://dav.example.net/caldav/");
+                return response;
+            }
+
+            return CreateStatusResponse(HttpStatusCode.NotFound, request);
+        });
+
+        using var client = new HttpClient(handler);
+        var sut = new AutoDiscoveryService(client);
+
+        var uri = await sut.DiscoverCalDavServiceUriAsync("user@calendar.example.com");
+
+        uri.Should().Be(new Uri("https://dav.example.net/caldav/"));
+    }
+
+    private static HttpResponseMessage CreateXmlResponse(string xml, HttpRequestMessage request)
+        => new(HttpStatusCode.OK)
+        {
+            RequestMessage = request,
+            Content = new StringContent(xml, Encoding.UTF8, "application/xml")
+        };
+
+    private static HttpResponseMessage CreateJsonResponse(string json, HttpRequestMessage request)
+        => new(HttpStatusCode.OK)
+        {
+            RequestMessage = request,
+            Content = new StringContent(json, Encoding.UTF8, "application/json")
+        };
+
+    private static HttpResponseMessage CreateStatusResponse(HttpStatusCode statusCode, HttpRequestMessage request)
+        => new(statusCode)
+        {
+            RequestMessage = request
+        };
+
+    private sealed class StubHttpMessageHandler(Func<HttpRequestMessage, HttpResponseMessage> responseFactory) : HttpMessageHandler
+    {
+        private readonly Func<HttpRequestMessage, HttpResponseMessage> _responseFactory = responseFactory;
+
+        public List<string> RequestedUris { get; } = [];
+
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            RequestedUris.Add(request.RequestUri?.ToString() ?? string.Empty);
+            var response = _responseFactory(request);
+
+            // Ensure probing logic sees a request URI even if response factory forgot it.
+            response.RequestMessage ??= request;
+
+            if (response.Headers.Date == null)
+            {
+                response.Headers.Date = DateTimeOffset.UtcNow;
+            }
+
+            if (!response.Headers.Contains("DAV") &&
+                response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+            {
+                response.Headers.Add("DAV", "1, calendar-access");
+            }
+
+            var hasAllowHeader = response.Headers.TryGetValues("Allow", out var allowValues) &&
+                                 allowValues.Any();
+
+            if (!hasAllowHeader &&
+                response.StatusCode == HttpStatusCode.OK &&
+                request.Method == HttpMethod.Options)
+            {
+                response.Headers.Add("Allow", "PROPFIND");
+            }
+
+            if (response.Content == null)
+            {
+                response.Content = new StringContent(string.Empty, Encoding.UTF8, "text/plain");
+            }
+
+            if (response.Content.Headers.ContentType == null)
+            {
+                response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+            }
+
+            return Task.FromResult(response);
+        }
+    }
+}
diff --git a/Wino.Core.Tests/Services/CalendarEventComposeResultValidatorTests.cs b/Wino.Core.Tests/Services/CalendarEventComposeResultValidatorTests.cs
new file mode 100644
index 00000000..31a7ad85
--- /dev/null
+++ b/Wino.Core.Tests/Services/CalendarEventComposeResultValidatorTests.cs
@@ -0,0 +1,166 @@
+using FluentAssertions;
+using System.IO;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Validation;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public sealed class CalendarEventComposeResultValidatorTests
+{
+    private readonly CalendarEventComposeResultValidator _validator = new();
+
+    [Fact]
+    public void Validate_WhenResultIsValid_DoesNotThrow()
+    {
+        var tempFilePath = Path.GetTempFileName();
+
+        try
+        {
+            var result = CreateValidResult();
+            result.Attachments.Add(new CalendarEventComposeAttachmentDraft
+            {
+                Id = Guid.NewGuid(),
+                FileName = Path.GetFileName(tempFilePath),
+                FilePath = tempFilePath,
+                FileExtension = ".tmp",
+                Size = 12
+            });
+
+            Action act = () => _validator.Validate(result);
+
+            act.Should().NotThrow();
+        }
+        finally
+        {
+            File.Delete(tempFilePath);
+        }
+    }
+
+    [Fact]
+    public void Validate_WhenEndDateIsBeforeStartDate_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.EndDate = result.StartDate.AddMinutes(-30);
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(Translator.CalendarEventCompose_ValidationInvalidTimeRange);
+    }
+
+    [Fact]
+    public void Validate_WhenAllDayEndDateMatchesStartDate_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.IsAllDay = true;
+        result.EndDate = result.StartDate;
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(Translator.CalendarEventCompose_ValidationInvalidAllDayRange);
+    }
+
+    [Fact]
+    public void Validate_WhenAttachmentDoesNotExist_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.Attachments.Add(new CalendarEventComposeAttachmentDraft
+        {
+            Id = Guid.NewGuid(),
+            FileName = "missing.txt",
+            FilePath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid():N}.txt"),
+            FileExtension = ".txt",
+            Size = 42
+        });
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(string.Format(Translator.CalendarEventCompose_ValidationMissingAttachment, "missing.txt"));
+    }
+
+    [Fact]
+    public void Validate_WhenAttendeeEmailIsInvalid_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.Attendees.Add(new CalendarEventAttendee
+        {
+            Id = Guid.NewGuid(),
+            CalendarItemId = Guid.Empty,
+            Email = "not-an-email"
+        });
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(Translator.CalendarEventCompose_ValidationInvalidAttendee);
+    }
+
+    [Fact]
+    public void Validate_WhenAttendeeEmailIsDuplicated_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.Attendees.Add(new CalendarEventAttendee
+        {
+            Id = Guid.NewGuid(),
+            CalendarItemId = Guid.Empty,
+            Email = "person@example.com"
+        });
+        result.Attendees.Add(new CalendarEventAttendee
+        {
+            Id = Guid.NewGuid(),
+            CalendarItemId = Guid.Empty,
+            Email = "PERSON@example.com"
+        });
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(Translator.CalendarEventCompose_ValidationInvalidAttendee);
+    }
+
+    [Fact]
+    public void Validate_WhenCalendarIdIsMissing_ThrowsValidationException()
+    {
+        var result = CreateValidResult();
+        result.CalendarId = Guid.Empty;
+
+        Action act = () => _validator.Validate(result);
+
+        act.Should()
+            .Throw<CalendarEventComposeValidationException>()
+            .WithMessage(Translator.CalendarEventCompose_ValidationMissingCalendar);
+    }
+
+    private static CalendarEventComposeResult CreateValidResult()
+    {
+        return new CalendarEventComposeResult
+        {
+            CalendarId = Guid.NewGuid(),
+            AccountId = Guid.NewGuid(),
+            Title = "Design review",
+            StartDate = new DateTime(2026, 3, 7, 13, 30, 0),
+            EndDate = new DateTime(2026, 3, 7, 14, 0, 0),
+            TimeZoneId = TimeZoneInfo.Local.Id,
+            SelectedReminders =
+            [
+                new Reminder
+                {
+                    Id = Guid.NewGuid(),
+                    DurationInSeconds = 900
+                }
+            ]
+        };
+    }
+}
diff --git a/Wino.Core.Tests/Services/CalendarReminderServiceTests.cs b/Wino.Core.Tests/Services/CalendarReminderServiceTests.cs
new file mode 100644
index 00000000..23e9b62b
--- /dev/null
+++ b/Wino.Core.Tests/Services/CalendarReminderServiceTests.cs
@@ -0,0 +1,256 @@
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Tests.Helpers;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public class CalendarReminderServiceTests : IAsyncLifetime
+{
+    private InMemoryDatabaseService _databaseService = null!;
+    private CalendarService _calendarService = null!;
+    private AccountCalendar _testCalendar = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+        _calendarService = new CalendarService(_databaseService);
+
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Reminder Test",
+            Address = "reminder@test.local",
+            SenderName = "Reminder Test",
+            IsCalendarAccessGranted = true
+        };
+
+        await _databaseService.Connection.InsertAsync(account, typeof(MailAccount));
+
+        _testCalendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = account.Id,
+            Name = "Test Calendar",
+            TimeZone = "UTC",
+            IsPrimary = true,
+            BackgroundColorHex = "#0A84FF",
+            TextColorHex = "#FFFFFF"
+        };
+
+        await _calendarService.InsertAccountCalendarAsync(_testCalendar);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenReminderFallsWithinWindow_ReturnsDueReminder()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        var calendarItem = await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup);
+
+        HashSet<string> sentReminderKeys = [];
+
+        var due = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        due.Should().HaveCount(1);
+        due[0].CalendarItem.Id.Should().Be(calendarItem.Id);
+        due[0].ReminderDurationInSeconds.Should().Be(5 * 60);
+        due[0].ReminderKey.Should().StartWith($"{calendarItem.Id:N}:{5 * 60}:");
+        sentReminderKeys.Should().ContainSingle(k => k.StartsWith($"{calendarItem.Id:N}:{5 * 60}:"));
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenReminderIsOutsideWindow_ReturnsEmpty()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(20),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup);
+
+        HashSet<string> sentReminderKeys = [];
+
+        var due = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        due.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenReminderAlreadySent_DoesNotReturnDuplicate()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        var calendarItem = await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup);
+
+        HashSet<string> sentReminderKeys = [];
+
+        var firstRun = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+        var secondRun = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        firstRun.Should().HaveCount(1);
+        secondRun.Should().BeEmpty();
+        sentReminderKeys.Should().ContainSingle(k => k.StartsWith($"{calendarItem.Id:N}:{5 * 60}:"));
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenCalendarAccessNotGranted_ReturnsEmpty()
+    {
+        var restrictedAccount = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "No Calendar Access",
+            Address = "restricted@test.local",
+            SenderName = "Restricted",
+            IsCalendarAccessGranted = false
+        };
+        await _databaseService.Connection.InsertAsync(restrictedAccount, typeof(MailAccount));
+
+        var restrictedCalendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = restrictedAccount.Id,
+            Name = "Restricted Calendar",
+            TimeZone = "UTC",
+            IsPrimary = true,
+            BackgroundColorHex = "#111111",
+            TextColorHex = "#FFFFFF"
+        };
+        await _calendarService.InsertAccountCalendarAsync(restrictedCalendar);
+
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup,
+            calendarId: restrictedCalendar.Id);
+
+        HashSet<string> sentReminderKeys = [];
+
+        var due = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        due.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenReminderTypeIsEmail_ReturnsEmpty()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Email);
+
+        HashSet<string> sentReminderKeys = [];
+
+        var due = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        due.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenItemIsRecurringParent_ReturnsEmpty()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup,
+            recurrence: "RRULE:FREQ=DAILY;COUNT=5");
+
+        HashSet<string> sentReminderKeys = [];
+
+        var due = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+
+        due.Should().BeEmpty();
+    }
+
+
+    [Fact]
+    public async Task CheckAndNotifyAsync_WhenItemIsSnoozed_TriggersAtSnoozedTime()
+    {
+        var nowLocal = new DateTime(2026, 1, 1, 10, 0, 0);
+        var lastCheckLocal = nowLocal.AddSeconds(-30);
+
+        var calendarItem = await CreateCalendarItemWithReminderAsync(
+            startDate: nowLocal.AddMinutes(5),
+            reminderDurationInSeconds: 5 * 60,
+            reminderType: CalendarItemReminderType.Popup);
+
+        await _calendarService.SnoozeCalendarItemAsync(calendarItem.Id, nowLocal.AddMinutes(10));
+
+        HashSet<string> sentReminderKeys = [];
+
+        var dueAtOriginalTrigger = await _calendarService.CheckAndNotifyAsync(lastCheckLocal, nowLocal, sentReminderKeys);
+        dueAtOriginalTrigger.Should().BeEmpty();
+
+        var snoozeTriggerWindowStart = nowLocal.AddMinutes(10).AddSeconds(-30);
+        var snoozeTriggerWindowEnd = nowLocal.AddMinutes(10);
+
+        var dueAtSnoozeTime = await _calendarService.CheckAndNotifyAsync(snoozeTriggerWindowStart, snoozeTriggerWindowEnd, sentReminderKeys);
+
+        dueAtSnoozeTime.Should().HaveCount(1);
+        dueAtSnoozeTime[0].CalendarItem.Id.Should().Be(calendarItem.Id);
+        dueAtSnoozeTime[0].ReminderKey.Should().StartWith($"{calendarItem.Id:N}:{5 * 60}:");
+    }
+
+    private async Task<CalendarItem> CreateCalendarItemWithReminderAsync(
+        DateTime startDate,
+        long reminderDurationInSeconds,
+        CalendarItemReminderType reminderType,
+        Guid? calendarId = null,
+        string? recurrence = null)
+    {
+        var item = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Reminder Test Event",
+            StartDate = startDate,
+            StartTimeZone = string.Empty,
+            EndTimeZone = string.Empty,
+            DurationInSeconds = 60 * 30,
+            CalendarId = calendarId ?? _testCalendar.Id,
+            IsHidden = false,
+            Recurrence = recurrence ?? string.Empty
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(item, null);
+
+        await _calendarService.SaveRemindersAsync(item.Id,
+        [
+            new Reminder
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = item.Id,
+                DurationInSeconds = reminderDurationInSeconds,
+                ReminderType = reminderType
+            }
+        ]);
+
+        return item;
+    }
+}
diff --git a/Wino.Core.Tests/Services/CalendarServiceTests.cs b/Wino.Core.Tests/Services/CalendarServiceTests.cs
new file mode 100644
index 00000000..91df77c0
--- /dev/null
+++ b/Wino.Core.Tests/Services/CalendarServiceTests.cs
@@ -0,0 +1,277 @@
+using FluentAssertions;
+using Itenso.TimePeriod;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Tests.Helpers;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+/// <summary>
+/// Tests for CalendarService, focusing on the GetCalendarEventsAsync method.
+/// Note: Recurring event occurrences are now synced from the server as individual instances,
+/// not calculated locally from recurrence patterns.
+/// </summary>
+public class CalendarServiceTests : IAsyncLifetime
+{
+    private InMemoryDatabaseService _databaseService = null!;
+    private CalendarService _calendarService = null!;
+    private AccountCalendar _testCalendar = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+        _calendarService = new CalendarService(_databaseService);
+
+        // Create a test calendar
+        _testCalendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = Guid.NewGuid(),
+            Name = "Test Calendar",
+            TimeZone = "UTC",
+            IsPrimary = true,
+            BackgroundColorHex = "#FF5733",
+            TextColorHex = "#FFFFFF"
+        };
+
+        await _calendarService.InsertAccountCalendarAsync(_testCalendar);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithNoEvents_ReturnsEmptyList()
+    {
+        // Arrange
+        var period = new TimeRange(DateTime.UtcNow.Date, DateTime.UtcNow.Date.AddDays(7));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithSingleNonRecurringEvent_ReturnsEvent()
+    {
+        // Arrange
+        var startDate = new DateTime(2025, 1, 15, 10, 0, 0, DateTimeKind.Utc);
+        var calendarItem = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Team Meeting",
+            Description = "Weekly sync",
+            StartDate = startDate,
+            DurationInSeconds = 3600, // 1 hour
+            CalendarId = _testCalendar.Id,
+            IsHidden = false
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(calendarItem, null);
+
+        var period = new TimeRange(
+            new DateTime(2025, 1, 15, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 16, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().HaveCount(1);
+        result[0].Title.Should().Be("Team Meeting");
+        result[0].StartDate.Should().Be(startDate);
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithNonRecurringEvent_OutsidePeriod_ReturnsEmpty()
+    {
+        // Arrange
+        var startDate = new DateTime(2025, 1, 15, 10, 0, 0, DateTimeKind.Utc);
+        var calendarItem = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Team Meeting",
+            StartDate = startDate,
+            DurationInSeconds = 3600,
+            CalendarId = _testCalendar.Id,
+            IsHidden = false
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(calendarItem, null);
+
+        // Query for a different week
+        var period = new TimeRange(
+            new DateTime(2025, 1, 22, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 29, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithHiddenEvent_ExcludesFromResults()
+    {
+        // Arrange
+        var startDate = new DateTime(2025, 1, 15, 10, 0, 0, DateTimeKind.Utc);
+        var hiddenEvent = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Hidden Event",
+            StartDate = startDate,
+            DurationInSeconds = 3600,
+            CalendarId = _testCalendar.Id,
+            IsHidden = true
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(hiddenEvent, null);
+
+        var period = new TimeRange(
+            new DateTime(2025, 1, 15, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 16, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().BeEmpty("because hidden events should be excluded");
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithAllDayEvent_ReturnsEvent()
+    {
+        // Arrange
+        var startDate = new DateTime(2025, 1, 15, 0, 0, 0, DateTimeKind.Utc); // Midnight
+        var allDayEvent = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Company Holiday",
+            StartDate = startDate,
+            DurationInSeconds = 86400, // 24 hours
+            CalendarId = _testCalendar.Id,
+            IsHidden = false
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(allDayEvent, null);
+
+        var period = new TimeRange(
+            new DateTime(2025, 1, 15, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 16, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().HaveCount(1);
+        result[0].Title.Should().Be("Company Holiday");
+        result[0].IsAllDayEvent.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithMultipleCalendars_ReturnsOnlyRequestedCalendarEvents()
+    {
+        // Arrange - Create another calendar
+        var secondCalendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = _testCalendar.AccountId,
+            Name = "Second Calendar",
+            TimeZone = "UTC",
+            IsPrimary = false,
+            BackgroundColorHex = "#00FF00",
+            TextColorHex = "#000000"
+        };
+
+        await _calendarService.InsertAccountCalendarAsync(secondCalendar);
+
+        // Add events to both calendars
+        var startDate = new DateTime(2025, 1, 15, 10, 0, 0, DateTimeKind.Utc);
+
+        var event1 = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Calendar 1 Event",
+            StartDate = startDate,
+            DurationInSeconds = 3600,
+            CalendarId = _testCalendar.Id,
+            IsHidden = false
+        };
+
+        var event2 = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Calendar 2 Event",
+            StartDate = startDate,
+            DurationInSeconds = 3600,
+            CalendarId = secondCalendar.Id,
+            IsHidden = false
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(event1, null);
+        await _calendarService.CreateNewCalendarItemAsync(event2, null);
+
+        var period = new TimeRange(
+            new DateTime(2025, 1, 15, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 16, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act - Query only the first calendar
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().HaveCount(1);
+        result[0].Title.Should().Be("Calendar 1 Event");
+        result[0].CalendarId.Should().Be(_testCalendar.Id);
+    }
+
+    [Fact]
+    public async Task GetCalendarEventsAsync_WithRecurringChildEvent_ReturnsChildAsRecurringChild()
+    {
+        // Arrange - Create a parent and child event
+        var parentId = Guid.NewGuid();
+        var parentEvent = new CalendarItem
+        {
+            Id = parentId,
+            Title = "Parent Recurring Event",
+            StartDate = new DateTime(2025, 1, 15, 10, 0, 0, DateTimeKind.Utc),
+            DurationInSeconds = 3600,
+            CalendarId = _testCalendar.Id,
+            IsHidden = false,
+            Recurrence = "RRULE:FREQ=DAILY"
+        };
+
+        var childEvent = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Occurrence Instance",
+            StartDate = new DateTime(2025, 1, 16, 10, 0, 0, DateTimeKind.Utc),
+            DurationInSeconds = 3600,
+            CalendarId = _testCalendar.Id,
+            RecurringCalendarItemId = parentId,
+            IsHidden = false
+        };
+
+        await _calendarService.CreateNewCalendarItemAsync(parentEvent, null);
+        await _calendarService.CreateNewCalendarItemAsync(childEvent, null);
+
+        var period = new TimeRange(
+            new DateTime(2025, 1, 16, 0, 0, 0, DateTimeKind.Utc),
+            new DateTime(2025, 1, 17, 0, 0, 0, DateTimeKind.Utc));
+
+        // Act
+        var result = await _calendarService.GetCalendarEventsAsync(_testCalendar, period);
+
+        // Assert
+        result.Should().HaveCount(1);
+        result[0].Title.Should().Be("Occurrence Instance");
+        result[0].IsRecurringChild.Should().BeTrue();
+        result[0].RecurringCalendarItemId.Should().Be(parentId);
+    }
+}
diff --git a/Wino.Core.Tests/Services/ContactServiceTests.cs b/Wino.Core.Tests/Services/ContactServiceTests.cs
new file mode 100644
index 00000000..4e3e10ef
--- /dev/null
+++ b/Wino.Core.Tests/Services/ContactServiceTests.cs
@@ -0,0 +1,115 @@
+using FluentAssertions;
+using MimeKit;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Tests.Helpers;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public class ContactServiceTests : IAsyncLifetime
+{
+    private InMemoryDatabaseService _databaseService = null!;
+    private ContactService _contactService = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+        _contactService = new ContactService(_databaseService);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task SaveAddressInformationAsync_WithNotificationReplyAddress_DoesNotPersistContact()
+    {
+        await _contactService.SaveAddressInformationAsync(
+        [
+            new AccountContact
+            {
+                Address = "reply+ABCD1234@reply.github.com",
+                Name = "[owner/repository] Issue #42"
+            }
+        ]);
+
+        var contact = await _databaseService.Connection
+            .Table<AccountContact>()
+            .Where(c => c.Address == "reply+ABCD1234@reply.github.com")
+            .FirstOrDefaultAsync();
+
+        contact.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task SaveAddressInformationAsync_WithHumanContact_PersistsContact()
+    {
+        await _contactService.SaveAddressInformationAsync(
+        [
+            new AccountContact
+            {
+                Address = "alice@example.com",
+                Name = "Alice Example"
+            }
+        ]);
+
+        var contact = await _databaseService.Connection
+            .Table<AccountContact>()
+            .Where(c => c.Address == "alice@example.com")
+            .FirstOrDefaultAsync();
+
+        contact.Should().NotBeNull();
+        contact!.Name.Should().Be("Alice Example");
+    }
+
+    [Fact]
+    public async Task SaveAddressInformationAsync_WithExistingNoisyContact_RemovesAutoCapturedEntry()
+    {
+        await _databaseService.Connection.InsertAsync(
+            new AccountContact
+            {
+                Address = "notifications@github.com",
+                Name = "GitHub Notifications"
+            },
+            typeof(AccountContact));
+
+        await _contactService.SaveAddressInformationAsync(
+        [
+            new AccountContact
+            {
+                Address = "notifications@github.com",
+                Name = "[owner/repository] Issue #99"
+            }
+        ]);
+
+        var contact = await _databaseService.Connection
+            .Table<AccountContact>()
+            .Where(c => c.Address == "notifications@github.com")
+            .FirstOrDefaultAsync();
+
+        contact.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task SaveAddressInformationAsync_WithNoisyMimeGroup_SkipsGroupAndNoisyMembers()
+    {
+        var message = new MimeMessage();
+        message.To.Add(new GroupAddress("[owner/repository] Issue #123", new InternetAddressList
+        {
+            new MailboxAddress("Alice Example", "alice@example.com"),
+            new MailboxAddress("[owner/repository] Issue #123", "notifications@github.com")
+        }));
+
+        await _contactService.SaveAddressInformationAsync(message);
+
+        var contacts = await _databaseService.Connection.Table<AccountContact>().ToListAsync();
+        var groups = await _databaseService.Connection.Table<ContactGroup>().ToListAsync();
+
+        contacts.Select(c => c.Address).Should().Contain("alice@example.com");
+        contacts.Select(c => c.Address).Should().NotContain("notifications@github.com");
+        groups.Should().BeEmpty();
+    }
+}
diff --git a/Wino.Core.Tests/Services/CreateCalendarEventRequestTests.cs b/Wino.Core.Tests/Services/CreateCalendarEventRequestTests.cs
new file mode 100644
index 00000000..514adbd0
--- /dev/null
+++ b/Wino.Core.Tests/Services/CreateCalendarEventRequestTests.cs
@@ -0,0 +1,127 @@
+using CommunityToolkit.Mvvm.Messaging;
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Helpers;
+using Wino.Core.Requests.Calendar;
+using Wino.Messaging.Client.Calendar;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public sealed class CreateCalendarEventRequestTests
+{
+    [Fact]
+    public void ApplyUiChanges_ForNonRecurringEvent_SendsOptimisticAddAndRevertDelete()
+    {
+        var composeResult = CreateComposeResult();
+        var assignedCalendar = CreateAssignedCalendar();
+        var request = new CreateCalendarEventRequest(composeResult, assignedCalendar);
+        var recipient = new CalendarRequestRecipient();
+
+        WeakReferenceMessenger.Default.RegisterAll(recipient);
+
+        try
+        {
+            request.LocalCalendarItemId.Should().NotBeNull();
+
+            request.ApplyUIChanges();
+            request.RevertUIChanges();
+
+            recipient.Added.Should().ContainSingle();
+            recipient.Deleted.Should().ContainSingle();
+            recipient.Added[0].Id.Should().Be(request.LocalCalendarItemId!.Value);
+            recipient.Deleted[0].Id.Should().Be(request.LocalCalendarItemId!.Value);
+        }
+        finally
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(recipient);
+        }
+    }
+
+    [Fact]
+    public void ApplyUiChanges_ForRecurringEvent_DoesNotSendOptimisticMessages()
+    {
+        var composeResult = CreateComposeResult();
+        composeResult.Recurrence = "RRULE:FREQ=DAILY;INTERVAL=1";
+        var request = new CreateCalendarEventRequest(composeResult, CreateAssignedCalendar());
+        var recipient = new CalendarRequestRecipient();
+
+        WeakReferenceMessenger.Default.RegisterAll(recipient);
+
+        try
+        {
+            request.LocalCalendarItemId.Should().BeNull();
+            request.Item.Should().BeNull();
+
+            request.ApplyUIChanges();
+            request.RevertUIChanges();
+
+            recipient.Added.Should().BeEmpty();
+            recipient.Deleted.Should().BeEmpty();
+            request.PreparedItem.Should().NotBeNull();
+        }
+        finally
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(recipient);
+        }
+    }
+
+    [Fact]
+    public void SynchronizationActionHelper_ForCreateRequest_ReturnsCalendarCreateAction()
+    {
+        var request = new CreateCalendarEventRequest(CreateComposeResult(), CreateAssignedCalendar());
+
+        var actionItems = SynchronizationActionHelper.CreateActionItems([request], Guid.NewGuid(), "Test");
+
+        actionItems.Should().ContainSingle();
+        actionItems[0].Description.Should().Be(Wino.Core.Domain.Translator.SyncAction_CreatingEvent);
+    }
+
+    private static CalendarEventComposeResult CreateComposeResult()
+    {
+        return new CalendarEventComposeResult
+        {
+            CalendarId = Guid.NewGuid(),
+            AccountId = Guid.NewGuid(),
+            Title = "Planning",
+            Location = "Room 4",
+            HtmlNotes = "<p>Notes</p>",
+            StartDate = new DateTime(2026, 3, 7, 10, 0, 0),
+            EndDate = new DateTime(2026, 3, 7, 11, 0, 0),
+            TimeZoneId = TimeZoneInfo.Local.Id,
+            ShowAs = CalendarItemShowAs.Busy
+        };
+    }
+
+    private static AccountCalendar CreateAssignedCalendar()
+    {
+        return new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = Guid.NewGuid(),
+            Name = "Primary",
+            DefaultShowAs = CalendarItemShowAs.Busy,
+            MailAccount = new MailAccount
+            {
+                Id = Guid.NewGuid(),
+                Address = "user@example.com",
+                SenderName = "User"
+            }
+        };
+    }
+
+    internal sealed class CalendarRequestRecipient :
+        IRecipient<CalendarItemAdded>,
+        IRecipient<CalendarItemDeleted>
+    {
+        public List<CalendarItem> Added { get; } = [];
+        public List<CalendarItem> Deleted { get; } = [];
+
+        public void Receive(CalendarItemAdded message) => Added.Add(message.CalendarItem);
+
+        public void Receive(CalendarItemDeleted message) => Deleted.Add(message.CalendarItem);
+    }
+}
diff --git a/Wino.Core.Tests/Services/MailFetchingTests.cs b/Wino.Core.Tests/Services/MailFetchingTests.cs
new file mode 100644
index 00000000..4b3f9f68
--- /dev/null
+++ b/Wino.Core.Tests/Services/MailFetchingTests.cs
@@ -0,0 +1,383 @@
+using System.Diagnostics;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Tests.Helpers;
+using Wino.Services;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Wino.Core.Tests.Services;
+
+/// <summary>
+/// Integration tests for MailService.FetchMailsAsync that verify the correctness of
+/// thread expansion and contact resolution, and track performance for large inboxes.
+///
+/// All tests run against a real in-memory SQLite file via the full service stack
+/// (MailService → FolderService / AccountService / ContactService) so that the
+/// batch-query path introduced in the performance optimisation is exercised end-to-end.
+/// </summary>
+public class MailFetchingTests : IAsyncLifetime
+{
+    // ── Infrastructure ─────────────────────────────────────────────────────────
+
+    private readonly ITestOutputHelper _output;
+    private InMemoryDatabaseService _databaseService = null!;
+    private MailService _mailService = null!;
+    private MailAccount _testAccount = null!;
+    private MailItemFolder _inboxFolder = null!;
+
+    public MailFetchingTests(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+
+        _testAccount = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Test Account",
+            Address = "me@test.local",
+            SenderName = "Test User",
+            ProviderType = MailProviderType.IMAP4
+        };
+
+        _inboxFolder = new MailItemFolder
+        {
+            Id = Guid.NewGuid(),
+            MailAccountId = _testAccount.Id,
+            FolderName = "Inbox",
+            SpecialFolderType = SpecialFolderType.Inbox,
+            IsSystemFolder = true,
+            IsSynchronizationEnabled = true
+        };
+
+        await _databaseService.Connection.InsertAsync(_testAccount, typeof(MailAccount));
+        await _databaseService.Connection.InsertAsync(_inboxFolder, typeof(MailItemFolder));
+
+        _mailService = BuildMailService(_databaseService);
+    }
+
+    public async Task DisposeAsync() => await _databaseService.DisposeAsync();
+
+    // ── Correctness: threading ON ──────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that thread siblings which fall outside the initial SQL page are
+    /// fetched by the expansion step, so every thread is always fully represented.
+    ///
+    /// Setup: 2 threads of 3 mails each (6 mails total), page size = 4.
+    /// The main query retrieves Thread A (3 mails, newest) and Thread B mail 1 (position 4).
+    /// Thread expansion must then fetch Thread B mails 2-3 that were beyond the page.
+    /// </summary>
+    [Fact]
+    public async Task FetchMailsAsync_WithThreadingEnabled_ExpandsSiblingsOutsidePage()
+    {
+        const int PageSize = 4;
+        var threadA = Guid.NewGuid().ToString();
+        var threadB = Guid.NewGuid().ToString();
+        var baseDate = DateTime.UtcNow;
+
+        var mails = new List<MailCopy>
+        {
+            // Thread A – all 3 land within the first page (positions 1–3)
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-1), threadId: threadA),
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-2), threadId: threadA),
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-3), threadId: threadA),
+            // Thread B – only position 4 lands in the page; 5 and 6 must be expanded
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-4), threadId: threadB),
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-5), threadId: threadB),
+            BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-6), threadId: threadB)
+        };
+        await _databaseService.Connection.InsertAllAsync(mails, typeof(MailCopy));
+
+        var options = BuildOptions([_inboxFolder], createThreads: true, take: PageSize);
+
+        // Act
+        var result = await _mailService.FetchMailsAsync(options);
+
+        // Assert – all 6 mails returned even though the page only held 4
+        result.Should().HaveCount(6,
+            "the 2 Thread B siblings outside the initial page must be fetched by expansion");
+        result.Should().OnlyContain(m => m.AssignedAccount != null && m.AssignedFolder != null,
+            "every returned mail must have its account and folder resolved");
+        result.Count(m => m.ThreadId == threadA).Should().Be(3, "Thread A must be complete");
+        result.Count(m => m.ThreadId == threadB).Should().Be(3, "Thread B must be complete");
+    }
+
+    // ── Correctness: threading OFF ─────────────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that when threading is disabled the result exactly matches the raw
+    /// SQL page — no sibling expansion occurs.
+    /// </summary>
+    [Fact]
+    public async Task FetchMailsAsync_WithThreadingDisabled_NeverExpandsSiblings()
+    {
+        const int PageSize = 4;
+        var threadId = Guid.NewGuid().ToString();
+        var baseDate = DateTime.UtcNow;
+
+        // 6 mails all sharing a ThreadId; with threading OFF only the first 4 come back
+        var mails = Enumerable.Range(0, 6)
+            .Select(i => BuildMail(_inboxFolder.Id, baseDate.AddSeconds(-i), threadId: threadId))
+            .ToList();
+
+        await _databaseService.Connection.InsertAllAsync(mails, typeof(MailCopy));
+
+        var options = BuildOptions([_inboxFolder], createThreads: false, take: PageSize);
+
+        // Act
+        var result = await _mailService.FetchMailsAsync(options);
+
+        // Assert – exactly the page size; no expansion happened
+        result.Should().HaveCount(PageSize,
+            "with threading disabled the result must match the raw page size");
+        result.Should().OnlyContain(m => m.AssignedAccount != null && m.AssignedFolder != null);
+    }
+
+    // ── Correctness: contact resolution ───────────────────────────────────────
+
+    /// <summary>
+    /// Verifies that sender contacts are resolved from three distinct paths:
+    /// the contact store (known sender), the unknown-sender fallback, and the
+    /// account-metadata shortcut used for self-sent mails.
+    /// </summary>
+    [Fact]
+    public async Task FetchMailsAsync_SenderContact_ResolvesFromAllThreeSources()
+    {
+        const string KnownAddress = "known@example.com";
+        const string UnknownAddress = "unknown@example.com";
+
+        await _databaseService.Connection.InsertAsync(
+            new AccountContact { Address = KnownAddress, Name = "Known Sender" },
+            typeof(AccountContact));
+
+        var mails = new List<MailCopy>
+        {
+            BuildMail(_inboxFolder.Id, DateTime.UtcNow,               fromAddress: KnownAddress),
+            BuildMail(_inboxFolder.Id, DateTime.UtcNow.AddSeconds(-1), fromAddress: UnknownAddress),
+            BuildMail(_inboxFolder.Id, DateTime.UtcNow.AddSeconds(-2), fromAddress: _testAccount.Address)
+        };
+        await _databaseService.Connection.InsertAllAsync(mails, typeof(MailCopy));
+
+        var options = BuildOptions([_inboxFolder], createThreads: false, take: 10);
+
+        // Act
+        var result = await _mailService.FetchMailsAsync(options);
+
+        result.Should().HaveCount(3);
+
+        // Known contact – resolved from AccountContact table
+        var knownResult = result.Single(m => m.FromAddress == KnownAddress);
+        knownResult.SenderContact!.Name.Should().Be("Known Sender");
+
+        // Unknown address – falls back to an ad-hoc contact built from From headers
+        var unknownResult = result.Single(m => m.FromAddress == UnknownAddress);
+        unknownResult.SenderContact!.Address.Should().Be(UnknownAddress);
+
+        // Self-sent mail – contact built from account metadata, not the contact store
+        var selfResult = result.Single(m => m.FromAddress == _testAccount.Address);
+        selfResult.SenderContact!.Name.Should().Be(_testAccount.SenderName,
+            "self-sent mail must use account metadata for the sender contact");
+    }
+
+    // ── Performance: 1 000 mails / ~70 threads ─────────────────────────────────
+
+    /// <summary>
+    /// Creates 1 000 mails: 70 threads of 7 mails each (490 mails) plus 510 standalone.
+    /// The mails are ordered newest-first in thread blocks so the default first-page
+    /// fetch (100 mails) naturally spans several complete threads and the tail of one
+    /// partial thread, letting us observe thread expansion.
+    ///
+    /// Two scenarios are measured and written to test output:
+    ///   1. First-page fetch (100 mails) plus automatic thread expansion.
+    ///   2. Full load of all 1 000 mails with threading enabled.
+    ///
+    /// A generous 5-second budget is asserted to catch catastrophic regressions
+    /// without being brittle on slow CI hardware.
+    /// </summary>
+    [Fact]
+    public async Task FetchMailsAsync_1000Mails_70Threads_CompletesWithinBudget()
+    {
+        // ── Arrange ────────────────────────────────────────────────────────────
+        const int ThreadCount = 70;
+        const int MailsPerThread = 7;
+        const int TotalMails = 1_000;
+        const int StandaloneMails = TotalMails - (ThreadCount * MailsPerThread); // 510
+
+        // 40 rotating sender addresses; the first 20 have entries in the contact store.
+        var senders = Enumerable.Range(0, 40)
+            .Select(i => $"sender{i:D2}@example.com")
+            .ToList();
+
+        var knownContacts = senders.Take(20)
+            .Select((addr, i) => new AccountContact { Address = addr, Name = $"Sender {i}" })
+            .ToList();
+        await _databaseService.Connection.InsertAllAsync(knownContacts, typeof(AccountContact));
+
+        // Threads occupy the newest date slots (positions 0–489) so the default 100-mail
+        // page always intersects several threads, triggering sibling expansion.
+        var mails = new List<MailCopy>(TotalMails);
+        var baseDate = DateTime.UtcNow;
+        int slot = 0;
+
+        for (int t = 0; t < ThreadCount; t++)
+        {
+            var threadId = Guid.NewGuid().ToString();
+            for (int m = 0; m < MailsPerThread; m++)
+            {
+                mails.Add(BuildMail(
+                    _inboxFolder.Id,
+                    baseDate.AddSeconds(-slot),
+                    threadId: threadId,
+                    fromAddress: senders[slot % senders.Count]));
+                slot++;
+            }
+        }
+
+        for (int i = 0; i < StandaloneMails; i++)
+        {
+            mails.Add(BuildMail(
+                _inboxFolder.Id,
+                baseDate.AddSeconds(-slot),
+                fromAddress: senders[slot % senders.Count]));
+            slot++;
+        }
+
+        await _databaseService.Connection.InsertAllAsync(mails, typeof(MailCopy));
+
+        _output.WriteLine($"Inserted {TotalMails} mails — " +
+                          $"{ThreadCount} threads × {MailsPerThread} mails + {StandaloneMails} standalone");
+        _output.WriteLine(string.Empty);
+
+        // ── Scenario 1: first page (default 100) + thread expansion ───────────
+        // The 100 newest mails span threads 0–13 completely (14 × 7 = 98 mails) plus
+        // the first 2 mails of thread 14.  Expansion must fetch thread 14's 5 siblings.
+        var optionsPage = BuildOptions([_inboxFolder], createThreads: true);
+        var sw = Stopwatch.StartNew();
+        var pageResult = await _mailService.FetchMailsAsync(optionsPage);
+        sw.Stop();
+        long pageMs = sw.ElapsedMilliseconds;
+
+        _output.WriteLine("[Scenario 1 – first page + thread expansion]");
+        _output.WriteLine($"  Mails returned : {pageResult.Count}  (expected > 100)");
+        _output.WriteLine($"  Elapsed        : {pageMs} ms");
+        _output.WriteLine(string.Empty);
+
+        pageResult.Should().OnlyContain(m => m.AssignedAccount != null && m.AssignedFolder != null);
+
+        // Thread expansion must have added thread 14's 5 siblings beyond the 100-mail page.
+        pageResult.Count.Should().BeGreaterThan(100,
+            "thread expansion must pull in siblings that were beyond the initial 100-mail page");
+
+        // ── Scenario 2: full load of all 1 000 mails with threading ───────────
+        var optionsAll = BuildOptions([_inboxFolder], createThreads: true, take: TotalMails);
+        sw.Restart();
+        var allResult = await _mailService.FetchMailsAsync(optionsAll);
+        sw.Stop();
+        long allMs = sw.ElapsedMilliseconds;
+
+        _output.WriteLine($"[Scenario 2 – full load ({TotalMails} mails, threading enabled)]");
+        _output.WriteLine($"  Mails returned : {allResult.Count}  (expected {TotalMails})");
+        _output.WriteLine($"  Elapsed        : {allMs} ms");
+
+        allResult.Should().HaveCount(TotalMails,
+            "every mail must be returned when Take equals the total count");
+        allResult.Should().OnlyContain(m => m.AssignedAccount != null && m.AssignedFolder != null);
+
+        // All 70 threads must be intact in the full result.
+        var threadGroups = allResult
+            .Where(m => !string.IsNullOrEmpty(m.ThreadId))
+            .GroupBy(m => m.ThreadId!)
+            .ToList();
+
+        threadGroups.Should().HaveCount(ThreadCount,
+            "all 70 threads must be represented in the full load");
+        threadGroups.Should().OnlyContain(g => g.Count() == MailsPerThread,
+            "every thread must contain exactly the expected number of mails");
+
+        allMs.Should().BeLessThan(5_000,
+            $"fetching {TotalMails} threaded mails via batched SQLite queries should complete well under 5 s");
+    }
+
+    // ── Helpers ────────────────────────────────────────────────────────────────
+
+    private static MailCopy BuildMail(
+        Guid folderId,
+        DateTime creationDate,
+        string? threadId = null,
+        string fromAddress = "external@example.com")
+    {
+        return new MailCopy
+        {
+            UniqueId = Guid.NewGuid(),
+            Id = Guid.NewGuid().ToString(),
+            FileId = Guid.NewGuid(),
+            FolderId = folderId,
+            Subject = $"Subject {Guid.NewGuid():N}",
+            PreviewText = "Preview text",
+            FromAddress = fromAddress,
+            FromName = fromAddress.Split('@')[0],
+            CreationDate = creationDate,
+            ThreadId = threadId,
+            IsRead = false
+        };
+    }
+
+    private static MailListInitializationOptions BuildOptions(
+        IEnumerable<MailItemFolder> folders,
+        bool createThreads = true,
+        int take = 0)
+    {
+        return new MailListInitializationOptions(
+            Folders: folders,
+            FilterType: FilterOptionType.All,
+            SortingOptionType: SortingOptionType.ReceiveDate,
+            CreateThreads: createThreads,
+            IsFocusedOnly: null,
+            SearchQuery: null,
+            Take: take);
+    }
+
+    /// <summary>
+    /// Builds a MailService wired to real FolderService, AccountService, and ContactService
+    /// all backed by the shared in-memory database, so the full SQL batch path is exercised.
+    /// </summary>
+    private static MailService BuildMailService(InMemoryDatabaseService db)
+    {
+        var signatureService = new Mock<ISignatureService>();
+        var authProvider = new Mock<IAuthenticationProvider>();
+        var mimeFileService = new Mock<IMimeFileService>();
+        var preferencesService = new Mock<IPreferencesService>();
+        var contactPictureFileService = new Mock<IContactPictureFileService>();
+
+        var accountService = new AccountService(
+            db,
+            signatureService.Object,
+            authProvider.Object,
+            mimeFileService.Object,
+            preferencesService.Object,
+            contactPictureFileService.Object);
+
+        var folderService = new FolderService(db, accountService);
+        var contactService = new ContactService(db);
+
+        return new MailService(
+            db,
+            folderService,
+            contactService,
+            accountService,
+            signatureService.Object,
+            mimeFileService.Object,
+            preferencesService.Object);
+    }
+}
diff --git a/Wino.Core.Tests/Services/MailRequestStateTests.cs b/Wino.Core.Tests/Services/MailRequestStateTests.cs
new file mode 100644
index 00000000..b06c4487
--- /dev/null
+++ b/Wino.Core.Tests/Services/MailRequestStateTests.cs
@@ -0,0 +1,85 @@
+using CommunityToolkit.Mvvm.Messaging;
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Requests.Mail;
+using Wino.Messaging.UI;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public sealed class MailRequestStateTests
+{
+    [Fact]
+    public void MarkReadRequest_RevertUiChanges_RestoresOriginalReadState()
+    {
+        var mailCopy = CreateMailCopy(isRead: false, isFlagged: false);
+        var request = new MarkReadRequest(mailCopy, IsRead: true);
+        var recipient = new MailRequestRecipient();
+
+        WeakReferenceMessenger.Default.RegisterAll(recipient);
+
+        try
+        {
+            request.IsNoOp.Should().BeFalse();
+
+            request.ApplyUIChanges();
+            request.RevertUIChanges();
+
+            mailCopy.IsRead.Should().BeFalse();
+            recipient.Updated.Should().HaveCount(2);
+            recipient.Updated[0].Source.Should().Be(MailUpdateSource.ClientUpdated);
+            recipient.Updated[1].Source.Should().Be(MailUpdateSource.ClientReverted);
+            recipient.Updated[1].UpdatedMail.IsRead.Should().BeFalse();
+        }
+        finally
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(recipient);
+        }
+    }
+
+    [Fact]
+    public void ChangeFlagRequest_RevertUiChanges_RestoresOriginalFlagState()
+    {
+        var mailCopy = CreateMailCopy(isRead: true, isFlagged: false);
+        var request = new ChangeFlagRequest(mailCopy, IsFlagged: true);
+        var recipient = new MailRequestRecipient();
+
+        WeakReferenceMessenger.Default.RegisterAll(recipient);
+
+        try
+        {
+            request.IsNoOp.Should().BeFalse();
+
+            request.ApplyUIChanges();
+            request.RevertUIChanges();
+
+            mailCopy.IsFlagged.Should().BeFalse();
+            recipient.Updated.Should().HaveCount(2);
+            recipient.Updated[0].Source.Should().Be(MailUpdateSource.ClientUpdated);
+            recipient.Updated[1].Source.Should().Be(MailUpdateSource.ClientReverted);
+            recipient.Updated[1].UpdatedMail.IsFlagged.Should().BeFalse();
+        }
+        finally
+        {
+            WeakReferenceMessenger.Default.UnregisterAll(recipient);
+        }
+    }
+
+    private static MailCopy CreateMailCopy(bool isRead, bool isFlagged) =>
+        new()
+        {
+            UniqueId = Guid.NewGuid(),
+            Id = Guid.NewGuid().ToString(),
+            FolderId = Guid.NewGuid(),
+            IsRead = isRead,
+            IsFlagged = isFlagged
+        };
+
+    internal sealed class MailRequestRecipient : IRecipient<MailUpdatedMessage>
+    {
+        public List<MailUpdatedMessage> Updated { get; } = [];
+
+        public void Receive(MailUpdatedMessage message) => Updated.Add(message);
+    }
+}
diff --git a/Wino.Core.Tests/Services/WinoAccountDataSyncServiceTests.cs b/Wino.Core.Tests/Services/WinoAccountDataSyncServiceTests.cs
new file mode 100644
index 00000000..770171e3
--- /dev/null
+++ b/Wino.Core.Tests/Services/WinoAccountDataSyncServiceTests.cs
@@ -0,0 +1,268 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Tests.Helpers;
+using Wino.Mail.Api.Contracts.Users;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public sealed class WinoAccountDataSyncServiceTests : IAsyncLifetime
+{
+    private InMemoryDatabaseService _databaseService = null!;
+    private Mock<IWinoAccountProfileService> _profileService = null!;
+    private Mock<IPreferencesService> _preferencesService = null!;
+    private AccountService _accountService = null!;
+    private WinoAccountDataSyncService _service = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+
+        _profileService = new Mock<IWinoAccountProfileService>(MockBehavior.Strict);
+        _preferencesService = new Mock<IPreferencesService>();
+        _preferencesService.SetupProperty(a => a.StartupEntityId);
+
+        _accountService = CreateAccountService(_databaseService, _preferencesService.Object);
+        _service = new WinoAccountDataSyncService(_profileService.Object, _preferencesService.Object, _accountService);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task ExportAsync_ImapMailbox_MapsSanitizedPayload()
+    {
+        var accountId = Guid.NewGuid();
+
+        await _accountService.CreateAccountAsync(
+            new MailAccount
+            {
+                Id = accountId,
+                Name = "Custom IMAP",
+                SenderName = "Custom IMAP Sender",
+                Address = "imap@example.com",
+                ProviderType = MailProviderType.IMAP4,
+                SpecialImapProvider = SpecialImapProvider.iCloud,
+                AccountColorHex = "#123456",
+                IsCalendarAccessGranted = true,
+                SynchronizationDeltaIdentifier = "delta-token",
+                CalendarSynchronizationDeltaIdentifier = "calendar-delta",
+                Base64ProfilePictureData = "profile"
+            },
+            new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                AccountId = accountId,
+                Address = "imap@example.com",
+                IncomingServer = "imap.example.com",
+                IncomingServerPort = "993",
+                IncomingServerUsername = "imap-user",
+                IncomingServerPassword = "secret-incoming",
+                IncomingServerSocketOption = ImapConnectionSecurity.Auto,
+                IncomingAuthenticationMethod = ImapAuthenticationMethod.NormalPassword,
+                OutgoingServer = "smtp.example.com",
+                OutgoingServerPort = "465",
+                OutgoingServerUsername = "smtp-user",
+                OutgoingServerPassword = "secret-outgoing",
+                OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
+                OutgoingAuthenticationMethod = ImapAuthenticationMethod.NormalPassword,
+                CalendarSupportMode = ImapCalendarSupportMode.CalDav,
+                CalDavServiceUrl = "https://dav.example.com",
+                CalDavUsername = "dav-user",
+                CalDavPassword = "secret-caldav",
+                ProxyServer = "proxy.example.com",
+                ProxyServerPort = "8080",
+                MaxConcurrentClients = 7
+            });
+
+        ReplaceUserMailboxesRequestDto? capturedRequest = null;
+        _profileService
+            .Setup(a => a.ReplaceMailboxesAsync(It.IsAny<ReplaceUserMailboxesRequestDto>(), It.IsAny<CancellationToken>()))
+            .Callback<ReplaceUserMailboxesRequestDto, CancellationToken>((request, _) => capturedRequest = request)
+            .Returns(Task.CompletedTask);
+
+        var result = await _service.ExportAsync(new WinoAccountSyncSelection(IncludePreferences: false, IncludeAccounts: true));
+
+        result.ExportedMailboxCount.Should().Be(1);
+        capturedRequest.Should().NotBeNull();
+        capturedRequest!.Mailboxes.Should().ContainSingle();
+
+        var exportedMailbox = capturedRequest.Mailboxes[0];
+        exportedMailbox.Address.Should().Be("imap@example.com");
+        exportedMailbox.ProviderType.Should().Be((int)MailProviderType.IMAP4);
+        exportedMailbox.SpecialImapProvider.Should().Be((int)SpecialImapProvider.iCloud);
+        exportedMailbox.AccountName.Should().Be("Custom IMAP");
+        exportedMailbox.SenderName.Should().Be("Custom IMAP Sender");
+        exportedMailbox.AccountColorHex.Should().Be("#123456");
+        exportedMailbox.IsCalendarAccessGranted.Should().BeTrue();
+        exportedMailbox.IncomingServer.Should().Be("imap.example.com");
+        exportedMailbox.IncomingServerUsername.Should().Be("imap-user");
+        exportedMailbox.OutgoingServer.Should().Be("smtp.example.com");
+        exportedMailbox.OutgoingServerUsername.Should().Be("smtp-user");
+        exportedMailbox.CalDavServiceUrl.Should().Be("https://dav.example.com");
+        exportedMailbox.CalDavUsername.Should().Be("dav-user");
+        exportedMailbox.ProxyServer.Should().Be("proxy.example.com");
+        exportedMailbox.ProxyServerPort.Should().Be("8080");
+        exportedMailbox.MaxConcurrentClients.Should().Be(7);
+
+        _profileService.Verify(a => a.SaveSettingsAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task ExportAsync_GmailMailbox_DoesNotIncludeCustomServerSettings()
+    {
+        await _accountService.CreateAccountAsync(
+            new MailAccount
+            {
+                Id = Guid.NewGuid(),
+                Name = "Gmail",
+                SenderName = "Gmail Sender",
+                Address = "gmail@example.com",
+                ProviderType = MailProviderType.Gmail
+            },
+            null!);
+
+        ReplaceUserMailboxesRequestDto? capturedRequest = null;
+        _profileService
+            .Setup(a => a.ReplaceMailboxesAsync(It.IsAny<ReplaceUserMailboxesRequestDto>(), It.IsAny<CancellationToken>()))
+            .Callback<ReplaceUserMailboxesRequestDto, CancellationToken>((request, _) => capturedRequest = request)
+            .Returns(Task.CompletedTask);
+
+        await _service.ExportAsync(new WinoAccountSyncSelection(IncludePreferences: false, IncludeAccounts: true));
+
+        var exportedMailbox = capturedRequest!.Mailboxes.Single();
+        exportedMailbox.IncomingServer.Should().BeNull();
+        exportedMailbox.OutgoingServer.Should().BeNull();
+        exportedMailbox.CalDavServiceUrl.Should().BeNull();
+        exportedMailbox.MaxConcurrentClients.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task ImportAsync_SkipsDuplicateMailbox_ByAddressAndProviderCaseInsensitive()
+    {
+        await _accountService.CreateAccountAsync(
+            new MailAccount
+            {
+                Id = Guid.NewGuid(),
+                Name = "Existing Gmail",
+                SenderName = "Existing Gmail",
+                Address = "User@Example.com",
+                ProviderType = MailProviderType.Gmail
+            },
+            null!);
+
+        _profileService
+            .Setup(a => a.GetMailboxesAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new UserMailboxSyncListDto(
+            [
+                new UserMailboxSyncItemDto
+                {
+                    Address = "user@example.com",
+                    ProviderType = (int)MailProviderType.Gmail,
+                    AccountName = "Duplicate Gmail"
+                },
+                new UserMailboxSyncItemDto
+                {
+                    Address = "second@example.com",
+                    ProviderType = (int)MailProviderType.Outlook,
+                    AccountName = "New Outlook"
+                }
+            ]));
+
+        var result = await _service.ImportAsync(new WinoAccountSyncSelection(IncludePreferences: false, IncludeAccounts: true));
+
+        result.ImportedMailboxCount.Should().Be(1);
+        result.SkippedDuplicateMailboxCount.Should().Be(1);
+
+        var accounts = await _accountService.GetAccountsAsync();
+        accounts.Should().HaveCount(2);
+        accounts.Should().Contain(a => a.Address == "second@example.com" && a.ProviderType == MailProviderType.Outlook);
+    }
+
+    [Fact]
+    public async Task ImportAsync_ImapMailbox_CreatesRootAliasAndInvalidCredentialsAttentionWithoutPasswords()
+    {
+        _profileService
+            .Setup(a => a.GetMailboxesAsync(It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new UserMailboxSyncListDto(
+            [
+                new UserMailboxSyncItemDto
+                {
+                    Address = "imap@example.com",
+                    ProviderType = (int)MailProviderType.IMAP4,
+                    SpecialImapProvider = (int)SpecialImapProvider.Yahoo,
+                    AccountName = "Imported IMAP",
+                    SenderName = "Imported Sender",
+                    CalendarSupportMode = (int)ImapCalendarSupportMode.CalDav,
+                    IncomingServer = "imap.example.com",
+                    IncomingServerPort = "993",
+                    IncomingServerUsername = "imap-user",
+                    IncomingServerSocketOption = (int)ImapConnectionSecurity.Auto,
+                    IncomingAuthenticationMethod = (int)ImapAuthenticationMethod.NormalPassword,
+                    OutgoingServer = "smtp.example.com",
+                    OutgoingServerPort = "465",
+                    OutgoingServerUsername = "smtp-user",
+                    OutgoingServerSocketOption = (int)ImapConnectionSecurity.Auto,
+                    OutgoingAuthenticationMethod = (int)ImapAuthenticationMethod.NormalPassword,
+                    CalDavServiceUrl = "https://dav.example.com",
+                    CalDavUsername = "dav-user",
+                    MaxConcurrentClients = 9
+                }
+            ]));
+
+        var result = await _service.ImportAsync(new WinoAccountSyncSelection(IncludePreferences: false, IncludeAccounts: true));
+
+        result.ImportedMailboxCount.Should().Be(1);
+
+        var importedAccount = (await _accountService.GetAccountsAsync()).Single();
+        importedAccount.AttentionReason.Should().Be(AccountAttentionReason.InvalidCredentials);
+        importedAccount.SynchronizationDeltaIdentifier.Should().BeEmpty();
+        importedAccount.CalendarSynchronizationDeltaIdentifier.Should().BeEmpty();
+
+        var importedAliases = await _accountService.GetAccountAliasesAsync(importedAccount.Id);
+        importedAliases.Should().ContainSingle(a => a.IsRootAlias && a.IsPrimary && a.AliasAddress == "imap@example.com");
+
+        var serverInformation = await _accountService.GetAccountCustomServerInformationAsync(importedAccount.Id);
+        serverInformation.Should().NotBeNull();
+        serverInformation.IncomingServerPassword.Should().BeEmpty();
+        serverInformation.OutgoingServerPassword.Should().BeEmpty();
+        serverInformation.CalDavPassword.Should().BeEmpty();
+        serverInformation.MaxConcurrentClients.Should().Be(9);
+        serverInformation.CalDavServiceUrl.Should().Be("https://dav.example.com");
+    }
+
+    private static AccountService CreateAccountService(InMemoryDatabaseService databaseService, IPreferencesService preferencesService)
+    {
+        var signatureService = new Mock<ISignatureService>();
+        signatureService
+            .Setup(a => a.CreateDefaultSignatureAsync(It.IsAny<Guid>()))
+            .ReturnsAsync((Guid accountId) => new AccountSignature
+            {
+                Id = Guid.NewGuid(),
+                MailAccountId = accountId,
+                Name = "Default",
+                HtmlBody = string.Empty
+            });
+
+        return new AccountService(
+            databaseService,
+            signatureService.Object,
+            Mock.Of<IAuthenticationProvider>(),
+            Mock.Of<IMimeFileService>(),
+            preferencesService,
+            Mock.Of<IContactPictureFileService>());
+    }
+}
diff --git a/Wino.Core.Tests/Services/WinoAccountProfileServiceTests.cs b/Wino.Core.Tests/Services/WinoAccountProfileServiceTests.cs
new file mode 100644
index 00000000..d4531cfe
--- /dev/null
+++ b/Wino.Core.Tests/Services/WinoAccountProfileServiceTests.cs
@@ -0,0 +1,264 @@
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Services;
+using Wino.Core.Tests.Helpers;
+using Xunit;
+
+namespace Wino.Core.Tests.Services;
+
+public class WinoAccountProfileServiceTests : IAsyncLifetime
+{
+    private readonly Mock<IWinoAccountApiClient> _apiClient = new();
+    private readonly Mock<IStoreManagementService> _storeManagementService = new();
+    private InMemoryDatabaseService _databaseService = null!;
+    private WinoAccountProfileService _service = null!;
+
+    public async Task InitializeAsync()
+    {
+        _databaseService = new InMemoryDatabaseService();
+        await _databaseService.InitializeAsync();
+        _service = new WinoAccountProfileService(_databaseService, _apiClient.Object, _storeManagementService.Object);
+    }
+
+    public async Task DisposeAsync()
+    {
+        await _databaseService.DisposeAsync();
+    }
+
+    [Fact]
+    public async Task LoginAsync_ShouldPersistSingleActiveAccount()
+    {
+        var authResult = CreateAuthResult("first@example.com");
+
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        var result = await _service.LoginAsync("first@example.com", "pw");
+
+        result.IsSuccess.Should().BeTrue();
+        result.Account.Should().NotBeNull();
+
+        var persisted = await _databaseService.Connection.Table<WinoAccount>().ToListAsync();
+        persisted.Should().ContainSingle();
+        persisted[0].Email.Should().Be("first@example.com");
+        persisted[0].AccessToken.Should().Be(authResult.AccessToken);
+        persisted[0].RefreshToken.Should().Be(authResult.RefreshToken);
+    }
+
+    [Fact]
+    public async Task LoginAsync_ShouldReplaceExistingActiveAccount()
+    {
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(CreateAuthResult("first@example.com")));
+
+        _apiClient
+            .Setup(x => x.LoginAsync("second@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(CreateAuthResult("second@example.com")));
+
+        await _service.LoginAsync("first@example.com", "pw");
+        await _service.LoginAsync("second@example.com", "pw");
+
+        var persisted = await _databaseService.Connection.Table<WinoAccount>().ToListAsync();
+        persisted.Should().ContainSingle();
+        persisted[0].Email.Should().Be("second@example.com");
+    }
+
+    [Fact]
+    public async Task SignOutAsync_ShouldDeletePersistedAccount()
+    {
+        var authResult = CreateAuthResult("signout@example.com");
+
+        _apiClient
+            .Setup(x => x.LoginAsync("signout@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        _apiClient
+            .Setup(x => x.LogoutAsync(authResult.RefreshToken, default))
+            .ReturnsAsync(ApiEnvelope<System.Text.Json.JsonElement>.Success(default));
+
+        await _service.LoginAsync("signout@example.com", "pw");
+        await _service.SignOutAsync();
+
+        var persisted = await _databaseService.Connection.Table<WinoAccount>().ToListAsync();
+        persisted.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task LoginAsync_ShouldPreserveEnvelopeErrorMessage()
+    {
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Failure(ApiErrorCodes.InvalidCredentials, "Password does not match this account."));
+
+        var result = await _service.LoginAsync("first@example.com", "pw");
+
+        result.IsSuccess.Should().BeFalse();
+        result.ErrorCode.Should().Be(ApiErrorCodes.InvalidCredentials);
+        result.ErrorMessage.Should().Be("Password does not match this account.");
+    }
+
+    [Fact]
+    public async Task LoginAsync_ShouldPreserveErrorDetails()
+    {
+        var details = JsonSerializer.SerializeToElement(new EmailConfirmationRequiredDetailsDto(
+            "/api/v1/auth/confirm-email/resend",
+            "ticket",
+            DateTimeOffset.UtcNow.AddMinutes(-2),
+            DateTimeOffset.UtcNow.AddMinutes(8)));
+
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Failure(ApiErrorCodes.EmailNotConfirmed, null, details));
+
+        var result = await _service.LoginAsync("first@example.com", "pw");
+
+        result.IsSuccess.Should().BeFalse();
+        result.ErrorDetails.Should().NotBeNull();
+        JsonSerializer.Deserialize<EmailConfirmationRequiredDetailsDto>(result.ErrorDetails!.Value.GetRawText())!
+            .ResendConfirmationTicket.Should().Be("ticket");
+    }
+
+    [Fact]
+    public async Task RegisterAsync_ShouldNotPersistAccountUntilEmailIsConfirmed()
+    {
+        var authResult = CreateAuthResult("register@example.com");
+
+        _apiClient
+            .Setup(x => x.RegisterAsync("register@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        var result = await _service.RegisterAsync("register@example.com", "pw");
+
+        result.IsSuccess.Should().BeTrue();
+        result.Account.Should().NotBeNull();
+
+        var persisted = await _databaseService.Connection.Table<WinoAccount>().ToListAsync();
+        persisted.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task ForgotPasswordAsync_ShouldForwardApiResponse()
+    {
+        _apiClient
+            .Setup(x => x.ForgotPasswordAsync("reset@example.com", default))
+            .ReturnsAsync(ApiEnvelope<JsonElement>.Success(default));
+
+        var result = await _service.ForgotPasswordAsync("reset@example.com");
+
+        result.IsSuccess.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task RefreshProfileAsync_ShouldPersistLatestProfileData()
+    {
+        var authResult = CreateAuthResult("first@example.com");
+
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        _apiClient
+            .Setup(x => x.GetCurrentUserAsync(default))
+            .ReturnsAsync(ApiEnvelope<AuthUserDto>.Success(new AuthUserDto(
+                authResult.User.UserId,
+                "updated@example.com",
+                "Premium",
+                authResult.User.HasPassword,
+                authResult.User.HasGoogleLogin,
+                authResult.User.HasFacebookLogin)));
+
+        await _service.LoginAsync("first@example.com", "pw");
+
+        var result = await _service.RefreshProfileAsync();
+
+        result.IsSuccess.Should().BeTrue();
+        result.Account.Should().NotBeNull();
+        result.Account!.Email.Should().Be("updated@example.com");
+        result.Account.AccountStatus.Should().Be("Premium");
+
+        var persisted = await _databaseService.Connection.Table<WinoAccount>().FirstOrDefaultAsync();
+        persisted.Should().NotBeNull();
+        persisted!.Email.Should().Be("updated@example.com");
+        persisted.AccountStatus.Should().Be("Premium");
+        persisted.AccessToken.Should().Be(authResult.AccessToken);
+        persisted.RefreshToken.Should().Be(authResult.RefreshToken);
+    }
+
+    [Fact]
+    public async Task ProcessBillingCallbackAsync_ShouldConfirmPurchasedAddOn()
+    {
+        var authResult = CreateAuthResult("first@example.com");
+        var callbackUri = new Uri("wino://billing/success?productCode=UNLIMITED_ACCOUNTS");
+
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        _apiClient
+            .Setup(x => x.GetCurrentUserAsync(default))
+            .ReturnsAsync(ApiEnvelope<AuthUserDto>.Success(authResult.User));
+
+        _storeManagementService
+            .Setup(x => x.HasProductAsync(WinoAddOnProductType.UNLIMITED_ACCOUNTS))
+            .ReturnsAsync(true);
+
+        await _service.LoginAsync("first@example.com", "pw");
+
+        var processed = await _service.ProcessBillingCallbackAsync(callbackUri);
+
+        processed.Should().BeTrue();
+        _apiClient.Verify(x => x.GetCurrentUserAsync(default), Times.AtLeastOnce);
+    }
+
+    [Fact]
+    public async Task SummarizeAsync_ShouldReturnQuotaBackedResponse()
+    {
+        var authResult = CreateAuthResult("first@example.com");
+
+        _apiClient
+            .Setup(x => x.LoginAsync("first@example.com", "pw", default))
+            .ReturnsAsync(WinoAccountApiResult<AuthResultDto>.Success(authResult));
+
+        _apiClient
+            .Setup(x => x.SummarizeAsync("<p>Hello</p>", "en", default))
+            .ReturnsAsync(ApiEnvelope<AiTextResultDto>.Success(
+                new AiTextResultDto("<p>Summary</p>"),
+                new QuotaInfoDto(
+                    "Active",
+                    DateTimeOffset.UtcNow.AddDays(-1),
+                    DateTimeOffset.UtcNow.AddDays(29),
+                    1000,
+                    4,
+                    996,
+                    new AiPackProductInfoDto("AI_PACK", 1000, 4.99m, "USD", "month"))));
+
+        await _service.LoginAsync("first@example.com", "pw");
+
+        var response = await _service.SummarizeAsync("<p>Hello</p>", "en");
+
+        response.IsSuccess.Should().BeTrue();
+        response.Result?.Html.Should().Be("<p>Summary</p>");
+    }
+
+    private static AuthResultDto CreateAuthResult(string email)
+    {
+        return new AuthResultDto(
+            new AuthUserDto(Guid.NewGuid(), email, "Active", true, false, false),
+            "access-token",
+            DateTimeOffset.UtcNow.AddMinutes(30),
+            "refresh-token",
+            DateTimeOffset.UtcNow.AddDays(30));
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/CalDavEventTimeMappingTests.cs b/Wino.Core.Tests/Synchronizers/CalDavEventTimeMappingTests.cs
new file mode 100644
index 00000000..de07df39
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/CalDavEventTimeMappingTests.cs
@@ -0,0 +1,111 @@
+using System.Reflection;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Integration.Processors;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public class CalDavEventTimeMappingTests
+{
+    [Fact]
+    public void ParseCalendarData_UtcEvent_AssignsUtcTimeZone()
+    {
+        const string ics = """
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:-//Wino Mail//Tests//EN
+            CALSCALE:GREGORIAN
+            BEGIN:VEVENT
+            UID:utc-event
+            DTSTAMP:20260201T000000Z
+            DTSTART:20260219T010000Z
+            DTEND:20260219T020000Z
+            SUMMARY:UTC Event
+            END:VEVENT
+            END:VCALENDAR
+            """;
+
+        var events = ParseEvents(ics);
+
+        events.Should().ContainSingle();
+        events[0].StartTimeZone.Should().Be(TimeZoneInfo.Utc.Id);
+        events[0].EndTimeZone.Should().Be(TimeZoneInfo.Utc.Id);
+    }
+
+    [Fact]
+    public async Task ManageCalendarEventAsync_PersistsWallClockTimeForSourceTimeZone()
+    {
+        var calendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            Name = "Calendar"
+        };
+
+        var remoteEvent = new CalDavCalendarEvent
+        {
+            RemoteEventId = "event-1",
+            Title = "Wall Clock Event",
+            Start = new DateTimeOffset(2026, 2, 19, 1, 0, 0, TimeSpan.FromHours(1)),
+            End = new DateTimeOffset(2026, 2, 19, 2, 0, 0, TimeSpan.FromHours(1)),
+            StartTimeZone = "Europe/Berlin",
+            EndTimeZone = "Europe/Berlin"
+        };
+
+        CalendarItem? capturedItem = null;
+        var calendarService = new Mock<ICalendarService>();
+        calendarService
+            .Setup(x => x.GetCalendarItemAsync(calendar.Id, remoteEvent.RemoteEventId))
+            .ReturnsAsync((CalendarItem?)null);
+        calendarService
+            .Setup(x => x.CreateNewCalendarItemAsync(It.IsAny<CalendarItem>(), It.IsAny<List<CalendarEventAttendee>>()))
+            .Callback<CalendarItem, List<CalendarEventAttendee>>((item, _) => capturedItem = item)
+            .Returns(Task.CompletedTask);
+        calendarService
+            .Setup(x => x.SaveRemindersAsync(It.IsAny<Guid>(), It.IsAny<List<Reminder>>()))
+            .Returns(Task.CompletedTask);
+
+        var sut = new ImapChangeProcessor(
+            Mock.Of<IDatabaseService>(),
+            Mock.Of<IFolderService>(),
+            Mock.Of<IMailService>(),
+            Mock.Of<IAccountService>(),
+            calendarService.Object,
+            Mock.Of<IMimeFileService>(),
+            Mock.Of<ICalendarIcsFileService>());
+
+        await sut.ManageCalendarEventAsync(remoteEvent, calendar, organizerAccount: null);
+
+        capturedItem.Should().NotBeNull();
+        var savedItem = capturedItem!;
+        savedItem.StartDate.Should().Be(new DateTime(2026, 2, 19, 1, 0, 0));
+        savedItem.DurationInSeconds.Should().Be(3600);
+        savedItem.StartTimeZone.Should().Be("Europe/Berlin");
+        savedItem.EndTimeZone.Should().Be("Europe/Berlin");
+    }
+
+    private static List<CalDavCalendarEvent> ParseEvents(string icsContent)
+    {
+        var parseMethod = typeof(CalDavClient).GetMethod(
+            "ParseCalendarData",
+            BindingFlags.NonPublic | BindingFlags.Static);
+
+        parseMethod.Should().NotBeNull();
+
+        var result = parseMethod!.Invoke(
+            null,
+            [
+                icsContent,
+                "https://calendar.example.com/event.ics",
+                "\"etag\"",
+                new DateTimeOffset(2026, 1, 1, 0, 0, 0, TimeSpan.Zero),
+                new DateTimeOffset(2026, 12, 31, 23, 59, 59, TimeSpan.Zero)
+            ]);
+
+        return result.Should().BeOfType<List<CalDavCalendarEvent>>().Subject;
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/CalDavServiceLiveTests.cs b/Wino.Core.Tests/Synchronizers/CalDavServiceLiveTests.cs
new file mode 100644
index 00000000..4d869f93
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/CalDavServiceLiveTests.cs
@@ -0,0 +1,238 @@
+using System.Net.Http.Headers;
+using System.Security;
+using System.Text;
+using System.Xml.Linq;
+using FluentAssertions;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Services;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class CalDavServiceLiveTests
+{
+    private const string ManualSkipMessage = "Manual live CalDAV test. Fill ServiceUri/Username/Password placeholders and remove Skip to run.";
+
+    // Replace placeholders with your own credentials when running these live tests.
+    private const string ServiceUri = "https://caldav.icloud.com/";
+    private const string Username = "REPLACE_WITH_USERNAME";
+    private const string Password = "REPLACE_WITH_PASSWORD";
+
+    private static readonly DateTimeOffset SyncWindowStartUtc = new(2026, 01, 01, 0, 0, 0, TimeSpan.Zero);
+    private static readonly DateTimeOffset SyncWindowEndUtc = new(2026, 12, 31, 23, 59, 59, TimeSpan.Zero);
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task InitialSync_ReturnsCalendarEvents()
+    {
+        var client = new CalDavClient();
+        var settings = BuildConnectionSettings();
+
+        var calendars = await client.DiscoverCalendarsAsync(settings);
+        calendars.Should().NotBeEmpty();
+
+        var calendar = calendars.First();
+        var events = await client.GetCalendarEventsAsync(settings, calendar, SyncWindowStartUtc, SyncWindowEndUtc);
+
+        events.Should().NotBeNull();
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task AddThenRemoveEvent_ChangesServerState()
+    {
+        var client = new CalDavClient();
+        var settings = BuildConnectionSettings();
+        var calendar = await GetTargetCalendarAsync(client, settings);
+
+        var eventId = $"wino-live-add-delete-{Guid.NewGuid():N}";
+        var resourceUri = BuildEventResourceUri(calendar, eventId);
+
+        await PutEventAsync(settings, resourceUri, BuildIcs(eventId, "Wino Live Add/Delete", new DateTimeOffset(2026, 04, 01, 10, 0, 0, TimeSpan.Zero), new DateTimeOffset(2026, 04, 01, 11, 0, 0, TimeSpan.Zero)));
+
+        var afterAdd = await client.GetCalendarEventsAsync(settings, calendar, SyncWindowStartUtc, SyncWindowEndUtc);
+        afterAdd.Should().Contain(e => e.Uid == eventId);
+
+        await DeleteEventAsync(settings, resourceUri);
+
+        var afterDelete = await client.GetCalendarEventsAsync(settings, calendar, SyncWindowStartUtc, SyncWindowEndUtc);
+        afterDelete.Should().NotContain(e => e.Uid == eventId);
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task UpdateExistingEvent_ChangesStartAndEndDates()
+    {
+        var client = new CalDavClient();
+        var settings = BuildConnectionSettings();
+        var calendar = await GetTargetCalendarAsync(client, settings);
+
+        var eventId = $"wino-live-update-{Guid.NewGuid():N}";
+        var resourceUri = BuildEventResourceUri(calendar, eventId);
+
+        var initialStart = new DateTimeOffset(2026, 05, 01, 8, 0, 0, TimeSpan.Zero);
+        var initialEnd = new DateTimeOffset(2026, 05, 01, 9, 0, 0, TimeSpan.Zero);
+
+        await PutEventAsync(settings, resourceUri, BuildIcs(eventId, "Wino Live Update", initialStart, initialEnd));
+
+        var updatedStart = new DateTimeOffset(2026, 05, 02, 14, 30, 0, TimeSpan.Zero);
+        var updatedEnd = new DateTimeOffset(2026, 05, 02, 16, 0, 0, TimeSpan.Zero);
+
+        await PutEventAsync(settings, resourceUri, BuildIcs(eventId, "Wino Live Update", updatedStart, updatedEnd));
+
+        var events = await client.GetCalendarEventsAsync(settings, calendar, SyncWindowStartUtc, SyncWindowEndUtc);
+        var updatedEvent = events.First(e => e.Uid == eventId);
+
+        updatedEvent.Start.Should().Be(updatedStart);
+        updatedEvent.End.Should().Be(updatedEnd);
+
+        await DeleteEventAsync(settings, resourceUri);
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task DeltaSync_AfterAdd_ReturnsChangedResource()
+    {
+        var client = new CalDavClient();
+        var settings = BuildConnectionSettings();
+        var calendar = await GetTargetCalendarAsync(client, settings);
+
+        var initialSyncToken = await GetCalendarSyncTokenAsync(settings, new Uri(calendar.RemoteCalendarId));
+        initialSyncToken.Should().NotBeNullOrWhiteSpace();
+
+        var eventId = $"wino-live-delta-{Guid.NewGuid():N}";
+        var resourceUri = BuildEventResourceUri(calendar, eventId);
+
+        await PutEventAsync(settings, resourceUri, BuildIcs(eventId, "Wino Live Delta", new DateTimeOffset(2026, 06, 01, 12, 0, 0, TimeSpan.Zero), new DateTimeOffset(2026, 06, 01, 13, 0, 0, TimeSpan.Zero)));
+
+        var deltaResponse = await ReportSyncCollectionAsync(settings, new Uri(calendar.RemoteCalendarId), initialSyncToken);
+        var changedHrefs = ExtractChangedHrefs(deltaResponse);
+
+        changedHrefs.Should().Contain(h => h.Contains($"{eventId}.ics", StringComparison.OrdinalIgnoreCase));
+
+        await DeleteEventAsync(settings, resourceUri);
+    }
+
+    private static CalDavConnectionSettings BuildConnectionSettings()
+        => new()
+        {
+            ServiceUri = new Uri(ServiceUri),
+            Username = Username,
+            Password = Password
+        };
+
+    private static async Task<CalDavCalendar> GetTargetCalendarAsync(CalDavClient client, CalDavConnectionSettings settings)
+    {
+        var calendars = await client.DiscoverCalendarsAsync(settings);
+        calendars.Should().NotBeEmpty();
+        return calendars.First();
+    }
+
+    private static Uri BuildEventResourceUri(CalDavCalendar calendar, string eventId)
+        => new($"{calendar.RemoteCalendarId.TrimEnd('/')}/{eventId}.ics");
+
+    private static string BuildIcs(string uid, string summary, DateTimeOffset startUtc, DateTimeOffset endUtc)
+    {
+        return $"""
+            BEGIN:VCALENDAR
+            VERSION:2.0
+            PRODID:-//Wino Mail//CalDAV Live Tests//EN
+            CALSCALE:GREGORIAN
+            BEGIN:VEVENT
+            UID:{uid}
+            DTSTAMP:{DateTimeOffset.UtcNow:yyyyMMdd'T'HHmmss'Z'}
+            DTSTART:{startUtc:yyyyMMdd'T'HHmmss'Z'}
+            DTEND:{endUtc:yyyyMMdd'T'HHmmss'Z'}
+            SUMMARY:{summary}
+            END:VEVENT
+            END:VCALENDAR
+            """;
+    }
+
+    private static async Task PutEventAsync(CalDavConnectionSettings settings, Uri eventUri, string icsContent)
+    {
+        using var client = CreateAuthenticatedHttpClient(settings);
+        using var request = new HttpRequestMessage(HttpMethod.Put, eventUri)
+        {
+            Content = new StringContent(icsContent, Encoding.UTF8, "text/calendar")
+        };
+
+        using var response = await client.SendAsync(request);
+        response.EnsureSuccessStatusCode();
+    }
+
+    private static async Task DeleteEventAsync(CalDavConnectionSettings settings, Uri eventUri)
+    {
+        using var client = CreateAuthenticatedHttpClient(settings);
+        using var response = await client.DeleteAsync(eventUri);
+        response.EnsureSuccessStatusCode();
+    }
+
+    private static async Task<string> GetCalendarSyncTokenAsync(CalDavConnectionSettings settings, Uri calendarUri)
+    {
+        const string body = """
+            <D:propfind xmlns:D="DAV:">
+              <D:prop>
+                <D:sync-token />
+              </D:prop>
+            </D:propfind>
+            """;
+
+        using var client = CreateAuthenticatedHttpClient(settings);
+        using var request = new HttpRequestMessage(new HttpMethod("PROPFIND"), calendarUri)
+        {
+            Content = new StringContent(body, Encoding.UTF8, "application/xml")
+        };
+
+        request.Headers.Add("Depth", "0");
+        using var response = await client.SendAsync(request);
+        response.EnsureSuccessStatusCode();
+
+        var xml = await response.Content.ReadAsStringAsync();
+        var doc = XDocument.Parse(xml);
+
+        return doc.Descendants().FirstOrDefault(x => x.Name.LocalName == "sync-token")?.Value ?? string.Empty;
+    }
+
+    private static async Task<XDocument> ReportSyncCollectionAsync(CalDavConnectionSettings settings, Uri calendarUri, string syncToken)
+    {
+        var body = $"""
+            <D:sync-collection xmlns:D="DAV:">
+              <D:sync-token>{SecurityElement.Escape(syncToken)}</D:sync-token>
+              <D:sync-level>1</D:sync-level>
+              <D:prop>
+                <D:getetag />
+              </D:prop>
+            </D:sync-collection>
+            """;
+
+        using var client = CreateAuthenticatedHttpClient(settings);
+        using var request = new HttpRequestMessage(new HttpMethod("REPORT"), calendarUri)
+        {
+            Content = new StringContent(body, Encoding.UTF8, "application/xml")
+        };
+
+        request.Headers.Add("Depth", "1");
+        using var response = await client.SendAsync(request);
+        response.EnsureSuccessStatusCode();
+
+        var xml = await response.Content.ReadAsStringAsync();
+        return XDocument.Parse(xml);
+    }
+
+    private static IReadOnlyList<string> ExtractChangedHrefs(XDocument deltaXml)
+        => deltaXml
+            .Descendants()
+            .Where(x => x.Name.LocalName == "href")
+            .Select(x => x.Value)
+            .Where(v => !string.IsNullOrWhiteSpace(v))
+            .ToList();
+
+    private static HttpClient CreateAuthenticatedHttpClient(CalDavConnectionSettings settings)
+    {
+        var client = new HttpClient();
+        var basicAuth = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{settings.Username}:{settings.Password}"));
+        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", basicAuth);
+        return client;
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/CalendarItemTimeZoneDisplayTests.cs b/Wino.Core.Tests/Synchronizers/CalendarItemTimeZoneDisplayTests.cs
new file mode 100644
index 00000000..f76e6115
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/CalendarItemTimeZoneDisplayTests.cs
@@ -0,0 +1,61 @@
+using FluentAssertions;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Extensions;
+using Wino.Core.Domain.Entities.Calendar;
+using Google.Apis.Calendar.v3.Data;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class CalendarItemTimeZoneDisplayTests
+{
+    [Fact]
+    public void AllDayEvents_KeepTheirOriginalCalendarDates_ForDisplay()
+    {
+        var calendarItem = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "National Sovereignty and Children's Day",
+            StartDate = new DateTime(2026, 4, 23, 0, 0, 0),
+            DurationInSeconds = TimeSpan.FromDays(1).TotalSeconds,
+            StartTimeZone = "Turkey Standard Time",
+            EndTimeZone = "Turkey Standard Time"
+        };
+
+        calendarItem.IsAllDayEvent.Should().BeTrue();
+        calendarItem.LocalStartDate.Should().Be(new DateTime(2026, 4, 23, 0, 0, 0));
+        calendarItem.LocalEndDate.Should().Be(new DateTime(2026, 4, 24, 0, 0, 0));
+    }
+
+    [Fact]
+    public void EditingAllDayEventDate_DoesNotApplyTimezoneConversion()
+    {
+        var calendarItem = new CalendarItem
+        {
+            Id = Guid.NewGuid(),
+            Title = "Holiday",
+            StartDate = new DateTime(2026, 4, 23, 0, 0, 0),
+            DurationInSeconds = TimeSpan.FromDays(1).TotalSeconds,
+            StartTimeZone = "Turkey Standard Time",
+            EndTimeZone = "Turkey Standard Time"
+        };
+
+        var viewModel = new CalendarItemViewModel(calendarItem);
+
+        viewModel.StartDate = new DateTime(2026, 4, 24, 0, 0, 0);
+
+        calendarItem.StartDate.Should().Be(new DateTime(2026, 4, 24, 0, 0, 0));
+    }
+
+    [Fact]
+    public void GmailDateOnlyEvents_KeepFloatingCalendarDates()
+    {
+        var start = new EventDateTime { Date = "2026-04-23" };
+        var end = new EventDateTime { Date = "2026-04-24" };
+
+        GoogleIntegratorExtensions.GetEventLocalDateTime(start).Should().Be(new DateTime(2026, 4, 23, 0, 0, 0));
+        GoogleIntegratorExtensions.GetEventLocalDateTime(end).Should().Be(new DateTime(2026, 4, 24, 0, 0, 0));
+
+        GoogleIntegratorExtensions.GetEventDateTimeOffset(start)!.Value.UtcDateTime.Should().Be(new DateTime(2026, 4, 23, 0, 0, 0, DateTimeKind.Utc));
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/GmailSynchronizerRequestSuccessTests.cs b/Wino.Core.Tests/Synchronizers/GmailSynchronizerRequestSuccessTests.cs
new file mode 100644
index 00000000..0e82a9b0
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/GmailSynchronizerRequestSuccessTests.cs
@@ -0,0 +1,187 @@
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using FluentAssertions;
+using Google.Apis.Requests;
+using Moq;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration.Processors;
+using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Mail;
+using Wino.Core.Synchronizers.Mail;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class GmailSynchronizerRequestSuccessTests
+{
+    [Fact]
+    public async Task ProcessSingleNativeRequestResponseAsync_BatchMarkReadRequest_PersistsLocalReadStateForEachMail()
+    {
+        var changeProcessor = new Mock<IGmailChangeProcessor>(MockBehavior.Strict);
+        changeProcessor
+            .Setup(x => x.ChangeMailReadStatusAsync("mail-1", true))
+            .Returns(Task.CompletedTask);
+        changeProcessor
+            .Setup(x => x.ChangeMailReadStatusAsync("mail-2", true))
+            .Returns(Task.CompletedTask);
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object);
+        var request = new BatchMarkReadRequest(
+        [
+            new MarkReadRequest(CreateMailCopy("mail-1"), IsRead: true),
+            new MarkReadRequest(CreateMailCopy("mail-2"), IsRead: true)
+        ]);
+        var bundle = new HttpRequestBundle<IClientServiceRequest>(Mock.Of<IClientServiceRequest>(), request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+
+        await InvokeProcessSingleNativeRequestResponseAsync(synchronizer, bundle, response);
+
+        changeProcessor.Verify(x => x.ChangeMailReadStatusAsync("mail-1", true), Times.Once);
+        changeProcessor.Verify(x => x.ChangeMailReadStatusAsync("mail-2", true), Times.Once);
+    }
+
+    [Fact]
+    public async Task ProcessSingleNativeRequestResponseAsync_BatchChangeFlagRequest_PersistsLocalFlagStateForEachMail()
+    {
+        var changeProcessor = new Mock<IGmailChangeProcessor>(MockBehavior.Strict);
+        changeProcessor
+            .Setup(x => x.ChangeFlagStatusAsync("mail-1", true))
+            .Returns(Task.CompletedTask);
+        changeProcessor
+            .Setup(x => x.ChangeFlagStatusAsync("mail-2", true))
+            .Returns(Task.CompletedTask);
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object);
+        var request = new BatchChangeFlagRequest(
+        [
+            new ChangeFlagRequest(CreateMailCopy("mail-1"), IsFlagged: true),
+            new ChangeFlagRequest(CreateMailCopy("mail-2"), IsFlagged: true)
+        ]);
+        var bundle = new HttpRequestBundle<IClientServiceRequest>(Mock.Of<IClientServiceRequest>(), request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+
+        await InvokeProcessSingleNativeRequestResponseAsync(synchronizer, bundle, response);
+
+        changeProcessor.Verify(x => x.ChangeFlagStatusAsync("mail-1", true), Times.Once);
+        changeProcessor.Verify(x => x.ChangeFlagStatusAsync("mail-2", true), Times.Once);
+    }
+
+    [Fact]
+    public async Task ProcessSingleNativeRequestResponseAsync_HandledRequestError_DoesNotPersistLocalReadState()
+    {
+        var changeProcessor = new Mock<IGmailChangeProcessor>(MockBehavior.Strict);
+        var errorFactory = new Mock<IGmailSynchronizerErrorHandlerFactory>(MockBehavior.Strict);
+        errorFactory
+            .Setup(x => x.HandleErrorAsync(It.IsAny<SynchronizerErrorContext>()))
+            .ReturnsAsync(true);
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object, errorFactory.Object);
+        var request = new BatchMarkReadRequest(
+        [
+            new MarkReadRequest(CreateMailCopy("mail-1"), IsRead: true)
+        ]);
+        var bundle = new HttpRequestBundle<IClientServiceRequest>(Mock.Of<IClientServiceRequest>(), request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+        var error = new RequestError
+        {
+            Code = 429,
+            Message = "rate limit"
+        };
+
+        await InvokeProcessSingleNativeRequestResponseAsync(synchronizer, bundle, response, error);
+
+        changeProcessor.Verify(x => x.ChangeMailReadStatusAsync(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+        errorFactory.Verify(x => x.HandleErrorAsync(It.IsAny<SynchronizerErrorContext>()), Times.Once);
+    }
+
+    [Fact]
+    public async Task ProcessSingleNativeRequestResponseAsync_HandledRequestError_RevertsOptimisticReadState()
+    {
+        var changeProcessor = new Mock<IGmailChangeProcessor>(MockBehavior.Strict);
+        var errorFactory = new Mock<IGmailSynchronizerErrorHandlerFactory>(MockBehavior.Strict);
+        errorFactory
+            .Setup(x => x.HandleErrorAsync(It.IsAny<SynchronizerErrorContext>()))
+            .ReturnsAsync(true);
+
+        var mail = CreateMailCopy("mail-1");
+        var request = new BatchMarkReadRequest(
+        [
+            new MarkReadRequest(mail, IsRead: true)
+        ]);
+        request.ApplyUIChanges();
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object, errorFactory.Object);
+        var bundle = new HttpRequestBundle<IClientServiceRequest>(Mock.Of<IClientServiceRequest>(), request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+        var error = new RequestError
+        {
+            Code = 429,
+            Message = "rate limit"
+        };
+
+        await InvokeProcessSingleNativeRequestResponseAsync(synchronizer, bundle, response, error);
+
+        mail.IsRead.Should().BeFalse();
+        changeProcessor.Verify(x => x.ChangeMailReadStatusAsync(It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+        errorFactory.Verify(x => x.HandleErrorAsync(It.IsAny<SynchronizerErrorContext>()), Times.Once);
+    }
+
+    private static GmailSynchronizer CreateSynchronizer(
+        IGmailChangeProcessor changeProcessor,
+        IGmailSynchronizerErrorHandlerFactory? errorFactory = null)
+    {
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Gmail",
+            Address = "user@example.com"
+        };
+
+        var authenticator = new Mock<IGmailAuthenticator>(MockBehavior.Loose);
+
+        return new GmailSynchronizer(account, authenticator.Object, changeProcessor, errorFactory ?? Mock.Of<IGmailSynchronizerErrorHandlerFactory>());
+    }
+
+    private static MailCopy CreateMailCopy(string id) =>
+        new()
+        {
+            UniqueId = Guid.NewGuid(),
+            Id = id,
+            FolderId = Guid.NewGuid(),
+            IsRead = false,
+            IsFlagged = false
+        };
+
+    private static async Task InvokeProcessSingleNativeRequestResponseAsync(
+        GmailSynchronizer synchronizer,
+        HttpRequestBundle<IClientServiceRequest> bundle,
+        HttpResponseMessage response,
+        RequestError? error = null)
+    {
+        var method = typeof(GmailSynchronizer).GetMethod(
+            "ProcessSingleNativeRequestResponseAsync",
+            BindingFlags.Instance | BindingFlags.NonPublic);
+
+        method.Should().NotBeNull();
+
+        var task = method!.Invoke(synchronizer, [bundle, error, response, CancellationToken.None]) as Task;
+        task.Should().NotBeNull();
+        await task!;
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/ICloudCalDavLiveTests.cs b/Wino.Core.Tests/Synchronizers/ICloudCalDavLiveTests.cs
new file mode 100644
index 00000000..4205baaf
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/ICloudCalDavLiveTests.cs
@@ -0,0 +1,98 @@
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Services;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class ICloudCalDavLiveTests
+{
+    private const string ManualSkipMessage = "Manual live iCloud CalDAV test. Fill credentials/constants in this file and remove Skip to run.";
+
+    // Inline credentials/configuration (manual test by design).
+    // For iCloud, ServiceUri is typically https://caldav.icloud.com/
+    private const string ServiceUri = "https://caldav.icloud.com/";
+    private static readonly CustomServerInformation ServerInformation = new()
+    {
+        IncomingServerUsername = "",
+        IncomingServerPassword = "",
+        Address = ""
+    };
+
+    // Fixed UTC range for deterministic fetch checks.
+    private static readonly DateTimeOffset PeriodStartUtc = new(2026, 01, 01, 0, 0, 0, TimeSpan.Zero);
+    private static readonly DateTimeOffset PeriodEndUtc = new(2026, 12, 31, 23, 59, 59, TimeSpan.Zero);
+
+    private readonly ITestOutputHelper _output;
+
+    public ICloudCalDavLiveTests(ITestOutputHelper output)
+    {
+        _output = output;
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task FetchesEventsForFixedUtcRange_AllCalendars()
+    {
+        var client = new CalDavClient();
+        var settings = GetConnectionSettings();
+
+        var calendars = await client.DiscoverCalendarsAsync(settings);
+        calendars.Should().NotBeNull();
+        calendars.Should().NotBeEmpty();
+
+        foreach (var calendar in calendars)
+        {
+            var events = await client.GetCalendarEventsAsync(settings, calendar, PeriodStartUtc, PeriodEndUtc);
+            _output.WriteLine($"Calendar: {calendar.Name} ({calendar.RemoteCalendarId}) => {events.Count} events");
+        }
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task ParsesRequiredIcsFields_ForFetchedEvents()
+    {
+        var client = new CalDavClient();
+        var settings = GetConnectionSettings();
+
+        var calendars = await client.DiscoverCalendarsAsync(settings);
+        calendars.Should().NotBeNull();
+        calendars.Should().NotBeEmpty();
+
+        foreach (var calendar in calendars)
+        {
+            var events = await client.GetCalendarEventsAsync(settings, calendar, PeriodStartUtc, PeriodEndUtc);
+
+            foreach (var item in events)
+            {
+                item.Uid.Should().NotBeNullOrWhiteSpace();
+                item.Start.Should().NotBe(default(DateTimeOffset));
+                item.Title.Should().NotBeNull();
+            }
+        }
+    }
+
+    [Fact]
+    public void BuildsConnectionSettings_FromCustomServerInformation()
+    {
+        var settings = GetConnectionSettings();
+
+        settings.ServiceUri.Should().Be(new Uri(ServiceUri));
+        settings.Username.Should().Be(string.IsNullOrWhiteSpace(ServerInformation.IncomingServerUsername)
+            ? ServerInformation.Address
+            : ServerInformation.IncomingServerUsername);
+        settings.Password.Should().Be(ServerInformation.IncomingServerPassword);
+    }
+
+    private static CalDavConnectionSettings GetConnectionSettings()
+        => new()
+        {
+            ServiceUri = new Uri(ServiceUri),
+            Username = string.IsNullOrWhiteSpace(ServerInformation.IncomingServerUsername)
+                ? ServerInformation.Address
+                : ServerInformation.IncomingServerUsername,
+            Password = ServerInformation.IncomingServerPassword
+        };
+}
diff --git a/Wino.Core.Tests/Synchronizers/ImapClientPoolTests.cs b/Wino.Core.Tests/Synchronizers/ImapClientPoolTests.cs
new file mode 100644
index 00000000..3d241fbb
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/ImapClientPoolTests.cs
@@ -0,0 +1,33 @@
+using FluentAssertions;
+using Wino.Core.Integration;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public class ImapClientPoolTests
+{
+    [Fact]
+    public void CalculateMaxConnections_ShouldUseDefault_WhenConfiguredValueIsNonPositive()
+    {
+        ImapClientPool.CalculateMaxConnections(0).Should().Be(5);
+        ImapClientPool.CalculateMaxConnections(-4).Should().Be(5);
+    }
+
+    [Fact]
+    public void CalculateMaxConnections_ShouldClampToTen_WhenConfiguredValueIsTooHigh()
+    {
+        ImapClientPool.CalculateMaxConnections(40).Should().Be(10);
+    }
+
+    [Fact]
+    public void CalculateTargetMinimumConnections_ShouldRespectConservativeMode()
+    {
+        ImapClientPool.CalculateTargetMinimumConnections(maxConnections: 5, useConservativeConnections: true).Should().Be(1);
+    }
+
+    [Fact]
+    public void CalculateTargetMinimumConnections_ShouldBeTwo_WhenNotConservativeAndCapacityAllows()
+    {
+        ImapClientPool.CalculateTargetMinimumConnections(maxConnections: 5, useConservativeConnections: false).Should().Be(2);
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/ImapSynchronizerCalDavConfigurationTests.cs b/Wino.Core.Tests/Synchronizers/ImapSynchronizerCalDavConfigurationTests.cs
new file mode 100644
index 00000000..334edefe
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/ImapSynchronizerCalDavConfigurationTests.cs
@@ -0,0 +1,173 @@
+using System.Reflection;
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Integration.Processors;
+using Wino.Core.Synchronizers.ImapSync;
+using Wino.Core.Synchronizers.Mail;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public class ImapSynchronizerCalDavConfigurationTests
+{
+    [Fact]
+    public async Task ResolveCalDavServiceUriAsync_UsesExplicitConfigurationBeforeAutoDiscovery()
+    {
+        var tempDirectory = CreateTempDirectory();
+        var autoDiscovery = new Mock<IAutoDiscoveryService>(MockBehavior.Strict);
+
+        var serverInformation = CreateServerInformation();
+        serverInformation.CalDavServiceUrl = "https://caldav.explicit.example.com/";
+
+        var synchronizer = CreateSynchronizer(tempDirectory, serverInformation, autoDiscovery.Object);
+
+        try
+        {
+            var resolvedUri = await InvokePrivateAsync<Uri>(synchronizer, "ResolveCalDavServiceUriAsync", CancellationToken.None);
+
+            resolvedUri.Should().Be(new Uri("https://caldav.explicit.example.com/"));
+            autoDiscovery.Verify(a => a.DiscoverCalDavServiceUriAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+        }
+        finally
+        {
+            await synchronizer.KillSynchronizerAsync();
+            DeleteDirectory(tempDirectory);
+        }
+    }
+
+    [Fact]
+    public async Task ResolveCalDavPassword_PrefersExplicitCalDavPassword()
+    {
+        var tempDirectory = CreateTempDirectory();
+
+        var serverInformation = CreateServerInformation();
+        serverInformation.IncomingServerPassword = "incoming-password";
+        serverInformation.OutgoingServerPassword = "outgoing-password";
+        serverInformation.CalDavPassword = "caldav-password";
+
+        var synchronizer = CreateSynchronizer(tempDirectory, serverInformation);
+
+        try
+        {
+            var password = InvokePrivate<string>(synchronizer, "ResolveCalDavPassword");
+
+            password.Should().Be("caldav-password");
+        }
+        finally
+        {
+            await synchronizer.KillSynchronizerAsync();
+            DeleteDirectory(tempDirectory);
+        }
+    }
+
+    [Fact]
+    public async Task ResolveCalDavUsername_PrefersExplicitCalDavUsername()
+    {
+        var tempDirectory = CreateTempDirectory();
+
+        var serverInformation = CreateServerInformation();
+        serverInformation.Address = "fallback@example.com";
+        serverInformation.CalDavUsername = "calendar-user@example.com";
+
+        var synchronizer = CreateSynchronizer(tempDirectory, serverInformation);
+
+        try
+        {
+            var username = InvokePrivate<string>(synchronizer, "ResolveCalDavUsername");
+
+            username.Should().Be("calendar-user@example.com");
+        }
+        finally
+        {
+            await synchronizer.KillSynchronizerAsync();
+            DeleteDirectory(tempDirectory);
+        }
+    }
+
+    private static ImapSynchronizer CreateSynchronizer(string appDataFolder,
+                                                       CustomServerInformation serverInformation,
+                                                       IAutoDiscoveryService? autoDiscoveryService = null)
+    {
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "IMAP Test",
+            Address = "test@example.com",
+            ProviderType = MailProviderType.IMAP4,
+            IsCalendarAccessGranted = true,
+            ServerInformation = serverInformation
+        };
+
+        var applicationConfiguration = new Mock<IApplicationConfiguration>();
+        applicationConfiguration.SetupProperty(x => x.ApplicationDataFolderPath, appDataFolder);
+        applicationConfiguration.SetupProperty(x => x.PublisherSharedFolderPath, appDataFolder);
+        applicationConfiguration.SetupProperty(x => x.ApplicationTempFolderPath, appDataFolder);
+        applicationConfiguration.SetupGet(x => x.SentryDNS).Returns(string.Empty);
+
+        var unifiedSynchronizer = new UnifiedImapSynchronizer(
+            Mock.Of<IFolderService>(),
+            Mock.Of<IMailService>(),
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>());
+
+        return new ImapSynchronizer(
+            account,
+            Mock.Of<IImapChangeProcessor>(),
+            applicationConfiguration.Object,
+            unifiedSynchronizer,
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>(),
+            Mock.Of<ICalDavClient>(),
+            autoDiscoveryService ?? Mock.Of<IAutoDiscoveryService>(),
+            Mock.Of<ICalendarService>());
+    }
+
+    private static CustomServerInformation CreateServerInformation()
+        => new()
+        {
+            Id = Guid.NewGuid(),
+            IncomingServer = "imap.example.com",
+            IncomingServerPort = "993",
+            IncomingServerUsername = "user@example.com",
+            IncomingServerPassword = "password",
+            OutgoingServer = "smtp.example.com",
+            OutgoingServerPort = "587",
+            OutgoingServerUsername = "user@example.com",
+            OutgoingServerPassword = "password",
+            MaxConcurrentClients = 5,
+            CalendarSupportMode = ImapCalendarSupportMode.CalDav
+        };
+
+    private static string CreateTempDirectory()
+    {
+        var path = Path.Combine(Path.GetTempPath(), "wino-imap-caldav-tests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(path);
+        return path;
+    }
+
+    private static void DeleteDirectory(string path)
+    {
+        if (Directory.Exists(path))
+        {
+            Directory.Delete(path, recursive: true);
+        }
+    }
+
+    private static T InvokePrivate<T>(object instance, string methodName)
+    {
+        var method = instance.GetType().GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance)
+                     ?? throw new InvalidOperationException($"Method '{methodName}' not found.");
+
+        return (T)method.Invoke(instance, null)!;
+    }
+
+    private static async Task<T> InvokePrivateAsync<T>(object instance, string methodName, params object[] parameters)
+    {
+        var method = instance.GetType().GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance)
+                     ?? throw new InvalidOperationException($"Method '{methodName}' not found.");
+
+        var task = (Task<T>)method.Invoke(instance, parameters)!;
+        return await task.ConfigureAwait(false);
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/ImapSynchronizerIdleTests.cs b/Wino.Core.Tests/Synchronizers/ImapSynchronizerIdleTests.cs
new file mode 100644
index 00000000..d14afe37
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/ImapSynchronizerIdleTests.cs
@@ -0,0 +1,82 @@
+using FluentAssertions;
+using Moq;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Integration.Processors;
+using Wino.Core.Synchronizers.ImapSync;
+using Wino.Core.Synchronizers.Mail;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public class ImapSynchronizerIdleTests
+{
+    [Fact]
+    public async Task ShouldTriggerIdleSynchronization_ShouldDebounceBurstSignals()
+    {
+        var tempDirectory = Path.Combine(Path.GetTempPath(), "wino-imap-idle-tests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(tempDirectory);
+
+        var synchronizer = CreateSynchronizer(tempDirectory);
+
+        try
+        {
+            var baseTime = new DateTime(2026, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+            synchronizer.ShouldTriggerIdleSynchronization(baseTime).Should().BeTrue();
+            synchronizer.ShouldTriggerIdleSynchronization(baseTime.AddSeconds(5)).Should().BeFalse();
+            synchronizer.ShouldTriggerIdleSynchronization(baseTime.AddSeconds(16)).Should().BeTrue();
+        }
+        finally
+        {
+            await synchronizer.KillSynchronizerAsync();
+
+            if (Directory.Exists(tempDirectory))
+            {
+                Directory.Delete(tempDirectory, recursive: true);
+            }
+        }
+    }
+
+    private static ImapSynchronizer CreateSynchronizer(string appDataFolder)
+    {
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "IMAP Test",
+            Address = "test@example.com",
+            ProviderType = MailProviderType.IMAP4,
+            ServerInformation = new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                IncomingServer = "imap.example.com",
+                IncomingServerPort = "993",
+                IncomingServerUsername = "user",
+                IncomingServerPassword = "password",
+                MaxConcurrentClients = 5
+            }
+        };
+
+        var applicationConfiguration = new Mock<IApplicationConfiguration>();
+        applicationConfiguration.SetupProperty(x => x.ApplicationDataFolderPath, appDataFolder);
+        applicationConfiguration.SetupProperty(x => x.PublisherSharedFolderPath, appDataFolder);
+        applicationConfiguration.SetupProperty(x => x.ApplicationTempFolderPath, appDataFolder);
+        applicationConfiguration.SetupGet(x => x.SentryDNS).Returns(string.Empty);
+
+        var unifiedSynchronizer = new UnifiedImapSynchronizer(
+            Mock.Of<IFolderService>(),
+            Mock.Of<IMailService>(),
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>());
+
+        return new ImapSynchronizer(
+            account,
+            Mock.Of<IImapChangeProcessor>(),
+            applicationConfiguration.Object,
+            unifiedSynchronizer,
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>(),
+            Mock.Of<ICalDavClient>(),
+            Mock.Of<IAutoDiscoveryService>(),
+            Mock.Of<ICalendarService>());
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/ImapSynchronizerLiveTests.cs b/Wino.Core.Tests/Synchronizers/ImapSynchronizerLiveTests.cs
new file mode 100644
index 00000000..0f508b58
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/ImapSynchronizerLiveTests.cs
@@ -0,0 +1,290 @@
+using FluentAssertions;
+using MailKit;
+using MailKit.Net.Imap;
+using MailKit.Search;
+using Moq;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration.Processors;
+using Wino.Core.Requests.Mail;
+using Wino.Core.Synchronizers.ImapSync;
+using Wino.Core.Synchronizers.Mail;
+using Wino.Services.Extensions;
+using Xunit;
+using IMailService = Wino.Core.Domain.Interfaces.IMailService;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class ImapSynchronizerLiveTests
+{
+    private const string ManualSkipMessage = "Manual live IMAP test. Fill Server/Port/Username/Password placeholders and remove Skip to run.";
+
+    // Replace placeholders with your own credentials when running these live tests.
+    private const string Server = "imap.example.com";
+    private const int Port = 993;
+    private const string Username = "REPLACE_WITH_USERNAME";
+    private const string Password = "REPLACE_WITH_PASSWORD";
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task InitialSynchronization_DownloadsInboxMetadata()
+    {
+        using var context = await CreateContextAsync();
+
+        var result = await context.Synchronizer.SynchronizeMailsAsync(CreateCustomFolderSyncOptions(context.Account.Id, context.InboxFolder.Id));
+
+        result.CompletedState.Should().Be(SynchronizationCompletedState.Success);
+        result.FolderResults.Should().ContainSingle();
+        result.FolderResults[0].Success.Should().BeTrue();
+        result.FolderResults[0].DownloadedCount.Should().BeGreaterThan(0);
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task DeltaSynchronization_SecondRunDownloadsNoAdditionalMessages()
+    {
+        using var context = await CreateContextAsync();
+
+        var initialResult = await context.Synchronizer.SynchronizeMailsAsync(CreateCustomFolderSyncOptions(context.Account.Id, context.InboxFolder.Id));
+        initialResult.CompletedState.Should().Be(SynchronizationCompletedState.Success);
+
+        var deltaResult = await context.Synchronizer.SynchronizeMailsAsync(CreateCustomFolderSyncOptions(context.Account.Id, context.InboxFolder.Id));
+
+        deltaResult.CompletedState.Should().Be(SynchronizationCompletedState.Success);
+        deltaResult.FolderResults.Should().ContainSingle();
+        deltaResult.FolderResults[0].DownloadedCount.Should().Be(0);
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task MarkFirstInboxMailUnreadThenRead_ValidatesReadFlagChanges()
+    {
+        using var context = await CreateContextAsync();
+
+        var firstUid = await GetFirstInboxMessageUidAsync(context.Account);
+        var mailCopy = CreateInboxMailCopy(context.InboxFolder, firstUid);
+
+        await ExecuteMarkReadAsync(context.Synchronizer, mailCopy, isRead: false);
+        (await GetIsSeenAsync(context.Account, firstUid)).Should().BeFalse();
+
+        await ExecuteMarkReadAsync(context.Synchronizer, mailCopy, isRead: true);
+        (await GetIsSeenAsync(context.Account, firstUid)).Should().BeTrue();
+    }
+
+    [Fact(Skip = ManualSkipMessage)]
+    [Trait("Category", "Live")]
+    public async Task MarkFirstInboxMailReadThenUnread_ValidatesUnreadFlagChanges()
+    {
+        using var context = await CreateContextAsync();
+
+        var firstUid = await GetFirstInboxMessageUidAsync(context.Account);
+        var mailCopy = CreateInboxMailCopy(context.InboxFolder, firstUid);
+
+        await ExecuteMarkReadAsync(context.Synchronizer, mailCopy, isRead: true);
+        (await GetIsSeenAsync(context.Account, firstUid)).Should().BeTrue();
+
+        await ExecuteMarkReadAsync(context.Synchronizer, mailCopy, isRead: false);
+        (await GetIsSeenAsync(context.Account, firstUid)).Should().BeFalse();
+    }
+
+    private static MailSynchronizationOptions CreateCustomFolderSyncOptions(Guid accountId, Guid folderId)
+        => new()
+        {
+            AccountId = accountId,
+            Type = MailSynchronizationType.CustomFolders,
+            SynchronizationFolderIds = [folderId]
+        };
+
+    private static async Task ExecuteMarkReadAsync(ImapSynchronizer synchronizer, MailCopy mailCopy, bool isRead)
+    {
+        var requests = synchronizer.MarkRead(new BatchMarkReadRequest([new MarkReadRequest(mailCopy, isRead)]));
+        await synchronizer.ExecuteNativeRequestsAsync(requests);
+    }
+
+    private static MailCopy CreateInboxMailCopy(MailItemFolder folder, UniqueId uid)
+        => new()
+        {
+            Id = MailkitClientExtensions.CreateUid(folder.Id, uid.Id),
+            AssignedFolder = folder,
+            IsRead = false,
+            Subject = "Live test placeholder"
+        };
+
+    private static async Task<UniqueId> GetFirstInboxMessageUidAsync(MailAccount account)
+    {
+        using var client = await CreateConnectedClientAsync(account);
+        var inbox = client.Inbox;
+
+        await inbox.OpenAsync(FolderAccess.ReadWrite);
+
+        var allUids = await inbox.SearchAsync(SearchQuery.All);
+        allUids.Should().NotBeEmpty("Inbox must contain at least one message for mark-read live tests.");
+
+        var firstUid = allUids.First();
+
+        await inbox.CloseAsync();
+        await client.DisconnectAsync(true);
+
+        return firstUid;
+    }
+
+    private static async Task<bool> GetIsSeenAsync(MailAccount account, UniqueId uid)
+    {
+        using var client = await CreateConnectedClientAsync(account);
+        var inbox = client.Inbox;
+
+        await inbox.OpenAsync(FolderAccess.ReadOnly);
+        var summary = await inbox.FetchAsync([uid], MessageSummaryItems.Flags);
+
+        await inbox.CloseAsync();
+        await client.DisconnectAsync(true);
+
+        summary.Should().ContainSingle();
+
+        var flags = summary[0].Flags;
+        flags.Should().NotBeNull();
+
+        return flags!.Value.HasFlag(MessageFlags.Seen);
+    }
+
+    private static async Task<ImapClient> CreateConnectedClientAsync(MailAccount account)
+    {
+        var client = new ImapClient();
+
+        await client.ConnectAsync(account.ServerInformation.IncomingServer, int.Parse(account.ServerInformation.IncomingServerPort), MailKit.Security.SecureSocketOptions.Auto);
+        await client.AuthenticateAsync(account.ServerInformation.IncomingServerUsername, account.ServerInformation.IncomingServerPassword);
+
+        return client;
+    }
+
+    private static async Task<LiveTestContext> CreateContextAsync()
+    {
+        var tempDirectory = Path.Combine(Path.GetTempPath(), "wino-imap-live-tests", Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(tempDirectory);
+
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "IMAP Live Test",
+            Address = Username,
+            ProviderType = MailProviderType.IMAP4,
+            ServerInformation = new CustomServerInformation
+            {
+                Id = Guid.NewGuid(),
+                IncomingServer = Server,
+                IncomingServerPort = Port.ToString(),
+                IncomingServerUsername = Username,
+                IncomingServerPassword = Password,
+                IncomingServerSocketOption = ImapConnectionSecurity.Auto,
+                MaxConcurrentClients = 2
+            }
+        };
+
+        var inboxFolder = new MailItemFolder
+        {
+            Id = Guid.NewGuid(),
+            MailAccountId = account.Id,
+            FolderName = "Inbox",
+            RemoteFolderId = "INBOX",
+            SpecialFolderType = SpecialFolderType.Inbox,
+            IsSynchronizationEnabled = true,
+            ShowUnreadCount = true,
+            UidValidity = 0,
+            HighestModeSeq = 0,
+            HighestKnownUid = 0
+        };
+
+        var storedMails = new Dictionary<string, MailCopy>();
+
+        var folderService = new Mock<IFolderService>();
+        folderService.Setup(x => x.GetKnownUidsForFolderAsync(inboxFolder.Id))
+            .ReturnsAsync(() => storedMails.Values.Select(m => MailkitClientExtensions.ResolveUid(m.Id)).ToList());
+        folderService.Setup(x => x.UpdateFolderAsync(It.IsAny<MailItemFolder>())).Returns(Task.CompletedTask);
+        folderService.Setup(x => x.UpdateFolderHighestModeSeqAsync(It.IsAny<Guid>(), It.IsAny<long>())).Returns(Task.CompletedTask);
+        folderService.Setup(x => x.DeleteFolderAsync(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.CompletedTask);
+
+        var mailService = new Mock<IMailService>();
+        mailService.Setup(x => x.GetMailsByFolderIdAsync(inboxFolder.Id)).ReturnsAsync(() => storedMails.Values.ToList());
+        mailService.Setup(x => x.GetExistingMailsAsync(inboxFolder.Id, It.IsAny<IEnumerable<UniqueId>>()))
+            .ReturnsAsync((Guid _, IEnumerable<UniqueId> ids) =>
+                ids.Select(uid => MailkitClientExtensions.CreateUid(inboxFolder.Id, uid.Id))
+                   .Where(storedMails.ContainsKey)
+                   .Select(id => storedMails[id])
+                   .ToList());
+        mailService.Setup(x => x.CreateMailAsync(account.Id, It.IsAny<NewMailItemPackage>()))
+            .ReturnsAsync((Guid _, NewMailItemPackage package) =>
+            {
+                storedMails[package.Copy.Id] = package.Copy;
+                return true;
+            });
+        mailService.Setup(x => x.ChangeReadStatusAsync(It.IsAny<string>(), It.IsAny<bool>()))
+            .Returns((string mailCopyId, bool isRead) =>
+            {
+                if (storedMails.TryGetValue(mailCopyId, out var copy))
+                {
+                    copy.IsRead = isRead;
+                }
+
+                return Task.CompletedTask;
+            });
+        mailService.Setup(x => x.ChangeFlagStatusAsync(It.IsAny<string>(), It.IsAny<bool>())).Returns(Task.CompletedTask);
+        mailService.Setup(x => x.DeleteMailAsync(It.IsAny<Guid>(), It.IsAny<string>()))
+            .Returns((Guid _, string mailCopyId) =>
+            {
+                storedMails.Remove(mailCopyId);
+                return Task.CompletedTask;
+            });
+
+        var changeProcessor = new Mock<IImapChangeProcessor>();
+        changeProcessor.Setup(x => x.GetSynchronizationFoldersAsync(It.IsAny<MailSynchronizationOptions>()))
+            .ReturnsAsync([inboxFolder]);
+        changeProcessor.Setup(x => x.GetRecentMailIdsForFolderAsync(inboxFolder.Id, It.IsAny<int>()))
+            .ReturnsAsync((Guid _, int count) => storedMails.Keys.Take(count).ToList());
+        changeProcessor.Setup(x => x.GetDownloadedUnreadMailsAsync(account.Id, It.IsAny<IEnumerable<string>>()))
+            .ReturnsAsync(new List<MailCopy>());
+
+        var appConfiguration = new Mock<IApplicationConfiguration>();
+        appConfiguration.SetupProperty(x => x.ApplicationDataFolderPath, tempDirectory);
+        appConfiguration.SetupProperty(x => x.PublisherSharedFolderPath, tempDirectory);
+        appConfiguration.SetupProperty(x => x.ApplicationTempFolderPath, tempDirectory);
+        appConfiguration.SetupGet(x => x.SentryDNS).Returns(string.Empty);
+
+        var unifiedSynchronizer = new UnifiedImapSynchronizer(
+            folderService.Object,
+            mailService.Object,
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>());
+
+        var synchronizer = new ImapSynchronizer(
+            account,
+            changeProcessor.Object,
+            appConfiguration.Object,
+            unifiedSynchronizer,
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>(),
+            Mock.Of<ICalDavClient>(),
+            Mock.Of<IAutoDiscoveryService>(),
+            Mock.Of<ICalendarService>());
+
+        return await Task.FromResult(new LiveTestContext(account, inboxFolder, synchronizer, tempDirectory));
+    }
+
+    private sealed class LiveTestContext(MailAccount account, MailItemFolder inboxFolder, ImapSynchronizer synchronizer, string tempDirectory) : IDisposable
+    {
+        public MailAccount Account { get; } = account;
+        public MailItemFolder InboxFolder { get; } = inboxFolder;
+        public ImapSynchronizer Synchronizer { get; } = synchronizer;
+
+        public void Dispose()
+        {
+            Synchronizer.KillSynchronizerAsync().GetAwaiter().GetResult();
+
+            if (Directory.Exists(tempDirectory))
+            {
+                Directory.Delete(tempDirectory, recursive: true);
+            }
+        }
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/OutlookSynchronizerRequestSuccessTests.cs b/Wino.Core.Tests/Synchronizers/OutlookSynchronizerRequestSuccessTests.cs
new file mode 100644
index 00000000..c723e79d
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/OutlookSynchronizerRequestSuccessTests.cs
@@ -0,0 +1,102 @@
+using System.Net;
+using System.Net.Http;
+using System.Reflection;
+using FluentAssertions;
+using Microsoft.Kiota.Abstractions;
+using Moq;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Integration.Processors;
+using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Mail;
+using Wino.Core.Synchronizers.Mail;
+using Xunit;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public sealed class OutlookSynchronizerRequestSuccessTests
+{
+    [Fact]
+    public async Task HandleSuccessfulResponseAsync_MarkReadRequest_PersistsLocalReadStateEvenWithoutResponseBody()
+    {
+        var changeProcessor = new Mock<IOutlookChangeProcessor>(MockBehavior.Strict);
+        changeProcessor
+            .Setup(x => x.ChangeMailReadStatusAsync("mail-id", true))
+            .Returns(Task.CompletedTask);
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object);
+        var request = new MarkReadRequest(CreateMailCopy(), IsRead: true);
+        var bundle = new HttpRequestBundle<RequestInformation>(new RequestInformation(), request, request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+
+        await InvokeHandleSuccessfulResponseAsync(synchronizer, bundle, response);
+
+        changeProcessor.Verify(x => x.ChangeMailReadStatusAsync("mail-id", true), Times.Once);
+    }
+
+    [Fact]
+    public async Task HandleSuccessfulResponseAsync_ChangeFlagRequest_PersistsLocalFlagStateEvenWithoutResponseBody()
+    {
+        var changeProcessor = new Mock<IOutlookChangeProcessor>(MockBehavior.Strict);
+        changeProcessor
+            .Setup(x => x.ChangeFlagStatusAsync("mail-id", true))
+            .Returns(Task.CompletedTask);
+
+        var synchronizer = CreateSynchronizer(changeProcessor.Object);
+        var request = new ChangeFlagRequest(CreateMailCopy(), IsFlagged: true);
+        var bundle = new HttpRequestBundle<RequestInformation>(new RequestInformation(), request, request);
+        using var response = new HttpResponseMessage(HttpStatusCode.OK)
+        {
+            Content = new StringContent(string.Empty)
+        };
+
+        await InvokeHandleSuccessfulResponseAsync(synchronizer, bundle, response);
+
+        changeProcessor.Verify(x => x.ChangeFlagStatusAsync("mail-id", true), Times.Once);
+    }
+
+    private static OutlookSynchronizer CreateSynchronizer(IOutlookChangeProcessor changeProcessor)
+    {
+        var account = new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Name = "Outlook",
+            Address = "user@example.com"
+        };
+
+        var authenticator = new Mock<IAuthenticator>(MockBehavior.Loose);
+        var errorFactory = new Mock<IOutlookSynchronizerErrorHandlerFactory>(MockBehavior.Loose);
+
+        return new OutlookSynchronizer(account, authenticator.Object, changeProcessor, errorFactory.Object);
+    }
+
+    private static MailCopy CreateMailCopy() =>
+        new()
+        {
+            UniqueId = Guid.NewGuid(),
+            Id = "mail-id",
+            FolderId = Guid.NewGuid(),
+            IsRead = false,
+            IsFlagged = false
+        };
+
+    private static async Task InvokeHandleSuccessfulResponseAsync(
+        OutlookSynchronizer synchronizer,
+        HttpRequestBundle<RequestInformation> bundle,
+        HttpResponseMessage response)
+    {
+        var method = typeof(OutlookSynchronizer).GetMethod(
+            "HandleSuccessfulResponseAsync",
+            BindingFlags.Instance | BindingFlags.NonPublic);
+
+        method.Should().NotBeNull();
+
+        var task = method!.Invoke(synchronizer, [bundle, response]) as Task;
+        task.Should().NotBeNull();
+        await task!;
+    }
+}
diff --git a/Wino.Core.Tests/Synchronizers/UnifiedImapSynchronizerTests.cs b/Wino.Core.Tests/Synchronizers/UnifiedImapSynchronizerTests.cs
new file mode 100644
index 00000000..87c00b9d
--- /dev/null
+++ b/Wino.Core.Tests/Synchronizers/UnifiedImapSynchronizerTests.cs
@@ -0,0 +1,226 @@
+using FluentAssertions;
+using MailKit;
+using MailKit.Net.Imap;
+using Moq;
+using System.Reflection;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Synchronizers.ImapSync;
+using Xunit;
+using IMailService = Wino.Core.Domain.Interfaces.IMailService;
+
+namespace Wino.Core.Tests.Synchronizers;
+
+public class UnifiedImapSynchronizerTests
+{
+    private static UnifiedImapSynchronizer CreateSut()
+    {
+        return new UnifiedImapSynchronizer(
+            Mock.Of<IFolderService>(),
+            Mock.Of<IMailService>(),
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>());
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldPrioritizeQResync_WhenEnabledAndSupported()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.QuickResync | ImapCapabilities.CondStore,
+            isQResyncEnabled: true,
+            serverHost: "imap.example.com");
+
+        strategy.Should().Be(ImapSyncStrategy.QResync);
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldFallbackToCondstore_WhenQResyncNotEnabled()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.QuickResync | ImapCapabilities.CondStore,
+            isQResyncEnabled: false,
+            serverHost: "imap.example.com");
+
+        strategy.Should().Be(ImapSyncStrategy.Condstore);
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldUseUidFallback_WhenNoAdvancedCapability()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.None,
+            isQResyncEnabled: false,
+            serverHost: "imap.example.com");
+
+        strategy.Should().Be(ImapSyncStrategy.UidBased);
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldRespectQuirkOverride_ForStrictProviders()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.QuickResync | ImapCapabilities.CondStore,
+            isQResyncEnabled: true,
+            serverHost: "imap.qq.com");
+
+        strategy.Should().Be(ImapSyncStrategy.Condstore);
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldFallbackToUid_WhenCondstoreIsUnavailable()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.QuickResync,
+            isQResyncEnabled: false,
+            serverHost: "imap.example.com");
+
+        strategy.Should().Be(ImapSyncStrategy.UidBased);
+    }
+
+    [Fact]
+    public void DetermineSyncStrategy_ShouldFallbackToUid_WhenQuirkDisablesQresyncAndNoCondstore()
+    {
+        var sut = CreateSut();
+
+        var strategy = sut.DetermineSyncStrategy(
+            ImapCapabilities.QuickResync,
+            isQResyncEnabled: true,
+            serverHost: "imap.163.com");
+
+        strategy.Should().Be(ImapSyncStrategy.UidBased);
+    }
+
+    [Fact]
+    public void CalculateHighestKnownUid_ShouldUseMaxOfCurrentObservedAndUidNext()
+    {
+        var result = UnifiedImapSynchronizer.CalculateHighestKnownUid(
+            currentHighestKnownUid: 100,
+            uidNext: new MailKit.UniqueId(151),
+            observedUids: new uint[] { 120, 140, 130 });
+
+        result.Should().Be(150);
+    }
+
+    [Fact]
+    public void CalculateHighestKnownUid_ShouldNotRegress_WhenObservedUidsAreLower()
+    {
+        var result = UnifiedImapSynchronizer.CalculateHighestKnownUid(
+            currentHighestKnownUid: 500,
+            uidNext: null,
+            observedUids: new uint[] { 110, 120, 130 });
+
+        result.Should().Be(500);
+    }
+
+    [Fact]
+    public void CalculateHighestKnownUid_ShouldUseUidNextMinusOne_WhenNoObservedUids()
+    {
+        var result = UnifiedImapSynchronizer.CalculateHighestKnownUid(
+            currentHighestKnownUid: 0,
+            uidNext: new MailKit.UniqueId(901),
+            observedUids: null);
+
+        result.Should().Be(900);
+    }
+
+    [Fact]
+    public void ShouldRunUidReconcile_ShouldReturnTrue_WhenNeverReconciled()
+    {
+        var shouldRun = UnifiedImapSynchronizer.ShouldRunUidReconcile(
+            lastUidReconcileUtc: null,
+            utcNow: DateTime.UtcNow,
+            reconcileInterval: TimeSpan.FromHours(12));
+
+        shouldRun.Should().BeTrue();
+    }
+
+    [Fact]
+    public void ShouldRunUidReconcile_ShouldReturnFalse_WhenWithinInterval()
+    {
+        var now = DateTime.UtcNow;
+
+        var shouldRun = UnifiedImapSynchronizer.ShouldRunUidReconcile(
+            lastUidReconcileUtc: now.AddHours(-1),
+            utcNow: now,
+            reconcileInterval: TimeSpan.FromHours(12));
+
+        shouldRun.Should().BeFalse();
+    }
+
+    [Fact]
+    public void ShouldRunUidReconcile_ShouldReturnTrue_WhenIntervalElapsed()
+    {
+        var now = DateTime.UtcNow;
+
+        var shouldRun = UnifiedImapSynchronizer.ShouldRunUidReconcile(
+            lastUidReconcileUtc: now.AddHours(-13),
+            utcNow: now,
+            reconcileInterval: TimeSpan.FromHours(12));
+
+        shouldRun.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task ProcessSummariesAsync_ShouldUseMetadataOnlyPackage()
+    {
+        var localFolder = new MailItemFolder
+        {
+            Id = Guid.NewGuid(),
+            MailAccountId = Guid.NewGuid(),
+            FolderName = "Inbox",
+            RemoteFolderId = "INBOX"
+        };
+
+        var summaryMock = new Mock<IMessageSummary>();
+        summaryMock.SetupGet(x => x.UniqueId).Returns(new UniqueId(42));
+        summaryMock.SetupGet(x => x.Flags).Returns(MessageFlags.None);
+
+        var mailServiceMock = new Mock<IMailService>();
+        mailServiceMock
+            .Setup(x => x.GetExistingMailsAsync(localFolder.Id, It.IsAny<IEnumerable<UniqueId>>()))
+            .ReturnsAsync(new List<MailCopy>());
+        mailServiceMock
+            .Setup(x => x.CreateMailAsync(localFolder.MailAccountId, It.IsAny<NewMailItemPackage>()))
+            .ReturnsAsync(true);
+
+        var sut = new UnifiedImapSynchronizer(
+            Mock.Of<IFolderService>(),
+            mailServiceMock.Object,
+            Mock.Of<IImapSynchronizerErrorHandlerFactory>());
+
+        ImapMessageCreationPackage? capturedPackage = null;
+
+        var imapSynchronizerMock = new Mock<IImapSynchronizer>();
+        imapSynchronizerMock
+            .Setup(x => x.CreateNewMailPackagesAsync(It.IsAny<ImapMessageCreationPackage>(), localFolder, It.IsAny<CancellationToken>()))
+            .Callback<ImapMessageCreationPackage, MailItemFolder, CancellationToken>((package, _, _) => capturedPackage = package)
+            .ReturnsAsync(new List<NewMailItemPackage>
+            {
+                new(new MailCopy { Id = "mail-id" }, null, localFolder.RemoteFolderId, Array.Empty<AccountContact>())
+            });
+
+        var processMethod = typeof(UnifiedImapSynchronizer).GetMethod("ProcessSummariesAsync", BindingFlags.Instance | BindingFlags.NonPublic);
+        processMethod.Should().NotBeNull();
+
+        var task = (Task<List<string>>)processMethod!.Invoke(
+            sut,
+            [imapSynchronizerMock.Object, localFolder, new List<IMessageSummary> { summaryMock.Object }, CancellationToken.None])!;
+
+        var result = await task;
+
+        result.Should().ContainSingle().Which.Should().Be("mail-id");
+        capturedPackage.Should().NotBeNull();
+        capturedPackage!.MimeMessage.Should().BeNull();
+    }
+}
diff --git a/Wino.Core.Tests/Wino.Core.Tests.csproj b/Wino.Core.Tests/Wino.Core.Tests.csproj
new file mode 100644
index 00000000..ce0461f6
--- /dev/null
+++ b/Wino.Core.Tests/Wino.Core.Tests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net10.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<IsPackable>false</IsPackable>
+		<IsTestProject>true</IsTestProject>
+		<IsAotCompatible>false</IsAotCompatible>
+		<IsTrimmable>false</IsTrimmable>
+		<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+		<EnableAotAnalyzer>false</EnableAotAnalyzer>
+		<EnableSingleFileAnalyzer>false</EnableSingleFileAnalyzer>
+		<Platforms>x86;x64;arm64</Platforms>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="xunit" />
+		<PackageReference Include="xunit.runner.visualstudio">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="FluentAssertions" />
+		<PackageReference Include="Moq" />
+		<PackageReference Include="Ical.Net" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj" />
+		<ProjectReference Include="..\Wino.Core\Wino.Core.csproj" />
+		<ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
+		<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/Wino.Core.UWP/AppThemes/TestTheme.xaml b/Wino.Core.UWP/AppThemes/TestTheme.xaml
deleted file mode 100644
index 903b065b..00000000
--- a/Wino.Core.UWP/AppThemes/TestTheme.xaml
+++ /dev/null
@@ -1,22 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <x:String x:Key="ThemeName">TestTheme.xaml</x:String>
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Name="Light">
-            <!--  Background Image  -->
-            <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/bg6.jpg</x:String>
-            <SolidColorBrush x:Key="ShellTitleBarBackgroundColorBrush">#A3FFFFFF</SolidColorBrush>
-            <SolidColorBrush x:Key="ShellNavigationViewBackgroundColorBrush">#A3FFFFFF</SolidColorBrush>
-            <SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#fdcb6e</SolidColorBrush>
-        </ResourceDictionary>
-        <ResourceDictionary x:Name="Dark">
-            <!--  Background Image  -->
-            <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/bg6.jpg</x:String>
-
-            <SolidColorBrush x:Key="ShellTitleBarBackgroundColorBrush">#A3000000</SolidColorBrush>
-            <SolidColorBrush x:Key="ShellNavigationViewBackgroundColorBrush">#A3000000</SolidColorBrush>
-            <SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush">#A3262626</SolidColorBrush>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
diff --git a/Wino.Core.UWP/Assets/WinoIcons.ttf b/Wino.Core.UWP/Assets/WinoIcons.ttf
deleted file mode 100644
index ef8acbf8..00000000
Binary files a/Wino.Core.UWP/Assets/WinoIcons.ttf and /dev/null differ
diff --git a/Wino.Core.UWP/BasePage.cs b/Wino.Core.UWP/BasePage.cs
deleted file mode 100644
index c39e454c..00000000
--- a/Wino.Core.UWP/BasePage.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Shell;
-
-namespace Wino.Core.UWP;
-
-public partial class BasePage : Page, IRecipient<LanguageChanged>
-{
-    public UIElement ShellContent
-    {
-        get { return (UIElement)GetValue(ShellContentProperty); }
-        set { SetValue(ShellContentProperty, value); }
-    }
-
-    public static readonly DependencyProperty ShellContentProperty = DependencyProperty.Register(nameof(ShellContent), typeof(UIElement), typeof(BasePage), new PropertyMetadata(null));
-
-    public void Receive(LanguageChanged message)
-    {
-        OnLanguageChanged();
-    }
-
-    public virtual void OnLanguageChanged() { }
-}
-
-public abstract class BasePage<T> : BasePage where T : CoreBaseViewModel
-{
-    public T ViewModel { get; } = WinoApplication.Current.Services.GetService<T>();
-
-    protected BasePage()
-    {
-        ViewModel.Dispatcher = new UWPDispatcher(Dispatcher);
-
-        Loaded += PageLoaded;
-        Unloaded += PageUnloaded;
-    }
-
-    private void PageUnloaded(object sender, RoutedEventArgs e)
-    {
-        Loaded -= PageLoaded;
-        Unloaded -= PageUnloaded;
-    }
-
-    private void PageLoaded(object sender, RoutedEventArgs e) => ViewModel.OnPageLoaded();
-
-    ~BasePage()
-    {
-        Debug.WriteLine($"Disposed {GetType().Name}");
-    }
-
-    [RequiresDynamicCode("AOT")]
-    [RequiresUnreferencedCode("AOT")]
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        var mode = GetNavigationMode(e.NavigationMode);
-        var parameter = e.Parameter;
-
-        WeakReferenceMessenger.Default.UnregisterAll(this);
-        WeakReferenceMessenger.Default.RegisterAll(this);
-
-        ViewModel.OnNavigatedTo(mode, parameter);
-    }
-
-    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
-    {
-        base.OnNavigatingFrom(e);
-
-        var mode = GetNavigationMode(e.NavigationMode);
-        var parameter = e.Parameter;
-
-        WeakReferenceMessenger.Default.UnregisterAll(this);
-
-        ViewModel.OnNavigatedFrom(mode, parameter);
-
-        GC.Collect();
-    }
-
-    private Domain.Models.Navigation.NavigationMode GetNavigationMode(NavigationMode mode)
-    {
-        return (Domain.Models.Navigation.NavigationMode)mode;
-    }
-}
diff --git a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml
deleted file mode 100644
index 4a3f5eab..00000000
--- a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml
+++ /dev/null
@@ -1,193 +0,0 @@
-<UserControl
-    x:Class="Wino.Core.UWP.Controls.WinoAppTitleBar"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:enums="using:Wino.Core.Domain.Enums"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    d:DesignHeight="300"
-    d:DesignWidth="400"
-    mc:Ignorable="d">
-
-    <Grid x:Name="MainGrid" Background="{ThemeResource AppBarBackgroundColor}">
-        <Grid
-            x:Name="dragbar"
-            Background="Transparent"
-            IsHitTestVisible="True" />
-
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="FluentButtonWidth" Width="Auto" />
-                <ColumnDefinition x:Name="EmptySpaceWidth" Width="*" />
-                <ColumnDefinition x:Name="SystemReservedWidth" Width="180" />
-            </Grid.ColumnDefinitions>
-
-            <!--  Shell Title Bar Left Side Background Placeholder  -->
-            <Grid Grid.ColumnSpan="3" />
-
-            <!--  Menu + Back Button  -->
-            <StackPanel
-                x:Name="LeftMenuStackPanel"
-                Orientation="Horizontal"
-                SizeChanged="TitlebarSizeChanged">
-                <Button
-                    x:Name="PaneButton"
-                    Width="48"
-                    Margin="-2,-2,0,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Stretch"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Click="PaneClicked"
-                    FocusVisualPrimaryThickness="0"
-                    FocusVisualSecondaryThickness="0"
-                    Visibility="{x:Bind IsMenuButtonVisible, Mode=OneWay}">
-                    <muxc:AnimatedIcon Width="16">
-                        <muxc:AnimatedIcon.Source>
-                            <animatedvisuals:AnimatedGlobalNavigationButtonVisualSource />
-                        </muxc:AnimatedIcon.Source>
-                        <muxc:AnimatedIcon.FallbackIconSource>
-                            <muxc:SymbolIconSource Symbol="GlobalNavigationButton" />
-                        </muxc:AnimatedIcon.FallbackIconSource>
-                    </muxc:AnimatedIcon>
-                </Button>
-                <Button
-                    x:Name="BackButton"
-                    Width="48"
-                    Margin="-2,4,4,4"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Stretch"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Click="BackClicked"
-                    Visibility="{x:Bind IsBackButtonVisible, Mode=OneWay}">
-                    <muxc:AnimatedIcon Width="16">
-                        <muxc:AnimatedIcon.Source>
-                            <animatedvisuals:AnimatedBackVisualSource />
-                        </muxc:AnimatedIcon.Source>
-                        <muxc:AnimatedIcon.FallbackIconSource>
-                            <muxc:SymbolIconSource Symbol="Back" />
-                        </muxc:AnimatedIcon.FallbackIconSource>
-                    </muxc:AnimatedIcon>
-                </Button>
-            </StackPanel>
-
-            <!--  CoreWindow Title  -->
-            <TextBlock
-                x:Name="CoreWindowTitleTextBlock"
-                Grid.Column="1"
-                Margin="4,0,0,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                FontWeight="SemiBold"
-                HorizontalTextAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}"
-                Text="{x:Bind CoreWindowText, Mode=OneWay}"
-                TextTrimming="Clip">
-                <animations:Implicit.ShowAnimations>
-                    <animations:OpacityAnimation
-                        From="0"
-                        To="1.0"
-                        Duration="0:0:1" />
-                </animations:Implicit.ShowAnimations>
-            </TextBlock>
-
-            <!--  Shell Sub Content  -->
-            <Grid Grid.Column="1" Canvas.ZIndex="999">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <ContentPresenter
-                    x:Name="ShellContentContainer"
-                    Content="{x:Bind ShellFrameContent, Mode=OneWay}"
-                    Visibility="{x:Bind IsShellFrameContentVisible, Mode=OneWay}">
-                    <ContentPresenter.ContentTransitions>
-                        <TransitionCollection>
-                            <PaneThemeTransition Edge="Top" />
-                        </TransitionCollection>
-                    </ContentPresenter.ContentTransitions>
-                </ContentPresenter>
-
-                <!--  Server disconnected button  -->
-                <Button
-                    x:Name="ConnectionStatusButton"
-                    Grid.Column="1"
-                    Margin="4,0,0,0"
-                    HorizontalAlignment="Left"
-                    ToolTipService.ToolTip="{x:Bind domain:Translator.TitleBarServerDisconnectedButton_Description}"
-                    Visibility="Collapsed">
-                    <Button.Flyout>
-                        <Flyout x:Name="ReconnectFlyout" Placement="Bottom">
-                            <StackPanel Spacing="12">
-                                <TextBlock
-                                    Width="250"
-                                    Text="{x:Bind domain:Translator.TitleBarServerDisconnectedButton_Description}"
-                                    TextWrapping="Wrap" />
-                                <Button
-                                    HorizontalAlignment="Right"
-                                    Click="ReconnectClicked"
-                                    Content="{x:Bind domain:Translator.TitleBarServerReconnectButton_Title}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <muxc:ProgressRing
-                            x:Name="ReconnectingProgressRing"
-                            Width="5"
-                            Height="5"
-                            Foreground="Lime"
-                            IsActive="True"
-                            Visibility="Collapsed" />
-                        <Viewbox
-                            x:Name="DisconnectedPathIcon"
-                            Width="16"
-                            Height="16">
-                            <PathIcon
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Data="F1 M 14.375 7.5 C 14.205729 7.5 14.059244 7.438151 13.935547 7.314453 C 13.811849 7.190756 13.75 7.044271 13.75 6.875 C 13.75 6.705729 13.811849 6.559245 13.935547 6.435547 C 14.059244 6.31185 14.205729 6.25 14.375 6.25 L 17.910156 6.25 C 17.558594 5.488281 17.104492 4.799805 16.547852 4.18457 C 15.991211 3.569336 15.367838 3.043621 14.677734 2.607422 C 13.98763 2.171225 13.245442 1.835938 12.451172 1.601562 C 11.6569 1.367188 10.839844 1.25 10 1.25 L 9.912109 1.25 C 9.182942 1.25 8.468424 1.344402 7.768555 1.533203 C 7.068685 1.722006 6.404622 1.988934 5.776367 2.333984 C 5.148112 2.679037 4.567057 3.098959 4.033203 3.59375 C 3.499349 4.088542 3.033854 4.638672 2.636719 5.244141 C 2.389323 5.628256 2.174479 6.028646 1.992188 6.445312 C 1.946615 6.549479 1.907552 6.655273 1.875 6.762695 C 1.842448 6.870117 1.80013 6.975912 1.748047 7.080078 C 1.689453 7.210287 1.614583 7.312826 1.523438 7.387695 C 1.432292 7.462565 1.311849 7.5 1.162109 7.5 C 0.986328 7.5 0.838216 7.439779 0.717773 7.319336 C 0.597331 7.198895 0.537109 7.050782 0.537109 6.875 C 0.537109 6.809896 0.546875 6.741537 0.566406 6.669922 C 0.904948 5.69336 1.386719 4.796551 2.011719 3.979492 C 2.636719 3.162436 3.361002 2.459311 4.18457 1.870117 C 5.008138 1.280926 5.906575 0.821941 6.879883 0.493164 C 7.85319 0.164389 8.857422 0 9.892578 0 C 10.810547 0 11.705729 0.115561 12.578125 0.34668 C 13.45052 0.577801 14.269205 0.914715 15.03418 1.357422 C 15.799153 1.800131 16.497395 2.340496 17.128906 2.978516 C 17.760416 3.616537 18.300781 4.342448 18.75 5.15625 L 18.75 1.875 C 18.75 1.70573 18.811848 1.559246 18.935547 1.435547 C 19.059244 1.31185 19.205729 1.25 19.375 1.25 C 19.54427 1.25 19.690754 1.31185 19.814453 1.435547 C 19.93815 1.559246 20 1.70573 20 1.875 L 20 6.875 C 20 7.044271 19.93815 7.190756 19.814453 7.314453 C 19.690754 7.438151 19.54427 7.5 19.375 7.5 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 15 14.375 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 14.375 C 13.75 14.544271 13.811849 14.690756 13.935547 14.814453 C 14.059244 14.938151 14.205729 15 14.375 15 C 14.544271 15 14.690755 14.938151 14.814453 14.814453 C 14.93815 14.690756 14.999999 14.544271 15 14.375 Z M 9.863281 20 C 8.984375 20 8.125 19.886068 7.285156 19.658203 C 6.445312 19.430338 5.651042 19.104818 4.902344 18.681641 C 4.153646 18.258463 3.466797 17.742514 2.841797 17.133789 C 2.216797 16.525066 1.686198 15.839844 1.25 15.078125 L 1.25 18.125 C 1.25 18.294271 1.188151 18.440756 1.064453 18.564453 C 0.940755 18.68815 0.794271 18.75 0.625 18.75 C 0.455729 18.75 0.309245 18.68815 0.185547 18.564453 C 0.061849 18.440756 0 18.294271 0 18.125 L 0 13.125 C 0 12.955729 0.061849 12.809245 0.185547 12.685547 C 0.309245 12.56185 0.455729 12.5 0.625 12.5 L 5.625 12.5 C 5.794271 12.5 5.940755 12.56185 6.064453 12.685547 C 6.188151 12.809245 6.25 12.955729 6.25 13.125 C 6.25 13.294271 6.188151 13.440756 6.064453 13.564453 C 5.940755 13.688151 5.794271 13.75 5.625 13.75 L 1.962891 13.75 C 2.275391 14.407553 2.661133 15.013021 3.120117 15.566406 C 3.579101 16.119793 4.095052 16.608074 4.667969 17.03125 C 5.240885 17.454428 5.859375 17.80599 6.523438 18.085938 C 7.1875 18.365885 7.880859 18.557943 8.603516 18.662109 C 8.792317 18.916016 8.994141 19.153646 9.208984 19.375 C 9.423828 19.596354 9.654947 19.804688 9.902344 20 Z M 15.15625 16.875 C 15.15625 16.660156 15.079752 16.476236 14.926758 16.323242 C 14.773763 16.170248 14.589844 16.09375 14.375 16.09375 C 14.160156 16.09375 13.976236 16.170248 13.823242 16.323242 C 13.670246 16.476236 13.593749 16.660156 13.59375 16.875 C 13.593749 17.089844 13.670246 17.273764 13.823242 17.426758 C 13.976236 17.579752 14.160156 17.65625 14.375 17.65625 C 14.589844 17.65625 14.773763 17.579752 14.926758 17.426758 C 15.079752 17.273764 15.15625 17.089844 15.15625 16.875 Z " />
-                        </Viewbox>
-                        <TextBlock
-                            x:Name="ConnectionStatusTextBlock"
-                            VerticalAlignment="Center"
-                            Text="{x:Bind domain:Translator.TitleBarServerDisconnectedButton_Title}" />
-                    </StackPanel>
-                </Button>
-            </Grid>
-        </Grid>
-
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="ServerConnectionStatus">
-                <VisualState x:Name="Connected" />
-                <VisualState x:Name="Connecting">
-                    <VisualState.Setters>
-                        <Setter Target="ReconnectingProgressRing.Visibility" Value="Visible" />
-                        <Setter Target="ConnectionStatusButton.Visibility" Value="Visible" />
-                        <Setter Target="DisconnectedPathIcon.Visibility" Value="Collapsed" />
-                        <Setter Target="ConnectionStatusTextBlock.Text" Value="{x:Bind domain:Translator.TitleBarServerReconnectingButton_Title}" />
-                    </VisualState.Setters>
-                    <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.ConnectionStatusEquals(ConnectionStatus, enums:WinoServerConnectionStatus.Connecting), Mode=OneWay}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-                <VisualState x:Name="Disconnected">
-                    <VisualState.Setters>
-                        <Setter Target="ConnectionStatusButton.Visibility" Value="Visible" />
-                        <Setter Target="DisconnectedPathIcon.Visibility" Value="Visible" />
-                        <Setter Target="ReconnectingProgressRing.Visibility" Value="Collapsed" />
-                        <Setter Target="ConnectionStatusTextBlock.Text" Value="{x:Bind domain:Translator.TitleBarServerDisconnectedButton_Title}" />
-                    </VisualState.Setters>
-                    <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.ConnectionStatusEquals(ConnectionStatus, enums:WinoServerConnectionStatus.Disconnected), Mode=OneWay}" />
-                    </VisualState.StateTriggers>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-    </Grid>
-</UserControl>
diff --git a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs b/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs
deleted file mode 100644
index 734650a6..00000000
--- a/Wino.Core.UWP/Controls/WinoAppTitleBar.xaml.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-using System.Windows.Input;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-
-namespace Wino.Core.UWP.Controls;
-
-public sealed partial class WinoAppTitleBar : UserControl
-{
-    public event TypedEventHandler<WinoAppTitleBar, RoutedEventArgs> BackButtonClicked;
-
-    public static readonly DependencyProperty IsRenderingPaneVisibleProperty = DependencyProperty.Register(nameof(IsRenderingPaneVisible), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(false, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty IsReaderNarrowedProperty = DependencyProperty.Register(nameof(IsReaderNarrowed), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(false, OnIsReaderNarrowedChanged));
-    public static readonly DependencyProperty IsBackButtonVisibleProperty = DependencyProperty.Register(nameof(IsBackButtonVisible), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(false, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty OpenPaneLengthProperty = DependencyProperty.Register(nameof(OpenPaneLength), typeof(double), typeof(WinoAppTitleBar), new PropertyMetadata(0d, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty IsNavigationPaneOpenProperty = DependencyProperty.Register(nameof(IsNavigationPaneOpen), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(false, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty NavigationViewDisplayModeProperty = DependencyProperty.Register(nameof(NavigationViewDisplayMode), typeof(Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode), typeof(WinoAppTitleBar), new PropertyMetadata(Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Compact, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty ShellFrameContentProperty = DependencyProperty.Register(nameof(ShellFrameContent), typeof(UIElement), typeof(WinoAppTitleBar), new PropertyMetadata(null, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty SystemReservedProperty = DependencyProperty.Register(nameof(SystemReserved), typeof(double), typeof(WinoAppTitleBar), new PropertyMetadata(0, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty CoreWindowTextProperty = DependencyProperty.Register(nameof(CoreWindowText), typeof(string), typeof(WinoAppTitleBar), new PropertyMetadata(string.Empty, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty ReadingPaneLengthProperty = DependencyProperty.Register(nameof(ReadingPaneLength), typeof(double), typeof(WinoAppTitleBar), new PropertyMetadata(420d, OnDrawingPropertyChanged));
-    public static readonly DependencyProperty ConnectionStatusProperty = DependencyProperty.Register(nameof(ConnectionStatus), typeof(WinoServerConnectionStatus), typeof(WinoAppTitleBar), new PropertyMetadata(WinoServerConnectionStatus.None, new PropertyChangedCallback(OnConnectionStatusChanged)));
-    public static readonly DependencyProperty ReconnectCommandProperty = DependencyProperty.Register(nameof(ReconnectCommand), typeof(ICommand), typeof(WinoAppTitleBar), new PropertyMetadata(null));
-    public static readonly DependencyProperty ShrinkShellContentOnExpansionProperty = DependencyProperty.Register(nameof(ShrinkShellContentOnExpansion), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsDragAreaProperty = DependencyProperty.Register(nameof(IsDragArea), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(false, new PropertyChangedCallback(OnIsDragAreaChanged)));
-    public static readonly DependencyProperty IsShellFrameContentVisibleProperty = DependencyProperty.Register(nameof(IsShellFrameContentVisible), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsMenuButtonVisibleProperty = DependencyProperty.Register(nameof(IsMenuButtonVisible), typeof(bool), typeof(WinoAppTitleBar), new PropertyMetadata(true));
-
-    public bool IsShellFrameContentVisible
-    {
-        get { return (bool)GetValue(IsShellFrameContentVisibleProperty); }
-        set { SetValue(IsShellFrameContentVisibleProperty, value); }
-    }
-
-    public ICommand ReconnectCommand
-    {
-        get { return (ICommand)GetValue(ReconnectCommandProperty); }
-        set { SetValue(ReconnectCommandProperty, value); }
-    }
-
-    public WinoServerConnectionStatus ConnectionStatus
-    {
-        get { return (WinoServerConnectionStatus)GetValue(ConnectionStatusProperty); }
-        set { SetValue(ConnectionStatusProperty, value); }
-    }
-
-    public string CoreWindowText
-    {
-        get { return (string)GetValue(CoreWindowTextProperty); }
-        set { SetValue(CoreWindowTextProperty, value); }
-    }
-
-    public bool IsDragArea
-    {
-        get { return (bool)GetValue(IsDragAreaProperty); }
-        set { SetValue(IsDragAreaProperty, value); }
-    }
-
-
-    public double SystemReserved
-    {
-        get { return (double)GetValue(SystemReservedProperty); }
-        set { SetValue(SystemReservedProperty, value); }
-    }
-
-    public UIElement ShellFrameContent
-    {
-        get { return (UIElement)GetValue(ShellFrameContentProperty); }
-        set { SetValue(ShellFrameContentProperty, value); }
-    }
-
-    public Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode NavigationViewDisplayMode
-    {
-        get { return (Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode)GetValue(NavigationViewDisplayModeProperty); }
-        set { SetValue(NavigationViewDisplayModeProperty, value); }
-    }
-
-    public bool ShrinkShellContentOnExpansion
-    {
-        get { return (bool)GetValue(ShrinkShellContentOnExpansionProperty); }
-        set { SetValue(ShrinkShellContentOnExpansionProperty, value); }
-    }
-
-    public bool IsNavigationPaneOpen
-    {
-        get { return (bool)GetValue(IsNavigationPaneOpenProperty); }
-        set { SetValue(IsNavigationPaneOpenProperty, value); }
-    }
-
-    public double OpenPaneLength
-    {
-        get { return (double)GetValue(OpenPaneLengthProperty); }
-        set { SetValue(OpenPaneLengthProperty, value); }
-    }
-
-
-
-    public bool IsMenuButtonVisible
-    {
-        get { return (bool)GetValue(IsMenuButtonVisibleProperty); }
-        set { SetValue(IsMenuButtonVisibleProperty, value); }
-    }
-
-
-    public bool IsBackButtonVisible
-    {
-        get { return (bool)GetValue(IsBackButtonVisibleProperty); }
-        set { SetValue(IsBackButtonVisibleProperty, value); }
-    }
-
-    public bool IsReaderNarrowed
-    {
-        get { return (bool)GetValue(IsReaderNarrowedProperty); }
-        set { SetValue(IsReaderNarrowedProperty, value); }
-    }
-
-    public bool IsRenderingPaneVisible
-    {
-        get { return (bool)GetValue(IsRenderingPaneVisibleProperty); }
-        set { SetValue(IsRenderingPaneVisibleProperty, value); }
-    }
-
-    public double ReadingPaneLength
-    {
-        get { return (double)GetValue(ReadingPaneLengthProperty); }
-        set { SetValue(ReadingPaneLengthProperty, value); }
-    }
-
-    private static void OnIsReaderNarrowedChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoAppTitleBar bar)
-        {
-            bar.DrawTitleBar();
-        }
-    }
-
-    private static void OnDrawingPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoAppTitleBar bar)
-        {
-            bar.DrawTitleBar();
-        }
-    }
-
-    private static void OnConnectionStatusChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoAppTitleBar bar)
-        {
-            bar.UpdateConnectionStatus();
-        }
-    }
-
-    private static void OnIsDragAreaChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoAppTitleBar bar)
-        {
-            bar.SetDragArea();
-        }
-    }
-
-    private void SetDragArea()
-    {
-        if (IsDragArea)
-        {
-            Window.Current.SetTitleBar(dragbar);
-        }
-    }
-
-    private void UpdateConnectionStatus()
-    {
-
-    }
-
-    private void DrawTitleBar()
-    {
-        UpdateLayout();
-
-        CoreWindowTitleTextBlock.Visibility = Visibility.Collapsed;
-        ShellContentContainer.Width = double.NaN;
-        ShellContentContainer.Margin = new Thickness(0, 0, 0, 0);
-        ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Stretch;
-
-        EmptySpaceWidth.Width = new GridLength(1, GridUnitType.Star);
-
-        // Menu is not visible.
-        if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Minimal)
-        {
-
-        }
-        else if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Compact)
-        {
-            // Icons are visible.
-
-            if (!IsReaderNarrowed && ShrinkShellContentOnExpansion)
-            {
-                ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
-                ShellContentContainer.Width = ReadingPaneLength;
-            }
-        }
-        else if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Expanded)
-        {
-            if (IsNavigationPaneOpen)
-            {
-                CoreWindowTitleTextBlock.Visibility = Visibility.Visible;
-
-                // LMargin = OpenPaneLength - LeftMenuStackPanel
-                ShellContentContainer.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
-
-                if (!IsReaderNarrowed && ShrinkShellContentOnExpansion)
-                {
-                    ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
-                    ShellContentContainer.Width = ReadingPaneLength;
-                }
-            }
-            else
-            {
-                if (ShrinkShellContentOnExpansion)
-                {
-                    EmptySpaceWidth.Width = new GridLength(ReadingPaneLength, GridUnitType.Pixel);
-                }
-                else
-                {
-                    EmptySpaceWidth.Width = new GridLength(ReadingPaneLength, GridUnitType.Star);
-                }
-            }
-        }
-    }
-
-    public WinoAppTitleBar()
-    {
-        InitializeComponent();
-    }
-
-    private void BackClicked(object sender, RoutedEventArgs e)
-    {
-        BackButtonClicked?.Invoke(this, e);
-    }
-
-    private void PaneClicked(object sender, RoutedEventArgs e)
-    {
-        IsNavigationPaneOpen = !IsNavigationPaneOpen;
-    }
-
-    private void TitlebarSizeChanged(object sender, SizeChangedEventArgs e) => DrawTitleBar();
-
-    private void ReconnectClicked(object sender, RoutedEventArgs e)
-    {
-        // Close the popup for reconnect button.
-        ReconnectFlyout.Hide();
-
-        // Execute the reconnect command.
-        ReconnectCommand?.Execute(null);
-    }
-}
diff --git a/Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml b/Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml
deleted file mode 100644
index e7bcd9ce..00000000
--- a/Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<ContentDialog
-    x:Class="Wino.Dialogs.AccountPickerDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Title="{x:Bind domain:Translator.AccountPickerDialog_Title}"
-    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
-    Style="{StaticResource WinoDialogStyle}"
-    mc:Ignorable="d">
-
-    <ListView
-        DisplayMemberPath="Address"
-        IsItemClickEnabled="True"
-        ItemClick="AccountClicked"
-        ItemsSource="{x:Bind AvailableAccounts}"
-        SelectionMode="None" />
-</ContentDialog>
diff --git a/Wino.Core.UWP/Dispatcher.cs b/Wino.Core.UWP/Dispatcher.cs
deleted file mode 100644
index 34b5b576..00000000
--- a/Wino.Core.UWP/Dispatcher.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Windows.UI.Core;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Core.UWP;
-
-public class UWPDispatcher : IDispatcher
-{
-    private readonly CoreDispatcher _coreDispatcher;
-
-    public UWPDispatcher(CoreDispatcher coreDispatcher)
-    {
-        _coreDispatcher = coreDispatcher;
-    }
-
-    public Task ExecuteOnUIThread(Action action)
-        => _coreDispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).AsTask();
-}
diff --git a/Wino.Core.UWP/Extensions/CompositionExtensions.Size.cs b/Wino.Core.UWP/Extensions/CompositionExtensions.Size.cs
deleted file mode 100644
index 93bcb248..00000000
--- a/Wino.Core.UWP/Extensions/CompositionExtensions.Size.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using System;
-using System.Numerics;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
-
-namespace Wino.Extensions;
-
-public static partial class CompositionExtensions
-{
-    public static void StartSizeAnimation(this UIElement element, Vector2? from = null, Vector2? to = null,
-        double duration = 800, int delay = 0, CompositionEasingFunction easing = null, Action completed = null,
-        AnimationIterationBehavior iterationBehavior = AnimationIterationBehavior.Count)
-    {
-        CompositionScopedBatch batch = null;
-
-        var visual = element.Visual();
-        var compositor = visual.Compositor;
-
-        if (completed != null)
-        {
-            batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-            batch.Completed += (s, e) => completed();
-        }
-
-        if (to == null)
-        {
-            to = Vector2.One;
-        }
-
-        visual.StartAnimation("Size",
-            compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
-
-        batch?.End();
-    }
-
-    public static void StartSizeAnimation(this Visual visual, Vector2? from = null, Vector2? to = null,
-        double duration = 800, int delay = 0, CompositionEasingFunction easing = null, Action completed = null,
-        AnimationIterationBehavior iterationBehavior = AnimationIterationBehavior.Count)
-    {
-        CompositionScopedBatch batch = null;
-        var compositor = visual.Compositor;
-
-        if (completed != null)
-        {
-            batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-            batch.Completed += (s, e) => completed();
-        }
-
-        if (to == null)
-        {
-            to = Vector2.One;
-        }
-
-        visual.StartAnimation("Size",
-            compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
-
-        batch?.End();
-    }
-
-    public static Task StartSizeAnimationAsync(this UIElement element, Vector2? from = null, Vector2? to = null,
-        double duration = 800, int delay = 0, CompositionEasingFunction easing = null,
-        AnimationIterationBehavior iterationBehavior = AnimationIterationBehavior.Count)
-    {
-        CompositionScopedBatch batch;
-
-        var visual = element.Visual();
-        var compositor = visual.Compositor;
-
-        var taskSource = new TaskCompletionSource<bool>();
-
-        void Completed(object o, CompositionBatchCompletedEventArgs e)
-        {
-            batch.Completed -= Completed;
-            taskSource.SetResult(true);
-        }
-
-        batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-        batch.Completed += Completed;
-
-        if (to == null)
-        {
-            to = Vector2.One;
-        }
-
-        visual.StartAnimation("Size",
-            compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
-
-        batch.End();
-
-        return taskSource.Task;
-    }
-
-    public static Task StartSizeAnimationAsync(this Visual visual, Vector2? from = null, Vector2? to = null,
-        double duration = 800, int delay = 0, CompositionEasingFunction easing = null,
-        AnimationIterationBehavior iterationBehavior = AnimationIterationBehavior.Count)
-    {
-        CompositionScopedBatch batch;
-
-        var compositor = visual.Compositor;
-
-        var taskSource = new TaskCompletionSource<bool>();
-
-        void Completed(object o, CompositionBatchCompletedEventArgs e)
-        {
-            batch.Completed -= Completed;
-            taskSource.SetResult(true);
-        }
-
-        batch = compositor.CreateScopedBatch(CompositionBatchTypes.Animation);
-        batch.Completed += Completed;
-
-        if (to == null)
-        {
-            to = Vector2.One;
-        }
-
-        visual.StartAnimation("Size",
-            compositor.CreateVector2KeyFrameAnimation(from, to.Value, duration, delay, easing, iterationBehavior));
-
-        batch.End();
-
-        return taskSource.Task;
-    }
-
-}
diff --git a/Wino.Core.UWP/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Core.UWP/Selectors/AppThemePreviewTemplateSelector.cs
deleted file mode 100644
index 6ed85638..00000000
--- a/Wino.Core.UWP/Selectors/AppThemePreviewTemplateSelector.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.UWP.Models.Personalization;
-
-namespace Wino.Core.UWP.Selectors;
-
-public partial class AppThemePreviewTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate SystemThemeTemplate { get; set; }
-    public DataTemplate PreDefinedThemeTemplate { get; set; }
-    public DataTemplate CustomAppTemplate { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item)
-    {
-        if (item is SystemAppTheme)
-            return SystemThemeTemplate;
-        else if (item is PreDefinedAppTheme)
-            return PreDefinedThemeTemplate;
-        else if (item is CustomAppTheme)
-            return CustomAppTemplate;
-
-        return base.SelectTemplateCore(item);
-    }
-}
diff --git a/Wino.Core.UWP/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Core.UWP/Selectors/NavigationMenuTemplateSelector.cs
deleted file mode 100644
index 516f82ca..00000000
--- a/Wino.Core.UWP/Selectors/NavigationMenuTemplateSelector.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.MenuItems;
-
-namespace Wino.Core.UWP.Selectors;
-
-public partial class NavigationMenuTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate MenuItemTemplate { get; set; }
-    public DataTemplate AccountManagementTemplate { get; set; }
-    public DataTemplate ClickableAccountMenuTemplate { get; set; }
-    public DataTemplate MergedAccountTemplate { get; set; }
-    public DataTemplate MergedAccountFolderTemplate { get; set; }
-    public DataTemplate MergedAccountMoreExpansionItemTemplate { get; set; }
-    public DataTemplate FolderMenuTemplate { get; set; }
-    public DataTemplate SettingsItemTemplate { get; set; }
-    public DataTemplate MoreItemsFolderTemplate { get; set; }
-    public DataTemplate RatingItemTemplate { get; set; }
-    public DataTemplate CreateNewFolderTemplate { get; set; }
-    public DataTemplate SeperatorTemplate { get; set; }
-    public DataTemplate NewMailTemplate { get; set; }
-    public DataTemplate CategoryItemsTemplate { get; set; }
-    public DataTemplate FixAuthenticationIssueTemplate { get; set; }
-    public DataTemplate FixMissingFolderConfigTemplate { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item)
-    {
-        if (item is NewMailMenuItem)
-            return NewMailTemplate;
-        else if (item is SettingsItem)
-            return SettingsItemTemplate;
-        else if (item is SeperatorItem)
-            return SeperatorTemplate;
-        else if (item is AccountMenuItem accountMenuItem)
-            // Merged inbox account menu items must be nested.
-            return ClickableAccountMenuTemplate;
-        else if (item is ManageAccountsMenuItem)
-            return AccountManagementTemplate;
-        else if (item is RateMenuItem)
-            return RatingItemTemplate;
-        else if (item is MergedAccountMenuItem)
-            return MergedAccountTemplate;
-        else if (item is MergedAccountMoreFolderMenuItem)
-            return MergedAccountMoreExpansionItemTemplate;
-        else if (item is MergedAccountFolderMenuItem)
-            return MergedAccountFolderTemplate;
-        else if (item is FolderMenuItem)
-            return FolderMenuTemplate;
-        else if (item is FixAccountIssuesMenuItem fixAccountIssuesMenuItem)
-            return fixAccountIssuesMenuItem.Account.AttentionReason == Domain.Enums.AccountAttentionReason.MissingSystemFolderConfiguration
-                    ? FixMissingFolderConfigTemplate : FixAuthenticationIssueTemplate;
-        else
-        {
-            var type = item.GetType();
-            return null;
-        }
-    }
-}
diff --git a/Wino.Core.UWP/Services/BackgroundTaskService.cs b/Wino.Core.UWP/Services/BackgroundTaskService.cs
deleted file mode 100644
index 829f1b8f..00000000
--- a/Wino.Core.UWP/Services/BackgroundTaskService.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using Serilog;
-using Windows.ApplicationModel.Background;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Core.UWP.Services;
-
-public class BackgroundTaskService : IBackgroundTaskService
-{
-    private const string IsBackgroundTasksUnregisteredKey = nameof(IsBackgroundTasksUnregisteredKey);
-    public const string ToastNotificationActivationHandlerTaskName = "ToastNotificationActivationHandlerTask";
-
-    private readonly IConfigurationService _configurationService;
-
-    public BackgroundTaskService(IConfigurationService configurationService)
-    {
-        _configurationService = configurationService;
-    }
-
-    public void UnregisterAllBackgroundTask()
-    {
-        if (_configurationService.Get(IsBackgroundTasksUnregisteredKey, false))
-        {
-            foreach (var task in BackgroundTaskRegistration.AllTasks)
-            {
-                task.Value.Unregister(true);
-            }
-
-            Log.Information("Unregistered all background tasks.");
-            _configurationService.Set(IsBackgroundTasksUnregisteredKey, true);
-        }
-    }
-
-    public Task RegisterBackgroundTasksAsync()
-    {
-        return RegisterToastNotificationHandlerBackgroundTaskAsync();
-    }
-
-    public async Task RegisterToastNotificationHandlerBackgroundTaskAsync()
-    {
-        // If background task is already registered, do nothing.
-        if (BackgroundTaskRegistration.AllTasks.Any(i => i.Value.Name.Equals(ToastNotificationActivationHandlerTaskName)))
-            return;
-
-        // Otherwise request access
-        BackgroundAccessStatus status = await BackgroundExecutionManager.RequestAccessAsync();
-
-        // Create the background task
-        BackgroundTaskBuilder builder = new BackgroundTaskBuilder()
-        {
-            Name = ToastNotificationActivationHandlerTaskName
-        };
-
-        // Assign the toast action trigger
-        builder.SetTrigger(new ToastNotificationActionTrigger());
-
-        // And register the task
-        BackgroundTaskRegistration registration = builder.Register();
-    }
-}
diff --git a/Wino.Core.UWP/Services/KeyPressService.cs b/Wino.Core.UWP/Services/KeyPressService.cs
deleted file mode 100644
index 664682ee..00000000
--- a/Wino.Core.UWP/Services/KeyPressService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Windows.System;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Core.UWP.Services;
-
-public class KeyPressService : IKeyPressService
-{
-    public bool IsCtrlKeyPressed()
-        => Window.Current?.CoreWindow?.GetKeyState(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down) ?? false;
-
-    public bool IsShiftKeyPressed()
-        => Window.Current?.CoreWindow?.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down) ?? false;
-}
diff --git a/Wino.Core.UWP/Services/NotificationBuilder.cs b/Wino.Core.UWP/Services/NotificationBuilder.cs
deleted file mode 100644
index 722979c3..00000000
--- a/Wino.Core.UWP/Services/NotificationBuilder.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.WinUI.Notifications;
-using Serilog;
-using Windows.Data.Xml.Dom;
-using Windows.UI.Notifications;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Messaging.UI;
-
-namespace Wino.Core.UWP.Services;
-
-// TODO: Refactor this thing. It's garbage.
-
-public class NotificationBuilder : INotificationBuilder
-{
-    private readonly IUnderlyingThemeService _underlyingThemeService;
-    private readonly IAccountService _accountService;
-    private readonly IFolderService _folderService;
-    private readonly IMailService _mailService;
-    private readonly IThumbnailService _thumbnailService;
-
-    public NotificationBuilder(IUnderlyingThemeService underlyingThemeService,
-                               IAccountService accountService,
-                               IFolderService folderService,
-                               IMailService mailService,
-                               IThumbnailService thumbnailService)
-    {
-        _underlyingThemeService = underlyingThemeService;
-        _accountService = accountService;
-        _folderService = folderService;
-        _mailService = mailService;
-        _thumbnailService = thumbnailService;
-
-        WeakReferenceMessenger.Default.Register<MailReadStatusChanged>(this, (r, msg) =>
-        {
-            RemoveNotification(msg.UniqueId);
-        });
-    }
-
-    public async Task CreateNotificationsAsync(Guid inboxFolderId, IEnumerable<IMailItem> downloadedMailItems)
-    {
-        var mailCount = downloadedMailItems.Count();
-
-        try
-        {
-            // If there are more than 3 mails, just display 1 general toast.
-            if (mailCount > 3)
-            {
-                var builder = new ToastContentBuilder();
-                builder.SetToastScenario(ToastScenario.Default);
-
-                builder.AddText(Translator.Notifications_MultipleNotificationsTitle);
-                builder.AddText(string.Format(Translator.Notifications_MultipleNotificationsMessage, mailCount));
-
-                builder.AddButton(GetDismissButton());
-                builder.AddAudio(new ToastAudio()
-                {
-                    Src = new Uri("ms-winsoundevent:Notification.Mail")
-                });
-
-                builder.Show();
-            }
-            else
-            {
-                var validItems = new List<IMailItem>();
-
-                // Fetch mails again to fill up assigned folder data and latest statuses.
-                // They've been marked as read by executing synchronizer tasks until inital sync finishes.
-
-                foreach (var item in downloadedMailItems)
-                {
-                    var mailItem = await _mailService.GetSingleMailItemAsync(item.UniqueId);
-
-                    if (mailItem != null && mailItem.AssignedFolder != null)
-                    {
-                        validItems.Add(mailItem);
-                    }
-                }
-
-                foreach (var mailItem in validItems)
-                {
-                    if (mailItem.IsRead)
-                    {
-                        // Remove the notification for a specific mail if it exists
-                        ToastNotificationManager.History.Remove(mailItem.UniqueId.ToString());
-                        continue;
-                    }
-
-                    var builder = new ToastContentBuilder();
-                    builder.SetToastScenario(ToastScenario.Default);
-
-                    var avatarThumbnail = await _thumbnailService.GetThumbnailAsync(mailItem.FromAddress, awaitLoad: true);
-                    if (!string.IsNullOrEmpty(avatarThumbnail))
-                    {
-                        var tempFile = await Windows.Storage.ApplicationData.Current.TemporaryFolder.CreateFileAsync($"{Guid.NewGuid()}.png", Windows.Storage.CreationCollisionOption.ReplaceExisting);
-                        await using (var stream = await tempFile.OpenStreamForWriteAsync())
-                        {
-                            var bytes = Convert.FromBase64String(avatarThumbnail);
-                            await stream.WriteAsync(bytes);
-                        }
-                        builder.AddAppLogoOverride(new Uri($"ms-appdata:///temp/{tempFile.Name}"), hintCrop: ToastGenericAppLogoCrop.Default);
-                    }
-
-                    // Override system notification timetamp with received date of the mail.
-                    // It may create confusion for some users, but still it's the truth...
-                    builder.AddCustomTimeStamp(mailItem.CreationDate.ToLocalTime());
-
-                    builder.AddText(mailItem.FromName);
-                    builder.AddText(mailItem.Subject);
-                    builder.AddText(mailItem.PreviewText);
-
-                    builder.AddArgument(Constants.ToastMailUniqueIdKey, mailItem.UniqueId.ToString());
-                    builder.AddArgument(Constants.ToastActionKey, MailOperation.Navigate);
-
-                    builder.AddButton(GetMarkAsReadButton(mailItem.UniqueId));
-                    builder.AddButton(GetDeleteButton(mailItem.UniqueId));
-                    builder.AddButton(GetArchiveButton(mailItem.UniqueId));
-                    builder.AddAudio(new ToastAudio()
-                    {
-                        Src = new Uri("ms-winsoundevent:Notification.Mail")
-                    });
-
-                    // Use UniqueId as tag to allow removal
-                    builder.Show(toast => toast.Tag = mailItem.UniqueId.ToString());
-                }
-
-                await UpdateTaskbarIconBadgeAsync();
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to create notifications.");
-        }
-    }
-
-    private ToastButton GetDismissButton()
-        => new ToastButton()
-        .SetDismissActivation()
-        .SetImageUri(new Uri("ms-appx:///Assets/NotificationIcons/dismiss.png"));
-
-    private static ToastButton GetArchiveButton(Guid mailUniqueId)
-        => new ToastButton()
-        .SetContent(Translator.MailOperation_Archive)
-        .SetImageUri(new Uri("ms-appx:///Assets/NotificationIcons/archive.png"))
-        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
-        .AddArgument(Constants.ToastActionKey, MailOperation.Archive)
-        .SetBackgroundActivation();
-
-    private ToastButton GetDeleteButton(Guid mailUniqueId)
-        => new ToastButton()
-        .SetContent(Translator.MailOperation_Delete)
-        .SetImageUri(new Uri("ms-appx:///Assets/NotificationIcons/delete.png"))
-        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
-        .AddArgument(Constants.ToastActionKey, MailOperation.SoftDelete)
-        .SetBackgroundActivation();
-
-    private static ToastButton GetMarkAsReadButton(Guid mailUniqueId)
-        => new ToastButton()
-        .SetContent(Translator.MailOperation_MarkAsRead)
-        .SetImageUri(new System.Uri("ms-appx:///Assets/NotificationIcons/markread.png"))
-        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
-        .AddArgument(Constants.ToastActionKey, MailOperation.MarkAsRead)
-        .SetBackgroundActivation();
-
-    public async Task UpdateTaskbarIconBadgeAsync()
-    {
-        int totalUnreadCount = 0;
-
-        try
-        {
-            var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication();
-            var accounts = await _accountService.GetAccountsAsync();
-
-            foreach (var account in accounts)
-            {
-                if (!account.Preferences.IsTaskbarBadgeEnabled) continue;
-
-                var accountInbox = await _folderService.GetSpecialFolderByAccountIdAsync(account.Id, SpecialFolderType.Inbox);
-
-                if (accountInbox == null)
-                    continue;
-
-                var inboxUnreadCount = await _folderService.GetFolderNotificationBadgeAsync(accountInbox.Id);
-
-                totalUnreadCount += inboxUnreadCount;
-            }
-
-            if (totalUnreadCount > 0)
-            {
-                // Get the blank badge XML payload for a badge number
-                XmlDocument badgeXml = BadgeUpdateManager.GetTemplateContent(BadgeTemplateType.BadgeNumber);
-
-                // Set the value of the badge in the XML to our number
-                XmlElement badgeElement = badgeXml.SelectSingleNode("/badge") as XmlElement;
-                badgeElement.SetAttribute("value", totalUnreadCount.ToString());
-
-                // Create the badge notification
-                BadgeNotification badge = new BadgeNotification(badgeXml);
-
-                // And update the badge
-                badgeUpdater.Update(badge);
-            }
-            else
-                badgeUpdater.Clear();
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Error while updating taskbar badge.");
-        }
-    }
-
-    public async Task CreateTestNotificationAsync(string title, string message)
-    {
-        // with args test.
-        await CreateNotificationsAsync(Guid.Parse("28c3c39b-7147-4de3-b209-949bd19eede6"), new List<IMailItem>()
-        {
-            new MailCopy()
-            {
-                Subject = "test subject",
-                PreviewText = "preview html",
-                CreationDate = DateTime.UtcNow,
-                FromAddress = "bkaankose@outlook.com",
-                Id = "AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AnMdP0zg8wkS_Ib2Eeh80LAAGq91I3QAA",
-            }
-        });
-
-        //var builder = new ToastContentBuilder();
-        //builder.SetToastScenario(ToastScenario.Default);
-
-        //builder.AddText(title);
-        //builder.AddText(message);
-
-        //builder.Show();
-
-        //await Task.CompletedTask;
-    }
-
-    public void RemoveNotification(Guid mailUniqueId)
-    {
-        try
-        {
-            ToastNotificationManager.History.Remove(mailUniqueId.ToString());
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, $"Failed to remove notification for mail {mailUniqueId}");
-        }
-    }
-}
diff --git a/Wino.Core.UWP/Services/StoreManagementService.cs b/Wino.Core.UWP/Services/StoreManagementService.cs
deleted file mode 100644
index 91fb9504..00000000
--- a/Wino.Core.UWP/Services/StoreManagementService.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Windows.Services.Store;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Store;
-
-namespace Wino.Core.UWP.Services;
-
-public class StoreManagementService : IStoreManagementService
-{
-    private StoreContext CurrentContext { get; }
-
-    private readonly Dictionary<StoreProductType, string> productIds = new Dictionary<StoreProductType, string>()
-    {
-        { StoreProductType.UnlimitedAccounts, "UnlimitedAccounts" }
-    };
-
-    private readonly Dictionary<StoreProductType, string> skuIds = new Dictionary<StoreProductType, string>()
-    {
-        { StoreProductType.UnlimitedAccounts, "9P02MXZ42GSM" }
-    };
-
-    public StoreManagementService()
-    {
-        CurrentContext = StoreContext.GetDefault();
-    }
-
-    public async Task<bool> HasProductAsync(StoreProductType productType)
-    {
-        var productKey = productIds[productType];
-        var appLicense = await CurrentContext.GetAppLicenseAsync();
-
-        if (appLicense == null)
-            return false;
-
-        // Access the valid licenses for durable add-ons for this app.
-        foreach (KeyValuePair<string, StoreLicense> item in appLicense.AddOnLicenses)
-        {
-            StoreLicense addOnLicense = item.Value;
-
-            if (addOnLicense.InAppOfferToken == productKey)
-            {
-                return addOnLicense.IsActive;
-            }
-        }
-
-        return false;
-    }
-
-    public async Task<Domain.Enums.StorePurchaseResult> PurchaseAsync(StoreProductType productType)
-    {
-        if (await HasProductAsync(productType))
-            return Domain.Enums.StorePurchaseResult.AlreadyPurchased;
-        else
-        {
-            var productKey = skuIds[productType];
-
-            var result = await CurrentContext.RequestPurchaseAsync(productKey);
-
-            switch (result.Status)
-            {
-                case StorePurchaseStatus.Succeeded:
-                    return Domain.Enums.StorePurchaseResult.Succeeded;
-                case StorePurchaseStatus.AlreadyPurchased:
-                    return Domain.Enums.StorePurchaseResult.AlreadyPurchased;
-                default:
-                    return Domain.Enums.StorePurchaseResult.NotPurchased;
-            }
-        }
-    }
-}
diff --git a/Wino.Core.UWP/Services/WinoServerConnectionManager.cs b/Wino.Core.UWP/Services/WinoServerConnectionManager.cs
deleted file mode 100644
index 49309940..00000000
--- a/Wino.Core.UWP/Services/WinoServerConnectionManager.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Nito.AsyncEx;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.AppService;
-using Windows.Foundation.Collections;
-using Windows.Foundation.Metadata;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Requests;
-using Wino.Core.Domain.Models.Server;
-using Wino.Core.Integration.Json;
-using Wino.Messaging;
-using Wino.Messaging.Client.Connection;
-using Wino.Messaging.Enums;
-using Wino.Messaging.Server;
-using Wino.Messaging.UI;
-
-namespace Wino.Core.UWP.Services;
-
-public class WinoServerConnectionManager :
-    IWinoServerConnectionManager<AppServiceConnection>,
-    IRecipient<WinoServerConnectionEstablished>
-{
-    private const int ServerConnectionTimeoutMs = 10000;
-
-    public event EventHandler<WinoServerConnectionStatus> StatusChanged;
-
-    public TaskCompletionSource<bool> ConnectingHandle { get; private set; }
-
-    private ILogger Logger => Logger.ForContext<WinoServerConnectionManager>();
-
-    private WinoServerConnectionStatus status;
-
-    public WinoServerConnectionStatus Status
-    {
-        get { return status; }
-        private set
-        {
-            Log.Information("Server connection status changed to {Status}.", value);
-            status = value;
-            StatusChanged?.Invoke(this, value);
-        }
-    }
-
-    private AppServiceConnection _connection;
-    public AppServiceConnection Connection
-    {
-        get { return _connection; }
-        set
-        {
-            if (_connection != null)
-            {
-                _connection.RequestReceived -= ServerMessageReceived;
-                _connection.ServiceClosed -= ServerDisconnected;
-            }
-
-            _connection = value;
-
-            if (value == null)
-            {
-                Status = WinoServerConnectionStatus.Disconnected;
-            }
-            else
-            {
-                value.RequestReceived += ServerMessageReceived;
-                value.ServiceClosed += ServerDisconnected;
-
-                Status = WinoServerConnectionStatus.Connected;
-            }
-        }
-    }
-
-    private readonly JsonSerializerOptions _jsonSerializerOptions = new()
-    {
-        TypeInfoResolver = new ServerRequestTypeInfoResolver()
-    };
-
-    public WinoServerConnectionManager()
-    {
-        WeakReferenceMessenger.Default.Register(this);
-    }
-
-    public async Task<bool> ConnectAsync()
-    {
-        if (Status == WinoServerConnectionStatus.Connected)
-        {
-            Log.Information("Server is already connected.");
-            return true;
-        }
-
-        if (Status == WinoServerConnectionStatus.Connecting)
-        {
-            // A connection is already being established at the moment.
-            // No need to run another connection establishment process.
-            // Await the connecting handler if possible.
-
-            if (ConnectingHandle != null)
-            {
-                return await ConnectingHandle.Task;
-            }
-        }
-
-        if (ApiInformation.IsApiContractPresent("Windows.ApplicationModel.FullTrustAppContract", 1, 0))
-        {
-            try
-            {
-                ConnectingHandle = new TaskCompletionSource<bool>();
-
-                Status = WinoServerConnectionStatus.Connecting;
-
-                var connectionCancellationToken = new CancellationTokenSource(TimeSpan.FromMilliseconds(ServerConnectionTimeoutMs));
-
-                await FullTrustProcessLauncher.LaunchFullTrustProcessForCurrentAppAsync("WinoServer");
-
-                // Connection establishment handler is in App.xaml.cs OnBackgroundActivated.
-                // Once the connection is established, the handler will set the Connection property
-                // and WinoServerConnectionEstablished will be fired by the messenger.
-
-                await ConnectingHandle.Task.WaitAsync(connectionCancellationToken.Token);
-
-                Log.Information("Server connection established successfully.");
-            }
-            catch (OperationCanceledException canceledException)
-            {
-                Log.Error(canceledException, $"Server process did not start in {ServerConnectionTimeoutMs} ms. Operation is canceled.");
-
-                ConnectingHandle?.TrySetException(canceledException);
-
-                Status = WinoServerConnectionStatus.Failed;
-                return false;
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Failed to connect to the server.");
-
-                ConnectingHandle?.TrySetException(ex);
-
-                Status = WinoServerConnectionStatus.Failed;
-                return false;
-            }
-
-            return true;
-        }
-        else
-        {
-            Log.Information("FullTrustAppContract is not present in the system. Server connection is not possible.");
-        }
-
-        return false;
-    }
-
-    public async Task InitializeAsync()
-    {
-        var isConnectionSuccessfull = await ConnectAsync();
-
-        if (isConnectionSuccessfull)
-        {
-            Log.Information("ServerConnectionManager initialized successfully.");
-        }
-        else
-        {
-            Log.Error("ServerConnectionManager initialization failed.");
-        }
-    }
-
-    private void ServerMessageReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
-    {
-        if (args.Request.Message.TryGetValue(MessageConstants.MessageTypeKey, out object messageTypeObject) && messageTypeObject is int messageTypeInt)
-        {
-            var messageType = (MessageType)messageTypeInt;
-
-            if (args.Request.Message.TryGetValue(MessageConstants.MessageDataKey, out object messageDataObject) && messageDataObject is string messageJson)
-            {
-                switch (messageType)
-                {
-                    case MessageType.UIMessage:
-                        if (!args.Request.Message.TryGetValue(MessageConstants.MessageDataTypeKey, out object dataTypeObject) || dataTypeObject is not string dataTypeName)
-                            throw new ArgumentException("Message data type is missing.");
-
-                        HandleUIMessage(messageJson, dataTypeName);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-
-    /// <summary>
-    /// Unpacks IServerMessage objects and delegate it to Messenger for UI to process.
-    /// </summary>
-    /// <param name="messageJson">Message data in json format.</param>
-    private void HandleUIMessage(string messageJson, string typeName)
-    {
-        switch (typeName)
-        {
-            case nameof(MailAddedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.MailAddedMessage));
-                break;
-            case nameof(MailDownloadedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.MailDownloadedMessage));
-                break;
-            case nameof(MailRemovedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.MailRemovedMessage));
-                break;
-            case nameof(MailUpdatedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.MailUpdatedMessage));
-                break;
-            case nameof(AccountCreatedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountCreatedMessage));
-                break;
-            case nameof(AccountRemovedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountRemovedMessage));
-                break;
-            case nameof(AccountUpdatedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountUpdatedMessage));
-                break;
-            case nameof(DraftCreated):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.DraftCreated));
-                break;
-            case nameof(DraftFailed):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.DraftFailed));
-                break;
-            case nameof(DraftMapped):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.DraftMapped));
-                break;
-            case nameof(FolderRenamed):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.FolderRenamed));
-                break;
-            case nameof(FolderSynchronizationEnabled):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.FolderSynchronizationEnabled));
-                break;
-            case nameof(MergedInboxRenamed):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.MergedInboxRenamed));
-                break;
-            case nameof(AccountSynchronizationCompleted):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountSynchronizationCompleted));
-                break;
-            case nameof(RefreshUnreadCountsMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.RefreshUnreadCountsMessage));
-                break;
-            case nameof(AccountSynchronizerStateChanged):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountSynchronizerStateChanged));
-                break;
-            case nameof(AccountSynchronizationProgressUpdatedMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountSynchronizationProgressUpdatedMessage));
-                break;
-            case nameof(AccountFolderConfigurationUpdated):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountFolderConfigurationUpdated));
-                break;
-            case nameof(CopyAuthURLRequested):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.CopyAuthURLRequested));
-                break;
-            case nameof(NewMailSynchronizationRequested):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.NewMailSynchronizationRequested));
-                break;
-            case nameof(AccountCacheResetMessage):
-                WeakReferenceMessenger.Default.Send(JsonSerializer.Deserialize(messageJson, CommunicationMessagesContext.Default.AccountCacheResetMessage));
-                break;
-            default:
-                throw new Exception("Invalid data type name passed to client.");
-        }
-    }
-
-    private void ServerDisconnected(AppServiceConnection sender, AppServiceClosedEventArgs args)
-    {
-        Log.Information("Server disconnected.");
-    }
-
-    public async Task QueueRequestAsync(IRequestBase request, Guid accountId)
-    {
-        var queuePackage = new ServerRequestPackage(accountId, request);
-
-        var queueResponse = await GetResponseInternalAsync<bool, ServerRequestPackage>(queuePackage, new Dictionary<string, object>()
-        {
-            { MessageConstants.MessageDataRequestAccountIdKey, accountId }
-        });
-
-        queueResponse.ThrowIfFailed();
-    }
-
-    public Task<WinoServerResponse<TResponse>> GetResponseAsync<TResponse, TRequestType>(TRequestType message, CancellationToken cancellationToken = default) where TRequestType : IClientMessage
-        => GetResponseInternalAsync<TResponse, TRequestType>(message, cancellationToken: cancellationToken);
-
-    [RequiresDynamicCode("Calls System.Text.Json.JsonSerializer.Serialize<TValue>(TValue, JsonSerializerOptions)")]
-    [RequiresUnreferencedCode("Calls System.Text.Json.JsonSerializer.Serialize<TValue>(TValue, JsonSerializerOptions)")]
-    private async Task<WinoServerResponse<TResponse>> GetResponseInternalAsync<TResponse, TRequestType>(TRequestType message,
-                                                                                                        Dictionary<string, object> parameters = null,
-                                                                                                        CancellationToken cancellationToken = default)
-    {
-        if (Status != WinoServerConnectionStatus.Connected)
-            await ConnectAsync();
-
-        if (Connection == null) return WinoServerResponse<TResponse>.CreateErrorResponse("Server connection is not established.");
-
-        string serializedMessage = string.Empty;
-
-        try
-        {
-            serializedMessage = JsonSerializer.Serialize(message, _jsonSerializerOptions);
-        }
-        catch (Exception serializationException)
-        {
-            Logger.Error(serializationException, $"Failed to serialize client message for sending.");
-            return WinoServerResponse<TResponse>.CreateErrorResponse($"Failed to serialize message.\n{serializationException.Message}");
-        }
-
-        AppServiceResponse response = null;
-
-        try
-        {
-            var valueSet = new ValueSet
-            {
-                { MessageConstants.MessageTypeKey, (int)MessageType.ServerMessage },
-                { MessageConstants.MessageDataKey, serializedMessage },
-                { MessageConstants.MessageDataTypeKey, message.GetType().Name }
-            };
-
-            // Add additional parameters into ValueSet
-            if (parameters != null)
-            {
-                foreach (var item in parameters)
-                {
-                    valueSet.Add(item.Key, item.Value);
-                }
-            }
-
-            response = await Connection.SendMessageAsync(valueSet).AsTask(cancellationToken);
-        }
-        catch (OperationCanceledException)
-        {
-            return WinoServerResponse<TResponse>.CreateErrorResponse($"Request is canceled by client.");
-        }
-        catch (Exception serverSendException)
-        {
-            Logger.Error(serverSendException, $"Failed to send message to server.");
-            return WinoServerResponse<TResponse>.CreateErrorResponse($"Failed to send message to server.\n{serverSendException.Message}");
-        }
-
-        // It should be always Success.
-        if (response.Status != AppServiceResponseStatus.Success)
-            return WinoServerResponse<TResponse>.CreateErrorResponse($"Wino Server responded with '{response.Status}' status to message delivery.");
-
-        // All responses must contain a message data.
-        if (!(response.Message.TryGetValue(MessageConstants.MessageDataKey, out object messageDataObject) && messageDataObject is string messageJson))
-            return WinoServerResponse<TResponse>.CreateErrorResponse("Server response did not contain message data.");
-
-        // Try deserialize the message data.
-        try
-        {
-            return JsonSerializer.Deserialize<WinoServerResponse<TResponse>>(messageJson);
-        }
-        catch (Exception jsonDeserializationError)
-        {
-            Logger.Error(jsonDeserializationError, $"Failed to deserialize server response message data.");
-            return WinoServerResponse<TResponse>.CreateErrorResponse($"Failed to deserialize Wino server response message data.\n{jsonDeserializationError.Message}");
-        }
-    }
-
-    public void Receive(WinoServerConnectionEstablished message)
-        => ConnectingHandle?.TrySetResult(true);
-}
diff --git a/Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml.cs b/Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml.cs
deleted file mode 100644
index 68d108bd..00000000
--- a/Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Windows.UI.Xaml;
-
-namespace Wino.Core.UWP.Styles;
-
-partial class CustomMessageDialogStyles : ResourceDictionary
-{
-    public CustomMessageDialogStyles()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Core.UWP/Views/Abstract/SettingsPageAbstract.cs b/Wino.Core.UWP/Views/Abstract/SettingsPageAbstract.cs
deleted file mode 100644
index 3b776525..00000000
--- a/Wino.Core.UWP/Views/Abstract/SettingsPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Core.ViewModels;
-
-namespace Wino.Views.Abstract;
-
-public abstract class SettingsPageAbstract : BasePage<SettingsPageViewModel> { }
diff --git a/Wino.Core.UWP/Views/ManageAccountsPage.xaml b/Wino.Core.UWP/Views/ManageAccountsPage.xaml
deleted file mode 100644
index 8b414196..00000000
--- a/Wino.Core.UWP/Views/ManageAccountsPage.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<abstract:ManageAccountsPageAbstract
-    x:Class="Wino.Views.ManageAccountsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Core.UWP.Views.Abstract"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
-    xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
-    Style="{StaticResource PageStyle}"
-    mc:Ignorable="d">
-
-    <Border Style="{StaticResource PageRootBorderStyle}">
-        <Grid
-            MaxWidth="900"
-            Padding="20"
-            HorizontalAlignment="Stretch"
-            RowSpacing="20">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <winuiControls:BreadcrumbBar
-                x:Name="Breadcrumb"
-                ItemClicked="BreadItemClicked"
-                ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
-                <winuiControls:BreadcrumbBar.ItemTemplate>
-                    <DataTemplate>
-                        <winuiControls:BreadcrumbBarItem Margin="0,0,8,0">
-                            <winuiControls:BreadcrumbBarItem.ContentTemplate>
-                                <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
-                                    <TextBlock
-                                        Margin="0,0,8,10"
-                                        FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
-                                        Style="{StaticResource TitleTextBlockStyle}"
-                                        Text="{Binding Title, Mode=OneWay}" />
-                                </DataTemplate>
-                            </winuiControls:BreadcrumbBarItem.ContentTemplate>
-                        </winuiControls:BreadcrumbBarItem>
-                    </DataTemplate>
-                </winuiControls:BreadcrumbBar.ItemTemplate>
-            </winuiControls:BreadcrumbBar>
-
-            <Frame x:Name="AccountPagesFrame" Grid.Row="1" />
-        </Grid>
-    </Border>
-</abstract:ManageAccountsPageAbstract>
diff --git a/Wino.Core.UWP/Views/ManageAccountsPage.xaml.cs b/Wino.Core.UWP/Views/ManageAccountsPage.xaml.cs
deleted file mode 100644
index a3da8717..00000000
--- a/Wino.Core.UWP/Views/ManageAccountsPage.xaml.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.Messaging;
-using MoreLinq;
-using Windows.UI.Xaml.Media.Animation;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.UWP.Views.Abstract;
-using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.UI;
-
-namespace Wino.Views;
-
-public sealed partial class ManageAccountsPage : ManageAccountsPageAbstract,
-    IRecipient<BackBreadcrumNavigationRequested>,
-    IRecipient<BreadcrumbNavigationRequested>,
-    IRecipient<MergedInboxRenamed>,
-    IRecipient<AccountUpdatedMessage>
-{
-    public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = new ObservableCollection<BreadcrumbNavigationItemViewModel>();
-
-
-    public ManageAccountsPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        var initialRequest = new BreadcrumbNavigationRequested(Translator.MenuManageAccounts, WinoPage.AccountManagementPage);
-        PageHistory.Add(new BreadcrumbNavigationItemViewModel(initialRequest, true));
-
-        var accountManagementPageType = ViewModel.NavigationService.GetPageType(WinoPage.AccountManagementPage);
-
-        AccountPagesFrame.Navigate(accountManagementPageType, null, new SuppressNavigationTransitionInfo());
-    }
-
-
-    void IRecipient<BreadcrumbNavigationRequested>.Receive(BreadcrumbNavigationRequested message)
-    {
-        var pageType = ViewModel.NavigationService.GetPageType(message.PageType);
-
-        if (pageType == null) return;
-
-        AccountPagesFrame.Navigate(pageType, message.Parameter, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-
-        PageHistory.ForEach(a => a.IsActive = false);
-
-        PageHistory.Add(new BreadcrumbNavigationItemViewModel(message, true));
-    }
-
-    private void GoBackFrame()
-    {
-        if (AccountPagesFrame.CanGoBack)
-        {
-            PageHistory.RemoveAt(PageHistory.Count - 1);
-
-            AccountPagesFrame.GoBack(new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-        }
-    }
-
-    private void BreadItemClicked(Microsoft.UI.Xaml.Controls.BreadcrumbBar sender, Microsoft.UI.Xaml.Controls.BreadcrumbBarItemClickedEventArgs args)
-    {
-        var clickedPageHistory = PageHistory[args.Index];
-
-        while (PageHistory.FirstOrDefault(a => a.IsActive) != clickedPageHistory)
-        {
-            AccountPagesFrame.GoBack(new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-            PageHistory.RemoveAt(PageHistory.Count - 1);
-            PageHistory[PageHistory.Count - 1].IsActive = true;
-        }
-    }
-
-    public void Receive(BackBreadcrumNavigationRequested message)
-    {
-        GoBackFrame();
-    }
-
-    public async void Receive(AccountUpdatedMessage message)
-    {
-        var activePage = PageHistory.FirstOrDefault(a => a.Request.PageType == WinoPage.AccountDetailsPage);
-
-        if (activePage == null) return;
-
-        await Dispatcher.TryRunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-        {
-            activePage.Title = message.Account.Name;
-        });
-    }
-
-    public void Receive(MergedInboxRenamed message)
-    {
-        // TODO: Find better way to retrieve page history from the stack for the merged account.
-        var activePage = PageHistory.LastOrDefault();
-
-        if (activePage == null) return;
-
-        activePage.Title = message.NewName;
-    }
-}
diff --git a/Wino.Core.UWP/Views/SettingOptionsPage.xaml b/Wino.Core.UWP/Views/SettingOptionsPage.xaml
deleted file mode 100644
index c6e4acc9..00000000
--- a/Wino.Core.UWP/Views/SettingOptionsPage.xaml
+++ /dev/null
@@ -1,37 +0,0 @@
-<abstract:SettingOptionsPageAbstract
-    x:Class="Wino.Views.Settings.SettingOptionsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:enums="using:Wino.Core.Domain.Enums"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:settings="using:Wino.Core.Domain.Models.Settings"
-    xmlns:translations="using:Wino.Core.Domain.Models.Translations"
-    x:Name="root"
-    Title="{x:Bind domain:Translator.SettingsOptions_Title}"
-    mc:Ignorable="d">
-
-    <ScrollViewer VerticalScrollBarVisibility="Hidden">
-        <ItemsControl ItemsSource="{x:Bind ViewModel.SettingOptions, Mode=OneWay}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate x:DataType="settings:SettingOption">
-                    <controls:SettingsCard
-                        Margin="0,2"
-                        Command="{Binding ElementName=root, Path=ViewModel.NavigateSubDetailCommand}"
-                        CommandParameter="{x:Bind NavigationPage}"
-                        Description="{x:Bind Description}"
-                        Header="{x:Bind Title}"
-                        IsClickEnabled="True">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="{x:Bind PathIcon}" />
-                        </controls:SettingsCard.HeaderIcon>
-                    </controls:SettingsCard>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-
-    </ScrollViewer>
-</abstract:SettingOptionsPageAbstract>
diff --git a/Wino.Core.UWP/Views/SettingOptionsPage.xaml.cs b/Wino.Core.UWP/Views/SettingOptionsPage.xaml.cs
deleted file mode 100644
index d5e35bd6..00000000
--- a/Wino.Core.UWP/Views/SettingOptionsPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Views.Abstract;
-
-namespace Wino.Views.Settings;
-
-public sealed partial class SettingOptionsPage : SettingOptionsPageAbstract
-{
-    public SettingOptionsPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Core.UWP/Views/SettingsPage.xaml.cs b/Wino.Core.UWP/Views/SettingsPage.xaml.cs
deleted file mode 100644
index 84e8c4db..00000000
--- a/Wino.Core.UWP/Views/SettingsPage.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.Messaging;
-using MoreLinq;
-using Windows.UI.Xaml.Media.Animation;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.Client.Navigation;
-using Wino.Views.Abstract;
-using Wino.Views.Settings;
-
-namespace Wino.Views;
-
-public sealed partial class SettingsPage : SettingsPageAbstract, IRecipient<BreadcrumbNavigationRequested>
-{
-    public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = [];
-
-    public SettingsPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        SettingsFrame.Navigate(typeof(SettingOptionsPage), null, new SuppressNavigationTransitionInfo());
-
-        var initialRequest = new BreadcrumbNavigationRequested(Translator.MenuSettings, WinoPage.SettingOptionsPage);
-        PageHistory.Add(new BreadcrumbNavigationItemViewModel(initialRequest, true));
-
-        if (e.Parameter is WinoPage parameterPage)
-        {
-            switch (parameterPage)
-            {
-                case WinoPage.AppPreferencesPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsAppPreferences_Title, WinoPage.AppPreferencesPage));
-                    break;
-                case WinoPage.PersonalizationPage:
-                    WeakReferenceMessenger.Default.Send(new BreadcrumbNavigationRequested(Translator.SettingsPersonalization_Title, WinoPage.PersonalizationPage));
-                    break;
-            }
-        }
-    }
-
-    public override void OnLanguageChanged()
-    {
-        base.OnLanguageChanged();
-
-        // Update Settings header in breadcrumb.
-
-        var settingsHeader = PageHistory.FirstOrDefault();
-
-        if (settingsHeader == null) return;
-
-        settingsHeader.Title = Translator.MenuSettings;
-    }
-
-    void IRecipient<BreadcrumbNavigationRequested>.Receive(BreadcrumbNavigationRequested message)
-    {
-        var pageType = ViewModel.NavigationService.GetPageType(message.PageType);
-
-        if (pageType == null) return;
-
-        SettingsFrame.Navigate(pageType, message.Parameter, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-
-        PageHistory.ForEach(a => a.IsActive = false);
-
-        PageHistory.Add(new BreadcrumbNavigationItemViewModel(message, true));
-    }
-
-    private void BreadItemClicked(Microsoft.UI.Xaml.Controls.BreadcrumbBar sender, Microsoft.UI.Xaml.Controls.BreadcrumbBarItemClickedEventArgs args)
-    {
-        var clickedPageHistory = PageHistory[args.Index];
-        var activeIndex = PageHistory.IndexOf(PageHistory.FirstOrDefault(a => a.IsActive));
-
-        while (PageHistory.FirstOrDefault(a => a.IsActive) != clickedPageHistory)
-        {
-            SettingsFrame.GoBack(new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-            PageHistory.RemoveAt(PageHistory.Count - 1);
-            PageHistory[PageHistory.Count - 1].IsActive = true;
-        }
-    }
-}
diff --git a/Wino.Core.UWP/Wino.Core.UWP.csproj b/Wino.Core.UWP/Wino.Core.UWP.csproj
deleted file mode 100644
index e6b2d5af..00000000
--- a/Wino.Core.UWP/Wino.Core.UWP.csproj
+++ /dev/null
@@ -1,110 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<Nullable>disable</Nullable>
-		<UseUwp>true</UseUwp>
-		<DefaultLanguage>en-US</DefaultLanguage>
-		<IsAotCompatible>true</IsAotCompatible>
-		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-		<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-	</PropertyGroup>
-	<ItemGroup>
-	  <None Remove="Assets\FileTypes\type_archive.png" />
-	  <None Remove="Assets\FileTypes\type_audio.png" />
-	  <None Remove="Assets\FileTypes\type_executable.png" />
-	  <None Remove="Assets\FileTypes\type_html.png" />
-	  <None Remove="Assets\FileTypes\type_image.png" />
-	  <None Remove="Assets\FileTypes\type_none.png" />
-	  <None Remove="Assets\FileTypes\type_other.png" />
-	  <None Remove="Assets\FileTypes\type_pdf.png" />
-	  <None Remove="Assets\FileTypes\type_rar.png" />
-	  <None Remove="Assets\FileTypes\type_video.png" />
-	  <None Remove="Assets\Providers\Gmail.png" />
-	  <None Remove="Assets\Providers\iCloud.png" />
-	  <None Remove="Assets\Providers\IMAP4.png" />
-	  <None Remove="Assets\Providers\Office 365.png" />
-	  <None Remove="Assets\Providers\Outlook.png" />
-	  <None Remove="Assets\Providers\Yahoo.png" />
-	  <None Remove="Assets\WinoIcons.ttf" />
-	  <None Remove="BackgroundImages\Acrylic.jpg" />
-	  <None Remove="BackgroundImages\Clouds.jpg" />
-	  <None Remove="BackgroundImages\Forest.jpg" />
-	  <None Remove="BackgroundImages\Garden.jpg" />
-	  <None Remove="BackgroundImages\Mica.jpg" />
-	  <None Remove="BackgroundImages\Nighty.jpg" />
-	  <None Remove="BackgroundImages\Snowflake.jpg" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Remove="AppThemes\Acrylic.xaml" />
-	  <Page Remove="AppThemes\Clouds.xaml" />
-	  <Page Remove="AppThemes\Custom.xaml" />
-	  <Page Remove="AppThemes\Forest.xaml" />
-	  <Page Remove="AppThemes\Garden.xaml" />
-	  <Page Remove="AppThemes\Mica.xaml" />
-	  <Page Remove="AppThemes\Nighty.xaml" />
-	  <Page Remove="AppThemes\Snowflake.xaml" />
-	  <Page Remove="AppThemes\TestTheme.xaml" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Content Include="AppThemes\Acrylic.xaml" />
-	  <Content Include="AppThemes\Clouds.xaml" />
-	  <Content Include="AppThemes\Custom.xaml" />
-	  <Content Include="AppThemes\Forest.xaml" />
-	  <Content Include="AppThemes\Garden.xaml" />
-	  <Content Include="AppThemes\Mica.xaml" />
-	  <Content Include="AppThemes\Nighty.xaml" />
-	  <Content Include="AppThemes\Snowflake.xaml" />
-	  <Content Include="AppThemes\TestTheme.xaml" />
-	  <Content Include="Assets\FileTypes\type_archive.png" />
-	  <Content Include="Assets\FileTypes\type_audio.png" />
-	  <Content Include="Assets\FileTypes\type_executable.png" />
-	  <Content Include="Assets\FileTypes\type_html.png" />
-	  <Content Include="Assets\FileTypes\type_image.png" />
-	  <Content Include="Assets\FileTypes\type_none.png" />
-	  <Content Include="Assets\FileTypes\type_other.png" />
-	  <Content Include="Assets\FileTypes\type_pdf.png" />
-	  <Content Include="Assets\FileTypes\type_rar.png" />
-	  <Content Include="Assets\FileTypes\type_video.png" />
-	  <Content Include="Assets\Providers\Gmail.png" />
-	  <Content Include="Assets\Providers\iCloud.png" />
-	  <Content Include="Assets\Providers\IMAP4.png" />
-	  <Content Include="Assets\Providers\Office 365.png" />
-	  <Content Include="Assets\Providers\Outlook.png" />
-	  <Content Include="Assets\Providers\Yahoo.png" />
-	  <Content Include="Assets\WinoIcons.ttf" />
-	  <Content Include="BackgroundImages\Acrylic.jpg" />
-	  <Content Include="BackgroundImages\Clouds.jpg" />
-	  <Content Include="BackgroundImages\Forest.jpg" />
-	  <Content Include="BackgroundImages\Garden.jpg" />
-	  <Content Include="BackgroundImages\Mica.jpg" />
-	  <Content Include="BackgroundImages\Nighty.jpg" />
-	  <Content Include="BackgroundImages\Snowflake.jpg" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="gravatar-dotnet" />
-		<PackageReference Include="Microsoft.Identity.Client" />
-		<PackageReference Include="Microsoft.UI.Xaml" />
-		<PackageReference Include="CommunityToolkit.Common" />
-		<PackageReference Include="CommunityToolkit.Diagnostics" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="CommunityToolkit.Uwp.Animations" />
-		<PackageReference Include="CommunityToolkit.Uwp.Behaviors" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.Segmented" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" />
-		<PackageReference Include="CommunityToolkit.Uwp.Extensions" />
-		<PackageReference Include="CommunityToolkit.WinUI.Notifications" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" />
-		<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
-		<PackageReference Include="Win2D.uwp" />
-		<PackageReference Include="EmailValidation" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-	  <ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/Wino.Core.UWP/WinoApplication.cs b/Wino.Core.UWP/WinoApplication.cs
deleted file mode 100644
index 6cdaa9dc..00000000
--- a/Wino.Core.UWP/WinoApplication.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Nito.AsyncEx;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Core;
-using Windows.Foundation.Metadata;
-using Windows.Globalization;
-using Windows.Storage;
-using Windows.UI;
-using Windows.UI.Core.Preview;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Activation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Translations;
-using Wino.Messaging.Client.Shell;
-using Wino.Services;
-
-namespace Wino.Core.UWP;
-
-public abstract class WinoApplication : Application, IRecipient<LanguageChanged>
-{
-    public new static WinoApplication Current => (WinoApplication)Application.Current;
-    public const string WinoLaunchLogPrefix = "[Wino Launch] ";
-
-    public IServiceProvider Services { get; }
-    protected IWinoLogger LogInitializer { get; }
-    protected IApplicationConfiguration AppConfiguration { get; }
-    protected IWinoServerConnectionManager<AppServiceConnection> AppServiceConnectionManager { get; }
-    public IThemeService ThemeService { get; }
-    public IUnderlyingThemeService UnderlyingThemeService { get; }
-    public IThumbnailService ThumbnailService { get; }
-    protected IDatabaseService DatabaseService { get; }
-    protected ITranslationService TranslationService { get; }
-
-    protected WinoApplication()
-    {
-        ConfigurePrelaunch();
-
-        Services = ConfigureServices();
-
-        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-        TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
-        UnhandledException += OnAppUnhandledException;
-
-        Resuming += OnResuming;
-        Suspending += OnSuspending;
-
-        LogInitializer = Services.GetService<IWinoLogger>();
-        AppConfiguration = Services.GetService<IApplicationConfiguration>();
-
-        AppServiceConnectionManager = Services.GetService<IWinoServerConnectionManager<AppServiceConnection>>();
-        ThemeService = Services.GetService<IThemeService>();
-        DatabaseService = Services.GetService<IDatabaseService>();
-        TranslationService = Services.GetService<ITranslationService>();
-        UnderlyingThemeService = Services.GetService<IUnderlyingThemeService>();
-        ThumbnailService = Services.GetService<IThumbnailService>();
-
-        // Make sure the paths are setup on app start.
-        AppConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
-        AppConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
-        AppConfiguration.ApplicationTempFolderPath = ApplicationData.Current.TemporaryFolder.Path;
-
-        ConfigureLogging();
-    }
-
-    private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
-        => Log.Fatal(e.ExceptionObject as Exception, "AppDomain Unhandled Exception");
-
-    private void OnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
-        => Log.Error(e.Exception, "Unobserved Task Exception");
-
-    private void OnAppUnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
-    {
-        Log.Fatal(e.Exception, "Unhandled Exception");
-        e.Handled = true;
-    }
-
-    protected abstract void OnApplicationCloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e);
-    protected abstract IEnumerable<ActivationHandler> GetActivationHandlers();
-    protected abstract ActivationHandler<IActivatedEventArgs> GetDefaultActivationHandler();
-    protected override void OnWindowCreated(WindowCreatedEventArgs args)
-    {
-        base.OnWindowCreated(args);
-
-        ConfigureTitleBar();
-
-        LogActivation($"OnWindowCreated -> IsWindowNull: {args.Window == null}");
-
-        TryRegisterAppCloseChange();
-    }
-
-    public IEnumerable<IInitializeAsync> GetActivationServices()
-    {
-        yield return DatabaseService;
-        yield return TranslationService;
-        yield return ThemeService;
-    }
-
-    public Task InitializeServicesAsync() => GetActivationServices().Select(a => a.InitializeAsync()).WhenAll();
-
-    public bool IsInteractiveLaunchArgs(object args) => args is IActivatedEventArgs;
-
-    public void LogActivation(string log) => Log.Information($"{WinoLaunchLogPrefix}{log}");
-
-    private void ConfigureTitleBar()
-    {
-        var coreTitleBar = CoreApplication.GetCurrentView().TitleBar;
-        var applicationViewTitleBar = ApplicationView.GetForCurrentView().TitleBar;
-
-        // Extend shell content into core window to meet design requirements.
-        coreTitleBar.ExtendViewIntoTitleBar = true;
-
-        // Change system buttons and background colors to meet design requirements.
-        applicationViewTitleBar.ButtonBackgroundColor = Colors.Transparent;
-        applicationViewTitleBar.BackgroundColor = Colors.Transparent;
-        applicationViewTitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
-        applicationViewTitleBar.ButtonForegroundColor = Colors.White;
-    }
-
-    public async Task ActivateWinoAsync(object args)
-    {
-        await InitializeServicesAsync();
-
-        if (IsInteractiveLaunchArgs(args))
-        {
-            if (Window.Current.Content == null)
-            {
-                var mainFrame = new Frame();
-
-                Window.Current.Content = mainFrame;
-
-                await ThemeService.InitializeAsync();
-            }
-        }
-
-        await HandleActivationAsync(args);
-
-        if (IsInteractiveLaunchArgs(args))
-        {
-            Window.Current.Activate();
-
-            LogActivation("Window activated");
-        }
-    }
-
-    public async Task HandleActivationAsync(object activationArgs)
-    {
-        if (GetActivationHandlers() != null)
-        {
-            var activationHandler = GetActivationHandlers().FirstOrDefault(h => h.CanHandle(activationArgs)) ?? null;
-
-            if (activationHandler != null)
-            {
-                await activationHandler.HandleAsync(activationArgs);
-            }
-        }
-
-        if (IsInteractiveLaunchArgs(activationArgs))
-        {
-            var defaultHandler = GetDefaultActivationHandler();
-
-            if (defaultHandler.CanHandle(activationArgs))
-            {
-                await defaultHandler.HandleAsync(activationArgs);
-            }
-        }
-    }
-
-    protected override async void OnLaunched(LaunchActivatedEventArgs args)
-    {
-        LogActivation($"OnLaunched -> {args.GetType().Name}, Kind -> {args.Kind}, PreviousExecutionState -> {args.PreviousExecutionState}, IsPrelaunch -> {args.PrelaunchActivated}");
-
-        if (!args.PrelaunchActivated)
-        {
-            await ActivateWinoAsync(args);
-        }
-    }
-
-    protected override async void OnFileActivated(FileActivatedEventArgs args)
-    {
-        base.OnFileActivated(args);
-
-        LogActivation($"OnFileActivated -> ItemCount: {args.Files.Count}, Kind: {args.Kind}, PreviousExecutionState: {args.PreviousExecutionState}");
-
-        await ActivateWinoAsync(args);
-    }
-
-    protected override async void OnActivated(IActivatedEventArgs args)
-    {
-        base.OnActivated(args);
-
-        Log.Information($"OnActivated -> {args.GetType().Name}, Kind -> {args.Kind}, Prev Execution State -> {args.PreviousExecutionState}");
-
-        await ActivateWinoAsync(args);
-    }
-
-    private void TryRegisterAppCloseChange()
-    {
-        try
-        {
-            var systemNavigationManagerPreview = SystemNavigationManagerPreview.GetForCurrentView();
-
-            systemNavigationManagerPreview.CloseRequested -= OnApplicationCloseRequested;
-            systemNavigationManagerPreview.CloseRequested += OnApplicationCloseRequested;
-        }
-        catch { }
-    }
-
-    private void ConfigurePrelaunch()
-    {
-        if (ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch"))
-            CoreApplication.EnablePrelaunch(true);
-    }
-
-    public virtual async void OnResuming(object sender, object e)
-    {
-        // App Service connection was lost on suspension.
-        // We must restore it.
-        // Server might be running already, but re-launching it will trigger a new connection attempt.
-
-        try
-        {
-            await AppServiceConnectionManager.ConnectAsync();
-        }
-        catch (OperationCanceledException)
-        {
-            // Ignore
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to connect to server after resuming the app.");
-        }
-    }
-    public virtual void OnSuspending(object sender, SuspendingEventArgs e) { }
-
-    public abstract IServiceProvider ConfigureServices();
-
-    public void ConfigureLogging()
-    {
-        string logFilePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.ClientLogFile);
-        LogInitializer.SetupLogger(logFilePath);
-    }
-
-    public virtual void OnLanguageChanged(AppLanguageModel languageModel)
-    {
-        var newCulture = new CultureInfo(languageModel.Code);
-
-        ApplicationLanguages.PrimaryLanguageOverride = languageModel.Code;
-
-        CultureInfo.DefaultThreadCurrentCulture = newCulture;
-        CultureInfo.DefaultThreadCurrentUICulture = newCulture;
-    }
-
-    public void Receive(LanguageChanged message) => OnLanguageChanged(TranslationService.CurrentLanguageModel);
-}
diff --git a/Wino.Core.ViewModels/AboutPageViewModel.cs b/Wino.Core.ViewModels/AboutPageViewModel.cs
index 26579f61..b2755d8c 100644
--- a/Wino.Core.ViewModels/AboutPageViewModel.cs
+++ b/Wino.Core.ViewModels/AboutPageViewModel.cs
@@ -6,6 +6,7 @@ using Serilog;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
 
 namespace Wino.Core.ViewModels;
 
@@ -20,10 +21,11 @@ public partial class AboutPageViewModel : CoreBaseViewModel
     private readonly IWinoLogger _logInitializer;
 
     public string VersionName => _nativeAppService.GetFullAppVersion();
-    public string DiscordChannelUrl => "https://discord.gg/windows-apps-hub-714581497222398064";
-    public string GitHubUrl => "https://github.com/bkaankose/Wino-Mail/";
-    public string PrivacyPolicyUrl => "https://www.winomail.app/support/privacy";
-    public string PaypalUrl => "https://paypal.me/bkaankose?country.x=PL&locale.x=en_US";
+    public string WebsiteUrl => AppUrls.Website;
+    public string DiscordChannelUrl => AppUrls.Discord;
+    public string GitHubUrl => AppUrls.GitHub;
+    public string PrivacyPolicyUrl => AppUrls.PrivacyPolicy;
+    public string PaypalUrl => AppUrls.Paypal;
 
     public IPreferencesService PreferencesService { get; }
 
@@ -47,19 +49,17 @@ public partial class AboutPageViewModel : CoreBaseViewModel
         PreferencesService = preferencesService;
     }
 
-    [RequiresDynamicCode("AOT")]
-    [RequiresUnreferencedCode("AOT")]
-    protected override void OnActivated()
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
     {
-        base.OnActivated();
+        base.OnNavigatedTo(mode, parameters);
 
         PreferencesService.PreferenceChanged -= PreferencesChanged;
         PreferencesService.PreferenceChanged += PreferencesChanged;
     }
 
-    protected override void OnDeactivated()
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
     {
-        base.OnDeactivated();
+        base.OnNavigatedFrom(mode, parameters);
 
         PreferencesService.PreferenceChanged -= PreferencesChanged;
     }
diff --git a/Wino.Core.ViewModels/AccountManagementPageViewModelBase.cs b/Wino.Core.ViewModels/AccountManagementPageViewModelBase.cs
index cb282865..5b407df5 100644
--- a/Wino.Core.ViewModels/AccountManagementPageViewModelBase.cs
+++ b/Wino.Core.ViewModels/AccountManagementPageViewModelBase.cs
@@ -9,7 +9,6 @@ using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Store;
 using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Navigation;
 
@@ -28,41 +27,41 @@ public abstract partial class AccountManagementPageViewModelBase : CoreBaseViewM
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsPurchasePanelVisible))]
-    private bool hasUnlimitedAccountProduct;
+    public partial bool HasUnlimitedAccountProduct { get; set; }
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsAccountCreationAlmostOnLimit))]
     [NotifyPropertyChangedFor(nameof(IsPurchasePanelVisible))]
-    private bool isAccountCreationBlocked;
+    public partial bool IsAccountCreationBlocked { get; set; }
 
     [ObservableProperty]
-    private IAccountProviderDetailViewModel _startupAccount;
+    public partial IAccountProviderDetailViewModel StartupAccount { get; set; }
 
     public int FREE_ACCOUNT_COUNT { get; } = 3;
     protected IDialogServiceBase DialogService { get; }
-    protected IWinoServerConnectionManager WinoServerConnectionManager { get; }
     protected INavigationService NavigationService { get; }
     protected IAccountService AccountService { get; }
     protected IProviderService ProviderService { get; }
     protected IStoreManagementService StoreManagementService { get; }
+    protected IWinoAccountProfileService WinoAccountProfileService { get; }
     protected IAuthenticationProvider AuthenticationProvider { get; }
     protected IPreferencesService PreferencesService { get; }
 
     public AccountManagementPageViewModelBase(IDialogServiceBase dialogService,
-                                              IWinoServerConnectionManager winoServerConnectionManager,
                                               INavigationService navigationService,
                                               IAccountService accountService,
                                               IProviderService providerService,
                                               IStoreManagementService storeManagementService,
+                                              IWinoAccountProfileService winoAccountProfileService,
                                               IAuthenticationProvider authenticationProvider,
                                               IPreferencesService preferencesService)
     {
         DialogService = dialogService;
-        WinoServerConnectionManager = winoServerConnectionManager;
         NavigationService = navigationService;
         AccountService = accountService;
         ProviderService = providerService;
         StoreManagementService = storeManagementService;
+        WinoAccountProfileService = winoAccountProfileService;
         AuthenticationProvider = authenticationProvider;
         PreferencesService = preferencesService;
     }
@@ -78,7 +77,7 @@ public abstract partial class AccountManagementPageViewModelBase : CoreBaseViewM
     [RelayCommand]
     public async Task PurchaseUnlimitedAccountAsync()
     {
-        var purchaseResult = await StoreManagementService.PurchaseAsync(StoreProductType.UnlimitedAccounts);
+        var purchaseResult = await StoreManagementService.PurchaseAsync(WinoAddOnProductType.UNLIMITED_ACCOUNTS);
 
         if (purchaseResult == StorePurchaseResult.Succeeded)
             DialogService.InfoBarMessage(Translator.Info_PurchaseThankYouTitle, Translator.Info_PurchaseThankYouMessage, InfoBarMessageType.Success);
@@ -95,14 +94,12 @@ public abstract partial class AccountManagementPageViewModelBase : CoreBaseViewM
 
     public async Task ManageStorePurchasesAsync()
     {
-        await ExecuteUIThread(async () =>
-        {
-            HasUnlimitedAccountProduct = await StoreManagementService.HasProductAsync(StoreProductType.UnlimitedAccounts);
+        var hasUnlimitedAccountProduct = await StoreManagementService.HasProductAsync(WinoAddOnProductType.UNLIMITED_ACCOUNTS).ConfigureAwait(false);
 
-            if (!HasUnlimitedAccountProduct)
-                IsAccountCreationBlocked = Accounts.Count >= FREE_ACCOUNT_COUNT;
-            else
-                IsAccountCreationBlocked = false;
+        await ExecuteUIThread(() =>
+        {
+            HasUnlimitedAccountProduct = hasUnlimitedAccountProduct;
+            IsAccountCreationBlocked = !hasUnlimitedAccountProduct && Accounts.Count >= FREE_ACCOUNT_COUNT;
         });
     }
 
diff --git a/Wino.Core.ViewModels/CalendarBaseViewModel.cs b/Wino.Core.ViewModels/CalendarBaseViewModel.cs
index 69b42bd1..a413b6ad 100644
--- a/Wino.Core.ViewModels/CalendarBaseViewModel.cs
+++ b/Wino.Core.ViewModels/CalendarBaseViewModel.cs
@@ -1,12 +1,45 @@
-using CommunityToolkit.Mvvm.Messaging;
+using System;
+using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
 using Wino.Messaging.Client.Calendar;
 
 namespace Wino.Core.ViewModels;
 
-public class CalendarBaseViewModel : CoreBaseViewModel, IRecipient<CalendarItemAdded>
+public class CalendarBaseViewModel : CoreBaseViewModel,
+    IRecipient<CalendarItemAdded>,
+    IRecipient<CalendarItemUpdated>,
+    IRecipient<CalendarItemDeleted>
 {
-    public void Receive(CalendarItemAdded message) => OnCalendarItemAdded(message.CalendarItem);
+    public void Receive(CalendarItemAdded message) => DispatchToUIThread(() => OnCalendarItemAdded(message.CalendarItem));
+    public void Receive(CalendarItemUpdated message) => DispatchToUIThread(() => OnCalendarItemUpdated(message.CalendarItem, message.Source));
+    public void Receive(CalendarItemDeleted message) => DispatchToUIThread(() => OnCalendarItemDeleted(message.CalendarItem));
 
     protected virtual void OnCalendarItemAdded(CalendarItem calendarItem) { }
+    protected virtual void OnCalendarItemUpdated(CalendarItem calendarItem, CalendarItemUpdateSource source) { }
+    protected virtual void OnCalendarItemDeleted(CalendarItem calendarItem) { }
+
+    private void DispatchToUIThread(Action action)
+    {
+        _ = ExecuteUIThread(action);
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<CalendarItemAdded>(this);
+        Messenger.Register<CalendarItemUpdated>(this);
+        Messenger.Register<CalendarItemDeleted>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<CalendarItemAdded>(this);
+        Messenger.Unregister<CalendarItemUpdated>(this);
+        Messenger.Unregister<CalendarItemDeleted>(this);
+    }
 }
+
diff --git a/Wino.Core.ViewModels/CoreBaseViewModel.cs b/Wino.Core.ViewModels/CoreBaseViewModel.cs
index 92b58856..17abbf45 100644
--- a/Wino.Core.ViewModels/CoreBaseViewModel.cs
+++ b/Wino.Core.ViewModels/CoreBaseViewModel.cs
@@ -2,18 +2,13 @@
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Navigation;
-using Wino.Messaging.UI;
 
 namespace Wino.Core.ViewModels;
 
-public class CoreBaseViewModel : ObservableRecipient,
-    INavigationAware,
-    IRecipient<AccountCreatedMessage>,
-    IRecipient<AccountRemovedMessage>,
-    IRecipient<AccountUpdatedMessage>
+public class CoreBaseViewModel : ObservableRecipient, INavigationAware
 {
     private IDispatcher _dispatcher;
     public IDispatcher Dispatcher
@@ -33,22 +28,44 @@ public class CoreBaseViewModel : ObservableRecipient,
         }
     }
 
-    public virtual void OnNavigatedTo(NavigationMode mode, object parameters) { IsActive = true; }
+    public virtual void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        UnregisterRecipients();
+        RegisterRecipients();
+    }
 
-    public virtual void OnNavigatedFrom(NavigationMode mode, object parameters) { IsActive = false; }
+    public virtual void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        UnregisterRecipients();
+    }
 
     public virtual void OnPageLoaded() { }
 
-    public async Task ExecuteUIThread(Action action) => await Dispatcher?.ExecuteOnUIThread(action);
+    public virtual Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args) => Task.CompletedTask;
+
+    public Task ExecuteUIThread(Action action)
+    {
+        if (action == null) return Task.CompletedTask;
+
+        if (Dispatcher == null)
+        {
+            action();
+            return Task.CompletedTask;
+        }
+
+        return Dispatcher.ExecuteOnUIThread(action);
+    }
     public void ReportUIChange<TMessage>(TMessage message) where TMessage : class, IUIMessage => Messenger.Send(message);
 
     protected virtual void OnDispatcherAssigned() { }
 
-    protected virtual void OnAccountCreated(MailAccount createdAccount) { }
-    protected virtual void OnAccountRemoved(MailAccount removedAccount) { }
-    protected virtual void OnAccountUpdated(MailAccount updatedAccount) { }
+    /// <summary>
+    /// Register message recipients for this view model. Override to register specific message types.
+    /// </summary>
+    protected virtual void RegisterRecipients() { }
 
-    void IRecipient<AccountCreatedMessage>.Receive(AccountCreatedMessage message) => OnAccountCreated(message.Account);
-    void IRecipient<AccountRemovedMessage>.Receive(AccountRemovedMessage message) => OnAccountRemoved(message.Account);
-    void IRecipient<AccountUpdatedMessage>.Receive(AccountUpdatedMessage message) => OnAccountUpdated(message.Account);
+    /// <summary>
+    /// Unregister message recipients for this view model. Override to unregister specific message types.
+    /// </summary>
+    protected virtual void UnregisterRecipients() { }
 }
diff --git a/Wino.Core.ViewModels/Data/BreadcrumbNavigationItemViewModel.cs b/Wino.Core.ViewModels/Data/BreadcrumbNavigationItemViewModel.cs
index 5d808e66..4d39385b 100644
--- a/Wino.Core.ViewModels/Data/BreadcrumbNavigationItemViewModel.cs
+++ b/Wino.Core.ViewModels/Data/BreadcrumbNavigationItemViewModel.cs
@@ -11,12 +11,18 @@ public partial class BreadcrumbNavigationItemViewModel : ObservableObject
     [ObservableProperty]
     private bool isActive;
 
+    public int StepNumber { get; set; }
+
+    public int BackStackDepth { get; set; }
+
     public BreadcrumbNavigationRequested Request { get; set; }
 
-    public BreadcrumbNavigationItemViewModel(BreadcrumbNavigationRequested request, bool isActive)
+    public BreadcrumbNavigationItemViewModel(BreadcrumbNavigationRequested request, bool isActive, int stepNumber = 0, int backStackDepth = 0)
     {
         Request = request;
         Title = request.PageTitle;
         IsActive = isActive;
+        StepNumber = stepNumber;
+        BackStackDepth = backStackDepth;
     }
 }
diff --git a/Wino.Core.ViewModels/Data/KeyboardShortcutActionViewModel.cs b/Wino.Core.ViewModels/Data/KeyboardShortcutActionViewModel.cs
new file mode 100644
index 00000000..85a2c624
--- /dev/null
+++ b/Wino.Core.ViewModels/Data/KeyboardShortcutActionViewModel.cs
@@ -0,0 +1,33 @@
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.ViewModels.Data;
+
+public class KeyboardShortcutActionViewModel
+{
+    public WinoApplicationMode Mode { get; }
+    public KeyboardShortcutAction Action { get; }
+
+    public string DisplayName => Action switch
+    {
+        KeyboardShortcutAction.NewMail => Translator.MenuNewMail,
+        KeyboardShortcutAction.ToggleReadUnread => Translator.KeyboardShortcuts_ActionToggleReadUnread,
+        KeyboardShortcutAction.ToggleFlag => Translator.KeyboardShortcuts_ActionToggleFlag,
+        KeyboardShortcutAction.ToggleArchive => Translator.KeyboardShortcuts_ActionToggleArchive,
+        KeyboardShortcutAction.Delete => Translator.Buttons_Delete,
+        KeyboardShortcutAction.Move => Translator.MailOperation_Move,
+        KeyboardShortcutAction.Reply => Translator.MailOperation_Reply,
+        KeyboardShortcutAction.ReplyAll => Translator.MailOperation_ReplyAll,
+        KeyboardShortcutAction.Send => Translator.Buttons_Send,
+        KeyboardShortcutAction.NewEvent => Translator.CalendarEventCompose_NewEventButton,
+        _ => Action.ToString()
+    };
+
+    public KeyboardShortcutActionViewModel(WinoApplicationMode mode, KeyboardShortcutAction action)
+    {
+        Mode = mode;
+        Action = action;
+    }
+
+    public override string ToString() => DisplayName;
+}
diff --git a/Wino.Core.ViewModels/Data/KeyboardShortcutViewModel.cs b/Wino.Core.ViewModels/Data/KeyboardShortcutViewModel.cs
new file mode 100644
index 00000000..975ac663
--- /dev/null
+++ b/Wino.Core.ViewModels/Data/KeyboardShortcutViewModel.cs
@@ -0,0 +1,96 @@
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.ViewModels.Data;
+
+/// <summary>
+/// ViewModel wrapper for KeyboardShortcut entity.
+/// </summary>
+public partial class KeyboardShortcutViewModel : ObservableObject
+{
+    [ObservableProperty]
+    public partial bool IsEnabled { get; set; }
+
+    public Guid Id { get; }
+    public WinoApplicationMode Mode { get; }
+    public string Key { get; }
+    public ModifierKeys ModifierKeys { get; }
+    public KeyboardShortcutAction Action { get; }
+    public DateTime CreatedAt { get; }
+
+    public string DisplayName
+    {
+        get
+        {
+            var modifierText = string.Empty;
+            if (ModifierKeys.HasFlag(ModifierKeys.Control))
+                modifierText += "Ctrl+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Alt))
+                modifierText += "Alt+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Shift))
+                modifierText += "Shift+";
+            if (ModifierKeys.HasFlag(ModifierKeys.Windows))
+                modifierText += "Win+";
+
+            return modifierText + Key;
+        }
+    }
+
+    public string ModeDisplayName => Mode switch
+    {
+        WinoApplicationMode.Mail => Translator.KeyboardShortcuts_ModeMail,
+        WinoApplicationMode.Calendar => Translator.KeyboardShortcuts_ModeCalendar,
+        WinoApplicationMode.Contacts => Translator.ContactsPage_Title,
+        WinoApplicationMode.Settings => Translator.MenuSettings,
+        _ => Mode.ToString()
+    };
+
+    public string ActionDisplayName
+    {
+        get
+        {
+            return Action switch
+            {
+                KeyboardShortcutAction.NewMail => Translator.MenuNewMail,
+                KeyboardShortcutAction.ToggleReadUnread => Translator.KeyboardShortcuts_ActionToggleReadUnread,
+                KeyboardShortcutAction.ToggleFlag => Translator.KeyboardShortcuts_ActionToggleFlag,
+                KeyboardShortcutAction.ToggleArchive => Translator.KeyboardShortcuts_ActionToggleArchive,
+                KeyboardShortcutAction.Delete => Translator.Buttons_Delete,
+                KeyboardShortcutAction.Move => Translator.MailOperation_Move,
+                KeyboardShortcutAction.Reply => Translator.MailOperation_Reply,
+                KeyboardShortcutAction.ReplyAll => Translator.MailOperation_ReplyAll,
+                KeyboardShortcutAction.Send => Translator.Buttons_Send,
+                KeyboardShortcutAction.NewEvent => Translator.CalendarEventCompose_NewEventButton,
+                _ => Action.ToString()
+            };
+        }
+    }
+
+    public KeyboardShortcutViewModel(KeyboardShortcut shortcut)
+    {
+        Id = shortcut.Id;
+        Mode = shortcut.Mode;
+        Key = shortcut.Key;
+        ModifierKeys = shortcut.ModifierKeys;
+        Action = shortcut.Action;
+        CreatedAt = shortcut.CreatedAt;
+        IsEnabled = shortcut.IsEnabled;
+    }
+
+    public KeyboardShortcut ToEntity()
+    {
+        return new KeyboardShortcut
+        {
+            Id = Id,
+            Mode = Mode,
+            Key = Key,
+            ModifierKeys = ModifierKeys,
+            Action = Action,
+            CreatedAt = CreatedAt,
+            IsEnabled = IsEnabled
+        };
+    }
+}
diff --git a/Wino.Core.ViewModels/Data/MailOperationViewModel.cs b/Wino.Core.ViewModels/Data/MailOperationViewModel.cs
new file mode 100644
index 00000000..bc16f0e7
--- /dev/null
+++ b/Wino.Core.ViewModels/Data/MailOperationViewModel.cs
@@ -0,0 +1,42 @@
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.ViewModels.Data;
+
+/// <summary>
+/// ViewModel for displaying mail operations in dropdowns/lists.
+/// </summary>
+public class MailOperationViewModel
+{
+    public MailOperation Operation { get; }
+
+    public string DisplayName
+    {
+        get
+        {
+            return Operation switch
+            {
+                MailOperation.Archive => Translator.MailOperation_Archive,
+                MailOperation.UnArchive => Translator.MailOperation_Unarchive,
+                MailOperation.SoftDelete => Translator.MailOperation_Delete,
+                MailOperation.Move => Translator.MailOperation_Move,
+                MailOperation.MoveToJunk => Translator.MailOperation_MoveJunk,
+                MailOperation.SetFlag => Translator.MailOperation_SetFlag,
+                MailOperation.ClearFlag => Translator.MailOperation_ClearFlag,
+                MailOperation.MarkAsRead => Translator.MailOperation_MarkAsRead,
+                MailOperation.MarkAsUnread => Translator.MailOperation_MarkAsUnread,
+                MailOperation.Reply => Translator.MailOperation_Reply,
+                MailOperation.ReplyAll => Translator.MailOperation_ReplyAll,
+                MailOperation.Forward => Translator.MailOperation_Forward,
+                _ => Operation.ToString()
+            };
+        }
+    }
+
+    public MailOperationViewModel(MailOperation operation)
+    {
+        Operation = operation;
+    }
+
+    public override string ToString() => DisplayName;
+}
diff --git a/Wino.Core.ViewModels/Data/WinoAddOnItemViewModel.cs b/Wino.Core.ViewModels/Data/WinoAddOnItemViewModel.cs
new file mode 100644
index 00000000..692ba90a
--- /dev/null
+++ b/Wino.Core.ViewModels/Data/WinoAddOnItemViewModel.cs
@@ -0,0 +1,85 @@
+#nullable enable
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Windows.Input;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Core.ViewModels.Data;
+
+public partial class WinoAddOnItemViewModel : ObservableObject
+{
+    public WinoAddOnProductType ProductType { get; }
+
+    public string NameKey => $"WinoAddOn_{ProductType}_Name";
+    public string DescriptionKey => $"WinoAddOn_{ProductType}_Description";
+    public string KeywordsKey => $"WinoAddOn_{ProductType}_Keywords";
+
+    public string IconGlyph => ProductType switch
+    {
+        WinoAddOnProductType.AI_PACK => "\uE945",
+        WinoAddOnProductType.UNLIMITED_ACCOUNTS => "\uE716",
+        _ => "\uE10F"
+    };
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowPurchaseState))]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial bool IsPurchased { get; set; }
+
+    public ICommand? PurchaseCommand { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowLoadingState))]
+    [NotifyPropertyChangedFor(nameof(ShowPurchaseState))]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    [NotifyPropertyChangedFor(nameof(ShowErrorState))]
+    public partial bool IsLoading { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsPurchaseInProgress { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowErrorState))]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial bool HasUsageData { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowErrorState))]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial string ErrorText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial int UsageCount { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial int UsageLimit { get; set; } = 1;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial double UsagePercentage { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial string RenewalText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(ShowUsageSummary))]
+    public partial string UsageResetText { get; set; } = string.Empty;
+
+    public bool ShowLoadingState => IsLoading;
+
+    public bool ShowPurchaseState => !IsLoading && string.IsNullOrWhiteSpace(ErrorText);
+
+    public bool ShowUsageSummary => ProductType == WinoAddOnProductType.AI_PACK &&
+                                    IsPurchased &&
+                                    !IsLoading &&
+                                    string.IsNullOrWhiteSpace(ErrorText) &&
+                                    HasUsageData;
+
+    public bool ShowErrorState => !IsLoading && !string.IsNullOrWhiteSpace(ErrorText);
+
+    public WinoAddOnItemViewModel(WinoAddOnProductType productType)
+    {
+        ProductType = productType;
+    }
+}
diff --git a/Wino.Core.ViewModels/KeyboardShortcutsPageViewModel.cs b/Wino.Core.ViewModels/KeyboardShortcutsPageViewModel.cs
new file mode 100644
index 00000000..a4c27da2
--- /dev/null
+++ b/Wino.Core.ViewModels/KeyboardShortcutsPageViewModel.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Serilog;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels.Data;
+
+namespace Wino.Core.ViewModels;
+
+/// <summary>
+/// ViewModel for managing keyboard shortcuts settings.
+/// </summary>
+public partial class KeyboardShortcutsPageViewModel : CoreBaseViewModel
+{
+    private readonly IKeyboardShortcutService _keyboardShortcutService;
+    private readonly IMailDialogService _dialogService;
+
+    [ObservableProperty]
+    public partial ObservableCollection<KeyboardShortcutViewModel> Shortcuts { get; set; } = new();
+
+    public KeyboardShortcutsPageViewModel(IKeyboardShortcutService keyboardShortcutService,
+                                        IMailDialogService dialogService)
+    {
+        _keyboardShortcutService = keyboardShortcutService;
+        _dialogService = dialogService;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+        await LoadShortcutsAsync();
+    }
+
+    [RelayCommand]
+    private async Task LoadShortcutsAsync()
+    {
+        try
+        {
+            var keyboardShortcuts = await _keyboardShortcutService.GetKeyboardShortcutsAsync();
+
+            Shortcuts.Clear();
+            foreach (var shortcut in keyboardShortcuts)
+            {
+                Shortcuts.Add(new KeyboardShortcutViewModel(shortcut));
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error("Failed to load keyboard shortcuts.", ex);
+
+            await _dialogService.ShowMessageAsync(
+                Translator.KeyboardShortcuts_FailedToLoad,
+                Translator.GeneralTitle_Error,
+                WinoCustomMessageDialogIcon.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task StartAddingShortcutAsync()
+    {
+        var result = await _dialogService.ShowKeyboardShortcutDialogAsync();
+        if (result.IsSuccess)
+        {
+            try
+            {
+                // Check if key combination is already in use
+                var isInUse = await _keyboardShortcutService.IsKeyCombinationInUseAsync(result.Mode, result.Key, result.ModifierKeys, null);
+                if (isInUse)
+                {
+                    await _dialogService.ShowMessageAsync(Translator.KeyboardShortcuts_ShortcutInUse, Translator.GeneralTitle_Error, WinoCustomMessageDialogIcon.Error);
+                    return;
+                }
+
+                // Create new shortcut
+                var shortcut = new KeyboardShortcut
+                {
+                    Mode = result.Mode,
+                    Key = result.Key,
+                    ModifierKeys = result.ModifierKeys,
+                    Action = result.Action,
+                    IsEnabled = true
+                };
+
+                await _keyboardShortcutService.SaveKeyboardShortcutAsync(shortcut);
+                await LoadShortcutsAsync();
+            }
+            catch (Exception ex)
+            {
+                Log.Error("Failed to save new keyboard shortcut.", ex);
+                await _dialogService.ShowMessageAsync(
+                    Translator.KeyboardShortcuts_FailedToSave,
+                    Translator.GeneralTitle_Error,
+                    WinoCustomMessageDialogIcon.Error);
+            }
+        }
+    }
+
+    [RelayCommand]
+    private async Task StartEditingShortcutAsync(KeyboardShortcutViewModel shortcut)
+    {
+        if (shortcut == null) return;
+
+        var dialogService = _dialogService as IMailDialogService;
+        if (dialogService == null) return;
+
+        var existingShortcut = shortcut.ToEntity();
+        var result = await dialogService.ShowKeyboardShortcutDialogAsync(existingShortcut);
+
+        if (result.IsSuccess)
+        {
+            try
+            {
+                // Check if key combination is already in use (excluding current shortcut)
+                var isInUse = await _keyboardShortcutService.IsKeyCombinationInUseAsync(result.Mode, result.Key, result.ModifierKeys, shortcut.Id);
+                if (isInUse)
+                {
+                    await _dialogService.ShowMessageAsync(Translator.KeyboardShortcuts_ShortcutInUse, Translator.GeneralTitle_Error, WinoCustomMessageDialogIcon.Error);
+                    return;
+                }
+
+                // Update existing shortcut
+                var updatedShortcut = shortcut.ToEntity();
+                updatedShortcut.Mode = result.Mode;
+                updatedShortcut.Key = result.Key;
+                updatedShortcut.ModifierKeys = result.ModifierKeys;
+                updatedShortcut.Action = result.Action;
+
+                await _keyboardShortcutService.SaveKeyboardShortcutAsync(updatedShortcut);
+                await LoadShortcutsAsync();
+            }
+            catch (Exception ex)
+            {
+                Log.Error("Failed to update keyboard shortcut.", ex);
+
+                await _dialogService.ShowMessageAsync(
+                    Translator.KeyboardShortcuts_FailedToUpdate,
+                    Translator.GeneralTitle_Error,
+                    WinoCustomMessageDialogIcon.Error);
+            }
+        }
+    }
+
+
+
+    [RelayCommand]
+    private async Task DeleteShortcutAsync(KeyboardShortcutViewModel shortcut)
+    {
+        if (shortcut == null) return;
+
+        try
+        {
+            await _keyboardShortcutService.DeleteKeyboardShortcutAsync(shortcut.Id);
+            await LoadShortcutsAsync();
+        }
+        catch (Exception ex)
+        {
+            Log.Error("Failed to delete keyboard shortcut.", ex);
+            await _dialogService.ShowMessageAsync(
+                Translator.KeyboardShortcuts_FailedToDelete,
+                Translator.GeneralTitle_Error,
+                WinoCustomMessageDialogIcon.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task ResetToDefaultsAsync()
+    {
+        try
+        {
+            await _keyboardShortcutService.ResetToDefaultShortcutsAsync();
+            await LoadShortcutsAsync();
+        }
+        catch (Exception ex)
+        {
+            Log.Error("Failed to reset keyboard shortcuts to defaults.", ex);
+            await _dialogService.ShowMessageAsync(
+                Translator.KeyboardShortcuts_FailedToReset,
+                Translator.GeneralTitle_Error,
+                WinoCustomMessageDialogIcon.Error);
+        }
+    }
+
+}
diff --git a/Wino.Core.ViewModels/NewAccountManagementPageViewModel.cs b/Wino.Core.ViewModels/NewAccountManagementPageViewModel.cs
index 4c289889..74c40093 100644
--- a/Wino.Core.ViewModels/NewAccountManagementPageViewModel.cs
+++ b/Wino.Core.ViewModels/NewAccountManagementPageViewModel.cs
@@ -4,10 +4,12 @@ namespace Wino.Core.ViewModels;
 
 public class ManageAccountsPagePageViewModel : CoreBaseViewModel
 {
-    public ManageAccountsPagePageViewModel(INavigationService navigationService)
+    public ManageAccountsPagePageViewModel(INavigationService navigationService, IStatePersistanceService statePersistenceService)
     {
         NavigationService = navigationService;
+        StatePersistenceService = statePersistenceService;
     }
 
     public INavigationService NavigationService { get; }
+    public IStatePersistanceService StatePersistenceService { get; }
 }
diff --git a/Wino.Core.ViewModels/PersonalizationPageViewModel.cs b/Wino.Core.ViewModels/PersonalizationPageViewModel.cs
index 7fc857de..c247a9b8 100644
--- a/Wino.Core.ViewModels/PersonalizationPageViewModel.cs
+++ b/Wino.Core.ViewModels/PersonalizationPageViewModel.cs
@@ -1,14 +1,17 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Personalization;
 using Wino.Core.ViewModels.Data;
 
@@ -20,7 +23,7 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     public IPreferencesService PreferencesService { get; }
 
     private readonly IDialogServiceBase _dialogService;
-    private readonly IThemeService _themeService;
+    private readonly INewThemeService _newThemeService;
 
     private bool isPropChangeDisabled = false;
 
@@ -28,10 +31,13 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     public MailCopy DemoPreviewMailCopy { get; } = new MailCopy()
     {
         FromName = "Sender Name",
+        FromAddress = "sender@wino.mail",
         Subject = "Mail Subject",
         PreviewText = "Thank you for using Wino Mail. We hope you enjoy the experience.",
     };
 
+    public IMailItemDisplayInformation DemoPreviewMailItemInformation { get; }
+
     #region Personalization
 
     public bool IsSelectedWindowsAccentColor => SelectedAppColor == Colors.LastOrDefault();
@@ -119,6 +125,13 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
         }
     }
 
+    // Backdrop selection properties
+    [ObservableProperty]
+    public partial List<BackdropTypeWrapper> AvailableBackdropTypes { get; set; }
+
+    [ObservableProperty]
+    public partial BackdropTypeWrapper SelectedBackdropType { get; set; }
+
     #endregion
 
     [RelayCommand]
@@ -131,15 +144,21 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     public AsyncRelayCommand CreateCustomThemeCommand { get; set; }
     public PersonalizationPageViewModel(IDialogServiceBase dialogService,
                                         IStatePersistanceService statePersistanceService,
-                                        IThemeService themeService,
+                                        INewThemeService newThemeService,
                                         IPreferencesService preferencesService)
     {
         _dialogService = dialogService;
-        _themeService = themeService;
+        _newThemeService = newThemeService;
 
         StatePersistenceService = statePersistanceService;
         PreferencesService = preferencesService;
 
+        DemoPreviewMailItemInformation = new DemoMailItemDisplayInformation(
+            DemoPreviewMailCopy.FromName,
+            DemoPreviewMailCopy.FromAddress,
+            DemoPreviewMailCopy.Subject,
+            DemoPreviewMailCopy.PreviewText);
+
         CreateCustomThemeCommand = new AsyncRelayCommand(CreateCustomThemeAsync);
     }
 
@@ -175,7 +194,7 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
 
         // Add system accent color as last item.
 
-        Colors.Add(new AppColorViewModel(_themeService.GetSystemAccentColorHex(), true));
+        Colors.Add(new AppColorViewModel(_newThemeService.GetSystemAccentColorHex(), true));
     }
 
     /// <summary>
@@ -183,10 +202,10 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     /// </summary>
     private void SetInitialValues()
     {
-        SelectedElementTheme = ElementThemes.Find(a => a.NativeTheme == _themeService.RootTheme);
+        SelectedElementTheme = ElementThemes.Find(a => a.NativeTheme == _newThemeService.RootTheme);
         SelectedInfoDisplayMode = PreferencesService.MailItemDisplayMode;
 
-        var currentAccentColor = _themeService.AccentColor;
+        var currentAccentColor = _newThemeService.AccentColor;
 
         bool isWindowsColor = string.IsNullOrEmpty(currentAccentColor);
 
@@ -198,14 +217,18 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
         else
             SelectedAppColor = Colors.FirstOrDefault(a => a.Hex == currentAccentColor);
 
-        SelectedAppTheme = AppThemes.Find(a => a.Id == _themeService.CurrentApplicationThemeId);
+        // Find selected theme, handling backward compatibility where theme ID might not exist
+        var currentThemeId = _newThemeService.CurrentApplicationThemeId;
+        SelectedAppTheme = currentThemeId.HasValue ? AppThemes.Find(a => a.Id == currentThemeId.Value) : null;
+
+        // Set the current backdrop from service - backdrop should be independent of theme selection
+        var currentBackdropType = _newThemeService.CurrentBackdropType;
+        SelectedBackdropType = AvailableBackdropTypes?.FirstOrDefault(x => x.BackdropType == currentBackdropType);
     }
 
-    [RequiresDynamicCode("AOT")]
-    [RequiresUnreferencedCode("AOT")]
-    protected override async void OnActivated()
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
-        base.OnActivated();
+        base.OnNavigatedTo(mode, parameters);
 
         await InitializeSettingsAsync();
     }
@@ -214,21 +237,24 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     {
         Deactivate();
 
-        AppThemes = await _themeService.GetAvailableThemesAsync();
+        AppThemes = await _newThemeService.GetAvailableThemesAsync();
 
         OnPropertyChanged(nameof(AppThemes));
 
+        // Initialize backdrop types
+        AvailableBackdropTypes = _newThemeService.GetAvailableBackdropTypes();
+
         InitializeColors();
         SetInitialValues();
 
         PropertyChanged -= PersonalizationSettingsUpdated;
         PropertyChanged += PersonalizationSettingsUpdated;
 
-        _themeService.AccentColorChanged -= AccentColorChanged;
-        _themeService.ElementThemeChanged -= ElementThemeChanged;
+        _newThemeService.AccentColorChanged -= AccentColorChanged;
+        _newThemeService.ElementThemeChanged -= ElementThemeChanged;
 
-        _themeService.AccentColorChanged += AccentColorChanged;
-        _themeService.ElementThemeChanged += ElementThemeChanged;
+        _newThemeService.AccentColorChanged += AccentColorChanged;
+        _newThemeService.ElementThemeChanged += ElementThemeChanged;
     }
 
     private void AccentColorChanged(object sender, string e)
@@ -260,8 +286,8 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
     {
         PropertyChanged -= PersonalizationSettingsUpdated;
 
-        _themeService.AccentColorChanged -= AccentColorChanged;
-        _themeService.ElementThemeChanged -= ElementThemeChanged;
+        _newThemeService.AccentColorChanged -= AccentColorChanged;
+        _newThemeService.ElementThemeChanged -= ElementThemeChanged;
 
         if (AppThemes != null)
         {
@@ -277,18 +303,53 @@ public partial class PersonalizationPageViewModel : CoreBaseViewModel
 
         if (e.PropertyName == nameof(SelectedElementTheme) && SelectedElementTheme != null)
         {
-            _themeService.RootTheme = SelectedElementTheme.NativeTheme;
+            _newThemeService.RootTheme = SelectedElementTheme.NativeTheme;
         }
         else if (e.PropertyName == nameof(SelectedAppTheme))
         {
-            _themeService.CurrentApplicationThemeId = SelectedAppTheme.Id;
+            // Set the theme ID, can be null if no theme is selected
+            _newThemeService.CurrentApplicationThemeId = SelectedAppTheme?.Id;
+
+            // Theme selection should not affect backdrop - they are independent settings
+        }
+        else if (e.PropertyName == nameof(SelectedBackdropType) && SelectedBackdropType != null)
+        {
+            _newThemeService.CurrentBackdropType = SelectedBackdropType.BackdropType;
         }
         else
         {
             if (e.PropertyName == nameof(SelectedInfoDisplayMode))
                 PreferencesService.MailItemDisplayMode = SelectedInfoDisplayMode;
             else if (e.PropertyName == nameof(SelectedAppColor))
-                _themeService.AccentColor = SelectedAppColor.Hex;
+                _newThemeService.AccentColor = SelectedAppColor.Hex;
+        }
+    }
+
+    private sealed class DemoMailItemDisplayInformation(
+        string fromName,
+        string fromAddress,
+        string subject,
+        string previewText) : IMailItemDisplayInformation
+    {
+        public string Subject { get; } = subject;
+        public string FromName { get; } = fromName;
+        public string FromAddress { get; } = fromAddress;
+        public string PreviewText { get; } = previewText;
+        public bool IsRead { get; } = false;
+        public bool IsDraft { get; } = false;
+        public bool HasAttachments { get; } = false;
+        public bool IsCalendarEvent { get; } = false;
+        public bool IsFlagged { get; } = false;
+        public DateTime CreationDate { get; } = DateTime.Now;
+        public Guid? ContactPictureFileId { get; } = null;
+        public bool ThumbnailUpdatedEvent { get; } = false;
+        public bool IsBusy { get; } = false;
+        public bool IsThreadExpanded { get; } = false;
+        public AccountContact SenderContact { get; } = null;
+        event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
+        {
+            add { }
+            remove { }
         }
     }
 }
diff --git a/Wino.Core.ViewModels/SettingOptionsPageViewModel.cs b/Wino.Core.ViewModels/SettingOptionsPageViewModel.cs
index 09411a1e..087fb08e 100644
--- a/Wino.Core.ViewModels/SettingOptionsPageViewModel.cs
+++ b/Wino.Core.ViewModels/SettingOptionsPageViewModel.cs
@@ -1,62 +1,397 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Personalization;
 using Wino.Core.Domain.Models.Settings;
+using Wino.Core.Domain.Models.Translations;
+using Wino.Core.Extensions;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Navigation;
 
 namespace Wino.Core.ViewModels;
 
 public partial class SettingOptionsPageViewModel : CoreBaseViewModel
 {
-    private readonly ISettingsBuilderService _settingsBuilderService;
+    private readonly INativeAppService _nativeAppService;
+    private readonly IAccountService _accountService;
+    private readonly IMimeStorageService _mimeStorageService;
+    private readonly IStoreRatingService _storeRatingService;
+    private readonly ITranslationService _translationService;
+    private readonly INewThemeService _newThemeService;
+    private readonly IPreferencesService _preferencesService;
+    private readonly IProviderService _providerService;
+    private bool _isInitializingSettings;
+    private bool _isAppearanceSelectionPaused;
 
-    [RelayCommand]
-    private void GoAccountSettings() => Messenger.Send<NavigateManageAccountsRequested>();
+    public string GitHubUrl => AppUrls.GitHub;
+    public string PaypalUrl => AppUrls.Paypal;
+    public string WebsiteUrl => AppUrls.Website;
+    public string PrivacyPolicyUrl => AppUrls.PrivacyPolicy;
+
+    public ObservableCollection<SettingsNavigationItemInfo> SearchSuggestions { get; } = [];
+    public ObservableCollection<IAccountProviderDetailViewModel> Accounts { get; } = [];
+    public ObservableCollection<AppColorViewModel> Colors { get; } = [];
+
+    public List<ElementThemeContainer> ElementThemes { get; } =
+    [
+        new(ApplicationElementTheme.Light, Translator.ElementTheme_Light),
+        new(ApplicationElementTheme.Dark, Translator.ElementTheme_Dark),
+        new(ApplicationElementTheme.Default, Translator.ElementTheme_Default),
+    ];
+
+    public bool HasAccounts => Accounts.Count > 0;
+
+    [ObservableProperty]
+    public partial string VersionText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string AccountSummaryText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial int AccountCount { get; set; }
+
+    [ObservableProperty]
+    public partial string StorageSummaryText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string SearchQuery { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial List<AppLanguageModel> AvailableLanguages { get; set; } = [];
+
+    [ObservableProperty]
+    public partial AppLanguageModel SelectedLanguage { get; set; }
+
+    [ObservableProperty]
+    public partial ElementThemeContainer SelectedElementTheme { get; set; }
+
+    [ObservableProperty]
+    public partial AppColorViewModel SelectedAppColor { get; set; }
+
+    [ObservableProperty]
+    public partial bool UseAccentColor { get; set; }
+
+    public SettingOptionsPageViewModel(INativeAppService nativeAppService,
+                                        IAccountService accountService,
+                                        IMimeStorageService mimeStorageService,
+                                         IStoreRatingService storeRatingService,
+                                          ITranslationService translationService,
+                                          INewThemeService newThemeService,
+                                          IPreferencesService preferencesService,
+                                         IProviderService providerService)
+    {
+        _nativeAppService = nativeAppService;
+        _accountService = accountService;
+        _mimeStorageService = mimeStorageService;
+        _storeRatingService = storeRatingService;
+        _translationService = translationService;
+        _newThemeService = newThemeService;
+        _preferencesService = preferencesService;
+        _providerService = providerService;
+    }
+
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        VersionText = string.Format("{0}{1}", Translator.SettingsAboutVersion, _nativeAppService.GetFullAppVersion());
+        SearchQuery = string.Empty;
+        SearchSuggestions.Clear();
+        StorageSummaryText = Translator.SettingsHome_StorageLoading;
+        InitializeQuickSettings();
+
+        _ = LoadDashboardAsync();
+    }
+
+    public void UpdateSearchSuggestions(string query)
+    {
+        SearchQuery = query;
+
+        SearchSuggestions.Clear();
+
+        foreach (var result in SettingsNavigationInfoProvider.Search(query, AccountSummaryText).Take(6))
+        {
+            SearchSuggestions.Add(result);
+        }
+    }
+
+    public SettingsNavigationItemInfo GetBestSearchSuggestion(string query)
+        => SettingsNavigationInfoProvider.Search(query, AccountSummaryText).FirstOrDefault();
+
+    public void NavigateToSetting(SettingsNavigationItemInfo item)
+    {
+        if (item?.PageType is WinoPage pageType)
+        {
+            NavigateSubDetail(pageType);
+        }
+    }
+
+    public void NavigateToAccount(IAccountProviderDetailViewModel account)
+    {
+        if (account == null)
+        {
+            return;
+        }
+
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsManageAccountSettings_Title, WinoPage.ManageAccountsPage));
+
+        switch (account)
+        {
+            case AccountProviderDetailViewModel accountDetails:
+                Messenger.Send(new BreadcrumbNavigationRequested(accountDetails.Account.Name, WinoPage.AccountDetailsPage, accountDetails.Account.Id));
+                break;
+            case MergedAccountProviderDetailViewModel mergedAccount:
+                Messenger.Send(new BreadcrumbNavigationRequested(mergedAccount.MergedInbox.Name, WinoPage.MergedAccountDetailsPage, mergedAccount));
+                break;
+        }
+    }
+
+    public void NavigateToAddAccount()
+    {
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsManageAccountSettings_Title, WinoPage.ManageAccountsPage));
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.WelcomeWizard_Step2Title, WinoPage.ProviderSelectionPage));
+    }
+
+    public void NavigateToManageAccounts()
+    {
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsManageAccountSettings_Title, WinoPage.ManageAccountsPage));
+    }
+
+    private async Task LoadDashboardAsync()
+    {
+        var accounts = (await _accountService.GetAccountsAsync().ConfigureAwait(false) ?? []).ToList();
+        var count = accounts.Count;
+        Dictionary<Guid, long> storageSizeMap = count == 0
+            ? []
+            : await _mimeStorageService.GetAccountsMimeStorageSizesAsync(accounts.Select(account => account.Id)).ConfigureAwait(false);
+        var totalStorageBytes = storageSizeMap.Values.Sum();
+        var groupedAccountItems = CreateAccountItems(accounts);
+
+        await ExecuteUIThread(() =>
+        {
+            AccountCount = count;
+            AccountSummaryText = string.Format(Translator.SettingsOptions_AccountsSummary, count);
+            Accounts.Clear();
+
+            foreach (var account in groupedAccountItems)
+            {
+                Accounts.Add(account);
+            }
+
+            OnPropertyChanged(nameof(HasAccounts));
+            StorageSummaryText = totalStorageBytes == 0
+                ? Translator.SettingsHome_StorageEmptySummary
+                : string.Format(Translator.SettingsStorage_TotalUsage, totalStorageBytes.GetBytesReadable());
+
+            if (!string.IsNullOrWhiteSpace(SearchQuery))
+            {
+                UpdateSearchSuggestions(SearchQuery);
+            }
+        });
+    }
+
+    private void InitializeQuickSettings()
+    {
+        _isInitializingSettings = true;
+        InitializeColors();
+        InitializeLanguageOptions();
+        InitializeAppearanceOptions();
+        _isInitializingSettings = false;
+    }
+
+    private void InitializeLanguageOptions()
+    {
+        AvailableLanguages = _translationService.GetAvailableLanguages();
+        SelectedLanguage = AvailableLanguages.FirstOrDefault(language => language.Language == _preferencesService.CurrentLanguage)
+                           ?? AvailableLanguages.FirstOrDefault();
+    }
+
+    private void InitializeColors()
+    {
+        Colors.Clear();
+
+        foreach (var color in _newThemeService.GetAvailableAccountColors().Distinct(StringComparer.OrdinalIgnoreCase))
+        {
+            Colors.Add(new AppColorViewModel(color));
+        }
+
+        var systemAccentColor = _newThemeService.GetSystemAccentColorHex();
+
+        if (Colors.All(color => !string.Equals(color.Hex, systemAccentColor, StringComparison.OrdinalIgnoreCase)))
+        {
+            Colors.Add(new AppColorViewModel(systemAccentColor, true));
+        }
+        else
+        {
+            var matchingAccentColor = Colors.First(color => string.Equals(color.Hex, systemAccentColor, StringComparison.OrdinalIgnoreCase));
+            Colors.Remove(matchingAccentColor);
+            Colors.Add(new AppColorViewModel(systemAccentColor, true));
+        }
+    }
+
+    private void InitializeAppearanceOptions()
+    {
+        _isAppearanceSelectionPaused = true;
+
+        var currentAccentColor = _newThemeService.AccentColor;
+
+        if (!string.IsNullOrWhiteSpace(currentAccentColor) &&
+            Colors.All(color => !string.Equals(color.Hex, currentAccentColor, StringComparison.OrdinalIgnoreCase)))
+        {
+            Colors.Insert(0, new AppColorViewModel(currentAccentColor));
+        }
+
+        SelectedElementTheme = ElementThemes.FirstOrDefault(theme => theme.NativeTheme == _newThemeService.RootTheme)
+                               ?? ElementThemes.LastOrDefault();
+
+        if (string.IsNullOrWhiteSpace(currentAccentColor))
+        {
+            SelectedAppColor = Colors.LastOrDefault(color => color.IsAccentColor) ?? Colors.LastOrDefault();
+            UseAccentColor = true;
+        }
+        else
+        {
+            SelectedAppColor = Colors.FirstOrDefault(color => string.Equals(color.Hex, currentAccentColor, StringComparison.OrdinalIgnoreCase))
+                               ?? Colors.FirstOrDefault();
+            UseAccentColor = SelectedAppColor?.IsAccentColor == true;
+        }
+
+        _isAppearanceSelectionPaused = false;
+    }
+
+    private List<IAccountProviderDetailViewModel> CreateAccountItems(List<MailAccount> accounts)
+    {
+        var groupedAccounts = accounts
+            .OrderBy(account => account.MergedInboxId == null ? 1 : 0)
+            .ThenBy(account => account.Order)
+            .ThenBy(account => account.Name)
+            .GroupBy(account => account.MergedInboxId);
+        var accountItems = new List<IAccountProviderDetailViewModel>();
+
+        foreach (var accountGroup in groupedAccounts)
+        {
+            if (accountGroup.Key == null)
+            {
+                accountItems.AddRange(accountGroup.Select(CreateAccountProviderDetails));
+                continue;
+            }
+
+            var mergedInbox = accountGroup.First().MergedInbox;
+            var holdingAccounts = accountGroup
+                .Select(CreateAccountProviderDetails)
+                .ToList();
+            var mergedAccount = new MergedAccountProviderDetailViewModel(mergedInbox, holdingAccounts)
+            {
+                ProviderDetail = holdingAccounts.FirstOrDefault()?.ProviderDetail
+            };
+
+            accountItems.Add(mergedAccount);
+        }
+
+        return accountItems;
+    }
+
+    private AccountProviderDetailViewModel CreateAccountProviderDetails(MailAccount account)
+    {
+        var provider = _providerService.GetProviderDetail(account.ProviderType);
+        return new AccountProviderDetailViewModel(provider, account);
+    }
+
+    partial void OnSelectedLanguageChanged(AppLanguageModel value)
+    {
+        if (_isInitializingSettings || value == null)
+        {
+            return;
+        }
+
+        _ = ApplyLanguageAsync(value);
+    }
+
+    partial void OnSelectedElementThemeChanged(ElementThemeContainer value)
+    {
+        if (_isInitializingSettings || value == null)
+        {
+            return;
+        }
+
+        _newThemeService.RootTheme = value.NativeTheme;
+    }
+
+    partial void OnSelectedAppColorChanged(AppColorViewModel value)
+    {
+        if (_isInitializingSettings || _isAppearanceSelectionPaused || value == null)
+        {
+            return;
+        }
+
+        _isAppearanceSelectionPaused = true;
+        UseAccentColor = value.IsAccentColor;
+        _isAppearanceSelectionPaused = false;
+
+        _newThemeService.AccentColor = value.Hex;
+    }
+
+    partial void OnUseAccentColorChanged(bool value)
+    {
+        if (_isInitializingSettings || _isAppearanceSelectionPaused || Colors.Count == 0)
+        {
+            return;
+        }
+
+        var accentColor = Colors.LastOrDefault(color => color.IsAccentColor);
+        var fallbackColor = Colors.FirstOrDefault(color => !color.IsAccentColor) ?? Colors.FirstOrDefault();
+        var targetColor = value ? accentColor : SelectedAppColor?.IsAccentColor == true ? fallbackColor : SelectedAppColor;
+
+        if (targetColor == null || ReferenceEquals(targetColor, SelectedAppColor))
+        {
+            return;
+        }
+
+        _isAppearanceSelectionPaused = true;
+        SelectedAppColor = targetColor;
+        _isAppearanceSelectionPaused = false;
+
+        _newThemeService.AccentColor = targetColor.Hex;
+    }
+
+    private async Task ApplyLanguageAsync(AppLanguageModel language)
+    {
+        await _translationService.InitializeLanguageAsync(language.Language);
+    }
 
     [RelayCommand]
     public void NavigateSubDetail(object type)
     {
         if (type is WinoPage pageType)
         {
-            if (pageType == WinoPage.AccountManagementPage)
-            {
-                GoAccountSettings();
-                return;
-            }
-
-            string pageTitle = pageType switch
-            {
-                WinoPage.PersonalizationPage => Translator.SettingsPersonalization_Title,
-                WinoPage.AboutPage => Translator.SettingsAbout_Title,
-                WinoPage.MessageListPage => Translator.SettingsMessageList_Title,
-                WinoPage.ReadComposePanePage => Translator.SettingsReadComposePane_Title,
-                WinoPage.LanguageTimePage => Translator.SettingsLanguageTime_Title,
-                WinoPage.AppPreferencesPage => Translator.SettingsAppPreferences_Title,
-                WinoPage.CalendarSettingsPage => Translator.SettingsCalendarSettings_Title,
-                _ => throw new NotImplementedException()
-            };
-
-            Messenger.Send(new BreadcrumbNavigationRequested(pageTitle, pageType));
+            var pageInfo = SettingsNavigationInfoProvider.GetInfo(pageType, AccountSummaryText);
+            Messenger.Send(new BreadcrumbNavigationRequested(pageInfo.Title, pageType));
         }
     }
 
-    [ObservableProperty]
-    private List<SettingOption> _settingOptions = new();
-
-    public SettingOptionsPageViewModel(ISettingsBuilderService settingsBuilderService)
+    [RelayCommand]
+    private async Task NavigateExternalAsync(object target)
     {
-        _settingsBuilderService = settingsBuilderService;
+        if (target is not string stringTarget || string.IsNullOrWhiteSpace(stringTarget))
+            return;
 
-        ReloadSettings();
-    }
+        if (stringTarget == "Store")
+        {
+            await _storeRatingService.LaunchStorePageForReviewAsync();
+            return;
+        }
 
-    private void ReloadSettings()
-    {
-        SettingOptions = _settingsBuilderService.GetSettingItems();
+        await _nativeAppService.LaunchUriAsync(new Uri(stringTarget));
     }
 }
diff --git a/Wino.Core.ViewModels/SettingsPageViewModel.cs b/Wino.Core.ViewModels/SettingsPageViewModel.cs
index 792eebe0..5df81444 100644
--- a/Wino.Core.ViewModels/SettingsPageViewModel.cs
+++ b/Wino.Core.ViewModels/SettingsPageViewModel.cs
@@ -1,13 +1,54 @@
-using Wino.Core.Domain.Interfaces;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Settings;
 
 namespace Wino.Core.ViewModels;
 
-public class SettingsPageViewModel : CoreBaseViewModel
+public partial class SettingsPageViewModel : CoreBaseViewModel
 {
-    public SettingsPageViewModel(INavigationService navigationService)
+    private readonly IAccountService _accountService;
+
+    public SettingsPageViewModel(
+        INavigationService navigationService,
+        IStatePersistanceService statePersistenceService,
+        IAccountService accountService)
     {
         NavigationService = navigationService;
+        StatePersistenceService = statePersistenceService;
+        _accountService = accountService;
     }
 
     public INavigationService NavigationService { get; }
+    public IStatePersistanceService StatePersistenceService { get; }
+
+    [ObservableProperty]
+    public partial string CurrentDescription { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string ManageAccountsDescription { get; set; } = string.Empty;
+
+    public async Task UpdateActivePageAsync(WinoPage pageType)
+    {
+        await EnsureAccountSummaryAsync();
+
+        var info = SettingsNavigationInfoProvider.GetInfo(pageType, ManageAccountsDescription);
+        await ExecuteUIThread(() => CurrentDescription = info.Description);
+    }
+
+    private async Task EnsureAccountSummaryAsync()
+    {
+        if (!string.IsNullOrWhiteSpace(ManageAccountsDescription))
+            return;
+
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        var count = accounts?.Count ?? 0;
+
+        await ExecuteUIThread(() =>
+        {
+            ManageAccountsDescription = string.Format(Translator.SettingsOptions_AccountsSummary, count);
+        });
+    }
 }
diff --git a/Wino.Core.ViewModels/WelcomeHostPageViewModel.cs b/Wino.Core.ViewModels/WelcomeHostPageViewModel.cs
new file mode 100644
index 00000000..5ee5dd40
--- /dev/null
+++ b/Wino.Core.ViewModels/WelcomeHostPageViewModel.cs
@@ -0,0 +1,13 @@
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Core.ViewModels;
+
+public class WelcomeHostPageViewModel : CoreBaseViewModel
+{
+    public WelcomeHostPageViewModel(INavigationService navigationService)
+    {
+        NavigationService = navigationService;
+    }
+
+    public INavigationService NavigationService { get; }
+}
diff --git a/Wino.Core.ViewModels/Wino.Core.ViewModels.csproj b/Wino.Core.ViewModels/Wino.Core.ViewModels.csproj
index f0cce77b..a6d57b15 100644
--- a/Wino.Core.ViewModels/Wino.Core.ViewModels.csproj
+++ b/Wino.Core.ViewModels/Wino.Core.ViewModels.csproj
@@ -1,10 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Platforms>x86;x64;arm64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Identity.Client" />
diff --git a/Wino.Core.ViewModels/WinoAccountManagementPageViewModel.cs b/Wino.Core.ViewModels/WinoAccountManagementPageViewModel.cs
new file mode 100644
index 00000000..80afdd15
--- /dev/null
+++ b/Wino.Core.ViewModels/WinoAccountManagementPageViewModel.cs
@@ -0,0 +1,616 @@
+#nullable enable
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Messaging.UI;
+
+namespace Wino.Core.ViewModels;
+
+public partial class WinoAccountManagementPageViewModel : CoreBaseViewModel,
+    IRecipient<WinoAccountProfileUpdatedMessage>,
+    IRecipient<WinoAccountProfileDeletedMessage>,
+    IRecipient<WinoAccountAddOnPurchasedMessage>
+{
+    private readonly IWinoAccountProfileService _profileService;
+    private readonly IWinoAccountDataSyncService _syncService;
+    private readonly IMailDialogService _dialogService;
+    private readonly IStoreManagementService _storeManagementService;
+    private readonly WinoAddOnItemViewModel _aiPackAddOn;
+    private readonly WinoAddOnItemViewModel _unlimitedAccountsAddOn;
+
+    public ObservableCollection<WinoAddOnItemViewModel> AddOns { get; } = [];
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsSignedOut))]
+    public partial bool IsSignedIn { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountEmail { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string AccountStatusText { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(PurchaseAddOnCommand))]
+    public partial bool IsCheckoutInProgress { get; set; }
+
+    public bool IsSignedOut => !IsSignedIn;
+
+    public WinoAccountManagementPageViewModel(IWinoAccountProfileService profileService,
+                                              IWinoAccountDataSyncService syncService,
+                                              IMailDialogService dialogService,
+                                              IStoreManagementService storeManagementService)
+    {
+        _profileService = profileService;
+        _syncService = syncService;
+        _dialogService = dialogService;
+        _storeManagementService = storeManagementService;
+
+        _aiPackAddOn = CreateAddOnItem(WinoAddOnProductType.AI_PACK);
+        _unlimitedAccountsAddOn = CreateAddOnItem(WinoAddOnProductType.UNLIMITED_ACCOUNTS);
+        AddOns.Add(_aiPackAddOn);
+        AddOns.Add(_unlimitedAccountsAddOn);
+    }
+
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+        _ = InitializeAsync();
+    }
+
+    [RelayCommand]
+    private async Task RegisterAsync()
+    {
+        var account = await _dialogService.ShowWinoAccountRegistrationDialogAsync();
+        if (account == null)
+        {
+            return;
+        }
+
+        _dialogService.InfoBarMessage(Translator.GeneralTitle_Info,
+                                      string.Format(Translator.WinoAccount_RegisterSuccessMessage, account.Email),
+                                      InfoBarMessageType.Success);
+    }
+
+    [RelayCommand]
+    private async Task SignInAsync()
+    {
+        var account = await _dialogService.ShowWinoAccountLoginDialogAsync();
+        if (account == null)
+        {
+            return;
+        }
+
+        _dialogService.InfoBarMessage(Translator.GeneralTitle_Info,
+                                      string.Format(Translator.WinoAccount_LoginSuccessMessage, account.Email),
+                                      InfoBarMessageType.Success);
+    }
+
+    [RelayCommand]
+    private async Task SignOutAsync()
+    {
+        var account = await _profileService.GetActiveAccountAsync().ConfigureAwait(false);
+        if (account == null)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Warning,
+                                          Translator.WinoAccount_SignOut_NoAccountMessage,
+                                          InfoBarMessageType.Warning);
+            return;
+        }
+
+        await _profileService.SignOutAsync().ConfigureAwait(false);
+
+        _dialogService.InfoBarMessage(Translator.GeneralTitle_Info,
+                                      string.Format(Translator.WinoAccount_SignOut_SuccessMessage, account.Email),
+                                      InfoBarMessageType.Success);
+    }
+
+    [RelayCommand]
+    private async Task ChangePasswordAsync()
+    {
+        var account = await _profileService.GetActiveAccountAsync();
+        if (account == null)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Warning,
+                                          Translator.WinoAccount_SignOut_NoAccountMessage,
+                                          InfoBarMessageType.Warning);
+            return;
+        }
+
+        var shouldContinue = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.WinoAccount_ChangePassword_ConfirmationMessage, account.Email),
+            Translator.WinoAccount_ChangePassword_Title,
+            Translator.WinoAccount_ChangePassword_Action);
+
+        if (!shouldContinue)
+        {
+            return;
+        }
+
+        var response = await _profileService.ForgotPasswordAsync(account.Email);
+        if (!response.IsSuccess)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error,
+                                          TranslateForgotPasswordError(response.ErrorCode),
+                                          InfoBarMessageType.Error);
+            return;
+        }
+
+        _dialogService.InfoBarMessage(Translator.GeneralTitle_Info,
+                                      string.Format(Translator.WinoAccount_ForgotPasswordDialog_SuccessMessage, account.Email),
+                                      InfoBarMessageType.Success);
+    }
+
+    private static string TranslateForgotPasswordError(string? errorCode)
+        => errorCode switch
+        {
+            ApiErrorCodes.EmailNotRegistered => Translator.WinoAccount_Error_EmailNotRegistered,
+            ApiErrorCodes.ValidationFailed => Translator.WinoAccount_Error_ValidationFailed,
+            _ when string.IsNullOrWhiteSpace(errorCode) => Translator.GeneralTitle_Error,
+            _ => errorCode!
+        };
+
+    [RelayCommand(CanExecute = nameof(CanPurchaseAddOn))]
+    private async Task PurchaseAddOnAsync(WinoAddOnItemViewModel? addOn)
+    {
+        if (addOn == null)
+        {
+            return;
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            IsCheckoutInProgress = true;
+            addOn.IsPurchaseInProgress = true;
+        });
+
+        try
+        {
+            var purchaseResult = await _storeManagementService.PurchaseAsync(addOn.ProductType);
+
+            if (purchaseResult == StorePurchaseResult.NotPurchased)
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error,
+                                              Translator.WinoAccount_Management_PurchaseStartFailed,
+                                              InfoBarMessageType.Error);
+                return;
+            }
+
+            var syncResult = await _profileService.SyncStoreEntitlementsAsync().ConfigureAwait(false);
+            if (!syncResult.IsSuccess && !string.Equals(syncResult.ErrorCode, "MissingAccessToken", StringComparison.Ordinal))
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error,
+                                              TranslateStoreSyncError(syncResult.ErrorCode),
+                                              InfoBarMessageType.Error);
+                return;
+            }
+
+            await HandleAddOnPurchasedAsync().ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (Exception)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error,
+                                          Translator.WinoAccount_Management_PurchaseStartFailed,
+                                          InfoBarMessageType.Error);
+        }
+        finally
+        {
+            await ExecuteUIThread(() =>
+            {
+                IsCheckoutInProgress = false;
+                addOn.IsPurchaseInProgress = false;
+            });
+        }
+    }
+
+    private bool CanPurchaseAddOn(WinoAddOnItemViewModel? addOn)
+        => addOn != null && !addOn.IsPurchased && !addOn.IsLoading && !IsCheckoutInProgress;
+
+    [RelayCommand]
+    private async Task ExportSettingsAsync()
+    {
+        try
+        {
+            var result = await _dialogService.ShowWinoAccountExportDialogAsync().ConfigureAwait(false);
+            if (result == null)
+            {
+                return;
+            }
+
+            _dialogService.InfoBarMessage(
+                Translator.GeneralTitle_Info,
+                BuildExportSuccessMessage(result),
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.GeneralTitle_Error,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task ImportSettingsAsync()
+    {
+        await ExecuteUIThread(() => IsBusy = true);
+
+        try
+        {
+            var result = await _syncService.ImportAsync(new WinoAccountSyncSelection());
+
+            if (!result.HasAnyRemoteData)
+            {
+                _dialogService.InfoBarMessage(
+                    Translator.GeneralTitle_Info,
+                    Translator.WinoAccount_Management_NoRemoteSettings,
+                    InfoBarMessageType.Information);
+                return;
+            }
+
+            var messageType = result.FailedPreferenceCount > 0
+                ? InfoBarMessageType.Warning
+                : InfoBarMessageType.Success;
+
+            _dialogService.InfoBarMessage(
+                result.FailedPreferenceCount > 0 ? Translator.GeneralTitle_Warning : Translator.GeneralTitle_Info,
+                BuildImportMessage(result),
+                messageType);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.GeneralTitle_Error,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            await ExecuteUIThread(() => IsBusy = false);
+        }
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<WinoAccountProfileUpdatedMessage>(this);
+        Messenger.Register<WinoAccountProfileDeletedMessage>(this);
+        Messenger.Register<WinoAccountAddOnPurchasedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<WinoAccountProfileUpdatedMessage>(this);
+        Messenger.Unregister<WinoAccountProfileDeletedMessage>(this);
+        Messenger.Unregister<WinoAccountAddOnPurchasedMessage>(this);
+    }
+
+    public void Receive(WinoAccountProfileUpdatedMessage message)
+        => _ = LoadAsync();
+
+    public void Receive(WinoAccountProfileDeletedMessage message)
+        => _ = LoadAsync();
+
+    public void Receive(WinoAccountAddOnPurchasedMessage message)
+        => _ = HandleAddOnPurchasedAsync();
+
+    private async Task InitializeAsync()
+    {
+        await LoadAsync().ConfigureAwait(false);
+    }
+
+    private async Task LoadAsync()
+    {
+        WinoAccount? cachedAccount = null;
+
+        try
+        {
+            cachedAccount = await _profileService.GetActiveAccountAsync().ConfigureAwait(false);
+
+            if (cachedAccount != null)
+            {
+                await ApplyAccountStateAsync(cachedAccount).ConfigureAwait(false);
+            }
+
+            await ExecuteUIThread(() => IsBusy = true);
+            await ResetAddOnStatesAsync().ConfigureAwait(false);
+            var loadAiPackTask = LoadAiPackAddOnAsync();
+            var loadUnlimitedAccountsTask = LoadUnlimitedAccountsAddOnAsync();
+
+            var resolvedAccount = cachedAccount;
+
+            if (cachedAccount == null || IsAccessTokenExpired(cachedAccount))
+            {
+                try
+                {
+                    var account = await _profileService.GetAuthenticatedAccountAsync().ConfigureAwait(false);
+                    if (account != null)
+                    {
+                        resolvedAccount = account;
+
+                        var refreshedProfileResult = await _profileService.RefreshProfileAsync().ConfigureAwait(false);
+                        if (refreshedProfileResult.IsSuccess && refreshedProfileResult.Account != null)
+                        {
+                            resolvedAccount = refreshedProfileResult.Account;
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                    resolvedAccount ??= cachedAccount;
+                }
+            }
+
+            await ApplyAccountStateAsync(resolvedAccount).ConfigureAwait(false);
+            await Task.WhenAll(loadAiPackTask, loadUnlimitedAccountsTask).ConfigureAwait(false);
+        }
+        catch (Exception)
+        {
+            if (cachedAccount == null)
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error,
+                                              Translator.WinoAccount_Management_LoadFailed,
+                                              InfoBarMessageType.Error);
+                await ResetStateAsync().ConfigureAwait(false);
+            }
+        }
+        finally
+        {
+            await ExecuteUIThread(() => IsBusy = false);
+        }
+    }
+
+    private async Task ApplyAccountStateAsync(Wino.Core.Domain.Entities.Shared.WinoAccount? account)
+    {
+        await ExecuteUIThread(() =>
+        {
+            IsSignedIn = account != null;
+            AccountEmail = account?.Email ?? string.Empty;
+            AccountStatusText = account == null
+                ? string.Empty
+                : string.Format(Translator.WinoAccount_Management_StatusLabel, account.AccountStatus);
+        });
+    }
+
+    private async Task HandleAddOnPurchasedAsync()
+    {
+        await LoadAsync().ConfigureAwait(false);
+
+        _dialogService.InfoBarMessage(Translator.Info_PurchaseThankYouTitle,
+                                      Translator.Info_PurchaseThankYouMessage,
+                                      InfoBarMessageType.Success);
+    }
+
+    private async Task ResetStateAsync()
+    {
+        await ExecuteUIThread(() =>
+        {
+            IsSignedIn = false;
+            AccountEmail = string.Empty;
+            AccountStatusText = string.Empty;
+            IsCheckoutInProgress = false;
+            PurchaseAddOnCommand.NotifyCanExecuteChanged();
+        });
+
+        await ResetAddOnStatesAsync().ConfigureAwait(false);
+    }
+
+    private WinoAddOnItemViewModel CreateAddOnItem(WinoAddOnProductType productType)
+    {
+        return new WinoAddOnItemViewModel(productType)
+        {
+            PurchaseCommand = PurchaseAddOnCommand,
+            UsageLimit = 1
+        };
+    }
+
+    private async Task ResetAddOnStatesAsync()
+    {
+        await ExecuteUIThread(() =>
+        {
+            ResetAddOnItem(_aiPackAddOn);
+            ResetAddOnItem(_unlimitedAccountsAddOn);
+            PurchaseAddOnCommand.NotifyCanExecuteChanged();
+        });
+    }
+
+    private static void ResetAddOnItem(WinoAddOnItemViewModel addOn)
+    {
+        addOn.IsLoading = true;
+        addOn.IsPurchased = false;
+        addOn.IsPurchaseInProgress = false;
+        addOn.HasUsageData = false;
+        addOn.ErrorText = string.Empty;
+        addOn.UsageCount = 0;
+        addOn.UsageLimit = 1;
+        addOn.UsagePercentage = 0;
+        addOn.RenewalText = string.Empty;
+        addOn.UsageResetText = string.Empty;
+    }
+
+    private static string TranslateStoreSyncError(string? errorCode)
+        => errorCode switch
+        {
+            _ => Translator.WinoAccount_Management_StoreSyncFailed
+        };
+
+    private static string BuildExportSuccessMessage(WinoAccountSyncExportResult result)
+    {
+        var parts = new Collection<string>();
+
+        if (result.IncludedPreferences)
+        {
+            parts.Add(Translator.WinoAccount_Management_ExportPreferencesSucceeded);
+        }
+
+        if (result.IncludedAccounts)
+        {
+            parts.Add(string.Format(Translator.WinoAccount_Management_ExportAccountsSucceeded, result.ExportedMailboxCount));
+        }
+
+        if (parts.Count == 0)
+        {
+            parts.Add(Translator.WinoAccount_Management_ExportSucceeded);
+        }
+
+        return string.Join(" ", parts);
+    }
+
+    private static string BuildImportMessage(WinoAccountSyncImportResult result)
+    {
+        var parts = new Collection<string>();
+
+        if (result.HadRemotePreferences)
+        {
+            parts.Add(result.FailedPreferenceCount > 0
+                ? string.Format(Translator.WinoAccount_Management_ImportPartial, result.AppliedPreferenceCount, result.FailedPreferenceCount)
+                : string.Format(Translator.WinoAccount_Management_ImportPreferencesSucceeded, result.AppliedPreferenceCount));
+        }
+
+        if (result.ImportedMailboxCount > 0)
+        {
+            parts.Add(string.Format(Translator.WinoAccount_Management_ImportAccountsSucceeded, result.ImportedMailboxCount));
+        }
+
+        if (result.SkippedDuplicateMailboxCount > 0)
+        {
+            parts.Add(string.Format(Translator.WinoAccount_Management_ImportDuplicateAccountsSkipped, result.SkippedDuplicateMailboxCount));
+        }
+
+        if (parts.Count == 0)
+        {
+            parts.Add(Translator.WinoAccount_Management_ImportEmpty);
+        }
+
+        if (result.ImportedMailboxCount > 0)
+        {
+            parts.Add(Translator.WinoAccount_Management_ImportReloginReminder);
+        }
+
+        return string.Join(" ", parts);
+    }
+
+    private static bool IsAccessTokenExpired(WinoAccount account)
+        => string.IsNullOrWhiteSpace(account.AccessToken) || account.AccessTokenExpiresAtUtc <= DateTime.UtcNow;
+
+    private async Task LoadUnlimitedAccountsAddOnAsync()
+    {
+        try
+        {
+            var hasUnlimitedAccounts = await _storeManagementService.HasProductAsync(WinoAddOnProductType.UNLIMITED_ACCOUNTS).ConfigureAwait(false);
+            await ExecuteUIThread(() =>
+            {
+                _unlimitedAccountsAddOn.IsPurchased = hasUnlimitedAccounts;
+                _unlimitedAccountsAddOn.ErrorText = string.Empty;
+            });
+        }
+        catch (Exception)
+        {
+            await ExecuteUIThread(() =>
+            {
+                _unlimitedAccountsAddOn.ErrorText = Translator.WinoAccount_Management_AddOnLoadFailed;
+            });
+        }
+        finally
+        {
+            await ExecuteUIThread(() =>
+            {
+                _unlimitedAccountsAddOn.IsLoading = false;
+                PurchaseAddOnCommand.NotifyCanExecuteChanged();
+            });
+        }
+    }
+
+    private async Task LoadAiPackAddOnAsync()
+    {
+        try
+        {
+            var hasAiPack = await _storeManagementService.HasProductAsync(WinoAddOnProductType.AI_PACK).ConfigureAwait(false);
+
+            await ExecuteUIThread(() =>
+            {
+                _aiPackAddOn.IsPurchased = hasAiPack;
+                _aiPackAddOn.ErrorText = string.Empty;
+            });
+
+            if (!hasAiPack)
+            {
+                return;
+            }
+
+            var aiStatusResponse = await _profileService.GetAiStatusAsync().ConfigureAwait(false);
+            if (!aiStatusResponse.IsSuccess || aiStatusResponse.Result == null)
+            {
+                await ExecuteUIThread(() =>
+                {
+                    _aiPackAddOn.HasUsageData = false;
+                    _aiPackAddOn.ErrorText = Translator.WinoAccount_Management_AiPackUsageLoadFailed;
+                });
+                return;
+            }
+
+            var aiStatus = aiStatusResponse.Result;
+            if (aiStatus.MonthlyLimit is not int usageLimit || usageLimit <= 0 || aiStatus.Used is not int usageCount)
+            {
+                await ExecuteUIThread(() =>
+                {
+                    _aiPackAddOn.HasUsageData = false;
+                    _aiPackAddOn.ErrorText = Translator.WinoAccount_Management_AiPackUsageLoadFailed;
+                });
+                return;
+            }
+
+            await ExecuteUIThread(() =>
+            {
+                _aiPackAddOn.HasUsageData = true;
+                _aiPackAddOn.ErrorText = string.Empty;
+                _aiPackAddOn.UsageCount = usageCount;
+                _aiPackAddOn.UsageLimit = usageLimit;
+                _aiPackAddOn.UsagePercentage = usageLimit > 0 ? (double)usageCount / usageLimit * 100 : 0;
+                _aiPackAddOn.RenewalText = aiStatus.CurrentPeriodEndUtc is DateTimeOffset renewalDateUtc
+                    ? string.Format(Translator.WinoAccount_Management_AiPackRenews, renewalDateUtc.LocalDateTime)
+                    : string.Empty;
+                _aiPackAddOn.UsageResetText = aiStatus.CurrentPeriodEndUtc is DateTimeOffset resetDateUtc
+                    ? string.Format(Translator.WinoAccount_Management_AiPackResets, resetDateUtc.LocalDateTime)
+                    : string.Empty;
+            });
+        }
+        catch (Exception)
+        {
+            await ExecuteUIThread(() =>
+            {
+                _aiPackAddOn.HasUsageData = false;
+                _aiPackAddOn.ErrorText = Translator.WinoAccount_Management_AddOnLoadFailed;
+            });
+        }
+        finally
+        {
+            await ExecuteUIThread(() =>
+            {
+                _aiPackAddOn.IsLoading = false;
+                PurchaseAddOnCommand.NotifyCanExecuteChanged();
+            });
+        }
+    }
+}
diff --git a/Wino.Core/CoreContainerSetup.cs b/Wino.Core/CoreContainerSetup.cs
index 1853c4c9..6f07640f 100644
--- a/Wino.Core/CoreContainerSetup.cs
+++ b/Wino.Core/CoreContainerSetup.cs
@@ -4,6 +4,9 @@ using Wino.Authentication;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Integration.Processors;
 using Wino.Core.Services;
+using Wino.Core.Synchronizers.Errors;
+using Wino.Core.Synchronizers.Errors.Gmail;
+using Wino.Core.Synchronizers.Errors.Imap;
 using Wino.Core.Synchronizers.Errors.Outlook;
 using Wino.Core.Synchronizers.ImapSync;
 
@@ -17,6 +20,8 @@ public static class CoreContainerSetup
 
         services.AddSingleton(loggerLevelSwitcher);
         services.AddSingleton<ISynchronizerFactory, SynchronizerFactory>();
+        services.AddSingleton<ISynchronizationManager>(provider => SynchronizationManager.Instance);
+        services.AddTransient<SynchronizationManagerInitializer>();
 
         services.AddTransient<IGmailChangeProcessor, GmailChangeProcessor>();
         services.AddTransient<IImapChangeProcessor, ImapChangeProcessor>();
@@ -31,15 +36,36 @@ public static class CoreContainerSetup
         services.AddTransient<IOutlookAuthenticator, OutlookAuthenticator>();
         services.AddTransient<IGmailAuthenticator, GmailAuthenticator>();
 
-        services.AddTransient<IImapSynchronizationStrategyProvider, ImapSynchronizationStrategyProvider>();
-        services.AddTransient<CondstoreSynchronizer>();
-        services.AddTransient<QResyncSynchronizer>();
-        services.AddTransient<UidBasedSynchronizer>();
+        services.AddTransient<UnifiedImapSynchronizer>();
 
-        // Register error factory handlers
+        // Register Outlook error handlers
         services.AddTransient<ObjectCannotBeDeletedHandler>();
+        services.AddTransient<DeltaTokenExpiredHandler>();
+        services.AddTransient<OutlookRateLimitHandler>();
 
+        // Register Gmail error handlers
+        services.AddTransient<GmailAuthenticationFailedHandler>();
+        services.AddTransient<GmailQuotaExceededHandler>();
+        services.AddTransient<GmailRateLimitHandler>();
+        services.AddTransient<GmailHistoryExpiredHandler>();
+        // Register shared error handlers
+        services.AddTransient<EntityNotFoundHandler>();
+
+        // Register IMAP error handlers
+        services.AddTransient<ImapConnectionLostHandler>();
+        services.AddTransient<ImapAuthenticationFailedHandler>();
+        services.AddTransient<ImapFolderNotFoundHandler>();
+        services.AddTransient<ImapProtocolErrorHandler>();
+
+        // Register Outlook auth handlers
+        services.AddTransient<OutlookAuthenticationFailedHandler>();
+
+        // Register error handler factories
         services.AddTransient<IOutlookSynchronizerErrorHandlerFactory, OutlookSynchronizerErrorHandlingFactory>();
         services.AddTransient<IGmailSynchronizerErrorHandlerFactory, GmailSynchronizerErrorHandlingFactory>();
+        services.AddTransient<IImapSynchronizerErrorHandlerFactory, ImapSynchronizerErrorHandlingFactory>();
+
+        // Register retry executor
+        services.AddTransient<IRetryExecutor, RetryExecutor>();
     }
 }
diff --git a/Wino.Core/Domain/Interfaces/ISynchronizerErrorHandler.cs b/Wino.Core/Domain/Interfaces/ISynchronizerErrorHandler.cs
index 6e5dcad2..f3a8e995 100644
--- a/Wino.Core/Domain/Interfaces/ISynchronizerErrorHandler.cs
+++ b/Wino.Core/Domain/Interfaces/ISynchronizerErrorHandler.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Wino.Core.Domain.Models.Errors;
+using Wino.Core.Domain.Models.Synchronization;
 
 namespace Wino.Core.Domain.Interfaces;
 
@@ -23,10 +23,6 @@ public interface ISynchronizerErrorHandler
     Task<bool> HandleAsync(SynchronizerErrorContext error);
 }
 
-public interface ISynchronizerErrorHandlerFactory
-{
-    Task<bool> HandleErrorAsync(SynchronizerErrorContext error);
-}
-
 public interface IOutlookSynchronizerErrorHandlerFactory : ISynchronizerErrorHandlerFactory;
 public interface IGmailSynchronizerErrorHandlerFactory : ISynchronizerErrorHandlerFactory;
+public interface IImapSynchronizerErrorHandlerFactory : ISynchronizerErrorHandlerFactory;
diff --git a/Wino.Core/Domain/Models/Errors/SynchronizerErrorContext.cs b/Wino.Core/Domain/Models/Errors/SynchronizerErrorContext.cs
deleted file mode 100644
index 4f868ea3..00000000
--- a/Wino.Core/Domain/Models/Errors/SynchronizerErrorContext.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Core.Domain.Models.Errors;
-
-/// <summary>
-/// Contains context information about a synchronizer error
-/// </summary>
-public class SynchronizerErrorContext
-{
-    /// <summary>
-    /// Account associated with the error
-    /// </summary>
-    public MailAccount Account { get; set; }
-
-    /// <summary>
-    /// Gets or sets the error code
-    /// </summary>
-    public int? ErrorCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the error message
-    /// </summary>
-    public string ErrorMessage { get; set; }
-
-    /// <summary>
-    /// Gets or sets the request bundle associated with the error
-    /// </summary>
-    public IRequestBundle RequestBundle { get; set; }
-
-    /// <summary>
-    /// Gets or sets additional data associated with the error
-    /// </summary>
-    public Dictionary<string, object> AdditionalData { get; set; } = new Dictionary<string, object>();
-
-    /// <summary>
-    /// Gets or sets the exception associated with the error
-    /// </summary>
-    public Exception Exception { get; set; }
-}
diff --git a/Wino.Core/Extensions/CalendarInvitationExtensions.cs b/Wino.Core/Extensions/CalendarInvitationExtensions.cs
new file mode 100644
index 00000000..36219272
--- /dev/null
+++ b/Wino.Core/Extensions/CalendarInvitationExtensions.cs
@@ -0,0 +1,121 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using MimeKit;
+
+namespace Wino.Core.Extensions;
+
+public static class CalendarInvitationExtensions
+{
+    public static string ExtractInvitationUid(this MimeMessage message)
+    {
+        if (message == null)
+        {
+            return null;
+        }
+
+        var icsContent = GetCalendarContent(message);
+        if (string.IsNullOrWhiteSpace(icsContent))
+        {
+            return null;
+        }
+
+        var unfolded = UnfoldIcs(icsContent);
+        var veventSection = ExtractFirstVEventSection(unfolded);
+        if (string.IsNullOrWhiteSpace(veventSection))
+        {
+            return null;
+        }
+
+        return TryReadIcsProperty(veventSection, "UID", out var uid)
+            ? uid
+            : null;
+    }
+
+    private static string GetCalendarContent(MimeMessage message)
+    {
+        var textPart = message.BodyParts
+            .OfType<TextPart>()
+            .FirstOrDefault(p => p.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (textPart != null)
+        {
+            return textPart.Text;
+        }
+
+        var mimePart = message.BodyParts
+            .OfType<MimePart>()
+            .FirstOrDefault(p => p.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (mimePart == null)
+        {
+            return null;
+        }
+
+        using var stream = new MemoryStream();
+        mimePart.Content.DecodeTo(stream);
+        var bytes = stream.ToArray();
+        if (bytes.Length == 0)
+        {
+            return null;
+        }
+
+        var charset = mimePart.ContentType?.Charset;
+        var encoding = string.IsNullOrWhiteSpace(charset) ? Encoding.UTF8 : Encoding.GetEncoding(charset);
+        return encoding.GetString(bytes);
+    }
+
+    private static string UnfoldIcs(string content)
+        => content
+            .Replace("\r\n ", string.Empty, StringComparison.Ordinal)
+            .Replace("\r\n\t", string.Empty, StringComparison.Ordinal)
+            .Replace("\n ", string.Empty, StringComparison.Ordinal)
+            .Replace("\n\t", string.Empty, StringComparison.Ordinal);
+
+    private static string ExtractFirstVEventSection(string ics)
+    {
+        const string beginVevent = "BEGIN:VEVENT";
+        const string endVevent = "END:VEVENT";
+
+        var beginIndex = ics.IndexOf(beginVevent, StringComparison.OrdinalIgnoreCase);
+        if (beginIndex < 0)
+        {
+            return string.Empty;
+        }
+
+        var endIndex = ics.IndexOf(endVevent, beginIndex, StringComparison.OrdinalIgnoreCase);
+        if (endIndex < 0)
+        {
+            return ics[beginIndex..];
+        }
+
+        return ics.Substring(beginIndex, endIndex - beginIndex + endVevent.Length);
+    }
+
+    private static bool TryReadIcsProperty(string icsSection, string propertyName, out string value)
+    {
+        value = string.Empty;
+        var lines = icsSection.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
+
+        foreach (var rawLine in lines)
+        {
+            var line = rawLine.Trim();
+            if (!line.StartsWith(propertyName, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var colonIndex = line.IndexOf(':');
+            if (colonIndex <= 0 || colonIndex >= line.Length - 1)
+            {
+                continue;
+            }
+
+            value = line[(colonIndex + 1)..].Trim();
+            return !string.IsNullOrWhiteSpace(value);
+        }
+
+        return false;
+    }
+}
diff --git a/Wino.Core/Extensions/GoogleIntegratorExtensions.cs b/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
index 8e19322a..292fb187 100644
--- a/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
+++ b/Wino.Core/Extensions/GoogleIntegratorExtensions.cs
@@ -1,17 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using Google.Apis.Calendar.v3.Data;
 using Google.Apis.Gmail.v1.Data;
-using MimeKit;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Misc;
 using Wino.Services;
-using Wino.Services.Extensions;
 
 namespace Wino.Core.Extensions;
 
@@ -121,41 +118,6 @@ public static class GoogleIntegratorExtensions
         return GetNormalizedLabelName(lastPart);
     }
 
-    /// <summary>
-    /// Returns MailCopy out of native Gmail message and converted MimeMessage of that native messaage.
-    /// </summary>
-    /// <param name="gmailMessage">Gmail Message</param>
-    /// <param name="mimeMessage">MimeMessage representation of that native message.</param>
-    /// <returns>MailCopy object that is ready to be inserted to database.</returns>
-    public static MailCopy AsMailCopy(this Message gmailMessage, MimeMessage mimeMessage)
-    {
-        bool isUnread = gmailMessage.GetIsUnread();
-        bool isFocused = gmailMessage.GetIsFocused();
-        bool isFlagged = gmailMessage.GetIsFlagged();
-        bool isDraft = gmailMessage.GetIsDraft();
-
-        return new MailCopy()
-        {
-            CreationDate = mimeMessage.Date.UtcDateTime,
-            Subject = HttpUtility.HtmlDecode(mimeMessage.Subject),
-            FromName = MailkitClientExtensions.GetActualSenderName(mimeMessage),
-            FromAddress = MailkitClientExtensions.GetActualSenderAddress(mimeMessage),
-            PreviewText = HttpUtility.HtmlDecode(gmailMessage.Snippet),
-            ThreadId = gmailMessage.ThreadId,
-            Importance = (MailImportance)mimeMessage.Importance,
-            Id = gmailMessage.Id,
-            IsDraft = isDraft,
-            HasAttachments = mimeMessage.Attachments.Any(),
-            IsRead = !isUnread,
-            IsFlagged = isFlagged,
-            IsFocused = isFocused,
-            InReplyTo = mimeMessage.InReplyTo,
-            MessageId = mimeMessage.MessageId,
-            References = mimeMessage.References.GetReferences(),
-            FileId = Guid.NewGuid()
-        };
-    }
-
     public static List<RemoteAccountAlias> GetRemoteAliases(this ListSendAsResponse response)
     {
         return response?.SendAs?.Select(a => new RemoteAccountAlias()
@@ -169,7 +131,7 @@ public static class GoogleIntegratorExtensions
         }).ToList();
     }
 
-    public static AccountCalendar AsCalendar(this CalendarListEntry calendarListEntry, Guid accountId)
+    public static AccountCalendar AsCalendar(this CalendarListEntry calendarListEntry, Guid accountId, string fallbackBackgroundColor = null)
     {
         var calendar = new AccountCalendar()
         {
@@ -179,13 +141,14 @@ public static class GoogleIntegratorExtensions
             Id = Guid.NewGuid(),
             TimeZone = calendarListEntry.TimeZone,
             IsPrimary = calendarListEntry.Primary.GetValueOrDefault(),
+            IsSynchronizationEnabled = true,
         };
 
         // Bg color must present. Generate one if doesnt exists.
         // Text color is optional. It'll be overriden by UI for readibility.
 
-        calendar.BackgroundColorHex = string.IsNullOrEmpty(calendarListEntry.BackgroundColor) ? ColorHelpers.GenerateFlatColorHex() : calendarListEntry.BackgroundColor;
-        calendar.TextColorHex = string.IsNullOrEmpty(calendarListEntry.ForegroundColor) ? "#000000" : calendarListEntry.ForegroundColor;
+        calendar.BackgroundColorHex = fallbackBackgroundColor ?? ColorHelpers.GenerateFlatColorHex();
+        calendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(calendar.BackgroundColorHex);
 
         return calendar;
     }
@@ -215,6 +178,40 @@ public static class GoogleIntegratorExtensions
         return null;
     }
 
+    public static DateTime? GetEventLocalDateTime(EventDateTime calendarEvent)
+    {
+        if (calendarEvent == null)
+        {
+            return null;
+        }
+
+        if (calendarEvent.DateTimeDateTimeOffset != null)
+        {
+            return DateTime.SpecifyKind(calendarEvent.DateTimeDateTimeOffset.Value.DateTime, DateTimeKind.Unspecified);
+        }
+
+        if (calendarEvent.Date != null)
+        {
+            if (DateTime.TryParse(calendarEvent.Date, out DateTime eventDateTime))
+            {
+                return DateTime.SpecifyKind(eventDateTime, DateTimeKind.Unspecified);
+            }
+
+            throw new Exception("Invalid date format in Google Calendar event date.");
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Extracts the timezone string from EventDateTime.
+    /// Returns null for all-day events or if timezone is not specified.
+    /// </summary>
+    public static string GetEventTimeZone(EventDateTime eventDateTime)
+    {
+        return eventDateTime?.TimeZone;
+    }
+
     /// <summary>
     /// RRULE, EXRULE, RDATE and EXDATE lines for a recurring event, as specified in RFC5545.
     /// </summary>
diff --git a/Wino.Core/Extensions/OutlookIntegratorExtensions.cs b/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
index 87051308..4bfdf542 100644
--- a/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
+++ b/Wino.Core/Extensions/OutlookIntegratorExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using Microsoft.Graph.Models;
@@ -8,6 +9,7 @@ using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Misc;
 
 namespace Wino.Core.Extensions;
@@ -60,16 +62,76 @@ public static class OutlookIntegratorExtensions
             FromName = outlookMessage.From?.EmailAddress?.Name,
             FromAddress = outlookMessage.From?.EmailAddress?.Address,
             Subject = outlookMessage.Subject,
-            FileId = Guid.NewGuid()
+            FileId = Guid.NewGuid(),
+            ItemType = MailItemType.Mail // ItemType will be set by caller if calendar access is granted
         };
 
+        // Extract In-Reply-To and References from InternetMessageHeaders for threading.
+        if (outlookMessage.InternetMessageHeaders != null)
+        {
+            var inReplyToHeader = outlookMessage.InternetMessageHeaders
+                .FirstOrDefault(h => string.Equals(h.Name, "In-Reply-To", StringComparison.OrdinalIgnoreCase));
+            if (inReplyToHeader != null)
+                mailCopy.InReplyTo = MailHeaderExtensions.StripAngleBrackets(inReplyToHeader.Value);
+
+            var referencesHeader = outlookMessage.InternetMessageHeaders
+                .FirstOrDefault(h => string.Equals(h.Name, "References", StringComparison.OrdinalIgnoreCase));
+            if (referencesHeader != null)
+                mailCopy.References = MailHeaderExtensions.NormalizeReferences(referencesHeader.Value);
+        }
+
         if (mailCopy.IsDraft)
             mailCopy.DraftId = mailCopy.ThreadId;
 
         return mailCopy;
     }
 
-    public static Message AsOutlookMessage(this MimeMessage mime, bool includeInternetHeaders)
+    public static MailItemType GetMailItemType(this Message message)
+    {
+        // Check if the message is an EventMessage (calendar-related)
+        if (message is EventMessage eventMessage)
+        {
+            // Try to get MeetingMessageType from the property
+            if (eventMessage.MeetingMessageType.HasValue)
+            {
+                return eventMessage.MeetingMessageType.Value switch
+                {
+                    MeetingMessageType.MeetingRequest => MailItemType.CalendarInvitation,
+                    MeetingMessageType.MeetingCancelled => MailItemType.CalendarCancellation,
+                    MeetingMessageType.MeetingAccepted or
+                    MeetingMessageType.MeetingTenativelyAccepted or
+                    MeetingMessageType.MeetingDeclined => MailItemType.CalendarResponse,
+                    _ => MailItemType.Mail
+                };
+            }
+
+            // Fallback: Check @odata.type in AdditionalData to determine specific type
+            if (message.AdditionalData?.TryGetValue("@odata.type", out var odataType) == true)
+            {
+                var odataTypeString = odataType?.ToString();
+                if (odataTypeString != null)
+                {
+                    // eventMessageRequest -> CalendarInvitation
+                    if (odataTypeString.Contains("eventMessageRequest", StringComparison.OrdinalIgnoreCase))
+                        return MailItemType.CalendarInvitation;
+
+                    // eventMessageResponse -> CalendarResponse
+                    if (odataTypeString.Contains("eventMessageResponse", StringComparison.OrdinalIgnoreCase))
+                        return MailItemType.CalendarResponse;
+
+                    // Generic eventMessage without specific type - assume invitation
+                    if (odataTypeString.Contains("eventMessage", StringComparison.OrdinalIgnoreCase))
+                        return MailItemType.CalendarInvitation;
+                }
+            }
+
+            return MailItemType.CalendarInvitation;
+        }
+
+        return MailItemType.Mail;
+    }
+
+    public static Message AsOutlookMessage(this MimeMessage mime, bool includeInternetHeaders, string conversationId = null)
     {
         var fromAddress = GetRecipients(mime.From).ElementAt(0);
         var toAddresses = GetRecipients(mime.To).ToList();
@@ -77,35 +139,42 @@ public static class OutlookIntegratorExtensions
         var bccAddresses = GetRecipients(mime.Bcc).ToList();
         var replyToAddresses = GetRecipients(mime.ReplyTo).ToList();
 
+        // Prefer HTML body, fall back to plain text.
+        var (bodyContent, bodyType) = mime.HtmlBody != null
+            ? (mime.HtmlBody, BodyType.Html)
+            : (mime.TextBody ?? string.Empty, BodyType.Text);
+
         var message = new Message()
         {
             Subject = mime.Subject,
             Importance = GetImportance(mime.Importance),
-            Body = new ItemBody() { ContentType = BodyType.Html, Content = mime.HtmlBody },
+            Body = new ItemBody() { ContentType = bodyType, Content = bodyContent },
             IsDraft = false,
-            IsRead = true, // Sent messages are always read.
+            IsRead = true,
             ToRecipients = toAddresses,
             CcRecipients = ccAddresses,
             BccRecipients = bccAddresses,
             From = fromAddress,
-            InternetMessageId = GetProperId(mime.MessageId),
+            InternetMessageId = mime.MessageId,
             ReplyTo = replyToAddresses,
-            Attachments = []
         };
 
-        // Headers are only included when creating the draft.
-        // When sending, they are not included. Graph will throw an error.
+        if (!string.IsNullOrEmpty(conversationId))
+        {
+            message.ConversationId = conversationId;
+        }
 
+        // Headers are only included when creating the draft.
+        // Graph API throws an error if headers are included in send/patch operations.
         if (includeInternetHeaders)
         {
             message.InternetMessageHeaders = GetHeaderList(mime);
         }
 
-
         return message;
     }
 
-    public static AccountCalendar AsCalendar(this Calendar outlookCalendar, MailAccount assignedAccount)
+    public static AccountCalendar AsCalendar(this Calendar outlookCalendar, MailAccount assignedAccount, string fallbackBackgroundColor = null)
     {
         var calendar = new AccountCalendar()
         {
@@ -114,6 +183,7 @@ public static class OutlookIntegratorExtensions
             RemoteCalendarId = outlookCalendar.Id,
             IsPrimary = outlookCalendar.IsDefaultCalendar.GetValueOrDefault(),
             Name = outlookCalendar.Name,
+            IsSynchronizationEnabled = true,
             IsExtended = true,
         };
 
@@ -121,8 +191,8 @@ public static class OutlookIntegratorExtensions
         // Bg must be present. Generate flat one if doesn't exists.
         // Text doesnt exists for Outlook.
 
-        calendar.BackgroundColorHex = string.IsNullOrEmpty(outlookCalendar.HexColor) ? ColorHelpers.GenerateFlatColorHex() : outlookCalendar.HexColor;
-        calendar.TextColorHex = "#000000";
+        calendar.BackgroundColorHex = fallbackBackgroundColor ?? ColorHelpers.GenerateFlatColorHex();
+        calendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(calendar.BackgroundColorHex);
 
         return calendar;
     }
@@ -209,7 +279,9 @@ public static class OutlookIntegratorExtensions
         {
             if (recurrence.Range.Type == RecurrenceRangeType.EndDate && recurrence.Range.EndDate != null)
             {
-                ruleBuilder.Append($"UNTIL={recurrence.Range.EndDate.Value:yyyyMMddTHHmmssZ};");
+                // RFC 5545 requires YYYYMMDD or YYYYMMDDTHHMMSSinvalid format (no dashes or colons)
+                var untilDate = recurrence.Range.EndDate.Value.DateTime.ToString("yyyyMMdd'T'HHmmss'Z'", System.Globalization.CultureInfo.InvariantCulture);
+                ruleBuilder.Append($"UNTIL={untilDate};");
             }
             else if (recurrence.Range.Type == RecurrenceRangeType.Numbered && recurrence.Range.NumberOfOccurrences.HasValue)
             {
@@ -223,23 +295,37 @@ public static class OutlookIntegratorExtensions
 
     public static DateTimeOffset GetDateTimeOffsetFromDateTimeTimeZone(DateTimeTimeZone dateTimeTimeZone)
     {
-        if (dateTimeTimeZone == null || string.IsNullOrEmpty(dateTimeTimeZone.DateTime) || string.IsNullOrEmpty(dateTimeTimeZone.TimeZone))
+        if (dateTimeTimeZone == null || string.IsNullOrEmpty(dateTimeTimeZone.DateTime))
         {
-            throw new ArgumentException("DateTimeTimeZone is null or empty.");
+            throw new ArgumentException("DateTimeTimeZone or DateTime is null or empty.");
         }
 
         try
         {
             // Parse the DateTime string
-            if (DateTime.TryParse(dateTimeTimeZone.DateTime, out DateTime parsedDateTime))
+            if (!DateTime.TryParse(dateTimeTimeZone.DateTime, out DateTime parsedDateTime))
+            {
+                throw new ArgumentException("DateTime string is not in a valid format.");
+            }
+
+            // If no timezone is provided, assume UTC
+            if (string.IsNullOrEmpty(dateTimeTimeZone.TimeZone))
+            {
+                return new DateTimeOffset(parsedDateTime, TimeSpan.Zero);
+            }
+
+            try
             {
                 // Get TimeZoneInfo to get the offset
                 TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(dateTimeTimeZone.TimeZone);
                 TimeSpan offset = timeZoneInfo.GetUtcOffset(parsedDateTime);
                 return new DateTimeOffset(parsedDateTime, offset);
             }
-            else
-                throw new ArgumentException("DateTime string is not in a valid format.");
+            catch (TimeZoneNotFoundException)
+            {
+                // If timezone is not found, assume UTC as fallback
+                return new DateTimeOffset(parsedDateTime, TimeSpan.Zero);
+            }
         }
         catch (Exception)
         {
@@ -247,6 +333,21 @@ public static class OutlookIntegratorExtensions
         }
     }
 
+    public static DateTime GetLocalDateTimeFromDateTimeTimeZone(DateTimeTimeZone dateTimeTimeZone)
+    {
+        if (dateTimeTimeZone == null || string.IsNullOrEmpty(dateTimeTimeZone.DateTime))
+        {
+            throw new ArgumentException("DateTimeTimeZone or DateTime is null or empty.");
+        }
+
+        if (!DateTime.TryParse(dateTimeTimeZone.DateTime, out DateTime parsedDateTime))
+        {
+            throw new ArgumentException("DateTime string is not in a valid format.");
+        }
+
+        return DateTime.SpecifyKind(parsedDateTime, DateTimeKind.Unspecified);
+    }
+
     private static AttendeeStatus GetAttendeeStatus(ResponseType? responseType)
     {
         return responseType switch
@@ -261,9 +362,12 @@ public static class OutlookIntegratorExtensions
         };
     }
 
-    public static CalendarEventAttendee CreateAttendee(this Attendee attendee, Guid calendarItemId)
+    public static CalendarEventAttendee CreateAttendee(this Attendee attendee, Guid calendarItemId, string organizerEmail = null)
     {
-        bool isOrganizer = attendee?.Status?.Response == ResponseType.Organizer;
+        // Check if this attendee is the organizer by comparing email addresses
+        bool isOrganizer = !string.IsNullOrEmpty(organizerEmail) &&
+                          !string.IsNullOrEmpty(attendee?.EmailAddress?.Address) &&
+                          string.Equals(attendee.EmailAddress.Address, organizerEmail, StringComparison.OrdinalIgnoreCase);
 
         var eventAttendee = new CalendarEventAttendee()
         {
@@ -281,6 +385,40 @@ public static class OutlookIntegratorExtensions
 
     #region Mime to Outlook Message Helpers
 
+    /// <summary>
+    /// Extracts all attachments (inline and regular) from a MimeMessage
+    /// and returns them as Graph SDK FileAttachment objects.
+    /// </summary>
+    public static List<FileAttachment> ExtractAttachments(this MimeMessage mime)
+    {
+        var attachments = new List<FileAttachment>();
+
+        foreach (var part in mime.BodyParts)
+        {
+            bool isInline = part.ContentDisposition?.Disposition == "inline";
+
+            if (!part.IsAttachment && !isInline)
+                continue;
+
+            if (part is not MimePart mimePart || mimePart.Content == null)
+                continue;
+
+            using var memory = new MemoryStream();
+            mimePart.Content.DecodeTo(memory);
+
+            attachments.Add(new FileAttachment()
+            {
+                Name = part.ContentDisposition?.FileName ?? part.ContentType.Name,
+                ContentBytes = memory.ToArray(),
+                ContentType = part.ContentType.MimeType,
+                ContentId = part.ContentId,
+                IsInline = isInline
+            });
+        }
+
+        return attachments;
+    }
+
     private static IEnumerable<Recipient> GetRecipients(this InternetAddressList internetAddresses)
     {
         foreach (var address in internetAddresses)
@@ -313,47 +451,47 @@ public static class OutlookIntegratorExtensions
     private static List<InternetMessageHeader> GetHeaderList(this MimeMessage mime)
     {
         // Graph API only allows max of 5 headers.
-        // Here we'll try to ignore some headers that are not neccessary.
-        // Outlook API will generate them automatically.
-
-        // Some headers also require to start with X- or x-.
+        // Graph only allows setting custom internet headers (typically X-*).
+        // Reply/threading headers like In-Reply-To and References are managed by
+        // createReply/createReplyAll flows and must not be sent here.
 
+        const int headerLimit = 5;
         string[] headersToIgnore = ["Date", "To", "Cc", "Bcc", "MIME-Version", "From", "Subject", "Message-Id"];
-        string[] headersToModify = ["In-Reply-To", "Reply-To", "References", "Thread-Topic"];
 
         var headers = new List<InternetMessageHeader>();
 
-        int includedHeaderCount = 0;
+        void AddHeader(string name, string value)
+        {
+            if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(value)) return;
+            if (headers.Count >= headerLimit) return;
+            if (headers.Any(h => string.Equals(h.Name, name, StringComparison.OrdinalIgnoreCase))) return;
 
+            // No header value should exceed 995 characters.
+            var headerValue = value.Length >= 995 ? value.Substring(0, 995) : value;
+            headers.Add(new InternetMessageHeader() { Name = name, Value = headerValue });
+        }
+
+        // PRIORITY: Always include WinoLocalDraftHeader first if it exists.
+        var winoDraftHeader = mime.Headers.FirstOrDefault(h => h.Field == Domain.Constants.WinoLocalDraftHeader);
+        if (winoDraftHeader != null)
+            AddHeader(winoDraftHeader.Field, winoDraftHeader.Value);
+
+        // Fill remaining slots with custom headers only (avoid Graph restrictions).
         foreach (var header in mime.Headers)
         {
-            if (!headersToIgnore.Contains(header.Field))
-            {
-                var headerName = headersToModify.Contains(header.Field) ? $"X-{header.Field}" : header.Field;
+            if (headers.Count >= headerLimit) break;
+            if (header.Field == Domain.Constants.WinoLocalDraftHeader) continue;
+            if (headersToIgnore.Contains(header.Field)) continue;
 
-                // No header value should exceed 995 characters.
-                var headerValue = header.Value.Length >= 995 ? header.Value.Substring(0, 995) : header.Value;
+            // Only include custom headers beyond the core threading ones.
+            if (!header.Field.StartsWith("X-", StringComparison.OrdinalIgnoreCase)) continue;
 
-                headers.Add(new InternetMessageHeader() { Name = headerName, Value = headerValue });
-                includedHeaderCount++;
-            }
-
-            if (includedHeaderCount >= 5) break;
+            AddHeader(header.Field, header.Value);
         }
 
         return headers;
     }
 
-    private static string GetProperId(string id)
-    {
-        // Outlook requires some identifiers to start with "X-" or "x-".
-        if (string.IsNullOrEmpty(id)) return string.Empty;
-
-        if (!id.StartsWith("x-") || !id.StartsWith("X-"))
-            return $"X-{id}";
-
-        return id;
-    }
 
 
     #endregion
diff --git a/Wino.Core/Helpers/CalendarEventComposeMapper.cs b/Wino.Core/Helpers/CalendarEventComposeMapper.cs
new file mode 100644
index 00000000..2aa2211e
--- /dev/null
+++ b/Wino.Core/Helpers/CalendarEventComposeMapper.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Core.Helpers;
+
+public sealed record PreparedCalendarEventCreateModel(
+    CalendarItem CalendarItem,
+    List<CalendarEventAttendee> Attendees,
+    List<Reminder> Reminders);
+
+public static class CalendarEventComposeMapper
+{
+    public static PreparedCalendarEventCreateModel Prepare(CalendarEventComposeResult composeResult, AccountCalendar assignedCalendar, Guid? calendarItemId = null)
+    {
+        ArgumentNullException.ThrowIfNull(composeResult);
+        ArgumentNullException.ThrowIfNull(assignedCalendar);
+
+        var itemId = calendarItemId ?? Guid.NewGuid();
+        var effectiveTimeZoneId = string.IsNullOrWhiteSpace(composeResult.TimeZoneId)
+            ? TimeZoneInfo.Local.Id
+            : composeResult.TimeZoneId;
+        var utcNow = DateTimeOffset.UtcNow;
+
+        var calendarItem = new CalendarItem
+        {
+            Id = itemId,
+            CalendarId = assignedCalendar.Id,
+            AssignedCalendar = assignedCalendar,
+            Title = composeResult.Title?.Trim() ?? string.Empty,
+            Description = composeResult.HtmlNotes ?? string.Empty,
+            Location = composeResult.Location?.Trim() ?? string.Empty,
+            StartDate = composeResult.StartDate,
+            DurationInSeconds = Math.Max(0, (composeResult.EndDate - composeResult.StartDate).TotalSeconds),
+            StartTimeZone = effectiveTimeZoneId,
+            EndTimeZone = effectiveTimeZoneId,
+            CreatedAt = utcNow,
+            UpdatedAt = utcNow,
+            Recurrence = composeResult.Recurrence ?? string.Empty,
+            OrganizerDisplayName = assignedCalendar.MailAccount?.SenderName ?? string.Empty,
+            OrganizerEmail = assignedCalendar.MailAccount?.Address ?? string.Empty,
+            Status = CalendarItemStatus.Accepted,
+            Visibility = CalendarItemVisibility.Public,
+            ShowAs = composeResult.ShowAs,
+            IsHidden = false,
+            IsLocked = false
+        };
+
+        var attendees = composeResult.Attendees?
+            .Where(attendee => attendee != null)
+            .Select(attendee => new CalendarEventAttendee
+            {
+                Id = attendee.Id == Guid.Empty ? Guid.NewGuid() : attendee.Id,
+                CalendarItemId = itemId,
+                Name = attendee.Name ?? string.Empty,
+                Email = attendee.Email ?? string.Empty,
+                Comment = attendee.Comment,
+                AttendenceStatus = attendee.AttendenceStatus,
+                IsOrganizer = attendee.IsOrganizer,
+                IsOptionalAttendee = attendee.IsOptionalAttendee,
+                ResolvedContact = attendee.ResolvedContact
+            })
+            .ToList() ?? [];
+
+        var reminders = composeResult.SelectedReminders?
+            .Where(reminder => reminder != null)
+            .Select(reminder => new Reminder
+            {
+                Id = reminder.Id == Guid.Empty ? Guid.NewGuid() : reminder.Id,
+                CalendarItemId = itemId,
+                DurationInSeconds = reminder.DurationInSeconds,
+                ReminderType = reminder.ReminderType
+            })
+            .ToList() ?? [];
+
+        return new PreparedCalendarEventCreateModel(calendarItem, attendees, reminders);
+    }
+}
diff --git a/Wino.Core/Helpers/CalendarRecurrenceMapper.cs b/Wino.Core/Helpers/CalendarRecurrenceMapper.cs
new file mode 100644
index 00000000..aac775d0
--- /dev/null
+++ b/Wino.Core/Helpers/CalendarRecurrenceMapper.cs
@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.Graph.Models;
+using Microsoft.Kiota.Abstractions;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+
+namespace Wino.Core.Helpers;
+
+public static class CalendarRecurrenceMapper
+{
+    public static PatternedRecurrence CreateOutlookRecurrence(CalendarItem calendarItem)
+    {
+        if (calendarItem == null || string.IsNullOrWhiteSpace(calendarItem.Recurrence))
+            return null;
+
+        var ruleLine = calendarItem.Recurrence
+            .Split(Domain.Constants.CalendarEventRecurrenceRuleSeperator, StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            .FirstOrDefault(line => line.StartsWith("RRULE:", StringComparison.OrdinalIgnoreCase));
+
+        if (string.IsNullOrWhiteSpace(ruleLine))
+            return null;
+
+        var components = ruleLine["RRULE:".Length..]
+            .Split(';', StringSplitOptions.RemoveEmptyEntries)
+            .Select(part => part.Split('=', 2, StringSplitOptions.TrimEntries))
+            .Where(parts => parts.Length == 2)
+            .ToDictionary(parts => parts[0].ToUpperInvariant(), parts => parts[1], StringComparer.OrdinalIgnoreCase);
+
+        if (!components.TryGetValue("FREQ", out var frequency))
+            return null;
+
+        var pattern = new RecurrencePattern
+        {
+            Interval = ParseInt(components, "INTERVAL", 1),
+            FirstDayOfWeek = DayOfWeekObject.Monday
+        };
+
+        var byDays = ParseByDays(components);
+        var startDate = calendarItem.StartDate;
+
+        switch (frequency.ToUpperInvariant())
+        {
+            case "DAILY":
+                pattern.Type = RecurrencePatternType.Daily;
+                break;
+            case "WEEKLY":
+                pattern.Type = RecurrencePatternType.Weekly;
+                    pattern.DaysOfWeek = byDays.Any()
+                        ? byDays.Select(day => (DayOfWeekObject?)day).ToList()
+                        : [(DayOfWeekObject?)MapDay(startDate.DayOfWeek)];
+                break;
+            case "MONTHLY":
+                if (byDays.Any())
+                {
+                    pattern.Type = RecurrencePatternType.RelativeMonthly;
+                    pattern.DaysOfWeek = byDays.Select(day => (DayOfWeekObject?)day).ToList();
+                    pattern.Index = MapWeekIndex(startDate);
+                }
+                else
+                {
+                    pattern.Type = RecurrencePatternType.AbsoluteMonthly;
+                    pattern.DayOfMonth = ParseInt(components, "BYMONTHDAY", startDate.Day);
+                }
+                break;
+            case "YEARLY":
+                pattern.Month = ParseInt(components, "BYMONTH", startDate.Month);
+
+                if (byDays.Any())
+                {
+                    pattern.Type = RecurrencePatternType.RelativeYearly;
+                    pattern.DaysOfWeek = byDays.Select(day => (DayOfWeekObject?)day).ToList();
+                    pattern.Index = MapWeekIndex(startDate);
+                }
+                else
+                {
+                    pattern.Type = RecurrencePatternType.AbsoluteYearly;
+                    pattern.DayOfMonth = ParseInt(components, "BYMONTHDAY", startDate.Day);
+                }
+                break;
+            default:
+                return null;
+        }
+
+        var recurrenceRange = CreateRange(components, calendarItem);
+        return new PatternedRecurrence
+        {
+            Pattern = pattern,
+            Range = recurrenceRange
+        };
+    }
+
+    private static RecurrenceRange CreateRange(IReadOnlyDictionary<string, string> components, CalendarItem calendarItem)
+    {
+        var startDate = CreateDate(calendarItem.StartDate);
+
+        if (components.TryGetValue("UNTIL", out var untilValue) &&
+            TryParseUntil(untilValue, out var untilDate))
+        {
+            return new RecurrenceRange
+            {
+                Type = RecurrenceRangeType.EndDate,
+                StartDate = startDate,
+                EndDate = CreateDate(untilDate),
+                RecurrenceTimeZone = calendarItem.StartTimeZone
+            };
+        }
+
+        return new RecurrenceRange
+        {
+            Type = RecurrenceRangeType.NoEnd,
+            StartDate = startDate,
+            RecurrenceTimeZone = calendarItem.StartTimeZone
+        };
+    }
+
+    private static bool TryParseUntil(string untilValue, out DateTime untilDate)
+    {
+        untilDate = default;
+
+        if (string.IsNullOrWhiteSpace(untilValue))
+            return false;
+
+        return DateTime.TryParseExact(
+                   untilValue,
+                   ["yyyyMMdd", "yyyyMMdd'T'HHmmss", "yyyyMMdd'T'HHmmss'Z'"],
+                   CultureInfo.InvariantCulture,
+                   DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
+                   out untilDate)
+               || DateTime.TryParse(untilValue, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out untilDate);
+    }
+
+    private static List<DayOfWeekObject> ParseByDays(IReadOnlyDictionary<string, string> components)
+    {
+        if (!components.TryGetValue("BYDAY", out var byDayValue) || string.IsNullOrWhiteSpace(byDayValue))
+            return [];
+
+        return byDayValue
+            .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .Select(MapDay)
+            .ToList();
+    }
+
+    private static int ParseInt(IReadOnlyDictionary<string, string> components, string key, int fallback)
+        => components.TryGetValue(key, out var value) && int.TryParse(value, out var parsedValue) ? parsedValue : fallback;
+
+    private static DayOfWeekObject MapDay(string dayToken)
+    {
+        return dayToken.ToUpperInvariant() switch
+        {
+            "MO" => DayOfWeekObject.Monday,
+            "TU" => DayOfWeekObject.Tuesday,
+            "WE" => DayOfWeekObject.Wednesday,
+            "TH" => DayOfWeekObject.Thursday,
+            "FR" => DayOfWeekObject.Friday,
+            "SA" => DayOfWeekObject.Saturday,
+            "SU" => DayOfWeekObject.Sunday,
+            _ => throw new ArgumentOutOfRangeException(nameof(dayToken), dayToken, null)
+        };
+    }
+
+    private static DayOfWeekObject MapDay(DayOfWeek dayOfWeek)
+    {
+        return dayOfWeek switch
+        {
+            DayOfWeek.Monday => DayOfWeekObject.Monday,
+            DayOfWeek.Tuesday => DayOfWeekObject.Tuesday,
+            DayOfWeek.Wednesday => DayOfWeekObject.Wednesday,
+            DayOfWeek.Thursday => DayOfWeekObject.Thursday,
+            DayOfWeek.Friday => DayOfWeekObject.Friday,
+            DayOfWeek.Saturday => DayOfWeekObject.Saturday,
+            DayOfWeek.Sunday => DayOfWeekObject.Sunday,
+            _ => DayOfWeekObject.Monday
+        };
+    }
+
+    private static WeekIndex MapWeekIndex(DateTime date)
+    {
+        var occurrence = ((date.Day - 1) / 7) + 1;
+
+        return occurrence switch
+        {
+            1 => WeekIndex.First,
+            2 => WeekIndex.Second,
+            3 => WeekIndex.Third,
+            4 => WeekIndex.Fourth,
+            _ => WeekIndex.Last
+        };
+    }
+
+    private static Date CreateDate(DateTime dateTime) => new(dateTime.Year, dateTime.Month, dateTime.Day);
+}
diff --git a/Wino.Core/Helpers/SynchronizationActionHelper.cs b/Wino.Core/Helpers/SynchronizationActionHelper.cs
new file mode 100644
index 00000000..1646a507
--- /dev/null
+++ b/Wino.Core/Helpers/SynchronizationActionHelper.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Requests.Calendar;
+using Wino.Core.Requests.Folder;
+using Wino.Core.Requests.Mail;
+
+namespace Wino.Core.Helpers;
+
+/// <summary>
+/// Converts queued synchronization requests into user-facing action descriptions.
+/// </summary>
+public static class SynchronizationActionHelper
+{
+    public static List<SynchronizationActionItem> CreateActionItems(
+        IEnumerable<IRequestBase> requests, Guid accountId, string accountName)
+    {
+        var items = new List<SynchronizationActionItem>();
+
+        // Group mail action requests by operation
+        var mailRequests = requests.OfType<IMailActionRequest>();
+        var mailGroups = mailRequests.GroupBy(r => GetMailActionKey(r));
+
+        foreach (var group in mailGroups)
+        {
+            var description = GetMailActionDescription(group.Key, group.ToList());
+
+            if (description != null)
+            {
+                items.Add(new SynchronizationActionItem
+                {
+                    AccountId = accountId,
+                    AccountName = accountName,
+                    Description = description
+                });
+            }
+        }
+
+        // Handle folder action requests individually
+        var folderRequests = requests.OfType<IFolderActionRequest>();
+        foreach (var folderRequest in folderRequests)
+        {
+            var description = GetFolderActionDescription(folderRequest);
+
+            if (description != null)
+            {
+                items.Add(new SynchronizationActionItem
+                {
+                    AccountId = accountId,
+                    AccountName = accountName,
+                    Description = description
+                });
+            }
+        }
+
+        var calendarRequests = requests.OfType<ICalendarActionRequest>();
+        foreach (var calendarRequest in calendarRequests)
+        {
+            var description = GetCalendarActionDescription(calendarRequest);
+
+            if (description != null)
+            {
+                items.Add(new SynchronizationActionItem
+                {
+                    AccountId = accountId,
+                    AccountName = accountName,
+                    Description = description
+                });
+            }
+        }
+
+        return items;
+    }
+
+    /// <summary>
+    /// Returns a key that differentiates MarkRead vs MarkUnread, Flag vs Unflag, Archive vs Unarchive.
+    /// </summary>
+    private static string GetMailActionKey(IMailActionRequest request)
+    {
+        return request switch
+        {
+            MarkReadRequest r => r.IsRead ? "MarkRead" : "MarkUnread",
+            ChangeFlagRequest r => r.IsFlagged ? "SetFlag" : "ClearFlag",
+            ArchiveRequest r => r.IsArchiving ? "Archive" : "Unarchive",
+            _ => request.Operation.ToString()
+        };
+    }
+
+    private static string GetMailActionDescription(string actionKey, List<IMailActionRequest> requests)
+    {
+        int count = requests.Count;
+
+        return actionKey switch
+        {
+            "MarkRead" => string.Format(Translator.SyncAction_MarkingAsRead, count),
+            "MarkUnread" => string.Format(Translator.SyncAction_MarkingAsUnread, count),
+            "Delete" => string.Format(Translator.SyncAction_Deleting, count),
+            "Move" => string.Format(Translator.SyncAction_Moving, count),
+            "Archive" => string.Format(Translator.SyncAction_Archiving, count),
+            "Unarchive" => string.Format(Translator.SyncAction_Unarchiving, count),
+            "SetFlag" => string.Format(Translator.SyncAction_SettingFlag, count),
+            "ClearFlag" => string.Format(Translator.SyncAction_ClearingFlag, count),
+            "CreateDraft" => Translator.SyncAction_CreatingDraft,
+            "Send" => Translator.SyncAction_SendingMail,
+            "MoveToFocused" => string.Format(Translator.SyncAction_MovingToFocused, count),
+            "AlwaysMoveTo" => string.Format(Translator.SyncAction_Moving, count),
+            _ => null
+        };
+    }
+
+    private static string GetFolderActionDescription(IFolderActionRequest request)
+    {
+        return request switch
+        {
+            RenameFolderRequest => Translator.SyncAction_RenamingFolder,
+            EmptyFolderRequest => Translator.SyncAction_EmptyingFolder,
+            MarkFolderAsReadRequest => Translator.SyncAction_MarkingFolderAsRead,
+            DeleteFolderRequest => Translator.FolderOperation_Delete,
+            CreateSubFolderRequest => Translator.FolderOperation_CreateSubFolder,
+            _ => null
+        };
+    }
+
+    private static string GetCalendarActionDescription(ICalendarActionRequest request)
+    {
+        return request switch
+        {
+            CreateCalendarEventRequest => Translator.SyncAction_CreatingEvent,
+            _ => null
+        };
+    }
+}
diff --git a/Wino.Core/Http/GraphRateLimitHandler.cs b/Wino.Core/Http/GraphRateLimitHandler.cs
new file mode 100644
index 00000000..7503b701
--- /dev/null
+++ b/Wino.Core/Http/GraphRateLimitHandler.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+
+namespace Wino.Core.Http;
+
+/// <summary>
+/// DelegatingHandler that automatically handles Microsoft Graph API 429 rate limiting responses.
+/// Integrates directly with the Graph SDK HTTP pipeline to provide transparent retry functionality.
+/// 
+/// Features:
+/// - Intercepts 429 (Too Many Requests) HTTP responses before they become ServiceExceptions
+/// - Respects Retry-After header from responses (both seconds and HTTP date formats)
+/// - Maximum 3 retry attempts to prevent infinite loops
+/// - Caps retry delays to 5 minutes maximum
+/// - Uses 60-second default delay if no Retry-After header is provided
+/// - Comprehensive logging for debugging and monitoring
+/// - Thread-safe and cancellation token aware
+/// - Integrates seamlessly with existing Graph SDK error handling
+/// 
+/// Usage:
+/// Add to GraphServiceClient handlers in OutlookSynchronizer constructor:
+/// 
+/// var handlers = GraphClientFactory.CreateDefaultHandlers();
+/// handlers.Add(new MicrosoftImmutableIdHandler());
+/// handlers.Add(new GraphRateLimitHandler());
+/// var httpClient = GraphClientFactory.Create(handlers);
+/// </summary>
+public class GraphRateLimitHandler : DelegatingHandler
+{
+    private static readonly ILogger _logger = Log.ForContext<GraphRateLimitHandler>();
+    private const int MaxRetryAttempts = 3;
+    private const int MaxDelaySeconds = 300; // 5 minutes cap
+    private const int DefaultDelaySeconds = 60; // Default delay when no Retry-After header
+
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var attempt = 0;
+
+        while (attempt <= MaxRetryAttempts)
+        {
+            HttpResponseMessage response;
+            
+            try
+            {
+                response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Error sending request to {Uri} on attempt {Attempt}", request.RequestUri, attempt + 1);
+                throw;
+            }
+
+            // Check if we got a 429 Too Many Requests response
+            if (response.StatusCode == HttpStatusCode.TooManyRequests)
+            {
+                if (attempt == MaxRetryAttempts)
+                {
+                    _logger.Warning("Max retry attempts ({MaxAttempts}) reached for rate limited request to {Uri}", 
+                        MaxRetryAttempts, request.RequestUri);
+                    return response; // Return the 429 response after max attempts
+                }
+
+                // Get the Retry-After header value
+                var retryAfterSeconds = GetRetryAfterSeconds(response);
+                
+                if (retryAfterSeconds > 0)
+                {
+                    // Cap the delay to a reasonable maximum
+                    var cappedDelay = Math.Min(retryAfterSeconds, MaxDelaySeconds);
+                    
+                    _logger.Information("Rate limited (429) - waiting {RetrySeconds} seconds before retry attempt {Attempt}/{MaxAttempts} for {Uri}", 
+                        cappedDelay, attempt + 1, MaxRetryAttempts, request.RequestUri);
+                    
+                    await Task.Delay(TimeSpan.FromSeconds(cappedDelay), cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    _logger.Warning("Rate limited (429) but no valid Retry-After header found for {Uri} - using default {DefaultDelay} second delay", 
+                        request.RequestUri, DefaultDelaySeconds);
+                    
+                    // Use a default delay if no Retry-After header is provided
+                    await Task.Delay(TimeSpan.FromSeconds(DefaultDelaySeconds), cancellationToken).ConfigureAwait(false);
+                }
+
+                attempt++;
+                response.Dispose(); // Dispose the 429 response before retry
+                continue;
+            }
+
+            // Success or other error - return the response
+            return response;
+        }
+
+        // This should never be reached, but just in case
+        throw new InvalidOperationException("Rate limiting retry logic error");
+    }
+
+    /// <summary>
+    /// Extracts the retry delay from the Retry-After header.
+    /// Supports both seconds (integer) and HTTP date formats.
+    /// </summary>
+    /// <param name="response">The HTTP response containing Retry-After header</param>
+    /// <returns>Number of seconds to wait, or 0 if header is missing or invalid</returns>
+    private int GetRetryAfterSeconds(HttpResponseMessage response)
+    {
+        try
+        {
+            // Check if Retry-After header exists
+            if (response.Headers.RetryAfter == null)
+            {
+                _logger.Debug("No Retry-After header found in response");
+                return 0;
+            }
+
+            // Handle retry-after-seconds (integer)
+            if (response.Headers.RetryAfter.Delta.HasValue)
+            {
+                var seconds = (int)response.Headers.RetryAfter.Delta.Value.TotalSeconds;
+                _logger.Debug("Found Retry-After delta: {Seconds} seconds", seconds);
+                return seconds;
+            }
+
+            // Handle retry-after-date (HTTP date)
+            if (response.Headers.RetryAfter.Date.HasValue)
+            {
+                var retryAfterTime = response.Headers.RetryAfter.Date.Value;
+                var delaySeconds = (int)(retryAfterTime - DateTimeOffset.UtcNow).TotalSeconds;
+                _logger.Debug("Found Retry-After date: {Date}, calculated delay: {Seconds} seconds", retryAfterTime, delaySeconds);
+                
+                // Ensure we don't have a negative delay
+                return Math.Max(0, delaySeconds);
+            }
+
+            _logger.Debug("Retry-After header present but no valid value found");
+            return 0;
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Error parsing Retry-After header");
+            return 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Wino.Core/Integration/ImapClientPool.cs b/Wino.Core/Integration/ImapClientPool.cs
index 683c33aa..1c0c997d 100644
--- a/Wino.Core/Integration/ImapClientPool.cs
+++ b/Wino.Core/Integration/ImapClientPool.cs
@@ -1,18 +1,18 @@
-using System;
+using System;
 using System.Collections.Concurrent;
-using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Security;
+using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
-using System.Text;
 using System.Threading;
+using System.Threading.Channels;
 using System.Threading.Tasks;
-using System.Timers;
+using MailKit;
 using MailKit.Net.Imap;
 using MailKit.Net.Proxy;
 using MailKit.Security;
 using MimeKit.Cryptography;
-using MoreLinq;
 using Serilog;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
@@ -20,401 +20,749 @@ using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Models.Connectivity;
 
 namespace Wino.Core.Integration;
+
 /// <summary>
-/// Provides a pooling mechanism for ImapClient.
-/// Makes sure that we don't have too many connections to the server.
-/// Rents a connected & authenticated client from the pool all the time.
+/// Connection state for tracking individual client health.
+/// </summary>
+public enum ImapClientState
+{
+    Available,
+    InUse,
+    Idle,
+    Reconnecting,
+    Failed,
+    Disposed
+}
+
+/// <summary>
+/// Provides an enhanced pooling mechanism for ImapClient with Channel-based async rental.
+/// Maintains minimum active connections and a dedicated IDLE client.
 /// </summary>
-/// <param name="customServerInformation">Connection/Authentication info to be used to configure ImapClient.</param>
 public class ImapClientPool : IDisposable
 {
-    // Hardcoded implementation details for ID extension if the server supports.
-    // Some providers like Chinese 126 require Id to be sent before authentication.
-    // We don't expose any customer data here. Therefore it's safe for now.
-    // Later on maybe we can make it configurable and leave it to the user with passing
-    // real implementation details.
-    private readonly ImapImplementation _implementation = new()
-    {
-        Version = "1.8.0",
-        OS = "Windows",
-        Vendor = "Wino",
-        SupportUrl = "https://www.winomail.app",
-        Name = "Wino Mail User",
-    };
+    private const int DefaultAcquireTimeoutMs = 45_000;
+    private const int KeepAliveIntervalMs = 4 * 60 * 1000;
+    private const int MaintenanceIntervalMs = 60 * 1000;
+
+    private readonly ILogger _logger = Log.ForContext<ImapClientPool>();
+    private readonly CustomServerInformation _customServerInformation;
+    private readonly ConcurrentDictionary<WinoImapClient, ImapClientState> _clientStates = new();
+    private readonly Channel<WinoImapClient> _availableClients;
+    private readonly CancellationTokenSource _maintenanceCts = new();
+    private readonly SemaphoreSlim _initializeSemaphore = new(1, 1);
+    private readonly object _idleClientLock = new();
+    private readonly object _initialWarmupLock = new();
+    private readonly ImapServerQuirkProfile _quirks;
+    private readonly ImapImplementation _implementation;
+    private readonly int _maxConnections;
+    private readonly int _targetMinimumConnections;
+
+    private DateTime _lastKeepAliveSentUtc = DateTime.MinValue;
+    private WinoImapClient _dedicatedIdleClient;
+    private bool _disposedValue;
+    private bool _initialized;
+    private Task _maintenanceTask;
+    private Task _initialWarmupTask = Task.CompletedTask;
 
     public bool ThrowOnSSLHandshakeCallback { get; set; }
     public ImapClientPoolOptions ImapClientPoolOptions { get; }
 
-    private bool _disposedValue;
-    private readonly int MinimumPoolSize = 5;
-    private readonly ConcurrentStack<IImapClient> _clients = new();
-    private readonly SemaphoreSlim _semaphore;
-    private readonly CustomServerInformation _customServerInformation;
-    private readonly Stream _protocolLogStream;
-    private readonly ILogger _logger = Log.ForContext<ImapClientPool>();
-    private readonly System.Timers.Timer _keepAliveTimer;
-    private readonly System.Timers.Timer _connectionMonitorTimer;
-
-    private const int KeepAliveInterval = 4 * 60 * 1000; // 4 minutes
-    private const int ConnectionMonitorInterval = 30 * 1000; // 30 seconds
+    /// <summary>
+    /// Gets the current health status of the connection pool.
+    /// </summary>
+    public ConnectionPoolHealth Health => GetHealthInternal();
 
     public ImapClientPool(ImapClientPoolOptions imapClientPoolOptions)
     {
         _customServerInformation = imapClientPoolOptions.ServerInformation;
-        _protocolLogStream = imapClientPoolOptions.ProtocolLog;
-
-        // Set the maximum pool size to 5 or the custom value if it's greater.
-        _semaphore = new(Math.Max(MinimumPoolSize, _customServerInformation.MaxConcurrentClients));
-
-        CryptographyContext.Register(typeof(WindowsSecureMimeContext));
         ImapClientPoolOptions = imapClientPoolOptions;
 
-        _keepAliveTimer = new System.Timers.Timer(KeepAliveInterval);
-        _connectionMonitorTimer = new System.Timers.Timer(ConnectionMonitorInterval);
+        _quirks = ImapServerQuirks.Resolve(_customServerInformation.IncomingServer);
 
-        _keepAliveTimer.Elapsed += KeepAliveTimerElapsed;
-        _connectionMonitorTimer.Elapsed += ConnectionMonitorTimerElapsed;
+        // Keep connection counts conservative by default and always cap by provider limits.
+        _maxConnections = CalculateMaxConnections(_customServerInformation.MaxConcurrentClients);
+        _targetMinimumConnections = CalculateTargetMinimumConnections(_maxConnections, _quirks.UseConservativeConnections);
+
+        _implementation = CreateImplementation();
+
+        CryptographyContext.Register(typeof(WindowsSecureMimeContext));
+
+        _availableClients = Channel.CreateUnbounded<WinoImapClient>(new UnboundedChannelOptions
+        {
+            SingleReader = false,
+            SingleWriter = false,
+            AllowSynchronousContinuations = false
+        });
     }
 
-    public async Task PreWarmPoolAsync()
+    /// <summary>
+    /// Initializes the pool by creating minimum connections and starting maintenance.
+    /// </summary>
+    public async Task InitializeAsync(CancellationToken cancellationToken = default)
     {
+        if (_initialized) return;
+
+        await _initializeSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
         try
         {
-            for (int i = 0; i < MinimumPoolSize; i++)
+            if (_initialized) return;
+
+            _logger.Information("Initializing IMAP client pool with {MinimumConnections} minimum active connections (max: {MaxConnections})", _targetMinimumConnections, _maxConnections);
+
+            // Fast-path startup: create one client eagerly so first RentAsync() is not blocked by full warm-up.
+            var initialClient = await CreateAndConnectClientAsync(cancellationToken).ConfigureAwait(false);
+            if (initialClient == null)
             {
-                var client = CreateNewClient();
-                await EnsureCapabilitiesAsync(client, true);
-                _clients.Push(client);
+                throw CreatePoolException("Failed to create initial IMAP connection for the pool.");
             }
 
-            // Start monitoring timers after pool is warmed
-            _keepAliveTimer.Start();
-            _connectionMonitorTimer.Start();
+            _clientStates[initialClient] = ImapClientState.Available;
+            await _availableClients.Writer.WriteAsync(initialClient, cancellationToken).ConfigureAwait(false);
+
+            _maintenanceTask = Task.Run(() => MaintenanceLoopAsync(_maintenanceCts.Token), _maintenanceCts.Token);
+            _initialized = true;
+
+            ScheduleInitialWarmup();
+            _logger.Information("IMAP client pool initialized. Health: {Health}", Health.Summary);
         }
         catch (Exception ex)
         {
-            _logger.Error(ex, "Failed to pre-warm client pool");
+            _logger.Error(ex, "Failed to initialize IMAP client pool");
+            throw CreatePoolException("IMAP client pool initialization failed.", ex);
         }
-    }
-
-    private async void KeepAliveTimerElapsed(object sender, ElapsedEventArgs e)
-    {
-        foreach (var client in _clients)
+        finally
         {
-            try
-            {
-                if (client.IsConnected && !((WinoImapClient)client).IsBusy())
-                {
-                    await SendNoOpAsync(client);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.Warning(ex, "Failed to send NOOP to client");
-            }
-        }
-    }
-
-    private async void ConnectionMonitorTimerElapsed(object sender, ElapsedEventArgs e)
-    {
-        foreach (var client in _clients)
-        {
-            try
-            {
-                if (!client.IsConnected && !((WinoImapClient)client).IsBusy())
-                {
-                    await EnsureCapabilitiesAsync(client, false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.Warning(ex, "Failed to reconnect client");
-            }
-        }
-    }
-
-    private async Task SendNoOpAsync(IImapClient client)
-    {
-        try
-        {
-            await client.NoOpAsync();
-        }
-        catch (Exception ex)
-        {
-            _logger.Warning(ex, "NOOP command failed");
+            _initializeSemaphore.Release();
         }
     }
 
     /// <summary>
-    /// Ensures all supported capabilities are enabled in this connection.
-    /// Reconnects and reauthenticates if necessary.
-    /// </summary>            
-    /// <param name="isCreatedNew">Whether the client has been newly created.</param>
-    private async Task EnsureCapabilitiesAsync(IImapClient client, bool isCreatedNew)
+    /// Pre-warms the pool (legacy compatibility method).
+    /// </summary>
+    public async Task PreWarmPoolAsync()
+    {
+        await InitializeAsync(CancellationToken.None).ConfigureAwait(false);
+
+        Task warmupTask;
+        lock (_initialWarmupLock)
+        {
+            warmupTask = _initialWarmupTask;
+        }
+
+        if (warmupTask != null)
+        {
+            await warmupTask.ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// Rents a client from the pool with the default timeout.
+    /// </summary>
+    public Task<WinoImapClient> RentAsync(CancellationToken cancellationToken = default)
+        => RentAsync(TimeSpan.FromMilliseconds(DefaultAcquireTimeoutMs), cancellationToken);
+
+    /// <summary>
+    /// Rents a client from the pool with explicit timeout and cancellation.
+    /// </summary>
+    public async Task<WinoImapClient> RentAsync(TimeSpan timeout, CancellationToken cancellationToken = default)
+    {
+        if (!_initialized)
+            await InitializeAsync(cancellationToken).ConfigureAwait(false);
+
+        using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+        linkedCts.CancelAfter(timeout);
+        var token = linkedCts.Token;
+
+        int createFailures = 0;
+
+        try
+        {
+            while (!token.IsCancellationRequested)
+            {
+                if (_availableClients.Reader.TryRead(out var pooledClient))
+                {
+                    if (pooledClient != null && _clientStates.TryGetValue(pooledClient, out var state) && state == ImapClientState.Available)
+                    {
+                        try
+                        {
+                            await EnsureClientReadyAsync(pooledClient, token).ConfigureAwait(false);
+                            _clientStates[pooledClient] = ImapClientState.InUse;
+                            return pooledClient;
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Warning(ex, "Pooled IMAP client was not ready. Marking as failed.");
+                            MarkClientAsFailed(pooledClient);
+                        }
+                    }
+                }
+
+                if (CanCreateAdditionalConnection())
+                {
+                    var newClient = await CreateAndConnectClientAsync(token).ConfigureAwait(false);
+                    if (newClient != null)
+                    {
+                        _clientStates[newClient] = ImapClientState.InUse;
+                        return newClient;
+                    }
+
+                    createFailures++;
+                }
+
+                await Task.Delay(150, token).ConfigureAwait(false);
+            }
+        }
+        catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
+        {
+            throw CreatePoolException($"Timed out while acquiring an IMAP client after {timeout.TotalSeconds:F1} seconds. Failures: {createFailures}.");
+        }
+
+        throw cancellationToken.IsCancellationRequested
+            ? new OperationCanceledException(cancellationToken)
+            : CreatePoolException($"Failed to acquire IMAP client within {timeout.TotalSeconds:F1} seconds. Failures: {createFailures}.");
+    }
+
+    /// <summary>
+    /// Gets a client from the pool (legacy compatibility method).
+    /// </summary>
+    public Task<IImapClient> GetClientAsync()
+        => GetClientAsync(CancellationToken.None, null);
+
+    /// <summary>
+    /// Gets a client from the pool with explicit cancellation and timeout control.
+    /// </summary>
+    public async Task<IImapClient> GetClientAsync(CancellationToken cancellationToken, TimeSpan? timeout = null)
+        => await RentAsync(timeout ?? TimeSpan.FromMilliseconds(DefaultAcquireTimeoutMs), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Returns a client to the pool.
+    /// </summary>
+    public void Return(WinoImapClient client, bool isFaulted = false)
+    {
+        if (client == null || _disposedValue)
+        {
+            if (client != null)
+                DisposeClient(client);
+            return;
+        }
+
+        if (isFaulted || !client.IsConnected)
+        {
+            MarkClientAsFailed(client);
+            return;
+        }
+
+        _clientStates[client] = ImapClientState.Available;
+        _availableClients.Writer.TryWrite(client);
+    }
+
+    /// <summary>
+    /// Releases a client (legacy compatibility method).
+    /// </summary>
+    public void Release(IImapClient item, bool destroyClient = false)
+    {
+        if (item is WinoImapClient winoClient)
+        {
+            Return(winoClient, destroyClient);
+        }
+        else if (item != null)
+        {
+            DisposeClient(item);
+        }
+    }
+
+    /// <summary>
+    /// Gets the dedicated IDLE client. Creates one if not available.
+    /// </summary>
+    public async Task<WinoImapClient> GetIdleClientAsync(CancellationToken cancellationToken = default)
+    {
+        lock (_idleClientLock)
+        {
+            if (_dedicatedIdleClient != null && _dedicatedIdleClient.IsConnected)
+            {
+                return _dedicatedIdleClient;
+            }
+        }
+
+        if (!CanCreateAdditionalConnection())
+        {
+            _logger.Warning("Unable to allocate a dedicated IDLE client because pool is at max capacity ({MaxConnections}).", _maxConnections);
+            return null;
+        }
+
+        var idleClient = await CreateAndConnectClientAsync(cancellationToken).ConfigureAwait(false);
+        if (idleClient == null)
+            return null;
+
+        lock (_idleClientLock)
+        {
+            if (_dedicatedIdleClient != null)
+            {
+                MarkClientAsFailed(_dedicatedIdleClient);
+            }
+
+            _dedicatedIdleClient = idleClient;
+            _clientStates[idleClient] = ImapClientState.Idle;
+        }
+
+        return idleClient;
+    }
+
+    /// <summary>
+    /// Releases the IDLE client for reconnection.
+    /// </summary>
+    public void ReleaseIdleClient(bool isFaulted = false)
+    {
+        lock (_idleClientLock)
+        {
+            if (_dedicatedIdleClient == null)
+                return;
+
+            if (isFaulted || !_dedicatedIdleClient.IsConnected)
+            {
+                MarkClientAsFailed(_dedicatedIdleClient);
+                _dedicatedIdleClient = null;
+                return;
+            }
+
+            _clientStates[_dedicatedIdleClient] = ImapClientState.Idle;
+        }
+    }
+
+    private ConnectionPoolHealth GetHealthInternal()
+    {
+        var health = new ConnectionPoolHealth
+        {
+            LastHealthCheck = DateTime.UtcNow,
+            IdleConnectionActive = _dedicatedIdleClient?.IsConnected ?? false
+        };
+
+        foreach (var kvp in _clientStates)
+        {
+            health.TotalConnections++;
+            switch (kvp.Value)
+            {
+                case ImapClientState.Available:
+                    health.AvailableConnections++;
+                    break;
+                case ImapClientState.InUse:
+                    health.InUseConnections++;
+                    break;
+                case ImapClientState.Failed:
+                    health.FailedConnections++;
+                    break;
+                case ImapClientState.Reconnecting:
+                    health.ReconnectingConnections++;
+                    break;
+            }
+        }
+
+        return health;
+    }
+
+    private async Task MaintenanceLoopAsync(CancellationToken cancellationToken)
+    {
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            try
+            {
+                await Task.Delay(MaintenanceIntervalMs, cancellationToken).ConfigureAwait(false);
+
+                var keepAliveElapsedMs = (DateTime.UtcNow - _lastKeepAliveSentUtc).TotalMilliseconds;
+                if (keepAliveElapsedMs >= KeepAliveIntervalMs)
+                {
+                    await SendNoOpToAvailableClientsAsync(cancellationToken).ConfigureAwait(false);
+                    _lastKeepAliveSentUtc = DateTime.UtcNow;
+                }
+
+                await EnsureMinimumConnectionsAsync(cancellationToken).ConfigureAwait(false);
+                await CleanupFailedConnectionsAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+            {
+                break;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Error in pool maintenance loop");
+            }
+        }
+    }
+
+    private async Task SendNoOpToAvailableClientsAsync(CancellationToken cancellationToken)
+    {
+        foreach (var kvp in _clientStates)
+        {
+            if (kvp.Value != ImapClientState.Available)
+                continue;
+
+            if (!kvp.Key.IsConnected || kvp.Key.IsBusy())
+                continue;
+
+            try
+            {
+                await kvp.Key.NoOpAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.Debug(ex, "NOOP failed for pooled client. Marking as failed.");
+                MarkClientAsFailed(kvp.Key);
+            }
+        }
+    }
+
+    private async Task EnsureMinimumConnectionsAsync(CancellationToken cancellationToken)
+    {
+        var availableConnections = _clientStates.Count(kvp => kvp.Value == ImapClientState.Available);
+        var neededConnections = _targetMinimumConnections - availableConnections;
+
+        if (neededConnections <= 0)
+            return;
+
+        for (int i = 0; i < neededConnections; i++)
+        {
+            if (!CanCreateAdditionalConnection())
+                break;
+
+            try
+            {
+                var client = await CreateAndConnectClientAsync(cancellationToken).ConfigureAwait(false);
+                if (client == null)
+                    continue;
+
+                _clientStates[client] = ImapClientState.Available;
+                await _availableClients.Writer.WriteAsync(client, cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to create minimum pool connection during maintenance.");
+                break;
+            }
+        }
+    }
+
+    private void ScheduleInitialWarmup()
+    {
+        lock (_initialWarmupLock)
+        {
+            if (_initialWarmupTask != null && !_initialWarmupTask.IsCompleted)
+                return;
+
+            _initialWarmupTask = Task.Run(() => EnsureWarmBaselineAsync(_maintenanceCts.Token), _maintenanceCts.Token);
+        }
+    }
+
+    private async Task EnsureWarmBaselineAsync(CancellationToken cancellationToken)
     {
         try
         {
-            bool isReconnected = await EnsureConnectedAsync(client);
-            bool mustDoPostAuthIdentification = false;
+            await EnsureMinimumConnectionsAsync(cancellationToken).ConfigureAwait(false);
 
-            if ((isCreatedNew || isReconnected) && client.IsConnected)
+            lock (_idleClientLock)
             {
-                if (client.Capabilities.HasFlag(ImapCapabilities.Compress))
-                    await client.CompressAsync();
+                if (_dedicatedIdleClient != null && _dedicatedIdleClient.IsConnected)
+                    return;
+            }
 
-                // Identify if the server supports ID extension.
-                // Some servers require it pre-authentication, some post-authentication.
-                // We'll observe the response here and do it after authentication if needed.
+            if (!CanCreateAdditionalConnection())
+                return;
 
-                if (client.Capabilities.HasFlag(ImapCapabilities.Id))
+            var idleCandidate = await CreateAndConnectClientAsync(cancellationToken).ConfigureAwait(false);
+            if (idleCandidate == null)
+                return;
+
+            bool assignedAsIdle = false;
+            lock (_idleClientLock)
+            {
+                if (_dedicatedIdleClient == null || !_dedicatedIdleClient.IsConnected)
                 {
-                    try
-                    {
-                        await client.IdentifyAsync(_implementation);
-                    }
-                    catch (ImapCommandException commandException) when (commandException.Response == ImapCommandResponse.No || commandException.Response == ImapCommandResponse.Bad)
-                    {
-                        mustDoPostAuthIdentification = true;
-                    }
-                    catch (Exception)
-                    {
-                        throw;
-                    }
+                    _dedicatedIdleClient = idleCandidate;
+                    _clientStates[idleCandidate] = ImapClientState.Idle;
+                    assignedAsIdle = true;
                 }
             }
 
-            await EnsureAuthenticatedAsync(client);
-
-            if ((isCreatedNew || isReconnected) && client.IsAuthenticated)
+            if (!assignedAsIdle)
             {
-                if (mustDoPostAuthIdentification) await client.IdentifyAsync(_implementation);
-
-                // Activate post-auth capabilities.
-                if (client.Capabilities.HasFlag(ImapCapabilities.QuickResync))
-                {
-                    await client.EnableQuickResyncAsync().ConfigureAwait(false);
-                    if (client is WinoImapClient winoImapClient) winoImapClient.IsQResyncEnabled = true;
-                }
+                _clientStates[idleCandidate] = ImapClientState.Available;
+                _availableClients.Writer.TryWrite(idleCandidate);
             }
         }
+        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+        {
+            // Pool is shutting down.
+        }
         catch (Exception ex)
         {
-            if (ex.InnerException is ImapTestSSLCertificateException imapTestSSLCertificateException)
-                throw imapTestSSLCertificateException;
-
-            throw new ImapClientPoolException(ex, GetProtocolLogContent());
-        }
-        finally
-        {
-            // Release it even if it fails.
-            _semaphore.Release();
+            _logger.Warning(ex, "Initial IMAP pool warm-up failed. Pool will continue with maintenance recovery.");
         }
     }
 
-    public string GetProtocolLogContent()
+    private Task CleanupFailedConnectionsAsync()
     {
-        if (_protocolLogStream == null) return default;
-
-        // Set the position to the beginning of the stream in case it is not already at the start
-        if (_protocolLogStream.CanSeek)
-            _protocolLogStream.Seek(0, SeekOrigin.Begin);
-
-        using var reader = new StreamReader(_protocolLogStream, Encoding.UTF8, true, 1024, leaveOpen: true);
-        return reader.ReadToEnd();
-    }
-
-    public async Task<IImapClient> GetClientAsync()
-    {
-        await _semaphore.WaitAsync();
-
-        if (_clients.TryPop(out IImapClient item))
+        foreach (var kvp in _clientStates)
         {
-            await EnsureCapabilitiesAsync(item, false);
+            if (kvp.Value != ImapClientState.Failed && kvp.Value != ImapClientState.Disposed)
+                continue;
 
-            return item;
+            DisposeClient(kvp.Key);
+            _clientStates.TryRemove(kvp.Key, out _);
         }
 
+        return Task.CompletedTask;
+    }
+
+    private async Task<WinoImapClient> CreateAndConnectClientAsync(CancellationToken cancellationToken)
+    {
         var client = CreateNewClient();
 
-        await EnsureCapabilitiesAsync(client, true);
-
-        return client;
+        try
+        {
+            await EnsureClientReadyAsync(client, cancellationToken).ConfigureAwait(false);
+            return client;
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to create and connect IMAP client.");
+            DisposeClient(client);
+            return null;
+        }
     }
 
-    public void Release(IImapClient item, bool destroyClient = false)
+    private async Task EnsureClientReadyAsync(WinoImapClient client, CancellationToken cancellationToken)
     {
-        if (item != null)
+        if (!client.IsConnected)
         {
-            if (destroyClient)
+            client.ServerCertificateValidationCallback = MyServerCertificateValidationCallback;
+
+            await client.ConnectAsync(
+                _customServerInformation.IncomingServer,
+                int.Parse(_customServerInformation.IncomingServerPort),
+                GetSocketOptions(_customServerInformation.IncomingServerSocketOption),
+                cancellationToken).ConfigureAwait(false);
+
+            if (client.Capabilities.HasFlag(ImapCapabilities.Compress))
             {
-                if (item.IsConnected)
+                try
                 {
-                    lock (item.SyncRoot)
-                    {
-                        item.Disconnect(quit: true);
-                    }
+                    await client.CompressAsync(cancellationToken).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Debug(ex, "Failed to enable IMAP compression. Continuing without compression.");
                 }
-                item.Dispose();
-            }
-            else if (!_disposedValue)
-            {
-                _clients.Push(item);
             }
 
-            _semaphore.Release();
-        }
-    }
-
-    private IImapClient CreateNewClient()
-    {
-        WinoImapClient client = null;
-
-        client = new WinoImapClient();
-
-        HttpProxyClient proxyClient = null;
-
-        // Add proxy client if exists.
-        if (!string.IsNullOrEmpty(_customServerInformation.ProxyServer))
-        {
-            proxyClient = new HttpProxyClient(_customServerInformation.ProxyServer, int.Parse(_customServerInformation.ProxyServerPort));
-            client.ProxyClient = proxyClient;
+            await TryIdentifyAsync(client, cancellationToken).ConfigureAwait(false);
         }
 
-        _logger.Debug("Creating new ImapClient. Current clients: {Count}", _clients.Count);
-
-        return client;
-    }
-
-    private SecureSocketOptions GetSocketOptions(ImapConnectionSecurity connectionSecurity)
-        => connectionSecurity switch
+        if (!client.IsAuthenticated)
         {
-            ImapConnectionSecurity.Auto => SecureSocketOptions.Auto,
-            ImapConnectionSecurity.None => SecureSocketOptions.None,
-            ImapConnectionSecurity.StartTls => SecureSocketOptions.StartTlsWhenAvailable,
-            ImapConnectionSecurity.SslTls => SecureSocketOptions.SslOnConnect,
-            _ => SecureSocketOptions.None
-        };
+            var cred = new NetworkCredential(
+                _customServerInformation.IncomingServerUsername,
+                _customServerInformation.IncomingServerPassword);
 
-    /// <returns>True if the connection is newly established.</returns>
-    public async Task<bool> EnsureConnectedAsync(IImapClient client)
-    {
-        if (client.IsConnected) return false;
+            var authMethod = _customServerInformation.IncomingAuthenticationMethod;
 
-        client.ServerCertificateValidationCallback = MyServerCertificateValidationCallback;
-
-        await client.ConnectAsync(_customServerInformation.IncomingServer,
-                                  int.Parse(_customServerInformation.IncomingServerPort),
-                                  GetSocketOptions(_customServerInformation.IncomingServerSocketOption));
-
-        // Print out useful information for testing.
-        if (client.IsConnected && ImapClientPoolOptions.IsTestPool)
-        {
-            // Print supported authentication methods for the client.
-            var supportedAuthMethods = client.AuthenticationMechanisms;
-
-            if (supportedAuthMethods == null || supportedAuthMethods.Count == 0)
+            if (authMethod != ImapAuthenticationMethod.Auto)
             {
-                WriteToProtocolLog("There are no supported authentication mechanisms...");
+                client.AuthenticationMechanisms.Clear();
+                var saslMechanism = GetSASLAuthenticationMethodName(authMethod);
+                client.AuthenticationMechanisms.Add(saslMechanism);
+                await client.AuthenticateAsync(SaslMechanism.Create(saslMechanism, cred), cancellationToken).ConfigureAwait(false);
             }
             else
             {
-                WriteToProtocolLog($"Supported authentication mechanisms: {string.Join(", ", supportedAuthMethods)}");
+                await client.AuthenticateAsync(cred, cancellationToken).ConfigureAwait(false);
+            }
+
+            await TryIdentifyAsync(client, cancellationToken).ConfigureAwait(false);
+
+            client.IsQResyncEnabled = false;
+            if (!_quirks.DisableQResync && client.Capabilities.HasFlag(ImapCapabilities.QuickResync))
+            {
+                try
+                {
+                    await client.EnableQuickResyncAsync(cancellationToken).ConfigureAwait(false);
+                    client.IsQResyncEnabled = true;
+                }
+                catch (Exception ex)
+                {
+                    _logger.Debug(ex, "Failed to enable QRESYNC for {Server}. Falling back to non-QRESYNC synchronization.", _customServerInformation.IncomingServer);
+                }
             }
         }
-
-        return true;
     }
 
-    public async Task EnsureAuthenticatedAsync(IImapClient client)
+    private async Task TryIdentifyAsync(WinoImapClient client, CancellationToken cancellationToken)
     {
-        if (client.IsAuthenticated) return;
+        if (!client.Capabilities.HasFlag(ImapCapabilities.Id))
+            return;
 
-        var cred = new NetworkCredential(_customServerInformation.IncomingServerUsername, _customServerInformation.IncomingServerPassword);
-        var prefferedAuthenticationMethod = _customServerInformation.IncomingAuthenticationMethod;
-
-        if (prefferedAuthenticationMethod != ImapAuthenticationMethod.Auto)
-        {
-            // Anything beside Auto must be explicitly set for the client.
-            client.AuthenticationMechanisms.Clear();
-            var saslMechanism = GetSASLAuthenticationMethodName(prefferedAuthenticationMethod);
-            client.AuthenticationMechanisms.Add(saslMechanism);
-            await client.AuthenticateAsync(SaslMechanism.Create(saslMechanism, cred));
-        }
-        else
-        {
-            await client.AuthenticateAsync(cred);
-        }
-    }
-
-    private string GetSASLAuthenticationMethodName(ImapAuthenticationMethod method)
-        => method switch
-        {
-            ImapAuthenticationMethod.NormalPassword => "PLAIN",
-            ImapAuthenticationMethod.EncryptedPassword => "LOGIN",
-            ImapAuthenticationMethod.Ntlm => "NTLM",
-            ImapAuthenticationMethod.CramMd5 => "CRAM-MD5",
-            ImapAuthenticationMethod.DigestMd5 => "DIGEST-MD5",
-            _ => "PLAIN"
-        };
-
-    private void WriteToProtocolLog(string message)
-    {
-        if (_protocolLogStream == null) return;
         try
         {
-            var messageBytes = Encoding.UTF8.GetBytes($"W: {message}\n");
-            _protocolLogStream.Write(messageBytes, 0, messageBytes.Length);
+            await client.IdentifyAsync(_implementation, cancellationToken).ConfigureAwait(false);
         }
-        catch (ObjectDisposedException)
+        catch (ImapCommandException)
         {
-            Log.Warning($"Protocol log stream is disposed. Cannot write to it.");
+            // Some servers refuse ID even if advertised. Ignore and continue.
         }
-        catch (Exception)
+        catch (Exception ex)
         {
-            throw;
+            _logger.Debug(ex, "Failed to send IMAP ID payload. Continuing without Identify().");
         }
     }
 
-    bool MyServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+    private WinoImapClient CreateNewClient()
+    {
+        var client = new WinoImapClient();
+
+        if (!string.IsNullOrEmpty(_customServerInformation.ProxyServer))
+        {
+            client.ProxyClient = new HttpProxyClient(
+                _customServerInformation.ProxyServer,
+                int.Parse(_customServerInformation.ProxyServerPort));
+        }
+
+        _logger.Debug("Created new IMAP client. Current tracked pool size: {Count}", _clientStates.Count);
+        return client;
+    }
+
+    private void DisposeClient(IImapClient client)
+    {
+        if (client == null)
+            return;
+
+        try
+        {
+            if (client.IsConnected)
+            {
+                lock (client.SyncRoot)
+                {
+                    client.Disconnect(quit: true);
+                }
+            }
+
+            client.Dispose();
+        }
+        catch (Exception ex)
+        {
+            _logger.Debug(ex, "Error disposing IMAP client.");
+        }
+    }
+
+    private void MarkClientAsFailed(WinoImapClient client)
+    {
+        if (client == null)
+            return;
+
+        _clientStates[client] = ImapClientState.Failed;
+    }
+
+    private bool CanCreateAdditionalConnection()
+    {
+        var activeCount = _clientStates.Count(kvp => kvp.Value != ImapClientState.Failed && kvp.Value != ImapClientState.Disposed);
+        return activeCount < _maxConnections;
+    }
+
+    private ImapClientPoolException CreatePoolException(string message, Exception innerException = null)
+    {
+        return innerException == null
+            ? new ImapClientPoolException(message, _customServerInformation)
+            : new ImapClientPoolException(innerException);
+    }
+
+    private static ImapImplementation CreateImplementation()
+    {
+        var version = Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown";
+
+        return new ImapImplementation
+        {
+            Name = "Wino Mail",
+            Version = version,
+            Vendor = "Wino",
+            OS = Environment.OSVersion.VersionString,
+            SupportUrl = "https://www.winomail.app"
+        };
+    }
+
+    public static int CalculateMaxConnections(int configuredMaxConcurrentClients)
+        => Math.Clamp(configuredMaxConcurrentClients <= 0 ? 5 : configuredMaxConcurrentClients, 1, 10);
+
+    public static int CalculateTargetMinimumConnections(int maxConnections, bool useConservativeConnections)
+        => useConservativeConnections ? 1 : Math.Min(2, Math.Max(1, maxConnections));
+
+    private SecureSocketOptions GetSocketOptions(ImapConnectionSecurity connectionSecurity) => connectionSecurity switch
+    {
+        ImapConnectionSecurity.Auto => SecureSocketOptions.Auto,
+        ImapConnectionSecurity.None => SecureSocketOptions.None,
+        ImapConnectionSecurity.StartTls => SecureSocketOptions.StartTlsWhenAvailable,
+        ImapConnectionSecurity.SslTls => SecureSocketOptions.SslOnConnect,
+        _ => SecureSocketOptions.None
+    };
+
+    private string GetSASLAuthenticationMethodName(ImapAuthenticationMethod method) => method switch
+    {
+        ImapAuthenticationMethod.NormalPassword => "PLAIN",
+        ImapAuthenticationMethod.EncryptedPassword => "LOGIN",
+        ImapAuthenticationMethod.Ntlm => "NTLM",
+        ImapAuthenticationMethod.CramMd5 => "CRAM-MD5",
+        ImapAuthenticationMethod.DigestMd5 => "DIGEST-MD5",
+        _ => "PLAIN"
+    };
+
+    private bool MyServerCertificateValidationCallback(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
     {
-        // If there are no errors, then everything went smoothly.
         if (sslPolicyErrors == SslPolicyErrors.None) return true;
 
-        // Imap connectivity test will throw to alert the user here.
         if (ThrowOnSSLHandshakeCallback)
         {
-            throw new ImapTestSSLCertificateException(certificate.Issuer, certificate.GetExpirationDateString(), certificate.GetEffectiveDateString());
+            throw new ImapTestSSLCertificateException(
+                certificate.Issuer,
+                certificate.GetExpirationDateString(),
+                certificate.GetEffectiveDateString());
         }
 
         return true;
     }
 
+    // Legacy compatibility methods
+    public Task<bool> EnsureConnectedAsync(IImapClient client) =>
+        Task.FromResult(client.IsConnected);
+
+    public Task EnsureAuthenticatedAsync(IImapClient client) =>
+        Task.CompletedTask;
+
     protected virtual void Dispose(bool disposing)
     {
-        if (!_disposedValue)
+        if (_disposedValue)
+            return;
+
+        if (disposing)
         {
-            if (disposing)
+            _maintenanceCts.Cancel();
+            _maintenanceTask?.Wait(TimeSpan.FromSeconds(5));
+            _maintenanceCts.Dispose();
+            _initializeSemaphore.Dispose();
+
+            _availableClients.Writer.Complete();
+
+            foreach (var kvp in _clientStates)
             {
-                _keepAliveTimer.Stop();
-                _connectionMonitorTimer.Stop();
-
-                _keepAliveTimer.Dispose();
-                _connectionMonitorTimer.Dispose();
-
-                _clients.ForEach(client =>
-                {
-                    lock (client.SyncRoot)
-                    {
-                        client.Disconnect(true);
-                    }
-                    client.Dispose();
-                });
-
-                _clients.Clear();
+                DisposeClient(kvp.Key);
+            }
+
+            _clientStates.Clear();
+
+            lock (_idleClientLock)
+            {
+                _dedicatedIdleClient = null;
             }
 
-            _disposedValue = true;
         }
+
+        _disposedValue = true;
     }
 
     public void Dispose()
diff --git a/Wino.Core/Integration/ImapServerQuirks.cs b/Wino.Core/Integration/ImapServerQuirks.cs
new file mode 100644
index 00000000..559d14f8
--- /dev/null
+++ b/Wino.Core/Integration/ImapServerQuirks.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+
+namespace Wino.Core.Integration;
+
+internal sealed class ImapServerQuirkProfile
+{
+    public static readonly ImapServerQuirkProfile Default = new();
+
+    public bool DisableQResync { get; init; }
+    public bool DisableCondstore { get; init; }
+    public bool UseConservativeConnections { get; init; }
+}
+
+internal static class ImapServerQuirks
+{
+    private static readonly Dictionary<string, ImapServerQuirkProfile> Quirks = new(StringComparer.OrdinalIgnoreCase)
+    {
+        // Some strict providers are more stable with conservative behavior.
+        ["qq.com"] = new ImapServerQuirkProfile { DisableQResync = true, UseConservativeConnections = true },
+        ["163.com"] = new ImapServerQuirkProfile { DisableQResync = true, UseConservativeConnections = true },
+        ["126.com"] = new ImapServerQuirkProfile { DisableQResync = true, UseConservativeConnections = true },
+        ["yeah.net"] = new ImapServerQuirkProfile { DisableQResync = true, UseConservativeConnections = true }
+    };
+
+    public static ImapServerQuirkProfile Resolve(string host)
+    {
+        if (string.IsNullOrWhiteSpace(host))
+            return ImapServerQuirkProfile.Default;
+
+        foreach (var (key, profile) in Quirks)
+        {
+            if (host.Contains(key, StringComparison.OrdinalIgnoreCase))
+                return profile;
+        }
+
+        return ImapServerQuirkProfile.Default;
+    }
+}
diff --git a/Wino.Core/Integration/Json/ServerRequestTypeInfoResolver.cs b/Wino.Core/Integration/Json/ServerRequestTypeInfoResolver.cs
deleted file mode 100644
index 918b1e60..00000000
--- a/Wino.Core/Integration/Json/ServerRequestTypeInfoResolver.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using System.Text.Json.Serialization.Metadata;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.Requests.Folder;
-using Wino.Core.Requests.Mail;
-
-namespace Wino.Core.Integration.Json;
-
-public class ServerRequestTypeInfoResolver : DefaultJsonTypeInfoResolver
-{
-    public ServerRequestTypeInfoResolver()
-    {
-        Modifiers.Add(new System.Action<JsonTypeInfo>(t =>
-        {
-            if (t.Type == typeof(IRequestBase))
-            {
-                t.PolymorphismOptions = new()
-                {
-                    DerivedTypes =
-                    {
-                        new JsonDerivedType(typeof(AlwaysMoveToRequest), nameof(AlwaysMoveToRequest)),
-                        new JsonDerivedType(typeof(ArchiveRequest), nameof(ArchiveRequest)),
-                        new JsonDerivedType(typeof(ChangeFlagRequest), nameof(ChangeFlagRequest)),
-                        new JsonDerivedType(typeof(CreateDraftRequest), nameof(CreateDraftRequest)),
-                        new JsonDerivedType(typeof(DeleteRequest), nameof(DeleteRequest)),
-                        new JsonDerivedType(typeof(EmptyFolderRequest), nameof(EmptyFolderRequest)),
-                        new JsonDerivedType(typeof(MarkFolderAsReadRequest), nameof(MarkFolderAsReadRequest)),
-                        new JsonDerivedType(typeof(MarkReadRequest), nameof(MarkReadRequest)),
-                        new JsonDerivedType(typeof(MoveRequest), nameof(MoveRequest)),
-                        new JsonDerivedType(typeof(MoveToFocusedRequest), nameof(MoveToFocusedRequest)),
-                        new JsonDerivedType(typeof(RenameFolderRequest), nameof(RenameFolderRequest)),
-                        new JsonDerivedType(typeof(SendDraftRequest), nameof(SendDraftRequest)),
-                    }
-                };
-            }
-            else if (t.Type == typeof(IMailItem))
-            {
-                t.PolymorphismOptions = new JsonPolymorphismOptions()
-                {
-                    DerivedTypes =
-                    {
-                        new JsonDerivedType(typeof(MailCopy), nameof(MailCopy)),
-                    }
-                };
-            }
-            else if (t.Type == typeof(IMailItemFolder))
-            {
-                t.PolymorphismOptions = new JsonPolymorphismOptions()
-                {
-                    DerivedTypes =
-                    {
-                        new JsonDerivedType(typeof(MailItemFolder), nameof(MailItemFolder)),
-                    }
-                };
-            }
-        }));
-    }
-}
diff --git a/Wino.Core/Integration/Processors/DefaultChangeProcessor.cs b/Wino.Core/Integration/Processors/DefaultChangeProcessor.cs
index a7a98ea3..1db37931 100644
--- a/Wino.Core/Integration/Processors/DefaultChangeProcessor.cs
+++ b/Wino.Core/Integration/Processors/DefaultChangeProcessor.cs
@@ -9,6 +9,7 @@ using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Services;
 
@@ -44,6 +45,8 @@ public interface IDefaultChangeProcessor
     Task<List<AccountCalendar>> GetAccountCalendarsAsync(Guid accountId);
 
     Task DeleteCalendarItemAsync(Guid calendarItemId);
+    Task DeleteCalendarItemAsync(string calendarRemoteEventId, Guid calendarId);
+    Task<CalendarItem> GetCalendarItemAsync(Guid calendarId, string remoteEventId);
 
     Task DeleteAccountCalendarAsync(AccountCalendar accountCalendar);
     Task InsertAccountCalendarAsync(AccountCalendar accountCalendar);
@@ -53,6 +56,8 @@ public interface IDefaultChangeProcessor
     Task<List<MailCopy>> GetMailCopiesAsync(IEnumerable<string> mailCopyIds);
     Task CreateMailRawAsync(MailAccount account, MailItemFolder mailItemFolder, NewMailItemPackage package);
     Task DeleteUserMailCacheAsync(Guid accountId);
+    Task UpsertMailInvitationCalendarMappingAsync(MailInvitationCalendarMapping mapping);
+    Task<MailInvitationCalendarMapping> GetMailInvitationCalendarMappingAsync(Guid accountId, string mailCopyId);
 
     /// <summary>
     /// Checks whether the mail exists in the folder.
@@ -106,6 +111,19 @@ public interface IImapChangeProcessor : IDefaultChangeProcessor
     /// </summary>
     /// <param name="folderId">Folder id to retrieve uIds for.</param>
     Task<IList<uint>> GetKnownUidsForFolderAsync(Guid folderId);
+
+    /// <summary>
+    /// Gets the most recent mail IDs for a folder (for notification purposes).
+    /// </summary>
+    /// <param name="folderId">Folder ID.</param>
+    /// <param name="count">Number of recent mails to return.</param>
+    Task<IEnumerable<string>> GetRecentMailIdsForFolderAsync(Guid folderId, int count);
+
+    Task ManageCalendarEventAsync(CalDavCalendarEvent calendarEvent, AccountCalendar assignedCalendar, MailAccount organizerAccount);
+    Task SaveCalendarItemIcsAsync(Guid accountId, Guid calendarId, Guid calendarItemId, string remoteEventId, string remoteResourceHref, string eTag, string icsContent);
+    Task<string> GetCalendarItemIcsETagAsync(Guid accountId, Guid calendarId, Guid calendarItemId);
+    Task DeleteCalendarItemIcsAsync(Guid accountId, Guid calendarItemId);
+    Task DeleteCalendarIcsForCalendarAsync(Guid accountId, Guid calendarId);
 }
 
 public class DefaultChangeProcessor(IDatabaseService databaseService,
@@ -185,9 +203,15 @@ public class DefaultChangeProcessor(IDatabaseService databaseService,
     public Task<List<AccountCalendar>> GetAccountCalendarsAsync(Guid accountId)
         => CalendarService.GetAccountCalendarsAsync(accountId);
 
-    public Task DeleteCalendarItemAsync(Guid calendarItemId)
+    public virtual Task DeleteCalendarItemAsync(Guid calendarItemId)
         => CalendarService.DeleteCalendarItemAsync(calendarItemId);
 
+    public virtual Task DeleteCalendarItemAsync(string calendarRemoteEventId, Guid calendarId)
+        => CalendarService.DeleteCalendarItemAsync(calendarRemoteEventId, calendarId);
+
+    public Task<CalendarItem> GetCalendarItemAsync(Guid calendarId, string remoteEventId)
+        => CalendarService.GetCalendarItemAsync(calendarId, remoteEventId);
+
     public Task DeleteAccountCalendarAsync(AccountCalendar accountCalendar)
         => CalendarService.DeleteAccountCalendarAsync(accountCalendar);
 
@@ -206,6 +230,43 @@ public class DefaultChangeProcessor(IDatabaseService databaseService,
         await AccountService.DeleteAccountMailCacheAsync(accountId, AccountCacheResetReason.ExpiredCache).ConfigureAwait(false);
     }
 
+    public async Task UpsertMailInvitationCalendarMappingAsync(MailInvitationCalendarMapping mapping)
+    {
+        if (mapping == null || mapping.AccountId == Guid.Empty || string.IsNullOrWhiteSpace(mapping.MailCopyId))
+            return;
+
+        var existing = await Connection.Table<MailInvitationCalendarMapping>()
+            .FirstOrDefaultAsync(x => x.AccountId == mapping.AccountId && x.MailCopyId == mapping.MailCopyId)
+            .ConfigureAwait(false);
+
+        if (existing == null)
+        {
+            if (mapping.Id == Guid.Empty)
+                mapping.Id = Guid.NewGuid();
+
+            mapping.UpdatedAtUtc = DateTime.UtcNow;
+            await Connection.InsertAsync(mapping, typeof(MailInvitationCalendarMapping)).ConfigureAwait(false);
+            return;
+        }
+
+        existing.InvitationUid = mapping.InvitationUid;
+        existing.CalendarId = mapping.CalendarId;
+        existing.CalendarItemId = mapping.CalendarItemId;
+        existing.CalendarRemoteEventId = mapping.CalendarRemoteEventId;
+        existing.UpdatedAtUtc = DateTime.UtcNow;
+
+        await Connection.UpdateAsync(existing, typeof(MailInvitationCalendarMapping)).ConfigureAwait(false);
+    }
+
+    public Task<MailInvitationCalendarMapping> GetMailInvitationCalendarMappingAsync(Guid accountId, string mailCopyId)
+    {
+        if (accountId == Guid.Empty || string.IsNullOrWhiteSpace(mailCopyId))
+            return Task.FromResult<MailInvitationCalendarMapping>(null);
+
+        return Connection.Table<MailInvitationCalendarMapping>()
+            .FirstOrDefaultAsync(x => x.AccountId == accountId && x.MailCopyId == mailCopyId);
+    }
+
     public Task<bool> IsMailExistsInFolderAsync(string messageId, Guid folderId)
             => MailService.IsMailExistsAsync(messageId, folderId);
 }
diff --git a/Wino.Core/Integration/Processors/GmailChangeProcessor.cs b/Wino.Core/Integration/Processors/GmailChangeProcessor.cs
index c478308d..c1da8367 100644
--- a/Wino.Core/Integration/Processors/GmailChangeProcessor.cs
+++ b/Wino.Core/Integration/Processors/GmailChangeProcessor.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 using Google.Apis.Calendar.v3.Data;
 using Serilog;
@@ -65,12 +66,14 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
             // We don't have this event yet. Create a new one.
             var eventStartDateTimeOffset = GoogleIntegratorExtensions.GetEventDateTimeOffset(calendarEvent.Start);
             var eventEndDateTimeOffset = GoogleIntegratorExtensions.GetEventDateTimeOffset(calendarEvent.End);
+            var eventStartLocalDateTime = GoogleIntegratorExtensions.GetEventLocalDateTime(calendarEvent.Start);
+            var eventEndLocalDateTime = GoogleIntegratorExtensions.GetEventLocalDateTime(calendarEvent.End);
 
             double totalDurationInSeconds = 0;
 
-            if (eventStartDateTimeOffset != null && eventEndDateTimeOffset != null)
+            if (eventStartLocalDateTime != null && eventEndLocalDateTime != null)
             {
-                totalDurationInSeconds = (eventEndDateTimeOffset.Value - eventStartDateTimeOffset.Value).TotalSeconds;
+                totalDurationInSeconds = (eventEndLocalDateTime.Value - eventStartLocalDateTime.Value).TotalSeconds;
             }
 
             CalendarItem calendarItem = null;
@@ -96,18 +99,21 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
                     CreatedAt = DateTimeOffset.UtcNow,
                     Description = calendarEvent.Description ?? parentRecurringEvent.Description,
                     Id = Guid.NewGuid(),
-                    StartDate = eventStartDateTimeOffset.Value.DateTime,
-                    StartDateOffset = eventStartDateTimeOffset.Value.Offset,
-                    EndDateOffset = eventEndDateTimeOffset?.Offset ?? parentRecurringEvent.EndDateOffset,
+                    StartDate = eventStartLocalDateTime.Value,
                     DurationInSeconds = totalDurationInSeconds,
                     Location = string.IsNullOrEmpty(calendarEvent.Location) ? parentRecurringEvent.Location : calendarEvent.Location,
 
+                    // Store timezone information
+                    StartTimeZone = GoogleIntegratorExtensions.GetEventTimeZone(calendarEvent.Start) ?? parentRecurringEvent.StartTimeZone,
+                    EndTimeZone = GoogleIntegratorExtensions.GetEventTimeZone(calendarEvent.End) ?? parentRecurringEvent.EndTimeZone,
+
                     // Leave it empty if it's not populated.
                     Recurrence = GoogleIntegratorExtensions.GetRecurrenceString(calendarEvent) == null ? string.Empty : GoogleIntegratorExtensions.GetRecurrenceString(calendarEvent),
                     Status = GetStatus(calendarEvent.Status),
                     Title = string.IsNullOrEmpty(calendarEvent.Summary) ? parentRecurringEvent.Title : calendarEvent.Summary,
                     UpdatedAt = DateTimeOffset.UtcNow,
                     Visibility = string.IsNullOrEmpty(calendarEvent.Visibility) ? parentRecurringEvent.Visibility : GetVisibility(calendarEvent.Visibility),
+                    ShowAs = string.IsNullOrEmpty(calendarEvent.Transparency) ? parentRecurringEvent.ShowAs : GetShowAs(calendarEvent.Transparency),
                     HtmlLink = string.IsNullOrEmpty(calendarEvent.HtmlLink) ? parentRecurringEvent.HtmlLink : calendarEvent.HtmlLink,
                     RemoteEventId = calendarEvent.Id,
                     IsLocked = calendarEvent.Locked.GetValueOrDefault(),
@@ -132,16 +138,20 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
                     CreatedAt = DateTimeOffset.UtcNow,
                     Description = calendarEvent.Description,
                     Id = Guid.NewGuid(),
-                    StartDate = eventStartDateTimeOffset.Value.DateTime,
-                    StartDateOffset = eventStartDateTimeOffset.Value.Offset,
-                    EndDateOffset = eventEndDateTimeOffset.Value.Offset,
+                    StartDate = eventStartLocalDateTime.Value,
                     DurationInSeconds = totalDurationInSeconds,
                     Location = calendarEvent.Location,
+
+                    // Store timezone information from Google Calendar event
+                    StartTimeZone = GoogleIntegratorExtensions.GetEventTimeZone(calendarEvent.Start),
+                    EndTimeZone = GoogleIntegratorExtensions.GetEventTimeZone(calendarEvent.End),
+
                     Recurrence = GoogleIntegratorExtensions.GetRecurrenceString(calendarEvent),
                     Status = GetStatus(calendarEvent.Status),
                     Title = calendarEvent.Summary,
                     UpdatedAt = DateTimeOffset.UtcNow,
                     Visibility = GetVisibility(calendarEvent.Visibility),
+                    ShowAs = GetShowAs(calendarEvent.Transparency),
                     HtmlLink = calendarEvent.HtmlLink,
                     RemoteEventId = calendarEvent.Id,
                     IsLocked = calendarEvent.Locked.GetValueOrDefault(),
@@ -153,6 +163,9 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
             // Hide canceled events.
             calendarItem.IsHidden = calendarItem.Status == CalendarItemStatus.Cancelled;
 
+            // Set assigned calendar for navigation properties to work.
+            calendarItem.AssignedCalendar = assignedCalendar;
+
             // Manage the recurring event id.
             if (parentRecurringEvent != null)
             {
@@ -218,7 +231,64 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
                 }
             }
 
+            // Prepare reminders list from Gmail event
+            List<Reminder> reminders = null;
+            if (calendarEvent.Reminders?.Overrides != null && calendarEvent.Reminders.Overrides.Count > 0)
+            {
+                reminders = new List<Reminder>();
+                foreach (var reminderOverride in calendarEvent.Reminders.Overrides)
+                {
+                    if (reminderOverride.Minutes.HasValue)
+                    {
+                        var durationInSeconds = reminderOverride.Minutes.Value * 60; // Convert minutes to seconds
+                        var reminderType = reminderOverride.Method switch
+                        {
+                            "email" => CalendarItemReminderType.Email,
+                            _ => CalendarItemReminderType.Popup
+                        };
+
+                        reminders.Add(new Reminder
+                        {
+                            Id = Guid.NewGuid(),
+                            CalendarItemId = calendarItem.Id,
+                            DurationInSeconds = durationInSeconds,
+                            ReminderType = reminderType
+                        });
+                    }
+                }
+            }
+
+            // Prepare attachments metadata from Gmail event
+            List<CalendarAttachment> attachments = null;
+            if (calendarEvent.Attachments != null && calendarEvent.Attachments.Count > 0)
+            {
+                attachments = calendarEvent.Attachments
+                    .Where(a => a != null && !string.IsNullOrEmpty(a.Title))
+                    .Select(a => new CalendarAttachment
+                    {
+                        Id = Guid.NewGuid(),
+                        CalendarItemId = calendarItem.Id,
+                        RemoteAttachmentId = a.FileId ?? a.FileUrl, // Gmail uses FileId or FileUrl
+                        FileName = a.Title,
+                        Size = 0, // Gmail API doesn't provide size in Event.Attachment
+                        ContentType = a.MimeType ?? "application/octet-stream",
+                        IsDownloaded = false,
+                        LocalFilePath = null,
+                        LastModified = DateTimeOffset.UtcNow
+                    })
+                    .ToList();
+            }
+
             await CalendarService.CreateNewCalendarItemAsync(calendarItem, attendees);
+
+            // Save reminders separately
+            await CalendarService.SaveRemindersAsync(calendarItem.Id, reminders).ConfigureAwait(false);
+
+            // Save attachments metadata separately
+            if (attachments != null && attachments.Count > 0)
+            {
+                await CalendarService.InsertOrReplaceAttachmentsAsync(attachments).ConfigureAwait(false);
+            }
         }
         else
         {
@@ -250,10 +320,67 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
 
                 // Update the event properties.
             }
+
+            // Prepare reminders list from Gmail event for update
+            List<Reminder> reminders = null;
+            if (calendarEvent.Reminders?.Overrides != null && calendarEvent.Reminders.Overrides.Count > 0)
+            {
+                reminders = new List<Reminder>();
+                foreach (var reminderOverride in calendarEvent.Reminders.Overrides)
+                {
+                    if (reminderOverride.Minutes.HasValue)
+                    {
+                        var durationInSeconds = reminderOverride.Minutes.Value * 60; // Convert minutes to seconds
+                        var reminderType = reminderOverride.Method switch
+                        {
+                            "email" => CalendarItemReminderType.Email,
+                            _ => CalendarItemReminderType.Popup
+                        };
+
+                        reminders.Add(new Reminder
+                        {
+                            Id = Guid.NewGuid(),
+                            CalendarItemId = existingCalendarItem.Id,
+                            DurationInSeconds = durationInSeconds,
+                            ReminderType = reminderType
+                        });
+                    }
+                }
+            }
+
+            // Save reminders
+            await CalendarService.SaveRemindersAsync(existingCalendarItem.Id, reminders).ConfigureAwait(false);
+
+            // Prepare attachments metadata from Gmail event for update
+            List<CalendarAttachment> attachments = null;
+            if (calendarEvent.Attachments != null && calendarEvent.Attachments.Count > 0)
+            {
+                attachments = calendarEvent.Attachments
+                    .Where(a => a != null && !string.IsNullOrEmpty(a.Title))
+                    .Select(a => new CalendarAttachment
+                    {
+                        Id = Guid.NewGuid(),
+                        CalendarItemId = existingCalendarItem.Id,
+                        RemoteAttachmentId = a.FileId ?? a.FileUrl,
+                        FileName = a.Title,
+                        Size = 0,
+                        ContentType = a.MimeType ?? "application/octet-stream",
+                        IsDownloaded = false,
+                        LocalFilePath = null,
+                        LastModified = DateTimeOffset.UtcNow
+                    })
+                    .ToList();
+            }
+
+            // Save attachments metadata
+            if (attachments != null && attachments.Count > 0)
+            {
+                await CalendarService.InsertOrReplaceAttachmentsAsync(attachments).ConfigureAwait(false);
+            }
         }
 
         // Upsert the event.
-        await Connection.InsertOrReplaceAsync(existingCalendarItem);
+        await Connection.InsertOrReplaceAsync(existingCalendarItem, typeof(CalendarItem));
     }
 
     private string GetOrganizerName(Event calendarEvent, MailAccount account)
@@ -284,10 +411,10 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
     {
         return status switch
         {
-            "confirmed" => CalendarItemStatus.Confirmed,
+            "confirmed" => CalendarItemStatus.Accepted,
             "tentative" => CalendarItemStatus.Tentative,
             "cancelled" => CalendarItemStatus.Cancelled,
-            _ => CalendarItemStatus.Confirmed
+            _ => CalendarItemStatus.Accepted
         };
     }
 
@@ -309,6 +436,20 @@ public class GmailChangeProcessor : DefaultChangeProcessor, IGmailChangeProcesso
         };
     }
 
+    private CalendarItemShowAs GetShowAs(string transparency)
+    {
+        /// Google Calendar uses "transparent" for free time (event doesn't block time) 
+        /// and "opaque" for busy time (event blocks time on the calendar).
+        /// If not specified, defaults to opaque (busy).
+
+        return transparency switch
+        {
+            "transparent" => CalendarItemShowAs.Free,
+            "opaque" => CalendarItemShowAs.Busy,
+            _ => CalendarItemShowAs.Busy
+        };
+    }
+
     public Task<bool> HasAccountAnyDraftAsync(Guid accountId)
         => MailService.HasAccountAnyDraftAsync(accountId);
 
diff --git a/Wino.Core/Integration/Processors/ImapChangeProcessor.cs b/Wino.Core/Integration/Processors/ImapChangeProcessor.cs
index f23470bf..02a27f85 100644
--- a/Wino.Core/Integration/Processors/ImapChangeProcessor.cs
+++ b/Wino.Core/Integration/Processors/ImapChangeProcessor.cs
@@ -1,21 +1,203 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Services;
 
 namespace Wino.Core.Integration.Processors;
 
 public class ImapChangeProcessor : DefaultChangeProcessor, IImapChangeProcessor
 {
+    private readonly ICalendarIcsFileService _calendarIcsFileService;
+
     public ImapChangeProcessor(IDatabaseService databaseService,
                                IFolderService folderService,
                                IMailService mailService,
                                IAccountService accountService,
                                ICalendarService calendarService,
-                               IMimeFileService mimeFileService) : base(databaseService, folderService, mailService, calendarService, accountService, mimeFileService)
+                               IMimeFileService mimeFileService,
+                               ICalendarIcsFileService calendarIcsFileService) : base(databaseService, folderService, mailService, calendarService, accountService, mimeFileService)
     {
+        _calendarIcsFileService = calendarIcsFileService;
     }
 
     public Task<IList<uint>> GetKnownUidsForFolderAsync(Guid folderId) => FolderService.GetKnownUidsForFolderAsync(folderId);
+
+    public Task<IEnumerable<string>> GetRecentMailIdsForFolderAsync(Guid folderId, int count)
+        => MailService.GetRecentMailIdsForFolderAsync(folderId, count);
+
+    public async Task ManageCalendarEventAsync(CalDavCalendarEvent calendarEvent, AccountCalendar assignedCalendar, MailAccount organizerAccount)
+    {
+        if (calendarEvent == null || assignedCalendar == null)
+            return;
+
+        var existingItem = await CalendarService.GetCalendarItemAsync(assignedCalendar.Id, calendarEvent.RemoteEventId).ConfigureAwait(false);
+        var isNewItem = existingItem == null;
+        var savingItemId = existingItem?.Id ?? Guid.NewGuid();
+        var savingItem = existingItem ?? new CalendarItem { Id = savingItemId };
+
+        var startTimeZone = NormalizeTimeZoneId(calendarEvent.StartTimeZone, calendarEvent.Start);
+        var endTimeZone = NormalizeTimeZoneId(calendarEvent.EndTimeZone, calendarEvent.End);
+        if (string.IsNullOrWhiteSpace(endTimeZone))
+            endTimeZone = startTimeZone;
+
+        var start = ConvertToEventWallClock(calendarEvent.Start, startTimeZone);
+        var end = ConvertToEventWallClock(calendarEvent.End, endTimeZone);
+
+        var durationInSeconds = (calendarEvent.End - calendarEvent.Start).TotalSeconds;
+        if (durationInSeconds <= 0)
+        {
+            if (end <= start)
+                end = start.AddHours(1);
+
+            durationInSeconds = (end - start).TotalSeconds;
+        }
+
+        savingItem.RemoteEventId = calendarEvent.RemoteEventId;
+        savingItem.CalendarId = assignedCalendar.Id;
+        savingItem.StartDate = start;
+        savingItem.DurationInSeconds = durationInSeconds;
+        savingItem.StartTimeZone = startTimeZone;
+        savingItem.EndTimeZone = endTimeZone;
+        savingItem.Title = calendarEvent.Title;
+        savingItem.Description = calendarEvent.Description;
+        savingItem.Location = calendarEvent.Location;
+        savingItem.Recurrence = calendarEvent.Recurrence;
+        savingItem.Status = calendarEvent.Status;
+        savingItem.Visibility = calendarEvent.Visibility;
+        savingItem.ShowAs = calendarEvent.ShowAs;
+        savingItem.IsHidden = calendarEvent.IsHidden;
+        savingItem.HtmlLink = string.Empty;
+        savingItem.IsLocked = false;
+        savingItem.OrganizerDisplayName = !string.IsNullOrWhiteSpace(calendarEvent.OrganizerDisplayName)
+            ? calendarEvent.OrganizerDisplayName
+            : organizerAccount?.SenderName ?? string.Empty;
+        savingItem.OrganizerEmail = !string.IsNullOrWhiteSpace(calendarEvent.OrganizerEmail)
+            ? calendarEvent.OrganizerEmail
+            : organizerAccount?.Address ?? string.Empty;
+        savingItem.AssignedCalendar = assignedCalendar;
+
+        if (savingItem.CreatedAt == default)
+            savingItem.CreatedAt = DateTimeOffset.UtcNow;
+
+        savingItem.UpdatedAt = DateTimeOffset.UtcNow;
+
+        if (!string.IsNullOrWhiteSpace(calendarEvent.SeriesMasterRemoteEventId))
+        {
+            var parentEvent = await CalendarService
+                .GetCalendarItemAsync(assignedCalendar.Id, calendarEvent.SeriesMasterRemoteEventId)
+                .ConfigureAwait(false);
+
+            if (parentEvent != null)
+            {
+                savingItem.RecurringCalendarItemId = parentEvent.Id;
+            }
+        }
+        else
+        {
+            savingItem.RecurringCalendarItemId = null;
+        }
+
+        var attendees = calendarEvent.Attendees?
+            .Where(a => !string.IsNullOrWhiteSpace(a.Email))
+            .Select(a => new CalendarEventAttendee
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = savingItemId,
+                Name = a.Name,
+                Email = a.Email,
+                AttendenceStatus = a.AttendenceStatus,
+                IsOrganizer = a.IsOrganizer,
+                IsOptionalAttendee = a.IsOptionalAttendee
+            })
+            .ToList();
+
+        var reminders = calendarEvent.Reminders?
+            .Where(r => r.DurationInSeconds > 0)
+            .Select(r => new Reminder
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = savingItemId,
+                DurationInSeconds = r.DurationInSeconds,
+                ReminderType = r.ReminderType
+            })
+            .ToList();
+
+        if (isNewItem)
+        {
+            await CalendarService.CreateNewCalendarItemAsync(savingItem, attendees).ConfigureAwait(false);
+        }
+        else
+        {
+            await CalendarService.UpdateCalendarItemAsync(savingItem, attendees).ConfigureAwait(false);
+        }
+
+        await CalendarService.SaveRemindersAsync(savingItemId, reminders).ConfigureAwait(false);
+    }
+
+    public Task SaveCalendarItemIcsAsync(Guid accountId, Guid calendarId, Guid calendarItemId, string remoteEventId, string remoteResourceHref, string eTag, string icsContent)
+        => _calendarIcsFileService.SaveCalendarItemIcsAsync(accountId, calendarId, calendarItemId, remoteEventId, remoteResourceHref, eTag, icsContent);
+
+    public Task<string> GetCalendarItemIcsETagAsync(Guid accountId, Guid calendarId, Guid calendarItemId)
+        => _calendarIcsFileService.GetCalendarItemIcsETagAsync(accountId, calendarId, calendarItemId);
+
+    public Task DeleteCalendarItemIcsAsync(Guid accountId, Guid calendarItemId)
+        => _calendarIcsFileService.DeleteCalendarItemIcsAsync(accountId, calendarItemId);
+
+    public Task DeleteCalendarIcsForCalendarAsync(Guid accountId, Guid calendarId)
+        => _calendarIcsFileService.DeleteCalendarIcsForCalendarAsync(accountId, calendarId);
+
+    public override async Task DeleteCalendarItemAsync(Guid calendarItemId)
+    {
+        var item = await CalendarService.GetCalendarItemAsync(calendarItemId).ConfigureAwait(false);
+        if (item == null)
+            return;
+
+        await _calendarIcsFileService.DeleteCalendarItemIcsAsync(item.AssignedCalendar?.AccountId ?? Guid.Empty, calendarItemId).ConfigureAwait(false);
+        await base.DeleteCalendarItemAsync(calendarItemId).ConfigureAwait(false);
+    }
+
+    public override async Task DeleteCalendarItemAsync(string calendarRemoteEventId, Guid calendarId)
+    {
+        var item = await CalendarService.GetCalendarItemAsync(calendarId, calendarRemoteEventId).ConfigureAwait(false);
+        if (item == null)
+            return;
+
+        await DeleteCalendarItemAsync(item.Id).ConfigureAwait(false);
+    }
+
+    private static string NormalizeTimeZoneId(string timeZoneId, DateTimeOffset value)
+    {
+        if (!string.IsNullOrWhiteSpace(timeZoneId))
+            return timeZoneId;
+
+        if (value != default && value.Offset == TimeSpan.Zero)
+            return TimeZoneInfo.Utc.Id;
+
+        return string.Empty;
+    }
+
+    private static DateTime ConvertToEventWallClock(DateTimeOffset value, string eventTimeZoneId)
+    {
+        if (value == default)
+            return default;
+
+        if (string.IsNullOrWhiteSpace(eventTimeZoneId))
+            return DateTime.SpecifyKind(value.DateTime, DateTimeKind.Unspecified);
+
+        try
+        {
+            var eventTimeZone = TimeZoneInfo.FindSystemTimeZoneById(eventTimeZoneId);
+            var inEventTimeZone = TimeZoneInfo.ConvertTime(value, eventTimeZone);
+            return DateTime.SpecifyKind(inEventTimeZone.DateTime, DateTimeKind.Unspecified);
+        }
+        catch
+        {
+            return DateTime.SpecifyKind(value.DateTime, DateTimeKind.Unspecified);
+        }
+    }
 }
diff --git a/Wino.Core/Integration/Processors/OutlookChangeProcessor.cs b/Wino.Core/Integration/Processors/OutlookChangeProcessor.cs
index 3b72c33e..c2e543c6 100644
--- a/Wino.Core/Integration/Processors/OutlookChangeProcessor.cs
+++ b/Wino.Core/Integration/Processors/OutlookChangeProcessor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Graph.Models;
@@ -7,8 +8,10 @@ using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Extensions;
 using Wino.Services;
+using Reminder = Wino.Core.Domain.Entities.Calendar.Reminder;
 
 namespace Wino.Core.Integration.Processors;
 
@@ -40,15 +43,13 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
 
     public async Task ManageCalendarEventAsync(Event calendarEvent, AccountCalendar assignedCalendar, MailAccount organizerAccount)
     {
-        // We parse the occurrences based on the parent event.
-        // There is literally no point to store them because
-        // type=Exception events are the exceptional childs of recurrency parent event.
-
-        if (calendarEvent.Type == EventType.Occurrence) return;
+        // All event types are now handled: SingleInstance, SeriesMaster, Occurrence, and Exception.
+        // Occurrences from CalendarView are individual instances that are saved separately.
 
         var savingItem = await CalendarService.GetCalendarItemAsync(assignedCalendar.Id, calendarEvent.Id);
 
         Guid savingItemId = Guid.Empty;
+        bool isNewItem = savingItem == null;
 
         if (savingItem != null)
             savingItemId = savingItem.Id;
@@ -58,25 +59,33 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
             savingItem = new CalendarItem() { Id = savingItemId };
         }
 
-        DateTimeOffset eventStartDateTimeOffset = OutlookIntegratorExtensions.GetDateTimeOffsetFromDateTimeTimeZone(calendarEvent.Start);
-        DateTimeOffset eventEndDateTimeOffset = OutlookIntegratorExtensions.GetDateTimeOffsetFromDateTimeTimeZone(calendarEvent.End);
+        var eventStartLocalDateTime = OutlookIntegratorExtensions.GetLocalDateTimeFromDateTimeTimeZone(calendarEvent.Start);
+        var eventEndLocalDateTime = OutlookIntegratorExtensions.GetLocalDateTimeFromDateTimeTimeZone(calendarEvent.End);
 
-        var durationInSeconds = (eventEndDateTimeOffset - eventStartDateTimeOffset).TotalSeconds;
+        var durationInSeconds = (eventEndLocalDateTime - eventStartLocalDateTime).TotalSeconds;
 
-        savingItem.RemoteEventId = calendarEvent.Id;
-        savingItem.StartDate = eventStartDateTimeOffset.DateTime;
-        savingItem.StartDateOffset = eventStartDateTimeOffset.Offset;
-        savingItem.EndDateOffset = eventEndDateTimeOffset.Offset;
+        // Store the wall-clock values exactly as Outlook returned them for the event timezone.
+        // Timed events are converted for display later, while all-day events stay as floating dates.
+        savingItem.RemoteEventId = calendarEvent.Id.WithClientTrackingId(calendarEvent.TransactionId.GetClientTrackingId());
+        savingItem.StartDate = eventStartLocalDateTime;
         savingItem.DurationInSeconds = durationInSeconds;
 
+        // Store the timezone information from the event
+        // This preserves the original timezone from Outlook, allowing proper reconstruction later
+        // If no timezone is provided, null will indicate UTC
+        savingItem.StartTimeZone = calendarEvent.Start?.TimeZone;
+        savingItem.EndTimeZone = calendarEvent.End?.TimeZone;
+
         savingItem.Title = calendarEvent.Subject;
         savingItem.Description = calendarEvent.Body?.Content;
         savingItem.Location = calendarEvent.Location?.DisplayName;
 
-        if (calendarEvent.Type == EventType.Exception && !string.IsNullOrEmpty(calendarEvent.SeriesMasterId))
+        // Handle recurring event relationships for both Exception and Occurrence types
+        if ((calendarEvent.Type == EventType.Exception || calendarEvent.Type == EventType.Occurrence) 
+            && !string.IsNullOrEmpty(calendarEvent.SeriesMasterId))
         {
-            // This is a recurring event exception.
-            // We need to find the parent event and set it as recurring event id.
+            // This is a recurring event instance (either an exception or a regular occurrence).
+            // Link it to the parent series master.
 
             var parentEvent = await CalendarService.GetCalendarItemAsync(assignedCalendar.Id, calendarEvent.SeriesMasterId);
 
@@ -86,12 +95,14 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
             }
             else
             {
-                Log.Warning($"Parent recurring event is missing for event. Skipping creation of {calendarEvent.Id}");
-                return;
+                // Parent not found yet - this can happen if occurrences sync before the series master.
+                // We still save the event but without the parent link for now.
+                Log.Warning($"Parent recurring event (SeriesMasterId: {calendarEvent.SeriesMasterId}) not found for event {calendarEvent.Id}. Event will be saved without parent link.");
             }
         }
 
         // Convert the recurrence pattern to string for parent recurring events.
+        // Note: We store this for reference but don't use it to calculate occurrences.
         if (calendarEvent.Type == EventType.SeriesMaster && calendarEvent.Recurrence != null)
         {
             savingItem.Recurrence = OutlookIntegratorExtensions.ToRfc5545RecurrenceString(calendarEvent.Recurrence);
@@ -103,6 +114,52 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
         savingItem.OrganizerDisplayName = calendarEvent.Organizer?.EmailAddress?.Name;
         savingItem.IsHidden = false;
 
+        // Set timestamps
+        if (calendarEvent.CreatedDateTime.HasValue)
+            savingItem.CreatedAt = calendarEvent.CreatedDateTime.Value;
+
+        if (calendarEvent.LastModifiedDateTime.HasValue)
+            savingItem.UpdatedAt = calendarEvent.LastModifiedDateTime.Value;
+
+        // Set visibility
+        if (calendarEvent.Sensitivity != null)
+        {
+            savingItem.Visibility = calendarEvent.Sensitivity.Value switch
+            {
+                Sensitivity.Normal => CalendarItemVisibility.Public,
+                Sensitivity.Personal => CalendarItemVisibility.Private,
+                Sensitivity.Private => CalendarItemVisibility.Private,
+                Sensitivity.Confidential => CalendarItemVisibility.Confidential,
+                _ => CalendarItemVisibility.Public
+            };
+        }
+        else
+        {
+            savingItem.Visibility = CalendarItemVisibility.Public;
+        }
+
+        // Set ShowAs status
+        if (calendarEvent.ShowAs != null)
+        {
+            savingItem.ShowAs = calendarEvent.ShowAs.Value switch
+            {
+                Microsoft.Graph.Models.FreeBusyStatus.Free => CalendarItemShowAs.Free,
+                Microsoft.Graph.Models.FreeBusyStatus.Tentative => CalendarItemShowAs.Tentative,
+                Microsoft.Graph.Models.FreeBusyStatus.Busy => CalendarItemShowAs.Busy,
+                Microsoft.Graph.Models.FreeBusyStatus.Oof => CalendarItemShowAs.OutOfOffice,
+                Microsoft.Graph.Models.FreeBusyStatus.WorkingElsewhere => CalendarItemShowAs.WorkingElsewhere,
+                _ => CalendarItemShowAs.Busy
+            };
+        }
+        else
+        {
+            savingItem.ShowAs = CalendarItemShowAs.Busy;
+        }
+
+        // Set IsLocked based on whether the user is the organizer
+        // Read-only events are those where the current user is not the organizer
+        savingItem.IsLocked = calendarEvent.IsOrganizer.HasValue && !calendarEvent.IsOrganizer.Value;
+
         if (calendarEvent.ResponseStatus?.Response != null)
         {
             switch (calendarEvent.ResponseStatus.Response.Value)
@@ -116,7 +173,7 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
                     break;
                 case ResponseType.Accepted:
                 case ResponseType.Organizer:
-                    savingItem.Status = CalendarItemStatus.Confirmed;
+                    savingItem.Status = CalendarItemStatus.Accepted;
                     break;
                 case ResponseType.Declined:
                     savingItem.Status = CalendarItemStatus.Cancelled;
@@ -128,18 +185,80 @@ public class OutlookChangeProcessor(IDatabaseService databaseService,
         }
         else
         {
-            savingItem.Status = CalendarItemStatus.Confirmed;
+            savingItem.Status = CalendarItemStatus.Accepted;
         }
 
-        // Upsert the event.
-        await Connection.InsertOrReplaceAsync(savingItem);
-
-        // Manage attendees.
+        // Prepare attendees list
+        List<CalendarEventAttendee> attendees = null;
         if (calendarEvent.Attendees != null)
         {
-            // Clear all attendees for this event.
-            var attendees = calendarEvent.Attendees.Select(a => a.CreateAttendee(savingItemId)).ToList();
-            await CalendarService.ManageEventAttendeesAsync(savingItemId, attendees).ConfigureAwait(false);
+            // Pass the organizer's email address to properly identify the organizer in the attendees list
+            string organizerEmail = calendarEvent.Organizer?.EmailAddress?.Address;
+            attendees = calendarEvent.Attendees.Select(a => a.CreateAttendee(savingItemId, organizerEmail)).ToList();
+        }
+
+        // Prepare reminders list from Outlook event
+        List<Reminder> reminders = null;
+        if (calendarEvent.IsReminderOn.GetValueOrDefault() && calendarEvent.ReminderMinutesBeforeStart.HasValue)
+        {
+            var reminderMinutes = calendarEvent.ReminderMinutesBeforeStart.Value;
+            var reminderDurationInSeconds = reminderMinutes * 60; // Convert minutes to seconds
+
+            reminders = new List<Reminder>
+            {
+                new Reminder
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarItemId = savingItemId,
+                    DurationInSeconds = reminderDurationInSeconds,
+                    ReminderType = CalendarItemReminderType.Popup
+                }
+            };
+        }
+
+        // Prepare attachments metadata from Outlook event
+        List<CalendarAttachment> attachments = null;
+        if (calendarEvent.HasAttachments.GetValueOrDefault() && calendarEvent.Attachments != null)
+        {
+            attachments = calendarEvent.Attachments
+                .Where(a => a != null && !string.IsNullOrEmpty(a.Name))
+                .Select(a => new CalendarAttachment
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarItemId = savingItemId,
+                    RemoteAttachmentId = a.Id,
+                    FileName = a.Name,
+                    Size = a.Size ?? 0,
+                    ContentType = a.ContentType ?? "application/octet-stream",
+                    IsDownloaded = false,
+                    LocalFilePath = null,
+                    LastModified = calendarEvent.LastModifiedDateTime ?? DateTimeOffset.UtcNow
+                })
+                .ToList();
+        }
+
+        // Set assigned calendar for navigation properties to work.
+        savingItem.AssignedCalendar = assignedCalendar;
+
+        // Use CalendarService to create or update the event
+        if (isNewItem)
+        {
+            // New item - use CreateNewCalendarItemAsync
+            await CalendarService.CreateNewCalendarItemAsync(savingItem, attendees).ConfigureAwait(false);
+        }
+        else
+        {
+            // Existing item - use UpdateCalendarItemAsync
+            await CalendarService.UpdateCalendarItemAsync(savingItem, attendees).ConfigureAwait(false);
+        }
+
+        // Save reminders separately
+        await CalendarService.SaveRemindersAsync(savingItemId, reminders).ConfigureAwait(false);
+
+        // Save attachments metadata separately
+        if (attachments != null && attachments.Count > 0)
+        {
+            await CalendarService.InsertOrReplaceAttachmentsAsync(attachments).ConfigureAwait(false);
         }
     }
 }
diff --git a/Wino.Core/Integration/WinoImapClient.cs b/Wino.Core/Integration/WinoImapClient.cs
index f4712268..8062d49e 100644
--- a/Wino.Core/Integration/WinoImapClient.cs
+++ b/Wino.Core/Integration/WinoImapClient.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using MailKit;
 using MailKit.Net.Imap;
@@ -9,7 +9,7 @@ namespace Wino.Core.Integration;
 /// <summary>
 /// Extended class for ImapClient that is used in Wino.
 /// </summary>
-internal class WinoImapClient : ImapClient
+public class WinoImapClient : ImapClient
 {
     private int _busyCount;
 
@@ -24,11 +24,6 @@ internal class WinoImapClient : ImapClient
         HookEvents();
     }
 
-    public WinoImapClient(IProtocolLogger protocolLogger) : base(protocolLogger)
-    {
-        HookEvents();
-    }
-
     private void HookEvents()
     {
         Disconnected += ClientDisconnected;
diff --git a/Wino.Core/Misc/ColorHelpers.cs b/Wino.Core/Misc/ColorHelpers.cs
index 5fdf9f83..8b012431 100644
--- a/Wino.Core/Misc/ColorHelpers.cs
+++ b/Wino.Core/Misc/ColorHelpers.cs
@@ -1,49 +1,100 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using Wino.Core.Domain.Misc;
 
 namespace Wino.Core.Misc;
 
 public static class ColorHelpers
 {
-    public static string GenerateFlatColorHex()
+    public static IReadOnlyList<string> GetFlatColorPalette() => CalendarColorPalette.GetColors();
+
+    public static string GenerateFlatColorHex() => GetDistinctFlatColorHex(Array.Empty<string>());
+
+    public static string GetDistinctFlatColorHex(IEnumerable<string> usedColors, string preferredColor = null)
     {
-        Random random = new();
-        int hue = random.Next(0, 360);      // Full hue range
-        int saturation = 70 + random.Next(30); // High saturation (70-100%)
-        int lightness = 50 + random.Next(20);  // Bright colors (50-70%)
+        var palette = CalendarColorPalette.GetColors();
+        var normalizedUsedColors = usedColors?
+            .Select(NormalizeHexColor)
+            .Where(color => !string.IsNullOrWhiteSpace(color))
+            .ToHashSet(StringComparer.OrdinalIgnoreCase) ?? new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
-        var color = FromHsl(hue, saturation, lightness);
+        if (TryNormalizeHexColor(preferredColor, out var normalizedPreferred) &&
+            palette.Contains(normalizedPreferred, StringComparer.OrdinalIgnoreCase) &&
+            !normalizedUsedColors.Contains(normalizedPreferred))
+        {
+            return normalizedPreferred;
+        }
 
-        return ToHexString(color);
+        var distinctColor = CalendarColorPalette.GetDistinctColor(usedColors);
+        if (palette.Contains(distinctColor))
+        {
+            return distinctColor;
+        }
+
+        var candidate = AdjustColor(palette[0], 1);
+
+        return candidate;
+    }
+
+    public static string GetReadableTextColorHex(string backgroundColor)
+    {
+        if (!TryNormalizeHexColor(backgroundColor, out var normalizedColor))
+        {
+            return "#FFFFFF";
+        }
+
+        var color = ColorTranslator.FromHtml(normalizedColor);
+        var luminance = ((0.299 * color.R) + (0.587 * color.G) + (0.114 * color.B)) / 255d;
+        return luminance > 0.6 ? "#111111" : "#FFFFFF";
     }
 
     public static string ToHexString(this Color c) => $"#{c.R:X2}{c.G:X2}{c.B:X2}";
 
     public static string ToRgbString(this Color c) => $"RGB({c.R}, {c.G}, {c.B})";
-
-    private static Color FromHsl(int h, int s, int l)
+    private static string AdjustColor(string hexColor, int cycle)
     {
-        double hue = h / 360.0;
-        double saturation = s / 100.0;
-        double lightness = l / 100.0;
+        var color = ColorTranslator.FromHtml(hexColor);
+        var factor = Math.Max(0.55, 1.0 - (cycle * 0.08));
 
-        // Conversion from HSL to RGB
-        var chroma = (1 - Math.Abs(2 * lightness - 1)) * saturation;
-        var x = chroma * (1 - Math.Abs((hue * 6) % 2 - 1));
-        var m = lightness - chroma / 2;
+        var adjusted = Color.FromArgb(
+            (int)Math.Clamp(color.R * factor, 0, 255),
+            (int)Math.Clamp(color.G * factor, 0, 255),
+            (int)Math.Clamp(color.B * factor, 0, 255));
 
-        double r = 0, g = 0, b = 0;
-
-        if (hue < 1.0 / 6.0) { r = chroma; g = x; b = 0; }
-        else if (hue < 2.0 / 6.0) { r = x; g = chroma; b = 0; }
-        else if (hue < 3.0 / 6.0) { r = 0; g = chroma; b = x; }
-        else if (hue < 4.0 / 6.0) { r = 0; g = x; b = chroma; }
-        else if (hue < 5.0 / 6.0) { r = x; g = 0; b = chroma; }
-        else { r = chroma; g = 0; b = x; }
-
-        return Color.FromArgb(
-            (int)((r + m) * 255),
-            (int)((g + m) * 255),
-            (int)((b + m) * 255));
+        return adjusted.ToHexString();
     }
+
+    private static bool TryNormalizeHexColor(string value, out string normalized)
+    {
+        normalized = string.Empty;
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return false;
+        }
+
+        var color = value.Trim();
+        if (color.StartsWith('#'))
+        {
+            color = color[1..];
+        }
+
+        if (color.Length != 6)
+        {
+            return false;
+        }
+
+        if (!int.TryParse(color, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out _))
+        {
+            return false;
+        }
+
+        normalized = $"#{color.ToUpperInvariant()}";
+        return true;
+    }
+
+    private static string NormalizeHexColor(string value)
+        => TryNormalizeHexColor(value, out var normalized) ? normalized : string.Empty;
 }
diff --git a/Wino.Core/Misc/OutlookFileAttachment.cs b/Wino.Core/Misc/OutlookFileAttachment.cs
deleted file mode 100644
index 0839657c..00000000
--- a/Wino.Core/Misc/OutlookFileAttachment.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Wino.Core.Misc;
-
-public class OutlookFileAttachment
-{
-    [JsonPropertyName("@odata.type")]
-    public string OdataType { get; } = "#microsoft.graph.fileAttachment";
-
-    [JsonPropertyName("name")]
-    public string FileName { get; set; }
-
-    [JsonPropertyName("contentBytes")]
-    public string Base64EncodedContentBytes { get; set; }
-
-    [JsonPropertyName("contentType")]
-    public string ContentType { get; set; }
-
-    [JsonPropertyName("contentId")]
-    public string ContentId { get; set; }
-
-    [JsonPropertyName("isInline")]
-    public bool IsInline { get; set; }
-}
diff --git a/Wino.Core/Properties/AssemblyInfo.cs b/Wino.Core/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..8e625798
--- /dev/null
+++ b/Wino.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Wino.Core.Tests")]
diff --git a/Wino.Core/Requests/Bundles/RequestBundle.cs b/Wino.Core/Requests/Bundles/RequestBundle.cs
index 75ab6321..8a61727e 100644
--- a/Wino.Core/Requests/Bundles/RequestBundle.cs
+++ b/Wino.Core/Requests/Bundles/RequestBundle.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Net.Http;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using System.Threading;
 using System.Threading.Tasks;
 using Wino.Core.Domain.Interfaces;
@@ -21,12 +21,10 @@ public record HttpRequestBundle<TRequest>(TRequest NativeRequest, IUIChangeReque
 /// <param name="BatchRequest">Batch request that is generated by base synchronizer.</param>
 public record HttpRequestBundle<TRequest, TResponse>(TRequest NativeRequest, IRequestBase Request) : HttpRequestBundle<TRequest>(NativeRequest, Request)
 {
-    [RequiresDynamicCode("AOT")]
-    [RequiresUnreferencedCode("AOT")]
-    public async Task<TResponse> DeserializeBundleAsync(HttpResponseMessage httpResponse, CancellationToken cancellationToken = default)
+    public async Task<TResponse> DeserializeBundleAsync(HttpResponseMessage httpResponse, JsonTypeInfo<TResponse> typeInfo, CancellationToken cancellationToken = default)
     {
         var content = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-        return JsonSerializer.Deserialize<TResponse>(content) ?? throw new InvalidOperationException("Invalid Http Response Deserialization");
+        return JsonSerializer.Deserialize(content, typeInfo) ?? throw new InvalidOperationException("Invalid Http Response Deserialization");
     }
 }
diff --git a/Wino.Core/Requests/Bundles/TaskRequestBundle.cs b/Wino.Core/Requests/Bundles/TaskRequestBundle.cs
index 7e968cfb..2db25b41 100644
--- a/Wino.Core/Requests/Bundles/TaskRequestBundle.cs
+++ b/Wino.Core/Requests/Bundles/TaskRequestBundle.cs
@@ -9,18 +9,20 @@ public class ImapRequest
 {
     public Func<IImapClient, IRequestBase, Task> IntegratorTask { get; }
     public IRequestBase Request { get; }
+    public bool RequiresConnectedClient { get; }
 
-    public ImapRequest(Func<IImapClient, IRequestBase, Task> integratorTask, IRequestBase request)
+    public ImapRequest(Func<IImapClient, IRequestBase, Task> integratorTask, IRequestBase request, bool requiresConnectedClient = true)
     {
         IntegratorTask = integratorTask;
         Request = request;
+        RequiresConnectedClient = requiresConnectedClient;
     }
 }
 
 public class ImapRequest<TRequestBaseType> : ImapRequest where TRequestBaseType : IRequestBase
 {
-    public ImapRequest(Func<IImapClient, TRequestBaseType, Task> integratorTask, TRequestBaseType request)
-        : base((client, request) => integratorTask(client, (TRequestBaseType)request), request)
+    public ImapRequest(Func<IImapClient, TRequestBaseType, Task> integratorTask, TRequestBaseType request, bool requiresConnectedClient = true)
+        : base((client, request) => integratorTask(client, (TRequestBaseType)request), request, requiresConnectedClient)
     {
     }
 }
diff --git a/Wino.Core/Requests/Calendar/AcceptEventRequest.cs b/Wino.Core/Requests/Calendar/AcceptEventRequest.cs
new file mode 100644
index 00000000..8d6505e0
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/AcceptEventRequest.cs
@@ -0,0 +1,39 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to accept a calendar event invitation on the server.
+/// The calendar item status should be updated locally before queuing this request.
+/// </summary>
+public record AcceptEventRequest(CalendarItem Item, string ResponseMessage = null) : CalendarRequestBase(Item)
+{
+    private readonly CalendarItemStatus _previousStatus = Item.Status;
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.AcceptEvent;
+
+    /// <summary>
+    /// After successful acceptance, we need to resync to get updated status.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // Update the item status locally
+        Item.Status = CalendarItemStatus.Accepted;
+        
+        // Notify UI that the event status was updated
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientUpdated));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If acceptance fails, revert to the previous status
+        Item.Status = _previousStatus;
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientReverted));
+    }
+}
diff --git a/Wino.Core/Requests/Calendar/CreateCalendarEventRequest.cs b/Wino.Core/Requests/Calendar/CreateCalendarEventRequest.cs
new file mode 100644
index 00000000..1b1c0832
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/CreateCalendarEventRequest.cs
@@ -0,0 +1,63 @@
+using System;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Core.Helpers;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to create a new calendar event on the server.
+/// Non-recurring events create an optimistic in-memory item for immediate UI feedback.
+/// Recurring events skip optimistic rendering and rely on provider synchronization to materialize instances.
+/// </summary>
+public record CreateCalendarEventRequest : CalendarRequestBase
+{
+    public CalendarEventComposeResult ComposeResult { get; }
+    public AccountCalendar AssignedCalendar { get; }
+    public PreparedCalendarEventCreateModel PreparedEvent { get; }
+    public CalendarItem PreparedItem => PreparedEvent.CalendarItem;
+    public bool IsRecurring => !string.IsNullOrWhiteSpace(ComposeResult?.Recurrence);
+
+    public CreateCalendarEventRequest(CalendarEventComposeResult composeResult, AccountCalendar assignedCalendar)
+        : this(composeResult, assignedCalendar, CalendarEventComposeMapper.Prepare(composeResult, assignedCalendar))
+    {
+    }
+
+    private CreateCalendarEventRequest(
+        CalendarEventComposeResult composeResult,
+        AccountCalendar assignedCalendar,
+        PreparedCalendarEventCreateModel preparedEvent)
+        : base(ShouldCreateOptimisticItem(composeResult) ? preparedEvent.CalendarItem : null)
+    {
+        ComposeResult = composeResult ?? throw new ArgumentNullException(nameof(composeResult));
+        AssignedCalendar = assignedCalendar ?? throw new ArgumentNullException(nameof(assignedCalendar));
+        PreparedEvent = preparedEvent ?? throw new ArgumentNullException(nameof(preparedEvent));
+    }
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.CreateEvent;
+
+    public override int ResynchronizationDelay => 5000;
+
+    public override void ApplyUIChanges()
+    {
+        if (Item == null)
+            return;
+
+        WeakReferenceMessenger.Default.Send(new CalendarItemAdded(Item));
+    }
+
+    public override void RevertUIChanges()
+    {
+        if (Item == null)
+            return;
+
+        WeakReferenceMessenger.Default.Send(new CalendarItemDeleted(Item));
+    }
+
+    private static bool ShouldCreateOptimisticItem(CalendarEventComposeResult composeResult)
+        => string.IsNullOrWhiteSpace(composeResult?.Recurrence);
+}
diff --git a/Wino.Core/Requests/Calendar/DeclineEventRequest.cs b/Wino.Core/Requests/Calendar/DeclineEventRequest.cs
new file mode 100644
index 00000000..31f89575
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/DeclineEventRequest.cs
@@ -0,0 +1,39 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to decline a calendar event invitation on the server.
+/// The calendar item status should be updated locally before queuing this request.
+/// </summary>
+public record DeclineEventRequest(CalendarItem Item, string ResponseMessage = null) : CalendarRequestBase(Item)
+{
+    private readonly CalendarItemStatus _previousStatus = Item.Status;
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.DeclineEvent;
+
+    /// <summary>
+    /// After successful decline, we need to resync to get updated status.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // Update the item status locally
+        Item.Status = CalendarItemStatus.Cancelled;
+
+        // Notify UI that the event status was updated
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientUpdated));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If decline fails, revert to the previous status
+        Item.Status = _previousStatus;
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientReverted));
+    }
+}
diff --git a/Wino.Core/Requests/Calendar/DeleteCalendarEventRequest.cs b/Wino.Core/Requests/Calendar/DeleteCalendarEventRequest.cs
new file mode 100644
index 00000000..a9ae4681
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/DeleteCalendarEventRequest.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to delete a calendar event on the server.
+/// </summary>
+public record DeleteCalendarEventRequest(CalendarItem Item) : CalendarRequestBase(Item)
+{
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.DeleteEvent;
+
+    /// <summary>
+    /// After successful deletion, resync to confirm the event was removed.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // Notify UI that the event was deleted
+        WeakReferenceMessenger.Default.Send(new CalendarItemDeleted(Item));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If deletion fails, we should notify the UI to add it back
+        WeakReferenceMessenger.Default.Send(new CalendarItemAdded(Item));
+    }
+}
diff --git a/Wino.Core/Requests/Calendar/OutlookDeclineEventRequest.cs b/Wino.Core/Requests/Calendar/OutlookDeclineEventRequest.cs
new file mode 100644
index 00000000..c7e87147
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/OutlookDeclineEventRequest.cs
@@ -0,0 +1,38 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Outlook-specific request to decline a calendar event invitation.
+/// In Outlook, declined events are removed from the calendar by the API after synchronization,
+/// so this request sends a delete notification to remove the event from the UI.
+/// </summary>
+public record OutlookDeclineEventRequest(CalendarItem Item, string ResponseMessage = null) : CalendarRequestBase(Item)
+{
+    private readonly CalendarItemStatus _previousStatus = Item.Status;
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.DeclineEvent;
+
+    /// <summary>
+    /// After successful decline, we need to resync to confirm the event is removed.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // In Outlook, declined events are deleted from the calendar after sync
+        // Send deleted message to remove from UI immediately
+        WeakReferenceMessenger.Default.Send(new CalendarItemDeleted(Item));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If decline fails, restore the previous status and re-add the event
+        Item.Status = _previousStatus;
+        WeakReferenceMessenger.Default.Send(new CalendarItemAdded(Item));
+    }
+}
diff --git a/Wino.Core/Requests/Calendar/TentativeEventRequest.cs b/Wino.Core/Requests/Calendar/TentativeEventRequest.cs
new file mode 100644
index 00000000..d53c2eb7
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/TentativeEventRequest.cs
@@ -0,0 +1,39 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to tentatively accept a calendar event invitation on the server.
+/// The calendar item status should be updated locally before queuing this request.
+/// </summary>
+public record TentativeEventRequest(CalendarItem Item, string ResponseMessage = null) : CalendarRequestBase(Item)
+{
+    private readonly CalendarItemStatus _previousStatus = Item.Status;
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.TentativeEvent;
+
+    /// <summary>
+    /// After successful tentative acceptance, we need to resync to get updated status.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // Update the item status locally
+        Item.Status = CalendarItemStatus.Tentative;
+        
+        // Notify UI that the event status was updated
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientUpdated));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If tentative acceptance fails, revert to the previous status
+        Item.Status = _previousStatus;
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientReverted));
+    }
+}
diff --git a/Wino.Core/Requests/Calendar/UpdateCalendarEventRequest.cs b/Wino.Core/Requests/Calendar/UpdateCalendarEventRequest.cs
new file mode 100644
index 00000000..8326a37a
--- /dev/null
+++ b/Wino.Core/Requests/Calendar/UpdateCalendarEventRequest.cs
@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Core.Requests.Calendar;
+
+/// <summary>
+/// Request to update an existing calendar event on the server.
+/// The calendar item should be already updated in the local database before queuing this request.
+/// </summary>
+public record UpdateCalendarEventRequest(CalendarItem Item, List<CalendarEventAttendee> Attendees) : CalendarRequestBase(Item)
+{
+    /// <summary>
+    /// Original attendees before the update, used for reverting changes if the update fails.
+    /// </summary>
+    public List<CalendarEventAttendee> OriginalAttendees { get; init; }
+
+    /// <summary>
+    /// Original calendar item state before the update, used for reverting changes if the update fails.
+    /// </summary>
+    public CalendarItem OriginalItem { get; init; }
+
+    public override CalendarSynchronizerOperation Operation => CalendarSynchronizerOperation.UpdateEvent;
+
+    /// <summary>
+    /// After successful update, we need to resync to ensure changes are properly reflected.
+    /// </summary>
+    public override int ResynchronizationDelay => 2000;
+
+    public override void ApplyUIChanges()
+    {
+        // Notify UI that the event was updated locally
+        WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientUpdated));
+    }
+
+    public override void RevertUIChanges()
+    {
+        // If update fails, restore the original state
+        if (OriginalItem != null && OriginalAttendees != null)
+        {
+            // Send the original item back to restore UI state
+            WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(OriginalItem, CalendarItemUpdateSource.ClientReverted));
+        }
+        else
+        {
+            // Fallback: just notify with current item to trigger refresh
+            WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(Item, CalendarItemUpdateSource.ClientReverted));
+        }
+    }
+}
diff --git a/Wino.Core/Requests/Folder/CreateSubFolderRequest.cs b/Wino.Core/Requests/Folder/CreateSubFolderRequest.cs
new file mode 100644
index 00000000..a655cf49
--- /dev/null
+++ b/Wino.Core/Requests/Folder/CreateSubFolderRequest.cs
@@ -0,0 +1,11 @@
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+
+namespace Wino.Core.Requests.Folder;
+
+public record CreateSubFolderRequest(MailItemFolder Folder, string NewFolderName) : FolderRequestBase(Folder, FolderSynchronizerOperation.CreateSubFolder)
+{
+    public override void ApplyUIChanges() { }
+    public override void RevertUIChanges() { }
+}
diff --git a/Wino.Core/Requests/Folder/DeleteFolderRequest.cs b/Wino.Core/Requests/Folder/DeleteFolderRequest.cs
new file mode 100644
index 00000000..5615e6cf
--- /dev/null
+++ b/Wino.Core/Requests/Folder/DeleteFolderRequest.cs
@@ -0,0 +1,17 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Requests;
+using Wino.Messaging.UI;
+
+namespace Wino.Core.Requests.Folder;
+
+public record DeleteFolderRequest(MailItemFolder Folder) : FolderRequestBase(Folder, FolderSynchronizerOperation.DeleteFolder)
+{
+    public override void ApplyUIChanges()
+    {
+        WeakReferenceMessenger.Default.Send(new FolderDeleted(Folder));
+    }
+
+    public override void RevertUIChanges() { }
+}
diff --git a/Wino.Core/Requests/Folder/MarkFolderAsReadRequest.cs b/Wino.Core/Requests/Folder/MarkFolderAsReadRequest.cs
index 9cf9a777..242249e2 100644
--- a/Wino.Core/Requests/Folder/MarkFolderAsReadRequest.cs
+++ b/Wino.Core/Requests/Folder/MarkFolderAsReadRequest.cs
@@ -17,10 +17,14 @@ public record MarkFolderAsReadRequest(MailItemFolder Folder, List<MailCopy> Mail
 
         foreach (var item in MailsToMarkRead)
         {
+            // Skip if already read
+            if (item.IsRead) continue;
+
             item.IsRead = true;
         }
 
-        WeakReferenceMessenger.Default.Send(new BulkMailUpdatedMessage(MailsToMarkRead));
+            WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(item, MailUpdateSource.ClientUpdated, MailCopyChangeFlags.IsRead));
+        }
     }
 
     public override void RevertUIChanges()
@@ -29,10 +33,14 @@ public record MarkFolderAsReadRequest(MailItemFolder Folder, List<MailCopy> Mail
 
         foreach (var item in MailsToMarkRead)
         {
+            // Skip if already unread (wasn't changed by ApplyUIChanges)
+            if (!item.IsRead) continue;
+
             item.IsRead = false;
         }
 
-        WeakReferenceMessenger.Default.Send(new BulkMailUpdatedMessage(MailsToMarkRead));
+            WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(item, MailUpdateSource.ClientReverted, MailCopyChangeFlags.IsRead));
+        }
     }
 
     public List<Guid> SynchronizationFolderIds => [Folder.Id];
diff --git a/Wino.Core/Requests/Mail/ChangeFlagRequest.cs b/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
index 8410cd8e..231435f4 100644
--- a/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
+++ b/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
@@ -12,24 +12,38 @@ namespace Wino.Core.Requests.Mail;
 public record ChangeFlagRequest(MailCopy Item, bool IsFlagged) : MailRequestBase(Item),
     ICustomFolderSynchronizationRequest
 {
+    private readonly bool _originalIsFlagged = Item.IsFlagged;
+
     public List<Guid> SynchronizationFolderIds => [Item.FolderId];
 
     public bool ExcludeMustHaveFolders => true;
 
     public override MailSynchronizerOperation Operation => MailSynchronizerOperation.ChangeFlag;
 
+    /// <summary>
+    /// Gets whether this request represents an actual state change.
+    /// If the mail is already in the desired flagged state, no change is needed.
+    /// </summary>
+    public bool IsNoOp { get; } = Item.IsFlagged == IsFlagged;
+
     public override void ApplyUIChanges()
     {
+        // Skip UI update if the mail is already in the desired state
+        if (IsNoOp) return;
+
         Item.IsFlagged = IsFlagged;
 
-        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item));
+        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientUpdated, MailCopyChangeFlags.IsFlagged));
     }
 
     public override void RevertUIChanges()
     {
-        Item.IsFlagged = !IsFlagged;
+        // Skip UI revert if this was a no-op request
+        if (IsNoOp) return;
 
-        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item));
+        Item.IsFlagged = _originalIsFlagged;
+
+        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientReverted, MailCopyChangeFlags.IsFlagged));
     }
 }
 
diff --git a/Wino.Core/Requests/Mail/CreateDraftRequest.cs b/Wino.Core/Requests/Mail/CreateDraftRequest.cs
index 569f9f25..7477673f 100644
--- a/Wino.Core/Requests/Mail/CreateDraftRequest.cs
+++ b/Wino.Core/Requests/Mail/CreateDraftRequest.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Requests;
-using Wino.Messaging.UI;
 
 namespace Wino.Core.Requests.Mail;
 
@@ -24,6 +22,7 @@ public record CreateDraftRequest(DraftPreparationRequest DraftPreperationRequest
 
     public override void RevertUIChanges()
     {
-        WeakReferenceMessenger.Default.Send(new MailRemovedMessage(Item));
+        // Keep local draft intact when create-draft synchronization fails.
+        // This allows users to retry sending the local draft to the server.
     }
 }
diff --git a/Wino.Core/Requests/Mail/MarkReadRequest.cs b/Wino.Core/Requests/Mail/MarkReadRequest.cs
index fded7f8b..28c4fd3b 100644
--- a/Wino.Core/Requests/Mail/MarkReadRequest.cs
+++ b/Wino.Core/Requests/Mail/MarkReadRequest.cs
@@ -11,24 +11,38 @@ namespace Wino.Core.Requests.Mail;
 
 public record MarkReadRequest(MailCopy Item, bool IsRead) : MailRequestBase(Item), ICustomFolderSynchronizationRequest
 {
+    private readonly bool _originalIsRead = Item.IsRead;
+
     public List<Guid> SynchronizationFolderIds => [Item.FolderId];
 
     public override MailSynchronizerOperation Operation => MailSynchronizerOperation.MarkRead;
 
     public bool ExcludeMustHaveFolders => true;
 
+    /// <summary>
+    /// Gets whether this request represents an actual state change.
+    /// If the mail is already in the desired read state, no change is needed.
+    /// </summary>
+    public bool IsNoOp { get; } = Item.IsRead == IsRead;
+
     public override void ApplyUIChanges()
     {
+        // Skip UI update if the mail is already in the desired state
+        if (IsNoOp) return;
+
         Item.IsRead = IsRead;
 
-        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item));
+        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientUpdated, MailCopyChangeFlags.IsRead));
     }
 
     public override void RevertUIChanges()
     {
-        Item.IsRead = !IsRead;
+        // Skip UI revert if this was a no-op request
+        if (IsNoOp) return;
 
-        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item));
+        Item.IsRead = _originalIsRead;
+
+        WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientReverted, MailCopyChangeFlags.IsRead));
     }
 }
 
diff --git a/Wino.Core/Services/AutoDiscoveryService.cs b/Wino.Core/Services/AutoDiscoveryService.cs
index 05cf06d0..10d21137 100644
--- a/Wino.Core/Services/AutoDiscoveryService.cs
+++ b/Wino.Core/Services/AutoDiscoveryService.cs
@@ -1,7 +1,12 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 using Serilog;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models;
@@ -10,47 +15,682 @@ using Wino.Core.Domain.Models.AutoDiscovery;
 namespace Wino.Core.Services;
 
 /// <summary>
-/// We have 2 methods to do auto discovery.
-/// 1. Use https://emailsettings.firetrust.com/settings?q={address} API
-/// 2. TODO: Thunderbird auto discovery file.
+/// Mail and CalDAV endpoint discovery with Thunderbird-style methods and fallbacks.
 /// </summary>
 public class AutoDiscoveryService : IAutoDiscoveryService
 {
-    private const string FiretrustURL = " https://emailsettings.firetrust.com/settings?q=";
+    private const string ThunderbirdIspdbUrl = "https://autoconfig.thunderbird.net/v1.1/";
+    private const string FiretrustUrl = "https://emailsettings.firetrust.com/settings?q=";
+    private const string GoogleDnsResolveUrl = "https://dns.google/resolve";
 
-    // TODO: Try Thunderbird Auto Discovery as second approach.
+    private static readonly ILogger Logger = Log.ForContext<AutoDiscoveryService>();
+    private static readonly StringComparer IgnoreCase = StringComparer.OrdinalIgnoreCase;
+    private static readonly HttpMethod OptionsMethod = new("OPTIONS");
 
-    public Task<AutoDiscoverySettings> GetAutoDiscoverySettings(AutoDiscoveryMinimalSettings autoDiscoveryMinimalSettings)
-        => GetSettingsFromFiretrustAsync(autoDiscoveryMinimalSettings.Email);
+    private readonly HttpClient _httpClient;
+    private readonly Dictionary<string, Uri> _calDavUriCache = new(IgnoreCase);
+    private readonly object _calDavCacheLock = new();
 
-    private static async Task<AutoDiscoverySettings> GetSettingsFromFiretrustAsync(string mailAddress)
+    public AutoDiscoveryService(HttpClient httpClient = null)
     {
-        using var client = new HttpClient();
-        var response = await client.GetAsync($"{FiretrustURL}{mailAddress}");
-
-        if (response.IsSuccessStatusCode)
-            return await DeserializeFiretrustResponse(response);
-        else
+        _httpClient = httpClient ?? new HttpClient
         {
-            Log.Warning($"Firetrust AutoDiscovery failed. ({response.StatusCode})");
-
-            return null;
-        }
+            Timeout = TimeSpan.FromSeconds(15)
+        };
     }
 
-    private static async Task<AutoDiscoverySettings> DeserializeFiretrustResponse(HttpResponseMessage response)
+    public async Task<AutoDiscoverySettings> GetAutoDiscoverySettings(AutoDiscoveryMinimalSettings autoDiscoveryMinimalSettings)
     {
-        try
-        {
-            var content = await response.Content.ReadAsStringAsync();
+        if (autoDiscoveryMinimalSettings == null || string.IsNullOrWhiteSpace(autoDiscoveryMinimalSettings.Email))
+            return null;
 
-            return JsonSerializer.Deserialize(content, DomainModelsJsonContext.Default.AutoDiscoverySettings);
-        }
-        catch (Exception ex)
+        if (!TryGetEmailParts(autoDiscoveryMinimalSettings.Email, out var localPart, out var domain))
+            return null;
+
+        var cancellationToken = CancellationToken.None;
+
+        var settings = await TryGetThunderbirdSettingsAsync(domain, autoDiscoveryMinimalSettings.Email, localPart, cancellationToken).ConfigureAwait(false)
+                       ?? await TryGetIspdbSettingsAsync(domain, autoDiscoveryMinimalSettings.Email, localPart, cancellationToken).ConfigureAwait(false)
+                       ?? await TryGetMxBasedSettingsAsync(domain, autoDiscoveryMinimalSettings.Email, localPart, cancellationToken).ConfigureAwait(false)
+                       ?? await TryGetSrvBasedSettingsAsync(domain, autoDiscoveryMinimalSettings.Email, cancellationToken).ConfigureAwait(false)
+                       ?? await TryGetGuessedHostSettingsAsync(domain, autoDiscoveryMinimalSettings.Email, cancellationToken).ConfigureAwait(false)
+                       ?? await GetSettingsFromFiretrustAsync(autoDiscoveryMinimalSettings.Email, cancellationToken).ConfigureAwait(false);
+
+        if (settings != null && string.IsNullOrWhiteSpace(settings.Domain))
         {
-            Log.Error(ex, "Failed to deserialize Firetrust response.");
+            settings.Domain = domain;
+        }
+
+        return settings;
+    }
+
+    public async Task<Uri> DiscoverCalDavServiceUriAsync(string mailAddress, CancellationToken cancellationToken = default)
+    {
+        if (!TryGetEmailParts(mailAddress, out _, out var domain))
+            return null;
+
+        lock (_calDavCacheLock)
+        {
+            if (_calDavUriCache.TryGetValue(domain, out var cachedUri))
+                return cachedUri;
+        }
+
+        var knownProviderUri = TryGetKnownProviderCalDavUri(domain);
+        if (knownProviderUri != null)
+        {
+            CacheCalDavUri(domain, knownProviderUri);
+            return knownProviderUri;
+        }
+
+        foreach (var candidate in GetCalDavCandidates(domain))
+        {
+            var resolved = await TryResolveCalDavEndpointAsync(candidate, cancellationToken).ConfigureAwait(false);
+            if (resolved == null)
+                continue;
+
+            CacheCalDavUri(domain, resolved);
+            return resolved;
         }
 
         return null;
     }
+
+    private async Task<AutoDiscoverySettings> TryGetThunderbirdSettingsAsync(
+        string lookupDomain,
+        string email,
+        string localPart,
+        CancellationToken cancellationToken)
+    {
+        foreach (var endpoint in BuildThunderbirdEndpoints(lookupDomain, email))
+        {
+            var settings = await TryGetSettingsFromXmlEndpointAsync(endpoint, email, localPart, lookupDomain, cancellationToken).ConfigureAwait(false);
+            if (settings != null)
+                return settings;
+        }
+
+        return null;
+    }
+
+    private async Task<AutoDiscoverySettings> TryGetIspdbSettingsAsync(
+        string lookupDomain,
+        string email,
+        string localPart,
+        CancellationToken cancellationToken)
+    {
+        var endpoint = $"{ThunderbirdIspdbUrl}{lookupDomain}?emailaddress={Uri.EscapeDataString(email)}";
+        return await TryGetSettingsFromXmlEndpointAsync(endpoint, email, localPart, lookupDomain, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<AutoDiscoverySettings> TryGetMxBasedSettingsAsync(
+        string domain,
+        string email,
+        string localPart,
+        CancellationToken cancellationToken)
+    {
+        var mxDomains = await GetMxSearchDomainsAsync(domain, cancellationToken).ConfigureAwait(false);
+
+        foreach (var mxDomain in mxDomains)
+        {
+            if (IgnoreCase.Equals(mxDomain, domain))
+                continue;
+
+            var settings = await TryGetThunderbirdSettingsAsync(mxDomain, email, localPart, cancellationToken).ConfigureAwait(false)
+                           ?? await TryGetIspdbSettingsAsync(mxDomain, email, localPart, cancellationToken).ConfigureAwait(false);
+
+            if (settings != null)
+                return settings;
+        }
+
+        return null;
+    }
+
+    private async Task<AutoDiscoverySettings> TryGetSrvBasedSettingsAsync(
+        string domain,
+        string email,
+        CancellationToken cancellationToken)
+    {
+        var incoming = await TryResolveSrvRecordAsync($"_imaps._tcp.{domain}", "IMAP", "SSL", cancellationToken).ConfigureAwait(false)
+                      ?? await TryResolveSrvRecordAsync($"_imap._tcp.{domain}", "IMAP", "STARTTLS", cancellationToken).ConfigureAwait(false);
+
+        var outgoing = await TryResolveSrvRecordAsync($"_submissions._tcp.{domain}", "SMTP", "SSL", cancellationToken).ConfigureAwait(false)
+                      ?? await TryResolveSrvRecordAsync($"_submission._tcp.{domain}", "SMTP", "STARTTLS", cancellationToken).ConfigureAwait(false)
+                      ?? await TryResolveSrvRecordAsync($"_smtp._tcp.{domain}", "SMTP", "STARTTLS", cancellationToken).ConfigureAwait(false);
+
+        if (incoming == null || outgoing == null)
+            return null;
+
+        incoming.Username = email;
+        outgoing.Username = email;
+
+        return new AutoDiscoverySettings
+        {
+            Domain = domain,
+            Settings = [incoming, outgoing]
+        };
+    }
+
+    private async Task<AutoDiscoverySettings> TryGetGuessedHostSettingsAsync(
+        string domain,
+        string email,
+        CancellationToken cancellationToken)
+    {
+        var imapHost = await GetFirstResolvableHostAsync(
+            [$"imap.{domain}", $"mail.{domain}", domain],
+            cancellationToken).ConfigureAwait(false);
+
+        var smtpHost = await GetFirstResolvableHostAsync(
+            [$"smtp.{domain}", $"mail.{domain}", domain],
+            cancellationToken).ConfigureAwait(false);
+
+        if (string.IsNullOrWhiteSpace(imapHost) || string.IsNullOrWhiteSpace(smtpHost))
+            return null;
+
+        return new AutoDiscoverySettings
+        {
+            Domain = domain,
+            Settings =
+            [
+                new AutoDiscoveryProviderSetting
+                {
+                    Protocol = "IMAP",
+                    Address = imapHost,
+                    Port = 993,
+                    Secure = "SSL",
+                    Username = email
+                },
+                new AutoDiscoveryProviderSetting
+                {
+                    Protocol = "SMTP",
+                    Address = smtpHost,
+                    Port = 587,
+                    Secure = "STARTTLS",
+                    Username = email
+                }
+            ]
+        };
+    }
+
+    private async Task<AutoDiscoverySettings> TryGetSettingsFromXmlEndpointAsync(
+        string endpoint,
+        string email,
+        string localPart,
+        string domain,
+        CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var response = await _httpClient.GetAsync(endpoint, cancellationToken).ConfigureAwait(false);
+            if (!response.IsSuccessStatusCode)
+                return null;
+
+            var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            return ParseThunderbirdSettings(content, email, localPart, domain);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            Logger.Debug(ex, "Failed to read autodiscovery XML endpoint {Endpoint}", endpoint);
+            return null;
+        }
+    }
+
+    private static AutoDiscoverySettings ParseThunderbirdSettings(string xmlContent, string email, string localPart, string domain)
+    {
+        if (string.IsNullOrWhiteSpace(xmlContent))
+            return null;
+
+        try
+        {
+            var document = XDocument.Parse(xmlContent);
+
+            var incomingServers = document
+                .Descendants()
+                .Where(e => e.Name.LocalName == "incomingServer")
+                .Where(e => string.Equals((string)e.Attribute("type"), "imap", StringComparison.OrdinalIgnoreCase))
+                .Select(e => ParseThunderbirdServer(e, "IMAP", email, localPart, domain))
+                .Where(e => e != null)
+                .ToList();
+
+            var outgoingServers = document
+                .Descendants()
+                .Where(e => e.Name.LocalName == "outgoingServer")
+                .Where(e => string.Equals((string)e.Attribute("type"), "smtp", StringComparison.OrdinalIgnoreCase))
+                .Select(e => ParseThunderbirdServer(e, "SMTP", email, localPart, domain))
+                .Where(e => e != null)
+                .ToList();
+
+            var bestIncoming = SelectBestServerSetting(incomingServers);
+            var bestOutgoing = SelectBestServerSetting(outgoingServers);
+
+            if (bestIncoming == null || bestOutgoing == null)
+                return null;
+
+            return new AutoDiscoverySettings
+            {
+                Domain = domain,
+                Settings = [bestIncoming, bestOutgoing]
+            };
+        }
+        catch (Exception ex)
+        {
+            Logger.Debug(ex, "Failed to parse Thunderbird autodiscovery XML.");
+            return null;
+        }
+    }
+
+    private static AutoDiscoveryProviderSetting ParseThunderbirdServer(
+        XElement serverElement,
+        string protocol,
+        string email,
+        string localPart,
+        string domain)
+    {
+        var address = ResolveTemplate(GetElementValue(serverElement, "hostname"), email, localPart, domain);
+        var username = ResolveTemplate(GetElementValue(serverElement, "username"), email, localPart, domain);
+        var socketType = ResolveTemplate(GetElementValue(serverElement, "socketType"), email, localPart, domain);
+
+        if (string.IsNullOrWhiteSpace(address))
+            return null;
+
+        if (!int.TryParse(GetElementValue(serverElement, "port"), out var port))
+            return null;
+
+        return new AutoDiscoveryProviderSetting
+        {
+            Protocol = protocol,
+            Address = address.Trim(),
+            Port = port,
+            Secure = socketType?.Trim() ?? string.Empty,
+            Username = string.IsNullOrWhiteSpace(username) ? email : username.Trim()
+        };
+    }
+
+    private static AutoDiscoveryProviderSetting SelectBestServerSetting(IReadOnlyCollection<AutoDiscoveryProviderSetting> settings)
+    {
+        if (settings == null || settings.Count == 0)
+            return null;
+
+        return settings
+            .OrderByDescending(GetSecurityScore)
+            .ThenBy(s => s.Port)
+            .FirstOrDefault();
+    }
+
+    private static int GetSecurityScore(AutoDiscoveryProviderSetting setting)
+    {
+        if (setting == null)
+            return 0;
+
+        var secureValue = setting.Secure ?? string.Empty;
+
+        if (secureValue.Contains("SSL", StringComparison.OrdinalIgnoreCase) ||
+            secureValue.Contains("TLS", StringComparison.OrdinalIgnoreCase))
+        {
+            return 3;
+        }
+
+        if (secureValue.Contains("STARTTLS", StringComparison.OrdinalIgnoreCase))
+            return 2;
+
+        return 1;
+    }
+
+    private static string GetElementValue(XElement element, string localName)
+        => element.Elements().FirstOrDefault(e => e.Name.LocalName == localName)?.Value;
+
+    private static string ResolveTemplate(string value, string email, string localPart, string domain)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return value;
+
+        return value
+            .Replace("%EMAILADDRESS%", email, StringComparison.OrdinalIgnoreCase)
+            .Replace("%EMAILLOCALPART%", localPart, StringComparison.OrdinalIgnoreCase)
+            .Replace("%EMAILDOMAIN%", domain, StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static IEnumerable<string> BuildThunderbirdEndpoints(string domain, string email)
+    {
+        var escapedEmail = Uri.EscapeDataString(email);
+        yield return $"https://autoconfig.{domain}/mail/config-v1.1.xml?emailaddress={escapedEmail}";
+        yield return $"https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress={escapedEmail}";
+    }
+
+    private async Task<AutoDiscoverySettings> GetSettingsFromFiretrustAsync(string mailAddress, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var response = await _httpClient.GetAsync($"{FiretrustUrl}{Uri.EscapeDataString(mailAddress)}", cancellationToken).ConfigureAwait(false);
+            if (!response.IsSuccessStatusCode)
+            {
+                Logger.Warning("Firetrust autodiscovery failed with status {StatusCode}", response.StatusCode);
+                return null;
+            }
+
+            var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            return JsonSerializer.Deserialize(content, DomainModelsJsonContext.Default.AutoDiscoverySettings);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            Logger.Error(ex, "Failed to deserialize Firetrust autodiscovery response.");
+            return null;
+        }
+    }
+
+    private async Task<AutoDiscoveryProviderSetting> TryResolveSrvRecordAsync(
+        string queryName,
+        string protocol,
+        string secureHint,
+        CancellationToken cancellationToken)
+    {
+        var records = await QueryDnsAsync(queryName, "SRV", cancellationToken).ConfigureAwait(false);
+        var srvRecord = records
+            .Select(ParseSrvRecord)
+            .Where(r => r != null)
+            .OrderBy(r => r.Priority)
+            .ThenBy(r => r.Weight)
+            .FirstOrDefault();
+
+        if (srvRecord == null)
+            return null;
+
+        return new AutoDiscoveryProviderSetting
+        {
+            Protocol = protocol,
+            Address = srvRecord.Target,
+            Port = srvRecord.Port,
+            Secure = secureHint
+        };
+    }
+
+    private async Task<IReadOnlyList<string>> GetMxSearchDomainsAsync(string domain, CancellationToken cancellationToken)
+    {
+        var results = new List<string> { domain };
+        var records = await QueryDnsAsync(domain, "MX", cancellationToken).ConfigureAwait(false);
+
+        var hosts = records
+            .Select(ParseMxRecord)
+            .Where(r => r != null)
+            .OrderBy(r => r.Preference)
+            .Select(r => r.Target)
+            .Distinct(IgnoreCase)
+            .ToList();
+
+        foreach (var host in hosts)
+        {
+            foreach (var candidateDomain in BuildDomainCandidatesFromHost(host))
+            {
+                if (!results.Contains(candidateDomain, IgnoreCase))
+                {
+                    results.Add(candidateDomain);
+                }
+            }
+        }
+
+        return results;
+    }
+
+    private async Task<string> GetFirstResolvableHostAsync(IEnumerable<string> hostCandidates, CancellationToken cancellationToken)
+    {
+        foreach (var host in hostCandidates.Where(h => !string.IsNullOrWhiteSpace(h)).Distinct(IgnoreCase))
+        {
+            if (await HasAnyDnsAddressRecordAsync(host, cancellationToken).ConfigureAwait(false))
+                return host;
+        }
+
+        return null;
+    }
+
+    private async Task<bool> HasAnyDnsAddressRecordAsync(string host, CancellationToken cancellationToken)
+    {
+        var aRecords = await QueryDnsAsync(host, "A", cancellationToken).ConfigureAwait(false);
+        if (aRecords.Count > 0)
+            return true;
+
+        var aaaaRecords = await QueryDnsAsync(host, "AAAA", cancellationToken).ConfigureAwait(false);
+        return aaaaRecords.Count > 0;
+    }
+
+    private async Task<IReadOnlyList<string>> QueryDnsAsync(string queryName, string queryType, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var url = $"{GoogleDnsResolveUrl}?name={Uri.EscapeDataString(queryName)}&type={Uri.EscapeDataString(queryType)}";
+            using var response = await _httpClient.GetAsync(url, cancellationToken).ConfigureAwait(false);
+            if (!response.IsSuccessStatusCode)
+                return Array.Empty<string>();
+
+            await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+            using var document = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            if (!document.RootElement.TryGetProperty("Answer", out var answerArray) ||
+                answerArray.ValueKind != JsonValueKind.Array)
+            {
+                return Array.Empty<string>();
+            }
+
+            var values = new List<string>();
+
+            foreach (var answer in answerArray.EnumerateArray())
+            {
+                if (answer.TryGetProperty("data", out var dataNode) && dataNode.ValueKind == JsonValueKind.String)
+                {
+                    var data = dataNode.GetString();
+                    if (!string.IsNullOrWhiteSpace(data))
+                        values.Add(data);
+                }
+            }
+
+            return values;
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            Logger.Debug(ex, "DNS-over-HTTPS query failed for {QueryName} ({Type})", queryName, queryType);
+            return Array.Empty<string>();
+        }
+    }
+
+    private async Task<Uri> TryResolveCalDavEndpointAsync(Uri candidate, CancellationToken cancellationToken)
+    {
+        var getResult = await ProbeCalDavEndpointAsync(candidate, HttpMethod.Get, cancellationToken).ConfigureAwait(false);
+        if (getResult != null)
+            return getResult;
+
+        return await ProbeCalDavEndpointAsync(candidate, OptionsMethod, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<Uri> ProbeCalDavEndpointAsync(Uri uri, HttpMethod method, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var request = new HttpRequestMessage(method, uri);
+            using var response = await _httpClient
+                .SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken)
+                .ConfigureAwait(false);
+
+            if (TryResolveRedirectTarget(uri, response, out var redirectTarget))
+                return redirectTarget;
+
+            if (!IsPossibleCalDavEndpoint(response))
+                return null;
+
+            return response.RequestMessage?.RequestUri ?? uri;
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            Logger.Debug(ex, "CalDAV probe failed for {Uri} with method {Method}", uri, method);
+            return null;
+        }
+    }
+
+    private static bool IsPossibleCalDavEndpoint(HttpResponseMessage response)
+    {
+        if (response == null)
+            return false;
+
+        if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden or HttpStatusCode.MultiStatus)
+            return true;
+
+        var hasDavHeader = response.Headers.Contains("DAV");
+        var hasDavMethod = response.Headers.TryGetValues("Allow", out var allowValues)
+                           && allowValues.Any(value =>
+                               value.Contains("PROPFIND", StringComparison.OrdinalIgnoreCase) ||
+                               value.Contains("REPORT", StringComparison.OrdinalIgnoreCase));
+
+        if (response.StatusCode == HttpStatusCode.MethodNotAllowed)
+            return hasDavHeader || hasDavMethod;
+
+        return response.IsSuccessStatusCode && (hasDavHeader || hasDavMethod);
+    }
+
+    private static bool TryResolveRedirectTarget(Uri baseUri, HttpResponseMessage response, out Uri resolvedUri)
+    {
+        resolvedUri = null;
+
+        if (response == null || !IsRedirectStatusCode(response.StatusCode))
+            return false;
+
+        if (response.Headers.Location == null)
+            return false;
+
+        resolvedUri = response.Headers.Location.IsAbsoluteUri
+            ? response.Headers.Location
+            : new Uri(baseUri, response.Headers.Location);
+
+        return true;
+    }
+
+    private static bool IsRedirectStatusCode(HttpStatusCode statusCode)
+        => statusCode == HttpStatusCode.MovedPermanently
+           || statusCode == HttpStatusCode.Found
+           || statusCode == HttpStatusCode.RedirectMethod
+           || statusCode == HttpStatusCode.TemporaryRedirect
+           || (int)statusCode == 308;
+
+    private static Uri TryGetKnownProviderCalDavUri(string domain)
+    {
+        if (domain.EndsWith("icloud.com", StringComparison.OrdinalIgnoreCase) ||
+            domain.EndsWith("me.com", StringComparison.OrdinalIgnoreCase) ||
+            domain.EndsWith("mac.com", StringComparison.OrdinalIgnoreCase))
+        {
+            return new Uri("https://caldav.icloud.com/");
+        }
+
+        if (domain.Contains("yahoo.", StringComparison.OrdinalIgnoreCase) ||
+            domain.EndsWith("aol.com", StringComparison.OrdinalIgnoreCase))
+        {
+            return new Uri("https://caldav.calendar.yahoo.com/");
+        }
+
+        return null;
+    }
+
+    private static IEnumerable<Uri> GetCalDavCandidates(string domain)
+    {
+        foreach (var candidateDomain in BuildDomainCandidatesFromHost(domain))
+        {
+            yield return new Uri($"https://{candidateDomain}/.well-known/caldav");
+            yield return new Uri($"https://caldav.{candidateDomain}/");
+        }
+    }
+
+    private static IEnumerable<string> BuildDomainCandidatesFromHost(string hostOrDomain)
+    {
+        if (string.IsNullOrWhiteSpace(hostOrDomain))
+            yield break;
+
+        var normalized = hostOrDomain.Trim().TrimEnd('.');
+        if (string.IsNullOrWhiteSpace(normalized))
+            yield break;
+
+        yield return normalized;
+
+        var segments = normalized.Split('.', StringSplitOptions.RemoveEmptyEntries);
+        if (segments.Length > 2)
+        {
+            yield return string.Join('.', segments.Skip(1));
+        }
+    }
+
+    private static bool TryGetEmailParts(string email, out string localPart, out string domain)
+    {
+        localPart = null;
+        domain = null;
+
+        if (string.IsNullOrWhiteSpace(email))
+            return false;
+
+        var separatorIndex = email.IndexOf('@');
+        if (separatorIndex <= 0 || separatorIndex >= email.Length - 1)
+            return false;
+
+        localPart = email[..separatorIndex];
+        domain = email[(separatorIndex + 1)..];
+        return !string.IsNullOrWhiteSpace(localPart) && !string.IsNullOrWhiteSpace(domain);
+    }
+
+    private void CacheCalDavUri(string domain, Uri calDavUri)
+    {
+        lock (_calDavCacheLock)
+        {
+            _calDavUriCache[domain] = calDavUri;
+        }
+    }
+
+    private static SrvRecord ParseSrvRecord(string rawValue)
+    {
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return null;
+
+        var parts = rawValue.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+        if (parts.Length < 4)
+            return null;
+
+        if (!ushort.TryParse(parts[0], out var priority) ||
+            !ushort.TryParse(parts[1], out var weight) ||
+            !int.TryParse(parts[2], out var port))
+        {
+            return null;
+        }
+
+        var target = parts[3].Trim().TrimEnd('.');
+        if (string.IsNullOrWhiteSpace(target))
+            return null;
+
+        return new SrvRecord(priority, weight, port, target);
+    }
+
+    private static MxRecord ParseMxRecord(string rawValue)
+    {
+        if (string.IsNullOrWhiteSpace(rawValue))
+            return null;
+
+        var parts = rawValue.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+        if (parts.Length < 2 || !ushort.TryParse(parts[0], out var preference))
+            return null;
+
+        var target = parts[1].Trim().TrimEnd('.');
+        if (string.IsNullOrWhiteSpace(target))
+            return null;
+
+        return new MxRecord(preference, target);
+    }
+
+    private sealed record SrvRecord(ushort Priority, ushort Weight, int Port, string Target);
+    private sealed record MxRecord(ushort Preference, string Target);
 }
diff --git a/Wino.Core/Services/GmailSynchronizerErrorHandlingFactory.cs b/Wino.Core/Services/GmailSynchronizerErrorHandlingFactory.cs
index b2153c32..0f64aaf1 100644
--- a/Wino.Core/Services/GmailSynchronizerErrorHandlingFactory.cs
+++ b/Wino.Core/Services/GmailSynchronizerErrorHandlingFactory.cs
@@ -1,11 +1,27 @@
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Errors;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Synchronizers.Errors;
+using Wino.Core.Synchronizers.Errors.Gmail;
 
 namespace Wino.Core.Services;
+
+/// <summary>
+/// Factory for handling Gmail synchronizer errors.
+/// Registers and routes errors to appropriate handlers.
+/// </summary>
 public class GmailSynchronizerErrorHandlingFactory : SynchronizerErrorHandlingFactory, IGmailSynchronizerErrorHandlerFactory
 {
-    public bool CanHandle(SynchronizerErrorContext error) => CanHandle(error);
-
-    public Task HandleAsync(SynchronizerErrorContext error) => HandleErrorAsync(error);
+    public GmailSynchronizerErrorHandlingFactory(
+        GmailAuthenticationFailedHandler authenticationFailedHandler,
+        GmailQuotaExceededHandler quotaExceededHandler,
+        GmailRateLimitHandler rateLimitHandler,
+        GmailHistoryExpiredHandler historyExpiredHandler,
+        EntityNotFoundHandler entityNotFoundHandler)
+    {
+        // Order matters - more specific handlers should be registered first
+        RegisterHandler(authenticationFailedHandler);
+        RegisterHandler(quotaExceededHandler);
+        RegisterHandler(historyExpiredHandler);
+        RegisterHandler(entityNotFoundHandler);
+        RegisterHandler(rateLimitHandler); // Most generic rate limit handler last
+    }
 }
diff --git a/Wino.Core/Services/ImapSynchronizerErrorHandlingFactory.cs b/Wino.Core/Services/ImapSynchronizerErrorHandlingFactory.cs
new file mode 100644
index 00000000..2a319896
--- /dev/null
+++ b/Wino.Core/Services/ImapSynchronizerErrorHandlingFactory.cs
@@ -0,0 +1,27 @@
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Synchronizers.Errors;
+using Wino.Core.Synchronizers.Errors.Imap;
+
+namespace Wino.Core.Services;
+
+/// <summary>
+/// Factory for handling IMAP synchronizer errors.
+/// Registers and routes errors to appropriate handlers.
+/// </summary>
+public class ImapSynchronizerErrorHandlingFactory : SynchronizerErrorHandlingFactory, IImapSynchronizerErrorHandlerFactory
+{
+    public ImapSynchronizerErrorHandlingFactory(
+        ImapConnectionLostHandler connectionLostHandler,
+        ImapAuthenticationFailedHandler authFailedHandler,
+        EntityNotFoundHandler entityNotFoundHandler,
+        ImapFolderNotFoundHandler folderNotFoundHandler,
+        ImapProtocolErrorHandler protocolErrorHandler)
+    {
+        // Order matters - more specific handlers should be registered first
+        RegisterHandler(authFailedHandler);
+        RegisterHandler(entityNotFoundHandler);
+        RegisterHandler(folderNotFoundHandler);
+        RegisterHandler(connectionLostHandler);
+        RegisterHandler(protocolErrorHandler); // Most generic, registered last
+    }
+}
diff --git a/Wino.Core/Services/ImapTestService.cs b/Wino.Core/Services/ImapTestService.cs
index 437f72ce..9f8e7065 100644
--- a/Wino.Core/Services/ImapTestService.cs
+++ b/Wino.Core/Services/ImapTestService.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using System.Threading.Tasks;
 using MailKit.Net.Smtp;
 using Wino.Core.Domain.Entities.Shared;
@@ -11,69 +9,32 @@ namespace Wino.Core.Services;
 
 public class ImapTestService : IImapTestService
 {
-    public const string ProtocolLogFileName = "ImapProtocolLog.log";
-
-    private readonly IPreferencesService _preferencesService;
-    private readonly IApplicationConfiguration _appInitializerService;
-
-    private Stream _protocolLogStream;
-
-    public ImapTestService(IPreferencesService preferencesService, IApplicationConfiguration appInitializerService)
+    public ImapTestService()
     {
-        _preferencesService = preferencesService;
-        _appInitializerService = appInitializerService;
-    }
-
-    private void EnsureProtocolLogFileExists()
-    {
-        // Create new file for protocol logger.
-        var localAppFolderPath = _appInitializerService.ApplicationDataFolderPath;
-
-        var logFile = Path.Combine(localAppFolderPath, ProtocolLogFileName);
-
-        if (File.Exists(logFile))
-            File.Delete(logFile);
-
-        _protocolLogStream = File.Create(logFile);
     }
 
     public async Task TestImapConnectionAsync(CustomServerInformation serverInformation, bool allowSSLHandShake)
     {
-        try
+        var poolOptions = ImapClientPoolOptions.CreateTestPool(serverInformation);
+
+        using (var clientPool = new ImapClientPool(poolOptions)
         {
-            EnsureProtocolLogFileExists();
-
-            var poolOptions = ImapClientPoolOptions.CreateTestPool(serverInformation, _protocolLogStream);
-
-            var clientPool = new ImapClientPool(poolOptions)
-            {
-                ThrowOnSSLHandshakeCallback = !allowSSLHandShake
-            };
-
-            using (clientPool)
-            {
-                // This call will make sure that everything is authenticated + connected successfully.
-                var client = await clientPool.GetClientAsync();
-
-                clientPool.Release(client);
-            }
-
-            // Test SMTP connectivity.
-            using var smtpClient = new SmtpClient();
-
-            if (!smtpClient.IsConnected)
-                await smtpClient.ConnectAsync(serverInformation.OutgoingServer, int.Parse(serverInformation.OutgoingServerPort), MailKit.Security.SecureSocketOptions.Auto);
-
-            if (!smtpClient.IsAuthenticated)
-                await smtpClient.AuthenticateAsync(serverInformation.OutgoingServerUsername, serverInformation.OutgoingServerPassword);
-        }
-        catch (Exception)
+            ThrowOnSSLHandshakeCallback = !allowSSLHandShake
+        })
         {
-            throw;
-        }
-        finally
-        {
-            _protocolLogStream?.Dispose();
+            // This call will make sure that everything is authenticated + connected successfully.
+            var client = await clientPool.GetClientAsync();
+
+            clientPool.Release(client);
         }
+
+        // Test SMTP connectivity.
+        using var smtpClient = new SmtpClient();
+
+        if (!smtpClient.IsConnected)
+            await smtpClient.ConnectAsync(serverInformation.OutgoingServer, int.Parse(serverInformation.OutgoingServerPort), MailKit.Security.SecureSocketOptions.Auto);
+
+        if (!smtpClient.IsAuthenticated)
+            await smtpClient.AuthenticateAsync(serverInformation.OutgoingServerUsername, serverInformation.OutgoingServerPassword);
     }
 }
diff --git a/Wino.Core/Services/OutlookSynchronizerErrorHandlingFactory.cs b/Wino.Core/Services/OutlookSynchronizerErrorHandlingFactory.cs
index 4947060f..91f411d3 100644
--- a/Wino.Core/Services/OutlookSynchronizerErrorHandlingFactory.cs
+++ b/Wino.Core/Services/OutlookSynchronizerErrorHandlingFactory.cs
@@ -1,18 +1,21 @@
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Errors;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Synchronizers.Errors;
 using Wino.Core.Synchronizers.Errors.Outlook;
 
 namespace Wino.Core.Services;
 
 public class OutlookSynchronizerErrorHandlingFactory : SynchronizerErrorHandlingFactory, IOutlookSynchronizerErrorHandlerFactory
 {
-    public OutlookSynchronizerErrorHandlingFactory(ObjectCannotBeDeletedHandler objectCannotBeDeleted)
+    public OutlookSynchronizerErrorHandlingFactory(OutlookAuthenticationFailedHandler authenticationFailedHandler,
+                                                 ObjectCannotBeDeletedHandler objectCannotBeDeleted,
+                                                 EntityNotFoundHandler entityNotFoundHandler,
+                                                 DeltaTokenExpiredHandler deltaTokenExpiredHandler,
+                                                 OutlookRateLimitHandler outlookRateLimitHandler)
     {
+        RegisterHandler(authenticationFailedHandler);
+        RegisterHandler(outlookRateLimitHandler);
         RegisterHandler(objectCannotBeDeleted);
+        RegisterHandler(entityNotFoundHandler);
+        RegisterHandler(deltaTokenExpiredHandler);
     }
-
-    public bool CanHandle(SynchronizerErrorContext error) => CanHandle(error);
-
-    public Task HandleAsync(SynchronizerErrorContext error) => HandleErrorAsync(error);
 }
diff --git a/Wino.Core/Services/RetryExecutor.cs b/Wino.Core/Services/RetryExecutor.cs
new file mode 100644
index 00000000..f59d5ffb
--- /dev/null
+++ b/Wino.Core/Services/RetryExecutor.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Retry;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Services;
+
+/// <summary>
+/// Executes operations with automatic retry and error handling support.
+/// Implements exponential backoff with jitter.
+/// </summary>
+public class RetryExecutor : IRetryExecutor
+{
+    private readonly ILogger _logger = Log.ForContext<RetryExecutor>();
+
+    /// <inheritdoc/>
+    public async Task<T> ExecuteWithRetryAsync<T>(
+        Func<CancellationToken, Task<T>> operation,
+        RetryPolicy policy,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        ISynchronizerErrorHandlerFactory errorHandler = null,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(operation);
+        ArgumentNullException.ThrowIfNull(policy);
+        ArgumentNullException.ThrowIfNull(errorContextFactory);
+
+        int attempt = 0;
+        Exception lastException = null;
+
+        while (attempt <= policy.MaxRetries)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            try
+            {
+                return await operation(cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                throw; // Don't retry on cancellation
+            }
+            catch (Exception ex)
+            {
+                lastException = ex;
+                attempt++;
+
+                var errorContext = errorContextFactory(ex);
+                errorContext.RetryCount = attempt;
+                errorContext.MaxRetries = policy.MaxRetries;
+
+                // Let the error handler process the error first
+                if (errorHandler != null)
+                {
+                    try
+                    {
+                        var handled = await errorHandler.HandleErrorAsync(errorContext).ConfigureAwait(false);
+                        if (handled)
+                        {
+                            _logger.Debug("Error handled by error handler, severity: {Severity}", errorContext.Severity);
+                        }
+                    }
+                    catch (Exception handlerEx)
+                    {
+                        _logger.Warning(handlerEx, "Error handler threw an exception");
+                    }
+                }
+
+                // Check if we should retry based on error severity
+                if (errorContext.Severity == SynchronizerErrorSeverity.Fatal ||
+                    errorContext.Severity == SynchronizerErrorSeverity.AuthRequired)
+                {
+                    _logger.Warning(ex, "Non-retryable error (severity: {Severity}), failing immediately", errorContext.Severity);
+                    throw;
+                }
+
+                if (errorContext.Severity == SynchronizerErrorSeverity.Recoverable)
+                {
+                    _logger.Debug(ex, "Recoverable error, not retrying but allowing continuation");
+                    throw;
+                }
+
+                // Transient error - check if we have retries left
+                if (attempt > policy.MaxRetries)
+                {
+                    _logger.Warning(ex, "All {MaxRetries} retries exhausted", policy.MaxRetries);
+                    throw;
+                }
+
+                // Calculate delay and wait
+                var delay = errorContext.RetryDelay ?? policy.GetDelay(attempt);
+                _logger.Debug("Retry attempt {Attempt}/{MaxRetries} after {Delay}ms delay for error: {ErrorMessage}",
+                    attempt, policy.MaxRetries, delay.TotalMilliseconds, ex.Message);
+
+                await Task.Delay(delay, cancellationToken).ConfigureAwait(false);
+            }
+        }
+
+        // Should not reach here, but just in case
+        throw lastException ?? new InvalidOperationException("Retry loop completed without result");
+    }
+
+    /// <inheritdoc/>
+    public async Task ExecuteWithRetryAsync(
+        Func<CancellationToken, Task> operation,
+        RetryPolicy policy,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        ISynchronizerErrorHandlerFactory errorHandler = null,
+        CancellationToken cancellationToken = default)
+    {
+        await ExecuteWithRetryAsync(
+            async ct =>
+            {
+                await operation(ct).ConfigureAwait(false);
+                return true; // Dummy return value
+            },
+            policy,
+            errorContextFactory,
+            errorHandler,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public Task<T> ExecuteWithRetryAsync<T>(
+        Func<CancellationToken, Task<T>> operation,
+        Func<Exception, SynchronizerErrorContext> errorContextFactory,
+        CancellationToken cancellationToken = default)
+    {
+        return ExecuteWithRetryAsync(
+            operation,
+            RetryPolicy.Default,
+            errorContextFactory,
+            null,
+            cancellationToken);
+    }
+}
diff --git a/Wino.Core/Services/SynchronizationManager.cs b/Wino.Core/Services/SynchronizationManager.cs
new file mode 100644
index 00000000..798431f5
--- /dev/null
+++ b/Wino.Core/Services/SynchronizationManager.cs
@@ -0,0 +1,829 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Authentication;
+using Wino.Core.Domain.Models.Connectivity;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Messaging.UI;
+
+namespace Wino.Core.Services;
+
+/// <summary>
+/// Singleton manager that handles synchronizer instances and operations for all accounts.
+/// Replaces the old WinoServerConnectionManager functionality.
+/// </summary>
+public class SynchronizationManager : ISynchronizationManager
+{
+    private static readonly Lazy<SynchronizationManager> _instance = new(() => new SynchronizationManager());
+    public static SynchronizationManager Instance => _instance.Value;
+
+    private readonly ConcurrentDictionary<Guid, IWinoSynchronizerBase> _synchronizerCache = new();
+    private readonly ConcurrentDictionary<Guid, CancellationTokenSource> _accountSynchronizationCancellationSources = new();
+    private readonly ConcurrentDictionary<Guid, SemaphoreSlim> _calendarSynchronizationLocks = new();
+    private readonly SemaphoreSlim _initializationSemaphore = new(1, 1);
+    private readonly ILogger _logger = Log.ForContext<SynchronizationManager>();
+
+    private SynchronizerFactory _concreteSynchronizerFactory;
+    private IImapTestService _imapTestService;
+    private IAccountService _accountService;
+    private IAuthenticationProvider _authenticationProvider;
+    private INotificationBuilder _notificationBuilder;
+
+    private bool _isInitialized = false;
+
+    private SynchronizationManager() { }
+
+    /// <summary>
+    /// Initializes the SynchronizationManager with required dependencies.
+    /// This must be called before using any other methods.
+    /// Note: Synchronizers are created lazily to avoid requiring window handles during app initialization.
+    /// </summary>
+    /// <param name="synchronizerFactory">Factory for creating synchronizers</param>
+    /// <param name="imapTestService">Service for testing IMAP connectivity</param>
+    /// <param name="accountService">Service for account operations</param>
+    /// <param name="authenticationProvider">Provider for OAuth authentication</param>
+    public async Task InitializeAsync(ISynchronizerFactory synchronizerFactory,
+                                     IImapTestService imapTestService,
+                                     IAccountService accountService,
+                                     INotificationBuilder notificationBuilder,
+                                     IAuthenticationProvider authenticationProvider)
+    {
+        await _initializationSemaphore.WaitAsync();
+
+        try
+        {
+            if (_isInitialized) return;
+
+            _concreteSynchronizerFactory = synchronizerFactory as SynchronizerFactory ?? throw new ArgumentException("SynchronizerFactory must be the concrete implementation");
+            _imapTestService = imapTestService ?? throw new ArgumentNullException(nameof(imapTestService));
+            _accountService = accountService ?? throw new ArgumentNullException(nameof(accountService));
+            _authenticationProvider = authenticationProvider ?? throw new ArgumentNullException(nameof(authenticationProvider));
+            _notificationBuilder = notificationBuilder ?? throw new ArgumentNullException(nameof(notificationBuilder));
+
+            // DO NOT create synchronizers here to avoid requiring window handles during initialization.
+            // Synchronizers will be created lazily when first accessed via GetOrCreateSynchronizerAsync.
+
+            _isInitialized = true;
+            _logger.Information("SynchronizationManager dependencies initialized. Synchronizers will be created lazily.");
+        }
+        finally
+        {
+            _initializationSemaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Tests IMAP server connectivity for the given server information.
+    /// </summary>
+    /// <param name="serverInformation">Server information to test</param>
+    /// <param name="allowSSLHandshake">Whether to allow SSL handshake</param>
+    /// <returns>Test results indicating success or failure with details</returns>
+    public async Task<ImapConnectivityTestResults> TestImapConnectivityAsync(CustomServerInformation serverInformation, bool allowSSLHandshake)
+    {
+        EnsureInitialized();
+
+        try
+        {
+            _logger.Information("Testing IMAP connectivity for {Server}:{Port}",
+                              serverInformation.IncomingServer,
+                              serverInformation.IncomingServerPort);
+
+            await _imapTestService.TestImapConnectionAsync(serverInformation, allowSSLHandshake);
+
+            _logger.Information("IMAP connectivity test successful");
+            return ImapConnectivityTestResults.Success();
+        }
+        catch (ImapTestSSLCertificateException sslTestException)
+        {
+            _logger.Warning("IMAP connectivity test requires SSL certificate confirmation");
+            return ImapConnectivityTestResults.CertificateUIRequired(
+                sslTestException.Issuer,
+                sslTestException.ExpirationDateString,
+                sslTestException.ValidFromDateString);
+        }
+        catch (ImapClientPoolException clientPoolException)
+        {
+            _logger.Error(clientPoolException, "IMAP connectivity test failed");
+            return ImapConnectivityTestResults.Failure(clientPoolException);
+        }
+        catch (Exception exception)
+        {
+            _logger.Error(exception, "IMAP connectivity test failed");
+            return ImapConnectivityTestResults.Failure(exception);
+        }
+    }
+
+    /// <summary>
+    /// Starts a new mail synchronization for the given account.
+    /// </summary>
+    /// <param name="options">Mail synchronization options</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Synchronization result</returns>
+    public async Task<MailSynchronizationResult> SynchronizeMailAsync(MailSynchronizationOptions options,
+                                                                      CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        if (await IsSynchronizationBlockedByAttentionAsync(options.AccountId).ConfigureAwait(false))
+        {
+            _logger.Information("Skipping mail synchronization for account {AccountId} because it requires credential attention.", options.AccountId);
+            return MailSynchronizationResult.Canceled;
+        }
+
+        var synchronizer = await GetOrCreateSynchronizerAsync(options.AccountId);
+        if (synchronizer == null)
+        {
+            _logger.Error("Could not find or create synchronizer for account {AccountId}", options.AccountId);
+
+            return MailSynchronizationResult.Failed(new Exception("Can't create/get synchronizer."));
+        }
+
+        _logger.Information("Starting mail synchronization for account {AccountId} with type {SyncType}",
+                          options.AccountId, options.Type);
+
+        var accountCancellationSource = _accountSynchronizationCancellationSources.GetOrAdd(options.AccountId, _ => new CancellationTokenSource());
+        using var linkedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(
+            cancellationToken,
+            accountCancellationSource.Token);
+
+        try
+        {
+            var result = await synchronizer.SynchronizeMailsAsync(options, linkedCancellationTokenSource.Token);
+
+            _logger.Information("Mail synchronization completed for account {AccountId} with state {State}",
+                              options.AccountId, result.CompletedState);
+
+            // Create notifications.
+            if (result.DownloadedMessages?.Any() ?? false)
+                await _notificationBuilder.CreateNotificationsAsync(result.DownloadedMessages);
+
+            await _notificationBuilder.UpdateTaskbarIconBadgeAsync();
+
+            return result;
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.Information("Mail synchronization canceled for account {AccountId}", options.AccountId);
+            return MailSynchronizationResult.Canceled;
+        }
+        catch (AuthenticationAttentionException authEx)
+        {
+            _logger.Warning("Account {AccountId} requires attention due to authentication issues", options.AccountId);
+            await SetInvalidCredentialAttentionAsync(authEx.Account).ConfigureAwait(false);
+
+            // Create app notification for authentication attention
+            _notificationBuilder.CreateAttentionRequiredNotification(authEx.Account);
+
+            return MailSynchronizationResult.Failed(authEx);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Mail synchronization failed for account {AccountId}", options.AccountId);
+            return MailSynchronizationResult.Failed(ex);
+        }
+    }
+
+    /// <summary>
+    /// Checks if there is an ongoing synchronization for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to check</param>
+    /// <returns>True if synchronization is ongoing, false otherwise</returns>
+    public bool IsAccountSynchronizing(Guid accountId)
+    {
+        EnsureInitialized();
+
+        if (_synchronizerCache.TryGetValue(accountId, out var synchronizer))
+        {
+            return synchronizer.State == AccountSynchronizerState.Synchronizing ||
+                   synchronizer.State == AccountSynchronizerState.ExecutingRequests;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Queues a request to the corresponding account's synchronizer with optional synchronization triggering.
+    /// Automatically determines whether to trigger mail or calendar synchronization based on the request type.
+    /// </summary>
+    /// <param name="request">Request to queue</param>
+    /// <param name="accountId">Account ID to queue the request for</param>
+    /// <param name="triggerSynchronization">Whether to automatically trigger synchronization after queuing the request</param>
+    public async Task QueueRequestAsync(IRequestBase request, Guid accountId, bool triggerSynchronization)
+    {
+        EnsureInitialized();
+
+        var synchronizer = await GetOrCreateSynchronizerAsync(accountId);
+        if (synchronizer == null)
+        {
+            _logger.Error("Could not find or create synchronizer for account {AccountId} to queue request", accountId);
+            return;
+        }
+
+        _logger.Debug("Queuing request {RequestType} for account {AccountId}",
+                     request.GetType().Name, accountId);
+
+        synchronizer.QueueRequest(request);
+
+        if (triggerSynchronization)
+        {
+            // Determine if this is a calendar or mail operation
+            bool isCalendarOperation = request is ICalendarActionRequest;
+
+            if (isCalendarOperation)
+            {
+                // Trigger calendar synchronization
+                _logger.Debug("Triggering calendar synchronization to execute queued request for account {AccountId}", accountId);
+
+                var calendarSyncOptions = new CalendarSynchronizationOptions()
+                {
+                    AccountId = accountId
+                };
+
+                // Trigger synchronization asynchronously without waiting for completion
+                _ = Task.Run(async () =>
+                {
+                    try
+                    {
+                        await SynchronizeCalendarAsync(calendarSyncOptions);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, "Failed to execute calendar synchronization after queuing request for account {AccountId}", accountId);
+                    }
+                });
+            }
+            else
+            {
+                // Trigger mail synchronization (includes mail and folder operations)
+                _logger.Debug("Triggering mail synchronization to execute queued request for account {AccountId}", accountId);
+
+                var mailSyncOptions = new MailSynchronizationOptions()
+                {
+                    AccountId = accountId,
+                    Type = MailSynchronizationType.ExecuteRequests
+                };
+
+                // Trigger synchronization asynchronously without waiting for completion
+                // This matches the pattern used in WinoRequestDelegator
+                _ = Task.Run(async () =>
+                {
+                    try
+                    {
+                        await SynchronizeMailAsync(mailSyncOptions);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, "Failed to execute mail synchronization after queuing request for account {AccountId}", accountId);
+                    }
+                });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Handles folder synchronization for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to synchronize folders for</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Synchronization result</returns>
+    public async Task<MailSynchronizationResult> SynchronizeFoldersAsync(Guid accountId,
+                                                                         CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        var options = new MailSynchronizationOptions
+        {
+            AccountId = accountId,
+            Type = MailSynchronizationType.FoldersOnly
+        };
+
+        return await SynchronizeMailAsync(options, cancellationToken);
+    }
+
+    /// <summary>
+    /// Handles alias synchronization for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to synchronize aliases for</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Synchronization result</returns>
+    public async Task<MailSynchronizationResult> SynchronizeAliasesAsync(Guid accountId,
+                                                                         CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        var options = new MailSynchronizationOptions
+        {
+            AccountId = accountId,
+            Type = MailSynchronizationType.Alias
+        };
+
+        return await SynchronizeMailAsync(options, cancellationToken);
+    }
+
+    /// <summary>
+    /// Handles profile synchronization for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to synchronize profile for</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Synchronization result</returns>
+    public async Task<MailSynchronizationResult> SynchronizeProfileAsync(Guid accountId,
+                                                                         CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        var options = new MailSynchronizationOptions
+        {
+            AccountId = accountId,
+            Type = MailSynchronizationType.UpdateProfile
+        };
+
+        return await SynchronizeMailAsync(options, cancellationToken);
+    }
+
+    /// <summary>
+    /// Handles calendar synchronization for the given account.
+    /// </summary>
+    /// <param name="options">Calendar synchronization options</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Synchronization result</returns>
+    public async Task<CalendarSynchronizationResult> SynchronizeCalendarAsync(CalendarSynchronizationOptions options,
+                                                                               CancellationToken cancellationToken = default)
+        => options.Type == CalendarSynchronizationType.Strict
+            ? await SynchronizeCalendarStrictAsync(options, cancellationToken).ConfigureAwait(false)
+            : await RunCalendarSynchronizationWithLockAsync(
+                options.AccountId,
+                cancellationToken,
+                () => SynchronizeCalendarCoreAsync(options, cancellationToken, reportState: true)).ConfigureAwait(false);
+
+    private async Task<CalendarSynchronizationResult> SynchronizeCalendarStrictAsync(
+        CalendarSynchronizationOptions options,
+        CancellationToken cancellationToken)
+    {
+        var metadataOptions = new CalendarSynchronizationOptions
+        {
+            AccountId = options.AccountId,
+            Type = CalendarSynchronizationType.CalendarMetadata,
+            SynchronizationCalendarIds = options.SynchronizationCalendarIds
+        };
+
+        var eventOptions = new CalendarSynchronizationOptions
+        {
+            AccountId = options.AccountId,
+            Type = CalendarSynchronizationType.CalendarEvents,
+            SynchronizationCalendarIds = options.SynchronizationCalendarIds
+        };
+
+        return await RunCalendarSynchronizationWithLockAsync(options.AccountId, cancellationToken, async () =>
+        {
+            try
+            {
+                PublishCalendarSynchronizationState(
+                    options.AccountId,
+                    CalendarSynchronizationType.Strict,
+                    isSynchronizationInProgress: true,
+                    Translator.SyncAction_SynchronizingCalendarMetadata);
+
+                var metadataResult = await SynchronizeCalendarCoreAsync(metadataOptions, cancellationToken, reportState: false).ConfigureAwait(false);
+                if (metadataResult.CompletedState is SynchronizationCompletedState.Failed or SynchronizationCompletedState.Canceled)
+                {
+                    return metadataResult;
+                }
+
+                PublishCalendarSynchronizationState(
+                    options.AccountId,
+                    CalendarSynchronizationType.Strict,
+                    isSynchronizationInProgress: true,
+                    Translator.SyncAction_SynchronizingCalendarEvents);
+
+                return await SynchronizeCalendarCoreAsync(eventOptions, cancellationToken, reportState: false).ConfigureAwait(false);
+            }
+            finally
+            {
+                PublishCalendarSynchronizationState(options.AccountId, CalendarSynchronizationType.Strict, isSynchronizationInProgress: false);
+            }
+        }).ConfigureAwait(false);
+    }
+
+    private async Task<CalendarSynchronizationResult> SynchronizeCalendarCoreAsync(
+        CalendarSynchronizationOptions options,
+        CancellationToken cancellationToken,
+        bool reportState)
+    {
+        EnsureInitialized();
+
+        if (await IsSynchronizationBlockedByAttentionAsync(options.AccountId).ConfigureAwait(false))
+        {
+            _logger.Information("Skipping calendar synchronization for account {AccountId} because it requires credential attention.", options.AccountId);
+            return CalendarSynchronizationResult.Canceled;
+        }
+
+        var synchronizer = await GetOrCreateSynchronizerAsync(options.AccountId);
+        if (synchronizer == null)
+        {
+            _logger.Error("Could not find or create synchronizer for account {AccountId}", options.AccountId);
+            return CalendarSynchronizationResult.Failed;
+        }
+
+        _logger.Information("Starting calendar synchronization for account {AccountId} with type {SyncType}",
+                          options.AccountId, options.Type);
+
+        if (reportState)
+        {
+            PublishCalendarSynchronizationState(
+                options.AccountId,
+                options.Type,
+                isSynchronizationInProgress: true,
+                GetCalendarSynchronizationStatus(options.Type));
+        }
+
+        var accountCancellationSource = _accountSynchronizationCancellationSources.GetOrAdd(options.AccountId, _ => new CancellationTokenSource());
+        using var linkedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(
+            cancellationToken,
+            accountCancellationSource.Token);
+
+        try
+        {
+            var result = await synchronizer.SynchronizeCalendarEventsAsync(options, linkedCancellationTokenSource.Token);
+
+            _logger.Information("Calendar synchronization completed for account {AccountId} with state {State}",
+                              options.AccountId, result.CompletedState);
+
+            // TODO: Create notifications for new calendar events when INotificationBuilder supports it
+            // if (result.DownloadedEvents?.Any() ?? false)
+            //     await _notificationBuilder.CreateCalendarNotificationsAsync(result.DownloadedEvents);
+
+            return result;
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.Information("Calendar synchronization canceled for account {AccountId}", options.AccountId);
+            return CalendarSynchronizationResult.Canceled;
+        }
+        catch (AuthenticationAttentionException authEx)
+        {
+            _logger.Warning("Account {AccountId} requires attention due to authentication issues", options.AccountId);
+            await SetInvalidCredentialAttentionAsync(authEx.Account).ConfigureAwait(false);
+
+            // Create app notification for authentication attention
+            _notificationBuilder.CreateAttentionRequiredNotification(authEx.Account);
+
+            return CalendarSynchronizationResult.Failed;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Calendar synchronization failed for account {AccountId}", options.AccountId);
+            return CalendarSynchronizationResult.Failed;
+        }
+        finally
+        {
+            if (reportState)
+            {
+                PublishCalendarSynchronizationState(options.AccountId, options.Type, isSynchronizationInProgress: false);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Downloads a MIME message for the given mail item.
+    /// </summary>
+    /// <param name="mailItem">Mail item to download</param>
+    /// <param name="accountId">Account ID that owns the mail item</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Downloaded MIME content path</returns>
+    public async Task<string> DownloadMimeMessageAsync(MailCopy mailItem, Guid accountId,
+                                                       CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        var synchronizer = await GetOrCreateSynchronizerAsync(accountId);
+        if (synchronizer == null)
+        {
+            _logger.Error("Could not find or create synchronizer for account {AccountId} to download MIME", accountId);
+            return null;
+        }
+
+        _logger.Debug("Downloading MIME message for mail item {MailItemId}", mailItem.Id);
+
+        try
+        {
+            await synchronizer.DownloadMissingMimeMessageAsync(mailItem, null, cancellationToken);
+            return mailItem.Id.ToString(); // Return some identifier, actual implementation might be different
+        }
+        catch (SynchronizerEntityNotFoundException)
+        {
+            _logger.Warning("MIME message for mail item {MailItemId} no longer exists on server. Removed locally.", mailItem.Id);
+            return null;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to download MIME message for mail item {MailItemId}", mailItem.Id);
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Downloads a calendar attachment using the appropriate synchronizer.
+    /// </summary>
+    public async Task DownloadCalendarAttachmentAsync(
+        Wino.Core.Domain.Entities.Calendar.CalendarItem calendarItem,
+        Wino.Core.Domain.Entities.Calendar.CalendarAttachment attachment,
+        string localFilePath,
+        CancellationToken cancellationToken = default)
+    {
+        EnsureInitialized();
+
+        if (calendarItem == null)
+            throw new ArgumentNullException(nameof(calendarItem));
+
+        if (attachment == null)
+            throw new ArgumentNullException(nameof(attachment));
+
+        var accountId = calendarItem.AssignedCalendar?.AccountId ?? Guid.Empty;
+        if (accountId == Guid.Empty)
+            throw new InvalidOperationException("Calendar item does not have an assigned account.");
+
+        var synchronizer = await GetOrCreateSynchronizerAsync(accountId);
+
+        if (synchronizer == null)
+        {
+            _logger.Error("Could not find or create synchronizer for account {AccountId} to download calendar attachment", accountId);
+            throw new InvalidOperationException("No synchronizer available for downloading calendar attachment.");
+        }
+
+        _logger.Debug("Downloading calendar attachment {AttachmentId} for calendar item {CalendarItemId}",
+                     attachment.Id, calendarItem.Id);
+
+        try
+        {
+            await synchronizer.DownloadCalendarAttachmentAsync(
+                calendarItem,
+                attachment,
+                localFilePath,
+                cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to download calendar attachment {AttachmentId}", attachment.Id);
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Creates a new synchronizer for a newly added account.
+    /// </summary>
+    /// <param name="account">Account to create synchronizer for</param>
+    /// <returns>Created synchronizer</returns>
+    public IWinoSynchronizerBase CreateSynchronizerForAccount(MailAccount account)
+    {
+        EnsureInitialized();
+
+        try
+        {
+            var synchronizer = _concreteSynchronizerFactory.CreateNewSynchronizer(account);
+            _synchronizerCache.TryAdd(account.Id, synchronizer);
+
+            _logger.Information("Created new synchronizer for account {AccountName} ({AccountId})",
+                              account.Name, account.Id);
+
+            return synchronizer;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to create synchronizer for account {AccountName} ({AccountId})",
+                        account.Name, account.Id);
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Cancels all in-flight synchronizations for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to cancel synchronizations for</param>
+    public Task CancelSynchronizationsAsync(Guid accountId)
+    {
+        EnsureInitialized();
+
+        if (_accountSynchronizationCancellationSources.TryRemove(accountId, out var cancellationSource))
+        {
+            try
+            {
+                if (!cancellationSource.IsCancellationRequested)
+                {
+                    cancellationSource.Cancel();
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+                // no-op
+            }
+            finally
+            {
+                cancellationSource.Dispose();
+            }
+
+            _logger.Information("Canceled ongoing synchronizations for account {AccountId}", accountId);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Destroys the synchronizer for the given account.
+    /// </summary>
+    /// <param name="accountId">Account ID to destroy synchronizer for</param>
+    public async Task DestroySynchronizerAsync(Guid accountId)
+    {
+        EnsureInitialized();
+        await CancelSynchronizationsAsync(accountId);
+
+        if (_synchronizerCache.TryRemove(accountId, out var synchronizer))
+        {
+            try
+            {
+                await synchronizer.KillSynchronizerAsync();
+                _logger.Information("Destroyed synchronizer for account {AccountId}", accountId);
+            }
+            catch (OperationCanceledException)
+            {
+                _logger.Information("Synchronizer destruction canceled for account {AccountId}", accountId);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Failed to destroy synchronizer for account {AccountId}", accountId);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Gets all cached synchronizers.
+    /// </summary>
+    /// <returns>Collection of all cached synchronizers</returns>
+    public IEnumerable<IWinoSynchronizerBase> GetAllSynchronizers()
+    {
+        EnsureInitialized();
+        return _synchronizerCache.Values.ToList();
+    }
+
+    /// <summary>
+    /// Gets a synchronizer for the given account ID.
+    /// </summary>
+    /// <param name="accountId">Account ID</param>
+    /// <returns>Synchronizer if found, null otherwise</returns>
+    public async Task<IWinoSynchronizerBase> GetSynchronizerAsync(Guid accountId)
+    {
+        EnsureInitialized();
+        return await GetOrCreateSynchronizerAsync(accountId);
+    }
+
+    private async Task<IWinoSynchronizerBase> GetOrCreateSynchronizerAsync(Guid accountId)
+    {
+        if (_synchronizerCache.TryGetValue(accountId, out var existingSynchronizer))
+        {
+            return existingSynchronizer;
+        }
+
+        // Try to create a new synchronizer if not found
+        var account = await _accountService.GetAccountAsync(accountId);
+        if (account != null)
+        {
+            return CreateSynchronizerForAccount(account);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Handles OAuth authentication for the specified provider.
+    /// </summary>
+    /// <param name="providerType">The mail provider type to authenticate</param>
+    /// <param name="account">Optional account to authenticate (null for initial authentication)</param>
+    /// <param name="proposeCopyAuthorizationURL">Whether to propose copying auth URL for Gmail</param>
+    /// <returns>Token information containing access token and username</returns>
+    public async Task<TokenInformationEx> HandleAuthorizationAsync(MailProviderType providerType,
+                                                                  MailAccount account = null,
+                                                                  bool proposeCopyAuthorizationURL = false)
+    {
+        EnsureInitialized();
+
+        try
+        {
+            var authenticator = _authenticationProvider.GetAuthenticator(providerType);
+
+            // Some users are having issues with Gmail authentication.
+            // Their browsers may never launch to complete authentication.
+            // Offer to copy auth url for them to complete it manually.
+            // Redirection will occur to the app and the token will be saved.
+            if (proposeCopyAuthorizationURL && authenticator is IGmailAuthenticator gmailAuthenticator)
+            {
+                gmailAuthenticator.ProposeCopyAuthURL = true;
+            }
+
+            TokenInformationEx tokenInfo;
+
+            if (account != null)
+            {
+                // Get token for existing account (may trigger interactive auth if token is expired)
+                tokenInfo = await authenticator.GetTokenInformationAsync(account);
+                _logger.Information("Retrieved token for existing account {AccountAddress}", account.Address);
+            }
+            else
+            {
+                // Initial authentication request - there is no account to get token for
+                // This will always trigger interactive authentication
+                tokenInfo = await authenticator.GenerateTokenInformationAsync(null);
+                _logger.Information("Generated new token for {ProviderType} authentication", providerType);
+            }
+
+            return tokenInfo;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to handle authorization for {ProviderType}", providerType);
+            throw;
+        }
+    }
+
+    private void EnsureInitialized()
+    {
+        if (!_isInitialized)
+        {
+            throw new InvalidOperationException("SynchronizationManager must be initialized before use. Call InitializeAsync first.");
+        }
+    }
+
+    private async Task SetInvalidCredentialAttentionAsync(MailAccount account)
+    {
+        if (account == null || _accountService == null)
+            return;
+
+        var persistedAccount = await _accountService.GetAccountAsync(account.Id).ConfigureAwait(false);
+
+        if (persistedAccount == null)
+            return;
+
+        if (persistedAccount.AttentionReason == AccountAttentionReason.InvalidCredentials)
+            return;
+
+        persistedAccount.AttentionReason = AccountAttentionReason.InvalidCredentials;
+        await _accountService.UpdateAccountAsync(persistedAccount).ConfigureAwait(false);
+    }
+
+    private async Task<bool> IsSynchronizationBlockedByAttentionAsync(Guid accountId)
+    {
+        if (_accountService == null)
+            return false;
+
+        var account = await _accountService.GetAccountAsync(accountId).ConfigureAwait(false);
+        return account?.AttentionReason == AccountAttentionReason.InvalidCredentials;
+    }
+
+    private void PublishCalendarSynchronizationState(
+        Guid accountId,
+        CalendarSynchronizationType synchronizationType,
+        bool isSynchronizationInProgress,
+        string synchronizationStatus = "")
+    {
+        WeakReferenceMessenger.Default.Send(new AccountCalendarSynchronizationStateChanged(
+            accountId,
+            synchronizationType,
+            isSynchronizationInProgress,
+            synchronizationStatus));
+    }
+
+    private static string GetCalendarSynchronizationStatus(CalendarSynchronizationType synchronizationType)
+        => synchronizationType switch
+        {
+            CalendarSynchronizationType.CalendarMetadata => Translator.SyncAction_SynchronizingCalendarMetadata,
+            CalendarSynchronizationType.Strict => Translator.SyncAction_SynchronizingCalendarData,
+            _ => Translator.SyncAction_SynchronizingCalendarEvents
+        };
+
+    private async Task<CalendarSynchronizationResult> RunCalendarSynchronizationWithLockAsync(
+        Guid accountId,
+        CancellationToken cancellationToken,
+        Func<Task<CalendarSynchronizationResult>> synchronizationFactory)
+    {
+        var calendarSemaphore = _calendarSynchronizationLocks.GetOrAdd(accountId, _ => new SemaphoreSlim(1, 1));
+        await calendarSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            return await synchronizationFactory().ConfigureAwait(false);
+        }
+        finally
+        {
+            calendarSemaphore.Release();
+        }
+    }
+}
diff --git a/Wino.Core/Services/SynchronizationManagerInitializer.cs b/Wino.Core/Services/SynchronizationManagerInitializer.cs
new file mode 100644
index 00000000..71b22e8e
--- /dev/null
+++ b/Wino.Core/Services/SynchronizationManagerInitializer.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Core.Services;
+
+/// <summary>
+/// Service responsible for initializing the SynchronizationManager during app startup.
+/// </summary>
+public class SynchronizationManagerInitializer : IInitializeAsync
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public SynchronizationManagerInitializer(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+    }
+
+    public async Task InitializeAsync()
+    {
+        var synchronizerFactory = _serviceProvider.GetRequiredService<ISynchronizerFactory>();
+        var imapTestService = _serviceProvider.GetRequiredService<IImapTestService>();
+        var accountService = _serviceProvider.GetRequiredService<IAccountService>();
+        var authenticationProvider = _serviceProvider.GetRequiredService<IAuthenticationProvider>();
+        var notificationBuilder = _serviceProvider.GetRequiredService<INotificationBuilder>();
+
+        // Cast to concrete type to access CreateNewSynchronizer method
+        var concreteSynchronizerFactory = synchronizerFactory as SynchronizerFactory;
+
+        await SynchronizationManager.Instance.InitializeAsync(concreteSynchronizerFactory, imapTestService, accountService, notificationBuilder, authenticationProvider);
+    }
+}
diff --git a/Wino.Core/Services/SynchronizerErrorHandlingFactory.cs b/Wino.Core/Services/SynchronizerErrorHandlingFactory.cs
index 7c9336c0..446688db 100644
--- a/Wino.Core/Services/SynchronizerErrorHandlingFactory.cs
+++ b/Wino.Core/Services/SynchronizerErrorHandlingFactory.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Serilog;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Errors;
+using Wino.Core.Domain.Models.Synchronization;
 
 namespace Wino.Core.Services;
 
diff --git a/Wino.Core/Services/SynchronizerFactory.cs b/Wino.Core/Services/SynchronizerFactory.cs
index 1cab069c..7aa25880 100644
--- a/Wino.Core/Services/SynchronizerFactory.cs
+++ b/Wino.Core/Services/SynchronizerFactory.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Integration.Processors;
+using Wino.Core.Synchronizers.ImapSync;
 using Wino.Core.Synchronizers.Mail;
 
 namespace Wino.Core.Services;
@@ -13,39 +14,48 @@ public class SynchronizerFactory : ISynchronizerFactory
     private bool isInitialized = false;
 
     private readonly IAccountService _accountService;
-    private readonly IImapSynchronizationStrategyProvider _imapSynchronizationStrategyProvider;
     private readonly IApplicationConfiguration _applicationConfiguration;
     private readonly IOutlookSynchronizerErrorHandlerFactory _outlookSynchronizerErrorHandlerFactory;
     private readonly IGmailSynchronizerErrorHandlerFactory _gmailSynchronizerErrorHandlerFactory;
+    private readonly IImapSynchronizerErrorHandlerFactory _imapSynchronizerErrorHandlerFactory;
     private readonly IOutlookChangeProcessor _outlookChangeProcessor;
     private readonly IGmailChangeProcessor _gmailChangeProcessor;
     private readonly IImapChangeProcessor _imapChangeProcessor;
-    private readonly IOutlookAuthenticator _outlookAuthenticator;
-    private readonly IGmailAuthenticator _gmailAuthenticator;
+    private readonly IAuthenticationProvider _authenticationProvider;
+    private readonly UnifiedImapSynchronizer _unifiedImapSynchronizer;
+    private readonly ICalDavClient _calDavClient;
+    private readonly IAutoDiscoveryService _autoDiscoveryService;
+    private readonly ICalendarService _calendarService;
 
     private readonly List<IWinoSynchronizerBase> synchronizerCache = new();
 
     public SynchronizerFactory(IOutlookChangeProcessor outlookChangeProcessor,
                                IGmailChangeProcessor gmailChangeProcessor,
                                IImapChangeProcessor imapChangeProcessor,
-                               IOutlookAuthenticator outlookAuthenticator,
-                               IGmailAuthenticator gmailAuthenticator,
+                               IAuthenticationProvider authenticationProvider,
                                IAccountService accountService,
-                               IImapSynchronizationStrategyProvider imapSynchronizationStrategyProvider,
                                IApplicationConfiguration applicationConfiguration,
                                IOutlookSynchronizerErrorHandlerFactory outlookSynchronizerErrorHandlerFactory,
-                               IGmailSynchronizerErrorHandlerFactory gmailSynchronizerErrorHandlerFactory)
+                               IGmailSynchronizerErrorHandlerFactory gmailSynchronizerErrorHandlerFactory,
+                               IImapSynchronizerErrorHandlerFactory imapSynchronizerErrorHandlerFactory,
+                               UnifiedImapSynchronizer unifiedImapSynchronizer,
+                               ICalDavClient calDavClient,
+                               IAutoDiscoveryService autoDiscoveryService,
+                               ICalendarService calendarService)
     {
         _outlookChangeProcessor = outlookChangeProcessor;
         _gmailChangeProcessor = gmailChangeProcessor;
         _imapChangeProcessor = imapChangeProcessor;
-        _outlookAuthenticator = outlookAuthenticator;
-        _gmailAuthenticator = gmailAuthenticator;
+        _authenticationProvider = authenticationProvider;
         _accountService = accountService;
-        _imapSynchronizationStrategyProvider = imapSynchronizationStrategyProvider;
         _applicationConfiguration = applicationConfiguration;
         _outlookSynchronizerErrorHandlerFactory = outlookSynchronizerErrorHandlerFactory;
         _gmailSynchronizerErrorHandlerFactory = gmailSynchronizerErrorHandlerFactory;
+        _imapSynchronizerErrorHandlerFactory = imapSynchronizerErrorHandlerFactory;
+        _unifiedImapSynchronizer = unifiedImapSynchronizer;
+        _calDavClient = calDavClient;
+        _autoDiscoveryService = autoDiscoveryService;
+        _calendarService = calendarService;
     }
 
     public async Task<IWinoSynchronizerBase> GetAccountSynchronizerAsync(Guid accountId)
@@ -75,11 +85,13 @@ public class SynchronizerFactory : ISynchronizerFactory
         switch (providerType)
         {
             case Domain.Enums.MailProviderType.Outlook:
-                return new OutlookSynchronizer(mailAccount, _outlookAuthenticator, _outlookChangeProcessor, _outlookSynchronizerErrorHandlerFactory);
+                var outlookAuthenticator = _authenticationProvider.GetAuthenticator(Domain.Enums.MailProviderType.Outlook) as IOutlookAuthenticator;
+                return new OutlookSynchronizer(mailAccount, outlookAuthenticator, _outlookChangeProcessor, _outlookSynchronizerErrorHandlerFactory);
             case Domain.Enums.MailProviderType.Gmail:
-                return new GmailSynchronizer(mailAccount, _gmailAuthenticator, _gmailChangeProcessor, _gmailSynchronizerErrorHandlerFactory);
+                var gmailAuthenticator = _authenticationProvider.GetAuthenticator(Domain.Enums.MailProviderType.Gmail) as IGmailAuthenticator;
+                return new GmailSynchronizer(mailAccount, gmailAuthenticator, _gmailChangeProcessor, _gmailSynchronizerErrorHandlerFactory);
             case Domain.Enums.MailProviderType.IMAP4:
-                return new ImapSynchronizer(mailAccount, _imapChangeProcessor, _imapSynchronizationStrategyProvider, _applicationConfiguration);
+                return new ImapSynchronizer(mailAccount, _imapChangeProcessor, _applicationConfiguration, _unifiedImapSynchronizer, _imapSynchronizerErrorHandlerFactory, _calDavClient, _autoDiscoveryService, _calendarService);
             default:
                 break;
         }
diff --git a/Wino.Core/Services/ThreadingStrategyProvider.cs b/Wino.Core/Services/ThreadingStrategyProvider.cs
deleted file mode 100644
index 37af968e..00000000
--- a/Wino.Core/Services/ThreadingStrategyProvider.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Services.Threading;
-
-namespace Wino.Core.Services;
-
-public class ThreadingStrategyProvider : IThreadingStrategyProvider
-{
-    private readonly OutlookThreadingStrategy _outlookThreadingStrategy;
-    private readonly GmailThreadingStrategy _gmailThreadingStrategy;
-    private readonly ImapThreadingStrategy _imapThreadStrategy;
-
-    public ThreadingStrategyProvider(OutlookThreadingStrategy outlookThreadingStrategy,
-                                     GmailThreadingStrategy gmailThreadingStrategy,
-                                     ImapThreadingStrategy imapThreadStrategy)
-    {
-        _outlookThreadingStrategy = outlookThreadingStrategy;
-        _gmailThreadingStrategy = gmailThreadingStrategy;
-        _imapThreadStrategy = imapThreadStrategy;
-    }
-
-    public IThreadingStrategy GetStrategy(MailProviderType mailProviderType)
-    {
-        return mailProviderType switch
-        {
-            MailProviderType.Outlook => _outlookThreadingStrategy,
-            MailProviderType.Gmail => _gmailThreadingStrategy,
-            _ => _imapThreadStrategy,
-        };
-    }
-}
diff --git a/Wino.Core/Services/WinoRequestDelegator.cs b/Wino.Core/Services/WinoRequestDelegator.cs
index 38003c62..7c04ef37 100644
--- a/Wino.Core/Services/WinoRequestDelegator.cs
+++ b/Wino.Core/Services/WinoRequestDelegator.cs
@@ -5,33 +5,41 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Serilog;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Helpers;
+using Wino.Core.Requests.Calendar;
 using Wino.Core.Requests.Mail;
 using Wino.Messaging.Server;
+using Wino.Messaging.UI;
 
 namespace Wino.Core.Services;
 
 public class WinoRequestDelegator : IWinoRequestDelegator
 {
     private readonly IWinoRequestProcessor _winoRequestProcessor;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
     private readonly IFolderService _folderService;
     private readonly IMailDialogService _dialogService;
+    private readonly IAccountService _accountService;
+    private readonly ICalendarService _calendarService;
 
     public WinoRequestDelegator(IWinoRequestProcessor winoRequestProcessor,
-                                IWinoServerConnectionManager winoServerConnectionManager,
                                 IFolderService folderService,
-                                IMailDialogService dialogService)
+                                IMailDialogService dialogService,
+                                IAccountService accountService,
+                                ICalendarService calendarService)
     {
         _winoRequestProcessor = winoRequestProcessor;
-        _winoServerConnectionManager = winoServerConnectionManager;
         _folderService = folderService;
         _dialogService = dialogService;
+        _accountService = accountService;
+        _calendarService = calendarService;
     }
 
     public async Task ExecuteAsync(MailOperationPreperationRequest request)
@@ -82,14 +90,20 @@ public class WinoRequestDelegator : IWinoRequestDelegator
         var accountIds = requests.GroupBy(a => a.Item.AssignedAccount.Id);
 
         // Queue requests for each account and start synchronization.
-        foreach (var accountId in accountIds)
+        foreach (var accountGroup in accountIds)
         {
-            foreach (var accountRequest in accountId)
+            foreach (var accountRequest in accountGroup)
             {
-                await QueueRequestAsync(accountRequest, accountId.Key);
+                await QueueRequestAsync(accountRequest, accountGroup.Key);
             }
 
-            await QueueSynchronizationAsync(accountId.Key);
+            var account = accountGroup.First().Item.AssignedAccount;
+            var actionItems = SynchronizationActionHelper.CreateActionItems(accountGroup, accountGroup.Key, account.Name);
+
+            if (actionItems.Count > 0)
+                WeakReferenceMessenger.Default.Send(new SynchronizationActionsAdded(accountGroup.Key, account.Name, actionItems));
+
+            await QueueSynchronizationAsync(accountGroup.Key);
         }
     }
 
@@ -117,55 +131,147 @@ public class WinoRequestDelegator : IWinoRequestDelegator
         if (request == null) return;
 
         await QueueRequestAsync(request, accountId);
+        await SendSyncActionsAddedAsync([request], accountId);
         await QueueSynchronizationAsync(accountId);
+
+        if (folderRequest.Action is FolderOperation.Delete or FolderOperation.CreateSubFolder)
+        {
+            await QueueFoldersOnlySynchronizationAsync(accountId);
+        }
     }
 
     public async Task ExecuteAsync(DraftPreparationRequest draftPreperationRequest)
     {
         var request = new CreateDraftRequest(draftPreperationRequest);
+        var accountId = draftPreperationRequest.Account.Id;
 
-        await QueueRequestAsync(request, draftPreperationRequest.Account.Id);
-        await QueueSynchronizationAsync(draftPreperationRequest.Account.Id);
+        await QueueRequestAsync(request, accountId);
+        await SendSyncActionsAddedAsync([request], accountId, draftPreperationRequest.Account.Name);
+        await QueueSynchronizationAsync(accountId);
     }
 
     public async Task ExecuteAsync(SendDraftPreparationRequest sendDraftPreperationRequest)
     {
         var request = new SendDraftRequest(sendDraftPreperationRequest);
+        var account = sendDraftPreperationRequest.MailItem.AssignedAccount;
 
-        await QueueRequestAsync(request, sendDraftPreperationRequest.MailItem.AssignedAccount.Id);
-        await QueueSynchronizationAsync(sendDraftPreperationRequest.MailItem.AssignedAccount.Id);
+        await QueueRequestAsync(request, account.Id);
+        await SendSyncActionsAddedAsync([request], account.Id, account.Name);
+        await QueueSynchronizationAsync(account.Id);
+    }
+
+    public async Task ExecuteAsync(CalendarOperationPreparationRequest calendarPreparationRequest)
+    {
+        if (calendarPreparationRequest == null)
+            return;
+
+        IRequestBase request = calendarPreparationRequest.Operation switch
+        {
+            CalendarSynchronizerOperation.CreateEvent => await CreateCalendarEventRequestAsync(calendarPreparationRequest).ConfigureAwait(false),
+            CalendarSynchronizerOperation.DeleteEvent => new DeleteCalendarEventRequest(calendarPreparationRequest.CalendarItem),
+            CalendarSynchronizerOperation.AcceptEvent => new AcceptEventRequest(calendarPreparationRequest.CalendarItem, calendarPreparationRequest.ResponseMessage),
+            CalendarSynchronizerOperation.DeclineEvent => CreateDeclineRequest(calendarPreparationRequest.CalendarItem, calendarPreparationRequest.ResponseMessage),
+            CalendarSynchronizerOperation.TentativeEvent => new TentativeEventRequest(calendarPreparationRequest.CalendarItem, calendarPreparationRequest.ResponseMessage),
+            CalendarSynchronizerOperation.UpdateEvent => new UpdateCalendarEventRequest(calendarPreparationRequest.CalendarItem, calendarPreparationRequest.Attendees)
+            {
+                OriginalItem = calendarPreparationRequest.OriginalItem,
+                OriginalAttendees = calendarPreparationRequest.OriginalAttendees
+            },
+            _ => throw new NotImplementedException($"Calendar operation {calendarPreparationRequest.Operation} is not implemented yet.")
+        };
+
+        if (request == null)
+            return;
+
+        var accountId = calendarPreparationRequest.Operation == CalendarSynchronizerOperation.CreateEvent
+            ? calendarPreparationRequest.ComposeResult.AccountId
+            : calendarPreparationRequest.CalendarItem.AssignedCalendar.AccountId;
+        var accountName = calendarPreparationRequest.Operation == CalendarSynchronizerOperation.CreateEvent
+            ? null
+            : calendarPreparationRequest.CalendarItem.AssignedCalendar.MailAccount?.Name;
+
+        await QueueRequestAsync(request, accountId);
+        await SendSyncActionsAddedAsync([request], accountId, accountName);
+        await QueueCalendarSynchronizationAsync(accountId);
+    }
+
+    private async Task<IRequestBase> CreateCalendarEventRequestAsync(CalendarOperationPreparationRequest calendarPreparationRequest)
+    {
+        var composeResult = calendarPreparationRequest.ComposeResult
+                            ?? throw new InvalidOperationException("Create event requests require a compose result.");
+        var assignedCalendar = await _calendarService.GetAccountCalendarAsync(composeResult.CalendarId).ConfigureAwait(false);
+
+        if (assignedCalendar == null)
+            throw new InvalidOperationException($"Calendar {composeResult.CalendarId} could not be resolved.");
+
+        return new CreateCalendarEventRequest(composeResult, assignedCalendar);
+    }
+
+    private IRequestBase CreateDeclineRequest(CalendarItem calendarItem, string responseMessage)
+    {
+        // For Outlook accounts, declined events are deleted by the server after synchronization.
+        // Use OutlookDeclineEventRequest to handle UI removal.
+        if (calendarItem.AssignedCalendar?.MailAccount?.ProviderType == MailProviderType.Outlook)
+        {
+            return new OutlookDeclineEventRequest(calendarItem, responseMessage);
+        }
+
+        return new DeclineEventRequest(calendarItem, responseMessage);
     }
 
     private async Task QueueRequestAsync(IRequestBase request, Guid accountId)
     {
-        try
-        {
-            await EnsureServerConnectedAsync();
-            await _winoServerConnectionManager.QueueRequestAsync(request, accountId);
-        }
-        catch (WinoServerException serverException)
-        {
-            _dialogService.InfoBarMessage("Wino Server Exception", serverException.Message, InfoBarMessageType.Error);
-        }
+        // Don't trigger synchronization for individual requests - we'll trigger it once for all requests
+        await SynchronizationManager.Instance.QueueRequestAsync(request, accountId, triggerSynchronization: false);
     }
 
-    private async Task QueueSynchronizationAsync(Guid accountId)
+    private Task QueueSynchronizationAsync(Guid accountId)
     {
-        await EnsureServerConnectedAsync();
-
         var options = new MailSynchronizationOptions()
         {
             AccountId = accountId,
             Type = MailSynchronizationType.ExecuteRequests
         };
 
-        WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
+        WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options));
+        return Task.CompletedTask;
     }
 
-    private async Task EnsureServerConnectedAsync()
+    private Task QueueFoldersOnlySynchronizationAsync(Guid accountId)
     {
-        if (_winoServerConnectionManager.Status == WinoServerConnectionStatus.Connected) return;
+        var options = new MailSynchronizationOptions()
+        {
+            AccountId = accountId,
+            Type = MailSynchronizationType.FoldersOnly
+        };
 
-        await _winoServerConnectionManager.ConnectAsync();
+        WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options));
+        return Task.CompletedTask;
+    }
+
+    private async Task SendSyncActionsAddedAsync(IEnumerable<IRequestBase> requests, Guid accountId, string accountName = null)
+    {
+        if (accountName == null)
+        {
+            var account = await _accountService.GetAccountAsync(accountId);
+            accountName = account?.Name ?? string.Empty;
+        }
+
+        var actionItems = SynchronizationActionHelper.CreateActionItems(requests, accountId, accountName);
+
+        if (actionItems.Count > 0)
+            WeakReferenceMessenger.Default.Send(new SynchronizationActionsAdded(accountId, accountName, actionItems));
+    }
+
+    private Task QueueCalendarSynchronizationAsync(Guid accountId)
+    {
+        var options = new CalendarSynchronizationOptions()
+        {
+            AccountId = accountId,
+            Type = CalendarSynchronizationType.ExecuteRequests
+        };
+
+        WeakReferenceMessenger.Default.Send(new NewCalendarSynchronizationRequested(options));
+        return Task.CompletedTask;
     }
 }
diff --git a/Wino.Core/Services/WinoRequestProcessor.cs b/Wino.Core/Services/WinoRequestProcessor.cs
index 5eead88c..87af29a0 100644
--- a/Wino.Core/Services/WinoRequestProcessor.cs
+++ b/Wino.Core/Services/WinoRequestProcessor.cs
@@ -31,10 +31,10 @@ public class WinoRequestProcessor : IWinoRequestProcessor
     /// </summary>
     private readonly List<ToggleRequestRule> _toggleRequestRules =
     [
-        new ToggleRequestRule(MailOperation.MarkAsRead, MailOperation.MarkAsUnread, new System.Func<IMailItem, bool>((item) => item.IsRead)),
-        new ToggleRequestRule(MailOperation.MarkAsUnread, MailOperation.MarkAsRead, new System.Func<IMailItem, bool>((item) => !item.IsRead)),
-        new ToggleRequestRule(MailOperation.SetFlag, MailOperation.ClearFlag, new System.Func<IMailItem, bool>((item) => item.IsFlagged)),
-        new ToggleRequestRule(MailOperation.ClearFlag, MailOperation.SetFlag, new System.Func<IMailItem, bool>((item) => !item.IsFlagged)),
+        new ToggleRequestRule(MailOperation.MarkAsRead, MailOperation.MarkAsUnread, new System.Func<MailCopy, bool>((item) => item.IsRead)),
+        new ToggleRequestRule(MailOperation.MarkAsUnread, MailOperation.MarkAsRead, new System.Func<MailCopy, bool>((item) => !item.IsRead)),
+        new ToggleRequestRule(MailOperation.SetFlag, MailOperation.ClearFlag, new System.Func<MailCopy, bool>((item) => item.IsFlagged)),
+        new ToggleRequestRule(MailOperation.ClearFlag, MailOperation.SetFlag, new System.Func<MailCopy, bool>((item) => !item.IsFlagged)),
     ];
 
     public WinoRequestProcessor(IFolderService folderService,
@@ -94,7 +94,7 @@ public class WinoRequestProcessor : IWinoRequestProcessor
         var requests = new List<IMailActionRequest>();
 
         // TODO: Fix: Collection was modified; enumeration operation may not execute
-        foreach (var item in preperationRequest.MailItems)
+        foreach (var item in preperationRequest.MailItems.ToList())
         {
             var singleRequest = await GetSingleRequestAsync(item, action, moveTargetStructure, preperationRequest.ToggleExecution);
 
@@ -255,15 +255,29 @@ public class WinoRequestProcessor : IWinoRequestProcessor
                     change = new MarkFolderAsReadRequest(folder, unreadItems);
 
                 break;
-                //case FolderOperation.Delete:
-                //    var isConfirmed = await _dialogService.ShowConfirmationDialogAsync($"'{folderStructure.FolderName}' is going to be deleted. Do you want to continue?", "Are you sure?", "Yes delete.");
+            case FolderOperation.Delete:
+                var deleteQuestion = string.Format(Translator.DialogMessage_DeleteAccountConfirmationMessage, folder.FolderName);
+                var shouldDelete = await _dialogService.ShowConfirmationDialogAsync(deleteQuestion, Translator.FolderOperation_Delete, Translator.FolderOperation_Delete);
 
-                //    if (isConfirmed)
-                //        change = new DeleteFolderRequest(accountId, folderStructure.RemoteFolderId, folderStructure.FolderId);
+                if (shouldDelete)
+                {
+                    change = new DeleteFolderRequest(folder);
+                }
 
-                //    break;
-                //default:
-                //    throw new NotImplementedException();
+                break;
+            case FolderOperation.CreateSubFolder:
+                var subFolderName = await _dialogService.ShowTextInputDialogAsync(
+                    string.Empty,
+                    Translator.FolderOperation_CreateSubFolder,
+                    Translator.DialogMessage_RenameFolderMessage,
+                    Translator.FolderOperation_CreateSubFolder);
+
+                if (!string.IsNullOrWhiteSpace(subFolderName))
+                {
+                    change = new CreateSubFolderRequest(folder, subFolderName.Trim());
+                }
+
+                break;
         }
 
         return change;
diff --git a/Wino.Core/Synchronizers/BaseSynchronizer.cs b/Wino.Core/Synchronizers/BaseSynchronizer.cs
index 267ef01a..1e0bf8ec 100644
--- a/Wino.Core/Synchronizers/BaseSynchronizer.cs
+++ b/Wino.Core/Synchronizers/BaseSynchronizer.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
@@ -13,12 +16,16 @@ using Wino.Messaging.UI;
 
 namespace Wino.Core.Synchronizers;
 
-public abstract class BaseSynchronizer<TBaseRequest> : IBaseSynchronizer
+public abstract partial class BaseSynchronizer<TBaseRequest> : ObservableObject, IBaseSynchronizer
 {
     protected SemaphoreSlim synchronizationSemaphore = new(1);
     protected CancellationToken activeSynchronizationCancellationToken;
 
     protected List<IRequestBase> changeRequestQueue = [];
+    private readonly ConcurrentDictionary<Guid, byte> _pendingMailOperationIds = new();
+    private readonly ConcurrentDictionary<Guid, byte> _pendingCalendarOperationIds = new();
+    protected readonly IMessenger Messenger;
+    
     public MailAccount Account { get; }
 
     private AccountSynchronizerState state;
@@ -29,20 +36,142 @@ public abstract class BaseSynchronizer<TBaseRequest> : IBaseSynchronizer
         {
             state = value;
 
-            WeakReferenceMessenger.Default.Send(new AccountSynchronizerStateChanged(Account.Id, value));
+            // Send state changed message with current progress information
+            Messenger.Send(new AccountSynchronizerStateChanged(
+                Account.Id, 
+                value, 
+                TotalItemsToSync, 
+                RemainingItemsToSync, 
+                SynchronizationStatus));
         }
     }
 
-    protected BaseSynchronizer(MailAccount account)
+    /// <summary>
+    /// Current synchronization status message.
+    /// </summary>
+    [ObservableProperty]
+    public partial string SynchronizationStatus { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Total items to download/sync in current operation. 
+    /// 0 means no active download or indeterminate progress.
+    /// </summary>
+    [ObservableProperty]
+    public partial int TotalItemsToSync { get; set; }
+
+    /// <summary>
+    /// Remaining items to download/sync in current operation.
+    /// </summary>
+    [ObservableProperty]
+    public partial int RemainingItemsToSync { get; set; }
+
+    /// <summary>
+    /// Calculated progress percentage (0-100) based on TotalItemsToSync and RemainingItemsToSync.
+    /// Returns -1 for indeterminate progress (when both are 0).
+    /// </summary>
+    public double SynchronizationProgress
+    {
+        get
+        {
+            if (TotalItemsToSync == 0 || RemainingItemsToSync == 0)
+                return -1; // Indeterminate
+
+            return ((double)(TotalItemsToSync - RemainingItemsToSync) / TotalItemsToSync) * 100;
+        }
+    }
+
+    protected BaseSynchronizer(MailAccount account, IMessenger messenger)
     {
         Account = account;
+        Messenger = messenger ?? WeakReferenceMessenger.Default;
+    }
+
+    /// <summary>
+    /// Resets synchronization progress to default state.
+    /// </summary>
+    protected void ResetSyncProgress()
+    {
+        TotalItemsToSync = 0;
+        RemainingItemsToSync = 0;
+        SynchronizationStatus = string.Empty;
+        OnPropertyChanged(nameof(SynchronizationProgress));
+    }
+
+    /// <summary>
+    /// Updates synchronization progress with current item counts.
+    /// </summary>
+    /// <param name="total">Total items to sync</param>
+    /// <param name="remaining">Remaining items to sync</param>
+    /// <param name="status">Optional status message</param>
+    protected void UpdateSyncProgress(int total, int remaining, string status = "")
+    {
+        TotalItemsToSync = total;
+        RemainingItemsToSync = remaining;
+        SynchronizationStatus = status;
+        OnPropertyChanged(nameof(SynchronizationProgress));
+        
+        // Send progress update message
+        Messenger.Send(new AccountSynchronizerStateChanged(
+            Account.Id, 
+            State, 
+            TotalItemsToSync, 
+            RemainingItemsToSync, 
+            SynchronizationStatus));
     }
 
     /// <summary>
     /// Queues a single request to be executed in the next synchronization.
     /// </summary>
     /// <param name="request">Request to execute.</param>
-    public void QueueRequest(IRequestBase request) => changeRequestQueue.Add(request);
+    public void QueueRequest(IRequestBase request)
+    {
+        changeRequestQueue.Add(request);
+        TrackQueuedRequest(request);
+    }
+
+    public bool HasPendingOperation(Guid mailUniqueId) => _pendingMailOperationIds.ContainsKey(mailUniqueId);
+
+    public IReadOnlyCollection<Guid> GetPendingOperationUniqueIds() => _pendingMailOperationIds.Keys.ToArray();
+
+    public bool HasPendingCalendarOperation(Guid calendarItemId) => _pendingCalendarOperationIds.ContainsKey(calendarItemId);
+
+    protected void TrackQueuedRequest(IRequestBase request)
+    {
+        if (request is IMailActionRequest mailActionRequest)
+        {
+            _pendingMailOperationIds.TryAdd(mailActionRequest.Item.UniqueId, 0);
+        }
+
+        if (request is ICalendarActionRequest calendarActionRequest)
+        {
+            if (calendarActionRequest.LocalCalendarItemId.HasValue)
+            {
+                _pendingCalendarOperationIds.TryAdd(calendarActionRequest.LocalCalendarItemId.Value, 0);
+            }
+        }
+    }
+
+    protected void UntrackProcessedRequest(IRequestBase request)
+    {
+        if (request is IMailActionRequest mailActionRequest)
+        {
+            _pendingMailOperationIds.TryRemove(mailActionRequest.Item.UniqueId, out _);
+        }
+
+        if (request is ICalendarActionRequest calendarActionRequest)
+        {
+            if (calendarActionRequest.LocalCalendarItemId.HasValue)
+            {
+                _pendingCalendarOperationIds.TryRemove(calendarActionRequest.LocalCalendarItemId.Value, out _);
+            }
+        }
+    }
+
+    protected void UntrackProcessedRequests(IEnumerable<IRequestBase> requests)
+    {
+        foreach (var request in requests)
+            UntrackProcessedRequest(request);
+    }
 
     /// <summary>
     /// Runs existing queued requests in the queue.
diff --git a/Wino.Core/Synchronizers/Errors/EntityNotFoundHandler.cs b/Wino.Core/Synchronizers/Errors/EntityNotFoundHandler.cs
new file mode 100644
index 00000000..afa154b8
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/EntityNotFoundHandler.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors;
+
+/// <summary>
+/// Generic handler for 404 (Not Found) errors across all synchronizers.
+/// When a resource is already gone on the server, this handler applies
+/// the intended change locally instead of throwing.
+/// Works for all mail actions, folder actions, and batch operations.
+/// </summary>
+public class EntityNotFoundHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<EntityNotFoundHandler>();
+    private readonly IMailService _mailService;
+    private readonly IFolderService _folderService;
+
+    public EntityNotFoundHandler(IMailService mailService, IFolderService folderService)
+    {
+        _mailService = mailService;
+        _folderService = folderService;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        if (error.ErrorCode != 404) return false;
+        if (error.RequestBundle == null) return false;
+        return true;
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        error.Severity = SynchronizerErrorSeverity.Recoverable;
+        error.Category = SynchronizerErrorCategory.ResourceNotFound;
+
+        var uiRequest = error.RequestBundle.UIChangeRequest;
+
+        // --- Folder actions ---
+        if (uiRequest is IFolderActionRequest folderAction)
+        {
+            _logger.Warning("Entity not found (404) for folder operation {Op} on {RemoteFolderId}. Deleting locally.",
+                folderAction.Operation, folderAction.Folder.RemoteFolderId);
+
+            try
+            {
+                await _folderService.DeleteFolderAsync(
+                    folderAction.Folder.MailAccountId,
+                    folderAction.Folder.RemoteFolderId).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Failed to delete folder locally after 404.");
+            }
+
+            return true;
+        }
+
+        // --- Individual mail actions ---
+        if (uiRequest is IMailActionRequest mailAction && error.Account != null)
+        {
+            _logger.Warning("Entity not found (404) for mail operation {Op} on {MailId}. Deleting locally.",
+                mailAction.Operation, mailAction.Item.Id);
+
+            // Revert optimistic UI change (e.g. mark-read/flag toggle) before deleting
+            error.RequestBundle.UIChangeRequest?.RevertUIChanges();
+
+            try
+            {
+                await _mailService.DeleteMailAsync(
+                    error.Account.Id, mailAction.Item.Id).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Failed to delete mail locally after 404.");
+            }
+
+            return true;
+        }
+
+        // --- Batch requests (can't identify specific item) ---
+        // Mark as recoverable. Next sync will clean up stale items.
+        _logger.Warning("Entity not found (404) for batch operation. Marking as recoverable.");
+        return true;
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Gmail/GmailAuthenticationFailedHandler.cs b/Wino.Core/Synchronizers/Errors/Gmail/GmailAuthenticationFailedHandler.cs
new file mode 100644
index 00000000..c82ec459
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Gmail/GmailAuthenticationFailedHandler.cs
@@ -0,0 +1,68 @@
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
+using Google;
+using Serilog;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Gmail;
+
+public class GmailAuthenticationFailedHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<GmailAuthenticationFailedHandler>();
+    private readonly IAccountService _accountService;
+
+    public GmailAuthenticationFailedHandler(IAccountService accountService)
+    {
+        _accountService = accountService;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        if (error.Exception is not GoogleApiException googleEx)
+            return false;
+
+        var reason = googleEx.Error?.Errors?.FirstOrDefault()?.Reason?.ToLowerInvariant() ?? string.Empty;
+        var message = googleEx.Message?.ToLowerInvariant() ?? string.Empty;
+
+        return googleEx.HttpStatusCode == HttpStatusCode.Unauthorized ||
+               (googleEx.HttpStatusCode == HttpStatusCode.Forbidden &&
+                (reason.Contains("auth") ||
+                 reason.Contains("credential") ||
+                 message.Contains("invalid credentials") ||
+                 message.Contains("insufficient authentication") ||
+                 message.Contains("login required")));
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Gmail authentication failed for account {AccountName} ({AccountId}). User intervention is required.",
+            error.Account?.Name, error.Account?.Id);
+
+        if (error.Account != null)
+        {
+            await PersistInvalidCredentialAttentionAsync(error.Account).ConfigureAwait(false);
+        }
+
+        error.Severity = SynchronizerErrorSeverity.AuthRequired;
+        error.Category = SynchronizerErrorCategory.Authentication;
+        error.RetryDelay = null;
+
+        return true;
+    }
+
+    private async Task PersistInvalidCredentialAttentionAsync(MailAccount account)
+    {
+        var persistedAccount = await _accountService.GetAccountAsync(account.Id).ConfigureAwait(false);
+
+        if (persistedAccount == null || persistedAccount.AttentionReason == AccountAttentionReason.InvalidCredentials)
+            return;
+
+        persistedAccount.AttentionReason = AccountAttentionReason.InvalidCredentials;
+        await _accountService.UpdateAccountAsync(persistedAccount).ConfigureAwait(false);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Gmail/GmailHistoryExpiredHandler.cs b/Wino.Core/Synchronizers/Errors/Gmail/GmailHistoryExpiredHandler.cs
new file mode 100644
index 00000000..70435125
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Gmail/GmailHistoryExpiredHandler.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Threading.Tasks;
+using Google;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration.Processors;
+
+namespace Wino.Core.Synchronizers.Errors.Gmail;
+
+/// <summary>
+/// Handles Gmail history ID expiration errors.
+/// When history is no longer available, resets the account's history ID to force a full resync.
+/// </summary>
+public class GmailHistoryExpiredHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<GmailHistoryExpiredHandler>();
+    private readonly IGmailChangeProcessor _gmailChangeProcessor;
+
+    public GmailHistoryExpiredHandler(IGmailChangeProcessor gmailChangeProcessor)
+    {
+        _gmailChangeProcessor = gmailChangeProcessor;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        // Gmail returns 404 when history ID is no longer valid
+        if (error.ErrorCode == 404)
+        {
+            var message = error.ErrorMessage?.ToLowerInvariant() ?? string.Empty;
+            return message.Contains("history") || message.Contains("notfound");
+        }
+
+        if (error.Exception is GoogleApiException googleEx)
+        {
+            if (googleEx.HttpStatusCode == System.Net.HttpStatusCode.NotFound)
+            {
+                var errorMessage = googleEx.Message?.ToLowerInvariant() ?? string.Empty;
+                return errorMessage.Contains("history") ||
+                       errorMessage.Contains("not found") ||
+                       errorMessage.Contains("starthistoryid");
+            }
+        }
+
+        return false;
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Gmail history ID expired for account {AccountName} ({AccountId}). Resetting to force full sync.",
+            error.Account?.Name, error.Account?.Id);
+
+        error.Severity = SynchronizerErrorSeverity.Recoverable;
+        error.Category = SynchronizerErrorCategory.ResourceNotFound;
+
+        // Reset the account's synchronization identifier (history ID)
+        if (error.Account != null)
+        {
+            try
+            {
+                await _gmailChangeProcessor.UpdateAccountDeltaSynchronizationIdentifierAsync(
+                    error.Account.Id, string.Empty).ConfigureAwait(false);
+
+                _logger.Information("Successfully reset Gmail history ID for account {AccountName}. Next sync will be full sync.",
+                    error.Account.Name);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Failed to reset Gmail history ID for account {AccountName}",
+                    error.Account.Name);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Gmail/GmailQuotaExceededHandler.cs b/Wino.Core/Synchronizers/Errors/Gmail/GmailQuotaExceededHandler.cs
new file mode 100644
index 00000000..77363d4a
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Gmail/GmailQuotaExceededHandler.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Google;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Gmail;
+
+/// <summary>
+/// Handles Gmail API quota exceeded errors (HTTP 403 with quota error).
+/// This is a more severe rate limit that indicates daily quota exhaustion.
+/// </summary>
+public class GmailQuotaExceededHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<GmailQuotaExceededHandler>();
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        if (error.Exception is GoogleApiException googleEx)
+        {
+            // Quota exceeded usually returns 403
+            if (googleEx.HttpStatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                var errorMessage = googleEx.Message?.ToLowerInvariant() ?? string.Empty;
+                var errorReason = googleEx.Error?.Errors?.FirstOrDefault()?.Reason?.ToLowerInvariant() ?? string.Empty;
+
+                return errorMessage.Contains("quota") ||
+                       errorMessage.Contains("limit exceeded") ||
+                       errorReason.Contains("quota") ||
+                       errorReason.Contains("ratelimitexceeded") ||
+                       errorReason.Contains("userlimitexceeded");
+            }
+        }
+
+        return false;
+    }
+
+    public Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Gmail API quota exceeded for account {AccountName} ({AccountId}). Sync will be paused.",
+            error.Account?.Name, error.Account?.Id);
+
+        // Quota exceeded is more severe - treat as fatal to prevent repeated failures
+        // The user will be notified and sync will resume after quota resets
+        error.Severity = SynchronizerErrorSeverity.Fatal;
+        error.Category = SynchronizerErrorCategory.RateLimit;
+
+        // Suggest a very long delay - quotas typically reset daily
+        error.RetryDelay = TimeSpan.FromHours(1);
+
+        return Task.FromResult(true);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Gmail/GmailRateLimitHandler.cs b/Wino.Core/Synchronizers/Errors/Gmail/GmailRateLimitHandler.cs
new file mode 100644
index 00000000..30251513
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Gmail/GmailRateLimitHandler.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Threading.Tasks;
+using Google;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Gmail;
+
+/// <summary>
+/// Handles Gmail API rate limiting errors (HTTP 429 Too Many Requests).
+/// Marks the error as transient with appropriate backoff delay.
+/// </summary>
+public class GmailRateLimitHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<GmailRateLimitHandler>();
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        if (error.ErrorCode == 429)
+            return true;
+
+        if (error.Exception is GoogleApiException googleEx)
+        {
+            return googleEx.HttpStatusCode == System.Net.HttpStatusCode.TooManyRequests ||
+                   (googleEx.Error?.Code == 429);
+        }
+
+        return false;
+    }
+
+    public Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Gmail API rate limit hit for account {AccountName} ({AccountId}). Operation: {Operation}. Will retry with backoff.",
+            error.Account?.Name, error.Account?.Id, error.OperationType ?? "N/A");
+
+        error.Severity = SynchronizerErrorSeverity.Transient;
+        error.Category = SynchronizerErrorCategory.RateLimit;
+
+        // Gmail rate limits are usually per-user, suggest a longer delay
+        error.RetryDelay = TimeSpan.FromSeconds(10);
+
+        return Task.FromResult(true);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Imap/ImapAuthenticationFailedHandler.cs b/Wino.Core/Synchronizers/Errors/Imap/ImapAuthenticationFailedHandler.cs
new file mode 100644
index 00000000..144217b8
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Imap/ImapAuthenticationFailedHandler.cs
@@ -0,0 +1,66 @@
+using System.Threading.Tasks;
+using MailKit.Security;
+using Serilog;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Imap;
+
+/// <summary>
+/// Handles IMAP authentication failures (AuthenticationException, SaslException).
+/// Marks the error as requiring re-authentication.
+/// </summary>
+public class ImapAuthenticationFailedHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<ImapAuthenticationFailedHandler>();
+    private readonly IAccountService _accountService;
+
+    public ImapAuthenticationFailedHandler(IAccountService accountService)
+    {
+        _accountService = accountService;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        return error.Exception is AuthenticationException ||
+               error.Exception is SaslException ||
+               (error.ErrorMessage?.Contains("authentication", System.StringComparison.OrdinalIgnoreCase) ?? false);
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "IMAP authentication failed for account {AccountName} ({AccountId}). User needs to re-authenticate.",
+            error.Account?.Name, error.Account?.Id);
+
+        if (error.Account != null)
+        {
+            await PersistInvalidCredentialAttentionAsync(error.Account).ConfigureAwait(false);
+        }
+
+        // Mark as requiring authentication - this will stop sync and notify user
+        error.Severity = SynchronizerErrorSeverity.AuthRequired;
+        error.Category = SynchronizerErrorCategory.Authentication;
+
+        // No point in retrying auth failures - credentials need to be updated
+        error.RetryDelay = null;
+
+        return true;
+    }
+
+    private async Task PersistInvalidCredentialAttentionAsync(MailAccount account)
+    {
+        var persistedAccount = await _accountService.GetAccountAsync(account.Id).ConfigureAwait(false);
+
+        if (persistedAccount == null)
+            return;
+
+        if (persistedAccount.AttentionReason == AccountAttentionReason.InvalidCredentials)
+            return;
+
+        persistedAccount.AttentionReason = AccountAttentionReason.InvalidCredentials;
+        await _accountService.UpdateAccountAsync(persistedAccount).ConfigureAwait(false);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Imap/ImapConnectionLostHandler.cs b/Wino.Core/Synchronizers/Errors/Imap/ImapConnectionLostHandler.cs
new file mode 100644
index 00000000..186dca26
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Imap/ImapConnectionLostHandler.cs
@@ -0,0 +1,45 @@
+using System;
+using System.IO;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using MailKit;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Imap;
+
+/// <summary>
+/// Handles IMAP connection loss errors (IOException, SocketException, ServiceNotConnectedException).
+/// Marks the error as transient for retry with backoff.
+/// </summary>
+public class ImapConnectionLostHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<ImapConnectionLostHandler>();
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        return error.Exception is IOException ||
+               error.Exception is SocketException ||
+               error.Exception is ServiceNotConnectedException ||
+               error.Exception?.InnerException is IOException ||
+               error.Exception?.InnerException is SocketException;
+    }
+
+    public Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "IMAP connection lost for account {AccountName} ({AccountId}). Folder: {FolderName}. Operation: {Operation}. Will retry.",
+            error.Account?.Name, error.Account?.Id, error.FolderName ?? "N/A", error.OperationType ?? "N/A");
+
+        // Mark as transient - the RetryExecutor will handle the retry logic
+        error.Severity = SynchronizerErrorSeverity.Transient;
+        error.Category = SynchronizerErrorCategory.Network;
+
+        // Suggest a reasonable retry delay for connection issues
+        error.RetryDelay = TimeSpan.FromSeconds(2);
+
+        return Task.FromResult(true);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Imap/ImapFolderNotFoundHandler.cs b/Wino.Core/Synchronizers/Errors/Imap/ImapFolderNotFoundHandler.cs
new file mode 100644
index 00000000..d23302c3
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Imap/ImapFolderNotFoundHandler.cs
@@ -0,0 +1,67 @@
+using System.Threading.Tasks;
+using MailKit;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration.Processors;
+
+namespace Wino.Core.Synchronizers.Errors.Imap;
+
+/// <summary>
+/// Handles IMAP folder not found errors (FolderNotFoundException).
+/// Deletes the folder locally and allows sync to continue with other folders.
+/// </summary>
+public class ImapFolderNotFoundHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<ImapFolderNotFoundHandler>();
+    private readonly IImapChangeProcessor _imapChangeProcessor;
+
+    public ImapFolderNotFoundHandler(IImapChangeProcessor imapChangeProcessor)
+    {
+        _imapChangeProcessor = imapChangeProcessor;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        return error.Exception is FolderNotFoundException ||
+               error.ErrorCode == 404 ||
+               (error.ErrorMessage?.Contains("folder not found", System.StringComparison.OrdinalIgnoreCase) ?? false) ||
+               (error.ErrorMessage?.Contains("mailbox not found", System.StringComparison.OrdinalIgnoreCase) ?? false);
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "IMAP folder not found for account {AccountName} ({AccountId}). Folder: {FolderName} ({FolderId}). Removing locally.",
+            error.Account?.Name, error.Account?.Id, error.FolderName, error.FolderId);
+
+        // Mark as recoverable - sync can continue with other folders
+        error.Severity = SynchronizerErrorSeverity.Recoverable;
+        error.Category = SynchronizerErrorCategory.ResourceNotFound;
+
+        // Try to delete the folder locally if we have the folder ID
+        if (error.FolderId.HasValue && error.Account != null)
+        {
+            try
+            {
+                // Get the folder's remote ID from the exception if available
+                var remoteId = error.Exception is FolderNotFoundException fnf ? fnf.FolderName : null;
+
+                if (!string.IsNullOrEmpty(remoteId))
+                {
+                    await _imapChangeProcessor.DeleteFolderAsync(error.Account.Id, remoteId).ConfigureAwait(false);
+                    _logger.Information("Successfully deleted local folder {FolderName} after server deletion.",
+                        error.FolderName);
+                }
+            }
+            catch (System.Exception ex)
+            {
+                _logger.Warning(ex, "Failed to delete local folder {FolderName} ({FolderId})",
+                    error.FolderName, error.FolderId);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Imap/ImapProtocolErrorHandler.cs b/Wino.Core/Synchronizers/Errors/Imap/ImapProtocolErrorHandler.cs
new file mode 100644
index 00000000..6d4eb540
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Imap/ImapProtocolErrorHandler.cs
@@ -0,0 +1,100 @@
+using System;
+using System.Threading.Tasks;
+using MailKit.Net.Imap;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Imap;
+
+/// <summary>
+/// Handles generic IMAP protocol errors (ImapProtocolException, ImapCommandException).
+/// This is the catch-all handler for IMAP errors not handled by more specific handlers.
+/// </summary>
+public class ImapProtocolErrorHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<ImapProtocolErrorHandler>();
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        // This is a catch-all for IMAP-related exceptions
+        return error.Exception is ImapProtocolException ||
+               error.Exception is ImapCommandException;
+    }
+
+    public Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        var severity = ClassifyProtocolError(error);
+        var category = SynchronizerErrorCategory.ProtocolError;
+
+        _logger.Warning(error.Exception,
+            "IMAP protocol error for account {AccountName} ({AccountId}). Folder: {FolderName}. Operation: {Operation}. Severity: {Severity}",
+            error.Account?.Name, error.Account?.Id, error.FolderName ?? "N/A", error.OperationType ?? "N/A", severity);
+
+        error.Severity = severity;
+        error.Category = category;
+
+        // For transient protocol errors, suggest a retry delay
+        if (severity == SynchronizerErrorSeverity.Transient)
+        {
+            error.RetryDelay = TimeSpan.FromSeconds(5);
+        }
+
+        return Task.FromResult(true);
+    }
+
+    /// <summary>
+    /// Classifies the protocol error to determine if it's transient, recoverable, or fatal.
+    /// </summary>
+    private static SynchronizerErrorSeverity ClassifyProtocolError(SynchronizerErrorContext error)
+    {
+        var message = error.ErrorMessage?.ToLowerInvariant() ?? string.Empty;
+        var exMessage = error.Exception?.Message?.ToLowerInvariant() ?? string.Empty;
+
+        // Check for rate limiting / throttling
+        if (message.Contains("too many") || message.Contains("rate limit") ||
+            message.Contains("throttl") || exMessage.Contains("too many"))
+        {
+            return SynchronizerErrorSeverity.Transient;
+        }
+
+        // Check for temporary server issues
+        if (message.Contains("try again") || message.Contains("temporary") ||
+            message.Contains("busy") || exMessage.Contains("try again"))
+        {
+            return SynchronizerErrorSeverity.Transient;
+        }
+
+        // Check for command-specific errors that are usually transient
+        if (error.Exception is ImapCommandException cmdEx)
+        {
+            // NO response usually means the operation failed but can be retried
+            if (cmdEx.Response == ImapCommandResponse.No)
+            {
+                // Unless it's a permanent failure indication
+                if (message.Contains("permanent") || message.Contains("invalid"))
+                {
+                    return SynchronizerErrorSeverity.Recoverable;
+                }
+                return SynchronizerErrorSeverity.Transient;
+            }
+
+            // BAD response usually indicates a protocol violation - don't retry
+            if (cmdEx.Response == ImapCommandResponse.Bad)
+            {
+                return SynchronizerErrorSeverity.Recoverable;
+            }
+        }
+
+        // Protocol exceptions that indicate connection issues
+        if (error.Exception is ImapProtocolException)
+        {
+            // Most protocol exceptions are connection-related and transient
+            return SynchronizerErrorSeverity.Transient;
+        }
+
+        // Default to recoverable for unknown protocol errors
+        return SynchronizerErrorSeverity.Recoverable;
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Outlook/DeltaTokenExpiredHandler.cs b/Wino.Core/Synchronizers/Errors/Outlook/DeltaTokenExpiredHandler.cs
new file mode 100644
index 00000000..28a963b3
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Outlook/DeltaTokenExpiredHandler.cs
@@ -0,0 +1,68 @@
+using System.Threading.Tasks;
+using Microsoft.Graph.Models.ODataErrors;
+using Microsoft.Kiota.Abstractions;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration.Processors;
+
+namespace Wino.Core.Synchronizers.Errors.Outlook;
+
+/// <summary>
+/// Handles 410 Gone errors for Outlook synchronization, which indicates that delta tokens have expired.
+/// When this occurs, all local mail cache should be deleted and initial synchronization should be reset.
+/// </summary>
+public class DeltaTokenExpiredHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<DeltaTokenExpiredHandler>();
+    private readonly IOutlookChangeProcessor _outlookChangeProcessor;
+
+    public DeltaTokenExpiredHandler(IOutlookChangeProcessor outlookChangeProcessor)
+    {
+        _outlookChangeProcessor = outlookChangeProcessor;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        // Handle 410 Gone responses which indicate delta token expiration
+        return error.ErrorCode == 410 || 
+               (error.Exception is ODataError oDataError && oDataError.ResponseStatusCode == 410) ||
+               (error.Exception is ApiException apiException && apiException.ResponseStatusCode == 410);
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning("Delta token has expired for account {AccountName} ({AccountId}). Deleting all local mail cache and resetting synchronization.", 
+            error.Account.Name, error.Account.Id);
+
+        try
+        {
+            // Delete all local mail cache for the account
+            await _outlookChangeProcessor.DeleteUserMailCacheAsync(error.Account.Id).ConfigureAwait(false);
+
+            // Reset the account's delta synchronization identifier
+            await _outlookChangeProcessor.UpdateAccountDeltaSynchronizationIdentifierAsync(error.Account.Id, string.Empty).ConfigureAwait(false);
+
+            // Get all folders for the account and reset their delta tokens
+            var folders = await _outlookChangeProcessor.GetLocalFoldersAsync(error.Account.Id).ConfigureAwait(false);
+            
+            foreach (var folder in folders)
+            {
+                // Reset folder delta token to force full re-sync (last 30 days)
+                await _outlookChangeProcessor.UpdateFolderDeltaSynchronizationIdentifierAsync(folder.Id, string.Empty).ConfigureAwait(false);
+            }
+
+            _logger.Information("Successfully reset synchronization state for account {AccountName} ({AccountId}). Next sync will download last 30 days.", 
+                error.Account.Name, error.Account.Id);
+
+            return true;
+        }
+        catch (System.Exception ex)
+        {
+            _logger.Error(ex, "Failed to handle delta token expiration for account {AccountName} ({AccountId})", 
+                error.Account.Name, error.Account.Id);
+            
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Wino.Core/Synchronizers/Errors/Outlook/ObjectCannotBeDeletedHandler.cs b/Wino.Core/Synchronizers/Errors/Outlook/ObjectCannotBeDeletedHandler.cs
index 2d78ad64..f31ba474 100644
--- a/Wino.Core/Synchronizers/Errors/Outlook/ObjectCannotBeDeletedHandler.cs
+++ b/Wino.Core/Synchronizers/Errors/Outlook/ObjectCannotBeDeletedHandler.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Microsoft.Kiota.Abstractions;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Errors;
 using Wino.Core.Domain.Models.Requests;
+using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Requests.Bundles;
 
 namespace Wino.Core.Synchronizers.Errors.Outlook;
@@ -18,7 +18,7 @@ public class ObjectCannotBeDeletedHandler : ISynchronizerErrorHandler
 
     public bool CanHandle(SynchronizerErrorContext error)
     {
-        return error.ErrorMessage.Contains("ErrorCannotDeleteObject") && error.RequestBundle is HttpRequestBundle<RequestInformation>;
+        return error.ErrorMessage.Contains("Object cannot be deleted.") && error.RequestBundle is HttpRequestBundle<RequestInformation>;
     }
 
     public async Task<bool> HandleAsync(SynchronizerErrorContext error)
diff --git a/Wino.Core/Synchronizers/Errors/Outlook/OutlookAuthenticationFailedHandler.cs b/Wino.Core/Synchronizers/Errors/Outlook/OutlookAuthenticationFailedHandler.cs
new file mode 100644
index 00000000..9183504c
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Outlook/OutlookAuthenticationFailedHandler.cs
@@ -0,0 +1,83 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Graph.Models.ODataErrors;
+using Microsoft.Kiota.Abstractions;
+using Serilog;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Outlook;
+
+public class OutlookAuthenticationFailedHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<OutlookAuthenticationFailedHandler>();
+    private readonly IAccountService _accountService;
+
+    public OutlookAuthenticationFailedHandler(IAccountService accountService)
+    {
+        _accountService = accountService;
+    }
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        if (error.Exception is ApiException apiException)
+        {
+            if (apiException.ResponseStatusCode == 401)
+                return true;
+
+            if (apiException.ResponseStatusCode == 403)
+            {
+                var message = apiException.Message?.ToLowerInvariant() ?? string.Empty;
+                return message.Contains("access denied") || message.Contains("authentication");
+            }
+        }
+
+        if (error.Exception is ODataError oDataError)
+        {
+            if (oDataError.ResponseStatusCode == 401)
+                return true;
+
+            var code = oDataError.Error?.Code?.ToLowerInvariant() ?? string.Empty;
+            var message = oDataError.Error?.Message?.ToLowerInvariant() ?? string.Empty;
+
+            return code.Contains("invalidauthenticationtoken") ||
+                   code.Contains("invalidgrant") ||
+                   code.Contains("token") ||
+                   message.Contains("access token") ||
+                   message.Contains("authentication");
+        }
+
+        return false;
+    }
+
+    public async Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Outlook authentication failed for account {AccountName} ({AccountId}). User intervention is required.",
+            error.Account?.Name, error.Account?.Id);
+
+        if (error.Account != null)
+        {
+            await PersistInvalidCredentialAttentionAsync(error.Account).ConfigureAwait(false);
+        }
+
+        error.Severity = SynchronizerErrorSeverity.AuthRequired;
+        error.Category = SynchronizerErrorCategory.Authentication;
+        error.RetryDelay = null;
+
+        return true;
+    }
+
+    private async Task PersistInvalidCredentialAttentionAsync(MailAccount account)
+    {
+        var persistedAccount = await _accountService.GetAccountAsync(account.Id).ConfigureAwait(false);
+
+        if (persistedAccount == null || persistedAccount.AttentionReason == AccountAttentionReason.InvalidCredentials)
+            return;
+
+        persistedAccount.AttentionReason = AccountAttentionReason.InvalidCredentials;
+        await _accountService.UpdateAccountAsync(persistedAccount).ConfigureAwait(false);
+    }
+}
diff --git a/Wino.Core/Synchronizers/Errors/Outlook/OutlookRateLimitHandler.cs b/Wino.Core/Synchronizers/Errors/Outlook/OutlookRateLimitHandler.cs
new file mode 100644
index 00000000..82456e66
--- /dev/null
+++ b/Wino.Core/Synchronizers/Errors/Outlook/OutlookRateLimitHandler.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Graph.Models.ODataErrors;
+using Microsoft.Kiota.Abstractions;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Core.Synchronizers.Errors.Outlook;
+
+/// <summary>
+/// Handles Microsoft Graph throttling responses for Outlook synchronization.
+/// </summary>
+public class OutlookRateLimitHandler : ISynchronizerErrorHandler
+{
+    private readonly ILogger _logger = Log.ForContext<OutlookRateLimitHandler>();
+
+    public bool CanHandle(SynchronizerErrorContext error)
+    {
+        return error.ErrorCode == 429 ||
+               (error.Exception is ODataError oDataError && oDataError.ResponseStatusCode == 429) ||
+               (error.Exception is ApiException apiException && apiException.ResponseStatusCode == 429);
+    }
+
+    public Task<bool> HandleAsync(SynchronizerErrorContext error)
+    {
+        _logger.Warning(error.Exception,
+            "Microsoft Graph rate limit hit for account {AccountName} ({AccountId}). Operation: {Operation}.",
+            error.Account?.Name, error.Account?.Id, error.OperationType ?? "N/A");
+
+        error.Severity = SynchronizerErrorSeverity.Transient;
+        error.Category = SynchronizerErrorCategory.RateLimit;
+        error.RetryDelay = TimeSpan.FromSeconds(10);
+
+        return Task.FromResult(true);
+    }
+}
diff --git a/Wino.Core/Synchronizers/GmailSynchronizer.cs b/Wino.Core/Synchronizers/GmailSynchronizer.cs
index e1fb9b49..5445e3aa 100644
--- a/Wino.Core/Synchronizers/GmailSynchronizer.cs
+++ b/Wino.Core/Synchronizers/GmailSynchronizer.cs
@@ -1,18 +1,23 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Web;
 using CommunityToolkit.Mvvm.Messaging;
 using Google;
 using Google.Apis.Calendar.v3.Data;
+using Google.Apis.Drive.v3;
 using Google.Apis.Gmail.v1;
 using Google.Apis.Gmail.v1.Data;
 using Google.Apis.Http;
 using Google.Apis.PeopleService.v1;
 using Google.Apis.Requests;
 using Google.Apis.Services;
+using Google.Apis.Upload;
 using MailKit;
 using Microsoft.IdentityModel.Tokens;
 using MimeKit;
@@ -23,29 +28,63 @@ using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.Errors;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Extensions;
 using Wino.Core.Http;
 using Wino.Core.Integration.Processors;
+using Wino.Core.Misc;
 using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Calendar;
 using Wino.Core.Requests.Folder;
 using Wino.Core.Requests.Mail;
 using Wino.Messaging.UI;
 using Wino.Services;
 using CalendarService = Google.Apis.Calendar.v3.CalendarService;
+using DriveFile = Google.Apis.Drive.v3.Data.File;
+using DriveService = Google.Apis.Drive.v3.DriveService;
 
 namespace Wino.Core.Synchronizers.Mail;
 
+[JsonSerializable(typeof(Message))]
+[JsonSerializable(typeof(Label))]
+[JsonSerializable(typeof(Draft))]
+[JsonSerializable(typeof(Event))]
+public partial class GmailSynchronizerJsonContext : JsonSerializerContext;
+
+/// <summary>
+/// Gmail synchronizer implementation using Gmail History API for efficient incremental sync.
+///
+/// SYNCHRONIZATION STRATEGY:
+/// - Initial sync: Downloads up to 1500 messages PER FOLDER with metadata only.
+///   Uses a global HashSet to track downloaded message IDs, avoiding duplicate downloads
+///   when messages have multiple labels. Each folder gets its full quota of messages.
+/// - Incremental sync: Uses ONLY History API to get changes since last sync.
+///   No per-folder downloads during incremental sync - this is the proper Gmail sync approach.
+/// - Messages are downloaded with metadata only during initial sync (no MIME content)
+/// - New messages during incremental sync are downloaded with full MIME content
+/// - MIME files for initial sync messages are downloaded on-demand when user reads a message
+///
+/// Key implementation details:
+/// - PerformInitialSyncAsync: Downloads messages per-folder with global deduplication
+/// - SynchronizeDeltaAsync: Processes incremental changes using History API with pagination
+/// - Handles 404/410 errors (history expired) by triggering full resync
+/// - CreateMinimalMailCopyAsync: Extracts MailCopy fields from Gmail Metadata format
+/// - DownloadMissingMimeMessageAsync: Downloads raw MIME only when explicitly requested
+/// </summary>
 public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message, Event>, IHttpClientFactory
 {
     public override uint BatchModificationSize => 1000;
 
-    /// This now represents actual per-folder download count for initial sync
+    /// <summary>
+    /// Maximum messages to fetch per folder during initial sync (1500).
+    /// All messages are downloaded with METADATA ONLY - no raw MIME content.
+    /// Uses Gmail API's Metadata format which includes headers, labels, and snippet but NOT full message body.
+    /// </summary>
     public override uint InitialMessageDownloadCountPerFolder => 1500;
 
     // It's actually 100. But Gmail SDK has internal bug for Out of Memory exception.
@@ -55,6 +94,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     private readonly ConfigurableHttpClient _googleHttpClient;
     private readonly GmailService _gmailService;
     private readonly CalendarService _calendarService;
+    private readonly DriveService _driveService;
     private readonly PeopleServiceService _peopleService;
 
     private readonly IGmailChangeProcessor _gmailChangeProcessor;
@@ -63,11 +103,12 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
     // Keeping a reference for quick access to the virtual archive folder.
     private Guid? archiveFolderId;
+    private bool _isFolderStructureChanged;
 
     public GmailSynchronizer(MailAccount account,
                              IGmailAuthenticator authenticator,
                              IGmailChangeProcessor gmailChangeProcessor,
-                             IGmailSynchronizerErrorHandlerFactory gmailSynchronizerErrorHandlerFactory) : base(account)
+                             IGmailSynchronizerErrorHandlerFactory gmailSynchronizerErrorHandlerFactory) : base(account, WeakReferenceMessenger.Default)
     {
         var messageHandler = new GmailClientMessageHandler(authenticator, account);
 
@@ -80,6 +121,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         _gmailService = new GmailService(initializer);
         _peopleService = new PeopleServiceService(initializer);
         _calendarService = new CalendarService(initializer);
+        _driveService = new DriveService(initializer);
 
         _gmailChangeProcessor = gmailChangeProcessor;
         _gmailSynchronizerErrorHandlerFactory = gmailSynchronizerErrorHandlerFactory;
@@ -123,16 +165,20 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     {
         _logger.Information("Internal mail synchronization started for {Name}", Account.Name);
 
-        // Make sure that virtual archive folder exists before all.
-        if (!archiveFolderId.HasValue)
-            await InitializeArchiveFolderAsync().ConfigureAwait(false);
+        var downloadedMessageIds = new List<string>();
+        var folderResults = new List<FolderSyncResult>();
 
-        // Gmail must always synchronize folders before because it doesn't have a per-folder sync.
-        bool shouldSynchronizeFolders = true;
-
-        if (shouldSynchronizeFolders)
+        try
         {
+            _isFolderStructureChanged = false;
+
+            // Make sure that virtual archive folder exists before all.
+            if (!archiveFolderId.HasValue)
+                await InitializeArchiveFolderAsync().ConfigureAwait(false);
+
+            // Gmail must always synchronize folders before because it doesn't have a per-folder sync.
             _logger.Information("Synchronizing folders for {Name}", Account.Name);
+            UpdateSyncProgress(0, 0, "Synchronizing folders...");
 
             try
             {
@@ -142,214 +188,318 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             {
                 throw new GmailServiceDisabledException();
             }
-            catch (Exception)
+
+            if (_isFolderStructureChanged)
             {
-                throw;
+                WeakReferenceMessenger.Default.Send(new AccountFolderConfigurationUpdated(Account.Id));
             }
 
             _logger.Information("Synchronizing folders for {Name} is completed", Account.Name);
-        }
+            UpdateSyncProgress(0, 0, "Folders synchronized");
 
-        // There is no specific folder synchronization in Gmail.
-        // Therefore we need to stop the synchronization at this point
-        // if type is only folder metadata sync.
+            // Stop synchronization at this point if type is only folder metadata sync.
+            if (options.Type == MailSynchronizationType.FoldersOnly) return MailSynchronizationResult.Empty;
 
-        if (options.Type == MailSynchronizationType.FoldersOnly) return MailSynchronizationResult.Empty;
+            cancellationToken.ThrowIfCancellationRequested();
 
-        retry:
-        cancellationToken.ThrowIfCancellationRequested();
+            bool isInitialSync = string.IsNullOrEmpty(Account.SynchronizationDeltaIdentifier);
 
-        bool isInitialSync = string.IsNullOrEmpty(Account.SynchronizationDeltaIdentifier);
+            _logger.Debug("Is initial synchronization: {IsInitialSync}", isInitialSync);
 
-        _logger.Debug("Is initial synchronization: {IsInitialSync}", isInitialSync);
-
-        var missingMessageIds = new List<string>();
-
-        var deltaChanges = new List<ListHistoryResponse>(); // For tracking delta changes.
-        var listChanges = new List<ListMessagesResponse>(); // For tracking initial sync changes.
-
-        /* Processing flow order is important to preserve the validity of history.
-         * 1 - Process added mails. Because we need to create the mail first before assigning it to labels.
-         * 2 - Process label assignments.
-         * 3 - Process removed mails.
-         * This affects reporting progres if done individually for each history change.
-         * Therefore we need to process all changes in one go after the fetch.
-         */
-
-        if (isInitialSync)
-        {
-            // Get all folders that need synchronization
-            var folders = await _gmailChangeProcessor.GetLocalFoldersAsync(Account.Id).ConfigureAwait(false);
-            var syncFolders = folders.Where(f =>
-                f.IsSynchronizationEnabled &&
-                f.SpecialFolderType != SpecialFolderType.Category &&
-                f.SpecialFolderType != SpecialFolderType.Archive).ToList();
-
-            // Download messages for each folder separately
-            foreach (var folder in syncFolders)
+            if (isInitialSync)
             {
-                var messageRequest = _gmailService.Users.Messages.List("me");
-                messageRequest.MaxResults = InitialMessageDownloadCountPerFolder;
-                messageRequest.LabelIds = new[] { folder.RemoteFolderId };
-                // messageRequest.OrderBy = "internalDate desc"; // Get latest messages first
-                messageRequest.IncludeSpamTrash = true;
+                // INITIAL SYNC: Download all messages globally (not per-folder) to avoid duplicates.
+                // Gmail messages can have multiple labels, so per-folder download would fetch same message multiple times.
+                downloadedMessageIds = await PerformInitialSyncAsync(cancellationToken).ConfigureAwait(false);
 
-                string nextPageToken = null;
-                uint downloadedCount = 0;
-
-                do
+                // Set the history ID to the latest value after initial sync
+                UpdateSyncProgress(0, 0, "Finalizing synchronization...");
+                var profile = await _gmailService.Users.GetProfile("me").ExecuteAsync(cancellationToken);
+                if (profile.HistoryId.HasValue)
                 {
-                    if (!string.IsNullOrEmpty(nextPageToken))
-                    {
-                        messageRequest.PageToken = nextPageToken;
-                    }
+                    await UpdateAccountSyncIdentifierAsync(profile.HistoryId.Value).ConfigureAwait(false);
+                    _logger.Information("Initial sync completed. Set history ID to {HistoryId}", profile.HistoryId.Value);
+                }
 
-                    var result = await messageRequest.ExecuteAsync(cancellationToken);
-                    nextPageToken = result.NextPageToken;
-
-                    if (result.Messages != null)
-                    {
-                        downloadedCount += (uint)result.Messages.Count;
-                        listChanges.Add(result);
-                    }
-
-                    // Stop if we've downloaded enough messages for this folder
-                    if (downloadedCount >= InitialMessageDownloadCountPerFolder)
-                    {
-                        break;
-                    }
-
-                } while (!string.IsNullOrEmpty(nextPageToken));
-
-                _logger.Information("Downloaded {Count} messages for folder {Folder}", downloadedCount, folder.FolderName);
-            }
-        }
-        else
-        {
-            var startHistoryId = ulong.Parse(Account.SynchronizationDeltaIdentifier);
-            var nextPageToken = ulong.Parse(Account.SynchronizationDeltaIdentifier).ToString();
-
-            var historyRequest = _gmailService.Users.History.List("me");
-            historyRequest.StartHistoryId = startHistoryId;
-
-            try
-            {
-                while (!string.IsNullOrEmpty(nextPageToken))
+                // Create successful folder results for all folders
+                var allFolders = await _gmailChangeProcessor.GetSynchronizationFoldersAsync(options).ConfigureAwait(false);
+                foreach (var folder in allFolders.Where(f => f.RemoteFolderId != ServiceConstants.ARCHIVE_LABEL_ID))
                 {
-                    // If this is the first delta check, start from the last history id.
-                    // Otherwise start from the next page token. We set them both to the same value for start.
-                    // For each different page we set the page token to the next page token.
-
-                    bool isFirstDeltaCheck = nextPageToken == startHistoryId.ToString();
-
-                    if (!isFirstDeltaCheck)
-                        historyRequest.PageToken = nextPageToken;
-
-                    var historyResponse = await historyRequest.ExecuteAsync(cancellationToken);
-
-                    nextPageToken = historyResponse.NextPageToken;
-
-                    if (historyResponse.History == null)
-                        continue;
-
-                    deltaChanges.Add(historyResponse);
+                    folderResults.Add(FolderSyncResult.Successful(folder.Id, folder.FolderName, 0));
                 }
             }
-            catch (GoogleApiException ex) when (ex.HttpStatusCode == System.Net.HttpStatusCode.NotFound)
+            else
             {
-                // History ID is too old or expired, need to do a full sync.
-                // Theoratically we need to delete the local cache and start from scratch.
+                // INCREMENTAL SYNC: Use ONLY History API - no per-folder downloads.
+                // This is the proper Gmail sync strategy as recommended by Google.
+                UpdateSyncProgress(0, 0, "Synchronizing changes...");
+                var deltaResult = await SynchronizeDeltaAsync(options, cancellationToken).ConfigureAwait(false);
+                downloadedMessageIds.AddRange(deltaResult.DownloadedMessageIds);
 
-                _logger.Warning("History ID {StartHistoryId} is expired for {Name}. Will remove user's mail cache and do full sync.", startHistoryId, Account.Name);
+                // If history sync was reset due to expired history ID, we need to do initial sync
+                if (deltaResult.RequiresFullResync)
+                {
+                    _logger.Warning("History ID expired. Performing full resync for {Name}", Account.Name);
+                    downloadedMessageIds = await PerformInitialSyncAsync(cancellationToken).ConfigureAwait(false);
 
-                await _gmailChangeProcessor.DeleteUserMailCacheAsync(Account.Id).ConfigureAwait(false);
+                    // Update history ID after full resync
+                    var profile = await _gmailService.Users.GetProfile("me").ExecuteAsync(cancellationToken);
+                    if (profile.HistoryId.HasValue)
+                    {
+                        await UpdateAccountSyncIdentifierAsync(profile.HistoryId.Value).ConfigureAwait(false);
+                        _logger.Information("Full resync completed. Set history ID to {HistoryId}", profile.HistoryId.Value);
+                    }
+                }
 
-                Account.SynchronizationDeltaIdentifier = string.Empty;
+                UpdateSyncProgress(0, 0, "Changes synchronized");
 
-                await _gmailChangeProcessor.UpdateAccountAsync(Account).ConfigureAwait(false);
+                // Create folder results for incremental sync
+                var allFolders = await _gmailChangeProcessor.GetSynchronizationFoldersAsync(options).ConfigureAwait(false);
+                foreach (var folder in allFolders.Where(f => f.RemoteFolderId != ServiceConstants.ARCHIVE_LABEL_ID))
+                {
+                    folderResults.Add(FolderSyncResult.Successful(folder.Id, folder.FolderName, 0));
+                }
+            }
 
-                goto retry;
+            // Map Gmail Draft resource IDs for all drafts.
+            // Gmail's Messages API doesn't expose Draft IDs, so we query the Drafts API separately.
+            // This ensures DraftId is correctly set for both Wino-created and externally-created drafts.
+            await MapDraftIdsAsync(cancellationToken).ConfigureAwait(false);
+
+            // Keep virtual Archive folder assignments in sync with Gmail "in:archive" query.
+            try
+            {
+                await MapArchivedMailsAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to map Gmail archive folder for {Name}", Account.Name);
             }
         }
-
-        // Add initial message ids from initial sync.
-        missingMessageIds.AddRange(listChanges.Where(a => a.Messages != null).SelectMany(a => a.Messages).Select(a => a.Id));
-
-        // Add missing message ids from delta changes.
-        foreach (var historyResponse in deltaChanges)
+        catch (OperationCanceledException)
         {
-            var addedMessageIds = historyResponse.History
-                .Where(a => a.MessagesAdded != null)
-                .SelectMany(a => a.MessagesAdded)
-                .Where(a => a.Message != null)
-                .Select(a => a.Message.Id);
-
-            missingMessageIds.AddRange(addedMessageIds);
-        }
-
-        // Start downloading missing messages.
-        foreach (var messageId in missingMessageIds)
-        {
-            await DownloadSingleMessageAsync(messageId, cancellationToken).ConfigureAwait(false);
-        }
-
-        // Map archive assignments if there are any changes reported.
-        if (listChanges.Any() || deltaChanges.Any())
-        {
-            await MapArchivedMailsAsync(cancellationToken).ConfigureAwait(false);
-        }
-
-        // Map remote drafts to local drafts.
-        await MapDraftIdsAsync(cancellationToken).ConfigureAwait(false);
-
-        // Start processing delta changes.
-        foreach (var historyResponse in deltaChanges)
-        {
-            await ProcessHistoryChangesAsync(historyResponse).ConfigureAwait(false);
-        }
-
-        // Take the max history id from delta changes and update the account sync modifier.
-
-        if (deltaChanges.Any())
-        {
-            var maxHistoryId = deltaChanges.Where(a => a.HistoryId != null).Max(a => a.HistoryId);
-
-            await UpdateAccountSyncIdentifierAsync(maxHistoryId);
-
-            if (maxHistoryId != null)
-            {
-                // TODO: This is not good. Centralize the identifier fetch and prevent direct access here.
-                // Account.SynchronizationDeltaIdentifier = await _gmailChangeProcessor.UpdateAccountDeltaSynchronizationIdentifierAsync(Account.Id, maxHistoryId.ToString()).ConfigureAwait(false);
-
-                _logger.Debug("Final sync identifier {SynchronizationDeltaIdentifier}", Account.SynchronizationDeltaIdentifier);
-            }
-        }
-
-        // Get all unred new downloaded items and return in the result.
-        // This is primarily used in notifications.
-
-        var unreadNewItems = await _gmailChangeProcessor.GetDownloadedUnreadMailsAsync(Account.Id, missingMessageIds).ConfigureAwait(false);
-
-        return MailSynchronizationResult.Completed(unreadNewItems);
-    }
-
-    private async Task DownloadSingleMessageAsync(string messageId, CancellationToken cancellationToken = default)
-    {
-        // Google .NET SDK has memory issues with batch downloading messages which will not be fixed since the library is in maintenance mode.
-        // https://github.com/googleapis/google-api-dotnet-client/issues/2603
-        // This method will be used to download messages one by one to prevent memory spikes.
-
-        try
-        {
-            var singleRequest = CreateSingleMessageGet(messageId);
-            var downloadedMessage = await singleRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
-
-            await HandleSingleItemDownloadedCallbackAsync(downloadedMessage, null, messageId, cancellationToken).ConfigureAwait(false);
-            await UpdateAccountSyncIdentifierAsync(downloadedMessage.HistoryId).ConfigureAwait(false);
+            _logger.Information("Synchronization was canceled for {Name}", Account.Name);
+            return MailSynchronizationResult.Canceled;
         }
         catch (Exception ex)
         {
-            _logger.Error(ex, "Error while downloading message {MessageId} for {Name}", messageId, Account.Name);
+            _logger.Error(ex, "Synchronization failed for {Name}", Account.Name);
+            return MailSynchronizationResult.Failed(ex);
+        }
+
+        // Get all unread new downloaded items for notifications
+        var unreadNewItems = await _gmailChangeProcessor.GetDownloadedUnreadMailsAsync(Account.Id, downloadedMessageIds).ConfigureAwait(false);
+
+        return MailSynchronizationResult.CompletedWithFolderResults(unreadNewItems, folderResults);
+    }
+
+    /// <summary>
+    /// Result of delta synchronization using History API.
+    /// </summary>
+    private record DeltaSyncResult(List<string> DownloadedMessageIds, bool RequiresFullResync);
+
+    /// <summary>
+    /// Performs initial synchronization by downloading messages per-folder.
+    /// Each folder gets up to 1500 messages, but we track already downloaded message IDs globally
+    /// to avoid downloading the same message multiple times (Gmail messages can have multiple labels).
+    /// </summary>
+    private async Task<List<string>> PerformInitialSyncAsync(CancellationToken cancellationToken)
+    {
+        // Track all downloaded message IDs globally to avoid duplicate downloads
+        var downloadedMessageIds = new HashSet<string>();
+
+        _logger.Information("Performing initial sync for {Name} - downloading messages per folder", Account.Name);
+
+        try
+        {
+            // Get all folders to sync (exclude virtual ARCHIVE folder)
+            var folders = await _gmailChangeProcessor.GetLocalFoldersAsync(Account.Id).ConfigureAwait(false);
+            var syncableFolders = folders
+                .Where(f => f.IsSynchronizationEnabled && f.RemoteFolderId != ServiceConstants.ARCHIVE_LABEL_ID)
+                .OrderByDescending(f => f.SpecialFolderType == SpecialFolderType.Draft || f.RemoteFolderId == ServiceConstants.DRAFT_LABEL_ID)
+                .ToList();
+
+            var totalFolders = syncableFolders.Count;
+            var totalMessagesDownloaded = 0;
+
+            for (int i = 0; i < totalFolders; i++)
+            {
+                var folder = syncableFolders[i];
+                cancellationToken.ThrowIfCancellationRequested();
+
+                UpdateSyncProgress(totalFolders, totalFolders - (i + 1), $"Syncing {folder.FolderName}...");
+
+                _logger.Debug("Downloading messages for folder {FolderName} (label: {LabelId})", folder.FolderName, folder.RemoteFolderId);
+
+                var folderDownloaded = 0;
+                string pageToken = null;
+                var remainingToDownload = (int)InitialMessageDownloadCountPerFolder;
+
+                do
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    var request = _gmailService.Users.Messages.List("me");
+                    request.LabelIds = new Google.Apis.Util.Repeatable<string>(new[] { folder.RemoteFolderId });
+                    request.MaxResults = Math.Min(remainingToDownload, 500); // API max is 500
+                    request.PageToken = pageToken;
+
+                    var response = await request.ExecuteAsync(cancellationToken);
+
+                    if (response.Messages != null && response.Messages.Count > 0)
+                    {
+                        // Filter out already downloaded messages to avoid duplicates
+                        var newMessageIds = response.Messages
+                            .Select(m => m.Id)
+                            .Where(id => !downloadedMessageIds.Contains(id))
+                            .ToList();
+
+                        if (newMessageIds.Count > 0)
+                        {
+                            // Draft folder needs MIME during initial sync so compose can open immediately.
+                            bool shouldDownloadRawMime = folder.SpecialFolderType == SpecialFolderType.Draft || folder.RemoteFolderId == ServiceConstants.DRAFT_LABEL_ID;
+                            await DownloadMessagesInBatchAsync(newMessageIds, downloadRawMime: shouldDownloadRawMime, cancellationToken).ConfigureAwait(false);
+
+                            foreach (var id in newMessageIds)
+                            {
+                                downloadedMessageIds.Add(id);
+                            }
+
+                            folderDownloaded += newMessageIds.Count;
+                            totalMessagesDownloaded += newMessageIds.Count;
+                        }
+
+                        // Count all messages (including duplicates) toward the folder limit
+                        remainingToDownload -= response.Messages.Count;
+
+                        _logger.Debug("Folder {FolderName}: Downloaded {New} new messages ({Total} total in folder)",
+                            folder.FolderName, newMessageIds.Count, folderDownloaded);
+                    }
+
+                    pageToken = response.NextPageToken;
+
+                    // Stop if we've processed enough messages for this folder or no more pages
+                    if (remainingToDownload <= 0 || string.IsNullOrEmpty(pageToken))
+                        break;
+
+                } while (!string.IsNullOrEmpty(pageToken));
+
+                _logger.Information("Folder {FolderName}: Downloaded {Count} messages", folder.FolderName, folderDownloaded);
+                UpdateSyncProgress(0, 0, $"Downloaded {totalMessagesDownloaded} messages");
+            }
+
+            _logger.Information("Initial sync completed. Downloaded {Count} unique messages for {Name}", downloadedMessageIds.Count, Account.Name);
+        }
+        catch (GoogleApiException ex) when (ex.HttpStatusCode == System.Net.HttpStatusCode.TooManyRequests)
+        {
+            _logger.Warning("Rate limit exceeded during initial sync. Retrying after delay.");
+            await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken);
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Error during initial sync for {Name}", Account.Name);
+            throw;
+        }
+
+        return downloadedMessageIds.ToList();
+    }
+
+    /// <summary>
+    /// Performs incremental synchronization using Gmail History API.
+    /// This is the recommended approach for Gmail sync after initial sync is complete.
+    /// Returns a result indicating downloaded messages and whether a full resync is needed.
+    /// </summary>
+    private async Task<DeltaSyncResult> SynchronizeDeltaAsync(MailSynchronizationOptions options, CancellationToken cancellationToken = default)
+    {
+        var downloadedMessageIds = new List<string>();
+
+        try
+        {
+            string pageToken = null;
+
+            do
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var historyRequest = _gmailService.Users.History.List("me");
+                historyRequest.StartHistoryId = ulong.Parse(Account.SynchronizationDeltaIdentifier!);
+
+                if (!string.IsNullOrEmpty(pageToken))
+                    historyRequest.PageToken = pageToken;
+
+                var historyResponse = await historyRequest.ExecuteAsync(cancellationToken);
+
+                if (historyResponse.History != null)
+                {
+                    var addedMessageIds = new List<string>();
+
+                    // Collect all added messages first
+                    foreach (var historyRecord in historyResponse.History)
+                    {
+                        if (historyRecord.MessagesAdded != null)
+                        {
+                            addedMessageIds.AddRange(historyRecord.MessagesAdded.Select(ma => ma.Message.Id));
+                        }
+                    }
+
+                    // Process added messages in batches if any
+                    // During delta sync, download with Raw format to get MIME content for new messages
+                    if (addedMessageIds.Count != 0)
+                    {
+                        // Deduplicate message IDs
+                        var uniqueAddedIds = addedMessageIds.Distinct().ToList();
+                        await DownloadMessagesInBatchAsync(uniqueAddedIds, downloadRawMime: true, cancellationToken).ConfigureAwait(false);
+                        downloadedMessageIds.AddRange(uniqueAddedIds);
+                    }
+
+                    // Process other history changes (label changes, deletions)
+                    await ProcessHistoryChangesAsync(historyResponse).ConfigureAwait(false);
+                }
+
+                // CRITICAL: Update the history ID to the latest one after processing all changes
+                // History IDs are always incremental, so the response contains the latest history ID
+                if (historyResponse.HistoryId.HasValue)
+                {
+                    await UpdateAccountSyncIdentifierAsync(historyResponse.HistoryId.Value).ConfigureAwait(false);
+                    _logger.Debug("Updated history ID to {HistoryId} after delta sync", historyResponse.HistoryId.Value);
+                }
+
+                pageToken = historyResponse.NextPageToken;
+
+            } while (!string.IsNullOrEmpty(pageToken));
+
+            _logger.Information("Delta sync completed. Downloaded {Count} new messages for {Name}", downloadedMessageIds.Count, Account.Name);
+
+            return new DeltaSyncResult(downloadedMessageIds, RequiresFullResync: false);
+        }
+        catch (GoogleApiException ex) when (ex.HttpStatusCode == System.Net.HttpStatusCode.NotFound ||
+                                            (int)ex.HttpStatusCode == 410) // Gone - history expired
+        {
+            // History ID is no longer valid (expired or not found)
+            // This happens when:
+            // 1. The history ID is too old (Gmail keeps history for ~30 days)
+            // 2. The account was reset or history was cleared
+            // Reset the sync identifier and signal that a full resync is needed
+            _logger.Warning("History ID {HistoryId} expired or not found for {Name}. Full resync required. Error: {Error}",
+                Account.SynchronizationDeltaIdentifier, Account.Name, ex.Message);
+
+            // Clear the sync identifier to trigger initial sync
+            Account.SynchronizationDeltaIdentifier = await _gmailChangeProcessor
+                .UpdateAccountDeltaSynchronizationIdentifierAsync(Account.Id, null)
+                .ConfigureAwait(false);
+
+            return new DeltaSyncResult(downloadedMessageIds, RequiresFullResync: true);
+        }
+        catch (GoogleApiException ex) when (ex.HttpStatusCode == System.Net.HttpStatusCode.TooManyRequests)
+        {
+            _logger.Warning("Rate limit exceeded during delta sync for {Name}. Retrying after delay.", Account.Name);
+            await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken);
+            throw;
         }
     }
 
@@ -361,18 +511,26 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
         await SynchronizeCalendarsAsync(cancellationToken).ConfigureAwait(false);
 
+        if (options?.Type == CalendarSynchronizationType.CalendarMetadata)
+            return CalendarSynchronizationResult.Empty;
+
         bool isInitialSync = string.IsNullOrEmpty(Account.SynchronizationDeltaIdentifier);
 
         _logger.Debug("Is initial synchronization: {IsInitialSync}", isInitialSync);
 
-        var localCalendars = await _gmailChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        var localCalendars = (await _gmailChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false))
+            .Where(c => c.IsSynchronizationEnabled)
+            .ToList();
 
         // TODO: Better logging and exception handling.
         foreach (var calendar in localCalendars)
         {
             var request = _calendarService.Events.List(calendar.RemoteCalendarId);
 
-            request.SingleEvents = false;
+            // Fetch individual event instances (including recurring event occurrences) 
+            // rather than recurring event masters. This ensures we get all occurrences
+            // as separate events that can be stored and displayed directly.
+            request.SingleEvents = true;
             request.ShowDeleted = true;
 
             if (!string.IsNullOrEmpty(calendar.SynchronizationDeltaToken))
@@ -444,6 +602,8 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         }
 
         var localCalendars = await _gmailChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        var remotePrimaryCalendarId = GetPrimaryCalendarId(calendarListResponse.Items);
+        var usedCalendarColors = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         List<AccountCalendar> insertedCalendars = new();
         List<AccountCalendar> updatedCalendars = new();
@@ -473,15 +633,26 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             if (existingLocalCalendar == null)
             {
                 // Insert new calendar.
-                var localCalendar = calendar.AsCalendar(Account.Id);
+                var fallbackColor = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, calendar.BackgroundColor);
+                var localCalendar = calendar.AsCalendar(Account.Id, fallbackColor);
+                localCalendar.IsPrimary = string.Equals(localCalendar.RemoteCalendarId, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
+                localCalendar.BackgroundColorHex = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, localCalendar.BackgroundColorHex);
+                localCalendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(localCalendar.BackgroundColorHex);
+                usedCalendarColors.Add(localCalendar.BackgroundColorHex);
                 insertedCalendars.Add(localCalendar);
             }
             else
             {
                 // Update existing calendar. Right now we only update the name.
-                if (ShouldUpdateCalendar(calendar, existingLocalCalendar))
+                var resolvedColor = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, existingLocalCalendar.BackgroundColorHex);
+                if (ShouldUpdateCalendar(calendar, existingLocalCalendar, remotePrimaryCalendarId) ||
+                    !string.Equals(existingLocalCalendar.BackgroundColorHex, resolvedColor, StringComparison.OrdinalIgnoreCase))
                 {
                     existingLocalCalendar.Name = calendar.Summary;
+                    existingLocalCalendar.TimeZone = calendar.TimeZone;
+                    existingLocalCalendar.BackgroundColorHex = resolvedColor;
+                    existingLocalCalendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(existingLocalCalendar.BackgroundColorHex);
+                    existingLocalCalendar.IsPrimary = string.Equals(existingLocalCalendar.RemoteCalendarId, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
 
                     updatedCalendars.Add(existingLocalCalendar);
                 }
@@ -490,6 +661,8 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
                     // Remove it from the local folder list to skip additional calendar updates.
                     localCalendars.Remove(existingLocalCalendar);
                 }
+
+                usedCalendarColors.Add(resolvedColor);
             }
         }
 
@@ -537,6 +710,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             };
 
             await _gmailChangeProcessor.InsertFolderAsync(archiveFolder).ConfigureAwait(false);
+            _isFolderStructureChanged = true;
 
             // Migration-> User might've already have another special folder for Archive.
             // We must remove that type assignment.
@@ -544,6 +718,11 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
             var otherArchiveFolders = localFolders.Where(a => a.SpecialFolderType == SpecialFolderType.Archive && a.Id != archiveFolderId.Value).ToList();
 
+            if (otherArchiveFolders.Any())
+            {
+                _isFolderStructureChanged = true;
+            }
+
             foreach (var otherArchiveFolder in otherArchiveFolders)
             {
                 otherArchiveFolder.SpecialFolderType = SpecialFolderType.Other;
@@ -644,18 +823,45 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
         if (insertedFolders.Any() || deletedFolders.Any() || updatedFolders.Any())
         {
-            WeakReferenceMessenger.Default.Send(new AccountFolderConfigurationUpdated(Account.Id));
+            _isFolderStructureChanged = true;
         }
     }
 
-    private bool ShouldUpdateCalendar(CalendarListEntry calendarListEntry, AccountCalendar accountCalendar)
+    private bool ShouldUpdateCalendar(CalendarListEntry calendarListEntry, AccountCalendar accountCalendar, string remotePrimaryCalendarId)
     {
-        // TODO: Only calendar name is updated for now. We can add more checks here.
-
         var remoteCalendarName = calendarListEntry.Summary;
-        var localCalendarName = accountCalendar.Name;
+        var remoteTimeZone = calendarListEntry.TimeZone;
+        var remoteBackgroundColor = string.IsNullOrEmpty(calendarListEntry.BackgroundColor) ? accountCalendar.BackgroundColorHex : calendarListEntry.BackgroundColor;
+        var remoteTextColor = string.IsNullOrEmpty(calendarListEntry.ForegroundColor) ? accountCalendar.TextColorHex : calendarListEntry.ForegroundColor;
+        var remoteIsPrimary = string.Equals(calendarListEntry.Id, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
 
-        return !localCalendarName.Equals(remoteCalendarName, StringComparison.OrdinalIgnoreCase);
+        bool isNameChanged = !string.Equals(accountCalendar.Name, remoteCalendarName, StringComparison.OrdinalIgnoreCase);
+        bool isTimeZoneChanged = !string.Equals(accountCalendar.TimeZone, remoteTimeZone, StringComparison.OrdinalIgnoreCase);
+        bool isBackgroundColorChanged = !string.Equals(accountCalendar.BackgroundColorHex, remoteBackgroundColor, StringComparison.OrdinalIgnoreCase);
+        bool isTextColorChanged = !string.Equals(accountCalendar.TextColorHex, remoteTextColor, StringComparison.OrdinalIgnoreCase);
+        bool isPrimaryChanged = accountCalendar.IsPrimary != remoteIsPrimary;
+
+        return isNameChanged || isTimeZoneChanged || isBackgroundColorChanged || isTextColorChanged || isPrimaryChanged;
+    }
+
+    private string GetPrimaryCalendarId(IList<CalendarListEntry> remoteCalendars)
+    {
+        if (remoteCalendars == null || remoteCalendars.Count == 0)
+            return string.Empty;
+
+        var explicitPrimary = remoteCalendars.FirstOrDefault(c => c.Primary.GetValueOrDefault());
+        if (explicitPrimary != null)
+            return explicitPrimary.Id;
+
+        var byPrimaryKeyword = remoteCalendars.FirstOrDefault(c => string.Equals(c.Id, "primary", StringComparison.OrdinalIgnoreCase));
+        if (byPrimaryKeyword != null)
+            return byPrimaryKeyword.Id;
+
+        var byAccountAddress = remoteCalendars.FirstOrDefault(c => string.Equals(c.Id, Account.Address, StringComparison.OrdinalIgnoreCase));
+        if (byAccountAddress != null)
+            return byAccountAddress.Id;
+
+        return remoteCalendars.First().Id;
     }
 
     private bool ShouldUpdateFolder(Label remoteFolder, MailItemFolder existingLocalFolder)
@@ -671,13 +877,34 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     }
 
     /// <summary>
-    /// Returns a single get request to retrieve the raw message with the given id
+    /// Returns a single get request to retrieve the message with the given id.
+    /// Always uses Metadata format to download only headers and labels - NOT raw MIME content.
+    /// MIME content is only downloaded when explicitly needed via DownloadMissingMimeMessageAsync.
     /// </summary>
     /// <param name="messageId">Message to download.</param>
-    /// <returns>Get request for raw mail.</returns>
+    /// <returns>Get request for message with Metadata format.</returns>
     private UsersResource.MessagesResource.GetRequest CreateSingleMessageGet(string messageId)
     {
         var singleRequest = _gmailService.Users.Messages.Get("me", messageId);
+
+        // Always use Metadata format for synchronization - this populates Payload.Headers
+        // but does NOT download the raw MIME content, saving significant bandwidth and time
+        singleRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Metadata;
+
+        return singleRequest;
+    }
+
+    /// <summary>
+    /// Returns a single get request to retrieve the message with Raw format (includes MIME).
+    /// Used during delta sync to download full message content.
+    /// </summary>
+    /// <param name="messageId">Message to download.</param>
+    /// <returns>Get request for message with Raw format.</returns>
+    private UsersResource.MessagesResource.GetRequest CreateSingleMessageGetRaw(string messageId)
+    {
+        var singleRequest = _gmailService.Users.Messages.Get("me", messageId);
+
+        // Use Raw format to get full MIME content
         singleRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Raw;
 
         return singleRequest;
@@ -690,7 +917,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     /// <param name="listHistoryResponse">List of history changes.</param>
     private async Task ProcessHistoryChangesAsync(ListHistoryResponse listHistoryResponse)
     {
-        _logger.Debug("Processing delta change {HistoryId} for {Name}", Account.Name, listHistoryResponse.HistoryId.GetValueOrDefault());
+        _logger.Debug("Processing delta change {HistoryId} for {Name}", listHistoryResponse.HistoryId.GetValueOrDefault(), Account.Name);
 
         foreach (var history in listHistoryResponse.History)
         {
@@ -758,6 +985,13 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
         foreach (var labelId in addedLabel.LabelIds)
         {
+            // ARCHIVE is a virtual folder - handle it separately
+            if (labelId == ServiceConstants.ARCHIVE_LABEL_ID)
+            {
+                await HandleArchiveAssignmentAsync(messageId).ConfigureAwait(false);
+                continue;
+            }
+
             // When UNREAD label is added mark the message as un-read.
             if (labelId == ServiceConstants.UNREAD_LABEL_ID)
                 await _gmailChangeProcessor.ChangeMailReadStatusAsync(messageId, false).ConfigureAwait(false);
@@ -778,6 +1012,13 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
         foreach (var labelId in removedLabel.LabelIds)
         {
+            // ARCHIVE is a virtual folder - handle it separately
+            if (labelId == ServiceConstants.ARCHIVE_LABEL_ID)
+            {
+                await HandleUnarchiveAssignmentAsync(messageId).ConfigureAwait(false);
+                continue;
+            }
+
             // When UNREAD label is removed mark the message as read.
             if (labelId == ServiceConstants.UNREAD_LABEL_ID)
                 await _gmailChangeProcessor.ChangeMailReadStatusAsync(messageId, true).ConfigureAwait(false);
@@ -962,6 +1203,9 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             message.ThreadId = singleDraftRequest.Item.ThreadId;
         }
 
+        // Local draft mapping header must never leak to recipients.
+        singleDraftRequest.Request.Mime.Headers.Remove(Domain.Constants.WinoLocalDraftHeader);
+
         singleDraftRequest.Request.Mime.Prepare(EncodingConstraint.None);
 
         var mimeString = singleDraftRequest.Request.Mime.ToString();
@@ -981,74 +1225,280 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
     public override async Task<List<MailCopy>> OnlineSearchAsync(string queryText, List<IMailItemFolder> folders, CancellationToken cancellationToken = default)
     {
-        var request = _gmailService.Users.Messages.List("me");
-        request.Q = queryText;
-        request.MaxResults = 500; // Max 500 is returned.
+        if (string.IsNullOrWhiteSpace(queryText))
+            return [];
 
-        string pageToken = null;
+        static bool IsArchiveFolder(IMailItemFolder folder)
+            => folder?.SpecialFolderType == SpecialFolderType.Archive || folder?.RemoteFolderId == ServiceConstants.ARCHIVE_LABEL_ID;
 
-        List<Message> messagesToDownload = [];
+        var messageIds = new HashSet<string>(StringComparer.Ordinal);
 
-        do
+        async Task CollectMessageIdsAsync(UsersResource.MessagesResource.ListRequest request)
         {
-            if (queryText.StartsWith("label:") || queryText.StartsWith("in:"))
+            string pageToken = null;
+
+            do
             {
-                // Ignore the folders if the query starts with these keywords.
-                // User is trying to list everything.
-            }
-            else if (folders?.Count > 0)
-            {
-                request.LabelIds = folders.Select(a => a.RemoteFolderId).ToList();
-            }
+                if (!string.IsNullOrEmpty(pageToken))
+                {
+                    request.PageToken = pageToken;
+                }
 
-            if (!string.IsNullOrEmpty(pageToken))
-            {
-                request.PageToken = pageToken;
-            }
+                var response = await request.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+                if (response.Messages == null || response.Messages.Count == 0) break;
 
-            var response = await request.ExecuteAsync(cancellationToken);
-            if (response.Messages == null) break;
+                foreach (var message in response.Messages)
+                {
+                    if (!string.IsNullOrEmpty(message.Id))
+                    {
+                        messageIds.Add(message.Id);
+                    }
+                }
 
-            // Handle skipping manually
-            messagesToDownload.AddRange(response.Messages);
-
-            pageToken = response.NextPageToken;
-        } while (!string.IsNullOrEmpty(pageToken));
-
-        // Do not download messages that exists, but return them for listing.
-
-        var messageIds = messagesToDownload.Select(a => a.Id);
-
-        var downloadRequireMessageIds = messageIds.Except(await _gmailChangeProcessor.AreMailsExistsAsync(messageIds));
-
-        // Download missing messages.
-        foreach (var messageId in downloadRequireMessageIds)
-        {
-            await DownloadSingleMessageAsync(messageId, cancellationToken).ConfigureAwait(false);
+                pageToken = response.NextPageToken;
+            } while (!string.IsNullOrEmpty(pageToken));
         }
 
-        // Get results from database and return.
+        bool hasScopedQuery = queryText.StartsWith("label:", StringComparison.OrdinalIgnoreCase) ||
+                              queryText.StartsWith("in:", StringComparison.OrdinalIgnoreCase);
 
-        return await _gmailChangeProcessor.GetMailCopiesAsync(messageIds);
+        if (hasScopedQuery || folders?.Count == 0)
+        {
+            var request = _gmailService.Users.Messages.List("me");
+            request.Q = queryText;
+            request.MaxResults = 500;
+
+            await CollectMessageIdsAsync(request).ConfigureAwait(false);
+        }
+        else
+        {
+            foreach (var folder in folders)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var request = _gmailService.Users.Messages.List("me");
+                request.MaxResults = 500;
+
+                if (IsArchiveFolder(folder))
+                {
+                    // Gmail archive is virtual. Query via search operator instead of label id.
+                    request.Q = $"in:archive {queryText}".Trim();
+                }
+                else
+                {
+                    request.Q = queryText;
+                    request.LabelIds = new List<string> { folder.RemoteFolderId };
+                }
+
+                await CollectMessageIdsAsync(request).ConfigureAwait(false);
+            }
+        }
+
+        if (messageIds.Count == 0)
+            return [];
+
+        var messageIdList = messageIds.ToList();
+
+        // Do not download messages that already exist locally.
+        var existingMessageIds = await _gmailChangeProcessor.AreMailsExistsAsync(messageIdList).ConfigureAwait(false);
+        var messagesToDownload = messageIdList.Except(existingMessageIds, StringComparer.Ordinal);
+
+        // Download missing messages in batch with metadata only.
+        await DownloadMessagesInBatchAsync(messagesToDownload, cancellationToken).ConfigureAwait(false);
+
+        // Get results from database and return.
+        return await _gmailChangeProcessor.GetMailCopiesAsync(messageIdList).ConfigureAwait(false);
     }
 
-    public override async Task DownloadMissingMimeMessageAsync(IMailItem mailItem,
-                                                           ITransferProgress transferProgress = null,
-                                                           CancellationToken cancellationToken = default)
+    /// <summary>
+    /// Downloads multiple messages in batches with metadata only (no MIME) and creates mail packages.
+    /// Uses Gmail batch API to download up to MaximumAllowedBatchRequestSize messages per request.
+    /// Used for initial sync where MIME is not needed.
+    /// </summary>
+    /// <param name="messageIds">List of Gmail message IDs to download</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    private async Task DownloadMessagesInBatchAsync(IEnumerable<string> messageIds, CancellationToken cancellationToken = default)
     {
-        var request = _gmailService.Users.Messages.Get("me", mailItem.Id);
-        request.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Raw;
+        await DownloadMessagesInBatchAsync(messageIds, downloadRawMime: false, cancellationToken).ConfigureAwait(false);
+    }
 
-        var gmailMessage = await request.ExecuteAsync(cancellationToken).ConfigureAwait(false);
-        var mimeMessage = gmailMessage.GetGmailMimeMessage();
+    /// <summary>
+    /// Downloads multiple messages in batches with optional MIME content and creates mail packages.
+    /// Uses Gmail batch API to download up to MaximumAllowedBatchRequestSize messages per request.
+    /// </summary>
+    /// <param name="messageIds">List of Gmail message IDs to download</param>
+    /// <param name="downloadRawMime">True to download Raw format with MIME, false for Metadata only</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    private async Task DownloadMessagesInBatchAsync(IEnumerable<string> messageIds, bool downloadRawMime, CancellationToken cancellationToken = default)
+    {
+        var messageIdList = messageIds.ToList();
+        if (messageIdList.Count == 0) return;
 
-        if (mimeMessage == null)
+        // Split into batches based on MaximumAllowedBatchRequestSize
+        var batches = messageIdList.Batch((int)MaximumAllowedBatchRequestSize);
+
+        foreach (var batch in batches)
         {
-            _logger.Warning("Tried to download Gmail Raw Mime with {Id} id and server responded without a data.", mailItem.Id);
+            var batchRequest = new BatchRequest(_gmailService);
+            var downloadedMessages = new List<Message>();
+            var batchTasks = new List<Task>();
+
+            foreach (var messageId in batch)
+            {
+                var request = downloadRawMime ? CreateSingleMessageGetRaw(messageId) : CreateSingleMessageGet(messageId);
+
+                batchRequest.Queue<Message>(request, (message, error, index, httpMessage) =>
+                {
+                    var task = Task.Run(async () =>
+                    {
+                        if (error != null)
+                        {
+                            _logger.Warning("Failed to download message {MessageId}: {Error}", messageId, error.Message);
+                            return;
+                        }
+
+                        if (message != null)
+                        {
+                            lock (downloadedMessages)
+                            {
+                                downloadedMessages.Add(message);
+                            }
+                        }
+                    });
+
+                    batchTasks.Add(task);
+                });
+            }
+
+            // Execute the batch request
+            await batchRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+            await Task.WhenAll(batchTasks).ConfigureAwait(false);
+
+            // Process all downloaded messages
+            foreach (var gmailMessage in downloadedMessages)
+            {
+                try
+                {
+                    // Create mail packages from metadata/raw.
+                    // If Gmail response is Raw format, CreateNewMailPackagesAsync will parse MIME and
+                    // include it in package(s) so it can be saved to disk.
+                    var packages = await CreateNewMailPackagesAsync(gmailMessage, null, cancellationToken).ConfigureAwait(false);
+
+                    if (packages != null)
+                    {
+                        foreach (var package in packages)
+                        {
+                            await _gmailChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+                        }
+                    }
+
+                    // Update sync identifier if available
+                    if (gmailMessage.HistoryId.HasValue)
+                    {
+                        await UpdateAccountSyncIdentifierAsync(gmailMessage.HistoryId.Value).ConfigureAwait(false);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex, "Failed to process downloaded message {MessageId}", gmailMessage.Id);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Downloads a single message by ID with metadata only (no MIME) and creates mail packages.
+    /// </summary>
+    /// <param name="messageId">Gmail message ID to download</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    private async Task DownloadSingleMessageMetadataAsync(string messageId, CancellationToken cancellationToken = default)
+    {
+        var request = CreateSingleMessageGet(messageId);
+        var gmailMessage = await request.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+
+        if (gmailMessage == null)
+        {
+            _logger.Warning("Failed to download message metadata for {MessageId}", messageId);
             return;
         }
 
-        await _gmailChangeProcessor.SaveMimeFileAsync(mailItem.FileId, mimeMessage, Account.Id).ConfigureAwait(false);
+        // Create mail packages from metadata
+        var packages = await CreateNewMailPackagesAsync(gmailMessage, null, cancellationToken).ConfigureAwait(false);
+
+        if (packages != null)
+        {
+            foreach (var package in packages)
+            {
+                await _gmailChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+            }
+        }
+
+        // Update sync identifier if available
+        if (gmailMessage.HistoryId.HasValue)
+        {
+            await UpdateAccountSyncIdentifierAsync(gmailMessage.HistoryId.Value).ConfigureAwait(false);
+        }
+    }
+
+    public override async Task DownloadMissingMimeMessageAsync(MailCopy mailItem,
+                                                           ITransferProgress transferProgress = null,
+                                                           CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var request = _gmailService.Users.Messages.Get("me", mailItem.Id);
+            request.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Raw;
+
+            var gmailMessage = await request.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+            var mimeMessage = gmailMessage.GetGmailMimeMessage();
+
+            if (mimeMessage == null)
+            {
+                _logger.Warning("Tried to download Gmail Raw Mime with {Id} id and server responded without a data.", mailItem.Id);
+                return;
+            }
+
+            await _gmailChangeProcessor.SaveMimeFileAsync(mailItem.FileId, mimeMessage, Account.Id).ConfigureAwait(false);
+        }
+        catch (GoogleApiException ex) when (ex.HttpStatusCode == System.Net.HttpStatusCode.NotFound)
+        {
+            _logger.Warning("Gmail message {MailId} not found (404) during MIME download. Deleting locally.", mailItem.Id);
+            await _gmailChangeProcessor.DeleteMailAsync(Account.Id, mailItem.Id).ConfigureAwait(false);
+            throw new SynchronizerEntityNotFoundException(ex.Message);
+        }
+    }
+
+    public override async Task DownloadCalendarAttachmentAsync(
+        Wino.Core.Domain.Entities.Calendar.CalendarItem calendarItem,
+        Wino.Core.Domain.Entities.Calendar.CalendarAttachment attachment,
+        string localFilePath,
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            // Gmail calendar attachments are stored in Google Drive
+            // RemoteAttachmentId contains either FileId or FileUrl
+            // For simplicity, we'll try to download from the FileId/FileUrl
+
+            if (string.IsNullOrEmpty(attachment.RemoteAttachmentId))
+            {
+                _logger.Error("RemoteAttachmentId is empty for attachment {AttachmentId}", attachment.Id);
+                throw new InvalidOperationException("RemoteAttachmentId is required to download Gmail calendar attachment.");
+            }
+
+            // Gmail calendar attachments are links to Google Drive files
+            // The attachment.RemoteAttachmentId is either a FileId or FileUrl
+            // Since we can't directly download from Calendar API, this would require Drive API access
+            // For now, throw NotSupportedException as Gmail attachments require additional Drive API setup
+
+            _logger.Warning("Gmail calendar attachment download requires Google Drive API access. FileId/URL: {RemoteId}", attachment.RemoteAttachmentId);
+            throw new NotSupportedException("Gmail calendar attachments are stored in Google Drive and require additional API configuration to download.");
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Error downloading Gmail calendar attachment {AttachmentId}", attachment.Id);
+            throw;
+        }
     }
 
     public override List<IRequestBundle<IClientServiceRequest>> RenameFolder(RenameFolderRequest request)
@@ -1075,6 +1525,38 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     public override List<IRequestBundle<IClientServiceRequest>> MarkFolderAsRead(MarkFolderAsReadRequest request)
         => MarkRead(new BatchMarkReadRequest(request.MailsToMarkRead.Select(a => new MarkReadRequest(a, true))));
 
+    public override List<IRequestBundle<IClientServiceRequest>> DeleteFolder(DeleteFolderRequest request)
+    {
+        var networkCall = _gmailService.Users.Labels.Delete("me", request.Folder.RemoteFolderId);
+        return [new HttpRequestBundle<IClientServiceRequest>(networkCall, request, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> CreateSubFolder(CreateSubFolderRequest request)
+    {
+        var parentLabelName = request.Folder.FolderName;
+
+        try
+        {
+            var parentLabel = _gmailService.Users.Labels.Get("me", request.Folder.RemoteFolderId).Execute();
+            if (!string.IsNullOrWhiteSpace(parentLabel?.Name))
+            {
+                parentLabelName = parentLabel.Name;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to resolve full parent label name for {FolderId}. Falling back to local folder name.", request.Folder.RemoteFolderId);
+        }
+
+        var label = new Label()
+        {
+            Name = $"{parentLabelName}/{request.NewFolderName}"
+        };
+
+        var networkCall = _gmailService.Users.Labels.Create(label, "me");
+        return [new HttpRequestBundle<IClientServiceRequest>(networkCall, request, request)];
+    }
+
     #endregion
 
     #region Request Execution
@@ -1082,6 +1564,14 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     public override async Task ExecuteNativeRequestsAsync(List<IRequestBundle<IClientServiceRequest>> batchedRequests,
                                                           CancellationToken cancellationToken = default)
     {
+        // First apply all UI changes immediately before any batching.
+        // This ensures UI reflects changes right away, regardless of batch processing.
+        foreach (var bundle in batchedRequests)
+        {
+            bundle.UIChangeRequest?.ApplyUIChanges();
+        }
+
+        // Now batch and execute the network requests.
         var batchedBundles = batchedRequests.Batch((int)MaximumAllowedBatchRequestSize);
         var bundleCount = batchedBundles.Count();
 
@@ -1098,7 +1588,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             for (int k = 0; k < bundleRequestCount; k++)
             {
                 var requestBundle = bundle.ElementAt(k);
-                requestBundle.UIChangeRequest?.ApplyUIChanges();
+                // UI changes are already applied above before batching.
 
                 nativeBatchRequest.Queue<object>(requestBundle.NativeRequest, (content, error, index, message)
                     => bundleTasks.Add(ProcessSingleNativeRequestResponseAsync(requestBundle, error, message, cancellationToken)));
@@ -1117,12 +1607,12 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         // Create error context
         var errorContext = new SynchronizerErrorContext
         {
+            Account = Account,
             ErrorCode = error.Code,
             ErrorMessage = error.Message,
             RequestBundle = bundle,
             AdditionalData = new Dictionary<string, object>
             {
-                { "Account", Account },
                 { "Error", error }
             }
         };
@@ -1130,6 +1620,16 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         // Try to handle the error with registered handlers
         var handled = await _gmailSynchronizerErrorHandlerFactory.HandleErrorAsync(errorContext);
 
+        if (handled)
+        {
+            if (ShouldRevertOptimisticMailStateChange(bundle?.UIChangeRequest))
+            {
+                bundle?.UIChangeRequest?.RevertUIChanges();
+            }
+
+            return;
+        }
+
         // If not handled by any specific handler, apply default error handling
         if (!handled)
         {
@@ -1157,58 +1657,11 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         }
     }
 
-    /// <summary>
-    /// Handles after each single message download.
-    /// This involves adding the Gmail message into Wino database.
-    /// </summary>
-    /// <param name="message"></param>
-    /// <param name="error"></param>
-    /// <param name="httpResponseMessage"></param>
-    /// <param name="cancellationToken"></param>
-    private async Task<Message> HandleSingleItemDownloadedCallbackAsync(Message message,
-                                                               RequestError error,
-                                                               string downloadingMessageId,
-                                                               CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await ProcessGmailRequestErrorAsync(error, null);
-        }
-        catch (OutOfMemoryException)
-        {
-            _logger.Warning("Gmail SDK got OutOfMemoryException due to bug in the SDK");
-        }
-        catch (SynchronizerEntityNotFoundException)
-        {
-            _logger.Warning("Resource not found for {DownloadingMessageId}", downloadingMessageId);
-        }
-        catch (SynchronizerException synchronizerException)
-        {
-            _logger.Error("Gmail SDK returned error for {DownloadingMessageId}\n{SynchronizerException}", downloadingMessageId, synchronizerException);
-        }
-
-        if (message == null)
-        {
-            _logger.Warning("Skipped GMail message download for {DownloadingMessageId}", downloadingMessageId);
-
-            return null;
-        }
-
-        // Gmail has LabelId property for each message.
-        // Therefore we can pass null as the assigned folder safely.
-        var mailPackage = await CreateNewMailPackagesAsync(message, null, cancellationToken);
-
-        // If CreateNewMailPackagesAsync returns null it means local draft mapping is done.
-        // We don't need to insert anything else.
-        if (mailPackage == null) return message;
-
-        foreach (var package in mailPackage)
-        {
-            await _gmailChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
-        }
-
-        return message;
-    }
+    private static bool ShouldRevertOptimisticMailStateChange(IUIChangeRequest request)
+        => request is BatchMarkReadRequest
+        || request is MarkReadRequest
+        || request is BatchChangeFlagRequest
+        || request is ChangeFlagRequest;
 
     private bool ShouldUpdateSyncIdentifier(ulong? historyId)
     {
@@ -1233,30 +1686,51 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
                                                                HttpResponseMessage httpResponseMessage,
                                                                CancellationToken cancellationToken = default)
     {
-        await ProcessGmailRequestErrorAsync(error, bundle);
+        if (error != null)
+        {
+            await ProcessGmailRequestErrorAsync(error, bundle).ConfigureAwait(false);
+            return;
+        }
+
+        await PersistSuccessfulMailStateChangesAsync(bundle).ConfigureAwait(false);
 
         if (bundle is HttpRequestBundle<IClientServiceRequest, Message> messageBundle)
         {
-            var gmailMessage = await messageBundle.DeserializeBundleAsync(httpResponseMessage, cancellationToken).ConfigureAwait(false);
+            var gmailMessage = await messageBundle.DeserializeBundleAsync(httpResponseMessage, GmailSynchronizerJsonContext.Default.Message, cancellationToken).ConfigureAwait(false);
 
             if (gmailMessage == null) return;
 
-            await HandleSingleItemDownloadedCallbackAsync(gmailMessage, error, string.Empty, cancellationToken);
+            // Create mail packages from the downloaded message
+            var packages = await CreateNewMailPackagesAsync(gmailMessage, null, cancellationToken).ConfigureAwait(false);
+
+            if (packages != null)
+            {
+                foreach (var package in packages)
+                {
+                    await _gmailChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+                }
+            }
+
             await UpdateAccountSyncIdentifierAsync(gmailMessage.HistoryId).ConfigureAwait(false);
         }
         else if (bundle is HttpRequestBundle<IClientServiceRequest, Label> folderBundle)
         {
-            var gmailLabel = await folderBundle.DeserializeBundleAsync(httpResponseMessage, cancellationToken).ConfigureAwait(false);
-
-            if (gmailLabel == null) return;
-
             // TODO: Handle new Gmail Label added or updated.
         }
+        else if (bundle is HttpRequestBundle<IClientServiceRequest, Event> eventBundle && eventBundle.Request is CreateCalendarEventRequest createCalendarEventRequest)
+        {
+            var createdEvent = await eventBundle.DeserializeBundleAsync(httpResponseMessage, GmailSynchronizerJsonContext.Default.Event, cancellationToken).ConfigureAwait(false);
+
+            if (createdEvent == null || string.IsNullOrWhiteSpace(createdEvent.Id))
+                return;
+
+            await UploadCalendarEventAttachmentsAsync(createCalendarEventRequest, createdEvent, cancellationToken).ConfigureAwait(false);
+        }
         else if (bundle is HttpRequestBundle<IClientServiceRequest, Draft> draftBundle && draftBundle.Request is CreateDraftRequest createDraftRequest)
         {
             // New draft mail is created.
 
-            var messageDraft = await draftBundle.DeserializeBundleAsync(httpResponseMessage, cancellationToken).ConfigureAwait(false);
+            var messageDraft = await draftBundle.DeserializeBundleAsync(httpResponseMessage, GmailSynchronizerJsonContext.Default.Draft, cancellationToken).ConfigureAwait(false);
 
             if (messageDraft == null) return;
 
@@ -1281,6 +1755,34 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         }
     }
 
+    private async Task PersistSuccessfulMailStateChangesAsync(IRequestBundle<IClientServiceRequest> bundle)
+    {
+        switch (bundle.UIChangeRequest)
+        {
+            case BatchMarkReadRequest batchMarkReadRequest:
+                foreach (var request in batchMarkReadRequest)
+                {
+                    await _gmailChangeProcessor.ChangeMailReadStatusAsync(request.Item.Id, request.IsRead).ConfigureAwait(false);
+                }
+                break;
+
+            case MarkReadRequest markReadRequest:
+                await _gmailChangeProcessor.ChangeMailReadStatusAsync(markReadRequest.Item.Id, markReadRequest.IsRead).ConfigureAwait(false);
+                break;
+
+            case BatchChangeFlagRequest batchChangeFlagRequest:
+                foreach (var request in batchChangeFlagRequest)
+                {
+                    await _gmailChangeProcessor.ChangeFlagStatusAsync(request.Item.Id, request.IsFlagged).ConfigureAwait(false);
+                }
+                break;
+
+            case ChangeFlagRequest changeFlagRequest:
+                await _gmailChangeProcessor.ChangeFlagStatusAsync(changeFlagRequest.Item.Id, changeFlagRequest.IsFlagged).ConfigureAwait(false);
+                break;
+        }
+    }
+
     /// <summary>
     /// Gmail Archive is a special folder that is not visible in the Gmail web interface.
     /// We need to handle it separately.
@@ -1288,41 +1790,62 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
     /// <param name="cancellationToken">Cancellation token.</param>
     private async Task MapArchivedMailsAsync(CancellationToken cancellationToken)
     {
+        if (!archiveFolderId.HasValue) return;
+
         var request = _gmailService.Users.Messages.List("me");
         request.Q = "in:archive";
-        request.MaxResults = InitialMessageDownloadCountPerFolder;
+        request.MaxResults = 500;
 
         string pageToken = null;
 
-        var archivedMessageIds = new List<string>();
+        var archivedMessageIds = new HashSet<string>(StringComparer.Ordinal);
 
         do
         {
             if (!string.IsNullOrEmpty(pageToken)) request.PageToken = pageToken;
 
-            var response = await request.ExecuteAsync(cancellationToken);
+            var response = await request.ExecuteAsync(cancellationToken).ConfigureAwait(false);
             if (response.Messages == null) break;
 
             foreach (var message in response.Messages)
             {
-                if (archivedMessageIds.Contains(message.Id)) continue;
-
-                archivedMessageIds.Add(message.Id);
+                if (!string.IsNullOrEmpty(message.Id))
+                {
+                    archivedMessageIds.Add(message.Id);
+                }
             }
 
             pageToken = response.NextPageToken;
         } while (!string.IsNullOrEmpty(pageToken));
 
-        var result = await _gmailChangeProcessor.GetGmailArchiveComparisonResultAsync(archiveFolderId.Value, archivedMessageIds).ConfigureAwait(false);
+        var result = await _gmailChangeProcessor.GetGmailArchiveComparisonResultAsync(archiveFolderId.Value, archivedMessageIds.ToList()).ConfigureAwait(false);
 
-        foreach (var archiveAddedItem in result.Added)
+        var addedArchiveIds = result.Added.Distinct(StringComparer.Ordinal).ToList();
+        var removedArchiveIds = result.Removed.Distinct(StringComparer.Ordinal).ToList();
+
+        if (addedArchiveIds.Count > 0)
         {
-            await HandleArchiveAssignmentAsync(archiveAddedItem);
+            // Archive sync can surface messages that were never downloaded before.
+            // Download metadata first so assignment creation can succeed.
+            var existingBeforeDownload = await _gmailChangeProcessor.AreMailsExistsAsync(addedArchiveIds).ConfigureAwait(false);
+            var missingArchiveIds = addedArchiveIds.Except(existingBeforeDownload, StringComparer.Ordinal).ToList();
+
+            if (missingArchiveIds.Count > 0)
+            {
+                await DownloadMessagesInBatchAsync(missingArchiveIds, cancellationToken).ConfigureAwait(false);
+            }
+
+            var existingAfterDownload = await _gmailChangeProcessor.AreMailsExistsAsync(addedArchiveIds).ConfigureAwait(false);
+
+            foreach (var archiveAddedItem in existingAfterDownload)
+            {
+                await HandleArchiveAssignmentAsync(archiveAddedItem).ConfigureAwait(false);
+            }
         }
 
-        foreach (var unAarchivedRemovedItem in result.Removed)
+        foreach (var unAarchivedRemovedItem in removedArchiveIds)
         {
-            await HandleUnarchiveAssignmentAsync(unAarchivedRemovedItem);
+            await HandleUnarchiveAssignmentAsync(unAarchivedRemovedItem).ConfigureAwait(false);
         }
     }
 
@@ -1355,11 +1878,270 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         }
     }
 
+    protected override Task<MailCopy> CreateMinimalMailCopyAsync(Message gmailMessage, MailItemFolder assignedFolder, CancellationToken cancellationToken = default)
+    {
+        bool isUnread = gmailMessage.GetIsUnread();
+        bool isFocused = gmailMessage.GetIsFocused();
+        bool isFlagged = gmailMessage.GetIsFlagged();
+        bool isDraft = gmailMessage.GetIsDraft();
+
+        // Try to get the most accurate date from Gmail's InternalDate first, then fallback to Date header
+        DateTime creationDate = DateTime.UtcNow;
+
+        if (gmailMessage.InternalDate.HasValue)
+        {
+            // Gmail's InternalDate is in milliseconds since Unix epoch
+            creationDate = DateTimeOffset.FromUnixTimeMilliseconds(gmailMessage.InternalDate.Value).UtcDateTime;
+        }
+        else
+        {
+            // Fallback to parsing the Date header
+            var dateHeaderValue = gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("Date", StringComparison.OrdinalIgnoreCase))?.Value;
+            if (!string.IsNullOrEmpty(dateHeaderValue) && DateTime.TryParse(dateHeaderValue, out var parsedDate))
+            {
+                creationDate = parsedDate.ToUniversalTime();
+            }
+        }
+
+        // Extract From header and parse name/address
+        var fromHeaderValue = gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("From", StringComparison.OrdinalIgnoreCase))?.Value ?? "";
+        var (fromName, fromAddress) = ExtractNameAndEmailFromHeader(fromHeaderValue);
+
+        // Detect calendar invitation by checking Content-Type header (only if calendar access granted)
+        var itemType = Account.IsCalendarAccessGranted ? GetMailItemTypeFromHeaders(gmailMessage.Payload?.Headers) : MailItemType.Mail;
+
+        var copy = new MailCopy()
+        {
+            CreationDate = creationDate,
+            Subject = HttpUtility.HtmlDecode(gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("Subject", StringComparison.OrdinalIgnoreCase))?.Value ?? ""),
+            FromName = HttpUtility.HtmlDecode(fromName),
+            FromAddress = fromAddress,
+            PreviewText = HttpUtility.HtmlDecode(gmailMessage.Snippet ?? "").Trim(),
+            ThreadId = gmailMessage.ThreadId,
+            Importance = MailImportance.Normal, // Default importance without MIME parsing
+            Id = gmailMessage.Id,
+            IsDraft = isDraft,
+            HasAttachments = gmailMessage.Payload?.Parts?.Any(p => !string.IsNullOrEmpty(p.Filename)) ?? false,
+            IsRead = !isUnread,
+            IsFlagged = isFlagged,
+            IsFocused = isFocused,
+            InReplyTo = MailHeaderExtensions.StripAngleBrackets(gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("In-Reply-To", StringComparison.OrdinalIgnoreCase))?.Value),
+            MessageId = MailHeaderExtensions.StripAngleBrackets(gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("Message-Id", StringComparison.OrdinalIgnoreCase))?.Value),
+            References = MailHeaderExtensions.NormalizeReferences(gmailMessage.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals("References", StringComparison.OrdinalIgnoreCase))?.Value),
+            FileId = Guid.NewGuid(),
+            ItemType = itemType
+        };
+
+        // Note: DraftId is NOT set here. Gmail's Draft resource ID is separate from ThreadId
+        // and can only be obtained from the Drafts API (not Messages API).
+        // DraftId is populated by:
+        // - MapLocalDraftAsync (for Wino-created drafts, from CreateDraft response)
+        // - MapDraftIdsAsync (for all drafts, from Drafts.List API)
+
+        return Task.FromResult(copy);
+    }
+
+    /// <summary>
+    /// Enriches a MailCopy with fields extracted from a parsed MimeMessage.
+    /// This is needed when messages are downloaded with Raw format (delta sync),
+    /// because the Gmail API does not populate Payload.Headers in Raw format.
+    /// Fields already populated (non-null/non-empty) are NOT overwritten.
+    /// </summary>
+    private static void EnrichMailCopyFromMime(MailCopy copy, MimeMessage mime)
+    {
+        if (copy == null || mime == null) return;
+
+        if (string.IsNullOrEmpty(copy.Subject))
+            copy.Subject = mime.Subject ?? string.Empty;
+
+        if (string.IsNullOrEmpty(copy.FromName))
+        {
+            var from = mime.From.Mailboxes.FirstOrDefault();
+            if (from != null)
+                copy.FromName = from.Name ?? string.Empty;
+        }
+
+        if (string.IsNullOrEmpty(copy.FromAddress))
+        {
+            var from = mime.From.Mailboxes.FirstOrDefault();
+            if (from != null)
+                copy.FromAddress = from.Address ?? string.Empty;
+        }
+
+        if (string.IsNullOrEmpty(copy.MessageId))
+            copy.MessageId = mime.MessageId;
+
+        if (string.IsNullOrEmpty(copy.InReplyTo))
+            copy.InReplyTo = mime.InReplyTo;
+
+        if (string.IsNullOrEmpty(copy.References) && mime.References?.Count > 0)
+            copy.References = string.Join(";", mime.References);
+
+        if (!copy.HasAttachments && mime.Attachments.Any())
+            copy.HasAttachments = true;
+
+        if (copy.Importance == MailImportance.Normal)
+        {
+            copy.Importance = mime.Importance switch
+            {
+                MessageImportance.High => MailImportance.High,
+                MessageImportance.Low => MailImportance.Low,
+                _ => MailImportance.Normal
+            };
+        }
+    }
+
+    /// <summary>
+    /// Determines MailItemType based on Gmail message headers.
+    /// Gmail doesn't have EventMessage type like Outlook, but calendar invitations can be detected
+    /// by checking Content-Type header for text/calendar or multipart/alternative with text/calendar part.
+    /// </summary>
+    private static MailItemType GetMailItemTypeFromHeaders(IList<MessagePartHeader> headers)
+    {
+        if (headers == null) return MailItemType.Mail;
+
+        // Check Content-Type header for text/calendar
+        var contentTypeHeader = headers.FirstOrDefault(h => h.Name.Equals("Content-Type", StringComparison.OrdinalIgnoreCase))?.Value;
+
+        if (!string.IsNullOrEmpty(contentTypeHeader))
+        {
+            // Check if it's a calendar message (text/calendar or multipart with calendar)
+            if (contentTypeHeader.Contains("text/calendar", StringComparison.OrdinalIgnoreCase))
+            {
+                // Check the METHOD parameter to determine invitation type
+                var methodMatch = System.Text.RegularExpressions.Regex.Match(contentTypeHeader, @"method=([^;\s]+)", System.Text.RegularExpressions.RegexOptions.IgnoreCase);
+
+                if (methodMatch.Success)
+                {
+                    var method = methodMatch.Groups[1].Value.Trim('"').ToUpperInvariant();
+
+                    return method switch
+                    {
+                        "REQUEST" => MailItemType.CalendarInvitation,
+                        "CANCEL" => MailItemType.CalendarCancellation,
+                        "REPLY" => MailItemType.CalendarResponse,
+                        _ => MailItemType.Mail
+                    };
+                }
+
+                // If no method specified, assume it's an invitation
+                return MailItemType.CalendarInvitation;
+            }
+        }
+
+        return MailItemType.Mail;
+    }
+
+    /// <summary>
+    /// Extracts name and email address from a header value like "Name <email@domain.com>" or "email@domain.com"
+    /// </summary>
+    private static (string name, string email) ExtractNameAndEmailFromHeader(string headerValue)
+    {
+        if (string.IsNullOrEmpty(headerValue))
+            return ("", "");
+
+        // Try to match "Name <email@domain.com>" format
+        var match = System.Text.RegularExpressions.Regex.Match(headerValue, @"^(.+?)\s*<(.+?)>$");
+        if (match.Success)
+        {
+            var name = match.Groups[1].Value.Trim().Trim('"');
+            var email = match.Groups[2].Value.Trim();
+            return (name, email);
+        }
+
+        // If no angle brackets, assume the whole value is the email with no name
+        var emailOnly = headerValue.Trim();
+        return ("", emailOnly);
+    }
+
+    private static IReadOnlyList<AccountContact> ExtractContactsFromGmailMessage(Message message, MimeMessage mimeMessage)
+    {
+        var contacts = new Dictionary<string, AccountContact>(StringComparer.OrdinalIgnoreCase);
+
+        AddFromHeaders(message?.Payload?.Headers);
+
+        if (mimeMessage != null)
+        {
+            AddFromInternetAddressList(mimeMessage.From);
+            AddFromInternetAddressList(mimeMessage.To);
+            AddFromInternetAddressList(mimeMessage.Cc);
+            AddFromInternetAddressList(mimeMessage.Bcc);
+            AddFromInternetAddressList(mimeMessage.ReplyTo);
+
+            if (mimeMessage.Sender is MailboxAddress senderMailbox)
+            {
+                AddContact(senderMailbox.Address, senderMailbox.Name);
+            }
+        }
+
+        return contacts.Values.ToList();
+
+        void AddFromHeaders(IList<MessagePartHeader> headers)
+        {
+            if (headers == null || headers.Count == 0) return;
+
+            AddFromHeader("From");
+            AddFromHeader("Sender");
+            AddFromHeader("To");
+            AddFromHeader("Cc");
+            AddFromHeader("Bcc");
+            AddFromHeader("Reply-To");
+
+            void AddFromHeader(string headerName)
+            {
+                var headerValue = headers
+                    .FirstOrDefault(h => h.Name.Equals(headerName, StringComparison.OrdinalIgnoreCase))
+                    ?.Value;
+
+                if (string.IsNullOrWhiteSpace(headerValue)) return;
+
+                try
+                {
+                    var addresses = InternetAddressList.Parse(headerValue);
+                    foreach (var mailbox in addresses.Mailboxes)
+                    {
+                        AddContact(mailbox.Address, mailbox.Name);
+                    }
+                }
+                catch
+                {
+                    var (name, email) = ExtractNameAndEmailFromHeader(headerValue);
+                    AddContact(email, name);
+                }
+            }
+        }
+
+        void AddFromInternetAddressList(InternetAddressList addresses)
+        {
+            if (addresses == null) return;
+
+            foreach (var mailbox in addresses.Mailboxes)
+            {
+                AddContact(mailbox.Address, mailbox.Name);
+            }
+        }
+
+        void AddContact(string address, string name)
+        {
+            var trimmedAddress = address?.Trim();
+            if (string.IsNullOrWhiteSpace(trimmedAddress)) return;
+
+            var displayName = string.IsNullOrWhiteSpace(name) ? trimmedAddress : name.Trim();
+
+            contacts[trimmedAddress] = new AccountContact
+            {
+                Address = trimmedAddress,
+                Name = displayName
+            };
+        }
+    }
+
     /// <summary>
     /// Creates new mail packages for the given message.
     /// AssignedFolder is null since the LabelId is parsed out of the Message.
+    /// If Gmail Message includes Raw payload, MIME is parsed and attached to packages.
     /// </summary>
-    /// <param name="message">Gmail message to create package for.</param>
+    /// <param name="message">Gmail message to create package for (must have Metadata format).</param>
     /// <param name="assignedFolder">Null, not used.</param>
     /// <param name="cancellationToken">Cancellation token</param>
     /// <returns>New mail package that change processor can use to insert new mail into database.</returns>
@@ -1368,40 +2150,508 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
                                                                               CancellationToken cancellationToken = default)
     {
         var packageList = new List<NewMailItemPackage>();
+        MimeMessage mimeMessage = null;
 
-        MimeMessage mimeMessage = message.GetGmailMimeMessage();
-        var mailCopy = message.AsMailCopy(mimeMessage);
-
-        // Check whether this message is mapped to any local draft.
-        // Previously we were using Draft resource response as mapping drafts.
-        // This seem to be a worse approach. Now both Outlook and Gmail use X-Wino-Draft-Id header to map drafts.
-        // This is a better approach since we don't need to fetch the draft resource to get the draft id.
-
-        if (mailCopy.IsDraft
-            && mimeMessage.Headers.Contains(Domain.Constants.WinoLocalDraftHeader)
-            && Guid.TryParse(mimeMessage.Headers[Domain.Constants.WinoLocalDraftHeader], out Guid localDraftCopyUniqueId))
+        // Raw format is used in delta sync and does not populate Payload.Headers.
+        // Parse MIME from Raw so we can resolve draft mapping header and persist mime content.
+        if (!string.IsNullOrEmpty(message?.Raw))
         {
-            // This message belongs to existing local draft copy.
-            // We don't need to create a new mail copy for this message, just update the existing one.
-
-            bool isMappingSuccesfull = await _gmailChangeProcessor.MapLocalDraftAsync(Account.Id, localDraftCopyUniqueId, mailCopy.Id, mailCopy.DraftId, mailCopy.ThreadId);
-
-            if (isMappingSuccesfull) return null;
-
-            // Local copy doesn't exists. Continue execution to insert mail copy.
+            try
+            {
+                mimeMessage = message.GetGmailMimeMessage();
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to parse MIME from raw Gmail message {MessageId}", message?.Id);
+            }
         }
 
+        // Create base MailCopy from metadata only - NO MIME download
+        var baseMailCopy = await CreateMinimalMailCopyAsync(message, assignedFolder, cancellationToken);
+
+        // Initial sync metadata flow does not include MIME, but calendar invitations need MIME
+        // for date rendering and invitation-to-calendar mapping.
+        if (mimeMessage == null && baseMailCopy?.ItemType == MailItemType.CalendarInvitation && !string.IsNullOrEmpty(message?.Id))
+        {
+            try
+            {
+                var rawRequest = _gmailService.Users.Messages.Get("me", message.Id);
+                rawRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Raw;
+
+                var rawMessage = await rawRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+                if (!string.IsNullOrEmpty(rawMessage?.Raw))
+                {
+                    mimeMessage = rawMessage.GetGmailMimeMessage();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to fetch raw MIME for calendar invitation {MessageId}", message.Id);
+            }
+        }
+
+        if (mimeMessage != null)
+        {
+            // Raw responses don't include metadata headers. Backfill important fields from MIME.
+            EnrichMailCopyFromMime(baseMailCopy, mimeMessage);
+        }
+
+        await TryMapCalendarInvitationAsync(baseMailCopy, mimeMessage, cancellationToken).ConfigureAwait(false);
+
+        var extractedContacts = ExtractContactsFromGmailMessage(message, mimeMessage);
+
+        // Check for local draft mapping using X-Wino-Draft-Id header.
+        // For Metadata format we read from Payload.Headers.
+        // For Raw format (Payload is null), we read from parsed MIME headers.
+        if (baseMailCopy.IsDraft)
+        {
+            var draftIdHeader = message.Payload?.Headers?.FirstOrDefault(h => h.Name.Equals(Domain.Constants.WinoLocalDraftHeader, StringComparison.OrdinalIgnoreCase))?.Value
+                                ?? mimeMessage?.Headers?.FirstOrDefault(h => h.Field.Equals(Domain.Constants.WinoLocalDraftHeader, StringComparison.OrdinalIgnoreCase))?.Value;
+
+            if (!string.IsNullOrEmpty(draftIdHeader) && Guid.TryParse(draftIdHeader, out _))
+            {
+                if (Guid.TryParse(draftIdHeader, out Guid localDraftCopyUniqueId))
+                {
+                    // This message belongs to existing local draft copy.
+                    // Map remote ids to local copy and skip creating duplicate rows.
+                    bool isMappingSuccessful = await _gmailChangeProcessor.MapLocalDraftAsync(
+                        Account.Id,
+                        localDraftCopyUniqueId,
+                        baseMailCopy.Id,
+                        baseMailCopy.DraftId,
+                        baseMailCopy.ThreadId).ConfigureAwait(false);
+
+                    if (isMappingSuccessful)
+                    {
+                        // Keep local draft MIME in sync with the fetched remote raw MIME if available.
+                        if (mimeMessage != null)
+                        {
+                            var mappedDraftCopies = await _gmailChangeProcessor.GetMailCopiesAsync([baseMailCopy.Id]).ConfigureAwait(false);
+                            if (mappedDraftCopies != null)
+                            {
+                                var savedFileIds = new HashSet<Guid>();
+                                foreach (var mappedCopy in mappedDraftCopies)
+                                {
+                                    if (mappedCopy.FileId == Guid.Empty || !savedFileIds.Add(mappedCopy.FileId))
+                                        continue;
+
+                                    await _gmailChangeProcessor.SaveMimeFileAsync(mappedCopy.FileId, mimeMessage, Account.Id).ConfigureAwait(false);
+                                }
+                            }
+                        }
+
+                        return null;
+                    }
+                }
+            }
+        }
+
+        // For Gmail, a single mail can have multiple labels (folders).
+        // Each label requires a separate MailCopy entry in the database with:
+        // - Same Id, UniqueId, FileId (shared across all copies)
+        // - Different FolderId (one per label)
+        // ARCHIVE label is excluded here as it's virtual and handled by MapArchivedMailsAsync
         if (message.LabelIds is not null)
         {
+            // Generate shared identifiers that will be the same for all copies of this mail
+            var sharedId = baseMailCopy.Id;
+            var sharedFileId = baseMailCopy.FileId;
+
             foreach (var labelId in message.LabelIds)
             {
-                packageList.Add(new NewMailItemPackage(mailCopy, mimeMessage, labelId));
+                // Skip ARCHIVE label - it's virtual and handled separately
+                if (labelId == ServiceConstants.ARCHIVE_LABEL_ID)
+                    continue;
+
+                // Create a new MailCopy instance for each label to avoid shared reference issues
+                var mailCopyForLabel = await CreateMinimalMailCopyAsync(message, assignedFolder, cancellationToken);
+
+                if (mimeMessage != null)
+                {
+                    EnrichMailCopyFromMime(mailCopyForLabel, mimeMessage);
+                }
+
+                // Ensure all copies share the same Id and FileId
+                mailCopyForLabel.Id = sharedId;
+                mailCopyForLabel.FileId = sharedFileId;
+
+                packageList.Add(new NewMailItemPackage(mailCopyForLabel, mimeMessage, labelId, extractedContacts));
             }
         }
 
         return packageList;
     }
 
+    private async Task TryMapCalendarInvitationAsync(MailCopy baseMailCopy, MimeMessage mimeMessage, CancellationToken cancellationToken)
+    {
+        if (baseMailCopy == null || baseMailCopy.ItemType != MailItemType.CalendarInvitation || mimeMessage == null)
+            return;
+
+        var invitationUid = mimeMessage.ExtractInvitationUid();
+        if (string.IsNullOrWhiteSpace(invitationUid))
+            return;
+
+        var calendars = await _gmailChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        if (calendars == null || calendars.Count == 0)
+            return;
+
+        foreach (var calendar in calendars)
+        {
+            try
+            {
+                var listRequest = _calendarService.Events.List(calendar.RemoteCalendarId);
+                listRequest.ICalUID = invitationUid;
+                listRequest.MaxResults = 1;
+                listRequest.SingleEvents = false;
+
+                var listResponse = await listRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+                var matchedEvent = listResponse?.Items?.FirstOrDefault();
+                if (matchedEvent == null || string.IsNullOrWhiteSpace(matchedEvent.Id))
+                    continue;
+
+                await _gmailChangeProcessor.ManageCalendarEventAsync(matchedEvent, calendar, Account).ConfigureAwait(false);
+
+                var localCalendarItem = await _gmailChangeProcessor.GetCalendarItemAsync(calendar.Id, matchedEvent.Id).ConfigureAwait(false);
+                if (localCalendarItem == null)
+                    return;
+
+                await _gmailChangeProcessor.UpsertMailInvitationCalendarMappingAsync(new MailInvitationCalendarMapping()
+                {
+                    Id = Guid.NewGuid(),
+                    AccountId = Account.Id,
+                    MailCopyId = baseMailCopy.Id,
+                    InvitationUid = invitationUid,
+                    CalendarId = calendar.Id,
+                    CalendarItemId = localCalendarItem.Id,
+                    CalendarRemoteEventId = matchedEvent.Id
+                }).ConfigureAwait(false);
+
+                return;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to map Gmail calendar invitation mail {MailCopyId} for calendar {CalendarId}", baseMailCopy.Id, calendar.Id);
+            }
+        }
+    }
+
+    #endregion
+
+    #region Calendar Operations
+
+    public override List<IRequestBundle<IClientServiceRequest>> CreateCalendarEvent(CreateCalendarEventRequest request)
+    {
+        var calendarItem = request.PreparedItem;
+        var attendees = request.PreparedEvent.Attendees;
+        var reminders = request.PreparedEvent.Reminders;
+        var calendar = request.AssignedCalendar;
+
+        var googleEvent = new Event
+        {
+            Id = calendarItem.Id.ToString("N").ToLowerInvariant(),
+            Summary = calendarItem.Title,
+            Description = calendarItem.Description,
+            Location = calendarItem.Location,
+            Status = calendarItem.Status == CalendarItemStatus.Accepted ? "confirmed" : "tentative",
+            Transparency = calendarItem.ShowAs == CalendarItemShowAs.Free ? "transparent" : "opaque"
+        };
+
+        if (calendarItem.IsAllDayEvent)
+        {
+            googleEvent.Start = new EventDateTime
+            {
+                Date = calendarItem.StartDate.ToString("yyyy-MM-dd"),
+                TimeZone = calendarItem.StartTimeZone
+            };
+            googleEvent.End = new EventDateTime
+            {
+                Date = calendarItem.EndDate.ToString("yyyy-MM-dd"),
+                TimeZone = calendarItem.EndTimeZone
+            };
+        }
+        else
+        {
+            googleEvent.Start = new EventDateTime
+            {
+                DateTimeDateTimeOffset = new DateTimeOffset(calendarItem.StartDate, ResolveOffset(calendarItem.StartDate, calendarItem.StartTimeZone)),
+                TimeZone = calendarItem.StartTimeZone
+            };
+            googleEvent.End = new EventDateTime
+            {
+                DateTimeDateTimeOffset = new DateTimeOffset(calendarItem.EndDate, ResolveOffset(calendarItem.EndDate, calendarItem.EndTimeZone ?? calendarItem.StartTimeZone)),
+                TimeZone = calendarItem.EndTimeZone
+            };
+        }
+
+        if (attendees.Count > 0)
+        {
+            googleEvent.Attendees = attendees.Select(a => new EventAttendee
+            {
+                Email = a.Email,
+                DisplayName = a.Name,
+                Optional = a.IsOptionalAttendee
+            }).ToList();
+        }
+
+        if (reminders.Count > 0)
+        {
+            googleEvent.Reminders = new Event.RemindersData
+            {
+                UseDefault = false,
+                Overrides = reminders.Select(reminder => new EventReminder
+                {
+                    Method = reminder.ReminderType == CalendarItemReminderType.Email ? "email" : "popup",
+                    Minutes = (int)Math.Max(0, reminder.DurationInSeconds / 60)
+                }).ToList()
+            };
+        }
+
+        if (!string.IsNullOrWhiteSpace(calendarItem.Recurrence))
+        {
+            googleEvent.Recurrence = calendarItem.Recurrence
+                .Split(Wino.Core.Domain.Constants.CalendarEventRecurrenceRuleSeperator, StringSplitOptions.RemoveEmptyEntries)
+                .Select(line => line.Trim())
+                .Where(line => !string.IsNullOrWhiteSpace(line))
+                .ToList();
+        }
+
+        var insertRequest = _calendarService.Events.Insert(googleEvent, calendar.RemoteCalendarId);
+        insertRequest.SendUpdates = attendees.Count > 0
+            ? Google.Apis.Calendar.v3.EventsResource.InsertRequest.SendUpdatesEnum.All
+            : Google.Apis.Calendar.v3.EventsResource.InsertRequest.SendUpdatesEnum.None;
+
+        return [new HttpRequestBundle<IClientServiceRequest, Event>(insertRequest, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> AcceptEvent(AcceptEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot accept event without remote event ID");
+        }
+
+        // For Gmail, we need to patch the event with the user's response status
+        // Get the current user's email from the account
+        var userEmail = Account.Address;
+
+        // Create a patch event to update only the attendee response
+        var patchEvent = new Event();
+
+        // We need to get the event first to update the specific attendee
+        // However, for efficiency, we'll use the patch method with sendUpdates parameter
+        var patchRequest = _calendarService.Events.Patch(new Event
+        {
+            // The API will handle updating the current user's attendee status
+            Attendees = new List<EventAttendee>
+            {
+                new EventAttendee
+                {
+                    Email = userEmail,
+                    ResponseStatus = "accepted"
+                }
+            }
+        }, calendar.RemoteCalendarId, remoteEventId);
+
+        // Send updates to other attendees if there's a message
+        patchRequest.SendUpdates = !string.IsNullOrEmpty(request.ResponseMessage)
+            ? Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.All
+            : Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.None;
+
+        return [new HttpRequestBundle<IClientServiceRequest>(patchRequest, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> DeclineEvent(DeclineEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot decline event without remote event ID");
+        }
+
+        var userEmail = Account.Address;
+
+        var patchRequest = _calendarService.Events.Patch(new Event
+        {
+            Attendees = new List<EventAttendee>
+            {
+                new EventAttendee
+                {
+                    Email = userEmail,
+                    ResponseStatus = "declined",
+                    Comment = request.ResponseMessage
+                }
+            }
+        }, calendar.RemoteCalendarId, remoteEventId);
+
+        patchRequest.SendUpdates = !string.IsNullOrEmpty(request.ResponseMessage)
+            ? Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.All
+            : Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.None;
+
+        return [new HttpRequestBundle<IClientServiceRequest>(patchRequest, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> TentativeEvent(TentativeEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot tentatively accept event without remote event ID");
+        }
+
+        var userEmail = Account.Address;
+
+        var patchRequest = _calendarService.Events.Patch(new Event
+        {
+            Attendees = new List<EventAttendee>
+            {
+                new EventAttendee
+                {
+                    Email = userEmail,
+                    ResponseStatus = "tentative",
+                    Comment = request.ResponseMessage
+                }
+            }
+        }, calendar.RemoteCalendarId, remoteEventId);
+
+        patchRequest.SendUpdates = !string.IsNullOrEmpty(request.ResponseMessage)
+            ? Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.All
+            : Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.None;
+
+        return [new HttpRequestBundle<IClientServiceRequest>(patchRequest, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> UpdateCalendarEvent(UpdateCalendarEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var attendees = request.Attendees;
+
+        // Get the calendar for this event
+        var calendar = calendarItem.AssignedCalendar;
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot update event without remote event ID");
+        }
+
+        // Convert CalendarItem to Google Event for update
+        var googleEvent = new Event
+        {
+            Summary = calendarItem.Title,
+            Description = calendarItem.Description,
+            Location = calendarItem.Location,
+            Status = calendarItem.Status == CalendarItemStatus.Accepted ? "confirmed" : "tentative",
+            Transparency = calendarItem.ShowAs == CalendarItemShowAs.Free ? "transparent" : "opaque"
+        };
+
+        // Set start and end time with proper timezone handling
+        // CalendarItem stores dates in the event's timezone (StartTimeZone/EndTimeZone)
+        // When user edits in local timezone, the dates are already converted and stored correctly
+        if (calendarItem.IsAllDayEvent)
+        {
+            // All-day events use Date instead of DateTime
+            googleEvent.Start = new EventDateTime
+            {
+                Date = calendarItem.StartDate.ToString("yyyy-MM-dd")
+            };
+            googleEvent.End = new EventDateTime
+            {
+                Date = calendarItem.EndDate.ToString("yyyy-MM-dd")
+            };
+        }
+        else
+        {
+            // Regular events with time
+            // StartDate and EndDate are stored in the event's timezone
+            // We preserve the timezone information during update
+            googleEvent.Start = new EventDateTime
+            {
+                DateTimeDateTimeOffset = new DateTimeOffset(calendarItem.StartDate, TimeSpan.Zero),
+                TimeZone = calendarItem.StartTimeZone ?? TimeZoneInfo.Local.Id
+            };
+            googleEvent.End = new EventDateTime
+            {
+                DateTimeDateTimeOffset = new DateTimeOffset(calendarItem.EndDate, TimeSpan.Zero),
+                TimeZone = calendarItem.EndTimeZone ?? TimeZoneInfo.Local.Id
+            };
+        }
+
+        // Add attendees if any
+        if (attendees != null && attendees.Count > 0)
+        {
+            googleEvent.Attendees = attendees.Select(a => new EventAttendee
+            {
+                Email = a.Email,
+                DisplayName = a.Name,
+                Optional = a.IsOptionalAttendee
+            }).ToList();
+        }
+
+        // Update the event using Google Calendar API
+        var updateRequest = _calendarService.Events.Update(googleEvent, calendar.RemoteCalendarId, remoteEventId);
+
+        // Send notifications to attendees if the event has attendees
+        updateRequest.SendUpdates = (attendees != null && attendees.Count > 0)
+            ? Google.Apis.Calendar.v3.EventsResource.UpdateRequest.SendUpdatesEnum.All
+            : Google.Apis.Calendar.v3.EventsResource.UpdateRequest.SendUpdatesEnum.None;
+
+        return [new HttpRequestBundle<IClientServiceRequest>(updateRequest, request)];
+    }
+
+    public override List<IRequestBundle<IClientServiceRequest>> DeleteCalendarEvent(DeleteCalendarEventRequest request)
+    {
+        var calendarItem = request.Item;
+
+        // Get the calendar for this event
+        var calendar = calendarItem.AssignedCalendar;
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot delete event without remote event ID");
+        }
+
+        var deleteRequest = _calendarService.Events.Delete(calendar.RemoteCalendarId, remoteEventId);
+
+        // Send cancellation notifications to attendees
+        deleteRequest.SendUpdates = Google.Apis.Calendar.v3.EventsResource.DeleteRequest.SendUpdatesEnum.All;
+
+        return [new HttpRequestBundle<IClientServiceRequest>(deleteRequest, request)];
+    }
+
     #endregion
 
     public override async Task KillSynchronizerAsync()
@@ -1411,6 +2661,96 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
         _gmailService.Dispose();
         _peopleService.Dispose();
         _calendarService.Dispose();
+        _driveService.Dispose();
         _googleHttpClient.Dispose();
     }
+
+    private async Task UploadCalendarEventAttachmentsAsync(CreateCalendarEventRequest request, Event createdEvent, CancellationToken cancellationToken)
+    {
+        var composeAttachments = request.ComposeResult.Attachments ?? [];
+        if (composeAttachments.Count == 0)
+            return;
+
+        if (composeAttachments.Count > 25)
+            throw new InvalidOperationException("Google Calendar supports at most 25 attachments per event.");
+
+        var eventAttachments = createdEvent.Attachments?
+            .Where(attachment => attachment != null && !string.IsNullOrWhiteSpace(attachment.FileUrl))
+            .ToList() ?? [];
+
+        foreach (var attachment in composeAttachments.Where(a => !string.IsNullOrWhiteSpace(a.FilePath) && File.Exists(a.FilePath)))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            eventAttachments.Add(await UploadAttachmentToDriveAsync(attachment, cancellationToken).ConfigureAwait(false));
+        }
+
+        if (eventAttachments.Count == 0)
+            return;
+
+        var patchRequest = _calendarService.Events.Patch(new Event
+        {
+            Attachments = eventAttachments
+        }, request.AssignedCalendar.RemoteCalendarId, createdEvent.Id);
+
+        patchRequest.SupportsAttachments = true;
+        patchRequest.SendUpdates = Google.Apis.Calendar.v3.EventsResource.PatchRequest.SendUpdatesEnum.None;
+
+        await patchRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<EventAttachment> UploadAttachmentToDriveAsync(
+        Wino.Core.Domain.Models.Calendar.CalendarEventComposeAttachmentDraft attachment,
+        CancellationToken cancellationToken)
+    {
+        var fileName = string.IsNullOrWhiteSpace(attachment.FileName)
+            ? Path.GetFileName(attachment.FilePath)
+            : attachment.FileName;
+        var contentType = MimeTypes.GetMimeType(fileName);
+
+        await using var fileStream = File.OpenRead(attachment.FilePath);
+
+        var uploadRequest = _driveService.Files.Create(new DriveFile
+        {
+            Name = fileName,
+            MimeType = contentType
+        }, fileStream, contentType);
+        uploadRequest.Fields = "id,name,mimeType,webViewLink";
+
+        var uploadProgress = await uploadRequest.UploadAsync(cancellationToken).ConfigureAwait(false);
+
+        if (uploadProgress.Status != UploadStatus.Completed)
+        {
+            throw new InvalidOperationException(
+                $"Failed to upload '{fileName}' to Google Drive. Upload status: {uploadProgress.Status}.");
+        }
+
+        var uploadedFile = uploadRequest.ResponseBody;
+        if (uploadedFile == null || string.IsNullOrWhiteSpace(uploadedFile.Id) || string.IsNullOrWhiteSpace(uploadedFile.WebViewLink))
+        {
+            throw new InvalidOperationException($"Google Drive did not return a valid attachment link for '{fileName}'.");
+        }
+
+        return new EventAttachment
+        {
+            FileId = uploadedFile.Id,
+            FileUrl = uploadedFile.WebViewLink,
+            MimeType = uploadedFile.MimeType ?? contentType,
+            Title = uploadedFile.Name ?? fileName
+        };
+    }
+
+    private static TimeSpan ResolveOffset(DateTime dateTime, string timeZoneId)
+    {
+        if (string.IsNullOrWhiteSpace(timeZoneId))
+            return TimeSpan.Zero;
+
+        try
+        {
+            return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId).GetUtcOffset(dateTime);
+        }
+        catch
+        {
+            return TimeSpan.Zero;
+        }
+    }
 }
diff --git a/Wino.Core/Synchronizers/ImapSync/CondstoreSynchronizer.cs b/Wino.Core/Synchronizers/ImapSync/CondstoreSynchronizer.cs
deleted file mode 100644
index 5bc89f4f..00000000
--- a/Wino.Core/Synchronizers/ImapSync/CondstoreSynchronizer.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MailKit;
-using MailKit.Net.Imap;
-using MailKit.Search;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Integration;
-using IMailService = Wino.Core.Domain.Interfaces.IMailService;
-
-namespace Wino.Core.Synchronizers.ImapSync;
-
-/// <summary>
-/// RFC 4551 CONDSTORE IMAP Synchronization strategy.
-/// </summary>
-internal class CondstoreSynchronizer : ImapSynchronizationStrategyBase
-{
-    public CondstoreSynchronizer(IFolderService folderService, IMailService mailService) : base(folderService, mailService)
-    {
-    }
-
-    public async override Task<List<string>> HandleSynchronizationAsync(IImapClient client,
-                                                                          MailItemFolder folder,
-                                                                          IImapSynchronizer synchronizer,
-                                                                          CancellationToken cancellationToken = default)
-    {
-        if (client is not WinoImapClient winoClient)
-            throw new ArgumentException("Client must be of type WinoImapClient.", nameof(client));
-
-        if (!client.Capabilities.HasFlag(ImapCapabilities.CondStore))
-            throw new ImapSynchronizerStrategyException("Server does not support CONDSTORE.");
-
-        IMailFolder remoteFolder = null;
-
-        var downloadedMessageIds = new List<string>();
-
-        Folder = folder;
-
-        try
-        {
-            remoteFolder = await winoClient.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
-
-            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
-
-            var localHighestModSeq = (ulong)folder.HighestModeSeq;
-
-            bool isInitialSynchronization = localHighestModSeq == 0;
-
-            // There are some changes on new messages or flag changes.
-            // Deletions are tracked separately because some servers do not increase
-            // the MODSEQ value for deleted messages.
-            if (remoteFolder.HighestModSeq > localHighestModSeq)
-            {
-                var changedUids = await GetChangedUidsAsync(client, remoteFolder, synchronizer, cancellationToken).ConfigureAwait(false);
-
-                // Get locally exists mails for the returned UIDs.
-                downloadedMessageIds = await HandleChangedUIdsAsync(synchronizer, remoteFolder, changedUids, cancellationToken).ConfigureAwait(false);
-
-                folder.HighestModeSeq = unchecked((long)remoteFolder.HighestModSeq);
-
-                await FolderService.UpdateFolderAsync(folder).ConfigureAwait(false);
-            }
-
-            await ManageUUIdBasedDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
-
-            return downloadedMessageIds;
-        }
-        catch (FolderNotFoundException)
-        {
-            await FolderService.DeleteFolderAsync(folder.MailAccountId, folder.RemoteFolderId).ConfigureAwait(false);
-
-            return default;
-        }
-        catch (Exception)
-        {
-            throw;
-        }
-        finally
-        {
-            if (!cancellationToken.IsCancellationRequested)
-            {
-                if (remoteFolder != null)
-                {
-                    if (remoteFolder.IsOpen)
-                    {
-                        await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    }
-                }
-            }
-        }
-    }
-
-    internal override async Task<IList<UniqueId>> GetChangedUidsAsync(IImapClient winoClient, IMailFolder remoteFolder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default)
-    {
-        var localHighestModSeq = (ulong)Folder.HighestModeSeq;
-        var remoteHighestModSeq = remoteFolder.HighestModSeq;
-
-        // Search for emails with a MODSEQ greater than the last known value.
-        // Use SORT extension if server supports.
-
-        IList<UniqueId> changedUids = null;
-
-        if (winoClient.Capabilities.HasFlag(ImapCapabilities.Sort))
-        {
-            // Highest mod seq must be greater than 0 for SORT.
-            changedUids = await remoteFolder.SortAsync(SearchQuery.ChangedSince(Math.Max(localHighestModSeq, 1)), [OrderBy.ReverseDate], cancellationToken).ConfigureAwait(false);
-        }
-        else
-        {
-            changedUids = await remoteFolder.SearchAsync(SearchQuery.ChangedSince(localHighestModSeq), cancellationToken).ConfigureAwait(false);
-        }
-
-        changedUids = await remoteFolder.SearchAsync(SearchQuery.ChangedSince(localHighestModSeq), cancellationToken).ConfigureAwait(false);
-
-        // For initial synchronizations, take the first allowed number of items.
-        // For consequtive synchronizations, take all the items. We don't want to miss any changes.
-        // Smaller uid means newer message. For initial sync, we need start taking items from the top.
-
-        bool isInitialSynchronization = localHighestModSeq == 0;
-
-        if (isInitialSynchronization)
-        {
-            changedUids = changedUids.OrderByDescending(a => a.Id).Take((int)synchronizer.InitialMessageDownloadCountPerFolder).ToList();
-        }
-
-        return changedUids;
-    }
-}
diff --git a/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyBase.cs b/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyBase.cs
deleted file mode 100644
index ae40e56a..00000000
--- a/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyBase.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MailKit;
-using MailKit.Net.Imap;
-using MailKit.Search;
-using MoreLinq;
-using Serilog;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Services.Extensions;
-using IMailService = Wino.Core.Domain.Interfaces.IMailService;
-
-namespace Wino.Core.Synchronizers.ImapSync;
-
-public abstract class ImapSynchronizationStrategyBase : IImapSynchronizerStrategy
-{
-    // Minimum summary items to Fetch for mail synchronization from IMAP.
-    protected readonly MessageSummaryItems MailSynchronizationFlags =
-        MessageSummaryItems.Flags |
-        MessageSummaryItems.UniqueId |
-        MessageSummaryItems.ThreadId |
-        MessageSummaryItems.EmailId |
-        MessageSummaryItems.Headers |
-        MessageSummaryItems.PreviewText |
-        MessageSummaryItems.GMailThreadId |
-        MessageSummaryItems.References |
-        MessageSummaryItems.ModSeq;
-
-    protected IFolderService FolderService { get; }
-    protected IMailService MailService { get; }
-    protected MailItemFolder Folder { get; set; }
-
-    protected ImapSynchronizationStrategyBase(IFolderService folderService, IMailService mailService)
-    {
-        FolderService = folderService;
-        MailService = mailService;
-    }
-
-    public abstract Task<List<string>> HandleSynchronizationAsync(IImapClient client, MailItemFolder folder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default);
-    internal abstract Task<IList<UniqueId>> GetChangedUidsAsync(IImapClient client, IMailFolder remoteFolder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default);
-
-    protected async Task<List<string>> HandleChangedUIdsAsync(IImapSynchronizer synchronizer,
-                                                              IMailFolder remoteFolder,
-                                                              IList<UniqueId> changedUids,
-                                                              CancellationToken cancellationToken)
-    {
-        List<string> downloadedMessageIds = new();
-
-        var existingMails = await MailService.GetExistingMailsAsync(Folder.Id, changedUids).ConfigureAwait(false);
-        var existingMailUids = existingMails.Select(m => MailkitClientExtensions.ResolveUidStruct(m.Id)).ToArray();
-
-        // These are the non-existing mails. They will be downloaded + processed.
-        var newMessageIds = changedUids.Except(existingMailUids).ToList();
-        var deletedMessageIds = existingMailUids.Except(changedUids).ToList();
-
-        // Fetch minimum data for the existing mails in one query.
-        var existingFlagData = await remoteFolder.FetchAsync(existingMailUids, MessageSummaryItems.Flags | MessageSummaryItems.UniqueId).ConfigureAwait(false);
-
-        foreach (var update in existingFlagData)
-        {
-            if (update.UniqueId == UniqueId.Invalid)
-            {
-                Log.Warning($"Couldn't fetch UniqueId for the mail. FetchAsync failed.");
-                continue;
-            }
-
-            if (update.Flags == null)
-            {
-                Log.Warning($"Couldn't fetch flags for the mail with UID {update.UniqueId.Id}. FetchAsync failed.");
-                continue;
-            }
-
-            var existingMail = existingMails.FirstOrDefault(m => MailkitClientExtensions.ResolveUidStruct(m.Id).Id == update.UniqueId.Id);
-
-            if (existingMail == null)
-            {
-                Log.Warning($"Couldn't find the mail with UID {update.UniqueId.Id} in the local database. Flag update is ignored.");
-                continue;
-            }
-
-            await HandleMessageFlagsChangeAsync(existingMail, update.Flags.Value).ConfigureAwait(false);
-        }
-
-        // Fetch the new mails in batch.
-
-        var batchedMessageIds = newMessageIds.Batch(50).ToList();
-        // Create tasks for each batch.
-        foreach (var group in batchedMessageIds)
-        {
-            downloadedMessageIds.AddRange(group.Select(a => MailkitClientExtensions.CreateUid(Folder.Id, a.Id)));
-
-            await DownloadMessagesAsync(synchronizer, remoteFolder, Folder, new UniqueIdSet(group, SortOrder.Ascending), cancellationToken).ConfigureAwait(false);
-        }
-
-        return downloadedMessageIds;
-    }
-
-    protected async Task HandleMessageFlagsChangeAsync(UniqueId? uniqueId, MessageFlags flags)
-    {
-        if (Folder == null) return;
-        if (uniqueId == null) return;
-
-        var localMailCopyId = MailkitClientExtensions.CreateUid(Folder.Id, uniqueId.Value.Id);
-
-        var isFlagged = MailkitClientExtensions.GetIsFlagged(flags);
-        var isRead = MailkitClientExtensions.GetIsRead(flags);
-
-        await MailService.ChangeReadStatusAsync(localMailCopyId, isRead).ConfigureAwait(false);
-        await MailService.ChangeFlagStatusAsync(localMailCopyId, isFlagged).ConfigureAwait(false);
-    }
-
-    protected async Task HandleMessageFlagsChangeAsync(MailCopy mailCopy, MessageFlags flags)
-    {
-        if (mailCopy == null) return;
-
-        var isFlagged = MailkitClientExtensions.GetIsFlagged(flags);
-        var isRead = MailkitClientExtensions.GetIsRead(flags);
-
-        if (isFlagged != mailCopy.IsFlagged)
-        {
-            await MailService.ChangeFlagStatusAsync(mailCopy.Id, isFlagged).ConfigureAwait(false);
-        }
-
-        if (isRead != mailCopy.IsRead)
-        {
-            await MailService.ChangeReadStatusAsync(mailCopy.Id, isRead).ConfigureAwait(false);
-        }
-    }
-
-    protected async Task HandleMessageDeletedAsync(IList<UniqueId> uniqueIds)
-    {
-        if (Folder == null) return;
-        if (uniqueIds == null || uniqueIds.Count == 0) return;
-
-        foreach (var uniqueId in uniqueIds)
-        {
-            if (uniqueId == null) continue;
-            var localMailCopyId = MailkitClientExtensions.CreateUid(Folder.Id, uniqueId.Id);
-
-            await MailService.DeleteMailAsync(Folder.MailAccountId, localMailCopyId).ConfigureAwait(false);
-        }
-    }
-
-    protected void OnMessagesVanished(object sender, MessagesVanishedEventArgs args)
-        => HandleMessageDeletedAsync(args.UniqueIds).ConfigureAwait(false);
-
-    protected void OnMessageFlagsChanged(object sender, MessageFlagsChangedEventArgs args)
-        => HandleMessageFlagsChangeAsync(args.UniqueId, args.Flags).ConfigureAwait(false);
-
-    protected async Task ManageUUIdBasedDeletedMessagesAsync(MailItemFolder localFolder, IMailFolder remoteFolder, CancellationToken cancellationToken = default)
-    {
-        var allUids = (await FolderService.GetKnownUidsForFolderAsync(localFolder.Id)).Select(a => new UniqueId(a)).ToList();
-
-        if (allUids.Count > 0)
-        {
-            var remoteAllUids = await remoteFolder.SearchAsync(SearchQuery.All, cancellationToken);
-            var deletedUids = allUids.Except(remoteAllUids).ToList();
-
-            await HandleMessageDeletedAsync(deletedUids).ConfigureAwait(false);
-        }
-    }
-
-    public async Task DownloadMessagesAsync(IImapSynchronizer synchronizer,
-                                            IMailFolder folder,
-                                            MailItemFolder localFolder,
-                                            UniqueIdSet uniqueIdSet,
-                                            CancellationToken cancellationToken = default)
-    {
-        var summaries = await folder.FetchAsync(uniqueIdSet, MailSynchronizationFlags, cancellationToken).ConfigureAwait(false);
-
-        foreach (var summary in summaries)
-        {
-            var mimeMessage = await folder.GetMessageAsync(summary.UniqueId, cancellationToken).ConfigureAwait(false);
-
-            var creationPackage = new ImapMessageCreationPackage(summary, mimeMessage);
-
-            var mailPackages = await synchronizer.CreateNewMailPackagesAsync(creationPackage, localFolder, cancellationToken).ConfigureAwait(false);
-
-            if (mailPackages != null)
-            {
-                foreach (var package in mailPackages)
-                {
-                    // Local draft is mapped. We don't need to create a new mail copy.
-                    if (package == null) continue;
-
-                    await MailService.CreateMailAsync(localFolder.MailAccountId, package).ConfigureAwait(false);
-                }
-            }
-        }
-    }
-}
diff --git a/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyProvider.cs b/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyProvider.cs
deleted file mode 100644
index 25c7d93e..00000000
--- a/Wino.Core/Synchronizers/ImapSync/ImapSynchronizationStrategyProvider.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using MailKit.Net.Imap;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Integration;
-
-namespace Wino.Core.Synchronizers.ImapSync;
-
-internal class ImapSynchronizationStrategyProvider : IImapSynchronizationStrategyProvider
-{
-    private readonly QResyncSynchronizer _qResyncSynchronizer;
-    private readonly CondstoreSynchronizer _condstoreSynchronizer;
-    private readonly UidBasedSynchronizer _uidBasedSynchronizer;
-
-    public ImapSynchronizationStrategyProvider(QResyncSynchronizer qResyncSynchronizer, CondstoreSynchronizer condstoreSynchronizer, UidBasedSynchronizer uidBasedSynchronizer)
-    {
-        _qResyncSynchronizer = qResyncSynchronizer;
-        _condstoreSynchronizer = condstoreSynchronizer;
-        _uidBasedSynchronizer = uidBasedSynchronizer;
-    }
-
-    public IImapSynchronizerStrategy GetSynchronizationStrategy(IImapClient client)
-    {
-        if (client is not WinoImapClient winoImapClient)
-            throw new System.ArgumentException("Client must be of type WinoImapClient.", nameof(client));
-
-        if (client.Capabilities.HasFlag(ImapCapabilities.QuickResync) && winoImapClient.IsQResyncEnabled) return _qResyncSynchronizer;
-        if (client.Capabilities.HasFlag(ImapCapabilities.CondStore)) return _condstoreSynchronizer;
-
-        return _uidBasedSynchronizer;
-    }
-}
diff --git a/Wino.Core/Synchronizers/ImapSync/QResyncSynchronizer.cs b/Wino.Core/Synchronizers/ImapSync/QResyncSynchronizer.cs
deleted file mode 100644
index 5316336e..00000000
--- a/Wino.Core/Synchronizers/ImapSync/QResyncSynchronizer.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MailKit;
-using MailKit.Net.Imap;
-using MailKit.Search;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Integration;
-using IMailService = Wino.Core.Domain.Interfaces.IMailService;
-
-namespace Wino.Core.Synchronizers.ImapSync;
-
-/// <summary>
-/// RFC 5162 QRESYNC IMAP Synchronization strategy.
-/// </summary>
-internal class QResyncSynchronizer : ImapSynchronizationStrategyBase
-{
-    public QResyncSynchronizer(IFolderService folderService, IMailService mailService) : base(folderService, mailService)
-    {
-    }
-
-    public override async Task<List<string>> HandleSynchronizationAsync(IImapClient client,
-                                                                        MailItemFolder folder,
-                                                                        IImapSynchronizer synchronizer,
-                                                                        CancellationToken cancellationToken = default)
-    {
-        var downloadedMessageIds = new List<string>();
-
-        if (client is not WinoImapClient winoClient)
-            throw new ImapSynchronizerStrategyException("Client must be of type WinoImapClient.");
-
-        if (!client.Capabilities.HasFlag(ImapCapabilities.QuickResync))
-            throw new ImapSynchronizerStrategyException("Server does not support QRESYNC.");
-
-        if (!winoClient.IsQResyncEnabled)
-            throw new ImapSynchronizerStrategyException("QRESYNC is not enabled for WinoImapClient.");
-
-        // Ready to implement QRESYNC synchronization.
-
-        IMailFolder remoteFolder = null;
-
-        Folder = folder;
-
-        try
-        {
-            remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
-
-            // Check the Uid validity first.
-            // If they don't match, clear all the local data and perform full-resync.
-
-            bool isCacheValid = remoteFolder.UidValidity == folder.UidValidity;
-
-            if (!isCacheValid)
-            {
-                // TODO: Remove all local data.
-            }
-
-            // Perform QRESYNC synchronization.
-            var localHighestModSeq = (ulong)folder.HighestModeSeq;
-            // HIGHESTMODSEQ must be a positive integer, 0 is illegal.
-            // It's harmless to set it to 1, as RFC-compliant server without mod-seq would ignore this parameter.
-            if (localHighestModSeq == 0) localHighestModSeq = 1;
-
-            remoteFolder.MessagesVanished += OnMessagesVanished;
-            remoteFolder.MessageFlagsChanged += OnMessageFlagsChanged;
-
-            var allUids = await FolderService.GetKnownUidsForFolderAsync(folder.Id);
-            var allUniqueIds = allUids.Select(a => new UniqueId(a)).ToList();
-
-            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, folder.UidValidity, localHighestModSeq, allUniqueIds).ConfigureAwait(false);
-
-            var changedUids = await GetChangedUidsAsync(client, remoteFolder, synchronizer, cancellationToken).ConfigureAwait(false);
-
-            downloadedMessageIds = await HandleChangedUIdsAsync(synchronizer, remoteFolder, changedUids, cancellationToken).ConfigureAwait(false);
-
-            // Update the local folder with the new highest mod-seq and validity.
-            folder.HighestModeSeq = unchecked((long)remoteFolder.HighestModSeq);
-            folder.UidValidity = remoteFolder.UidValidity;
-
-            await ManageUUIdBasedDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
-
-            await FolderService.UpdateFolderAsync(folder).ConfigureAwait(false);
-        }
-        catch (FolderNotFoundException)
-        {
-            await FolderService.DeleteFolderAsync(folder.MailAccountId, folder.RemoteFolderId).ConfigureAwait(false);
-
-            return default;
-        }
-        catch (Exception)
-        {
-            throw;
-        }
-        finally
-        {
-            if (!cancellationToken.IsCancellationRequested)
-            {
-                if (remoteFolder != null)
-                {
-                    remoteFolder.MessagesVanished -= OnMessagesVanished;
-                    remoteFolder.MessageFlagsChanged -= OnMessageFlagsChanged;
-
-                    if (remoteFolder.IsOpen)
-                    {
-                        await remoteFolder.CloseAsync();
-                    }
-                }
-            }
-        }
-
-        return downloadedMessageIds;
-    }
-
-    internal override async Task<IList<UniqueId>> GetChangedUidsAsync(IImapClient client, IMailFolder remoteFolder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default)
-    {
-        var localHighestModSeq = (ulong)Folder.HighestModeSeq;
-        if (localHighestModSeq == 0) localHighestModSeq = 1;
-        return await remoteFolder.SearchAsync(SearchQuery.ChangedSince(localHighestModSeq), cancellationToken).ConfigureAwait(false);
-    }
-}
diff --git a/Wino.Core/Synchronizers/ImapSync/UidBasedSynchronizer.cs b/Wino.Core/Synchronizers/ImapSync/UidBasedSynchronizer.cs
deleted file mode 100644
index 6f67be3a..00000000
--- a/Wino.Core/Synchronizers/ImapSync/UidBasedSynchronizer.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MailKit;
-using MailKit.Net.Imap;
-using MailKit.Search;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Integration;
-
-namespace Wino.Core.Synchronizers.ImapSync;
-
-/// <summary>
-/// Uid based IMAP Synchronization strategy.
-/// </summary>
-internal class UidBasedSynchronizer : ImapSynchronizationStrategyBase
-{
-    public UidBasedSynchronizer(IFolderService folderService, Domain.Interfaces.IMailService mailService) : base(folderService, mailService)
-    {
-    }
-
-    public override async Task<List<string>> HandleSynchronizationAsync(IImapClient client, MailItemFolder folder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default)
-    {
-        if (client is not WinoImapClient winoClient)
-            throw new ArgumentException("Client must be of type WinoImapClient.", nameof(client));
-
-        Folder = folder;
-
-        var downloadedMessageIds = new List<string>();
-        IMailFolder remoteFolder = null;
-
-        try
-        {
-            remoteFolder = await winoClient.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
-
-            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
-
-            // Fetch UIDs from the remote folder
-            var remoteUids = await remoteFolder.SearchAsync(SearchQuery.All, cancellationToken).ConfigureAwait(false);
-
-            remoteUids = remoteUids.OrderByDescending(a => a.Id).Take((int)synchronizer.InitialMessageDownloadCountPerFolder).ToList();
-
-            await HandleChangedUIdsAsync(synchronizer, remoteFolder, remoteUids, cancellationToken).ConfigureAwait(false);
-            await ManageUUIdBasedDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
-        }
-        catch (FolderNotFoundException)
-        {
-            await FolderService.DeleteFolderAsync(folder.MailAccountId, folder.RemoteFolderId).ConfigureAwait(false);
-
-            return default;
-        }
-        catch (Exception)
-        {
-
-            throw;
-        }
-        finally
-        {
-            if (!cancellationToken.IsCancellationRequested)
-            {
-                if (remoteFolder != null)
-                {
-                    if (remoteFolder.IsOpen)
-                    {
-                        await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                    }
-                }
-            }
-        }
-
-        return downloadedMessageIds;
-    }
-
-    internal override Task<IList<UniqueId>> GetChangedUidsAsync(IImapClient client, IMailFolder remoteFolder, IImapSynchronizer synchronizer, CancellationToken cancellationToken = default)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/Wino.Core/Synchronizers/ImapSync/UnifiedImapSynchronizer.cs b/Wino.Core/Synchronizers/ImapSync/UnifiedImapSynchronizer.cs
new file mode 100644
index 00000000..8ec32bfc
--- /dev/null
+++ b/Wino.Core/Synchronizers/ImapSync/UnifiedImapSynchronizer.cs
@@ -0,0 +1,735 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MailKit;
+using MailKit.Net.Imap;
+using MailKit.Search;
+using MoreLinq;
+using Serilog;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Integration;
+using Wino.Services.Extensions;
+using IMailService = Wino.Core.Domain.Interfaces.IMailService;
+
+namespace Wino.Core.Synchronizers.ImapSync;
+
+/// <summary>
+/// Unified IMAP synchronization strategy that automatically selects the best available method:
+/// 1. QRESYNC (RFC 5162) - Best: supports quick resync with vanished messages
+/// 2. CONDSTORE (RFC 4551) - Good: supports mod-seq based change tracking
+/// 3. UID-based delta - Fallback: tracks UIDNEXT/high-water UID without sequence-number persistence
+/// </summary>
+public class UnifiedImapSynchronizer
+{
+    private static readonly TimeSpan UidReconcileInterval = TimeSpan.FromHours(12);
+
+    private readonly ILogger _logger = Log.ForContext<UnifiedImapSynchronizer>();
+    private readonly IFolderService _folderService;
+    private readonly IMailService _mailService;
+    private readonly IImapSynchronizerErrorHandlerFactory _errorHandlerFactory;
+
+    // Metadata-first synchronization flags: no full MIME body download.
+    private readonly MessageSummaryItems _mailSynchronizationFlags =
+        MessageSummaryItems.Flags |
+        MessageSummaryItems.UniqueId |
+        MessageSummaryItems.InternalDate |
+        MessageSummaryItems.Envelope |
+        MessageSummaryItems.Headers |
+        MessageSummaryItems.PreviewText |
+        MessageSummaryItems.GMailThreadId |
+        MessageSummaryItems.References |
+        MessageSummaryItems.ModSeq |
+        MessageSummaryItems.BodyStructure;
+
+    public UnifiedImapSynchronizer(
+        IFolderService folderService,
+        IMailService mailService,
+        IImapSynchronizerErrorHandlerFactory errorHandlerFactory)
+    {
+        _folderService = folderService;
+        _mailService = mailService;
+        _errorHandlerFactory = errorHandlerFactory;
+    }
+
+    /// <summary>
+    /// Determines the best synchronization strategy based on server capabilities and known quirks.
+    /// </summary>
+    public ImapSyncStrategy DetermineSyncStrategy(IImapClient client, string serverHost)
+    {
+        var capabilities = client.Capabilities;
+        var isQResyncEnabled = client is WinoImapClient winoClient && winoClient.IsQResyncEnabled;
+
+        return DetermineSyncStrategy(capabilities, isQResyncEnabled, serverHost);
+    }
+
+    public ImapSyncStrategy DetermineSyncStrategy(ImapCapabilities capabilities, bool isQResyncEnabled, string serverHost = null)
+    {
+        var quirks = ImapServerQuirks.Resolve(serverHost);
+
+        if (!quirks.DisableQResync && capabilities.HasFlag(ImapCapabilities.QuickResync) && isQResyncEnabled)
+            return ImapSyncStrategy.QResync;
+
+        if (!quirks.DisableCondstore && capabilities.HasFlag(ImapCapabilities.CondStore))
+            return ImapSyncStrategy.Condstore;
+
+        return ImapSyncStrategy.UidBased;
+    }
+
+    /// <summary>
+    /// Main synchronization entry point. Automatically selects the best strategy.
+    /// </summary>
+    public async Task<FolderSyncResult> SynchronizeFolderAsync(
+        IImapClient client,
+        MailItemFolder folder,
+        IImapSynchronizer synchronizer,
+        string serverHost,
+        CancellationToken cancellationToken = default)
+    {
+        var strategy = DetermineSyncStrategy(client, serverHost);
+        _logger.Debug("Using {Strategy} sync strategy for folder {FolderName}", strategy, folder.FolderName);
+
+        var originalHighestModeSeq = folder.HighestModeSeq;
+        var originalUidValidity = folder.UidValidity;
+        var originalHighestKnownUid = folder.HighestKnownUid;
+        var originalLastUidReconcileUtc = folder.LastUidReconcileUtc;
+
+        try
+        {
+            var downloadedIds = strategy switch
+            {
+                ImapSyncStrategy.QResync => await SynchronizeWithQResyncAsync(client, folder, synchronizer, cancellationToken).ConfigureAwait(false),
+                ImapSyncStrategy.Condstore => await SynchronizeWithCondstoreAsync(client, folder, synchronizer, cancellationToken).ConfigureAwait(false),
+                _ => await SynchronizeWithUidDeltaAsync(client, folder, synchronizer, cancellationToken).ConfigureAwait(false)
+            };
+
+            bool highestModeSeqChanged = folder.HighestModeSeq != originalHighestModeSeq;
+            bool requiresFullFolderUpdate =
+                folder.UidValidity != originalUidValidity
+                || folder.HighestKnownUid != originalHighestKnownUid
+                || folder.LastUidReconcileUtc != originalLastUidReconcileUtc;
+
+            if (requiresFullFolderUpdate)
+            {
+                // Persist all sync-state fields in one write when any non-mod-seq token changed.
+                await _folderService.UpdateFolderAsync(folder).ConfigureAwait(false);
+            }
+            else if (highestModeSeqChanged)
+            {
+                // Avoid full-folder write when only mod-seq changed.
+                await _folderService.UpdateFolderHighestModeSeqAsync(folder.Id, folder.HighestModeSeq).ConfigureAwait(false);
+            }
+
+            return FolderSyncResult.Successful(folder.Id, folder.FolderName, downloadedIds.Count);
+        }
+        catch (FolderNotFoundException)
+        {
+            _logger.Warning("Folder {FolderName} not found on server, deleting locally", folder.FolderName);
+            await _folderService.DeleteFolderAsync(folder.MailAccountId, folder.RemoteFolderId).ConfigureAwait(false);
+
+            return FolderSyncResult.Skipped(folder.Id, folder.FolderName, "Folder not found on server");
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            var errorContext = new SynchronizerErrorContext
+            {
+                ErrorMessage = ex.Message,
+                Exception = ex,
+                FolderId = folder.Id,
+                FolderName = folder.FolderName,
+                OperationType = "ImapFolderSync"
+            };
+
+            _ = await _errorHandlerFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+            if (errorContext.CanContinueSync)
+            {
+                _logger.Warning(ex, "Folder {FolderName} sync failed with recoverable error", folder.FolderName);
+                return FolderSyncResult.Failed(folder.Id, folder.FolderName, errorContext);
+            }
+
+            _logger.Error(ex, "Folder {FolderName} sync failed with fatal error", folder.FolderName);
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Metadata-only message download helper used by IMAP online search.
+    /// </summary>
+    public async Task<List<string>> DownloadMessagesByUidsAsync(
+        IImapClient client,
+        IMailFolder remoteFolder,
+        MailItemFolder localFolder,
+        IList<UniqueId> uids,
+        IImapSynchronizer synchronizer,
+        CancellationToken cancellationToken = default)
+    {
+        if (uids == null || uids.Count == 0)
+            return [];
+
+        if (!remoteFolder.IsOpen)
+            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+
+        var downloadedMessageIds = new List<string>();
+
+        foreach (var batch in uids.Distinct().OrderBy(a => a.Id).Batch(50))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var summaryBatch = await remoteFolder
+                .FetchAsync(new UniqueIdSet(batch.ToList(), SortOrder.Ascending), _mailSynchronizationFlags, cancellationToken)
+                .ConfigureAwait(false);
+
+            downloadedMessageIds.AddRange(await ProcessSummariesAsync(synchronizer, localFolder, summaryBatch, cancellationToken).ConfigureAwait(false));
+        }
+
+        UpdateHighestKnownUid(localFolder, remoteFolder, uids.Select(a => a.Id));
+        return downloadedMessageIds;
+    }
+
+    #region Strategy Implementations
+
+    private async Task<List<string>> SynchronizeWithQResyncAsync(
+        IImapClient client,
+        MailItemFolder folder,
+        IImapSynchronizer synchronizer,
+        CancellationToken cancellationToken)
+    {
+        if (client is not WinoImapClient)
+            throw new InvalidOperationException("QRESYNC requires WinoImapClient.");
+
+        var downloadedMessageIds = new List<string>();
+        IMailFolder remoteFolder = null;
+
+        var vanishedUids = new List<UniqueId>();
+        var changedFlags = new Dictionary<uint, MessageFlags>();
+
+        void OnMessagesVanished(object sender, MessagesVanishedEventArgs args)
+        {
+            lock (vanishedUids)
+            {
+                vanishedUids.AddRange(args.UniqueIds);
+            }
+        }
+
+        void OnMessageFlagsChanged(object sender, MessageFlagsChangedEventArgs args)
+        {
+            if (args.UniqueId is not UniqueId uniqueId)
+                return;
+
+            lock (changedFlags)
+            {
+                changedFlags[uniqueId.Id] = args.Flags;
+            }
+        }
+
+        try
+        {
+            remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
+
+            // Open once to validate UIDVALIDITY and reset local state if needed.
+            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+            await EnsureUidValidityStateAsync(folder, remoteFolder).ConfigureAwait(false);
+            await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            var knownUids = await _folderService.GetKnownUidsForFolderAsync(folder.Id).ConfigureAwait(false);
+            var knownUidStructs = knownUids.Select(a => new UniqueId(a)).ToList();
+            var localHighestModSeq = (ulong)Math.Max(folder.HighestModeSeq, 1);
+
+            remoteFolder.MessagesVanished += OnMessagesVanished;
+            remoteFolder.MessageFlagsChanged += OnMessageFlagsChanged;
+
+            await remoteFolder
+                .OpenAsync(FolderAccess.ReadOnly, folder.UidValidity, localHighestModSeq, knownUidStructs, cancellationToken)
+                .ConfigureAwait(false);
+
+            var changedUids = await remoteFolder
+                .SearchAsync(SearchQuery.ChangedSince(localHighestModSeq), cancellationToken)
+                .ConfigureAwait(false);
+
+            downloadedMessageIds = await DownloadMessagesByUidsAsync(client, remoteFolder, folder, changedUids, synchronizer, cancellationToken).ConfigureAwait(false);
+
+            folder.HighestModeSeq = unchecked((long)remoteFolder.HighestModSeq);
+
+            await ApplyFlagChangesAsync(folder, changedFlags).ConfigureAwait(false);
+            await ApplyDeletedUidsAsync(folder, vanishedUids).ConfigureAwait(false);
+
+            if (ShouldRunUidReconcile(folder))
+            {
+                await ReconcileDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
+            }
+        }
+        finally
+        {
+            if (remoteFolder != null)
+            {
+                remoteFolder.MessagesVanished -= OnMessagesVanished;
+                remoteFolder.MessageFlagsChanged -= OnMessageFlagsChanged;
+
+                if (remoteFolder.IsOpen && !cancellationToken.IsCancellationRequested)
+                {
+                    await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                }
+            }
+        }
+
+        return downloadedMessageIds;
+    }
+
+    private async Task<List<string>> SynchronizeWithCondstoreAsync(
+        IImapClient client,
+        MailItemFolder folder,
+        IImapSynchronizer synchronizer,
+        CancellationToken cancellationToken)
+    {
+        var downloadedMessageIds = new List<string>();
+        IMailFolder remoteFolder = null;
+
+        try
+        {
+            remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
+            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+
+            await EnsureUidValidityStateAsync(folder, remoteFolder).ConfigureAwait(false);
+
+            var localHighestModSeq = (ulong)Math.Max(folder.HighestModeSeq, 1);
+            bool isInitialSync = folder.HighestModeSeq == 0;
+
+            if (remoteFolder.HighestModSeq > localHighestModSeq || isInitialSync)
+            {
+                IList<UniqueId> changedUids;
+
+                if (client.Capabilities.HasFlag(ImapCapabilities.Sort))
+                {
+                    changedUids = await remoteFolder
+                        .SortAsync(SearchQuery.ChangedSince(localHighestModSeq), [OrderBy.ReverseDate], cancellationToken)
+                        .ConfigureAwait(false);
+                }
+                else
+                {
+                    changedUids = await remoteFolder
+                        .SearchAsync(SearchQuery.ChangedSince(localHighestModSeq), cancellationToken)
+                        .ConfigureAwait(false);
+                }
+
+                if (isInitialSync)
+                {
+                    changedUids = changedUids
+                        .OrderByDescending(a => a.Id)
+                        .Take((int)synchronizer.InitialMessageDownloadCountPerFolder)
+                        .ToList();
+                }
+
+                downloadedMessageIds = await DownloadMessagesByUidsAsync(client, remoteFolder, folder, changedUids, synchronizer, cancellationToken).ConfigureAwait(false);
+                folder.HighestModeSeq = unchecked((long)remoteFolder.HighestModSeq);
+            }
+
+            if (ShouldRunUidReconcile(folder))
+            {
+                await ReconcileDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
+            }
+        }
+        finally
+        {
+            if (remoteFolder?.IsOpen == true && !cancellationToken.IsCancellationRequested)
+            {
+                await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+        }
+
+        return downloadedMessageIds;
+    }
+
+    private async Task<List<string>> SynchronizeWithUidDeltaAsync(
+        IImapClient client,
+        MailItemFolder folder,
+        IImapSynchronizer synchronizer,
+        CancellationToken cancellationToken)
+    {
+        var downloadedMessageIds = new List<string>();
+        IMailFolder remoteFolder = null;
+
+        try
+        {
+            remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
+            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+
+            await EnsureUidValidityStateAsync(folder, remoteFolder).ConfigureAwait(false);
+
+            if (folder.HighestKnownUid == 0)
+            {
+                var remoteUids = await remoteFolder.SearchAsync(SearchQuery.All, cancellationToken).ConfigureAwait(false);
+
+                var initialUids = remoteUids
+                    .OrderByDescending(a => a.Id)
+                    .Take((int)synchronizer.InitialMessageDownloadCountPerFolder)
+                    .ToList();
+
+                downloadedMessageIds = await DownloadMessagesByUidsAsync(client, remoteFolder, folder, initialUids, synchronizer, cancellationToken).ConfigureAwait(false);
+                UpdateHighestKnownUid(folder, remoteFolder, remoteUids.Select(a => a.Id));
+            }
+            else
+            {
+                var minUid = new UniqueId(folder.HighestKnownUid + 1);
+                var deltaUids = await remoteFolder
+                    .SearchAsync(SearchQuery.Uids(new UniqueIdRange(minUid, UniqueId.MaxValue)), cancellationToken)
+                    .ConfigureAwait(false);
+
+                downloadedMessageIds = await DownloadMessagesByUidsAsync(client, remoteFolder, folder, deltaUids, synchronizer, cancellationToken).ConfigureAwait(false);
+                UpdateHighestKnownUid(folder, remoteFolder, deltaUids.Select(a => a.Id));
+            }
+
+            await ReconcileUidBasedFlagChangesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
+
+            if (ShouldRunUidReconcile(folder))
+            {
+                await ReconcileDeletedMessagesAsync(folder, remoteFolder, cancellationToken).ConfigureAwait(false);
+            }
+        }
+        finally
+        {
+            if (remoteFolder?.IsOpen == true && !cancellationToken.IsCancellationRequested)
+            {
+                await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+        }
+
+        return downloadedMessageIds;
+    }
+
+    #endregion
+
+    #region Shared Helpers
+
+    private async Task EnsureUidValidityStateAsync(MailItemFolder folder, IMailFolder remoteFolder)
+    {
+        if (folder.UidValidity != 0 && remoteFolder.UidValidity != folder.UidValidity)
+        {
+            _logger.Warning("UIDVALIDITY changed for folder {FolderName}. Resetting local folder state.", folder.FolderName);
+
+            var existingMails = await _mailService.GetMailsByFolderIdAsync(folder.Id).ConfigureAwait(false);
+            foreach (var mail in existingMails)
+            {
+                await _mailService.DeleteMailAsync(folder.MailAccountId, mail.Id).ConfigureAwait(false);
+            }
+
+            folder.HighestKnownUid = 0;
+            folder.HighestModeSeq = 0;
+            folder.LastUidReconcileUtc = null;
+        }
+
+        folder.UidValidity = remoteFolder.UidValidity;
+    }
+
+    private async Task<List<string>> ProcessSummariesAsync(
+        IImapSynchronizer synchronizer,
+        MailItemFolder localFolder,
+        IList<IMessageSummary> summaries,
+        CancellationToken cancellationToken)
+    {
+        var downloadedMessageIds = new List<string>();
+
+        if (summaries == null || summaries.Count == 0)
+            return downloadedMessageIds;
+
+        var uniqueIds = summaries
+            .Where(s => s.UniqueId != UniqueId.Invalid)
+            .Select(s => s.UniqueId)
+            .ToList();
+
+        if (uniqueIds.Count == 0)
+            return downloadedMessageIds;
+
+        var existingMails = await _mailService.GetExistingMailsAsync(localFolder.Id, uniqueIds).ConfigureAwait(false);
+        var existingByUid = existingMails
+            .Select(m => (Uid: MailkitClientExtensions.ResolveUidStruct(m.Id), Mail: m))
+            .ToDictionary(a => a.Uid.Id, a => a.Mail);
+
+        foreach (var summary in summaries)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (summary.UniqueId == UniqueId.Invalid)
+                continue;
+
+            if (existingByUid.TryGetValue(summary.UniqueId.Id, out var existingMail))
+            {
+                if (summary.Flags != null)
+                {
+                    await UpdateMailFlagsAsync(existingMail, summary.Flags.Value).ConfigureAwait(false);
+                }
+
+                continue;
+            }
+
+            var creationPackage = new ImapMessageCreationPackage(summary, mimeMessage: null);
+            var mailPackages = await synchronizer.CreateNewMailPackagesAsync(creationPackage, localFolder, cancellationToken).ConfigureAwait(false);
+
+            if (mailPackages == null)
+                continue;
+
+            foreach (var package in mailPackages)
+            {
+                if (package == null)
+                    continue;
+
+                var inserted = await _mailService.CreateMailAsync(localFolder.MailAccountId, package).ConfigureAwait(false);
+                if (inserted)
+                {
+                    downloadedMessageIds.Add(package.Copy.Id);
+                }
+            }
+        }
+
+        return downloadedMessageIds;
+    }
+
+    private async Task UpdateMailFlagsAsync(MailCopy mailCopy, MessageFlags flags)
+    {
+        var isFlagged = MailkitClientExtensions.GetIsFlagged(flags);
+        var isRead = MailkitClientExtensions.GetIsRead(flags);
+
+        if (isFlagged != mailCopy.IsFlagged)
+        {
+            await _mailService.ChangeFlagStatusAsync(mailCopy.Id, isFlagged).ConfigureAwait(false);
+        }
+
+        if (isRead != mailCopy.IsRead)
+        {
+            await _mailService.ChangeReadStatusAsync(mailCopy.Id, isRead).ConfigureAwait(false);
+        }
+    }
+
+    private async Task ApplyDeletedUidsAsync(MailItemFolder folder, IList<UniqueId> uniqueIds)
+    {
+        if (uniqueIds == null || uniqueIds.Count == 0)
+            return;
+
+        foreach (var uniqueId in uniqueIds.Distinct())
+        {
+            var localMailCopyId = MailkitClientExtensions.CreateUid(folder.Id, uniqueId.Id);
+            await _mailService.DeleteMailAsync(folder.MailAccountId, localMailCopyId).ConfigureAwait(false);
+        }
+    }
+
+    private async Task ApplyFlagChangesAsync(MailItemFolder folder, IDictionary<uint, MessageFlags> changedFlags)
+    {
+        if (changedFlags == null || changedFlags.Count == 0)
+            return;
+
+        foreach (var changed in changedFlags)
+        {
+            var localMailCopyId = MailkitClientExtensions.CreateUid(folder.Id, changed.Key);
+            var isFlagged = MailkitClientExtensions.GetIsFlagged(changed.Value);
+            var isRead = MailkitClientExtensions.GetIsRead(changed.Value);
+
+            await _mailService.ChangeReadStatusAsync(localMailCopyId, isRead).ConfigureAwait(false);
+            await _mailService.ChangeFlagStatusAsync(localMailCopyId, isFlagged).ConfigureAwait(false);
+        }
+    }
+
+    private async Task ReconcileUidBasedFlagChangesAsync(MailItemFolder localFolder, IMailFolder remoteFolder, CancellationToken cancellationToken)
+    {
+        var localMails = await _mailService.GetMailsByFolderIdAsync(localFolder.Id).ConfigureAwait(false);
+
+        if (localMails == null || localMails.Count == 0)
+            return;
+
+        var localByUid = new Dictionary<uint, MailCopy>();
+        var localUnreadUids = new HashSet<uint>();
+        var localFlaggedUids = new HashSet<uint>();
+
+        foreach (var localMail in localMails)
+        {
+            if (localMail == null || string.IsNullOrEmpty(localMail.Id))
+                continue;
+
+            uint uid;
+            try
+            {
+                uid = MailkitClientExtensions.ResolveUid(localMail.Id);
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+                continue;
+            }
+
+            localByUid[uid] = localMail;
+
+            if (!localMail.IsRead)
+                localUnreadUids.Add(uid);
+
+            if (localMail.IsFlagged)
+                localFlaggedUids.Add(uid);
+        }
+
+        if (localByUid.Count == 0)
+            return;
+
+        var remoteUnreadUids = (await remoteFolder.SearchAsync(SearchQuery.NotSeen, cancellationToken).ConfigureAwait(false))
+            .Select(a => a.Id)
+            .ToHashSet();
+        var remoteFlaggedUids = (await remoteFolder.SearchAsync(SearchQuery.Flagged, cancellationToken).ConfigureAwait(false))
+            .Select(a => a.Id)
+            .ToHashSet();
+
+        var markReadCandidates = localUnreadUids.Except(remoteUnreadUids).ToList();
+        var unflagCandidates = localFlaggedUids.Except(remoteFlaggedUids).ToList();
+
+        var existingMarkReadCandidates = await FilterExistingRemoteUidsAsync(remoteFolder, markReadCandidates, cancellationToken).ConfigureAwait(false);
+        var existingUnflagCandidates = await FilterExistingRemoteUidsAsync(remoteFolder, unflagCandidates, cancellationToken).ConfigureAwait(false);
+
+        foreach (var uid in existingMarkReadCandidates)
+        {
+            if (!localByUid.TryGetValue(uid, out var localMail) || localMail.IsRead)
+                continue;
+
+            await _mailService.ChangeReadStatusAsync(localMail.Id, true).ConfigureAwait(false);
+        }
+
+        foreach (var uid in remoteUnreadUids)
+        {
+            if (!localByUid.TryGetValue(uid, out var localMail) || !localMail.IsRead)
+                continue;
+
+            await _mailService.ChangeReadStatusAsync(localMail.Id, false).ConfigureAwait(false);
+        }
+
+        foreach (var uid in existingUnflagCandidates)
+        {
+            if (!localByUid.TryGetValue(uid, out var localMail) || !localMail.IsFlagged)
+                continue;
+
+            await _mailService.ChangeFlagStatusAsync(localMail.Id, false).ConfigureAwait(false);
+        }
+
+        foreach (var uid in remoteFlaggedUids)
+        {
+            if (!localByUid.TryGetValue(uid, out var localMail) || localMail.IsFlagged)
+                continue;
+
+            await _mailService.ChangeFlagStatusAsync(localMail.Id, true).ConfigureAwait(false);
+        }
+    }
+
+    private static async Task<HashSet<uint>> FilterExistingRemoteUidsAsync(IMailFolder remoteFolder, IEnumerable<uint> candidateUids, CancellationToken cancellationToken)
+    {
+        var existing = new HashSet<uint>();
+        var uidList = candidateUids?.Distinct().ToList();
+
+        if (uidList == null || uidList.Count == 0)
+            return existing;
+
+        foreach (var batch in uidList.Batch(200))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var batchUids = batch.Select(a => new UniqueId(a)).ToList();
+            var existingBatch = await remoteFolder
+                .SearchAsync(SearchQuery.Uids(new UniqueIdSet(batchUids, SortOrder.Ascending)), cancellationToken)
+                .ConfigureAwait(false);
+
+            foreach (var existingUid in existingBatch)
+            {
+                existing.Add(existingUid.Id);
+            }
+        }
+
+        return existing;
+    }
+
+    private bool ShouldRunUidReconcile(MailItemFolder folder)
+    {
+        return ShouldRunUidReconcile(folder.LastUidReconcileUtc, DateTime.UtcNow, UidReconcileInterval);
+    }
+
+    private async Task ReconcileDeletedMessagesAsync(MailItemFolder localFolder, IMailFolder remoteFolder, CancellationToken cancellationToken)
+    {
+        var allLocalUids = (await _folderService.GetKnownUidsForFolderAsync(localFolder.Id).ConfigureAwait(false))
+            .Select(a => new UniqueId(a))
+            .ToList();
+
+        if (allLocalUids.Count == 0)
+        {
+            localFolder.LastUidReconcileUtc = DateTime.UtcNow;
+            return;
+        }
+
+        var remoteAllUids = await remoteFolder.SearchAsync(SearchQuery.All, cancellationToken).ConfigureAwait(false);
+        var deletedUids = allLocalUids.Except(remoteAllUids).ToList();
+
+        await ApplyDeletedUidsAsync(localFolder, deletedUids).ConfigureAwait(false);
+        localFolder.LastUidReconcileUtc = DateTime.UtcNow;
+    }
+
+    private static void UpdateHighestKnownUid(MailItemFolder folder, IMailFolder remoteFolder, IEnumerable<uint> observedUids)
+    {
+        folder.HighestKnownUid = CalculateHighestKnownUid(folder.HighestKnownUid, remoteFolder?.UidNext, observedUids);
+    }
+
+    public static bool ShouldRunUidReconcile(DateTime? lastUidReconcileUtc, DateTime utcNow, TimeSpan reconcileInterval)
+    {
+        if (!lastUidReconcileUtc.HasValue)
+        {
+            return true;
+        }
+
+        return utcNow - lastUidReconcileUtc.Value >= reconcileInterval;
+    }
+
+    public static uint CalculateHighestKnownUid(uint currentHighestKnownUid, UniqueId? uidNext, IEnumerable<uint> observedUids)
+    {
+        uint observedMax = 0;
+
+        if (observedUids != null)
+        {
+            foreach (var uid in observedUids)
+            {
+                if (uid > observedMax)
+                {
+                    observedMax = uid;
+                }
+            }
+        }
+
+        uint uidNextBased = 0;
+        if (uidNext.HasValue)
+        {
+            uidNextBased = uidNext.Value.Id > 0 ? uidNext.Value.Id - 1 : 0;
+        }
+
+        return Math.Max(currentHighestKnownUid, Math.Max(observedMax, uidNextBased));
+    }
+
+    #endregion
+}
+
+/// <summary>
+/// IMAP synchronization strategy enumeration.
+/// </summary>
+public enum ImapSyncStrategy
+{
+    /// <summary>
+    /// RFC 5162 Quick Resync - supports vanished messages and efficient delta sync.
+    /// </summary>
+    QResync,
+
+    /// <summary>
+    /// RFC 4551 Conditional Store - supports mod-seq based change tracking.
+    /// </summary>
+    Condstore,
+
+    /// <summary>
+    /// UID-based delta synchronization fallback.
+    /// </summary>
+    UidBased
+}
diff --git a/Wino.Core/Synchronizers/ImapSynchronizer.cs b/Wino.Core/Synchronizers/ImapSynchronizer.cs
index 58680553..b0e925d9 100644
--- a/Wino.Core/Synchronizers/ImapSynchronizer.cs
+++ b/Wino.Core/Synchronizers/ImapSynchronizer.cs
@@ -1,21 +1,24 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
+using Itenso.TimePeriod;
 using MailKit;
 using MailKit.Net.Imap;
 using MailKit.Search;
-using MoreLinq;
+using MimeKit;
 using Serilog;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Connectivity;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
@@ -24,8 +27,11 @@ using Wino.Core.Extensions;
 using Wino.Core.Integration;
 using Wino.Core.Integration.Processors;
 using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Calendar;
 using Wino.Core.Requests.Folder;
 using Wino.Core.Requests.Mail;
+using Wino.Core.Synchronizers.ImapSync;
+using Wino.Core.Misc;
 using Wino.Messaging.Server;
 using Wino.Messaging.UI;
 using Wino.Services.Extensions;
@@ -34,49 +40,62 @@ namespace Wino.Core.Synchronizers.Mail;
 
 public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreationPackage, object>, IImapSynchronizer
 {
-    [Obsolete("N/A")]
+    /// <summary>
+    /// N/A for IMAP as it doesn't support batch modifications natively.
+    /// </summary>
     public override uint BatchModificationSize => 1000;
     public override uint InitialMessageDownloadCountPerFolder => 500;
 
     #region Idle Implementation
 
-    private CancellationTokenSource idleCancellationTokenSource;
-    private CancellationTokenSource idleDoneTokenSource;
+    private static readonly Random IdleReconnectJitter = new();
+    private readonly object _idleDebounceLock = new();
+    private CancellationTokenSource _idleLoopCancellationTokenSource;
+    private Task _idleLoopTask;
+    private int _lastIdleInboxCount = -1;
+    private DateTime _lastIdleSyncRequestUtc = DateTime.MinValue;
+    private readonly TimeSpan _idleSyncDebounceWindow = TimeSpan.FromSeconds(15);
 
     #endregion
 
     private readonly ILogger _logger = Log.ForContext<ImapSynchronizer>();
     private readonly ImapClientPool _clientPool;
     private readonly IImapChangeProcessor _imapChangeProcessor;
-    private readonly IImapSynchronizationStrategyProvider _imapSynchronizationStrategyProvider;
     private readonly IApplicationConfiguration _applicationConfiguration;
+    private readonly UnifiedImapSynchronizer _unifiedSynchronizer;
+    private readonly IImapSynchronizerErrorHandlerFactory _errorHandlerFactory;
+    private readonly ICalDavClient _calDavClient;
+    private readonly IAutoDiscoveryService _autoDiscoveryService;
+    private readonly ICalendarService _calendarService;
+    private readonly SemaphoreSlim _calDavDiscoveryLock = new(1, 1);
+    private Uri _cachedCalDavServiceUri;
+    private bool _isCalDavDiscoveryAttempted;
+    private readonly IImapCalendarOperationHandler _localCalendarOperationHandler;
+    private readonly IImapCalendarOperationHandler _calDavCalendarOperationHandler;
+    private bool _isFolderStructureChanged;
 
     public ImapSynchronizer(MailAccount account,
                             IImapChangeProcessor imapChangeProcessor,
-                            IImapSynchronizationStrategyProvider imapSynchronizationStrategyProvider,
-                            IApplicationConfiguration applicationConfiguration) : base(account)
+                            IApplicationConfiguration applicationConfiguration,
+                            UnifiedImapSynchronizer unifiedSynchronizer,
+                            IImapSynchronizerErrorHandlerFactory errorHandlerFactory,
+                            ICalDavClient calDavClient,
+                            IAutoDiscoveryService autoDiscoveryService,
+                            ICalendarService calendarService) : base(account, WeakReferenceMessenger.Default)
     {
-        // Create client pool with account protocol log.
         _imapChangeProcessor = imapChangeProcessor;
-        _imapSynchronizationStrategyProvider = imapSynchronizationStrategyProvider;
         _applicationConfiguration = applicationConfiguration;
+        _unifiedSynchronizer = unifiedSynchronizer;
+        _errorHandlerFactory = errorHandlerFactory;
+        _calDavClient = calDavClient;
+        _autoDiscoveryService = autoDiscoveryService;
+        _calendarService = calendarService;
 
-        var protocolLogStream = CreateAccountProtocolLogFileStream();
-        var poolOptions = ImapClientPoolOptions.CreateDefault(Account.ServerInformation, protocolLogStream);
+        var poolOptions = ImapClientPoolOptions.CreateDefault(Account.ServerInformation);
 
         _clientPool = new ImapClientPool(poolOptions);
-    }
-
-    private Stream CreateAccountProtocolLogFileStream()
-    {
-        if (Account == null) throw new ArgumentNullException(nameof(Account));
-
-        var logFile = Path.Combine(_applicationConfiguration.ApplicationDataFolderPath, $"Protocol_{Account.Address}_{Account.Id}.log");
-
-        // Each session should start a new log.
-        if (File.Exists(logFile)) File.Delete(logFile);
-
-        return new FileStream(logFile, FileMode.CreateNew);
+        _localCalendarOperationHandler = new LocalCalendarOperationHandler(Account, _imapChangeProcessor, _calendarService, _applicationConfiguration.ApplicationDataFolderPath, "local");
+        _calDavCalendarOperationHandler = new CalDavCalendarOperationHandler(this, Account, _calendarService, _calDavClient);
     }
 
     /// <summary>
@@ -112,7 +131,7 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
             var remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId);
 
             await remoteFolder.OpenAsync(FolderAccess.ReadWrite).ConfigureAwait(false);
-            await remoteFolder.StoreAsync(GetUniqueId(item.Item.Id), new StoreFlagsRequest(item.Item.IsFlagged ? StoreAction.Add : StoreAction.Remove, MessageFlags.Flagged) { Silent = true }).ConfigureAwait(false);
+            await remoteFolder.StoreAsync(GetUniqueId(item.Item.Id), new StoreFlagsRequest(item.IsFlagged ? StoreAction.Add : StoreAction.Remove, MessageFlags.Flagged) { Silent = true }).ConfigureAwait(false);
             await remoteFolder.CloseAsync().ConfigureAwait(false);
         }, requests);
     }
@@ -187,6 +206,9 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
             if (!smtpClient.IsAuthenticated)
                 await smtpClient.AuthenticateAsync(Account.ServerInformation.OutgoingServerUsername, Account.ServerInformation.OutgoingServerPassword);
 
+            // Remove local draft header before sending to prevent leaking to recipients.
+            singleRequest.Mime.Headers.Remove(Domain.Constants.WinoLocalDraftHeader);
+
             // TODO: Transfer progress implementation as popup in the UI.
             await smtpClient.SendAsync(singleRequest.Mime, default);
             await smtpClient.DisconnectAsync(true);
@@ -209,17 +231,13 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
                 var sentFolder = await client.GetFolderAsync(singleRequest.SentFolder.RemoteFolderId);
 
                 await sentFolder.OpenAsync(FolderAccess.ReadWrite);
-
-                // Delete local Wino draft header. Otherwise mapping will be applied on re-sync.
-                singleRequest.Mime.Headers.Remove(Domain.Constants.WinoLocalDraftHeader);
-
                 await sentFolder.AppendAsync(singleRequest.Mime, MessageFlags.Seen);
                 await sentFolder.CloseAsync();
             }
         }, request, request);
     }
 
-    public override async Task DownloadMissingMimeMessageAsync(IMailItem mailItem,
+    public override async Task DownloadMissingMimeMessageAsync(MailCopy mailItem,
                                                            ITransferProgress transferProgress = null,
                                                            CancellationToken cancellationToken = default)
     {
@@ -227,18 +245,48 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         var remoteFolderId = folder.RemoteFolderId;
 
         var client = await _clientPool.GetClientAsync().ConfigureAwait(false);
-        var remoteFolder = await client.GetFolderAsync(remoteFolderId, cancellationToken).ConfigureAwait(false);
 
-        var uniqueId = new UniqueId(MailkitClientExtensions.ResolveUid(mailItem.Id));
+        try
+        {
+            var remoteFolder = await client.GetFolderAsync(remoteFolderId, cancellationToken).ConfigureAwait(false);
 
-        await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+            var uniqueId = new UniqueId(MailkitClientExtensions.ResolveUid(mailItem.Id));
 
-        var message = await remoteFolder.GetMessageAsync(uniqueId, cancellationToken, transferProgress).ConfigureAwait(false);
+            await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
 
-        await _imapChangeProcessor.SaveMimeFileAsync(mailItem.FileId, message, Account.Id).ConfigureAwait(false);
-        await remoteFolder.CloseAsync(false, cancellationToken).ConfigureAwait(false);
+            var message = await remoteFolder.GetMessageAsync(uniqueId, cancellationToken, transferProgress).ConfigureAwait(false);
 
-        _clientPool.Release(client);
+            await _imapChangeProcessor.SaveMimeFileAsync(mailItem.FileId, message, Account.Id).ConfigureAwait(false);
+            await remoteFolder.CloseAsync(false, cancellationToken).ConfigureAwait(false);
+        }
+        catch (FolderNotFoundException ex)
+        {
+            _logger.Warning("IMAP folder {FolderId} not found during MIME download for {MailId}. Deleting locally.", remoteFolderId, mailItem.Id);
+            await _imapChangeProcessor.DeleteMailAsync(Account.Id, mailItem.Id).ConfigureAwait(false);
+            throw new SynchronizerEntityNotFoundException(ex.Message);
+        }
+        catch (ImapCommandException ex) when (ex.Response == ImapCommandResponse.No)
+        {
+            _logger.Warning("IMAP message {MailId} not found during MIME download (NO response). Deleting locally.", mailItem.Id);
+            await _imapChangeProcessor.DeleteMailAsync(Account.Id, mailItem.Id).ConfigureAwait(false);
+            throw new SynchronizerEntityNotFoundException(ex.Message);
+        }
+        finally
+        {
+            _clientPool.Release(client);
+        }
+    }
+
+    public override Task DownloadCalendarAttachmentAsync(
+        Wino.Core.Domain.Entities.Calendar.CalendarItem calendarItem,
+        Wino.Core.Domain.Entities.Calendar.CalendarAttachment attachment,
+        string localFilePath,
+        CancellationToken cancellationToken = default)
+    {
+        // IMAP protocol doesn't support calendar operations natively
+        // Calendar functionality would require CalDAV protocol
+        _logger.Warning("IMAP protocol does not support calendar attachments. CalDAV would be required.");
+        throw new NotSupportedException("IMAP does not support calendar attachments. Use Outlook or Gmail for calendar functionality.");
     }
 
     public override List<IRequestBundle<ImapRequest>> RenameFolder(RenameFolderRequest request)
@@ -250,6 +298,105 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         }, request, request);
     }
 
+    public override List<IRequestBundle<ImapRequest>> DeleteFolder(DeleteFolderRequest request)
+    {
+        return CreateSingleTaskBundle(async (client, item) =>
+        {
+            var folder = await client.GetFolderAsync(request.Folder.RemoteFolderId).ConfigureAwait(false);
+            await folder.DeleteAsync().ConfigureAwait(false);
+        }, request, request);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> CreateSubFolder(CreateSubFolderRequest request)
+    {
+        return CreateSingleTaskBundle(async (client, item) =>
+        {
+            var parentFolder = await client.GetFolderAsync(request.Folder.RemoteFolderId).ConfigureAwait(false);
+            await parentFolder.CreateAsync(request.NewFolderName, true).ConfigureAwait(false);
+        }, request, request);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> CreateCalendarEvent(CreateCalendarEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.CreateCalendarEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> UpdateCalendarEvent(UpdateCalendarEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.UpdateCalendarEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> DeleteCalendarEvent(DeleteCalendarEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.DeleteCalendarEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> AcceptEvent(AcceptEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.AcceptEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> DeclineEvent(DeclineEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.DeclineEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    public override List<IRequestBundle<ImapRequest>> TentativeEvent(TentativeEventRequest request)
+    {
+        var handler = ResolveCalendarOperationHandler();
+        return CreateCalendarOperationTaskBundle(
+            request,
+            async value => await handler.TentativeEventAsync(value).ConfigureAwait(false),
+            handler.RequiresConnectedClient);
+    }
+
+    private IImapCalendarOperationHandler ResolveCalendarOperationHandler()
+    {
+        var mode = Account.ServerInformation?.CalendarSupportMode ?? ImapCalendarSupportMode.Disabled;
+
+        return mode switch
+        {
+            ImapCalendarSupportMode.LocalOnly => _localCalendarOperationHandler,
+            ImapCalendarSupportMode.CalDav => _calDavCalendarOperationHandler,
+            _ => throw new NotSupportedException("Calendar operations are disabled for this IMAP account.")
+        };
+    }
+
+    private List<IRequestBundle<ImapRequest>> CreateCalendarOperationTaskBundle<TRequest>(
+        TRequest request,
+        Func<TRequest, Task> operation,
+        bool requiresConnectedClient)
+        where TRequest : IRequestBase, IUIChangeRequest
+    {
+        return
+        [
+            new ImapRequestBundle(
+                new ImapRequest<TRequest>((client, value) => operation(value), request, requiresConnectedClient),
+                request,
+                request)
+        ];
+    }
+
     #endregion
 
     public override async Task<List<NewMailItemPackage>> CreateNewMailPackagesAsync(ImapMessageCreationPackage message, MailItemFolder assignedFolder, CancellationToken cancellationToken = default)
@@ -264,21 +411,34 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         // Check draft mapping.
         // This is the same implementation as in the OutlookSynchronizer.
 
-        if (message.MimeMessage != null &&
-            message.MimeMessage.Headers.Contains(Domain.Constants.WinoLocalDraftHeader) &&
-            Guid.TryParse(message.MimeMessage.Headers[Domain.Constants.WinoLocalDraftHeader], out Guid localDraftCopyUniqueId))
+        string draftHeaderValue = null;
+
+        if (message.MimeMessage?.Headers?.Contains(Domain.Constants.WinoLocalDraftHeader) == true)
+        {
+            draftHeaderValue = message.MimeMessage.Headers[Domain.Constants.WinoLocalDraftHeader];
+        }
+        else if (message.MessageSummary?.Headers?.Contains(Domain.Constants.WinoLocalDraftHeader) == true)
+        {
+            draftHeaderValue = message.MessageSummary.Headers[Domain.Constants.WinoLocalDraftHeader];
+        }
+
+        if (Guid.TryParse(draftHeaderValue, out Guid localDraftCopyUniqueId))
         {
             // This message belongs to existing local draft copy.
             // We don't need to create a new mail copy for this message, just update the existing one.
 
-            bool isMappingSuccessful = await _imapChangeProcessor.MapLocalDraftAsync(Account.Id, localDraftCopyUniqueId, mailCopy.Id, mailCopy.DraftId, mailCopy.ThreadId);
+            bool isMappingSuccessful = await _imapChangeProcessor.MapLocalDraftAsync(Account.Id, localDraftCopyUniqueId, mailCopy.Id, draftHeaderValue, mailCopy.ThreadId);
 
             if (isMappingSuccessful) return null;
 
             // Local copy doesn't exists. Continue execution to insert mail copy.
         }
 
-        var package = new NewMailItemPackage(mailCopy, message.MimeMessage, assignedFolder.RemoteFolderId);
+        var contacts = message.MimeMessage != null
+            ? ExtractContactsFromMimeMessage(message.MimeMessage)
+            : ExtractContactsFromMessageSummary(message.MessageSummary);
+
+        var package = new NewMailItemPackage(mailCopy, message.MimeMessage, assignedFolder.RemoteFolderId, contacts);
 
         return
         [
@@ -286,52 +446,252 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         ];
     }
 
+    private static IReadOnlyList<AccountContact> ExtractContactsFromMimeMessage(MimeMessage mimeMessage)
+    {
+        if (mimeMessage == null) return [];
+
+        var contacts = new Dictionary<string, AccountContact>(StringComparer.OrdinalIgnoreCase);
+
+        AddFromInternetAddressList(mimeMessage.From);
+        AddFromInternetAddressList(mimeMessage.To);
+        AddFromInternetAddressList(mimeMessage.Cc);
+        AddFromInternetAddressList(mimeMessage.Bcc);
+        AddFromInternetAddressList(mimeMessage.ReplyTo);
+
+        if (mimeMessage.Sender is MailboxAddress senderMailbox)
+        {
+            AddContact(senderMailbox.Address, senderMailbox.Name);
+        }
+
+        return contacts.Values.ToList();
+
+        void AddFromInternetAddressList(InternetAddressList addresses)
+        {
+            if (addresses == null) return;
+
+            foreach (var mailbox in addresses.Mailboxes)
+            {
+                AddContact(mailbox.Address, mailbox.Name);
+            }
+        }
+
+        void AddContact(string address, string name)
+        {
+            var trimmedAddress = address?.Trim();
+            if (string.IsNullOrWhiteSpace(trimmedAddress)) return;
+
+            var displayName = string.IsNullOrWhiteSpace(name) ? trimmedAddress : name.Trim();
+
+            contacts[trimmedAddress] = new AccountContact
+            {
+                Address = trimmedAddress,
+                Name = displayName
+            };
+        }
+    }
+
+    private static IReadOnlyList<AccountContact> ExtractContactsFromMessageSummary(IMessageSummary summary)
+    {
+        if (summary?.Envelope == null) return [];
+
+        var contacts = new Dictionary<string, AccountContact>(StringComparer.OrdinalIgnoreCase);
+
+        AddFromInternetAddressList(summary.Envelope.From);
+        AddFromInternetAddressList(summary.Envelope.To);
+        AddFromInternetAddressList(summary.Envelope.Cc);
+        AddFromInternetAddressList(summary.Envelope.Bcc);
+        AddFromInternetAddressList(summary.Envelope.ReplyTo);
+
+        var senderMailbox = summary.Envelope.Sender?.Mailboxes?.FirstOrDefault();
+        if (senderMailbox != null)
+        {
+            AddContact(senderMailbox.Address, senderMailbox.Name);
+        }
+
+        return contacts.Values.ToList();
+
+        void AddFromInternetAddressList(InternetAddressList addresses)
+        {
+            if (addresses == null) return;
+
+            foreach (var mailbox in addresses.Mailboxes)
+            {
+                AddContact(mailbox.Address, mailbox.Name);
+            }
+        }
+
+        void AddContact(string address, string name)
+        {
+            var trimmedAddress = address?.Trim();
+            if (string.IsNullOrWhiteSpace(trimmedAddress)) return;
+
+            var displayName = string.IsNullOrWhiteSpace(name) ? trimmedAddress : name.Trim();
+
+            contacts[trimmedAddress] = new AccountContact
+            {
+                Address = trimmedAddress,
+                Name = displayName
+            };
+        }
+    }
+
     protected override async Task<MailSynchronizationResult> SynchronizeMailsInternalAsync(MailSynchronizationOptions options, CancellationToken cancellationToken = default)
     {
         var downloadedMessageIds = new List<string>();
+        var folderResults = new List<FolderSyncResult>();
 
         _logger.Information("Internal synchronization started for {Name}", Account.Name);
         _logger.Information("Options: {Options}", options);
 
-        PublishSynchronizationProgress(1);
-
-        bool shouldDoFolderSync = options.Type == MailSynchronizationType.FullFolders || options.Type == MailSynchronizationType.FoldersOnly;
-
-        if (shouldDoFolderSync)
+        try
         {
-            await SynchronizeFoldersAsync(cancellationToken).ConfigureAwait(false);
-        }
+            _isFolderStructureChanged = false;
 
-        if (options.Type != MailSynchronizationType.FoldersOnly)
-        {
-            var synchronizationFolders = await _imapChangeProcessor.GetSynchronizationFoldersAsync(options).ConfigureAwait(false);
+            // Set indeterminate progress initially
+            UpdateSyncProgress(0, 0, "Synchronizing...");
 
-            for (int i = 0; i < synchronizationFolders.Count; i++)
+            bool shouldDoFolderSync = options.Type == MailSynchronizationType.FullFolders || options.Type == MailSynchronizationType.FoldersOnly;
+
+            if (shouldDoFolderSync)
             {
-                var folder = synchronizationFolders[i];
-                var progress = (int)Math.Round((double)(i + 1) / synchronizationFolders.Count * 100);
+                await SynchronizeFoldersAsync(cancellationToken).ConfigureAwait(false);
 
-                PublishSynchronizationProgress(progress);
-
-                var folderDownloadedMessageIds = await SynchronizeFolderInternalAsync(folder, cancellationToken).ConfigureAwait(false);
-
-                if (cancellationToken.IsCancellationRequested) return MailSynchronizationResult.Canceled;
-
-                if (folderDownloadedMessageIds != null)
+                if (_isFolderStructureChanged)
                 {
-                    downloadedMessageIds.AddRange(folderDownloadedMessageIds);
+                    WeakReferenceMessenger.Default.Send(new AccountFolderConfigurationUpdated(Account.Id));
                 }
             }
-        }
 
-        PublishSynchronizationProgress(100);
+            if (options.Type != MailSynchronizationType.FoldersOnly)
+            {
+                var synchronizationFolders = await _imapChangeProcessor.GetSynchronizationFoldersAsync(options).ConfigureAwait(false);
+
+                var totalFolders = synchronizationFolders.Count;
+                const int maxParallelFolderSyncClients = 3;
+                var folderSyncSemaphore = new SemaphoreSlim(maxParallelFolderSyncClients, maxParallelFolderSyncClients);
+                using var linkedCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+                var linkedToken = linkedCancellationTokenSource.Token;
+                var resultLock = new object();
+                int completedFolders = 0;
+
+                var syncTasks = synchronizationFolders.Select(async folder =>
+                {
+                    await folderSyncSemaphore.WaitAsync(linkedToken).ConfigureAwait(false);
+
+                    try
+                    {
+                        IImapClient client = null;
+
+                        try
+                        {
+                            client = await _clientPool.GetClientAsync(linkedToken).ConfigureAwait(false);
+                            var folderResult = await _unifiedSynchronizer
+                                .SynchronizeFolderAsync(client, folder, this, Account.ServerInformation?.IncomingServer, linkedToken)
+                                .ConfigureAwait(false);
+
+                            List<string> folderDownloadedIds = null;
+                            if (folderResult.Success && folderResult.DownloadedCount > 0)
+                            {
+                                folderDownloadedIds = await GetDownloadedIdsForFolderAsync(folder, folderResult.DownloadedCount).ConfigureAwait(false);
+                            }
+
+                            lock (resultLock)
+                            {
+                                folderResults.Add(folderResult);
+                                if (folderDownloadedIds != null && folderDownloadedIds.Count > 0)
+                                {
+                                    downloadedMessageIds.AddRange(folderDownloadedIds);
+                                }
+                            }
+                        }
+                        finally
+                        {
+                            if (client != null)
+                            {
+                                _clientPool.Release(client);
+                            }
+                        }
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        throw;
+                    }
+                    catch (Exception ex)
+                    {
+                        var errorContext = new SynchronizerErrorContext
+                        {
+                            Account = Account,
+                            ErrorMessage = ex.Message,
+                            Exception = ex,
+                            FolderId = folder.Id,
+                            FolderName = folder.FolderName,
+                            OperationType = "ImapFolderSync"
+                        };
+
+                        _ = await _errorHandlerFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+                        var failedResult = FolderSyncResult.Failed(folder.Id, folder.FolderName, errorContext);
+
+                        lock (resultLock)
+                        {
+                            folderResults.Add(failedResult);
+                        }
+
+                        if (!errorContext.CanContinueSync)
+                        {
+                            _logger.Error(ex, "Folder {FolderName} sync failed with fatal error", folder.FolderName);
+                            linkedCancellationTokenSource.Cancel();
+                            throw;
+                        }
+
+                        _logger.Warning(ex, "Folder {FolderName} sync failed, continuing with other folders", folder.FolderName);
+                    }
+                    finally
+                    {
+                        folderSyncSemaphore.Release();
+
+                        var completed = Interlocked.Increment(ref completedFolders);
+                        UpdateSyncProgress(totalFolders, totalFolders - completed, $"Syncing {folder.FolderName}...");
+                    }
+                }).ToList();
+
+                await Task.WhenAll(syncTasks).ConfigureAwait(false);
+
+                if (cancellationToken.IsCancellationRequested) return MailSynchronizationResult.Canceled;
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.Information("Synchronization was canceled for {Name}", Account.Name);
+            return MailSynchronizationResult.Canceled;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Synchronization failed for {Name}", Account.Name);
+            return MailSynchronizationResult.Failed(ex);
+        }
+        finally
+        {
+            // Reset progress
+            ResetSyncProgress();
+        }
 
         // Get all unread new downloaded items and return in the result.
         // This is primarily used in notifications.
 
         var unreadNewItems = await _imapChangeProcessor.GetDownloadedUnreadMailsAsync(Account.Id, downloadedMessageIds).ConfigureAwait(false);
 
-        return MailSynchronizationResult.Completed(unreadNewItems);
+        return MailSynchronizationResult.CompletedWithFolderResults(unreadNewItems, folderResults);
+    }
+
+    /// <summary>
+    /// Gets the most recent downloaded message IDs for a folder.
+    /// Used for notification purposes after sync completes.
+    /// </summary>
+    private async Task<List<string>> GetDownloadedIdsForFolderAsync(MailItemFolder folder, int count)
+    {
+        // Get the most recent mail IDs from the folder
+        var recentMails = await _imapChangeProcessor.GetRecentMailIdsForFolderAsync(folder.Id, count).ConfigureAwait(false);
+        return recentMails?.ToList() ?? new List<string>();
     }
 
     public override async Task ExecuteNativeRequestsAsync(List<IRequestBundle<ImapRequest>> batchedRequests, CancellationToken cancellationToken = default)
@@ -341,7 +701,10 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
         foreach (var item in batchedRequests)
         {
-            item.Request.ApplyUIChanges();
+            if (ShouldApplyOptimisticUIChanges(item.Request))
+            {
+                item.Request.ApplyUIChanges();
+            }
         }
 
         // All task bundles will execute on the same client.
@@ -360,14 +723,20 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
             try
             {
-                executorClient = await _clientPool.GetClientAsync();
+                if (item.NativeRequest.RequiresConnectedClient)
+                {
+                    executorClient = await _clientPool.GetClientAsync();
+                }
             }
             catch (ImapClientPoolException)
             {
                 // Client pool failed to get a client.
                 // Requests may not be executed at this point.
 
-                item.Request.RevertUIChanges();
+                if (ShouldApplyOptimisticUIChanges(item.Request))
+                {
+                    item.Request.RevertUIChanges();
+                }
 
                 isCrashed = true;
                 throw;
@@ -381,24 +750,58 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
                 }
             }
 
-            // TODO: Retry pattern.
-            // TODO: Error handling.
             try
             {
                 await item.NativeRequest.IntegratorTask(executorClient, item.Request).ConfigureAwait(false);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                item.Request.RevertUIChanges();
-                throw;
+                var errorContext = new SynchronizerErrorContext
+                {
+                    Account = Account,
+                    ErrorCode = ex is FolderNotFoundException ? 404 : null,
+                    ErrorMessage = ex.Message,
+                    Exception = ex,
+                    RequestBundle = item,
+                    OperationType = "RequestExecution"
+                };
+
+                var handled = await _errorHandlerFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+                if (!handled)
+                {
+                    if (ShouldApplyOptimisticUIChanges(item.Request))
+                    {
+                        item.Request.RevertUIChanges();
+                    }
+                    throw;
+                }
             }
             finally
             {
-                _clientPool.Release(executorClient);
+                if (executorClient != null)
+                {
+                    _clientPool.Release(executorClient);
+                }
             }
         }
     }
 
+    private bool ShouldApplyOptimisticUIChanges(IRequestBase request)
+    {
+        // Mail changes are always applied.
+        // Calendar changes are applied only if calendar is not in local mode.
+        // Database updates are immidiate and will be reflected in the UI right after the request is processed, so no need for optimistic changes.
+
+        if (request is not ICalendarActionRequest)
+        {
+            return true;
+        }
+
+        var mode = Account.ServerInformation?.CalendarSupportMode ?? ImapCalendarSupportMode.Disabled;
+        return mode != ImapCalendarSupportMode.LocalOnly;
+    }
+
     /// <summary>
     /// Assigns special folder type for the given local folder.
     /// If server doesn't support special folders, we can't determine the type. MailKit will throw for GetFolder.
@@ -610,7 +1013,7 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
             if (insertedFolders.Any() || deletedFolders.Any() || updatedFolders.Any())
             {
-                WeakReferenceMessenger.Default.Send(new AccountFolderConfigurationUpdated(Account.Id));
+                _isFolderStructureChanged = true;
             }
         }
         catch (Exception ex)
@@ -631,7 +1034,6 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
     public override async Task<List<MailCopy>> OnlineSearchAsync(string queryText, List<IMailItemFolder> folders, CancellationToken cancellationToken = default)
     {
         IImapClient client = null;
-        IMailFolder activeFolder = null;
 
         try
         {
@@ -642,6 +1044,9 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
             foreach (var folder in folders)
             {
+                if (folder is not MailItemFolder localFolder)
+                    continue;
+
                 var remoteFolder = await client.GetFolderAsync(folder.RemoteFolderId, cancellationToken).ConfigureAwait(false);
                 await remoteFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
 
@@ -670,9 +1075,9 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
                 if (nonExistingUniqueIds.Count != 0)
                 {
-                    var syncStrategy = _imapSynchronizationStrategyProvider.GetSynchronizationStrategy(client);
-
-                    await syncStrategy.DownloadMessagesAsync(this, remoteFolder, folder as MailItemFolder, new UniqueIdSet(nonExistingUniqueIds, SortOrder.Ascending), cancellationToken).ConfigureAwait(false);
+                    await _unifiedSynchronizer
+                        .DownloadMessagesByUidsAsync(client, remoteFolder, localFolder, nonExistingUniqueIds, this, cancellationToken)
+                        .ConfigureAwait(false);
                 }
 
                 await remoteFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -687,52 +1092,10 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         }
         finally
         {
-            if (activeFolder?.IsOpen ?? false)
-            {
-                await activeFolder.CloseAsync().ConfigureAwait(false);
-            }
-
             _clientPool.Release(client);
         }
     }
 
-    private async Task<IEnumerable<string>> SynchronizeFolderInternalAsync(MailItemFolder folder, CancellationToken cancellationToken = default)
-    {
-        if (!folder.IsSynchronizationEnabled) return default;
-
-        IImapClient availableClient = null;
-
-    retry:
-        try
-        {
-
-            availableClient = await _clientPool.GetClientAsync().ConfigureAwait(false);
-
-            var strategy = _imapSynchronizationStrategyProvider.GetSynchronizationStrategy(availableClient);
-            return await strategy.HandleSynchronizationAsync(availableClient, folder, this, cancellationToken).ConfigureAwait(false);
-        }
-        catch (IOException)
-        {
-            _clientPool.Release(availableClient, false);
-
-            goto retry;
-        }
-        catch (OperationCanceledException)
-        {
-            // Ignore cancellations.
-        }
-        catch (Exception ex)
-        {
-            _logger.Error(ex, "Synchronization failed for folder {FolderName}", folder.FolderName);
-        }
-        finally
-        {
-            _clientPool.Release(availableClient, false);
-        }
-
-        return new List<string>();
-    }
-
     /// <summary>
     /// Whether the local folder should be updated with the remote folder.
     /// IMAP only compares folder name for now.
@@ -742,114 +1105,963 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
     public bool ShouldUpdateFolder(IMailFolder remoteFolder, MailItemFolder localFolder)
         => !localFolder.FolderName.Equals(remoteFolder.Name, StringComparison.OrdinalIgnoreCase);
 
-    protected override Task<CalendarSynchronizationResult> SynchronizeCalendarEventsInternalAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
-        => throw new NotImplementedException();
-
-    public async Task StartIdleClientAsync()
+    protected override async Task<CalendarSynchronizationResult> SynchronizeCalendarEventsInternalAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
     {
-        IImapClient idleClient = null;
-        IMailFolder inboxFolder = null;
+        if (Account.ProviderType != MailProviderType.IMAP4 || !Account.IsCalendarAccessGranted || Account.ServerInformation == null)
+            return CalendarSynchronizationResult.Empty;
 
-        bool? reconnect = null;
+        if (Account.ServerInformation.CalendarSupportMode is ImapCalendarSupportMode.Disabled or ImapCalendarSupportMode.LocalOnly)
+            return CalendarSynchronizationResult.Empty;
+
+        var calDavServiceUri = await ResolveCalDavServiceUriAsync(cancellationToken).ConfigureAwait(false);
+        if (calDavServiceUri == null)
+        {
+            _logger.Information("Skipping calendar sync for {AccountName}: CalDAV endpoint is not configured.", Account.Name);
+            return CalendarSynchronizationResult.Empty;
+        }
+
+        var password = ResolveCalDavPassword();
+        if (string.IsNullOrWhiteSpace(password))
+        {
+            _logger.Warning("Skipping calendar sync for {AccountName}: empty credentials.", Account.Name);
+            return CalendarSynchronizationResult.Empty;
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var calDavUsername = ResolveCalDavUsername();
+        if (string.IsNullOrWhiteSpace(calDavUsername))
+        {
+            _logger.Warning("Skipping calendar sync for {AccountName}: account email address is empty for CalDAV credentials.", Account.Name);
+            return CalendarSynchronizationResult.Empty;
+        }
+
+        var activeConnection = new CalDavConnectionSettings
+        {
+            ServiceUri = calDavServiceUri,
+            Username = calDavUsername,
+            Password = password
+        };
+
+        IReadOnlyList<CalDavCalendar> remoteCalendars;
 
         try
         {
-            var client = await _clientPool.GetClientAsync().ConfigureAwait(false);
+            remoteCalendars = await _calDavClient
+                .DiscoverCalendarsAsync(activeConnection, cancellationToken)
+                .ConfigureAwait(false);
+        }
+        catch (UnauthorizedAccessException)
+        {
+            _logger.Warning("Skipping calendar sync for {AccountName}: CalDAV authentication failed for username {Username}.", Account.Name, calDavUsername);
+            return CalendarSynchronizationResult.Empty;
+        }
 
-            if (!client.Capabilities.HasFlag(ImapCapabilities.Idle))
+        await SynchronizeCalendarMetadataAsync(remoteCalendars).ConfigureAwait(false);
+
+        if (options?.Type == CalendarSynchronizationType.CalendarMetadata)
+            return CalendarSynchronizationResult.Empty;
+
+        var localCalendars = await _imapChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        var remoteCalendarsById = remoteCalendars.ToDictionary(c => c.RemoteCalendarId, StringComparer.OrdinalIgnoreCase);
+
+        if (options?.Type == CalendarSynchronizationType.SingleCalendar && options.SynchronizationCalendarIds?.Count > 0)
+        {
+            localCalendars = localCalendars
+                .Where(c => options.SynchronizationCalendarIds.Contains(c.Id))
+                .ToList();
+        }
+
+        localCalendars = localCalendars
+            .Where(c => c.IsSynchronizationEnabled)
+            .ToList();
+
+        var periodStartUtc = DateTimeOffset.UtcNow.AddYears(-1);
+        var periodEndUtc = DateTimeOffset.UtcNow.AddYears(2);
+
+        foreach (var localCalendar in localCalendars)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (!remoteCalendarsById.TryGetValue(localCalendar.RemoteCalendarId, out var remoteCalendar))
+                continue;
+
+            var remoteToken = BuildCalendarDeltaToken(remoteCalendar);
+
+            var isInitialSync = string.IsNullOrWhiteSpace(localCalendar.SynchronizationDeltaToken);
+            var tokenChanged = !string.Equals(localCalendar.SynchronizationDeltaToken, remoteToken, StringComparison.Ordinal);
+            var forceSync = options?.Type is CalendarSynchronizationType.ExecuteRequests or CalendarSynchronizationType.SingleCalendar;
+
+            if (!isInitialSync && !tokenChanged && !forceSync)
+                continue;
+
+            var remoteEvents = await _calDavClient.GetCalendarEventsAsync(
+                activeConnection,
+                remoteCalendar,
+                periodStartUtc,
+                periodEndUtc,
+                cancellationToken).ConfigureAwait(false);
+            var remoteEventIds = new HashSet<string>(
+                remoteEvents
+                    .Where(e => !string.IsNullOrWhiteSpace(e.RemoteEventId))
+                    .Select(e => e.RemoteEventId),
+                StringComparer.OrdinalIgnoreCase);
+
+            foreach (var remoteEvent in remoteEvents)
             {
-                Log.Debug($"{Account.Name} does not support Idle command. Ignored.");
-                return;
+                var existingLocalItem = await _imapChangeProcessor
+                    .GetCalendarItemAsync(localCalendar.Id, remoteEvent.RemoteEventId)
+                    .ConfigureAwait(false);
+
+                var shouldSkipUnchangedEvent = await ShouldSkipUnchangedCalDavEventAsync(
+                    localCalendar,
+                    existingLocalItem,
+                    remoteEvent).ConfigureAwait(false);
+
+                if (shouldSkipUnchangedEvent)
+                    continue;
+
+                await _imapChangeProcessor
+                    .ManageCalendarEventAsync(remoteEvent, localCalendar, Account)
+                    .ConfigureAwait(false);
+
+                if (string.IsNullOrWhiteSpace(remoteEvent.IcsContent))
+                    continue;
+
+                var localItem = existingLocalItem ?? await _imapChangeProcessor
+                    .GetCalendarItemAsync(localCalendar.Id, remoteEvent.RemoteEventId)
+                    .ConfigureAwait(false);
+
+                if (localItem == null)
+                    continue;
+
+                await _imapChangeProcessor
+                    .SaveCalendarItemIcsAsync(
+                        Account.Id,
+                        localCalendar.Id,
+                        localItem.Id,
+                        remoteEvent.RemoteEventId,
+                        remoteEvent.RemoteResourceHref,
+                        remoteEvent.ETag,
+                        remoteEvent.IcsContent)
+                    .ConfigureAwait(false);
             }
 
-            if (client.Inbox == null)
+            await ReconcileDeletedCalendarItemsAsync(localCalendar, periodStartUtc, periodEndUtc, remoteEventIds)
+                .ConfigureAwait(false);
+
+            localCalendar.SynchronizationDeltaToken = remoteToken;
+            await _imapChangeProcessor.UpdateAccountCalendarAsync(localCalendar).ConfigureAwait(false);
+        }
+
+        return CalendarSynchronizationResult.Empty;
+    }
+
+    private async Task<bool> ShouldSkipUnchangedCalDavEventAsync(
+        AccountCalendar localCalendar,
+        CalendarItem existingLocalItem,
+        CalDavCalendarEvent remoteEvent)
+    {
+        if (localCalendar == null || existingLocalItem == null || remoteEvent == null)
+            return false;
+
+        // Ensure unresolved parent-child linkage still gets corrected when required.
+        if (!string.IsNullOrWhiteSpace(remoteEvent.SeriesMasterRemoteEventId) &&
+            existingLocalItem.RecurringCalendarItemId == null)
+        {
+            return false;
+        }
+
+        if (string.IsNullOrWhiteSpace(remoteEvent.ETag))
+            return false;
+
+        var savedETag = await _imapChangeProcessor
+            .GetCalendarItemIcsETagAsync(Account.Id, localCalendar.Id, existingLocalItem.Id)
+            .ConfigureAwait(false);
+
+        if (string.IsNullOrWhiteSpace(savedETag))
+            return false;
+
+        return string.Equals(savedETag.Trim(), remoteEvent.ETag.Trim(), StringComparison.Ordinal);
+    }
+
+    private async Task ReconcileDeletedCalendarItemsAsync(
+        AccountCalendar localCalendar,
+        DateTimeOffset periodStartUtc,
+        DateTimeOffset periodEndUtc,
+        HashSet<string> remoteEventIds)
+    {
+        var syncPeriod = new TimeRange(periodStartUtc.UtcDateTime, periodEndUtc.UtcDateTime);
+        var localEventsInWindow = await _calendarService
+            .GetCalendarEventsAsync(localCalendar, syncPeriod)
+            .ConfigureAwait(false);
+
+        foreach (var localEvent in localEventsInWindow)
+        {
+            if (string.IsNullOrWhiteSpace(localEvent.RemoteEventId))
+                continue;
+
+            if (remoteEventIds.Contains(localEvent.RemoteEventId))
+                continue;
+
+            await _imapChangeProcessor.DeleteCalendarItemAsync(localEvent.Id).ConfigureAwait(false);
+        }
+    }
+
+    private static string BuildCalendarDeltaToken(CalDavCalendar calendar)
+    {
+        if (calendar == null)
+            return string.Empty;
+
+        var syncToken = calendar.SyncToken?.Trim() ?? string.Empty;
+        var ctag = calendar.CTag?.Trim() ?? string.Empty;
+
+        if (!string.IsNullOrWhiteSpace(syncToken) && !string.IsNullOrWhiteSpace(ctag))
+            return $"{syncToken}|{ctag}";
+
+        return !string.IsNullOrWhiteSpace(syncToken) ? syncToken : ctag;
+    }
+
+    private async Task<Uri> ResolveCalDavServiceUriAsync(CancellationToken cancellationToken)
+    {
+        var explicitCalDavUri = TryGetExplicitCalDavServiceUri();
+        if (explicitCalDavUri != null)
+        {
+            _cachedCalDavServiceUri = explicitCalDavUri;
+            _isCalDavDiscoveryAttempted = true;
+            return _cachedCalDavServiceUri;
+        }
+
+        if (_cachedCalDavServiceUri != null)
+            return _cachedCalDavServiceUri;
+
+        if (_isCalDavDiscoveryAttempted)
+            return null;
+
+        await _calDavDiscoveryLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            if (_cachedCalDavServiceUri != null)
+                return _cachedCalDavServiceUri;
+
+            if (_isCalDavDiscoveryAttempted)
+                return null;
+
+            _isCalDavDiscoveryAttempted = true;
+
+            var emailCandidates = new[]
             {
-                Log.Warning($"{Account.Name} does not have an Inbox folder for idle client to track. Ignored.");
-                return;
+                Account.ServerInformation?.Address,
+                Account.Address
+            }
+            .Where(value => !string.IsNullOrWhiteSpace(value) && value.Contains('@'))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+            foreach (var email in emailCandidates)
+            {
+                var discoveredUri = await _autoDiscoveryService
+                    .DiscoverCalDavServiceUriAsync(email, cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (discoveredUri == null)
+                    continue;
+
+                _cachedCalDavServiceUri = discoveredUri;
+                return _cachedCalDavServiceUri;
             }
 
-            // Setup idle client.
-            idleClient = client;
+            if (Account.SpecialImapProvider == SpecialImapProvider.iCloud)
+            {
+                _cachedCalDavServiceUri = new Uri("https://caldav.icloud.com/");
+                return _cachedCalDavServiceUri;
+            }
 
-            idleDoneTokenSource ??= new CancellationTokenSource();
-            idleCancellationTokenSource ??= new CancellationTokenSource();
+            if (Account.SpecialImapProvider == SpecialImapProvider.Yahoo)
+            {
+                _cachedCalDavServiceUri = new Uri("https://caldav.calendar.yahoo.com/");
+                return _cachedCalDavServiceUri;
+            }
 
-            inboxFolder = client.Inbox;
-
-            await inboxFolder.OpenAsync(FolderAccess.ReadOnly, idleCancellationTokenSource.Token);
-
-            inboxFolder.CountChanged += IdleNotificationTriggered;
-            inboxFolder.MessageFlagsChanged += IdleNotificationTriggered;
-            inboxFolder.MessageExpunged += IdleNotificationTriggered;
-            inboxFolder.MessagesVanished += IdleNotificationTriggered;
-
-            Log.Debug("Starting an idle client for {Name}", Account.Name);
-
-            await client.IdleAsync(idleDoneTokenSource.Token, idleCancellationTokenSource.Token);
-        }
-        catch (ImapProtocolException protocolException)
-        {
-            Log.Information(protocolException, "Idle client received protocol exception.");
-            reconnect = true;
-        }
-        catch (IOException ioException)
-        {
-            Log.Information(ioException, "Idle client received IO exception.");
-            reconnect = true;
-        }
-        catch (OperationCanceledException)
-        {
-            reconnect = !IsDisposing;
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Idle client failed to start.");
-            reconnect = false;
+            return null;
         }
         finally
         {
-            if (inboxFolder != null)
+            _calDavDiscoveryLock.Release();
+        }
+    }
+
+    private string ResolveCalDavPassword()
+    {
+        if (!string.IsNullOrWhiteSpace(Account.ServerInformation?.CalDavPassword))
+            return Account.ServerInformation.CalDavPassword;
+
+        if (!string.IsNullOrWhiteSpace(Account.ServerInformation?.IncomingServerPassword))
+            return Account.ServerInformation.IncomingServerPassword;
+
+        if (!string.IsNullOrWhiteSpace(Account.ServerInformation?.OutgoingServerPassword))
+            return Account.ServerInformation.OutgoingServerPassword;
+
+        return string.Empty;
+    }
+
+    private string ResolveCalDavUsername()
+    {
+        if (!string.IsNullOrWhiteSpace(Account.ServerInformation?.CalDavUsername))
+            return Account.ServerInformation.CalDavUsername.Trim();
+
+        if (!string.IsNullOrWhiteSpace(Account.ServerInformation?.Address))
+            return Account.ServerInformation.Address.Trim();
+
+        if (!string.IsNullOrWhiteSpace(Account.Address))
+            return Account.Address.Trim();
+
+        return string.Empty;
+    }
+
+    private Uri TryGetExplicitCalDavServiceUri()
+    {
+        var configuredUrl = Account.ServerInformation?.CalDavServiceUrl;
+        if (string.IsNullOrWhiteSpace(configuredUrl))
+            return null;
+
+        if (!Uri.TryCreate(configuredUrl, UriKind.Absolute, out var uri))
+        {
+            _logger.Warning("Configured CalDAV URL is invalid for account {AccountName}: {Url}", Account.Name, configuredUrl);
+            return null;
+        }
+
+        return uri;
+    }
+
+    private async Task SynchronizeCalendarMetadataAsync(IReadOnlyList<CalDavCalendar> remoteCalendars)
+    {
+        var localCalendars = await _imapChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        var remoteCalendarsById = remoteCalendars
+            .GroupBy(c => c.RemoteCalendarId, StringComparer.OrdinalIgnoreCase)
+            .ToDictionary(g => g.Key, g => g.First(), StringComparer.OrdinalIgnoreCase);
+        var usedCalendarColors = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        var remotePrimaryCalendarId = remoteCalendars.FirstOrDefault()?.RemoteCalendarId;
+
+        foreach (var localCalendar in localCalendars.ToList())
+        {
+            if (remoteCalendarsById.ContainsKey(localCalendar.RemoteCalendarId))
+                continue;
+
+            await _imapChangeProcessor
+                .DeleteCalendarIcsForCalendarAsync(Account.Id, localCalendar.Id)
+                .ConfigureAwait(false);
+            await _imapChangeProcessor.DeleteAccountCalendarAsync(localCalendar).ConfigureAwait(false);
+            localCalendars.Remove(localCalendar);
+        }
+
+        foreach (var remoteCalendar in remoteCalendars)
+        {
+            var existingLocal = localCalendars.FirstOrDefault(c =>
+                string.Equals(c.RemoteCalendarId, remoteCalendar.RemoteCalendarId, StringComparison.OrdinalIgnoreCase));
+
+            var isPrimary = string.Equals(remoteCalendar.RemoteCalendarId, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
+
+            if (existingLocal == null)
             {
-                inboxFolder.CountChanged -= IdleNotificationTriggered;
-                inboxFolder.MessageFlagsChanged -= IdleNotificationTriggered;
-                inboxFolder.MessageExpunged -= IdleNotificationTriggered;
-                inboxFolder.MessagesVanished -= IdleNotificationTriggered;
+                var newCalendar = new AccountCalendar
+                {
+                    Id = Guid.NewGuid(),
+                    AccountId = Account.Id,
+                    RemoteCalendarId = remoteCalendar.RemoteCalendarId,
+                    Name = remoteCalendar.Name,
+                    IsPrimary = isPrimary,
+                    IsSynchronizationEnabled = true,
+                    IsExtended = true,
+                    BackgroundColorHex = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors),
+                    TimeZone = "UTC",
+                    SynchronizationDeltaToken = string.Empty
+                };
+
+                newCalendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(newCalendar.BackgroundColorHex);
+                usedCalendarColors.Add(newCalendar.BackgroundColorHex);
+                await _imapChangeProcessor.InsertAccountCalendarAsync(newCalendar).ConfigureAwait(false);
+                continue;
             }
 
-            if (idleDoneTokenSource != null)
+            var resolvedColor = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, existingLocal.BackgroundColorHex);
+            var shouldUpdate = !string.Equals(existingLocal.Name, remoteCalendar.Name, StringComparison.Ordinal)
+                               || existingLocal.IsPrimary != isPrimary
+                               || !string.Equals(existingLocal.BackgroundColorHex, resolvedColor, StringComparison.OrdinalIgnoreCase);
+
+            if (!shouldUpdate)
             {
-                idleDoneTokenSource.Dispose();
-                idleDoneTokenSource = null;
+                usedCalendarColors.Add(resolvedColor);
+                continue;
             }
 
-            if (idleClient != null)
-            {
-                // Killing the client is not necessary. We can re-use it later.
-                _clientPool.Release(idleClient, destroyClient: false);
+            existingLocal.Name = remoteCalendar.Name;
+            existingLocal.IsPrimary = isPrimary;
+            existingLocal.BackgroundColorHex = resolvedColor;
+            existingLocal.TextColorHex = ColorHelpers.GetReadableTextColorHex(existingLocal.BackgroundColorHex);
+            usedCalendarColors.Add(existingLocal.BackgroundColorHex);
+            await _imapChangeProcessor.UpdateAccountCalendarAsync(existingLocal).ConfigureAwait(false);
+        }
+    }
 
-                idleClient = null;
+    private interface IImapCalendarOperationHandler
+    {
+        bool RequiresConnectedClient { get; }
+        Task CreateCalendarEventAsync(CreateCalendarEventRequest request);
+        Task UpdateCalendarEventAsync(UpdateCalendarEventRequest request);
+        Task DeleteCalendarEventAsync(DeleteCalendarEventRequest request);
+        Task AcceptEventAsync(AcceptEventRequest request);
+        Task DeclineEventAsync(DeclineEventRequest request);
+        Task TentativeEventAsync(TentativeEventRequest request);
+    }
+
+    private class LocalCalendarOperationHandler : IImapCalendarOperationHandler
+    {
+        private readonly MailAccount _account;
+        private readonly IImapChangeProcessor _changeProcessor;
+        private readonly ICalendarService _calendarService;
+        private readonly string _applicationDataFolderPath;
+        private readonly string _resourceScheme;
+
+        public bool RequiresConnectedClient => false;
+
+        public LocalCalendarOperationHandler(MailAccount account, IImapChangeProcessor changeProcessor, ICalendarService calendarService, string applicationDataFolderPath, string resourceScheme)
+        {
+            _account = account;
+            _changeProcessor = changeProcessor;
+            _calendarService = calendarService;
+            _applicationDataFolderPath = applicationDataFolderPath;
+            _resourceScheme = resourceScheme;
+        }
+
+        public async Task CreateCalendarEventAsync(CreateCalendarEventRequest request)
+        {
+            var item = request.PreparedItem;
+            var attendees = request.PreparedEvent.Attendees;
+            var reminders = request.PreparedEvent.Reminders;
+            EnsureCalendarItemDefaults(item, _account, "local");
+            item.AssignedCalendar ??= await _calendarService.GetAccountCalendarAsync(item.CalendarId).ConfigureAwait(false);
+
+            var existing = await _calendarService.GetCalendarItemAsync(item.Id).ConfigureAwait(false);
+
+            if (existing == null)
+                await _calendarService.CreateNewCalendarItemAsync(item, attendees).ConfigureAwait(false);
+            else
+                await _calendarService.UpdateCalendarItemAsync(item, attendees).ConfigureAwait(false);
+
+            await _calendarService.SaveRemindersAsync(item.Id, reminders).ConfigureAwait(false);
+            await SaveAttachmentsAsync(request.ComposeResult, item.Id).ConfigureAwait(false);
+            await PersistIcsAsync(item, attendees).ConfigureAwait(false);
+        }
+
+        public async Task UpdateCalendarEventAsync(UpdateCalendarEventRequest request)
+        {
+            var item = request.Item;
+            EnsureCalendarItemDefaults(item, _account, "local");
+            item.AssignedCalendar ??= await _calendarService.GetAccountCalendarAsync(item.CalendarId).ConfigureAwait(false);
+
+            var attendees = request.Attendees ?? await _calendarService.GetAttendeesAsync(item.Id).ConfigureAwait(false);
+
+            await _calendarService.UpdateCalendarItemAsync(item, attendees).ConfigureAwait(false);
+            await PersistIcsAsync(item, attendees).ConfigureAwait(false);
+        }
+
+        public Task DeleteCalendarEventAsync(DeleteCalendarEventRequest request)
+            => _changeProcessor.DeleteCalendarItemAsync(request.Item.Id);
+
+        public async Task AcceptEventAsync(AcceptEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Accepted;
+            await UpdateStatusAsync(request.Item).ConfigureAwait(false);
+        }
+
+        public async Task DeclineEventAsync(DeclineEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Cancelled;
+            await UpdateStatusAsync(request.Item).ConfigureAwait(false);
+        }
+
+        public async Task TentativeEventAsync(TentativeEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Tentative;
+            await UpdateStatusAsync(request.Item).ConfigureAwait(false);
+        }
+
+        private async Task UpdateStatusAsync(CalendarItem item)
+        {
+            EnsureCalendarItemDefaults(item, _account, "local");
+            item.AssignedCalendar ??= await _calendarService.GetAccountCalendarAsync(item.CalendarId).ConfigureAwait(false);
+
+            var attendees = await _calendarService.GetAttendeesAsync(item.Id).ConfigureAwait(false);
+            await _calendarService.UpdateCalendarItemAsync(item, attendees).ConfigureAwait(false);
+            await PersistIcsAsync(item, attendees).ConfigureAwait(false);
+        }
+
+        private Task PersistIcsAsync(CalendarItem item, List<CalendarEventAttendee> attendees)
+        {
+            var resourceHref = $"{_resourceScheme}://calendar/{item.CalendarId:N}/{item.Id:N}";
+            var icsContent = BuildIcsContent(item, attendees);
+
+            return _changeProcessor.SaveCalendarItemIcsAsync(
+                _account.Id,
+                item.CalendarId,
+                item.Id,
+                item.RemoteEventId,
+                resourceHref,
+                DateTimeOffset.UtcNow.ToString("O"),
+                icsContent);
+        }
+
+        private async Task SaveAttachmentsAsync(CalendarEventComposeResult composeResult, Guid calendarItemId)
+        {
+            await _calendarService.DeleteAttachmentsAsync(calendarItemId).ConfigureAwait(false);
+
+            var attachments = composeResult?.Attachments;
+            if (attachments == null || attachments.Count == 0)
+                return;
+
+            var attachmentsRoot = Path.Combine(_applicationDataFolderPath, "CalendarAttachments", calendarItemId.ToString("N"));
+            Directory.CreateDirectory(attachmentsRoot);
+
+            var storedAttachments = new List<CalendarAttachment>();
+
+            foreach (var attachment in attachments.Where(a => !string.IsNullOrWhiteSpace(a.FilePath) && File.Exists(a.FilePath)))
+            {
+                var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? Path.GetFileName(attachment.FilePath) : attachment.FileName;
+                var destinationPath = Path.Combine(attachmentsRoot, fileName);
+                File.Copy(attachment.FilePath, destinationPath, overwrite: true);
+
+                storedAttachments.Add(new CalendarAttachment
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarItemId = calendarItemId,
+                    RemoteAttachmentId = attachment.Id.ToString("N"),
+                    FileName = fileName,
+                    Size = attachment.Size,
+                    ContentType = MimeTypes.GetMimeType(fileName),
+                    IsDownloaded = true,
+                    LocalFilePath = destinationPath,
+                    LastModified = DateTimeOffset.UtcNow
+                });
             }
 
-            if (reconnect == true)
+            if (storedAttachments.Count > 0)
             {
-                Log.Information("Idle client is reconnecting.");
-
-                _ = StartIdleClientAsync();
-            }
-            else if (reconnect == false)
-            {
-                Log.Information("Finalized idle client.");
+                await _calendarService.InsertOrReplaceAttachmentsAsync(storedAttachments).ConfigureAwait(false);
             }
         }
     }
 
+    private sealed class CalDavCalendarOperationHandler : IImapCalendarOperationHandler
+    {
+        private readonly ImapSynchronizer _owner;
+        private readonly MailAccount _account;
+        private readonly ICalendarService _calendarService;
+        private readonly ICalDavClient _calDavClient;
+
+        public bool RequiresConnectedClient => false;
+
+        public CalDavCalendarOperationHandler(
+            ImapSynchronizer owner,
+            MailAccount account,
+            ICalendarService calendarService,
+            ICalDavClient calDavClient)
+        {
+            _owner = owner;
+            _account = account;
+            _calendarService = calendarService;
+            _calDavClient = calDavClient;
+        }
+
+        public Task CreateCalendarEventAsync(CreateCalendarEventRequest request)
+            => UpsertCalendarEventAsync(request.PreparedItem, request.PreparedEvent.Attendees);
+
+        public Task UpdateCalendarEventAsync(UpdateCalendarEventRequest request)
+            => UpsertCalendarEventAsync(request.Item, request.Attendees);
+
+        public async Task DeleteCalendarEventAsync(DeleteCalendarEventRequest request)
+        {
+            var (connection, calendar) = await ResolveCalDavContextAsync(request.Item.CalendarId).ConfigureAwait(false);
+            if (string.IsNullOrWhiteSpace(request.Item?.RemoteEventId))
+            {
+                throw new InvalidOperationException("Cannot delete CalDAV event because remote event ID is missing.");
+            }
+
+            await _calDavClient
+                .DeleteCalendarEventAsync(connection, calendar, request.Item.RemoteEventId.GetProviderRemoteEventId())
+                .ConfigureAwait(false);
+        }
+
+        public Task AcceptEventAsync(AcceptEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Accepted;
+            return UpsertCalendarEventAsync(request.Item, null);
+        }
+
+        public Task DeclineEventAsync(DeclineEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Cancelled;
+            return UpsertCalendarEventAsync(request.Item, null);
+        }
+
+        public Task TentativeEventAsync(TentativeEventRequest request)
+        {
+            request.Item.Status = CalendarItemStatus.Tentative;
+            return UpsertCalendarEventAsync(request.Item, null);
+        }
+
+        private async Task UpsertCalendarEventAsync(CalendarItem item, List<CalendarEventAttendee> attendees)
+        {
+            EnsureCalendarItemDefaults(item, _account, "caldav");
+
+            if (attendees == null)
+            {
+                attendees = await _calendarService.GetAttendeesAsync(item.Id).ConfigureAwait(false);
+            }
+
+            var (connection, calendar) = await ResolveCalDavContextAsync(item.CalendarId).ConfigureAwait(false);
+            var icsContent = BuildIcsContent(item, attendees);
+
+            await _calDavClient
+                .UpsertCalendarEventAsync(connection, calendar, item.RemoteEventId.GetProviderRemoteEventId(), icsContent)
+                .ConfigureAwait(false);
+        }
+
+        private async Task<(CalDavConnectionSettings Connection, CalDavCalendar Calendar)> ResolveCalDavContextAsync(Guid calendarId)
+        {
+            var assignedCalendar = await _calendarService.GetAccountCalendarAsync(calendarId).ConfigureAwait(false);
+            if (assignedCalendar == null || string.IsNullOrWhiteSpace(assignedCalendar.RemoteCalendarId))
+            {
+                throw new InvalidOperationException("Cannot execute CalDAV operation because the target calendar has no remote ID.");
+            }
+
+            var serviceUri = await _owner.ResolveCalDavServiceUriAsync(CancellationToken.None).ConfigureAwait(false);
+            if (serviceUri == null)
+            {
+                throw new InvalidOperationException("Cannot execute CalDAV operation because no CalDAV service URI is configured.");
+            }
+
+            var username = _owner.ResolveCalDavUsername();
+            var password = _owner.ResolveCalDavPassword();
+
+            if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password))
+            {
+                throw new InvalidOperationException("Cannot execute CalDAV operation because credentials are missing.");
+            }
+
+            var connection = new CalDavConnectionSettings
+            {
+                ServiceUri = serviceUri,
+                Username = username,
+                Password = password
+            };
+
+            var remoteCalendar = new CalDavCalendar
+            {
+                RemoteCalendarId = assignedCalendar.RemoteCalendarId,
+                Name = assignedCalendar.Name
+            };
+
+            return (connection, remoteCalendar);
+        }
+    }
+
+    private static void EnsureCalendarItemDefaults(CalendarItem item, MailAccount account, string idPrefix)
+    {
+        if (item == null)
+            throw new ArgumentNullException(nameof(item));
+
+        if (item.Id == Guid.Empty)
+            item.Id = Guid.NewGuid();
+
+        if (string.IsNullOrWhiteSpace(item.RemoteEventId))
+            item.RemoteEventId = $"{idPrefix}-{item.Id:N}";
+
+        if (item.CreatedAt == default)
+            item.CreatedAt = DateTimeOffset.UtcNow;
+
+        item.UpdatedAt = DateTimeOffset.UtcNow;
+        item.OrganizerDisplayName ??= account?.SenderName ?? string.Empty;
+        item.OrganizerEmail ??= account?.Address ?? string.Empty;
+        item.StartTimeZone ??= TimeZoneInfo.Local.Id;
+        item.EndTimeZone ??= item.StartTimeZone;
+    }
+
+    private static string BuildIcsContent(CalendarItem item, List<CalendarEventAttendee> attendees)
+    {
+        var uid = item.RemoteEventId?.Split(new[] { "::" }, StringSplitOptions.None)[0] ?? item.Id.ToString("N");
+        var dtStamp = DateTimeOffset.UtcNow.ToString("yyyyMMdd'T'HHmmss'Z'");
+
+        var lines = new List<string>
+        {
+            "BEGIN:VCALENDAR",
+            "VERSION:2.0",
+            "PRODID:-//Wino Mail//Calendar//EN",
+            "CALSCALE:GREGORIAN",
+            "BEGIN:VEVENT",
+            $"UID:{EscapeIcs(uid)}",
+            $"DTSTAMP:{dtStamp}",
+        };
+
+        if (item.IsAllDayEvent)
+        {
+            lines.Add($"DTSTART;VALUE=DATE:{item.StartDate:yyyyMMdd}");
+            lines.Add($"DTEND;VALUE=DATE:{item.EndDate:yyyyMMdd}");
+        }
+        else
+        {
+            var startUtc = ConvertEventTimeToUtc(item.StartDate, item.StartTimeZone);
+            var endUtc = ConvertEventTimeToUtc(item.EndDate, item.EndTimeZone ?? item.StartTimeZone);
+
+            lines.Add($"DTSTART:{startUtc:yyyyMMdd'T'HHmmss'Z'}");
+            lines.Add($"DTEND:{endUtc:yyyyMMdd'T'HHmmss'Z'}");
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.Title))
+            lines.Add($"SUMMARY:{EscapeIcs(item.Title)}");
+
+        if (!string.IsNullOrWhiteSpace(item.Description))
+            lines.Add($"DESCRIPTION:{EscapeIcs(item.Description)}");
+
+        if (!string.IsNullOrWhiteSpace(item.Location))
+            lines.Add($"LOCATION:{EscapeIcs(item.Location)}");
+
+        lines.Add($"STATUS:{MapStatus(item.Status)}");
+        lines.Add($"TRANSP:{(item.ShowAs == CalendarItemShowAs.Free ? "TRANSPARENT" : "OPAQUE")}");
+        lines.Add($"CLASS:{MapVisibility(item.Visibility)}");
+
+        if (!string.IsNullOrWhiteSpace(item.Recurrence))
+        {
+            var recurrenceLines = item.Recurrence
+                .Split(Wino.Core.Domain.Constants.CalendarEventRecurrenceRuleSeperator, StringSplitOptions.RemoveEmptyEntries)
+                .Select(l => l.Trim())
+                .Where(l => !string.IsNullOrWhiteSpace(l));
+
+            lines.AddRange(recurrenceLines);
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.OrganizerEmail))
+        {
+            var organizerName = string.IsNullOrWhiteSpace(item.OrganizerDisplayName)
+                ? item.OrganizerEmail
+                : item.OrganizerDisplayName;
+            lines.Add($"ORGANIZER;CN={EscapeIcs(organizerName)}:mailto:{EscapeIcs(item.OrganizerEmail)}");
+        }
+
+        if (attendees != null)
+        {
+            foreach (var attendee in attendees.Where(a => !string.IsNullOrWhiteSpace(a.Email)))
+            {
+                var role = attendee.IsOptionalAttendee ? "OPT-PARTICIPANT" : "REQ-PARTICIPANT";
+                var partStat = attendee.AttendenceStatus switch
+                {
+                    AttendeeStatus.Accepted => "ACCEPTED",
+                    AttendeeStatus.Declined => "DECLINED",
+                    AttendeeStatus.Tentative => "TENTATIVE",
+                    _ => "NEEDS-ACTION"
+                };
+
+                var cn = string.IsNullOrWhiteSpace(attendee.Name) ? attendee.Email : attendee.Name;
+                lines.Add($"ATTENDEE;CN={EscapeIcs(cn)};ROLE={role};PARTSTAT={partStat}:mailto:{EscapeIcs(attendee.Email)}");
+            }
+        }
+
+        lines.Add("END:VEVENT");
+        lines.Add("END:VCALENDAR");
+
+        return string.Join(Environment.NewLine, lines);
+    }
+
+    private static DateTime ConvertEventTimeToUtc(DateTime eventDateTime, string eventTimeZoneId)
+    {
+        if (string.IsNullOrWhiteSpace(eventTimeZoneId))
+            return eventDateTime.ToUniversalTime();
+
+        try
+        {
+            var eventTimeZone = TimeZoneInfo.FindSystemTimeZoneById(eventTimeZoneId);
+            var unspecifiedDateTime = DateTime.SpecifyKind(eventDateTime, DateTimeKind.Unspecified);
+            return TimeZoneInfo.ConvertTimeToUtc(unspecifiedDateTime, eventTimeZone);
+        }
+        catch
+        {
+            return eventDateTime.ToUniversalTime();
+        }
+    }
+
+    private static string EscapeIcs(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+            return string.Empty;
+
+        return value
+            .Replace("\\", "\\\\", StringComparison.Ordinal)
+            .Replace(";", "\\;", StringComparison.Ordinal)
+            .Replace(",", "\\,", StringComparison.Ordinal)
+            .Replace("\r\n", "\\n", StringComparison.Ordinal)
+            .Replace("\n", "\\n", StringComparison.Ordinal);
+    }
+
+    private static string MapStatus(CalendarItemStatus status)
+    {
+        return status switch
+        {
+            CalendarItemStatus.Cancelled => "CANCELLED",
+            CalendarItemStatus.Tentative => "TENTATIVE",
+            _ => "CONFIRMED"
+        };
+    }
+
+    private static string MapVisibility(CalendarItemVisibility visibility)
+    {
+        return visibility switch
+        {
+            CalendarItemVisibility.Public => "PUBLIC",
+            CalendarItemVisibility.Private => "PRIVATE",
+            CalendarItemVisibility.Confidential => "CONFIDENTIAL",
+            _ => "PUBLIC"
+        };
+    }
+
+    public Task StartIdleClientAsync()
+    {
+        if (IsDisposing)
+            return Task.CompletedTask;
+
+        if (_idleLoopTask != null && !_idleLoopTask.IsCompleted)
+            return Task.CompletedTask;
+
+        _idleLoopCancellationTokenSource = new CancellationTokenSource();
+        _idleLoopTask = RunIdleLoopAsync(_idleLoopCancellationTokenSource.Token);
+
+        return Task.CompletedTask;
+    }
+
+    private async Task RunIdleLoopAsync(CancellationToken cancellationToken)
+    {
+        int reconnectAttempt = 0;
+
+        while (!cancellationToken.IsCancellationRequested && !IsDisposing)
+        {
+            IImapClient idleClient = null;
+            IMailFolder inboxFolder = null;
+            bool shouldReconnect = false;
+
+            try
+            {
+                idleClient = await _clientPool.GetIdleClientAsync(cancellationToken).ConfigureAwait(false);
+
+                if (idleClient == null)
+                {
+                    _logger.Warning("Dedicated IDLE client could not be allocated for {AccountName}.", Account.Name);
+                    return;
+                }
+
+                if (!idleClient.Capabilities.HasFlag(ImapCapabilities.Idle))
+                {
+                    _logger.Information("{AccountName} does not support IMAP IDLE. Automatic updates rely on global sync interval.", Account.Name);
+                    return;
+                }
+
+                if (idleClient.Inbox == null)
+                {
+                    _logger.Warning("{AccountName} does not expose Inbox for IDLE listening.", Account.Name);
+                    return;
+                }
+
+                inboxFolder = idleClient.Inbox;
+
+                await inboxFolder.OpenAsync(FolderAccess.ReadOnly, cancellationToken).ConfigureAwait(false);
+
+                _lastIdleInboxCount = inboxFolder.Count;
+                inboxFolder.CountChanged += IdleInboxCountChanged;
+
+                reconnectAttempt = 0;
+                _logger.Debug("Started dedicated IDLE loop for {AccountName}.", Account.Name);
+
+                while (!cancellationToken.IsCancellationRequested && !IsDisposing && idleClient.IsConnected)
+                {
+                    using var idleDoneTokenSource = new CancellationTokenSource(TimeSpan.FromMinutes(9));
+                    await idleClient.IdleAsync(idleDoneTokenSource.Token, cancellationToken).ConfigureAwait(false);
+                }
+            }
+            catch (ImapProtocolException protocolException)
+            {
+                _logger.Information(protocolException, "Idle client received protocol exception for {AccountName}.", Account.Name);
+                shouldReconnect = true;
+            }
+            catch (IOException ioException)
+            {
+                _logger.Information(ioException, "Idle client received IO exception for {AccountName}.", Account.Name);
+                shouldReconnect = true;
+            }
+            catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested || IsDisposing)
+            {
+                break;
+            }
+            catch (OperationCanceledException)
+            {
+                shouldReconnect = true;
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Idle client loop failed for {AccountName}.", Account.Name);
+                shouldReconnect = true;
+            }
+            finally
+            {
+                if (inboxFolder != null)
+                {
+                    inboxFolder.CountChanged -= IdleInboxCountChanged;
+
+                    if (inboxFolder.IsOpen && !cancellationToken.IsCancellationRequested)
+                    {
+                        await inboxFolder.CloseAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+                    }
+                }
+
+                _clientPool.ReleaseIdleClient(isFaulted: shouldReconnect);
+            }
+
+            if (!shouldReconnect)
+            {
+                break;
+            }
+
+            reconnectAttempt++;
+            var reconnectDelay = GetIdleReconnectDelay(reconnectAttempt);
+            _logger.Information("Reconnecting IDLE client for {AccountName} in {Delay}.", Account.Name, reconnectDelay);
+
+            try
+            {
+                await Task.Delay(reconnectDelay, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+        }
+    }
+
+    private static TimeSpan GetIdleReconnectDelay(int attempt)
+    {
+        var backoffSeconds = Math.Min(60, Math.Pow(2, Math.Min(attempt, 6)));
+        int jitterMs;
+
+        lock (IdleReconnectJitter)
+        {
+            jitterMs = IdleReconnectJitter.Next(250, 1250);
+        }
+
+        return TimeSpan.FromSeconds(backoffSeconds) + TimeSpan.FromMilliseconds(jitterMs);
+    }
+
     private void RequestIdleChangeSynchronization()
     {
-        Debug.WriteLine("Detected idle change.");
-
-        // We don't really need to act on the count change in detail.
-        // Our synchronization should be enough to handle the changes with on-demand sync.
-        // We can just trigger a sync here IMAPIdle type.
+        if (!ShouldTriggerIdleSynchronization(DateTime.UtcNow))
+            return;
 
         var options = new MailSynchronizationOptions()
         {
@@ -857,18 +2069,60 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
             Type = MailSynchronizationType.IMAPIdle
         };
 
-        WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
+        WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options));
     }
 
-    private void IdleNotificationTriggered(object sender, EventArgs e)
-        => RequestIdleChangeSynchronization();
-
-    public Task StopIdleClientAsync()
+    internal bool ShouldTriggerIdleSynchronization(DateTime nowUtc)
     {
-        idleDoneTokenSource?.Cancel();
-        idleCancellationTokenSource?.Cancel();
+        lock (_idleDebounceLock)
+        {
+            if (nowUtc - _lastIdleSyncRequestUtc < _idleSyncDebounceWindow)
+            {
+                return false;
+            }
 
-        return Task.CompletedTask;
+            _lastIdleSyncRequestUtc = nowUtc;
+            return true;
+        }
+    }
+
+    private void IdleInboxCountChanged(object sender, EventArgs e)
+    {
+        if (sender is not IMailFolder inboxFolder)
+            return;
+
+        var currentCount = inboxFolder.Count;
+        var previousCount = _lastIdleInboxCount;
+        _lastIdleInboxCount = currentCount;
+
+        if (currentCount > previousCount)
+        {
+            RequestIdleChangeSynchronization();
+        }
+    }
+
+    public async Task StopIdleClientAsync()
+    {
+        if (_idleLoopCancellationTokenSource != null)
+        {
+            _idleLoopCancellationTokenSource.Cancel();
+        }
+
+        if (_idleLoopTask != null)
+        {
+            try
+            {
+                await _idleLoopTask.ConfigureAwait(false);
+            }
+            catch (OperationCanceledException)
+            {
+                // no-op
+            }
+        }
+
+        _idleLoopCancellationTokenSource?.Dispose();
+        _idleLoopCancellationTokenSource = null;
+        _idleLoopTask = null;
     }
 
     public override async Task KillSynchronizerAsync()
@@ -882,3 +2136,5 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
     public Task PreWarmClientPoolAsync() => _clientPool.PreWarmPoolAsync();
 }
+
+
diff --git a/Wino.Core/Synchronizers/OutlookSynchronizer.cs b/Wino.Core/Synchronizers/OutlookSynchronizer.cs
index a2ab4bd9..445db927 100644
--- a/Wino.Core/Synchronizers/OutlookSynchronizer.cs
+++ b/Wino.Core/Synchronizers/OutlookSynchronizer.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
@@ -13,47 +11,70 @@ using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Graph;
+using Microsoft.Graph.Me.MailFolders.Item.Messages.Delta;
 using Microsoft.Graph.Models;
 using Microsoft.Graph.Models.ODataErrors;
 using Microsoft.Kiota.Abstractions;
 using Microsoft.Kiota.Abstractions.Authentication;
-using Microsoft.Kiota.Abstractions.Serialization;
-using Microsoft.Kiota.Http.HttpClientLibrary.Middleware;
-using Microsoft.Kiota.Http.HttpClientLibrary.Middleware.Options;
 using MimeKit;
 using MoreLinq.Extensions;
 using Serilog;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.Errors;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Extensions;
 using Wino.Core.Http;
+using Wino.Core.Helpers;
 using Wino.Core.Integration.Processors;
 using Wino.Core.Misc;
 using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Calendar;
 using Wino.Core.Requests.Folder;
 using Wino.Core.Requests.Mail;
+using Wino.Messaging.UI;
 
 namespace Wino.Core.Synchronizers.Mail;
 
 [JsonSerializable(typeof(Microsoft.Graph.Me.Messages.Item.Move.MovePostRequestBody))]
-[JsonSerializable(typeof(OutlookFileAttachment))]
 public partial class OutlookSynchronizerJsonContext : JsonSerializerContext;
 
+/// <summary>
+/// Outlook synchronizer implementation with delta token synchronization.
+/// 
+/// SYNCHRONIZATION STRATEGY:
+/// - Uses delta API for both initial and incremental sync
+/// - Initial sync: Downloads last 30 days of emails with metadata only
+/// - Incremental sync: Uses delta token to get only changes since last sync
+/// - Messages are downloaded with metadata only (no MIME content during sync)
+/// - MIME files are downloaded on-demand when user explicitly reads a message
+/// 
+/// Key implementation details:
+/// - SynchronizeFolderAsync: Main entry point for per-folder synchronization
+/// - DownloadMailsForInitialSyncAsync: Downloads last 30 days using delta API with filter
+/// - ProcessDeltaChangesAsync: Processes incremental changes using delta token
+/// - DownloadMessageMetadataBatchAsync: Downloads metadata in batches using Graph batch API
+/// - CreateMailCopyFromMessageAsync: Creates MailCopy from Message metadata
+/// - DownloadMissingMimeMessageAsync: Downloads raw MIME only when explicitly requested
+/// </summary>
 public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message, Event>
 {
     public override uint BatchModificationSize => 20;
-    public override uint InitialMessageDownloadCountPerFolder => 250;
+    public override uint InitialMessageDownloadCountPerFolder => 1000;
     private const uint MaximumAllowedBatchRequestSize = 20;
+    private const int SimpleAttachmentUploadLimitBytes = 3 * 1024 * 1024;
+    private const int MaximumUploadSessionAttachmentSizeBytes = 150 * 1024 * 1024;
+    private const int LargeAttachmentUploadChunkSizeBytes = 320 * 1024;
 
     private const string INBOX_NAME = "inbox";
     private const string SENT_NAME = "sentitems";
@@ -75,22 +96,32 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         "Id",
         "ConversationId",
         "From",
+        "Sender",
+        "ToRecipients",
+        "CcRecipients",
+        "BccRecipients",
+        "ReplyTo",
         "Subject",
         "ParentFolderId",
         "InternetMessageId",
+        "InternetMessageHeaders",
     ];
 
     private readonly SemaphoreSlim _handleItemRetrievalSemaphore = new(1);
+    private readonly SemaphoreSlim _handleCalendarEventRetrievalSemaphore = new(1);
 
     private readonly ILogger _logger = Log.ForContext<OutlookSynchronizer>();
     private readonly IOutlookChangeProcessor _outlookChangeProcessor;
     private readonly GraphServiceClient _graphClient;
     private readonly IOutlookSynchronizerErrorHandlerFactory _errorHandlingFactory;
+    private bool _isFolderStructureChanged;
+
+    private readonly SemaphoreSlim _concurrentDownloadSemaphore = new(10); // Limit to 10 concurrent downloads
 
     public OutlookSynchronizer(MailAccount account,
                                IAuthenticator authenticator,
                                IOutlookChangeProcessor outlookChangeProcessor,
-                               IOutlookSynchronizerErrorHandlerFactory errorHandlingFactory) : base(account)
+                               IOutlookSynchronizerErrorHandlerFactory errorHandlingFactory) : base(account, WeakReferenceMessenger.Default)
     {
         var tokenProvider = new MicrosoftTokenProvider(Account, authenticator);
 
@@ -98,14 +129,7 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         var handlers = GraphClientFactory.CreateDefaultHandlers();
 
         handlers.Add(GetMicrosoftImmutableIdHandler());
-
-        // Remove existing RetryHandler and add a new one with custom options.
-        var existingRetryHandler = handlers.FirstOrDefault(a => a is RetryHandler);
-        if (existingRetryHandler != null)
-            handlers.Remove(existingRetryHandler);
-
-        // Add custom one.
-        handlers.Add(GetRetryHandler());
+        handlers.Add(GetGraphRateLimitHandler());
 
         var httpClient = GraphClientFactory.Create(handlers);
         _graphClient = new GraphServiceClient(httpClient, new BaseBearerTokenAuthenticationProvider(tokenProvider));
@@ -118,29 +142,7 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
     private MicrosoftImmutableIdHandler GetMicrosoftImmutableIdHandler() => new();
 
-    private RetryHandler GetRetryHandler()
-    {
-        var options = new RetryHandlerOption()
-        {
-            ShouldRetry = (delay, attempt, httpResponse) =>
-            {
-                var statusCode = httpResponse.StatusCode;
-
-                return statusCode switch
-                {
-                    HttpStatusCode.ServiceUnavailable => true,
-                    HttpStatusCode.GatewayTimeout => true,
-                    (HttpStatusCode)429 => true,
-                    HttpStatusCode.Unauthorized => true,
-                    _ => false
-                };
-            },
-            Delay = 3,
-            MaxRetry = 3
-        };
-
-        return new RetryHandler(options);
-    }
+    private GraphRateLimitHandler GetGraphRateLimitHandler() => new();
 
     #endregion
 
@@ -148,13 +150,15 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
     protected override async Task<MailSynchronizationResult> SynchronizeMailsInternalAsync(MailSynchronizationOptions options, CancellationToken cancellationToken = default)
     {
         var downloadedMessageIds = new List<string>();
+        var folderResults = new List<FolderSyncResult>();
 
         _logger.Information("Internal synchronization started for {Name}", Account.Name);
         _logger.Information("Options: {Options}", options);
 
         try
         {
-            PublishSynchronizationProgress(1);
+            // Set indeterminate progress initially
+            UpdateSyncProgress(0, 0, "Synchronizing folders...");
 
             await SynchronizeFoldersAsync(cancellationToken).ConfigureAwait(false);
 
@@ -164,40 +168,115 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
                 _logger.Information(string.Format("{1} Folders: {0}", string.Join(",", synchronizationFolders.Select(a => a.FolderName)), synchronizationFolders.Count));
 
-                for (int i = 0; i < synchronizationFolders.Count; i++)
+                var totalFolders = synchronizationFolders.Count;
+
+                for (int i = 0; i < totalFolders; i++)
                 {
                     var folder = synchronizationFolders[i];
-                    var progress = (int)Math.Round((double)(i + 1) / synchronizationFolders.Count * 100);
 
-                    PublishSynchronizationProgress(progress);
+                    // Update progress based on folder completion
+                    var progressPercentage = (int)Math.Round((double)(i + 1) / totalFolders * 100);
+                    var statusMessage = string.Format(Translator.Sync_SynchronizingFolder, folder.FolderName, progressPercentage);
+                    UpdateSyncProgress(totalFolders, totalFolders - (i + 1), statusMessage);
 
-                    var folderDownloadedMessageIds = await SynchronizeFolderAsync(folder, cancellationToken).ConfigureAwait(false);
-                    downloadedMessageIds.AddRange(folderDownloadedMessageIds);
+                    try
+                    {
+                        var folderDownloadedMessageIds = await SynchronizeFolderAsync(folder, cancellationToken).ConfigureAwait(false);
+                        downloadedMessageIds.AddRange(folderDownloadedMessageIds);
+
+                        folderResults.Add(FolderSyncResult.Successful(folder.Id, folder.FolderName, folderDownloadedMessageIds.Count()));
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // Cancellation should stop the entire sync
+                        throw;
+                    }
+                    catch (ODataError odataError)
+                    {
+                        // Handle OData errors - determine if we should continue or stop
+                        var errorContext = new SynchronizerErrorContext
+                        {
+                            Account = Account,
+                            ErrorCode = (int?)odataError.ResponseStatusCode,
+                            ErrorMessage = odataError.Error?.Message ?? odataError.Message,
+                            Exception = odataError,
+                            FolderId = folder.Id,
+                            FolderName = folder.FolderName,
+                            OperationType = "FolderSync"
+                        };
+
+                        var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+                        if (errorContext.CanContinueSync)
+                        {
+                            _logger.Warning("Folder {FolderName} sync failed with recoverable error, continuing with other folders. Error: {Error}",
+                                folder.FolderName, odataError.Error?.Message);
+                            folderResults.Add(FolderSyncResult.Failed(folder.Id, folder.FolderName, errorContext));
+                        }
+                        else
+                        {
+                            _logger.Error(odataError, "Folder {FolderName} sync failed with fatal error, stopping sync", folder.FolderName);
+                            folderResults.Add(FolderSyncResult.Failed(folder.Id, folder.FolderName, errorContext));
+                            throw;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        // For unexpected exceptions, try to classify and decide if we should continue
+                        var errorContext = new SynchronizerErrorContext
+                        {
+                            Account = Account,
+                            ErrorMessage = ex.Message,
+                            Exception = ex,
+                            FolderId = folder.Id,
+                            FolderName = folder.FolderName,
+                            OperationType = "FolderSync",
+                            Severity = SynchronizerErrorSeverity.Recoverable, // Default to recoverable for individual folders
+                            Category = SynchronizerErrorCategory.Unknown
+                        };
+
+                        _logger.Warning(ex, "Folder {FolderName} sync failed, continuing with other folders", folder.FolderName);
+                        folderResults.Add(FolderSyncResult.Failed(folder.Id, folder.FolderName, errorContext));
+                    }
                 }
             }
         }
+        catch (OperationCanceledException)
+        {
+            _logger.Information("Synchronization was canceled for {Name}", Account.Name);
+            return MailSynchronizationResult.Canceled;
+        }
         catch (Exception ex)
         {
             _logger.Error(ex, "Synchronizing folders for {Name}", Account.Name);
-            Debugger.Break();
-
-            throw;
+            return MailSynchronizationResult.Failed(ex);
         }
         finally
         {
-            PublishSynchronizationProgress(100);
+            // Reset progress at the end
+            ResetSyncProgress();
         }
 
-        // Get all unred new downloaded items and return in the result.
+        // Get all unread new downloaded items and return in the result.
         // This is primarily used in notifications.
 
         var unreadNewItems = await _outlookChangeProcessor.GetDownloadedUnreadMailsAsync(Account.Id, downloadedMessageIds).ConfigureAwait(false);
 
-        return MailSynchronizationResult.Completed(unreadNewItems);
+        return MailSynchronizationResult.CompletedWithFolderResults(unreadNewItems, folderResults);
     }
 
     public async Task DownloadSearchResultMessageAsync(string messageId, MailItemFolder assignedFolder, CancellationToken cancellationToken = default)
     {
+        if (string.IsNullOrWhiteSpace(messageId) || assignedFolder == null) return;
+
+        // Online search can return the same message across repeated invocations/races.
+        // Guard before network+MIME download and before database insert.
+        var existing = await _outlookChangeProcessor.AreMailsExistsAsync([messageId]).ConfigureAwait(false);
+        if (existing.Contains(messageId))
+        {
+            return;
+        }
+
         Log.Information("Downloading search result message {messageId} for {Name} - {FolderName}", messageId, Account.Name, assignedFolder.FolderName);
 
         // Outlook message handling was a little strange.
@@ -211,6 +290,17 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             config.QueryParameters.Select = outlookMessageSelectParameters;
         }, cancellationToken).ConfigureAwait(false);
 
+        // Check if this is an EventMessage and fetch it separately if needed (only if calendar access granted)
+        if (Account.IsCalendarAccessGranted && message is EventMessage)
+        {
+            message = await FetchEventMessageAsync(message.Id, cancellationToken).ConfigureAwait(false);
+            if (message == null)
+            {
+                _logger.Warning("Failed to fetch EventMessage {MessageId}, skipping", messageId);
+                return;
+            }
+        }
+
         var mailPackages = await CreateNewMailPackagesAsync(message, assignedFolder, cancellationToken).ConfigureAwait(false);
 
         if (mailPackages == null) return;
@@ -219,7 +309,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            await _outlookChangeProcessor.CreateMailRawAsync(Account, assignedFolder, package).ConfigureAwait(false);
+            // Use safe upsert path to avoid duplicate rows when message already exists.
+            await _outlookChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
         }
     }
 
@@ -229,110 +320,680 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
         cancellationToken.ThrowIfCancellationRequested();
 
-    retry:
-        string latestDeltaLink = string.Empty;
+        _logger.Debug("Synchronizing {FolderName} using delta API", folder.FolderName);
 
-        bool isInitialSync = string.IsNullOrEmpty(folder.DeltaToken);
-
-        Microsoft.Graph.Me.MailFolders.Item.Messages.Delta.DeltaGetResponse messageCollectionPage = null;
-
-        _logger.Debug("Synchronizing {FolderName}", folder.FolderName);
-
-        if (isInitialSync)
+        // Check if we have a delta token
+        if (string.IsNullOrEmpty(folder.DeltaToken))
         {
-            _logger.Debug("No sync identifier for Folder {FolderName}. Performing initial sync.", folder.FolderName);
+            _logger.Debug("No delta token for folder {FolderName}. Starting initial sync (last 30 days).", folder.FolderName);
 
-            // No delta link. Performing initial sync.
-
-            messageCollectionPage = await _graphClient.Me.MailFolders[folder.RemoteFolderId].Messages.Delta.GetAsDeltaGetResponseAsync((config) =>
-           {
-               config.QueryParameters.Top = (int)InitialMessageDownloadCountPerFolder;
-               config.QueryParameters.Select = outlookMessageSelectParameters;
-               config.QueryParameters.Orderby = ["receivedDateTime desc"];
-           }, cancellationToken).ConfigureAwait(false);
+            // Download mails for initial sync (last 30 days)
+            await DownloadMailsForInitialSyncAsync(folder, downloadedMessageIds, cancellationToken).ConfigureAwait(false);
         }
         else
         {
-            var currentDeltaToken = folder.DeltaToken;
+            // Initial sync is completed, process delta changes
+            _logger.Debug("Delta token exists for folder {FolderName}. Processing incremental changes.", folder.FolderName);
 
-            var requestInformation = _graphClient.Me.MailFolders[folder.RemoteFolderId].Messages.Delta.ToGetRequestInformation((config) =>
-            {
-                config.QueryParameters.Top = (int)InitialMessageDownloadCountPerFolder;
-                config.QueryParameters.Select = outlookMessageSelectParameters;
-                config.QueryParameters.Orderby = ["receivedDateTime desc"];
-            });
-
-            requestInformation.UrlTemplate = requestInformation.UrlTemplate.Insert(requestInformation.UrlTemplate.Length - 1, ",%24deltatoken");
-            requestInformation.QueryParameters.Add("%24deltatoken", currentDeltaToken);
-
-            try
-            {
-                messageCollectionPage = await _graphClient.RequestAdapter.SendAsync(requestInformation, Microsoft.Graph.Me.MailFolders.Item.Messages.Delta.DeltaGetResponse.CreateFromDiscriminatorValue, cancellationToken: cancellationToken);
-            }
-            catch (ApiException apiException) when (apiException.ResponseStatusCode == 410)
-            {
-                folder.DeltaToken = string.Empty;
-
-                goto retry;
-            }
-        }
-
-        var messageIteratorAsync = PageIterator<Message, Microsoft.Graph.Me.MailFolders.Item.Messages.Delta.DeltaGetResponse>.CreatePageIterator(_graphClient, messageCollectionPage, async (item) =>
-        {
-            try
-            {
-                await _handleItemRetrievalSemaphore.WaitAsync();
-                return await HandleItemRetrievedAsync(item, folder, downloadedMessageIds, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Error occurred while handling item {Id} for folder {FolderName}", item.Id, folder.FolderName);
-            }
-            finally
-            {
-                _handleItemRetrievalSemaphore.Release();
-            }
-
-            return true;
-        });
-
-        await messageIteratorAsync
-            .IterateAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        latestDeltaLink = messageIteratorAsync.Deltalink;
-
-        if (downloadedMessageIds.Any())
-        {
-            _logger.Debug("Downloaded {Count} messages for folder {FolderName}", downloadedMessageIds.Count, folder.FolderName);
-        }
-
-        //Store delta link for tracking new changes.
-        if (!string.IsNullOrEmpty(latestDeltaLink))
-        {
-            // Parse Delta Token from Delta Link since v5 of Graph SDK works based on the token, not the link.
-
-            var deltaToken = GetDeltaTokenFromDeltaLink(latestDeltaLink);
-
-            await _outlookChangeProcessor.UpdateFolderDeltaSynchronizationIdentifierAsync(folder.Id, deltaToken).ConfigureAwait(false);
+            await ProcessDeltaChangesAsync(folder, downloadedMessageIds, cancellationToken).ConfigureAwait(false);
         }
 
         await _outlookChangeProcessor.UpdateFolderLastSyncDateAsync(folder.Id).ConfigureAwait(false);
 
+        if (downloadedMessageIds.Any())
+        {
+            _logger.Information("Downloaded {Count} messages for folder {FolderName}", downloadedMessageIds.Count, folder.FolderName);
+        }
+
         return downloadedMessageIds;
     }
 
+    /// <summary>
+    /// Downloads mails for initial synchronization using Delta API with 30-day filter.
+    /// Downloads metadata only (no MIME content) for messages received in the last 30 days.
+    /// </summary>
+    private async Task DownloadMailsForInitialSyncAsync(MailItemFolder folder, List<string> downloadedMessageIds, CancellationToken cancellationToken)
+    {
+        _logger.Debug("Starting initial mail download for folder {FolderName} (last 6 months)", folder.FolderName);
+
+        try
+        {
+            // Calculate date 6 months ago
+            var sixMonthsAgo = DateTime.UtcNow.AddMonths(-6);
+            var filterDate = sixMonthsAgo.ToString("yyyy-MM-ddTHH:mm:ssZ");
+
+            _logger.Information("Downloading messages received after {FilterDate} for folder {FolderName}", filterDate, folder.FolderName);
+
+            // Use Delta API with receivedDateTime filter for last 6 months
+            var messageCollectionPage = await _graphClient.Me.MailFolders[folder.RemoteFolderId].Messages.Delta.GetAsDeltaGetResponseAsync((config) =>
+            {
+                config.QueryParameters.Select = outlookMessageSelectParameters;
+                config.QueryParameters.Orderby = ["receivedDateTime desc"];
+                config.QueryParameters.Filter = $"receivedDateTime ge {filterDate}";
+            }, cancellationToken).ConfigureAwait(false);
+
+            var totalProcessed = 0;
+
+            // Use PageIterator to process all messages
+            var messageIterator = PageIterator<Message, DeltaGetResponse>.CreatePageIterator(_graphClient, messageCollectionPage, async (message) =>
+            {
+                try
+                {
+                    await _handleItemRetrievalSemaphore.WaitAsync();
+
+                    if (!IsResourceDeleted(message.AdditionalData) && !IsNotRealMessageType(message))
+                    {
+                        // Check if this is an EventMessage and fetch it separately if needed (only if calendar access granted)
+                        if (Account.IsCalendarAccessGranted && message is EventMessage)
+                        {
+                            message = await FetchEventMessageAsync(message.Id, cancellationToken).ConfigureAwait(false);
+                            if (message == null)
+                            {
+                                return true; // Skip this message if fetch failed
+                            }
+                        }
+
+                        // Check if message already exists
+                        bool mailExists = await _outlookChangeProcessor.IsMailExistsInFolderAsync(message.Id, folder.Id).ConfigureAwait(false);
+
+                        if (!mailExists)
+                        {
+                            // For drafts and calendar invitations, download MIME during initial sync like delta sync.
+                            var itemType = Account.IsCalendarAccessGranted ? message.GetMailItemType() : MailItemType.Mail;
+                            if (folder.SpecialFolderType == SpecialFolderType.Draft || itemType == MailItemType.CalendarInvitation)
+                            {
+                                var draftPackages = await CreateNewMailPackagesAsync(message, folder, cancellationToken).ConfigureAwait(false);
+
+                                if (draftPackages != null)
+                                {
+                                    foreach (var package in draftPackages)
+                                    {
+                                        bool isInserted = await _outlookChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+                                        if (isInserted)
+                                        {
+                                            downloadedMessageIds.Add(package.Copy.Id);
+                                            totalProcessed++;
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                // Create MailCopy from metadata
+                                var mailCopy = await CreateMailCopyFromMessageAsync(message, folder).ConfigureAwait(false);
+
+                                if (mailCopy != null)
+                                {
+                                    // Create package without MIME
+                                    var contacts = ExtractContactsFromOutlookMessage(message);
+                                    var package = new NewMailItemPackage(mailCopy, null, folder.RemoteFolderId, contacts);
+                                    bool isInserted = await _outlookChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+
+                                    if (isInserted)
+                                    {
+                                        downloadedMessageIds.Add(mailCopy.Id);
+                                        totalProcessed++;
+                                    }
+                                }
+                            }
+
+                            // Update progress periodically
+                            if (totalProcessed > 0 && totalProcessed % 50 == 0)
+                            {
+                                var statusMessage = string.Format(Translator.Sync_DownloadedMessages, totalProcessed, folder.FolderName);
+                                UpdateSyncProgress(0, 0, statusMessage);
+                            }
+                        }
+                        else
+                        {
+                            _logger.Debug("Mail {MailId} already exists in folder {FolderName}, skipping", message.Id, folder.FolderName);
+                        }
+                    }
+
+                    return true; // Continue processing
+                }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex, "Failed to process message {MessageId} during initial sync for folder {FolderName}", message.Id, folder.FolderName);
+                    return true; // Continue despite error
+                }
+                finally
+                {
+                    _handleItemRetrievalSemaphore.Release();
+                }
+            });
+
+            await messageIterator.IterateAsync(cancellationToken).ConfigureAwait(false);
+
+            // Extract and store delta token for future incremental syncs
+            if (!string.IsNullOrEmpty(messageIterator.Deltalink))
+            {
+                var deltaToken = GetDeltaTokenFromDeltaLink(messageIterator.Deltalink);
+                await _outlookChangeProcessor.UpdateFolderDeltaSynchronizationIdentifierAsync(folder.Id, deltaToken).ConfigureAwait(false);
+                await _outlookChangeProcessor.UpdateFolderLastSyncDateAsync(folder.Id).ConfigureAwait(false);
+                folder.DeltaToken = deltaToken;
+                _logger.Information("Stored delta token for folder {FolderName} - future syncs will be incremental", folder.FolderName);
+            }
+            else
+            {
+                _logger.Warning("No delta token received for folder {FolderName} - future syncs may re-download messages", folder.FolderName);
+            }
+
+            _logger.Information("Initial sync completed for folder {FolderName}. Downloaded {Count} messages", folder.FolderName, totalProcessed);
+        }
+        catch (ApiException apiException)
+        {
+            // Handle API errors
+            var errorContext = new SynchronizerErrorContext
+            {
+                Account = Account,
+                ErrorCode = (int?)apiException.ResponseStatusCode,
+                ErrorMessage = $"API error during initial sync: {apiException.Message}",
+                Exception = apiException
+            };
+
+            var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+            if (handled)
+            {
+                if (apiException.ResponseStatusCode == 410)
+                {
+                    folder.DeltaToken = string.Empty;
+                    _logger.Information("API error handled successfully for folder {FolderName} during initial sync. Error: {ErrorCode}", folder.FolderName, apiException.ResponseStatusCode);
+                }
+            }
+            else
+            {
+                _logger.Error(apiException, "Unhandled API error during initial sync for folder {FolderName}. Error: {ErrorCode}", folder.FolderName, apiException.ResponseStatusCode);
+            }
+
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Error occurred during initial mail download for folder {FolderName}", folder.FolderName);
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Downloads metadata for a batch of messages using Graph SDK batch API (no MIME content).
+    /// Processes up to 20 messages per batch request as per MaximumAllowedBatchRequestSize.
+    /// </summary>
+    private async Task<List<string>> DownloadMessageMetadataBatchAsync(List<string> messageIds, MailItemFolder folder, bool retryFailedOnce, CancellationToken cancellationToken)
+    {
+        if (messageIds == null || messageIds.Count == 0)
+            return new List<string>();
+
+        var downloadedIds = new List<string>();
+
+        // Filter out messages that already exist in the database
+        var messagesToDownload = new List<string>();
+        foreach (var messageId in messageIds)
+        {
+            bool mailExists = await _outlookChangeProcessor.IsMailExistsInFolderAsync(messageId, folder.Id).ConfigureAwait(false);
+            if (!mailExists)
+            {
+                messagesToDownload.Add(messageId);
+            }
+            else
+            {
+                _logger.Debug("Mail {MailId} already exists in folder {FolderName}, skipping download", messageId, folder.FolderName);
+            }
+        }
+
+        if (messagesToDownload.Count == 0)
+        {
+            _logger.Debug("All messages already exist in folder {FolderName}", folder.FolderName);
+            return downloadedIds;
+        }
+
+        // Store failed message ids to retry after.
+
+        List<string> failedMessageIds = new();
+
+        // Process in batches of MaximumAllowedBatchRequestSize (20)
+        var batches = messagesToDownload.Batch((int)MaximumAllowedBatchRequestSize);
+
+        foreach (var batch in batches)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            try
+            {
+                var batchContent = new BatchRequestContentCollection(_graphClient);
+                var requestIdToMessageIdMap = new Dictionary<string, string>();
+
+                // Add all message requests to the batch
+                foreach (var messageId in batch)
+                {
+                    var requestInfo = _graphClient.Me.Messages[messageId].ToGetRequestInformation((config) =>
+                    {
+                        config.QueryParameters.Select = outlookMessageSelectParameters;
+                    });
+
+                    var batchRequestId = await batchContent.AddBatchRequestStepAsync(requestInfo).ConfigureAwait(false);
+                    requestIdToMessageIdMap[batchRequestId] = messageId;
+                }
+
+                // Execute the batch request
+                var batchResponse = await _graphClient.Batch.PostAsync(batchContent, cancellationToken).ConfigureAwait(false);
+
+                // Process all responses
+                foreach (var batchRequestId in requestIdToMessageIdMap.Keys)
+                {
+                    var messageId = requestIdToMessageIdMap[batchRequestId];
+
+                    try
+                    {
+                        // Deserialize the Message directly from batch response
+                        var message = await batchResponse.GetResponseByIdAsync<Message>(batchRequestId).ConfigureAwait(false);
+
+                        if (message != null)
+                        {
+                            // Create MailCopy from metadata only
+                            var mailCopy = await CreateMailCopyFromMessageAsync(message, folder).ConfigureAwait(false);
+
+                            if (mailCopy != null)
+                            {
+                                // Create package without MIME
+                                var contacts = ExtractContactsFromOutlookMessage(message);
+                                var package = new NewMailItemPackage(mailCopy, null, folder.RemoteFolderId, contacts);
+                                bool isInserted = await _outlookChangeProcessor.CreateMailAsync(Account.Id, package).ConfigureAwait(false);
+
+                                if (isInserted)
+                                {
+                                    downloadedIds.Add(mailCopy.Id);
+                                    _logger.Debug("Downloaded metadata for message {MailId} in folder {FolderName}", messageId, folder.FolderName);
+                                }
+                                else
+                                {
+                                    _logger.Warning("Failed to insert mail {MailId} for folder {FolderName}", messageId, folder.FolderName);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            _logger.Warning("Failed to deserialize message {MailId} for folder {FolderName}", messageId, folder.FolderName);
+                            failedMessageIds.Add(messageId);
+                        }
+                    }
+                    catch (ODataError odataError)
+                    {
+                        // Handle OData errors from the batch response
+                        if (odataError.ResponseStatusCode == 404)
+                        {
+                            _logger.Warning("Mail {MailId} not found on server (404) for folder {FolderName}", messageId, folder.FolderName);
+                        }
+                        else
+                        {
+                            failedMessageIds.Add(messageId);
+                            _logger.Error("OData error while downloading mail {MailId} for folder {FolderName}. Error: {Error}", messageId, folder.FolderName, odataError.Error?.Message);
+                        }
+                    }
+                    catch (ServiceException serviceException)
+                    {
+                        // Try to handle the error using the error handling factory
+                        var errorContext = new SynchronizerErrorContext
+                        {
+                            Account = Account,
+                            ErrorCode = (int?)serviceException.ResponseStatusCode,
+                            ErrorMessage = $"Service error during batch mail download: {serviceException.Message}",
+                            Exception = serviceException,
+                        };
+
+                        var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+                        if (!handled)
+                        {
+                            failedMessageIds.Add(messageId);
+                            _logger.Error(serviceException, "Unhandled service error while downloading mail {MailId} for folder {FolderName}. Error: {ErrorCode}", messageId, folder.FolderName, serviceException.ResponseStatusCode);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        failedMessageIds.Add(messageId);
+                        _logger.Error(ex, "Error occurred while processing message {MailId} for folder {FolderName}", messageId, folder.FolderName);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                failedMessageIds.AddRange(batch);
+
+                _logger.Error(ex, "Error occurred during batch download for folder {FolderName}", folder.FolderName);
+            }
+        }
+
+        if (retryFailedOnce && failedMessageIds.Any())
+        {
+            // For a good cause wait a little bit.
+
+            await Task.Delay(3000);
+
+            // Do not retry here once again.
+            var failedDownloadedMessagIds = await DownloadMessageMetadataBatchAsync(failedMessageIds, folder, false, cancellationToken);
+
+            downloadedIds.Concat(failedDownloadedMessagIds);
+        }
+
+        return downloadedIds;
+    }
+
+    /// <summary>
+    /// Creates a MailCopy from an Outlook Message with metadata only (centralized method).
+    /// This replaces the scattered CreateMinimalMailCopyAsync and AsMailCopy calls.
+    /// </summary>
+    private async Task<MailCopy> CreateMailCopyFromMessageAsync(Message message, MailItemFolder assignedFolder)
+    {
+        if (message == null) return null;
+
+        var mailCopy = message.AsMailCopy();
+        mailCopy.FolderId = assignedFolder.Id;
+        mailCopy.UniqueId = Guid.NewGuid();
+        mailCopy.FileId = Guid.NewGuid();
+
+        // Set ItemType based on calendar access permissions
+        if (Account.IsCalendarAccessGranted && message is EventMessage)
+        {
+            mailCopy.ItemType = message.GetMailItemType();
+        }
+
+        // Check for draft mapping if this is a draft with WinoLocalDraftHeader
+        if (message.IsDraft.GetValueOrDefault() && message.InternetMessageHeaders != null)
+        {
+            var winoDraftHeader = message.InternetMessageHeaders
+                .FirstOrDefault(h => string.Equals(h.Name, Domain.Constants.WinoLocalDraftHeader, StringComparison.OrdinalIgnoreCase));
+
+            if (winoDraftHeader != null && Guid.TryParse(winoDraftHeader.Value, out Guid localDraftCopyUniqueId))
+            {
+                // This message belongs to existing local draft copy.
+                // We don't need to create a new mail copy for this message, just update the existing one.
+
+                bool isMappingSuccessful = await _outlookChangeProcessor.MapLocalDraftAsync(
+                    Account.Id,
+                    localDraftCopyUniqueId,
+                    mailCopy.Id,
+                    mailCopy.DraftId,
+                    mailCopy.ThreadId);
+
+                if (isMappingSuccessful)
+                {
+                    _logger.Debug("Successfully mapped remote draft {RemoteId} to local draft {LocalId}",
+                        mailCopy.Id, localDraftCopyUniqueId);
+                    return null; // Don't create new mail copy, existing one was updated
+                }
+
+                // Local copy doesn't exist. Continue execution to insert mail copy.
+                _logger.Debug("Local draft copy {LocalId} not found, creating new mail copy for {RemoteId}",
+                    localDraftCopyUniqueId, mailCopy.Id);
+            }
+        }
+
+        return mailCopy;
+    }
+
+    private static IReadOnlyList<AccountContact> ExtractContactsFromOutlookMessage(Message message)
+    {
+        if (message == null) return [];
+
+        var contacts = new Dictionary<string, AccountContact>(StringComparer.OrdinalIgnoreCase);
+
+        AddRecipient(message.From?.EmailAddress);
+        AddRecipient(message.Sender?.EmailAddress);
+
+        if (message.ToRecipients != null)
+        {
+            foreach (var recipient in message.ToRecipients)
+            {
+                AddRecipient(recipient?.EmailAddress);
+            }
+        }
+
+        if (message.CcRecipients != null)
+        {
+            foreach (var recipient in message.CcRecipients)
+            {
+                AddRecipient(recipient?.EmailAddress);
+            }
+        }
+
+        if (message.BccRecipients != null)
+        {
+            foreach (var recipient in message.BccRecipients)
+            {
+                AddRecipient(recipient?.EmailAddress);
+            }
+        }
+
+        if (message.ReplyTo != null)
+        {
+            foreach (var recipient in message.ReplyTo)
+            {
+                AddRecipient(recipient?.EmailAddress);
+            }
+        }
+
+        return contacts.Values.ToList();
+
+        void AddRecipient(EmailAddress emailAddress)
+        {
+            var address = emailAddress?.Address?.Trim();
+            if (string.IsNullOrWhiteSpace(address)) return;
+
+            var displayName = string.IsNullOrWhiteSpace(emailAddress.Name) ? address : emailAddress.Name.Trim();
+
+            contacts[address] = new AccountContact
+            {
+                Address = address,
+                Name = displayName
+            };
+        }
+    }
+
     private string GetDeltaTokenFromDeltaLink(string deltaLink)
         => Regex.Split(deltaLink, "deltatoken=")[1];
 
+    /// <summary>
+    /// Determines MailItemType based on EventMessage's MeetingMessageType.
+    /// </summary>
+    private static MailItemType GetMailItemType(EventMessage eventMessage)
+    {
+        if (eventMessage.MeetingMessageType.HasValue)
+        {
+            return eventMessage.MeetingMessageType.Value switch
+            {
+                MeetingMessageType.MeetingRequest => MailItemType.CalendarInvitation,
+                MeetingMessageType.MeetingCancelled => MailItemType.CalendarCancellation,
+                MeetingMessageType.MeetingAccepted or
+                MeetingMessageType.MeetingTenativelyAccepted or
+                MeetingMessageType.MeetingDeclined => MailItemType.CalendarResponse,
+                _ => MailItemType.Mail
+            };
+        }
+
+        // Fallback to CalendarInvitation if type is unknown
+        return MailItemType.CalendarInvitation;
+    }
+
+    protected override async Task<MailCopy> CreateMinimalMailCopyAsync(Message message, MailItemFolder assignedFolder, CancellationToken cancellationToken = default)
+    {
+        // Use centralized method
+        return await CreateMailCopyFromMessageAsync(message, assignedFolder).ConfigureAwait(false);
+    }
+
+    private async Task<Message> GetMessageByIdAsync(string messageId, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var message = await _graphClient.Me.Messages[messageId].GetAsync((config) =>
+            {
+                config.QueryParameters.Select = outlookMessageSelectParameters;
+            }, cancellationToken).ConfigureAwait(false);
+
+            // Check if this is an EventMessage and fetch it separately if needed (only if calendar access granted)
+            if (Account.IsCalendarAccessGranted && message is EventMessage)
+            {
+                message = await FetchEventMessageAsync(message.Id, cancellationToken).ConfigureAwait(false);
+            }
+
+            return message;
+        }
+        catch (ServiceException serviceException)
+        {
+            // Try to handle the error using the error handling factory first
+            var errorContext = new SynchronizerErrorContext
+            {
+                Account = Account,
+                ErrorCode = (int?)serviceException.ResponseStatusCode,
+                ErrorMessage = $"Service error during message retrieval: {serviceException.Message}",
+                Exception = serviceException
+            };
+
+            var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+            if (!handled)
+            {
+                // No handler could process this error, log and handle appropriately
+                if (serviceException.ResponseStatusCode == 404)
+                {
+                    // Re-throw 404 errors to be handled by the caller for queue cleanup
+                    throw;
+                }
+                else
+                {
+                    _logger.Error(serviceException, "Unhandled service error while getting message {MessageId}. Error: {ErrorCode}", messageId, serviceException.ResponseStatusCode);
+                    return null;
+                }
+            }
+            else
+            {
+                _logger.Information("Service error handled successfully during message retrieval. Message: {MessageId}, Error: {ErrorCode}", messageId, serviceException.ResponseStatusCode);
+                return null; // Return null since the error was handled but we couldn't get the message
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to get message {MessageId}", messageId);
+            return null;
+        }
+    }
+
+    private async Task ProcessDeltaChangesAsync(MailItemFolder folder, List<string> downloadedMessageIds, CancellationToken cancellationToken = default)
+    {
+        // Only process delta changes if we have a delta token (not initial sync)
+        if (string.IsNullOrEmpty(folder.DeltaToken))
+            return;
+
+        try
+        {
+            var currentDeltaToken = folder.DeltaToken;
+
+            // Always use Delta endpoint with proper configuration
+            var requestInformation = _graphClient.Me.MailFolders[folder.RemoteFolderId].Messages.Delta.ToGetRequestInformation((config) =>
+            {
+                config.QueryParameters.Select = outlookMessageSelectParameters;
+                config.QueryParameters.Orderby = ["receivedDateTime desc"]; // Sort by received date desc
+            });
+
+            requestInformation.UrlTemplate = requestInformation.UrlTemplate.Insert(requestInformation.UrlTemplate.Length - 1, ",%24deltatoken");
+            requestInformation.QueryParameters.Add("%24deltatoken", currentDeltaToken);
+
+            var messageCollectionPage = await _graphClient.RequestAdapter.SendAsync(requestInformation,
+                DeltaGetResponse.CreateFromDiscriminatorValue,
+                cancellationToken: cancellationToken);
+
+            // Use PageIterator<DeltaGetResponse> for iterating mails
+            var messageIterator = PageIterator<Message, DeltaGetResponse>
+                .CreatePageIterator(_graphClient, messageCollectionPage, async (item) =>
+                {
+                    try
+                    {
+                        await _handleItemRetrievalSemaphore.WaitAsync();
+                        return await HandleItemRetrievedAsync(item, folder, downloadedMessageIds, cancellationToken);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, "Error occurred while handling delta item {Id} for folder {FolderName}", item.Id, folder.FolderName);
+                    }
+                    finally
+                    {
+                        _handleItemRetrievalSemaphore.Release();
+                    }
+
+                    return true;
+                });
+
+            await messageIterator.IterateAsync(cancellationToken).ConfigureAwait(false);
+
+            // Update delta token for next sync - store delta token when there are no nextPageToken remaining
+            if (!string.IsNullOrEmpty(messageIterator.Deltalink))
+            {
+                var deltaToken = GetDeltaTokenFromDeltaLink(messageIterator.Deltalink);
+                await _outlookChangeProcessor.UpdateFolderDeltaSynchronizationIdentifierAsync(folder.Id, deltaToken).ConfigureAwait(false);
+                _logger.Debug("Updated delta token for folder {FolderName} after processing delta changes", folder.FolderName);
+            }
+        }
+        catch (ApiException apiException)
+        {
+            // Try to handle the error using the error handling factory
+            var errorContext = new SynchronizerErrorContext
+            {
+                Account = Account,
+                ErrorCode = (int?)apiException.ResponseStatusCode,
+                ErrorMessage = $"API error during legacy delta sync: {apiException.Message}",
+                Exception = apiException
+            };
+
+            var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+            if (!handled)
+            {
+                // No handler could process this error, log and re-throw
+                _logger.Error(apiException, "Unhandled API error during legacy delta sync for folder {FolderName}. Error: {ErrorCode}", folder.FolderName, apiException.ResponseStatusCode);
+            }
+        }
+    }
+
     private bool IsResourceDeleted(IDictionary<string, object> additionalData)
         => additionalData != null && additionalData.ContainsKey("@removed");
 
+    /// <summary>
+    /// Fetches an EventMessage with full details including MeetingMessageType from the Messages endpoint.
+    /// This is necessary because MeetingMessageType is not available when fetching as Message type.
+    /// </summary>
+    private async Task<EventMessage> FetchEventMessageAsync(string messageId, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var requestInfo = _graphClient.Me.Messages[messageId].ToGetRequestInformation((config) =>
+            {
+                config.QueryParameters.Select = outlookMessageSelectParameters.Concat(["MeetingMessageType"]).ToArray();
+            });
+
+            var eventMessage = await _graphClient.Me.Messages[messageId].GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            var odataType = eventMessage?.AdditionalData?.ContainsKey("@odata.type") == true
+                ? eventMessage.AdditionalData["@odata.type"]?.ToString()
+                : "unknown";
+
+            _logger.Debug("Fetched EventMessage {MessageId} with type {ODataType}", messageId, odataType);
+
+            return eventMessage as EventMessage;
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to fetch EventMessage {MessageId}", messageId);
+            return null;
+        }
+    }
+
     private async Task<bool> HandleFolderRetrievedAsync(MailFolder folder, OutlookSpecialFolderIdInformation outlookSpecialFolderIdInformation, CancellationToken cancellationToken = default)
     {
         if (IsResourceDeleted(folder.AdditionalData))
         {
             await _outlookChangeProcessor.DeleteFolderAsync(Account.Id, folder.Id).ConfigureAwait(false);
+            _isFolderStructureChanged = true;
         }
         else
         {
@@ -365,6 +1026,7 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             item.ShowUnreadCount = item.SpecialFolderType != SpecialFolderType.Deleted || item.SpecialFolderType != SpecialFolderType.Other;
 
             await _outlookChangeProcessor.InsertFolderAsync(item).ConfigureAwait(false);
+            _isFolderStructureChanged = true;
         }
 
         return true;
@@ -375,11 +1037,12 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
     /// Basically deleted item retention items are stored as Message object in Deleted Items folder.
     /// Suprisingly, odatatype will also be the same as Message.
     /// In order to differentiate them from regular messages, we need to check the addresses in the message.
+    /// EventMessage types (calendar invitations/responses) are now processed as regular mail items with appropriate ItemType.
     /// </summary>
     /// <param name="item">Retrieved message.</param>
     /// <returns>Whether the item is non-Message type or not.</returns>
     private bool IsNotRealMessageType(Message item)
-        => item is EventMessage || item.From?.EmailAddress == null;
+        => item.From?.EmailAddress == null;
 
     private async Task<bool> HandleItemRetrievedAsync(Message item, MailItemFolder folder, IList<string> downloadedMessageIds, CancellationToken cancellationToken = default)
     {
@@ -392,6 +1055,16 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         }
         else
         {
+            // Check if this is an EventMessage and fetch it separately if needed (only if calendar access granted)
+            if (Account.IsCalendarAccessGranted && item is EventMessage)
+            {
+                item = await FetchEventMessageAsync(item.Id, cancellationToken).ConfigureAwait(false);
+                if (item == null)
+                {
+                    return true; // Skip this message if fetch failed
+                }
+            }
+
             // If the item exists in the local database, it means that it's already downloaded. Process as an Update.
 
             var isMailExists = await _outlookChangeProcessor.IsMailExistsInFolderAsync(item.Id, folder.Id);
@@ -399,31 +1072,28 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             if (isMailExists)
             {
                 // Some of the properties of the item are updated.
+                _logger.Debug("Processing delta update for existing mail {MessageId} in folder {FolderName}", item.Id, folder.FolderName);
 
                 if (item.IsRead != null)
                 {
+                    _logger.Debug("Updating read status for mail {MessageId}: IsRead={IsRead}", item.Id, item.IsRead.GetValueOrDefault());
                     await _outlookChangeProcessor.ChangeMailReadStatusAsync(item.Id, item.IsRead.GetValueOrDefault()).ConfigureAwait(false);
                 }
 
                 if (item.Flag?.FlagStatus != null)
                 {
-                    await _outlookChangeProcessor.ChangeFlagStatusAsync(item.Id, item.Flag.FlagStatus.GetValueOrDefault() == FollowupFlagStatus.Flagged)
-                                                 .ConfigureAwait(false);
+                    var isFlagged = item.Flag.FlagStatus.GetValueOrDefault() == FollowupFlagStatus.Flagged;
+                    _logger.Debug("Updating flag status for mail {MessageId}: IsFlagged={IsFlagged}", item.Id, isFlagged);
+                    await _outlookChangeProcessor.ChangeFlagStatusAsync(item.Id, isFlagged).ConfigureAwait(false);
                 }
             }
             else
             {
                 if (IsNotRealMessageType(item))
                 {
-                    if (item is EventMessage eventMessage)
-                    {
-                        Log.Warning("Recieved event message. This is not supported yet. {Id}", eventMessage.Id);
-                    }
-                    else
-                    {
-                        Log.Warning("Recieved either contact or todo item as message This is not supported yet. {Id}", item.Id);
-                    }
-
+                    // EventMessages are handled above if calendar access is granted
+                    // This catches non-message types like contacts or todo items
+                    Log.Warning("Received non-message item type (contact/todo). This is not supported yet. {Id}", item.Id);
                     return true;
                 }
 
@@ -453,6 +1123,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
     private async Task SynchronizeFoldersAsync(CancellationToken cancellationToken = default)
     {
+        _isFolderStructureChanged = false;
+
         var specialFolderInfo = await GetSpecialFolderIdsAsync(cancellationToken).ConfigureAwait(false);
         var graphFolders = await GetDeltaFoldersAsync(cancellationToken).ConfigureAwait(false);
 
@@ -463,71 +1135,89 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         await iterator.IterateAsync();
 
         await UpdateDeltaSynchronizationIdentifierAsync(iterator.Deltalink).ConfigureAwait(false);
-    }
 
-    [RequiresUnreferencedCode("Calls Microsoft.Kiota.Abstractions.Serialization.KiotaJsonSerializer.DeserializeAsync<T>(String, CancellationToken)")]
-    private async Task<T> DeserializeGraphBatchResponseAsync<T>(BatchResponseContentCollection collection, string requestId, CancellationToken cancellationToken = default) where T : IParsable, new()
-    {
-        // This deserialization may throw generalException in case of failure.
-        // Bug: https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/2010
-        // This is a workaround for the bug to retrieve the actual exception.
-        // All generic batch response deserializations must go under this method.
-
-        try
+        if (_isFolderStructureChanged)
         {
-            return await collection.GetResponseByIdAsync<T>(requestId);
-        }
-        catch (ODataError)
-        {
-            throw;
-        }
-        catch (ServiceException serviceException)
-        {
-            // Actual exception is hidden inside ServiceException.
-
-
-            ODataError errorResult = await KiotaJsonSerializer.DeserializeAsync<ODataError>(serviceException.RawResponseBody, cancellationToken);
-
-            throw new SynchronizerException("Outlook Error", errorResult);
+            WeakReferenceMessenger.Default.Send(new AccountFolderConfigurationUpdated(Account.Id));
         }
     }
 
     private async Task<OutlookSpecialFolderIdInformation> GetSpecialFolderIdsAsync(CancellationToken cancellationToken)
     {
-        var wellKnownFolderIdBatch = new BatchRequestContentCollection(_graphClient);
-        var folderRequests = new Dictionary<string, RequestInformation>
-        {
-            { INBOX_NAME, _graphClient.Me.MailFolders[INBOX_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) },
-            { SENT_NAME, _graphClient.Me.MailFolders[SENT_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) },
-            { DELETED_NAME, _graphClient.Me.MailFolders[DELETED_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) },
-            { JUNK_NAME, _graphClient.Me.MailFolders[JUNK_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) },
-            { DRAFTS_NAME, _graphClient.Me.MailFolders[DRAFTS_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) },
-            { ARCHIVE_NAME, _graphClient.Me.MailFolders[ARCHIVE_NAME].ToGetRequestInformation((t) => { t.QueryParameters.Select = ["id"]; }) }
-        };
+        var localFolders = await _outlookChangeProcessor.GetLocalFoldersAsync(Account.Id).ConfigureAwait(false);
+        var cachedSpecialFolders = TryGetSpecialFolderIdsFromLocalFolders(localFolders);
 
-        var batchIds = new Dictionary<string, string>();
-        foreach (var request in folderRequests)
+        if (cachedSpecialFolders != null)
         {
-            batchIds[request.Key] = await wellKnownFolderIdBatch.AddBatchRequestStepAsync(request.Value);
+            _logger.Debug("Using cached Outlook special folder ids for {AccountName}", Account.Name);
+            return cachedSpecialFolders;
         }
 
-        var returnedResponse = await _graphClient.Batch.PostAsync(wellKnownFolderIdBatch, cancellationToken).ConfigureAwait(false);
-
-        var folderIds = new Dictionary<string, string>();
-        foreach (var batchId in batchIds)
-        {
-            folderIds[batchId.Key] = (await DeserializeGraphBatchResponseAsync<MailFolder>(returnedResponse, batchId.Value, cancellationToken)).Id;
-        }
+        _logger.Information("Cached Outlook special folder ids are incomplete for {AccountName}. Fetching from Microsoft Graph.", Account.Name);
 
         return new OutlookSpecialFolderIdInformation(
-            folderIds[INBOX_NAME],
-            folderIds[DELETED_NAME],
-            folderIds[JUNK_NAME],
-            folderIds[DRAFTS_NAME],
-            folderIds[SENT_NAME],
-            folderIds[ARCHIVE_NAME]);
+            await GetWellKnownFolderIdAsync(INBOX_NAME, cancellationToken).ConfigureAwait(false),
+            await GetWellKnownFolderIdAsync(DELETED_NAME, cancellationToken).ConfigureAwait(false),
+            await GetWellKnownFolderIdAsync(JUNK_NAME, cancellationToken).ConfigureAwait(false),
+            await GetWellKnownFolderIdAsync(DRAFTS_NAME, cancellationToken).ConfigureAwait(false),
+            await GetWellKnownFolderIdAsync(SENT_NAME, cancellationToken).ConfigureAwait(false),
+            await GetWellKnownFolderIdAsync(ARCHIVE_NAME, cancellationToken).ConfigureAwait(false));
     }
 
+    private async Task<string> GetWellKnownFolderIdAsync(string wellKnownFolderName, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var folder = await _graphClient.Me.MailFolders[wellKnownFolderName]
+                .GetAsync(requestConfiguration =>
+                {
+                    requestConfiguration.QueryParameters.Select = ["id"];
+                }, cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (string.IsNullOrWhiteSpace(folder?.Id))
+            {
+                throw new SynchronizerException($"Outlook special folder '{wellKnownFolderName}' returned no id.");
+            }
+
+            return folder.Id;
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to fetch Outlook special folder id for {FolderName}", wellKnownFolderName);
+            throw;
+        }
+    }
+
+    private static OutlookSpecialFolderIdInformation TryGetSpecialFolderIdsFromLocalFolders(IEnumerable<MailItemFolder> localFolders)
+    {
+        if (localFolders == null)
+        {
+            return null;
+        }
+
+        var inboxId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Inbox);
+        var deletedId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Deleted);
+        var junkId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Junk);
+        var draftId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Draft);
+        var sentId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Sent);
+        var archiveId = GetSpecialFolderRemoteId(localFolders, SpecialFolderType.Archive);
+
+        if (new[] { inboxId, deletedId, junkId, draftId, sentId, archiveId }.Any(string.IsNullOrWhiteSpace))
+        {
+            return null;
+        }
+
+        return new OutlookSpecialFolderIdInformation(inboxId, deletedId, junkId, draftId, sentId, archiveId);
+    }
+
+    private static string GetSpecialFolderRemoteId(IEnumerable<MailItemFolder> localFolders, SpecialFolderType specialFolderType)
+        => localFolders.FirstOrDefault(folder => folder.SpecialFolderType == specialFolderType && !string.IsNullOrWhiteSpace(folder.RemoteFolderId))?.RemoteFolderId;
+
     private async Task<Microsoft.Graph.Me.MailFolders.Delta.DeltaGetResponse> GetDeltaFoldersAsync(CancellationToken cancellationToken)
     {
         if (string.IsNullOrEmpty(Account.SynchronizationDeltaIdentifier))
@@ -551,10 +1241,44 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
                 Microsoft.Graph.Me.MailFolders.Delta.DeltaGetResponse.CreateFromDiscriminatorValue,
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
-        catch (ApiException apiException) when (apiException.ResponseStatusCode == 410)
+        catch (ApiException apiException)
         {
-            Account.SynchronizationDeltaIdentifier = string.Empty;
-            return await GetDeltaFoldersAsync(cancellationToken);
+            // Try to handle the error using the error handling factory
+            var errorContext = new SynchronizerErrorContext
+            {
+                Account = Account,
+                ErrorCode = (int?)apiException.ResponseStatusCode,
+                ErrorMessage = $"API error during folder synchronization: {apiException.Message}",
+                Exception = apiException
+            };
+
+            var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext).ConfigureAwait(false);
+
+            if (handled)
+            {
+                // The error handler has processed the error (e.g., DeltaTokenExpiredHandler for 410)
+                // Update in-memory account state if it was a delta token expiration
+                if (apiException.ResponseStatusCode == 410)
+                {
+                    Account.SynchronizationDeltaIdentifier = string.Empty;
+                    _logger.Information("API error handled successfully for account {AccountName} during folder sync. Error: {ErrorCode}", Account.Name, apiException.ResponseStatusCode);
+                }
+            }
+            else
+            {
+                // No handler could process this error, log and re-throw
+                _logger.Error(apiException, "Unhandled API error during folder synchronization for account {AccountName}. Error: {ErrorCode}", Account.Name, apiException.ResponseStatusCode);
+                throw;
+            }
+
+            // If a handler processed the error and it was 410, retry with fresh token
+            if (apiException.ResponseStatusCode == 410)
+            {
+                return await GetDeltaFoldersAsync(cancellationToken);
+            }
+
+            // For other handled errors, we still need to throw since we can't return a meaningful response
+            throw;
         }
     }
 
@@ -774,94 +1498,109 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
     public override List<IRequestBundle<RequestInformation>> SendDraft(SendDraftRequest request)
     {
         var sendDraftPreparationRequest = request.Request;
-
-        // 1. Delete draft
-        // 2. Create new Message with new MIME.
-        // 3. Make sure that conversation id is tagged correctly for replies.
-
         var mailCopyId = sendDraftPreparationRequest.MailItem.Id;
         var mimeMessage = sendDraftPreparationRequest.Mime;
 
-        // Convert mime message to Outlook message.
-        // Outlook synchronizer does not send MIME messages directly anymore.
-        // Alias support is lacking with direct MIMEs.
-        // Therefore we convert the MIME message to Outlook message and use proper APIs.
-
-        var outlookMessage = mimeMessage.AsOutlookMessage(false);
-
-        // Create attachment requests.
-        // TODO: We need to support large file attachments with sessioned upload at some point.
-
-        var attachmentRequestList = CreateAttachmentUploadBundles(mimeMessage, mailCopyId, request).ToList();
-
-        // Update draft.
+        // Graph API ignores the From header in direct MIME uploads, so we must convert
+        // to a JSON Message object to properly support sending from aliases.
+        var conversationId = sendDraftPreparationRequest.MailItem.ThreadId;
+        var outlookMessage = mimeMessage.AsOutlookMessage(false, conversationId);
 
         var patchDraftRequest = _graphClient.Me.Messages[mailCopyId].ToPatchRequestInformation(outlookMessage);
-        var patchDraftRequestBundle = new HttpRequestBundle<RequestInformation>(patchDraftRequest, request);
+        var patchDraftBundle = new HttpRequestBundle<RequestInformation>(patchDraftRequest, request);
 
-        // Send draft.
+        var sendRequest = PreparePostRequestInformation(_graphClient.Me.Messages[mailCopyId].Send.ToPostRequestInformation());
+        var sendBundle = new HttpRequestBundle<RequestInformation>(sendRequest, request);
 
-        var sendDraftRequest = PreparePostRequestInformation(_graphClient.Me.Messages[mailCopyId].Send.ToPostRequestInformation());
-        var sendDraftRequestBundle = new HttpRequestBundle<RequestInformation>(sendDraftRequest, request);
-
-        return [.. attachmentRequestList, patchDraftRequestBundle, sendDraftRequestBundle];
+        // Attachment uploads are handled outside batching because large attachments
+        // require upload sessions whose URLs are generated dynamically.
+        return [patchDraftBundle, sendBundle];
     }
 
-    private List<IRequestBundle<RequestInformation>> CreateAttachmentUploadBundles(MimeMessage mime, string mailCopyId, IRequestBase sourceRequest)
+    private async Task UploadDraftAttachmentsAsync(SendDraftRequest sendDraftRequest, CancellationToken cancellationToken)
     {
-        var allAttachments = new List<OutlookFileAttachment>();
+        var mailCopyId = sendDraftRequest.Request.MailItem.Id;
+        var attachments = sendDraftRequest.Request.Mime.ExtractAttachments();
 
-        foreach (var part in mime.BodyParts)
+        if (!attachments.Any())
         {
-            var isAttachmentOrInline = part.IsAttachment ? true : part.ContentDisposition?.Disposition == "inline";
+            return;
+        }
 
-            if (!isAttachmentOrInline) continue;
+        foreach (var attachment in attachments)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-            using var memory = new MemoryStream();
-            ((MimePart)part).Content.DecodeTo(memory);
-
-            var base64String = Convert.ToBase64String(memory.ToArray());
-
-            var attachment = new OutlookFileAttachment()
+            var contentBytes = attachment.ContentBytes ?? [];
+            if (contentBytes.Length <= SimpleAttachmentUploadLimitBytes)
             {
-                Base64EncodedContentBytes = base64String,
-                FileName = part.ContentDisposition?.FileName ?? part.ContentType.Name,
-                ContentId = part.ContentId,
-                ContentType = part.ContentType.MimeType,
-                IsInline = part.ContentDisposition?.Disposition == "inline"
+                await _graphClient.Me.Messages[mailCopyId].Attachments.PostAsync(attachment, cancellationToken: cancellationToken).ConfigureAwait(false);
+                continue;
+            }
+
+            if (contentBytes.Length > MaximumUploadSessionAttachmentSizeBytes)
+            {
+                var attachmentSizeMb = contentBytes.LongLength / (1024d * 1024d);
+                var maximumSizeMb = MaximumUploadSessionAttachmentSizeBytes / (1024d * 1024d);
+
+                throw new InvalidOperationException(
+                    $"Attachment '{attachment.Name}' is {attachmentSizeMb:F1} MB, which exceeds Outlook's upload limit of {maximumSizeMb:F0} MB per attachment.");
+            }
+
+            var sessionBody = new Microsoft.Graph.Me.Messages.Item.Attachments.CreateUploadSession.CreateUploadSessionPostRequestBody
+            {
+                AttachmentItem = new AttachmentItem
+                {
+                    AttachmentType = AttachmentType.File,
+                    ContentType = attachment.ContentType,
+                    Name = attachment.Name,
+                    Size = contentBytes.LongLength
+                }
             };
 
-            allAttachments.Add(attachment);
-        }
+            var uploadSession = await _graphClient.Me.Messages[mailCopyId].Attachments.CreateUploadSession.PostAsync(sessionBody, cancellationToken: cancellationToken).ConfigureAwait(false);
 
-        static RequestInformation PrepareUploadAttachmentRequest(RequestInformation requestInformation, OutlookFileAttachment outlookFileAttachment)
+            if (uploadSession?.UploadUrl == null)
+            {
+                throw new InvalidOperationException($"Failed to create upload session for attachment '{attachment.Name}'.");
+            }
+
+            await UploadAttachmentInChunksAsync(uploadSession.UploadUrl, contentBytes, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    private static async Task UploadAttachmentInChunksAsync(string uploadUrl, byte[] content, CancellationToken cancellationToken)
+    {
+        using var client = new HttpClient();
+
+        var totalSize = content.Length;
+        var offset = 0;
+
+        while (offset < totalSize)
         {
-            requestInformation.Headers.Clear();
+            cancellationToken.ThrowIfCancellationRequested();
 
-            string contentJson = JsonSerializer.Serialize(outlookFileAttachment, OutlookSynchronizerJsonContext.Default.OutlookFileAttachment);
+            var chunkLength = Math.Min(LargeAttachmentUploadChunkSizeBytes, totalSize - offset);
+            var end = offset + chunkLength - 1;
 
-            requestInformation.Content = new MemoryStream(Encoding.UTF8.GetBytes(contentJson));
-            requestInformation.HttpMethod = Method.POST;
-            requestInformation.Headers.Add("Content-Type", "application/json");
+            using var request = new HttpRequestMessage(HttpMethod.Put, uploadUrl)
+            {
+                Content = new ByteArrayContent(content, offset, chunkLength)
+            };
 
-            return requestInformation;
+            request.Content.Headers.Add("Content-Range", $"bytes {offset}-{end}/{totalSize}");
+
+            using var response = await client.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+            // Upload session returns either 202 (continue) or 201/200 (completed).
+            if (!response.IsSuccessStatusCode)
+            {
+                var responseContent = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+                throw new InvalidOperationException($"Attachment chunk upload failed with status {(int)response.StatusCode}: {responseContent}");
+            }
+
+            offset += chunkLength;
         }
-
-        var retList = new List<IRequestBundle<RequestInformation>>();
-
-        // Prepare attachment upload requests.
-
-        foreach (var attachment in allAttachments)
-        {
-            var emptyPostRequest = _graphClient.Me.Messages[mailCopyId].Attachments.ToPostRequestInformation(new Attachment());
-            var modifiedAttachmentUploadRequest = PrepareUploadAttachmentRequest(emptyPostRequest, attachment);
-
-            var bundle = new HttpRequestBundle<RequestInformation>(modifiedAttachmentUploadRequest, null);
-
-            retList.Add(bundle);
-        }
-
-        return retList;
     }
 
     public override List<IRequestBundle<RequestInformation>> Archive(BatchArchiveRequest request)
@@ -871,12 +1610,77 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         return Move(batchMoveRequest);
     }
 
-    public override async Task DownloadMissingMimeMessageAsync(IMailItem mailItem,
+    public override async Task DownloadMissingMimeMessageAsync(MailCopy mailItem,
                                                            MailKit.ITransferProgress transferProgress = null,
                                                            CancellationToken cancellationToken = default)
     {
-        var mimeMessage = await DownloadMimeMessageAsync(mailItem.Id, cancellationToken).ConfigureAwait(false);
-        await _outlookChangeProcessor.SaveMimeFileAsync(mailItem.FileId, mimeMessage, Account.Id).ConfigureAwait(false);
+        try
+        {
+            var mimeMessage = await DownloadMimeMessageAsync(mailItem.Id, cancellationToken).ConfigureAwait(false);
+            await _outlookChangeProcessor.SaveMimeFileAsync(mailItem.FileId, mimeMessage, Account.Id).ConfigureAwait(false);
+        }
+        catch (ODataError ex) when (ex.ResponseStatusCode == 404)
+        {
+            _logger.Warning("Outlook message {MailId} not found (404) during MIME download. Deleting locally.", mailItem.Id);
+            await _outlookChangeProcessor.DeleteMailAsync(Account.Id, mailItem.Id).ConfigureAwait(false);
+            throw new SynchronizerEntityNotFoundException(ex.Message);
+        }
+    }
+
+    public override async Task DownloadCalendarAttachmentAsync(
+        Wino.Core.Domain.Entities.Calendar.CalendarItem calendarItem,
+        Wino.Core.Domain.Entities.Calendar.CalendarAttachment attachment,
+        string localFilePath,
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var calendar = calendarItem.AssignedCalendar;
+            var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+
+            // First, get the attachment metadata to retrieve contentBytes for FileAttachment
+            var attachmentItem = await _graphClient.Me
+                .Calendars[calendar.RemoteCalendarId]
+                .Events[remoteEventId]
+                .Attachments[attachment.RemoteAttachmentId]
+                .GetAsync(cancellationToken: cancellationToken)
+                .ConfigureAwait(false);
+
+            if (attachmentItem == null)
+            {
+                _logger.Error("Failed to retrieve attachment {AttachmentId} for event {EventId}", attachment.RemoteAttachmentId, calendarItem.RemoteEventId);
+                throw new InvalidOperationException("Failed to retrieve attachment.");
+            }
+
+            byte[] contentBytes = null;
+
+            // Handle FileAttachment (has ContentBytes property)
+            if (attachmentItem is FileAttachment fileAttachment && fileAttachment.ContentBytes != null)
+            {
+                contentBytes = fileAttachment.ContentBytes;
+            }
+            // Handle ItemAttachment (embedded items like emails)
+            else if (attachmentItem is ItemAttachment)
+            {
+                _logger.Warning("ItemAttachment type not supported for download. AttachmentId: {AttachmentId}", attachment.RemoteAttachmentId);
+                throw new NotSupportedException("ItemAttachment downloads are not currently supported.");
+            }
+            else
+            {
+                _logger.Error("Unknown attachment type or missing content for {AttachmentId}", attachment.RemoteAttachmentId);
+                throw new InvalidOperationException("Attachment content is not available.");
+            }
+
+            // Save to local file
+            await System.IO.File.WriteAllBytesAsync(localFilePath, contentBytes, cancellationToken).ConfigureAwait(false);
+
+            _logger.Information("Downloaded calendar attachment {FileName} to {LocalPath}", attachment.FileName, localFilePath);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Error downloading calendar attachment {AttachmentId}", attachment.Id);
+            throw;
+        }
     }
 
     public override List<IRequestBundle<RequestInformation>> RenameFolder(RenameFolderRequest request)
@@ -897,10 +1701,52 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
     public override List<IRequestBundle<RequestInformation>> MarkFolderAsRead(MarkFolderAsReadRequest request)
         => MarkRead(new BatchMarkReadRequest(request.MailsToMarkRead.Select(a => new MarkReadRequest(a, true))));
 
+    public override List<IRequestBundle<RequestInformation>> DeleteFolder(DeleteFolderRequest request)
+    {
+        var networkCall = _graphClient.Me.MailFolders[request.Folder.RemoteFolderId].ToDeleteRequestInformation();
+        return [new HttpRequestBundle<RequestInformation>(networkCall, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> CreateSubFolder(CreateSubFolderRequest request)
+    {
+        var requestBody = new MailFolder
+        {
+            DisplayName = request.NewFolderName
+        };
+
+        var networkCall = _graphClient.Me.MailFolders[request.Folder.RemoteFolderId].ChildFolders.ToPostRequestInformation(requestBody);
+        return [new HttpRequestBundle<RequestInformation>(networkCall, request)];
+    }
+
     #endregion
 
     public override async Task ExecuteNativeRequestsAsync(List<IRequestBundle<RequestInformation>> batchedRequests, CancellationToken cancellationToken = default)
     {
+        // First apply all UI changes immediately before any batching.
+        // This ensures UI reflects changes right away, regardless of batch processing.
+        foreach (var bundle in batchedRequests)
+        {
+            bundle.UIChangeRequest?.ApplyUIChanges();
+        }
+
+        // SendDraft requests may include large attachments, which require upload sessions.
+        // Upload these attachments before the batched patch/send sequence.
+        foreach (var sendDraftBundle in batchedRequests.Where(b => b.UIChangeRequest is SendDraftRequest))
+        {
+            var sendDraftRequest = sendDraftBundle.UIChangeRequest as SendDraftRequest;
+
+            try
+            {
+                await UploadDraftAttachmentsAsync(sendDraftRequest, cancellationToken).ConfigureAwait(false);
+            }
+            catch
+            {
+                sendDraftRequest?.RevertUIChanges();
+                throw;
+            }
+        }
+
+        // Now batch and execute the network requests.
         var batchedGroups = batchedRequests.Batch((int)MaximumAllowedBatchRequestSize);
 
         foreach (var batch in batchedGroups)
@@ -937,7 +1783,7 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             var bundle = batch.ElementAt(i);
             requiresSerial |= bundle.UIChangeRequest is SendDraftRequest;
 
-            bundle.UIChangeRequest?.ApplyUIChanges();
+            // UI changes are already applied in ExecuteNativeRequestsAsync before batching.
             var batchRequestId = await batchContent.AddBatchRequestStepAsync(bundle.NativeRequest);
             bundle.BundleId = batchRequestId;
             bundleIdMap[batchRequestId] = bundle;
@@ -983,6 +1829,10 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
                 {
                     await HandleFailedResponseAsync(bundle, response, errors);
                 }
+                else
+                {
+                    await HandleSuccessfulResponseAsync(bundle, response).ConfigureAwait(false);
+                }
             }
         }
 
@@ -1021,8 +1871,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         // Try to handle the error with registered handlers
         var handled = await _errorHandlingFactory.HandleErrorAsync(errorContext);
 
-        // If not handled by any specific handler, revert UI changes and add to error list
-        if (!handled)
+        // Transient errors still need to bubble so the request can be retried or surfaced to the caller.
+        if (!handled || errorContext.Severity == SynchronizerErrorSeverity.Transient)
         {
             bundle.UIChangeRequest?.RevertUIChanges();
             Debug.WriteLine(errorString);
@@ -1030,6 +1880,119 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         }
     }
 
+    private async Task HandleSuccessfulResponseAsync(IRequestBundle<RequestInformation> bundle, HttpResponseMessage response)
+    {
+        try
+        {
+            if (bundle?.UIChangeRequest is MarkReadRequest markReadRequest)
+            {
+                await _outlookChangeProcessor.ChangeMailReadStatusAsync(markReadRequest.Item.Id, markReadRequest.IsRead).ConfigureAwait(false);
+                return;
+            }
+
+            if (bundle?.UIChangeRequest is ChangeFlagRequest changeFlagRequest)
+            {
+                await _outlookChangeProcessor.ChangeFlagStatusAsync(changeFlagRequest.Item.Id, changeFlagRequest.IsFlagged).ConfigureAwait(false);
+                return;
+            }
+
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            if (string.IsNullOrWhiteSpace(content))
+                return;
+
+            var json = JsonNode.Parse(content);
+            if (bundle?.UIChangeRequest is CreateDraftRequest createDraftRequest)
+            {
+                var createdDraftId = json?["id"]?.GetValue<string>();
+                if (string.IsNullOrWhiteSpace(createdDraftId))
+                    return;
+
+                var createdConversationId = json?["conversationId"]?.GetValue<string>();
+                var localDraft = createDraftRequest.DraftPreperationRequest.CreatedLocalDraftCopy;
+
+                await _outlookChangeProcessor.MapLocalDraftAsync(
+                    Account.Id,
+                    localDraft.UniqueId,
+                    createdDraftId,
+                    createdConversationId,
+                    createdConversationId).ConfigureAwait(false);
+                return;
+            }
+
+            if (bundle?.UIChangeRequest is CreateCalendarEventRequest createCalendarEventRequest)
+            {
+                var createdEventId = json?["id"]?.GetValue<string>();
+                if (string.IsNullOrWhiteSpace(createdEventId))
+                    return;
+
+                await UploadCalendarEventAttachmentsAsync(createCalendarEventRequest, createdEventId, CancellationToken.None).ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Debug(ex, "Failed to process Outlook create response.");
+        }
+    }
+
+    private async Task UploadCalendarEventAttachmentsAsync(CreateCalendarEventRequest request, string remoteEventId, CancellationToken cancellationToken)
+    {
+        var attachments = request.ComposeResult.Attachments ?? [];
+        if (attachments.Count == 0)
+            return;
+
+        var remoteCalendarId = request.AssignedCalendar.RemoteCalendarId;
+
+        foreach (var attachment in attachments.Where(a => !string.IsNullOrWhiteSpace(a.FilePath) && File.Exists(a.FilePath)))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var contentBytes = await File.ReadAllBytesAsync(attachment.FilePath, cancellationToken).ConfigureAwait(false);
+            var contentType = MimeTypes.GetMimeType(attachment.FileName ?? attachment.FilePath);
+
+            var fileAttachment = new FileAttachment
+            {
+                Name = attachment.FileName,
+                ContentType = contentType,
+                ContentBytes = contentBytes
+            };
+
+            if (contentBytes.Length <= SimpleAttachmentUploadLimitBytes)
+            {
+                await _graphClient.Me.Calendars[remoteCalendarId].Events[remoteEventId].Attachments.PostAsync(fileAttachment, cancellationToken: cancellationToken).ConfigureAwait(false);
+                continue;
+            }
+
+            if (contentBytes.Length > MaximumUploadSessionAttachmentSizeBytes)
+            {
+                var attachmentSizeMb = contentBytes.LongLength / (1024d * 1024d);
+                var maximumSizeMb = MaximumUploadSessionAttachmentSizeBytes / (1024d * 1024d);
+
+                throw new InvalidOperationException(
+                    $"Attachment '{attachment.FileName}' is {attachmentSizeMb:F1} MB, which exceeds Outlook's upload limit of {maximumSizeMb:F0} MB per attachment.");
+            }
+
+            var sessionBody = new Microsoft.Graph.Me.Calendars.Item.Events.Item.Attachments.CreateUploadSession.CreateUploadSessionPostRequestBody
+            {
+                AttachmentItem = new AttachmentItem
+                {
+                    AttachmentType = AttachmentType.File,
+                    ContentType = contentType,
+                    Name = attachment.FileName,
+                    Size = contentBytes.LongLength
+                }
+            };
+
+            var uploadSession = await _graphClient.Me.Calendars[remoteCalendarId].Events[remoteEventId].Attachments.CreateUploadSession.PostAsync(sessionBody, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            if (uploadSession?.UploadUrl == null)
+            {
+                throw new InvalidOperationException($"Failed to create upload session for attachment '{attachment.FileName}'.");
+            }
+
+            await UploadAttachmentInChunksAsync(uploadSession.UploadUrl, contentBytes, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
     private void ThrowBatchExecutionException(List<string> errors)
     {
         var formattedErrorString = string.Join("\n",
@@ -1039,12 +2002,16 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
     public override async Task<List<MailCopy>> OnlineSearchAsync(string queryText, List<IMailItemFolder> folders, CancellationToken cancellationToken = default)
     {
-        List<Message> messagesReturnedByApi = [];
+        var messagesById = new Dictionary<string, Message>(StringComparer.Ordinal);
 
         // Perform search for each folder separately.
         if (folders?.Count > 0)
         {
-            var folderIds = folders.Select(a => a.RemoteFolderId);
+            var folderIds = folders
+                .Where(a => a != null && !string.IsNullOrWhiteSpace(a.RemoteFolderId))
+                .Select(a => a.RemoteFolderId)
+                .Distinct(StringComparer.Ordinal)
+                .ToList();
 
             var tasks = folderIds.Select(async folderId =>
             {
@@ -1054,15 +2021,19 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
                         requestConfig.QueryParameters.Search = $"\"{queryText}\"";
                         requestConfig.QueryParameters.Select = ["Id, ParentFolderId"];
                         requestConfig.QueryParameters.Top = 1000;
-                    });
+                    }, cancellationToken);
 
                 var result = await mailQuery;
 
                 if (result?.Value != null)
                 {
-                    lock (messagesReturnedByApi)
+                    lock (messagesById)
                     {
-                        messagesReturnedByApi.AddRange(result.Value);
+                        foreach (var message in result.Value)
+                        {
+                            if (string.IsNullOrWhiteSpace(message?.Id)) continue;
+                            messagesById[message.Id] = message;
+                        }
                     }
                 }
             });
@@ -1084,22 +2055,24 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
             if (result?.Value != null)
             {
-                messagesReturnedByApi.AddRange(result.Value);
+                foreach (var message in result.Value)
+                {
+                    if (string.IsNullOrWhiteSpace(message?.Id)) continue;
+                    messagesById[message.Id] = message;
+                }
             }
         }
 
-        if (messagesReturnedByApi.Count == 0) return [];
+        if (messagesById.Count == 0) return [];
 
         var localFolders = (await _outlookChangeProcessor.GetLocalFoldersAsync(Account.Id).ConfigureAwait(false))
             .ToDictionary(x => x.RemoteFolderId);
 
-        var messagesDictionary = messagesReturnedByApi.ToDictionary(a => a.Id);
-
         // Contains a list of message ids that potentially can be downloaded.
-        List<string> messageIdsWithKnownFolder = [];
+        var messageIdsWithKnownFolder = new HashSet<string>(StringComparer.Ordinal);
 
         // Validate that all messages are in a known folder.
-        foreach (var message in messagesReturnedByApi)
+        foreach (var message in messagesById.Values)
         {
             if (!localFolders.ContainsKey(message.ParentFolderId))
             {
@@ -1110,13 +2083,18 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             messageIdsWithKnownFolder.Add(message.Id);
         }
 
+        if (messageIdsWithKnownFolder.Count == 0) return [];
+
         var locallyExistingMails = await _outlookChangeProcessor.AreMailsExistsAsync(messageIdsWithKnownFolder).ConfigureAwait(false);
 
         // Find messages that are not downloaded yet.
         List<Message> messagesToDownload = [];
-        foreach (var id in messagesDictionary.Keys.Except(locallyExistingMails))
+        foreach (var id in messageIdsWithKnownFolder.Except(locallyExistingMails, StringComparer.Ordinal))
         {
-            messagesToDownload.Add(messagesDictionary[id]);
+            if (messagesById.TryGetValue(id, out var message))
+            {
+                messagesToDownload.Add(message);
+            }
         }
 
         foreach (var message in messagesToDownload)
@@ -1136,30 +2114,92 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
     public override async Task<List<NewMailItemPackage>> CreateNewMailPackagesAsync(Message message, MailItemFolder assignedFolder, CancellationToken cancellationToken = default)
     {
+        // Download MIME message for specific scenarios (e.g., search results, draft handling)
+        // During normal sync, this method should not be called - use CreateMailCopyFromMessageAsync instead
         var mimeMessage = await DownloadMimeMessageAsync(message.Id, cancellationToken).ConfigureAwait(false);
-        var mailCopy = message.AsMailCopy();
+        var mailCopy = await CreateMailCopyFromMessageAsync(message, assignedFolder).ConfigureAwait(false);
 
-        if (message.IsDraft.GetValueOrDefault()
-            && mimeMessage.Headers.Contains(Domain.Constants.WinoLocalDraftHeader)
-            && Guid.TryParse(mimeMessage.Headers[Domain.Constants.WinoLocalDraftHeader], out Guid localDraftCopyUniqueId))
-        {
-            // This message belongs to existing local draft copy.
-            // We don't need to create a new mail copy for this message, just update the existing one.
+        // If draft mapping was successful, mailCopy will be null
+        if (mailCopy == null) return null;
 
-            bool isMappingSuccessful = await _outlookChangeProcessor.MapLocalDraftAsync(Account.Id, localDraftCopyUniqueId, mailCopy.Id, mailCopy.DraftId, mailCopy.ThreadId);
-
-            if (isMappingSuccessful) return null;
-
-            // Local copy doesn't exists. Continue execution to insert mail copy.
-        }
+        await TryMapCalendarInvitationAsync(mailCopy, mimeMessage, cancellationToken).ConfigureAwait(false);
 
         // Outlook messages can only be assigned to 1 folder at a time.
         // Therefore we don't need to create multiple copies of the same message for different folders.
-        var package = new NewMailItemPackage(mailCopy, mimeMessage, assignedFolder.RemoteFolderId);
+        var contacts = ExtractContactsFromOutlookMessage(message);
+        var package = new NewMailItemPackage(mailCopy, mimeMessage, assignedFolder.RemoteFolderId, contacts);
 
         return [package];
     }
 
+    private async Task TryMapCalendarInvitationAsync(MailCopy mailCopy, MimeMessage mimeMessage, CancellationToken cancellationToken)
+    {
+        if (mailCopy.ItemType != MailItemType.CalendarInvitation || mimeMessage == null)
+            return;
+
+        var invitationUid = mimeMessage.ExtractInvitationUid();
+        if (string.IsNullOrWhiteSpace(invitationUid))
+            return;
+
+        var calendars = await _outlookChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        if (calendars == null || calendars.Count == 0)
+            return;
+
+        string escapedUid = invitationUid.Replace("'", "''", StringComparison.Ordinal);
+
+        foreach (var calendar in calendars)
+        {
+            try
+            {
+                var eventsResponse = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events
+                    .GetAsync(requestConfiguration =>
+                    {
+                        requestConfiguration.QueryParameters.Filter = $"iCalUId eq '{escapedUid}'";
+                        requestConfiguration.QueryParameters.Select = ["id"];
+                        requestConfiguration.QueryParameters.Top = 1;
+                    }, cancellationToken: cancellationToken)
+                    .ConfigureAwait(false);
+
+                var matchedEvent = eventsResponse?.Value?.FirstOrDefault();
+                if (matchedEvent == null || string.IsNullOrWhiteSpace(matchedEvent.Id))
+                    continue;
+
+                var fullEvent = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[matchedEvent.Id]
+                    .GetAsync(requestConfiguration =>
+                    {
+                        requestConfiguration.QueryParameters.Expand = ["attachments($select=id,name,contentType,size,isInline)"];
+                    }, cancellationToken: cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (fullEvent == null)
+                    continue;
+
+                await _outlookChangeProcessor.ManageCalendarEventAsync(fullEvent, calendar, Account).ConfigureAwait(false);
+
+                var localCalendarItem = await _outlookChangeProcessor.GetCalendarItemAsync(calendar.Id, fullEvent.Id).ConfigureAwait(false);
+                if (localCalendarItem == null)
+                    return;
+
+                await _outlookChangeProcessor.UpsertMailInvitationCalendarMappingAsync(new MailInvitationCalendarMapping()
+                {
+                    Id = Guid.NewGuid(),
+                    AccountId = Account.Id,
+                    MailCopyId = mailCopy.Id,
+                    InvitationUid = invitationUid,
+                    CalendarId = calendar.Id,
+                    CalendarItemId = localCalendarItem.Id,
+                    CalendarRemoteEventId = fullEvent.Id
+                }).ConfigureAwait(false);
+
+                return;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to map Outlook calendar invitation mail {MailCopyId} for calendar {CalendarId}", mailCopy.Id, calendar.Id);
+            }
+        }
+    }
+
     protected override async Task<CalendarSynchronizationResult> SynchronizeCalendarEventsInternalAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
     {
         _logger.Information("Internal calendar synchronization started for {Name}", Account.Name);
@@ -1168,7 +2208,12 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
         await SynchronizeCalendarsAsync(cancellationToken).ConfigureAwait(false);
 
-        var localCalendars = await _outlookChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        if (options?.Type == CalendarSynchronizationType.CalendarMetadata)
+            return CalendarSynchronizationResult.Empty;
+
+        var localCalendars = (await _outlookChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false))
+            .Where(c => c.IsSynchronizationEnabled)
+            .ToList();
 
         Microsoft.Graph.Me.Calendars.Item.CalendarView.Delta.DeltaGetResponse eventsDeltaResponse = null;
 
@@ -1182,26 +2227,17 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             {
                 _logger.Information("No calendar sync identifier for calendar {Name}. Performing initial sync.", calendar.Name);
 
-                var startDate = DateTime.UtcNow.AddYears(-2).ToString("u");
-                var endDate = DateTime.UtcNow.ToString("u");
+                // ISO 8601 format as expected by Microsoft Graph API (e.g., "2019-11-08T19:00:00-08:00")
+                var startDate = DateTimeOffset.Now.AddYears(-2).ToString("yyyy-MM-ddTHH:mm:sszzz");
+                var endDate = DateTimeOffset.Now.AddYears(2).ToString("yyyy-MM-ddTHH:mm:sszzz");
 
+                // Get Id only. We will always download the full event.
                 eventsDeltaResponse = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].CalendarView.Delta.GetAsDeltaGetResponseAsync((requestConfiguration) =>
                 {
+                    requestConfiguration.QueryParameters.Select = ["id", "type"];
                     requestConfiguration.QueryParameters.StartDateTime = startDate;
                     requestConfiguration.QueryParameters.EndDateTime = endDate;
                 }, cancellationToken: cancellationToken);
-
-                // No delta link. Performing initial sync.
-                //eventsDeltaResponse = await _graphClient.Me.CalendarView.Delta.GetAsDeltaGetResponseAsync((requestConfiguration) =>
-                //{
-                //    requestConfiguration.QueryParameters.StartDateTime = startDate;
-                //    requestConfiguration.QueryParameters.EndDateTime = endDate;
-
-                //    // TODO: Expand does not work.
-                //    // https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/2358
-
-                //    requestConfiguration.QueryParameters.Expand = new string[] { "calendar($select=name,id)" }; // Expand the calendar and select name and id. Customize as needed.
-                //}, cancellationToken: cancellationToken);
             }
             else
             {
@@ -1209,20 +2245,7 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
                 _logger.Information("Performing delta sync for calendar {Name}.", calendar.Name);
 
-                var requestInformation = _graphClient.Me.Calendars[calendar.RemoteCalendarId].CalendarView.Delta.ToGetRequestInformation((requestConfiguration) =>
-                {
-
-                    //requestConfiguration.QueryParameters.StartDateTime = startDate;
-                    //requestConfiguration.QueryParameters.EndDateTime = endDate;
-                });
-
-                //var requestInformation = _graphClient.Me.Calendars[calendar.RemoteCalendarId].CalendarView.Delta.ToGetRequestInformation((config) =>
-                //{
-                //    config.QueryParameters.Top = (int)InitialMessageDownloadCountPerFolder;
-                //    config.QueryParameters.Select = outlookMessageSelectParameters;
-                //    config.QueryParameters.Orderby = ["receivedDateTime desc"];
-                //});
-
+                var requestInformation = _graphClient.Me.Calendars[calendar.RemoteCalendarId].CalendarView.Delta.ToGetRequestInformation();
 
                 requestInformation.UrlTemplate = requestInformation.UrlTemplate.Insert(requestInformation.UrlTemplate.Length - 1, ",%24deltatoken");
                 requestInformation.QueryParameters.Add("%24deltatoken", currentDeltaToken);
@@ -1237,6 +2260,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
             var messageIteratorAsync = PageIterator<Event, Microsoft.Graph.Me.Calendars.Item.CalendarView.Delta.DeltaGetResponse>.CreatePageIterator(_graphClient, eventsDeltaResponse, (item) =>
             {
+                // Include all event types: SingleInstance, SeriesMaster, Occurrence, and Exception
+                // CalendarView already expands recurring events into individual occurrences
                 events.Add(item);
 
                 return true;
@@ -1253,18 +2278,35 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
             foreach (var item in events)
             {
-                try
+                // Declined events are returned as Deleted from the API.
+                // There is no way to distinguish unfortunately atm.
+
+                if (IsResourceDeleted(item.AdditionalData))
                 {
-                    await _handleItemRetrievalSemaphore.WaitAsync();
-                    await _outlookChangeProcessor.ManageCalendarEventAsync(item, calendar, Account).ConfigureAwait(false);
+                    await _outlookChangeProcessor.DeleteCalendarItemAsync(item.Id, calendar.Id).ConfigureAwait(false);
                 }
-                catch (Exception)
+                else
                 {
-                    // _logger.Error(ex, "Error occurred while handling item {Id} for calendar {Name}", item.Id, calendar.Name);
-                }
-                finally
-                {
-                    _handleItemRetrievalSemaphore.Release();
+                    try
+                    {
+                        await _handleCalendarEventRetrievalSemaphore.WaitAsync();
+
+                        Event fullEvent = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[item.Id]
+                            .GetAsync(requestConfiguration =>
+                            {
+                                // Expand attachments but only get metadata, not the full content
+                                requestConfiguration.QueryParameters.Expand = new[] { "attachments($select=id,name,contentType,size,isInline)" };
+                            }, cancellationToken: cancellationToken).ConfigureAwait(false);
+                        await _outlookChangeProcessor.ManageCalendarEventAsync(fullEvent, calendar, Account).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.Error(ex, "Error occurred while handling item {Id} for calendar {Name}", item.Id, calendar.Name);
+                    }
+                    finally
+                    {
+                        _handleCalendarEventRetrievalSemaphore.Release();
+                    }
                 }
             }
 
@@ -1281,14 +2323,17 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             }
         }
 
-        return default;
+        // TODO: Return proper results.
+        return CalendarSynchronizationResult.Empty;
     }
 
     private async Task SynchronizeCalendarsAsync(CancellationToken cancellationToken = default)
     {
         var calendars = await _graphClient.Me.Calendars.GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+        var remotePrimaryCalendarId = await GetPrimaryCalendarIdAsync(calendars.Value, cancellationToken).ConfigureAwait(false);
 
         var localCalendars = await _outlookChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
+        var usedCalendarColors = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         List<AccountCalendar> insertedCalendars = new();
         List<AccountCalendar> updatedCalendars = new();
@@ -1318,15 +2363,25 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
             if (existingLocalCalendar == null)
             {
                 // Insert new calendar.
-                var localCalendar = calendar.AsCalendar(Account);
+                var fallbackColor = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, calendar.HexColor);
+                var localCalendar = calendar.AsCalendar(Account, fallbackColor);
+                localCalendar.IsPrimary = string.Equals(localCalendar.RemoteCalendarId, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
+                localCalendar.BackgroundColorHex = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, localCalendar.BackgroundColorHex);
+                localCalendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(localCalendar.BackgroundColorHex);
+                usedCalendarColors.Add(localCalendar.BackgroundColorHex);
                 insertedCalendars.Add(localCalendar);
             }
             else
             {
                 // Update existing calendar. Right now we only update the name.
-                if (ShouldUpdateCalendar(calendar, existingLocalCalendar))
+                var resolvedColor = ColorHelpers.GetDistinctFlatColorHex(usedCalendarColors, existingLocalCalendar.BackgroundColorHex);
+                if (ShouldUpdateCalendar(calendar, existingLocalCalendar, remotePrimaryCalendarId) ||
+                    !string.Equals(existingLocalCalendar.BackgroundColorHex, resolvedColor, StringComparison.OrdinalIgnoreCase))
                 {
                     existingLocalCalendar.Name = calendar.Name;
+                    existingLocalCalendar.IsPrimary = string.Equals(existingLocalCalendar.RemoteCalendarId, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
+                    existingLocalCalendar.BackgroundColorHex = resolvedColor;
+                    existingLocalCalendar.TextColorHex = ColorHelpers.GetReadableTextColorHex(existingLocalCalendar.BackgroundColorHex);
 
                     updatedCalendars.Add(existingLocalCalendar);
                 }
@@ -1335,6 +2390,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
                     // Remove it from the local folder list to skip additional calendar updates.
                     localCalendars.Remove(existingLocalCalendar);
                 }
+
+                usedCalendarColors.Add(resolvedColor);
             }
         }
 
@@ -1356,16 +2413,330 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
         }
     }
 
-    private bool ShouldUpdateCalendar(Calendar calendar, AccountCalendar accountCalendar)
+    private bool ShouldUpdateCalendar(Calendar calendar, AccountCalendar accountCalendar, string remotePrimaryCalendarId)
     {
-        // TODO: Only calendar name is updated for now. We can add more checks here.
-
         var remoteCalendarName = calendar.Name;
-        var localCalendarName = accountCalendar.Name;
+        var remoteBackgroundColor = string.IsNullOrEmpty(calendar.HexColor) ? accountCalendar.BackgroundColorHex : calendar.HexColor;
+        var remoteIsPrimary = string.Equals(calendar.Id, remotePrimaryCalendarId, StringComparison.OrdinalIgnoreCase);
 
-        return !localCalendarName.Equals(remoteCalendarName, StringComparison.OrdinalIgnoreCase);
+        bool isNameChanged = !string.Equals(accountCalendar.Name, remoteCalendarName, StringComparison.OrdinalIgnoreCase);
+        bool isBackgroundColorChanged = !string.Equals(accountCalendar.BackgroundColorHex, remoteBackgroundColor, StringComparison.OrdinalIgnoreCase);
+        bool isPrimaryChanged = accountCalendar.IsPrimary != remoteIsPrimary;
+
+        return isNameChanged || isBackgroundColorChanged || isPrimaryChanged;
     }
 
+    private async Task<string> GetPrimaryCalendarIdAsync(IList<Calendar> remoteCalendars, CancellationToken cancellationToken)
+    {
+        if (remoteCalendars == null || remoteCalendars.Count == 0)
+            return string.Empty;
+
+        var explicitPrimary = remoteCalendars.FirstOrDefault(c => c.IsDefaultCalendar.GetValueOrDefault());
+        if (explicitPrimary != null)
+            return explicitPrimary.Id;
+
+        try
+        {
+            var meCalendar = await _graphClient.Me.Calendar.GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+            if (!string.IsNullOrEmpty(meCalendar?.Id))
+                return meCalendar.Id;
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to fetch default Outlook calendar for {Name}. Falling back to first available calendar.", Account.Name);
+        }
+
+        return remoteCalendars.First().Id;
+    }
+
+    #region Calendar Operations
+
+    public override List<IRequestBundle<RequestInformation>> CreateCalendarEvent(CreateCalendarEventRequest request)
+    {
+        var calendarItem = request.PreparedItem;
+        var attendees = request.PreparedEvent.Attendees;
+        var reminders = request.PreparedEvent.Reminders;
+        var calendar = request.AssignedCalendar;
+
+        var outlookEvent = new Microsoft.Graph.Models.Event
+        {
+            Subject = calendarItem.Title,
+            Body = new Microsoft.Graph.Models.ItemBody
+            {
+                ContentType = Microsoft.Graph.Models.BodyType.Html,
+                Content = calendarItem.Description
+            },
+            Location = new Microsoft.Graph.Models.Location
+            {
+                DisplayName = calendarItem.Location
+            },
+            ShowAs = calendarItem.ShowAs switch
+            {
+                CalendarItemShowAs.Free => Microsoft.Graph.Models.FreeBusyStatus.Free,
+                CalendarItemShowAs.Tentative => Microsoft.Graph.Models.FreeBusyStatus.Tentative,
+                CalendarItemShowAs.Busy => Microsoft.Graph.Models.FreeBusyStatus.Busy,
+                CalendarItemShowAs.OutOfOffice => Microsoft.Graph.Models.FreeBusyStatus.Oof,
+                CalendarItemShowAs.WorkingElsewhere => Microsoft.Graph.Models.FreeBusyStatus.WorkingElsewhere,
+                _ => Microsoft.Graph.Models.FreeBusyStatus.Busy
+            },
+            TransactionId = calendarItem.Id.ToString("N")
+        };
+
+        if (calendarItem.IsAllDayEvent)
+        {
+            outlookEvent.IsAllDay = true;
+            outlookEvent.Start = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.StartDate.ToString("yyyy-MM-dd"),
+                TimeZone = calendarItem.StartTimeZone ?? TimeZoneInfo.Local.Id
+            };
+            outlookEvent.End = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.EndDate.ToString("yyyy-MM-dd"),
+                TimeZone = calendarItem.EndTimeZone ?? calendarItem.StartTimeZone ?? TimeZoneInfo.Local.Id
+            };
+        }
+        else
+        {
+            outlookEvent.IsAllDay = false;
+            outlookEvent.Start = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.StartDate.ToString("yyyy-MM-ddTHH:mm:ss"),
+                TimeZone = calendarItem.StartTimeZone ?? TimeZoneInfo.Local.Id
+            };
+            outlookEvent.End = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.EndDate.ToString("yyyy-MM-ddTHH:mm:ss"),
+                TimeZone = calendarItem.EndTimeZone ?? TimeZoneInfo.Local.Id
+            };
+        }
+
+        if (attendees.Count > 0)
+        {
+            outlookEvent.Attendees = attendees.Select(a => new Microsoft.Graph.Models.Attendee
+            {
+                EmailAddress = new Microsoft.Graph.Models.EmailAddress
+                {
+                    Address = a.Email,
+                    Name = a.Name
+                },
+                Type = a.IsOptionalAttendee ? Microsoft.Graph.Models.AttendeeType.Optional : Microsoft.Graph.Models.AttendeeType.Required
+            }).ToList();
+        }
+
+        if (reminders.Count > 0)
+        {
+            var reminder = reminders
+                .OrderBy(reminder => reminder.DurationInSeconds)
+                .FirstOrDefault(reminder => reminder.ReminderType == CalendarItemReminderType.Popup)
+                ?? reminders.OrderBy(reminder => reminder.DurationInSeconds).First();
+
+            outlookEvent.IsReminderOn = true;
+            outlookEvent.ReminderMinutesBeforeStart = (int)Math.Max(0, reminder.DurationInSeconds / 60);
+        }
+
+        var recurrence = CalendarRecurrenceMapper.CreateOutlookRecurrence(calendarItem);
+        if (recurrence != null)
+        {
+            outlookEvent.Recurrence = recurrence;
+        }
+
+        var createRequest = _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events.ToPostRequestInformation(outlookEvent);
+
+        return [new HttpRequestBundle<RequestInformation>(createRequest, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> AcceptEvent(AcceptEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot accept event without remote event ID");
+        }
+
+        var acceptRequestInfo = _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[remoteEventId].Accept.ToPostRequestInformation(new Microsoft.Graph.Me.Calendars.Item.Events.Item.Accept.AcceptPostRequestBody
+        {
+            Comment = request.ResponseMessage,
+            SendResponse = !string.IsNullOrEmpty(request.ResponseMessage)
+        });
+
+        return [new HttpRequestBundle<RequestInformation>(acceptRequestInfo, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> OutlookDeclineEvent(OutlookDeclineEventRequest request)
+    {
+        var responseMessage = request.ResponseMessage;
+
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot decline event without remote event ID");
+        }
+
+        var declineRequestInfo = _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[remoteEventId].Decline.ToPostRequestInformation(new Microsoft.Graph.Me.Calendars.Item.Events.Item.Decline.DeclinePostRequestBody
+        {
+            Comment = responseMessage,
+            SendResponse = !string.IsNullOrEmpty(responseMessage)
+        });
+
+        return [new HttpRequestBundle<RequestInformation>(declineRequestInfo, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> TentativeEvent(TentativeEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var calendar = calendarItem.AssignedCalendar;
+
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot tentatively accept event without remote event ID");
+        }
+
+        var tentativelyAcceptRequestInfo = _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[remoteEventId].TentativelyAccept.ToPostRequestInformation(new Microsoft.Graph.Me.Calendars.Item.Events.Item.TentativelyAccept.TentativelyAcceptPostRequestBody
+        {
+            Comment = request.ResponseMessage,
+            SendResponse = !string.IsNullOrEmpty(request.ResponseMessage)
+        });
+
+        return [new HttpRequestBundle<RequestInformation>(tentativelyAcceptRequestInfo, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> UpdateCalendarEvent(UpdateCalendarEventRequest request)
+    {
+        var calendarItem = request.Item;
+        var attendees = request.Attendees;
+
+        // Get the calendar for this event
+        var calendar = calendarItem.AssignedCalendar;
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        // Convert CalendarItem to Outlook Event for update
+        var outlookEvent = new Microsoft.Graph.Models.Event
+        {
+            Subject = calendarItem.Title,
+            Body = new Microsoft.Graph.Models.ItemBody
+            {
+                ContentType = Microsoft.Graph.Models.BodyType.Text,
+                Content = calendarItem.Description
+            },
+            Location = new Microsoft.Graph.Models.Location
+            {
+                DisplayName = calendarItem.Location
+            },
+            ShowAs = calendarItem.ShowAs switch
+            {
+                CalendarItemShowAs.Free => Microsoft.Graph.Models.FreeBusyStatus.Free,
+                CalendarItemShowAs.Tentative => Microsoft.Graph.Models.FreeBusyStatus.Tentative,
+                CalendarItemShowAs.Busy => Microsoft.Graph.Models.FreeBusyStatus.Busy,
+                CalendarItemShowAs.OutOfOffice => Microsoft.Graph.Models.FreeBusyStatus.Oof,
+                CalendarItemShowAs.WorkingElsewhere => Microsoft.Graph.Models.FreeBusyStatus.WorkingElsewhere,
+                _ => Microsoft.Graph.Models.FreeBusyStatus.Busy
+            }
+        };
+
+        // Set start and end time using DateTimeTimeZone
+        if (calendarItem.IsAllDayEvent)
+        {
+            // All-day events
+            outlookEvent.IsAllDay = true;
+            outlookEvent.Start = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.StartDate.ToString("yyyy-MM-dd"),
+                TimeZone = "UTC"
+            };
+            outlookEvent.End = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.EndDate.ToString("yyyy-MM-dd"),
+                TimeZone = "UTC"
+            };
+        }
+        else
+        {
+            // Regular events with time
+            // StartDate and EndDate are stored in the event's timezone
+            // We preserve the timezone information during update
+            outlookEvent.IsAllDay = false;
+            outlookEvent.Start = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.StartDate.ToString("yyyy-MM-ddTHH:mm:ss"),
+                TimeZone = calendarItem.StartTimeZone ?? TimeZoneInfo.Local.Id
+            };
+            outlookEvent.End = new Microsoft.Graph.Models.DateTimeTimeZone
+            {
+                DateTime = calendarItem.EndDate.ToString("yyyy-MM-ddTHH:mm:ss"),
+                TimeZone = calendarItem.EndTimeZone ?? TimeZoneInfo.Local.Id
+            };
+        }
+
+        // Add attendees if any
+        if (attendees != null && attendees.Count > 0)
+        {
+            outlookEvent.Attendees = attendees.Select(a => new Microsoft.Graph.Models.Attendee
+            {
+                EmailAddress = new Microsoft.Graph.Models.EmailAddress
+                {
+                    Address = a.Email,
+                    Name = a.Name
+                },
+                Type = a.IsOptionalAttendee ? Microsoft.Graph.Models.AttendeeType.Optional : Microsoft.Graph.Models.AttendeeType.Required
+            }).ToList();
+        }
+
+        // Update the event using Graph API
+        var updateRequest = _graphClient.Me.Events[calendarItem.RemoteEventId.GetProviderRemoteEventId()].ToPatchRequestInformation(outlookEvent);
+
+        return [new HttpRequestBundle<RequestInformation>(updateRequest, request)];
+    }
+
+    public override List<IRequestBundle<RequestInformation>> DeleteCalendarEvent(DeleteCalendarEventRequest request)
+    {
+        var calendarItem = request.Item;
+
+        // Get the calendar for this event
+        var calendar = calendarItem.AssignedCalendar;
+        if (calendar == null)
+        {
+            throw new InvalidOperationException("Calendar item must have an assigned calendar");
+        }
+
+        var remoteEventId = calendarItem.RemoteEventId.GetProviderRemoteEventId();
+        if (string.IsNullOrEmpty(remoteEventId))
+        {
+            throw new InvalidOperationException("Cannot delete event without remote event ID");
+        }
+
+        var deleteRequest = _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[remoteEventId].ToDeleteRequestInformation();
+
+        return [new HttpRequestBundle<RequestInformation>(deleteRequest, request)];
+    }
+
+    #endregion
+
     public override async Task KillSynchronizerAsync()
     {
         await base.KillSynchronizerAsync();
diff --git a/Wino.Core/Synchronizers/WinoSynchronizer.cs b/Wino.Core/Synchronizers/WinoSynchronizer.cs
index f1ba0133..9375611b 100644
--- a/Wino.Core/Synchronizers/WinoSynchronizer.cs
+++ b/Wino.Core/Synchronizers/WinoSynchronizer.cs
@@ -18,6 +18,7 @@ using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Requests.Bundles;
+using Wino.Core.Requests.Calendar;
 using Wino.Core.Requests.Folder;
 using Wino.Core.Requests.Mail;
 using Wino.Messaging.UI;
@@ -32,7 +33,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
 
     protected ILogger Logger = Log.ForContext<WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEventType>>();
 
-    protected WinoSynchronizer(MailAccount account) : base(account) { }
+    protected WinoSynchronizer(MailAccount account, IMessenger messenger) : base(account, messenger) { }
 
     /// <summary>
     /// How many items per single HTTP call can be modified.
@@ -41,15 +42,19 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
 
     /// <summary>
     /// How many items must be downloaded per folder when the folder is first synchronized.
+    /// Only metadata is downloaded during sync - MIME content is fetched on-demand when user reads mail.
     /// </summary>
     public abstract uint InitialMessageDownloadCountPerFolder { get; }
 
     /// <summary>
-    /// Creates a new Wino Mail Item package out of native message type with full Mime.
+    /// Creates a new Wino Mail Item package out of native message type with metadata only.
+    /// NO MIME content is downloaded during synchronization - only headers and essential metadata.
+    /// MIME will be downloaded on-demand when user explicitly reads the message.
     /// </summary>
     /// <param name="message">Native message type for the synchronizer.</param>
+    /// <param name="assignedFolder">Folder to assign the mail to.</param>
     /// <param name="cancellationToken">Cancellation token</param>
-    /// <returns>Package that encapsulates downloaded Mime and additional information for adding new mail.</returns>
+    /// <returns>Package with MailCopy metadata. MimeMessage will be null during sync.</returns>
     public abstract Task<List<NewMailItemPackage>> CreateNewMailPackagesAsync(TMessageType message, MailItemFolder assignedFolder, CancellationToken cancellationToken = default);
 
     /// <summary>
@@ -58,6 +63,38 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
     /// </summary>
     protected virtual Task SynchronizeAliasesAsync() => Task.CompletedTask;
 
+    /// <summary>
+    /// Queues all mail ids for initial synchronization for a specific folder.
+    /// Only overridden by synchronizers that support the new queue-based sync.
+    /// </summary>
+    /// <param name="folder">Folder to queue mail ids for</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>Task</returns>
+    protected virtual Task QueueMailIdsForInitialSyncAsync(MailItemFolder folder, CancellationToken cancellationToken = default) => Task.CompletedTask;
+
+    /// <summary>
+    /// Downloads mail items from the queue in batches.
+    /// Only overridden by synchronizers that support the new queue-based sync.
+    /// </summary>
+    /// <param name="folder">Folder to download mails for</param>
+    /// <param name="batchSize">Number of items to download in each batch</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>List of downloaded mail ids</returns>
+    protected virtual Task<List<string>> DownloadMailsFromQueueAsync(MailItemFolder folder, int batchSize, CancellationToken cancellationToken = default) => Task.FromResult(new List<string>());
+
+    /// <summary>
+    /// Creates a MailCopy object with minimal properties from the native message type.
+    /// This is used during synchronization to create mail entries WITHOUT downloading MIME content.
+    /// Only metadata (headers, labels, flags) is extracted from the native message format.
+    /// MIME content will be downloaded later on-demand when user reads the message.
+    /// Only overridden by synchronizers that support metadata-only synchronization.
+    /// </summary>
+    /// <param name="message">Native message type</param>
+    /// <param name="assignedFolder">Folder this message belongs to</param>
+    /// <param name="cancellationToken">Cancellation token</param>
+    /// <returns>MailCopy with minimal properties populated from metadata</returns>
+    protected virtual Task<MailCopy> CreateMinimalMailCopyAsync(TMessageType message, MailItemFolder assignedFolder, CancellationToken cancellationToken = default) => Task.FromResult<MailCopy>(null);
+
     /// <summary>
     /// Internally synchronizes the account's mails with the given options.
     /// Not exposed and overriden for each synchronizer.
@@ -166,6 +203,12 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
                             case FolderSynchronizerOperation.MarkFolderRead:
                                 nativeRequests.AddRange(MarkFolderAsRead(group.ElementAt(0) as MarkFolderAsReadRequest));
                                 break;
+                            case FolderSynchronizerOperation.DeleteFolder:
+                                nativeRequests.AddRange(DeleteFolder(group.ElementAt(0) as DeleteFolderRequest));
+                                break;
+                            case FolderSynchronizerOperation.CreateSubFolder:
+                                nativeRequests.AddRange(CreateSubFolder(group.ElementAt(0) as CreateSubFolderRequest));
+                                break;
                             default:
                                 break;
                         }
@@ -176,7 +219,16 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
 
                 Console.WriteLine($"Prepared {nativeRequests.Count()} native requests");
 
-                await ExecuteNativeRequestsAsync(nativeRequests, activeSynchronizationCancellationToken).ConfigureAwait(false);
+                try
+                {
+                    await ExecuteNativeRequestsAsync(nativeRequests, activeSynchronizationCancellationToken).ConfigureAwait(false);
+                }
+                finally
+                {
+                    UntrackProcessedRequests(requestCopies);
+                }
+
+                Messenger.Send(new SynchronizationActionsCompleted(Account.Id));
 
                 PublishUnreadItemChanges();
 
@@ -205,7 +257,8 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
 
             await synchronizationSemaphore.WaitAsync(activeSynchronizationCancellationToken);
 
-            PublishSynchronizationProgress(1);
+            // Set indeterminate progress for initial state
+            UpdateSyncProgress(0, 0, "Synchronizing...");
 
             State = AccountSynchronizerState.Synchronizing;
 
@@ -226,7 +279,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
                 {
                     Log.Error(ex, "Failed to update profile information for {Name}", Account.Name);
 
-                    return MailSynchronizationResult.Failed;
+                    return MailSynchronizationResult.Failed(ex);
                 }
 
                 return MailSynchronizationResult.Completed(newProfileInformation);
@@ -247,7 +300,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
                 {
                     Log.Error(ex, "Failed to update aliases for {Name}", Account.Name);
 
-                    return MailSynchronizationResult.Failed;
+                    return MailSynchronizationResult.Failed(ex);
                 }
             }
 
@@ -286,8 +339,8 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
                 PendingSynchronizationRequest.Remove(pendingRequest.Key);
             }
 
-            // Reset account progress to hide the progress.
-            PublishSynchronizationProgress(0);
+            // Reset synchronization progress
+            ResetSyncProgress();
 
             State = AccountSynchronizerState.Idle;
             synchronizationSemaphore.Release();
@@ -300,10 +353,106 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
     /// <param name="options">Synchronization options.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>Synchronization result that contains summary of the sync.</returns>
-    public Task<CalendarSynchronizationResult> SynchronizeCalendarEventsAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
+    public async Task<CalendarSynchronizationResult> SynchronizeCalendarEventsAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
     {
-        // TODO: Execute requests for calendar events.
-        return SynchronizeCalendarEventsInternalAsync(options, cancellationToken);
+        bool shouldExecuteRequests = changeRequestQueue.Any(r => r is ICalendarActionRequest);
+        bool shouldDelayExecution = false;
+        int maxExecutionDelay = 0;
+
+        if (shouldExecuteRequests)
+        {
+            State = AccountSynchronizerState.ExecutingRequests;
+
+            List<IRequestBundle<TBaseRequest>> nativeRequests = new();
+            List<IRequestBase> requestCopies = new(changeRequestQueue.Where(r => r is ICalendarActionRequest));
+
+            var keys = requestCopies.GroupBy(a => a.GroupingKey());
+
+            foreach (var group in keys)
+            {
+                var key = group.Key;
+
+                if (key is CalendarSynchronizerOperation calendarSynchronizerOperation)
+                {
+                    switch (calendarSynchronizerOperation)
+                    {
+                        case CalendarSynchronizerOperation.CreateEvent:
+                            nativeRequests.AddRange(group
+                                .OfType<CreateCalendarEventRequest>()
+                                .SelectMany(CreateCalendarEvent));
+                            break;
+                        case CalendarSynchronizerOperation.AcceptEvent:
+                            nativeRequests.AddRange(group
+                                .OfType<AcceptEventRequest>()
+                                .SelectMany(AcceptEvent));
+                            break;
+                        case CalendarSynchronizerOperation.DeclineEvent:
+                            if (Account.ProviderType == MailProviderType.Outlook)
+                            {
+                                nativeRequests.AddRange(group
+                                    .OfType<OutlookDeclineEventRequest>()
+                                    .SelectMany(OutlookDeclineEvent));
+                            }
+                            else
+                            {
+                                nativeRequests.AddRange(group
+                                    .OfType<DeclineEventRequest>()
+                                    .SelectMany(DeclineEvent));
+                            }
+                            break;
+                        case CalendarSynchronizerOperation.TentativeEvent:
+                            nativeRequests.AddRange(group
+                                .OfType<TentativeEventRequest>()
+                                .SelectMany(TentativeEvent));
+                            break;
+                        case CalendarSynchronizerOperation.UpdateEvent:
+                            nativeRequests.AddRange(group
+                                .OfType<UpdateCalendarEventRequest>()
+                                .SelectMany(UpdateCalendarEvent));
+                            break;
+                        case CalendarSynchronizerOperation.DeleteEvent:
+                            nativeRequests.AddRange(group
+                                .OfType<DeleteCalendarEventRequest>()
+                                .SelectMany(DeleteCalendarEvent));
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // Remove processed calendar requests from queue
+            changeRequestQueue.RemoveAll(r => r is ICalendarActionRequest);
+
+            Console.WriteLine($"Prepared {nativeRequests.Count()} native calendar requests");
+
+            try
+            {
+                await ExecuteNativeRequestsAsync(nativeRequests, cancellationToken).ConfigureAwait(false);
+            }
+            finally
+            {
+                UntrackProcessedRequests(requestCopies);
+            }
+
+            Messenger.Send(new SynchronizationActionsCompleted(Account.Id));
+
+            // Let servers to finish their job. Sometimes the servers don't respond immediately.
+            shouldDelayExecution = requestCopies.Any(a => a.ResynchronizationDelay > 0);
+
+            if (shouldDelayExecution)
+            {
+                maxExecutionDelay = requestCopies.Aggregate(0, (max, next) => Math.Max(max, next.ResynchronizationDelay));
+            }
+        }
+
+        if (shouldDelayExecution)
+        {
+            await Task.Delay(maxExecutionDelay, cancellationToken);
+        }
+
+        // Execute the actual synchronization
+        return await SynchronizeCalendarEventsInternalAsync(options, cancellationToken);
     }
 
     /// <summary>
@@ -313,13 +462,6 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
     private void PublishUnreadItemChanges()
         => WeakReferenceMessenger.Default.Send(new RefreshUnreadCountsMessage(Account.Id));
 
-    /// <summary>
-    /// Sends a message to the shell to update the synchronization progress.
-    /// </summary>
-    /// <param name="progress">Percentage of the progress.</param>
-    public void PublishSynchronizationProgress(double progress)
-        => WeakReferenceMessenger.Default.Send(new AccountSynchronizationProgressUpdatedMessage(Account.Id, progress));
-
     /// <summary>
     /// Attempts to find out the best possible synchronization options after the batch request execution.
     /// </summary>
@@ -400,11 +542,20 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
     public virtual List<IRequestBundle<TBaseRequest>> RenameFolder(RenameFolderRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
     public virtual List<IRequestBundle<TBaseRequest>> EmptyFolder(EmptyFolderRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
     public virtual List<IRequestBundle<TBaseRequest>> MarkFolderAsRead(MarkFolderAsReadRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> DeleteFolder(DeleteFolderRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> CreateSubFolder(CreateSubFolderRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
 
     #endregion
 
     #region Calendar Operations
 
+    public virtual List<IRequestBundle<TBaseRequest>> CreateCalendarEvent(CreateCalendarEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> UpdateCalendarEvent(UpdateCalendarEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> DeleteCalendarEvent(DeleteCalendarEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> AcceptEvent(AcceptEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> DeclineEvent(DeclineEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> OutlookDeclineEvent(OutlookDeclineEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual List<IRequestBundle<TBaseRequest>> TentativeEvent(TentativeEventRequest request) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
 
     #endregion
 
@@ -415,7 +566,20 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
     /// <param name="mailItem">Mail item that its mime file does not exist on the disk.</param>
     /// <param name="transferProgress">Optional download progress for IMAP synchronizer.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
-    public virtual Task DownloadMissingMimeMessageAsync(IMailItem mailItem, ITransferProgress transferProgress = null, CancellationToken cancellationToken = default) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+    public virtual Task DownloadMissingMimeMessageAsync(MailCopy mailItem, ITransferProgress transferProgress = null, CancellationToken cancellationToken = default) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
+
+    /// <summary>
+    /// Downloads a calendar attachment from the provider.
+    /// </summary>
+    /// <param name="calendarItem">Calendar item the attachment belongs to.</param>
+    /// <param name="attachment">Attachment metadata to download.</param>
+    /// <param name="localFilePath">Local file path to save the attachment to.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    public virtual Task DownloadCalendarAttachmentAsync(
+        Wino.Core.Domain.Entities.Calendar.CalendarItem calendarItem,
+        Wino.Core.Domain.Entities.Calendar.CalendarAttachment attachment,
+        string localFilePath,
+        CancellationToken cancellationToken = default) => throw new NotSupportedException(string.Format(Translator.Exception_UnsupportedSynchronizerOperation, this.GetType()));
 
     /// <summary>
     /// Performs an online search for the given query text in the given folders.
diff --git a/Wino.Core/Wino.Core.csproj b/Wino.Core/Wino.Core.csproj
index 4c44cde9..7734fc96 100644
--- a/Wino.Core/Wino.Core.csproj
+++ b/Wino.Core/Wino.Core.csproj
@@ -1,17 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<RootNamespace>Wino.Core</RootNamespace>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Diagnostics" />
 		<PackageReference Include="CommunityToolkit.Mvvm" />
 		<PackageReference Include="Google.Apis.Calendar.v3" />
+		<PackageReference Include="Google.Apis.Drive.v3" />
 		<PackageReference Include="Google.Apis.Gmail.v1" />
 		<PackageReference Include="Google.Apis.PeopleService.v1" />
 		<PackageReference Include="HtmlAgilityPack" />
@@ -28,8 +32,6 @@
 		<PackageReference Include="NodaTime" />
 		<PackageReference Include="Sentry.Serilog" />
 		<PackageReference Include="SkiaSharp" />
-		<PackageReference Include="SqlKata" />
-		<PackageReference Include="System.Text.Encoding.CodePages" />
 	</ItemGroup>
 	
 	<ItemGroup>
@@ -38,4 +40,8 @@
 		<ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
 		<ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
 	</ItemGroup>
-</Project>
\ No newline at end of file
+	
+	<ItemGroup>
+	  <Folder Include="Domain\Models\Errors\" />
+	</ItemGroup>
+</Project>
diff --git a/Wino.Mail.ViewModels.Tests/Collections/WinoMailCollectionTests.cs b/Wino.Mail.ViewModels.Tests/Collections/WinoMailCollectionTests.cs
new file mode 100644
index 00000000..3c13879b
--- /dev/null
+++ b/Wino.Mail.ViewModels.Tests/Collections/WinoMailCollectionTests.cs
@@ -0,0 +1,229 @@
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.ViewModels.Collections;
+using Wino.Mail.ViewModels.Data;
+using Xunit;
+
+namespace Wino.Mail.ViewModels.Tests.Collections;
+
+public class WinoMailCollectionTests
+{
+    [Fact]
+    public async Task AddAsync_ShouldAddSingleItemAsMailItemViewModel()
+    {
+        var sut = CreateCollection();
+        var mail = CreateMailCopy(threadId: "thread-1");
+
+        await sut.AddAsync(mail);
+
+        var items = FlattenItems(sut);
+        items.Should().ContainSingle().Which.Should().BeOfType<MailItemViewModel>();
+        sut.ContainsMailUniqueId(mail.UniqueId).Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task AddAsync_ShouldKeepItemsSeparate_WhenThreadIdsDiffer()
+    {
+        var sut = CreateCollection();
+        var first = CreateMailCopy(threadId: "thread-1");
+        var second = CreateMailCopy(threadId: "thread-2");
+
+        await sut.AddAsync(first);
+        await sut.AddAsync(second);
+
+        var items = FlattenItems(sut);
+        items.Should().HaveCount(2);
+        items.Should().OnlyContain(item => item is MailItemViewModel);
+    }
+
+    [Fact]
+    public async Task AddAsync_ShouldConvertSingleItemToThread_WhenSecondItemWithSameThreadIdIsAdded()
+    {
+        var sut = CreateCollection();
+        var first = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow.AddMinutes(-1));
+        var second = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow);
+
+        await sut.AddAsync(first);
+        FlattenItems(sut).Should().ContainSingle().Which.Should().BeOfType<MailItemViewModel>();
+
+        await sut.AddAsync(second);
+
+        var items = FlattenItems(sut);
+        var threadItem = items.Should().ContainSingle().Which.Should().BeOfType<ThreadMailItemViewModel>().Subject;
+        threadItem.EmailCount.Should().Be(2);
+        threadItem.GetContainingIds().Should().BeEquivalentTo([first.UniqueId, second.UniqueId]);
+    }
+
+    [Fact]
+    public async Task RemoveAsync_ShouldConvertThreadToSingleItem_WhenThreadDropsToOneItem()
+    {
+        var sut = CreateCollection();
+        var first = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow.AddMinutes(-1));
+        var second = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow);
+
+        await sut.AddAsync(first);
+        await sut.AddAsync(second);
+
+        await sut.RemoveAsync(second);
+
+        var items = FlattenItems(sut);
+        var remainingItem = items.Should().ContainSingle().Which.Should().BeOfType<MailItemViewModel>().Subject;
+        remainingItem.MailCopy.UniqueId.Should().Be(first.UniqueId);
+
+        var container = sut.GetMailItemContainer(first.UniqueId);
+        container.Should().NotBeNull();
+        container.ThreadViewModel.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task RemoveAsync_ShouldRemoveSingleItem()
+    {
+        var sut = CreateCollection();
+        var mail = CreateMailCopy(threadId: "thread-1");
+
+        await sut.AddAsync(mail);
+        await sut.RemoveAsync(mail);
+
+        FlattenItems(sut).Should().BeEmpty();
+        sut.ContainsMailUniqueId(mail.UniqueId).Should().BeFalse();
+    }
+
+    [Fact]
+    public async Task AddRangeAsync_ShouldCreateThreadsForItemsWithMatchingThreadId()
+    {
+        var sut = CreateCollection();
+
+        var threadAFirst = new MailItemViewModel(CreateMailCopy(threadId: "thread-a", creationDate: DateTime.UtcNow.AddMinutes(-10)));
+        var threadASecond = new MailItemViewModel(CreateMailCopy(threadId: "thread-a", creationDate: DateTime.UtcNow.AddMinutes(-9)));
+        var threadCFirst = new MailItemViewModel(CreateMailCopy(threadId: "thread-c", creationDate: DateTime.UtcNow.AddMinutes(-8)));
+        var threadCSecond = new MailItemViewModel(CreateMailCopy(threadId: "thread-c", creationDate: DateTime.UtcNow.AddMinutes(-7)));
+        var single = new MailItemViewModel(CreateMailCopy(threadId: "thread-b", creationDate: DateTime.UtcNow.AddMinutes(-6)));
+
+        await sut.AddRangeAsync([threadAFirst, threadASecond, threadCFirst, threadCSecond, single], clearIdCache: true);
+
+        var items = FlattenItems(sut);
+        items.Should().HaveCount(3);
+        items.Count(item => item is ThreadMailItemViewModel).Should().Be(2);
+        items.Count(item => item is MailItemViewModel).Should().Be(1);
+
+        var threadItems = items.OfType<ThreadMailItemViewModel>().ToList();
+        threadItems.Should().Contain(item => item.ThreadId == "thread-a" && item.EmailCount == 2);
+        threadItems.Should().Contain(item => item.ThreadId == "thread-c" && item.EmailCount == 2);
+    }
+
+    [Fact]
+    public async Task UpdateMailCopy_ShouldMergeExistingSingles_WhenThreadIdChangesToMatch()
+    {
+        var sut = CreateCollection();
+        var first = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow.AddMinutes(-1));
+        var second = CreateMailCopy(threadId: string.Empty, creationDate: DateTime.UtcNow);
+
+        await sut.AddAsync(first);
+        await sut.AddAsync(second);
+
+        var updatedSecond = CloneMailCopy(second);
+        updatedSecond.ThreadId = "shared-thread";
+
+        await sut.UpdateMailCopy(updatedSecond, MailUpdateSource.Server, MailCopyChangeFlags.ThreadId);
+
+        var items = FlattenItems(sut);
+        var threadItem = items.Should().ContainSingle().Which.Should().BeOfType<ThreadMailItemViewModel>().Subject;
+        threadItem.EmailCount.Should().Be(2);
+        threadItem.GetContainingIds().Should().BeEquivalentTo([first.UniqueId, second.UniqueId]);
+    }
+
+    [Fact]
+    public async Task AddAsync_ShouldThreadWithUpdatedItem_WhenThreadIdWasSetByPriorUpdate()
+    {
+        var sut = CreateCollection();
+        var existing = CreateMailCopy(threadId: string.Empty, creationDate: DateTime.UtcNow.AddMinutes(-1));
+        var incoming = CreateMailCopy(threadId: "shared-thread", creationDate: DateTime.UtcNow);
+
+        await sut.AddAsync(existing);
+
+        var updatedExisting = CloneMailCopy(existing);
+        updatedExisting.ThreadId = "shared-thread";
+
+        await sut.UpdateMailCopy(updatedExisting, MailUpdateSource.Server, MailCopyChangeFlags.ThreadId);
+        await sut.AddAsync(incoming);
+
+        var items = FlattenItems(sut);
+        var threadItem = items.Should().ContainSingle().Which.Should().BeOfType<ThreadMailItemViewModel>().Subject;
+        threadItem.EmailCount.Should().Be(2);
+        threadItem.GetContainingIds().Should().BeEquivalentTo([existing.UniqueId, incoming.UniqueId]);
+    }
+
+    private static WinoMailCollection CreateCollection() => new()
+    {
+        CoreDispatcher = new ImmediateDispatcher()
+    };
+
+    private static List<IMailListItem> FlattenItems(WinoMailCollection collection)
+    {
+        var items = new List<IMailListItem>();
+
+        foreach (var group in collection.MailItems)
+        {
+            foreach (var item in group)
+            {
+                items.Add(item);
+            }
+        }
+
+        return items;
+    }
+
+    private static MailCopy CreateMailCopy(string threadId, DateTime? creationDate = null)
+        => new()
+        {
+            UniqueId = Guid.NewGuid(),
+            ThreadId = threadId,
+            CreationDate = creationDate ?? DateTime.UtcNow,
+            FromName = "Sender",
+            FromAddress = "sender@wino.dev",
+            Subject = "Subject",
+            PreviewText = "Preview",
+            FileId = Guid.NewGuid(),
+            FolderId = Guid.NewGuid()
+        };
+
+    private static MailCopy CloneMailCopy(MailCopy source)
+        => new()
+        {
+            UniqueId = source.UniqueId,
+            Id = source.Id,
+            FolderId = source.FolderId,
+            ThreadId = source.ThreadId,
+            MessageId = source.MessageId,
+            References = source.References,
+            InReplyTo = source.InReplyTo,
+            FromName = source.FromName,
+            FromAddress = source.FromAddress,
+            Subject = source.Subject,
+            PreviewText = source.PreviewText,
+            CreationDate = source.CreationDate,
+            Importance = source.Importance,
+            IsRead = source.IsRead,
+            IsFlagged = source.IsFlagged,
+            IsFocused = source.IsFocused,
+            HasAttachments = source.HasAttachments,
+            ItemType = source.ItemType,
+            DraftId = source.DraftId,
+            IsDraft = source.IsDraft,
+            FileId = source.FileId,
+            SenderContact = source.SenderContact,
+            AssignedAccount = source.AssignedAccount,
+            AssignedFolder = source.AssignedFolder
+        };
+
+    private sealed class ImmediateDispatcher : IDispatcher
+    {
+        public Task ExecuteOnUIThread(Action action)
+        {
+            action();
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Wino.Mail.ViewModels.Tests/Data/MailItemViewModelUpdateTests.cs b/Wino.Mail.ViewModels.Tests/Data/MailItemViewModelUpdateTests.cs
new file mode 100644
index 00000000..a674ba1f
--- /dev/null
+++ b/Wino.Mail.ViewModels.Tests/Data/MailItemViewModelUpdateTests.cs
@@ -0,0 +1,173 @@
+using FluentAssertions;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.ViewModels.Collections;
+using Wino.Mail.ViewModels.Data;
+using Xunit;
+
+namespace Wino.Mail.ViewModels.Tests.Data;
+
+public class MailItemViewModelUpdateTests
+{
+    [Fact]
+    public void UpdateFrom_ShouldNotifyOnlyReadState_WhenSameInstanceAndHintProvided()
+    {
+        var mailCopy = CreateMailCopy("thread-1", DateTime.UtcNow);
+        var sut = new MailItemViewModel(mailCopy);
+        var raisedProperties = new List<string>();
+
+        sut.PropertyChanged += (_, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.PropertyName))
+            {
+                raisedProperties.Add(e.PropertyName);
+            }
+        };
+
+        mailCopy.IsRead = true;
+
+        sut.UpdateFrom(mailCopy, MailCopyChangeFlags.IsRead);
+
+        raisedProperties.Should().Equal(nameof(MailItemViewModel.IsRead));
+    }
+
+    [Fact]
+    public void UpdateFrom_ShouldNotifyAddressAndDependentSenderFields_WhenFromAddressChanges()
+    {
+        var original = CreateMailCopy("thread-1", DateTime.UtcNow);
+        original.FromName = string.Empty;
+        var updated = CloneMailCopy(original);
+        updated.FromAddress = "updated@wino.dev";
+
+        var sut = new MailItemViewModel(original);
+        var raisedProperties = new List<string>();
+
+        sut.PropertyChanged += (_, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.PropertyName))
+            {
+                raisedProperties.Add(e.PropertyName);
+            }
+        };
+
+        sut.UpdateFrom(updated);
+
+        raisedProperties.Should().Equal(
+            nameof(MailItemViewModel.FromAddress),
+            nameof(MailItemViewModel.FromName),
+            nameof(MailItemViewModel.SortingName));
+    }
+
+    [Fact]
+    public async Task UpdateMailCopy_ShouldNotifyThreadOnlyForReadState_WhenReadStateChanges()
+    {
+        var collection = new WinoMailCollection
+        {
+            CoreDispatcher = new ImmediateDispatcher()
+        };
+
+        var older = CreateMailCopy("thread-1", DateTime.UtcNow.AddMinutes(-5));
+        var latest = CreateMailCopy("thread-1", DateTime.UtcNow);
+
+        await collection.AddAsync(older);
+        await collection.AddAsync(latest);
+
+        ThreadMailItemViewModel? threadItem = null;
+        foreach (var group in collection.MailItems)
+        {
+            foreach (var item in group)
+            {
+                if (item is ThreadMailItemViewModel thread)
+                {
+                    threadItem = thread;
+                    break;
+                }
+            }
+
+            if (threadItem != null)
+                break;
+        }
+
+        threadItem.Should().NotBeNull();
+
+        var raisedProperties = new List<string>();
+        threadItem!.PropertyChanged += (_, e) =>
+        {
+            if (!string.IsNullOrEmpty(e.PropertyName))
+            {
+                raisedProperties.Add(e.PropertyName);
+            }
+        };
+
+        latest.IsRead = true;
+
+        await collection.UpdateMailCopy(latest, MailUpdateSource.ClientUpdated, MailCopyChangeFlags.IsRead);
+
+        raisedProperties.Should().Equal(nameof(ThreadMailItemViewModel.IsRead));
+    }
+
+    private static MailCopy CreateMailCopy(string threadId, DateTime creationDate)
+        => new()
+        {
+            UniqueId = Guid.NewGuid(),
+            Id = Guid.NewGuid().ToString("N"),
+            FolderId = Guid.NewGuid(),
+            ThreadId = threadId,
+            MessageId = $"message-{Guid.NewGuid():N}",
+            References = string.Empty,
+            InReplyTo = string.Empty,
+            FromName = "Sender",
+            FromAddress = "sender@wino.dev",
+            Subject = "Subject",
+            PreviewText = "Preview",
+            CreationDate = creationDate,
+            Importance = MailImportance.Normal,
+            IsRead = false,
+            IsFlagged = false,
+            IsFocused = false,
+            HasAttachments = false,
+            ItemType = MailItemType.Mail,
+            DraftId = string.Empty,
+            IsDraft = false,
+            FileId = Guid.NewGuid()
+        };
+
+    private static MailCopy CloneMailCopy(MailCopy source)
+        => new()
+        {
+            UniqueId = source.UniqueId,
+            Id = source.Id,
+            FolderId = source.FolderId,
+            ThreadId = source.ThreadId,
+            MessageId = source.MessageId,
+            References = source.References,
+            InReplyTo = source.InReplyTo,
+            FromName = source.FromName,
+            FromAddress = source.FromAddress,
+            Subject = source.Subject,
+            PreviewText = source.PreviewText,
+            CreationDate = source.CreationDate,
+            Importance = source.Importance,
+            IsRead = source.IsRead,
+            IsFlagged = source.IsFlagged,
+            IsFocused = source.IsFocused,
+            HasAttachments = source.HasAttachments,
+            ItemType = source.ItemType,
+            DraftId = source.DraftId,
+            IsDraft = source.IsDraft,
+            FileId = source.FileId,
+            SenderContact = source.SenderContact,
+            AssignedAccount = source.AssignedAccount,
+            AssignedFolder = source.AssignedFolder
+        };
+
+    private sealed class ImmediateDispatcher : IDispatcher
+    {
+        public Task ExecuteOnUIThread(Action action)
+        {
+            action();
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Wino.Mail.ViewModels.Tests/GlobalUsings.cs b/Wino.Mail.ViewModels.Tests/GlobalUsings.cs
new file mode 100644
index 00000000..29ee885e
--- /dev/null
+++ b/Wino.Mail.ViewModels.Tests/GlobalUsings.cs
@@ -0,0 +1,4 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.Threading.Tasks;
diff --git a/Wino.Mail.ViewModels.Tests/Wino.Mail.ViewModels.Tests.csproj b/Wino.Mail.ViewModels.Tests/Wino.Mail.ViewModels.Tests.csproj
new file mode 100644
index 00000000..b93bd23a
--- /dev/null
+++ b/Wino.Mail.ViewModels.Tests/Wino.Mail.ViewModels.Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <IsAotCompatible>false</IsAotCompatible>
+    <IsTrimmable>false</IsTrimmable>
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+    <EnableAotAnalyzer>false</EnableAotAnalyzer>
+    <EnableSingleFileAnalyzer>false</EnableSingleFileAnalyzer>
+    <Platforms>x86;x64;arm64</Platforms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Wino.Mail.ViewModels\Wino.Mail.ViewModels.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
index 494d8813..b6d2d8f2 100644
--- a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
@@ -1,18 +1,26 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Misc;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Services;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Calendar;
 using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.Server;
 
 namespace Wino.Mail.ViewModels;
 
@@ -20,13 +28,55 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
 {
     private readonly IMailDialogService _dialogService;
     private readonly IAccountService _accountService;
-    private readonly IWinoServerConnectionManager _serverConnectionManager;
     private readonly IFolderService _folderService;
+    private readonly ICalendarService _calendarService;
+    private readonly IStatePersistanceService _statePersistanceService;
+    private readonly INewThemeService _themeService;
+    private readonly IImapTestService _imapTestService;
     private bool isLoaded = false;
 
-    public MailAccount Account { get; set; }
+    [ObservableProperty]
+    public partial MailAccount Account { get; set; }
     public ObservableCollection<IMailItemFolder> CurrentFolders { get; set; } = [];
+    public ObservableCollection<AccountCalendar> AccountCalendars { get; set; } = [];
+    public ObservableCollection<AccountCalendarSettingsItemViewModel> AccountCalendarSettingsItems { get; } = [];
+    public ObservableCollection<AccountCalendarShowAsOption> ShowAsOptions { get; } = [];
 
+    [ObservableProperty]
+    public partial AccountCalendar SelectedPrimaryCalendar { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedTabIndex { get; set; } = 0; // Default to Mail tab
+
+    [ObservableProperty]
+    public partial string AccountName { get; set; }
+
+    [ObservableProperty]
+    public partial string SenderName { get; set; }
+
+    [ObservableProperty]
+    public partial AppColorViewModel SelectedColor { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsImapServer))]
+    public partial CustomServerInformation ServerInformation { get; set; }
+
+    [ObservableProperty]
+    public partial List<AppColorViewModel> AvailableColors { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedIncomingServerConnectionSecurityIndex { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedIncomingServerAuthenticationMethodIndex { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedOutgoingServerConnectionSecurityIndex { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedOutgoingServerAuthenticationMethodIndex { get; set; }
+
+    // Mail-related properties
     [ObservableProperty]
     private bool isFocusedInboxEnabled;
 
@@ -46,17 +96,56 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
     private bool isTaskbarBadgeEnabled;
 
     public bool IsFocusedInboxSupportedForAccount => Account != null && Account.Preferences.IsFocusedInboxEnabled != null;
+    public bool IsImapServer => ServerInformation != null;
+    public string ProviderIconPath => Account?.SpecialImapProvider != SpecialImapProvider.None
+        ? $"ms-appx:///Assets/Providers/{Account.SpecialImapProvider}.png"
+        : $"ms-appx:///Assets/Providers/{Account?.ProviderType}.png";
+    public string Address => Account?.Address ?? string.Empty;
+
+    public List<ImapAuthenticationMethodModel> AvailableAuthenticationMethods { get; } =
+    [
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Auto, Translator.ImapAuthenticationMethod_Auto),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.None, Translator.ImapAuthenticationMethod_None),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.NormalPassword, Translator.ImapAuthenticationMethod_Plain),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.EncryptedPassword, Translator.ImapAuthenticationMethod_EncryptedPassword),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Ntlm, Translator.ImapAuthenticationMethod_Ntlm),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.CramMd5, Translator.ImapAuthenticationMethod_CramMD5),
+        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.DigestMd5, Translator.ImapAuthenticationMethod_DigestMD5)
+    ];
+
+    public List<ImapConnectionSecurityModel> AvailableConnectionSecurities { get; set; } =
+    [
+        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.Auto, Translator.ImapConnectionSecurity_Auto),
+        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.SslTls, Translator.ImapConnectionSecurity_SslTls),
+        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.StartTls, Translator.ImapConnectionSecurity_StartTls),
+        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.None, Translator.ImapConnectionSecurity_None)
+    ];
 
 
     public AccountDetailsPageViewModel(IMailDialogService dialogService,
         IAccountService accountService,
-        IWinoServerConnectionManager serverConnectionManager,
-        IFolderService folderService)
+        IFolderService folderService,
+        ICalendarService calendarService,
+        IStatePersistanceService statePersistanceService,
+        INewThemeService themeService,
+        IImapTestService imapTestService)
     {
         _dialogService = dialogService;
         _accountService = accountService;
-        _serverConnectionManager = serverConnectionManager;
         _folderService = folderService;
+        _calendarService = calendarService;
+        _statePersistanceService = statePersistanceService;
+        _themeService = themeService;
+        _imapTestService = imapTestService;
+
+        var colorHexList = _themeService.GetAvailableAccountColors();
+        AvailableColors = colorHexList.Select(a => new AppColorViewModel(a)).ToList();
+
+        ShowAsOptions.Add(new AccountCalendarShowAsOption(CalendarItemShowAs.Free, Translator.CalendarShowAs_Free));
+        ShowAsOptions.Add(new AccountCalendarShowAsOption(CalendarItemShowAs.Tentative, Translator.CalendarShowAs_Tentative));
+        ShowAsOptions.Add(new AccountCalendarShowAsOption(CalendarItemShowAs.Busy, Translator.CalendarShowAs_Busy));
+        ShowAsOptions.Add(new AccountCalendarShowAsOption(CalendarItemShowAs.OutOfOffice, Translator.CalendarShowAs_OutOfOffice));
+        ShowAsOptions.Add(new AccountCalendarShowAsOption(CalendarItemShowAs.WorkingElsewhere, Translator.CalendarShowAs_WorkingElsewhere));
     }
 
     [RelayCommand]
@@ -71,44 +160,80 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
     private void EditAliases()
         => Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsManageAliases_Title, WinoPage.AliasManagementPage, Account.Id));
 
-    public Task FolderSyncToggledAsync(IMailItemFolder folderStructure, bool isEnabled)
-        => _folderService.ChangeFolderSynchronizationStateAsync(folderStructure.Id, isEnabled);
-
-    public Task FolderShowUnreadToggled(IMailItemFolder folderStructure, bool isEnabled)
-        => _folderService.ChangeFolderShowUnreadCountStateAsync(folderStructure.Id, isEnabled);
+    [RelayCommand]
+    private void EditImapCalDavSettings()
+        => Messenger.Send(new BreadcrumbNavigationRequested(
+            Translator.ImapCalDavSettingsPage_TitleEdit,
+            WinoPage.ImapCalDavSettingsPage,
+            ImapCalDavSettingsNavigationContext.CreateForEditMode(Account.Id)));
 
     [RelayCommand]
-    private void EditAccountDetails()
-        => Messenger.Send(new BreadcrumbNavigationRequested(Translator.SettingsEditAccountDetails_Title, WinoPage.EditAccountDetailsPage, Account));
+    private async Task SaveChangesAsync()
+    {
+        await UpdateAccountAsync();
+
+        _dialogService.InfoBarMessage(Translator.EditAccountDetailsPage_SaveSuccess_Title, Translator.EditAccountDetailsPage_SaveSuccess_Message, InfoBarMessageType.Success);
+    }
 
     [RelayCommand]
-    private async Task DeleteAccount()
+    private async Task DeleteAccountAsync()
     {
         if (Account == null)
             return;
 
         var confirmation = await _dialogService.ShowConfirmationDialogAsync(Translator.DialogMessage_DeleteAccountConfirmationTitle,
-                                                                           string.Format(Translator.DialogMessage_DeleteAccountConfirmationMessage, Account.Name),
-                                                                           Translator.Buttons_Delete);
+                                                                            string.Format(Translator.DialogMessage_DeleteAccountConfirmationMessage, Account.Name),
+                                                                            Translator.Buttons_Delete);
 
         if (!confirmation)
             return;
 
+        await SynchronizationManager.Instance.DestroySynchronizerAsync(Account.Id);
+        await _accountService.DeleteAccountAsync(Account);
 
-        var isSynchronizerKilledResponse = await _serverConnectionManager.GetResponseAsync<bool, KillAccountSynchronizerRequested>(new KillAccountSynchronizerRequested(Account.Id));
+        _dialogService.InfoBarMessage(Translator.Info_AccountDeletedTitle, string.Format(Translator.Info_AccountDeletedMessage, Account.Name), InfoBarMessageType.Success);
 
-        if (isSynchronizerKilledResponse.IsSuccess)
+        Messenger.Send(new BackBreadcrumNavigationRequested());
+    }
+
+    [RelayCommand]
+    private async Task ValidateImapSettingsAsync()
+    {
+        try
         {
-            await _accountService.DeleteAccountAsync(Account);
-
-            _dialogService.InfoBarMessage(Translator.Info_AccountDeletedTitle, string.Format(Translator.Info_AccountDeletedMessage, Account.Name), InfoBarMessageType.Success);
-
-            Messenger.Send(new BackBreadcrumNavigationRequested());
+            await _imapTestService.TestImapConnectionAsync(ServerInformation, true);
+            _dialogService.InfoBarMessage(Translator.IMAPSetupDialog_ValidationSuccess_Title, Translator.IMAPSetupDialog_ValidationSuccess_Message, InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(Translator.IMAPSetupDialog_ValidationFailed_Title, ex.Message, InfoBarMessageType.Error);
         }
     }
 
+    [RelayCommand]
+    private async Task UpdateCustomServerInformationAsync()
+    {
+        if (ServerInformation != null)
+        {
+            ServerInformation.IncomingAuthenticationMethod = AvailableAuthenticationMethods[SelectedIncomingServerAuthenticationMethodIndex].ImapAuthenticationMethod;
+            ServerInformation.IncomingServerSocketOption = AvailableConnectionSecurities[SelectedIncomingServerConnectionSecurityIndex].ImapConnectionSecurity;
 
+            ServerInformation.OutgoingAuthenticationMethod = AvailableAuthenticationMethods[SelectedOutgoingServerAuthenticationMethodIndex].ImapAuthenticationMethod;
+            ServerInformation.OutgoingServerSocketOption = AvailableConnectionSecurities[SelectedOutgoingServerConnectionSecurityIndex].ImapConnectionSecurity;
 
+            Account.ServerInformation = ServerInformation;
+        }
+
+        await _accountService.UpdateAccountCustomServerInformationAsync(Account.ServerInformation);
+
+        _dialogService.InfoBarMessage(Translator.IMAPSetupDialog_SaveImapSuccess_Title, Translator.IMAPSetupDialog_SaveImapSuccess_Message, InfoBarMessageType.Success);
+    }
+
+    public Task FolderSyncToggledAsync(IMailItemFolder folderStructure, bool isEnabled)
+        => _folderService.ChangeFolderSynchronizationStateAsync(folderStructure.Id, isEnabled);
+
+    public Task FolderShowUnreadToggled(IMailItemFolder folderStructure, bool isEnabled)
+        => _folderService.ChangeFolderShowUnreadCountStateAsync(folderStructure.Id, isEnabled);
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
@@ -117,6 +242,9 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
         if (parameters is Guid accountId)
         {
             Account = await _accountService.GetAccountAsync(accountId);
+            AccountName = Account.Name;
+            SenderName = Account.SenderName;
+            ServerInformation = Account.ServerInformation;
 
             IsFocusedInboxEnabled = Account.Preferences.IsFocusedInboxEnabled.GetValueOrDefault();
             AreNotificationsEnabled = Account.Preferences.IsNotificationsEnabled;
@@ -126,7 +254,24 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
             IsAppendMessageSettinEnabled = Account.Preferences.ShouldAppendMessagesToSentFolder;
             IsTaskbarBadgeEnabled = Account.Preferences.IsTaskbarBadgeEnabled;
 
-            OnPropertyChanged(nameof(IsFocusedInboxSupportedForAccount));
+            if (!string.IsNullOrEmpty(Account.AccountColorHex))
+            {
+                SelectedColor = AvailableColors.FirstOrDefault(a => a.Hex == Account.AccountColorHex);
+            }
+            else
+            {
+                SelectedColor = null;
+            }
+
+            if (ServerInformation != null)
+            {
+                SelectedIncomingServerAuthenticationMethodIndex = AvailableAuthenticationMethods.FindIndex(a => a.ImapAuthenticationMethod == ServerInformation.IncomingAuthenticationMethod);
+                SelectedIncomingServerConnectionSecurityIndex = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == ServerInformation.IncomingServerSocketOption);
+                SelectedOutgoingServerAuthenticationMethodIndex = AvailableAuthenticationMethods.FindIndex(a => a.ImapAuthenticationMethod == ServerInformation.OutgoingAuthenticationMethod);
+                SelectedOutgoingServerConnectionSecurityIndex = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == ServerInformation.OutgoingServerSocketOption);
+            }
+
+            SelectedTabIndex = _statePersistanceService.ApplicationMode == WinoApplicationMode.Calendar ? 2 : 1;
 
             var folderStructures = (await _folderService.GetFolderStructureForAccountAsync(Account.Id, true)).Folders;
 
@@ -135,10 +280,90 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
                 CurrentFolders.Add(folder);
             }
 
+            // Load calendar list
+            await LoadAccountCalendarsAsync();
+
             isLoaded = true;
         }
     }
 
+    private Task UpdateAccountAsync()
+    {
+        Account.Name = AccountName;
+        Account.SenderName = SenderName;
+        Account.AccountColorHex = SelectedColor?.Hex ?? string.Empty;
+
+        return _accountService.UpdateAccountAsync(Account);
+    }
+
+    private async Task LoadAccountCalendarsAsync()
+    {
+        var calendars = await _calendarService.GetAccountCalendarsAsync(Account.Id);
+
+        await ExecuteUIThread(() =>
+        {
+            AccountCalendars.Clear();
+            AccountCalendarSettingsItems.Clear();
+
+            foreach (var calendar in calendars)
+            {
+                AccountCalendars.Add(calendar);
+                AccountCalendarSettingsItems.Add(new AccountCalendarSettingsItemViewModel(calendar, ShowAsOptions, AvailableColors));
+            }
+        });
+
+        SelectedPrimaryCalendar = AccountCalendars.FirstOrDefault(calendar => calendar.IsPrimary) ?? AccountCalendars.FirstOrDefault();
+    }
+
+    public AccountCalendarShowAsOption GetShowAsOption(CalendarItemShowAs showAs)
+        => ShowAsOptions.FirstOrDefault(option => option.ShowAs == showAs) ?? ShowAsOptions.First();
+
+    public async Task UpdateCalendarSynchronizationAsync(AccountCalendar calendar, bool isEnabled)
+    {
+        if (calendar == null || calendar.IsSynchronizationEnabled == isEnabled)
+            return;
+
+        calendar.IsSynchronizationEnabled = isEnabled;
+        await _calendarService.UpdateAccountCalendarAsync(calendar);
+    }
+
+    public async Task UpdateCalendarDefaultShowAsAsync(AccountCalendar calendar, AccountCalendarShowAsOption option)
+    {
+        if (calendar == null || option == null || calendar.DefaultShowAs == option.ShowAs)
+            return;
+
+        calendar.DefaultShowAs = option.ShowAs;
+        await _calendarService.UpdateAccountCalendarAsync(calendar);
+    }
+
+    public async Task UpdateCalendarColorAsync(AccountCalendarSettingsItemViewModel calendarItem, AppColorViewModel color)
+    {
+        if (calendarItem?.Calendar == null || color == null || calendarItem.Calendar.BackgroundColorHex == color.Hex)
+            return;
+
+        calendarItem.SetBackgroundColor(color);
+        await _calendarService.UpdateAccountCalendarAsync(calendarItem.Calendar);
+    }
+
+    [RelayCommand]
+    private void ResetColor()
+        => SelectedColor = null;
+
+    partial void OnSelectedColorChanged(AppColorViewModel oldValue, AppColorViewModel newValue)
+    {
+        if (Account != null)
+        {
+            _ = UpdateAccountAsync();
+        }
+    }
+
+    partial void OnAccountChanged(MailAccount value)
+    {
+        OnPropertyChanged(nameof(IsFocusedInboxSupportedForAccount));
+        OnPropertyChanged(nameof(ProviderIconPath));
+        OnPropertyChanged(nameof(Address));
+    }
+
     protected override async void OnPropertyChanged(PropertyChangedEventArgs e)
     {
         base.OnPropertyChanged(e);
@@ -167,6 +392,64 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
                 Account.Preferences.IsTaskbarBadgeEnabled = IsTaskbarBadgeEnabled;
                 await _accountService.UpdateAccountAsync(Account);
                 break;
+            case nameof(SelectedPrimaryCalendar) when SelectedPrimaryCalendar != null:
+                foreach (var calendar in AccountCalendars)
+                {
+                    calendar.IsPrimary = calendar.Id == SelectedPrimaryCalendar.Id;
+                }
+
+                await _calendarService.SetPrimaryCalendarAsync(Account.Id, SelectedPrimaryCalendar.Id);
+                break;
         }
     }
 }
+
+public sealed class AccountCalendarShowAsOption
+{
+    public CalendarItemShowAs ShowAs { get; }
+    public string DisplayText { get; }
+
+    public AccountCalendarShowAsOption(CalendarItemShowAs showAs, string displayText)
+    {
+        ShowAs = showAs;
+        DisplayText = displayText;
+    }
+}
+
+public partial class AccountCalendarSettingsItemViewModel : ObservableObject
+{
+    public AccountCalendar Calendar { get; }
+    public ObservableCollection<AccountCalendarShowAsOption> ShowAsOptions { get; }
+    public List<AppColorViewModel> AvailableColors { get; }
+
+    public string Name => Calendar.Name;
+    public string TimeZone => Calendar.TimeZone;
+    public string BackgroundColorHex => Calendar.BackgroundColorHex;
+
+    [ObservableProperty]
+    public partial bool IsSynchronizationEnabled { get; set; }
+
+    [ObservableProperty]
+    public partial AccountCalendarShowAsOption SelectedShowAsOption { get; set; }
+
+    [ObservableProperty]
+    public partial AppColorViewModel SelectedColor { get; set; }
+
+    public AccountCalendarSettingsItemViewModel(AccountCalendar calendar, ObservableCollection<AccountCalendarShowAsOption> showAsOptions, List<AppColorViewModel> availableColors)
+    {
+        Calendar = calendar;
+        ShowAsOptions = showAsOptions;
+        AvailableColors = availableColors;
+        IsSynchronizationEnabled = calendar.IsSynchronizationEnabled;
+        SelectedShowAsOption = showAsOptions.FirstOrDefault(option => option.ShowAs == calendar.DefaultShowAs) ?? showAsOptions.FirstOrDefault();
+        SelectedColor = availableColors.FirstOrDefault(color => string.Equals(color.Hex, calendar.BackgroundColorHex, StringComparison.OrdinalIgnoreCase))
+            ?? new AppColorViewModel(calendar.BackgroundColorHex ?? ColorHelpers.GenerateFlatColorHex());
+    }
+
+    public void SetBackgroundColor(AppColorViewModel color)
+    {
+        SelectedColor = color;
+        Calendar.BackgroundColorHex = color.Hex;
+        OnPropertyChanged(nameof(BackgroundColorHex));
+    }
+}
diff --git a/Wino.Mail.ViewModels/AccountManagementViewModel.cs b/Wino.Mail.ViewModels/AccountManagementViewModel.cs
index a225d76d..2c531298 100644
--- a/Wino.Mail.ViewModels/AccountManagementViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountManagementViewModel.cs
@@ -12,43 +12,42 @@ using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Authentication;
-using Wino.Core.Domain.Models.Connectivity;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Services;
 using Wino.Core.ViewModels;
 using Wino.Core.ViewModels.Data;
 using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.Server;
 using Wino.Messaging.UI;
 
 namespace Wino.Mail.ViewModels;
 
 public partial class AccountManagementViewModel : AccountManagementPageViewModelBase
 {
-    private readonly ISpecialImapProviderConfigResolver _specialImapProviderConfigResolver;
-    private readonly IImapTestService _imapTestService;
     private readonly IWinoLogger _winoLogger;
+    private readonly ISpecialImapProviderConfigResolver _specialImapProviderConfigResolver;
+    private readonly ICalDavClient _calDavClient;
 
     public IMailDialogService MailDialogService { get; }
 
     public AccountManagementViewModel(IMailDialogService dialogService,
-                                      IWinoServerConnectionManager winoServerConnectionManager,
                                       INavigationService navigationService,
                                       IAccountService accountService,
-                                      ISpecialImapProviderConfigResolver specialImapProviderConfigResolver,
                                       IProviderService providerService,
-                                      IImapTestService imapTestService,
                                       IStoreManagementService storeManagementService,
+                                      IWinoAccountProfileService winoAccountProfileService,
                                       IWinoLogger winoLogger,
+                                      ISpecialImapProviderConfigResolver specialImapProviderConfigResolver,
+                                      ICalDavClient calDavClient,
                                       IAuthenticationProvider authenticationProvider,
-                                      IPreferencesService preferencesService) : base(dialogService, winoServerConnectionManager, navigationService, accountService, providerService, storeManagementService, authenticationProvider, preferencesService)
+                                      IPreferencesService preferencesService) : base(dialogService, navigationService, accountService, providerService, storeManagementService, winoAccountProfileService, authenticationProvider, preferencesService)
     {
         MailDialogService = dialogService;
-        _specialImapProviderConfigResolver = specialImapProviderConfigResolver;
-        _imapTestService = imapTestService;
         _winoLogger = winoLogger;
+        _specialImapProviderConfigResolver = specialImapProviderConfigResolver;
+        _calDavClient = calDavClient;
     }
 
     [RelayCommand]
@@ -88,246 +87,114 @@ public partial class AccountManagementViewModel : AccountManagementPageViewModel
             return;
         }
 
-        MailAccount createdAccount = null;
-        IAccountCreationDialog creationDialog = null;
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.WelcomeWizard_Step2Title, WinoPage.ProviderSelectionPage));
+    }
 
-        try
+    public Task StartAddNewAccountAsync() => AddNewAccountAsync();
+
+    private async Task ValidateSpecialImapConnectivityAsync(CustomServerInformation serverInformation)
+    {
+        var connectivityResult = await SynchronizationManager.Instance
+            .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: false)
+            .ConfigureAwait(false);
+
+        if (connectivityResult.IsCertificateUIRequired)
         {
-            var providers = ProviderService.GetAvailableProviders();
+            var certificateMessage =
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row0}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateIssuer}: {connectivityResult.CertificateIssuer}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidFrom}: {connectivityResult.CertificateValidFromDateString}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidTo}: {connectivityResult.CertificateExpirationDateString}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row1}";
 
-            // Select provider.
-            var accountCreationDialogResult = await MailDialogService.ShowAccountProviderSelectionDialogAsync(providers);
+            var allowCertificate = await ExecuteUIThreadTaskAsync(
+                () => MailDialogService.ShowConfirmationDialogAsync(certificateMessage, Translator.GeneralTitle_Warning, Translator.Buttons_Allow))
+                .ConfigureAwait(false);
 
-            var accountCreationCancellationTokenSource = new CancellationTokenSource();
+            if (!allowCertificate)
+                throw new InvalidOperationException(Translator.IMAPSetupDialog_CertificateDenied);
 
-            if (accountCreationDialogResult != null)
+            connectivityResult = await SynchronizationManager.Instance
+                .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: true)
+                .ConfigureAwait(false);
+        }
+
+        if (!connectivityResult.IsSuccess)
+            throw new InvalidOperationException(connectivityResult.FailedReason ?? Translator.IMAPSetupDialog_ConnectionFailedMessage);
+
+        if (serverInformation.CalendarSupportMode != ImapCalendarSupportMode.CalDav)
+            return;
+
+        if (string.IsNullOrWhiteSpace(serverInformation.CalDavServiceUrl))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavUrlRequired);
+
+        var settings = new CalDavConnectionSettings
+        {
+            ServiceUri = new Uri(serverInformation.CalDavServiceUrl, UriKind.Absolute),
+            Username = serverInformation.CalDavUsername,
+            Password = serverInformation.CalDavPassword
+        };
+
+        await _calDavClient.DiscoverCalendarsAsync(settings).ConfigureAwait(false);
+    }
+
+    private async Task ExecuteUIThreadTaskAsync(Func<Task> action)
+    {
+        if (Dispatcher == null)
+        {
+            await action().ConfigureAwait(false);
+            return;
+        }
+
+        var completionSource = new TaskCompletionSource<object>();
+
+        await ExecuteUIThread(() =>
+        {
+            _ = ExecuteAndCaptureAsync();
+
+            async Task ExecuteAndCaptureAsync()
             {
-                creationDialog = MailDialogService.GetAccountCreationDialog(accountCreationDialogResult);
-
-                CustomServerInformation customServerInformation = null;
-
-                createdAccount = new MailAccount()
+                try
                 {
-                    ProviderType = accountCreationDialogResult.ProviderType,
-                    Name = accountCreationDialogResult.AccountName,
-                    SpecialImapProvider = accountCreationDialogResult.SpecialImapProviderDetails?.SpecialImapProvider ?? SpecialImapProvider.None,
-                    Id = Guid.NewGuid(),
-                    AccountColorHex = accountCreationDialogResult.AccountColorHex
-                };
-
-                await creationDialog.ShowDialogAsync(accountCreationCancellationTokenSource);
-                await Task.Delay(500);
-
-                creationDialog.State = AccountCreationDialogState.SigningIn;
-
-                string tokenInformation = string.Empty;
-
-                // Custom server implementation requires more async waiting.
-                if (creationDialog is IImapAccountCreationDialog customServerDialog)
-                {
-                    // Pass along the account properties and perform initial navigation on the imap frame.
-                    customServerDialog.StartImapConnectionSetup(createdAccount);
-
-                    customServerInformation = await customServerDialog.GetCustomServerInformationAsync()
-                        ?? throw new AccountSetupCanceledException();
-
-                    // At this point connection is successful.
-                    // Save the server setup information and later on we'll fetch folders.
-
-                    customServerInformation.AccountId = createdAccount.Id;
-
-                    createdAccount.Address = customServerInformation.Address;
-                    createdAccount.ServerInformation = customServerInformation;
-                    createdAccount.SenderName = customServerInformation.DisplayName;
+                    await action().ConfigureAwait(false);
+                    completionSource.TrySetResult(null);
                 }
-                else
+                catch (Exception ex)
                 {
-                    // Hanle special imap providers like iCloud and Yahoo.
-                    if (accountCreationDialogResult.SpecialImapProviderDetails != null)
-                    {
-                        // Special imap provider testing dialog. This is only available for iCloud and Yahoo.
-                        customServerInformation = _specialImapProviderConfigResolver.GetServerInformation(createdAccount, accountCreationDialogResult);
-                        customServerInformation.Id = Guid.NewGuid();
-                        customServerInformation.AccountId = createdAccount.Id;
-
-                        createdAccount.SenderName = accountCreationDialogResult.SpecialImapProviderDetails.SenderName;
-                        createdAccount.Address = customServerInformation.Address;
-
-                        // Let server validate the imap/smtp connection.
-                        var testResultResponse = await WinoServerConnectionManager.GetResponseAsync<ImapConnectivityTestResults, ImapConnectivityTestRequested>(new ImapConnectivityTestRequested(customServerInformation, true));
-
-                        if (!testResultResponse.IsSuccess)
-                        {
-                            throw new Exception($"{Translator.IMAPSetupDialog_ConnectionFailedTitle}\n{testResultResponse.Message}");
-                        }
-                        else if (!testResultResponse.Data.IsSuccess)
-                        {
-                            // Server connectivity might succeed, but result might be failed.
-                            throw new ImapClientPoolException(testResultResponse.Data.FailedReason, customServerInformation, testResultResponse.Data.FailureProtocolLog);
-                        }
-                    }
-                    else
-                    {
-                        // OAuth authentication is handled here.
-                        // Server authenticates, returns the token info here.
-
-                        var tokenInformationResponse = await WinoServerConnectionManager
-                            .GetResponseAsync<TokenInformationEx, AuthorizationRequested>(new AuthorizationRequested(accountCreationDialogResult.ProviderType,
-                                                                                                                   createdAccount,
-                                                                                                                   createdAccount.ProviderType == MailProviderType.Gmail), accountCreationCancellationTokenSource.Token);
-
-                        if (creationDialog.State == AccountCreationDialogState.Canceled)
-                            throw new AccountSetupCanceledException();
-
-                        if (!tokenInformationResponse.IsSuccess)
-                            throw new Exception(tokenInformationResponse.Message);
-
-                        createdAccount.Address = tokenInformationResponse.Data.AccountAddress;
-
-                        tokenInformationResponse.ThrowIfFailed();
-                    }
+                    completionSource.TrySetException(ex);
                 }
-
-                // Address is still doesn't have a value for API synchronizers.
-                // It'll be synchronized with profile information.
-
-                await AccountService.CreateAccountAsync(createdAccount, customServerInformation);
-
-                // Local account has been created.
-
-                // Sync profile information if supported.
-                if (createdAccount.IsProfileInfoSyncSupported)
-                {
-                    // Start profile information synchronization.
-                    // It's only available for Outlook and Gmail synchronizers.
-
-                    var profileSyncOptions = new MailSynchronizationOptions()
-                    {
-                        AccountId = createdAccount.Id,
-                        Type = MailSynchronizationType.UpdateProfile
-                    };
-
-                    var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client));
-
-                    var profileSynchronizationResult = profileSynchronizationResponse.Data;
-
-                    if (profileSynchronizationResult.CompletedState != SynchronizationCompletedState.Success)
-                        throw new Exception(Translator.Exception_FailedToSynchronizeProfileInformation);
-
-                    createdAccount.SenderName = profileSynchronizationResult.ProfileInformation.SenderName;
-                    createdAccount.Base64ProfilePictureData = profileSynchronizationResult.ProfileInformation.Base64ProfilePictureData;
-
-                    if (!string.IsNullOrEmpty(profileSynchronizationResult.ProfileInformation.AccountAddress))
-                    {
-                        createdAccount.Address = profileSynchronizationResult.ProfileInformation.AccountAddress;
-                    }
-
-                    await AccountService.UpdateProfileInformationAsync(createdAccount.Id, profileSynchronizationResult.ProfileInformation);
-                }
-
-                if (creationDialog is IImapAccountCreationDialog customServerAccountCreationDialog)
-                    customServerAccountCreationDialog.ShowPreparingFolders();
-                else
-                    creationDialog.State = AccountCreationDialogState.PreparingFolders;
-
-                // Start synchronizing folders.
-                var folderSyncOptions = new MailSynchronizationOptions()
-                {
-                    AccountId = createdAccount.Id,
-                    Type = MailSynchronizationType.FoldersOnly
-                };
-
-                var folderSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(folderSyncOptions, SynchronizationSource.Client));
-
-                var folderSynchronizationResult = folderSynchronizationResponse.Data;
-
-                if (folderSynchronizationResult == null || folderSynchronizationResult.CompletedState != SynchronizationCompletedState.Success)
-                    throw new Exception($"{Translator.Exception_FailedToSynchronizeFolders}\n{folderSynchronizationResponse.Message}");
-
-                // Sync aliases if supported.
-                if (createdAccount.IsAliasSyncSupported)
-                {
-                    // Try to synchronize aliases for the account.
-
-                    var aliasSyncOptions = new MailSynchronizationOptions()
-                    {
-                        AccountId = createdAccount.Id,
-                        Type = MailSynchronizationType.Alias
-                    };
-
-                    var aliasSyncResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client));
-                    var aliasSynchronizationResult = folderSynchronizationResponse.Data;
-
-                    if (aliasSynchronizationResult.CompletedState != SynchronizationCompletedState.Success)
-                        throw new Exception(Translator.Exception_FailedToSynchronizeAliases);
-                }
-                else
-                {
-                    // Create root primary alias for the account.
-                    // This is only available for accounts that do not support alias synchronization.
-
-                    await AccountService.CreateRootAliasAsync(createdAccount.Id, createdAccount.Address);
-                }
-
-                // Send changes to listeners.
-                ReportUIChange(new AccountCreatedMessage(createdAccount));
-
-                // Notify success.
-                DialogService.InfoBarMessage(Translator.Info_AccountCreatedTitle, string.Format(Translator.Info_AccountCreatedMessage, createdAccount.Address), InfoBarMessageType.Success);
             }
-        }
-        catch (Exception ex) when (ex.Message.Contains(nameof(GmailServiceDisabledException)))
+        });
+
+        await completionSource.Task.ConfigureAwait(false);
+    }
+
+    private async Task<T> ExecuteUIThreadTaskAsync<T>(Func<Task<T>> action)
+    {
+        if (Dispatcher == null)
+            return await action().ConfigureAwait(false);
+
+        var completionSource = new TaskCompletionSource<T>();
+
+        await ExecuteUIThread(() =>
         {
-            // For Google Workspace accounts, Gmail API might be disabled by the admin.
-            // Wino can't continue synchronization in this case.
-            // We must notify the user about this and prevent account creation.
+            _ = ExecuteAndCaptureAsync();
 
-            DialogService.InfoBarMessage(Translator.GmailServiceDisabled_Title, Translator.GmailServiceDisabled_Message, InfoBarMessageType.Error);
-
-            if (createdAccount != null)
+            async Task ExecuteAndCaptureAsync()
             {
-                await AccountService.DeleteAccountAsync(createdAccount);
+                try
+                {
+                    var result = await action().ConfigureAwait(false);
+                    completionSource.TrySetResult(result);
+                }
+                catch (Exception ex)
+                {
+                    completionSource.TrySetException(ex);
+                }
             }
-        }
-        catch (AccountSetupCanceledException)
-        {
-            // Ignore
-        }
-        catch (Exception ex) when (ex.Message.Contains(nameof(AccountSetupCanceledException)))
-        {
-            // Ignore
-        }
-        catch (ImapClientPoolException testClientPoolException) when (testClientPoolException.CustomServerInformation != null)
-        {
-            var properties = testClientPoolException.CustomServerInformation.GetConnectionProperties();
+        });
 
-            properties.Add("ProtocolLog", testClientPoolException.ProtocolLog);
-            properties.Add("DiagnosticId", PreferencesService.DiagnosticId);
-
-            _winoLogger.TrackEvent("IMAP Test Failed", properties);
-
-            DialogService.InfoBarMessage(Translator.Info_AccountCreationFailedTitle, testClientPoolException.Message, InfoBarMessageType.Error);
-        }
-        catch (ImapClientPoolException clientPoolException) when (clientPoolException.InnerException != null)
-        {
-            DialogService.InfoBarMessage(Translator.Info_AccountCreationFailedTitle, clientPoolException.InnerException.Message, InfoBarMessageType.Error);
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to create account.");
-
-            DialogService.InfoBarMessage(Translator.Info_AccountCreationFailedTitle, ex.Message, InfoBarMessageType.Error);
-
-            // Delete account in case of failure.
-            if (createdAccount != null)
-            {
-                await AccountService.DeleteAccountAsync(createdAccount);
-            }
-        }
-        finally
-        {
-            creationDialog?.Complete(false);
-        }
+        return await completionSource.Task.ConfigureAwait(false);
     }
 
     [RelayCommand]
diff --git a/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs b/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
new file mode 100644
index 00000000..85423bab
--- /dev/null
+++ b/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
@@ -0,0 +1,477 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Services;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.UI;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class AccountSetupProgressPageViewModel : MailBaseViewModel
+{
+    private readonly IAccountService _accountService;
+    private readonly ISpecialImapProviderConfigResolver _specialImapProviderConfigResolver;
+    private readonly ICalDavClient _calDavClient;
+    private readonly IMailDialogService _dialogService;
+
+    public WelcomeWizardContext WizardContext { get; }
+
+    public ObservableCollection<AccountSetupStepModel> Steps { get; } = [];
+
+    [ObservableProperty]
+    public partial bool IsSetupComplete { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsSetupFailed { get; set; }
+
+    [ObservableProperty]
+    public partial string FailureMessage { get; set; }
+
+    private MailAccount _createdAccount;
+    private bool _dbWritten;
+
+    public AccountSetupProgressPageViewModel(
+        IAccountService accountService,
+        ISpecialImapProviderConfigResolver specialImapProviderConfigResolver,
+        ICalDavClient calDavClient,
+        IMailDialogService dialogService,
+        WelcomeWizardContext wizardContext)
+    {
+        _accountService = accountService;
+        _specialImapProviderConfigResolver = specialImapProviderConfigResolver;
+        _calDavClient = calDavClient;
+        _dialogService = dialogService;
+        WizardContext = wizardContext;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        // Only run on fresh navigation, not on back-navigation
+        if (mode == NavigationMode.Back) return;
+
+        await RunSetupAsync();
+    }
+
+    private void BuildSteps()
+    {
+        Steps.Clear();
+
+        if (WizardContext.IsOAuthProvider)
+        {
+            Steps.Add(new AccountSetupStepModel
+            {
+                Title = string.Format(Translator.AccountSetup_Step_Authenticating, WizardContext.SelectedProvider.Name)
+            });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_FetchingProfile });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SavingAccount });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SyncingFolders });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_FetchingCalendarMetadata });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SyncingAliases });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_Finalizing });
+        }
+        else if (WizardContext.IsSpecialImapProvider)
+        {
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_TestingMailAuth });
+
+            if (WizardContext.CalendarSupportMode == ImapCalendarSupportMode.CalDav)
+            {
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_DiscoveringCalDav });
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_TestingCalendarAuth });
+            }
+
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SavingAccount });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SyncingFolders });
+
+            if (WizardContext.CalendarSupportMode != ImapCalendarSupportMode.Disabled)
+            {
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_FetchingCalendarMetadata });
+            }
+
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_Finalizing });
+        }
+        else // Generic IMAP
+        {
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SavingAccount });
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_SyncingFolders });
+
+            var setupResult = WizardContext.ImapCalDavSetupResult;
+            if (setupResult?.IsCalendarAccessGranted == true &&
+                setupResult.ServerInformation?.CalendarSupportMode == ImapCalendarSupportMode.CalDav)
+            {
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_DiscoveringCalDav });
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_TestingCalendarAuth });
+            }
+
+            if (setupResult?.IsCalendarAccessGranted == true)
+            {
+                Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_FetchingCalendarMetadata });
+            }
+
+            Steps.Add(new AccountSetupStepModel { Title = Translator.AccountSetup_Step_Finalizing });
+        }
+    }
+
+    private int _currentStepIndex;
+
+    private void SetStepInProgress(string title)
+    {
+        for (int i = 0; i < Steps.Count; i++)
+        {
+            if (Steps[i].Title == title)
+            {
+                _currentStepIndex = i;
+                Steps[i].Status = AccountSetupStepStatus.InProgress;
+                return;
+            }
+        }
+    }
+
+    private void SetCurrentStepSucceeded()
+    {
+        if (_currentStepIndex < Steps.Count)
+            Steps[_currentStepIndex].Status = AccountSetupStepStatus.Succeeded;
+    }
+
+    private void SetCurrentStepFailed(string errorMessage)
+    {
+        if (_currentStepIndex < Steps.Count)
+        {
+            Steps[_currentStepIndex].Status = AccountSetupStepStatus.Failed;
+            Steps[_currentStepIndex].ErrorMessage = errorMessage;
+        }
+    }
+
+    private async Task RunSetupAsync()
+    {
+        IsSetupComplete = false;
+        IsSetupFailed = false;
+        FailureMessage = null;
+        _dbWritten = false;
+        _createdAccount = null;
+
+        BuildSteps();
+
+        try
+        {
+            CustomServerInformation customServerInformation = null;
+
+            // Build account in memory
+            _createdAccount = new MailAccount
+            {
+                Id = Guid.NewGuid(),
+                ProviderType = WizardContext.SelectedProvider.Type,
+                Name = WizardContext.AccountName,
+                SpecialImapProvider = WizardContext.SelectedProvider.SpecialImapProvider,
+                AccountColorHex = WizardContext.AccountColorHex,
+                IsCalendarAccessGranted = true
+            };
+
+            if (WizardContext.IsOAuthProvider)
+            {
+                // Step: Authenticating
+                SetStepInProgress(string.Format(Translator.AccountSetup_Step_Authenticating, WizardContext.SelectedProvider.Name));
+
+                var authTokenInfo = await SynchronizationManager.Instance.HandleAuthorizationAsync(
+                    WizardContext.SelectedProvider.Type,
+                    _createdAccount,
+                    _createdAccount.ProviderType == MailProviderType.Gmail);
+
+                _createdAccount.Address = authTokenInfo.AccountAddress;
+                SetCurrentStepSucceeded();
+
+                // Step: Save to DB
+                SetStepInProgress(Translator.AccountSetup_Step_SavingAccount);
+                await _accountService.CreateAccountAsync(_createdAccount, null);
+                _dbWritten = true;
+                SetCurrentStepSucceeded();
+
+                // Step: Profile
+                SetStepInProgress(Translator.AccountSetup_Step_FetchingProfile);
+                var profileResult = await SynchronizationManager.Instance.SynchronizeProfileAsync(_createdAccount.Id);
+                if (profileResult.CompletedState != SynchronizationCompletedState.Success)
+                    throw new Exception(Translator.Exception_FailedToSynchronizeProfileInformation);
+
+                if (profileResult.ProfileInformation != null)
+                {
+                    _createdAccount.SenderName = profileResult.ProfileInformation.SenderName;
+                    _createdAccount.Base64ProfilePictureData = profileResult.ProfileInformation.Base64ProfilePictureData;
+
+                    if (!string.IsNullOrEmpty(profileResult.ProfileInformation.AccountAddress))
+                        _createdAccount.Address = profileResult.ProfileInformation.AccountAddress;
+
+                    await _accountService.UpdateProfileInformationAsync(_createdAccount.Id, profileResult.ProfileInformation);
+                }
+                SetCurrentStepSucceeded();
+
+                // Step: Folders
+                SetStepInProgress(Translator.AccountSetup_Step_SyncingFolders);
+                var folderResult = await SynchronizationManager.Instance.SynchronizeFoldersAsync(_createdAccount.Id);
+                if (folderResult == null || folderResult.CompletedState != SynchronizationCompletedState.Success)
+                    throw new Exception(Translator.Exception_FailedToSynchronizeFolders);
+                SetCurrentStepSucceeded();
+
+                // Step: Calendar metadata
+                SetStepInProgress(Translator.AccountSetup_Step_FetchingCalendarMetadata);
+                if (_createdAccount.IsCalendarAccessGranted)
+                {
+                    var calResult = await SynchronizationManager.Instance.SynchronizeCalendarAsync(new CalendarSynchronizationOptions
+                    {
+                        AccountId = _createdAccount.Id,
+                        Type = CalendarSynchronizationType.CalendarMetadata
+                    });
+                    if (calResult == null || calResult.CompletedState != SynchronizationCompletedState.Success)
+                        throw new Exception(Translator.Exception_FailedToSynchronizeCalendarMetadata);
+                }
+                SetCurrentStepSucceeded();
+
+                // Step: Aliases
+                SetStepInProgress(Translator.AccountSetup_Step_SyncingAliases);
+                if (_createdAccount.IsAliasSyncSupported)
+                {
+                    var aliasResult = await SynchronizationManager.Instance.SynchronizeAliasesAsync(_createdAccount.Id);
+                    if (aliasResult.CompletedState != SynchronizationCompletedState.Success)
+                        throw new Exception(Translator.Exception_FailedToSynchronizeAliases);
+                }
+                else
+                {
+                    await _accountService.CreateRootAliasAsync(_createdAccount.Id, _createdAccount.Address);
+                }
+                SetCurrentStepSucceeded();
+            }
+            else if (WizardContext.IsSpecialImapProvider)
+            {
+                var dialogResult = WizardContext.BuildAccountCreationDialogResult();
+
+                customServerInformation = _specialImapProviderConfigResolver.GetServerInformation(_createdAccount, dialogResult);
+                if (customServerInformation == null) throw new Exception("Failed to resolve server information.");
+
+                customServerInformation.Id = Guid.NewGuid();
+                customServerInformation.AccountId = _createdAccount.Id;
+
+                _createdAccount.Address = WizardContext.EmailAddress;
+                _createdAccount.SenderName = WizardContext.DisplayName;
+                _createdAccount.IsCalendarAccessGranted = customServerInformation.CalendarSupportMode != ImapCalendarSupportMode.Disabled;
+                _createdAccount.ServerInformation = customServerInformation;
+
+                // Step: Test IMAP
+                SetStepInProgress(Translator.AccountSetup_Step_TestingMailAuth);
+                await ValidateImapConnectivityAsync(customServerInformation);
+                SetCurrentStepSucceeded();
+
+                // Step: CalDAV discovery and testing (if applicable)
+                if (customServerInformation.CalendarSupportMode == ImapCalendarSupportMode.CalDav)
+                {
+                    SetStepInProgress(Translator.AccountSetup_Step_DiscoveringCalDav);
+                    SetCurrentStepSucceeded();
+
+                    SetStepInProgress(Translator.AccountSetup_Step_TestingCalendarAuth);
+                    await ValidateCalDavConnectivityAsync(customServerInformation);
+                    SetCurrentStepSucceeded();
+                }
+
+                // Step: Save to DB
+                SetStepInProgress(Translator.AccountSetup_Step_SavingAccount);
+                await _accountService.CreateAccountAsync(_createdAccount, customServerInformation);
+                _dbWritten = true;
+                SetCurrentStepSucceeded();
+
+                // Step: Folders
+                SetStepInProgress(Translator.AccountSetup_Step_SyncingFolders);
+                var folderResult = await SynchronizationManager.Instance.SynchronizeFoldersAsync(_createdAccount.Id);
+                if (folderResult == null || folderResult.CompletedState != SynchronizationCompletedState.Success)
+                    throw new Exception(Translator.Exception_FailedToSynchronizeFolders);
+                SetCurrentStepSucceeded();
+
+                // Step: Calendar metadata (if not disabled)
+                if (_createdAccount.IsCalendarAccessGranted)
+                {
+                    SetStepInProgress(Translator.AccountSetup_Step_FetchingCalendarMetadata);
+                    var calResult = await SynchronizationManager.Instance.SynchronizeCalendarAsync(new CalendarSynchronizationOptions
+                    {
+                        AccountId = _createdAccount.Id,
+                        Type = CalendarSynchronizationType.CalendarMetadata
+                    });
+                    if (calResult == null || calResult.CompletedState != SynchronizationCompletedState.Success)
+                        throw new Exception(Translator.Exception_FailedToSynchronizeCalendarMetadata);
+                    SetCurrentStepSucceeded();
+                }
+
+                // Aliases for IMAP
+                await _accountService.CreateRootAliasAsync(_createdAccount.Id, _createdAccount.Address);
+            }
+            else // Generic IMAP
+            {
+                var setupResult = WizardContext.ImapCalDavSetupResult
+                    ?? throw new Exception("IMAP setup was not completed.");
+
+                customServerInformation = setupResult.ServerInformation
+                    ?? throw new Exception("Server information is missing.");
+
+                customServerInformation.Id = Guid.NewGuid();
+                customServerInformation.AccountId = _createdAccount.Id;
+
+                _createdAccount.Address = setupResult.EmailAddress;
+                _createdAccount.SenderName = setupResult.DisplayName;
+                _createdAccount.IsCalendarAccessGranted = setupResult.IsCalendarAccessGranted;
+                _createdAccount.ServerInformation = customServerInformation;
+
+                // Step: Save to DB
+                SetStepInProgress(Translator.AccountSetup_Step_SavingAccount);
+                await _accountService.CreateAccountAsync(_createdAccount, customServerInformation);
+                _dbWritten = true;
+                SetCurrentStepSucceeded();
+
+                // Step: Folders
+                SetStepInProgress(Translator.AccountSetup_Step_SyncingFolders);
+                var folderResult = await SynchronizationManager.Instance.SynchronizeFoldersAsync(_createdAccount.Id);
+                if (folderResult == null || folderResult.CompletedState != SynchronizationCompletedState.Success)
+                    throw new Exception(Translator.Exception_FailedToSynchronizeFolders);
+                SetCurrentStepSucceeded();
+
+                // Step: CalDAV (if applicable)
+                if (setupResult.IsCalendarAccessGranted &&
+                    customServerInformation.CalendarSupportMode == ImapCalendarSupportMode.CalDav)
+                {
+                    SetStepInProgress(Translator.AccountSetup_Step_DiscoveringCalDav);
+                    SetCurrentStepSucceeded();
+
+                    SetStepInProgress(Translator.AccountSetup_Step_TestingCalendarAuth);
+                    await ValidateCalDavConnectivityAsync(customServerInformation);
+                    SetCurrentStepSucceeded();
+                }
+
+                // Step: Calendar metadata
+                if (setupResult.IsCalendarAccessGranted)
+                {
+                    SetStepInProgress(Translator.AccountSetup_Step_FetchingCalendarMetadata);
+                    var calResult = await SynchronizationManager.Instance.SynchronizeCalendarAsync(new CalendarSynchronizationOptions
+                    {
+                        AccountId = _createdAccount.Id,
+                        Type = CalendarSynchronizationType.CalendarMetadata
+                    });
+                    if (calResult == null || calResult.CompletedState != SynchronizationCompletedState.Success)
+                        throw new Exception(Translator.Exception_FailedToSynchronizeCalendarMetadata);
+                    SetCurrentStepSucceeded();
+                }
+
+                // Aliases for IMAP
+                await _accountService.CreateRootAliasAsync(_createdAccount.Id, _createdAccount.Address);
+            }
+
+            // Step: Finalizing
+            SetStepInProgress(Translator.AccountSetup_Step_Finalizing);
+            SetCurrentStepSucceeded();
+
+            IsSetupComplete = true;
+
+            // Notify listeners — this triggers ShellWindow creation from App.xaml.cs
+            Messenger.Send(new AccountCreatedMessage(_createdAccount));
+        }
+        catch (AccountSetupCanceledException)
+        {
+            // User canceled authentication — go back silently, no error UI
+            Messenger.Send(new BackBreadcrumNavigationRequested(NavigationTransitionEffect.FromLeft));
+        }
+        catch (Exception ex) when (ex.Message.Contains(nameof(AccountSetupCanceledException)))
+        {
+            // Wrapped cancellation — same silent behavior
+            Messenger.Send(new BackBreadcrumNavigationRequested(NavigationTransitionEffect.FromLeft));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Account setup failed.");
+
+            SetCurrentStepFailed(ex.Message);
+            IsSetupFailed = true;
+            FailureMessage = Translator.AccountSetup_FailureMessage;
+
+            // Rollback if DB write happened
+            if (_dbWritten && _createdAccount != null)
+            {
+                try
+                {
+                    await _accountService.DeleteAccountAsync(_createdAccount);
+                }
+                catch (Exception deleteEx)
+                {
+                    Log.Error(deleteEx, "Failed to rollback account creation.");
+                }
+
+                _dbWritten = false;
+            }
+        }
+    }
+
+    private async Task ValidateImapConnectivityAsync(CustomServerInformation serverInformation)
+    {
+        var connectivityResult = await SynchronizationManager.Instance
+            .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: false);
+
+        if (connectivityResult.IsCertificateUIRequired)
+        {
+            var certificateMessage =
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row0}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateIssuer}: {connectivityResult.CertificateIssuer}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidFrom}: {connectivityResult.CertificateValidFromDateString}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidTo}: {connectivityResult.CertificateExpirationDateString}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row1}";
+
+            var allowCertificate = await _dialogService.ShowConfirmationDialogAsync(
+                certificateMessage,
+                Translator.GeneralTitle_Warning,
+                Translator.Buttons_Allow);
+
+            if (!allowCertificate)
+                throw new InvalidOperationException(Translator.IMAPSetupDialog_CertificateDenied);
+
+            connectivityResult = await SynchronizationManager.Instance
+                .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: true);
+        }
+
+        if (!connectivityResult.IsSuccess)
+            throw new InvalidOperationException(connectivityResult.FailedReason ?? Translator.IMAPSetupDialog_ConnectionFailedMessage);
+    }
+
+    private async Task ValidateCalDavConnectivityAsync(CustomServerInformation serverInformation)
+    {
+        if (string.IsNullOrWhiteSpace(serverInformation.CalDavServiceUrl))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavUrlRequired);
+
+        var settings = new CalDavConnectionSettings
+        {
+            ServiceUri = new Uri(serverInformation.CalDavServiceUrl, UriKind.Absolute),
+            Username = serverInformation.CalDavUsername,
+            Password = serverInformation.CalDavPassword
+        };
+
+        await _calDavClient.DiscoverCalendarsAsync(settings);
+    }
+
+    [RelayCommand]
+    private void GoBack()
+    {
+        Messenger.Send(new BackBreadcrumNavigationRequested(NavigationTransitionEffect.FromLeft));
+    }
+
+    [RelayCommand]
+    private async Task TryAgainAsync()
+    {
+        await RunSetupAsync();
+    }
+}
diff --git a/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs b/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs
index 71b1f1bc..7b1a3071 100644
--- a/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AliasManagementPageViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -12,7 +13,7 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Synchronization;
-using Wino.Messaging.Server;
+using Wino.Core.Services;
 
 namespace Wino.Mail.ViewModels;
 
@@ -20,7 +21,7 @@ public partial class AliasManagementPageViewModel : MailBaseViewModel
 {
     private readonly IMailDialogService _dialogService;
     private readonly IAccountService _accountService;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
+    private readonly ISmimeCertificateService _smimeCertificateService;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanSynchronizeAliases))]
@@ -33,11 +34,11 @@ public partial class AliasManagementPageViewModel : MailBaseViewModel
 
     public AliasManagementPageViewModel(IMailDialogService dialogService,
                                         IAccountService accountService,
-                                        IWinoServerConnectionManager winoServerConnectionManager)
+                                        ISmimeCertificateService smimeCertificateService)
     {
         _dialogService = dialogService;
         _accountService = accountService;
-        _winoServerConnectionManager = winoServerConnectionManager;
+        _smimeCertificateService = smimeCertificateService;
     }
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
@@ -54,7 +55,22 @@ public partial class AliasManagementPageViewModel : MailBaseViewModel
 
     private async Task LoadAliasesAsync()
     {
-        AccountAliases = await _accountService.GetAccountAliasesAsync(Account.Id);
+        var aliases = await _accountService.GetAccountAliasesAsync(Account.Id);
+        foreach (var alias in aliases)
+        {
+            alias.Certificates.Clear();
+            alias.Certificates.Add(null); // First blank optioon
+            var certs = _smimeCertificateService.GetCertificates()
+                .Where(cert => cert.Subject.Contains(alias.AliasAddress, StringComparison.OrdinalIgnoreCase))
+                .ToList();
+            foreach (var cert in certs)
+                alias.Certificates.Add(cert);
+
+            alias.SelectedSigningCertificate = !string.IsNullOrEmpty(alias.SelectedSigningCertificateThumbprint)
+                ? alias.Certificates.FirstOrDefault(c => c?.Thumbprint == alias.SelectedSigningCertificateThumbprint)
+                : null;
+        }
+        AccountAliases = aliases;
     }
 
     [RelayCommand]
@@ -82,12 +98,12 @@ public partial class AliasManagementPageViewModel : MailBaseViewModel
             Type = MailSynchronizationType.Alias
         };
 
-        var aliasSyncResponse = await _winoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(aliasSyncOptions, SynchronizationSource.Client));
+        var aliasSyncResult = await SynchronizationManager.Instance.SynchronizeAliasesAsync(Account.Id);
 
-        if (aliasSyncResponse.IsSuccess)
+        if (aliasSyncResult.CompletedState == SynchronizationCompletedState.Success)
             await LoadAliasesAsync();
         else
-            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, aliasSyncResponse.Message, InfoBarMessageType.Error);
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, "Failed to synchronize aliases", InfoBarMessageType.Error);
     }
 
     [RelayCommand]
@@ -151,4 +167,20 @@ public partial class AliasManagementPageViewModel : MailBaseViewModel
         await _accountService.DeleteAccountAliasAsync(alias.Id);
         await LoadAliasesAsync();
     }
+
+    public async Task SetAliasSmimeEncryption(MailAccountAlias alias, bool value)
+    {
+        alias.IsSmimeEncryptionEnabled = value;
+        await _accountService.UpdateAccountAliasesAsync(Account.Id, AccountAliases);
+        await LoadAliasesAsync();
+    }
+
+    public async Task SetSelectedSigningCertificate(MailAccountAlias alias, X509Certificate2 cert)
+    {
+        alias.SelectedSigningCertificate = cert;
+        alias.SelectedSigningCertificateThumbprint = cert?.Thumbprint;
+
+        await _accountService.UpdateAccountAliasesAsync(Account.Id, AccountAliases);
+        await LoadAliasesAsync();
+    }
 }
diff --git a/Wino.Mail.ViewModels/AppPreferencesPageViewModel.cs b/Wino.Mail.ViewModels/AppPreferencesPageViewModel.cs
index 3a7489d0..4c6ab537 100644
--- a/Wino.Mail.ViewModels/AppPreferencesPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AppPreferencesPageViewModel.cs
@@ -1,92 +1,31 @@
-using System.Collections.Generic;
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Ai;
 using Wino.Core.Domain.Models.Navigation;
-using Wino.Messaging.Server;
+using Wino.Core.Domain.Models.Translations;
 
 namespace Wino.Mail.ViewModels;
 
 public partial class AppPreferencesPageViewModel : MailBaseViewModel
 {
-    public IPreferencesService PreferencesService { get; }
-
-    [ObservableProperty]
-    private List<string> _appTerminationBehavior;
-
-    [ObservableProperty]
-    public partial List<string> SearchModes { get; set; }
-
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(IsStartupBehaviorDisabled))]
-    [NotifyPropertyChangedFor(nameof(IsStartupBehaviorEnabled))]
-    private StartupBehaviorResult startupBehaviorResult;
-
-    private int _emailSyncIntervalMinutes;
-    public int EmailSyncIntervalMinutes
-    {
-        get => _emailSyncIntervalMinutes;
-        set
-        {
-            SetProperty(ref _emailSyncIntervalMinutes, value);
-
-            PreferencesService.EmailSyncIntervalMinutes = value;
-        }
-    }
-
-    public bool IsStartupBehaviorDisabled => !IsStartupBehaviorEnabled;
-    public bool IsStartupBehaviorEnabled => StartupBehaviorResult == StartupBehaviorResult.Enabled;
-
-    private string _selectedAppTerminationBehavior;
-    public string SelectedAppTerminationBehavior
-    {
-        get => _selectedAppTerminationBehavior;
-        set
-        {
-            SetProperty(ref _selectedAppTerminationBehavior, value);
-
-            PreferencesService.ServerTerminationBehavior = (ServerBackgroundMode)AppTerminationBehavior.IndexOf(value);
-        }
-    }
-
-    private string _selectedDefaultSearchMode;
-    public string SelectedDefaultSearchMode
-    {
-        get => _selectedDefaultSearchMode;
-        set
-        {
-            SetProperty(ref _selectedDefaultSearchMode, value);
-
-            PreferencesService.DefaultSearchMode = (SearchMode)SearchModes.IndexOf(value);
-        }
-    }
-
-    private readonly IMailDialogService _dialogService;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
-    private readonly IStartupBehaviorService _startupBehaviorService;
-
-    public AppPreferencesPageViewModel(IMailDialogService dialogService,
-                                       IPreferencesService preferencesService,
-                                       IWinoServerConnectionManager winoServerConnectionManager,
-                                       IStartupBehaviorService startupBehaviorService)
+    public AppPreferencesPageViewModel(
+        IMailDialogService dialogService,
+        IPreferencesService preferencesService,
+        IStartupBehaviorService startupBehaviorService,
+        ITranslationService translationService,
+        IAiActionOptionsService aiActionOptionsService)
     {
         _dialogService = dialogService;
         PreferencesService = preferencesService;
-        _winoServerConnectionManager = winoServerConnectionManager;
         _startupBehaviorService = startupBehaviorService;
-
-        // Load the app termination behavior options
-
-        _appTerminationBehavior =
-        [
-            Translator.SettingsAppPreferences_ServerBackgroundingMode_MinimizeTray_Title, // "Minimize to tray"
-            Translator.SettingsAppPreferences_ServerBackgroundingMode_Invisible_Title, // "Invisible"
-            Translator.SettingsAppPreferences_ServerBackgroundingMode_Terminate_Title // "Terminate"
-        ];
+        _translationService = translationService;
+        _aiActionOptionsService = aiActionOptionsService;
 
         SearchModes =
         [
@@ -94,22 +33,137 @@ public partial class AppPreferencesPageViewModel : MailBaseViewModel
             Translator.SettingsAppPreferences_SearchMode_Online
         ];
 
-        SelectedAppTerminationBehavior = _appTerminationBehavior[(int)PreferencesService.ServerTerminationBehavior];
+        ApplicationModes =
+        [
+            Translator.SettingsAppPreferences_ApplicationMode_Mail,
+            Translator.SettingsAppPreferences_ApplicationMode_Calendar,
+            Translator.ContactsPage_Title,
+            Translator.MenuSettings
+        ];
+
         SelectedDefaultSearchMode = SearchModes[(int)PreferencesService.DefaultSearchMode];
+        SelectedDefaultApplicationMode = ApplicationModes[(int)PreferencesService.DefaultApplicationMode];
         EmailSyncIntervalMinutes = PreferencesService.EmailSyncIntervalMinutes;
+        SummarySavePath = PreferencesService.AiSummarySavePath;
+    }
+
+    public IPreferencesService PreferencesService { get; }
+
+    [ObservableProperty]
+    public partial List<string> SearchModes { get; set; }
+
+    [ObservableProperty]
+    public partial List<string> ApplicationModes { get; set; }
+
+    [ObservableProperty]
+    public partial List<AppLanguageModel> AvailableLanguages { get; set; } = [];
+
+    [ObservableProperty]
+    public partial AppLanguageModel SelectedLanguage { get; set; }
+
+    [ObservableProperty]
+    public partial List<AiTranslateLanguageOption> AvailableAiLanguages { get; set; } = [];
+
+    [ObservableProperty]
+    public partial AiTranslateLanguageOption SelectedDefaultTranslationLanguage { get; set; }
+
+    [ObservableProperty]
+    public partial AiTranslateLanguageOption SelectedSummarizeLanguage { get; set; }
+
+    [ObservableProperty]
+    public partial string SummarySavePath { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool HasInvalidSummarySavePath { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsStartupBehaviorDisabled))]
+    [NotifyPropertyChangedFor(nameof(IsStartupBehaviorEnabled))]
+    private StartupBehaviorResult startupBehaviorResult;
+
+    private readonly IMailDialogService _dialogService;
+    private readonly IStartupBehaviorService _startupBehaviorService;
+    private readonly ITranslationService _translationService;
+    private readonly IAiActionOptionsService _aiActionOptionsService;
+    private bool _isLanguageInitialized;
+    private bool _isAiPreferencesInitialized;
+    private int _emailSyncIntervalMinutes;
+    private string _selectedDefaultSearchMode;
+    private string _selectedDefaultApplicationMode;
+
+    public int EmailSyncIntervalMinutes
+    {
+        get => _emailSyncIntervalMinutes;
+        set
+        {
+            SetProperty(ref _emailSyncIntervalMinutes, value);
+            PreferencesService.EmailSyncIntervalMinutes = value;
+        }
+    }
+
+    public bool IsStartupBehaviorDisabled => !IsStartupBehaviorEnabled;
+    public bool IsStartupBehaviorEnabled => StartupBehaviorResult == StartupBehaviorResult.Enabled;
+
+    public string SelectedDefaultSearchMode
+    {
+        get => _selectedDefaultSearchMode;
+        set
+        {
+            SetProperty(ref _selectedDefaultSearchMode, value);
+            PreferencesService.DefaultSearchMode = (SearchMode)SearchModes.IndexOf(value);
+        }
+    }
+
+    public string SelectedDefaultApplicationMode
+    {
+        get => _selectedDefaultApplicationMode;
+        set
+        {
+            SetProperty(ref _selectedDefaultApplicationMode, value);
+            PreferencesService.DefaultApplicationMode = (WinoApplicationMode)ApplicationModes.IndexOf(value);
+        }
+    }
+
+    partial void OnSelectedLanguageChanged(AppLanguageModel value)
+    {
+        if (!_isLanguageInitialized || value == null)
+            return;
+
+        _ = _translationService.InitializeLanguageAsync(value.Language);
+    }
+
+    partial void OnSelectedDefaultTranslationLanguageChanged(AiTranslateLanguageOption value)
+    {
+        if (!_isAiPreferencesInitialized || value == null)
+            return;
+
+        PreferencesService.AiDefaultTranslationLanguageCode = value.Code;
+    }
+
+    partial void OnSelectedSummarizeLanguageChanged(AiTranslateLanguageOption value)
+    {
+        if (!_isAiPreferencesInitialized || value == null)
+            return;
+
+        PreferencesService.AiSummarizeLanguageCode = value.Code;
+    }
+
+    partial void OnSummarySavePathChanged(string value)
+    {
+        if (!_isAiPreferencesInitialized)
+            return;
+
+        PreferencesService.AiSummarySavePath = value ?? string.Empty;
+        RefreshSummarySavePathState();
     }
 
     [RelayCommand]
     private async Task ToggleStartupBehaviorAsync()
     {
         if (IsStartupBehaviorEnabled)
-        {
             await DisableStartupAsync();
-        }
         else
-        {
             await EnableStartupAsync();
-        }
 
         OnPropertyChanged(nameof(IsStartupBehaviorEnabled));
     }
@@ -117,14 +171,12 @@ public partial class AppPreferencesPageViewModel : MailBaseViewModel
     private async Task EnableStartupAsync()
     {
         StartupBehaviorResult = await _startupBehaviorService.ToggleStartupBehavior(true);
-
         NotifyCurrentStartupState();
     }
 
     private async Task DisableStartupAsync()
     {
         StartupBehaviorResult = await _startupBehaviorService.ToggleStartupBehavior(false);
-
         NotifyCurrentStartupState();
     }
 
@@ -152,25 +204,56 @@ public partial class AppPreferencesPageViewModel : MailBaseViewModel
         }
     }
 
-    protected override async void OnPropertyChanged(PropertyChangedEventArgs e)
+    [RelayCommand]
+    private async Task BrowseSummarySavePathAsync()
     {
-        base.OnPropertyChanged(e);
+        var pickedPath = await _dialogService.PickWindowsFolderAsync();
+        if (string.IsNullOrWhiteSpace(pickedPath))
+            return;
 
-        if (e.PropertyName == nameof(SelectedAppTerminationBehavior))
-        {
-            var terminationModeChangedResult = await _winoServerConnectionManager.GetResponseAsync<bool, ServerTerminationModeChanged>(new ServerTerminationModeChanged(PreferencesService.ServerTerminationBehavior));
-
-            if (!terminationModeChangedResult.IsSuccess)
-            {
-                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, terminationModeChangedResult.Message, InfoBarMessageType.Error);
-            }
-        }
+        await ExecuteUIThread(() => SummarySavePath = pickedPath);
     }
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
         base.OnNavigatedTo(mode, parameters);
 
-        StartupBehaviorResult = await _startupBehaviorService.GetCurrentStartupBehaviorAsync();
+        var availableLanguages = _translationService.GetAvailableLanguages();
+        var availableAiLanguages = new List<AiTranslateLanguageOption>(_aiActionOptionsService.GetTranslateLanguageOptions());
+        var startupBehaviorResult = await _startupBehaviorService.GetCurrentStartupBehaviorAsync();
+
+        await ExecuteUIThread(() =>
+        {
+            AvailableLanguages = availableLanguages;
+            SelectedLanguage = AvailableLanguages.Find(language => language.Language == PreferencesService.CurrentLanguage)
+                               ?? (AvailableLanguages.Count > 0 ? AvailableLanguages[0] : null);
+            _isLanguageInitialized = true;
+
+            AvailableAiLanguages = availableAiLanguages;
+            SelectedDefaultTranslationLanguage = FindAiLanguageOption(PreferencesService.AiDefaultTranslationLanguageCode)
+                                                 ?? FindAiLanguageOption("en-US")
+                                                 ?? (AvailableAiLanguages.Count > 0 ? AvailableAiLanguages[0] : null);
+            SelectedSummarizeLanguage = FindAiLanguageOption(PreferencesService.AiSummarizeLanguageCode)
+                                        ?? FindAiLanguageOption("en-US")
+                                        ?? (AvailableAiLanguages.Count > 0 ? AvailableAiLanguages[0] : null);
+            SummarySavePath = PreferencesService.AiSummarySavePath;
+            RefreshSummarySavePathState();
+            _isAiPreferencesInitialized = true;
+
+            StartupBehaviorResult = startupBehaviorResult;
+        });
+    }
+
+    private AiTranslateLanguageOption FindAiLanguageOption(string languageCode)
+    {
+        if (string.IsNullOrWhiteSpace(languageCode))
+            return null;
+
+        return AvailableAiLanguages.Find(option => option.Code == languageCode);
+    }
+
+    private void RefreshSummarySavePathState()
+    {
+        HasInvalidSummarySavePath = !string.IsNullOrWhiteSpace(SummarySavePath) && !Directory.Exists(SummarySavePath);
     }
 }
diff --git a/Wino.Mail.ViewModels/Collections/GroupHeaders.cs b/Wino.Mail.ViewModels/Collections/GroupHeaders.cs
new file mode 100644
index 00000000..834d9064
--- /dev/null
+++ b/Wino.Mail.ViewModels/Collections/GroupHeaders.cs
@@ -0,0 +1,79 @@
+using System;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Wino.Mail.ViewModels.Collections;
+
+/// <summary>
+/// Base class for group headers in the flat collection
+/// </summary>
+public abstract partial class GroupHeaderBase : ObservableObject
+{
+    [ObservableProperty]
+    private int itemCount;
+
+    [ObservableProperty]
+    private int unreadCount;
+
+    protected GroupHeaderBase(string key, string displayName)
+    {
+        Key = key;
+        DisplayName = displayName;
+    }
+
+    /// <summary>
+    /// The unique key for this group (used for sorting and identification)
+    /// </summary>
+    public string Key { get; }
+
+    /// <summary>
+    /// The display name shown in the UI
+    /// </summary>
+    public string DisplayName { get; }
+}
+
+/// <summary>
+/// Group header for date-based grouping
+/// </summary>
+public partial class DateGroupHeader : GroupHeaderBase
+{
+    public DateGroupHeader(DateTime date) : base(date.ToString("yyyy-MM-dd"), FormatDisplayName(date))
+    {
+        Date = date;
+    }
+
+    /// <summary>
+    /// The date this group represents
+    /// </summary>
+    public DateTime Date { get; }
+
+    private static string FormatDisplayName(DateTime date)
+    {
+        var today = DateTime.Today;
+        var yesterday = today.AddDays(-1);
+
+        return date.Date switch
+        {
+            var d when d == today => "Today",
+            var d when d == yesterday => "Yesterday",
+            var d when d >= today.AddDays(-7) => date.ToString("dddd"), // This week
+            var d when d.Year == today.Year => date.ToString("MMMM dd"), // This year
+            _ => date.ToString("MMMM dd, yyyy") // Other years
+        };
+    }
+}
+
+/// <summary>
+/// Group header for sender name-based grouping
+/// </summary>
+public partial class SenderGroupHeader : GroupHeaderBase
+{
+    public SenderGroupHeader(string senderName) : base(senderName, senderName)
+    {
+        SenderName = senderName;
+    }
+
+    /// <summary>
+    /// The sender name this group represents
+    /// </summary>
+    public string SenderName { get; }
+}
diff --git a/Wino.Mail.ViewModels/Collections/ThreadingManager.cs b/Wino.Mail.ViewModels/Collections/ThreadingManager.cs
deleted file mode 100644
index 471cf9af..00000000
--- a/Wino.Mail.ViewModels/Collections/ThreadingManager.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
-
-namespace Wino.Mail.ViewModels.Collections;
-
-internal class ThreadingManager
-{
-    private readonly IThreadingStrategyProvider _threadingStrategyProvider;
-
-    public ThreadingManager(IThreadingStrategyProvider threadingStrategyProvider)
-    {
-        _threadingStrategyProvider = threadingStrategyProvider;
-    }
-
-    public bool ShouldThread(MailCopy newItem, IMailItem existingItem)
-    {
-        if (_threadingStrategyProvider == null) return false;
-
-        var strategy = _threadingStrategyProvider.GetStrategy(newItem.AssignedAccount.ProviderType);
-        return strategy?.ShouldThreadWithItem(newItem, existingItem) ?? false;
-    }
-
-    public ThreadMailItem CreateNewThread(IMailItem existingItem, MailCopy newItem)
-    {
-        var thread = new ThreadMailItem();
-        thread.AddThreadItem(existingItem);
-        thread.AddThreadItem(newItem);
-        return thread;
-    }
-}
diff --git a/Wino.Mail.ViewModels/Collections/WinoMailCollection.cs b/Wino.Mail.ViewModels/Collections/WinoMailCollection.cs
index 3425bcfa..2d4f804a 100644
--- a/Wino.Mail.ViewModels/Collections/WinoMailCollection.cs
+++ b/Wino.Mail.ViewModels/Collections/WinoMailCollection.cs
@@ -1,43 +1,75 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Collections;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using MoreLinq.Extensions;
 using Serilog;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Comparers;
-using Wino.Core.Domain.Models.MailItem;
 using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Mails;
 
 namespace Wino.Mail.ViewModels.Collections;
 
-public class WinoMailCollection
+public class WinoMailCollection : ObservableRecipient, IRecipient<SelectedItemsChangedMessage>
 {
     // We cache each mail copy id for faster access on updates.
     // If the item provider here for update or removal doesn't exist here
     // we can ignore the operation.
 
-    public HashSet<Guid> MailCopyIdHashSet = [];
+    public ConcurrentDictionary<Guid, bool> MailCopyIdHashSet = [];
 
-    public event EventHandler<IMailItem> MailItemRemoved;
+    // Cache ThreadIds to quickly find items that should be threaded together
+    private readonly ConcurrentDictionary<string, List<IMailListItem>> _threadIdToItemsMap = new();
 
-    private ListItemComparer listComparer = new ListItemComparer();
+    // Cache item to group mapping for faster lookups
+    private readonly ConcurrentDictionary<IMailListItem, ObservableGroup<object, IMailListItem>> _itemToGroupMap = new();
 
-    private readonly ObservableGroupedCollection<object, IMailItem> _mailItemSource = new ObservableGroupedCollection<object, IMailItem>();
+    // Cache uniqueId to MailItemViewModel for faster GetMailItemContainer lookups
+    private readonly ConcurrentDictionary<Guid, MailItemViewModel> _uniqueIdToMailItemMap = new();
 
-    public ReadOnlyObservableGroupedCollection<object, IMailItem> MailItems { get; }
+    // Cache uniqueId to ThreadMailItemViewModel for O(1) thread membership checks
+    private readonly ConcurrentDictionary<Guid, ThreadMailItemViewModel> _uniqueIdToThreadMap = new();
+
+    public event EventHandler<MailItemViewModel> MailItemRemoved;
+    public event EventHandler ItemSelectionChanged;
+
+    private ListItemComparer listComparer = new();
+
+    private readonly ObservableGroupedCollection<object, IMailListItem> _mailItemSource = new ObservableGroupedCollection<object, IMailListItem>();
+
+    public ReadOnlyObservableGroupedCollection<object, IMailListItem> MailItems { get; }
+
+    private SortingOptionType _sortingType;
 
     /// <summary>
     /// Property that defines how the item sorting should be done in the collection.
     /// </summary>
-    public SortingOptionType SortingType { get; set; }
+    public SortingOptionType SortingType
+    {
+        get => _sortingType;
+        set
+        {
+            _sortingType = value;
+            // Update the comparer's sort mode when sorting type changes
+            listComparer.SortByName = value == SortingOptionType.Sender;
+        }
+    }
 
     /// <summary>
-    /// Threading strategy that will help thread items according to the account type.
+    /// Gets or sets the grouping type for emails.
+    /// Note: WinoMailCollection groups automatically on the UI, so this just affects the grouping key logic.
     /// </summary>
-    public IThreadingStrategyProvider ThreadingStrategyProvider { get; set; }
+    public EmailGroupingType GroupingType
+    {
+        get => SortingType == SortingOptionType.ReceiveDate ? EmailGroupingType.ByDate : EmailGroupingType.ByFromName;
+        set => SortingType = value == EmailGroupingType.ByDate ? SortingOptionType.ReceiveDate : SortingOptionType.Sender;
+    }
 
     /// <summary>
     /// Automatically deletes single mail items after the delete operation or thread->single transition.
@@ -47,19 +79,56 @@ public class WinoMailCollection
 
     public int Count => _mailItemSource.Count;
 
-    public IDispatcher CoreDispatcher { get; set; }
-
-    private readonly ThreadingManager _threadingManager;
-
-    public WinoMailCollection(IThreadingStrategyProvider threadingStrategyProvider)
+    public bool IsAllSelected
     {
-        _threadingManager = new ThreadingManager(threadingStrategyProvider);
-        MailItems = new ReadOnlyObservableGroupedCollection<object, IMailItem>(_mailItemSource);
+        get
+        {
+            return AllItemsCount == SelectedItemsCount;
+        }
     }
 
-    public void Clear() => _mailItemSource.Clear();
+    public IDispatcher CoreDispatcher { get; set; }
 
-    private object GetGroupingKey(IMailItem mailItem)
+    public WinoMailCollection()
+    {
+        MailItems = new ReadOnlyObservableGroupedCollection<object, IMailListItem>(_mailItemSource);
+
+        // Initialize sorting type to default (date-based)
+        SortingType = SortingOptionType.ReceiveDate;
+
+        Messenger.Register<SelectedItemsChangedMessage>(this);
+    }
+
+    public void Cleanup()
+    {
+        Messenger.Unregister<SelectedItemsChangedMessage>(this);
+    }
+
+    public async Task ClearAsync()
+    {
+        await ExecuteUIThread(() =>
+        {
+            foreach (var group in _mailItemSource)
+            {
+                foreach (var item in group)
+                {
+                    if (item is ThreadMailItemViewModel threadItem)
+                    {
+                        threadItem.UnregisterThreadEmailPropertyChangedHandlers();
+                    }
+                }
+            }
+
+            _mailItemSource.Clear();
+            MailCopyIdHashSet.Clear();
+            _threadIdToItemsMap.Clear();
+            _itemToGroupMap.Clear();
+            _uniqueIdToMailItemMap.Clear();
+            _uniqueIdToThreadMap.Clear();
+        });
+    }
+
+    private object GetGroupingKey(IMailListItem mailItem)
     {
         if (SortingType == SortingOptionType.ReceiveDate)
             return mailItem.CreationDate.ToLocalTime().Date;
@@ -69,68 +138,254 @@ public class WinoMailCollection
 
     private void UpdateUniqueIdHashes(IMailHashContainer itemContainer, bool isAdd)
     {
-        foreach (var item in itemContainer.GetContainingIds())
+        if (isAdd)
         {
-            if (isAdd)
+            if (itemContainer is MailItemViewModel mailItemVM)
             {
-                MailCopyIdHashSet.Add(item);
+                MailCopyIdHashSet.TryAdd(mailItemVM.MailCopy.UniqueId, true);
+                _uniqueIdToMailItemMap[mailItemVM.MailCopy.UniqueId] = mailItemVM;
             }
-            else
+            else if (itemContainer is ThreadMailItemViewModel threadVM)
             {
-                MailCopyIdHashSet.Remove(item);
+                foreach (var email in threadVM.ThreadEmails)
+                {
+                    MailCopyIdHashSet.TryAdd(email.MailCopy.UniqueId, true);
+                    _uniqueIdToMailItemMap[email.MailCopy.UniqueId] = email;
+                    _uniqueIdToThreadMap[email.MailCopy.UniqueId] = threadVM;
+                }
             }
         }
-    }
-
-    private void InsertItemInternal(object groupKey, IMailItem mailItem)
-    {
-        UpdateUniqueIdHashes(mailItem, true);
-
-        if (mailItem is MailCopy mailCopy)
-        {
-            _mailItemSource.InsertItem(groupKey, listComparer, new MailItemViewModel(mailCopy), listComparer.GetItemComparer());
-        }
-        else if (mailItem is ThreadMailItem threadMailItem)
-        {
-            _mailItemSource.InsertItem(groupKey, listComparer, new ThreadMailItemViewModel(threadMailItem), listComparer.GetItemComparer());
-        }
         else
         {
-            _mailItemSource.InsertItem(groupKey, listComparer, mailItem, listComparer.GetItemComparer());
+            foreach (var id in itemContainer.GetContainingIds())
+            {
+                MailCopyIdHashSet.TryRemove(id, out _);
+                _uniqueIdToMailItemMap.TryRemove(id, out _);
+                _uniqueIdToThreadMap.TryRemove(id, out _);
+            }
         }
     }
 
-    private void RemoveItemInternal(ObservableGroup<object, IMailItem> group, IMailItem mailItem)
+    private void UpdateThreadIdCache(IMailListItem item, bool isAdd)
+    {
+        var threadIds = GetThreadIdsFromItem(item);
+
+        foreach (var threadId in threadIds)
+        {
+            if (string.IsNullOrEmpty(threadId)) continue;
+
+            if (isAdd)
+            {
+                var list = _threadIdToItemsMap.GetOrAdd(threadId, _ => new List<IMailListItem>());
+                list.Add(item);
+            }
+            else
+            {
+                if (_threadIdToItemsMap.TryGetValue(threadId, out var list))
+                {
+                    list.Remove(item);
+                    if (list.Count == 0)
+                    {
+                        _threadIdToItemsMap.TryRemove(threadId, out _);
+                    }
+                }
+            }
+        }
+    }
+
+    private IEnumerable<string> GetThreadIdsFromItem(IMailListItem item)
+    {
+        if (item is MailItemViewModel mailItem && !string.IsNullOrEmpty(mailItem.MailCopy.ThreadId))
+        {
+            yield return mailItem.MailCopy.ThreadId;
+        }
+        else if (item is ThreadMailItemViewModel threadItem)
+        {
+            var uniqueThreadIds = threadItem.ThreadEmails
+                .Where(e => !string.IsNullOrEmpty(e.MailCopy.ThreadId))
+                .Select(e => e.MailCopy.ThreadId)
+                .Distinct();
+
+            foreach (var threadId in uniqueThreadIds)
+            {
+                yield return threadId;
+            }
+        }
+    }
+
+    private IMailListItem FindThreadableItem(string threadId, Guid? excludedUniqueId = null, IMailListItem excludedItem = null)
+    {
+        if (string.IsNullOrEmpty(threadId) || !_threadIdToItemsMap.TryGetValue(threadId, out var items))
+        {
+            return null;
+        }
+
+        foreach (var item in items)
+        {
+            if (ReferenceEquals(item, excludedItem))
+            {
+                continue;
+            }
+
+            if (excludedUniqueId.HasValue)
+            {
+                if (item is MailItemViewModel mailItem && mailItem.MailCopy.UniqueId == excludedUniqueId.Value)
+                {
+                    continue;
+                }
+
+                if (item is ThreadMailItemViewModel threadItem && threadItem.HasUniqueId(excludedUniqueId.Value))
+                {
+                    continue;
+                }
+            }
+
+            return item;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Checks if a ThreadId exists in the collection.
+    /// </summary>
+    /// <param name="threadId">The ThreadId to check for.</param>
+    /// <returns>True if the ThreadId exists in the collection, false otherwise.</returns>
+    public bool ContainsThreadId(string threadId)
+    {
+        return !string.IsNullOrEmpty(threadId) && _threadIdToItemsMap.ContainsKey(threadId);
+    }
+
+    /// <summary>
+    /// Checks whether a mail with the given UniqueId currently exists in this collection.
+    /// </summary>
+    public bool ContainsMailUniqueId(Guid uniqueId) => MailCopyIdHashSet.ContainsKey(uniqueId);
+
+    /// <summary>
+    /// Finds a MailItemViewModel by its UniqueId, searching through all items including those inside threads.
+    /// </summary>
+    /// <param name="uniqueId">The UniqueId of the mail item to find.</param>
+    /// <returns>The MailItemViewModel if found, otherwise null.</returns>
+    public MailItemViewModel Find(Guid uniqueId)
+    {
+        // Fast path: check the cache for O(1) lookup
+        if (_uniqueIdToMailItemMap.TryGetValue(uniqueId, out var cachedMailItem))
+        {
+            return cachedMailItem;
+        }
+
+        // Fallback: scan all groups and populate caches
+        foreach (var group in _mailItemSource)
+        {
+            foreach (var item in group)
+            {
+                if (item is MailItemViewModel mailItem && mailItem.MailCopy.UniqueId == uniqueId)
+                {
+                    _uniqueIdToMailItemMap[uniqueId] = mailItem;
+                    return mailItem;
+                }
+                else if (item is ThreadMailItemViewModel threadItem)
+                {
+                    var foundInThread = threadItem.ThreadEmails.FirstOrDefault(e => e.MailCopy.UniqueId == uniqueId);
+                    if (foundInThread != null)
+                    {
+                        _uniqueIdToMailItemMap[uniqueId] = foundInThread;
+                        _uniqueIdToThreadMap[uniqueId] = threadItem;
+                        return foundInThread;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private async Task InsertItemInternalAsync(object groupKey, IMailListItem mailItem)
+    {
+        UpdateUniqueIdHashes(mailItem, true);
+        UpdateThreadIdCache(mailItem, true);
+        await ExecuteUIThread(() =>
+        {
+            _mailItemSource.InsertItem(groupKey, listComparer, mailItem, listComparer);
+
+            // Update item-to-group cache
+            var group = _mailItemSource.FirstGroupByKeyOrDefault(groupKey);
+            if (group != null)
+            {
+                _itemToGroupMap[mailItem] = group;
+            }
+        });
+    }
+
+    private async Task RemoveItemInternalAsync(ObservableGroup<object, IMailListItem> group, IMailListItem mailItem, bool detachThreadHandlers = true)
     {
         UpdateUniqueIdHashes(mailItem, false);
+        UpdateThreadIdCache(mailItem, false);
 
-        MailItemRemoved?.Invoke(this, mailItem);
-
-        group.Remove(mailItem);
-
-        if (group.Count == 0)
+        if (mailItem is MailItemViewModel singleMailItem)
         {
-            _mailItemSource.RemoveGroup(group.Key);
+            MailItemRemoved?.Invoke(this, singleMailItem);
         }
+        else if (mailItem is ThreadMailItemViewModel threadViewModel)
+        {
+            foreach (var threadMailItem in threadViewModel.ThreadEmails)
+            {
+                MailItemRemoved?.Invoke(this, threadMailItem);
+            }
+
+            if (detachThreadHandlers)
+            {
+                threadViewModel.UnregisterThreadEmailPropertyChangedHandlers();
+            }
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            group.Remove(mailItem);
+
+            // Remove from item-to-group cache
+            _itemToGroupMap.TryRemove(mailItem, out _);
+
+            if (group.Count == 0)
+            {
+                _mailItemSource.RemoveGroup(group.Key);
+            }
+        });
     }
 
-    private async Task HandleThreadingAsync(ObservableGroup<object, IMailItem> group, IMailItem item, MailCopy addedItem)
+    private async Task HandleThreadingAsync(ObservableGroup<object, IMailListItem> group, IMailListItem item, MailCopy addedItem)
     {
         if (item is ThreadMailItemViewModel threadViewModel)
         {
             await HandleExistingThreadAsync(group, threadViewModel, addedItem);
         }
-        else
+        else if (item is MailItemViewModel mailViewModel)
         {
-            await HandleNewThreadAsync(group, item, addedItem);
+            await HandleNewThreadAsync(group, mailViewModel, addedItem);
         }
     }
 
-    private async Task HandleExistingThreadAsync(ObservableGroup<object, IMailItem> group, ThreadMailItemViewModel threadViewModel, MailCopy addedItem)
+    private async Task HandleExistingThreadAsync(ObservableGroup<object, IMailListItem> group, ThreadMailItemViewModel threadViewModel, MailCopy addedItem)
     {
         var existingGroupKey = GetGroupingKey(threadViewModel);
 
-        await ExecuteUIThread(() => { threadViewModel.AddMailItemViewModel(addedItem); });
+        // Update ThreadId cache before modifying the thread
+        UpdateThreadIdCache(threadViewModel, false);
+
+        var newMailItem = new MailItemViewModel(addedItem);
+
+        await ExecuteUIThread(() =>
+        {
+            threadViewModel.AddEmail(newMailItem);
+        });
+
+        // Update ThreadId cache after modifying the thread
+        UpdateThreadIdCache(threadViewModel, true);
+
+        // Update caches for the new mail item (use the actual instance, not a throwaway)
+        MailCopyIdHashSet.TryAdd(addedItem.UniqueId, true);
+        _uniqueIdToMailItemMap[addedItem.UniqueId] = newMailItem;
+        _uniqueIdToThreadMap[addedItem.UniqueId] = threadViewModel;
 
         var newGroupKey = GetGroupingKey(threadViewModel);
 
@@ -140,17 +395,16 @@ public class WinoMailCollection
         }
         else
         {
-            await ExecuteUIThread(() => { threadViewModel.NotifyPropertyChanges(); });
+            await ExecuteUIThread(() => { threadViewModel.ThreadEmails = threadViewModel.ThreadEmails; });
         }
-
-        UpdateUniqueIdHashes(addedItem, true);
     }
 
-    private async Task HandleNewThreadAsync(ObservableGroup<object, IMailItem> group, IMailItem item, MailCopy addedItem)
+    private async Task HandleNewThreadAsync(ObservableGroup<object, IMailListItem> group, MailItemViewModel item, MailCopy addedItem)
     {
-        if (item.Id == addedItem.Id)
+        if (item.MailCopy.UniqueId == addedItem.UniqueId)
         {
-            await UpdateExistingItemAsync(item, addedItem);
+            var existingItemContainer = GetMailItemContainer(addedItem.UniqueId);
+            await UpdateExistingItemAsync(existingItemContainer, addedItem);
         }
         else
         {
@@ -158,121 +412,371 @@ public class WinoMailCollection
         }
     }
 
-    private async Task MoveThreadToNewGroupAsync(ObservableGroup<object, IMailItem> currentGroup, ThreadMailItemViewModel threadViewModel, object newGroupKey)
+    private async Task MoveThreadToNewGroupAsync(ObservableGroup<object, IMailListItem> currentGroup, ThreadMailItemViewModel threadViewModel, object newGroupKey)
     {
-        var mailThreadItems = threadViewModel.GetThreadMailItem();
-
-        await ExecuteUIThread(() =>
-        {
-            RemoveItemInternal(currentGroup, threadViewModel);
-            InsertItemInternal(newGroupKey, new ThreadMailItemViewModel(mailThreadItems));
-        });
+        await RemoveItemInternalAsync(currentGroup, threadViewModel, detachThreadHandlers: false);
+        await InsertItemInternalAsync(newGroupKey, threadViewModel);
     }
 
-    private async Task CreateNewThreadAsync(ObservableGroup<object, IMailItem> group, IMailItem item, MailCopy addedItem)
+    private async Task CreateNewThreadAsync(ObservableGroup<object, IMailListItem> group, MailItemViewModel item, MailCopy addedItem)
     {
-        var threadMailItem = _threadingManager.CreateNewThread(item, addedItem);
-        var newGroupKey = GetGroupingKey(threadMailItem);
+        var threadViewModel = new ThreadMailItemViewModel(item.MailCopy.ThreadId);
 
         await ExecuteUIThread(() =>
         {
-            RemoveItemInternal(group, item);
-            InsertItemInternal(newGroupKey, threadMailItem);
+            threadViewModel.AddEmail(item);
+            threadViewModel.AddEmail(new MailItemViewModel(addedItem));
         });
+
+        var newGroupKey = GetGroupingKey(threadViewModel);
+
+        await RemoveItemInternalAsync(group, item);
+        await InsertItemInternalAsync(newGroupKey, threadViewModel);
     }
 
     public async Task AddAsync(MailCopy addedItem)
     {
-        foreach (var group in _mailItemSource)
+        // First check if this is an update to an existing item
+        if (MailCopyIdHashSet.ContainsKey(addedItem.UniqueId))
         {
-            foreach (var item in group)
+            // Find and update the existing item
+            var existingItemContainer = GetMailItemContainer(addedItem.UniqueId);
+            if (existingItemContainer?.ItemViewModel != null)
             {
-                if (_threadingManager.ShouldThread(addedItem, item))
+                await UpdateExistingItemAsync(existingItemContainer, addedItem);
+                return;
+            }
+        }
+
+        // Check if this item should be threaded with an existing item
+        if (!string.IsNullOrEmpty(addedItem.ThreadId))
+        {
+            var threadableItem = FindThreadableItem(addedItem.ThreadId);
+            if (threadableItem != null)
+            {
+                // Find the group containing this item
+                var targetGroup = FindGroupContainingItem(threadableItem);
+                if (targetGroup != null)
                 {
-                    await HandleThreadingAsync(group, item, addedItem);
-                    return;
-                }
-                else if (item.Id == addedItem.Id && item is MailItemViewModel itemViewModel)
-                {
-                    await UpdateExistingItemAsync(itemViewModel, addedItem);
+                    await HandleThreadingAsync(targetGroup, threadableItem, addedItem);
                     return;
                 }
             }
         }
 
+        // No threading needed, add as new item
         await AddNewItemAsync(addedItem);
     }
 
+    private ObservableGroup<object, IMailListItem> FindGroupContainingItem(IMailListItem item)
+    {
+        // Try cache first
+        if (_itemToGroupMap.TryGetValue(item, out var cachedGroup))
+        {
+            // Cache can become stale during concurrent list refreshes/moves.
+            // Validate before returning so we don't mutate a detached group.
+            if (_mailItemSource.Contains(cachedGroup) && cachedGroup.Contains(item))
+            {
+                return cachedGroup;
+            }
+
+            _itemToGroupMap.TryRemove(item, out _);
+        }
+
+        // Fallback to search if not in cache
+        foreach (var group in _mailItemSource)
+        {
+            if (group.Contains(item))
+            {
+                _itemToGroupMap[item] = group;
+                return group;
+            }
+        }
+        return null;
+    }
+
     private async Task AddNewItemAsync(MailCopy addedItem)
     {
-        var groupKey = GetGroupingKey(addedItem);
-        await ExecuteUIThread(() => { InsertItemInternal(groupKey, addedItem); });
+        var newMailItem = new MailItemViewModel(addedItem);
+        var groupKey = GetGroupingKey(newMailItem);
+        await InsertItemInternalAsync(groupKey, newMailItem);
     }
 
-    private async Task UpdateExistingItemAsync(IMailItem existingItem, MailCopy updatedItem)
+    private async Task ReinsertUpdatedItemAsync(MailCopy updatedItem, bool isSelected, bool isBusy)
     {
-        if (existingItem is MailItemViewModel itemViewModel)
-        {
-            UpdateUniqueIdHashes(itemViewModel, false);
-            UpdateUniqueIdHashes(updatedItem, true);
+        await RemoveAsync(updatedItem);
+        await AddAsync(updatedItem);
 
-            await ExecuteUIThread(() => { itemViewModel.MailCopy = updatedItem; });
+        var updatedContainer = GetMailItemContainer(updatedItem.UniqueId);
+        if (updatedContainer?.ItemViewModel == null)
+        {
+            return;
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            updatedContainer.ItemViewModel.IsSelected = isSelected;
+            updatedContainer.ItemViewModel.IsBusy = isBusy;
+        });
+    }
+
+    private async Task UpdateExistingItemAsync(MailItemContainer itemContainer,
+                                               MailCopy updatedItem,
+                                               MailUpdateSource mailUpdateSource = MailUpdateSource.Server,
+                                               MailCopyChangeFlags changeHint = MailCopyChangeFlags.None)
+    {
+        if (itemContainer?.ItemViewModel == null)
+        {
+            return;
+        }
+
+        var existingItem = itemContainer.ItemViewModel;
+        var threadOwner = itemContainer.ThreadViewModel as IMailListItem ?? existingItem;
+        var wasSelected = existingItem.IsSelected;
+        MailCopyChangeFlags appliedChanges = MailCopyChangeFlags.None;
+
+        await ExecuteUIThread(() =>
+        {
+            UpdateUniqueIdHashes(existingItem, false);
+            UpdateThreadIdCache(threadOwner, false);
+
+            itemContainer.ThreadViewModel?.SuspendChildPropertyNotifications();
+
+            try
+            {
+                appliedChanges = existingItem.UpdateFrom(updatedItem, changeHint);
+            }
+            finally
+            {
+                itemContainer.ThreadViewModel?.ResumeChildPropertyNotifications();
+            }
+
+            existingItem.IsBusy = mailUpdateSource == MailUpdateSource.ClientUpdated;
+
+            UpdateUniqueIdHashes(existingItem, true);
+            UpdateThreadIdCache(threadOwner, true);
+
+            if (itemContainer.ThreadViewModel != null)
+            {
+                _uniqueIdToThreadMap[existingItem.MailCopy.UniqueId] = itemContainer.ThreadViewModel;
+            }
+            else
+            {
+                _uniqueIdToThreadMap.TryRemove(existingItem.MailCopy.UniqueId, out _);
+            }
+        });
+
+        if ((appliedChanges & MailCopyChangeFlags.ThreadId) != 0)
+        {
+            await ReinsertUpdatedItemAsync(updatedItem, wasSelected, existingItem.IsBusy);
+            return;
+        }
+
+        if (itemContainer.ThreadViewModel != null && appliedChanges != MailCopyChangeFlags.None)
+        {
+            await ExecuteUIThread(() =>
+            {
+                itemContainer.ThreadViewModel.NotifyMailItemUpdated(existingItem, appliedChanges);
+            });
         }
     }
 
-    public void AddRange(IEnumerable<IMailItem> items, bool clearIdCache)
+    /// <summary>
+    /// Adds multiple emails to the collection.
+    /// </summary>
+    public async Task AddRangeAsync(IEnumerable<MailItemViewModel> items, bool clearIdCache)
     {
         if (clearIdCache)
         {
             MailCopyIdHashSet.Clear();
+            _threadIdToItemsMap.Clear();
+            _itemToGroupMap.Clear();
+            _uniqueIdToMailItemMap.Clear();
+            _uniqueIdToThreadMap.Clear();
         }
 
-        var groupedByName = items
-                            .GroupBy(a => GetGroupingKey(a))
-                            .Select(a => new ObservableGroup<object, IMailItem>(a.Key, a));
+        var itemsList = items as List<MailItemViewModel> ?? items.ToList();
+        if (itemsList.Count == 0) return;
 
-        foreach (var group in groupedByName)
+        var itemsToAdd = new List<IMailListItem>(itemsList.Count);
+        var processedItems = new HashSet<MailItemViewModel>(itemsList.Count);
+        var itemsToUpdate = new List<(MailItemViewModel existing, MailCopy updated)>();
+        var threadingOperations = new List<(ObservableGroup<object, IMailListItem> group, IMailListItem item, MailCopy addedItem)>();
+
+        // Build a lookup for existing groups to avoid repeated searches
+        var groupLookup = new Dictionary<IMailListItem, ObservableGroup<object, IMailListItem>>(_mailItemSource.Count * 10);
+        foreach (var group in _mailItemSource)
         {
-            // Store all mail copy ids for faster access.
             foreach (var item in group)
             {
-                if (item is MailItemViewModel mailCopyItem && !MailCopyIdHashSet.Contains(item.UniqueId))
+                groupLookup[item] = group;
+            }
+        }
+
+        // Build thread lookup from the batch items
+        var batchThreadLookup = new Dictionary<string, List<MailItemViewModel>>();
+        foreach (var item in itemsList)
+        {
+            if (!string.IsNullOrEmpty(item.MailCopy.ThreadId))
+            {
+                if (!batchThreadLookup.TryGetValue(item.MailCopy.ThreadId, out var list))
                 {
-                    MailCopyIdHashSet.Add(item.UniqueId);
+                    list = new List<MailItemViewModel>();
+                    batchThreadLookup[item.MailCopy.ThreadId] = list;
                 }
-                else if (item is ThreadMailItemViewModel threadMailItem)
+                list.Add(item);
+            }
+        }
+
+        // Process items and handle threading
+        foreach (var item in itemsList)
+        {
+            if (processedItems.Contains(item))
+                continue;
+
+            // Check if this is an update to an existing item
+            if (MailCopyIdHashSet.ContainsKey(item.MailCopy.UniqueId))
+            {
+                var existingItemContainer = GetMailItemContainer(item.MailCopy.UniqueId);
+                if (existingItemContainer?.ItemViewModel != null)
                 {
-                    foreach (var mailItem in threadMailItem.ThreadItems)
+                    itemsToUpdate.Add((existingItemContainer.ItemViewModel, item.MailCopy));
+                    processedItems.Add(item);
+                    continue;
+                }
+            }
+
+            // Check if this item should be threaded
+            if (!string.IsNullOrEmpty(item.MailCopy.ThreadId))
+            {
+                // Look for existing item with same ThreadId
+                var existingThreadableItem = FindThreadableItem(item.MailCopy.ThreadId);
+
+                if (existingThreadableItem != null)
+                {
+                    // Thread with existing item
+                    if (groupLookup.TryGetValue(existingThreadableItem, out var targetGroup))
                     {
-                        if (!MailCopyIdHashSet.Contains(mailItem.UniqueId))
+                        threadingOperations.Add((targetGroup, existingThreadableItem, item.MailCopy));
+                        processedItems.Add(item);
+                        continue;
+                    }
+                }
+
+                // Look for other items in the current batch with same ThreadId
+                if (batchThreadLookup.TryGetValue(item.MailCopy.ThreadId, out var threadableItems) && threadableItems.Count > 1)
+                {
+                    // Create a new thread with all matching items - defer UI operations
+                    var threadViewModel = new ThreadMailItemViewModel(item.MailCopy.ThreadId);
+
+                    // Add emails without UI thread for now
+                    foreach (var threadItem in threadableItems)
+                    {
+                        threadViewModel.AddEmail(threadItem);
+                    }
+
+                    itemsToAdd.Add(threadViewModel);
+
+                    // Mark all threaded items as processed
+                    foreach (var threadItem in threadableItems)
+                    {
+                        processedItems.Add(threadItem);
+                    }
+                    continue;
+                }
+            }
+
+            // No threading needed, add as single item
+            itemsToAdd.Add(item);
+            processedItems.Add(item);
+        }
+
+        // Execute all threading operations in a single UI thread call
+        if (threadingOperations.Count > 0)
+        {
+            foreach (var (group, existingItem, addedItem) in threadingOperations)
+            {
+                await HandleThreadingAsync(group, existingItem, addedItem);
+            }
+        }
+
+        // Execute all updates in a single UI thread call
+        if (itemsToUpdate.Count > 0)
+        {
+            await ExecuteUIThread(() =>
+            {
+                foreach (var (existing, updated) in itemsToUpdate)
+                {
+                    UpdateUniqueIdHashes(existing, false);
+                    existing.UpdateFrom(updated);
+                    UpdateUniqueIdHashes(existing, true);
+                }
+            });
+        }
+
+        // Group items by their grouping key and add them in a single UI thread call
+        if (itemsToAdd.Count > 0)
+        {
+            // Pre-compute grouping on background thread to reduce UI thread work
+            var groupedItems = await Task.Run(() => itemsToAdd
+                .GroupBy(GetGroupingKey)
+                .ToDictionary(g => g.Key, g => g.ToList())).ConfigureAwait(false);
+
+            await ExecuteUIThread(() =>
+            {
+                foreach (var kvp in groupedItems)
+                {
+                    var groupKey = kvp.Key;
+                    var groupItems = kvp.Value;
+
+                    // Update caches first
+                    foreach (var item in groupItems)
+                    {
+                        UpdateUniqueIdHashes(item, true);
+                        UpdateThreadIdCache(item, true);
+                    }
+
+                    var existingGroup = _mailItemSource.FirstGroupByKeyOrDefault(groupKey);
+
+                    if (existingGroup == null)
+                    {
+                        var newGroup = new ObservableGroup<object, IMailListItem>(groupKey, groupItems);
+                        _mailItemSource.AddGroup(groupKey, newGroup);
+
+                        // Update item-to-group cache
+                        foreach (var item in groupItems)
                         {
-                            MailCopyIdHashSet.Add(mailItem.UniqueId);
+                            _itemToGroupMap[item] = newGroup;
+                        }
+                    }
+                    else
+                    {
+                        foreach (var item in groupItems)
+                        {
+                            existingGroup.Add(item);
+                            _itemToGroupMap[item] = existingGroup;
                         }
                     }
                 }
-            }
-
-            var existingGroup = _mailItemSource.FirstGroupByKeyOrDefault(group.Key);
-
-            if (existingGroup == null)
-            {
-                _mailItemSource.AddGroup(group.Key, group);
-            }
-            else
-            {
-                foreach (var item in group)
-                {
-                    existingGroup.Add(item);
-                }
-            }
+            });
         }
     }
 
     public MailItemContainer GetMailItemContainer(Guid uniqueMailId)
     {
-        var groupCount = _mailItemSource.Count;
+        // Fast path: use caches for O(1) lookup
+        if (_uniqueIdToMailItemMap.TryGetValue(uniqueMailId, out var cachedMailItem))
+        {
+            if (_uniqueIdToThreadMap.TryGetValue(uniqueMailId, out var threadVM))
+            {
+                return new MailItemContainer(cachedMailItem, threadVM);
+            }
 
-        for (int i = 0; i < groupCount; i++)
+            return new MailItemContainer(cachedMailItem);
+        }
+
+        // Fallback: scan all groups and populate caches
+        for (int i = 0; i < _mailItemSource.Count; i++)
         {
             var group = _mailItemSource[i];
 
@@ -280,11 +784,20 @@ public class WinoMailCollection
             {
                 var item = group[k];
 
-                if (item is MailItemViewModel singleMailItemViewModel && singleMailItemViewModel.UniqueId == uniqueMailId)
+                if (item is MailItemViewModel singleMailItemViewModel && singleMailItemViewModel.MailCopy.UniqueId == uniqueMailId)
+                {
+                    _uniqueIdToMailItemMap[uniqueMailId] = singleMailItemViewModel;
                     return new MailItemContainer(singleMailItemViewModel);
+                }
                 else if (item is ThreadMailItemViewModel threadMailItemViewModel && threadMailItemViewModel.HasUniqueId(uniqueMailId))
                 {
-                    var singleItemViewModel = threadMailItemViewModel.GetItemById(uniqueMailId) as MailItemViewModel;
+                    var singleItemViewModel = threadMailItemViewModel.ThreadEmails.FirstOrDefault(e => e.MailCopy.UniqueId == uniqueMailId);
+
+                    if (singleItemViewModel != null)
+                    {
+                        _uniqueIdToMailItemMap[uniqueMailId] = singleItemViewModel;
+                        _uniqueIdToThreadMap[uniqueMailId] = threadMailItemViewModel;
+                    }
 
                     return new MailItemContainer(singleItemViewModel, threadMailItemViewModel);
                 }
@@ -294,62 +807,57 @@ public class WinoMailCollection
         return null;
     }
 
-    public void UpdateThumbnails(string address)
+    /// <summary>
+    /// Updates thumbnails for all mail items with the specified address.
+    /// </summary>
+    public Task UpdateThumbnailsForAddressAsync(string address)
     {
-        if (CoreDispatcher == null) return;
+        if (CoreDispatcher == null) return Task.CompletedTask;
 
-        CoreDispatcher.ExecuteOnUIThread(() =>
+        return CoreDispatcher.ExecuteOnUIThread(() =>
         {
             foreach (var group in _mailItemSource)
             {
                 foreach (var item in group)
                 {
-                    if (item is MailItemViewModel mailItemViewModel && mailItemViewModel.MailCopy.FromAddress.Equals(address, StringComparison.OrdinalIgnoreCase))
+                    if (item is MailItemViewModel mailItemViewModel && mailItemViewModel.MailCopy.FromAddress?.Equals(address, StringComparison.OrdinalIgnoreCase) == true)
                     {
                         mailItemViewModel.ThumbnailUpdatedEvent = !mailItemViewModel.ThumbnailUpdatedEvent;
                     }
+                    else if (item is ThreadMailItemViewModel threadViewModel)
+                    {
+                        foreach (var threadMailItem in threadViewModel.ThreadEmails)
+                        {
+                            if (threadMailItem.MailCopy.FromAddress?.Equals(address, StringComparison.OrdinalIgnoreCase) == true)
+                            {
+                                threadMailItem.ThumbnailUpdatedEvent = !threadMailItem.ThumbnailUpdatedEvent;
+                            }
+                        }
+                    }
                 }
             }
         });
     }
 
     /// <summary>
-    /// Fins the item container that updated mail copy belongs to and updates it.
+    /// Finds the item container that updated mail copy belongs to and updates it.
     /// </summary>
     /// <param name="updatedMailCopy">Updated mail copy.</param>
     /// <returns></returns>
-    public async Task UpdateMailCopy(MailCopy updatedMailCopy)
+    public Task UpdateMailCopy(MailCopy updatedMailCopy, MailUpdateSource mailUpdateSource, MailCopyChangeFlags changedProperties = MailCopyChangeFlags.None)
     {
-        // This item doesn't exist in the list.
-        if (!MailCopyIdHashSet.Contains(updatedMailCopy.UniqueId))
+        var itemContainer = GetMailItemContainer(updatedMailCopy.UniqueId);
 
+        if (itemContainer?.ItemViewModel == null)
         {
-            return;
+            return Task.CompletedTask;
         }
 
-        await ExecuteUIThread(() =>
-        {
-            var itemContainer = GetMailItemContainer(updatedMailCopy.UniqueId);
-
-            if (itemContainer == null) return;
-
-            if (itemContainer.ItemViewModel != null)
-            {
-                UpdateUniqueIdHashes(itemContainer.ItemViewModel, false);
-            }
-
-            if (itemContainer.ItemViewModel != null)
-            {
-                itemContainer.ItemViewModel.MailCopy = updatedMailCopy;
-            }
-
-            UpdateUniqueIdHashes(updatedMailCopy, true);
-
-            // Call thread notifications if possible.
-            itemContainer.ThreadViewModel?.NotifyPropertyChanges();
-        });
+        return UpdateExistingItemAsync(itemContainer, updatedMailCopy, mailUpdateSource, changedProperties);
     }
 
+    public MailItemViewModel GetFirst() => AllItems.ElementAtOrDefault(0);
+
     public MailItemViewModel GetNextItem(MailCopy mailCopy)
     {
         try
@@ -364,7 +872,7 @@ public class WinoMailCollection
                 {
                     var item = group[k];
 
-                    if (item is MailItemViewModel singleMailItemViewModel && singleMailItemViewModel.UniqueId == mailCopy.UniqueId)
+                    if (item is MailItemViewModel singleMailItemViewModel && singleMailItemViewModel.MailCopy.UniqueId == mailCopy.UniqueId)
                     {
                         if (k + 1 < group.Count)
                         {
@@ -381,15 +889,15 @@ public class WinoMailCollection
                     }
                     else if (item is ThreadMailItemViewModel threadMailItemViewModel && threadMailItemViewModel.HasUniqueId(mailCopy.UniqueId))
                     {
-                        var singleItemViewModel = threadMailItemViewModel.GetItemById(mailCopy.UniqueId) as MailItemViewModel;
+                        var singleItemViewModel = threadMailItemViewModel.ThreadEmails.FirstOrDefault(e => e.MailCopy.UniqueId == mailCopy.UniqueId);
 
                         if (singleItemViewModel == null) return null;
 
-                        var singleItemIndex = threadMailItemViewModel.ThreadItems.IndexOf(singleItemViewModel);
+                        var singleItemIndex = threadMailItemViewModel.ThreadEmails.ToList().IndexOf(singleItemViewModel);
 
-                        if (singleItemIndex + 1 < threadMailItemViewModel.ThreadItems.Count)
+                        if (singleItemIndex + 1 < threadMailItemViewModel.ThreadEmails.Count)
                         {
-                            return threadMailItemViewModel.ThreadItems[singleItemIndex + 1] as MailItemViewModel;
+                            return threadMailItemViewModel.ThreadEmails[singleItemIndex + 1];
                         }
                         else if (i + 1 < groupCount)
                         {
@@ -415,98 +923,215 @@ public class WinoMailCollection
 
     public async Task RemoveAsync(MailCopy removeItem)
     {
+        var itemContainer = GetMailItemContainer(removeItem.UniqueId);
+
         // This item doesn't exist in the list.
-        if (!MailCopyIdHashSet.Contains(removeItem.UniqueId)) return;
+        if (itemContainer?.ItemViewModel == null) return;
 
-        // Check all items for whether this item should be threaded with them.
-        bool shouldExit = false;
-
-        var groupCount = _mailItemSource.Count;
-
-        for (int i = 0; i < groupCount; i++)
+        if (itemContainer.ThreadViewModel != null)
         {
-            if (shouldExit) break;
+            // Item is inside a thread - use cached lookups instead of scanning all groups.
+            var threadMailItemViewModel = itemContainer.ThreadViewModel;
+            var group = FindGroupContainingItem(threadMailItemViewModel);
+            if (group == null) return;
 
-            var group = _mailItemSource[i];
+            var removalItem = itemContainer.ItemViewModel;
 
-            for (int k = 0; k < group.Count; k++)
+            // Update ThreadId cache before modifying the thread
+            UpdateThreadIdCache(threadMailItemViewModel, false);
+
+            await ExecuteUIThread(() => { threadMailItemViewModel.RemoveEmail(removalItem); });
+
+            // Always clean up the removed item's hashes (fixes leak when thread converts to single)
+            UpdateUniqueIdHashes(removalItem, false);
+
+            // Update ThreadId cache after modifying the thread
+            if (threadMailItemViewModel.EmailCount > 0)
             {
-                var item = group[k];
+                UpdateThreadIdCache(threadMailItemViewModel, true);
+            }
 
-                if (item is ThreadMailItemViewModel threadMailItemViewModel && threadMailItemViewModel.HasUniqueId(removeItem.UniqueId))
+            if (threadMailItemViewModel.EmailCount == 1)
+            {
+                // Convert to single item.
+                var singleViewModel = threadMailItemViewModel.ThreadEmails.First();
+                var groupKey = GetGroupingKey(singleViewModel);
+
+                await RemoveItemInternalAsync(group, threadMailItemViewModel);
+                await InsertItemInternalAsync(groupKey, singleViewModel);
+
+                // If thread->single conversion is being done, we should ignore it for non-draft items.
+                // eg. Deleting a reply message from draft folder. Single non-draft item should not be re-added.
+                if (PruneSingleNonDraftItems && !singleViewModel.IsDraft)
                 {
-                    var removalItem = threadMailItemViewModel.GetItemById(removeItem.UniqueId);
-
-                    if (removalItem == null) return;
-
-                    // Threads' Id is equal to the last item they hold.
-                    // We can't do Id check here because that'd remove the whole thread.
-
-                    /* Remove item from the thread.
-                     * If thread had 1 item inside:
-                     * -> Remove the thread and insert item as single item.
-                     * If thread had 0 item inside:
-                     * -> Remove the thread.
-                     */
-
-                    var oldGroupKey = GetGroupingKey(threadMailItemViewModel);
-
-                    await ExecuteUIThread(() => { threadMailItemViewModel.RemoveCopyItem(removalItem); });
-
-                    if (threadMailItemViewModel.ThreadItems.Count == 1)
+                    var newGroup = _mailItemSource.FirstGroupByKeyOrDefault(groupKey);
+                    if (newGroup != null)
                     {
-                        // Convert to single item.
+                        await RemoveItemInternalAsync(newGroup, singleViewModel);
+                    }
+                }
+            }
+            else if (threadMailItemViewModel.EmailCount == 0)
+            {
+                await RemoveItemInternalAsync(group, threadMailItemViewModel);
+            }
+        }
+        else
+        {
+            // Standalone item.
+            IMailListItem mailItem = itemContainer.ItemViewModel;
+            var group = FindGroupContainingItem(mailItem);
 
-                        var singleViewModel = threadMailItemViewModel.GetSingleItemViewModel();
-                        var groupKey = GetGroupingKey(singleViewModel);
+            if (group != null)
+            {
+                await RemoveItemInternalAsync(group, mailItem);
+            }
+        }
 
-                        await ExecuteUIThread(() =>
+        await NotifySelectionChangesAsync();
+    }
+
+    private IEnumerable<IMailListItem> AllItemsIncludingThreads
+    {
+        get
+        {
+            foreach (var group in _mailItemSource)
+            {
+                foreach (var item in group)
+                {
+                    if (item is ThreadMailItemViewModel threadMailItemViewModel)
+                    {
+                        foreach (var child in threadMailItemViewModel.ThreadEmails)
                         {
-                            RemoveItemInternal(group, threadMailItemViewModel);
-                            InsertItemInternal(groupKey, singleViewModel);
-                        });
-
-                        // If thread->single conversion is being done, we should ignore it for non-draft items.
-                        // eg. Deleting a reply message from draft folder. Single non-draft item should not be re-added.
-
-                        if (PruneSingleNonDraftItems && !singleViewModel.IsDraft)
-                        {
-                            // This item should not be here anymore.
-                            // It's basically a reply mail in Draft folder.
-                            var newGroup = _mailItemSource.FirstGroupByKeyOrDefault(groupKey);
-
-                            if (newGroup != null)
-                            {
-                                await ExecuteUIThread(() => { RemoveItemInternal(newGroup, singleViewModel); });
-                            }
+                            yield return child;
                         }
                     }
-                    else if (threadMailItemViewModel.ThreadItems.Count == 0)
-                    {
-                        await ExecuteUIThread(() => { RemoveItemInternal(group, threadMailItemViewModel); });
-                    }
-                    else
-                    {
-                        // Item inside the thread is removed.
-                        await ExecuteUIThread(() => { threadMailItemViewModel.ThreadItems.Remove(removalItem); });
-
-                        UpdateUniqueIdHashes(removalItem, false);
-                    }
-
-                    shouldExit = true;
-                    break;
-                }
-                else if (item.UniqueId == removeItem.UniqueId)
-                {
-                    await ExecuteUIThread(() => { RemoveItemInternal(group, item); });
-
-                    shouldExit = true;
-
-                    break;
+                    yield return item;
                 }
             }
         }
     }
 
-    private async Task ExecuteUIThread(Action action) => await CoreDispatcher?.ExecuteOnUIThread(action);
+    private IEnumerable<MailItemViewModel> AllItems
+    {
+        get
+        {
+            foreach (var group in _mailItemSource)
+            {
+                foreach (var item in group)
+                {
+                    if (item is ThreadMailItemViewModel threadMail)
+                    {
+                        foreach (var singleItem in threadMail.ThreadEmails)
+                        {
+                            yield return singleItem;
+                        }
+                    }
+                    else if (item is MailItemViewModel mailItemViewModel)
+                        yield return mailItemViewModel;
+                }
+            }
+        }
+    }
+
+    public IEnumerable<MailItemViewModel> SelectedItems => AllItems.Where(a => a.IsSelected);
+    public int SelectedItemsCount => AllItems.Count(a => a.IsSelected);
+    public int AllItemsCount => AllItems.Count();
+    public bool IsAllItemsSelected => AllItems.Any() && AllItems.All(a => a.IsSelected);
+    public bool HasSingleItemSelected => SelectedItemsCount == 1;
+
+    public async Task ExecuteWithoutRaiseSelectionChangedAsync(Action<IMailListItem> action, bool includeThreads)
+    {
+        try
+        {
+            // Do not listen to individual selection changes while we are doing bulk selection.
+            Messenger.Unregister<SelectedItemsChangedMessage>(this);
+
+            await ExecuteUIThread(() =>
+            {
+                if (includeThreads)
+                {
+                    foreach (var item in AllItemsIncludingThreads)
+                    {
+                        action(item);
+                    }
+                }
+                else
+                {
+                    foreach (var item in AllItems)
+                    {
+                        action(item);
+                    }
+                }
+            });
+        }
+        catch (Exception)
+        {
+        }
+        finally
+        {
+            Messenger.Unregister<SelectedItemsChangedMessage>(this);
+            Messenger.Register<SelectedItemsChangedMessage>(this);
+            Messenger.Send(new SelectedItemsChangedMessage());
+
+            await NotifySelectionChangesAsync();
+        }
+    }
+
+    public Task ToggleSelectAllAsync()
+    {
+        if (IsAllItemsSelected)
+        {
+            return UnselectAllAsync();
+        }
+        else
+        {
+            return SelectAllAsync();
+        }
+    }
+
+    /// <summary>
+    /// Gets the index of an item in the flat Items collection.
+    /// Note: WinoMailCollection doesn't have a flat Items collection like GroupedEmailCollection.
+    /// This returns -1 as it's not applicable to the grouped structure.
+    /// </summary>
+    public int IndexOf(object item)
+    {
+        // WinoMailCollection uses grouped structure, so we need to search through groups
+        int currentIndex = 0;
+
+        foreach (var group in _mailItemSource)
+        {
+            foreach (var groupItem in group)
+            {
+                if (ReferenceEquals(groupItem, item))
+                {
+                    return currentIndex;
+                }
+                currentIndex++;
+            }
+        }
+
+        return -1;
+    }
+
+    public Task SelectAllAsync() => ExecuteWithoutRaiseSelectionChangedAsync(a => a.IsSelected = true, true);
+    public Task UnselectAllAsync(IMailListItem exceptItem = null) => ExecuteWithoutRaiseSelectionChangedAsync(a => { if (a != exceptItem) a.IsSelected = false; }, true);
+    public Task CollapseAllThreadsAsync() => ExecuteWithoutRaiseSelectionChangedAsync(a => { if (a is ThreadMailItemViewModel thread) thread.IsThreadExpanded = false; }, true);
+
+    private Task ExecuteUIThread(Action action) => CoreDispatcher?.ExecuteOnUIThread(action);
+
+    public void Receive(SelectedItemsChangedMessage message) => _ = NotifySelectionChangesAsync();
+
+    private async Task NotifySelectionChangesAsync()
+    {
+        await ExecuteUIThread(() =>
+        {
+            OnPropertyChanged(nameof(IsAllItemsSelected));
+            OnPropertyChanged(nameof(SelectedItemsCount));
+            OnPropertyChanged(nameof(HasSingleItemSelected));
+
+            ItemSelectionChanged?.Invoke(this, null);
+        });
+    }
 }
diff --git a/Wino.Mail.ViewModels/ComposePageViewModel.cs b/Wino.Mail.ViewModels/ComposePageViewModel.cs
index 979fcf0a..bf6c23b6 100644
--- a/Wino.Mail.ViewModels/ComposePageViewModel.cs
+++ b/Wino.Mail.ViewModels/ComposePageViewModel.cs
@@ -3,39 +3,64 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using MimeKit;
+using MimeKit.Cryptography;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Extensions;
 using Wino.Core.Services;
 using Wino.Mail.ViewModels.Data;
+using Wino.Mail.ViewModels.Messages;
 using Wino.Messaging.Client.Mails;
-using Wino.Messaging.Server;
+using Wino.Messaging.UI;
 
 namespace Wino.Mail.ViewModels;
 
-public partial class ComposePageViewModel : MailBaseViewModel
+public partial class ComposePageViewModel : MailBaseViewModel,
+    IRecipient<ReaderItemRefreshRequestedEvent>,
+    IRecipient<SynchronizationActionsAdded>,
+    IRecipient<SynchronizationActionsCompleted>,
+    IRecipient<AccountSynchronizerStateChanged>
 {
+    private static readonly TimeSpan LocalDraftRetryGracePeriod = TimeSpan.FromSeconds(15);
+
     public Func<Task<string>> GetHTMLBodyFunction;
 
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
+    {
+        if (args.Handled || args.Mode != WinoApplicationMode.Mail)
+            return;
+
+        if (args.Action == KeyboardShortcutAction.Send)
+        {
+            await SendAsync();
+            args.Handled = true;
+        }
+    }
+
     // When we send the message or discard it, we need to block the mime update
     // Update is triggered when we leave the page.
     private bool isUpdatingMimeBlocked = false;
 
-    private bool canSendMail => ComposingAccount != null && !IsLocalDraft && CurrentMimeMessage != null;
+    private bool canSendMail => ComposingAccount != null && !IsLocalDraft && CurrentMimeMessage != null && !IsDraftBusy;
+    private bool canSendLocalDraftToServer => ComposingAccount != null && IsLocalDraft && CurrentMimeMessage != null && !IsDraftBusy && !IsRetryingSendToServer;
 
     [NotifyCanExecuteChangedFor(nameof(DiscardCommand))]
     [NotifyCanExecuteChangedFor(nameof(SendCommand))]
+    [NotifyCanExecuteChangedFor(nameof(SendToServerCommand))]
     [ObservableProperty]
     private MimeMessage currentMimeMessage = null;
 
@@ -47,47 +72,72 @@ public partial class ComposePageViewModel : MailBaseViewModel
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsLocalDraft))]
+    [NotifyPropertyChangedFor(nameof(ShouldShowSendToServerButton))]
+    [NotifyPropertyChangedFor(nameof(ShouldShowSendButton))]
     [NotifyCanExecuteChangedFor(nameof(DiscardCommand))]
     [NotifyCanExecuteChangedFor(nameof(SendCommand))]
-    private MailItemViewModel currentMailDraftItem;
+    [NotifyCanExecuteChangedFor(nameof(SendToServerCommand))]
+    public partial MailItemViewModel CurrentMailDraftItem { get; set; }
 
     [ObservableProperty]
-    private bool isImportanceSelected;
+    [NotifyPropertyChangedFor(nameof(ShouldShowSendToServerButton))]
+    [NotifyCanExecuteChangedFor(nameof(DiscardCommand))]
+    [NotifyCanExecuteChangedFor(nameof(SendCommand))]
+    [NotifyCanExecuteChangedFor(nameof(SendToServerCommand))]
+    public partial bool IsDraftBusy { get; set; }
 
     [ObservableProperty]
-    private MessageImportance selectedMessageImportance;
+    [NotifyCanExecuteChangedFor(nameof(SendToServerCommand))]
+    public partial bool IsRetryingSendToServer { get; set; }
 
     [ObservableProperty]
-    private bool isCCBCCVisible;
+    public partial bool IsImportanceSelected { get; set; }
 
     [ObservableProperty]
-    private string subject;
+    public partial MessageImportance SelectedMessageImportance { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsCCBCCVisible { get; set; }
+
+    [ObservableProperty]
+    public partial string Subject { get; set; }
 
     [ObservableProperty]
     [NotifyCanExecuteChangedFor(nameof(DiscardCommand))]
     [NotifyCanExecuteChangedFor(nameof(SendCommand))]
-    private MailAccount composingAccount;
+    [NotifyCanExecuteChangedFor(nameof(SendToServerCommand))]
+    public partial MailAccount ComposingAccount { get; set; }
 
     [ObservableProperty]
-    private List<MailAccountAlias> availableAliases;
+    public partial List<MailAccountAlias> AvailableAliases { get; set; }
+    [ObservableProperty]
+    public partial MailAccountAlias SelectedAlias { get; set; }
+    [ObservableProperty]
+    public partial bool IsDraggingOverComposerGrid { get; set; }
+    [ObservableProperty]
+    public partial bool IsDraggingOverFilesDropZone { get; set; }
+    [ObservableProperty]
+    public partial bool IsDraggingOverImagesDropZone { get; set; }
+    [ObservableProperty]
+    public partial bool IsSmimeSignatureEnabled { get; set; }
+    [ObservableProperty]
+    public partial bool IsSmimeEncryptionEnabled { get; set; }
 
     [ObservableProperty]
-    private MailAccountAlias selectedAlias;
+    public partial X509Certificate2 SelectedSigningCertificate { get; set; }
 
-    [ObservableProperty]
-    private bool isDraggingOverComposerGrid;
+    public ObservableCollection<X509Certificate2> AvailableCertificates = [];
 
-    [ObservableProperty]
-    private bool isDraggingOverFilesDropZone;
-
-    [ObservableProperty]
-    private bool isDraggingOverImagesDropZone;
+    public bool AreCertificatesAvailable => AvailableCertificates.Count > 0;
 
+    public ObservableCollection<EmailTemplate> AvailableEmailTemplates { get; } = [];
     public ObservableCollection<MailAttachmentViewModel> IncludedAttachments { get; set; } = [];
     public ObservableCollection<MailAccount> Accounts { get; set; } = [];
     public ObservableCollection<AccountContact> ToItems { get; set; } = [];
     public ObservableCollection<AccountContact> CCItems { get; set; } = [];
     public ObservableCollection<AccountContact> BCCItems { get; set; } = [];
+    public bool ShouldShowSendToServerButton => IsLocalDraft && !IsDraftBusy;
+    public bool ShouldShowSendButton => !IsLocalDraft;
 
     #endregion
 
@@ -99,11 +149,12 @@ public partial class ComposePageViewModel : MailBaseViewModel
     private readonly IFileService _fileService;
     private readonly IFolderService _folderService;
     private readonly IAccountService _accountService;
+    private readonly IEmailTemplateService _emailTemplateService;
     private readonly IWinoRequestDelegator _worker;
     public readonly IFontService FontService;
     public readonly IPreferencesService PreferencesService;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
     public readonly IContactService ContactService;
+    public readonly ISmimeCertificateService _smimeCertificateService;
 
     public ComposePageViewModel(IMailDialogService dialogService,
                                 IMailService mailService,
@@ -112,11 +163,12 @@ public partial class ComposePageViewModel : MailBaseViewModel
                                 INativeAppService nativeAppService,
                                 IFolderService folderService,
                                 IAccountService accountService,
+                                IEmailTemplateService emailTemplateService,
                                 IWinoRequestDelegator worker,
                                 IContactService contactService,
                                 IFontService fontService,
                                 IPreferencesService preferencesService,
-                                IWinoServerConnectionManager winoServerConnectionManager)
+                                ISmimeCertificateService smimeCertificateService)
     {
         NativeAppService = nativeAppService;
         ContactService = contactService;
@@ -129,8 +181,40 @@ public partial class ComposePageViewModel : MailBaseViewModel
         _mimeFileService = mimeFileService;
         _fileService = fileService;
         _accountService = accountService;
+        _emailTemplateService = emailTemplateService;
         _worker = worker;
-        _winoServerConnectionManager = winoServerConnectionManager;
+        _smimeCertificateService = smimeCertificateService;
+
+        foreach (var cert in _smimeCertificateService.GetCertificates(emailAddress: SelectedAlias?.AliasAddress))
+        {
+            if (cert != null)
+            {
+                AvailableCertificates.Add(cert);
+            }
+        }
+    }
+
+    partial void OnSelectedAliasChanged(MailAccountAlias value)
+    {
+        if (value != null)
+        {
+            IsSmimeSignatureEnabled = value.SelectedSigningCertificateThumbprint != null;
+            IsSmimeEncryptionEnabled = value.IsSmimeEncryptionEnabled;
+
+            AvailableCertificates.Clear();
+            var certs = _smimeCertificateService.GetCertificates(emailAddress: SelectedAlias.AliasAddress);
+            foreach (var cert in certs)
+            {
+                AvailableCertificates.Add(cert);
+            }
+            SelectedSigningCertificate = AvailableCertificates
+                .Where(c => c.Thumbprint == SelectedAlias.SelectedSigningCertificateThumbprint).FirstOrDefault() ?? AvailableCertificates.FirstOrDefault();
+        }
+    }
+
+    partial void OnSelectedSigningCertificateChanged(X509Certificate2 value)
+    {
+        IsSmimeSignatureEnabled = value != null;
     }
 
     [RelayCommand]
@@ -214,25 +298,116 @@ public partial class ComposePageViewModel : MailBaseViewModel
 
         isUpdatingMimeBlocked = true;
 
-        var assignedAccount = CurrentMailDraftItem.AssignedAccount;
+        var assignedAccount = CurrentMailDraftItem.MailCopy.AssignedAccount;
         var sentFolder = await _folderService.GetSpecialFolderByAccountIdAsync(assignedAccount.Id, SpecialFolderType.Sent);
 
+
+        // Load alias certs
+        var certs = _smimeCertificateService.GetCertificates(emailAddress: SelectedAlias.AliasAddress);
+
+        if (IsSmimeSignatureEnabled)
+        {
+            var signingCertificate = !string.IsNullOrEmpty(SelectedAlias.SelectedSigningCertificateThumbprint)
+                ? certs.FirstOrDefault(c => c?.Thumbprint == SelectedAlias.SelectedSigningCertificateThumbprint)
+                : null;
+
+            var signer = new CmsSigner(signingCertificate) { DigestAlgorithm = DigestAlgorithm.Sha1 };
+
+            if (IsSmimeEncryptionEnabled)
+            {
+                var recipients = new CmsRecipientCollection();
+                var cmsRecipients = CurrentMimeMessage.To.Mailboxes
+                    .Select(mailbox => new CmsRecipient(
+                        _smimeCertificateService.GetCertificates(emailAddress: mailbox.Address).FirstOrDefault() ?? _smimeCertificateService.GetCertificates(StoreName.AddressBook, emailAddress: mailbox.Address).FirstOrDefault()
+                    ));
+                foreach (var recipient in cmsRecipients)
+                {
+                    recipients.Add(recipient);
+                }
+
+                CurrentMimeMessage.Body = ApplicationPkcs7Mime.SignAndEncrypt(signer, recipients, CurrentMimeMessage.Body);
+            }
+            else
+            {
+                // CurrentMimeMessage.Body = MultipartSigned.Create(signer, CurrentMimeMessage.Body);
+                CurrentMimeMessage.Body = ApplicationPkcs7Mime.Sign(signer, CurrentMimeMessage.Body);
+            }
+        }
+        else if (IsSmimeEncryptionEnabled)
+        {
+            // var encryptionCertificate = !string.IsNullOrEmpty(SelectedAlias.SelectedEncryptionCertificateThumbprint)
+            //     ? certs.FirstOrDefault(c => c?.Thumbprint == SelectedAlias.SelectedEncryptionCertificateThumbprint)
+            //     : null;
+            // Encrypt the message if encryption certificate is selected.
+            CurrentMimeMessage.Body = ApplicationPkcs7Mime.Encrypt(CurrentMimeMessage.To.Mailboxes, CurrentMimeMessage.Body);
+        }
+
         using MemoryStream memoryStream = new();
         CurrentMimeMessage.WriteTo(FormatOptions.Default, memoryStream);
-        byte[] buffer = memoryStream.GetBuffer();
-        int count = (int)memoryStream.Length;
-
-        var base64EncodedMessage = Convert.ToBase64String(buffer);
+        var base64EncodedMessage = Convert.ToBase64String(memoryStream.ToArray());
         var draftSendPreparationRequest = new SendDraftPreparationRequest(CurrentMailDraftItem.MailCopy,
                                                                           SelectedAlias,
                                                                           sentFolder,
-                                                                          CurrentMailDraftItem.AssignedFolder,
-                                                                          CurrentMailDraftItem.AssignedAccount.Preferences,
+                                                                          CurrentMailDraftItem.MailCopy.AssignedFolder,
+                                                                          CurrentMailDraftItem.MailCopy.AssignedAccount.Preferences,
                                                                           base64EncodedMessage);
 
+        await ExecuteUIThread(() =>
+        {
+            IsDraftBusy = true;
+        });
+
         await _worker.ExecuteAsync(draftSendPreparationRequest);
     }
 
+    [RelayCommand(CanExecute = nameof(canSendLocalDraftToServer))]
+    private async Task SendToServerAsync()
+    {
+        if (CurrentMailDraftItem?.MailCopy == null || ComposingAccount == null || CurrentMimeMessage == null)
+            return;
+
+        try
+        {
+            await ExecuteUIThread(() =>
+            {
+                IsRetryingSendToServer = true;
+                IsDraftBusy = true;
+                NotifyComposeActionStateChanged();
+            });
+
+            await UpdateMimeChangesAsync().ConfigureAwait(false);
+
+            var localDraftCopy = CurrentMailDraftItem.MailCopy;
+            var (retryReason, referenceMailCopy) = await ResolveRetryDraftContextAsync().ConfigureAwait(false);
+            var draftPreparationRequest = new DraftPreparationRequest(
+                localDraftCopy.AssignedAccount ?? ComposingAccount,
+                localDraftCopy,
+                CurrentMimeMessage.GetBase64MimeMessage(),
+                retryReason,
+                referenceMailCopy);
+
+            await _worker.ExecuteAsync(draftPreparationRequest).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(Translator.Info_RequestCreationFailedTitle, ex.Message, InfoBarMessageType.Error);
+        }
+        finally
+        {
+            await ExecuteUIThread(() =>
+            {
+                IsRetryingSendToServer = false;
+            });
+
+            await UpdatePendingOperationStateAsync().ConfigureAwait(false);
+
+            await ExecuteUIThread(() =>
+            {
+                NotifyComposeActionStateChanged();
+            });
+        }
+    }
+
     public async Task UpdateMimeChangesAsync()
     {
         if (isUpdatingMimeBlocked || CurrentMimeMessage == null || ComposingAccount == null || CurrentMailDraftItem == null) return;
@@ -332,13 +507,13 @@ public partial class ComposePageViewModel : MailBaseViewModel
         }
     }
 
-    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedFrom(mode, parameters);
+    //public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    //{
+    //    base.OnNavigatedFrom(mode, parameters);
 
-        /// Do not put any code here.
-        /// Make sure to use Page's OnNavigatedTo instead.
-    }
+    //    /// Do not put any code here.
+    //    /// Make sure to use Page's OnNavigatedTo instead.
+    //}
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
@@ -348,17 +523,97 @@ public partial class ComposePageViewModel : MailBaseViewModel
         {
             CurrentMailDraftItem = mailItem;
 
+            await UpdatePendingOperationStateAsync();
+            await LoadEmailTemplatesAsync();
             await TryPrepareComposeAsync(true);
         }
     }
 
+    public async void Receive(ReaderItemRefreshRequestedEvent message)
+    {
+        if (message.MailItemViewModel == null || !message.MailItemViewModel.IsDraft) return;
+
+        // Save current draft before switching.
+        await UpdateMimeChangesAsync();
+
+        // Reset state for the new draft.
+        isUpdatingMimeBlocked = false;
+        ComposingAccount = null;
+        IncludedAttachments.Clear();
+
+        // Set the new draft item and prepare it.
+        CurrentMailDraftItem = message.MailItemViewModel;
+        await UpdatePendingOperationStateAsync();
+        await LoadEmailTemplatesAsync();
+        await TryPrepareComposeAsync(true);
+    }
+
+    private async Task LoadEmailTemplatesAsync()
+    {
+        var templates = await _emailTemplateService.GetEmailTemplatesAsync().ConfigureAwait(false);
+
+        await ExecuteUIThread(() =>
+        {
+            AvailableEmailTemplates.Clear();
+
+            foreach (var template in templates)
+            {
+                AvailableEmailTemplates.Add(template);
+            }
+        });
+    }
+
+    public async void Receive(SynchronizationActionsAdded message)
+    {
+        if (!ShouldTrackDraftSynchronizationState(message.AccountId))
+            return;
+
+        await UpdatePendingOperationStateAsync().ConfigureAwait(false);
+    }
+
+    public async void Receive(SynchronizationActionsCompleted message)
+    {
+        if (!ShouldTrackDraftSynchronizationState(message.AccountId))
+            return;
+
+        await UpdatePendingOperationStateAsync().ConfigureAwait(false);
+    }
+
+    public async void Receive(AccountSynchronizerStateChanged message)
+    {
+        if (message.NewState != AccountSynchronizerState.Idle || !ShouldTrackDraftSynchronizationState(message.AccountId))
+            return;
+
+        await UpdatePendingOperationStateAsync().ConfigureAwait(false);
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<ReaderItemRefreshRequestedEvent>(this);
+        Messenger.Register<SynchronizationActionsAdded>(this);
+        Messenger.Register<SynchronizationActionsCompleted>(this);
+        Messenger.Register<AccountSynchronizerStateChanged>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<ReaderItemRefreshRequestedEvent>(this);
+        Messenger.Unregister<SynchronizationActionsAdded>(this);
+        Messenger.Unregister<SynchronizationActionsCompleted>(this);
+        Messenger.Unregister<AccountSynchronizerStateChanged>(this);
+    }
+
     private async Task<bool> InitializeComposerAccountAsync()
     {
         if (CurrentMailDraftItem == null) return false;
 
         if (ComposingAccount != null) return true;
 
-        var composingAccount = await _accountService.GetAccountAsync(CurrentMailDraftItem.AssignedAccount.Id).ConfigureAwait(false);
+        var composingAccount = await _accountService.GetAccountAsync(CurrentMailDraftItem.MailCopy.AssignedAccount.Id).ConfigureAwait(false);
         if (composingAccount == null) return false;
 
         var aliases = await _accountService.GetAccountAliasesAsync(composingAccount.Id).ConfigureAwait(false);
@@ -377,7 +632,7 @@ public partial class ComposePageViewModel : MailBaseViewModel
             primaryAlias = aliases.Find(a => a.AliasAddress == CurrentMailDraftItem.FromAddress);
         }
 
-        primaryAlias ??= await _accountService.GetPrimaryAccountAliasAsync(ComposingAccount.Id).ConfigureAwait(false);
+        primaryAlias ??= await _accountService.GetPrimaryAccountAliasAsync(composingAccount.Id).ConfigureAwait(false);
 
         await ExecuteUIThread(() =>
         {
@@ -389,6 +644,44 @@ public partial class ComposePageViewModel : MailBaseViewModel
         return true;
     }
 
+    private async Task UpdatePendingOperationStateAsync()
+    {
+        var hasPendingOperation = false;
+        var keepBusyForInitialGracePeriod = false;
+
+        if (CurrentMailDraftItem?.MailCopy == null || !CurrentMailDraftItem.MailCopy.IsDraft)
+        {
+            await ExecuteUIThread(() =>
+            {
+                IsDraftBusy = false;
+                NotifyComposeActionStateChanged();
+            });
+            return;
+        }
+
+        var accountId = CurrentMailDraftItem.MailCopy.AssignedAccount?.Id ?? Guid.Empty;
+
+        if (accountId != Guid.Empty)
+        {
+            var synchronizer = await SynchronizationManager.Instance.GetSynchronizerAsync(accountId).ConfigureAwait(false);
+            hasPendingOperation = synchronizer?.HasPendingOperation(CurrentMailDraftItem.MailCopy.UniqueId) ?? false;
+        }
+
+        // Newly created local drafts can have a short period where request queue is empty
+        // while folder synchronization/mapping is still in progress.
+        // Keep progress visible during this grace period to prevent "Send to server" flicker.
+        if (!hasPendingOperation && CurrentMailDraftItem.MailCopy.IsLocalDraft)
+        {
+            keepBusyForInitialGracePeriod = IsWithinLocalDraftRetryGracePeriod(CurrentMailDraftItem.MailCopy);
+        }
+
+        await ExecuteUIThread(() =>
+        {
+            IsDraftBusy = hasPendingOperation || keepBusyForInitialGracePeriod;
+            NotifyComposeActionStateChanged();
+        });
+    }
+
     private async Task TryPrepareComposeAsync(bool downloadIfNeeded)
     {
         if (CurrentMailDraftItem == null) return;
@@ -397,7 +690,7 @@ public partial class ComposePageViewModel : MailBaseViewModel
 
         if (!isComposerInitialized) return;
 
-        retry:
+    retry:
 
         // Replying existing message.
         MimeMessageInformation mimeMessageInformation = null;
@@ -412,13 +705,12 @@ public partial class ComposePageViewModel : MailBaseViewModel
             {
                 downloadIfNeeded = false;
 
-                var package = new DownloadMissingMessageRequested(CurrentMailDraftItem.AssignedAccount.Id, CurrentMailDraftItem.MailCopy);
-                var downloadResponse = await _winoServerConnectionManager.GetResponseAsync<bool, DownloadMissingMessageRequested>(package);
+                // Download missing MIME message using SynchronizationManager
+                await SynchronizationManager.Instance.DownloadMimeMessageAsync(
+                    CurrentMailDraftItem.MailCopy,
+                    CurrentMailDraftItem.MailCopy.AssignedAccount.Id);
 
-                if (downloadResponse.IsSuccess)
-                {
-                    goto retry;
-                }
+                goto retry;
             }
             else
                 _dialogService.InfoBarMessage(Translator.Info_ComposerMissingMIMETitle, Translator.Info_ComposerMissingMIMEMessage, InfoBarMessageType.Error);
@@ -471,6 +763,8 @@ public partial class ComposePageViewModel : MailBaseViewModel
     {
         if (CurrentMimeMessage == null) return;
 
+        IncludedAttachments.Clear();
+
         foreach (var attachment in CurrentMimeMessage.Attachments)
         {
             if (attachment.IsAttachment && attachment is MimePart attachmentPart)
@@ -530,6 +824,32 @@ public partial class ComposePageViewModel : MailBaseViewModel
             list.Add(new MailboxAddress(item.Name, item.Address));
     }
 
+    private async Task<(DraftCreationReason reason, MailCopy referenceMailCopy)> ResolveRetryDraftContextAsync()
+    {
+        if (CurrentMimeMessage == null || CurrentMailDraftItem?.MailCopy?.AssignedAccount == null)
+            return (DraftCreationReason.Empty, null);
+
+        var inReplyTo = CurrentMimeMessage.InReplyTo;
+        if (string.IsNullOrWhiteSpace(inReplyTo) && CurrentMimeMessage.Headers.Contains(HeaderId.InReplyTo))
+            inReplyTo = CurrentMimeMessage.Headers[HeaderId.InReplyTo];
+
+        inReplyTo = MailHeaderExtensions.StripAngleBrackets(inReplyTo);
+        if (string.IsNullOrWhiteSpace(inReplyTo))
+            return (DraftCreationReason.Empty, null);
+
+        var accountId = CurrentMailDraftItem.MailCopy.AssignedAccount.Id;
+        var referenceMailCopy = await _mailService.GetMailCopyByMessageIdAsync(accountId, inReplyTo).ConfigureAwait(false);
+        if (referenceMailCopy == null)
+            return (DraftCreationReason.Empty, null);
+
+        // We cannot perfectly reconstruct original intent (Reply vs ReplyAll) from persisted data.
+        // Infer ReplyAll when multiple recipients exist on the local MIME.
+        var totalRecipients = CurrentMimeMessage.To.Mailboxes.Count() + CurrentMimeMessage.Cc.Mailboxes.Count();
+        var reason = totalRecipients > 1 ? DraftCreationReason.ReplyAll : DraftCreationReason.Reply;
+
+        return (reason, referenceMailCopy);
+    }
+
     public async Task<AccountContact> GetAddressInformationAsync(string tokenText, ObservableCollection<AccountContact> collection)
     {
         // Get model from the service. This will make sure the name is properly included if there is any record.
@@ -554,21 +874,57 @@ public partial class ComposePageViewModel : MailBaseViewModel
         _dialogService.InfoBarMessage(Translator.Info_InvalidAddressTitle, string.Format(Translator.Info_InvalidAddressMessage, address), InfoBarMessageType.Warning);
     }
 
-    protected override async void OnMailUpdated(MailCopy updatedMail)
+    protected override async void OnMailUpdated(MailCopy updatedMail, MailUpdateSource source, MailCopyChangeFlags changedProperties)
     {
-        base.OnMailUpdated(updatedMail);
+        base.OnMailUpdated(updatedMail, source, changedProperties);
 
         if (CurrentMailDraftItem == null) return;
 
-        if (updatedMail.UniqueId == CurrentMailDraftItem.UniqueId)
+        if (updatedMail.UniqueId == CurrentMailDraftItem.MailCopy.UniqueId)
         {
-            await ExecuteUIThread(() =>
+            await ExecuteUIThread(async () =>
             {
-                CurrentMailDraftItem.MailCopy = updatedMail;
-
-                DiscardCommand.NotifyCanExecuteChanged();
-                SendCommand.NotifyCanExecuteChanged();
+                CurrentMailDraftItem.UpdateFrom(updatedMail, changedProperties);
+                await UpdatePendingOperationStateAsync();
+                NotifyComposeActionStateChanged();
             });
         }
     }
+
+    private void NotifyComposeActionStateChanged()
+    {
+        OnPropertyChanged(nameof(IsLocalDraft));
+        OnPropertyChanged(nameof(ShouldShowSendToServerButton));
+        OnPropertyChanged(nameof(ShouldShowSendButton));
+
+        DiscardCommand.NotifyCanExecuteChanged();
+        SendCommand.NotifyCanExecuteChanged();
+        SendToServerCommand.NotifyCanExecuteChanged();
+    }
+
+    private bool ShouldTrackDraftSynchronizationState(Guid accountId)
+    {
+        if (accountId == Guid.Empty)
+            return false;
+
+        var currentDraftAccountId = CurrentMailDraftItem?.MailCopy?.AssignedAccount?.Id
+                                    ?? ComposingAccount?.Id
+                                    ?? Guid.Empty;
+
+        return currentDraftAccountId != Guid.Empty && currentDraftAccountId == accountId;
+    }
+
+    private bool IsWithinLocalDraftRetryGracePeriod(MailCopy localDraft)
+    {
+        if (localDraft == null || localDraft.CreationDate == default)
+            return false;
+
+        var elapsed = DateTime.UtcNow - localDraft.CreationDate;
+
+        // Clock skew safety.
+        if (elapsed < TimeSpan.Zero)
+            return true;
+
+        return elapsed < LocalDraftRetryGracePeriod;
+    }
 }
diff --git a/Wino.Mail.ViewModels/ContactsPageViewModel.cs b/Wino.Mail.ViewModels/ContactsPageViewModel.cs
new file mode 100644
index 00000000..f08e4ac6
--- /dev/null
+++ b/Wino.Mail.ViewModels/ContactsPageViewModel.cs
@@ -0,0 +1,489 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Contacts;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class ContactsPageViewModel : MailBaseViewModel,
+    IRecipient<NewContactRequested>
+{
+    private const int ContactPageSize = 50;
+
+    private readonly IContactService _contactService;
+    private readonly IMailDialogService _dialogService;
+    private readonly IContactPictureFileService _contactPictureFileService;
+
+    private CancellationTokenSource _searchDebounceCancellationTokenSource;
+    private int _currentOffset = 0;
+    private int _currentQueryVersion = 0;
+
+    [ObservableProperty]
+    public partial string SearchQuery { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreContactsCommand))]
+    [NotifyPropertyChangedFor(nameof(IsEmpty))]
+    public partial bool IsLoading { get; set; } = false;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreContactsCommand))]
+    public partial bool IsLoadingMore { get; set; } = false;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreContactsCommand))]
+    public partial bool HasMoreContacts { get; set; } = false;
+
+    [ObservableProperty]
+    public partial bool IsSelectionMode { get; set; } = false;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(DeleteSelectedContactsCommand))]
+    public partial int SelectedContactsCount { get; set; } = 0;
+
+    [ObservableProperty]
+    public partial int TotalContactsCount { get; set; } = 0;
+
+    public bool IsEmpty => !IsLoading && Contacts.Count == 0;
+    public bool CanLoadMoreContacts => HasMoreContacts && !IsLoading && !IsLoadingMore;
+    public bool CanDeleteSelectedContacts => SelectedContactsCount > 0;
+
+    public ObservableCollection<AccountContactViewModel> Contacts { get; } = new();
+    public ObservableCollection<AccountContactViewModel> SelectedContacts { get; } = new();
+
+    public ContactsPageViewModel(IContactService contactService, IMailDialogService dialogService, IContactPictureFileService contactPictureFileService)
+    {
+        _contactService = contactService;
+        _dialogService = dialogService;
+        _contactPictureFileService = contactPictureFileService;
+
+        Contacts.CollectionChanged += ContactsCollectionChanged;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        SelectedContacts.CollectionChanged -= SelectedContactsChanged;
+        SelectedContacts.CollectionChanged += SelectedContactsChanged;
+
+        await ReloadContactsAsync();
+    }
+
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedFrom(mode, parameters);
+
+        SelectedContacts.CollectionChanged -= SelectedContactsChanged;
+
+        _searchDebounceCancellationTokenSource?.Cancel();
+        _searchDebounceCancellationTokenSource?.Dispose();
+        _searchDebounceCancellationTokenSource = null;
+    }
+
+    private async void SelectedContactsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        => await ExecuteUIThread(() => { SelectedContactsCount = SelectedContacts.Count; });
+
+    private async void ContactsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        => await ExecuteUIThread(() => { OnPropertyChanged(nameof(IsEmpty)); });
+
+    void IRecipient<NewContactRequested>.Receive(NewContactRequested message)
+        => _ = AddContactAsync();
+
+    [RelayCommand]
+    private async Task ReloadContactsAsync()
+    {
+        var queryVersion = ++_currentQueryVersion;
+        _currentOffset = 0;
+
+        await ExecuteUIThread(() =>
+        {
+            HasMoreContacts = false;
+            Contacts.Clear();
+            SelectedContacts.Clear();
+        });
+
+        await LoadContactsPageAsync(queryVersion, reset: true);
+    }
+
+    [RelayCommand(CanExecute = nameof(CanLoadMoreContacts))]
+    private async Task LoadMoreContactsAsync()
+    {
+        await LoadContactsPageAsync(_currentQueryVersion, reset: false);
+    }
+
+    private async Task LoadContactsPageAsync(int queryVersion, bool reset)
+    {
+        if (IsLoading || IsLoadingMore)
+            return;
+
+        await ExecuteUIThread(() =>
+        {
+            if (reset)
+                IsLoading = true;
+            else
+                IsLoadingMore = true;
+        });
+
+        try
+        {
+            var searchQuery = string.IsNullOrWhiteSpace(SearchQuery) ? null : SearchQuery.Trim();
+            var page = await _contactService.GetContactsPageAsync(
+                _currentOffset,
+                ContactPageSize,
+                searchQuery,
+                excludeRootContacts: true).ConfigureAwait(false);
+
+            if (queryVersion != _currentQueryVersion)
+                return;
+
+            await ExecuteUIThread(() =>
+            {
+                if (reset)
+                {
+                    Contacts.Clear();
+                }
+
+                foreach (var contact in page.Contacts)
+                {
+                    Contacts.Add(new AccountContactViewModel(contact));
+                }
+
+                TotalContactsCount = page.TotalCount;
+                HasMoreContacts = page.HasMore;
+                _currentOffset = Contacts.Count;
+            });
+        }
+        catch (Exception ex)
+        {
+            if (queryVersion != _currentQueryVersion)
+                return;
+
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_ErrorTitle,
+                string.Format(Translator.ContactInfoBar_FailedToLoadContacts, ex.Message),
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            if (queryVersion == _currentQueryVersion)
+            {
+                await ExecuteUIThread(() =>
+                {
+                    if (reset)
+                        IsLoading = false;
+                    else
+                        IsLoadingMore = false;
+                });
+            }
+        }
+    }
+
+    [RelayCommand]
+    private async Task AddContactAsync()
+    {
+        var result = await _dialogService.ShowEditContactDialogAsync(null);
+
+        if (result == null) return;
+
+        try
+        {
+            var newContact = await _contactService.CreateNewContactAsync(result.Address, result.Name);
+
+            if (result.ContactPictureFileId.HasValue)
+            {
+                newContact.ContactPictureFileId = result.ContactPictureFileId;
+                await _contactService.UpdateContactAsync(newContact);
+            }
+
+            await ReloadContactsAsync();
+
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_SuccessTitle,
+                Translator.ContactInfoBar_ContactAdded,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_ErrorTitle,
+                string.Format(Translator.ContactInfoBar_FailedToAddContact, ex.Message),
+                InfoBarMessageType.Error);
+        }
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<NewContactRequested>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<NewContactRequested>(this);
+    }
+
+    [RelayCommand]
+    private async Task EditContactAsync(AccountContactViewModel contactViewModel)
+    {
+        var contact = contactViewModel?.SourceContact;
+        if (contact == null) return;
+
+        var result = await _dialogService.ShowEditContactDialogAsync(contact);
+
+        if (result == null) return;
+
+        try
+        {
+            contact.Name = result.Name;
+            contact.ContactPictureFileId = result.ContactPictureFileId;
+            contact.IsOverridden = result.IsOverridden;
+
+            await _contactService.UpdateContactAsync(contact);
+            await ReloadContactsAsync();
+
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_SuccessTitle,
+                Translator.ContactInfoBar_ContactUpdated,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_ErrorTitle,
+                string.Format(Translator.ContactInfoBar_FailedToUpdateContact, ex.Message),
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task DeleteContactAsync(AccountContactViewModel contactViewModel)
+    {
+        var contact = contactViewModel?.SourceContact;
+        if (contact == null || contact.IsRootContact)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_WarningTitle,
+                Translator.ContactInfoBar_CannotDeleteRoot,
+                InfoBarMessageType.Warning);
+            return;
+        }
+
+        var confirmed = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.ContactConfirmDialog_DeleteMessage, contact.Name ?? contact.Address),
+            Translator.ContactConfirmDialog_DeleteTitle,
+            Translator.ContactConfirmDialog_DeleteButton);
+
+        if (confirmed)
+        {
+            await DeleteContactsInternalAsync(new[] { contact });
+        }
+    }
+
+    [RelayCommand(CanExecute = nameof(CanDeleteSelectedContacts))]
+    private async Task DeleteSelectedContactsAsync()
+    {
+        if (SelectedContacts.Count == 0) return;
+
+        var deletableContacts = SelectedContacts
+            .Select(c => c?.SourceContact)
+            .Where(c => c != null && !c.IsRootContact)
+            .GroupBy(c => c.Address, StringComparer.OrdinalIgnoreCase)
+            .Select(g => g.First())
+            .ToList();
+
+        if (deletableContacts.Count == 0)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_WarningTitle,
+                Translator.ContactInfoBar_CannotDeleteRoot,
+                InfoBarMessageType.Warning);
+            return;
+        }
+
+        var confirmed = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.ContactConfirmDialog_DeleteMultipleMessage, deletableContacts.Count),
+            Translator.ContactConfirmDialog_DeleteTitle,
+            Translator.ContactConfirmDialog_DeleteButton);
+
+        if (confirmed)
+        {
+            await DeleteContactsInternalAsync(deletableContacts);
+        }
+    }
+
+    private async Task DeleteContactsInternalAsync(IEnumerable<AccountContact> contactsToDelete)
+    {
+        try
+        {
+            var addresses = contactsToDelete
+                .Select(c => c.Address)
+                .Where(a => !string.IsNullOrWhiteSpace(a))
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (addresses.Count == 0) return;
+
+            await _contactService.DeleteContactsAsync(addresses);
+            await ReloadContactsAsync();
+
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_SuccessTitle,
+                Translator.ContactInfoBar_ContactsDeleted,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_ErrorTitle,
+                string.Format(Translator.ContactInfoBar_FailedToDeleteContacts, ex.Message),
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task ToggleSelection()
+    {
+        await ExecuteUIThread(() =>
+        {
+            IsSelectionMode = !IsSelectionMode;
+
+            if (!IsSelectionMode)
+            {
+                SelectedContacts.Clear();
+            }
+        });
+    }
+
+    [RelayCommand]
+    private async Task SelectAllContacts()
+    {
+        await ExecuteUIThread(() =>
+        {
+            SelectedContacts.Clear();
+
+            foreach (var contact in Contacts)
+            {
+                SelectedContacts.Add(contact);
+            }
+        });
+    }
+
+    [RelayCommand]
+    private async Task ClearSelection()
+    {
+        await ExecuteUIThread(() => { SelectedContacts.Clear(); });
+    }
+
+    [RelayCommand]
+    private async Task PickContactPhotoAsync(AccountContactViewModel contactViewModel)
+    {
+        var contact = contactViewModel?.SourceContact;
+        if (contact == null) return;
+
+        try
+        {
+            var files = await _dialogService.PickFilesAsync(".png", ".jpg", ".jpeg");
+
+            if (files?.Any() == true)
+            {
+                var file = files.First();
+
+                if (contact.ContactPictureFileId.HasValue)
+                    await _contactPictureFileService.DeleteContactPictureAsync(contact.ContactPictureFileId.Value);
+
+                contact.ContactPictureFileId = await _contactPictureFileService
+                    .SaveContactPictureAsync(file.Data)
+                    .ConfigureAwait(false);
+
+                await _contactService.UpdateContactAsync(contact);
+                await RefreshContactInUiAsync(contact);
+
+                _dialogService.InfoBarMessage(
+                    Translator.ContactInfoBar_SuccessTitle,
+                    Translator.ContactInfoBar_ContactPhotoUpdated,
+                    InfoBarMessageType.Success);
+            }
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.ContactInfoBar_ErrorTitle,
+                string.Format(Translator.ContactInfoBar_FailedToUpdatePhoto, ex.Message),
+                InfoBarMessageType.Error);
+        }
+    }
+
+    private async Task RefreshContactInUiAsync(AccountContact contact)
+    {
+        if (contact == null || string.IsNullOrWhiteSpace(contact.Address))
+            return;
+
+        await ExecuteUIThread(() =>
+        {
+            ReplaceContactByAddress(Contacts, contact);
+            ReplaceContactByAddress(SelectedContacts, contact);
+        });
+    }
+
+    private static void ReplaceContactByAddress(ObservableCollection<AccountContactViewModel> source, AccountContact updatedContact)
+    {
+        var index = source
+            .Select((item, i) => new { item, i })
+            .FirstOrDefault(x => string.Equals(x.item.Address, updatedContact.Address, StringComparison.OrdinalIgnoreCase))
+            ?.i ?? -1;
+
+        if (index < 0) return;
+
+        source[index] = new AccountContactViewModel(CloneContact(updatedContact));
+    }
+
+    private static AccountContact CloneContact(AccountContact contact)
+        => new()
+        {
+            Address = contact.Address,
+            Name = contact.Name,
+            ContactPictureFileId = contact.ContactPictureFileId,
+            IsRootContact = contact.IsRootContact,
+            IsOverridden = contact.IsOverridden
+        };
+
+    partial void OnSearchQueryChanged(string value)
+    {
+        DebounceSearchAndReload();
+    }
+
+    private async void DebounceSearchAndReload()
+    {
+        _searchDebounceCancellationTokenSource?.Cancel();
+        _searchDebounceCancellationTokenSource?.Dispose();
+
+        _searchDebounceCancellationTokenSource = new CancellationTokenSource();
+
+        try
+        {
+            await Task.Delay(250, _searchDebounceCancellationTokenSource.Token);
+            await ReloadContactsAsync();
+        }
+        catch (OperationCanceledException)
+        {
+            // Ignore stale search input.
+        }
+    }
+}
diff --git a/Wino.Mail.ViewModels/CreateEmailTemplatePageViewModel.cs b/Wino.Mail.ViewModels/CreateEmailTemplatePageViewModel.cs
new file mode 100644
index 00000000..7e678132
--- /dev/null
+++ b/Wino.Mail.ViewModels/CreateEmailTemplatePageViewModel.cs
@@ -0,0 +1,112 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class CreateEmailTemplatePageViewModel(
+    IEmailTemplateService emailTemplateService,
+    IMailDialogService dialogService,
+    INavigationService navigationService) : MailBaseViewModel
+{
+    private readonly IEmailTemplateService _emailTemplateService = emailTemplateService;
+    private readonly IMailDialogService _dialogService = dialogService;
+
+    private EmailTemplate _editingTemplate;
+
+    public INavigationService NavigationService { get; } = navigationService;
+
+    [ObservableProperty]
+    public partial string TemplateName { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string TemplateDescription { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial bool IsExistingTemplate { get; set; }
+
+    public async Task<string> LoadAsync(object parameter)
+    {
+        EmailTemplate template = null;
+
+        var templateId = parameter switch
+        {
+            Guid guid when guid != Guid.Empty => guid,
+            string value when Guid.TryParse(value, out var parsedGuid) => parsedGuid,
+            EmailTemplate emailTemplate when emailTemplate.Id != Guid.Empty => emailTemplate.Id,
+            _ => Guid.Empty
+        };
+
+        if (templateId != Guid.Empty)
+        {
+            template = await _emailTemplateService.GetEmailTemplateAsync(templateId).ConfigureAwait(false);
+        }
+
+        _editingTemplate = template;
+
+        await ExecuteUIThread(() =>
+        {
+            IsExistingTemplate = template != null;
+            TemplateName = template?.Name ?? string.Empty;
+            TemplateDescription = template?.Description ?? string.Empty;
+        });
+
+        return template?.HtmlContent ?? string.Empty;
+    }
+
+    public async Task SaveAsync(string htmlContent)
+    {
+        var trimmedName = TemplateName?.Trim() ?? string.Empty;
+
+        if (string.IsNullOrWhiteSpace(trimmedName))
+        {
+            _dialogService.InfoBarMessage(
+                Translator.GeneralTitle_Error,
+                Translator.SettingsEmailTemplates_NameRequired,
+                InfoBarMessageType.Warning);
+            return;
+        }
+
+        var template = _editingTemplate ?? new EmailTemplate
+        {
+            Id = Guid.NewGuid()
+        };
+
+        template.Name = trimmedName;
+        template.Description = TemplateDescription?.Trim() ?? string.Empty;
+        template.HtmlContent = htmlContent ?? string.Empty;
+
+        if (_editingTemplate == null)
+        {
+            await _emailTemplateService.CreateEmailTemplateAsync(template).ConfigureAwait(false);
+        }
+        else
+        {
+            await _emailTemplateService.UpdateEmailTemplateAsync(template).ConfigureAwait(false);
+        }
+
+        _editingTemplate = template;
+        NavigationService.GoBack();
+    }
+
+    public async Task DeleteAsync()
+    {
+        if (_editingTemplate == null)
+            return;
+
+        var shouldDelete = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.DialogMessage_DeleteEmailTemplateConfirmationMessage, _editingTemplate.Name),
+            Translator.DialogMessage_DeleteEmailTemplateConfirmationTitle,
+            Translator.Buttons_Delete).ConfigureAwait(false);
+
+        if (!shouldDelete)
+            return;
+
+        await _emailTemplateService.DeleteEmailTemplateAsync(_editingTemplate).ConfigureAwait(false);
+        NavigationService.GoBack();
+    }
+}
diff --git a/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs b/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
index cc9ff979..7a9ae7f2 100644
--- a/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
+++ b/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
@@ -1,23 +1,28 @@
-using System;
+using System;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Mail.ViewModels.Data;
 
-public partial class AccountContactViewModel : ObservableObject
+public partial class AccountContactViewModel : ObservableObject, IMailItemDisplayInformation
 {
+    public AccountContact SourceContact { get; }
     public string Address { get; set; }
     public string Name { get; set; }
-    public string Base64ContactPicture { get; set; }
+    public Guid? ContactPictureFileId { get; set; }
     public bool IsRootContact { get; set; }
+    public bool IsOverridden { get; set; }
 
     public AccountContactViewModel(AccountContact contact)
     {
+        SourceContact = contact;
         Address = contact.Address;
         Name = contact.Name;
-        Base64ContactPicture = contact.Base64ContactPicture;
+        ContactPictureFileId = contact.ContactPictureFileId;
         IsRootContact = contact.IsRootContact;
+        IsOverridden = contact.IsOverridden;
     }
 
     /// <summary>
@@ -49,4 +54,26 @@ public partial class AccountContactViewModel : ObservableObject
 
     [ObservableProperty]
     public partial bool ThumbnailUpdatedEvent { get; set; }
+
+    // IMailItemDisplayInformation implementation for avatar-only rendering.
+    public string Subject => string.Empty;
+    public string FromName => Name ?? string.Empty;
+    public string FromAddress => Address ?? string.Empty;
+    public string PreviewText => string.Empty;
+    public bool IsRead => true;
+    public bool IsDraft => false;
+    public bool HasAttachments => false;
+    public bool IsCalendarEvent => false;
+    public bool IsFlagged => false;
+    public DateTime CreationDate => default;
+    public bool IsBusy => false;
+    public bool IsThreadExpanded => false;
+    public AccountContact SenderContact => new()
+    {
+        Address = Address,
+        Name = Name,
+        ContactPictureFileId = ContactPictureFileId,
+        IsRootContact = IsRootContact,
+        IsOverridden = IsOverridden
+    };
 }
diff --git a/Wino.Mail.ViewModels/Data/AccountStorageItemViewModel.cs b/Wino.Mail.ViewModels/Data/AccountStorageItemViewModel.cs
new file mode 100644
index 00000000..b82046a1
--- /dev/null
+++ b/Wino.Mail.ViewModels/Data/AccountStorageItemViewModel.cs
@@ -0,0 +1,40 @@
+using System.Windows.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Extensions;
+
+namespace Wino.Mail.ViewModels.Data;
+
+public partial class AccountStorageItemViewModel(MailAccount account, long sizeBytes, ICommand deleteAllCommand, ICommand deleteOneMonthCommand, ICommand deleteThreeMonthsCommand, ICommand deleteSixMonthsCommand, ICommand deleteYearCommand) : ObservableObject
+{
+    public MailAccount Account { get; } = account;
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(SizeText))]
+    public partial long SizeBytes { get; set; } = sizeBytes;
+
+    [ObservableProperty]
+    public partial string SizeDescription { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial ICommand DeleteAllCommand { get; set; } = deleteAllCommand;
+
+    [ObservableProperty]
+    public partial ICommand DeleteOneMonthCommand { get; set; } = deleteOneMonthCommand;
+
+    [ObservableProperty]
+    public partial ICommand DeleteThreeMonthsCommand { get; set; } = deleteThreeMonthsCommand;
+
+    [ObservableProperty]
+    public partial ICommand DeleteSixMonthsCommand { get; set; } = deleteSixMonthsCommand;
+
+    [ObservableProperty]
+    public partial ICommand DeleteYearCommand { get; set; } = deleteYearCommand;
+
+    public string AccountName => string.IsNullOrWhiteSpace(Account.Name) ? Account.Address ?? string.Empty : Account.Name;
+    public string AccountAddress => Account.Address ?? string.Empty;
+    public string SizeText => SizeBytes.GetBytesReadable();
+}
diff --git a/Wino.Mail.ViewModels/Data/IMailListItem.cs b/Wino.Mail.ViewModels/Data/IMailListItem.cs
new file mode 100644
index 00000000..957915ba
--- /dev/null
+++ b/Wino.Mail.ViewModels/Data/IMailListItem.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.ViewModels.Data;
+
+/// <summary>
+/// Common interface for mail items that can be displayed in a mail list.
+/// Implemented by both MailItemViewModel and ThreadMailItemViewModel.
+/// </summary>
+public interface IMailListItem : IMailHashContainer, IMailListItemSorting, INotifyPropertyChanged
+{
+    /// <summary>
+    /// Gets the latest creation date for sorting purposes.
+    /// For MailItemViewModel: the mail's creation date
+    /// For ThreadMailItemViewModel: the latest email's creation date
+    /// </summary>
+    DateTime CreationDate { get; }
+
+    /// <summary>
+    /// Gets the sender's name for grouping purposes.
+    /// For MailItemViewModel: the mail's from name
+    /// For ThreadMailItemViewModel: the latest email's from name
+    /// </summary>
+    string FromName { get; }
+
+    /// <summary>
+    /// Gets whether this item is selected.
+    /// For MailItemViewModel: returns IsSelected
+    /// For ThreadMailItemViewModel: returns IsSelected
+    /// </summary>
+    bool IsSelected { get; set; }
+
+    /// <summary>
+    /// Gets whether this item is currently processing a network operation.
+    /// </summary>
+    bool IsBusy { get; }
+
+    /// <summary>
+    /// Gets all selected mail items within this list item.
+    /// For MailItemViewModel: returns itself if IsSelected is true, otherwise empty
+    /// For ThreadMailItemViewModel: returns all selected emails within the thread
+    /// </summary>
+    IEnumerable<MailItemViewModel> GetSelectedMailItems();
+}
diff --git a/Wino.Mail.ViewModels/Data/ImapCalDavSettingsNavigationContext.cs b/Wino.Mail.ViewModels/Data/ImapCalDavSettingsNavigationContext.cs
new file mode 100644
index 00000000..8a1bce39
--- /dev/null
+++ b/Wino.Mail.ViewModels/Data/ImapCalDavSettingsNavigationContext.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Mail.ViewModels.Data;
+
+public enum ImapCalDavSettingsPageMode
+{
+    Create,
+    Edit,
+    Wizard
+}
+
+public sealed class ImapCalDavSettingsNavigationContext
+{
+    public ImapCalDavSettingsPageMode Mode { get; init; }
+    public Guid AccountId { get; init; }
+    public AccountCreationDialogResult AccountCreationDialogResult { get; init; }
+    public TaskCompletionSource<ImapCalDavSetupResult> CompletionSource { get; init; }
+
+    public static ImapCalDavSettingsNavigationContext CreateForCreateMode(
+        AccountCreationDialogResult accountCreationDialogResult,
+        TaskCompletionSource<ImapCalDavSetupResult> completionSource)
+        => new()
+        {
+            Mode = ImapCalDavSettingsPageMode.Create,
+            AccountCreationDialogResult = accountCreationDialogResult,
+            CompletionSource = completionSource
+        };
+
+    public static ImapCalDavSettingsNavigationContext CreateForEditMode(Guid accountId)
+        => new()
+        {
+            Mode = ImapCalDavSettingsPageMode.Edit,
+            AccountId = accountId
+        };
+
+    public static ImapCalDavSettingsNavigationContext CreateForWizardMode(
+        AccountCreationDialogResult accountCreationDialogResult)
+        => new()
+        {
+            Mode = ImapCalDavSettingsPageMode.Wizard,
+            AccountCreationDialogResult = accountCreationDialogResult
+        };
+
+    public bool IsWizardMode => Mode == ImapCalDavSettingsPageMode.Wizard;
+}
+
+public sealed class ImapCalDavSetupResult
+{
+    public string DisplayName { get; init; }
+    public string EmailAddress { get; init; }
+    public bool IsCalendarAccessGranted { get; init; }
+    public CustomServerInformation ServerInformation { get; init; }
+}
+
+public sealed class ImapCalendarSupportModeOption(ImapCalendarSupportMode mode, string title)
+{
+    public ImapCalendarSupportMode Mode { get; } = mode;
+    public string Title { get; } = title;
+}
diff --git a/Wino.Mail.ViewModels/Data/MailItemContainer.cs b/Wino.Mail.ViewModels/Data/MailItemContainer.cs
index 08920973..67d5f590 100644
--- a/Wino.Mail.ViewModels/Data/MailItemContainer.cs
+++ b/Wino.Mail.ViewModels/Data/MailItemContainer.cs
@@ -6,6 +6,25 @@ public class MailItemContainer
 {
     public MailItemViewModel ItemViewModel { get; set; }
     public ThreadMailItemViewModel ThreadViewModel { get; set; }
+    
+    /// <summary>
+    /// Indicates whether the mail item is currently visible in the UI's Items collection.
+    /// For threaded items, this indicates if the individual mail item is visible (thread must be expanded).
+    /// </summary>
+    public bool IsItemVisible { get; set; }
+    
+    /// <summary>
+    /// Indicates whether the thread expander (if applicable) is currently visible in the UI's Items collection.
+    /// Only relevant when ThreadViewModel is not null.
+    /// </summary>
+    public bool IsThreadVisible { get; set; }
+    
+    /// <summary>
+    /// Indicates whether the container can be successfully navigated to in the UI.
+    /// For standalone items: true if IsItemVisible is true.
+    /// For threaded items: true if IsThreadVisible is true (the thread expander can be navigated to).
+    /// </summary>
+    public bool CanNavigate => ThreadViewModel != null ? IsThreadVisible : IsItemVisible;
 
     public MailItemContainer(MailItemViewModel itemViewModel, ThreadMailItemViewModel threadViewModel) : this(itemViewModel)
     {
diff --git a/Wino.Mail.ViewModels/Data/MailItemViewModel.cs b/Wino.Mail.ViewModels/Data/MailItemViewModel.cs
index 66344587..7eebd613 100644
--- a/Wino.Mail.ViewModels/Data/MailItemViewModel.cs
+++ b/Wino.Mail.ViewModels/Data/MailItemViewModel.cs
@@ -3,34 +3,78 @@ using System.Collections.Generic;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Mail.ViewModels.Data;
 
 /// <summary>
 /// Single view model for IMailItem representation.
 /// </summary>
-public partial class MailItemViewModel(MailCopy mailCopy) : ObservableObject, IMailItem
+public partial class MailItemViewModel(MailCopy mailCopy) : ObservableRecipient, IMailListItem, IMailItemDisplayInformation
 {
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(CreationDate))]
+    [NotifyPropertyChangedFor(nameof(IsFlagged))]
+    [NotifyPropertyChangedFor(nameof(FromName))]
+    [NotifyPropertyChangedFor(nameof(IsFocused))]
+    [NotifyPropertyChangedFor(nameof(IsRead))]
+    [NotifyPropertyChangedFor(nameof(IsDraft))]
+    [NotifyPropertyChangedFor(nameof(DraftId))]
+    [NotifyPropertyChangedFor(nameof(Id))]
+    [NotifyPropertyChangedFor(nameof(Subject))]
+    [NotifyPropertyChangedFor(nameof(PreviewText))]
+    [NotifyPropertyChangedFor(nameof(FromAddress))]
+    [NotifyPropertyChangedFor(nameof(HasAttachments))]
+    [NotifyPropertyChangedFor(nameof(IsCalendarEvent))]
+    [NotifyPropertyChangedFor(nameof(Importance))]
+    [NotifyPropertyChangedFor(nameof(ThreadId))]
+    [NotifyPropertyChangedFor(nameof(MessageId))]
+    [NotifyPropertyChangedFor(nameof(References))]
+    [NotifyPropertyChangedFor(nameof(InReplyTo))]
+    [NotifyPropertyChangedFor(nameof(FileId))]
+    [NotifyPropertyChangedFor(nameof(FolderId))]
+    [NotifyPropertyChangedFor(nameof(UniqueId))]
+    [NotifyPropertyChangedFor(nameof(ContactPictureFileId))]
+    [NotifyPropertyChangedFor(nameof(SenderContact))]
     public partial MailCopy MailCopy { get; set; } = mailCopy;
 
-    public Guid UniqueId => ((IMailItem)MailCopy).UniqueId;
-    public string ThreadId => ((IMailItem)MailCopy).ThreadId;
-    public string MessageId => ((IMailItem)MailCopy).MessageId;
-    public DateTime CreationDate => ((IMailItem)MailCopy).CreationDate;
-    public string References => ((IMailItem)MailCopy).References;
-    public string InReplyTo => ((IMailItem)MailCopy).InReplyTo;
+    [ObservableProperty]
+    public partial bool IsDisplayedInThread { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedRecipients]
+    public partial bool IsSelected { get; set; }
+
+    /// <summary>
+    /// Direct callback invoked when <see cref="IsSelected"/> changes.
+    /// Used by the ListViewItem container to update its IsCustomSelected DP
+    /// without subscribing to INotifyPropertyChanged (faster, AOT-safe).
+    /// </summary>
+    public Action<bool> OnSelectionChanged { get; set; }
+
+    partial void OnIsSelectedChanged(bool value) => OnSelectionChanged?.Invoke(value);
+
+    /// <summary>
+    /// Indicates if this mail item is currently being processed by a network operation.
+    /// Used to show loading state in the UI.
+    /// </summary>
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    public bool IsThreadExpanded => false;
+
+    public AccountContact SenderContact => MailCopy.SenderContact;
+
+    public DateTime CreationDate
+    {
+        get => MailCopy.CreationDate;
+        set => SetProperty(MailCopy.CreationDate, value, MailCopy, (u, n) => u.CreationDate = n);
+    }
 
     [ObservableProperty]
     public partial bool ThumbnailUpdatedEvent { get; set; } = false;
 
-    [ObservableProperty]
-    public partial bool IsCustomFocused { get; set; }
-
-    [ObservableProperty]
-    public partial bool IsSelected { get; set; }
-
     public bool IsFlagged
     {
         get => MailCopy.IsFlagged;
@@ -97,13 +141,274 @@ public partial class MailItemViewModel(MailCopy mailCopy) : ObservableObject, IM
         set => SetProperty(MailCopy.HasAttachments, value, MailCopy, (u, n) => u.HasAttachments = n);
     }
 
-    public MailItemFolder AssignedFolder => ((IMailItem)MailCopy).AssignedFolder;
+    public bool IsCalendarEvent => MailCopy.ItemType == MailItemType.CalendarInvitation;
 
-    public MailAccount AssignedAccount => ((IMailItem)MailCopy).AssignedAccount;
+    public MailImportance Importance
+    {
+        get => MailCopy.Importance;
+        set => SetProperty(MailCopy.Importance, value, MailCopy, (u, n) => u.Importance = n);
+    }
 
-    public Guid FileId => ((IMailItem)MailCopy).FileId;
+    public string ThreadId
+    {
+        get => MailCopy.ThreadId;
+        set => SetProperty(MailCopy.ThreadId, value, MailCopy, (u, n) => u.ThreadId = n);
+    }
 
-    public AccountContact SenderContact => ((IMailItem)MailCopy).SenderContact;
+    public string MessageId
+    {
+        get => MailCopy.MessageId;
+        set => SetProperty(MailCopy.MessageId, value, MailCopy, (u, n) => u.MessageId = n);
+    }
 
-    public IEnumerable<Guid> GetContainingIds() => new[] { UniqueId };
+    public string References
+    {
+        get => MailCopy.References;
+        set => SetProperty(MailCopy.References, value, MailCopy, (u, n) => u.References = n);
+    }
+
+    public string InReplyTo
+    {
+        get => MailCopy.InReplyTo;
+        set => SetProperty(MailCopy.InReplyTo, value, MailCopy, (u, n) => u.InReplyTo = n);
+    }
+
+    public Guid FileId
+    {
+        get => MailCopy.FileId;
+        set => SetProperty(MailCopy.FileId, value, MailCopy, (u, n) => u.FileId = n);
+    }
+
+    public Guid FolderId
+    {
+        get => MailCopy.FolderId;
+        set => SetProperty(MailCopy.FolderId, value, MailCopy, (u, n) => u.FolderId = n);
+    }
+
+    public Guid UniqueId
+    {
+        get => MailCopy.UniqueId;
+        set => SetProperty(MailCopy.UniqueId, value, MailCopy, (u, n) => u.UniqueId = n);
+    }
+
+    public Guid? ContactPictureFileId
+    {
+        get => MailCopy.SenderContact?.ContactPictureFileId;
+        set => SetProperty(MailCopy.SenderContact?.ContactPictureFileId, value, MailCopy, (u, n) =>
+        {
+            if (u.SenderContact != null)
+                u.SenderContact.ContactPictureFileId = n;
+        });
+    }
+
+    public DateTime SortingDate => CreationDate;
+
+    public string SortingName => FromName;
+
+    public IEnumerable<Guid> GetContainingIds() => [MailCopy.UniqueId];
+
+    public IEnumerable<MailItemViewModel> GetSelectedMailItems()
+    {
+        if (IsSelected)
+        {
+            yield return this;
+        }
+    }
+
+    public static MailCopyChangeFlags GetChangeFlagsForProperty(string propertyName)
+    {
+        return propertyName switch
+        {
+            nameof(CreationDate) or nameof(SortingDate) => MailCopyChangeFlags.CreationDate,
+            nameof(IsFlagged) => MailCopyChangeFlags.IsFlagged,
+            nameof(FromName) or nameof(SortingName) => MailCopyChangeFlags.FromName,
+            nameof(IsFocused) => MailCopyChangeFlags.IsFocused,
+            nameof(IsRead) => MailCopyChangeFlags.IsRead,
+            nameof(IsDraft) => MailCopyChangeFlags.IsDraft,
+            nameof(DraftId) => MailCopyChangeFlags.DraftId,
+            nameof(Id) => MailCopyChangeFlags.Id,
+            nameof(Subject) => MailCopyChangeFlags.Subject,
+            nameof(PreviewText) => MailCopyChangeFlags.PreviewText,
+            nameof(FromAddress) => MailCopyChangeFlags.FromAddress,
+            nameof(HasAttachments) => MailCopyChangeFlags.HasAttachments,
+            nameof(IsCalendarEvent) => MailCopyChangeFlags.ItemType,
+            nameof(Importance) => MailCopyChangeFlags.Importance,
+            nameof(ThreadId) => MailCopyChangeFlags.ThreadId,
+            nameof(MessageId) => MailCopyChangeFlags.MessageId,
+            nameof(References) => MailCopyChangeFlags.References,
+            nameof(InReplyTo) => MailCopyChangeFlags.InReplyTo,
+            nameof(FileId) => MailCopyChangeFlags.FileId,
+            nameof(FolderId) => MailCopyChangeFlags.FolderId,
+            nameof(UniqueId) => MailCopyChangeFlags.UniqueId,
+            nameof(ContactPictureFileId) or nameof(SenderContact) => MailCopyChangeFlags.SenderContact,
+            _ => MailCopyChangeFlags.None
+        };
+    }
+
+    /// <summary>
+    /// Updates the existing <see cref="MailCopy"/> while raising only the relevant UI notifications.
+    /// </summary>
+    /// <param name="source">Source data used to update this item.</param>
+    /// <param name="changeHint">
+    /// Optional set of known changes. This is required when <paramref name="source"/> is the same instance
+    /// and has already been mutated by Apply/Revert flows.
+    /// </param>
+    /// <returns>The effective set of changed fields used for notifications.</returns>
+    public MailCopyChangeFlags UpdateFrom(MailCopy source, MailCopyChangeFlags changeHint = MailCopyChangeFlags.None)
+    {
+        if (source == null) return MailCopyChangeFlags.None;
+
+        var changedFlags = MailCopyChangeFlags.None;
+        var isSameReference = ReferenceEquals(MailCopy, source);
+
+        if (!isSameReference)
+        {
+            changedFlags |= SetIfChanged(MailCopy.Id, source.Id, value => MailCopy.Id = value, MailCopyChangeFlags.Id);
+            changedFlags |= SetIfChanged(MailCopy.FolderId, source.FolderId, value => MailCopy.FolderId = value, MailCopyChangeFlags.FolderId);
+            changedFlags |= SetIfChanged(MailCopy.ThreadId, source.ThreadId, value => MailCopy.ThreadId = value, MailCopyChangeFlags.ThreadId);
+            changedFlags |= SetIfChanged(MailCopy.MessageId, source.MessageId, value => MailCopy.MessageId = value, MailCopyChangeFlags.MessageId);
+            changedFlags |= SetIfChanged(MailCopy.References, source.References, value => MailCopy.References = value, MailCopyChangeFlags.References);
+            changedFlags |= SetIfChanged(MailCopy.InReplyTo, source.InReplyTo, value => MailCopy.InReplyTo = value, MailCopyChangeFlags.InReplyTo);
+            changedFlags |= SetIfChanged(MailCopy.IsDraft, source.IsDraft, value => MailCopy.IsDraft = value, MailCopyChangeFlags.IsDraft);
+            changedFlags |= SetIfChanged(MailCopy.DraftId, source.DraftId, value => MailCopy.DraftId = value, MailCopyChangeFlags.DraftId);
+            changedFlags |= SetIfChanged(MailCopy.CreationDate, source.CreationDate, value => MailCopy.CreationDate = value, MailCopyChangeFlags.CreationDate);
+            changedFlags |= SetIfChanged(MailCopy.Subject, source.Subject, value => MailCopy.Subject = value, MailCopyChangeFlags.Subject);
+            changedFlags |= SetIfChanged(MailCopy.PreviewText, source.PreviewText, value => MailCopy.PreviewText = value, MailCopyChangeFlags.PreviewText);
+            changedFlags |= SetIfChanged(MailCopy.FromName, source.FromName, value => MailCopy.FromName = value, MailCopyChangeFlags.FromName);
+            changedFlags |= SetIfChanged(MailCopy.FromAddress, source.FromAddress, value => MailCopy.FromAddress = value, MailCopyChangeFlags.FromAddress);
+            changedFlags |= SetIfChanged(MailCopy.HasAttachments, source.HasAttachments, value => MailCopy.HasAttachments = value, MailCopyChangeFlags.HasAttachments);
+            changedFlags |= SetIfChanged(MailCopy.Importance, source.Importance, value => MailCopy.Importance = value, MailCopyChangeFlags.Importance);
+            changedFlags |= SetIfChanged(MailCopy.IsRead, source.IsRead, value => MailCopy.IsRead = value, MailCopyChangeFlags.IsRead);
+            changedFlags |= SetIfChanged(MailCopy.IsFlagged, source.IsFlagged, value => MailCopy.IsFlagged = value, MailCopyChangeFlags.IsFlagged);
+            changedFlags |= SetIfChanged(MailCopy.IsFocused, source.IsFocused, value => MailCopy.IsFocused = value, MailCopyChangeFlags.IsFocused);
+            changedFlags |= SetIfChanged(MailCopy.FileId, source.FileId, value => MailCopy.FileId = value, MailCopyChangeFlags.FileId);
+            changedFlags |= SetIfChanged(MailCopy.ItemType, source.ItemType, value => MailCopy.ItemType = value, MailCopyChangeFlags.ItemType);
+            changedFlags |= SetIfChanged(MailCopy.SenderContact, source.SenderContact, value => MailCopy.SenderContact = value, MailCopyChangeFlags.SenderContact);
+            changedFlags |= SetIfChanged(MailCopy.AssignedAccount, source.AssignedAccount, value => MailCopy.AssignedAccount = value, MailCopyChangeFlags.AssignedAccount);
+            changedFlags |= SetIfChanged(MailCopy.AssignedFolder, source.AssignedFolder, value => MailCopy.AssignedFolder = value, MailCopyChangeFlags.AssignedFolder);
+            changedFlags |= SetIfChanged(MailCopy.UniqueId, source.UniqueId, value => MailCopy.UniqueId = value, MailCopyChangeFlags.UniqueId);
+        }
+
+        changedFlags |= changeHint;
+
+        if (isSameReference && changedFlags == MailCopyChangeFlags.None)
+        {
+            // Without a hint there is no reliable way to diff in-place updates on the same instance.
+            // Fall back to full refresh to preserve correctness.
+            changedFlags = MailCopyChangeFlags.All;
+        }
+
+        RaisePropertyChanges(changedFlags);
+
+        return changedFlags;
+    }
+
+    private static MailCopyChangeFlags SetIfChanged<T>(T currentValue, T newValue, Action<T> setter, MailCopyChangeFlags flag)
+    {
+        if (EqualityComparer<T>.Default.Equals(currentValue, newValue))
+            return MailCopyChangeFlags.None;
+
+        setter(newValue);
+        return flag;
+    }
+
+    private void RaisePropertyChanges(MailCopyChangeFlags changedFlags)
+    {
+        if (changedFlags == MailCopyChangeFlags.None)
+            return;
+
+        var changedProperties = new List<string>(12);
+
+        void Queue(string propertyName)
+        {
+            if (!changedProperties.Contains(propertyName))
+            {
+                changedProperties.Add(propertyName);
+            }
+        }
+
+        if ((changedFlags & MailCopyChangeFlags.CreationDate) != 0)
+        {
+            Queue(nameof(CreationDate));
+            Queue(nameof(SortingDate));
+        }
+
+        if ((changedFlags & MailCopyChangeFlags.IsFlagged) != 0)
+            Queue(nameof(IsFlagged));
+
+        if ((changedFlags & MailCopyChangeFlags.FromName) != 0)
+        {
+            Queue(nameof(FromName));
+            Queue(nameof(SortingName));
+        }
+
+        if ((changedFlags & MailCopyChangeFlags.FromAddress) != 0)
+        {
+            Queue(nameof(FromAddress));
+            Queue(nameof(FromName));
+            Queue(nameof(SortingName));
+        }
+
+        if ((changedFlags & MailCopyChangeFlags.IsFocused) != 0)
+            Queue(nameof(IsFocused));
+
+        if ((changedFlags & MailCopyChangeFlags.IsRead) != 0)
+            Queue(nameof(IsRead));
+
+        if ((changedFlags & MailCopyChangeFlags.IsDraft) != 0)
+            Queue(nameof(IsDraft));
+
+        if ((changedFlags & MailCopyChangeFlags.DraftId) != 0)
+            Queue(nameof(DraftId));
+
+        if ((changedFlags & MailCopyChangeFlags.Id) != 0)
+            Queue(nameof(Id));
+
+        if ((changedFlags & MailCopyChangeFlags.Subject) != 0)
+            Queue(nameof(Subject));
+
+        if ((changedFlags & MailCopyChangeFlags.PreviewText) != 0)
+            Queue(nameof(PreviewText));
+
+        if ((changedFlags & MailCopyChangeFlags.HasAttachments) != 0)
+            Queue(nameof(HasAttachments));
+
+        if ((changedFlags & MailCopyChangeFlags.ItemType) != 0)
+            Queue(nameof(IsCalendarEvent));
+
+        if ((changedFlags & MailCopyChangeFlags.Importance) != 0)
+            Queue(nameof(Importance));
+
+        if ((changedFlags & MailCopyChangeFlags.ThreadId) != 0)
+            Queue(nameof(ThreadId));
+
+        if ((changedFlags & MailCopyChangeFlags.MessageId) != 0)
+            Queue(nameof(MessageId));
+
+        if ((changedFlags & MailCopyChangeFlags.References) != 0)
+            Queue(nameof(References));
+
+        if ((changedFlags & MailCopyChangeFlags.InReplyTo) != 0)
+            Queue(nameof(InReplyTo));
+
+        if ((changedFlags & MailCopyChangeFlags.FileId) != 0)
+            Queue(nameof(FileId));
+
+        if ((changedFlags & MailCopyChangeFlags.FolderId) != 0)
+            Queue(nameof(FolderId));
+
+        if ((changedFlags & MailCopyChangeFlags.UniqueId) != 0)
+            Queue(nameof(UniqueId));
+
+        if ((changedFlags & MailCopyChangeFlags.SenderContact) != 0)
+        {
+            Queue(nameof(ContactPictureFileId));
+            Queue(nameof(SenderContact));
+        }
+
+        foreach (var changedProperty in changedProperties)
+        {
+            OnPropertyChanged(changedProperty);
+        }
+    }
 }
diff --git a/Wino.Mail.ViewModels/Data/ThreadMailItemViewModel.cs b/Wino.Mail.ViewModels/Data/ThreadMailItemViewModel.cs
index bcc87aef..bc82acf5 100644
--- a/Wino.Mail.ViewModels/Data/ThreadMailItemViewModel.cs
+++ b/Wino.Mail.ViewModels/Data/ThreadMailItemViewModel.cs
@@ -1,126 +1,484 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
+using System.ComponentModel;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
-using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Mail.ViewModels.Data;
 
 /// <summary>
 /// Thread mail item (multiple IMailItem) view model representation.
 /// </summary>
-public partial class ThreadMailItemViewModel : ObservableObject, IMailItemThread, IComparable<string>, IComparable<DateTime>
+public partial class ThreadMailItemViewModel : ObservableRecipient, IMailListItem, IMailItemDisplayInformation
 {
-    public ObservableCollection<IMailItem> ThreadItems => (MailItem as IMailItemThread)?.ThreadItems ?? [];
-    public AccountContact SenderContact => ((IMailItemThread)MailItem).SenderContact;
+    private readonly string _threadId;
+    private readonly HashSet<Guid> _uniqueIdSet = [];
+    private MailItemViewModel _cachedLatestMailViewModel;
+    private int _suspendChildPropertyNotificationsCount;
 
     [ObservableProperty]
-    private ThreadMailItem mailItem;
+    [NotifyPropertyChangedRecipients]
+    [NotifyPropertyChangedFor(nameof(IsSelectedOrExpanded))]
+    public partial bool IsThreadExpanded { get; set; }
 
     [ObservableProperty]
-    private bool isThreadExpanded;
+    [NotifyPropertyChangedRecipients]
+    [NotifyPropertyChangedFor(nameof(IsSelectedOrExpanded))]
+    public partial bool IsSelected { get; set; }
 
-    public ThreadMailItemViewModel(ThreadMailItem threadMailItem)
+    /// <summary>
+    /// Direct callback invoked when <see cref="IsSelected"/> changes.
+    /// Used by the ListViewItem container to update its IsCustomSelected DP
+    /// without subscribing to INotifyPropertyChanged (faster, AOT-safe).
+    /// </summary>
+    public Action<bool> OnSelectionChanged { get; set; }
+
+    partial void OnIsSelectedChanged(bool value) => OnSelectionChanged?.Invoke(value);
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    public bool IsSelectedOrExpanded => IsSelected || IsThreadExpanded;
+
+    /// <summary>
+    /// Gets the number of emails in this thread
+    /// </summary>
+    public int EmailCount => ThreadEmails.Count;
+
+    /// <summary>
+    /// Gets the latest email's subject for display
+    /// </summary>
+    public string Subject => latestMailViewModel?.MailCopy?.Subject;
+
+    /// <summary>
+    /// Gets the latest email's sender name for display
+    /// </summary>
+    public string FromName => latestMailViewModel?.MailCopy?.FromName ?? Translator.UnknownSender;
+
+    /// <summary>
+    /// Gets the latest email's creation date for sorting
+    /// </summary>
+    public DateTime CreationDate => latestMailViewModel?.MailCopy?.CreationDate ?? DateTime.MinValue;
+
+    /// <summary>
+    /// Gets the latest email's sender address for display
+    /// </summary>
+    public string FromAddress => latestMailViewModel?.FromAddress ?? string.Empty;
+
+    /// <summary>
+    /// Gets the preview text from the latest email
+    /// </summary>
+    public string PreviewText => latestMailViewModel?.PreviewText ?? string.Empty;
+
+    /// <summary>
+    /// Gets whether any email in this thread has attachments
+    /// </summary>
+    public bool HasAttachments => ThreadEmails.Any(e => e.HasAttachments);
+
+    /// <summary>
+    /// Gets whether any email in this thread is a calendar invitation.
+    /// </summary>
+    public bool IsCalendarEvent => ThreadEmails.Any(e => e.IsCalendarEvent);
+
+    /// <summary>
+    /// Gets whether any email in this thread is flagged
+    /// </summary>
+    public bool IsFlagged => ThreadEmails.Any(e => e.IsFlagged);
+
+    /// <summary>
+    /// Gets whether the latest email is focused
+    /// </summary>
+    public bool IsFocused => latestMailViewModel?.IsFocused ?? false;
+
+    /// <summary>
+    /// Gets whether all emails in this thread are read
+    /// </summary>
+    public bool IsRead => ThreadEmails.All(e => e.IsRead);
+
+    /// <summary>
+    /// Gets whether any email in this thread is a draft
+    /// </summary>
+    public bool IsDraft => ThreadEmails.Any(e => e.IsDraft);
+
+    /// <summary>
+    /// Gets the draft ID from the latest email if it's a draft
+    /// </summary>
+    public string DraftId => latestMailViewModel?.DraftId ?? string.Empty;
+
+    /// <summary>
+    /// Gets the ID from the latest email
+    /// </summary>
+    public string Id => latestMailViewModel?.Id ?? string.Empty;
+
+    /// <summary>
+    /// Gets the importance of the latest email
+    /// </summary>
+    public MailImportance Importance => latestMailViewModel?.Importance ?? MailImportance.Normal;
+
+    /// <summary>
+    /// Gets the thread ID from the latest email
+    /// </summary>
+    public string ThreadId => latestMailViewModel?.ThreadId ?? _threadId;
+
+    /// <summary>
+    /// Gets the message ID from the latest email
+    /// </summary>
+    public string MessageId => latestMailViewModel?.MessageId ?? string.Empty;
+
+    /// <summary>
+    /// Gets the references from the latest email
+    /// </summary>
+    public string References => latestMailViewModel?.References ?? string.Empty;
+
+    /// <summary>
+    /// Gets the in-reply-to from the latest email
+    /// </summary>
+    public string InReplyTo => latestMailViewModel?.InReplyTo ?? string.Empty;
+
+    /// <summary>
+    /// Gets the file ID from the latest email
+    /// </summary>
+    public Guid FileId => latestMailViewModel?.FileId ?? Guid.Empty;
+
+    /// <summary>
+    /// Gets the folder ID from the latest email
+    /// </summary>
+    public Guid FolderId => latestMailViewModel?.FolderId ?? Guid.Empty;
+
+    /// <summary>
+    /// Gets the unique ID from the latest email
+    /// </summary>
+    public Guid UniqueId => latestMailViewModel?.UniqueId ?? Guid.Empty;
+
+    public Guid? ContactPictureFileId => latestMailViewModel?.MailCopy?.SenderContact?.ContactPictureFileId;
+
+    public bool ThumbnailUpdatedEvent => latestMailViewModel?.ThumbnailUpdatedEvent ?? false;
+
+    public AccountContact SenderContact => latestMailViewModel?.MailCopy?.SenderContact;
+
+    /// <summary>
+    /// Gets all emails in this thread (observable)
+    /// </summary>
+    ///
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(EmailCount))]
+    [NotifyPropertyChangedFor(nameof(Subject))]
+    [NotifyPropertyChangedFor(nameof(FromName))]
+    [NotifyPropertyChangedFor(nameof(CreationDate))]
+    [NotifyPropertyChangedFor(nameof(FromAddress))]
+    [NotifyPropertyChangedFor(nameof(PreviewText))]
+    [NotifyPropertyChangedFor(nameof(HasAttachments))]
+    [NotifyPropertyChangedFor(nameof(IsCalendarEvent))]
+    [NotifyPropertyChangedFor(nameof(IsFlagged))]
+    [NotifyPropertyChangedFor(nameof(IsFocused))]
+    [NotifyPropertyChangedFor(nameof(IsRead))]
+    [NotifyPropertyChangedFor(nameof(IsDraft))]
+    [NotifyPropertyChangedFor(nameof(DraftId))]
+    [NotifyPropertyChangedFor(nameof(Id))]
+    [NotifyPropertyChangedFor(nameof(Importance))]
+    [NotifyPropertyChangedFor(nameof(ThreadId))]
+    [NotifyPropertyChangedFor(nameof(MessageId))]
+    [NotifyPropertyChangedFor(nameof(References))]
+    [NotifyPropertyChangedFor(nameof(InReplyTo))]
+    [NotifyPropertyChangedFor(nameof(FileId))]
+    [NotifyPropertyChangedFor(nameof(FolderId))]
+    [NotifyPropertyChangedFor(nameof(UniqueId))]
+    [NotifyPropertyChangedFor(nameof(ContactPictureFileId))]
+    [NotifyPropertyChangedFor(nameof(SenderContact))]
+    public partial ObservableCollection<MailItemViewModel> ThreadEmails { get; set; } = [];
+
+    private MailItemViewModel latestMailViewModel => _cachedLatestMailViewModel;
+
+    public DateTime SortingDate => CreationDate;
+
+    public string SortingName => FromName;
+
+    public ThreadMailItemViewModel(string threadId)
     {
-        MailItem = new ThreadMailItem();
+        _threadId = threadId;
+    }
 
-        // Local copies
-        foreach (var item in threadMailItem.ThreadItems)
+    internal void SuspendChildPropertyNotifications() => _suspendChildPropertyNotificationsCount++;
+
+    internal void ResumeChildPropertyNotifications()
+    {
+        if (_suspendChildPropertyNotificationsCount > 0)
         {
-            AddMailItemViewModel(item);
+            _suspendChildPropertyNotificationsCount--;
         }
     }
 
-    public ThreadMailItem GetThreadMailItem() => MailItem;
-
-    public IEnumerable<MailCopy> GetMailCopies()
-        => ThreadItems.OfType<MailItemViewModel>().Select(a => a.MailCopy);
-
-    public void AddMailItemViewModel(IMailItem mailItem)
+    private void RefreshLatestMailCache()
     {
-        if (mailItem == null) return;
+        _cachedLatestMailViewModel = ThreadEmails
+            .OrderByDescending(static item => item.MailCopy.CreationDate)
+            .FirstOrDefault();
+    }
 
-        if (mailItem is MailCopy mailCopy)
-            MailItem.AddThreadItem(new MailItemViewModel(mailCopy));
-        else if (mailItem is MailItemViewModel mailItemViewModel)
-            MailItem.AddThreadItem(mailItemViewModel);
+    /// <summary>
+    /// Adds an email to this thread
+    /// </summary>
+    public void AddEmail(MailItemViewModel email)
+    {
+        if (email.MailCopy.ThreadId != _threadId)
+            throw new ArgumentException($"Email ThreadId '{email.MailCopy.ThreadId}' does not match expander ThreadId '{_threadId}'");
+
+        // Insert email in sorted order by CreationDate (newest first, oldest last)
+        var insertIndex = 0;
+        for (int i = 0; i < ThreadEmails.Count; i++)
+        {
+            if (ThreadEmails[i].MailCopy.CreationDate < email.MailCopy.CreationDate)
+            {
+                insertIndex = i;
+                break;
+            }
+            insertIndex = i + 1;
+        }
+
+        ThreadEmails.Insert(insertIndex, email);
+        email.PropertyChanged += ThreadEmailPropertyChanged;
+        _uniqueIdSet.Add(email.MailCopy.UniqueId);
+        RefreshLatestMailCache();
+        OnPropertyChanged(nameof(EmailCount));
+        NotifyMailItemUpdated(email, MailCopyChangeFlags.All);
+    }
+
+    /// <summary>
+    /// Removes an email from this thread
+    /// </summary>
+    public void RemoveEmail(MailItemViewModel email)
+    {
+        if (ThreadEmails.Remove(email))
+        {
+            email.PropertyChanged -= ThreadEmailPropertyChanged;
+            _uniqueIdSet.Remove(email.MailCopy.UniqueId);
+            RefreshLatestMailCache();
+            OnPropertyChanged(nameof(EmailCount));
+            NotifyMailItemUpdated(email, MailCopyChangeFlags.All);
+        }
+    }
+
+    public void UnregisterThreadEmailPropertyChangedHandlers()
+    {
+        foreach (var email in ThreadEmails)
+        {
+            email.PropertyChanged -= ThreadEmailPropertyChanged;
+        }
+    }
+
+
+    private void ThreadEmailPropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (_suspendChildPropertyNotificationsCount > 0)
+            return;
+
+        if (sender is not MailItemViewModel updatedMailItem)
+            return;
+
+        if (e.PropertyName == nameof(MailItemViewModel.IsSelected) ||
+            e.PropertyName == nameof(MailItemViewModel.IsDisplayedInThread) ||
+            e.PropertyName == nameof(MailItemViewModel.IsBusy))
+        {
+            return;
+        }
+
+        if (e.PropertyName == nameof(MailItemViewModel.ThumbnailUpdatedEvent))
+        {
+            if (ReferenceEquals(updatedMailItem, latestMailViewModel))
+            {
+                OnPropertyChanged(nameof(ThumbnailUpdatedEvent));
+            }
+
+            return;
+        }
+
+        var changedFlags = string.IsNullOrEmpty(e.PropertyName)
+            ? MailCopyChangeFlags.All
+            : MailItemViewModel.GetChangeFlagsForProperty(e.PropertyName);
+
+        if (changedFlags == MailCopyChangeFlags.None)
+        {
+            NotifyMailItemUpdated(updatedMailItem, MailCopyChangeFlags.All);
+            return;
+        }
+
+        NotifyMailItemUpdated(updatedMailItem, changedFlags);
+    }
+
+    /// <summary>
+    /// Notifies that a mail item within this thread has been updated.
+    /// </summary>
+    /// <param name="updatedMailItem">The mail item that was updated (can be null to refresh all).</param>
+    /// <param name="changedFlags">Set of changed child fields.</param>
+    public void NotifyMailItemUpdated(MailItemViewModel updatedMailItem, MailCopyChangeFlags changedFlags = MailCopyChangeFlags.All)
+    {
+        if (changedFlags == MailCopyChangeFlags.None)
+            return;
+
+        var previousLatest = latestMailViewModel;
+
+        if (changedFlags == MailCopyChangeFlags.All ||
+            (changedFlags & MailCopyChangeFlags.CreationDate) != 0 ||
+            previousLatest == null ||
+            !ThreadEmails.Contains(previousLatest))
+        {
+            RefreshLatestMailCache();
+        }
+
+        var currentLatest = latestMailViewModel;
+        var latestChanged = !ReferenceEquals(previousLatest, currentLatest);
+
+        var updatesDisplayedLatest = changedFlags == MailCopyChangeFlags.All ||
+                                     updatedMailItem == null ||
+                                     latestChanged ||
+                                     ReferenceEquals(updatedMailItem, previousLatest) ||
+                                     ReferenceEquals(updatedMailItem, currentLatest);
+
+        var changedProperties = new List<string>(10);
+
+        void Queue(string propertyName)
+        {
+            if (!changedProperties.Contains(propertyName))
+            {
+                changedProperties.Add(propertyName);
+            }
+        }
+
+        if (updatesDisplayedLatest)
+        {
+            if (changedFlags == MailCopyChangeFlags.All || latestChanged)
+            {
+                Queue(nameof(Subject));
+                Queue(nameof(FromName));
+                Queue(nameof(CreationDate));
+                Queue(nameof(FromAddress));
+                Queue(nameof(PreviewText));
+                Queue(nameof(IsFocused));
+                Queue(nameof(DraftId));
+                Queue(nameof(Id));
+                Queue(nameof(Importance));
+                Queue(nameof(ThreadId));
+                Queue(nameof(MessageId));
+                Queue(nameof(References));
+                Queue(nameof(InReplyTo));
+                Queue(nameof(FileId));
+                Queue(nameof(FolderId));
+                Queue(nameof(UniqueId));
+                Queue(nameof(ContactPictureFileId));
+                Queue(nameof(SenderContact));
+                Queue(nameof(ThumbnailUpdatedEvent));
+                Queue(nameof(SortingDate));
+                Queue(nameof(SortingName));
+            }
+            else
+            {
+                if ((changedFlags & MailCopyChangeFlags.Subject) != 0)
+                    Queue(nameof(Subject));
+
+                if ((changedFlags & MailCopyChangeFlags.FromName) != 0)
+                {
+                    Queue(nameof(FromName));
+                    Queue(nameof(SortingName));
+                }
+
+                if ((changedFlags & MailCopyChangeFlags.CreationDate) != 0)
+                {
+                    Queue(nameof(CreationDate));
+                    Queue(nameof(SortingDate));
+                }
+
+                if ((changedFlags & MailCopyChangeFlags.FromAddress) != 0)
+                    Queue(nameof(FromAddress));
+
+                if ((changedFlags & MailCopyChangeFlags.PreviewText) != 0)
+                    Queue(nameof(PreviewText));
+
+                if ((changedFlags & MailCopyChangeFlags.IsFocused) != 0)
+                    Queue(nameof(IsFocused));
+
+                if ((changedFlags & MailCopyChangeFlags.DraftId) != 0)
+                    Queue(nameof(DraftId));
+
+                if ((changedFlags & MailCopyChangeFlags.Id) != 0)
+                    Queue(nameof(Id));
+
+                if ((changedFlags & MailCopyChangeFlags.Importance) != 0)
+                    Queue(nameof(Importance));
+
+                if ((changedFlags & MailCopyChangeFlags.ThreadId) != 0)
+                    Queue(nameof(ThreadId));
+
+                if ((changedFlags & MailCopyChangeFlags.MessageId) != 0)
+                    Queue(nameof(MessageId));
+
+                if ((changedFlags & MailCopyChangeFlags.References) != 0)
+                    Queue(nameof(References));
+
+                if ((changedFlags & MailCopyChangeFlags.InReplyTo) != 0)
+                    Queue(nameof(InReplyTo));
+
+                if ((changedFlags & MailCopyChangeFlags.FileId) != 0)
+                    Queue(nameof(FileId));
+
+                if ((changedFlags & MailCopyChangeFlags.FolderId) != 0)
+                    Queue(nameof(FolderId));
+
+                if ((changedFlags & MailCopyChangeFlags.UniqueId) != 0)
+                    Queue(nameof(UniqueId));
+
+                if ((changedFlags & MailCopyChangeFlags.SenderContact) != 0)
+                {
+                    Queue(nameof(ContactPictureFileId));
+                    Queue(nameof(SenderContact));
+                }
+            }
+        }
+
+        if ((changedFlags & MailCopyChangeFlags.HasAttachments) != 0 || changedFlags == MailCopyChangeFlags.All)
+            Queue(nameof(HasAttachments));
+
+        if ((changedFlags & MailCopyChangeFlags.ItemType) != 0 || changedFlags == MailCopyChangeFlags.All)
+            Queue(nameof(IsCalendarEvent));
+
+        if ((changedFlags & MailCopyChangeFlags.IsFlagged) != 0 || changedFlags == MailCopyChangeFlags.All)
+            Queue(nameof(IsFlagged));
+
+        if ((changedFlags & MailCopyChangeFlags.IsRead) != 0 || changedFlags == MailCopyChangeFlags.All)
+            Queue(nameof(IsRead));
+
+        if ((changedFlags & MailCopyChangeFlags.IsDraft) != 0 || changedFlags == MailCopyChangeFlags.All)
+            Queue(nameof(IsDraft));
+
+        foreach (var changedProperty in changedProperties)
+        {
+            OnPropertyChanged(changedProperty);
+        }
+    }
+
+    /// <summary>
+    /// Checks if this thread contains an email with the specified unique ID
+    /// </summary>
+    public bool HasUniqueId(Guid uniqueId) => _uniqueIdSet.Contains(uniqueId);
+
+    public IEnumerable<Guid> GetContainingIds() => ThreadEmails.Select(a => a.MailCopy.UniqueId);
+
+    public IEnumerable<MailItemViewModel> GetSelectedMailItems()
+    {
+        if (IsSelected)
+        {
+            // If the thread itself is selected, return all emails in the thread
+            return ThreadEmails;
+        }
         else
-            Debugger.Break();
+        {
+            // Otherwise, return only individually selected emails within the thread
+            return ThreadEmails.Where(e => e.IsSelected);
+        }
     }
-
-    public bool HasUniqueId(Guid uniqueMailId)
-        => ThreadItems.Any(a => a.UniqueId == uniqueMailId);
-
-    public IMailItem GetItemById(Guid uniqueMailId)
-        => ThreadItems.FirstOrDefault(a => a.UniqueId == uniqueMailId);
-
-    public void RemoveCopyItem(IMailItem item)
-    {
-        MailCopy copyToRemove = null;
-
-        if (item is MailItemViewModel mailItemViewModel)
-            copyToRemove = mailItemViewModel.MailCopy;
-        else if (item is MailCopy copyItem)
-            copyToRemove = copyItem;
-
-        var existedItem = ThreadItems.FirstOrDefault(a => a.Id == copyToRemove.Id);
-
-        if (existedItem == null) return;
-
-        ThreadItems.Remove(existedItem);
-
-        NotifyPropertyChanges();
-    }
-
-    public void NotifyPropertyChanges()
-    {
-        // TODO
-        // Stupid temporary fix for not updating UI.
-        // This view model must be reworked with ThreadMailItem together.
-
-        var current = MailItem;
-
-        MailItem = null;
-        MailItem = current;
-    }
-
-    public IMailItem LatestMailItem => ((IMailItemThread)MailItem).LatestMailItem;
-    public IMailItem FirstMailItem => ((IMailItemThread)MailItem).FirstMailItem;
-
-    public string Id => ((IMailItem)MailItem).Id;
-    public string Subject => ((IMailItem)MailItem).Subject;
-    public string ThreadId => ((IMailItem)MailItem).ThreadId;
-    public string MessageId => ((IMailItem)MailItem).MessageId;
-    public string References => ((IMailItem)MailItem).References;
-    public string PreviewText => ((IMailItem)MailItem).PreviewText;
-    public string FromName => ((IMailItem)MailItem).FromName;
-    public DateTime CreationDate => ((IMailItem)MailItem).CreationDate;
-    public string FromAddress => ((IMailItem)MailItem).FromAddress;
-    public bool HasAttachments => ((IMailItem)MailItem).HasAttachments;
-    public bool IsFlagged => ((IMailItem)MailItem).IsFlagged;
-    public bool IsFocused => ((IMailItem)MailItem).IsFocused;
-    public bool IsRead => ((IMailItem)MailItem).IsRead;
-    public bool IsDraft => ((IMailItem)MailItem).IsDraft;
-    public string DraftId => string.Empty;
-    public string InReplyTo => ((IMailItem)MailItem).InReplyTo;
-
-    public MailItemFolder AssignedFolder => ((IMailItem)MailItem).AssignedFolder;
-
-    public MailAccount AssignedAccount => ((IMailItem)MailItem).AssignedAccount;
-
-    public Guid UniqueId => ((IMailItem)MailItem).UniqueId;
-
-    public Guid FileId => ((IMailItem)MailItem).FileId;
-
-    public int CompareTo(DateTime other) => CreationDate.CompareTo(other);
-    public int CompareTo(string other) => FromName.CompareTo(other);
-
-    // Get single mail item view model out of the only item in thread items.
-    public MailItemViewModel GetSingleItemViewModel() => ThreadItems.First() as MailItemViewModel;
-
-    public IEnumerable<Guid> GetContainingIds() => ((IMailItemThread)MailItem).GetContainingIds();
 }
+
diff --git a/Wino.Mail.ViewModels/Data/WelcomeWizardContext.cs b/Wino.Mail.ViewModels/Data/WelcomeWizardContext.cs
new file mode 100644
index 00000000..fe38bd23
--- /dev/null
+++ b/Wino.Mail.ViewModels/Data/WelcomeWizardContext.cs
@@ -0,0 +1,79 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Mail.ViewModels.Data;
+
+public partial class WelcomeWizardContext : ObservableObject
+{
+    // Step 2 — Provider selection
+    [ObservableProperty]
+    public partial IProviderDetail SelectedProvider { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountName { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountColorHex { get; set; }
+
+    // Special IMAP fields (iCloud/Yahoo)
+    [ObservableProperty]
+    public partial string DisplayName { get; set; }
+
+    [ObservableProperty]
+    public partial string EmailAddress { get; set; }
+
+    [ObservableProperty]
+    public partial string AppSpecificPassword { get; set; }
+
+    [ObservableProperty]
+    public partial ImapCalendarSupportMode CalendarSupportMode { get; set; } = ImapCalendarSupportMode.Disabled;
+
+    // Generic IMAP — populated by ImapCalDavSettingsPage
+    public ImapCalDavSetupResult ImapCalDavSetupResult { get; set; }
+
+    // Computed helpers
+    public bool IsOAuthProvider => SelectedProvider?.Type is MailProviderType.Outlook or MailProviderType.Gmail;
+
+    public bool IsSpecialImapProvider =>
+        SelectedProvider?.SpecialImapProvider is SpecialImapProvider.iCloud or SpecialImapProvider.Yahoo;
+
+    public bool IsGenericImap =>
+        SelectedProvider?.Type == MailProviderType.IMAP4
+        && SelectedProvider?.SpecialImapProvider == SpecialImapProvider.None;
+
+    public SpecialImapProviderDetails BuildSpecialImapProviderDetails()
+    {
+        if (!IsSpecialImapProvider) return null;
+
+        return new SpecialImapProviderDetails(
+            EmailAddress,
+            AppSpecificPassword,
+            DisplayName,
+            SelectedProvider.SpecialImapProvider,
+            CalendarSupportMode);
+    }
+
+    public AccountCreationDialogResult BuildAccountCreationDialogResult()
+    {
+        return new AccountCreationDialogResult(
+            SelectedProvider.Type,
+            AccountName,
+            BuildSpecialImapProviderDetails(),
+            AccountColorHex);
+    }
+
+    public void Reset()
+    {
+        SelectedProvider = null;
+        AccountName = null;
+        AccountColorHex = null;
+        DisplayName = null;
+        EmailAddress = null;
+        AppSpecificPassword = null;
+        CalendarSupportMode = ImapCalendarSupportMode.Disabled;
+        ImapCalDavSetupResult = null;
+    }
+}
diff --git a/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs b/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs
deleted file mode 100644
index 9878d71e..00000000
--- a/Wino.Mail.ViewModels/EditAccountDetailsPageViewModel.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.ViewModels.Data;
-using Wino.Messaging.Client.Navigation;
-
-namespace Wino.Mail.ViewModels;
-
-public partial class EditAccountDetailsPageViewModel : MailBaseViewModel
-{
-    private readonly IAccountService _accountService;
-    private readonly IThemeService _themeService;
-    private readonly IImapTestService _imapTestService;
-    private readonly IMailDialogService _mailDialogService;
-
-    [ObservableProperty]
-    public partial MailAccount Account { get; set; }
-
-    [ObservableProperty]
-    public partial string AccountName { get; set; }
-
-    [ObservableProperty]
-    public partial string SenderName { get; set; }
-
-    [ObservableProperty]
-    public partial AppColorViewModel SelectedColor { get; set; }
-
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(IsImapServer))]
-    public partial CustomServerInformation ServerInformation { get; set; }
-
-    [ObservableProperty]
-    public partial List<AppColorViewModel> AvailableColors { get; set; }
-
-
-    [ObservableProperty]
-    public partial int SelectedIncomingServerConnectionSecurityIndex { get; set; }
-
-    [ObservableProperty]
-    public partial int SelectedIncomingServerAuthenticationMethodIndex { get; set; }
-
-    [ObservableProperty]
-    public partial int SelectedOutgoingServerConnectionSecurityIndex { get; set; }
-
-    [ObservableProperty]
-    public partial int SelectedOutgoingServerAuthenticationMethodIndex { get; set; }
-
-    public List<ImapAuthenticationMethodModel> AvailableAuthenticationMethods { get; } =
-    [
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Auto, Translator.ImapAuthenticationMethod_Auto),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.None, Translator.ImapAuthenticationMethod_None),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.NormalPassword, Translator.ImapAuthenticationMethod_Plain),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.EncryptedPassword, Translator.ImapAuthenticationMethod_EncryptedPassword),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Ntlm, Translator.ImapAuthenticationMethod_Ntlm),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.CramMd5, Translator.ImapAuthenticationMethod_CramMD5),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.DigestMd5, Translator.ImapAuthenticationMethod_DigestMD5)
-    ];
-
-    public List<ImapConnectionSecurityModel> AvailableConnectionSecurities { get; set; } =
-    [
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.Auto, Translator.ImapConnectionSecurity_Auto),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.SslTls, Translator.ImapConnectionSecurity_SslTls),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.StartTls, Translator.ImapConnectionSecurity_StartTls),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.None, Translator.ImapConnectionSecurity_None)
-    ];
-
-    public bool IsImapServer => ServerInformation != null;
-
-    public EditAccountDetailsPageViewModel(IAccountService accountService,
-                                           IThemeService themeService,
-                                           IImapTestService imapTestService,
-                                           IMailDialogService mailDialogService)
-    {
-        _accountService = accountService;
-        _themeService = themeService;
-        _imapTestService = imapTestService;
-        _mailDialogService = mailDialogService;
-
-        var colorHexList = _themeService.GetAvailableAccountColors();
-
-        AvailableColors = colorHexList.Select(a => new AppColorViewModel(a)).ToList();
-    }
-
-    [RelayCommand]
-    private async Task SaveChangesAsync()
-    {
-        await UpdateAccountAsync();
-
-        Messenger.Send(new BackBreadcrumNavigationRequested());
-    }
-
-    [RelayCommand]
-    private async Task ValidateImapSettingsAsync()
-    {
-        try
-        {
-            await _imapTestService.TestImapConnectionAsync(ServerInformation, true);
-            _mailDialogService.InfoBarMessage(Translator.IMAPSetupDialog_ValidationSuccess_Title, Translator.IMAPSetupDialog_ValidationSuccess_Message, Core.Domain.Enums.InfoBarMessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            _mailDialogService.InfoBarMessage(Translator.IMAPSetupDialog_ValidationFailed_Title, ex.Message, Core.Domain.Enums.InfoBarMessageType.Error); ;
-        }
-    }
-
-    [RelayCommand]
-    private async Task UpdateCustomServerInformationAsync()
-    {
-        if (ServerInformation != null)
-        {
-            ServerInformation.IncomingAuthenticationMethod = AvailableAuthenticationMethods[SelectedIncomingServerAuthenticationMethodIndex].ImapAuthenticationMethod;
-            ServerInformation.IncomingServerSocketOption = AvailableConnectionSecurities[SelectedIncomingServerConnectionSecurityIndex].ImapConnectionSecurity;
-
-            ServerInformation.OutgoingAuthenticationMethod = AvailableAuthenticationMethods[SelectedOutgoingServerAuthenticationMethodIndex].ImapAuthenticationMethod;
-            ServerInformation.OutgoingServerSocketOption = AvailableConnectionSecurities[SelectedOutgoingServerConnectionSecurityIndex].ImapConnectionSecurity;
-
-            Account.ServerInformation = ServerInformation;
-        }
-
-        await _accountService.UpdateAccountCustomServerInformationAsync(Account.ServerInformation);
-
-        _mailDialogService.InfoBarMessage(Translator.IMAPSetupDialog_SaveImapSuccess_Title, Translator.IMAPSetupDialog_SaveImapSuccess_Message, Core.Domain.Enums.InfoBarMessageType.Success);
-    }
-
-    private Task UpdateAccountAsync()
-    {
-        Account.Name = AccountName;
-        Account.SenderName = SenderName;
-        Account.AccountColorHex = SelectedColor == null ? string.Empty : SelectedColor.Hex;
-
-        return _accountService.UpdateAccountAsync(Account);
-    }
-
-    [RelayCommand]
-    private void ResetColor()
-        => SelectedColor = null;
-
-    partial void OnSelectedColorChanged(AppColorViewModel oldValue, AppColorViewModel newValue)
-    {
-        _ = UpdateAccountAsync();
-    }
-
-    public override void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-
-        if (parameters is MailAccount account)
-        {
-            Account = account;
-            AccountName = account.Name;
-            SenderName = account.SenderName;
-            ServerInformation = Account.ServerInformation;
-
-            if (!string.IsNullOrEmpty(account.AccountColorHex))
-            {
-                SelectedColor = AvailableColors.FirstOrDefault(a => a.Hex == account.AccountColorHex);
-            }
-
-            if (ServerInformation != null)
-            {
-                SelectedIncomingServerAuthenticationMethodIndex = AvailableAuthenticationMethods.FindIndex(a => a.ImapAuthenticationMethod == ServerInformation.IncomingAuthenticationMethod);
-                SelectedIncomingServerConnectionSecurityIndex = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == ServerInformation.IncomingServerSocketOption);
-
-                SelectedOutgoingServerAuthenticationMethodIndex = AvailableAuthenticationMethods.FindIndex(a => a.ImapAuthenticationMethod == ServerInformation.OutgoingAuthenticationMethod);
-                SelectedOutgoingServerConnectionSecurityIndex = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == ServerInformation.OutgoingServerSocketOption);
-            }
-        }
-    }
-}
diff --git a/Wino.Mail.ViewModels/EmailTemplatesPageViewModel.cs b/Wino.Mail.ViewModels/EmailTemplatesPageViewModel.cs
new file mode 100644
index 00000000..e3106e67
--- /dev/null
+++ b/Wino.Mail.ViewModels/EmailTemplatesPageViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class EmailTemplatesPageViewModel(IEmailTemplateService emailTemplateService) : MailBaseViewModel
+{
+    private readonly IEmailTemplateService _emailTemplateService = emailTemplateService;
+
+    public ObservableCollection<EmailTemplate> EmailTemplates { get; } = [];
+
+    public async Task LoadAsync()
+    {
+        var templates = await _emailTemplateService.GetEmailTemplatesAsync().ConfigureAwait(false);
+
+        await ExecuteUIThread(() =>
+        {
+            EmailTemplates.Clear();
+
+            foreach (var template in templates)
+            {
+                EmailTemplates.Add(template);
+            }
+        });
+    }
+
+    public void CreateTemplate()
+    {
+        Messenger.Send(new BreadcrumbNavigationRequested(
+            Translator.SettingsEmailTemplates_CreatePageTitle,
+            WinoPage.CreateEmailTemplatePage));
+    }
+
+    public void OpenTemplate(EmailTemplate template)
+    {
+        if (template == null)
+            return;
+
+        var title = string.IsNullOrWhiteSpace(template.Name)
+            ? Translator.SettingsEmailTemplates_EditPageTitle
+            : template.Name;
+
+        Messenger.Send(new BreadcrumbNavigationRequested(
+            title,
+            WinoPage.CreateEmailTemplatePage,
+            template.Id));
+    }
+}
diff --git a/Wino.Mail.ViewModels/ImapCalDavSettingsPageViewModel.cs b/Wino.Mail.ViewModels/ImapCalDavSettingsPageViewModel.cs
new file mode 100644
index 00000000..b6b5d9d5
--- /dev/null
+++ b/Wino.Mail.ViewModels/ImapCalDavSettingsPageViewModel.cs
@@ -0,0 +1,1073 @@
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.AutoDiscovery;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Services;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.Server;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class ImapCalDavSettingsPageViewModel : MailBaseViewModel
+{
+    private readonly IAutoDiscoveryService _autoDiscoveryService;
+    private readonly ICalDavClient _calDavClient;
+    private readonly IAccountService _accountService;
+    private readonly IMailDialogService _mailDialogService;
+    private readonly ISpecialImapProviderConfigResolver _specialImapProviderConfigResolver;
+    private readonly WelcomeWizardContext _wizardContext;
+
+    private ImapCalDavSettingsPageMode _pageMode;
+    private Guid _editingAccountId;
+    private SpecialImapProvider _editingSpecialImapProvider;
+    private TaskCompletionSource<ImapCalDavSetupResult> _completionSource;
+    private bool _isCompletionFinalized;
+    private bool _localOnlyInfoShown;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsCreateMode))]
+    [NotifyPropertyChangedFor(nameof(IsEditMode))]
+    private string pageTitle = string.Empty;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(HasProviderHint))]
+    private string providerHint = string.Empty;
+
+    [ObservableProperty]
+    private string displayName = string.Empty;
+
+    [ObservableProperty]
+    private string emailAddress = string.Empty;
+
+    [ObservableProperty]
+    private string password = string.Empty;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsCalendarModeSelectionVisible))]
+    [NotifyPropertyChangedFor(nameof(IsCalDavSettingsVisible))]
+    [NotifyPropertyChangedFor(nameof(IsLocalCalendarModeSelected))]
+    [NotifyPropertyChangedFor(nameof(SelectedCalendarSupportDescription))]
+    private bool isCalendarSupportEnabled = true;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsCalDavSettingsVisible))]
+    [NotifyPropertyChangedFor(nameof(IsLocalCalendarModeSelected))]
+    [NotifyPropertyChangedFor(nameof(SelectedCalendarSupportDescription))]
+    [NotifyPropertyChangedFor(nameof(SelectedCalendarSupportModeIndex))]
+    private ImapCalendarSupportMode selectedCalendarSupportMode = ImapCalendarSupportMode.CalDav;
+
+    [ObservableProperty]
+    private string incomingServer = string.Empty;
+
+    [ObservableProperty]
+    private string incomingServerPort = string.Empty;
+
+    [ObservableProperty]
+    private string incomingServerUsername = string.Empty;
+
+    [ObservableProperty]
+    private string incomingServerPassword = string.Empty;
+
+    [ObservableProperty]
+    private string outgoingServer = string.Empty;
+
+    [ObservableProperty]
+    private string outgoingServerPort = string.Empty;
+
+    [ObservableProperty]
+    private string outgoingServerUsername = string.Empty;
+
+    [ObservableProperty]
+    private string outgoingServerPassword = string.Empty;
+
+    [ObservableProperty]
+    private string proxyServer = string.Empty;
+
+    [ObservableProperty]
+    private string proxyServerPort = string.Empty;
+
+    [ObservableProperty]
+    private string calDavServiceUrl = string.Empty;
+
+    [ObservableProperty]
+    private string calDavUsername = string.Empty;
+
+    [ObservableProperty]
+    private string calDavPassword = string.Empty;
+
+    [ObservableProperty]
+    private int maxConcurrentClients = 5;
+
+    [ObservableProperty]
+    private bool isImapValidationSucceeded;
+
+    [ObservableProperty]
+    private bool isCalDavValidationSucceeded;
+
+    [ObservableProperty]
+    private int selectedIncomingServerConnectionSecurityIndex;
+
+    [ObservableProperty]
+    private int selectedIncomingServerAuthenticationMethodIndex;
+
+    [ObservableProperty]
+    private int selectedOutgoingServerConnectionSecurityIndex;
+
+    [ObservableProperty]
+    private int selectedOutgoingServerAuthenticationMethodIndex;
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsBasicSetupSelected))]
+    [NotifyPropertyChangedFor(nameof(IsAdvancedSetupSelected))]
+    private int selectedSetupTabIndex;
+
+    public bool IsCreateMode => _pageMode == ImapCalDavSettingsPageMode.Create;
+    public bool IsEditMode => !IsCreateMode;
+    public bool HasProviderHint => !string.IsNullOrWhiteSpace(ProviderHint);
+    public bool IsBasicSetupSelected => SelectedSetupTabIndex == 0;
+    public bool IsAdvancedSetupSelected => SelectedSetupTabIndex == 1;
+    public bool IsCalendarModeSelectionVisible => IsCalendarSupportEnabled;
+    public bool IsCalDavSettingsVisible => IsCalendarSupportEnabled && SelectedCalendarSupportMode == ImapCalendarSupportMode.CalDav;
+    public bool IsLocalCalendarModeSelected => IsCalendarSupportEnabled && SelectedCalendarSupportMode == ImapCalendarSupportMode.LocalOnly;
+    public string SubtitleText => Translator.ImapCalDavSettingsPage_Subtitle;
+    public string BasicSectionTitleText => Translator.ImapCalDavSettingsPage_BasicSectionTitle;
+    public string BasicSectionDescriptionText => Translator.ImapCalDavSettingsPage_BasicSectionDescription;
+    public string DisplayNameHeaderText => Translator.IMAPSetupDialog_DisplayName;
+    public string DisplayNamePlaceholderText => Translator.IMAPSetupDialog_DisplayNamePlaceholder;
+    public string EmailAddressHeaderText => Translator.IMAPSetupDialog_MailAddress;
+    public string EmailAddressPlaceholderText => Translator.IMAPSetupDialog_MailAddressPlaceholder;
+    public string PasswordHeaderText => Translator.IMAPSetupDialog_Password;
+    public string EnableCalendarSupportText => Translator.ImapCalDavSettingsPage_EnableCalendarSupport;
+    public string AutoDiscoverButtonText => Translator.ImapCalDavSettingsPage_AutoDiscoverButton;
+    public string BasicTabText => Translator.ImapCalDavSettingsPage_BasicTab;
+    public string AdvancedTabText => Translator.ImapCalDavSettingsPage_AdvancedTab;
+    public string AdvancedSectionTitleText => Translator.ImapCalDavSettingsPage_AdvancedSectionTitle;
+    public string AdvancedSectionDescriptionText => Translator.ImapCalDavSettingsPage_AdvancedSectionDescription;
+    public string IncomingSectionTitleText => Translator.IMAPSetupDialog_IMAPSettings;
+    public string IncomingServerHeaderText => Translator.IMAPSetupDialog_IncomingMailServer;
+    public string PortHeaderText => Translator.IMAPSetupDialog_IncomingMailServerPort;
+    public string IncomingUsernameHeaderText => Translator.IMAPSetupDialog_Username;
+    public string IncomingPasswordHeaderText => Translator.IMAPSetupDialog_Password;
+    public string OutgoingSectionTitleText => Translator.IMAPSetupDialog_SMTPSettings;
+    public string OutgoingServerHeaderText => Translator.IMAPSetupDialog_OutgoingMailServer;
+    public string OutgoingUsernameHeaderText => Translator.IMAPSetupDialog_OutgoingMailServerUsername;
+    public string OutgoingPasswordHeaderText => Translator.IMAPSetupDialog_OutgoingMailServerPassword;
+    public string ConnectionSecurityHeaderText => Translator.ImapCalDavSettingsPage_ConnectionSecurityHeader;
+    public string AuthenticationMethodHeaderText => Translator.ImapCalDavSettingsPage_AuthenticationMethodHeader;
+    public string CalendarSectionTitleText => Translator.ImapCalDavSettingsPage_CalendarSectionTitle;
+    public string CalendarSectionDescriptionText => Translator.ImapCalDavSettingsPage_CalendarSectionDescription;
+    public string CalendarModeHeaderText => Translator.ImapCalDavSettingsPage_CalendarModeHeader;
+    public string LocalCalendarLearnMoreText => Translator.ImapCalDavSettingsPage_LocalCalendarLearnMore;
+    public string CalDavServiceUrlHeaderText => Translator.ImapCalDavSettingsPage_CalDavServiceUrl;
+    public string CalDavUsernameHeaderText => Translator.ImapCalDavSettingsPage_CalDavUsername;
+    public string CalDavPasswordHeaderText => Translator.ImapCalDavSettingsPage_CalDavPassword;
+    public string TestImapButtonText => Translator.ImapCalDavSettingsPage_TestImapButton;
+    public string TestCalDavButtonText => Translator.ImapCalDavSettingsPage_TestCalDavButton;
+    public string SaveButtonText => Translator.Buttons_Save;
+    public string CancelButtonText => Translator.Buttons_Cancel;
+
+    public string SelectedCalendarSupportDescription => SelectedCalendarSupportMode switch
+    {
+        ImapCalendarSupportMode.CalDav => Translator.ImapCalDavSettingsPage_CalendarModeCalDavDescription,
+        ImapCalendarSupportMode.LocalOnly => Translator.ImapCalDavSettingsPage_CalendarModeLocalOnlyDescription,
+        _ => Translator.ImapCalDavSettingsPage_CalendarModeDisabledDescription
+    };
+
+    public List<ImapAuthenticationMethodModel> AvailableAuthenticationMethods { get; } =
+    [
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.Auto, Translator.ImapAuthenticationMethod_Auto),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.None, Translator.ImapAuthenticationMethod_None),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.NormalPassword, Translator.ImapAuthenticationMethod_Plain),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.EncryptedPassword, Translator.ImapAuthenticationMethod_EncryptedPassword),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.Ntlm, Translator.ImapAuthenticationMethod_Ntlm),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.CramMd5, Translator.ImapAuthenticationMethod_CramMD5),
+        new ImapAuthenticationMethodModel(ImapAuthenticationMethod.DigestMd5, Translator.ImapAuthenticationMethod_DigestMD5)
+    ];
+
+    public List<ImapConnectionSecurityModel> AvailableConnectionSecurities { get; } =
+    [
+        new ImapConnectionSecurityModel(ImapConnectionSecurity.Auto, Translator.ImapConnectionSecurity_Auto),
+        new ImapConnectionSecurityModel(ImapConnectionSecurity.SslTls, Translator.ImapConnectionSecurity_SslTls),
+        new ImapConnectionSecurityModel(ImapConnectionSecurity.StartTls, Translator.ImapConnectionSecurity_StartTls),
+        new ImapConnectionSecurityModel(ImapConnectionSecurity.None, Translator.ImapConnectionSecurity_None)
+    ];
+
+    public List<string> AvailableConnectionSecurityDisplayNames { get; } =
+    [
+        Translator.ImapConnectionSecurity_Auto,
+        Translator.ImapConnectionSecurity_SslTls,
+        Translator.ImapConnectionSecurity_StartTls,
+        Translator.ImapConnectionSecurity_None
+    ];
+
+    public List<ImapCalendarSupportModeOption> AvailableCalendarSupportModes { get; } =
+    [
+        new ImapCalendarSupportModeOption(ImapCalendarSupportMode.CalDav, Translator.ImapCalDavSettingsPage_CalendarModeCalDav),
+        new ImapCalendarSupportModeOption(ImapCalendarSupportMode.LocalOnly, Translator.ImapCalDavSettingsPage_CalendarModeLocalOnly),
+        new ImapCalendarSupportModeOption(ImapCalendarSupportMode.Disabled, Translator.ImapCalDavSettingsPage_CalendarModeDisabled)
+    ];
+
+    public List<string> AvailableAuthenticationMethodDisplayNames { get; } =
+    [
+        Translator.ImapAuthenticationMethod_Auto,
+        Translator.ImapAuthenticationMethod_None,
+        Translator.ImapAuthenticationMethod_Plain,
+        Translator.ImapAuthenticationMethod_EncryptedPassword,
+        Translator.ImapAuthenticationMethod_Ntlm,
+        Translator.ImapAuthenticationMethod_CramMD5,
+        Translator.ImapAuthenticationMethod_DigestMD5
+    ];
+
+    public List<string> AvailableCalendarSupportModeTitles { get; } =
+    [
+        Translator.ImapCalDavSettingsPage_CalendarModeCalDav,
+        Translator.ImapCalDavSettingsPage_CalendarModeLocalOnly,
+        Translator.ImapCalDavSettingsPage_CalendarModeDisabled
+    ];
+
+    public int SelectedCalendarSupportModeIndex
+    {
+        get
+        {
+            var index = AvailableCalendarSupportModes.FindIndex(a => a.Mode == SelectedCalendarSupportMode);
+            return index < 0 ? 0 : index;
+        }
+        set
+        {
+            if (value < 0 || value >= AvailableCalendarSupportModes.Count)
+                return;
+
+            var selectedMode = AvailableCalendarSupportModes[value].Mode;
+            if (selectedMode != SelectedCalendarSupportMode)
+            {
+                SelectedCalendarSupportMode = selectedMode;
+            }
+        }
+    }
+
+    public ImapCalDavSettingsPageViewModel(IAutoDiscoveryService autoDiscoveryService,
+                                           ICalDavClient calDavClient,
+                                           IAccountService accountService,
+                                           IMailDialogService mailDialogService,
+                                           ISpecialImapProviderConfigResolver specialImapProviderConfigResolver,
+                                           WelcomeWizardContext wizardContext)
+    {
+        _autoDiscoveryService = autoDiscoveryService;
+        _calDavClient = calDavClient;
+        _accountService = accountService;
+        _mailDialogService = mailDialogService;
+        _specialImapProviderConfigResolver = specialImapProviderConfigResolver;
+        _wizardContext = wizardContext;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        if (parameters is not ImapCalDavSettingsNavigationContext context)
+            return;
+
+        _pageMode = context.Mode;
+        _editingAccountId = context.AccountId;
+        _completionSource = context.CompletionSource;
+        _isCompletionFinalized = false;
+        _localOnlyInfoShown = false;
+        SelectedSetupTabIndex = 0;
+
+        if (_pageMode == ImapCalDavSettingsPageMode.Create || _pageMode == ImapCalDavSettingsPageMode.Wizard)
+        {
+            PageTitle = Translator.ImapCalDavSettingsPage_TitleCreate;
+            ApplyCreateContextDefaults(context.AccountCreationDialogResult);
+        }
+        else
+        {
+            PageTitle = Translator.ImapCalDavSettingsPage_TitleEdit;
+            await InitializeEditModeAsync(context.AccountId);
+        }
+    }
+
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        if (_pageMode == ImapCalDavSettingsPageMode.Create && !_isCompletionFinalized)
+        {
+            _completionSource?.TrySetResult(null);
+            _isCompletionFinalized = true;
+        }
+
+        base.OnNavigatedFrom(mode, parameters);
+    }
+
+    public bool IsWizardMode => _pageMode == ImapCalDavSettingsPageMode.Wizard;
+
+    [RelayCommand]
+    private async Task AutoDiscoverSettingsAsync()
+    {
+        try
+        {
+            var minimalSettings = BuildMinimalSettingsOrThrow();
+            await AutoDiscoverAndApplySettingsAsync(minimalSettings).ConfigureAwait(false);
+
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationSuccess_Title,
+                Translator.ImapCalDavSettingsPage_AutoDiscoverySuccessMessage,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationFailed_Title,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task TestImapConnectionAsync()
+    {
+        try
+        {
+            await EnsureImapSettingsPreparedAsync().ConfigureAwait(false);
+            var serverInformation = BuildServerInformation();
+
+            ValidateImapSettings(serverInformation);
+            await ValidateImapConnectivityAsync(serverInformation).ConfigureAwait(false);
+
+            IsImapValidationSucceeded = true;
+
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationSuccess_Title,
+                Translator.ImapCalDavSettingsPage_ImapTestSuccessMessage,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            IsImapValidationSucceeded = false;
+
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationFailed_Title,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task TestCalDavConnectionAsync()
+    {
+        try
+        {
+            if (!IsCalendarSupportEnabled || SelectedCalendarSupportMode != ImapCalendarSupportMode.CalDav)
+                throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavNotRequiredMessage);
+
+            TryApplyKnownProviderSettingsIfNeeded(requireCompleteImapSettings: false, requireCompleteCalDavSettings: true);
+            var serverInformation = BuildServerInformation();
+            ValidateCalDavSettings(serverInformation);
+            await ValidateCalDavConnectivityAsync(serverInformation).ConfigureAwait(false);
+
+            IsCalDavValidationSucceeded = true;
+
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationSuccess_Title,
+                Translator.ImapCalDavSettingsPage_CalDavTestSuccessMessage,
+                InfoBarMessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            IsCalDavValidationSucceeded = false;
+
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationFailed_Title,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+    [RelayCommand]
+    private async Task SaveAsync()
+    {
+        try
+        {
+            await EnsureImapSettingsPreparedAsync().ConfigureAwait(false);
+
+            var serverInformation = BuildServerInformation();
+
+            ValidateIdentitySettings();
+            ValidateImapSettings(serverInformation);
+            ValidateCalendarModeSpecificSettings(serverInformation);
+
+            await ValidateImapConnectivityAsync(serverInformation).ConfigureAwait(false);
+            IsImapValidationSucceeded = true;
+
+            if (serverInformation.CalendarSupportMode == ImapCalendarSupportMode.CalDav)
+            {
+                await ValidateCalDavConnectivityAsync(serverInformation).ConfigureAwait(false);
+                IsCalDavValidationSucceeded = true;
+            }
+            else
+            {
+                IsCalDavValidationSucceeded = false;
+            }
+
+            if (_pageMode == ImapCalDavSettingsPageMode.Wizard)
+            {
+                CompleteWizardFlow(serverInformation);
+                return;
+            }
+
+            if (_pageMode == ImapCalDavSettingsPageMode.Create)
+            {
+                CompleteCreateFlow(serverInformation);
+                return;
+            }
+
+            await SaveEditFlowAsync(serverInformation).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _mailDialogService.InfoBarMessage(
+                Translator.IMAPSetupDialog_ValidationFailed_Title,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private void Cancel()
+    {
+        if (_pageMode == ImapCalDavSettingsPageMode.Create && !_isCompletionFinalized)
+        {
+            _completionSource?.TrySetResult(null);
+            _isCompletionFinalized = true;
+        }
+
+        Messenger.Send(new BackBreadcrumNavigationRequested());
+    }
+
+    private void CompleteWizardFlow(CustomServerInformation serverInformation)
+    {
+        serverInformation.Id = Guid.NewGuid();
+        serverInformation.AccountId = Guid.Empty;
+
+        _wizardContext.ImapCalDavSetupResult = new ImapCalDavSetupResult
+        {
+            DisplayName = DisplayName.Trim(),
+            EmailAddress = EmailAddress.Trim(),
+            IsCalendarAccessGranted = serverInformation.CalendarSupportMode != ImapCalendarSupportMode.Disabled,
+            ServerInformation = serverInformation
+        };
+
+        Messenger.Send(new BreadcrumbNavigationRequested(Translator.WelcomeWizard_Step3Title, WinoPage.AccountSetupProgressPage));
+    }
+
+    [RelayCommand]
+    private Task ShowLocalCalendarExplanationAsync()
+        => _mailDialogService.ShowMessageAsync(
+            Translator.ImapCalDavSettingsPage_LocalCalendarDialogMessage,
+            Translator.ImapCalDavSettingsPage_LocalCalendarDialogTitle,
+            WinoCustomMessageDialogIcon.Information);
+
+    partial void OnIsCalendarSupportEnabledChanged(bool value)
+    {
+        if (!value && SelectedCalendarSupportMode != ImapCalendarSupportMode.Disabled)
+        {
+            SelectedCalendarSupportMode = ImapCalendarSupportMode.Disabled;
+        }
+        else if (value && SelectedCalendarSupportMode == ImapCalendarSupportMode.Disabled)
+        {
+            SelectedCalendarSupportMode = ImapCalendarSupportMode.CalDav;
+        }
+    }
+
+    partial void OnSelectedCalendarSupportModeChanged(ImapCalendarSupportMode value)
+    {
+        if (value == ImapCalendarSupportMode.LocalOnly && !_localOnlyInfoShown)
+        {
+            _localOnlyInfoShown = true;
+            _ = ShowLocalCalendarExplanationAsync();
+        }
+
+        if (value != ImapCalendarSupportMode.CalDav)
+        {
+            IsCalDavValidationSucceeded = false;
+        }
+    }
+
+    private async Task InitializeEditModeAsync(Guid accountId)
+    {
+        var account = await _accountService.GetAccountAsync(accountId);
+        if (account == null)
+            throw new InvalidOperationException(Translator.Exception_NullAssignedAccount);
+
+        _editingSpecialImapProvider = account.SpecialImapProvider;
+        DisplayName = account.SenderName ?? string.Empty;
+        EmailAddress = account.Address ?? string.Empty;
+        ApplyProviderHint(_editingSpecialImapProvider);
+
+        ApplyServerInformation(account.ServerInformation);
+
+        if (account.ServerInformation != null)
+        {
+            SelectedCalendarSupportMode = account.ServerInformation.CalendarSupportMode;
+        }
+
+        if (SelectedCalendarSupportMode == ImapCalendarSupportMode.Disabled && account.IsCalendarAccessGranted)
+        {
+            SelectedCalendarSupportMode = ImapCalendarSupportMode.CalDav;
+        }
+
+        IsCalendarSupportEnabled = SelectedCalendarSupportMode != ImapCalendarSupportMode.Disabled;
+    }
+
+    private void ApplyCreateContextDefaults(AccountCreationDialogResult accountCreationDialogResult)
+    {
+        DisplayName = accountCreationDialogResult?.AccountName ?? string.Empty;
+        EmailAddress = accountCreationDialogResult?.SpecialImapProviderDetails?.Address ?? string.Empty;
+        Password = accountCreationDialogResult?.SpecialImapProviderDetails?.Password ?? string.Empty;
+        var normalizedEmail = !string.IsNullOrWhiteSpace(EmailAddress) && !EmailAddress.Contains('@')
+            ? $"{EmailAddress}@icloud.com"
+            : EmailAddress;
+
+        if (!string.IsNullOrWhiteSpace(accountCreationDialogResult?.SpecialImapProviderDetails?.SenderName))
+            DisplayName = accountCreationDialogResult.SpecialImapProviderDetails.SenderName;
+
+        IsCalendarSupportEnabled = true;
+        SelectedCalendarSupportMode = ImapCalendarSupportMode.CalDav;
+
+        var specialProvider = accountCreationDialogResult?.SpecialImapProviderDetails?.SpecialImapProvider ?? SpecialImapProvider.None;
+        _editingSpecialImapProvider = specialProvider;
+        ApplyProviderHint(specialProvider);
+
+        switch (specialProvider)
+        {
+            case SpecialImapProvider.iCloud:
+                ApplySpecialProviderDefaults(
+                    "imap.mail.me.com",
+                    "993",
+                    normalizedEmail,
+                    "smtp.mail.me.com",
+                    "587",
+                    normalizedEmail,
+                    Password,
+                    "https://caldav.icloud.com/",
+                    normalizedEmail,
+                    Password);
+                break;
+            case SpecialImapProvider.Yahoo:
+                ApplySpecialProviderDefaults(
+                    "imap.mail.yahoo.com",
+                    "993",
+                    EmailAddress,
+                    "smtp.mail.yahoo.com",
+                    "587",
+                    EmailAddress,
+                    Password,
+                    "https://caldav.calendar.yahoo.com/",
+                    EmailAddress,
+                    Password);
+                break;
+        }
+    }
+
+    private void ApplySpecialProviderDefaults(string incomingServer,
+                                              string incomingPort,
+                                              string incomingUsername,
+                                              string outgoingServer,
+                                              string outgoingPort,
+                                              string outgoingUsername,
+                                              string password,
+                                              string calDavServiceUrl,
+                                              string calDavUsername,
+                                              string calDavPassword)
+    {
+        IncomingServer = incomingServer;
+        IncomingServerPort = incomingPort;
+        IncomingServerUsername = incomingUsername;
+        IncomingServerPassword = password;
+
+        OutgoingServer = outgoingServer;
+        OutgoingServerPort = outgoingPort;
+        OutgoingServerUsername = outgoingUsername;
+        OutgoingServerPassword = password;
+        CalDavServiceUrl = calDavServiceUrl;
+        CalDavUsername = calDavUsername;
+        CalDavPassword = calDavPassword;
+
+        SelectedIncomingServerConnectionSecurityIndex = 0;
+        SelectedIncomingServerAuthenticationMethodIndex = 0;
+        SelectedOutgoingServerConnectionSecurityIndex = 0;
+        SelectedOutgoingServerAuthenticationMethodIndex = 0;
+    }
+
+    private void ApplyServerInformation(CustomServerInformation serverInformation)
+    {
+        if (serverInformation == null)
+            return;
+
+        IncomingServer = serverInformation.IncomingServer ?? string.Empty;
+        IncomingServerPort = serverInformation.IncomingServerPort ?? string.Empty;
+        IncomingServerUsername = serverInformation.IncomingServerUsername ?? string.Empty;
+        IncomingServerPassword = serverInformation.IncomingServerPassword ?? string.Empty;
+
+        OutgoingServer = serverInformation.OutgoingServer ?? string.Empty;
+        OutgoingServerPort = serverInformation.OutgoingServerPort ?? string.Empty;
+        OutgoingServerUsername = serverInformation.OutgoingServerUsername ?? string.Empty;
+        OutgoingServerPassword = serverInformation.OutgoingServerPassword ?? string.Empty;
+
+        ProxyServer = serverInformation.ProxyServer ?? string.Empty;
+        ProxyServerPort = serverInformation.ProxyServerPort ?? string.Empty;
+        MaxConcurrentClients = serverInformation.MaxConcurrentClients <= 0 ? 5 : serverInformation.MaxConcurrentClients;
+
+        CalDavServiceUrl = serverInformation.CalDavServiceUrl ?? string.Empty;
+        CalDavUsername = serverInformation.CalDavUsername ?? string.Empty;
+        CalDavPassword = serverInformation.CalDavPassword ?? string.Empty;
+
+        if (string.IsNullOrWhiteSpace(CalDavUsername))
+            CalDavUsername = EmailAddress;
+
+        if (string.IsNullOrWhiteSpace(CalDavPassword))
+            CalDavPassword = IncomingServerPassword;
+
+        SelectedIncomingServerAuthenticationMethodIndex = FindAuthenticationMethodIndex(serverInformation.IncomingAuthenticationMethod);
+        SelectedIncomingServerConnectionSecurityIndex = FindConnectionSecurityIndex(serverInformation.IncomingServerSocketOption);
+        SelectedOutgoingServerAuthenticationMethodIndex = FindAuthenticationMethodIndex(serverInformation.OutgoingAuthenticationMethod);
+        SelectedOutgoingServerConnectionSecurityIndex = FindConnectionSecurityIndex(serverInformation.OutgoingServerSocketOption);
+    }
+
+    private async Task EnsureImapSettingsPreparedAsync()
+    {
+        if (HasCompleteImapSettings())
+            return;
+
+        if (TryApplyKnownProviderSettingsIfNeeded(requireCompleteImapSettings: true, requireCompleteCalDavSettings: false))
+            return;
+
+        var minimalSettings = BuildMinimalSettingsOrThrow();
+        await AutoDiscoverAndApplySettingsAsync(minimalSettings).ConfigureAwait(false);
+
+        if (!HasCompleteImapSettings())
+            throw new InvalidOperationException(Translator.Exception_ImapAutoDiscoveryFailed);
+    }
+
+    private async Task AutoDiscoverAndApplySettingsAsync(AutoDiscoveryMinimalSettings minimalSettings)
+    {
+        if (TryApplyKnownProviderSettings(alwaysApplyForKnownProvider: true))
+            return;
+
+        var discoverySettings = await _autoDiscoveryService.GetAutoDiscoverySettings(minimalSettings).ConfigureAwait(false);
+
+        if (discoverySettings == null)
+            throw new InvalidOperationException(Translator.Exception_ImapAutoDiscoveryFailed);
+
+        discoverySettings.UserMinimalSettings = minimalSettings;
+
+        var serverInformation = discoverySettings.ToServerInformation();
+        if (serverInformation == null)
+            throw new InvalidOperationException(Translator.Exception_ImapAutoDiscoveryFailed);
+
+        ApplyServerInformation(serverInformation);
+
+        if (IsCalendarSupportEnabled && SelectedCalendarSupportMode == ImapCalendarSupportMode.CalDav)
+        {
+            var discoveredCalDavUri = await _autoDiscoveryService.DiscoverCalDavServiceUriAsync(minimalSettings.Email).ConfigureAwait(false);
+            if (discoveredCalDavUri != null)
+            {
+                CalDavServiceUrl = discoveredCalDavUri.ToString();
+            }
+
+            if (string.IsNullOrWhiteSpace(CalDavUsername))
+                CalDavUsername = minimalSettings.Email;
+
+            if (string.IsNullOrWhiteSpace(CalDavPassword))
+                CalDavPassword = minimalSettings.Password;
+        }
+    }
+    private async Task ValidateImapConnectivityAsync(CustomServerInformation serverInformation)
+    {
+        var connectivityResult = await SynchronizationManager.Instance
+            .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: false)
+            .ConfigureAwait(false);
+
+        if (connectivityResult.IsCertificateUIRequired)
+        {
+            var certificateMessage =
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row0}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateIssuer}: {connectivityResult.CertificateIssuer}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidFrom}: {connectivityResult.CertificateValidFromDateString}\n" +
+                $"{Translator.IMAPSetupDialog_CertificateValidTo}: {connectivityResult.CertificateExpirationDateString}\n\n" +
+                $"{Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row1}";
+
+            var allowCertificate = await _mailDialogService
+                .ShowConfirmationDialogAsync(certificateMessage, Translator.GeneralTitle_Warning, Translator.Buttons_Allow)
+                .ConfigureAwait(false);
+
+            if (!allowCertificate)
+                throw new InvalidOperationException(Translator.IMAPSetupDialog_CertificateDenied);
+
+            connectivityResult = await SynchronizationManager.Instance
+                .TestImapConnectivityAsync(serverInformation, allowSSLHandshake: true)
+                .ConfigureAwait(false);
+        }
+
+        if (!connectivityResult.IsSuccess)
+            throw new InvalidOperationException(connectivityResult.FailedReason ?? Translator.IMAPSetupDialog_ConnectionFailedMessage);
+    }
+
+    private async Task ValidateCalDavConnectivityAsync(CustomServerInformation serverInformation)
+    {
+        ValidateCalDavSettings(serverInformation);
+
+        var uri = new Uri(serverInformation.CalDavServiceUrl, UriKind.Absolute);
+        var username = serverInformation.CalDavUsername;
+        var password = serverInformation.CalDavPassword;
+
+        var settings = new CalDavConnectionSettings
+        {
+            ServiceUri = uri,
+            Username = username,
+            Password = password
+        };
+
+        await _calDavClient.DiscoverCalendarsAsync(settings).ConfigureAwait(false);
+    }
+
+    private void CompleteCreateFlow(CustomServerInformation serverInformation)
+    {
+        if (_completionSource == null || _isCompletionFinalized)
+            return;
+
+        serverInformation.Id = Guid.NewGuid();
+        serverInformation.AccountId = Guid.Empty;
+
+        _completionSource.TrySetResult(new ImapCalDavSetupResult
+        {
+            DisplayName = DisplayName.Trim(),
+            EmailAddress = EmailAddress.Trim(),
+            IsCalendarAccessGranted = serverInformation.CalendarSupportMode != ImapCalendarSupportMode.Disabled,
+            ServerInformation = serverInformation
+        });
+
+        _isCompletionFinalized = true;
+
+        _mailDialogService.InfoBarMessage(
+            Translator.IMAPSetupDialog_ValidationSuccess_Title,
+            Translator.ImapCalDavSettingsPage_SaveSuccessMessage,
+            InfoBarMessageType.Success);
+
+        Messenger.Send(new BackBreadcrumNavigationRequested());
+    }
+
+    private async Task SaveEditFlowAsync(CustomServerInformation serverInformation)
+    {
+        var account = await _accountService.GetAccountAsync(_editingAccountId).ConfigureAwait(false);
+        if (account == null)
+            throw new InvalidOperationException(Translator.Exception_NullAssignedAccount);
+
+        account.SenderName = DisplayName.Trim();
+        account.Address = EmailAddress.Trim();
+        account.IsCalendarAccessGranted = serverInformation.CalendarSupportMode != ImapCalendarSupportMode.Disabled;
+
+        serverInformation.Id = account.ServerInformation?.Id ?? Guid.NewGuid();
+        serverInformation.AccountId = account.Id;
+
+        account.ServerInformation = serverInformation;
+        account.AttentionReason = AccountAttentionReason.None;
+
+        await _accountService.UpdateAccountCustomServerInformationAsync(serverInformation).ConfigureAwait(false);
+        await _accountService.UpdateAccountAsync(account).ConfigureAwait(false);
+
+        Messenger.Send(new NewMailSynchronizationRequested(new MailSynchronizationOptions
+        {
+            AccountId = account.Id,
+            Type = MailSynchronizationType.FullFolders
+        }));
+
+        if (account.IsCalendarAccessGranted)
+        {
+            Messenger.Send(new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions
+            {
+                AccountId = account.Id,
+                Type = CalendarSynchronizationType.CalendarEvents
+            }));
+        }
+
+        _mailDialogService.InfoBarMessage(
+            Translator.IMAPSetupDialog_ValidationSuccess_Title,
+            Translator.ImapCalDavSettingsPage_SaveSuccessMessage,
+            InfoBarMessageType.Success);
+
+        Messenger.Send(new BackBreadcrumNavigationRequested());
+    }
+
+    private AutoDiscoveryMinimalSettings BuildMinimalSettingsOrThrow()
+    {
+        ValidateIdentitySettings();
+
+        if (string.IsNullOrWhiteSpace(Password))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationPasswordRequired);
+
+        return new AutoDiscoveryMinimalSettings
+        {
+            DisplayName = DisplayName.Trim(),
+            Email = EmailAddress.Trim(),
+            Password = Password
+        };
+    }
+
+    private CustomServerInformation BuildServerInformation()
+    {
+        var incomingAuth = GetAuthenticationMethodByIndex(SelectedIncomingServerAuthenticationMethodIndex);
+        var incomingSecurity = GetConnectionSecurityByIndex(SelectedIncomingServerConnectionSecurityIndex);
+        var outgoingAuth = GetAuthenticationMethodByIndex(SelectedOutgoingServerAuthenticationMethodIndex);
+        var outgoingSecurity = GetConnectionSecurityByIndex(SelectedOutgoingServerConnectionSecurityIndex);
+
+        var mode = IsCalendarSupportEnabled ? SelectedCalendarSupportMode : ImapCalendarSupportMode.Disabled;
+
+        var calDavUser = (CalDavUsername ?? string.Empty).Trim();
+        if (string.IsNullOrWhiteSpace(calDavUser))
+            calDavUser = (EmailAddress ?? string.Empty).Trim();
+
+        var calDavPassword = string.IsNullOrWhiteSpace(CalDavPassword)
+            ? IncomingServerPassword
+            : CalDavPassword;
+
+        return new CustomServerInformation
+        {
+            Id = Guid.NewGuid(),
+            Address = (EmailAddress ?? string.Empty).Trim(),
+            IncomingServer = (IncomingServer ?? string.Empty).Trim(),
+            IncomingServerPort = (IncomingServerPort ?? string.Empty).Trim(),
+            IncomingServerUsername = (IncomingServerUsername ?? string.Empty).Trim(),
+            IncomingServerPassword = IncomingServerPassword ?? string.Empty,
+            IncomingServerType = CustomIncomingServerType.IMAP4,
+            IncomingAuthenticationMethod = incomingAuth,
+            IncomingServerSocketOption = incomingSecurity,
+            OutgoingServer = (OutgoingServer ?? string.Empty).Trim(),
+            OutgoingServerPort = (OutgoingServerPort ?? string.Empty).Trim(),
+            OutgoingServerUsername = (OutgoingServerUsername ?? string.Empty).Trim(),
+            OutgoingServerPassword = OutgoingServerPassword ?? string.Empty,
+            OutgoingAuthenticationMethod = outgoingAuth,
+            OutgoingServerSocketOption = outgoingSecurity,
+            ProxyServer = (ProxyServer ?? string.Empty).Trim(),
+            ProxyServerPort = (ProxyServerPort ?? string.Empty).Trim(),
+            MaxConcurrentClients = MaxConcurrentClients <= 0 ? 5 : MaxConcurrentClients,
+            CalendarSupportMode = mode,
+            CalDavServiceUrl = mode == ImapCalendarSupportMode.CalDav ? (CalDavServiceUrl ?? string.Empty).Trim() : string.Empty,
+            CalDavUsername = mode == ImapCalendarSupportMode.CalDav ? calDavUser : string.Empty,
+            CalDavPassword = mode == ImapCalendarSupportMode.CalDav ? calDavPassword : string.Empty
+        };
+    }
+
+    private void ValidateIdentitySettings()
+    {
+        if (string.IsNullOrWhiteSpace(DisplayName))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationDisplayNameRequired);
+
+        if (string.IsNullOrWhiteSpace(EmailAddress))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationEmailRequired);
+
+        if (!EmailValidation.EmailValidator.Validate(EmailAddress.Trim()))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationEmailInvalid);
+    }
+
+    private static bool IsValidPort(string portText)
+        => int.TryParse(portText, out var value) && value > 0 && value <= 65535;
+
+    private void ValidateImapSettings(CustomServerInformation serverInformation)
+    {
+        ValidateIdentitySettings();
+
+        if (string.IsNullOrWhiteSpace(serverInformation.IncomingServer))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationIncomingServerRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.IncomingServerPort))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationIncomingPortRequired);
+
+        if (!IsValidPort(serverInformation.IncomingServerPort))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.IncomingServerUsername))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationUsernameRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.IncomingServerPassword))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationPasswordRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.OutgoingServer))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.OutgoingServerPort))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired);
+
+        if (!IsValidPort(serverInformation.OutgoingServerPort))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.OutgoingServerUsername))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.OutgoingServerPassword))
+            throw new InvalidOperationException(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired);
+    }
+
+    private void ValidateCalendarModeSpecificSettings(CustomServerInformation serverInformation)
+    {
+        if (serverInformation.CalendarSupportMode != ImapCalendarSupportMode.CalDav)
+            return;
+
+        ValidateCalDavSettings(serverInformation);
+    }
+
+    private void ValidateCalDavSettings(CustomServerInformation serverInformation)
+    {
+        if (string.IsNullOrWhiteSpace(serverInformation.CalDavServiceUrl))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavUrlRequired);
+
+        if (!Uri.TryCreate(serverInformation.CalDavServiceUrl, UriKind.Absolute, out _))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavUrlInvalid);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.CalDavUsername))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavUsernameRequired);
+
+        if (string.IsNullOrWhiteSpace(serverInformation.CalDavPassword))
+            throw new InvalidOperationException(Translator.ImapCalDavSettingsPage_CalDavPasswordRequired);
+    }
+
+    private void ApplyProviderHint(SpecialImapProvider provider)
+    {
+        ProviderHint = provider switch
+        {
+            SpecialImapProvider.iCloud => Translator.ImapCalDavSettingsPage_ICloudHint,
+            SpecialImapProvider.Yahoo => Translator.ImapCalDavSettingsPage_YahooHint,
+            _ => string.Empty
+        };
+    }
+
+    private bool TryApplyKnownProviderSettingsIfNeeded(bool requireCompleteImapSettings, bool requireCompleteCalDavSettings)
+    {
+        var needsImapSettings = requireCompleteImapSettings && !HasCompleteImapSettings();
+        var needsCalDavSettings = requireCompleteCalDavSettings
+                                  && IsCalendarSupportEnabled
+                                  && SelectedCalendarSupportMode == ImapCalendarSupportMode.CalDav
+                                  && !HasCompleteCalDavSettings();
+
+        if (!needsImapSettings && !needsCalDavSettings)
+            return false;
+
+        return TryApplyKnownProviderSettings(alwaysApplyForKnownProvider: false);
+    }
+
+    private bool TryApplyKnownProviderSettings(bool alwaysApplyForKnownProvider)
+    {
+        if (_editingSpecialImapProvider is not (SpecialImapProvider.iCloud or SpecialImapProvider.Yahoo))
+            return false;
+
+        var effectivePassword = GetKnownProviderPasswordCandidate();
+        if (string.IsNullOrWhiteSpace(EmailAddress) || string.IsNullOrWhiteSpace(effectivePassword))
+            return false;
+
+        if (!alwaysApplyForKnownProvider && HasCompleteImapSettings() && HasCompleteCalDavSettings())
+            return false;
+
+        var mode = IsCalendarSupportEnabled ? SelectedCalendarSupportMode : ImapCalendarSupportMode.Disabled;
+        var providerDetails = new SpecialImapProviderDetails(
+            EmailAddress.Trim(),
+            effectivePassword,
+            DisplayName.Trim(),
+            _editingSpecialImapProvider,
+            mode);
+
+        var serverInformation = _specialImapProviderConfigResolver.GetServerInformation(
+            new MailAccount
+            {
+                Address = EmailAddress.Trim(),
+                SenderName = DisplayName.Trim(),
+                ProviderType = MailProviderType.IMAP4,
+                SpecialImapProvider = _editingSpecialImapProvider,
+                IsCalendarAccessGranted = mode != ImapCalendarSupportMode.Disabled
+            },
+            new AccountCreationDialogResult(MailProviderType.IMAP4, DisplayName.Trim(), providerDetails, string.Empty));
+
+        if (serverInformation == null)
+            return false;
+
+        serverInformation.ProxyServer = (ProxyServer ?? string.Empty).Trim();
+        serverInformation.ProxyServerPort = (ProxyServerPort ?? string.Empty).Trim();
+        serverInformation.MaxConcurrentClients = MaxConcurrentClients <= 0 ? serverInformation.MaxConcurrentClients : MaxConcurrentClients;
+
+        ApplyServerInformation(serverInformation);
+        Password = effectivePassword;
+        return true;
+    }
+
+    private string GetKnownProviderPasswordCandidate()
+    {
+        if (!string.IsNullOrWhiteSpace(Password))
+            return Password;
+
+        if (!string.IsNullOrWhiteSpace(IncomingServerPassword))
+            return IncomingServerPassword;
+
+        if (!string.IsNullOrWhiteSpace(OutgoingServerPassword))
+            return OutgoingServerPassword;
+
+        return CalDavPassword ?? string.Empty;
+    }
+
+    private bool HasCompleteCalDavSettings()
+        => !IsCalendarSupportEnabled
+           || SelectedCalendarSupportMode != ImapCalendarSupportMode.CalDav
+           || (!string.IsNullOrWhiteSpace(CalDavServiceUrl)
+               && Uri.TryCreate(CalDavServiceUrl, UriKind.Absolute, out _)
+               && !string.IsNullOrWhiteSpace(CalDavUsername)
+               && !string.IsNullOrWhiteSpace(CalDavPassword));
+
+    private bool HasCompleteImapSettings()
+        => !string.IsNullOrWhiteSpace(IncomingServer)
+           && !string.IsNullOrWhiteSpace(IncomingServerPort)
+           && !string.IsNullOrWhiteSpace(IncomingServerUsername)
+           && !string.IsNullOrWhiteSpace(IncomingServerPassword)
+           && !string.IsNullOrWhiteSpace(OutgoingServer)
+           && !string.IsNullOrWhiteSpace(OutgoingServerPort)
+           && !string.IsNullOrWhiteSpace(OutgoingServerUsername)
+           && !string.IsNullOrWhiteSpace(OutgoingServerPassword)
+           && IsValidPort(IncomingServerPort)
+           && IsValidPort(OutgoingServerPort);
+
+    private int FindAuthenticationMethodIndex(ImapAuthenticationMethod method)
+    {
+        var index = AvailableAuthenticationMethods.FindIndex(a => a.ImapAuthenticationMethod == method);
+        return index < 0 ? 0 : index;
+    }
+
+    private int FindConnectionSecurityIndex(ImapConnectionSecurity security)
+    {
+        var index = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == security);
+        return index < 0 ? 0 : index;
+    }
+
+    private ImapAuthenticationMethod GetAuthenticationMethodByIndex(int index)
+    {
+        if (index < 0 || index >= AvailableAuthenticationMethods.Count)
+            return ImapAuthenticationMethod.Auto;
+
+        return AvailableAuthenticationMethods[index].ImapAuthenticationMethod;
+    }
+
+    private ImapConnectionSecurity GetConnectionSecurityByIndex(int index)
+    {
+        if (index < 0 || index >= AvailableConnectionSecurities.Count)
+            return ImapConnectionSecurity.Auto;
+
+        return AvailableConnectionSecurities[index].ImapConnectionSecurity;
+    }
+}
diff --git a/Wino.Mail.ViewModels/LanguageTimePageViewModel.cs b/Wino.Mail.ViewModels/LanguageTimePageViewModel.cs
deleted file mode 100644
index 51d36ab9..00000000
--- a/Wino.Mail.ViewModels/LanguageTimePageViewModel.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Translations;
-
-namespace Wino.Mail.ViewModels;
-
-public partial class LanguageTimePageViewModel(IPreferencesService preferencesService, ITranslationService translationService) : MailBaseViewModel
-{
-    public IPreferencesService PreferencesService { get; } = preferencesService;
-    private readonly ITranslationService _translationService = translationService;
-
-    [ObservableProperty]
-    private List<AppLanguageModel> _availableLanguages;
-
-    [ObservableProperty]
-    private AppLanguageModel _selectedLanguage;
-
-    private bool isInitialized = false;
-
-    public override void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-
-        AvailableLanguages = _translationService.GetAvailableLanguages();
-
-        SelectedLanguage = AvailableLanguages.FirstOrDefault(a => a.Language == PreferencesService.CurrentLanguage);
-
-        isInitialized = true;
-    }
-
-    protected override async void OnPropertyChanged(PropertyChangedEventArgs e)
-    {
-        base.OnPropertyChanged(e);
-
-        if (!isInitialized) return;
-
-        if (e.PropertyName == nameof(SelectedLanguage))
-        {
-            await _translationService.InitializeLanguageAsync(SelectedLanguage.Language);
-        }
-    }
-}
diff --git a/Wino.Mail.ViewModels/AppShellViewModel.cs b/Wino.Mail.ViewModels/MailAppShellViewModel.cs
similarity index 71%
rename from Wino.Mail.ViewModels/AppShellViewModel.cs
rename to Wino.Mail.ViewModels/MailAppShellViewModel.cs
index 8bccc626..b4168541 100644
--- a/Wino.Mail.ViewModels/AppShellViewModel.cs
+++ b/Wino.Mail.ViewModels/MailAppShellViewModel.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using MoreLinq;
 using MoreLinq.Extensions;
@@ -17,9 +16,12 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.MenuItems;
 using Wino.Core.Domain.Models.Folders;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Services;
+using Wino.Mail.ViewModels.Data;
 using Wino.Messaging.Client.Accounts;
 using Wino.Messaging.Client.Navigation;
 using Wino.Messaging.Client.Shell;
@@ -28,17 +30,19 @@ using Wino.Messaging.UI;
 
 namespace Wino.Mail.ViewModels;
 
-public partial class AppShellViewModel : MailBaseViewModel,
-    IRecipient<NavigateManageAccountsRequested>,
+public partial class MailAppShellViewModel : MailBaseViewModel,
+    IMailShellClient,
     IRecipient<MailtoProtocolMessageRequested>,
     IRecipient<RefreshUnreadCountsMessage>,
     IRecipient<AccountsMenuRefreshRequested>,
     IRecipient<MergedInboxRenamed>,
     IRecipient<LanguageChanged>,
     IRecipient<AccountMenuItemsReordered>,
-    IRecipient<AccountSynchronizationProgressUpdatedMessage>,
+    IRecipient<AccountSynchronizerStateChanged>,
     IRecipient<NavigateAppPreferencesRequested>,
-    IRecipient<AccountFolderConfigurationUpdated>
+    IRecipient<AccountFolderConfigurationUpdated>,
+    IRecipient<AccountRemovedMessage>,
+    IRecipient<AccountUpdatedMessage>
 {
     #region Menu Items
 
@@ -51,7 +55,8 @@ public partial class AppShellViewModel : MailBaseViewModel,
     public MenuItemCollection MenuItems { get; set; }
 
     private readonly SettingsItem SettingsItem = new SettingsItem();
-    private readonly ManageAccountsMenuItem ManageAccountsMenuItem = new ManageAccountsMenuItem();
+    private readonly ContactsMenuItem ContactsMenuItem = new ContactsMenuItem();
+    private readonly StoreUpdateMenuItem StoreUpdateMenuItem = new StoreUpdateMenuItem();
 
     public IMenuItem CreateMailMenuItem = new NewMailMenuItem();
 
@@ -60,9 +65,11 @@ public partial class AppShellViewModel : MailBaseViewModel,
     private const string IsActivateStartupLaunchAskedKey = nameof(IsActivateStartupLaunchAskedKey);
 
     public IStatePersistanceService StatePersistenceService { get; }
-    public IWinoServerConnectionManager ServerConnectionManager { get; }
     public IPreferencesService PreferencesService { get; }
     public INavigationService NavigationService { get; }
+    public WinoApplicationMode Mode => WinoApplicationMode.Mail;
+    public bool HandlesNavigationSelection => true;
+    public IMenuItem CreatePrimaryMenuItem => CreateMailMenuItem;
 
     private readonly IFolderService _folderService;
     private readonly IConfigurationService _configurationService;
@@ -74,20 +81,19 @@ public partial class AppShellViewModel : MailBaseViewModel,
     private readonly INotificationBuilder _notificationBuilder;
     private readonly IWinoRequestDelegator _winoRequestDelegator;
     private readonly IMailDialogService _dialogService;
-    private readonly IBackgroundTaskService _backgroundTaskService;
     private readonly IMimeFileService _mimeFileService;
+    private readonly IWebView2RuntimeValidatorService _webView2RuntimeValidatorService;
+    private readonly IStoreUpdateService _storeUpdateService;
 
     private readonly INativeAppService _nativeAppService;
     private readonly IMailService _mailService;
+    private bool _hasRegisteredPersistentRecipients;
+    private readonly SemaphoreSlim _menuRefreshSemaphore = new(1, 1);
 
     private readonly SemaphoreSlim accountInitFolderUpdateSlim = new SemaphoreSlim(1);
 
-    [ObservableProperty]
-    private WinoServerConnectionStatus activeConnectionStatus;
-
-    public AppShellViewModel(IMailDialogService dialogService,
+    public MailAppShellViewModel(IMailDialogService dialogService,
                              INavigationService navigationService,
-                             IBackgroundTaskService backgroundTaskService,
                              IMimeFileService mimeFileService,
                              INativeAppService nativeAppService,
                              IMailService mailService,
@@ -100,21 +106,12 @@ public partial class AppShellViewModel : MailBaseViewModel,
                              IWinoRequestDelegator winoRequestDelegator,
                              IFolderService folderService,
                              IStatePersistanceService statePersistanceService,
-                             IWinoServerConnectionManager serverConnectionManager,
                              IConfigurationService configurationService,
-                             IStartupBehaviorService startupBehaviorService)
+                             IStartupBehaviorService startupBehaviorService,
+                             IWebView2RuntimeValidatorService webView2RuntimeValidatorService,
+                             IStoreUpdateService storeUpdateService)
     {
         StatePersistenceService = statePersistanceService;
-        ServerConnectionManager = serverConnectionManager;
-
-        ActiveConnectionStatus = serverConnectionManager.Status;
-        ServerConnectionManager.StatusChanged += async (sender, status) =>
-        {
-            await ExecuteUIThread(() =>
-            {
-                ActiveConnectionStatus = status;
-            });
-        };
 
         PreferencesService = preferencesService;
         _dialogService = dialogService;
@@ -122,7 +119,6 @@ public partial class AppShellViewModel : MailBaseViewModel,
 
         _configurationService = configurationService;
         _startupBehaviorService = startupBehaviorService;
-        _backgroundTaskService = backgroundTaskService;
         _mimeFileService = mimeFileService;
         _nativeAppService = nativeAppService;
         _mailService = mailService;
@@ -133,11 +129,10 @@ public partial class AppShellViewModel : MailBaseViewModel,
         _launchProtocolService = launchProtocolService;
         _notificationBuilder = notificationBuilder;
         _winoRequestDelegator = winoRequestDelegator;
+        _webView2RuntimeValidatorService = webView2RuntimeValidatorService;
+        _storeUpdateService = storeUpdateService;
     }
 
-    [RelayCommand]
-    private Task ReconnectServerAsync() => ServerConnectionManager.ConnectAsync();
-
     protected override void OnDispatcherAssigned()
     {
         base.OnDispatcherAssigned();
@@ -154,23 +149,11 @@ public partial class AppShellViewModel : MailBaseViewModel,
         return _contextMenuItemService.GetFolderContextMenuActions(folder);
     }
 
-    private async Task CreateFooterItemsAsync()
+    private async Task CreateFooterItemsAsync(bool showNotification = false)
     {
         await ExecuteUIThread(() =>
         {
-            // TODO: Selected footer item container still remains selected after re-creation.
-            // To reproduce, go settings and change the language.
-
-            foreach (var item in FooterItems)
-            {
-                item.IsExpanded = false;
-                item.IsSelected = false;
-            }
-
             FooterItems.Clear();
-
-            FooterItems.Add(ManageAccountsMenuItem);
-            FooterItems.Add(SettingsItem);
         });
     }
 
@@ -234,21 +217,82 @@ public partial class AppShellViewModel : MailBaseViewModel,
         }
     }
 
+    private async void PreferencesServiceChanged(object sender, string e)
+    {
+        if (e == nameof(IPreferencesService.IsStoreUpdateNotificationsEnabled))
+        {
+            await CreateFooterItemsAsync();
+        }
+    }
+
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
-        base.OnNavigatedTo(mode, parameters);
-        await CreateFooterItemsAsync();
+        if (!_hasRegisteredPersistentRecipients)
+        {
+            RegisterRecipients();
+            _hasRegisteredPersistentRecipients = true;
+        }
+
+        var activationContext = parameters as ShellModeActivationContext;
+        var shouldRunStartupFlows = (activationContext?.IsInitialActivation ?? true) &&
+                                    activationContext?.SuppressStartupFlows != true;
+        var hasExistingAccountMenuItems = MenuItems?.OfType<IAccountMenuItem>().Any() == true;
+
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+        PreferencesService.PreferenceChanged += PreferencesServiceChanged;
+
+        await CreateFooterItemsAsync(true);
+
+        if (!hasExistingAccountMenuItems)
+        {
+            await RecreateMenuItemsAsync();
+        }
 
-        await RecreateMenuItemsAsync();
         await ProcessLaunchOptionsAsync();
+        await ValidateWebView2RuntimeAsync();
 
-        if (!Debugger.IsAttached)
+        if (shouldRunStartupFlows && !Debugger.IsAttached)
         {
             await ForceAllAccountSynchronizationsAsync();
         }
 
-        await MakeSureEnableStartupLaunchAsync();
-        await ConfigureBackgroundTasksAsync();
+        if (shouldRunStartupFlows)
+        {
+            await MakeSureEnableStartupLaunchAsync();
+        }
+    }
+
+    private async Task ValidateWebView2RuntimeAsync()
+    {
+        var isRuntimeAvailable = await _webView2RuntimeValidatorService.IsRuntimeAvailableAsync();
+
+        if (!isRuntimeAvailable)
+        {
+            await ExecuteUIThread(() => _notificationBuilder.CreateWebView2RuntimeMissingNotification());
+        }
+    }
+
+    public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+    }
+
+    public void PrepareForShellShutdown()
+    {
+        PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+
+        if (_hasRegisteredPersistentRecipients)
+        {
+            UnregisterRecipients();
+            _hasRegisteredPersistentRecipients = false;
+        }
+
+        latestSelectedAccountMenuItem = null;
+        SelectedMenuItem = null;
+
+        MenuItems?.Clear();
+        MenuItems?.Add(CreateMailMenuItem);
+        FooterItems?.Clear();
     }
 
     private async Task MakeSureEnableStartupLaunchAsync()
@@ -291,22 +335,6 @@ public partial class AppShellViewModel : MailBaseViewModel,
         }
     }
 
-    private async Task ConfigureBackgroundTasksAsync()
-    {
-        try
-        {
-            // This will only unregister once. Safe to execute multiple times.
-            _backgroundTaskService.UnregisterAllBackgroundTask();
-
-            await _backgroundTaskService.RegisterBackgroundTasksAsync();
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to configure background tasks.");
-
-            _dialogService.InfoBarMessage(Translator.Info_BackgroundExecutionUnknownErrorTitle, Translator.Info_BackgroundExecutionUnknownErrorMessage, InfoBarMessageType.Error);
-        }
-    }
 
     private async Task ForceAllAccountSynchronizationsAsync()
     {
@@ -321,7 +349,7 @@ public partial class AppShellViewModel : MailBaseViewModel,
                 Type = MailSynchronizationType.FullFolders
             };
 
-            Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
+            Messenger.Send(new NewMailSynchronizationRequested(options));
         }
     }
 
@@ -382,7 +410,7 @@ public partial class AppShellViewModel : MailBaseViewModel,
     {
         if (PreferencesService.StartupEntityId == null)
         {
-            NavigationService.Navigate(WinoPage.WelcomePage);
+            NavigateToWelcomeWizard();
         }
         else
         {
@@ -406,8 +434,8 @@ public partial class AppShellViewModel : MailBaseViewModel,
             }
             else
             {
-                // Fallback to welcome page if startup entity is not found.
-                NavigationService.Navigate(WinoPage.WelcomePage);
+                // Fallback to the welcome wizard if startup entity is not found.
+                NavigateToWelcomeWizard();
             }
         }
     }
@@ -426,7 +454,7 @@ public partial class AppShellViewModel : MailBaseViewModel,
 
             var args = new NavigateMailFolderEventArgs(baseFolderMenuItem, folderInitAwaitTask);
 
-            NavigationService.Navigate(WinoPage.MailListPage, args, NavigationReferenceFrame.ShellFrame);
+            NavigationService.Navigate(WinoPage.MailListPage, args, NavigationReferenceFrame.InnerShellFrame);
 
             UpdateWindowTitleForFolder(baseFolderMenuItem);
         });
@@ -440,6 +468,11 @@ public partial class AppShellViewModel : MailBaseViewModel,
         StatePersistenceService.CoreWindowTitle = $"{folder.AssignedAccountName} - {folder.FolderName}";
     }
 
+    private void UpdateWindowTitle(string title)
+    {
+        StatePersistenceService.CoreWindowTitle = title;
+    }
+
     private async Task NavigateSpecialFolderAsync(MailAccount account, SpecialFolderType specialFolderType, bool extendAccountMenu)
     {
         try
@@ -558,21 +591,75 @@ public partial class AppShellViewModel : MailBaseViewModel,
         }
     }
 
+    public Task HandleAccountAttentionAsync(MailAccount account)
+        => FixAccountIssuesAsync(account);
+
+    private void TriggerFullSynchronization(MailAccount account)
+    {
+        Messenger.Send(new NewMailSynchronizationRequested(new MailSynchronizationOptions
+        {
+            AccountId = account.Id,
+            Type = MailSynchronizationType.FullFolders
+        }));
+
+        if (account.IsCalendarAccessGranted)
+        {
+            Messenger.Send(new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions
+            {
+                AccountId = account.Id,
+                Type = CalendarSynchronizationType.CalendarEvents
+            }));
+        }
+    }
+
     private async Task FixAccountIssuesAsync(MailAccount account)
     {
-        // TODO: This area is very unclear. Needs to be rewritten with care.
-        // Fix account issues are expected to not work, but may work for some cases.
-
         try
         {
             if (account.AttentionReason == AccountAttentionReason.InvalidCredentials)
-                await _accountService.FixTokenIssuesAsync(account.Id);
+            {
+                if (account.ProviderType is MailProviderType.Gmail or MailProviderType.Outlook)
+                {
+                    await SynchronizationManager.Instance.HandleAuthorizationAsync(
+                        account.ProviderType,
+                        account,
+                        account.ProviderType == MailProviderType.Gmail);
+
+                    await _accountService.ClearAccountAttentionAsync(account.Id);
+
+                    _dialogService.InfoBarMessage(
+                        Translator.Info_AccountIssueFixSuccessTitle,
+                        Translator.Info_AccountIssueFixSuccessMessage,
+                        InfoBarMessageType.Success);
+
+                    TriggerFullSynchronization(account);
+                    return;
+                }
+
+                NavigationService.Navigate(WinoPage.SettingsPage, WinoPage.ManageAccountsPage);
+                Messenger.Send(new BreadcrumbNavigationRequested(
+                    Translator.ImapCalDavSettingsPage_TitleEdit,
+                    WinoPage.ImapCalDavSettingsPage,
+                    ImapCalDavSettingsNavigationContext.CreateForEditMode(account.Id)));
+
+                _dialogService.InfoBarMessage(
+                    Translator.Info_AccountIssueFixSuccessTitle,
+                    Translator.Info_AccountIssueFixImapMessage,
+                    InfoBarMessageType.Information);
+                return;
+            }
             else if (account.AttentionReason == AccountAttentionReason.MissingSystemFolderConfiguration)
+            {
                 await _dialogService.HandleSystemFolderConfigurationDialogAsync(account.Id, _folderService);
+                await _accountService.ClearAccountAttentionAsync(account.Id);
 
-            await _accountService.ClearAccountAttentionAsync(account.Id);
+                _dialogService.InfoBarMessage(
+                    Translator.Info_AccountIssueFixSuccessTitle,
+                    Translator.Info_AccountIssueFixSuccessMessage,
+                    InfoBarMessageType.Success);
 
-            _dialogService.InfoBarMessage(Translator.Info_AccountIssueFixFailedTitle, Translator.Info_AccountIssueFixSuccessMessage, InfoBarMessageType.Success);
+                TriggerFullSynchronization(account);
+            }
         }
         catch (Exception ex)
         {
@@ -619,14 +706,6 @@ public partial class AppShellViewModel : MailBaseViewModel,
             // Don't navigate to merged account if it's already selected. Preserve user's already selected folder.
             await ChangeLoadedAccountAsync(clickedMergedAccountMenuItem, true);
         }
-        else if (clickedMenuItem is SettingsItem)
-        {
-            NavigationService.Navigate(WinoPage.SettingsPage, parameter, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.None);
-        }
-        else if (clickedMenuItem is ManageAccountsMenuItem)
-        {
-            NavigationService.Navigate(WinoPage.ManageAccountsPage, parameter, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.None);
-        }
         else if (clickedMenuItem is IAccountMenuItem clickedAccountMenuItem)
         {
             // Changing loaded account.
@@ -801,7 +880,7 @@ public partial class AppShellViewModel : MailBaseViewModel,
 
                 if (isManageAccountClicked)
                 {
-                    SelectedMenuItem = ManageAccountsMenuItem;
+                    NavigationService.Navigate(WinoPage.SettingsPage, WinoPage.ManageAccountsPage);
                 }
 
                 return;
@@ -874,49 +953,20 @@ public partial class AppShellViewModel : MailBaseViewModel,
         await _winoRequestDelegator.ExecuteAsync(draftPreparationRequest);
     }
 
-    protected override async void OnAccountUpdated(MailAccount updatedAccount)
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
     {
-        await ExecuteUIThread(() =>
+        if (args.Handled || args.Mode != WinoApplicationMode.Mail)
+            return;
+
+        if (args.Action == KeyboardShortcutAction.NewMail)
         {
-            if (MenuItems.TryGetAccountMenuItem(updatedAccount.Id, out IAccountMenuItem foundAccountMenuItem))
-            {
-                foundAccountMenuItem.UpdateAccount(updatedAccount);
-            }
-        });
-    }
-
-    protected override void OnAccountRemoved(MailAccount removedAccount)
-        => Messenger.Send(new AccountsMenuRefreshRequested(false));
-
-    protected override async void OnAccountCreated(MailAccount createdAccount)
-    {
-        latestSelectedAccountMenuItem = null;
-
-        await RecreateMenuItemsAsync();
-
-        if (!MenuItems.TryGetAccountMenuItem(createdAccount.Id, out IAccountMenuItem createdMenuItem)) return;
-
-        await ChangeLoadedAccountAsync(createdMenuItem);
-
-        // Each created account should start a new synchronization automatically.
-        var options = new MailSynchronizationOptions()
-        {
-            AccountId = createdAccount.Id,
-            Type = MailSynchronizationType.FullFolders,
-        };
-
-        Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
-
-        try
-        {
-            await _nativeAppService.PinAppToTaskbarAsync();
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to pin Wino to taskbar.");
+            await HandleCreateNewMailAsync();
+            args.Handled = true;
         }
     }
 
+
+
     // TODO: Handle by messaging.
     private async Task SetAccountAttentionAsync(Guid accountId, AccountAttentionReason reason)
     {
@@ -931,8 +981,6 @@ public partial class AppShellViewModel : MailBaseViewModel,
         accountMenuItem.UpdateAccount(accountModel);
     }
 
-    public void Receive(NavigateManageAccountsRequested message) => SelectedMenuItem = ManageAccountsMenuItem;
-
     public async void Receive(MailtoProtocolMessageRequested message)
     {
         var accounts = await _accountService.GetAccountsAsync();
@@ -963,13 +1011,94 @@ public partial class AppShellViewModel : MailBaseViewModel,
 
     private async Task RecreateMenuItemsAsync()
     {
-        await ExecuteUIThread(() =>
+        await _menuRefreshSemaphore.WaitAsync().ConfigureAwait(false);
+        try
         {
-            MenuItems.Clear();
-            MenuItems.Add(CreateMailMenuItem);
-        });
+            await ExecuteUIThread(() =>
+            {
+                MenuItems.Clear();
+                MenuItems.Add(CreateMailMenuItem);
+            });
 
-        await LoadAccountsAsync();
+            await LoadAccountsAsync();
+        }
+        finally
+        {
+            _menuRefreshSemaphore.Release();
+        }
+    }
+
+    private async Task RestoreSelectedAccountAfterMenuRefreshAsync(bool automaticallyNavigateFirstItem)
+    {
+        IAccountMenuItem validSelectedMenuItem = null;
+        bool hasPreviousSelection = latestSelectedAccountMenuItem != null;
+
+        if (hasPreviousSelection)
+        {
+            var selectedEntityId = latestSelectedAccountMenuItem.EntityId.GetValueOrDefault();
+
+            if (selectedEntityId != Guid.Empty &&
+                MenuItems.TryGetAccountMenuItem(selectedEntityId, out IAccountMenuItem foundSelectedMenuItem))
+            {
+                validSelectedMenuItem = foundSelectedMenuItem;
+            }
+            else
+            {
+                latestSelectedAccountMenuItem = null;
+            }
+        }
+
+        if (validSelectedMenuItem == null)
+        {
+            validSelectedMenuItem = MenuItems.FirstOrDefault(a => a is IAccountMenuItem) as IAccountMenuItem;
+            hasPreviousSelection = false;
+        }
+
+        if (validSelectedMenuItem != null)
+        {
+            await ChangeLoadedAccountAsync(validSelectedMenuItem, hasPreviousSelection || automaticallyNavigateFirstItem);
+        }
+        else
+        {
+            await ExecuteUIThread(() => SelectedMenuItem = null);
+            NavigateToWelcomeWizard();
+        }
+    }
+
+    private void NavigateToWelcomeWizard()
+        => NavigationService.Navigate(
+            WinoPage.WelcomeHostPage,
+            null,
+            NavigationReferenceFrame.ShellFrame,
+            NavigationTransitionType.None);
+
+    private bool IsAccountCurrentlyLoaded(Guid accountId)
+    {
+        return latestSelectedAccountMenuItem?.HoldingAccounts?.Any(a => a.Id == accountId) == true;
+    }
+
+    private async Task RefreshLoadedAccountFolderStructureAsync(Guid accountId)
+    {
+        if (!IsAccountCurrentlyLoaded(accountId) || latestSelectedAccountMenuItem == null)
+            return;
+
+        var selectedFolderId = (SelectedMenuItem as IBaseFolderMenuItem)?.HandlingFolders
+            ?.FirstOrDefault(a => a.MailAccountId == accountId)?.Id;
+
+        var folders = await _folderService.GetAccountFoldersForDisplayAsync(latestSelectedAccountMenuItem);
+
+        await MenuItems.ReplaceFoldersAsync(folders);
+        await UpdateUnreadItemCountAsync();
+
+        if (selectedFolderId.HasValue &&
+            MenuItems.TryGetFolderMenuItem(selectedFolderId.Value, out IBaseFolderMenuItem selectedFolderMenuItem))
+        {
+            await NavigateFolderAsync(selectedFolderMenuItem);
+        }
+        else
+        {
+            await NavigateInboxAsync(latestSelectedAccountMenuItem);
+        }
     }
 
     public async void Receive(RefreshUnreadCountsMessage message)
@@ -978,27 +1107,12 @@ public partial class AppShellViewModel : MailBaseViewModel,
     public async void Receive(AccountsMenuRefreshRequested message)
     {
         await RecreateMenuItemsAsync();
-
-        // Try to restore latest selected account.
-        if (latestSelectedAccountMenuItem != null)
-        {
-            await ChangeLoadedAccountAsync(latestSelectedAccountMenuItem, navigateInbox: true);
-        }
-        else if (MenuItems.FirstOrDefault(a => a is IAccountMenuItem) is IAccountMenuItem firstAccount)
-        {
-            await ChangeLoadedAccountAsync(firstAccount, message.AutomaticallyNavigateFirstItem);
-        }
+        await RestoreSelectedAccountAfterMenuRefreshAsync(message.AutomaticallyNavigateFirstItem);
     }
 
     public async void Receive(AccountFolderConfigurationUpdated message)
     {
-        // Reloading of folders is needed to re-create folder tree if the account is loaded.
-
-        if (MenuItems.TryGetAccountMenuItem(message.AccountId, out IAccountMenuItem accountMenuItem) &&
-            latestSelectedAccountMenuItem == accountMenuItem)
-        {
-            await ChangeLoadedAccountAsync(accountMenuItem, true);
-        }
+        await RefreshLoadedAccountFolderStructureAsync(message.AccountId);
     }
 
     public async void Receive(MergedInboxRenamed message)
@@ -1015,10 +1129,9 @@ public partial class AppShellViewModel : MailBaseViewModel,
 
     public async void Receive(LanguageChanged message)
     {
-        await CreateFooterItemsAsync();
+        await CreateFooterItemsAsync(true);
         await RecreateMenuItemsAsync();
-
-        await ChangeLoadedAccountAsync(latestSelectedAccountMenuItem, navigateInbox: false);
+        await RestoreSelectedAccountAfterMenuRefreshAsync(false);
     }
 
     private void ReorderAccountMenuItems(Dictionary<Guid, int> newAccountOrder)
@@ -1056,6 +1169,24 @@ public partial class AppShellViewModel : MailBaseViewModel,
         UpdateFolderCollection(mailItemFolder);
     }
 
+    protected override async void OnFolderDeleted(MailItemFolder folder)
+    {
+        base.OnFolderDeleted(folder);
+
+        bool wasSelected = SelectedMenuItem is IBaseFolderMenuItem selectedFolder &&
+            selectedFolder.HandlingFolders.Any(a => a.Id == folder.Id);
+
+        await ExecuteUIThread(() => MenuItems.RemoveFolderMenuItem(folder.Id));
+
+        if (wasSelected && latestSelectedAccountMenuItem != null)
+        {
+            await NavigateInboxAsync(latestSelectedAccountMenuItem);
+            return;
+        }
+
+        await RefreshLoadedAccountFolderStructureAsync(folder.MailAccountId);
+    }
+
     protected override void OnFolderSynchronizationEnabled(IMailItemFolder mailItemFolder)
     {
         base.OnFolderSynchronizationEnabled(mailItemFolder);
@@ -1063,17 +1194,163 @@ public partial class AppShellViewModel : MailBaseViewModel,
         UpdateFolderCollection(mailItemFolder);
     }
 
-    public async void Receive(AccountSynchronizationProgressUpdatedMessage message)
+    public async void Receive(AccountSynchronizerStateChanged message)
     {
         var accountMenuItem = MenuItems.GetSpecificAccountMenuItem(message.AccountId);
 
         if (accountMenuItem == null) return;
 
-        await ExecuteUIThread(() => { accountMenuItem.SynchronizationProgress = message.Progress; });
+        await ExecuteUIThread(() =>
+        {
+            accountMenuItem.TotalItemsToSync = message.TotalItemsToSync;
+            accountMenuItem.RemainingItemsToSync = message.RemainingItemsToSync;
+            accountMenuItem.SynchronizationStatus = message.SynchronizationStatus;
+
+            // If this account is part of a merged inbox, update the merged inbox progress as well
+            if (accountMenuItem.ParentMenuItem is MergedAccountMenuItem mergedAccountMenuItem)
+            {
+                mergedAccountMenuItem.RefreshSynchronizationProgress();
+            }
+        });
     }
 
     public async void Receive(NavigateAppPreferencesRequested message)
     {
-        await MenuItemInvokedOrSelectedAsync(SettingsItem, WinoPage.AppPreferencesPage);
+        NavigationService.Navigate(WinoPage.SettingsPage, WinoPage.AppPreferencesPage);
     }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<AccountRemovedMessage>(this);
+        Messenger.Register<AccountUpdatedMessage>(this);
+        Messenger.Register<MailtoProtocolMessageRequested>(this);
+        Messenger.Register<RefreshUnreadCountsMessage>(this);
+        Messenger.Register<AccountsMenuRefreshRequested>(this);
+        Messenger.Register<MergedInboxRenamed>(this);
+        Messenger.Register<LanguageChanged>(this);
+        Messenger.Register<AccountMenuItemsReordered>(this);
+        Messenger.Register<AccountSynchronizerStateChanged>(this);
+        Messenger.Register<NavigateAppPreferencesRequested>(this);
+        Messenger.Register<AccountFolderConfigurationUpdated>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<AccountRemovedMessage>(this);
+        Messenger.Unregister<AccountUpdatedMessage>(this);
+        Messenger.Unregister<MailtoProtocolMessageRequested>(this);
+        Messenger.Unregister<RefreshUnreadCountsMessage>(this);
+        Messenger.Unregister<AccountsMenuRefreshRequested>(this);
+        Messenger.Unregister<MergedInboxRenamed>(this);
+        Messenger.Unregister<LanguageChanged>(this);
+        Messenger.Unregister<AccountMenuItemsReordered>(this);
+        Messenger.Unregister<AccountSynchronizerStateChanged>(this);
+        Messenger.Unregister<NavigateAppPreferencesRequested>(this);
+        Messenger.Unregister<AccountFolderConfigurationUpdated>(this);
+    }
+
+    public async void Receive(AccountRemovedMessage message)
+    {
+        var remainingAccounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        if (!remainingAccounts.Any())
+        {
+            latestSelectedAccountMenuItem = null;
+            await ExecuteUIThread(() =>
+            {
+                SelectedMenuItem = null;
+                MenuItems?.Clear();
+                MenuItems?.Add(CreateMailMenuItem);
+            });
+            return;
+        }
+
+        if (latestSelectedAccountMenuItem?.HoldingAccounts?.Any(a => a.Id == message.Account.Id) == true)
+        {
+            latestSelectedAccountMenuItem = null;
+            await ExecuteUIThread(() => SelectedMenuItem = null);
+        }
+
+        await RecreateMenuItemsAsync();
+        await RestoreSelectedAccountAfterMenuRefreshAsync(false);
+    }
+
+    public async Task HandleAccountCreatedAsync(MailAccount createdAccount)
+    {
+        latestSelectedAccountMenuItem = null;
+
+        await RecreateMenuItemsAsync();
+
+        if (!MenuItems.TryGetAccountMenuItem(createdAccount.Id, out IAccountMenuItem createdMenuItem))
+        {
+            Log.Warning("Created account {AccountId} could not be found in menu items after refresh.", createdAccount.Id);
+            return;
+        }
+
+        await ChangeLoadedAccountAsync(createdMenuItem);
+
+        // Each created account should start a new synchronization automatically.
+        var options = new MailSynchronizationOptions()
+        {
+            AccountId = createdAccount.Id,
+            Type = MailSynchronizationType.FullFolders,
+        };
+
+        Messenger.Send(new NewMailSynchronizationRequested(options));
+
+        if (createdAccount.IsCalendarAccessGranted)
+        {
+            var calendarOptions = new CalendarSynchronizationOptions()
+            {
+                AccountId = createdAccount.Id,
+                Type = CalendarSynchronizationType.CalendarEvents
+            };
+
+            Messenger.Send(new NewCalendarSynchronizationRequested(calendarOptions));
+        }
+
+        try
+        {
+            await _nativeAppService.PinAppToTaskbarAsync();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to pin Wino to taskbar.");
+        }
+    }
+
+    public async void Receive(AccountUpdatedMessage message)
+    {
+        var updatedAccount = message.Account;
+
+        await ExecuteUIThread(() =>
+        {
+            if (MenuItems.TryGetAccountMenuItem(updatedAccount.Id, out IAccountMenuItem foundAccountMenuItem))
+            {
+                foundAccountMenuItem.UpdateAccount(updatedAccount);
+            }
+        });
+    }
+
+    void IShellClient.Activate(ShellModeActivationContext activationContext)
+        => OnNavigatedTo(NavigationMode.New, activationContext);
+
+    void IShellClient.Deactivate()
+        => OnNavigatedFrom(NavigationMode.New, null!);
+
+    Task IShellClient.HandleNavigationItemInvokedAsync(IMenuItem menuItem)
+        => MenuItemInvokedOrSelectedAsync(menuItem);
+
+    Task IShellClient.HandleNavigationSelectionChangedAsync(IMenuItem menuItem)
+        => menuItem == null ? Task.CompletedTask : MenuItemInvokedOrSelectedAsync(menuItem);
 }
+
+
+
+
+
+
+
diff --git a/Wino.Mail.ViewModels/MailBaseViewModel.cs b/Wino.Mail.ViewModels/MailBaseViewModel.cs
index 084c498d..07be737f 100644
--- a/Wino.Mail.ViewModels/MailBaseViewModel.cs
+++ b/Wino.Mail.ViewModels/MailBaseViewModel.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.ViewModels;
 using Wino.Messaging.UI;
@@ -12,39 +12,28 @@ public class MailBaseViewModel : CoreBaseViewModel,
     IRecipient<MailAddedMessage>,
     IRecipient<MailRemovedMessage>,
     IRecipient<MailUpdatedMessage>,
-    IRecipient<BulkMailUpdatedMessage>,
     IRecipient<MailDownloadedMessage>,
     IRecipient<DraftCreated>,
     IRecipient<DraftFailed>,
     IRecipient<DraftMapped>,
     IRecipient<FolderRenamed>,
+    IRecipient<FolderDeleted>,
     IRecipient<FolderSynchronizationEnabled>
 {
     protected virtual void OnMailAdded(MailCopy addedMail) { }
     protected virtual void OnMailRemoved(MailCopy removedMail) { }
-    protected virtual void OnMailUpdated(MailCopy updatedMail) { }
-
-    protected virtual void OnMailUpdated(IReadOnlyList<MailCopy> updatedMails)
-    {
-        if (updatedMails == null) return;
-
-        foreach (var mail in updatedMails)
-        {
-            OnMailUpdated(mail);
-        }
-    }
-
+    protected virtual void OnMailUpdated(MailCopy updatedMail, MailUpdateSource source, MailCopyChangeFlags changedProperties) { }
     protected virtual void OnMailDownloaded(MailCopy downloadedMail) { }
     protected virtual void OnDraftCreated(MailCopy draftMail, MailAccount account) { }
     protected virtual void OnDraftFailed(MailCopy draftMail, MailAccount account) { }
     protected virtual void OnDraftMapped(string localDraftCopyId, string remoteDraftCopyId) { }
     protected virtual void OnFolderRenamed(IMailItemFolder mailItemFolder) { }
+    protected virtual void OnFolderDeleted(MailItemFolder folder) { }
     protected virtual void OnFolderSynchronizationEnabled(IMailItemFolder mailItemFolder) { }
 
     void IRecipient<MailAddedMessage>.Receive(MailAddedMessage message) => OnMailAdded(message.AddedMail);
     void IRecipient<MailRemovedMessage>.Receive(MailRemovedMessage message) => OnMailRemoved(message.RemovedMail);
-    void IRecipient<MailUpdatedMessage>.Receive(MailUpdatedMessage message) => OnMailUpdated(message.UpdatedMail);
-    void IRecipient<BulkMailUpdatedMessage>.Receive(BulkMailUpdatedMessage message) => OnMailUpdated(message.UpdatedMails);
+    void IRecipient<MailUpdatedMessage>.Receive(MailUpdatedMessage message) => OnMailUpdated(message.UpdatedMail, message.Source, message.ChangedProperties);
     void IRecipient<MailDownloadedMessage>.Receive(MailDownloadedMessage message) => OnMailDownloaded(message.DownloadedMail);
 
     void IRecipient<DraftMapped>.Receive(DraftMapped message) => OnDraftMapped(message.LocalDraftCopyId, message.RemoteDraftCopyId);
@@ -52,5 +41,40 @@ public class MailBaseViewModel : CoreBaseViewModel,
     void IRecipient<DraftCreated>.Receive(DraftCreated message) => OnDraftCreated(message.DraftMail, message.Account);
 
     void IRecipient<FolderRenamed>.Receive(FolderRenamed message) => OnFolderRenamed(message.MailItemFolder);
+    void IRecipient<FolderDeleted>.Receive(FolderDeleted message) => OnFolderDeleted(message.MailItemFolder);
     void IRecipient<FolderSynchronizationEnabled>.Receive(FolderSynchronizationEnabled message) => OnFolderSynchronizationEnabled(message.MailItemFolder);
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        UnregisterRecipients();
+
+        Messenger.Register<MailAddedMessage>(this);
+        Messenger.Register<MailRemovedMessage>(this);
+        Messenger.Register<MailUpdatedMessage>(this);
+        Messenger.Register<MailDownloadedMessage>(this);
+        Messenger.Register<DraftCreated>(this);
+        Messenger.Register<DraftFailed>(this);
+        Messenger.Register<DraftMapped>(this);
+        Messenger.Register<FolderRenamed>(this);
+        Messenger.Register<FolderDeleted>(this);
+        Messenger.Register<FolderSynchronizationEnabled>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<MailAddedMessage>(this);
+        Messenger.Unregister<MailRemovedMessage>(this);
+        Messenger.Unregister<MailUpdatedMessage>(this);
+        Messenger.Unregister<MailDownloadedMessage>(this);
+        Messenger.Unregister<DraftCreated>(this);
+        Messenger.Unregister<DraftFailed>(this);
+        Messenger.Unregister<DraftMapped>(this);
+        Messenger.Unregister<FolderRenamed>(this);
+        Messenger.Unregister<FolderDeleted>(this);
+        Messenger.Unregister<FolderSynchronizationEnabled>(this);
+    }
 }
diff --git a/Wino.Mail.ViewModels/MailListPageViewModel.cs b/Wino.Mail.ViewModels/MailListPageViewModel.cs
index d7bfc2a0..991bd517 100644
--- a/Wino.Mail.ViewModels/MailListPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MailListPageViewModel.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
-using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 using MoreLinq;
 using Nito.AsyncEx;
 using Serilog;
@@ -18,12 +17,14 @@ using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Menus;
+using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.Domain.Models.Server;
 using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.Services;
 using Wino.Mail.ViewModels.Collections;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.ViewModels.Messages;
@@ -36,13 +37,13 @@ namespace Wino.Mail.ViewModels;
 public partial class MailListPageViewModel : MailBaseViewModel,
     IRecipient<MailItemNavigationRequested>,
     IRecipient<ActiveMailFolderChangedEvent>,
-    IRecipient<MailItemSelectedEvent>,
-    IRecipient<MailItemSelectionRemovedEvent>,
     IRecipient<AccountSynchronizationCompleted>,
     IRecipient<NewMailSynchronizationRequested>,
     IRecipient<AccountSynchronizerStateChanged>,
     IRecipient<AccountCacheResetMessage>,
-    IRecipient<ThumbnailAdded>
+    IRecipient<ThumbnailAdded>,
+    IRecipient<PropertyChangedMessage<bool>>,
+    IRecipient<SwipeActionRequested>
 {
     private bool isChangingFolder = false;
 
@@ -57,13 +58,9 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
     private readonly HashSet<Guid> gmailUnreadFolderMarkedAsReadUniqueIds = [];
 
-    private IObservable<System.Reactive.EventPattern<NotifyCollectionChangedEventArgs>> selectionChangedObservable = null;
-
-    public WinoMailCollection MailCollection { get; }
-
-    public ObservableCollection<MailItemViewModel> SelectedItems { get; set; } = [];
+    public WinoMailCollection MailCollection { get; set; } = new WinoMailCollection();
     public ObservableCollection<FolderPivotViewModel> PivotFolders { get; set; } = [];
-    public ObservableCollection<MailOperationMenuItem> ActionItems { get; set; } = [];
+    public ObservableCollection<IMenuOperation> ActionItems { get; set; } = [];
 
     private readonly SemaphoreSlim listManipulationSemepahore = new SemaphoreSlim(1);
     private CancellationTokenSource listManipulationCancellationTokenSource = new CancellationTokenSource();
@@ -71,18 +68,18 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     public INavigationService NavigationService { get; }
     public IStatePersistanceService StatePersistenceService { get; }
     public IPreferencesService PreferencesService { get; }
-    public IThemeService ThemeService { get; }
+    public INewThemeService ThemeService { get; }
 
     private readonly IAccountService _accountService;
     private readonly IMailDialogService _mailDialogService;
     private readonly IMailService _mailService;
+    private readonly IMimeFileService _mimeFileService;
+    private readonly INotificationBuilder _notificationBuilder;
     private readonly IFolderService _folderService;
-    private readonly IThreadingStrategyProvider _threadingStrategyProvider;
     private readonly IContextMenuItemService _contextMenuItemService;
     private readonly IWinoRequestDelegator _winoRequestDelegator;
     private readonly IKeyPressService _keyPressService;
     private readonly IWinoLogger _winoLogger;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
     private MailItemViewModel _activeMailItem;
 
     public List<SortingOption> SortingOptions { get; } =
@@ -104,6 +101,16 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     [ObservableProperty]
     private bool isMultiSelectionModeEnabled;
 
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(SelectedMessageText))]
+    [NotifyPropertyChangedFor(nameof(DraggingMessageText))]
+    public partial bool IsDragInProgress { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(SelectedMessageText))]
+    [NotifyPropertyChangedFor(nameof(DraggingMessageText))]
+    public partial int DraggingItemsCount { get; set; }
+
     [ObservableProperty]
     public partial string SearchQuery { get; set; }
 
@@ -116,25 +123,32 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     [NotifyPropertyChangedFor(nameof(IsEmpty))]
     [NotifyPropertyChangedFor(nameof(IsFolderEmpty))]
     [NotifyPropertyChangedFor(nameof(IsProgressRing))]
-    private bool isInitializingFolder;
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreItemsCommand))]
+    public partial bool IsInitializingFolder { get; set; }
 
     [ObservableProperty]
-    private InfoBarMessageType barSeverity;
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreItemsCommand))]
+    public partial bool FinishedLoading { get; set; } = false;
+
+    public bool CanLoadMoreItems => !IsInitializingFolder && !IsOnlineSearchEnabled && !FinishedLoading;
 
     [ObservableProperty]
-    private string barMessage;
+    public partial InfoBarMessageType BarSeverity { get; set; }
 
     [ObservableProperty]
-    private double mailListLength = 420;
+    public partial string BarMessage { get; set; }
 
     [ObservableProperty]
-    private double maxMailListLength = 1200;
+    public partial double MailListLength { get; set; } = 420;
 
     [ObservableProperty]
-    private string barTitle;
+    public partial double MaxMailListLength { get; set; } = 1200;
 
     [ObservableProperty]
-    private bool isBarOpen;
+    public partial string BarTitle { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsBarOpen { get; set; }
 
     /// <summary>
     /// Current folder that is being represented from the menu.
@@ -142,80 +156,89 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanSynchronize))]
     [NotifyPropertyChangedFor(nameof(IsFolderSynchronizationEnabled))]
-    private IBaseFolderMenuItem activeFolder;
+    public partial IBaseFolderMenuItem ActiveFolder { get; set; }
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanSynchronize))]
-    private bool isAccountSynchronizerInSynchronization;
+    public partial bool IsAccountSynchronizerInSynchronization { get; set; }
 
     public MailListPageViewModel(IMailDialogService dialogService,
                                  INavigationService navigationService,
                                  IAccountService accountService,
                                  IMailDialogService mailDialogService,
                                  IMailService mailService,
+                                 IMimeFileService mimeFileService,
                                  IStatePersistanceService statePersistenceService,
+                                 INotificationBuilder notificationBuilder,
                                  IFolderService folderService,
-                                 IThreadingStrategyProvider threadingStrategyProvider,
                                  IContextMenuItemService contextMenuItemService,
                                  IWinoRequestDelegator winoRequestDelegator,
                                  IKeyPressService keyPressService,
                                  IPreferencesService preferencesService,
-                                 IThemeService themeService,
-                                 IWinoLogger winoLogger,
-                                 IWinoServerConnectionManager winoServerConnectionManager)
+                                 INewThemeService themeService,
+                                 IWinoLogger winoLogger)
     {
-        MailCollection = new WinoMailCollection(threadingStrategyProvider);
-        PreferencesService = preferencesService;
-        ThemeService = themeService;
         _winoLogger = winoLogger;
-        _winoServerConnectionManager = winoServerConnectionManager;
-        StatePersistenceService = statePersistenceService;
-        NavigationService = navigationService;
         _accountService = accountService;
         _mailDialogService = mailDialogService;
         _mailService = mailService;
+        _mimeFileService = mimeFileService;
         _folderService = folderService;
-        _threadingStrategyProvider = threadingStrategyProvider;
         _contextMenuItemService = contextMenuItemService;
         _winoRequestDelegator = winoRequestDelegator;
         _keyPressService = keyPressService;
 
+        PreferencesService = preferencesService;
+        ThemeService = themeService;
+        StatePersistenceService = statePersistenceService;
+        _notificationBuilder = notificationBuilder;
+        NavigationService = navigationService;
+
         SelectedFilterOption = FilterOptions[0];
         SelectedSortingOption = SortingOptions[0];
 
-        mailListLength = statePersistenceService.MailListPaneLength;
+        MailListLength = statePersistenceService.MailListPaneLength;
+    }
 
-        selectionChangedObservable = Observable.FromEventPattern<NotifyCollectionChangedEventArgs>(SelectedItems, nameof(SelectedItems.CollectionChanged));
-        selectionChangedObservable
-            .Throttle(TimeSpan.FromMilliseconds(100))
-            .Subscribe(async a =>
-            {
-                await ExecuteUIThread(() => { SelectedItemCollectionUpdated(a.EventArgs); });
-            });
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
 
-        MailCollection.MailItemRemoved += (c, removedItem) =>
+        MailCollection.ItemSelectionChanged += MailItemSelectionChanged;
+    }
+
+    public override async void OnNavigatedFrom(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedFrom(mode, parameters);
+
+        MailCollection.ItemSelectionChanged -= MailItemSelectionChanged;
+
+        await MailCollection.ClearAsync();
+        MailCollection.Cleanup();
+    }
+
+    private void MailItemSelectionChanged(object sender, EventArgs e)
+    {
+        if (MailCollection.HasSingleItemSelected)
         {
-            if (removedItem is ThreadMailItemViewModel removedThreadViewModelItem)
-            {
-                foreach (var viewModel in removedThreadViewModelItem.ThreadItems.Cast<MailItemViewModel>())
-                {
-                    if (SelectedItems.Contains(viewModel))
-                    {
-                        SelectedItems.Remove(viewModel);
-                    }
-                }
-            }
-            else if (removedItem is MailItemViewModel removedMailItemViewModel && SelectedItems.Contains(removedMailItemViewModel))
-            {
-                SelectedItems.Remove(removedMailItemViewModel);
-            }
-        };
+            var selectedItem = MailCollection.SelectedItems.ElementAtOrDefault(0);
+            ActiveMailItemChanged(selectedItem);
+        }
+        else if (MailCollection.SelectedItemsCount == 0)
+        {
+            ActiveMailItemChanged(null);
+        }
+
+        NotifyItemFoundState();
+        NotifyItemSelected();
+        SetupTopBarActions();
     }
 
     private void SetupTopBarActions()
     {
         ActionItems.Clear();
-        var actions = GetAvailableMailActions(SelectedItems);
+
+        var actions = GetAvailableMailActions(MailCollection.SelectedItems);
         actions.ForEach(a => ActionItems.Add(a));
     }
 
@@ -248,7 +271,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
             {
                 if (value != null && MailCollection != null)
                 {
-                    MailCollection.SortingType = value.Type;
+                    MailCollection.GroupingType = value.Type == SortingOptionType.ReceiveDate ? EmailGroupingType.ByDate : EmailGroupingType.ByFromName;
                 }
             }
         }
@@ -256,18 +279,20 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
     public bool CanSynchronize => !IsAccountSynchronizerInSynchronization && IsFolderSynchronizationEnabled;
     public bool IsFolderSynchronizationEnabled => ActiveFolder?.IsSynchronizationEnabled ?? false;
-    public int SelectedItemCount => SelectedItems.Count;
-    public bool HasMultipleItemSelections => SelectedItemCount > 1;
-    public bool HasSingleItemSelection => SelectedItemCount == 1;
-    public bool HasSelectedItems => SelectedItems.Any();
     public bool IsArchiveSpecialFolder => ActiveFolder?.SpecialFolderType == SpecialFolderType.Archive;
 
-    public string SelectedMessageText => HasSelectedItems ? string.Format(Translator.MailsSelected, SelectedItemCount) : Translator.NoMailSelected;
+    public string SelectedMessageText => IsDragInProgress
+        ? string.Format(Translator.MailsDragging, DraggingItemsCount)
+        : MailCollection.SelectedItemsCount > 0
+            ? string.Format(Translator.MailsSelected, MailCollection.SelectedItemsCount)
+            : Translator.NoMailSelected;
+
+    public string DraggingMessageText => string.Format(Translator.MailsDragging, DraggingItemsCount);
 
     /// <summary>
     /// Indicates current state of the mail list. Doesn't matter it's loading or no.
     /// </summary>
-    public bool IsEmpty => MailCollection.Count == 0;
+    public bool IsEmpty => MailCollection.AllItemsCount == 0;
 
     /// <summary>
     /// Progress ring only should be visible when the folder is initializing and there are no items. We don't need to show it when there are items.
@@ -284,6 +309,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     public partial bool IsOnlineSearchButtonVisible { get; set; }
 
     [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(LoadMoreItemsCommand))]
     public partial bool IsOnlineSearchEnabled { get; set; }
 
     [ObservableProperty]
@@ -295,20 +321,6 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     {
         if (_activeMailItem == selectedMailItemViewModel) return;
 
-        // Don't update active mail item if Ctrl key is pressed or multi selection is enabled.
-        // User is probably trying to select multiple items.
-        // This is not the same behavior in Windows Mail,
-        // but it's a trash behavior.
-
-        var isCtrlKeyPressed = _keyPressService.IsCtrlKeyPressed();
-
-        bool isMultiSelecting = isCtrlKeyPressed || IsMultiSelectionModeEnabled;
-
-        if (isMultiSelecting && StatePersistenceService.IsReaderNarrowed)
-        {
-            return;
-        }
-
         _activeMailItem = selectedMailItemViewModel;
 
         Messenger.Send(new ActiveMailItemChangedEvent(_activeMailItem));
@@ -341,13 +353,14 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     public void NotifyItemSelected()
     {
         OnPropertyChanged(nameof(SelectedMessageText));
-        OnPropertyChanged(nameof(HasSingleItemSelection));
-        OnPropertyChanged(nameof(HasSelectedItems));
-        OnPropertyChanged(nameof(SelectedItemCount));
-        OnPropertyChanged(nameof(HasMultipleItemSelections));
 
-        if (SelectedFolderPivot != null)
-            SelectedFolderPivot.SelectedItemCount = SelectedItemCount;
+        SelectedFolderPivot?.SelectedItemCount = MailCollection.SelectedItemsCount;
+    }
+
+    public void SetDragState(bool isDragInProgress, int draggingItemsCount = 0)
+    {
+        IsDragInProgress = isDragInProgress;
+        DraggingItemsCount = isDragInProgress ? Math.Max(1, draggingItemsCount) : 0;
     }
 
     private void NotifyItemFoundState()
@@ -356,13 +369,6 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         OnPropertyChanged(nameof(IsFolderEmpty));
     }
 
-    protected override void OnDispatcherAssigned()
-    {
-        base.OnDispatcherAssigned();
-
-        MailCollection.CoreDispatcher = Dispatcher;
-    }
-
     private async void UpdateBarMessage(InfoBarMessageType severity, string title, string message)
     {
         await ExecuteUIThread(() =>
@@ -375,26 +381,6 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         });
     }
 
-    private void SelectedItemCollectionUpdated(NotifyCollectionChangedEventArgs e)
-    {
-        if (SelectedItems.Count == 1)
-        {
-            ActiveMailItemChanged(SelectedItems[0]);
-        }
-        else
-        {
-            // At this point, either we don't have any item selected 
-            // or we have multiple item selected. In either case
-            // there should be no active item.
-
-            ActiveMailItemChanged(null);
-        }
-
-        NotifyItemSelected();
-
-        SetupTopBarActions();
-    }
-
     private async Task UpdateFolderPivotsAsync()
     {
         if (ActiveFolder == null) return;
@@ -453,11 +439,11 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     public Task ExecuteHoverAction(MailOperationPreperationRequest request) => ExecuteMailOperationAsync(request);
 
     [RelayCommand]
-    private async Task ExecuteTopBarAction(MailOperationMenuItem menuItem)
+    private async Task ExecuteTopBarAction(IMenuOperation menuItem)
     {
-        if (menuItem == null || !SelectedItems.Any()) return;
+        if (menuItem is not MailOperationMenuItem mailOperationMenuItem || MailCollection.SelectedItemsCount == 0) return;
 
-        await HandleMailOperation(menuItem.Operation, SelectedItems);
+        await HandleMailOperation(mailOperationMenuItem.Operation, MailCollection.SelectedItems);
     }
 
     /// <summary>
@@ -467,9 +453,9 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     [RelayCommand]
     private async Task ExecuteMailOperation(MailOperation mailOperation)
     {
-        if (!SelectedItems.Any()) return;
+        if (MailCollection.SelectedItemsCount == 0) return;
 
-        await HandleMailOperation(mailOperation, SelectedItems);
+        await HandleMailOperation(mailOperation, MailCollection.SelectedItems);
     }
 
     private async Task HandleMailOperation(MailOperation mailOperation, IEnumerable<MailItemViewModel> mailItems)
@@ -507,7 +493,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
                 GroupedSynchronizationTrackingId = trackingSynchronizationId
             };
 
-            Messenger.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
+            Messenger.Send(new NewMailSynchronizationRequested(options));
         }
     }
 
@@ -544,6 +530,8 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     {
         IsOnlineSearchEnabled = false;
         AreSearchResultsOnline = false;
+        HasNoOnlineSearchResult = false;
+        OnPropertyChanged(nameof(HasNoOnlineSearchResult));
         IsInSearchMode = !string.IsNullOrEmpty(SearchQuery);
 
         if (IsInSearchMode)
@@ -565,11 +553,12 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         }
     }
 
-    [RelayCommand]
+    [RelayCommand(CanExecute = nameof(CanLoadMoreItems))]
     private async Task LoadMoreItemsAsync()
     {
-        if (IsInitializingFolder || IsOnlineSearchEnabled) return;
+        if (IsInitializingFolder || IsOnlineSearchEnabled || FinishedLoading) return;
 
+        Debug.WriteLine("Loading more...");
         await ExecuteUIThread(() => { IsInitializingFolder = true; });
 
         var initializationOptions = new MailListInitializationOptions(ActiveFolder.HandlingFolders,
@@ -582,9 +571,18 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
         var items = await _mailService.FetchMailsAsync(initializationOptions).ConfigureAwait(false);
 
-        var viewModels = PrepareMailViewModels(items);
+        if (items.Count == 0)
+        {
+            await ExecuteUIThread(() => { FinishedLoading = true; });
 
-        await ExecuteUIThread(() => { MailCollection.AddRange(viewModels, clearIdCache: false); });
+            return;
+        }
+
+        var viewModels = await PrepareMailViewModelsAsync(items).ConfigureAwait(false);
+        var pendingOperationUniqueIds = await GetPendingOperationUniqueIdsForActiveFolderAccountsAsync().ConfigureAwait(false);
+        ApplyPendingOperationBusyStates(viewModels, pendingOperationUniqueIds);
+
+        await MailCollection.AddRangeAsync(viewModels, false);
         await ExecuteUIThread(() => { IsInitializingFolder = false; });
     }
 
@@ -592,43 +590,91 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
     public Task ExecuteMailOperationAsync(MailOperationPreperationRequest package) => _winoRequestDelegator.ExecuteAsync(package);
 
-    public IEnumerable<MailItemViewModel> GetTargetMailItemViewModels(IMailItem clickedItem)
+    public override async Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args)
     {
-        // Threat threads as a whole and include everything in the group. Except single selections outside of the thread.
-        IEnumerable<MailItemViewModel> contextMailItems = null;
+        if (args.Handled || args.Mode != WinoApplicationMode.Mail)
+            return;
 
-        if (clickedItem is ThreadMailItemViewModel clickedThreadItem)
+        var targetItems = GetShortcutTargetItems().ToList();
+
+        switch (args.Action)
         {
-            // Clicked item is a thread.
-
-            clickedThreadItem.IsThreadExpanded = true;
-            contextMailItems = clickedThreadItem.ThreadItems.Cast<MailItemViewModel>();
-
-            // contextMailItems = clickedThreadItem.GetMailCopies();
+            case KeyboardShortcutAction.ToggleReadUnread:
+                if (!targetItems.Any()) return;
+                await ExecuteMailOperationAsync(new MailOperationPreperationRequest(MailOperation.MarkAsRead, targetItems.Select(x => x.MailCopy), true));
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.ToggleFlag:
+                if (!targetItems.Any()) return;
+                await ExecuteMailOperationAsync(new MailOperationPreperationRequest(MailOperation.SetFlag, targetItems.Select(x => x.MailCopy), true));
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.ToggleArchive:
+                if (!targetItems.Any()) return;
+                await ExecuteMailOperationAsync(new MailOperationPreperationRequest(MailOperation.Archive, targetItems.Select(x => x.MailCopy), true));
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.Delete:
+                if (!targetItems.Any()) return;
+                await ExecuteMailOperationAsync(new MailOperationPreperationRequest(MailOperation.SoftDelete, targetItems.Select(x => x.MailCopy)));
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.Move:
+                if (!targetItems.Any()) return;
+                await ExecuteMailOperationAsync(new MailOperationPreperationRequest(MailOperation.Move, targetItems.Select(x => x.MailCopy)));
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.Reply:
+                await CreateReplyDraftAsync(DraftCreationReason.Reply);
+                args.Handled = true;
+                break;
+            case KeyboardShortcutAction.ReplyAll:
+                await CreateReplyDraftAsync(DraftCreationReason.ReplyAll);
+                args.Handled = true;
+                break;
         }
-        else if (clickedItem is MailItemViewModel clickedMailItemViewModel)
-        {
-            // If the clicked item is included in SelectedItems, then we need to thing them as whole.
-            // If there are selected items, but clicked item is not one of them, then it's a single context menu.
-
-            bool includedInSelectedItems = SelectedItems.Contains(clickedItem);
-
-            if (includedInSelectedItems)
-                contextMailItems = SelectedItems;
-            else
-                contextMailItems = [clickedMailItemViewModel];
-        }
-
-        return contextMailItems;
     }
 
-    public IEnumerable<MailOperationMenuItem> GetAvailableMailActions(IEnumerable<IMailItem> contextMailItems)
-        => _contextMenuItemService.GetMailItemContextMenuActions(contextMailItems);
+    private IEnumerable<MailItemViewModel> GetShortcutTargetItems()
+    {
+        if (MailCollection.SelectedItemsCount > 0)
+            return MailCollection.SelectedItems.OfType<MailItemViewModel>();
 
-    public void ChangeCustomFocusedState(IEnumerable<IMailItem> mailItems, bool isFocused)
-        => mailItems.OfType<MailItemViewModel>().ForEach(a => a.IsCustomFocused = isFocused);
+        if (_activeMailItem != null)
+            return [_activeMailItem];
 
-    private bool ShouldPreventItemAdd(IMailItem mailItem)
+        return [];
+    }
+
+    private async Task CreateReplyDraftAsync(DraftCreationReason reason)
+    {
+        var targetMail = GetShortcutTargetItems().FirstOrDefault();
+        if (targetMail?.MailCopy == null || targetMail.MailCopy.FileId == Guid.Empty)
+            return;
+
+        var mimeInformation = await _mimeFileService.GetMimeMessageInformationAsync(targetMail.MailCopy.FileId, targetMail.MailCopy.AssignedAccount.Id);
+        if (mimeInformation?.MimeMessage == null)
+            return;
+
+        var draftOptions = new DraftCreationOptions
+        {
+            Reason = reason,
+            ReferencedMessage = new ReferencedMessage
+            {
+                MimeMessage = mimeInformation.MimeMessage,
+                MailCopy = targetMail.MailCopy
+            }
+        };
+
+        var (draftMailCopy, draftBase64MimeMessage) = await _mailService.CreateDraftAsync(targetMail.MailCopy.AssignedAccount.Id, draftOptions).ConfigureAwait(false);
+        var draftPreparationRequest = new DraftPreparationRequest(targetMail.MailCopy.AssignedAccount, draftMailCopy, draftBase64MimeMessage, draftOptions.Reason, targetMail.MailCopy);
+        await _winoRequestDelegator.ExecuteAsync(draftPreparationRequest);
+    }
+
+    public IEnumerable<MailOperationMenuItem> GetAvailableMailActions(IEnumerable<MailItemViewModel> contextMailItems)
+        => _contextMenuItemService.GetMailItemContextMenuActions(contextMailItems.Select(a => a.MailCopy));
+
+    private bool ShouldPreventItemAdd(MailCopy mailItem)
     {
         bool condition = mailItem.IsRead
                           && SelectedFilterOption.Type == FilterOptionType.Unread
@@ -638,6 +684,80 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         return condition;
     }
 
+    private static bool IsDraftOrSentFolder(MailCopy mailItem)
+        => mailItem?.AssignedFolder?.SpecialFolderType is SpecialFolderType.Draft or SpecialFolderType.Sent;
+
+    private bool IsActiveDraftFolder()
+        => ActiveFolder?.SpecialFolderType == SpecialFolderType.Draft;
+
+    private bool BelongsToActiveFolder(MailCopy mailItem)
+        => mailItem?.AssignedFolder != null && ActiveFolder?.HandlingFolders?.Any(a => a.Id == mailItem.AssignedFolder.Id) == true;
+
+    private bool ShouldIncludeByThread(MailCopy mailItem)
+        => PreferencesService.IsThreadingEnabled
+           && !string.IsNullOrEmpty(mailItem?.ThreadId)
+           && ThreadIdExistsInCollection(mailItem);
+
+    private bool ShouldIncludeAddedMailInCurrentList(MailCopy addedMail)
+    {
+        if (addedMail == null || ActiveFolder == null || addedMail.AssignedFolder == null)
+            return false;
+
+        // 1) If threading is enabled and we already have the same conversation in view, include it.
+        if (ShouldIncludeByThread(addedMail))
+            return true;
+
+        // 2) Include items that belong to the active folder.
+        if (BelongsToActiveFolder(addedMail))
+            return true;
+
+        // 3) Draft-specific visibility: include drafts while viewing Drafts.
+        if (addedMail.IsDraft && IsActiveDraftFolder())
+            return true;
+
+        return false;
+    }
+
+    private bool IsMailMatchingLocalSearch(MailCopy mailItem)
+    {
+        if (!IsInSearchMode) return true;
+        if (string.IsNullOrWhiteSpace(SearchQuery)) return true;
+
+        var query = SearchQuery.Trim();
+
+        return (!string.IsNullOrEmpty(mailItem.Subject) && mailItem.Subject.Contains(query, StringComparison.OrdinalIgnoreCase))
+            || (!string.IsNullOrEmpty(mailItem.PreviewText) && mailItem.PreviewText.Contains(query, StringComparison.OrdinalIgnoreCase))
+            || (!string.IsNullOrEmpty(mailItem.FromName) && mailItem.FromName.Contains(query, StringComparison.OrdinalIgnoreCase))
+            || (!string.IsNullOrEmpty(mailItem.FromAddress) && mailItem.FromAddress.Contains(query, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private bool ShouldRemoveUpdatedMailFromCurrentList(MailCopy updatedMail)
+    {
+        // Update flow already checks if this item is currently listed.
+        // Keep the item in the list and update in-place.
+        _ = updatedMail;
+        return false;
+    }
+
+    [RelayCommand]
+    public void RemoveFirst()
+    {
+        var fi = MailCollection.GetFirst();
+        if (fi == null) return;
+
+        Messenger.Send(new MailRemovedMessage(fi.MailCopy));
+    }
+
+    /// <summary>
+    /// Checks if a ThreadId exists in the current mail collection.
+    /// </summary>
+    /// <param name="mailItem">The mail item to check ThreadId for.</param>
+    /// <returns>True if the ThreadId exists in the collection, false otherwise.</returns>
+    private bool ThreadIdExistsInCollection(MailCopy mailItem)
+    {
+        return MailCollection.ContainsThreadId(mailItem.ThreadId);
+    }
+
     protected override async void OnMailAdded(MailCopy addedMail)
     {
         base.OnMailAdded(addedMail);
@@ -651,21 +771,82 @@ public partial class MailListPageViewModel : MailBaseViewModel,
             // At least one of the accounts we are listing must match with the account of the added mail.
             if (!ActiveFolder.HandlingFolders.Any(a => a.MailAccountId == addedMail.AssignedAccount.Id)) return;
 
-            // Messages coming to sent or draft folder must be inserted regardless of the filter.
-            bool shouldPreventIgnoringFilter = addedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Draft ||
-                                               addedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Sent;
+            // Fix for draft duplication: When a draft is created for reply/forward, it's first added as local draft.
+            // Then the server sync fetches it back. We should skip adding remote drafts if a local draft already exists
+            // with the same ThreadId. The mapping system (DraftMapped) will handle updating the existing local draft.
+            if (addedMail.IsDraft && !addedMail.IsLocalDraft && !string.IsNullOrEmpty(addedMail.ThreadId))
+            {
+                // Check if collection already has a local draft with the same ThreadId in the same folder
+                bool hasLocalDraftInSameThread = false;
 
-            // Item does not belong to this folder and doesn't have special type to be inserted.
-            if (!shouldPreventIgnoringFilter && !ActiveFolder.HandlingFolders.Any(a => a.Id == addedMail.AssignedFolder.Id)) return;
+                foreach (var group in MailCollection.MailItems)
+                {
+                    foreach (var item in group)
+                    {
+                        if (item is MailItemViewModel mailItem)
+                        {
+                            if (mailItem.IsDraft &&
+                                mailItem.MailCopy.IsLocalDraft &&
+                                mailItem.MailCopy.ThreadId == addedMail.ThreadId &&
+                                mailItem.MailCopy.FolderId == addedMail.FolderId)
+                            {
+                                hasLocalDraftInSameThread = true;
+                                break;
+                            }
+                        }
+                        else if (item is ThreadMailItemViewModel threadItem)
+                        {
+                            foreach (var threadEmail in threadItem.ThreadEmails)
+                            {
+                                if (threadEmail.IsDraft &&
+                                    threadEmail.MailCopy.IsLocalDraft &&
+                                    threadEmail.MailCopy.ThreadId == addedMail.ThreadId &&
+                                    threadEmail.MailCopy.FolderId == addedMail.FolderId)
+                                {
+                                    hasLocalDraftInSameThread = true;
+                                    break;
+                                }
+                            }
+                            if (hasLocalDraftInSameThread) break;
+                        }
+                    }
+                    if (hasLocalDraftInSameThread) break;
+                }
 
-            // Item should be prevented from being added to the list due to filter.
-            if (!shouldPreventIgnoringFilter && ShouldPreventItemAdd(addedMail)) return;
+                if (hasLocalDraftInSameThread)
+                {
+                    // Local draft exists in the same thread - skip adding remote duplicate
+                    // The mapping system will update the local draft with remote IDs when DraftMapped message is received
+                    return;
+                }
+            }
+
+            if (!ShouldIncludeAddedMailInCurrentList(addedMail)) return;
+            if (ShouldPreventItemAdd(addedMail)) return;
+
+            if (SelectedFolderPivot?.IsFocused is bool isFocused && addedMail.IsFocused != isFocused)
+            {
+                return;
+            }
+
+            if (IsInSearchMode)
+            {
+                // Online search results are loaded from a dedicated query snapshot.
+                // Ignore live additions while that snapshot is active.
+                if (IsOnlineSearchEnabled || AreSearchResultsOnline) return;
+
+                if (!IsMailMatchingLocalSearch(addedMail)) return;
+            }
 
             await listManipulationSemepahore.WaitAsync();
 
+            // AddAsync already handles UI threading internally, no need to wrap it
             await MailCollection.AddAsync(addedMail);
 
-            await ExecuteUIThread(() => { NotifyItemFoundState(); });
+            await ExecuteUIThread(() =>
+            {
+                NotifyItemFoundState();
+            });
         }
         catch { }
         finally
@@ -674,15 +855,32 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         }
     }
 
-    protected override async void OnMailUpdated(MailCopy updatedMail)
+    protected override async void OnMailUpdated(MailCopy updatedMail, MailUpdateSource source, MailCopyChangeFlags changedProperties)
     {
-        base.OnMailUpdated(updatedMail);
+        base.OnMailUpdated(updatedMail, source, changedProperties);
 
-        Debug.WriteLine($"Updating {updatedMail.Id}-> {updatedMail.UniqueId}");
+        try
+        {
+            await listManipulationSemepahore.WaitAsync();
 
-        await MailCollection.UpdateMailCopy(updatedMail);
+            bool isItemListed = MailCollection.ContainsMailUniqueId(updatedMail.UniqueId);
+            if (!isItemListed) return;
 
-        await ExecuteUIThread(() => { SetupTopBarActions(); });
+            if (ShouldRemoveUpdatedMailFromCurrentList(updatedMail))
+            {
+                await MailCollection.RemoveAsync(updatedMail);
+                await ExecuteUIThread(() => { NotifyItemFoundState(); });
+                return;
+            }
+
+            await MailCollection.UpdateMailCopy(updatedMail, source, changedProperties);
+        }
+        finally
+        {
+            listManipulationSemepahore.Release();
+        }
+
+        // await ExecuteUIThread(() => { SetupTopBarActions(); });
     }
 
     protected override async void OnMailUpdated(IReadOnlyList<MailCopy> updatedMails)
@@ -720,55 +918,74 @@ public partial class MailListPageViewModel : MailBaseViewModel,
     {
         base.OnMailRemoved(removedMail);
 
-        if (removedMail.AssignedAccount == null || removedMail.AssignedFolder == null) return;
+        if (removedMail.AssignedAccount == null) return;
 
-        // We should delete the items only if:
-        // 1. They are deleted from the active folder.
-        // 2. Deleted from draft or sent folder.
-        // 3. Removal is not caused by Gmail Unread folder action.
-        // Delete/sent are special folders that can list their items in other folders.
-
-        bool removedFromActiveFolder = ActiveFolder.HandlingFolders.Any(a => a.Id == removedMail.AssignedFolder.Id);
-        bool removedFromDraftOrSent = removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Draft ||
-                                      removedMail.AssignedFolder.SpecialFolderType == SpecialFolderType.Sent;
-
-        bool isDeletedByGmailUnreadFolderAction = ActiveFolder.SpecialFolderType == SpecialFolderType.Unread &&
-                                                  gmailUnreadFolderMarkedAsReadUniqueIds.Contains(removedMail.UniqueId);
-
-        if ((removedFromActiveFolder || removedFromDraftOrSent) && !isDeletedByGmailUnreadFolderAction)
+        try
         {
-            bool isDeletedMailSelected = SelectedItems.Any(a => a.MailCopy.UniqueId == removedMail.UniqueId);
+            await listManipulationSemepahore.WaitAsync();
 
-            // Automatically select the next item in the list if the setting is enabled.
-            MailItemViewModel nextItem = null;
+            // Remove only if this specific mail copy currently exists in this list.
+            // Using AssignedFolder-based checks is unreliable for move flows because the
+            // same MailCopy instance can be updated before this message is handled.
+            bool removedItemExistsInCurrentList = MailCollection.ContainsMailUniqueId(removedMail.UniqueId);
 
-            if (isDeletedMailSelected && PreferencesService.AutoSelectNextItem)
+            bool isDeletedByGmailUnreadFolderAction = ActiveFolder?.SpecialFolderType == SpecialFolderType.Unread &&
+                                                      gmailUnreadFolderMarkedAsReadUniqueIds.Contains(removedMail.UniqueId);
+
+            if (removedItemExistsInCurrentList && !isDeletedByGmailUnreadFolderAction)
             {
-                await ExecuteUIThread(() =>
+                bool isDeletedMailSelected = MailCollection.SelectedItems.Any(a => a.MailCopy.UniqueId == removedMail.UniqueId);
+
+                // Automatically select the next item in the list if the setting is enabled.
+                MailItemViewModel nextItem = null;
+
+                if (isDeletedMailSelected && PreferencesService.AutoSelectNextItem)
                 {
-                    nextItem = MailCollection.GetNextItem(removedMail);
-                });
+                    await ExecuteUIThread(() =>
+                    {
+                        nextItem = MailCollection.GetNextItem(removedMail);
+                    });
+                }
+
+                // RemoveAsync already handles UI threading internally
+                await MailCollection.RemoveAsync(removedMail);
+
+                if (nextItem != null)
+                    WeakReferenceMessenger.Default.Send(new SelectMailItemContainerEvent(nextItem.UniqueId, ScrollToItem: true));
+                else if (isDeletedMailSelected)
+                {
+                    // There are no next item to select, but we removed the last item which was selected.
+                    // Clearing selected item will dispose rendering page.
+
+                    // UnselectAllAsync already handles UI threading internally
+                    await MailCollection.UnselectAllAsync();
+                }
+
+                await ExecuteUIThread(() => { NotifyItemFoundState(); });
             }
-
-            // Remove the deleted item from the list.
-            await MailCollection.RemoveAsync(removedMail);
-
-            if (nextItem != null)
-                WeakReferenceMessenger.Default.Send(new SelectMailItemContainerEvent(nextItem, ScrollToItem: true));
-            else if (isDeletedMailSelected)
+            else if (isDeletedByGmailUnreadFolderAction)
             {
-                // There are no next item to select, but we removed the last item which was selected.
-                // Clearing selected item will dispose rendering page.
-
-                SelectedItems.Clear();
+                // Remove the entry from the set so we can listen to actual deletes next time.
+                gmailUnreadFolderMarkedAsReadUniqueIds.Remove(removedMail.UniqueId);
             }
-
-            await ExecuteUIThread(() => { NotifyItemFoundState(); });
         }
-        else if (isDeletedByGmailUnreadFolderAction)
+        finally
         {
-            // Remove the entry from the set so we can listen to actual deletes next time.
-            gmailUnreadFolderMarkedAsReadUniqueIds.Remove(removedMail.UniqueId);
+            listManipulationSemepahore.Release();
+        }
+    }
+
+    protected override async void OnFolderDeleted(MailItemFolder folder)
+    {
+        base.OnFolderDeleted(folder);
+
+        if (ActiveFolder == null) return;
+
+        bool isActiveFolder = ActiveFolder.HandlingFolders.Any(a => a.Id == folder.Id);
+
+        if (isActiveFolder)
+        {
+            await MailCollection.ClearAsync();
         }
     }
 
@@ -782,7 +999,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
             // Otherwise the draft mail item will be duplicated on the next add execution.
             await listManipulationSemepahore.WaitAsync();
 
-            // Create the item. Draft folder navigation is already done at this point.
+            // AddAsync already handles UI threading internally
             await MailCollection.AddAsync(draftMail);
 
             await ExecuteUIThread(() =>
@@ -799,14 +1016,71 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         }
     }
 
-    private IEnumerable<IMailItem> PrepareMailViewModels(IEnumerable<IMailItem> mailItems)
+    protected override void OnDraftMapped(string localDraftCopyId, string remoteDraftCopyId)
     {
-        foreach (var item in mailItems)
+        base.OnDraftMapped(localDraftCopyId, remoteDraftCopyId);
+
+        // When a draft is mapped from local to remote, the database has been updated
+        // but the UI collection still references the MailCopy object with old IDs.
+        // The MailCollection.AddAsync method checks UniqueId (which doesn't change during mapping)
+        // so if mapping worked correctly, no duplicate should appear.
+        // This method is here for future enhancements if additional UI updates are needed.
+    }
+
+    private async Task<List<MailItemViewModel>> PrepareMailViewModelsAsync(IEnumerable<MailCopy> mailItems, CancellationToken cancellationToken = default)
+    {
+        // Run ViewModel creation on background thread to avoid blocking UI
+        return await Task.Run(() =>
         {
-            if (item is MailCopy singleMailItem)
-                yield return new MailItemViewModel(singleMailItem);
-            else if (item is ThreadMailItem threadMailItem)
-                yield return new ThreadMailItemViewModel(threadMailItem);
+            var viewModels = new List<MailItemViewModel>();
+            foreach (var mailItem in mailItems)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                viewModels.Add(new MailItemViewModel(mailItem));
+            }
+            return viewModels;
+        }, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<HashSet<Guid>> GetPendingOperationUniqueIdsForActiveFolderAccountsAsync(CancellationToken cancellationToken = default)
+    {
+        var pendingOperationUniqueIds = new HashSet<Guid>();
+
+        var accountIds = ActiveFolder?.HandlingFolders?
+            .Select(folder => folder.MailAccountId)
+            .Where(accountId => accountId != Guid.Empty)
+            .Distinct()
+            .ToList();
+
+        if (accountIds == null || accountIds.Count == 0)
+            return pendingOperationUniqueIds;
+
+        foreach (var accountId in accountIds)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var synchronizer = await SynchronizationManager.Instance.GetSynchronizerAsync(accountId).ConfigureAwait(false);
+
+            if (synchronizer == null)
+                continue;
+
+            foreach (var uniqueId in synchronizer.GetPendingOperationUniqueIds())
+            {
+                pendingOperationUniqueIds.Add(uniqueId);
+            }
+        }
+
+        return pendingOperationUniqueIds;
+    }
+
+    private static void ApplyPendingOperationBusyStates(IEnumerable<MailItemViewModel> viewModels, HashSet<Guid> pendingOperationUniqueIds)
+    {
+        if (viewModels == null || pendingOperationUniqueIds == null || pendingOperationUniqueIds.Count == 0)
+            return;
+
+        foreach (var viewModel in viewModels)
+        {
+            viewModel.IsBusy = pendingOperationUniqueIds.Contains(viewModel.MailCopy.UniqueId);
         }
     }
 
@@ -819,6 +1093,36 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         await InitializeFolderAsync();
     }
 
+    private async Task<List<MailCopy>> PerformSynchronizerOnlineSearchAsync(string queryText,
+                                                                             IEnumerable<IMailItemFolder> handlingFolders,
+                                                                             CancellationToken cancellationToken)
+    {
+        if (handlingFolders == null) return [];
+
+        var foldersByAccount = handlingFolders
+            .GroupBy(a => a.MailAccountId)
+            .ToList();
+
+        if (foldersByAccount.Count == 0) return [];
+
+        var searchTasks = foldersByAccount.Select(async groupedFolders =>
+        {
+            var synchronizer = await SynchronizationManager.Instance.GetSynchronizerAsync(groupedFolders.Key).ConfigureAwait(false);
+            if (synchronizer == null) return new List<MailCopy>();
+
+            var accountResults = await synchronizer.OnlineSearchAsync(queryText, groupedFolders.ToList(), cancellationToken).ConfigureAwait(false);
+            return accountResults ?? new List<MailCopy>();
+        });
+
+        var allResults = await Task.WhenAll(searchTasks).ConfigureAwait(false);
+
+        return allResults
+            .SelectMany(a => a)
+            .GroupBy(a => a.UniqueId)
+            .Select(a => a.First())
+            .ToList();
+    }
+
     private async Task InitializeFolderAsync()
     {
         if (SelectedFilterOption == null || SelectedFolderPivot == null || SelectedSortingOption == null)
@@ -826,10 +1130,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
         try
         {
-            MailCollection.Clear();
-            MailCollection.MailCopyIdHashSet.Clear();
-
-            SelectedItems.Clear();
+            await MailCollection.ClearAsync();
 
             if (ActiveFolder == null)
                 return;
@@ -850,17 +1151,9 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
             await listManipulationSemepahore.WaitAsync(cancellationToken);
 
-            // Setup MailCollection configuration.
-
-            // Don't pass any threading strategy if disabled in settings.
-            MailCollection.ThreadingStrategyProvider = PreferencesService.IsThreadingEnabled ? _threadingStrategyProvider : null;
-
-            // TODO: This should go inside 
-            MailCollection.PruneSingleNonDraftItems = ActiveFolder.SpecialFolderType == SpecialFolderType.Draft;
-
             // Here items are sorted and filtered.
 
-            List<IMailItem> items = null;
+            List<MailCopy> items = null;
             List<MailCopy> onlineSearchItems = null;
 
             bool isDoingSearch = !string.IsNullOrEmpty(SearchQuery);
@@ -873,27 +1166,10 @@ public partial class MailListPageViewModel : MailBaseViewModel,
                 // Perform online search.
                 if (isDoingOnlineSearch)
                 {
-                    WinoServerResponse<OnlineSearchResult> onlineSearchResult = null;
-                    string onlineSearchFailedMessage = null;
-
                     try
                     {
-                        var accountIds = ActiveFolder.HandlingFolders.Select(a => a.MailAccountId).ToList();
-                        var folders = ActiveFolder.HandlingFolders.ToList();
-                        var searchRequest = new OnlineSearchRequested(accountIds, SearchQuery, folders);
-
-                        onlineSearchResult = await _winoServerConnectionManager.GetResponseAsync<OnlineSearchResult, OnlineSearchRequested>(searchRequest, cancellationToken);
-
-                        if (onlineSearchResult.IsSuccess)
-                        {
-                            await ExecuteUIThread(() => { AreSearchResultsOnline = true; });
-
-                            onlineSearchItems = onlineSearchResult.Data.SearchResult;
-                        }
-                        else
-                        {
-                            onlineSearchFailedMessage = onlineSearchResult.Message;
-                        }
+                        onlineSearchItems = await PerformSynchronizerOnlineSearchAsync(SearchQuery, ActiveFolder.HandlingFolders, cancellationToken).ConfigureAwait(false);
+                        await ExecuteUIThread(() => { AreSearchResultsOnline = true; });
                     }
                     catch (OperationCanceledException)
                     {
@@ -902,21 +1178,18 @@ public partial class MailListPageViewModel : MailBaseViewModel,
                     catch (Exception ex)
                     {
                         Log.Warning(ex, "Failed to perform online search.");
-                        onlineSearchFailedMessage = ex.Message;
-                    }
 
-                    if (onlineSearchResult != null && !onlineSearchResult.IsSuccess)
-                    {
-                        // Query or server error.
-                        var serverErrorMessage = string.Format(Translator.OnlineSearchFailed_Message, onlineSearchResult.Message);
-                        _mailDialogService.InfoBarMessage(Translator.GeneralTitle_Error, serverErrorMessage, InfoBarMessageType.Warning);
+                        isDoingOnlineSearch = false;
+                        onlineSearchItems = null;
 
-                    }
-                    else if (!string.IsNullOrEmpty(onlineSearchFailedMessage))
-                    {
-                        // Fatal error.
-                        var serverErrorMessage = string.Format(Translator.OnlineSearchFailed_Message, onlineSearchFailedMessage);
-                        _mailDialogService.InfoBarMessage(Translator.GeneralTitle_Error, serverErrorMessage, InfoBarMessageType.Warning);
+                        await ExecuteUIThread(() =>
+                        {
+                            IsOnlineSearchEnabled = false;
+                            AreSearchResultsOnline = false;
+
+                            var serverErrorMessage = string.Format(Translator.OnlineSearchFailed_Message, ex.Message);
+                            _mailDialogService.InfoBarMessage(Translator.GeneralTitle_Error, serverErrorMessage, InfoBarMessageType.Warning);
+                        });
                     }
                 }
             }
@@ -926,7 +1199,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
                                                                           SelectedSortingOption.Type,
                                                                           PreferencesService.IsThreadingEnabled,
                                                                           SelectedFolderPivot.IsFocused,
-                                                                          SearchQuery,
+                                                                          isDoingOnlineSearch ? string.Empty : SearchQuery,
                                                                           MailCollection.MailCopyIdHashSet,
                                                                           onlineSearchItems);
 
@@ -938,11 +1211,16 @@ public partial class MailListPageViewModel : MailBaseViewModel,
                 // We don't need to insert them one by one.
                 // Just create VMs and do bulk insert.
 
-                var viewModels = PrepareMailViewModels(items);
+                var viewModels = await PrepareMailViewModelsAsync(items, cancellationToken).ConfigureAwait(false);
+                var pendingOperationUniqueIds = await GetPendingOperationUniqueIdsForActiveFolderAccountsAsync(cancellationToken).ConfigureAwait(false);
+                ApplyPendingOperationBusyStates(viewModels, pendingOperationUniqueIds);
+
+                await MailCollection.AddRangeAsync(viewModels, clearIdCache: true);
 
                 await ExecuteUIThread(() =>
                 {
-                    MailCollection.AddRange(viewModels, true);
+                    HasNoOnlineSearchResult = isDoingOnlineSearch && items.Count == 0;
+                    OnPropertyChanged(nameof(HasNoOnlineSearchResult));
 
                     if (isDoingSearch && !isDoingOnlineSearch)
                     {
@@ -974,22 +1252,15 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
                 OnPropertyChanged(nameof(CanSynchronize));
                 NotifyItemFoundState();
+
+                // Clear the loading message after completion
+                IsBarOpen = false;
             });
         }
     }
 
     #region Receivers
 
-    void IRecipient<MailItemSelectedEvent>.Receive(MailItemSelectedEvent message)
-    {
-        if (!SelectedItems.Contains(message.SelectedMailItem)) SelectedItems.Add(message.SelectedMailItem);
-    }
-
-    void IRecipient<MailItemSelectionRemovedEvent>.Receive(MailItemSelectionRemovedEvent message)
-    {
-        if (SelectedItems.Contains(message.RemovedMailItem)) SelectedItems.Remove(message.RemovedMailItem);
-    }
-
     async void IRecipient<ActiveMailFolderChangedEvent>.Receive(ActiveMailFolderChangedEvent message)
     {
         NotifyItemSelected();
@@ -1008,6 +1279,8 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         IsInSearchMode = false;
         IsOnlineSearchButtonVisible = false;
         AreSearchResultsOnline = false;
+        HasNoOnlineSearchResult = false;
+        OnPropertyChanged(nameof(HasNoOnlineSearchResult));
 
         // Prepare Focused - Other or folder name tabs.
         await UpdateFolderPivotsAsync();
@@ -1041,6 +1314,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
             SearchQuery = string.Empty;
             IsInSearchMode = false;
             IsOnlineSearchEnabled = false;
+            HasNoOnlineSearchResult = false;
         }
     }
 
@@ -1070,6 +1344,9 @@ public partial class MailListPageViewModel : MailBaseViewModel,
             case SynchronizationCompletedState.Success:
                 UpdateBarMessage(InfoBarMessageType.Success, ActiveFolder.FolderName, Translator.SynchronizationFolderReport_Success);
                 break;
+            case SynchronizationCompletedState.PartiallyCompleted:
+                UpdateBarMessage(InfoBarMessageType.Warning, ActiveFolder.FolderName, Translator.SynchronizationFolderReport_Failed);
+                break;
             case SynchronizationCompletedState.Failed:
                 UpdateBarMessage(InfoBarMessageType.Error, ActiveFolder.FolderName, Translator.SynchronizationFolderReport_Failed);
                 break;
@@ -1080,30 +1357,9 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
     void IRecipient<MailItemNavigationRequested>.Receive(MailItemNavigationRequested message)
     {
-        Debug.WriteLine($"Mail item navigation requested");
-        // Find mail item and add to selected items.
+        // TODO: Remove this.
 
-        MailItemViewModel navigatingMailItem = null;
-        ThreadMailItemViewModel threadMailItemViewModel = null;
-
-        for (int i = 0; i < 3; i++)
-        {
-            var mailContainer = MailCollection.GetMailItemContainer(message.UniqueMailId);
-
-            if (mailContainer != null)
-            {
-                navigatingMailItem = mailContainer.ItemViewModel;
-                threadMailItemViewModel = mailContainer.ThreadViewModel;
-
-                break;
-            }
-        }
-
-        if (threadMailItemViewModel != null)
-            threadMailItemViewModel.IsThreadExpanded = true;
-
-        if (navigatingMailItem != null)
-            WeakReferenceMessenger.Default.Send(new SelectMailItemContainerEvent(navigatingMailItem, message.ScrollToItem));
+        WeakReferenceMessenger.Default.Send(new SelectMailItemContainerEvent(message.UniqueMailId, message.ScrollToItem));
     }
 
     #endregion
@@ -1142,9 +1398,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
             foreach (var accountId in accountIds)
             {
-                var serverResponse = await _winoServerConnectionManager.GetResponseAsync<bool, SynchronizationExistenceCheckRequest>(new SynchronizationExistenceCheckRequest(accountId));
-
-                if (serverResponse.IsSuccess && serverResponse.Data == true)
+                if (SynchronizationManager.Instance.IsAccountSynchronizing(accountId))
                 {
                     isAnyAccountSynchronizing = true;
                     break;
@@ -1155,7 +1409,7 @@ public partial class MailListPageViewModel : MailBaseViewModel,
         await ExecuteUIThread(() => { IsAccountSynchronizerInSynchronization = isAnyAccountSynchronizing; });
     }
 
-    public void Receive(AccountCacheResetMessage message)
+    public async void Receive(AccountCacheResetMessage message)
     {
         if (message.Reason == AccountCacheResetReason.ExpiredCache &&
             ActiveFolder.HandlingFolders.Any(a => a.MailAccountId == message.AccountId))
@@ -1164,14 +1418,97 @@ public partial class MailListPageViewModel : MailBaseViewModel,
 
             if (handlingFolder == null) return;
 
-            _ = ExecuteUIThread(() =>
-            {
-                MailCollection.Clear();
+            // ClearAsync already handles UI threading internally
+            await MailCollection.ClearAsync();
 
+            await ExecuteUIThread(() =>
+            {
                 _mailDialogService.InfoBarMessage(Translator.AccountCacheReset_Title, Translator.AccountCacheReset_Message, InfoBarMessageType.Warning);
             });
         }
     }
 
-    public void Receive(ThumbnailAdded message) => MailCollection.UpdateThumbnails(message.Email);
+    protected override void OnDispatcherAssigned()
+    {
+        base.OnDispatcherAssigned();
+
+        MailCollection.CoreDispatcher = Dispatcher;
+    }
+
+    public void Receive(ThumbnailAdded message)
+    {
+        _ = MailCollection.UpdateThumbnailsForAddressAsync(message.Email);
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<MailItemNavigationRequested>(this);
+        Messenger.Register<ActiveMailFolderChangedEvent>(this);
+        Messenger.Register<AccountSynchronizationCompleted>(this);
+        Messenger.Register<NewMailSynchronizationRequested>(this);
+        Messenger.Register<AccountSynchronizerStateChanged>(this);
+        Messenger.Register<AccountCacheResetMessage>(this);
+        Messenger.Register<ThumbnailAdded>(this);
+        Messenger.Register<PropertyChangedMessage<bool>>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<MailItemNavigationRequested>(this);
+        Messenger.Unregister<ActiveMailFolderChangedEvent>(this);
+        Messenger.Unregister<AccountSynchronizationCompleted>(this);
+        Messenger.Unregister<NewMailSynchronizationRequested>(this);
+        Messenger.Unregister<AccountSynchronizerStateChanged>(this);
+        Messenger.Unregister<AccountCacheResetMessage>(this);
+        Messenger.Unregister<ThumbnailAdded>(this);
+        Messenger.Unregister<PropertyChangedMessage<bool>>(this);
+    }
+
+    public void Receive(PropertyChangedMessage<bool> message)
+    {
+        // Handle IsSelected property changes from MailItemViewModel
+        if (message.PropertyName == nameof(MailItemViewModel.IsSelected) && message.Sender is MailItemViewModel mailItemViewModel)
+        {
+            Messenger.Send(new SelectedItemsChangedMessage());
+        }
+        else if (message.Sender is ThreadMailItemViewModel threadMailItemViewModel)
+        {
+            if (message.PropertyName == nameof(ThreadMailItemViewModel.IsSelected))
+            {
+                // Thread selected.
+            }
+            else if (message.PropertyName == nameof(ThreadMailItemViewModel.IsThreadExpanded))
+            {
+                // Thread expanded.
+            }
+        }
+    }
+
+    public async void Receive(SwipeActionRequested message)
+    {
+        if (message.MailItem == null) return;
+
+        // Get mail copies based on the mail item type
+        IEnumerable<MailCopy> mailCopies;
+
+        if (message.MailItem is MailItemViewModel singleItem)
+        {
+            mailCopies = new[] { singleItem.MailCopy };
+        }
+        else if (message.MailItem is ThreadMailItemViewModel threadItem)
+        {
+            mailCopies = threadItem.ThreadEmails.Select(e => e.MailCopy);
+        }
+        else
+        {
+            return; // Unknown mail item type
+        }
+
+        var package = new MailOperationPreperationRequest(message.Operation, mailCopies);
+        await ExecuteMailOperationAsync(package);
+    }
 }
diff --git a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
index 5fccd83a..e89d12c0 100644
--- a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
@@ -11,27 +11,30 @@ using CommunityToolkit.Mvvm.Messaging;
 using MailKit;
 
 using MimeKit;
+using MimeKit.Cryptography;
 using Serilog;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Menus;
 using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Printing;
 using Wino.Core.Domain.Models.Reader;
+using Wino.Core.Services;
 using Wino.Mail.ViewModels.Data;
 using Wino.Mail.ViewModels.Messages;
 using Wino.Messaging.Client.Mails;
-using Wino.Messaging.Server;
 using Wino.Messaging.UI;
 using IMailService = Wino.Core.Domain.Interfaces.IMailService;
 
 namespace Wino.Mail.ViewModels;
 
 public partial class MailRenderingPageViewModel : MailBaseViewModel,
-    IRecipient<NewMailItemRenderingRequestedEvent>,
+    IRecipient<ReaderItemRefreshRequestedEvent>,
     IRecipient<ThumbnailAdded>,
     ITransferProgress // For listening IMAP message download progress.
 {
@@ -40,13 +43,13 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
 
     private readonly IMimeFileService _mimeFileService;
     private readonly Core.Domain.Interfaces.IMailService _mailService;
+    private readonly IFolderService _folderService;
     private readonly IFileService _fileService;
     private readonly IWinoRequestDelegator _requestDelegator;
     private readonly IContactService _contactService;
     private readonly IClipboardService _clipboardService;
     private readonly IUnsubscriptionService _unsubscriptionService;
     private readonly IApplicationConfiguration _applicationConfiguration;
-    private readonly IWinoServerConnectionManager _winoServerConnectionManager;
     private bool forceImageLoading = false;
 
     private MailItemViewModel initializedMailItemViewModel = null;
@@ -56,11 +59,17 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     // Used in 'Save as' and 'Print' functionality.
     public Func<string, Task<bool>> SaveHTMLasPDFFunc { get; set; }
 
+    public Func<WebView2PrintSettingsModel, Task<PrintingResult>> DirectPrintFuncAsync { get; set; }
+
     #region Properties
 
     public bool ShouldDisplayDownloadProgress => IsIndetermineProgress || (CurrentDownloadPercentage > 0 && CurrentDownloadPercentage <= 100);
     public bool CanUnsubscribe => CurrentRenderModel?.UnsubscribeInfo?.CanUnsubscribe ?? false;
-    public bool IsJunkMail => initializedMailItemViewModel?.AssignedFolder != null && initializedMailItemViewModel.AssignedFolder.SpecialFolderType == SpecialFolderType.Junk;
+    public bool IsSmimeSigned => (CurrentRenderModel?.Signatures?.Count ?? 0) > 0;
+    public bool IsSmimeEncrypted => CurrentRenderModel?.IsSmimeEncrypted ?? false;
+    public bool IsJunkMail => initializedMailItemViewModel?.MailCopy.AssignedFolder != null && initializedMailItemViewModel.MailCopy.AssignedFolder.SpecialFolderType == SpecialFolderType.Junk;
+    public bool SmimeSignaturesValid => CurrentRenderModel?.Signatures?.Any(x => x.Value) ?? false;
+    public bool SmimeSignaturesInvalid => !SmimeSignaturesValid;
 
     public bool IsImageRenderingDisabled
     {
@@ -100,6 +109,10 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanUnsubscribe))]
+    [NotifyPropertyChangedFor(nameof(IsSmimeSigned))]
+    [NotifyPropertyChangedFor(nameof(IsSmimeEncrypted))]
+    [NotifyPropertyChangedFor(nameof(SmimeSignaturesValid))]
+    [NotifyPropertyChangedFor(nameof(SmimeSignaturesInvalid))]
     public partial MailRenderModel CurrentRenderModel { get; set; }
 
     [ObservableProperty]
@@ -112,7 +125,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     public partial string FromName { get; set; }
 
     [ObservableProperty]
-    public partial string ContactPicture { get; set; }
+    public partial IMailItemDisplayInformation CurrentMailItemDisplayInformation { get; set; }
 
     [ObservableProperty]
     public partial DateTime CreationDate { get; set; }
@@ -120,7 +133,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     public ObservableCollection<AccountContactViewModel> CcItems { get; set; } = [];
     public ObservableCollection<AccountContactViewModel> BccItems { get; set; } = [];
     public ObservableCollection<MailAttachmentViewModel> Attachments { get; set; } = [];
-    public ObservableCollection<MailOperationMenuItem> MenuItems { get; set; } = [];
+    public ObservableCollection<IMenuOperation> MenuItems { get; set; } = [];
 
     #endregion
 
@@ -128,22 +141,24 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     public IStatePersistanceService StatePersistenceService { get; }
     public IPreferencesService PreferencesService { get; }
     public IPrintService PrintService { get; }
+    public Guid? CurrentMailAccountId => initializedMailItemViewModel?.MailCopy.AssignedAccount?.Id;
+    public Guid? CurrentMailFileId => initializedMailItemViewModel?.MailCopy.FileId;
 
     public MailRenderingPageViewModel(IMailDialogService dialogService,
-                                      INativeAppService nativeAppService,
-                                      IUnderlyingThemeService underlyingThemeService,
-                                      IMimeFileService mimeFileService,
-                                      IMailService mailService,
-                                      IFileService fileService,
-                                      IWinoRequestDelegator requestDelegator,
-                                      IStatePersistanceService statePersistenceService,
-                                      IContactService contactService,
-                                      IClipboardService clipboardService,
-                                      IUnsubscriptionService unsubscriptionService,
-                                      IPreferencesService preferencesService,
-                                      IPrintService printService,
-                                      IApplicationConfiguration applicationConfiguration,
-                                      IWinoServerConnectionManager winoServerConnectionManager)
+        INativeAppService nativeAppService,
+        IUnderlyingThemeService underlyingThemeService,
+        IMimeFileService mimeFileService,
+        IMailService mailService,
+        IFolderService folderService,
+        IFileService fileService,
+        IWinoRequestDelegator requestDelegator,
+        IStatePersistanceService statePersistenceService,
+        IContactService contactService,
+        IClipboardService clipboardService,
+        IUnsubscriptionService unsubscriptionService,
+        IPreferencesService preferencesService,
+        IPrintService printService,
+        IApplicationConfiguration applicationConfiguration)
     {
         _dialogService = dialogService;
         NativeAppService = nativeAppService;
@@ -152,12 +167,12 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
         PreferencesService = preferencesService;
         PrintService = printService;
         _applicationConfiguration = applicationConfiguration;
-        _winoServerConnectionManager = winoServerConnectionManager;
         _clipboardService = clipboardService;
         _unsubscriptionService = unsubscriptionService;
         _underlyingThemeService = underlyingThemeService;
         _mimeFileService = mimeFileService;
         _mailService = mailService;
+        _folderService = folderService;
         _fileService = fileService;
         _requestDelegator = requestDelegator;
     }
@@ -240,63 +255,98 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     }
 
     [RelayCommand]
-    private async Task OperationClicked(MailOperationMenuItem menuItem)
+    private async Task OperationClicked(IMenuOperation menuItem)
     {
-        if (menuItem == null) return;
+        if (menuItem is not MailOperationMenuItem mailOperationMenuItem) return;
 
-        await HandleMailOperationAsync(menuItem.Operation);
+        await HandleMailOperationAsync(mailOperationMenuItem.Operation);
     }
 
     private async Task HandleMailOperationAsync(MailOperation operation)
     {
-        // Toggle theme
-        if (operation == MailOperation.DarkEditor || operation == MailOperation.LightEditor)
-            IsDarkWebviewRenderer = !IsDarkWebviewRenderer;
-        else if (operation == MailOperation.SaveAs)
+        try
         {
-            await SaveAsAsync();
-        }
-        else if (operation == MailOperation.Print)
-        {
-            await PrintAsync();
-        }
-        else if (operation == MailOperation.ViewMessageSource)
-        {
-            await _dialogService.ShowMessageSourceDialogAsync(initializedMimeMessageInformation.MimeMessage.ToString());
-        }
-        else if (operation == MailOperation.Reply || operation == MailOperation.ReplyAll || operation == MailOperation.Forward)
-        {
-            if (initializedMailItemViewModel == null) return;
-
-            // Create new draft.
-            var draftOptions = new DraftCreationOptions()
+            if (operation == MailOperation.SaveAs)
             {
-                Reason = operation switch
+                await SaveAsAsync();
+            }
+            else if (operation == MailOperation.Print)
+            {
+                var settings = await _dialogService.ShowPrintDialogAsync();
+
+                if (settings == null) return;
+
+                var printingResult = await DirectPrintFuncAsync.Invoke(settings);
+
+                // TODO: More detailed printing result handling.
+                if (printingResult == PrintingResult.Submitted)
                 {
-                    MailOperation.Reply => DraftCreationReason.Reply,
-                    MailOperation.ReplyAll => DraftCreationReason.ReplyAll,
-                    MailOperation.Forward => DraftCreationReason.Forward,
-                    _ => DraftCreationReason.Empty
-                },
-                ReferencedMessage = new ReferencedMessage()
-                {
-                    MimeMessage = initializedMimeMessageInformation.MimeMessage,
-                    MailCopy = initializedMailItemViewModel.MailCopy
+                    _dialogService.InfoBarMessage(Translator.DialogMessage_PrintingSuccessTitle, Translator.DialogMessage_PrintingSuccessMessage, InfoBarMessageType.Success);
+                }
+                else if (printingResult == PrintingResult.Failed)
+                {
+                    _dialogService.InfoBarMessage(Translator.DialogMessage_PrintingFailedTitle, Translator.DialogMessage_PrintingFailedMessage, InfoBarMessageType.Error);
                 }
-            };
 
-            var (draftMailCopy, draftBase64MimeMessage) = await _mailService.CreateDraftAsync(initializedMailItemViewModel.AssignedAccount.Id, draftOptions).ConfigureAwait(false);
+            }
+            else if (operation == MailOperation.ViewMessageSource)
+            {
+                await _dialogService.ShowMessageSourceDialogAsync(initializedMimeMessageInformation.MimeMessage.ToString());
+            }
+            else if (operation == MailOperation.Reply || operation == MailOperation.ReplyAll || operation == MailOperation.Forward)
+            {
+                if (initializedMailItemViewModel == null) return;
 
-            var draftPreparationRequest = new DraftPreparationRequest(initializedMailItemViewModel.AssignedAccount, draftMailCopy, draftBase64MimeMessage, draftOptions.Reason, initializedMailItemViewModel.MailCopy);
+                // Create new draft.
+                var draftOptions = new DraftCreationOptions()
+                {
+                    Reason = operation switch
+                    {
+                        MailOperation.Reply => DraftCreationReason.Reply,
+                        MailOperation.ReplyAll => DraftCreationReason.ReplyAll,
+                        MailOperation.Forward => DraftCreationReason.Forward,
+                        _ => DraftCreationReason.Empty
+                    },
+                    ReferencedMessage = new ReferencedMessage()
+                    {
+                        MimeMessage = initializedMimeMessageInformation.MimeMessage,
+                        MailCopy = initializedMailItemViewModel.MailCopy
+                    }
+                };
 
-            await _requestDelegator.ExecuteAsync(draftPreparationRequest);
+                var (draftMailCopy, draftBase64MimeMessage) = await _mailService.CreateDraftAsync(initializedMailItemViewModel.MailCopy.AssignedAccount.Id, draftOptions).ConfigureAwait(false);
 
+                var draftPreparationRequest = new DraftPreparationRequest(initializedMailItemViewModel.MailCopy.AssignedAccount, draftMailCopy, draftBase64MimeMessage, draftOptions.Reason, initializedMailItemViewModel.MailCopy);
+
+                await _requestDelegator.ExecuteAsync(draftPreparationRequest);
+
+            }
+            else if (initializedMailItemViewModel != null)
+            {
+                // All other operations require a mail item.
+                var prepRequest = new MailOperationPreperationRequest(operation, initializedMailItemViewModel.MailCopy);
+                await _requestDelegator.ExecuteAsync(prepRequest);
+            }
         }
-        else if (initializedMailItemViewModel != null)
+        catch (UnavailableSpecialFolderException unavailableSpecialFolderException)
         {
-            // All other operations require a mail item.
-            var prepRequest = new MailOperationPreperationRequest(operation, initializedMailItemViewModel.MailCopy);
-            await _requestDelegator.ExecuteAsync(prepRequest);
+            _dialogService.InfoBarMessage(Translator.Info_MissingFolderTitle,
+                                          string.Format(Translator.Info_MissingFolderMessage, unavailableSpecialFolderException.SpecialFolderType),
+                                          InfoBarMessageType.Warning,
+                                          Translator.SettingConfigureSpecialFolders_Button,
+                                          () =>
+                                          {
+                                              _dialogService.HandleSystemFolderConfigurationDialogAsync(unavailableSpecialFolderException.AccountId, _folderService);
+                                          });
+        }
+        catch (NotImplementedException)
+        {
+            _dialogService.ShowNotSupportedMessage();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Mail operation execution failed. Operation: {Operation}", operation);
+            _dialogService.InfoBarMessage(Translator.Info_RequestCreationFailedTitle, ex.Message, InfoBarMessageType.Error);
         }
     }
 
@@ -310,6 +360,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
 
         initializedMailItemViewModel = null;
         initializedMimeMessageInformation = null;
+        CurrentMailItemDisplayInformation = null;
 
         // Dispose existing content first.
         Messenger.Send(new CancelRenderingContentRequested());
@@ -355,8 +406,10 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             // To show the progress on the UI.
             CurrentDownloadPercentage = 1;
 
-            var package = new DownloadMissingMessageRequested(mailItemViewModel.AssignedAccount.Id, mailItemViewModel.MailCopy);
-            await _winoServerConnectionManager.GetResponseAsync<bool, DownloadMissingMessageRequested>(package);
+            // Download missing MIME message using SynchronizationManager
+            await SynchronizationManager.Instance.DownloadMimeMessageAsync(
+                mailItemViewModel.MailCopy,
+                mailItemViewModel.MailCopy.AssignedAccount.Id);
         }
         catch (OperationCanceledException)
         {
@@ -375,7 +428,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     private async Task RenderAsync(MailItemViewModel mailItemViewModel, CancellationToken cancellationToken = default)
     {
         ResetProgress();
-        var isMimeExists = await _mimeFileService.IsMimeExistAsync(mailItemViewModel.AssignedAccount.Id, mailItemViewModel.MailCopy.FileId);
+        var isMimeExists = await _mimeFileService.IsMimeExistAsync(mailItemViewModel.MailCopy.AssignedAccount.Id, mailItemViewModel.MailCopy.FileId);
 
         if (!isMimeExists)
         {
@@ -384,7 +437,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
 
         // Find the MIME for this item and render it.
         var mimeMessageInformation = await _mimeFileService.GetMimeMessageInformationAsync(mailItemViewModel.MailCopy.FileId,
-                                                                                           mailItemViewModel.AssignedAccount.Id,
+                                                                                           mailItemViewModel.MailCopy.AssignedAccount.Id,
                                                                                            cancellationToken).ConfigureAwait(false);
 
         if (mimeMessageInformation == null)
@@ -394,6 +447,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
         }
 
         initializedMailItemViewModel = mailItemViewModel;
+        await ExecuteUIThread(() => { CurrentMailItemDisplayInformation = mailItemViewModel; });
         await RenderAsync(mimeMessageInformation);
     }
 
@@ -435,13 +489,14 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             // TODO: FromName and FromAddress is probably not correct here for mail lists.
             FromAddress = message.From.Mailboxes.FirstOrDefault()?.Address ?? Translator.UnknownAddress;
             FromName = message.From.Mailboxes.FirstOrDefault()?.Name ?? Translator.UnknownSender;
-            CreationDate = message.Date.DateTime;
-            ContactPicture = initializedMailItemViewModel?.SenderContact?.Base64ContactPicture;
+
+            // Use the received date from MailCopy if available, otherwise fall back to the sent date from MIME message
+            CreationDate = initializedMailItemViewModel?.MailCopy.CreationDate ?? message.Date.DateTime;
 
             // Automatically disable images for Junk folder to prevent pixel tracking.
             // This can only work for selected mail item rendering, not for EML file rendering.
             if (initializedMailItemViewModel != null &&
-                initializedMailItemViewModel.AssignedFolder.SpecialFolderType == SpecialFolderType.Junk)
+                initializedMailItemViewModel.MailCopy.AssignedFolder.SpecialFolderType == SpecialFolderType.Junk)
             {
                 renderingOptions.LoadImages = false;
             }
@@ -480,7 +535,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
                 var contactViewModel = new AccountContactViewModel(foundContact);
 
                 // Make sure that user account first in the list.
-                if (string.Equals(contactViewModel.Address, initializedMailItemViewModel?.AssignedAccount?.Address, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(contactViewModel.Address, initializedMailItemViewModel?.MailCopy.AssignedAccount?.Address, StringComparison.OrdinalIgnoreCase))
                 {
                     contactViewModel.IsMe = true;
                     accounts.Insert(0, contactViewModel);
@@ -506,11 +561,15 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     {
         base.OnNavigatedFrom(mode, parameters);
 
-        renderCancellationTokenSource.Cancel();
+        renderCancellationTokenSource?.Cancel();
+        renderCancellationTokenSource?.Dispose();
+        renderCancellationTokenSource = null;
+
         CurrentDownloadPercentage = 0d;
 
         initializedMailItemViewModel = null;
         initializedMimeMessageInformation = null;
+        CurrentMailItemDisplayInformation = null;
 
         forceImageLoading = false;
 
@@ -527,12 +586,6 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     {
         MenuItems.Clear();
 
-        // Add light/dark editor theme switch.
-        if (IsDarkWebviewRenderer)
-            MenuItems.Add(MailOperationMenuItem.Create(MailOperation.LightEditor));
-        else
-            MenuItems.Add(MailOperationMenuItem.Create(MailOperation.DarkEditor));
-
         // Save As PDF
         MenuItems.Add(MailOperationMenuItem.Create(MailOperation.SaveAs, true, true));
 
@@ -563,7 +616,7 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
         }
 
         // Archive - Unarchive
-        if (initializedMailItemViewModel.AssignedFolder.SpecialFolderType == SpecialFolderType.Archive)
+        if (initializedMailItemViewModel.MailCopy.AssignedFolder.SpecialFolderType == SpecialFolderType.Archive)
             MenuItems.Add(MailOperationMenuItem.Create(MailOperation.UnArchive));
         else
             MenuItems.Add(MailOperationMenuItem.Create(MailOperation.Archive));
@@ -586,15 +639,15 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             MenuItems.Add(MailOperationMenuItem.Create(MailOperation.MarkAsRead, true, false));
     }
 
-    protected override async void OnMailUpdated(MailCopy updatedMail)
+    protected override async void OnMailUpdated(MailCopy updatedMail, MailUpdateSource source, MailCopyChangeFlags changedProperties)
     {
-        base.OnMailUpdated(updatedMail);
+        base.OnMailUpdated(updatedMail, source, changedProperties);
 
         if (initializedMailItemViewModel == null) return;
 
         // Check if the updated mail is the same mail item we are rendering.
         // This is done with UniqueId to include FolderId into calculations.
-        if (initializedMailItemViewModel.UniqueId != updatedMail.UniqueId) return;
+        if (initializedMailItemViewModel.MailCopy.UniqueId != updatedMail.UniqueId) return;
 
         await ExecuteUIThread(() => { InitializeCommandBarItems(); });
     }
@@ -690,40 +743,6 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
         }
     }
 
-    private async Task PrintAsync()
-    {
-        // Printing:
-        // 1. Let WebView2 save the current HTML as PDF to temporary location.
-        // 2. Saving as PDF will divide pages correctly for Win2D CanvasBitmap.
-        // 3. Use Win2D CanvasBitmap as IPrintDocumentSource and WinRT APIs to print the PDF.
-
-        try
-        {
-            var printFilePath = Path.Combine(_applicationConfiguration.ApplicationTempFolderPath, "print.pdf");
-
-            if (File.Exists(printFilePath)) File.Delete(printFilePath);
-
-            await SaveHTMLasPDFFunc(printFilePath);
-
-            var result = await PrintService.PrintPdfFileAsync(printFilePath, Subject);
-
-            if (result == PrintingResult.Submitted)
-            {
-                _dialogService.InfoBarMessage(Translator.DialogMessage_PrintingSuccessTitle, Translator.DialogMessage_PrintingSuccessMessage, InfoBarMessageType.Success);
-            }
-            else if (result != PrintingResult.Canceled)
-            {
-                var message = string.Format(Translator.DialogMessage_PrintingFailedMessage, result);
-                _dialogService.InfoBarMessage(Translator.DialogMessage_PrintingFailedTitle, message, InfoBarMessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to print mail.");
-            _dialogService.InfoBarMessage(string.Empty, ex.Message, InfoBarMessageType.Error);
-        }
-    }
-
     private async Task SaveAsAsync()
     {
         try
@@ -739,8 +758,8 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             if (isSaved)
             {
                 _dialogService.InfoBarMessage(Translator.Info_PDFSaveSuccessTitle,
-                                              string.Format(Translator.Info_PDFSaveSuccessMessage, pdfFilePath),
-                                              InfoBarMessageType.Success);
+                    string.Format(Translator.Info_PDFSaveSuccessMessage, pdfFilePath),
+                    InfoBarMessageType.Success);
             }
         }
         catch (Exception ex)
@@ -782,8 +801,10 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
     // For upload.
     void ITransferProgress.Report(long bytesTransferred) { }
 
-    public async void Receive(NewMailItemRenderingRequestedEvent message)
+    public async void Receive(ReaderItemRefreshRequestedEvent message)
     {
+        if (message.MailItemViewModel == null || message.MailItemViewModel.IsDraft) return;
+
         try
         {
             await RenderAsync(message.MailItemViewModel, renderCancellationTokenSource.Token);
@@ -822,4 +843,86 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             }
         });
     }
+
+    [RelayCommand]
+    private async Task ShowSmimeSigningCertificateInfoAsync()
+    {
+        if (IsSmimeSigned)
+        {
+            MimePart signaturePart;
+            if (initializedMimeMessageInformation?.MimeMessage?.Body is MultipartSigned signed && signed[1] is MimePart signaturePart1)
+            {
+                signaturePart = signaturePart1;
+            }
+            else if (initializedMimeMessageInformation?.MimeMessage?.Body is ApplicationPkcs7Mime pkcs7)
+            {
+                signaturePart = null;
+            }
+            else
+            {
+                //_dialogService.InfoBarMessage(Translator.Info_SmimeSignatureNotFoundTitle, Translator.Info_SmimeSignatureNotFoundMessage, InfoBarMessageType.Error);
+                return;
+            }
+
+            string info = $"{Translator.SmimeSignaturesInMessage}:\n";
+            foreach (var (signature, valid) in CurrentRenderModel.Signatures)
+            {
+                info += string.Format(Translator.SmimeSignatureEntry, valid ? "✅" : "❌", signature.SignerCertificate.Name, signature.SignerCertificate.Fingerprint, signature.SignerCertificate.CreationDate, signature.SignerCertificate.ExpirationDate);
+            }
+            await ShowSmimeCertificateInfoAsync(signaturePart, info, Translator.SmimeSigningCertificateInfoTitle);
+        }
+
+    }
+
+    private async Task ShowSmimeCertificateInfoAsync(MimePart certificateAttachment, string additionalInfo = "", string title = null)
+    {
+        {
+            if (certificateAttachment == null)
+            {
+                await _dialogService.ShowConfirmationDialogAsync(
+                    $"{additionalInfo}\n{Translator.SmimeNoCertificateFileFound}", title ?? Translator.SmimeCertificateInfoTitle, Translator.Buttons_OK);
+                return;
+            }
+            var fileName = certificateAttachment.FileName ?? "smime.p7s";
+            var contentType = certificateAttachment.ContentType?.MimeType ?? "application/pkcs7-signature";
+            var size = certificateAttachment.Content?.Stream?.Length ?? 0;
+            var info = string.Format(Translator.SmimeCertificateFileInfo, fileName, contentType, size);
+
+            var result = await _dialogService.ShowConfirmationDialogAsync(
+                $"{additionalInfo}\n{info}", title ?? Translator.SmimeCertificateInfoTitle,
+                Translator.SmimeSaveCertificate);
+            if (result)
+            {
+                var pickedPath = await _dialogService.PickFilePathAsync(fileName);
+                if (!string.IsNullOrEmpty(pickedPath))
+                {
+                    var pickedDirectory = Path.GetDirectoryName(pickedPath);
+                    var pickedFileName = Path.GetFileName(pickedPath);
+                    await using (var stream = await _fileService.GetFileStreamAsync(pickedDirectory, pickedFileName))
+                    {
+                        await certificateAttachment.Content!.DecodeToAsync(stream);
+                    }
+
+                    _dialogService.InfoBarMessage(Translator.SmimeCertificate, string.Format(Translator.SmimeCertificateSavedTo, pickedPath),
+                        InfoBarMessageType.Success);
+                }
+            }
+        }
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Register<ReaderItemRefreshRequestedEvent>(this);
+        Messenger.Register<ThumbnailAdded>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<ReaderItemRefreshRequestedEvent>(this);
+        Messenger.Unregister<ThumbnailAdded>(this);
+    }
 }
diff --git a/Wino.Mail.ViewModels/MailViewModelsContainerSetup.cs b/Wino.Mail.ViewModels/MailViewModelsContainerSetup.cs
deleted file mode 100644
index d1526993..00000000
--- a/Wino.Mail.ViewModels/MailViewModelsContainerSetup.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Wino.Core;
-
-namespace Wino.Mail.ViewModels;
-
-public static class MailViewModelsContainerSetup
-{
-    public static void RegisterViewModelService(this IServiceCollection services)
-    {
-        // View models use core services.
-        services.RegisterCoreServices();
-    }
-}
diff --git a/Wino.Mail.ViewModels/MessageListPageViewModel.cs b/Wino.Mail.ViewModels/MessageListPageViewModel.cs
index b1bf22bb..a08cf320 100644
--- a/Wino.Mail.ViewModels/MessageListPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MessageListPageViewModel.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Input;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
@@ -12,22 +14,8 @@ public partial class MessageListPageViewModel : MailBaseViewModel
 {
     public IPreferencesService PreferencesService { get; }
     private readonly IThumbnailService _thumbnailService;
-
-    private int selectedMarkAsOptionIndex;
-    public int SelectedMarkAsOptionIndex
-    {
-        get => selectedMarkAsOptionIndex;
-        set
-        {
-            if (SetProperty(ref selectedMarkAsOptionIndex, value))
-            {
-                if (value >= 0)
-                {
-                    PreferencesService.MarkAsPreference = (MailMarkAsOption)Enum.GetValues<MailMarkAsOption>().GetValue(value);
-                }
-            }
-        }
-    }
+    private readonly IStatePersistanceService _statePersistenceService;
+    private readonly IDialogServiceBase _dialogService;
 
     private readonly List<MailOperation> availableHoverActions =
     [
@@ -38,6 +26,13 @@ public partial class MessageListPageViewModel : MailBaseViewModel
         MailOperation.MoveToJunk
     ];
 
+    private readonly List<MailListDisplayMode> availableMailSpacingOptions =
+    [
+        MailListDisplayMode.Compact,
+        MailListDisplayMode.Medium,
+        MailListDisplayMode.Spacious
+    ];
+
     public List<string> AvailableHoverActionsTranslations { get; set; } =
     [
         Translator.HoverActionOption_Archive,
@@ -47,6 +42,37 @@ public partial class MessageListPageViewModel : MailBaseViewModel
         Translator.HoverActionOption_MoveJunk
     ];
 
+    public IMailItemDisplayInformation DemoPreviewMailItemInformation { get; } = new DemoMailItemDisplayInformation();
+
+    public MailListDisplayMode SelectedMailSpacingMode => availableMailSpacingOptions[selectedMailSpacingIndex];
+
+    private int selectedMarkAsOptionIndex;
+    public int SelectedMarkAsOptionIndex
+    {
+        get => selectedMarkAsOptionIndex;
+        set
+        {
+            if (SetProperty(ref selectedMarkAsOptionIndex, value) && value >= 0)
+            {
+                PreferencesService.MarkAsPreference = (MailMarkAsOption)Enum.GetValues<MailMarkAsOption>().GetValue(value);
+            }
+        }
+    }
+
+    private int selectedMailSpacingIndex;
+    public int SelectedMailSpacingIndex
+    {
+        get => selectedMailSpacingIndex;
+        set
+        {
+            if (SetProperty(ref selectedMailSpacingIndex, value) && value >= 0 && value < availableMailSpacingOptions.Count)
+            {
+                PreferencesService.MailItemDisplayMode = availableMailSpacingOptions[value];
+                OnPropertyChanged(nameof(SelectedMailSpacingMode));
+            }
+        }
+    }
+
     #region Properties
     private int leftHoverActionIndex;
     public int LeftHoverActionIndex
@@ -88,13 +114,19 @@ public partial class MessageListPageViewModel : MailBaseViewModel
     }
     #endregion
 
-    public MessageListPageViewModel(IPreferencesService preferencesService, IThumbnailService thumbnailService)
+    public MessageListPageViewModel(IPreferencesService preferencesService,
+                                    IThumbnailService thumbnailService,
+                                    IStatePersistanceService statePersistenceService,
+                                    IDialogServiceBase dialogService)
     {
         PreferencesService = preferencesService;
         _thumbnailService = thumbnailService;
+        _statePersistenceService = statePersistenceService;
+        _dialogService = dialogService;
         leftHoverActionIndex = availableHoverActions.IndexOf(PreferencesService.LeftHoverAction);
         centerHoverActionIndex = availableHoverActions.IndexOf(PreferencesService.CenterHoverAction);
         rightHoverActionIndex = availableHoverActions.IndexOf(PreferencesService.RightHoverAction);
+        selectedMailSpacingIndex = availableMailSpacingOptions.IndexOf(PreferencesService.MailItemDisplayMode);
         SelectedMarkAsOptionIndex = Array.IndexOf(Enum.GetValues<MailMarkAsOption>(), PreferencesService.MarkAsPreference);
     }
 
@@ -103,4 +135,39 @@ public partial class MessageListPageViewModel : MailBaseViewModel
     {
         await _thumbnailService.ClearCache();
     }
+
+    [RelayCommand]
+    private void ResetMailListPaneLength()
+    {
+        _statePersistenceService.MailListPaneLength = 420;
+        _dialogService.InfoBarMessage(Translator.GeneralTitle_Info, Translator.Info_MailListSizeResetSuccessMessage, InfoBarMessageType.Success);
+    }
+
+    private sealed class DemoMailItemDisplayInformation : IMailItemDisplayInformation
+    {
+        public event PropertyChangedEventHandler PropertyChanged
+        {
+            add { }
+            remove { }
+        }
+
+        public string Subject => "Quarterly planning notes";
+        public string FromName => "Ava Brooks";
+        public string FromAddress => "ava@contoso.com";
+        public string PreviewText => "Agenda draft, attendee updates, and a few follow-up items for this week.";
+        public bool IsRead => false;
+        public bool IsDraft => false;
+        public bool HasAttachments => true;
+        public bool IsCalendarEvent => false;
+        public bool IsFlagged => true;
+        public DateTime CreationDate => DateTime.Now.AddMinutes(-12);
+        public Guid? ContactPictureFileId => null;
+        public bool ThumbnailUpdatedEvent => false;
+        public bool IsThreadExpanded => false;
+        public AccountContact SenderContact => new()
+        {
+            Address = "ava@contoso.com",
+            Name = "Ava Brooks"
+        };
+    }
 }
diff --git a/Wino.Mail.ViewModels/Messages/MailItemSelectedEvent.cs b/Wino.Mail.ViewModels/Messages/MailItemSelectedEvent.cs
deleted file mode 100644
index b30b6a36..00000000
--- a/Wino.Mail.ViewModels/Messages/MailItemSelectedEvent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Mail.ViewModels.Messages;
-
-/// <summary>
-/// Wino has complex selected item detection mechanism with nested ListViews that
-/// supports multi selection with threads. Each list view will raise this for mail list page
-/// to react.
-/// </summary>
-public class MailItemSelectedEvent
-{
-    public MailItemSelectedEvent(MailItemViewModel selectedMailItem)
-    {
-        SelectedMailItem = selectedMailItem;
-    }
-
-    public MailItemViewModel SelectedMailItem { get; set; }
-}
diff --git a/Wino.Mail.ViewModels/Messages/MailItemSelectionRemovedEvent.cs b/Wino.Mail.ViewModels/Messages/MailItemSelectionRemovedEvent.cs
deleted file mode 100644
index d098ba0f..00000000
--- a/Wino.Mail.ViewModels/Messages/MailItemSelectionRemovedEvent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Mail.ViewModels.Messages;
-
-/// <summary>
-/// Selected item removed event.
-/// </summary>
-public class MailItemSelectionRemovedEvent
-{
-    public MailItemSelectionRemovedEvent(MailItemViewModel removedMailItem)
-    {
-        RemovedMailItem = removedMailItem;
-    }
-
-    public MailItemViewModel RemovedMailItem { get; set; }
-}
diff --git a/Wino.Mail.ViewModels/Messages/NewMailItemRenderingRequestedEvent.cs b/Wino.Mail.ViewModels/Messages/NewMailItemRenderingRequestedEvent.cs
deleted file mode 100644
index 095b1670..00000000
--- a/Wino.Mail.ViewModels/Messages/NewMailItemRenderingRequestedEvent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Mail.ViewModels.Messages;
-
-/// <summary>
-/// When the rendering page is active, but new item is requested to be rendered.
-/// To not trigger navigation again and re-use existing Chromium.
-/// </summary>
-/// <param name="MailItemViewModel"></param>
-public record NewMailItemRenderingRequestedEvent(MailItemViewModel MailItemViewModel);
diff --git a/Wino.Mail.ViewModels/Messages/ReaderItemRefreshRequestedEvent.cs b/Wino.Mail.ViewModels/Messages/ReaderItemRefreshRequestedEvent.cs
new file mode 100644
index 00000000..eab15937
--- /dev/null
+++ b/Wino.Mail.ViewModels/Messages/ReaderItemRefreshRequestedEvent.cs
@@ -0,0 +1,10 @@
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.ViewModels.Messages;
+
+/// <summary>
+/// Requests refreshing the currently active reader page (mail rendering or compose)
+/// with a different selected mail item without re-navigation.
+/// </summary>
+/// <param name="MailItemViewModel">The selected mail item to refresh with.</param>
+public record ReaderItemRefreshRequestedEvent(MailItemViewModel MailItemViewModel);
diff --git a/Wino.Mail.ViewModels/Messages/SelectMailItemContainerEvent.cs b/Wino.Mail.ViewModels/Messages/SelectMailItemContainerEvent.cs
index 814d75a6..ec6797ec 100644
--- a/Wino.Mail.ViewModels/Messages/SelectMailItemContainerEvent.cs
+++ b/Wino.Mail.ViewModels/Messages/SelectMailItemContainerEvent.cs
@@ -1,8 +1,8 @@
-using Wino.Mail.ViewModels.Data;
+using System;
 
 namespace Wino.Mail.ViewModels.Messages;
 
 /// <summary>
 /// When listing view model manipulated the selected mail container in the UI.
 /// </summary>
-public record SelectMailItemContainerEvent(MailItemViewModel SelectedMailViewModel, bool ScrollToItem = false);
+public record SelectMailItemContainerEvent(Guid MailUniqueId, bool ScrollToItem = false);
diff --git a/Wino.Mail.ViewModels/Messages/SwipeActionRequested.cs b/Wino.Mail.ViewModels/Messages/SwipeActionRequested.cs
new file mode 100644
index 00000000..236cc440
--- /dev/null
+++ b/Wino.Mail.ViewModels/Messages/SwipeActionRequested.cs
@@ -0,0 +1,9 @@
+using Wino.Core.Domain.Enums;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.ViewModels.Messages;
+
+/// <summary>
+/// When a swipe action is performed on a mail item container.
+/// </summary>
+public record SwipeActionRequested(MailOperation Operation, IMailListItem MailItem);
\ No newline at end of file
diff --git a/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs b/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
new file mode 100644
index 00000000..c5480a68
--- /dev/null
+++ b/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
@@ -0,0 +1,122 @@
+using System.Collections.Generic;
+using System.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class ProviderSelectionPageViewModel : MailBaseViewModel
+{
+    private readonly IProviderService _providerService;
+    private readonly INewThemeService _themeService;
+
+    public WelcomeWizardContext WizardContext { get; }
+
+    public List<IProviderDetail> Providers { get; private set; } = [];
+    public List<AppColorViewModel> AvailableColors { get; private set; } = [];
+
+    [ObservableProperty]
+    public partial IProviderDetail SelectedProvider { get; set; }
+
+    [ObservableProperty]
+    public partial AppColorViewModel SelectedColor { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountName { get; set; }
+
+    [ObservableProperty]
+    public partial bool CanProceed { get; set; }
+
+    public bool IsColorSelected => SelectedColor != null;
+
+    public ProviderSelectionPageViewModel(
+        IProviderService providerService,
+        INewThemeService themeService,
+        WelcomeWizardContext wizardContext)
+    {
+        _providerService = providerService;
+        _themeService = themeService;
+        WizardContext = wizardContext;
+    }
+
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        Providers = _providerService.GetAvailableProviders();
+        AvailableColors = _themeService.GetAvailableAccountColors()
+            .Select(hex => new AppColorViewModel(hex))
+            .ToList();
+
+        // Restore from wizard context if navigating back
+        if (WizardContext.SelectedProvider != null)
+        {
+            SelectedProvider = Providers.FirstOrDefault(p =>
+                p.Type == WizardContext.SelectedProvider.Type &&
+                p.SpecialImapProvider == WizardContext.SelectedProvider.SpecialImapProvider);
+            AccountName = WizardContext.AccountName;
+
+            if (WizardContext.AccountColorHex != null)
+                SelectedColor = AvailableColors.FirstOrDefault(c => c.Hex == WizardContext.AccountColorHex);
+        }
+
+        Validate();
+    }
+
+    partial void OnSelectedProviderChanged(IProviderDetail value) => Validate();
+    partial void OnAccountNameChanged(string value) => Validate();
+    partial void OnSelectedColorChanged(AppColorViewModel value) => OnPropertyChanged(nameof(IsColorSelected));
+
+    [RelayCommand]
+    private void ClearColor() => SelectedColor = null;
+
+    private void Validate()
+    {
+        CanProceed = SelectedProvider != null && !string.IsNullOrWhiteSpace(AccountName);
+    }
+
+    [RelayCommand]
+    private void Proceed()
+    {
+        if (!CanProceed) return;
+
+        // Persist to wizard context
+        WizardContext.SelectedProvider = SelectedProvider;
+        WizardContext.AccountName = AccountName?.Trim();
+        WizardContext.AccountColorHex = SelectedColor?.Hex ?? string.Empty;
+
+        if (WizardContext.IsGenericImap)
+        {
+            // Navigate to ImapCalDavSettingsPage in wizard mode
+            var context = ImapCalDavSettingsNavigationContext.CreateForWizardMode(
+                WizardContext.BuildAccountCreationDialogResult());
+
+            Messenger.Send(new BreadcrumbNavigationRequested(
+                Translator.ImapCalDavSettingsPage_TitleCreate,
+                WinoPage.ImapCalDavSettingsPage,
+                context));
+        }
+        else if (SelectedProvider.SpecialImapProvider is SpecialImapProvider.iCloud or SpecialImapProvider.Yahoo)
+        {
+            // Navigate to credentials page for special IMAP providers
+            Messenger.Send(new BreadcrumbNavigationRequested(
+                SelectedProvider.Name,
+                WinoPage.SpecialImapCredentialsPage));
+        }
+        else
+        {
+            // OAuth — go directly to progress page
+            Messenger.Send(new BreadcrumbNavigationRequested(
+                Translator.WelcomeWizard_Step3Title,
+                WinoPage.AccountSetupProgressPage));
+        }
+    }
+}
diff --git a/Wino.Mail.ViewModels/SignatureAndEncryptionPageViewModel.cs b/Wino.Mail.ViewModels/SignatureAndEncryptionPageViewModel.cs
new file mode 100644
index 00000000..3eba7180
--- /dev/null
+++ b/Wino.Mail.ViewModels/SignatureAndEncryptionPageViewModel.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Input;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Common;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class SignatureAndEncryptionPageViewModel : MailBaseViewModel
+{
+    private readonly ISmimeCertificateService _smimeCertificateService;
+    private readonly IDialogServiceBase _dialogService;
+    private readonly IFileService _fileService;
+
+    public ObservableCollection<X509Certificate2> PersonalCertificates { get; } = [];
+    public ObservableCollection<X509Certificate2> RecipientCertificates { get; } = [];
+    public List<X509Certificate2> SelectedPersonalCertificates { get; } = [];
+    public List<X509Certificate2> SelectedRecipientCertificates { get; } = [];
+
+    public bool PersonalCertificatesEmpty => PersonalCertificates.Count == 0;
+
+    public SignatureAndEncryptionPageViewModel(
+        IDialogServiceBase dialogService,
+        ISmimeCertificateService smimeCertificateService,
+        IFileService fileService
+    )
+    {
+        _dialogService = dialogService;
+        _fileService = fileService;
+        _smimeCertificateService = smimeCertificateService;
+
+        PersonalCertificates.CollectionChanged += (s, e) => { OnPropertyChanged(nameof(PersonalCertificatesEmpty)); };
+        LoadAllCertificates();
+    }
+
+    private void LoadAllCertificates()
+    {
+        PersonalCertificates.Clear();
+        var personalCerts = _smimeCertificateService.GetCertificates();
+        foreach (var cert in personalCerts)
+        {
+            PersonalCertificates.Add(cert);
+        }
+
+        // Recipient certificates
+        RecipientCertificates.Clear();
+        var recipientCerts = _smimeCertificateService.GetCertificates(storeName: StoreName.AddressBook);
+        foreach (var cert in recipientCerts)
+        {
+            RecipientCertificates.Add(cert);
+        }
+    }
+
+    [RelayCommand]
+    public async Task ImportPersonalCertificatesAsync()
+    {
+        await ImportCertificates(StoreName.My);
+    }
+
+    [RelayCommand]
+    public async Task ImportRecipientCertificatesAsync()
+    {
+        await ImportCertificates(StoreName.AddressBook);
+    }
+
+    private async Task ImportCertificates(StoreName storeName)
+    {
+        var files = await PickCertificateFilesAsync();
+        var failedImports = new List<string>();
+        var successCount = 0;
+        foreach (var file in files)
+        {
+            string password = null;
+            if (file.FileExtension.Equals(".pfx") || file.FileExtension.Equals(".p12"))
+            {
+                password = await PromptForPasswordAsync(file.FileName);
+            }
+
+            try
+            {
+                _smimeCertificateService.ImportCertificate(file.FileExtension, file.Data, password,
+                    storeName: storeName);
+                successCount++;
+            }
+            catch (Exception ex)
+            {
+                failedImports.Add($"{file.FileName}: {ex.Message}");
+            }
+        }
+        LoadAllCertificates();
+        if (successCount > 0)
+        {
+            _dialogService.InfoBarMessage(
+                string.Format(Translator.Smime_ImportCertificates_Success),
+                Translator.GeneralTitle_Info,
+                InfoBarMessageType.Success);
+        }
+        if (failedImports.Count > 0)
+        {
+            await _dialogService.ShowMessageAsync(
+                $"{Translator.Smime_ImportCertificates_Error}\n\n{string.Join("\n", failedImports)}",
+                Translator.GeneralTitle_Warning,
+                Core.Domain.Enums.WinoCustomMessageDialogIcon.Warning);
+        }
+    }
+
+    [RelayCommand]
+    public async Task RemovePersonalCertificatesAsync()
+    {
+        await RemoveCertificatesAsync(SelectedPersonalCertificates, StoreName.My);
+    }
+
+    [RelayCommand]
+    public async Task RemoveRecipientCertificatesAsync()
+    {
+        await RemoveCertificatesAsync(SelectedRecipientCertificates, StoreName.AddressBook);
+    }
+
+    private async Task RemoveCertificatesAsync(List<X509Certificate2> certificates, StoreName storeName)
+    {
+        if (certificates.Any())
+        {
+            var confirm = await ConfirmAsync(string.Format(Translator.Smime_RemoveCertificates_Confirm,
+                string.Join(", ", certificates.Select(cert => cert.Subject))));
+            if (confirm)
+            {
+                foreach (var cert in certificates)
+                {
+                    _smimeCertificateService.RemoveCertificate(cert.Thumbprint, storeName: storeName);
+                }
+
+                LoadAllCertificates();
+                _dialogService.InfoBarMessage(
+                    Translator.Smime_RemoveCertificates_Success,
+                    Translator.GeneralTitle_Info,
+                    InfoBarMessageType.Success
+                );
+            }
+        }
+    }
+
+    [RelayCommand]
+    public async Task ExportPersonalCertificatesAsync()
+    {
+        await ExportCertificatesAsync(SelectedPersonalCertificates);
+    }
+
+    [RelayCommand]
+    public async Task ExportRecipientCertificatesAsync()
+    {
+        await ExportCertificatesAsync(SelectedRecipientCertificates);
+    }
+
+    // Export logic for .cer or .pem
+    private async Task ExportCertificatesAsync(IEnumerable<X509Certificate2> cert)
+    {
+        var failedExports = new List<string>();
+        var successCount = 0;
+        foreach (var certificate in cert)
+        {
+            var fileName = $"{certificate.Subject.Replace("CN=", "")}.cer";
+            var path = await _dialogService.PickFilePathAsync(fileName);
+            if (path != null)
+            {
+                var folderPath = System.IO.Path.GetDirectoryName(path);
+                await using var stream = await _fileService.GetFileStreamAsync(folderPath, fileName);
+                if (stream != null)
+                {
+                    try
+                    {
+                        var certificateData = certificate.Export(X509ContentType.Cert);
+                        await stream.WriteAsync(certificateData, 0, certificateData.Length);
+                        await stream.FlushAsync();
+                        successCount++;
+                    }
+                    catch (Exception ex)
+                    {
+                        failedExports.Add($"{certificate.Subject}: {ex.Message}");
+                    }
+                }
+                else
+                {
+                    failedExports.Add($"{certificate.Subject}: File stream error");
+                }
+            }
+        }
+        if (successCount > 0)
+        {
+            _dialogService.InfoBarMessage(
+                Translator.Smime_ExportCertificates_Success,
+                Translator.GeneralTitle_Info,
+                InfoBarMessageType.Success
+            );
+        }
+        if (failedExports.Count > 0)
+        {
+            await _dialogService.ShowMessageAsync(
+                $"{Translator.Smime_ExportCertificates_Error}\n\n{string.Join("\n", failedExports)}",
+                Translator.GeneralTitle_Warning,
+                Core.Domain.Enums.WinoCustomMessageDialogIcon.Warning);
+        }
+    }
+
+    private async Task ShowCertificateDetailsAsync(X509Certificate2 cert)
+    {
+        var details = string.Format(Translator.Smime_CertificateDetails, cert.Subject, cert.Issuer, cert.NotBefore,
+            cert.NotAfter, cert.Thumbprint);
+        await _dialogService.ShowMessageAsync(details, Translator.GeneralTitle_Info,
+            Core.Domain.Enums.WinoCustomMessageDialogIcon.Information);
+    }
+
+    // Confirmation dialog
+    private async Task<bool> ConfirmAsync(string message)
+    {
+        return await _dialogService.ShowConfirmationDialogAsync(message, Translator.Smime_Confirm_Title,
+            Translator.Buttons_Yes);
+    }
+
+    // File picker for importing certificates
+    private async Task<List<SharedFile>> PickCertificateFilesAsync()
+    {
+        return await _dialogService.PickFilesAsync(".pfx", ".p12", ".cer", ".crt");
+    }
+
+    // Ask for password for .pfx/.p12
+    private async Task<string> PromptForPasswordAsync(string fileName)
+    {
+        return await _dialogService.ShowTextInputDialogAsync("",
+            Translator.Smime_CertificatePassword_Title,
+            string.Format(Translator.Smime_CertificatePassword_Placeholder, fileName), Translator.Buttons_OK);
+    }
+}
diff --git a/Wino.Mail.ViewModels/SpecialImapCredentialsPageViewModel.cs b/Wino.Mail.ViewModels/SpecialImapCredentialsPageViewModel.cs
new file mode 100644
index 00000000..9ba42445
--- /dev/null
+++ b/Wino.Mail.ViewModels/SpecialImapCredentialsPageViewModel.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class SpecialImapCredentialsPageViewModel : MailBaseViewModel
+{
+    private static readonly Dictionary<SpecialImapProvider, string> AppPasswordHelpLinks = new()
+    {
+        { SpecialImapProvider.iCloud, "https://support.apple.com/en-us/102654" },
+        { SpecialImapProvider.Yahoo, "http://help.yahoo.com/kb/SLN15241.html" },
+    };
+
+    private readonly INativeAppService _nativeAppService;
+
+    public WelcomeWizardContext WizardContext { get; }
+
+    [ObservableProperty]
+    public partial string DisplayName { get; set; }
+
+    [ObservableProperty]
+    public partial string EmailAddress { get; set; }
+
+    [ObservableProperty]
+    public partial string AppSpecificPassword { get; set; }
+
+    [ObservableProperty]
+    public partial int SelectedCalendarModeIndex { get; set; }
+
+    [ObservableProperty]
+    public partial bool CanProceed { get; set; }
+
+    public string AppPasswordHelpUrl
+    {
+        get
+        {
+            if (WizardContext.SelectedProvider == null) return null;
+            AppPasswordHelpLinks.TryGetValue(WizardContext.SelectedProvider.SpecialImapProvider, out var url);
+            return url;
+        }
+    }
+
+    public string CalendarModeCalDavDescription
+        => WizardContext.SelectedProvider?.SpecialImapProvider == SpecialImapProvider.iCloud
+            ? Translator.ProviderSelection_CalendarMode_CalDavDescription_Apple
+            : Translator.ProviderSelection_CalendarMode_CalDavDescription_Yahoo;
+
+    public SpecialImapCredentialsPageViewModel(
+        INativeAppService nativeAppService,
+        WelcomeWizardContext wizardContext)
+    {
+        _nativeAppService = nativeAppService;
+        WizardContext = wizardContext;
+    }
+
+    public override void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        // Restore from context when navigating back
+        DisplayName = WizardContext.DisplayName;
+        EmailAddress = WizardContext.EmailAddress;
+        AppSpecificPassword = WizardContext.AppSpecificPassword;
+
+        SelectedCalendarModeIndex = WizardContext.CalendarSupportMode switch
+        {
+            ImapCalendarSupportMode.CalDav => 1,
+            ImapCalendarSupportMode.LocalOnly => 2,
+            _ => 0
+        };
+
+        OnPropertyChanged(nameof(AppPasswordHelpUrl));
+        OnPropertyChanged(nameof(CalendarModeCalDavDescription));
+
+        Validate();
+    }
+
+    partial void OnDisplayNameChanged(string value) => Validate();
+    partial void OnEmailAddressChanged(string value) => Validate();
+    partial void OnAppSpecificPasswordChanged(string value) => Validate();
+
+    private void Validate()
+    {
+        CanProceed = !string.IsNullOrWhiteSpace(DisplayName)
+            && !string.IsNullOrWhiteSpace(EmailAddress)
+            && EmailValidation.EmailValidator.Validate(EmailAddress ?? string.Empty)
+            && !string.IsNullOrWhiteSpace(AppSpecificPassword);
+    }
+
+    [RelayCommand]
+    private void Proceed()
+    {
+        if (!CanProceed) return;
+
+        WizardContext.DisplayName = DisplayName?.Trim();
+        WizardContext.EmailAddress = EmailAddress?.Trim();
+        WizardContext.AppSpecificPassword = AppSpecificPassword?.Trim();
+        WizardContext.CalendarSupportMode = SelectedCalendarModeIndex switch
+        {
+            1 => ImapCalendarSupportMode.CalDav,
+            2 => ImapCalendarSupportMode.LocalOnly,
+            _ => ImapCalendarSupportMode.Disabled
+        };
+
+        Messenger.Send(new BreadcrumbNavigationRequested(
+            Translator.WelcomeWizard_Step3Title,
+            WinoPage.AccountSetupProgressPage));
+    }
+
+    [RelayCommand]
+    private async Task OpenAppPasswordHelp()
+    {
+        var url = AppPasswordHelpUrl;
+        if (url != null)
+            await _nativeAppService.LaunchUriAsync(new Uri(url));
+    }
+}
diff --git a/Wino.Mail.ViewModels/StoragePageViewModel.cs b/Wino.Mail.ViewModels/StoragePageViewModel.cs
new file mode 100644
index 00000000..58226a7c
--- /dev/null
+++ b/Wino.Mail.ViewModels/StoragePageViewModel.cs
@@ -0,0 +1,237 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Serilog;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Extensions;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class StoragePageViewModel(
+    IAccountService accountService,
+    IMimeStorageService mimeStorageService,
+    IMailDialogService dialogService) : MailBaseViewModel
+{
+    private readonly ILogger _logger = Log.ForContext<StoragePageViewModel>();
+    private readonly IAccountService _accountService = accountService;
+    private readonly IMimeStorageService _mimeStorageService = mimeStorageService;
+    private readonly IMailDialogService _dialogService = dialogService;
+
+    public ObservableCollection<AccountStorageItemViewModel> AccountStorageItems { get; } = [];
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsBusy))]
+    public partial bool IsLoading { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsBusy))]
+    public partial bool IsCleaning { get; set; }
+
+    [ObservableProperty]
+    public partial string MimeRootPath { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string SummaryText { get; set; } = "";
+
+    public bool IsBusy => IsLoading || IsCleaning;
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+        await ExecuteUIThread(() => { SummaryText = Translator.SettingsStorage_NoLocalMimeDataFound; });
+
+        await RefreshStorageAsync();
+    }
+
+    partial void OnIsLoadingChanged(bool value)
+    {
+        UpdateAccountBusyState();
+    }
+
+    partial void OnIsCleaningChanged(bool value)
+    {
+        UpdateAccountBusyState();
+    }
+
+    private void UpdateAccountBusyState()
+    {
+        Dispatcher.ExecuteOnUIThread(() =>
+        {
+            foreach (var item in AccountStorageItems)
+            {
+                item.IsBusy = IsBusy;
+            }
+        });
+    }
+
+    [RelayCommand]
+    private async Task RefreshStorageAsync()
+    {
+        if (IsBusy) return;
+
+        await ExecuteUIThread(() => { IsLoading = true; });
+
+        try
+        {
+            var mimeRootPath = await _mimeStorageService.GetMimeRootPathAsync().ConfigureAwait(false);
+            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+            var sizeMap = await _mimeStorageService.GetAccountsMimeStorageSizesAsync(accounts.Select(a => a.Id)).ConfigureAwait(false);
+
+            var storageItems = accounts
+                .Select(account =>
+                {
+                    sizeMap.TryGetValue(account.Id, out var accountSize);
+                    var viewModel = new AccountStorageItemViewModel(account, accountSize, DeleteAllCommand, DeleteOlderThanOneMonthCommand, DeleteOlderThanThreeMonthsCommand, DeleteOlderThanSixMonthsCommand, DeleteOlderThanOneYearCommand);
+                    viewModel.SizeDescription = string.Format(Translator.SettingsStorage_AccountUsageDescription, viewModel.SizeText);
+                    return viewModel;
+                })
+                .OrderByDescending(a => a.SizeBytes)
+                .ToList();
+
+            await ExecuteUIThread(() =>
+            {
+                MimeRootPath = mimeRootPath;
+                AccountStorageItems.Clear();
+
+                foreach (var item in storageItems)
+                {
+                    AccountStorageItems.Add(item);
+                }
+
+                var total = storageItems.Sum(a => a.SizeBytes);
+                SummaryText = storageItems.Count == 0
+                    ? Translator.SettingsStorage_NoAccountsFound
+                    : string.Format(Translator.SettingsStorage_TotalUsage, total.GetBytesReadable());
+            });
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to refresh storage data.");
+            await ExecuteUIThread(() =>
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, ex.Message, Core.Domain.Enums.InfoBarMessageType.Error);
+            });
+        }
+        finally
+        {
+            await ExecuteUIThread(() => { IsLoading = false; });
+        }
+    }
+
+    [RelayCommand]
+    private async Task DeleteAllAsync(AccountStorageItemViewModel accountItem)
+    {
+        if (accountItem == null || IsBusy) return;
+
+        bool approved = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.SettingsStorage_DeleteAll_Confirm_Message, accountItem.AccountName),
+            Translator.SettingsStorage_DeleteAll_Confirm_Title,
+            Translator.Buttons_Delete);
+
+        if (!approved) return;
+
+        await ExecuteUIThread(() => { IsCleaning = true; });
+
+        try
+        {
+            await _mimeStorageService.DeleteAccountMimeStorageAsync(accountItem.Account.Id).ConfigureAwait(false);
+            await ExecuteUIThread(() =>
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Info, Translator.SettingsStorage_DeleteAll_Success, Core.Domain.Enums.InfoBarMessageType.Success);
+            });
+            await RefreshStorageAsync();
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to delete all MIME content for account {AccountId}", accountItem.Account.Id);
+            await ExecuteUIThread(() =>
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, ex.Message, Core.Domain.Enums.InfoBarMessageType.Error);
+            });
+        }
+        finally
+        {
+            await ExecuteUIThread(() => { IsCleaning = false; });
+        }
+    }
+
+    [RelayCommand]
+    private Task DeleteOlderThanOneMonthAsync(AccountStorageItemViewModel accountItem)
+        => DeleteOlderThanAsync(accountItem, 1);
+
+    [RelayCommand]
+    private Task DeleteOlderThanThreeMonthsAsync(AccountStorageItemViewModel accountItem)
+        => DeleteOlderThanAsync(accountItem, 3);
+
+    [RelayCommand]
+    private Task DeleteOlderThanSixMonthsAsync(AccountStorageItemViewModel accountItem)
+        => DeleteOlderThanAsync(accountItem, 6);
+
+    [RelayCommand]
+    private Task DeleteOlderThanOneYearAsync(AccountStorageItemViewModel accountItem)
+        => DeleteOlderThanAsync(accountItem, 12);
+
+    private async Task DeleteOlderThanAsync(AccountStorageItemViewModel accountItem, int months)
+    {
+        if (accountItem == null || IsBusy) return;
+
+        string rangeText = GetRangeText(months);
+
+        bool approved = await _dialogService.ShowConfirmationDialogAsync(
+            string.Format(Translator.SettingsStorage_DeleteOld_Confirm_Message, rangeText, accountItem.AccountName),
+            Translator.SettingsStorage_DeleteOld_Confirm_Title,
+            Translator.Buttons_Delete);
+
+        if (!approved) return;
+
+        await ExecuteUIThread(() => { IsCleaning = true; });
+
+        try
+        {
+            var cutoffDateUtc = DateTime.UtcNow.AddMonths(-months);
+            var deletedDirectoryCount = await _mimeStorageService
+                .DeleteAccountMimeStorageOlderThanAsync(accountItem.Account.Id, cutoffDateUtc)
+                .ConfigureAwait(false);
+
+            await ExecuteUIThread(() =>
+            {
+                _dialogService.InfoBarMessage(
+                    Translator.GeneralTitle_Info,
+                    string.Format(Translator.SettingsStorage_DeleteOld_Success, deletedDirectoryCount, rangeText),
+                    Core.Domain.Enums.InfoBarMessageType.Success);
+            });
+
+            await RefreshStorageAsync();
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to delete MIME content by cutoff for account {AccountId}", accountItem.Account.Id);
+            await ExecuteUIThread(() =>
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, ex.Message, Core.Domain.Enums.InfoBarMessageType.Error);
+            });
+        }
+        finally
+        {
+            await ExecuteUIThread(() => { IsCleaning = false; });
+        }
+    }
+
+    private static string GetRangeText(int months)
+    {
+        return months switch
+        {
+            1 => Translator.SettingsStorage_1Month,
+            3 => Translator.SettingsStorage_3Months,
+            6 => Translator.SettingsStorage_6Months,
+            12 => Translator.SettingsStorage_1Year,
+            _ => string.Format(Translator.SettingsStorage_Months, months)
+        };
+    }
+}
diff --git a/Wino.Mail.ViewModels/WelcomePageV2ViewModel.cs b/Wino.Mail.ViewModels/WelcomePageV2ViewModel.cs
new file mode 100644
index 00000000..9626af2a
--- /dev/null
+++ b/Wino.Mail.ViewModels/WelcomePageV2ViewModel.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Updates;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.UI;
+
+namespace Wino.Mail.ViewModels;
+
+public partial class WelcomePageV2ViewModel : MailBaseViewModel
+{
+    private readonly IUpdateManager _updateManager;
+    private readonly IMailDialogService _dialogService;
+    private readonly IWinoAccountDataSyncService _syncService;
+
+    [ObservableProperty]
+    public partial List<UpdateNoteSection> UpdateSections { get; set; } = [];
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(GetStartedCommand))]
+    [NotifyCanExecuteChangedFor(nameof(ImportFromWinoAccountCommand))]
+    public partial bool IsImportInProgress { get; set; }
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(HasImportStatus))]
+    public partial string ImportStatusMessage { get; set; } = string.Empty;
+
+    public bool HasImportStatus => !string.IsNullOrWhiteSpace(ImportStatusMessage);
+
+    public WelcomePageV2ViewModel(IUpdateManager updateManager,
+                                  IMailDialogService dialogService,
+                                  IWinoAccountDataSyncService syncService)
+    {
+        _updateManager = updateManager;
+        _dialogService = dialogService;
+        _syncService = syncService;
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        try
+        {
+            var updateNotes = await _updateManager.GetLatestUpdateNotesAsync();
+            UpdateSections = updateNotes.Sections;
+        }
+        catch (Exception)
+        {
+            UpdateSections = [];
+        }
+    }
+
+    [RelayCommand(CanExecute = nameof(CanOpenWelcomeActions))]
+    private void GetStarted()
+    {
+        Messenger.Send(new BreadcrumbNavigationRequested(
+            Translator.WelcomeWizard_Step2Title,
+            WinoPage.ProviderSelectionPage));
+    }
+
+    [RelayCommand(CanExecute = nameof(CanOpenWelcomeActions))]
+    private async Task ImportFromWinoAccountAsync()
+    {
+        await ExecuteUIThread(() => ImportStatusMessage = string.Empty);
+
+        try
+        {
+            var account = await _dialogService.ShowWinoAccountLoginDialogAsync().ConfigureAwait(false);
+            if (account == null)
+            {
+                return;
+            }
+
+            await ExecuteUIThread(() => IsImportInProgress = true);
+
+            var result = await _syncService.ImportAsync(new WinoAccountSyncSelection()).ConfigureAwait(false);
+            if (result.ImportedMailboxCount > 0)
+            {
+                ReportUIChange(new WelcomeImportCompletedMessage(result.ImportedMailboxCount));
+                return;
+            }
+
+            await ExecuteUIThread(() => ImportStatusMessage = BuildInlineImportMessage(result));
+        }
+        catch (Exception ex)
+        {
+            await _dialogService.ShowMessageAsync(ex.Message, Translator.GeneralTitle_Error, WinoCustomMessageDialogIcon.Error);
+        }
+        finally
+        {
+            await ExecuteUIThread(() => IsImportInProgress = false);
+        }
+    }
+
+    private bool CanOpenWelcomeActions() => !IsImportInProgress;
+
+    private static string BuildInlineImportMessage(WinoAccountSyncImportResult result)
+    {
+        var preferencesMessage = result.FailedPreferenceCount > 0
+            ? string.Format(Translator.WinoAccount_Management_ImportPartial, result.AppliedPreferenceCount, result.FailedPreferenceCount)
+            : result.HadRemotePreferences
+                ? string.Format(Translator.WinoAccount_Management_ImportPreferencesSucceeded, result.AppliedPreferenceCount)
+                : string.Empty;
+
+        if (result.RemoteMailboxCount == 0)
+        {
+            return string.IsNullOrWhiteSpace(preferencesMessage)
+                ? Translator.WelcomeWindow_ImportNoAccountsFound
+                : $"{preferencesMessage} {Translator.WelcomeWindow_ImportNoAccountsFound}";
+        }
+
+        if (result.SkippedDuplicateMailboxCount > 0 && result.ImportedMailboxCount == 0)
+        {
+            var duplicateMessage = string.Format(Translator.WelcomeWindow_ImportDuplicateAccountsSkipped, result.SkippedDuplicateMailboxCount);
+            return string.IsNullOrWhiteSpace(preferencesMessage)
+                ? duplicateMessage
+                : $"{preferencesMessage} {duplicateMessage}";
+        }
+
+        return string.IsNullOrWhiteSpace(preferencesMessage)
+            ? Translator.WinoAccount_Management_ImportEmpty
+            : preferencesMessage;
+    }
+}
diff --git a/Wino.Mail.ViewModels/WelcomePageViewModel.cs b/Wino.Mail.ViewModels/WelcomePageViewModel.cs
deleted file mode 100644
index abe77009..00000000
--- a/Wino.Mail.ViewModels/WelcomePageViewModel.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using CommunityToolkit.Mvvm.ComponentModel;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-
-namespace Wino.Mail.ViewModels;
-
-public partial class WelcomePageViewModel : MailBaseViewModel
-{
-    public const string VersionFile = "1102.md";
-    private readonly IMailDialogService _dialogService;
-    private readonly IFileService _fileService;
-
-    [ObservableProperty]
-    private string currentVersionNotes;
-
-    public WelcomePageViewModel(IMailDialogService dialogService, IFileService fileService)
-    {
-        _dialogService = dialogService;
-        _fileService = fileService;
-    }
-
-    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
-    {
-        base.OnNavigatedTo(mode, parameters);
-
-        try
-        {
-            CurrentVersionNotes = await _fileService.GetFileContentByApplicationUriAsync($"ms-appx:///Assets/ReleaseNotes/{VersionFile}");
-        }
-        catch (Exception)
-        {
-            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, "Can't find the patch notes.", Core.Domain.Enums.InfoBarMessageType.Information);
-        }
-    }
-}
diff --git a/Wino.Mail.ViewModels/Wino.Mail.ViewModels.csproj b/Wino.Mail.ViewModels/Wino.Mail.ViewModels.csproj
index 7cbcd411..b84d5cb7 100644
--- a/Wino.Mail.ViewModels/Wino.Mail.ViewModels.csproj
+++ b/Wino.Mail.ViewModels/Wino.Mail.ViewModels.csproj
@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Platforms>x86;x64;arm64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="EmailValidation" />
 		<PackageReference Include="Microsoft.Identity.Client" />
 		<PackageReference Include="Sentry.Serilog" />
+		<PackageReference Include="MimeKit" />
 		<PackageReference Include="System.Reactive" />
 	</ItemGroup>
 	<ItemGroup>
@@ -19,4 +23,7 @@
 		<ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
 		<ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="Helpers\" />
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Wino.Core.UWP/Activation/ActivationHandler.cs b/Wino.Mail.WinUI/Activation/ActivationHandler.cs
similarity index 81%
rename from Wino.Core.UWP/Activation/ActivationHandler.cs
rename to Wino.Mail.WinUI/Activation/ActivationHandler.cs
index bbe692f1..845d8bae 100644
--- a/Wino.Core.UWP/Activation/ActivationHandler.cs
+++ b/Wino.Mail.WinUI/Activation/ActivationHandler.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace Wino.Activation;
 
@@ -18,13 +18,16 @@ public abstract class ActivationHandler<T> : ActivationHandler
 
     public override async Task HandleAsync(object args)
     {
-        await HandleInternalAsync(args as T);
+        if (args is T typedArgs)
+        {
+            await HandleInternalAsync(typedArgs);
+        }
     }
 
     public override bool CanHandle(object args)
     {
         // CanHandle checks the args is of type you have configured
-        return args is T && CanHandleInternal(args as T);
+        return args is T typedArgs && CanHandleInternal(typedArgs);
     }
 
     // You can override this method to add extra validation on activation args
diff --git a/Wino.Mail.WinUI/Activation/AppModeActivationResolver.cs b/Wino.Mail.WinUI/Activation/AppModeActivationResolver.cs
new file mode 100644
index 00000000..965da52a
--- /dev/null
+++ b/Wino.Mail.WinUI/Activation/AppModeActivationResolver.cs
@@ -0,0 +1,92 @@
+using System;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Mail.WinUI.Activation;
+
+internal static class AppModeActivationResolver
+{
+    public static WinoApplicationMode Resolve(string? launchArguments, string? tileId, string? appId, WinoApplicationMode defaultMode = WinoApplicationMode.Mail)
+    {
+        if (TryResolveFromText(launchArguments, defaultMode, out var mode))
+            return mode;
+
+        if (TryResolveFromText(tileId, defaultMode, out mode))
+            return mode;
+
+        if (TryResolveFromText(appId, defaultMode, out mode))
+            return mode;
+
+        return defaultMode;
+    }
+
+    private static bool TryResolveFromText(string? value, WinoApplicationMode defaultMode, out WinoApplicationMode mode)
+    {
+        mode = defaultMode;
+
+        if (string.IsNullOrWhiteSpace(value))
+            return false;
+
+        if (Contains(value, "--mode=toggle-default") ||
+            Contains(value, "mode=toggle-default"))
+        {
+            mode = GetOpposite(defaultMode);
+            return true;
+        }
+
+        if (Contains(value, "wino-calendar") ||
+            Contains(value, "--mode=calendar") ||
+            Contains(value, "mode=calendar") ||
+            Contains(value, "calendarapp") ||
+            EqualsToken(value, "calendar"))
+        {
+            mode = WinoApplicationMode.Calendar;
+            return true;
+        }
+
+        if (Contains(value, "wino-contacts") ||
+            Contains(value, "--mode=contacts") ||
+            Contains(value, "mode=contacts") ||
+            Contains(value, "contactsapp") ||
+            EqualsToken(value, "contacts"))
+        {
+            mode = WinoApplicationMode.Contacts;
+            return true;
+        }
+
+        if (Contains(value, "wino-settings") ||
+            Contains(value, "--mode=settings") ||
+            Contains(value, "mode=settings") ||
+            Contains(value, "settingsapp") ||
+            EqualsToken(value, "settings"))
+        {
+            mode = WinoApplicationMode.Settings;
+            return true;
+        }
+
+        if (Contains(value, "wino-mail") ||
+            Contains(value, "--mode=mail") ||
+            Contains(value, "mode=mail") ||
+            Contains(value, "mailapp") ||
+            EqualsToken(value, "mail"))
+        {
+            mode = WinoApplicationMode.Mail;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool Contains(string source, string token)
+        => source.Contains(token, StringComparison.OrdinalIgnoreCase);
+
+    private static bool EqualsToken(string source, string token)
+        => string.Equals(source.Trim(), token, StringComparison.OrdinalIgnoreCase);
+
+    private static WinoApplicationMode GetOpposite(WinoApplicationMode defaultMode)
+        => defaultMode switch
+        {
+            WinoApplicationMode.Mail => WinoApplicationMode.Calendar,
+            WinoApplicationMode.Calendar => WinoApplicationMode.Mail,
+            _ => WinoApplicationMode.Mail
+        };
+}
diff --git a/Wino.Mail/Activation/ProtocolActivationHandler.cs b/Wino.Mail.WinUI/Activation/ProtocolActivationHandler.cs
similarity index 99%
rename from Wino.Mail/Activation/ProtocolActivationHandler.cs
rename to Wino.Mail.WinUI/Activation/ProtocolActivationHandler.cs
index 9692ea20..938c61d5 100644
--- a/Wino.Mail/Activation/ProtocolActivationHandler.cs
+++ b/Wino.Mail.WinUI/Activation/ProtocolActivationHandler.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Windows.ApplicationModel.Activation;
diff --git a/Wino.Mail.WinUI/App.xaml b/Wino.Mail.WinUI/App.xaml
new file mode 100644
index 00000000..21d04fe6
--- /dev/null
+++ b/Wino.Mail.WinUI/App.xaml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<uwp:WinoApplication
+    x:Class="Wino.Mail.WinUI.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:coreStyles="using:Wino.Mail.WinUI.Styles"
+    xmlns:local="using:Wino.Mail.WinUI"
+    xmlns:styles="using:Wino.Styles"
+    xmlns:uwp="using:Wino.Mail.WinUI">
+    <uwp:WinoApplication.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <ResourceDictionary Source="/Styles/Colors.xaml" />
+                <ResourceDictionary Source="/Styles/ContentPresenters.xaml" />
+                <ResourceDictionary Source="/Styles/Converters.xaml" />
+                <ResourceDictionary Source="/Styles/FontIcons.xaml" />
+                <ResourceDictionary Source="/Styles/WinoInfoBar.xaml" />
+                <ResourceDictionary Source="/Styles/SharedStyles.xaml" />
+                <ResourceDictionary Source="/Styles/IconTemplates.xaml" />
+                <ResourceDictionary Source="/Styles/OperationCommandBar.xaml" />
+
+
+                <coreStyles:CustomMessageDialogStyles />
+                <coreStyles:DataTemplates />
+
+                <ResourceDictionary>
+                    <Style TargetType="ScrollViewer">
+                        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+                    </Style>
+
+                    <SolidColorBrush x:Key="CommandBarBackground" Color="Transparent" />
+                    <SolidColorBrush x:Key="CommandBarBackgroundOpen" Color="Transparent" />
+                    <SolidColorBrush x:Key="CommandBarBorderBrushOpen" Color="Transparent" />
+                    <Thickness x:Key="CommandBarBorderThicknessOpen">0</Thickness>
+
+                    <StaticResource x:Key="AppBarToggleButtonBackgroundChecked" ResourceKey="SystemAccentColor" />
+                    <StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPointerOver" ResourceKey="SystemAccentColor" />
+                    <StaticResource x:Key="AppBarToggleButtonBackgroundCheckedPressed" ResourceKey="SystemAccentColor" />
+
+                    <Thickness x:Key="ImapSetupDialogSubPagePadding">24,24,24,24</Thickness>
+
+                    <Style x:Key="PageRootBorderStyle" TargetType="Border">
+                        <Setter Property="Background" Value="{ThemeResource WinoContentZoneBackgroud}" />
+                        <Setter Property="BorderBrush" Value="{StaticResource CardStrokeColorDefaultBrush}" />
+                        <Setter Property="CornerRadius" Value="7" />
+                        <Setter Property="BorderThickness" Value="1" />
+                    </Style>
+
+                    <Style x:Key="InformationAreaGridStyle" TargetType="Grid">
+                        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
+                        <Setter Property="CornerRadius" Value="8" />
+                        <Setter Property="Padding" Value="16" />
+                    </Style>
+
+                    <Style TargetType="StackPanel">
+                        <Setter Property="ChildrenTransitions">
+                            <Setter.Value>
+                                <TransitionCollection>
+                                    <EntranceThemeTransition IsStaggeringEnabled="False" />
+                                </TransitionCollection>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+
+                    <Style
+                        x:Key="WinoDialogStyle"
+                        BasedOn="{StaticResource DefaultContentDialogStyle}"
+                        TargetType="ContentDialog">
+                        <Setter Property="CornerRadius" Value="8" />
+                        <Setter Property="Padding" Value="24" />
+                    </Style>
+
+                    <Style TargetType="coreControls:WinoNavigationViewItem">
+                        <Setter Property="ContentTransitions">
+                            <Setter.Value>
+                                <TransitionCollection>
+                                    <PopupThemeTransition />
+                                </TransitionCollection>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+
+                    <Style x:Key="PageStyle" TargetType="Page">
+                        <Setter Property="Margin" Value="-1,0,0,0" />
+                        <Setter Property="Padding" Value="12" />
+                        <Setter Property="Background" Value="{ThemeResource AppBarBackgroundColor}" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate>
+                                    <Grid Padding="12">
+                                        <ContentPresenter />
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+
+                    <x:Double x:Key="SettingsCardSpacing">4</x:Double>
+
+                    <Style
+                        x:Key="SettingsSectionHeaderTextBlockStyle"
+                        BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                        TargetType="TextBlock">
+                        <Style.Setters>
+                            <Setter Property="Margin" Value="1,30,0,6" />
+                        </Style.Setters>
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
+                <ResourceDictionary Source="Controls/ListView/WinoListViewStyles.xaml" />
+                <ResourceDictionary Source="/Styles/ItemContainerStyles.xaml" />
+                <ResourceDictionary Source="/Styles/ImagePreviewControl.xaml" />
+                <ResourceDictionary Source="/Styles/WebViewEditorControl.xaml" />
+                <ResourceDictionary Source="Controls/ListView/WinoListViewStyles.xaml" />
+
+                <ResourceDictionary Source="/Styles/CalendarThemeResources.xaml" />
+
+                <ResourceDictionary Source="/Styles/WinoCalendarTypeSelectorControl.xaml" />
+
+                <styles:WinoExpanderStyle />
+                <ResourceDictionary Source="/Styles/CalendarShellNavigationViewStyle.xaml" />
+                <ResourceDictionary Source="/Styles/CalendarViewStyles.xaml" />
+                <ResourceDictionary Source="AppThemes/Default.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </uwp:WinoApplication.Resources>
+</uwp:WinoApplication>
+
+
diff --git a/Wino.Mail.WinUI/App.xaml.cs b/Wino.Mail.WinUI/App.xaml.cs
new file mode 100644
index 00000000..06289cb2
--- /dev/null
+++ b/Wino.Mail.WinUI/App.xaml.cs
@@ -0,0 +1,1424 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.Windows.AppLifecycle;
+using Microsoft.Windows.AppNotifications;
+using MimeKit.Cryptography;
+using Windows.ApplicationModel.Activation;
+using Wino.Calendar.ViewModels;
+using Wino.Calendar.ViewModels.Interfaces;
+using Wino.Core;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.ViewModels;
+using Wino.Mail.Services;
+using Wino.Mail.ViewModels;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI.Activation;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Mail.WinUI.Services;
+using Wino.Mail.WinUI.ViewModels;
+using Wino.Messaging.Client.Accounts;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.Server;
+using Wino.Messaging.UI;
+using Wino.Services;
+using Wino.Views;
+using WinUIEx;
+namespace Wino.Mail.WinUI;
+
+public partial class App : WinoApplication,
+    IRecipient<NewMailSynchronizationRequested>,
+    IRecipient<NewCalendarSynchronizationRequested>,
+    IRecipient<AccountCreatedMessage>,
+    IRecipient<AccountRemovedMessage>,
+    IRecipient<GetStartedFromWelcomeRequested>,
+    IRecipient<WelcomeImportCompletedMessage>
+{
+    private const int InboxSyncsPerFullSync = 20;
+    private const string ToggleDefaultModeLaunchArgument = "--mode=toggle-default";
+    private const string WinoProtocolScheme = "wino";
+    private const string BillingProtocolHost = "billing";
+    private const string BillingSuccessPath = "/success";
+    private ISynchronizationManager? _synchronizationManager;
+    private IPreferencesService? _preferencesService;
+    private IAccountService? _accountService;
+    private bool _windowManagerConfigured;
+    private bool _hasConfiguredAccounts;
+    private bool _isExiting;
+    private CancellationTokenSource? _autoSynchronizationLoopCts;
+    private readonly SemaphoreSlim _autoSynchronizationSemaphore = new(1, 1);
+    private readonly ConcurrentDictionary<Guid, int> _inboxSyncCounters = [];
+    private NativeTrayIcon? _trayIcon;
+
+    internal bool IsExiting => _isExiting;
+
+    public App()
+    {
+        InitializeComponent();
+
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        CryptographyContext.Register(typeof(WindowsSecureMimeContext));
+
+        RegisterRecipients();
+    }
+
+    private void EnsureWindowManagerConfigured()
+    {
+        if (_windowManagerConfigured)
+            return;
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        windowManager.ActiveWindowChanged -= OnActiveWindowChanged;
+        windowManager.ActiveWindowChanged += OnActiveWindowChanged;
+        windowManager.WindowRemoved -= OnManagedWindowRemoved;
+        windowManager.WindowRemoved += OnManagedWindowRemoved;
+
+        var nativeAppService = Services.GetRequiredService<INativeAppService>();
+        nativeAppService.GetCoreWindowHwnd = () =>
+        {
+            var window = windowManager.ActiveWindow
+                         ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                         ?? windowManager.GetWindow(WinoWindowKind.Welcome)
+                         ?? MainWindow;
+
+            return window == null
+                ? IntPtr.Zero
+                : WinRT.Interop.WindowNative.GetWindowHandle(window);
+        };
+
+        _windowManagerConfigured = true;
+    }
+
+    private void OnActiveWindowChanged(object? sender, WindowEx? window)
+    {
+        if (window == null)
+            return;
+
+        MainWindow = window;
+        InitializeNavigationDispatcher();
+    }
+
+    private void OnManagedWindowRemoved(object? sender, WindowEx window)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.ActiveWindow
+                     ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                     ?? windowManager.GetWindow(WinoWindowKind.Welcome);
+
+        InitializeNavigationDispatcher();
+    }
+
+    private void EnsureTrayIconCreated()
+    {
+        if (_trayIcon != null)
+            return;
+
+        var iconPath = Path.Combine(AppContext.BaseDirectory, "Assets", "Wino_Icon.ico");
+        var dispatcherQueue = DispatcherQueue.GetForCurrentThread()
+                             ?? throw new InvalidOperationException("Tray icon must be created on a thread with a DispatcherQueue.");
+
+        _trayIcon = new NativeTrayIcon(
+            dispatcherQueue,
+            iconPath,
+            "Wino Mail",
+            BuildTrayMenu,
+            ActivatePreferredWindowAsync);
+
+        _trayIcon.Create();
+    }
+
+    private IReadOnlyList<NativeTrayIcon.NativeTrayMenuItem> BuildTrayMenu()
+    {
+        List<NativeTrayIcon.NativeTrayMenuItem> items =
+        [
+            new(Translator.SystemTrayMenu_Open, ActivatePreferredWindowAsync, IsDefault: true),
+            new(Translator.SystemTrayMenu_ShowWino, OpenMailFromTrayAsync)
+        ];
+
+        items.Add(new NativeTrayIcon.NativeTrayMenuItem(
+            Translator.SystemTrayMenu_ShowWinoCalendar,
+            OpenCalendarFromTrayAsync));
+        items.Add(new NativeTrayIcon.NativeTrayMenuItem(
+            Translator.SystemTrayMenu_ExitWino,
+            ExitApplicationAsync));
+
+        return items;
+    }
+
+    private Task ActivatePreferredWindowAsync()
+    {
+        if (!_hasConfiguredAccounts)
+            return ActivateWelcomeWindowAsync();
+
+        return ActivateShellWindowAsync(_preferencesService?.DefaultApplicationMode);
+    }
+
+    private Task OpenMailFromTrayAsync()
+        => _hasConfiguredAccounts
+            ? ActivateShellWindowAsync(WinoApplicationMode.Mail)
+            : ActivateWelcomeWindowAsync();
+
+    private Task OpenCalendarFromTrayAsync()
+        => _hasConfiguredAccounts
+            ? ActivateShellWindowAsync(WinoApplicationMode.Calendar)
+            : ActivateWelcomeWindowAsync();
+
+    private async Task ActivateWelcomeWindowAsync()
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        var welcomeWindow = windowManager.GetWindow(WinoWindowKind.Welcome) as WelcomeWindow;
+
+        if (welcomeWindow == null)
+        {
+            CreateWelcomeWindow();
+            welcomeWindow = MainWindow as WelcomeWindow;
+        }
+
+        if (welcomeWindow == null)
+            return;
+
+        CloseShellWindowIfPresent();
+        await ActivateWindowAsync(welcomeWindow);
+    }
+
+    private async Task ActivateShellWindowAsync(WinoApplicationMode? mode, IWinoShellWindow? existingShellWindow = null)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        var shellWindow = existingShellWindow;
+
+        if (shellWindow == null)
+        {
+            shellWindow = windowManager.GetWindow(WinoWindowKind.Shell) as IWinoShellWindow;
+
+            if (shellWindow == null)
+            {
+                CreateWindow(null);
+                shellWindow = MainWindow as IWinoShellWindow;
+            }
+        }
+
+        if (shellWindow == null)
+            return;
+
+        if (mode.HasValue)
+            shellWindow.HandleAppActivation(GetModeLaunchArgument(mode.Value));
+
+        CloseWelcomeWindowIfPresent();
+        await ActivateWindowAsync((WindowEx)shellWindow);
+    }
+
+    private void CloseWelcomeWindowIfPresent()
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) is not WelcomeWindow welcomeWindow)
+            return;
+
+        welcomeWindow.PrepareForClose();
+        welcomeWindow.AllowClose();
+        welcomeWindow.Close();
+    }
+
+    private void CloseShellWindowIfPresent()
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        if (windowManager.GetWindow(WinoWindowKind.Shell) is not ShellWindow shellWindow)
+            return;
+
+        windowManager.HideWindow(shellWindow);
+        if (ReferenceEquals(MainWindow, shellWindow))
+        {
+            MainWindow = null;
+            InitializeNavigationDispatcher();
+        }
+
+        shellWindow.PrepareForClose();
+        shellWindow.Close();
+    }
+
+    private async Task ActivateWindowAsync(WindowEx window)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = window;
+        windowManager.ActivateWindow(window);
+        await NewThemeService.ApplyThemeToActiveWindowAsync();
+    }
+
+    private Task ExitApplicationAsync()
+    {
+        ExitApplication();
+        return Task.CompletedTask;
+    }
+
+    private void ExitApplication()
+    {
+        if (_isExiting)
+            return;
+
+        _isExiting = true;
+        _trayIcon?.Dispose();
+        _trayIcon = null;
+
+        Services.GetRequiredService<IWinoWindowManager>().CloseAllWindows();
+        Application.Current.Exit();
+    }
+
+    public bool IsNotificationActivation(out AppNotificationActivatedEventArgs args)
+    {
+        var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
+
+        if (activationArgs.Kind == ExtendedActivationKind.AppNotification)
+        {
+            args = ((AppNotificationActivatedEventArgs)activationArgs.Data);
+            return true;
+        }
+
+        args = null!;
+        return false;
+    }
+
+    #region Dependency Injection
+
+
+    private void RegisterUWPServices(IServiceCollection services)
+    {
+        services.AddSingleton<INavigationService, NavigationService>();
+        services.AddSingleton<IMailDialogService, DialogService>();
+        services.AddSingleton<IAiActionOptionsService, AiActionOptionsService>();
+        services.AddSingleton<ReleaseLocalAccountDataCleanupService>();
+        services.AddTransient<IProviderService, ProviderService>();
+        services.AddSingleton<IAuthenticatorConfig, MailAuthenticatorConfiguration>();
+        services.AddSingleton<IAccountCalendarStateService, AccountCalendarStateService>();
+        services.AddSingleton<IDateContextProvider, SystemDateContextProvider>();
+        services.AddSingleton<ICalendarRangeTextFormatter, CalendarRangeTextFormatter>();
+    }
+
+    private void RegisterViewModels(IServiceCollection services)
+    {
+        services.AddSingleton(typeof(MailAppShellViewModel));
+        services.AddSingleton(typeof(CalendarAppShellViewModel));
+        services.AddSingleton(typeof(ContactsShellClient));
+        services.AddSingleton(typeof(SettingsShellClient));
+        services.AddSingleton(typeof(WinoAppShellViewModel));
+        services.AddSingleton<IMailShellClient>(serviceProvider => serviceProvider.GetRequiredService<MailAppShellViewModel>());
+        services.AddSingleton<ICalendarShellClient>(serviceProvider => serviceProvider.GetRequiredService<CalendarAppShellViewModel>());
+        services.AddSingleton<IShellClient>(serviceProvider => serviceProvider.GetRequiredService<MailAppShellViewModel>());
+        services.AddSingleton<IShellClient>(serviceProvider => serviceProvider.GetRequiredService<CalendarAppShellViewModel>());
+        services.AddSingleton<IShellClient>(serviceProvider => serviceProvider.GetRequiredService<ContactsShellClient>());
+        services.AddSingleton<IShellClient>(serviceProvider => serviceProvider.GetRequiredService<SettingsShellClient>());
+
+        services.AddTransient(typeof(MailListPageViewModel));
+        services.AddTransient(typeof(MailRenderingPageViewModel));
+        services.AddTransient(typeof(AccountManagementViewModel));
+        services.AddTransient(typeof(WelcomePageV2ViewModel));
+        services.AddTransient(typeof(ProviderSelectionPageViewModel));
+        services.AddTransient(typeof(AccountSetupProgressPageViewModel));
+        services.AddTransient(typeof(SpecialImapCredentialsPageViewModel));
+        services.AddSingleton(typeof(WelcomeWizardContext));
+
+        services.AddTransient(typeof(ComposePageViewModel));
+        services.AddTransient(typeof(IdlePageViewModel));
+
+        services.AddTransient(typeof(ImapCalDavSettingsPageViewModel));
+        services.AddTransient(typeof(AccountDetailsPageViewModel));
+        services.AddTransient(typeof(SignatureManagementPageViewModel));
+        services.AddTransient(typeof(MessageListPageViewModel));
+        services.AddTransient(typeof(ReadComposePanePageViewModel));
+        services.AddTransient(typeof(MergedAccountDetailsPageViewModel));
+        services.AddTransient(typeof(AppPreferencesPageViewModel));
+        services.AddTransient(typeof(StoragePageViewModel));
+        services.AddTransient(typeof(WinoAccountManagementPageViewModel));
+        services.AddTransient(typeof(AliasManagementPageViewModel));
+        services.AddTransient(typeof(ContactsPageViewModel));
+        services.AddTransient(typeof(SignatureAndEncryptionPageViewModel));
+        services.AddTransient(typeof(EmailTemplatesPageViewModel));
+        services.AddTransient(typeof(CreateEmailTemplatePageViewModel));
+        services.AddSingleton(typeof(CalendarPageViewModel));
+        services.AddTransient(typeof(CalendarRenderingSettingsPageViewModel));
+        services.AddTransient(typeof(CalendarNotificationSettingsPageViewModel));
+        services.AddTransient(typeof(CalendarPreferenceSettingsPageViewModel));
+        services.AddTransient(typeof(CalendarAccountSettingsPageViewModel));
+        services.AddTransient(typeof(EventDetailsPageViewModel));
+        services.AddTransient(typeof(CalendarEventComposePageViewModel));
+    }
+
+    #endregion
+
+    public override IServiceProvider ConfigureServices()
+    {
+        var services = new ServiceCollection();
+
+        services.RegisterCoreServices();
+        services.RegisterSharedServices();
+        services.RegisterCoreUWPServices();
+        services.RegisterCoreViewModels();
+
+        RegisterUWPServices(services);
+        RegisterViewModels(services);
+
+        return services.BuildServiceProvider();
+    }
+
+    private bool IsStartupTaskLaunch() => AppInstance.GetCurrent().GetActivatedEventArgs()?.Kind == ExtendedActivationKind.StartupTask;
+    public bool IsAppRunning() => MainWindow != null;
+
+    protected override async void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+    {
+        base.OnLaunched(args);
+
+        // Always register notification callbacks.
+        TryRegisterAppNotifications();
+
+        await Services.GetRequiredService<ReleaseLocalAccountDataCleanupService>()
+            .RunIfNeededAsync();
+
+        // Initialize required services regardless of launch activation type.
+        // All activation scenarios require these services to be ready.
+        // Note: Theme service is initialized separately after window creation.
+        await InitializeServicesAsync();
+
+        _synchronizationManager = Services.GetRequiredService<ISynchronizationManager>();
+        _preferencesService = Services.GetRequiredService<IPreferencesService>();
+        _accountService = Services.GetRequiredService<IAccountService>();
+
+        EnsureWindowManagerConfigured();
+        EnsureTrayIconCreated();
+
+        var hasAnyAccount = (await _accountService.GetAccountsAsync()).Any();
+        _hasConfiguredAccounts = hasAnyAccount;
+        if (!IsStartupTaskLaunch() && !hasAnyAccount)
+        {
+            CreateWelcomeWindow();
+            await NewThemeService.InitializeAsync();
+            MainWindow?.Activate();
+            LogActivation("Welcome window created and activated.");
+            return;
+        }
+
+        _preferencesService.PreferenceChanged -= PreferencesServiceChanged;
+        _preferencesService.PreferenceChanged += PreferencesServiceChanged;
+
+        RestartAutoSynchronizationLoop();
+
+        // Check if launched from toast notification.
+        if (IsNotificationActivation(out AppNotificationActivatedEventArgs toastArgs))
+        {
+            await HandleToastActivationAsync(toastArgs);
+            return;
+        }
+
+        // Check if launched by startup task.
+        bool isStartupTaskLaunch = IsStartupTaskLaunch();
+
+        if (isStartupTaskLaunch && !hasAnyAccount)
+        {
+            CreateWelcomeWindow();
+        }
+        else
+        {
+            CreateWindow(args);
+        }
+
+        // Initialize theme service after window creation.
+        // Theme service requires the window to exist to properly load and apply themes.
+        await NewThemeService.InitializeAsync();
+
+        if (hasAnyAccount)
+        {
+            // Wino account loading and activation.
+            await LoadInitialWinoAccountAsync();
+            await HandlePostActivationAsync(AppInstance.GetCurrent().GetActivatedEventArgs());
+        }
+
+        LogActivation("Theme service initialized.");
+
+        // If startup task launch, keep window hidden (system tray only).
+        // Otherwise, activate the window normally.
+        if (isStartupTaskLaunch)
+        {
+            LogActivation("Launched by startup task. Window created but hidden (system tray only).");
+        }
+        else
+        {
+            // Normal launch - show and activate the window.
+            // The What's New dialog is shown from MailAppShellViewModel.OnNavigatedTo once XamlRoot is ready.
+            MainWindow?.Activate();
+            LogActivation("Window created and activated.");
+        }
+    }
+
+    private void AppNotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args)
+    {
+        // AppNotification callbacks are not guaranteed to run on the UI thread.
+        // Marshal toast handling to the window dispatcher before touching window APIs.
+        if (MainWindow?.DispatcherQueue?.TryEnqueue(() => _ = HandleToastActivationAsync(args)) == true)
+            return;
+
+        _ = HandleToastActivationAsync(args);
+    }
+
+    private void TryRegisterAppNotifications()
+    {
+        var notificationManager = AppNotificationManager.Default;
+
+        notificationManager.NotificationInvoked -= AppNotificationInvoked;
+        notificationManager.NotificationInvoked += AppNotificationInvoked;
+
+        try
+        {
+            notificationManager.Register();
+        }
+        catch (Exception ex)
+        {
+            LogActivation($"App notification registration failed: {ex.GetType().Name} - {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// Handles toast notification activation scenarios.
+    /// </summary>
+    private async Task HandleToastActivationAsync(AppNotificationActivatedEventArgs toastArgs)
+    {
+        var toastArguments = ToastArguments.Parse(toastArgs.Argument);
+
+        if (toastArguments.TryGetValue(Constants.ToastStoreUpdateActionKey, out string storeUpdateAction) &&
+            storeUpdateAction == Constants.ToastStoreUpdateActionInstall)
+        {
+            await HandleStoreUpdateToastAsync();
+            return;
+        }
+
+        // Check calendar reminder toast activation first.
+        if (toastArguments.TryGetValue(Constants.ToastCalendarActionKey, out string calendarAction) &&
+            toastArguments.TryGetValue(Constants.ToastCalendarItemIdKey, out string calendarItemIdString) &&
+            Guid.TryParse(calendarItemIdString, out Guid calendarItemId))
+        {
+            if (calendarAction == Constants.ToastCalendarNavigateAction)
+            {
+                await HandleCalendarToastNavigationAsync(calendarItemId);
+                return;
+            }
+
+            if (calendarAction == Constants.ToastCalendarSnoozeAction)
+            {
+                await HandleCalendarToastSnoozeAsync(toastArgs, calendarItemId);
+                return;
+            }
+        }
+
+        // Check if this is a navigation toast (user clicked the notification).
+        if (toastArguments.TryGetValue(Constants.ToastActionKey, out MailOperation action) &&
+            Guid.TryParse(toastArguments[Constants.ToastMailUniqueIdKey], out Guid mailItemUniqueId))
+        {
+            if (action == MailOperation.Navigate)
+            {
+                // User clicked notification - create window if needed and navigate.
+                await HandleToastNavigationAsync(mailItemUniqueId);
+            }
+            else
+            {
+                // User clicked action button (Mark as Read, Delete, etc.)
+                // Execute action without window and exit.
+
+                await HandleToastActionAsync(action, mailItemUniqueId);
+            }
+        }
+    }
+
+    private async Task HandleStoreUpdateToastAsync()
+    {
+        if (!IsAppRunning())
+        {
+            await CreateAndActivateWindow(null!);
+        }
+        else
+        {
+            EnsureMainWindowVisibleAndForeground();
+        }
+
+        var storeUpdateService = Services.GetRequiredService<IStoreUpdateService>();
+        await storeUpdateService.StartUpdateAsync();
+    }
+
+    private async Task HandleCalendarToastNavigationAsync(Guid calendarItemId)
+    {
+        var calendarService = Services.GetRequiredService<ICalendarService>();
+        var navigationService = Services.GetRequiredService<INavigationService>();
+
+        var calendarItem = await calendarService.GetCalendarItemAsync(calendarItemId);
+        if (calendarItem == null)
+            return;
+
+        var target = new CalendarItemTarget(calendarItem, CalendarEventTargetType.Single);
+
+        if (!IsAppRunning())
+        {
+            await CreateAndActivateWindow(null!);
+        }
+        else
+        {
+            EnsureMainWindowVisibleAndForeground();
+        }
+
+        navigationService.ChangeApplicationMode(Core.Domain.Enums.WinoApplicationMode.Calendar);
+        navigationService.Navigate(WinoPage.EventDetailsPage, target);
+    }
+
+    private async Task HandleCalendarToastSnoozeAsync(AppNotificationActivatedEventArgs toastArgs, Guid calendarItemId)
+    {
+        if (!TryGetSnoozeDurationMinutes(toastArgs, out var snoozeDurationMinutes))
+            return;
+
+        var calendarService = Services.GetRequiredService<ICalendarService>();
+        var snoozedUntilLocal = DateTime.Now.AddMinutes(snoozeDurationMinutes);
+
+        await calendarService.SnoozeCalendarItemAsync(calendarItemId, snoozedUntilLocal).ConfigureAwait(false);
+    }
+
+    private static bool TryGetSnoozeDurationMinutes(AppNotificationActivatedEventArgs toastArgs, out int snoozeDurationMinutes)
+    {
+        snoozeDurationMinutes = 0;
+
+        if (toastArgs.UserInput == null ||
+            !toastArgs.UserInput.TryGetValue(Constants.ToastCalendarSnoozeDurationInputId, out var selectedValue) ||
+            selectedValue == null)
+        {
+            return false;
+        }
+
+        var selectedText = selectedValue.ToString();
+
+        return int.TryParse(selectedText, out snoozeDurationMinutes) && snoozeDurationMinutes > 0;
+    }
+
+    /// <summary>
+    /// Handles toast notification click for navigation.
+    /// Creates window if not running, sets up navigation parameter.
+    /// </summary>
+    private async Task HandleToastNavigationAsync(Guid mailItemUniqueId)
+    {
+        var mailService = Services.GetRequiredService<IMailService>();
+        var navigationService = Services.GetRequiredService<INavigationService>();
+
+        var account = await mailService.GetMailAccountByUniqueIdAsync(mailItemUniqueId);
+        if (account == null) return;
+
+        var mailItem = await mailService.GetSingleMailItemAsync(mailItemUniqueId);
+        if (mailItem == null) return;
+
+        var message = new AccountMenuItemExtended(mailItem.AssignedFolder.Id, mailItem);
+
+        // Store navigation parameter in LaunchProtocolService so AppShell can pick it up.
+        var launchProtocolService = Services.GetRequiredService<ILaunchProtocolService>();
+        launchProtocolService.LaunchParameter = message;
+
+        // Create window if not already created.
+        if (!IsAppRunning())
+        {
+            // Pass null for args since we're handling toast navigation
+            await CreateAndActivateWindow(null!);
+            navigationService.ChangeApplicationMode(Core.Domain.Enums.WinoApplicationMode.Mail);
+        }
+        else
+        {
+            // App is already running - send message and bring window to front.
+            navigationService.ChangeApplicationMode(Core.Domain.Enums.WinoApplicationMode.Mail);
+            WeakReferenceMessenger.Default.Send(message);
+            EnsureMainWindowVisibleAndForeground();
+        }
+    }
+
+    /// <summary>
+    /// Handles toast action button clicks (Mark as Read, Delete, etc.).
+    /// Executes the action without showing UI and exits the app.
+    /// </summary>
+    private async Task HandleToastActionAsync(MailOperation action, Guid mailItemUniqueId)
+    {
+        LogActivation($"Handling toast action: {action} for mail {mailItemUniqueId}");
+
+        var mailService = Services.GetRequiredService<IMailService>();
+        var mailItem = await mailService.GetSingleMailItemAsync(mailItemUniqueId);
+
+        if (mailItem == null)
+        {
+            LogActivation("Mail item not found. Exiting.");
+            ExitApplication();
+            return;
+        }
+
+        var package = new MailOperationPreperationRequest(action, mailItem);
+
+        // Check if app is already running (has a window).
+        if (IsAppRunning())
+        {
+            // App is running - use the simple delegator pattern.
+            // The synchronization will happen in the background.
+            LogActivation("App is running. Queueing request via delegator.");
+
+            var delegator = Services.GetRequiredService<IWinoRequestDelegator>();
+            await delegator.ExecuteAsync(package);
+
+            // Don't exit - app continues running.
+            LogActivation($"Toast action {action} queued successfully.");
+        }
+        else
+        {
+            // App is not running - we need to wait for sync before exiting.
+            LogActivation("App is not running. Executing synchronization and waiting for completion.");
+
+            if (_synchronizationManager == null)
+            {
+                LogActivation("Synchronization manager is not initialized. Exiting.");
+                ExitApplication();
+                return;
+            }
+
+            var processor = Services.GetRequiredService<IWinoRequestProcessor>();
+            var notificationBuilder = Services.GetRequiredService<INotificationBuilder>();
+
+            // Prepare the requests for the action.
+            var requests = await processor.PrepareRequestsAsync(package);
+
+            if (requests != null && requests.Any())
+            {
+                // Group requests by account ID (usually just one account).
+                var accountIds = requests.GroupBy(a => a.Item.AssignedAccount.Id);
+
+                foreach (var accountGroup in accountIds)
+                {
+                    var accountId = accountGroup.Key;
+
+                    // Queue all requests for this account.
+                    foreach (var request in accountGroup)
+                    {
+                        await _synchronizationManager.QueueRequestAsync(request, accountId, triggerSynchronization: false);
+                    }
+
+                    // Create synchronization options to execute the queued requests.
+                    var syncOptions = new MailSynchronizationOptions()
+                    {
+                        AccountId = accountId,
+                        Type = MailSynchronizationType.ExecuteRequests
+                    };
+
+                    LogActivation($"Executing synchronization for account {accountId}...");
+
+                    // Wait for synchronization to complete before exiting.
+                    var syncResult = await _synchronizationManager.SynchronizeMailAsync(syncOptions);
+
+                    LogActivation($"Toast action {action} completed. Sync result: {syncResult.CompletedState}");
+                }
+
+                await notificationBuilder.UpdateTaskbarIconBadgeAsync();
+            }
+
+            LogActivation("Toast action handling complete. Exiting app.");
+
+            // Exit the app after synchronization is complete.
+            ExitApplication();
+        }
+    }
+
+    /// <summary>
+    /// Creates the main window and activates it.
+    /// </summary>
+    private async Task CreateAndActivateWindow(Microsoft.UI.Xaml.LaunchActivatedEventArgs? args)
+    {
+        CreateWindow(args);
+
+        // Initialize theme service after window is created.
+        await NewThemeService.InitializeAsync();
+
+        if (MainWindow != null)
+            Services.GetRequiredService<IWinoWindowManager>().ActivateWindow(MainWindow);
+
+        LogActivation("Window created and activated.");
+    }
+
+    public Task OpenManageAccountsFromWelcomeAsync()
+    {
+        Services.GetRequiredService<INavigationService>()
+            .Navigate(WinoPage.SettingsPage, WinoPage.ManageAccountsPage, NavigationReferenceFrame.ShellFrame, NavigationTransitionType.DrillIn);
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Creates the main window without activating it.
+    /// Used for both normal launch and startup task launch (tray only).
+    /// </summary>
+    private void CreateWindow(Microsoft.UI.Xaml.LaunchActivatedEventArgs? args,
+                              string? forcedLaunchArguments = null,
+                              ShellModeActivationContext? activationContextOverride = null)
+    {
+        LogActivation("Creating main window.");
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.CreateWindow(WinoWindowKind.Shell, () => new ShellWindow());
+        InitializeNavigationDispatcher();
+
+        if (MainWindow is not IWinoShellWindow shellWindow)
+            throw new ArgumentException("MainWindow must implement IWinoShellWindow");
+
+        windowManager.SetPrimaryNavigationFrame(WinoWindowKind.Shell, shellWindow.GetMainFrame());
+
+        var navigationService = Services.GetRequiredService<INavigationService>();
+        var defaultMode = _preferencesService?.DefaultApplicationMode ?? WinoApplicationMode.Mail;
+        var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
+
+        if (activationContextOverride != null)
+        {
+            var targetMode = !string.IsNullOrWhiteSpace(forcedLaunchArguments)
+                ? AppModeActivationResolver.Resolve(forcedLaunchArguments, null, null, defaultMode)
+                : TryResolveActivationMode(activationArgs, defaultMode, out var resolvedActivationMode)
+                    ? resolvedActivationMode
+                    : AppModeActivationResolver.Resolve(args?.Arguments, GetCurrentLaunchTileId(), Environment.CommandLine, defaultMode);
+
+            navigationService.ChangeApplicationMode(targetMode, activationContextOverride);
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(forcedLaunchArguments))
+        {
+            shellWindow.HandleAppActivation(forcedLaunchArguments);
+            return;
+        }
+
+        if (activationArgs.Kind == ExtendedActivationKind.Launch &&
+            activationArgs.Data is ILaunchActivatedEventArgs launchArgs)
+        {
+            var launchArguments = launchArgs.Arguments;
+
+            if (Program.TryConsumeCurrentProcessAlternateModeOverride())
+            {
+                launchArguments = AppendLaunchArgument(launchArguments, ToggleDefaultModeLaunchArgument);
+            }
+
+            shellWindow.HandleAppActivation(launchArguments, launchArgs.TileId, Environment.CommandLine);
+            return;
+        }
+
+        if (TryResolveActivationMode(activationArgs, defaultMode, out var activationMode))
+        {
+            shellWindow.HandleAppActivation(GetModeLaunchArgument(activationMode));
+            return;
+        }
+
+        shellWindow.HandleAppActivation(args?.Arguments, GetCurrentLaunchTileId(), Environment.CommandLine);
+    }
+
+    private void CreateWelcomeWindow()
+    {
+        LogActivation("Creating welcome window.");
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        MainWindow = windowManager.CreateWindow(WinoWindowKind.Welcome, () => new WelcomeWindow());
+        if (MainWindow is WelcomeWindow welcomeWindow)
+        {
+            var rootFrame = welcomeWindow.GetRootFrame();
+            windowManager.SetPrimaryNavigationFrame(WinoWindowKind.Welcome, rootFrame);
+
+            if (rootFrame.Content is WelcomeHostPage welcomeHostPage)
+            {
+                welcomeHostPage.ResetWizard();
+            }
+            else
+            {
+                rootFrame.BackStack.Clear();
+                rootFrame.ForwardStack.Clear();
+                rootFrame.Navigate(typeof(WelcomeHostPage), null, new SuppressNavigationTransitionInfo());
+            }
+        }
+
+        InitializeNavigationDispatcher();
+    }
+
+    private void InitializeNavigationDispatcher()
+    {
+        if (MainWindow == null)
+            return;
+
+        if (Services.GetService<IDispatcher>() is WinUIDispatcher dispatcher)
+        {
+            dispatcher.Initialize(MainWindow.DispatcherQueue);
+        }
+    }
+
+    private void EnsureMainWindowVisibleAndForeground()
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        var currentWindow = windowManager.ActiveWindow
+                            ?? windowManager.GetWindow(WinoWindowKind.Shell)
+                            ?? windowManager.GetWindow(WinoWindowKind.Welcome)
+                            ?? MainWindow;
+
+        if (currentWindow == null)
+            return;
+
+        MainWindow = currentWindow;
+        windowManager.ActivateWindow(currentWindow);
+    }
+
+    private void RegisterRecipients()
+    {
+        WeakReferenceMessenger.Default.Register<NewMailSynchronizationRequested>(this);
+        WeakReferenceMessenger.Default.Register<NewCalendarSynchronizationRequested>(this);
+        WeakReferenceMessenger.Default.Register<AccountCreatedMessage>(this);
+        WeakReferenceMessenger.Default.Register<AccountRemovedMessage>(this);
+        WeakReferenceMessenger.Default.Register<GetStartedFromWelcomeRequested>(this);
+        WeakReferenceMessenger.Default.Register<WelcomeImportCompletedMessage>(this);
+    }
+
+    public async void Receive(NewMailSynchronizationRequested message)
+    {
+        if (_synchronizationManager == null) return;
+
+        MailSynchronizationResult syncResult;
+
+        try
+        {
+            syncResult = await _synchronizationManager.SynchronizeMailAsync(message.Options);
+        }
+        catch (Exception ex)
+        {
+            // Defensive fallback to guarantee completion message emission.
+            syncResult = MailSynchronizationResult.Failed(ex);
+        }
+
+        WeakReferenceMessenger.Default.Send(new AccountSynchronizationCompleted(
+            message.Options.AccountId,
+            syncResult.CompletedState,
+            message.Options.GroupedSynchronizationTrackingId));
+
+        if (syncResult.CompletedState is SynchronizationCompletedState.Success or SynchronizationCompletedState.PartiallyCompleted)
+        {
+            await ClearInvalidCredentialAttentionIfNeededAsync(message.Options.AccountId).ConfigureAwait(false);
+        }
+
+        if (syncResult.CompletedState == SynchronizationCompletedState.Failed ||
+            syncResult.CompletedState == SynchronizationCompletedState.PartiallyCompleted)
+        {
+            var dialogService = Services.GetRequiredService<IMailDialogService>();
+            var errorMessage = GetSynchronizationFailureMessage(message.Options.Type, syncResult.Exception?.Message);
+            var severity = syncResult.CompletedState == SynchronizationCompletedState.PartiallyCompleted
+                ? InfoBarMessageType.Warning
+                : InfoBarMessageType.Error;
+
+            dialogService.InfoBarMessage(Translator.Info_SyncFailedTitle, errorMessage, severity);
+        }
+    }
+
+    public async void Receive(NewCalendarSynchronizationRequested message)
+    {
+        if (_synchronizationManager == null) return;
+
+        var calendarSyncResult = await _synchronizationManager.SynchronizeCalendarAsync(message.Options);
+
+        if (calendarSyncResult.CompletedState == SynchronizationCompletedState.Failed)
+        {
+            var dialogService = Services.GetRequiredService<IMailDialogService>();
+            dialogService.InfoBarMessage(
+                Translator.Info_SyncFailedTitle,
+                message.Options.Type switch
+                {
+                    CalendarSynchronizationType.CalendarMetadata => Translator.Exception_FailedToSynchronizeCalendarMetadata,
+                    CalendarSynchronizationType.Strict => Translator.Exception_FailedToSynchronizeCalendarData,
+                    _ => Translator.Exception_FailedToSynchronizeCalendarEvents
+                },
+                InfoBarMessageType.Error);
+        }
+    }
+
+    public void Receive(AccountCreatedMessage message)
+    {
+        _hasConfiguredAccounts = true;
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+
+        // Only transition when the account was created from the WelcomeWindow.
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            // Create and activate ShellWindow — ActiveWindowChanged fires and rebinds the dispatcher.
+            CreateWindow(null, GetModeLaunchArgument(WinoApplicationMode.Mail));
+            CloseWelcomeWindowIfPresent();
+            if (MainWindow != null)
+                await ActivateWindowAsync(MainWindow);
+
+            if (message.Account.IsCalendarAccessGranted)
+            {
+                WeakReferenceMessenger.Default.Send(new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions
+                {
+                    AccountId = message.Account.Id,
+                    Type = CalendarSynchronizationType.CalendarEvents
+                }));
+            }
+
+            RestartAutoSynchronizationLoop();
+        });
+    }
+
+    public void Receive(WelcomeImportCompletedMessage message)
+    {
+        _hasConfiguredAccounts = message.ImportedMailboxCount > 0;
+
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            if (_preferencesService != null)
+            {
+                _preferencesService.PreferenceChanged -= PreferencesServiceChanged;
+                _preferencesService.PreferenceChanged += PreferencesServiceChanged;
+            }
+
+            CreateWindow(
+                null,
+                GetModeLaunchArgument(WinoApplicationMode.Mail),
+                new ShellModeActivationContext
+                {
+                    SuppressStartupFlows = true
+                });
+
+            await LoadInitialWinoAccountAsync();
+            CloseWelcomeWindowIfPresent();
+
+            if (MainWindow != null)
+            {
+                await ActivateWindowAsync(MainWindow);
+            }
+
+            RestartAutoSynchronizationLoop();
+
+            Services.GetRequiredService<IMailDialogService>().InfoBarMessage(
+                Translator.GeneralTitle_Info,
+                Translator.WinoAccount_Management_ImportReloginReminder,
+                InfoBarMessageType.Information);
+        });
+    }
+
+    public void Receive(AccountRemovedMessage message)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+
+        // Only handle when ShellWindow is active (not during wizard rollback)
+        if (windowManager.GetWindow(WinoWindowKind.Shell) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            var accounts = await _accountService!.GetAccountsAsync();
+            _hasConfiguredAccounts = accounts.Any();
+            if (_hasConfiguredAccounts) return;
+
+            // All accounts removed — go back to welcome wizard from step 1
+            Services.GetRequiredService<WelcomeWizardContext>().Reset();
+            StopAutoSynchronizationLoop();
+            CloseShellWindowIfPresent();
+            CreateWelcomeWindow();
+            if (MainWindow != null)
+                await ActivateWindowAsync(MainWindow);
+        });
+    }
+
+    public void Receive(GetStartedFromWelcomeRequested message)
+    {
+        var windowManager = Services.GetRequiredService<IWinoWindowManager>();
+
+        if (windowManager.GetWindow(WinoWindowKind.Welcome) == null)
+            return;
+
+        MainWindow?.DispatcherQueue?.TryEnqueue(async () =>
+        {
+            CreateWindow(null);
+            windowManager.HideWindow(WinoWindowKind.Welcome);
+            await NewThemeService.ApplyThemeToActiveWindowAsync();
+            MainWindow?.Activate();
+        });
+    }
+
+    private static string GetSynchronizationFailureMessage(MailSynchronizationType synchronizationType, string? exceptionMessage)
+    {
+        if (!string.IsNullOrWhiteSpace(exceptionMessage))
+        {
+            return exceptionMessage;
+        }
+
+        return synchronizationType switch
+        {
+            MailSynchronizationType.Alias => Translator.Exception_FailedToSynchronizeAliases,
+            MailSynchronizationType.UpdateProfile => Translator.Exception_FailedToSynchronizeProfileInformation,
+            _ => Translator.Exception_FailedToSynchronizeFolders
+        };
+    }
+
+    private void PreferencesServiceChanged(object? sender, string propertyName)
+    {
+        if (propertyName != nameof(IPreferencesService.EmailSyncIntervalMinutes))
+            return;
+
+        RestartAutoSynchronizationLoop();
+    }
+
+    private void RestartAutoSynchronizationLoop()
+    {
+        if (_preferencesService == null)
+            return;
+
+        StopAutoSynchronizationLoop();
+
+        int intervalMinutes = Math.Max(1, _preferencesService.EmailSyncIntervalMinutes);
+        _autoSynchronizationLoopCts = new CancellationTokenSource();
+
+        _ = RunAutoSynchronizationLoopAsync(TimeSpan.FromMinutes(intervalMinutes), _autoSynchronizationLoopCts.Token);
+        LogActivation($"Automatic sync loop started. Interval: {intervalMinutes} minute(s).");
+    }
+
+    private void StopAutoSynchronizationLoop()
+    {
+        if (_autoSynchronizationLoopCts == null)
+            return;
+
+        _autoSynchronizationLoopCts.Cancel();
+        _autoSynchronizationLoopCts.Dispose();
+        _autoSynchronizationLoopCts = null;
+    }
+
+    private async Task LoadInitialWinoAccountAsync()
+    {
+        var winoAccountProfileService = Services.GetRequiredService<IWinoAccountProfileService>();
+        var winoAccount = await winoAccountProfileService.GetActiveAccountAsync().ConfigureAwait(false);
+
+        if (winoAccount != null)
+        {
+            WeakReferenceMessenger.Default.Send(new WinoAccountProfileUpdatedMessage(winoAccount));
+        }
+    }
+
+    private async Task RunAutoSynchronizationLoopAsync(TimeSpan interval, CancellationToken cancellationToken)
+    {
+        try
+        {
+            await ExecuteAutoSynchronizationAsync(cancellationToken).ConfigureAwait(false);
+
+            using var timer = new PeriodicTimer(interval);
+
+            while (await timer.WaitForNextTickAsync(cancellationToken).ConfigureAwait(false))
+            {
+                await ExecuteAutoSynchronizationAsync(cancellationToken).ConfigureAwait(false);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            // no-op
+        }
+        catch (Exception ex)
+        {
+            LogActivation($"Automatic sync loop failed: {ex.Message}");
+        }
+    }
+
+    private async Task ExecuteAutoSynchronizationAsync(CancellationToken cancellationToken)
+    {
+        if (_synchronizationManager == null || _accountService == null)
+            return;
+
+        bool lockTaken = false;
+
+        try
+        {
+            lockTaken = await _autoSynchronizationSemaphore.WaitAsync(0, cancellationToken).ConfigureAwait(false);
+            if (!lockTaken)
+                return;
+
+            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+            var currentAccountIds = accounts.Select(a => a.Id).ToHashSet();
+            foreach (var staleAccountId in _inboxSyncCounters.Keys.Where(a => !currentAccountIds.Contains(a)).ToList())
+            {
+                _inboxSyncCounters.TryRemove(staleAccountId, out _);
+            }
+
+            var synchronizationTasks = accounts
+                .Select(account => ExecuteAutoSynchronizationForAccountAsync(account, cancellationToken))
+                .ToList();
+
+            await Task.WhenAll(synchronizationTasks).ConfigureAwait(false);
+        }
+        finally
+        {
+            if (lockTaken)
+            {
+                _autoSynchronizationSemaphore.Release();
+            }
+        }
+    }
+
+    private async Task ExecuteAutoSynchronizationForAccountAsync(Wino.Core.Domain.Entities.Shared.MailAccount account, CancellationToken cancellationToken)
+    {
+        if (_synchronizationManager == null)
+            return;
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (_synchronizationManager.IsAccountSynchronizing(account.Id))
+            return;
+
+        var inboxSyncOptions = new MailSynchronizationOptions
+        {
+            AccountId = account.Id,
+            Type = MailSynchronizationType.InboxOnly
+        };
+
+        var inboxSyncResult = await _synchronizationManager.SynchronizeMailAsync(inboxSyncOptions, cancellationToken).ConfigureAwait(false);
+
+        if (inboxSyncResult.CompletedState is SynchronizationCompletedState.Success or SynchronizationCompletedState.PartiallyCompleted)
+        {
+            await ClearInvalidCredentialAttentionIfNeededAsync(account.Id).ConfigureAwait(false);
+
+            var inboxSyncCount = _inboxSyncCounters.AddOrUpdate(account.Id, 1, (_, currentCount) => currentCount + 1);
+
+            if (inboxSyncCount >= InboxSyncsPerFullSync)
+            {
+                var fullSyncOptions = new MailSynchronizationOptions
+                {
+                    AccountId = account.Id,
+                    Type = MailSynchronizationType.FullFolders
+                };
+
+                await _synchronizationManager.SynchronizeMailAsync(fullSyncOptions, cancellationToken).ConfigureAwait(false);
+                _inboxSyncCounters[account.Id] = 0;
+            }
+        }
+
+        if (!account.IsCalendarAccessGranted)
+            return;
+
+        var calendarOptions = new CalendarSynchronizationOptions
+        {
+            AccountId = account.Id,
+            Type = CalendarSynchronizationType.CalendarMetadata
+        };
+
+        await _synchronizationManager.SynchronizeCalendarAsync(calendarOptions, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task ClearInvalidCredentialAttentionIfNeededAsync(Guid accountId)
+    {
+        if (_accountService == null)
+            return;
+
+        var account = await _accountService.GetAccountAsync(accountId).ConfigureAwait(false);
+
+        if (account?.AttentionReason != AccountAttentionReason.InvalidCredentials)
+            return;
+
+        await _accountService.ClearAccountAttentionAsync(accountId).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Handles activation redirected from another instance (single-instancing).
+    /// This is called when a second instance tries to launch and redirects to this existing instance.
+    /// </summary>
+    public void HandleRedirectedActivation(AppActivationArguments args)
+    {
+        // Dispatch to UI thread since this is called from Program.OnActivated
+        MainWindow?.DispatcherQueue.TryEnqueue(async () =>
+        {
+            // Handle different activation kinds
+            if (args.Kind == ExtendedActivationKind.AppNotification)
+            {
+                // Handle toast notification activation
+                var toastArgs = (AppNotificationActivatedEventArgs)args.Data;
+                _ = HandleToastActivationAsync(toastArgs);
+            }
+            else
+            {
+                if (MainWindow is IWinoShellWindow shellWindow)
+                {
+                    if (args.Kind == ExtendedActivationKind.Launch &&
+                        args.Data is ILaunchActivatedEventArgs launchArgs)
+                    {
+                        var launchArguments = launchArgs.Arguments;
+
+                        if (Program.TryConsumeRedirectedAlternateModeOverride())
+                        {
+                            launchArguments = AppendLaunchArgument(launchArguments, ToggleDefaultModeLaunchArgument);
+                        }
+
+                        shellWindow.HandleAppActivation(launchArguments, launchArgs.TileId);
+                    }
+                    else if (TryResolveActivationMode(args, _preferencesService?.DefaultApplicationMode ?? WinoApplicationMode.Mail, out var redirectedMode))
+                    {
+                        shellWindow.HandleAppActivation(GetModeLaunchArgument(redirectedMode));
+                    }
+                }
+
+                await HandlePostActivationAsync(args);
+
+                // Bring the existing window to front after handling redirected activation.
+                MainWindow?.BringToFront();
+                MainWindow?.Activate();
+            }
+        });
+    }
+
+    private static string GetModeLaunchArgument(WinoApplicationMode mode)
+        => mode switch
+        {
+            WinoApplicationMode.Calendar => "--mode=calendar",
+            WinoApplicationMode.Contacts => "--mode=contacts",
+            WinoApplicationMode.Settings => "--mode=settings",
+            _ => "--mode=mail"
+        };
+
+    private static string AppendLaunchArgument(string? launchArguments, string launchArgument)
+    {
+        return string.IsNullOrWhiteSpace(launchArguments)
+            ? launchArgument
+            : $"{launchArguments} {launchArgument}";
+    }
+
+    private static bool TryResolveActivationMode(AppActivationArguments activationArgs, WinoApplicationMode defaultMode, out WinoApplicationMode mode)
+    {
+        mode = defaultMode;
+
+        if (activationArgs.Kind == ExtendedActivationKind.Protocol &&
+            activationArgs.Data is IProtocolActivatedEventArgs protocolArgs)
+        {
+            var scheme = protocolArgs.Uri?.Scheme;
+
+            if (string.Equals(scheme, "webcal", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(scheme, "webcals", StringComparison.OrdinalIgnoreCase))
+            {
+                mode = WinoApplicationMode.Calendar;
+                return true;
+            }
+
+            if (string.Equals(scheme, "mailto", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(scheme, "google.pw.oauth2", StringComparison.OrdinalIgnoreCase))
+            {
+                mode = WinoApplicationMode.Mail;
+                return true;
+            }
+
+            if (string.Equals(scheme, WinoProtocolScheme, StringComparison.OrdinalIgnoreCase) &&
+                string.Equals(protocolArgs.Uri?.Host, BillingProtocolHost, StringComparison.OrdinalIgnoreCase))
+            {
+                mode = WinoApplicationMode.Settings;
+                return true;
+            }
+        }
+
+        if (activationArgs.Kind == ExtendedActivationKind.File &&
+            activationArgs.Data is IFileActivatedEventArgs fileArgs)
+        {
+            var fileItem = fileArgs.Files?.FirstOrDefault();
+            var extension = Path.GetExtension(fileItem?.Name ?? string.Empty);
+
+            if (string.Equals(extension, ".ics", StringComparison.OrdinalIgnoreCase))
+            {
+                mode = WinoApplicationMode.Calendar;
+                return true;
+            }
+
+            if (string.Equals(extension, ".eml", StringComparison.OrdinalIgnoreCase))
+            {
+                mode = WinoApplicationMode.Mail;
+                return true;
+            }
+        }
+
+        if (activationArgs.Kind == ExtendedActivationKind.Launch &&
+            activationArgs.Data is ILaunchActivatedEventArgs launchArgs)
+        {
+            mode = AppModeActivationResolver.Resolve(launchArgs.Arguments, launchArgs.TileId, null, defaultMode);
+            return true;
+        }
+
+        return false;
+    }
+
+    private static string? GetCurrentLaunchTileId()
+    {
+        var activationArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
+
+        if (activationArgs.Kind == ExtendedActivationKind.Launch &&
+            activationArgs.Data is ILaunchActivatedEventArgs launchArgs)
+        {
+            return launchArgs.TileId;
+        }
+
+        return null;
+    }
+
+    private async Task HandlePostActivationAsync(AppActivationArguments activationArgs)
+    {
+        if (await TryHandleBillingProtocolActivationAsync(activationArgs).ConfigureAwait(false))
+        {
+            return;
+        }
+    }
+
+    private async Task<bool> TryHandleBillingProtocolActivationAsync(AppActivationArguments activationArgs)
+    {
+        if (!TryGetBillingCallbackUri(activationArgs, out var callbackUri))
+        {
+            return false;
+        }
+
+        Services.GetRequiredService<INavigationService>().Navigate(
+            WinoPage.SettingsPage,
+            WinoPage.WinoAccountManagementPage,
+            NavigationReferenceFrame.ShellFrame,
+            NavigationTransitionType.None);
+
+        var winoAccountProfileService = Services.GetRequiredService<IWinoAccountProfileService>();
+        await winoAccountProfileService.ProcessBillingCallbackAsync(callbackUri).ConfigureAwait(false);
+        return true;
+    }
+
+    private static bool TryGetBillingCallbackUri(AppActivationArguments activationArgs, out Uri callbackUri)
+    {
+        callbackUri = null!;
+
+        if (activationArgs.Kind != ExtendedActivationKind.Protocol ||
+            activationArgs.Data is not IProtocolActivatedEventArgs protocolArgs ||
+            protocolArgs.Uri == null)
+        {
+            return false;
+        }
+
+        var uri = protocolArgs.Uri;
+        if (!string.Equals(uri.Scheme, WinoProtocolScheme, StringComparison.OrdinalIgnoreCase) ||
+            !string.Equals(uri.Host, BillingProtocolHost, StringComparison.OrdinalIgnoreCase) ||
+            !string.Equals(uri.AbsolutePath, BillingSuccessPath, StringComparison.OrdinalIgnoreCase))
+        {
+            return false;
+        }
+
+        callbackUri = uri;
+        return true;
+    }
+}
+
+
diff --git a/Wino.Core.UWP/AppThemes/Acrylic.xaml b/Wino.Mail.WinUI/AppThemes/Acrylic.xaml
similarity index 65%
rename from Wino.Core.UWP/AppThemes/Acrylic.xaml
rename to Wino.Mail.WinUI/AppThemes/Acrylic.xaml
index fb84bf43..0d26ea38 100644
--- a/Wino.Core.UWP/AppThemes/Acrylic.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Acrylic.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Microsoft.UI.Xaml.Media"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Acrylic</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
 
@@ -14,10 +13,12 @@
         <ResourceDictionary x:Name="Light">
             <!--  Reading Page Date/Name Group Header Background  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#B2FCFCFC</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#D9ECEFF1</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
 
             <local:AcrylicBrush
                 x:Key="WinoApplicationBackgroundColor"
-                BackgroundSource="HostBackdrop"
                 FallbackColor="#F9F9F9"
                 TintColor="#FCFCFC"
                 TintOpacity="0.75" />
@@ -25,10 +26,12 @@
 
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#2C2C2C</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#662C2C2C</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#992C2C2C</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
 
             <local:AcrylicBrush
                 x:Key="WinoApplicationBackgroundColor"
-                BackgroundSource="HostBackdrop"
                 FallbackColor="#2C2C2C"
                 TintColor="#2C2C2C"
                 TintOpacity="0.30" />
diff --git a/Wino.Core.UWP/AppThemes/Clouds.xaml b/Wino.Mail.WinUI/AppThemes/Clouds.xaml
similarity index 56%
rename from Wino.Core.UWP/AppThemes/Clouds.xaml
rename to Wino.Mail.WinUI/AppThemes/Clouds.xaml
index ca234cc1..7bd2507f 100644
--- a/Wino.Core.UWP/AppThemes/Clouds.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Clouds.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Clouds</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Clouds.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Clouds.jpg</x:String>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -13,11 +12,17 @@
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Name="Light">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b2dffc</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#33B2DFFC</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#66B2DFFC</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
 
             <SolidColorBrush x:Key="CalendarSeperatorBrush">#222f3e</SolidColorBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b2dffc</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#33B2DFFC</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#66B2DFFC</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
 
             <SolidColorBrush x:Key="CalendarSeperatorBrush">#222f3e</SolidColorBrush>
         </ResourceDictionary>
diff --git a/Wino.Core.UWP/AppThemes/Custom.xaml b/Wino.Mail.WinUI/AppThemes/Custom.xaml
similarity index 75%
rename from Wino.Core.UWP/AppThemes/Custom.xaml
rename to Wino.Mail.WinUI/AppThemes/Custom.xaml
index 71bbf1a3..fc56711b 100644
--- a/Wino.Core.UWP/AppThemes/Custom.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Custom.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Custom</x:String>
     <x:String x:Key="ThemeBackgroundImage">ms-appdata:///local/CustomWallpaper.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
 
     <ImageBrush
         x:Key="WinoApplicationBackgroundColor"
@@ -23,6 +22,9 @@
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush>
 
             <Color x:Key="MainCustomThemeColor">#D9FFFFFF</Color>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush" Color="{StaticResource MainCustomThemeColor}" Opacity="0.55" />
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush" Color="{StaticResource MainCustomThemeColor}" Opacity="0.85" />
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
 
             <SolidColorBrush x:Key="AppBarBackgroundColor" Color="{StaticResource MainCustomThemeColor}" />
             <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
@@ -34,6 +36,9 @@
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#1f1f1f</SolidColorBrush>
 
             <Color x:Key="MainCustomThemeColor">#E61F1F1F</Color>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush" Color="{StaticResource MainCustomThemeColor}" Opacity="0.55" />
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush" Color="{StaticResource MainCustomThemeColor}" Opacity="0.85" />
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
 
             <!--  Reading Pane Background  -->
             <SolidColorBrush x:Key="ReadingPaneBackgroundColorBrush" Color="{StaticResource MainCustomThemeColor}" />
diff --git a/Wino.Core.UWP/AppThemes/Mica.xaml b/Wino.Mail.WinUI/AppThemes/Default.xaml
similarity index 54%
rename from Wino.Core.UWP/AppThemes/Mica.xaml
rename to Wino.Mail.WinUI/AppThemes/Default.xaml
index 302451b4..0a1c448e 100644
--- a/Wino.Core.UWP/AppThemes/Mica.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Default.xaml
@@ -1,10 +1,9 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
-    <x:String x:Key="ThemeName">Mica</x:String>
-    <x:Boolean x:Key="UseMica">True</x:Boolean>
+    <x:String x:Key="ThemeName">Default</x:String>
 
     <SolidColorBrush x:Key="WinoApplicationBackgroundColor">Transparent</SolidColorBrush>
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -14,9 +13,15 @@
         <ResourceDictionary x:Name="Light">
             <!--  Reading Page Date/Name Group Header Background  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#ecf0f1</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#F7F9FA</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#DFE4EA</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#1f1f1f</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#1F1F1F</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#262626</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/AppThemes/Forest.xaml b/Wino.Mail.WinUI/AppThemes/Forest.xaml
similarity index 52%
rename from Wino.Core.UWP/AppThemes/Forest.xaml
rename to Wino.Mail.WinUI/AppThemes/Forest.xaml
index 63ab19a1..83288e03 100644
--- a/Wino.Core.UWP/AppThemes/Forest.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Forest.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Forest</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Forest.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Forest.jpg</x:String>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -13,9 +12,15 @@
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Name="Light">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#A800D608</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#2200D608</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#4D00D608</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#59001C01</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#22001C01</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#59001C01</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/AppThemes/Garden.xaml b/Wino.Mail.WinUI/AppThemes/Garden.xaml
similarity index 55%
rename from Wino.Core.UWP/AppThemes/Garden.xaml
rename to Wino.Mail.WinUI/AppThemes/Garden.xaml
index cf238b79..85b3adbe 100644
--- a/Wino.Core.UWP/AppThemes/Garden.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Garden.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Garden</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Garden.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Garden.jpg</x:String>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -13,12 +12,18 @@
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Name="Light">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#dcfad8</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#26DCFAD8</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#59DCFAD8</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
             <SolidColorBrush x:Key="CalendarSeperatorBrush">#576574</SolidColorBrush>
         </ResourceDictionary>
 
         <!--  N/A. Light theme only.  -->
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#dcfad8</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#26576574</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#59576574</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/AppThemes/Nighty.xaml b/Wino.Mail.WinUI/AppThemes/Nighty.xaml
similarity index 53%
rename from Wino.Core.UWP/AppThemes/Nighty.xaml
rename to Wino.Mail.WinUI/AppThemes/Nighty.xaml
index 51de8e5f..5bfcfaa3 100644
--- a/Wino.Core.UWP/AppThemes/Nighty.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Nighty.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Nighty</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Nighty.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Nighty.jpg</x:String>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -14,10 +13,16 @@
         <ResourceDictionary x:Name="Light">
             <!--  Brushes  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#fdcb6e</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#33FDCB6E</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#66FDCB6E</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <!--  Brushes  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#5413191F</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#2213191F</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#5413191F</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/AppThemes/Snowflake.xaml b/Wino.Mail.WinUI/AppThemes/Snowflake.xaml
similarity index 53%
rename from Wino.Core.UWP/AppThemes/Snowflake.xaml
rename to Wino.Mail.WinUI/AppThemes/Snowflake.xaml
index 3358e139..b768b91e 100644
--- a/Wino.Core.UWP/AppThemes/Snowflake.xaml
+++ b/Wino.Mail.WinUI/AppThemes/Snowflake.xaml
@@ -1,11 +1,10 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="using:Windows.UI.Xaml">
+    xmlns:xaml="using:Microsoft.UI.Xaml">
 
     <x:String x:Key="ThemeName">Snowflake</x:String>
-    <x:String x:Key="ThemeBackgroundImage">ms-appx:///Wino.Core.UWP/BackgroundImages/Snowflake.jpg</x:String>
-    <x:Boolean x:Key="UseMica">False</x:Boolean>
+    <x:String x:Key="ThemeBackgroundImage">ms-appx:///BackgroundImages/Snowflake.jpg</x:String>
 
     <ImageBrush x:Key="WinoApplicationBackgroundColor" ImageSource="{StaticResource ThemeBackgroundImage}" />
     <SolidColorBrush x:Key="AppBarBackgroundColor">Transparent</SolidColorBrush>
@@ -14,10 +13,16 @@
         <ResourceDictionary x:Name="Light">
             <!--  Brushes  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b0c6dd</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#33B0C6DD</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#66B0C6DD</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#4D0078D4</SolidColorBrush>
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <!--  Brushes  -->
             <SolidColorBrush x:Key="MailListHeaderBackgroundColor">#b0c6dd</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarDefaultHourBackgroundBrush">#33B0C6DD</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarWorkHourBackgroundBrush">#66B0C6DD</SolidColorBrush>
+            <SolidColorBrush x:Key="CalendarSelectedHourBackgroundBrush">#66399BFF</SolidColorBrush>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-100.png
new file mode 100644
index 00000000..30488703
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-125.png
new file mode 100644
index 00000000..78a99689
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-150.png
new file mode 100644
index 00000000..7f923b86
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-200.png
new file mode 100644
index 00000000..8532ea41
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-400.png
new file mode 100644
index 00000000..7c65c063
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/LargeTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-100.png
new file mode 100644
index 00000000..7a1eaedb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-125.png
new file mode 100644
index 00000000..40b3ab4c
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-150.png
new file mode 100644
index 00000000..cc7da075
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-200.png
new file mode 100644
index 00000000..26b910f6
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-400.png
new file mode 100644
index 00000000..cfaabcdb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SmallTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-100.png
new file mode 100644
index 00000000..169b6db6
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-125.png
new file mode 100644
index 00000000..437d10eb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-150.png
new file mode 100644
index 00000000..0bafaa6d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-200.png
new file mode 100644
index 00000000..4313f73e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-400.png
new file mode 100644
index 00000000..7a224a2b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/SplashScreen.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..9f36f4eb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..65c3d34d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..8105f621
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..5a18cde3
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..ddd238bc
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square150x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png
new file mode 100644
index 00000000..e756568f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png
new file mode 100644
index 00000000..290e89c2
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 00000000..d4cf69f0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png
new file mode 100644
index 00000000..c1ce2f33
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png
new file mode 100644
index 00000000..87e80532
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-16.png
new file mode 100644
index 00000000..e756568f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-24.png
new file mode 100644
index 00000000..290e89c2
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 00000000..d4cf69f0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-32.png
new file mode 100644
index 00000000..c1ce2f33
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-48.png
new file mode 100644
index 00000000..87e80532
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..7345b443
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..2afb3113
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..8114e111
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..96b4ccf4
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..6383ffc3
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..e756568f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..290e89c2
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..290e89c2
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..d4cf69f0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..c1ce2f33
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..87e80532
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Square44x44Logo.targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-100.png
new file mode 100644
index 00000000..640e8767
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-125.png
new file mode 100644
index 00000000..97cf7cbb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-150.png
new file mode 100644
index 00000000..d4a71a12
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-200.png
new file mode 100644
index 00000000..3512de10
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-400.png
new file mode 100644
index 00000000..908fd71f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/StoreLogo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..cb9dbd55
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..1cf7b58d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..2ba7fb5d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..169b6db6
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..4313f73e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/CalendarAssets/Wide310x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-100.png
new file mode 100644
index 00000000..27dad70a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-125.png
new file mode 100644
index 00000000..fd560f24
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-150.png
new file mode 100644
index 00000000..c92234dc
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-200.png
new file mode 100644
index 00000000..e503e856
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-400.png
new file mode 100644
index 00000000..dffa1286
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/LargeTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-100.png
new file mode 100644
index 00000000..dc8cdc7c
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-125.png
new file mode 100644
index 00000000..16279dd5
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-150.png
new file mode 100644
index 00000000..2ca3b32b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-200.png
new file mode 100644
index 00000000..2986f315
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-400.png
new file mode 100644
index 00000000..0bc1d256
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SmallTile.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-100.png
new file mode 100644
index 00000000..4d52d609
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-125.png
new file mode 100644
index 00000000..59a21e15
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-150.png
new file mode 100644
index 00000000..2a5ec8c1
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-200.png
new file mode 100644
index 00000000..e51bafd4
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-400.png
new file mode 100644
index 00000000..6c28797e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/SplashScreen.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..1133e445
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..2f7bf28e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..98fb8d4e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..97ed4a03
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..1a65fbc7
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square150x150Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png
new file mode 100644
index 00000000..0faa7aae
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png
new file mode 100644
index 00000000..58a0504f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 00000000..a8e4e336
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png
new file mode 100644
index 00000000..e041f59b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png
new file mode 100644
index 00000000..229cca05
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-16.png
new file mode 100644
index 00000000..0faa7aae
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-24.png
new file mode 100644
index 00000000..58a0504f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 00000000..a8e4e336
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-32.png
new file mode 100644
index 00000000..e041f59b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-48.png
new file mode 100644
index 00000000..229cca05
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..0e9904a0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..c9022704
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..64425f74
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..93a17783
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..ca07113e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-16.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..0faa7aae
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-16.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..58a0504f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..58a0504f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-256.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..a8e4e336
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-256.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-32.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..e041f59b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-32.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-48.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..229cca05
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Square44x44Logo.targetsize-48.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-100.png
new file mode 100644
index 00000000..9881e699
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-125.png
new file mode 100644
index 00000000..b57a5960
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-150.png
new file mode 100644
index 00000000..8fa6592f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-200.png
new file mode 100644
index 00000000..5ef3b658
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-400.png
new file mode 100644
index 00000000..cfd23b34
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/StoreLogo.scale-400.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-100.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..75a12d76
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-100.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-125.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..54d68b2e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-125.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-150.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..8630d7b6
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-150.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-200.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..4d52d609
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-200.png differ
diff --git a/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-400.png b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..e51bafd4
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/AppEntries/MailAssets/Wide310x150Logo.scale-400.png differ
diff --git a/Wino.Mail/Assets/EML/eml.png b/Wino.Mail.WinUI/Assets/EML/eml.png
similarity index 100%
rename from Wino.Mail/Assets/EML/eml.png
rename to Wino.Mail.WinUI/Assets/EML/eml.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_archive.png b/Wino.Mail.WinUI/Assets/FileTypes/type_archive.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_archive.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_archive.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_audio.png b/Wino.Mail.WinUI/Assets/FileTypes/type_audio.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_audio.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_audio.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_executable.png b/Wino.Mail.WinUI/Assets/FileTypes/type_executable.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_executable.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_executable.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_html.png b/Wino.Mail.WinUI/Assets/FileTypes/type_html.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_html.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_html.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_image.png b/Wino.Mail.WinUI/Assets/FileTypes/type_image.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_image.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_image.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_none.png b/Wino.Mail.WinUI/Assets/FileTypes/type_none.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_none.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_none.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_other.png b/Wino.Mail.WinUI/Assets/FileTypes/type_other.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_other.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_other.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_pdf.png b/Wino.Mail.WinUI/Assets/FileTypes/type_pdf.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_pdf.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_pdf.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_rar.png b/Wino.Mail.WinUI/Assets/FileTypes/type_rar.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_rar.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_rar.png
diff --git a/Wino.Core.UWP/Assets/FileTypes/type_video.png b/Wino.Mail.WinUI/Assets/FileTypes/type_video.png
similarity index 100%
rename from Wino.Core.UWP/Assets/FileTypes/type_video.png
rename to Wino.Mail.WinUI/Assets/FileTypes/type_video.png
diff --git a/Wino.Mail/Assets/NotificationIcons/profile-dark.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/profile.png
similarity index 100%
rename from Wino.Mail/Assets/NotificationIcons/profile-dark.png
rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/profile.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-join.png
new file mode 100644
index 00000000..bc6fc2bc
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-snooze.png
new file mode 100644
index 00000000..618e1d16
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/dismiss.png
new file mode 100644
index 00000000..e81df3fb
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-archive.png
new file mode 100644
index 00000000..ef6b6b8f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-delete.png
new file mode 100644
index 00000000..e6ea8428
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-markread.png
new file mode 100644
index 00000000..abf2884e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-100/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-join.png
new file mode 100644
index 00000000..1c23956e
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-snooze.png
new file mode 100644
index 00000000..a568d93d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/dismiss.png
new file mode 100644
index 00000000..679d63f3
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-archive.png
new file mode 100644
index 00000000..0601580d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-delete.png
new file mode 100644
index 00000000..c74ce5f9
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-markread.png
new file mode 100644
index 00000000..11cd2dd1
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-125/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-join.png
new file mode 100644
index 00000000..b47963af
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-snooze.png
new file mode 100644
index 00000000..f9968a2b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/dismiss.png
new file mode 100644
index 00000000..8ba86ea4
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-archive.png
new file mode 100644
index 00000000..b7435c8a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-delete.png
new file mode 100644
index 00000000..f970df4b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-markread.png
new file mode 100644
index 00000000..0f16c559
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-150/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-join.png
new file mode 100644
index 00000000..445bef6a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-snooze.png
new file mode 100644
index 00000000..7357261a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/dismiss.png
new file mode 100644
index 00000000..735d6c69
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-archive.png
new file mode 100644
index 00000000..785fbb5a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-delete.png
new file mode 100644
index 00000000..7ecaf105
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-markread.png
new file mode 100644
index 00000000..c6c548d0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-200/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-join.png
new file mode 100644
index 00000000..fb17ae9a
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-snooze.png
new file mode 100644
index 00000000..0ad818e1
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/dismiss.png
new file mode 100644
index 00000000..a6591fd2
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-archive.png
new file mode 100644
index 00000000..a4e573d9
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-delete.png
new file mode 100644
index 00000000..23702da9
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-markread.png
new file mode 100644
index 00000000..7ead265f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-dark/scale-400/mail-markread.png differ
diff --git a/Wino.Mail/Assets/NotificationIcons/profile-light.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/profile.png
similarity index 100%
rename from Wino.Mail/Assets/NotificationIcons/profile-light.png
rename to Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/profile.png
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-join.png
new file mode 100644
index 00000000..4ba19db7
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-snooze.png
new file mode 100644
index 00000000..8e297571
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/dismiss.png
new file mode 100644
index 00000000..a635bbfa
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-archive.png
new file mode 100644
index 00000000..de9ddc37
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-delete.png
new file mode 100644
index 00000000..9f57ff6f
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-markread.png
new file mode 100644
index 00000000..03cde630
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-100/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-join.png
new file mode 100644
index 00000000..01a4d0ee
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-snooze.png
new file mode 100644
index 00000000..9ec09801
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/dismiss.png
new file mode 100644
index 00000000..5f2fa277
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-archive.png
new file mode 100644
index 00000000..922eb752
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-delete.png
new file mode 100644
index 00000000..8c1c5cf5
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-markread.png
new file mode 100644
index 00000000..559a08e9
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-125/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-join.png
new file mode 100644
index 00000000..1a12fe40
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-snooze.png
new file mode 100644
index 00000000..daebf99b
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/dismiss.png
new file mode 100644
index 00000000..4cdcf55c
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-archive.png
new file mode 100644
index 00000000..edfc3805
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-delete.png
new file mode 100644
index 00000000..1eb3b3bd
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-markread.png
new file mode 100644
index 00000000..403a5962
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-150/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-join.png
new file mode 100644
index 00000000..1905dfb0
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-snooze.png
new file mode 100644
index 00000000..3498f142
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/dismiss.png
new file mode 100644
index 00000000..24b40c5c
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-archive.png
new file mode 100644
index 00000000..1369d7ce
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-delete.png
new file mode 100644
index 00000000..0a3dc404
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-markread.png
new file mode 100644
index 00000000..5d56de68
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-200/mail-markread.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-join.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-join.png
new file mode 100644
index 00000000..3be418e3
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-join.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-snooze.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-snooze.png
new file mode 100644
index 00000000..0bd4607d
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/calendar-snooze.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/dismiss.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/dismiss.png
new file mode 100644
index 00000000..c05ba123
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/dismiss.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-archive.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-archive.png
new file mode 100644
index 00000000..fc527f89
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-archive.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-delete.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-delete.png
new file mode 100644
index 00000000..7f66c6fa
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-delete.png differ
diff --git a/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-markread.png b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-markread.png
new file mode 100644
index 00000000..2ddd86dd
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/NotificationIcons/theme-light/scale-400/mail-markread.png differ
diff --git a/Wino.Core.UWP/Assets/Providers/Gmail.png b/Wino.Mail.WinUI/Assets/Providers/Gmail.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/Gmail.png
rename to Wino.Mail.WinUI/Assets/Providers/Gmail.png
diff --git a/Wino.Core.UWP/Assets/Providers/IMAP4.png b/Wino.Mail.WinUI/Assets/Providers/IMAP4.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/IMAP4.png
rename to Wino.Mail.WinUI/Assets/Providers/IMAP4.png
diff --git a/Wino.Core.UWP/Assets/Providers/Office 365.png b/Wino.Mail.WinUI/Assets/Providers/Office 365.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/Office 365.png
rename to Wino.Mail.WinUI/Assets/Providers/Office 365.png
diff --git a/Wino.Core.UWP/Assets/Providers/Outlook.png b/Wino.Mail.WinUI/Assets/Providers/Outlook.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/Outlook.png
rename to Wino.Mail.WinUI/Assets/Providers/Outlook.png
diff --git a/Wino.Core.UWP/Assets/Providers/Yahoo.png b/Wino.Mail.WinUI/Assets/Providers/Yahoo.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/Yahoo.png
rename to Wino.Mail.WinUI/Assets/Providers/Yahoo.png
diff --git a/Wino.Core.UWP/Assets/Providers/iCloud.png b/Wino.Mail.WinUI/Assets/Providers/iCloud.png
similarity index 100%
rename from Wino.Core.UWP/Assets/Providers/iCloud.png
rename to Wino.Mail.WinUI/Assets/Providers/iCloud.png
diff --git a/Wino.Mail/Assets/ReleaseNotes/1102.md b/Wino.Mail.WinUI/Assets/ReleaseNotes/1102.md
similarity index 100%
rename from Wino.Mail/Assets/ReleaseNotes/1102.md
rename to Wino.Mail.WinUI/Assets/ReleaseNotes/1102.md
diff --git a/Wino.Mail.WinUI/Assets/ReleaseNotes/vnext.md b/Wino.Mail.WinUI/Assets/ReleaseNotes/vnext.md
new file mode 100644
index 00000000..3e014bd0
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/ReleaseNotes/vnext.md
@@ -0,0 +1,86 @@
+# 🎉 Welcome to Wino Mail – What's New?
+
+Thank you for using Wino Mail! This update is one of the biggest yet, bringing a brand-new Wino Calendar, major security improvements, and a ton of quality-of-life upgrades. Here's a tour of everything new:
+
+---
+
+## 📅 Wino Calendar
+
+Wino now ships with a fully integrated calendar alongside your mail. You can view, create, and manage your events without ever leaving the app. If you use any CalDAV-compatible service (like iCloud, Fastmail, or a self-hosted server), your events will sync automatically and stay up to date. Recurring events, reminders, RSVP responses, and online meeting links are all supported. When someone sends you a calendar invitation by email, Wino will recognize it and let you accept or decline right from the mail reading view.
+
+- View, create, edit, and delete calendar events
+- Sync with any CalDAV-compatible calendar service
+- Full recurring event support
+- RSVP directly from invitation emails
+- Reminders and "Join Online" links for virtual meetings
+- Calendar settings integrated into the main Settings page
+
+---
+
+## 🔒 Email Signing & Encryption (S/MIME)
+
+You can now send digitally signed emails so recipients know a message genuinely came from you, and encrypt outgoing emails so only the intended recipient can read them. When you receive a signed or encrypted email, Wino will verify the signature and decrypt the content automatically. Import your personal certificate once from **Settings → Signature & Encryption**, and Wino takes care of the rest. Each email address (alias) can have its own certificate.
+
+- Import your personal S/MIME certificate (PKCS#12 / .pfx)
+- Sign and/or encrypt outgoing emails with toggle buttons in the compose toolbar
+- Visual indicator on received emails that are signed or encrypted
+- Automatic signature verification and decryption on incoming mail
+
+---
+
+## 💬 Threaded Mail View
+
+Emails that belong to the same conversation are now grouped into threads, making it much easier to follow a back-and-forth discussion without scrolling through your entire inbox. Threads expand and collapse smoothly, and you can select or act on individual messages within a conversation.
+
+---
+
+## 📎 Large Attachments for Outlook
+
+Sending large files via your Outlook or Microsoft 365 account no longer fails. Wino now uses Microsoft's upload session API behind the scenes, which handles big attachments reliably regardless of file size.
+
+---
+
+## 🔔 Smarter Notifications
+
+Toast notifications now let you act on emails directly from the notification (mark as read, delete, etc.) even if the app is not open. Clicking a calendar reminder notification takes you straight to that event. Notifications for mail and calendar are now routed to the correct app entry automatically.
+
+---
+
+## 🗂️ Folder Management
+
+You can now create new sub-folders and delete existing folders directly from the sidebar — no need to go to your webmail to organize your mailbox. A new Storage settings page also lets you see how much space Wino is using on your device.
+
+---
+
+## 💫 Swipe Actions
+
+Swipe left or right on emails in the mail list to quickly archive, delete, or mark them — ideal for touch screen devices or when you want to process your inbox fast.
+
+---
+
+## ⌨️ Keyboard Shortcuts
+
+A new keyboard shortcuts dialog is available so you can discover all the keyboard shortcuts Wino supports. Press the shortcut or find it in the app menu to open it.
+
+---
+
+## 🖨️ Custom Print Dialog
+
+Printing an email now uses Wino's own print dialog, giving you a cleaner and more consistent experience.
+
+---
+
+## 🚀 Faster App Startup
+
+Wino's internals have been modernized to take full advantage of the latest .NET runtime optimizations. While this is a behind-the-scenes change, it means the app starts quicker, uses less memory, and is set up for even better performance in future updates.
+
+---
+
+## 🐛 Bug Fixes & Stability
+
+- Fixed several issues with Outlook sync reliability and speed
+- Improved IMAP synchronization to be more stable and resource-efficient
+- Fixed duplicate mail and calendar event issues
+- Improved account sign-out and re-authentication handling
+- Better error messages when something goes wrong during sync
+- Dozens of smaller fixes throughout the app
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Calendar.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Calendar.svg
new file mode 100644
index 00000000..40bd60e7
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Calendar.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="cal-body" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#EFF6FF"/>
+      <stop offset="100%" stop-color="#DBEAFE"/>
+    </linearGradient>
+    <linearGradient id="cal-header" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#60A5FA"/>
+      <stop offset="100%" stop-color="#2563EB"/>
+    </linearGradient>
+    <linearGradient id="cal-today" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#818CF8"/>
+      <stop offset="100%" stop-color="#4F46E5"/>
+    </linearGradient>
+    <filter id="cal-shadow" x="-10%" y="-10%" width="120%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="6" flood-color="#2563EB" flood-opacity="0.18"/>
+    </filter>
+  </defs>
+
+  <!-- Body -->
+  <rect x="10" y="22" width="108" height="96" rx="14" fill="url(#cal-body)" filter="url(#cal-shadow)"/>
+
+  <!-- Header band -->
+  <rect x="10" y="22" width="108" height="34" rx="14" fill="url(#cal-header)"/>
+  <rect x="10" y="42" width="108" height="14" fill="url(#cal-header)"/>
+
+  <!-- Ring binders -->
+  <rect x="37" y="12" width="10" height="24" rx="5" fill="#93C5FD"/>
+  <rect x="81" y="12" width="10" height="24" rx="5" fill="#93C5FD"/>
+  <rect x="39" y="14" width="6" height="20" rx="3" fill="#1D4ED8"/>
+  <rect x="83" y="14" width="6" height="20" rx="3" fill="#1D4ED8"/>
+
+  <!-- Month label -->
+  <text x="64" y="43" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="13" font-weight="600" fill="white" opacity="0.95">MARCH</text>
+
+  <!-- Grid: row 1 -->
+  <rect x="18" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="40" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="62" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="84" y="64" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="106" y="64" width="12" height="14" rx="5" fill="white" opacity="0.55"/>
+
+  <!-- Grid: row 2 (today highlighted) -->
+  <rect x="18" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="40" y="84" width="16" height="14" rx="5" fill="url(#cal-today)"/>
+  <rect x="62" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="84" y="84" width="16" height="14" rx="5" fill="white" opacity="0.55"/>
+  <rect x="106" y="84" width="12" height="14" rx="5" fill="white" opacity="0.55"/>
+
+  <!-- Grid: row 3 (partial) -->
+  <rect x="18" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+  <rect x="40" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+  <rect x="62" y="104" width="16" height="10" rx="5" fill="white" opacity="0.35"/>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Customize.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Customize.svg
new file mode 100644
index 00000000..5667a4f3
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Customize.svg
@@ -0,0 +1,49 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="cu-palette" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FDF4FF"/>
+      <stop offset="100%" stop-color="#F3E8FF"/>
+    </linearGradient>
+    <linearGradient id="cu-handle" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#A78BFA"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="cu-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#7C3AED" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Palette body -->
+  <path d="M64 12 C38 12 18 30 18 54 C18 68 26 76 36 80 C46 84 46 92 50 98 C54 104 60 108 68 106 C82 104 110 88 110 60 C110 34 90 12 64 12 Z"
+        fill="url(#cu-palette)" filter="url(#cu-shadow)"/>
+
+  <!-- Palette thumb hole -->
+  <circle cx="78" cy="96" r="10" fill="#E9D5FF"/>
+  <circle cx="78" cy="96" r="6" fill="white" opacity="0.6"/>
+
+  <!-- Color swatches -->
+  <!-- Red -->
+  <circle cx="38" cy="44" r="11" fill="#F87171"/>
+  <circle cx="38" cy="44" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Orange -->
+  <circle cx="62" cy="28" r="11" fill="#FB923C"/>
+  <circle cx="62" cy="28" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Blue -->
+  <circle cx="87" cy="34" r="11" fill="#60A5FA"/>
+  <circle cx="87" cy="34" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Green -->
+  <circle cx="100" cy="56" r="11" fill="#4ADE80"/>
+  <circle cx="100" cy="56" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Purple -->
+  <circle cx="92" cy="80" r="11" fill="#A78BFA"/>
+  <circle cx="92" cy="80" r="11" fill="white" opacity="0.15"/>
+
+  <!-- Brush -->
+  <rect x="22" y="72" width="8" height="36" rx="4" fill="url(#cu-handle)" transform="rotate(-40 26 90)"/>
+  <path d="M8 110 C8 110 14 106 18 112 C16 116 10 116 8 110 Z" fill="#F87171"/>
+  <path d="M10 112 C10 112 14 109 17 113" fill="none" stroke="#FCA5A5" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Mail.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Mail.svg
new file mode 100644
index 00000000..7a551879
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Mail.svg
@@ -0,0 +1,51 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="ml-env" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#F0F9FF"/>
+      <stop offset="100%" stop-color="#BAE6FD"/>
+    </linearGradient>
+    <linearGradient id="ml-flap" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#38BDF8"/>
+      <stop offset="100%" stop-color="#0284C7"/>
+    </linearGradient>
+    <linearGradient id="ml-dot1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#4ADE80"/>
+      <stop offset="100%" stop-color="#16A34A"/>
+    </linearGradient>
+    <linearGradient id="ml-dot2" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#F87171"/>
+      <stop offset="100%" stop-color="#DC2626"/>
+    </linearGradient>
+    <linearGradient id="ml-dot3" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#A78BFA"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="ml-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#0284C7" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Envelope body -->
+  <rect x="14" y="30" width="100" height="70" rx="12" fill="url(#ml-env)" filter="url(#ml-shadow)"/>
+
+  <!-- Envelope flap (closed) -->
+  <path d="M14 42 L64 68 L114 42 L114 38 A12 12 0 0 0 102 26 L26 26 A12 12 0 0 0 14 38 Z"
+        fill="url(#ml-flap)"/>
+
+  <!-- Fold line on front -->
+  <path d="M14 46 L64 71 L114 46" fill="none" stroke="#7DD3FC" stroke-width="1.2" opacity="0.6"/>
+
+  <!-- Body content lines -->
+  <rect x="28" y="76" width="50" height="5" rx="2.5" fill="#0EA5E9" opacity="0.3"/>
+  <rect x="28" y="86" width="36" height="5" rx="2.5" fill="#0EA5E9" opacity="0.2"/>
+
+  <!-- Provider dots (Outlook=blue, Gmail=red, IMAP=purple) -->
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot1)" stroke="white" stroke-width="2"/>
+  <text x="90" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="11" font-weight="700" fill="white">G</text>
+
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot2)" stroke="white" stroke-width="2" transform="translate(-26,0)"/>
+  <text x="64" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="10" font-weight="700" fill="white">O</text>
+
+  <circle cx="90" cy="81" r="11" fill="url(#ml-dot3)" stroke="white" stroke-width="2" transform="translate(-52,0)"/>
+  <text x="38" y="86" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="10" font-weight="700" fill="white">@</text>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/More.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/More.svg
new file mode 100644
index 00000000..e62b98fe
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/More.svg
@@ -0,0 +1,48 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="mo-star1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FCD34D"/>
+      <stop offset="100%" stop-color="#F59E0B"/>
+    </linearGradient>
+    <linearGradient id="mo-star2" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#93C5FD"/>
+      <stop offset="100%" stop-color="#3B82F6"/>
+    </linearGradient>
+    <linearGradient id="mo-star3" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#C4B5FD"/>
+      <stop offset="100%" stop-color="#7C3AED"/>
+    </linearGradient>
+    <filter id="mo-glow1" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="3" stdDeviation="5" flood-color="#F59E0B" flood-opacity="0.4"/>
+    </filter>
+    <filter id="mo-glow2" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="2" stdDeviation="4" flood-color="#3B82F6" flood-opacity="0.35"/>
+    </filter>
+    <filter id="mo-glow3" x="-30%" y="-30%" width="160%" height="160%">
+      <feDropShadow dx="0" dy="2" stdDeviation="4" flood-color="#7C3AED" flood-opacity="0.35"/>
+    </filter>
+  </defs>
+
+  <!-- Large center star -->
+  <polygon points="64,14 70,50 106,56 70,62 64,98 58,62 22,56 58,50"
+           fill="url(#mo-star1)" filter="url(#mo-glow1)"/>
+
+  <!-- Star highlight -->
+  <polygon points="64,20 68.5,48 92,52 68.5,56 64,84 59.5,56 36,52 59.5,48"
+           fill="white" opacity="0.18"/>
+
+  <!-- Small star top-right -->
+  <polygon points="98,18 100.5,28 110,30 100.5,32 98,42 95.5,32 86,30 95.5,28"
+           fill="url(#mo-star2)" filter="url(#mo-glow2)"/>
+
+  <!-- Small star bottom-left -->
+  <polygon points="28,82 30,90 38,92 30,94 28,102 26,94 18,92 26,90"
+           fill="url(#mo-star3)" filter="url(#mo-glow3)"/>
+
+  <!-- Tiny sparkle dots -->
+  <circle cx="104" cy="66" r="3" fill="#FCD34D" opacity="0.8"/>
+  <circle cx="22" cy="44" r="2.5" fill="#93C5FD" opacity="0.8"/>
+  <circle cx="110" cy="90" r="2" fill="#C4B5FD" opacity="0.7"/>
+  <circle cx="18" cy="106" r="2" fill="#FCD34D" opacity="0.6"/>
+  <circle cx="64" cy="108" r="2.5" fill="#93C5FD" opacity="0.6"/>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Notification.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Notification.svg
new file mode 100644
index 00000000..1a298e70
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Notification.svg
@@ -0,0 +1,45 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="nb-bell" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#FCD34D"/>
+      <stop offset="100%" stop-color="#D97706"/>
+    </linearGradient>
+    <linearGradient id="nb-badge" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#F87171"/>
+      <stop offset="100%" stop-color="#DC2626"/>
+    </linearGradient>
+    <linearGradient id="nb-action" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#60A5FA"/>
+      <stop offset="100%" stop-color="#2563EB"/>
+    </linearGradient>
+    <filter id="nb-glow" x="-20%" y="-20%" width="140%" height="140%">
+      <feDropShadow dx="0" dy="4" stdDeviation="7" flood-color="#D97706" flood-opacity="0.3"/>
+    </filter>
+  </defs>
+
+  <!-- Bell body -->
+  <path d="M64 14 C64 14 40 18 38 52 L34 80 L94 80 L90 52 C88 18 64 14 64 14 Z"
+        fill="url(#nb-bell)" filter="url(#nb-glow)"/>
+
+  <!-- Bell highlight -->
+  <path d="M64 18 C64 18 52 22 50 46 L48 64 L72 64 C72 46 66 24 64 18 Z"
+        fill="white" opacity="0.2"/>
+
+  <!-- Bell base / clapper mount -->
+  <rect x="30" y="78" width="68" height="10" rx="5" fill="#B45309"/>
+
+  <!-- Clapper -->
+  <circle cx="64" cy="100" r="8" fill="#92400E"/>
+  <rect x="61" y="88" width="6" height="14" rx="3" fill="#B45309"/>
+
+  <!-- Notification badge -->
+  <circle cx="92" cy="26" r="13" fill="url(#nb-badge)"/>
+  <text x="92" y="31" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="13" font-weight="700" fill="white">3</text>
+
+  <!-- Action buttons (toast-like) -->
+  <rect x="20" y="98" width="38" height="18" rx="7" fill="url(#nb-action)"/>
+  <text x="39" y="111" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="9" font-weight="600" fill="white">Archive</text>
+
+  <rect x="64" y="98" width="38" height="18" rx="7" fill="white" stroke="#E5E7EB" stroke-width="1"/>
+  <text x="83" y="111" text-anchor="middle" font-family="Segoe UI Variable, Segoe UI, sans-serif" font-size="9" font-weight="600" fill="#374151">Delete</text>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Security.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Security.svg
new file mode 100644
index 00000000..8ec6fbfa
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Security.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="sh-outer" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#6EE7B7"/>
+      <stop offset="100%" stop-color="#059669"/>
+    </linearGradient>
+    <linearGradient id="sh-inner" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#A7F3D0" stop-opacity="0.9"/>
+      <stop offset="100%" stop-color="#34D399" stop-opacity="0.6"/>
+    </linearGradient>
+    <linearGradient id="sh-lock" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#ECFDF5"/>
+      <stop offset="100%" stop-color="#D1FAE5"/>
+    </linearGradient>
+    <filter id="sh-glow" x="-20%" y="-20%" width="140%" height="140%">
+      <feDropShadow dx="0" dy="4" stdDeviation="8" flood-color="#059669" flood-opacity="0.25"/>
+    </filter>
+  </defs>
+
+  <!-- Shield outer -->
+  <path d="M64 10 L106 28 L106 68 C106 92 86 112 64 118 C42 112 22 92 22 68 L22 28 Z"
+        fill="url(#sh-outer)" filter="url(#sh-glow)"/>
+
+  <!-- Shield inner highlight -->
+  <path d="M64 18 L100 34 L100 68 C100 88 83 106 64 112 C45 106 28 88 28 68 L28 34 Z"
+        fill="url(#sh-inner)" opacity="0.6"/>
+
+  <!-- Lock body -->
+  <rect x="50" y="62" width="28" height="22" rx="6" fill="url(#sh-lock)"/>
+
+  <!-- Lock shackle -->
+  <path d="M56 62 L56 54 A8 8 0 0 1 72 54 L72 62"
+        fill="none" stroke="white" stroke-width="5" stroke-linecap="round"/>
+
+  <!-- Keyhole -->
+  <circle cx="64" cy="71" r="4" fill="#059669"/>
+  <rect x="62" y="72" width="4" height="7" rx="2" fill="#059669"/>
+
+  <!-- Check sparkles -->
+  <circle cx="94" cy="28" r="3" fill="white" opacity="0.7"/>
+  <circle cx="106" cy="44" r="2" fill="white" opacity="0.5"/>
+  <circle cx="34" cy="44" r="2" fill="white" opacity="0.5"/>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Thread.svg b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Thread.svg
new file mode 100644
index 00000000..48723e7b
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/Images/Thread.svg
@@ -0,0 +1,49 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
+  <defs>
+    <linearGradient id="th-env3" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#E0E7FF"/>
+      <stop offset="100%" stop-color="#C7D2FE"/>
+    </linearGradient>
+    <linearGradient id="th-env2" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#EDE9FE"/>
+      <stop offset="100%" stop-color="#DDD6FE"/>
+    </linearGradient>
+    <linearGradient id="th-env1" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0%" stop-color="#818CF8"/>
+      <stop offset="100%" stop-color="#4F46E5"/>
+    </linearGradient>
+    <linearGradient id="th-flap" x1="0" y1="0" x2="0" y2="1">
+      <stop offset="0%" stop-color="#6366F1"/>
+      <stop offset="100%" stop-color="#4338CA"/>
+    </linearGradient>
+    <filter id="th-shadow" x="-10%" y="-10%" width="130%" height="130%">
+      <feDropShadow dx="0" dy="4" stdDeviation="6" flood-color="#4F46E5" flood-opacity="0.2"/>
+    </filter>
+  </defs>
+
+  <!-- Back envelope (bottom-most) -->
+  <rect x="18" y="38" width="80" height="52" rx="8" fill="url(#th-env3)" opacity="0.8"/>
+  <path d="M18 46 L58 66 L98 46" fill="none" stroke="#A5B4FC" stroke-width="1.5" stroke-linejoin="round"/>
+
+  <!-- Middle envelope -->
+  <rect x="24" y="30" width="80" height="52" rx="8" fill="url(#th-env2)" opacity="0.9"/>
+  <path d="M24 38 L64 58 L104 38" fill="none" stroke="#C4B5FD" stroke-width="1.5" stroke-linejoin="round"/>
+
+  <!-- Front envelope -->
+  <rect x="30" y="22" width="80" height="52" rx="10" fill="url(#th-env1)" filter="url(#th-shadow)"/>
+
+  <!-- Front flap (triangle) -->
+  <path d="M30 32 L70 52 L110 32 L110 30 A10 10 0 0 0 100 22 L40 22 A10 10 0 0 0 30 30 Z"
+        fill="url(#th-flap)"/>
+
+  <!-- Dividing line on front -->
+  <path d="M30 38 L70 57 L110 38" fill="none" stroke="#818CF8" stroke-width="1" opacity="0.5"/>
+
+  <!-- Lines in body -->
+  <rect x="42" y="56" width="40" height="4" rx="2" fill="white" opacity="0.35"/>
+  <rect x="42" y="64" width="28" height="4" rx="2" fill="white" opacity="0.25"/>
+
+  <!-- Reply indicator dot -->
+  <circle cx="100" cy="84" r="12" fill="#4F46E5"/>
+  <path d="M95 84 L101 78 M101 78 L101 90 M101 78 L107 84" fill="none" stroke="white" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/features.json b/Wino.Mail.WinUI/Assets/UpdateNotes/features.json
new file mode 100644
index 00000000..07eb1dad
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/features.json
@@ -0,0 +1,44 @@
+[
+    {
+        "title": "# Outlook, Gmail & IMAP/SMTP",
+        "description": "Connect all your email accounts in one place. Wino supports Microsoft Outlook (Office 365), Gmail, and any standard IMAP/SMTP server — giving you a unified inbox experience.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Mail.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Calendar with CalDAV Support",
+        "description": "Manage your schedule alongside your emails. Create local calendars or connect to remote CalDAV-compatible servers. View, create, and respond to events and invitations.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Calendar.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# S/MIME Signing & Encryption",
+        "description": "Keep your communications secure. Sign and encrypt emails with personal certificates to ensure your messages are authentic and private.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Security.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Conversation Threading",
+        "description": "Follow discussions with ease. Emails are grouped by conversation thread so you never lose context in long email chains.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Thread.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Actionable Notifications",
+        "description": "Stay productive without switching apps. Mark as read, delete, or archive emails directly from Windows toast notifications.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Notification.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    },
+    {
+        "title": "# Rich Customization",
+        "description": "Make Wino yours. Choose from built-in themes, create custom themes with your own wallpapers and accent colors, configure swipe actions, and set keyboard shortcuts.",
+        "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Customize.svg",
+        "imageWidth": 128,
+        "imageHeight": 128
+    }
+]
diff --git a/Wino.Mail.WinUI/Assets/UpdateNotes/vnext.json b/Wino.Mail.WinUI/Assets/UpdateNotes/vnext.json
new file mode 100644
index 00000000..1dba91df
--- /dev/null
+++ b/Wino.Mail.WinUI/Assets/UpdateNotes/vnext.json
@@ -0,0 +1,39 @@
+{
+    "sections": [
+        {
+            "title": "Wino Calendar is here!",
+            "description": "You can now create local or remote CalDAV-compatible calendars, manage recurring events, and respond to invitations — all from within Wino.",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Calendar.svg",
+            "imageWidth": 128,
+            "imageHeight": 128
+        },
+        {
+            "title": "S/MIME Signing & Encryption",
+            "description": "Wino now supports signing and encrypting your emails with personal certificates. Keep your communications secure and verifiable.",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Security.svg",
+            "imageWidth": 128,
+            "imageHeight": 128
+        },
+        {
+            "title": "Threaded Mail View",
+            "description": "Emails are now grouped by conversation, making it easier to follow long discussions without losing context.",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Thread.svg",
+            "imageWidth": 128,
+            "imageHeight": 128
+        },
+        {
+            "title": "Smarter Notifications",
+            "description": "Act on your emails directly from toast notifications — mark as read, delete, or archive without opening the app.",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/Notification.svg",
+            "imageWidth": 128,
+            "imageHeight": 128
+        },
+        {
+            "title": "And much more...",
+            "description": "Folder management, swipe actions, keyboard shortcuts, a custom print dialog, and significant performance improvements are all included in this release.\n\nThank you for using Wino Mail!",
+            "imageUrl": "ms-appx:///Assets/UpdateNotes/Images/More.svg",
+            "imageWidth": 128,
+            "imageHeight": 128
+        }
+    ]
+}
diff --git a/Wino.Mail.WinUI/Assets/WinoIcons.ttf b/Wino.Mail.WinUI/Assets/WinoIcons.ttf
new file mode 100644
index 00000000..cd38942c
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/WinoIcons.ttf differ
diff --git a/Wino.Mail.WinUI/Assets/Wino_Icon.ico b/Wino.Mail.WinUI/Assets/Wino_Icon.ico
new file mode 100644
index 00000000..f8dd2cd6
Binary files /dev/null and b/Wino.Mail.WinUI/Assets/Wino_Icon.ico differ
diff --git a/Wino.Core.UWP/BackgroundImages/Acrylic.jpg b/Wino.Mail.WinUI/BackgroundImages/Acrylic.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Acrylic.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Acrylic.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Clouds.jpg b/Wino.Mail.WinUI/BackgroundImages/Clouds.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Clouds.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Clouds.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Forest.jpg b/Wino.Mail.WinUI/BackgroundImages/Forest.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Forest.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Forest.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Garden.jpg b/Wino.Mail.WinUI/BackgroundImages/Garden.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Garden.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Garden.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Mica.jpg b/Wino.Mail.WinUI/BackgroundImages/Mica.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Mica.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Mica.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Nighty.jpg b/Wino.Mail.WinUI/BackgroundImages/Nighty.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Nighty.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Nighty.jpg
diff --git a/Wino.Core.UWP/BackgroundImages/Snowflake.jpg b/Wino.Mail.WinUI/BackgroundImages/Snowflake.jpg
similarity index 100%
rename from Wino.Core.UWP/BackgroundImages/Snowflake.jpg
rename to Wino.Mail.WinUI/BackgroundImages/Snowflake.jpg
diff --git a/Wino.Mail.WinUI/BasePage.cs b/Wino.Mail.WinUI/BasePage.cs
new file mode 100644
index 00000000..858b929e
--- /dev/null
+++ b/Wino.Mail.WinUI/BasePage.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Diagnostics;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Shell;
+using WinoNavigationMode = Wino.Core.Domain.Models.Navigation.NavigationMode;
+
+namespace Wino.Mail.WinUI;
+
+public partial class BasePage : Page, IRecipient<LanguageChanged>
+{
+    private bool _isPreparedForClose;
+
+    public void Receive(LanguageChanged message)
+    {
+        OnLanguageChanged();
+    }
+
+    public virtual void OnLanguageChanged() { }
+
+    /// <summary>
+    /// Register message recipients for this page. Override to register specific message types.
+    /// </summary>
+    protected virtual void RegisterRecipients() { }
+
+    /// <summary>
+    /// Unregister message recipients for this page. Override to unregister specific message types.
+    /// </summary>
+    protected virtual void UnregisterRecipients() { }
+
+    public virtual CoreBaseViewModel? AssociatedViewModel => null;
+
+    public virtual void PrepareForClose()
+    {
+        if (_isPreparedForClose)
+            return;
+
+        _isPreparedForClose = true;
+
+        WeakReferenceMessenger.Default.Unregister<LanguageChanged>(this);
+        UnregisterRecipients();
+    }
+
+    protected void ResetPreparedForCloseState()
+    {
+        _isPreparedForClose = false;
+    }
+
+    protected bool IsPreparedForClose => _isPreparedForClose;
+}
+
+public abstract class BasePage<T> : BasePage where T : CoreBaseViewModel
+{
+    public T ViewModel { get; } = WinoApplication.Current.Services.GetService<T>() ?? throw new ArgumentException($"Can't resolve '{typeof(T)}' as view model.");
+    public override CoreBaseViewModel AssociatedViewModel => ViewModel;
+
+    protected BasePage()
+    {
+        ViewModel.Dispatcher = new WinUIDispatcher(DispatcherQueue);
+
+        Loaded += PageLoaded;
+        Unloaded += PageUnloaded;
+    }
+
+    private void PageUnloaded(object sender, RoutedEventArgs e)
+    {
+        Loaded -= PageLoaded;
+        Unloaded -= PageUnloaded;
+    }
+
+    private void PageLoaded(object sender, RoutedEventArgs e) => ViewModel.OnPageLoaded();
+
+    ~BasePage() { Debug.WriteLine($"Disposed {GetType().Name}"); }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        var mode = GetNavigationMode(e.NavigationMode);
+        var parameter = e.Parameter;
+
+        ResetPreparedForCloseState();
+        WeakReferenceMessenger.Default.Register<LanguageChanged>(this);
+        RegisterRecipients();
+
+        ViewModel.OnNavigatedTo(mode, parameter);
+    }
+
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        base.OnNavigatingFrom(e);
+
+        var mode = GetNavigationMode(e.NavigationMode);
+        var parameter = e.Parameter;
+
+        PrepareForClose(mode, parameter);
+
+        GC.Collect();
+    }
+
+    public override void PrepareForClose()
+    {
+        PrepareForClose(WinoNavigationMode.New, null);
+    }
+
+    private void PrepareForClose(WinoNavigationMode mode, object? parameter)
+    {
+        if (IsPreparedForClose)
+            return;
+
+        base.PrepareForClose();
+        ViewModel.OnNavigatedFrom(mode, parameter!);
+    }
+
+    private WinoNavigationMode GetNavigationMode(NavigationMode mode)
+    {
+        return (WinoNavigationMode)mode;
+    }
+}
diff --git a/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs b/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
similarity index 91%
rename from Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
rename to Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
index c741555b..84a8d5e1 100644
--- a/Wino.Mail/Behaviors/CreateMailNavigationItemBehavior.cs
+++ b/Wino.Mail.WinUI/Behaviors/CreateMailNavigationItemBehavior.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 
 namespace Wino.Behaviors;
 
@@ -58,7 +58,7 @@ public class CreateMailNavigationItemBehavior : Behavior<WinoNavigationViewItem>
         }
     }
 
-    private void MenuCollectionUpdated(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    private void MenuCollectionUpdated(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
     {
         ManageAccounts();
     }
diff --git a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml b/Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml
similarity index 81%
rename from Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml
rename to Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml
index ae38dd73..17ea54df 100644
--- a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml
+++ b/Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml
@@ -1,10 +1,10 @@
-<UserControl
-    x:Class="Wino.Core.UWP.Controls.AccountCreationDialogControl"
+<UserControl
+    x:Class="Wino.Mail.WinUI.Controls.AccountCreationDialogControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Core.UWP.Controls"
+    xmlns:local="using:Wino.Mail.WinUI.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     d:DesignHeight="300"
@@ -113,7 +113,15 @@
                     <VisualState.Setters>
                         <Setter Target="CancelButton.Visibility" Value="Collapsed" />
                         <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingEvents}" />
-                        <!--<Setter Target="DialogIcon.Data" Value="F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 5 10 C 5 9.824219 5.032552 9.661459 5.097656 9.511719 C 5.16276 9.361979 5.252278 9.230144 5.366211 9.116211 C 5.480143 9.002279 5.613606 8.912761 5.766602 8.847656 C 5.919596 8.782553 6.083984 8.75 6.259766 8.75 C 6.435547 8.75 6.598307 8.782553 6.748047 8.847656 C 6.897786 8.912761 7.027994 9.000651 7.138672 9.111328 C 7.249349 9.222006 7.337239 9.352214 7.402344 9.501953 C 7.467447 9.651693 7.5 9.814453 7.5 9.990234 C 7.5 10.166016 7.467447 10.330404 7.402344 10.483398 C 7.337239 10.636394 7.247721 10.769857 7.133789 10.883789 C 7.019856 10.997722 6.888021 11.08724 6.738281 11.152344 C 6.588542 11.217448 6.425781 11.25 6.25 11.25 C 6.074219 11.25 5.909831 11.217448 5.756836 11.152344 C 5.603841 11.08724 5.472005 10.99935 5.361328 10.888672 C 5.250651 10.777995 5.16276 10.646159 5.097656 10.493164 C 5.032552 10.34017 5 10.175781 5 10 Z M 8.75 10 C 8.75 9.824219 8.782552 9.661459 8.847656 9.511719 C 8.91276 9.361979 9.002278 9.230144 9.116211 9.116211 C 9.230143 9.002279 9.363606 8.912761 9.516602 8.847656 C 9.669596 8.782553 9.833984 8.75 10.009766 8.75 C 10.185547 8.75 10.348307 8.782553 10.498047 8.847656 C 10.647786 8.912761 10.777994 9.000651 10.888672 9.111328 C 10.999349 9.222006 11.087239 9.352214 11.152344 9.501953 C 11.217447 9.651693 11.25 9.814453 11.25 9.990234 C 11.25 10.166016 11.217447 10.330404 11.152344 10.483398 C 11.087239 10.636394 10.997721 10.769857 10.883789 10.883789 C 10.769856 10.997722 10.638021 11.08724 10.488281 11.152344 C 10.338541 11.217448 10.175781 11.25 10 11.25 C 9.824219 11.25 9.65983 11.217448 9.506836 11.152344 C 9.353841 11.08724 9.222005 10.99935 9.111328 10.888672 C 9.00065 10.777995 8.91276 10.646159 8.847656 10.493164 C 8.782552 10.34017 8.75 10.175781 8.75 10 Z M 15 9.990234 C 14.999999 10.166016 14.967447 10.330404 14.902344 10.483398 C 14.837239 10.636394 14.747721 10.769857 14.633789 10.883789 C 14.519856 10.997722 14.388021 11.08724 14.238281 11.152344 C 14.088541 11.217448 13.925781 11.25 13.75 11.25 C 13.574219 11.25 13.40983 11.217448 13.256836 11.152344 C 13.103841 11.08724 12.972005 10.99935 12.861328 10.888672 C 12.75065 10.777995 12.66276 10.646159 12.597656 10.493164 C 12.532552 10.34017 12.5 10.175781 12.5 10 C 12.5 9.824219 12.532552 9.661459 12.597656 9.511719 C 12.66276 9.361979 12.752278 9.230144 12.866211 9.116211 C 12.980143 9.002279 13.113605 8.912761 13.266602 8.847656 C 13.419596 8.782553 13.583984 8.75 13.759766 8.75 C 13.935547 8.75 14.098307 8.782553 14.248047 8.847656 C 14.397785 8.912761 14.527994 9.000651 14.638672 9.111328 C 14.749349 9.222006 14.837239 9.352214 14.902344 9.501953 C 14.967447 9.651693 14.999999 9.814453 15 9.990234 Z M 7.5 13.75 C 7.5 13.925781 7.467447 14.088542 7.402344 14.238281 C 7.337239 14.388021 7.247721 14.519857 7.133789 14.633789 C 7.019856 14.747722 6.886393 14.83724 6.733398 14.902344 C 6.580403 14.967448 6.416015 15 6.240234 15 C 6.064453 15 5.901692 14.967448 5.751953 14.902344 C 5.602213 14.83724 5.472005 14.74935 5.361328 14.638672 C 5.250651 14.527995 5.16276 14.397787 5.097656 14.248047 C 5.032552 14.098308 5 13.935547 5 13.759766 C 5 13.583984 5.032552 13.419597 5.097656 13.266602 C 5.16276 13.113607 5.252278 12.980144 5.366211 12.866211 C 5.480143 12.752279 5.611979 12.662761 5.761719 12.597656 C 5.911458 12.532553 6.074219 12.5 6.25 12.5 C 6.425781 12.5 6.590169 12.532553 6.743164 12.597656 C 6.896158 12.662761 7.027994 12.750651 7.138672 12.861328 C 7.249349 12.972006 7.337239 13.103842 7.402344 13.256836 C 7.467447 13.409831 7.5 13.574219 7.5 13.75 Z M 11.25 13.75 C 11.25 13.925781 11.217447 14.088542 11.152344 14.238281 C 11.087239 14.388021 10.997721 14.519857 10.883789 14.633789 C 10.769856 14.747722 10.636393 14.83724 10.483398 14.902344 C 10.330403 14.967448 10.166016 15 9.990234 15 C 9.814453 15 9.651692 14.967448 9.501953 14.902344 C 9.352213 14.83724 9.222005 14.74935 9.111328 14.638672 C 9.00065 14.527995 8.91276 14.397787 8.847656 14.248047 C 8.782552 14.098308 8.75 13.935547 8.75 13.759766 C 8.75 13.583984 8.782552 13.419597 8.847656 13.266602 C 8.91276 13.113607 9.002278 12.980144 9.116211 12.866211 C 9.230143 12.752279 9.361979 12.662761 9.511719 12.597656 C 9.661458 12.532553 9.824219 12.5 10 12.5 C 10.175781 12.5 10.340169 12.532553 10.493164 12.597656 C 10.646158 12.662761 10.777994 12.750651 10.888672 12.861328 C 10.999349 12.972006 11.087239 13.103842 11.152344 13.256836 C 11.217447 13.409831 11.25 13.574219 11.25 13.75 Z " />-->
+                        <Setter Target="DialogIcon.Data" Value="M3 2h1V1h2v1h8V1h2v1h1c1.10457 0 2 .89543 2 2v12c0 1.1046-.89543 2-2 2H3c-1.10457 0-2-.8954-2-2V4c0-1.10457.89543-2 2-2zM3 7v9h14V7H3z" />
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState x:Name="CalendarMetadataFetch">
+                    <VisualState.Setters>
+                        <Setter Target="CancelButton.Visibility" Value="Collapsed" />
+                        <Setter Target="StatusText.Text" Value="{x:Bind domain:Translator.AccountCreationDialog_FetchingCalendarMetadata}" />
+                        <Setter Target="DialogIcon.Data" Value="M3 2h1V1h2v1h8V1h2v1h1c1.10457 0 2 .89543 2 2v12c0 1.1046-.89543 2-2 2H3c-1.10457 0-2-.8954-2-2V4c0-1.10457.89543-2 2-2zM3 7v9h14V7H3z" />
                     </VisualState.Setters>
                 </VisualState>
 
diff --git a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs b/Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml.cs
similarity index 69%
rename from Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs
rename to Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml.cs
index 0cd1c098..09ddcc55 100644
--- a/Wino.Core.UWP/Controls/AccountCreationDialogControl.xaml.cs
+++ b/Wino.Mail.WinUI/Controls/AccountCreationDialogControl.xaml.cs
@@ -1,21 +1,22 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Messaging.UI;
 
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public sealed partial class AccountCreationDialogControl : UserControl, IRecipient<CopyAuthURLRequested>
 {
-    private string copyClipboardURL;
+    private string copyClipboardURL = string.Empty;
 
-    public event EventHandler CancelClicked;
+    public event EventHandler? CancelClicked;
 
     public AccountCreationDialogState State
     {
@@ -46,30 +47,30 @@ public sealed partial class AccountCreationDialogControl : UserControl, IRecipie
 
         await Task.Delay(2000);
 
-        await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+        await DispatcherQueue.EnqueueAsync(async () =>
         {
-            AuthHelpDialogButton.Visibility = Windows.UI.Xaml.Visibility.Visible;
+            AuthHelpDialogButton.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
         });
     }
 
-    private void ControlLoaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private void ControlLoaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
         WeakReferenceMessenger.Default.Register(this);
     }
 
-    private void ControlUnloaded(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private void ControlUnloaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
         WeakReferenceMessenger.Default.UnregisterAll(this);
     }
 
-    private async void CopyClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private async void CopyClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
         if (string.IsNullOrEmpty(copyClipboardURL)) return;
 
-        var clipboardService = WinoApplication.Current.Services.GetService<IClipboardService>();
+        var clipboardService = WinoApplication.Current.Services.GetRequiredService<IClipboardService>();
         await clipboardService.CopyClipboardAsync(copyClipboardURL);
     }
 
 
-    private void CancelButtonClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e) => CancelClicked?.Invoke(this, null);
+    private void CancelButtonClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) => CancelClicked?.Invoke(this, EventArgs.Empty);
 }
diff --git a/Wino.Mail/Controls/AccountNavigationItem.cs b/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
similarity index 81%
rename from Wino.Mail/Controls/AccountNavigationItem.cs
rename to Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
index 9462a088..6b1a65e3 100644
--- a/Wino.Mail/Controls/AccountNavigationItem.cs
+++ b/Wino.Mail.WinUI/Controls/AccountNavigationItem.cs
@@ -1,8 +1,8 @@
-using System.Numerics;
+using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 
 namespace Wino.Controls;
 
@@ -28,8 +28,8 @@ public partial class AccountNavigationItem : WinoNavigationViewItem
     private const string PART_NavigationViewItemMenuItemsHost = "NavigationViewItemMenuItemsHost";
     private const string PART_SelectionIndicator = "CustomSelectionIndicator";
 
-    private ItemsRepeater _itemsRepeater;
-    private Windows.UI.Xaml.Shapes.Rectangle _selectionIndicator;
+    private ItemsRepeater _itemsRepeater = null!;
+    private Microsoft.UI.Xaml.Shapes.Rectangle _selectionIndicator = null!;
 
     public AccountNavigationItem()
     {
@@ -40,8 +40,8 @@ public partial class AccountNavigationItem : WinoNavigationViewItem
     {
         base.OnApplyTemplate();
 
-        _itemsRepeater = GetTemplateChild(PART_NavigationViewItemMenuItemsHost) as ItemsRepeater;
-        _selectionIndicator = GetTemplateChild(PART_SelectionIndicator) as Windows.UI.Xaml.Shapes.Rectangle;
+        _itemsRepeater = (GetTemplateChild(PART_NavigationViewItemMenuItemsHost) as ItemsRepeater)!;
+        _selectionIndicator = (GetTemplateChild(PART_SelectionIndicator) as Microsoft.UI.Xaml.Shapes.Rectangle)!;
 
         UpdateSelectionBorder();
     }
diff --git a/Wino.Mail.WinUI/Controls/Advanced/WinoItemsView.cs b/Wino.Mail.WinUI/Controls/Advanced/WinoItemsView.cs
new file mode 100644
index 00000000..c3a705b6
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Advanced/WinoItemsView.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.WinUI.Controls.Advanced;
+
+[Obsolete("ItemsView sucks. Hard to deal with virtualization issues. Use ListView. This control is here to wise up anyone who tries to use it.")]
+public partial class WinoItemsView : ItemsView
+{
+    private const string PART_ScrollView = nameof(PART_ScrollView);
+
+    private ScrollView? _internalScrollView;
+
+    [GeneratedDependencyProperty]
+    public partial ICommand? LoadMoreCommand { get; set; }
+
+    public IEnumerable<object>? CastedItemsSource => ItemsSource as IEnumerable<object>;
+
+    public WinoItemsView()
+    {
+        DefaultStyleKey = typeof(ItemsView);
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _internalScrollView = GetTemplateChild("PART_ScrollView") as ScrollView ?? throw new System.Exception("Can't find the ScrollView in WinoItemsView.");
+
+        _internalScrollView.ViewChanged -= InternalScrollViewPositionChanged;
+        _internalScrollView.ViewChanged += InternalScrollViewPositionChanged;
+    }
+
+    private void InternalScrollViewPositionChanged(ScrollView sender, object args)
+    {
+        if (_internalScrollView == null) return;
+
+        // No need to raise init request if there are no items in the list.
+        if (ItemsSource == null) return;
+
+        double progress = sender.VerticalOffset / sender.ScrollableHeight;
+
+        // Trigger when scrolled past 90% of total height
+        if (progress >= 0.9) LoadMoreCommand?.Execute(null);
+    }
+
+    public bool SelectMailItemContainer(MailItemViewModel mailItemViewModel)
+    {
+        return true;
+    }
+
+    /// <summary>
+    /// Recursively clears all selections except the given mail.
+    /// </summary>
+    /// <param name="exceptViewModel">Exceptional mail item to be not unselected.</param>
+    /// <param name="preserveThreadExpanding">Whether expansion states of thread containers should stay as it is or not.</param>
+    public void ClearSelections(MailItemViewModel? exceptViewModel = null, bool preserveThreadExpanding = false)
+    {
+        if (CastedItemsSource == null) return;
+
+        foreach (var item in CastedItemsSource)
+        {
+            if (item is MailItemViewModel mailItemViewModel)
+            {
+                if (mailItemViewModel != exceptViewModel)
+                {
+                    mailItemViewModel.IsSelected = false;
+                }
+            }
+            else if (item is ThreadMailItemViewModel threadMailItemViewModel)
+            {
+                threadMailItemViewModel.IsSelected = false;
+
+                if (!preserveThreadExpanding) threadMailItemViewModel.IsThreadExpanded = false;
+
+                foreach (var childMail in threadMailItemViewModel.ThreadEmails)
+                {
+                    if (childMail != exceptViewModel)
+                    {
+                        childMail.IsSelected = false;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml b/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml
new file mode 100644
index 00000000..cf49e1f9
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml
@@ -0,0 +1,328 @@
+<UserControl
+    x:Class="Wino.Mail.WinUI.Controls.AiActionsPanel"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Wino.Core.Domain.Models.Ai"
+    x:Name="root"
+    Loaded="OnLoaded"
+    Unloaded="OnUnloaded"
+    mc:Ignorable="d">
+
+    <Border
+        Padding="14"
+        Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+        BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+        BorderThickness="1"
+        CornerRadius="10">
+        <Grid>
+            <StackPanel Spacing="14">
+                <ProgressBar
+                    x:Name="BusyProgressBar"
+                    IsIndeterminate="True"
+                    Visibility="Collapsed" />
+
+                <StackPanel x:Name="LoadingPanel" Spacing="12">
+                    <StackPanel Orientation="Horizontal" Spacing="10">
+                        <ProgressRing
+                            Width="20"
+                            Height="20"
+                            IsActive="True" />
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            Style="{StaticResource BodyStrongTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.AiActions_CheckingStatus, Mode=OneWay}" />
+                    </StackPanel>
+                </StackPanel>
+
+                <StackPanel
+                    x:Name="SignedOutPanel"
+                    Spacing="14"
+                    Visibility="Collapsed">
+                    <Border
+                        Height="120"
+                        Padding="18"
+                        CornerRadius="12">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                <GradientStop Offset="0" Color="#1A6EE7B7" />
+                                <GradientStop Offset="0.55" Color="#2038BDF8" />
+                                <GradientStop Offset="1" Color="#1A818CF8" />
+                            </LinearGradientBrush>
+                        </Border.Background>
+                        <Grid ColumnSpacing="14">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <Border
+                                Width="56"
+                                Height="56"
+                                VerticalAlignment="Top"
+                                Background="#22FFFFFF"
+                                CornerRadius="28">
+                                <FontIcon
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                    FontSize="26"
+                                    Foreground="White"
+                                    Glyph="&#xE945;" />
+                            </Border>
+
+                            <StackPanel Grid.Column="1" Spacing="6">
+                                <TextBlock
+                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                    Text="{x:Bind domain:Translator.AiActions_SignedOutTitle, Mode=OneWay}"
+                                    TextWrapping="WrapWholeWords" />
+                                <TextBlock
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind domain:Translator.AiActions_SignedOutDescription, Mode=OneWay}"
+                                    TextWrapping="WrapWholeWords" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+
+                    <Grid ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Button
+                            Click="SignInButton_Click"
+                            Content="{x:Bind domain:Translator.Buttons_SignIn, Mode=OneWay}"
+                            Style="{StaticResource AccentButtonStyle}" />
+                        <Button
+                            Grid.Column="1"
+                            Click="CreateAccountButton_Click"
+                            Content="{x:Bind domain:Translator.Buttons_CreateAccount, Mode=OneWay}" />
+                    </Grid>
+                </StackPanel>
+
+                <StackPanel
+                    x:Name="PurchasePanel"
+                    Spacing="14"
+                    Visibility="Collapsed">
+                    <Border
+                        Padding="16"
+                        Background="{ThemeResource CardBackgroundFillColorTertiaryBrush}"
+                        CornerRadius="12">
+                        <StackPanel Spacing="8">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.AiActions_NoPackTitle, Mode=OneWay}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource BodyTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.AiActions_NoPackDescription, Mode=OneWay}"
+                                TextWrapping="WrapWholeWords" />
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <Border
+                                    Padding="8,2"
+                                    Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                    CornerRadius="8">
+                                    <TextBlock Foreground="White" Text="{x:Bind domain:Translator.WinoAccount_Management_AiPackPromoPrice, Mode=OneWay}" />
+                                </Border>
+                                <Border
+                                    Padding="8,2"
+                                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                                    CornerRadius="8">
+                                    <TextBlock Text="{x:Bind domain:Translator.WinoAccount_Management_AiPackPromoRequests, Mode=OneWay}" />
+                                </Border>
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+
+                    <Button
+                        HorizontalAlignment="Left"
+                        Click="PurchaseButton_Click"
+                        Content="{x:Bind domain:Translator.WinoAccount_Management_AiPackGetButton, Mode=OneWay}"
+                        Style="{StaticResource AccentButtonStyle}" />
+                </StackPanel>
+
+                <Grid
+                    x:Name="ReadyPanel"
+                    ColumnSpacing="12"
+                    Visibility="Collapsed">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <!--  Column 1: Action tabs  -->
+                    <controls:Segmented
+                        x:Name="ActionSelector"
+                        Height="30"
+                        VerticalAlignment="Center"
+                        SelectionChanged="ActionSelector_SelectionChanged"
+                        Style="{StaticResource ButtonSegmentedStyle}">
+                        <controls:SegmentedItem
+                            x:Name="TranslateSegment"
+                            Padding="12,6"
+                            Content="{x:Bind domain:Translator.WinoAccount_Management_AiPackFeatureTranslate, Mode=OneWay}">
+                            <controls:SegmentedItem.Icon>
+                                <SymbolIcon Symbol="Switch" />
+                            </controls:SegmentedItem.Icon>
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem
+                            x:Name="RewriteSegment"
+                            Padding="12,6"
+                            Content="{x:Bind domain:Translator.WinoAccount_Management_AiPackFeatureRewrite, Mode=OneWay}">
+                            <controls:SegmentedItem.Icon>
+                                <SymbolIcon Symbol="Edit" />
+                            </controls:SegmentedItem.Icon>
+                        </controls:SegmentedItem>
+                        <controls:SegmentedItem
+                            x:Name="SummarizeSegment"
+                            Padding="12,6"
+                            Content="{x:Bind domain:Translator.WinoAccount_Management_AiPackFeatureSummarize, Mode=OneWay}">
+                            <controls:SegmentedItem.Icon>
+                                <SymbolIcon Symbol="Bullets" />
+                            </controls:SegmentedItem.Icon>
+                        </controls:SegmentedItem>
+                    </controls:Segmented>
+
+                    <!--  Column 2: Action-specific options  -->
+                    <Grid Grid.Column="1" ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <!--  Translate options  -->
+                        <StackPanel
+                            x:Name="TranslateOptionsPanel"
+                            Orientation="Horizontal"
+                            Spacing="8"
+                            Visibility="Collapsed">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Composer_AiTranslateLanguage, Mode=OneWay}" />
+                            <ComboBox
+                                x:Name="TranslateLanguageComboBox"
+                                MinWidth="120"
+                                SelectionChanged="TranslateLanguageComboBox_SelectionChanged">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate x:DataType="models:AiTranslateLanguageOption">
+                                        <TextBlock Text="{x:Bind Label}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <Button
+                                x:Name="RunTranslateButton"
+                                Click="RunTranslateButton_Click"
+                                Content="{x:Bind domain:Translator.Composer_AiTranslateApply, Mode=OneWay}"
+                                Style="{StaticResource AccentButtonStyle}" />
+                        </StackPanel>
+
+                        <!--  Rewrite options  -->
+                        <StackPanel
+                            x:Name="RewriteOptionsPanel"
+                            Spacing="8"
+                            Visibility="Collapsed">
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <TextBlock
+                                    VerticalAlignment="Center"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind domain:Translator.Composer_AiRewriteMode, Mode=OneWay}" />
+                                <ComboBox
+                                    x:Name="RewriteModeComboBox"
+                                    MinWidth="140"
+                                    SelectionChanged="RewriteModeComboBox_SelectionChanged">
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate x:DataType="models:AiRewriteModeOption">
+                                            <TextBlock Text="{x:Bind Label}" />
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
+                                </ComboBox>
+                                <Button
+                                    x:Name="RunRewriteButton"
+                                    Click="RunRewriteButton_Click"
+                                    Content="{x:Bind domain:Translator.Composer_AiRewriteApply, Mode=OneWay}"
+                                    Style="{StaticResource AccentButtonStyle}" />
+                            </StackPanel>
+                            <TextBlock
+                                x:Name="RewriteDescriptionTextBlock"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                TextWrapping="WrapWholeWords" />
+                            <TextBox
+                                x:Name="CustomRewriteTextBox"
+                                PlaceholderText="{x:Bind domain:Translator.Composer_AiRewriteCustomPlaceholder, Mode=OneWay}"
+                                Visibility="Collapsed" />
+                        </StackPanel>
+
+                        <!--  Summarize options  -->
+                        <StackPanel
+                            x:Name="SummarizeOptionsPanel"
+                            Spacing="8"
+                            Visibility="Collapsed">
+
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <TextBlock
+                                    VerticalAlignment="Center"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind domain:Translator.Composer_AiTranslateLanguage, Mode=OneWay}" />
+                                <ComboBox
+                                    x:Name="SummarizeLanguageComboBox"
+                                    MinWidth="120"
+                                    SelectionChanged="SummarizeLanguageComboBox_SelectionChanged">
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate x:DataType="models:AiTranslateLanguageOption">
+                                            <TextBlock Text="{x:Bind Label}" />
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
+                                </ComboBox>
+
+                                <Button
+                                    x:Name="RunSummarizeButton"
+                                    HorizontalAlignment="Left"
+                                    Click="RunSummarizeButton_Click"
+                                    Content="{x:Bind domain:Translator.WinoAccount_Management_AiPackFeatureSummarize, Mode=OneWay}"
+                                    Style="{StaticResource AccentButtonStyle}" />
+                                <FontIcon
+                                    x:Name="SummarizeCachedIndicator"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                    FontSize="16"
+                                    Foreground="#2AA84A"
+                                    Glyph="&#xE73E;"
+                                    ToolTipService.ToolTip="{x:Bind domain:Translator.Composer_AiSummarize, Mode=OneWay}"
+                                    Visibility="Collapsed" />
+                            </StackPanel>
+
+                        </StackPanel>
+
+                    </Grid>
+
+                    <!--  Column 3: Progress  -->
+                    <StackPanel
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <ProgressBar
+                            x:Name="UsageProgressBar"
+                            Width="100"
+                            VerticalAlignment="Center"
+                            Maximum="1000"
+                            Value="0" />
+                        <TextBlock
+                            x:Name="UsageSummaryTextBlock"
+                            VerticalAlignment="Center"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}" />
+                    </StackPanel>
+                </Grid>
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml.cs b/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml.cs
new file mode 100644
index 00000000..19b4a71a
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/AiActionsPanel.xaml.cs
@@ -0,0 +1,760 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Ai;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Mail.WinUI.Services;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class AiActionsPanel : UserControl, IDisposable
+{
+    public event EventHandler? CloseRequested;
+    private readonly IWinoAccountProfileService _profileService = App.Current.Services.GetRequiredService<IWinoAccountProfileService>();
+    private readonly IStoreManagementService _storeManagementService = App.Current.Services.GetRequiredService<IStoreManagementService>();
+    private readonly IMailDialogService _dialogService = App.Current.Services.GetRequiredService<IMailDialogService>();
+    private readonly IAiActionOptionsService _optionsService = App.Current.Services.GetRequiredService<IAiActionOptionsService>();
+    private readonly IPreferencesService _preferencesService = App.Current.Services.GetRequiredService<IPreferencesService>();
+
+    private bool _disposedValue;
+    private bool _isRefreshing;
+    private bool _isBusy;
+    private AiActionType _lastConfigurableAction = AiActionType.Translate;
+    private bool _hasCachedSummary;
+    private CancellationTokenSource? _actionCancellationTokenSource;
+    private IReadOnlyList<AiTranslateLanguageOption> _translateOptions = Array.Empty<AiTranslateLanguageOption>();
+    private IReadOnlyList<AiRewriteModeOption> _rewriteOptions = Array.Empty<AiRewriteModeOption>();
+
+    [GeneratedDependencyProperty(DefaultValue = AiActionType.None)]
+    public partial AiActionType AvailableActions { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial IAiHtmlActionHost? HtmlHost { get; set; }
+
+    public AiTranslateLanguageOption? SelectedTranslateLanguageOption { get; set; }
+
+    public AiTranslateLanguageOption? SelectedSummarizeLanguageOption { get; set; }
+
+    public AiRewriteModeOption? SelectedRewriteModeOption { get; set; }
+
+    public AiActionsPanel()
+    {
+        InitializeComponent();
+    }
+
+    public void CancelPendingOperation()
+    {
+        _actionCancellationTokenSource?.Cancel();
+    }
+
+    public void Dispose()
+    {
+        if (_disposedValue)
+        {
+            return;
+        }
+
+        _disposedValue = true;
+        CancelAndDisposeActionCancellationToken();
+    }
+
+    partial void OnAvailableActionsChanged(AiActionType newValue)
+    {
+        UpdateActionAvailability();
+        ApplySelectedAction(SelectDefaultAction());
+        _ = RefreshCachedSummaryStateAsync();
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        LoadOptions();
+        UpdateActionAvailability();
+        ApplySelectedAction(SelectDefaultAction());
+        _ = RefreshAvailabilityAsync();
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        CancelPendingOperation();
+    }
+
+    private void LoadOptions()
+    {
+        // Save current selections before replacing ItemsSource (which clears SelectedItem).
+        var previousTranslateCode = SelectedTranslateLanguageOption?.Code;
+        var previousSummarizeCode = SelectedSummarizeLanguageOption?.Code;
+        var previousRewriteMode = SelectedRewriteModeOption?.Mode;
+        var preferredTranslateCode = string.IsNullOrWhiteSpace(previousTranslateCode)
+            ? _preferencesService.AiDefaultTranslationLanguageCode
+            : previousTranslateCode;
+        var preferredSummarizeCode = string.IsNullOrWhiteSpace(previousSummarizeCode)
+            ? _preferencesService.AiSummarizeLanguageCode
+            : previousSummarizeCode;
+
+        _translateOptions = _optionsService.GetTranslateLanguageOptions();
+        _rewriteOptions = _optionsService.GetRewriteModeOptions();
+
+        TranslateLanguageComboBox.ItemsSource = _translateOptions;
+        SummarizeLanguageComboBox.ItemsSource = _translateOptions;
+        RewriteModeComboBox.ItemsSource = _rewriteOptions;
+
+        // Restore selection by matching on value, falling back to first item.
+        SelectedTranslateLanguageOption = FindOption(_translateOptions, o => o.Code == preferredTranslateCode)
+                                          ?? FindOption(_translateOptions, o => o.Code == "en-US")
+                                          ?? (_translateOptions.Count > 0 ? _translateOptions[0] : null);
+        SelectedSummarizeLanguageOption = FindOption(_translateOptions, o => o.Code == preferredSummarizeCode)
+                                          ?? FindOption(_translateOptions, o => o.Code == "en-US")
+                                          ?? (_translateOptions.Count > 0 ? _translateOptions[0] : null);
+        SelectedRewriteModeOption = FindOption(_rewriteOptions, o => o.Mode == previousRewriteMode) ?? (_rewriteOptions.Count > 0 ? _rewriteOptions[0] : null);
+
+        TranslateLanguageComboBox.SelectedItem = SelectedTranslateLanguageOption;
+        SummarizeLanguageComboBox.SelectedItem = SelectedSummarizeLanguageOption;
+        RewriteModeComboBox.SelectedItem = SelectedRewriteModeOption;
+        UpdateRewriteOptionState();
+    }
+
+    private static T? FindOption<T>(IReadOnlyList<T> options, Func<T, bool> predicate) where T : class
+    {
+        foreach (var option in options)
+        {
+            if (predicate(option))
+            {
+                return option;
+            }
+        }
+
+        return null;
+    }
+
+    private void UpdateActionAvailability()
+    {
+        TranslateSegment.Visibility = HasAction(AiActionType.Translate) ? Visibility.Visible : Visibility.Collapsed;
+        RewriteSegment.Visibility = HasAction(AiActionType.Rewrite) ? Visibility.Visible : Visibility.Collapsed;
+        SummarizeSegment.Visibility = HasAction(AiActionType.Summarize) ? Visibility.Visible : Visibility.Collapsed;
+        SummarizeCachedIndicator.Visibility = HasAction(AiActionType.Summarize) && _hasCachedSummary ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private bool HasAction(AiActionType action) => (AvailableActions & action) == action;
+
+    private AiActionType SelectDefaultAction()
+    {
+        if (HasAction(AiActionType.Translate))
+        {
+            return AiActionType.Translate;
+        }
+
+        if (HasAction(AiActionType.Rewrite))
+        {
+            return AiActionType.Rewrite;
+        }
+
+        if (HasAction(AiActionType.Summarize))
+        {
+            return AiActionType.Summarize;
+        }
+
+        return AiActionType.None;
+    }
+
+    private void ApplySelectedAction(AiActionType action)
+    {
+        if (action is AiActionType.Translate or AiActionType.Rewrite)
+        {
+            _lastConfigurableAction = action;
+        }
+
+        ActionSelector.SelectedItem = action switch
+        {
+            AiActionType.Translate => TranslateSegment,
+            AiActionType.Rewrite => RewriteSegment,
+            AiActionType.Summarize => SummarizeSegment,
+            _ => null
+        };
+
+        TranslateOptionsPanel.Visibility = action == AiActionType.Translate ? Visibility.Visible : Visibility.Collapsed;
+        RewriteOptionsPanel.Visibility = action == AiActionType.Rewrite ? Visibility.Visible : Visibility.Collapsed;
+        SummarizeOptionsPanel.Visibility = action == AiActionType.Summarize ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    public async Task RefreshAvailabilityAsync()
+    {
+        if (_isRefreshing || _disposedValue)
+        {
+            return;
+        }
+
+        _isRefreshing = true;
+        SetBusyUi(isBusy: false, showLoading: true);
+
+        try
+        {
+            var account = await _profileService.GetAuthenticatedAccountAsync().ConfigureAwait(true);
+            if (account == null)
+            {
+                UpdateUsageSummary(string.Empty);
+                UpdatePanelState(showSignedOut: true);
+                return;
+            }
+
+            var hasAiPack = await _storeManagementService.HasProductAsync(WinoAddOnProductType.AI_PACK).ConfigureAwait(true);
+            if (!hasAiPack)
+            {
+                UpdateUsageSummary(string.Empty);
+                UpdatePanelState(showPurchase: true);
+                return;
+            }
+
+            var aiStatusResponse = await _profileService.GetAiStatusAsync().ConfigureAwait(true);
+            if (aiStatusResponse.IsSuccess && aiStatusResponse.Result != null)
+            {
+                UpdateUsageSummary(
+                    CreateUsageSummary(aiStatusResponse.Result),
+                    GetUsedCount(aiStatusResponse.Result),
+                    GetUsageLimit(aiStatusResponse.Result));
+            }
+            else
+            {
+                UpdateUsageSummary(Translator.WinoAccount_Management_AiPackUsageLoadFailed);
+            }
+
+            await RefreshCachedSummaryStateAsync().ConfigureAwait(true);
+            ApplySelectedAction(SelectDefaultAction());
+            UpdatePanelState(showReady: true);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (Exception)
+        {
+            UpdateUsageSummary(Translator.WinoAccount_Management_AiPackUsageLoadFailed);
+            UpdatePanelState(showReady: true);
+        }
+        finally
+        {
+            _isRefreshing = false;
+            SetBusyUi(_isBusy, showLoading: false);
+        }
+    }
+
+    private static string CreateUsageSummary(AiStatusResultDto aiStatus)
+    {
+        if (aiStatus.Used is int used && aiStatus.MonthlyLimit is int limit && limit > 0)
+        {
+            return string.Format(Translator.AiActions_UsageSummary, used, limit);
+        }
+
+        return Translator.WinoAccount_Management_AiPackUsageLoadFailed;
+    }
+
+    private static int GetUsedCount(AiStatusResultDto aiStatus)
+        => aiStatus.Used is int used ? used : 0;
+
+    private static string CreateUsageSummary(QuotaInfoDto quotaInfo)
+    {
+        if (quotaInfo.Used is int used && quotaInfo.MonthlyLimit is int limit && limit > 0)
+        {
+            return string.Format(Translator.AiActions_UsageSummary, used, limit);
+        }
+
+        return Translator.WinoAccount_Management_AiPackUsageLoadFailed;
+    }
+
+    private static int GetUsedCount(QuotaInfoDto quotaInfo)
+        => quotaInfo.Used is int used ? used : 0;
+
+    private static int GetUsageLimit(QuotaInfoDto quotaInfo)
+        => quotaInfo.MonthlyLimit is int limit && limit > 0 ? limit : 1000;
+
+    private static int GetUsageLimit(AiStatusResultDto aiStatus)
+        => aiStatus.MonthlyLimit is int limit && limit > 0 ? limit : 1000;
+
+
+    private void UpdatePanelState(bool showLoading = false, bool showSignedOut = false, bool showPurchase = false, bool showReady = false)
+    {
+        LoadingPanel.Visibility = showLoading ? Visibility.Visible : Visibility.Collapsed;
+        SignedOutPanel.Visibility = showSignedOut ? Visibility.Visible : Visibility.Collapsed;
+        PurchasePanel.Visibility = showPurchase ? Visibility.Visible : Visibility.Collapsed;
+        ReadyPanel.Visibility = showReady ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private void UpdateUsageSummary(string usageText, int usedCount = 0)
+    {
+        UsageSummaryTextBlock.Text = usageText;
+        UsageProgressBar.Maximum = 1000;
+        UsageProgressBar.Value = Math.Min(usedCount, 1000);
+    }
+
+    private void UpdateUsageSummary(string usageText, int usedCount, int usageLimit)
+    {
+        var normalizedLimit = usageLimit > 0 ? usageLimit : 1000;
+        UsageSummaryTextBlock.Text = usageText;
+        UsageProgressBar.Maximum = normalizedLimit;
+        UsageProgressBar.Value = Math.Min(usedCount, normalizedLimit);
+    }
+
+    private void SetBusyUi(bool isBusy, bool showLoading)
+    {
+        _isBusy = isBusy;
+
+        BusyProgressBar.Visibility = isBusy ? Visibility.Visible : Visibility.Collapsed;
+        ActionSelector.IsEnabled = !isBusy;
+        TranslateLanguageComboBox.IsEnabled = !isBusy;
+        SummarizeLanguageComboBox.IsEnabled = !isBusy;
+        RewriteModeComboBox.IsEnabled = !isBusy;
+        CustomRewriteTextBox.IsEnabled = !isBusy;
+        RunTranslateButton.IsEnabled = !isBusy;
+        RunRewriteButton.IsEnabled = !isBusy;
+        RunSummarizeButton.IsEnabled = !isBusy;
+        SignedOutPanel.IsHitTestVisible = !isBusy;
+        PurchasePanel.IsHitTestVisible = !isBusy;
+
+        if (showLoading)
+        {
+            UpdatePanelState(showLoading: true);
+        }
+        else if (ReadyPanel.Visibility == Visibility.Visible)
+        {
+            UpdatePanelState(showReady: true);
+        }
+        else if (SignedOutPanel.Visibility == Visibility.Visible)
+        {
+            UpdatePanelState(showSignedOut: true);
+        }
+        else if (PurchasePanel.Visibility == Visibility.Visible)
+        {
+            UpdatePanelState(showPurchase: true);
+        }
+    }
+
+    private async void SignInButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (_isBusy)
+        {
+            return;
+        }
+
+        var account = await _dialogService.ShowWinoAccountLoginDialogAsync();
+        if (account != null)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Info, string.Format(Translator.WinoAccount_LoginSuccessMessage, account.Email), InfoBarMessageType.Success);
+        }
+
+        await RefreshAvailabilityAsync();
+    }
+
+    private async void CreateAccountButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (_isBusy)
+        {
+            return;
+        }
+
+        var account = await _dialogService.ShowWinoAccountRegistrationDialogAsync();
+        if (account != null)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Info, string.Format(Translator.WinoAccount_RegisterSuccessMessage, account.Email), InfoBarMessageType.Success);
+        }
+
+        await RefreshAvailabilityAsync();
+    }
+
+    private async void PurchaseButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (_isBusy)
+        {
+            return;
+        }
+
+        SetBusyUi(isBusy: true, showLoading: false);
+
+        try
+        {
+            var purchaseResult = await _storeManagementService.PurchaseAsync(WinoAddOnProductType.AI_PACK).ConfigureAwait(true);
+
+            if (purchaseResult == StorePurchaseResult.NotPurchased)
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, Translator.WinoAccount_Management_PurchaseStartFailed, InfoBarMessageType.Error);
+                return;
+            }
+
+            var syncResult = await _profileService.SyncStoreEntitlementsAsync().ConfigureAwait(true);
+            if (!syncResult.IsSuccess && !string.Equals(syncResult.ErrorCode, "MissingAccessToken", StringComparison.Ordinal))
+            {
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, Translator.WinoAccount_Management_StoreSyncFailed, InfoBarMessageType.Error);
+                return;
+            }
+
+            if (purchaseResult == StorePurchaseResult.AlreadyPurchased)
+            {
+                _dialogService.InfoBarMessage(Translator.Info_PurchaseExistsTitle, Translator.Info_PurchaseExistsMessage, InfoBarMessageType.Warning);
+            }
+            else
+            {
+                _dialogService.InfoBarMessage(Translator.Info_PurchaseThankYouTitle, Translator.Info_PurchaseThankYouMessage, InfoBarMessageType.Success);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (Exception)
+        {
+            _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, Translator.WinoAccount_Management_PurchaseStartFailed, InfoBarMessageType.Error);
+        }
+        finally
+        {
+            SetBusyUi(isBusy: false, showLoading: false);
+            await RefreshAvailabilityAsync();
+        }
+    }
+
+    private void ActionSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (ReferenceEquals(ActionSelector.SelectedItem, TranslateSegment))
+        {
+            ApplySelectedAction(AiActionType.Translate);
+            return;
+        }
+
+        if (ReferenceEquals(ActionSelector.SelectedItem, RewriteSegment))
+        {
+            ApplySelectedAction(AiActionType.Rewrite);
+            return;
+        }
+
+        if (ReferenceEquals(ActionSelector.SelectedItem, SummarizeSegment))
+        {
+            ApplySelectedAction(AiActionType.Summarize);
+            _ = RefreshCachedSummaryStateAsync();
+        }
+    }
+
+    private void TranslateLanguageComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (TranslateLanguageComboBox.SelectedItem is AiTranslateLanguageOption option)
+        {
+            SelectedTranslateLanguageOption = option;
+            _preferencesService.AiDefaultTranslationLanguageCode = option.Code;
+        }
+    }
+
+    private void RewriteModeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (RewriteModeComboBox.SelectedItem is AiRewriteModeOption option)
+        {
+            SelectedRewriteModeOption = option;
+            UpdateRewriteOptionState();
+        }
+    }
+
+    private void SummarizeLanguageComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (SummarizeLanguageComboBox.SelectedItem is AiTranslateLanguageOption option)
+        {
+            SelectedSummarizeLanguageOption = option;
+            _preferencesService.AiSummarizeLanguageCode = option.Code;
+        }
+    }
+
+    private void UpdateRewriteOptionState()
+    {
+        var isCustom = SelectedRewriteModeOption?.IsCustom ?? false;
+        RewriteDescriptionTextBlock.Text = SelectedRewriteModeOption?.Description ?? string.Empty;
+        RewriteDescriptionTextBlock.Visibility = string.IsNullOrWhiteSpace(RewriteDescriptionTextBlock.Text) ? Visibility.Collapsed : Visibility.Visible;
+        CustomRewriteTextBox.Visibility = isCustom ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private async void RunTranslateButton_Click(object sender, RoutedEventArgs e)
+    {
+        await ExecuteAiActionAsync(AiActionType.Translate);
+    }
+
+    private async void RunRewriteButton_Click(object sender, RoutedEventArgs e)
+    {
+        await ExecuteAiActionAsync(AiActionType.Rewrite);
+    }
+
+    private async void RunSummarizeButton_Click(object sender, RoutedEventArgs e)
+    {
+        await ExecuteAiActionAsync(AiActionType.Summarize);
+    }
+
+    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    {
+        CancelPendingOperation();
+        CloseRequested?.Invoke(this, EventArgs.Empty);
+    }
+
+    private async Task ExecuteAiActionAsync(AiActionType action)
+    {
+        if (_isBusy)
+        {
+            _dialogService.InfoBarMessage(Translator.Composer_AiBusyTitle, Translator.Composer_AiBusyMessage, InfoBarMessageType.Warning);
+            return;
+        }
+
+        if (HtmlHost == null)
+        {
+            return;
+        }
+
+        CancelAndDisposeActionCancellationToken();
+        _actionCancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = _actionCancellationTokenSource.Token;
+
+        SetBusyUi(isBusy: true, showLoading: false);
+
+        try
+        {
+            if (action == AiActionType.Translate && SelectedTranslateLanguageOption == null)
+            {
+                _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, Translator.WinoAccount_Error_ValidationFailed, InfoBarMessageType.Error);
+                return;
+            }
+
+            if (action == AiActionType.Rewrite && string.IsNullOrWhiteSpace(ResolveRewriteMode()))
+            {
+                _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, Translator.WinoAccount_Error_ValidationFailed, InfoBarMessageType.Error);
+                return;
+            }
+
+            if (action == AiActionType.Summarize && SelectedSummarizeLanguageOption == null)
+            {
+                _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, Translator.WinoAccount_Error_ValidationFailed, InfoBarMessageType.Error);
+                return;
+            }
+
+            if (action == AiActionType.Translate)
+            {
+                var cachedTranslation = await HtmlHost.TryGetCachedTranslationHtmlAsync(SelectedTranslateLanguageOption?.Code ?? string.Empty, cancellationToken).ConfigureAwait(true);
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (!string.IsNullOrWhiteSpace(cachedTranslation))
+                {
+                    await HtmlHost.ApplyHtmlResultAsync(cachedTranslation, cancellationToken).ConfigureAwait(true);
+                    return;
+                }
+            }
+
+            if (action == AiActionType.Summarize)
+            {
+                var cachedSummary = await HtmlHost.TryGetCachedSummaryTextAsync(cancellationToken).ConfigureAwait(true);
+                cancellationToken.ThrowIfCancellationRequested();
+
+                if (!string.IsNullOrWhiteSpace(cachedSummary))
+                {
+                    _hasCachedSummary = true;
+                    UpdateActionAvailability();
+                    await ShowSummaryDialogAsync(cachedSummary).ConfigureAwait(true);
+                    return;
+                }
+            }
+
+            var html = await HtmlHost.GetCurrentHtmlAsync(cancellationToken).ConfigureAwait(true);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (string.IsNullOrWhiteSpace(html))
+            {
+                _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, Translator.WinoAccount_Error_AiHtmlEmpty, InfoBarMessageType.Error);
+                return;
+            }
+
+            var response = action switch
+            {
+                AiActionType.Translate => await _profileService.TranslateAsync(html, SelectedTranslateLanguageOption?.Code ?? string.Empty, cancellationToken).ConfigureAwait(true),
+                AiActionType.Rewrite => await _profileService.RewriteAsync(html, ResolveRewriteMode(), cancellationToken).ConfigureAwait(true),
+                AiActionType.Summarize => await _profileService.SummarizeAsync(html, SelectedSummarizeLanguageOption?.Code ?? string.Empty, cancellationToken).ConfigureAwait(true),
+                _ => ApiEnvelope<AiTextResultDto>.Failure(ApiErrorCodes.ValidationFailed)
+            };
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (!response.IsSuccess || response.Result == null || string.IsNullOrWhiteSpace(response.Result.Html))
+            {
+                _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, WinoAccountAiErrorTranslator.Format(response.ErrorCode, null), InfoBarMessageType.Error);
+                return;
+            }
+
+            if (response.Quota != null)
+            {
+                UpdateUsageSummary(
+                    CreateUsageSummary(response.Quota),
+                    GetUsedCount(response.Quota),
+                    GetUsageLimit(response.Quota));
+            }
+
+            if (action == AiActionType.Translate)
+            {
+                await HtmlHost.SaveCachedTranslationHtmlAsync(SelectedTranslateLanguageOption?.Code ?? string.Empty, response.Result.Html, cancellationToken).ConfigureAwait(true);
+                cancellationToken.ThrowIfCancellationRequested();
+                await HtmlHost.ApplyHtmlResultAsync(response.Result.Html, cancellationToken).ConfigureAwait(true);
+                return;
+            }
+
+            if (action == AiActionType.Summarize)
+            {
+                await HtmlHost.SaveCachedSummaryTextAsync(response.Result.Html, cancellationToken).ConfigureAwait(true);
+                cancellationToken.ThrowIfCancellationRequested();
+
+                _hasCachedSummary = true;
+                UpdateActionAvailability();
+
+                var savedSummary = await HtmlHost.TryGetCachedSummaryTextAsync(cancellationToken).ConfigureAwait(true);
+                cancellationToken.ThrowIfCancellationRequested();
+
+                await ShowSummaryDialogAsync(string.IsNullOrWhiteSpace(savedSummary) ? response.Result.Html : savedSummary).ConfigureAwait(true);
+                return;
+            }
+
+            await HtmlHost.ApplyHtmlResultAsync(response.Result.Html, cancellationToken).ConfigureAwait(true);
+        }
+        catch (OperationCanceledException)
+        {
+        }
+        catch (Exception ex)
+        {
+            _dialogService.InfoBarMessage(Translator.Composer_AiErrorTitle, WinoAccountAiErrorTranslator.Format(null, ex.Message), InfoBarMessageType.Error);
+        }
+        finally
+        {
+            SetBusyUi(isBusy: false, showLoading: false);
+
+            if (_actionCancellationTokenSource != null)
+            {
+                _actionCancellationTokenSource.Dispose();
+                _actionCancellationTokenSource = null;
+            }
+
+            // Summarize no longer auto-switches back; the user explicitly selected the tab.
+        }
+    }
+
+    private string ResolveRewriteMode()
+    {
+        if (SelectedRewriteModeOption == null)
+        {
+            return string.Empty;
+        }
+
+        if (!SelectedRewriteModeOption.IsCustom)
+        {
+            return SelectedRewriteModeOption.Mode;
+        }
+
+        return CustomRewriteTextBox.Text?.Trim() ?? string.Empty;
+    }
+
+    private async Task RefreshCachedSummaryStateAsync()
+    {
+        if (HtmlHost == null || !HasAction(AiActionType.Summarize))
+        {
+            _hasCachedSummary = false;
+            UpdateActionAvailability();
+            return;
+        }
+
+        try
+        {
+            var cachedSummary = await HtmlHost.TryGetCachedSummaryTextAsync(CancellationToken.None).ConfigureAwait(true);
+            _hasCachedSummary = !string.IsNullOrWhiteSpace(cachedSummary);
+        }
+        catch (Exception)
+        {
+            _hasCachedSummary = false;
+        }
+
+        UpdateActionAvailability();
+    }
+
+    private async Task ShowSummaryDialogAsync(string summary)
+    {
+        if (HtmlHost == null)
+        {
+            await _dialogService.ShowMessageAsync(summary, Translator.Composer_AiSummarize, WinoCustomMessageDialogIcon.Information);
+            return;
+        }
+
+        var summaryTextBox = new TextBox
+        {
+            Text = summary,
+            IsReadOnly = true,
+            AcceptsReturn = true,
+            TextWrapping = TextWrapping.Wrap,
+            MinHeight = 240,
+            MaxHeight = 420,
+            BorderThickness = new Thickness(0),
+            Background = new SolidColorBrush(Windows.UI.Color.FromArgb(0, 0, 0, 0))
+        };
+
+        var dialog = new ContentDialog
+        {
+            XamlRoot = XamlRoot,
+            RequestedTheme = ActualTheme,
+            Title = Translator.Composer_AiSummarize,
+            PrimaryButtonText = Translator.Buttons_Save,
+            SecondaryButtonText = Translator.Buttons_Close,
+            DefaultButton = ContentDialogButton.Secondary,
+            Content = new ScrollViewer
+            {
+                Content = summaryTextBox,
+                VerticalScrollBarVisibility = ScrollBarVisibility.Auto,
+                HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled
+            }
+        };
+
+        dialog.PrimaryButtonClick += async (sender, args) =>
+        {
+            var deferral = args.GetDeferral();
+
+            try
+            {
+                var configuredSummarySavePath = _preferencesService.AiSummarySavePath;
+                var path = !string.IsNullOrWhiteSpace(configuredSummarySavePath) && Directory.Exists(configuredSummarySavePath)
+                    ? Path.Combine(configuredSummarySavePath, HtmlHost.GetSuggestedSummaryFileName())
+                    : await _dialogService.PickFilePathAsync(HtmlHost.GetSuggestedSummaryFileName());
+
+                if (string.IsNullOrWhiteSpace(path))
+                {
+                    args.Cancel = true;
+                    return;
+                }
+
+                await File.WriteAllTextAsync(path, summary);
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Info, string.Format(Translator.ClipboardTextCopied_Message, Path.GetFileName(path)), InfoBarMessageType.Success);
+            }
+            catch (Exception ex)
+            {
+                args.Cancel = true;
+                _dialogService.InfoBarMessage(Translator.GeneralTitle_Error, ex.Message, InfoBarMessageType.Error);
+            }
+            finally
+            {
+                deferral.Complete();
+            }
+        };
+
+        await dialog.ShowAsync();
+    }
+
+    private void CancelAndDisposeActionCancellationToken()
+    {
+        if (_actionCancellationTokenSource == null)
+        {
+            return;
+        }
+
+        _actionCancellationTokenSource.Cancel();
+        _actionCancellationTokenSource.Dispose();
+        _actionCancellationTokenSource = null;
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml b/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml
new file mode 100644
index 00000000..a738aca8
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml
@@ -0,0 +1,32 @@
+<controls:Segmented
+    x:Class="Wino.Mail.WinUI.Controls.AppModeFooterSwitcherControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:domain="using:Wino.Core.Domain"
+    Padding="0"
+    HorizontalAlignment="Stretch"
+    Loaded="ControlLoaded"
+    SelectionChanged="ModeSegmentedControlSelectionChanged"
+    Unloaded="ControlUnloaded">
+    <controls:SegmentedItem Padding="0" ToolTipService.ToolTip="{x:Bind domain:Translator.KeyboardShortcuts_ModeMail}">
+        <controls:SegmentedItem.Icon>
+            <SymbolIcon Symbol="Mail" />
+        </controls:SegmentedItem.Icon>
+    </controls:SegmentedItem>
+    <controls:SegmentedItem Padding="0" ToolTipService.ToolTip="{x:Bind domain:Translator.KeyboardShortcuts_ModeCalendar}">
+        <controls:SegmentedItem.Icon>
+            <SymbolIcon Symbol="Calendar" />
+        </controls:SegmentedItem.Icon>
+    </controls:SegmentedItem>
+    <controls:SegmentedItem Padding="0" ToolTipService.ToolTip="{x:Bind domain:Translator.ContactsPage_Title}">
+        <controls:SegmentedItem.Icon>
+            <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE716;" />
+        </controls:SegmentedItem.Icon>
+    </controls:SegmentedItem>
+    <controls:SegmentedItem Padding="0" ToolTipService.ToolTip="{x:Bind domain:Translator.MenuSettings}">
+        <controls:SegmentedItem.Icon>
+            <SymbolIcon Symbol="Setting" />
+        </controls:SegmentedItem.Icon>
+    </controls:SegmentedItem>
+</controls:Segmented>
diff --git a/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml.cs b/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml.cs
new file mode 100644
index 00000000..c1069ee4
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/AppModeFooterSwitcherControl.xaml.cs
@@ -0,0 +1,113 @@
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class AppModeFooterSwitcherControl : Segmented
+{
+    private const double VerticalItemExtent = 44;
+    private readonly IStatePersistanceService _statePersistenceService;
+    private readonly INavigationService _navigationService;
+    private bool _isUpdatingSelection;
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        nameof(Orientation),
+        typeof(Orientation),
+        typeof(AppModeFooterSwitcherControl),
+        new PropertyMetadata(Orientation.Horizontal, OnOrientationChanged));
+
+    public Orientation Orientation
+    {
+        get => (Orientation)GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public AppModeFooterSwitcherControl()
+    {
+        _statePersistenceService = WinoApplication.Current.Services.GetRequiredService<IStatePersistanceService>();
+        _navigationService = WinoApplication.Current.Services.GetRequiredService<INavigationService>();
+
+        InitializeComponent();
+    }
+
+    private static void OnOrientationChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs _)
+    {
+        ((AppModeFooterSwitcherControl)dependencyObject).UpdateOrientationState();
+    }
+
+    private void ControlLoaded(object sender, RoutedEventArgs e)
+    {
+        _statePersistenceService.StatePropertyChanged += StatePropertyChanged;
+        UpdateOrientationState();
+        UpdateSelection(_statePersistenceService.ApplicationMode);
+    }
+
+    private void ControlUnloaded(object sender, RoutedEventArgs e)
+    {
+        _statePersistenceService.StatePropertyChanged -= StatePropertyChanged;
+    }
+    private void StatePropertyChanged(object? sender, string propertyName)
+    {
+        if (propertyName != nameof(IStatePersistanceService.ApplicationMode))
+            return;
+
+        DispatcherQueue.TryEnqueue(() => UpdateSelection(_statePersistenceService.ApplicationMode));
+    }
+
+    private void ModeSegmentedControlSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isUpdatingSelection)
+            return;
+
+        var selectedMode = SelectedIndex switch
+        {
+            1 => WinoApplicationMode.Calendar,
+            2 => WinoApplicationMode.Contacts,
+            3 => WinoApplicationMode.Settings,
+            _ => WinoApplicationMode.Mail
+        };
+
+        if (selectedMode == _statePersistenceService.ApplicationMode)
+            return;
+
+        _navigationService.ChangeApplicationMode(selectedMode);
+    }
+
+    private void UpdateSelection(WinoApplicationMode mode)
+    {
+        _isUpdatingSelection = true;
+        SelectedIndex = mode switch
+        {
+            WinoApplicationMode.Calendar => 1,
+            WinoApplicationMode.Contacts => 2,
+            WinoApplicationMode.Settings => 3,
+            _ => 0
+        };
+        _isUpdatingSelection = false;
+    }
+
+    private void UpdateOrientationState()
+    {
+        foreach (var item in Items)
+        {
+            if (item is not SegmentedItem segmentedItem)
+                continue;
+
+            if (Orientation == Orientation.Vertical)
+            {
+                segmentedItem.Width = VerticalItemExtent;
+                segmentedItem.Height = VerticalItemExtent;
+            }
+            else
+            {
+                segmentedItem.ClearValue(WidthProperty);
+                segmentedItem.ClearValue(HeightProperty);
+            }
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CalendarEmptySlotTappedEventArgs.cs b/Wino.Mail.WinUI/Controls/Calendar/CalendarEmptySlotTappedEventArgs.cs
new file mode 100644
index 00000000..19017c9e
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarEmptySlotTappedEventArgs.cs
@@ -0,0 +1,19 @@
+using System;
+using Microsoft.UI.Xaml;
+using Windows.Foundation;
+
+namespace Wino.Calendar.Controls;
+
+public sealed class CalendarEmptySlotTappedEventArgs : EventArgs
+{
+    public CalendarEmptySlotTappedEventArgs(DateTime clickedDate, Point anchorPoint, Size cellSize)
+    {
+        ClickedDate = clickedDate;
+        AnchorPoint = anchorPoint;
+        CellSize = cellSize;
+    }
+
+    public DateTime ClickedDate { get; }
+    public Point AnchorPoint { get; }
+    public Size CellSize { get; }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CalendarItemAccessor.cs b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemAccessor.cs
new file mode 100644
index 00000000..6153e094
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemAccessor.cs
@@ -0,0 +1,14 @@
+using System;
+using Wino.Calendar.ViewModels.Data;
+
+namespace Wino.Calendar.Controls;
+
+internal static class CalendarItemAccessor
+{
+    public static bool TryGetTimeRange(CalendarItemViewModel item, out DateTimeOffset start, out DateTimeOffset end)
+    {
+        start = new DateTimeOffset(item.StartDate);
+        end = new DateTimeOffset(item.EndDate);
+        return end > start;
+    }
+}
diff --git a/Wino.Calendar/Controls/CalendarItemCommandBarFlyout.cs b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemCommandBarFlyout.cs
similarity index 93%
rename from Wino.Calendar/Controls/CalendarItemCommandBarFlyout.cs
rename to Wino.Mail.WinUI/Controls/Calendar/CalendarItemCommandBarFlyout.cs
index 407a9ed5..46146559 100644
--- a/Wino.Calendar/Controls/CalendarItemCommandBarFlyout.cs
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemCommandBarFlyout.cs
@@ -1,5 +1,5 @@
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Calendar.ViewModels.Data;
 
 namespace Wino.Calendar.Controls;
diff --git a/Wino.Calendar/Controls/CalendarItemControl.xaml b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml
similarity index 77%
rename from Wino.Calendar/Controls/CalendarItemControl.xaml
rename to Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml
index abfc1766..485f625c 100644
--- a/Wino.Calendar/Controls/CalendarItemControl.xaml
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml
@@ -2,7 +2,7 @@
     x:Class="Wino.Calendar.Controls.CalendarItemControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Core.UWP.Controls"
+    xmlns:controls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:local="using:Wino.Calendar.Controls"
@@ -21,8 +21,9 @@
         DoubleTapped="ControlDoubleTapped"
         RightTapped="ControlRightTapped"
         Tapped="ControlTapped"
-        ToolTipService.ToolTip="{x:Bind CalendarItemTitle, Mode=OneWay}">
+        ToolTipService.ToolTip="{x:Bind CalendarItem.DisplayTitle, Mode=OneWay}">
         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5" />
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
@@ -36,20 +37,36 @@
             </local:CalendarItemCommandBarFlyout>
         </Grid.ContextFlyout>
 
+
         <Grid
             x:Name="MainBackground"
+            Grid.Column="1"
             Grid.ColumnSpan="2"
-            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(CalendarItem.AssignedCalendar.BackgroundColorHex), Mode=OneWay}" />
+            Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(CalendarItem.AssignedCalendar.BackgroundColorHex), Mode=OneWay}"
+            Opacity="0.9" />
 
         <Rectangle
             x:Name="MainBorder"
+            Grid.Column="1"
             Grid.ColumnSpan="2"
             Canvas.ZIndex="2"
             Stroke="{ThemeResource CalendarItemBorderBrush}"
             StrokeThickness="0" />
 
+        <!--  ShowAs Status Stripe  -->
+        <ContentControl
+            x:Name="ShowAsStripe"
+            Grid.Column="0"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            Canvas.ZIndex="10000"
+            Content="{x:Bind CalendarItem, Mode=OneWay}"
+            ContentTemplateSelector="{StaticResource ShowAsStripeSelector}"
+            IsTabStop="False" />
+
         <TextBlock
             x:Name="EventTitleTextblock"
+            Grid.Column="1"
             Margin="2,0"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Center"
@@ -57,14 +74,26 @@
             FontSize="13"
             Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(CalendarItem.AssignedCalendar.BackgroundColorHex), Mode=OneWay}"
             HorizontalTextAlignment="Center"
-            Text="{x:Bind CalendarItemTitle, Mode=OneWay}"
+            Text="{x:Bind CalendarItem.DisplayTitle, Mode=OneWay}"
             TextTrimming="CharacterEllipsis" />
 
+
+        <muxc:ProgressRing
+            x:Name="BusyRing"
+            Grid.Column="2"
+            Width="14"
+            Height="14"
+            Margin="0,2,2,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            IsActive="False"
+            Visibility="Collapsed" />
+
         <!--  TODO: Event attributes  -->
         <StackPanel
             x:Name="AttributeStack"
-            Grid.Column="1"
-            Margin="0,4,0,0"
+            Grid.Column="2"
+            Margin="0,4,4,0"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
             Orientation="Horizontal"
@@ -109,6 +138,20 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
+            <VisualStateGroup x:Name="BusyStates">
+                <VisualState x:Name="NotBusy" />
+                <VisualState x:Name="Busy">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind CalendarItem.IsBusy, Mode=OneWay, FallbackValue=False}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="MainBackground.Opacity" Value="0.55" />
+                        <Setter Target="BusyRing.IsActive" Value="True" />
+                        <Setter Target="BusyRing.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+
             <VisualStateGroup x:Name="EventDurationStates">
                 <!--  Regular event template in the panel.  -->
                 <VisualState x:Name="RegularEvent" />
@@ -116,8 +159,11 @@
                 <!--  All-Day template for top area.  -->
                 <VisualState x:Name="AllDayEvent">
                     <VisualState.Setters>
-
+                        <Setter Target="EventTitleTextblock.HorizontalAlignment" Value="Stretch" />
+                        <Setter Target="EventTitleTextblock.HorizontalTextAlignment" Value="Left" />
+                        <Setter Target="EventTitleTextblock.Margin" Value="6,0" />
                         <Setter Target="AttributeStack.VerticalAlignment" Value="Center" />
+                        <Setter Target="AttributeStack.Margin" Value="0,0,4,0" />
                         <Setter Target="MainGrid.MinHeight" Value="30" />
                         <Setter Target="MainBorder.StrokeThickness" Value="0" />
                     </VisualState.Setters>
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml.cs b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml.cs
new file mode 100644
index 00000000..09a12209
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarItemControl.xaml.cs
@@ -0,0 +1,116 @@
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using Itenso.TimePeriod;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Messages;
+using Wino.Core.Domain;
+namespace Wino.Calendar.Controls;
+
+public sealed partial class CalendarItemControl : UserControl
+{
+    // Single tap has a delay to report double taps properly.
+    private bool isSingleTap = false;
+
+    public static readonly DependencyProperty CalendarItemProperty = DependencyProperty.Register(nameof(CalendarItem), typeof(CalendarItemViewModel), typeof(CalendarItemControl), new PropertyMetadata(null, new PropertyChangedCallback(OnCalendarItemChanged)));
+    public static readonly DependencyProperty IsDraggingProperty = DependencyProperty.Register(nameof(IsDragging), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
+    public static readonly DependencyProperty IsCustomEventAreaProperty = DependencyProperty.Register(nameof(IsCustomEventArea), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
+
+    /// <summary>
+    /// Whether the control is displaying as regular event or all-multi day area in the day control.
+    /// </summary>
+    public bool IsCustomEventArea
+    {
+        get { return (bool)GetValue(IsCustomEventAreaProperty); }
+        set { SetValue(IsCustomEventAreaProperty, value); }
+    }
+
+    public CalendarItemViewModel CalendarItem
+    {
+        get { return (CalendarItemViewModel)GetValue(CalendarItemProperty); }
+        set { SetValue(CalendarItemProperty, value); }
+    }
+
+    public bool IsDragging
+    {
+        get { return (bool)GetValue(IsDraggingProperty); }
+        set { SetValue(IsDraggingProperty, value); }
+    }
+
+    public CalendarItemControl()
+    {
+        InitializeComponent();
+    }
+
+    private static void OnCalendarItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is CalendarItemControl control)
+        {
+            control.UpdateVisualStates();
+        }
+    }
+
+    private void UpdateVisualStates()
+    {
+        if (CalendarItem == null) return;
+
+        if (CalendarItem.IsAllDayEvent)
+        {
+            VisualStateManager.GoToState(this, "AllDayEvent", true);
+        }
+        else if (CalendarItem.IsMultiDayEvent)
+        {
+            if (IsCustomEventArea)
+            {
+                VisualStateManager.GoToState(this, "CustomAreaMultiDayEvent", true);
+            }
+            else
+            {
+                // Hide it.
+                VisualStateManager.GoToState(this, "MultiDayEvent", true);
+            }
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, "RegularEvent", true);
+        }
+    }
+
+    private void ControlDragStarting(UIElement sender, DragStartingEventArgs args) => IsDragging = true;
+
+    private void ControlDropped(UIElement sender, DropCompletedEventArgs args) => IsDragging = false;
+
+    private async void ControlTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (CalendarItem == null) return;
+
+        isSingleTap = true;
+
+        await Task.Delay(100);
+
+        if (isSingleTap && CalendarItem != null)
+        {
+            WeakReferenceMessenger.Default.Send(new CalendarItemTappedMessage(CalendarItem));
+        }
+    }
+
+    private void ControlDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
+    {
+        if (CalendarItem == null) return;
+
+        isSingleTap = false;
+
+        WeakReferenceMessenger.Default.Send(new CalendarItemDoubleTappedMessage(CalendarItem));
+    }
+
+    private void ControlRightTapped(object sender, RightTappedRoutedEventArgs e)
+    {
+        if (CalendarItem == null) return;
+
+        WeakReferenceMessenger.Default.Send(new CalendarItemRightTappedMessage(CalendarItem));
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml b/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml
new file mode 100644
index 00000000..534491d7
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Wino.Calendar.Controls.CalendarPeriodControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:local="using:Wino.Calendar.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:skia="using:SkiaSharp.Views.Windows"
+    xmlns:viewModels="using:Wino.Calendar.ViewModels.Data"
+    x:Name="Root"
+    SizeChanged="ControlSizeChanged"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+
+
+        <DataTemplate x:Key="CalendarEventTemplate" x:DataType="viewModels:CalendarItemViewModel">
+            <local:CalendarItemControl CalendarItem="{x:Bind}" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonthEventTemplate" x:DataType="viewModels:CalendarItemViewModel">
+            <local:CalendarItemControl CalendarItem="{x:Bind}" IsCustomEventArea="True" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="TimedHeaderTemplate" x:DataType="local:HeaderTextLayout">
+            <TextBlock
+                Width="{x:Bind Width}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontWeight="SemiBold"
+                Text="{x:Bind Text}"
+                TextAlignment="Center" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="MonthHeaderTemplate" x:DataType="local:HeaderTextLayout">
+            <TextBlock
+                Width="{x:Bind Width}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontWeight="SemiBold"
+                Text="{x:Bind Text}"
+                TextAlignment="Center" />
+        </DataTemplate>
+
+        <ItemsPanelTemplate x:Key="HorizontalItemsPanel">
+            <StackPanel Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid x:Name="TimedRoot" Visibility="Collapsed">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="64" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Border
+                x:Name="TimedHourHeaderHost"
+                Grid.Row="0"
+                Grid.Column="0"
+                Height="44"
+                Background="{ThemeResource LayerFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="0,0,1,1" />
+
+            <Grid
+                x:Name="TimedHeaderHost"
+                Grid.Row="0"
+                Grid.ColumnSpan="2"
+                Height="44"
+                Margin="64,0,0,0"
+                Background="{ThemeResource LayerFillColorDefaultBrush}">
+                <skia:SKXamlCanvas x:Name="TimedHeaderCanvas" PaintSurface="TimedHeaderCanvasPaintSurface" />
+                <ItemsControl
+                    x:Name="TimedHeadersItemsControl"
+                    HorizontalContentAlignment="Stretch"
+                    ItemTemplate="{StaticResource TimedHeaderTemplate}"
+                    ItemsSource="{x:Bind TimedHeaderTexts, Mode=OneWay}">
+                    <ItemsControl.ItemsPanel>
+                        <StaticResource ResourceKey="HorizontalItemsPanel" />
+                    </ItemsControl.ItemsPanel>
+                </ItemsControl>
+            </Grid>
+
+            <Border
+                x:Name="TimedAllDayCornerHost"
+                Grid.Row="1"
+                Grid.Column="0"
+                Height="{x:Bind TimedAllDayHeight, Mode=OneWay}"
+                Background="{ThemeResource LayerFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="0,0,1,1"
+                Visibility="{x:Bind HasTimedAllDayItems, Mode=OneWay}" />
+
+            <Grid
+                x:Name="TimedAllDayHost"
+                Grid.Row="1"
+                Grid.Column="1"
+                Height="{x:Bind TimedAllDayHeight, Mode=OneWay}"
+                Background="{ThemeResource LayerFillColorDefaultBrush}"
+                Visibility="{x:Bind HasTimedAllDayItems, Mode=OneWay}">
+                <skia:SKXamlCanvas x:Name="TimedAllDayCanvas" PaintSurface="TimedAllDayCanvasPaintSurface" />
+                <Canvas x:Name="TimedAllDayItemsCanvas" />
+            </Grid>
+
+            <Grid
+                Grid.Row="2"
+                Grid.ColumnSpan="2"
+                Background="Transparent">
+                <ScrollViewer
+                    x:Name="TimedScrollViewer"
+                    Background="Transparent"
+                    HorizontalScrollBarVisibility="Disabled"
+                    VerticalScrollBarVisibility="Auto"
+                    VerticalScrollMode="Enabled">
+                    <Grid x:Name="TimedScrollContentGrid" Height="{x:Bind TimelineHeight, Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="64" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Canvas
+                            x:Name="HourLabelsCanvas"
+                            Width="64"
+                            IsHitTestVisible="False" />
+
+                        <Grid
+                            x:Name="TimedViewport"
+                            Grid.Column="1"
+                            Height="{x:Bind TimelineHeight, Mode=OneWay}">
+                            <skia:SKXamlCanvas x:Name="TimedStructureCanvas" PaintSurface="TimedStructureCanvasPaintSurface" />
+                            <Border
+                                x:Name="TimedInteractionLayer"
+                                Background="Transparent"
+                                Tapped="TimedInteractionLayerTapped" />
+                            <Canvas x:Name="TimedItemsCanvas" />
+                        </Grid>
+                    </Grid>
+                </ScrollViewer>
+            </Grid>
+
+        </Grid>
+
+        <Grid x:Name="MonthRoot" Visibility="Collapsed">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Height="36">
+                <ItemsControl
+                    x:Name="MonthHeadersItemsControl"
+                    VerticalAlignment="Center"
+                    ItemTemplate="{StaticResource MonthHeaderTemplate}"
+                    ItemsSource="{x:Bind MonthHeaderTexts, Mode=OneWay}">
+                    <ItemsControl.ItemsPanel>
+                        <StaticResource ResourceKey="HorizontalItemsPanel" />
+                    </ItemsControl.ItemsPanel>
+                </ItemsControl>
+            </Grid>
+
+            <Grid
+                x:Name="MonthViewport"
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch">
+                <skia:SKXamlCanvas x:Name="MonthStructureCanvas" PaintSurface="MonthStructureCanvasPaintSurface" />
+                <Border
+                    x:Name="MonthInteractionLayer"
+                    Background="Transparent"
+                    Tapped="MonthInteractionLayerTapped" />
+                <Canvas x:Name="MonthCellLabelsCanvas" IsHitTestVisible="False" />
+                <Canvas x:Name="MonthItemsCanvas">
+                    <Canvas.Transitions>
+                        <TransitionCollection>
+                            <AddDeleteThemeTransition />
+                        </TransitionCollection>
+                    </Canvas.Transitions>
+                </Canvas>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml.cs b/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml.cs
new file mode 100644
index 00000000..4bf6a283
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CalendarPeriodControl.xaml.cs
@@ -0,0 +1,1230 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using CommunityToolkit.WinUI;
+using Itenso.TimePeriod;
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using SkiaSharp;
+using SkiaSharp.Views.Windows;
+using Windows.Foundation;
+using Windows.UI;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Calendar.Controls;
+
+public sealed partial class CalendarPeriodControl : UserControl, INotifyPropertyChanged
+{
+    private static readonly TimeSpan SizeRefreshDebounceInterval = TimeSpan.FromMilliseconds(75);
+    private const double SizeChangeThreshold = 0.5d;
+    private const double TimedHourColumnWidth = 64d;
+    private const double TimedGridIntervalMinutes = 30d;
+    private const double TimedSelectionIntervalMinutes = 30d;
+    private const double TimedItemRightSpacing = 10d;
+    private VisibleDateRange _currentRange = new(
+        CalendarDisplayType.Month,
+        DateOnly.FromDateTime(DateTime.Today),
+        DateOnly.FromDateTime(DateTime.Today),
+        DateOnly.FromDateTime(DateTime.Today),
+        DateOnly.FromDateTime(DateTime.Today),
+        1,
+        true,
+        true,
+        [DateOnly.FromDateTime(DateTime.Today)]);
+
+    private TimedCalendarLayoutResult _timedLayout = new([], 0, []);
+    private MonthCalendarLayoutResult _monthLayout = new(0, 0, [], []);
+    private INotifyCollectionChanged? _observableItemsSource;
+    private double _timedDayWidth;
+    private double _timedAllDayHeight;
+    private double _monthCellWidth;
+    private double _monthCellHeight;
+    private bool _hasPresentedState;
+    private bool _refreshPending = true;
+    private bool _refreshScheduled;
+    private CalendarDisplayType _lastDisplayMode = CalendarDisplayType.Month;
+    private DateOnly _lastDisplayDate = DateOnly.FromDateTime(DateTime.Today);
+    private DayOfWeek _lastFirstDayOfWeek = DayOfWeek.Monday;
+    private readonly DispatcherQueueTimer _sizeRefreshTimer;
+
+    [GeneratedDependencyProperty]
+    public partial VisibleDateRange? VisibleRange { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial CalendarSettings? CalendarSettings { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial IReadOnlyList<CalendarItemViewModel>? CalendarItems { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial string? TimedHeaderDateFormat { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial Brush? DefaultHourBackground { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial Brush? WorkHourBackground { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial Brush? SelectedSlotBackground { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial DateTime? SelectedDateTime { get; set; }
+
+    public CalendarPeriodControl()
+    {
+        InitializeComponent();
+
+        _sizeRefreshTimer = DispatcherQueue.CreateTimer();
+        _sizeRefreshTimer.Interval = SizeRefreshDebounceInterval;
+        _sizeRefreshTimer.IsRepeating = false;
+        _sizeRefreshTimer.Tick += SizeRefreshTimerTick;
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+    public event EventHandler<CalendarEmptySlotTappedEventArgs>? EmptySlotTapped;
+
+    private ObservableCollection<HeaderTextLayout> TimedHeaderTextsCollection { get; } = [];
+    private ObservableCollection<HeaderTextLayout> MonthHeaderTextsCollection { get; } = [];
+    private ObservableCollection<TimedItemLayout> TimedItemsCollection { get; } = [];
+    private ObservableCollection<TimedItemLayout> TimedAllDayItemsCollection { get; } = [];
+    private ObservableCollection<MonthCellLabelLayout> MonthCellLabelsCollection { get; } = [];
+    private ObservableCollection<MonthItemLayout> MonthItemsCollection { get; } = [];
+
+    public IEnumerable<HeaderTextLayout> TimedHeaderTexts => TimedHeaderTextsCollection;
+    public IEnumerable<HeaderTextLayout> MonthHeaderTexts => MonthHeaderTextsCollection;
+    public IEnumerable<TimedItemLayout> TimedItems => TimedItemsCollection;
+    public IEnumerable<TimedItemLayout> TimedAllDayItems => TimedAllDayItemsCollection;
+    public IEnumerable<MonthCellLabelLayout> MonthCellLabels => MonthCellLabelsCollection;
+    public IEnumerable<MonthItemLayout> MonthItems => MonthItemsCollection;
+
+    public double TimedDayWidth
+    {
+        get => _timedDayWidth;
+        private set
+        {
+            if (_timedDayWidth == value)
+            {
+                return;
+            }
+
+            _timedDayWidth = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double MonthCellWidth
+    {
+        get => _monthCellWidth;
+        private set
+        {
+            if (_monthCellWidth == value)
+            {
+                return;
+            }
+
+            _monthCellWidth = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double MonthCellHeight
+    {
+        get => _monthCellHeight;
+        private set
+        {
+            if (_monthCellHeight == value)
+            {
+                return;
+            }
+
+            _monthCellHeight = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public double TimedAllDayHeight
+    {
+        get => _timedAllDayHeight;
+        private set
+        {
+            if (_timedAllDayHeight == value)
+            {
+                return;
+            }
+
+            _timedAllDayHeight = value;
+            OnPropertyChanged();
+            OnPropertyChanged(nameof(HasTimedAllDayItems));
+        }
+    }
+
+    public bool HasTimedAllDayItems => TimedAllDayHeight > 0d;
+
+    public double TimelineHeight => TimedCalendarLayoutCalculator.GetTimelineHeight(GetHourHeight());
+
+    partial void OnVisibleRangeChanged(VisibleDateRange? newValue) => RequestRefresh();
+    partial void OnCalendarSettingsChanged(CalendarSettings? newValue) => RequestRefresh();
+    partial void OnTimedHeaderDateFormatChanged(string? newValue) => RequestRefresh();
+    partial void OnSelectedSlotBackgroundChanged(Brush? newValue) => InvalidateStructureCanvases();
+    partial void OnSelectedDateTimeChanged(DateTime? newValue) => InvalidateStructureCanvases();
+
+    partial void OnCalendarItemsChanged(IReadOnlyList<CalendarItemViewModel>? newValue)
+    {
+        DetachCurrentItemsSource();
+        AttachItemsSource(newValue);
+        RequestRefresh();
+    }
+
+    private void ControlSizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        if (!HasMeaningfulSizeChange(e))
+        {
+            return;
+        }
+
+        var isLiveResize = _hasPresentedState &&
+                           e.PreviousSize.Width > 0 &&
+                           e.PreviousSize.Height > 0;
+
+        if (isLiveResize)
+        {
+            _refreshPending = true;
+            _sizeRefreshTimer.Stop();
+            _sizeRefreshTimer.Start();
+            return;
+        }
+
+        if (!_refreshPending)
+        {
+            return;
+        }
+
+        QueueRefresh();
+    }
+
+    private IEnumerable<CalendarItemViewModel> CurrentItems => CalendarItems ?? [];
+
+    private void AttachItemsSource(IReadOnlyList<CalendarItemViewModel>? itemsSource)
+    {
+        if (itemsSource is INotifyCollectionChanged observableItemsSource)
+        {
+            _observableItemsSource = observableItemsSource;
+            _observableItemsSource.CollectionChanged += ItemsSourceCollectionChanged;
+        }
+    }
+
+    private void DetachItemsSource(IReadOnlyList<CalendarItemViewModel>? itemsSource)
+    {
+        var observableItemsSource = itemsSource as INotifyCollectionChanged;
+
+        if (observableItemsSource is not null)
+        {
+            observableItemsSource.CollectionChanged -= ItemsSourceCollectionChanged;
+        }
+
+        if (ReferenceEquals(_observableItemsSource, observableItemsSource))
+        {
+            _observableItemsSource = null;
+        }
+    }
+
+    private void DetachCurrentItemsSource()
+    {
+        if (_observableItemsSource is not null)
+        {
+            _observableItemsSource.CollectionChanged -= ItemsSourceCollectionChanged;
+            _observableItemsSource = null;
+        }
+    }
+
+    private void ItemsSourceCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e) => RequestRefresh();
+
+    private void RequestRefresh()
+    {
+        _refreshPending = true;
+        QueueRefresh();
+    }
+
+    private void InvalidateStructureCanvases()
+    {
+        TimedStructureCanvas.Invalidate();
+        MonthStructureCanvas.Invalidate();
+    }
+
+    private void Refresh()
+    {
+        if (!_refreshPending || !IsLoaded || ActualWidth <= 0 || VisibleRange is null || CalendarSettings is null)
+        {
+            return;
+        }
+
+        var transition = GetTransitionInfo();
+        _currentRange = CreateLayoutRange(VisibleRange, CalendarSettings);
+
+        if (VisibleRange.DisplayType == CalendarDisplayType.Month)
+        {
+            RefreshMonthView();
+        }
+        else
+        {
+            RefreshTimedView();
+        }
+
+        RunTransition(transition);
+        _hasPresentedState = true;
+        _refreshPending = false;
+        _lastDisplayMode = VisibleRange.DisplayType;
+        _lastDisplayDate = VisibleRange.AnchorDate;
+        _lastFirstDayOfWeek = CalendarSettings.FirstDayOfWeek;
+
+        Debug.WriteLine($"Refreshed control.");
+    }
+
+    private static bool HasMeaningfulSizeChange(SizeChangedEventArgs e)
+        => Math.Abs(e.NewSize.Width - e.PreviousSize.Width) > SizeChangeThreshold ||
+           Math.Abs(e.NewSize.Height - e.PreviousSize.Height) > SizeChangeThreshold;
+
+    private void QueueRefresh()
+    {
+        if (_refreshScheduled)
+        {
+            return;
+        }
+
+        _refreshScheduled = true;
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            _refreshScheduled = false;
+            Refresh();
+        });
+    }
+
+    private void SizeRefreshTimerTick(DispatcherQueueTimer sender, object args)
+    {
+        sender.Stop();
+        QueueRefresh();
+    }
+
+    private void RefreshTimedView()
+    {
+        TimedRoot.Visibility = Visibility.Visible;
+        MonthRoot.Visibility = Visibility.Collapsed;
+        ResetTimedVisualState();
+
+        var timedSurfaceWidth = GetTimedSurfaceWidth();
+
+        TimedDayWidth = _currentRange.Dates.Count == 0 ? 0d : timedSurfaceWidth / _currentRange.Dates.Count;
+        TimedAllDayHeight = TimedCalendarLayoutCalculator.GetAllDayHeight(
+            TimedCalendarLayoutCalculator.GetAllDayLaneCount(_currentRange.Dates, CurrentItems));
+        TimedScrollContentGrid.Width = ActualWidth;
+        TimedViewport.Width = timedSurfaceWidth;
+        TimedViewport.Height = TimelineHeight;
+        TimedAllDayHost.Width = timedSurfaceWidth;
+        TimedAllDayItemsCanvas.Width = timedSurfaceWidth;
+        TimedAllDayItemsCanvas.Height = TimedAllDayHeight;
+
+        _timedLayout = TimedCalendarLayoutCalculator.Calculate(_currentRange, CurrentItems, timedSurfaceWidth, GetHourHeight());
+
+        ReplaceCollection(
+            TimedHeaderTextsCollection,
+            _timedLayout.VisibleDates.Select(date =>
+                new HeaderTextLayout(
+                    GetTimedHeaderText(date),
+                    TimedDayWidth)));
+
+        var eventTemplate = (DataTemplate)Resources["CalendarEventTemplate"];
+        ReplaceCollection(TimedAllDayItemsCollection, TimedCalendarLayoutCalculator.CalculateAllDayItems(_currentRange, CurrentItems, timedSurfaceWidth).Select(item =>
+        {
+            PrepareDisplayMetadata(item.Item, item.Date);
+            item.Template = eventTemplate;
+            return item;
+        }));
+        ReplaceCollection(TimedItemsCollection, _timedLayout.Items.Select(item =>
+        {
+            PrepareDisplayMetadata(item.Item, item.Date);
+            item.Template = eventTemplate;
+            return item;
+        }));
+        RenderHourLabels();
+        RenderTimedAllDayItems();
+        RenderTimedItems();
+
+        TimedAllDayCanvas.Invalidate();
+        TimedHeaderCanvas.Invalidate();
+        TimedStructureCanvas.Invalidate();
+    }
+
+    private void RefreshMonthView()
+    {
+        TimedRoot.Visibility = Visibility.Collapsed;
+        MonthRoot.Visibility = Visibility.Visible;
+
+        var availableMonthHeight = Math.Max(0d, ActualHeight - MonthHeadersItemsControl.ActualHeight);
+        _monthLayout = MonthCalendarLayoutCalculator.Calculate(_currentRange, CurrentItems, ActualWidth, availableMonthHeight);
+
+        MonthCellWidth = _monthLayout.CellWidth;
+        MonthCellHeight = _monthLayout.CellHeight;
+
+        MonthViewport.Width = ActualWidth;
+        MonthViewport.Height = availableMonthHeight;
+
+        ReplaceCollection(
+            MonthHeaderTextsCollection,
+            Enumerable.Range(0, MonthCalendarLayoutCalculator.ColumnCount)
+                .Select(index =>
+                {
+                    var day = (DayOfWeek)(((int)CalendarSettings!.FirstDayOfWeek + index) % 7);
+                    return new HeaderTextLayout(
+                        CalendarSettings.CultureInfo.DateTimeFormat.AbbreviatedDayNames[(int)day],
+                        MonthCellWidth);
+                }));
+
+        ReplaceCollection(
+            MonthCellLabelsCollection,
+            _monthLayout.Cells.Select(cell =>
+                new MonthCellLabelLayout(
+                    cell.Date.Day.ToString(CalendarSettings!.CultureInfo),
+                    cell.Date.Month == VisibleRange!.AnchorDate.Month && cell.Date.Year == VisibleRange.AnchorDate.Year ? 1d : 0.55d,
+                    new LayoutRect(cell.Bounds.X + 4, cell.Bounds.Y + 2, cell.Bounds.Width, cell.Bounds.Height))));
+
+        var monthEventTemplate = (DataTemplate)Resources["MonthEventTemplate"];
+        ReplaceCollection(MonthItemsCollection, _monthLayout.Items.Select(item =>
+        {
+            PrepareDisplayMetadata(item.Item, item.Date);
+            item.Template = monthEventTemplate;
+            return item;
+        }));
+        RenderMonthCellLabels();
+        RenderMonthItems();
+
+        MonthStructureCanvas.Invalidate();
+    }
+
+    private void PrepareDisplayMetadata(CalendarItemViewModel item, DateOnly date)
+    {
+        if (CalendarSettings is null || item is not ICalendarItemViewModel calendarItemViewModel)
+        {
+            return;
+        }
+
+        calendarItemViewModel.DisplayingPeriod = new TimeRange(
+            date.ToDateTime(TimeOnly.MinValue),
+            date.AddDays(1).ToDateTime(TimeOnly.MinValue));
+        calendarItemViewModel.CalendarSettings = CalendarSettings;
+    }
+
+    private static VisibleDateRange CreateLayoutRange(VisibleDateRange visibleRange, CalendarSettings calendarSettings)
+    {
+        if (visibleRange.DisplayType != CalendarDisplayType.Month)
+        {
+            return visibleRange;
+        }
+
+        var start = AlignToWeekStart(visibleRange.StartDate, calendarSettings.FirstDayOfWeek);
+        var end = AlignToWeekEnd(visibleRange.EndDate, calendarSettings.FirstDayOfWeek);
+        var totalDays = end.DayNumber - start.DayNumber + 1;
+
+        if (totalDays <= 35)
+        {
+            end = start.AddDays(34);
+        }
+        else if (totalDays < 42)
+        {
+            end = start.AddDays(41);
+        }
+
+        var dates = Enumerable.Range(0, end.DayNumber - start.DayNumber + 1)
+                              .Select(offset => start.AddDays(offset))
+                              .ToArray();
+
+        return new VisibleDateRange(
+            visibleRange.DisplayType,
+            visibleRange.AnchorDate,
+            start,
+            end,
+            visibleRange.PrimaryDate,
+            dates.Length,
+            dates.Contains(DateOnly.FromDateTime(DateTime.Today)),
+            start.Year == end.Year && start.Month == end.Month,
+            dates);
+    }
+
+    private static DateOnly AlignToWeekStart(DateOnly date, DayOfWeek firstDayOfWeek)
+    {
+        var offset = ((int)date.DayOfWeek - (int)firstDayOfWeek + 7) % 7;
+        return date.AddDays(-offset);
+    }
+
+    private static DateOnly AlignToWeekEnd(DateOnly date, DayOfWeek firstDayOfWeek)
+    {
+        var lastDayOfWeek = (DayOfWeek)(((int)firstDayOfWeek + 6) % 7);
+        var offset = ((int)lastDayOfWeek - (int)date.DayOfWeek + 7) % 7;
+        return date.AddDays(offset);
+    }
+
+    private void TimedHeaderCanvasPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
+    {
+        using var borderPaint = CreateLinePaint();
+        var canvas = e.Surface.Canvas;
+        canvas.Clear(SKColors.Transparent);
+
+        var timedSurfaceWidth = GetTimedSurfaceWidth();
+
+        if (_timedLayout.VisibleDates.Count == 0 || timedSurfaceWidth <= 0)
+        {
+            return;
+        }
+
+        var scaleX = (float)(e.Info.Width / timedSurfaceWidth);
+        var height = e.Info.Height;
+        var dayWidth = (float)(_timedLayout.DayWidth * scaleX);
+
+        for (var index = 1; index < _timedLayout.VisibleDates.Count; index++)
+        {
+            var x = dayWidth * index;
+            canvas.DrawLine(x, 0, x, height, borderPaint);
+        }
+
+        canvas.DrawLine(0, height - 1, e.Info.Width, height - 1, borderPaint);
+    }
+
+    private void TimedAllDayCanvasPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
+    {
+        using var borderPaint = CreateLinePaint();
+        var canvas = e.Surface.Canvas;
+        canvas.Clear(SKColors.Transparent);
+
+        var timedSurfaceWidth = GetTimedSurfaceWidth();
+
+        if (_timedLayout.VisibleDates.Count == 0 || timedSurfaceWidth <= 0 || TimedAllDayHeight <= 0)
+        {
+            return;
+        }
+
+        var scaleX = (float)(e.Info.Width / timedSurfaceWidth);
+        var height = e.Info.Height;
+        var dayWidth = (float)(_timedLayout.DayWidth * scaleX);
+
+        for (var index = 1; index < _timedLayout.VisibleDates.Count; index++)
+        {
+            var x = dayWidth * index;
+            canvas.DrawLine(x, 0, x, height, borderPaint);
+        }
+
+        canvas.DrawLine(0, height - 1, e.Info.Width, height - 1, borderPaint);
+    }
+
+    private void TimedStructureCanvasPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
+    {
+        using var linePaint = CreateLinePaint();
+        using var minorLinePaint = CreateMinorLinePaint();
+        using var defaultFillPaint = CreateFillPaint(DefaultHourBackground ?? new SolidColorBrush(Colors.Transparent));
+        using var workFillPaint = CreateFillPaint(WorkHourBackground ?? new SolidColorBrush(Colors.Transparent));
+        using var selectedFillPaint = CreateFillPaint(SelectedSlotBackground ?? new SolidColorBrush(Colors.Transparent));
+        var canvas = e.Surface.Canvas;
+        canvas.Clear(SKColors.Transparent);
+
+        var timedSurfaceWidth = GetTimedSurfaceWidth();
+
+        if (_timedLayout.VisibleDates.Count == 0 || timedSurfaceWidth <= 0)
+        {
+            return;
+        }
+
+        var hourHeight = GetHourHeight();
+        var timelineHeight = TimedCalendarLayoutCalculator.GetTimelineHeight(hourHeight);
+        var scaleX = (float)(e.Info.Width / timedSurfaceWidth);
+        var scaleY = (float)(e.Info.Height / timelineHeight);
+        var dayWidth = (float)(_timedLayout.DayWidth * scaleX);
+        var isWorkingHoursEnabled = CalendarSettings?.IsWorkingHoursEnabled == true;
+        var workDayStartHour = CalendarSettings?.WorkingHourStart.TotalHours ?? 9d;
+        var workDayEndHour = CalendarSettings?.WorkingHourEnd.TotalHours ?? 17d;
+        var intervalHeight = (float)(GetTimedGridIntervalHeight() * scaleY);
+        var intervalCount = (int)(24d * 60d / TimedGridIntervalMinutes);
+
+        for (var dayIndex = 0; dayIndex < _timedLayout.VisibleDates.Count; dayIndex++)
+        {
+            var x = dayIndex * dayWidth;
+            var isWorkingDay = isWorkingHoursEnabled &&
+                               CalendarSettings?.WorkingDays.Contains(_timedLayout.VisibleDates[dayIndex].DayOfWeek) == true;
+
+            for (var intervalIndex = 0; intervalIndex < intervalCount; intervalIndex++)
+            {
+                var intervalStartHour = (intervalIndex * TimedGridIntervalMinutes) / 60d;
+                var y = intervalIndex * intervalHeight;
+                var fillPaint = isWorkingDay && intervalStartHour >= workDayStartHour && intervalStartHour < workDayEndHour
+                    ? workFillPaint
+                    : defaultFillPaint;
+                canvas.DrawRect(x, y, dayWidth, intervalHeight, fillPaint);
+            }
+        }
+
+        var selectedTimedSlotRect = GetSelectedTimedSlotRect(dayWidth, intervalHeight, intervalCount);
+        if (selectedTimedSlotRect.HasValue && selectedFillPaint.Color.Alpha > 0)
+        {
+            canvas.DrawRect(selectedTimedSlotRect.Value, selectedFillPaint);
+        }
+
+        for (var intervalIndex = 0; intervalIndex <= intervalCount; intervalIndex++)
+        {
+            var y = intervalIndex * intervalHeight;
+            var paint = intervalIndex % 2 == 0 ? linePaint : minorLinePaint;
+            canvas.DrawLine(0, y, e.Info.Width, y, paint);
+        }
+
+        for (var index = 0; index <= _timedLayout.VisibleDates.Count; index++)
+        {
+            var x = dayWidth * index;
+            canvas.DrawLine(x, 0, x, e.Info.Height, linePaint);
+        }
+    }
+
+    private void MonthStructureCanvasPaintSurface(object? sender, SKPaintSurfaceEventArgs e)
+    {
+        using var linePaint = CreateLinePaint();
+        using var todayPaint = new SKPaint
+        {
+            Style = SKPaintStyle.Fill,
+            Color = new SKColor(0, 120, 215, 26),
+            IsAntialias = true
+        };
+        using var selectedPaint = CreateFillPaint(SelectedSlotBackground ?? new SolidColorBrush(Colors.Transparent));
+
+        var canvas = e.Surface.Canvas;
+        canvas.Clear(SKColors.Transparent);
+
+        if (_monthLayout.CellWidth <= 0 || _monthLayout.CellHeight <= 0 || MonthViewport.ActualWidth <= 0 || MonthViewport.ActualHeight <= 0)
+        {
+            return;
+        }
+
+        var cellWidth = (float)(e.Info.Width / MonthCalendarLayoutCalculator.ColumnCount);
+        var cellHeight = (float)(e.Info.Height / MonthCalendarLayoutCalculator.RowCount);
+        var today = DateOnly.FromDateTime(DateTime.Now.Date);
+
+        foreach (var cell in _monthLayout.Cells)
+        {
+            if (cell.Date != today)
+            {
+                continue;
+            }
+
+            canvas.DrawRect((float)cell.Bounds.X, (float)cell.Bounds.Y, (float)cell.Bounds.Width, (float)cell.Bounds.Height, todayPaint);
+        }
+
+        var selectedMonthCellRect = GetSelectedMonthCellRect();
+        if (selectedMonthCellRect.HasValue && selectedPaint.Color.Alpha > 0)
+        {
+            canvas.DrawRect(selectedMonthCellRect.Value, selectedPaint);
+        }
+
+        for (var row = 0; row <= MonthCalendarLayoutCalculator.RowCount; row++)
+        {
+            var y = row * cellHeight;
+            canvas.DrawLine(0, y, e.Info.Width, y, linePaint);
+        }
+
+        for (var column = 0; column <= MonthCalendarLayoutCalculator.ColumnCount; column++)
+        {
+            var x = column * cellWidth;
+            canvas.DrawLine(x, 0, x, e.Info.Height, linePaint);
+        }
+    }
+
+    private static void ReplaceCollection<T>(ObservableCollection<T> target, IEnumerable<T> items)
+    {
+        target.Clear();
+
+        foreach (var item in items)
+        {
+            target.Add(item);
+        }
+    }
+
+    private void RenderHourLabels()
+    {
+        HourLabelsCanvas.Children.Clear();
+        HourLabelsCanvas.Height = TimelineHeight;
+
+        var hourHeight = GetHourHeight();
+        var labelWidth = Math.Max(0d, TimedHourColumnWidth - 10d);
+
+        for (var hour = 0; hour <= 24; hour++)
+        {
+            var textBlock = new TextBlock
+            {
+                Width = labelWidth,
+                Text = GetTimedHourLabelText(hour),
+                TextAlignment = TextAlignment.Right,
+                Opacity = 0.72
+            };
+
+            var y = hour == 24
+                ? Math.Max(0d, TimelineHeight - 20d)
+                : Math.Max(0d, (hour * hourHeight) - 10d);
+
+            Canvas.SetLeft(textBlock, 0d);
+            Canvas.SetTop(textBlock, y);
+            HourLabelsCanvas.Children.Add(textBlock);
+        }
+    }
+
+    private void RenderTimedItems()
+    {
+        TimedItemsCanvas.Children.Clear();
+
+        foreach (var item in TimedItemsCollection)
+        {
+            var presenter = new ContentPresenter
+            {
+                Width = Math.Max(0d, item.Bounds.Width - TimedItemRightSpacing),
+                Height = item.Bounds.Height,
+                Content = item.Item,
+                ContentTemplate = item.Template
+            };
+
+            Canvas.SetLeft(presenter, item.Bounds.X);
+            Canvas.SetTop(presenter, item.Bounds.Y);
+            TimedItemsCanvas.Children.Add(presenter);
+        }
+    }
+
+    private void RenderTimedAllDayItems()
+    {
+        TimedAllDayItemsCanvas.Children.Clear();
+
+        foreach (var item in TimedAllDayItemsCollection)
+        {
+            var presenter = new ContentPresenter
+            {
+                Width = item.Bounds.Width,
+                Height = item.Bounds.Height,
+                Content = item.Item,
+                ContentTemplate = item.Template
+            };
+
+            Canvas.SetLeft(presenter, item.Bounds.X);
+            Canvas.SetTop(presenter, item.Bounds.Y);
+            TimedAllDayItemsCanvas.Children.Add(presenter);
+        }
+    }
+
+    private void RenderMonthCellLabels()
+    {
+        MonthCellLabelsCanvas.Children.Clear();
+
+        foreach (var label in MonthCellLabelsCollection)
+        {
+            var textBlock = new TextBlock
+            {
+                Width = label.Bounds.Width,
+                Height = label.Bounds.Height,
+                Opacity = label.LabelOpacity,
+                Text = label.DayText
+            };
+
+            Canvas.SetLeft(textBlock, label.Bounds.X);
+            Canvas.SetTop(textBlock, label.Bounds.Y);
+            MonthCellLabelsCanvas.Children.Add(textBlock);
+        }
+    }
+
+    private void RenderMonthItems()
+    {
+        MonthItemsCanvas.Children.Clear();
+
+        foreach (var item in MonthItemsCollection)
+        {
+            var presenter = new ContentPresenter
+            {
+                Width = item.Bounds.Width,
+                Height = item.Bounds.Height,
+                Content = item.Item,
+                ContentTemplate = item.Template
+            };
+
+            Canvas.SetLeft(presenter, item.Bounds.X);
+            Canvas.SetTop(presenter, item.Bounds.Y);
+            MonthItemsCanvas.Children.Add(presenter);
+        }
+    }
+
+    private void TimedInteractionLayerTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (_timedLayout.VisibleDates.Count == 0 || _timedLayout.DayWidth <= 0)
+        {
+            return;
+        }
+
+        var position = e.GetPosition(TimedViewport);
+        var dayIndex = Math.Clamp((int)(position.X / _timedLayout.DayWidth), 0, _timedLayout.VisibleDates.Count - 1);
+        var intervalHeight = GetTimedSelectionIntervalHeight();
+        var slotIndex = Math.Clamp((int)(position.Y / intervalHeight), 0, (int)((24d * 60d / TimedSelectionIntervalMinutes) - 1));
+        var slotStart = TimeSpan.FromMinutes(slotIndex * TimedSelectionIntervalMinutes);
+        var clickedDate = _timedLayout.VisibleDates[dayIndex].ToDateTime(TimeOnly.MinValue).Add(slotStart);
+        var anchorPoint = TimedViewport.TransformToVisual(Root).TransformPoint(position);
+
+        EmptySlotTapped?.Invoke(
+            this,
+            new CalendarEmptySlotTappedEventArgs(
+                clickedDate,
+                anchorPoint,
+                new Size(_timedLayout.DayWidth, intervalHeight)));
+    }
+
+    private void MonthInteractionLayerTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (_monthLayout.Cells.Count == 0 || _monthLayout.CellWidth <= 0 || _monthLayout.CellHeight <= 0)
+        {
+            return;
+        }
+
+        var position = e.GetPosition(MonthViewport);
+        var column = Math.Clamp((int)(position.X / _monthLayout.CellWidth), 0, MonthCalendarLayoutCalculator.ColumnCount - 1);
+        var row = Math.Clamp((int)(position.Y / _monthLayout.CellHeight), 0, MonthCalendarLayoutCalculator.RowCount - 1);
+        var cellIndex = Math.Clamp((row * MonthCalendarLayoutCalculator.ColumnCount) + column, 0, _monthLayout.Cells.Count - 1);
+        var cell = _monthLayout.Cells[cellIndex];
+        var anchorPoint = MonthViewport.TransformToVisual(Root).TransformPoint(position);
+
+        EmptySlotTapped?.Invoke(
+            this,
+            new CalendarEmptySlotTappedEventArgs(
+                cell.Date.ToDateTime(TimeOnly.MinValue),
+                anchorPoint,
+                new Size(cell.Bounds.Width, cell.Bounds.Height)));
+    }
+
+    private SKRect? GetSelectedTimedSlotRect(float dayWidth, float intervalHeight, int intervalCount)
+    {
+        if (SelectedDateTime is not DateTime selectedDateTime || _timedLayout.VisibleDates.Count == 0)
+        {
+            return null;
+        }
+
+        var dayIndex = FindVisibleDateIndex(DateOnly.FromDateTime(selectedDateTime));
+        if (dayIndex < 0)
+        {
+            return null;
+        }
+
+        var slotIndex = (int)Math.Floor(selectedDateTime.TimeOfDay.TotalMinutes / TimedSelectionIntervalMinutes);
+        slotIndex = Math.Clamp(slotIndex, 0, intervalCount - 1);
+
+        var x = dayIndex * dayWidth;
+        var y = slotIndex * intervalHeight;
+        return new SKRect(x, y, x + dayWidth, y + intervalHeight);
+    }
+
+    private SKRect? GetSelectedMonthCellRect()
+    {
+        if (SelectedDateTime is not DateTime selectedDateTime)
+        {
+            return null;
+        }
+
+        var selectedDate = DateOnly.FromDateTime(selectedDateTime);
+        foreach (var cell in _monthLayout.Cells)
+        {
+            if (cell.Date != selectedDate)
+            {
+                continue;
+            }
+
+            return new SKRect(
+                (float)cell.Bounds.X,
+                (float)cell.Bounds.Y,
+                (float)(cell.Bounds.X + cell.Bounds.Width),
+                (float)(cell.Bounds.Y + cell.Bounds.Height));
+        }
+
+        return null;
+    }
+
+    private int FindVisibleDateIndex(DateOnly date)
+    {
+        for (var index = 0; index < _timedLayout.VisibleDates.Count; index++)
+        {
+            if (_timedLayout.VisibleDates[index] == date)
+            {
+                return index;
+            }
+        }
+
+        return -1;
+    }
+
+    private double GetTimedSurfaceWidth() => Math.Max(0d, ActualWidth - TimedHourColumnWidth);
+
+    private string GetTimedHeaderText(DateOnly date)
+    {
+        if (!string.IsNullOrWhiteSpace(TimedHeaderDateFormat) && CalendarSettings is not null)
+        {
+            try
+            {
+                return date.ToDateTime(TimeOnly.MinValue).ToString(TimedHeaderDateFormat, CalendarSettings.CultureInfo);
+            }
+            catch (FormatException)
+            {
+            }
+        }
+
+        return CalendarSettings?.GetTimedDayHeaderText(date) ?? date.ToDateTime(TimeOnly.MinValue).ToString("ddd dd");
+    }
+
+    private string GetTimedHourLabelText(int hour)
+        => CalendarSettings?.GetTimedHourLabelText(hour) ?? $"{hour:00}:00";
+
+    private CalendarTransitionInfo GetTransitionInfo()
+    {
+        if (!_hasPresentedState || VisibleRange is null || CalendarSettings is null)
+        {
+            return new CalendarTransitionInfo(CalendarTransitionKind.None, 0);
+        }
+
+        if (_lastDisplayMode != VisibleRange.DisplayType)
+        {
+            return new CalendarTransitionInfo(CalendarTransitionKind.ModeChange, 0);
+        }
+
+        if (_lastDisplayDate != VisibleRange.AnchorDate)
+        {
+            return new CalendarTransitionInfo(
+                CalendarTransitionKind.Navigation,
+                VisibleRange.AnchorDate.CompareTo(_lastDisplayDate));
+        }
+
+        if (_lastFirstDayOfWeek != CalendarSettings.FirstDayOfWeek)
+        {
+            return new CalendarTransitionInfo(CalendarTransitionKind.Refresh, 0);
+        }
+
+        return new CalendarTransitionInfo(CalendarTransitionKind.None, 0);
+    }
+
+    private void RunTransition(CalendarTransitionInfo transition)
+    {
+        if (transition.Kind == CalendarTransitionKind.None || VisibleRange is null)
+        {
+            return;
+        }
+
+        if (VisibleRange.DisplayType != CalendarDisplayType.Month)
+        {
+            RunTimedTransition(transition);
+            return;
+        }
+
+        var target = (UIElement)MonthRoot;
+        var visual = ElementCompositionPreview.GetElementVisual(target);
+        var compositor = visual.Compositor;
+
+        visual.CenterPoint = new Vector3((float)(target.RenderSize.Width * 0.5), (float)(target.RenderSize.Height * 0.5), 0f);
+        visual.StopAnimation(nameof(visual.Offset));
+        visual.StopAnimation(nameof(visual.Opacity));
+        visual.StopAnimation(nameof(visual.Scale));
+
+        switch (transition.Kind)
+        {
+            case CalendarTransitionKind.Navigation:
+                StartNavigationTransition(compositor, visual, transition.Direction, target.RenderSize.Width);
+                break;
+            case CalendarTransitionKind.ModeChange:
+                StartModeTransition(compositor, visual);
+                break;
+            case CalendarTransitionKind.Refresh:
+                StartRefreshTransition(compositor, visual);
+                break;
+        }
+    }
+
+    private void RunTimedTransition(CalendarTransitionInfo transition)
+    {
+        var contentVisual = ElementCompositionPreview.GetElementVisual(TimedScrollViewer);
+        var compositor = contentVisual.Compositor;
+
+        PrepareAnimatedVisual(contentVisual, TimedScrollViewer);
+
+        switch (transition.Kind)
+        {
+            case CalendarTransitionKind.Navigation:
+                StartTimedNavigationTransition(compositor, transition.Direction);
+                break;
+            case CalendarTransitionKind.ModeChange:
+                StartTimedModeTransition(compositor);
+                break;
+            case CalendarTransitionKind.Refresh:
+                StartTimedRefreshTransition(compositor);
+                break;
+        }
+    }
+
+    private void ResetTimedVisualState()
+    {
+        ResetAnimatedElement(TimedScrollViewer);
+        ResetAnimatedElement(TimedAllDayHost);
+    }
+
+    private static void StartNavigationTransition(Compositor compositor, Visual visual, int direction, double width)
+    {
+        var travel = (float)Math.Max(48d, Math.Min(160d, width * 0.08d));
+        var startX = direction >= 0 ? travel : -travel;
+
+        var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.InsertKeyFrame(0f, new Vector3(startX, 0f, 0f));
+        offsetAnimation.InsertKeyFrame(1f, Vector3.Zero);
+        offsetAnimation.Duration = TimeSpan.FromMilliseconds(220);
+
+        var opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.InsertKeyFrame(0f, 0.72f);
+        opacityAnimation.InsertKeyFrame(1f, 1f);
+        opacityAnimation.Duration = offsetAnimation.Duration;
+
+        visual.StartAnimation(nameof(visual.Offset), offsetAnimation);
+        visual.StartAnimation(nameof(visual.Opacity), opacityAnimation);
+    }
+
+    private void StartTimedNavigationTransition(Compositor compositor, int direction)
+    {
+        var width = Math.Max(TimedRoot.RenderSize.Width, ActualWidth);
+        var travel = (float)Math.Max(56d, Math.Min(184d, width * 0.09d));
+        var signedTravel = direction >= 0 ? travel : -travel;
+        var clipInset = (float)Math.Max(18d, Math.Min(64d, width * 0.05d));
+
+        StartTimedElementTransition(compositor, TimedScrollViewer, signedTravel, 0f, 0.68f, TimeSpan.FromMilliseconds(240), direction >= 0 ? 0f : clipInset, direction >= 0 ? clipInset : 0f, animateScale: false);
+        if (HasTimedAllDayItems)
+        {
+            StartTimedElementTransition(compositor, TimedAllDayHost, signedTravel, 0f, 0.68f, TimeSpan.FromMilliseconds(240), direction >= 0 ? 0f : clipInset, direction >= 0 ? clipInset : 0f, animateScale: false);
+        }
+    }
+
+    private static void StartModeTransition(Compositor compositor, Visual visual)
+    {
+        var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.InsertKeyFrame(0f, new Vector3(0f, 18f, 0f));
+        offsetAnimation.InsertKeyFrame(1f, Vector3.Zero);
+        offsetAnimation.Duration = TimeSpan.FromMilliseconds(260);
+
+        var opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.InsertKeyFrame(0f, 0f);
+        opacityAnimation.InsertKeyFrame(1f, 1f);
+        opacityAnimation.Duration = offsetAnimation.Duration;
+
+        var scaleAnimation = compositor.CreateVector3KeyFrameAnimation();
+        scaleAnimation.InsertKeyFrame(0f, new Vector3(0.985f, 0.985f, 1f));
+        scaleAnimation.InsertKeyFrame(1f, new Vector3(1f, 1f, 1f));
+        scaleAnimation.Duration = offsetAnimation.Duration;
+
+        visual.StartAnimation(nameof(visual.Offset), offsetAnimation);
+        visual.StartAnimation(nameof(visual.Opacity), opacityAnimation);
+        visual.StartAnimation(nameof(visual.Scale), scaleAnimation);
+    }
+
+    private void StartTimedModeTransition(Compositor compositor)
+    {
+        StartTimedElementTransition(compositor, TimedScrollViewer, 0f, 18f, 0f, TimeSpan.FromMilliseconds(240), 0f, 0f, animateScale: false);
+        if (HasTimedAllDayItems)
+        {
+            StartTimedElementTransition(compositor, TimedAllDayHost, 0f, 18f, 0f, TimeSpan.FromMilliseconds(240), 0f, 0f, animateScale: false);
+        }
+    }
+
+    private static void StartRefreshTransition(Compositor compositor, Visual visual)
+    {
+        var opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.InsertKeyFrame(0f, 0.82f);
+        opacityAnimation.InsertKeyFrame(1f, 1f);
+        opacityAnimation.Duration = TimeSpan.FromMilliseconds(160);
+
+        visual.StartAnimation(nameof(visual.Opacity), opacityAnimation);
+    }
+
+    private void StartTimedRefreshTransition(Compositor compositor)
+    {
+        StartOpacityTransition(compositor, ElementCompositionPreview.GetElementVisual(TimedScrollViewer), 0.8f, TimeSpan.FromMilliseconds(160));
+        if (HasTimedAllDayItems)
+        {
+            StartOpacityTransition(compositor, ElementCompositionPreview.GetElementVisual(TimedAllDayHost), 0.8f, TimeSpan.FromMilliseconds(160));
+        }
+    }
+
+    private static void PrepareAnimatedVisual(Visual visual, UIElement target)
+    {
+        visual.CenterPoint = new Vector3((float)(target.RenderSize.Width * 0.5), (float)(target.RenderSize.Height * 0.5), 0f);
+        visual.StopAnimation(nameof(visual.Offset));
+        visual.StopAnimation(nameof(visual.Opacity));
+        visual.StopAnimation(nameof(visual.Scale));
+    }
+
+    private static void ResetAnimatedElement(UIElement target)
+    {
+        var visual = ElementCompositionPreview.GetElementVisual(target);
+        PrepareAnimatedVisual(visual, target);
+
+        visual.Offset = Vector3.Zero;
+        visual.Opacity = 1f;
+        visual.Scale = new Vector3(1f, 1f, 1f);
+
+        if (visual.Clip is InsetClip clip)
+        {
+            clip.StopAnimation(nameof(clip.LeftInset));
+            clip.StopAnimation(nameof(clip.RightInset));
+            clip.LeftInset = 0f;
+            clip.RightInset = 0f;
+        }
+    }
+
+    private static void StartTimedElementTransition(Compositor compositor, UIElement target, float offsetX, float offsetY, float startingOpacity, TimeSpan duration, float leftInset, float rightInset, bool animateScale = true)
+    {
+        var visual = ElementCompositionPreview.GetElementVisual(target);
+        PrepareAnimatedVisual(visual, target);
+
+        var easing = compositor.CreateCubicBezierEasingFunction(new Vector2(0.16f, 1f), new Vector2(0.3f, 1f));
+        var fadeEasing = compositor.CreateCubicBezierEasingFunction(new Vector2(0.2f, 0f), new Vector2(0f, 1f));
+        var clip = visual.Clip as InsetClip ?? compositor.CreateInsetClip();
+
+        clip.LeftInset = leftInset;
+        clip.RightInset = rightInset;
+        visual.Clip = clip;
+
+        var offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
+        offsetAnimation.InsertKeyFrame(0f, new Vector3(offsetX, offsetY, 0f));
+        offsetAnimation.InsertKeyFrame(1f, Vector3.Zero, easing);
+        offsetAnimation.Duration = duration;
+
+        var opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.InsertKeyFrame(0f, startingOpacity);
+        opacityAnimation.InsertKeyFrame(1f, 1f, fadeEasing);
+        opacityAnimation.Duration = duration;
+
+        var leftInsetAnimation = compositor.CreateScalarKeyFrameAnimation();
+        leftInsetAnimation.InsertKeyFrame(1f, 0f, easing);
+        leftInsetAnimation.Duration = duration;
+
+        var rightInsetAnimation = compositor.CreateScalarKeyFrameAnimation();
+        rightInsetAnimation.InsertKeyFrame(1f, 0f, easing);
+        rightInsetAnimation.Duration = duration;
+
+        visual.StartAnimation(nameof(visual.Offset), offsetAnimation);
+        visual.StartAnimation(nameof(visual.Opacity), opacityAnimation);
+
+        if (animateScale)
+        {
+            var scaleAnimation = compositor.CreateVector3KeyFrameAnimation();
+            scaleAnimation.InsertKeyFrame(0f, new Vector3(0.996f, 0.996f, 1f));
+            scaleAnimation.InsertKeyFrame(1f, new Vector3(1f, 1f, 1f), easing);
+            scaleAnimation.Duration = duration;
+            visual.StartAnimation(nameof(visual.Scale), scaleAnimation);
+        }
+        else
+        {
+            visual.Scale = new Vector3(1f, 1f, 1f);
+        }
+
+        clip.StartAnimation(nameof(clip.LeftInset), leftInsetAnimation);
+        clip.StartAnimation(nameof(clip.RightInset), rightInsetAnimation);
+    }
+
+    private static void StartOpacityTransition(Compositor compositor, Visual visual, float startingOpacity, TimeSpan duration)
+    {
+        visual.StopAnimation(nameof(visual.Opacity));
+
+        var easing = compositor.CreateCubicBezierEasingFunction(new Vector2(0.2f, 0f), new Vector2(0f, 1f));
+        var opacityAnimation = compositor.CreateScalarKeyFrameAnimation();
+        opacityAnimation.InsertKeyFrame(0f, startingOpacity);
+        opacityAnimation.InsertKeyFrame(1f, 1f, easing);
+        opacityAnimation.Duration = duration;
+
+        visual.StartAnimation(nameof(visual.Opacity), opacityAnimation);
+    }
+
+    private static SKPaint CreateLinePaint()
+    {
+        var strokeColor = GetStrokeColor();
+
+        return new SKPaint
+        {
+            Color = new SKColor(strokeColor.R, strokeColor.G, strokeColor.B, (byte)Math.Max(40, strokeColor.A / 2)),
+            IsAntialias = false,
+            StrokeWidth = 1
+        };
+    }
+
+    private static SKPaint CreateMinorLinePaint()
+    {
+        var strokeColor = GetStrokeColor();
+
+        return new SKPaint
+        {
+            Color = new SKColor(strokeColor.R, strokeColor.G, strokeColor.B, (byte)Math.Max(20, strokeColor.A / 4)),
+            IsAntialias = false,
+            StrokeWidth = 1
+        };
+    }
+
+    private static SKPaint CreateFillPaint(Brush brush)
+    {
+        return new SKPaint
+        {
+            Color = ToSkColor(brush),
+            Style = SKPaintStyle.Fill,
+            IsAntialias = false
+        };
+    }
+
+    private static SKColor ToSkColor(Brush brush)
+    {
+        return brush is SolidColorBrush solidColorBrush
+            ? new SKColor(solidColorBrush.Color.R, solidColorBrush.Color.G, solidColorBrush.Color.B, solidColorBrush.Color.A)
+            : SKColors.Transparent;
+    }
+
+    private static double GetTimedGridIntervalHeight(double hourHeight) => hourHeight * (TimedGridIntervalMinutes / 60d);
+
+    private double GetTimedGridIntervalHeight() => GetTimedGridIntervalHeight(GetHourHeight());
+
+    private double GetTimedSelectionIntervalHeight() => GetHourHeight() * (TimedSelectionIntervalMinutes / 60d);
+
+    private double GetHourHeight() => CalendarSettings?.HourHeight ?? 60d;
+
+    private static Color GetStrokeColor()
+    {
+        if (Application.Current.Resources.TryGetValue("CardStrokeColorDefaultBrush", out var resource) &&
+            resource is SolidColorBrush solidBrush)
+        {
+            return solidBrush.Color;
+        }
+
+        return Color.FromArgb(96, 210, 210, 210);
+    }
+
+    private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    private readonly record struct CalendarTransitionInfo(CalendarTransitionKind Kind, int Direction);
+
+    private enum CalendarTransitionKind
+    {
+        None,
+        Navigation,
+        ModeChange,
+        Refresh
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/CustomCalendarFlipView.cs b/Wino.Mail.WinUI/Controls/Calendar/CustomCalendarFlipView.cs
new file mode 100644
index 00000000..dfd56773
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/CustomCalendarFlipView.cs
@@ -0,0 +1,121 @@
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Mail.WinUI.Controls.CalendarFlipView;
+
+namespace Wino.Calendar.Controls;
+
+/// <summary>
+/// FlipView that hides the navigation buttons and exposes methods to navigate to the next and previous items with animations.
+/// </summary>
+public partial class CustomCalendarFlipView : FlipView
+{
+    private const string PART_PreviousButtonHorizontal = "PreviousButtonHorizontal";
+    private const string PART_NextButtonHorizontal = "NextButtonHorizontal";
+    private const string PART_PreviousButtonVertical = "PreviousButtonVertical";
+    private const string PART_NextButtonVertical = "NextButtonVertical";
+
+    public static readonly DependencyProperty DisplayTypeProperty = DependencyProperty.Register(
+        nameof(DisplayType),
+        typeof(CalendarDisplayType),
+        typeof(CustomCalendarFlipView),
+        new PropertyMetadata(CalendarDisplayType.Week));
+
+    public CalendarDisplayType DisplayType
+    {
+        get => (CalendarDisplayType)GetValue(DisplayTypeProperty);
+        set => SetValue(DisplayTypeProperty, value);
+    }
+
+    private Button? PreviousButtonHorizontal;
+    private Button? NextButtonHorizontal;
+    private Button? PreviousButtonVertical;
+    private Button? NextButtonVertical;
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        RefreshNavigationButtons();
+
+        // Hide navigation buttons
+        HideButton(PreviousButtonHorizontal);
+        HideButton(NextButtonHorizontal);
+        HideButton(PreviousButtonVertical);
+        HideButton(NextButtonVertical);
+
+        SelectionChanged -= FlipViewSelectionChanged;
+        SelectionChanged += FlipViewSelectionChanged;
+    }
+
+    private static void HideButton(Button? button)
+    {
+        if (button == null) return;
+
+        button.Opacity = 0;
+        button.IsHitTestVisible = false;
+    }
+
+    private void FlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
+        => OnSelectedItemChanged(e.RemovedItems.FirstOrDefault(), e.AddedItems.FirstOrDefault());
+
+    protected virtual void OnSelectedItemChanged(object? oldValue, object? newValue) { }
+
+    protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+    {
+        base.PrepareContainerForItemOverride(element, item);
+        OnContainerPrepared(element, item);
+    }
+
+    protected virtual void OnContainerPrepared(DependencyObject element, object item) { }
+
+    protected override DependencyObject GetContainerForItemOverride() => new WinoCalendarFlyoutItem();
+
+    public void GoPreviousFlip()
+    {
+        InvokeNavigationButton(PreviousButtonHorizontal, PreviousButtonVertical);
+    }
+
+    public void GoNextFlip()
+    {
+        InvokeNavigationButton(NextButtonHorizontal, NextButtonVertical);
+    }
+
+    private void RefreshNavigationButtons()
+    {
+        PreviousButtonHorizontal = GetTemplateChild(PART_PreviousButtonHorizontal) as Button;
+        NextButtonHorizontal = GetTemplateChild(PART_NextButtonHorizontal) as Button;
+        PreviousButtonVertical = GetTemplateChild(PART_PreviousButtonVertical) as Button;
+        NextButtonVertical = GetTemplateChild(PART_NextButtonVertical) as Button;
+    }
+
+    private void InvokeNavigationButton(Button? primaryButton, Button? secondaryButton)
+    {
+        if (Items == null || Items.Count == 0)
+            return;
+
+        RefreshNavigationButtons();
+
+        var previousIndex = SelectedIndex;
+
+        if (TryInvokeNavigationButton(primaryButton, previousIndex))
+        {
+            return;
+        }
+
+        TryInvokeNavigationButton(secondaryButton, previousIndex);
+    }
+
+    private bool TryInvokeNavigationButton(Button? navigationButton, int previousIndex)
+    {
+        if (navigationButton == null)
+            return false;
+
+        var peer = new ButtonAutomationPeer(navigationButton);
+        peer.Invoke();
+
+        return SelectedIndex != previousIndex;
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/HeaderTextLayout.cs b/Wino.Mail.WinUI/Controls/Calendar/HeaderTextLayout.cs
new file mode 100644
index 00000000..21cafb22
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/HeaderTextLayout.cs
@@ -0,0 +1,13 @@
+namespace Wino.Calendar.Controls;
+
+public sealed class HeaderTextLayout
+{
+    public HeaderTextLayout(string text, double width)
+    {
+        Text = text;
+        Width = width;
+    }
+
+    public string Text { get; set; }
+    public double Width { get; set; }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/LayoutRect.cs b/Wino.Mail.WinUI/Controls/Calendar/LayoutRect.cs
new file mode 100644
index 00000000..ef2043f2
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/LayoutRect.cs
@@ -0,0 +1,3 @@
+namespace Wino.Calendar.Controls;
+
+public readonly record struct LayoutRect(double X, double Y, double Width, double Height);
diff --git a/Wino.Mail.WinUI/Controls/Calendar/MonthCalendarLayout.cs b/Wino.Mail.WinUI/Controls/Calendar/MonthCalendarLayout.cs
new file mode 100644
index 00000000..387ddce6
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/MonthCalendarLayout.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Calendar.Controls;
+
+public sealed class MonthCellLayout
+{
+    public MonthCellLayout(DateOnly date, int index, int row, int column, LayoutRect bounds)
+    {
+        Date = date;
+        Index = index;
+        Row = row;
+        Column = column;
+        Bounds = bounds;
+    }
+
+    public DateOnly Date { get; set; }
+    public int Index { get; set; }
+    public int Row { get; set; }
+    public int Column { get; set; }
+    public LayoutRect Bounds { get; set; }
+}
+
+public sealed class MonthItemLayout
+{
+    public MonthItemLayout(CalendarItemViewModel item, int cellIndex, DateOnly date, LayoutRect bounds, DataTemplate? template = null)
+    {
+        Item = item;
+        CellIndex = cellIndex;
+        Date = date;
+        Bounds = bounds;
+        Template = template;
+    }
+
+    public CalendarItemViewModel Item { get; set; }
+    public int CellIndex { get; set; }
+    public DateOnly Date { get; set; }
+    public LayoutRect Bounds { get; set; }
+    public DataTemplate? Template { get; set; }
+}
+
+public sealed class MonthCellLabelLayout
+{
+    public MonthCellLabelLayout(string dayText, double labelOpacity, LayoutRect bounds)
+    {
+        DayText = dayText;
+        LabelOpacity = labelOpacity;
+        Bounds = bounds;
+    }
+
+    public string DayText { get; set; }
+    public double LabelOpacity { get; set; }
+    public LayoutRect Bounds { get; set; }
+}
+
+internal sealed record MonthCalendarLayoutResult(double CellWidth, double CellHeight, IReadOnlyList<MonthCellLayout> Cells, IReadOnlyList<MonthItemLayout> Items);
+
+internal static class MonthCalendarLayoutCalculator
+{
+    public const int ColumnCount = 7;
+    public const int RowCount = 6;
+
+    private const double CellPadding = 4d;
+    private const double DayLabelHeight = 20d;
+    private const double RegularItemHeight = 18d;
+    private const double ExpandedItemHeight = 30d;
+    private const double ItemGap = 2d;
+
+    public static MonthCalendarLayoutResult Calculate(VisibleDateRange range, IEnumerable<CalendarItemViewModel> items, double availableWidth, double availableHeight)
+    {
+        var cellWidth = availableWidth <= 0 ? 0d : availableWidth / ColumnCount;
+        var cellHeight = availableHeight <= 0 ? 0d : availableHeight / RowCount;
+        var cells = range.Dates
+            .Select((date, index) =>
+            {
+                var row = index / ColumnCount;
+                var column = index % ColumnCount;
+                return new MonthCellLayout(
+                    date,
+                    index,
+                    row,
+                    column,
+                    new LayoutRect(column * cellWidth, row * cellHeight, cellWidth, cellHeight));
+            })
+            .ToArray();
+
+        var itemLayouts = new List<MonthItemLayout>();
+
+        foreach (var cell in cells)
+        {
+            var cellItems = GetCellItems(items, cell.Date).ToList();
+            var nextItemY = cell.Bounds.Y + DayLabelHeight + CellPadding;
+
+            for (var index = 0; index < cellItems.Count; index++)
+            {
+                var itemHeight = GetItemHeight(cellItems[index]);
+
+                if (nextItemY + itemHeight > cell.Bounds.Y + cell.Bounds.Height - CellPadding)
+                {
+                    break;
+                }
+
+                itemLayouts.Add(new MonthItemLayout(
+                    cellItems[index],
+                    cell.Index,
+                    cell.Date,
+                    new LayoutRect(
+                        cell.Bounds.X + CellPadding,
+                        nextItemY,
+                        Math.Max(0, cell.Bounds.Width - (CellPadding * 2)),
+                        itemHeight)));
+
+                nextItemY += itemHeight + ItemGap;
+            }
+        }
+
+        return new MonthCalendarLayoutResult(cellWidth, cellHeight, cells, itemLayouts);
+    }
+
+    private static IEnumerable<CalendarItemViewModel> GetCellItems(IEnumerable<CalendarItemViewModel> items, DateOnly date)
+    {
+        var dayStart = date.ToDateTime(TimeOnly.MinValue);
+        var dayEnd = dayStart.AddDays(1);
+
+        foreach (var item in items)
+        {
+            if (!CalendarItemAccessor.TryGetTimeRange(item, out var start, out var end))
+            {
+                continue;
+            }
+
+            var localStart = start.LocalDateTime;
+            var localEnd = end.LocalDateTime;
+
+            if (localEnd <= localStart)
+            {
+                continue;
+            }
+
+            if (localStart < dayEnd && localEnd > dayStart)
+            {
+                yield return item;
+            }
+        }
+    }
+
+    private static double GetItemHeight(CalendarItemViewModel item)
+        => item.IsAllDayEvent || item.IsMultiDayEvent
+            ? ExpandedItemHeight
+            : RegularItemHeight;
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/TimedCalendarLayout.cs b/Wino.Mail.WinUI/Controls/Calendar/TimedCalendarLayout.cs
new file mode 100644
index 00000000..464a7e2e
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/TimedCalendarLayout.cs
@@ -0,0 +1,265 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Calendar.Controls;
+
+public sealed class TimedItemLayout
+{
+    public TimedItemLayout(CalendarItemViewModel item, int dayIndex, DateOnly date, LayoutRect bounds, DataTemplate? template = null)
+    {
+        Item = item;
+        DayIndex = dayIndex;
+        Date = date;
+        Bounds = bounds;
+        Template = template;
+    }
+
+    public CalendarItemViewModel Item { get; set; }
+    public int DayIndex { get; set; }
+    public DateOnly Date { get; set; }
+    public LayoutRect Bounds { get; set; }
+    public DataTemplate? Template { get; set; }
+}
+
+internal sealed record TimedCalendarLayoutResult(IReadOnlyList<DateOnly> VisibleDates, double DayWidth, IReadOnlyList<TimedItemLayout> Items);
+
+internal static class TimedCalendarLayoutCalculator
+{
+    private const double AllDayItemHeight = 28d;
+    private const double AllDayItemGap = 4d;
+    private const double AllDaySectionPadding = 6d;
+
+    public static double GetTimelineHeight(double hourHeight) => hourHeight * 24d;
+
+    public static double GetAllDayHeight(int laneCount)
+    {
+        if (laneCount <= 0)
+        {
+            return 0d;
+        }
+
+        return (AllDaySectionPadding * 2d) +
+               (laneCount * AllDayItemHeight) +
+               ((laneCount - 1) * AllDayItemGap);
+    }
+
+    public static TimedCalendarLayoutResult Calculate(VisibleDateRange range, IEnumerable<CalendarItemViewModel> items, double availableWidth, double hourHeight)
+    {
+        var visibleDates = range.Dates;
+        var dayWidth = visibleDates.Count == 0 ? 0d : availableWidth / visibleDates.Count;
+        var layouts = new List<TimedItemLayout>();
+
+        for (var dayIndex = 0; dayIndex < visibleDates.Count; dayIndex++)
+        {
+            var date = visibleDates[dayIndex];
+            var daySegments = BuildDaySegments(items, date)
+                .OrderBy(segment => segment.StartMinute)
+                .ThenBy(segment => segment.EndMinute)
+                .ToList();
+
+            foreach (var cluster in BuildClusters(daySegments))
+            {
+                AssignColumns(cluster);
+                var columnCount = cluster.Max(segment => segment.ColumnIndex) + 1;
+                var subColumnWidth = columnCount == 0 ? dayWidth : dayWidth / columnCount;
+
+                foreach (var segment in cluster)
+                {
+                    var x = (dayIndex * dayWidth) + (segment.ColumnIndex * subColumnWidth) + 2;
+                    var width = Math.Max(0, subColumnWidth - 4);
+                    var y = (segment.StartMinute / 60d) * hourHeight;
+                    var height = Math.Max(1, ((segment.EndMinute - segment.StartMinute) / 60d) * hourHeight);
+
+                    layouts.Add(new TimedItemLayout(segment.Item, dayIndex, date, new LayoutRect(x, y, width, height)));
+                }
+            }
+        }
+
+        return new TimedCalendarLayoutResult(visibleDates, dayWidth, layouts);
+    }
+
+    private static List<Segment> BuildDaySegments(IEnumerable<CalendarItemViewModel> items, DateOnly date)
+    {
+        var dayStart = date.ToDateTime(TimeOnly.MinValue);
+        var dayEnd = dayStart.AddDays(1);
+        var segments = new List<Segment>();
+
+        foreach (var item in items)
+        {
+            if (!CalendarItemAccessor.TryGetTimeRange(item, out var start, out var end))
+            {
+                continue;
+            }
+
+            if (item.IsAllDayEvent)
+            {
+                continue;
+            }
+
+            var localStart = start.LocalDateTime;
+            var localEnd = end.LocalDateTime;
+
+            if (localEnd <= localStart)
+            {
+                continue;
+            }
+
+            var segmentStart = localStart > dayStart ? localStart : dayStart;
+            var segmentEnd = localEnd < dayEnd ? localEnd : dayEnd;
+
+            if (segmentEnd <= segmentStart)
+            {
+                continue;
+            }
+
+            segments.Add(new Segment(item, (segmentStart - dayStart).TotalMinutes, (segmentEnd - dayStart).TotalMinutes));
+        }
+
+        return segments;
+    }
+
+    public static IReadOnlyList<TimedItemLayout> CalculateAllDayItems(VisibleDateRange range, IEnumerable<CalendarItemViewModel> items, double availableWidth)
+    {
+        var visibleDates = range.Dates;
+        var dayWidth = visibleDates.Count == 0 ? 0d : availableWidth / visibleDates.Count;
+        var layouts = new List<TimedItemLayout>();
+
+        for (var dayIndex = 0; dayIndex < visibleDates.Count; dayIndex++)
+        {
+            var date = visibleDates[dayIndex];
+            var dayItems = BuildAllDayItems(items, date)
+                .OrderBy(item => item.StartDate)
+                .ThenBy(item => item.EndDate)
+                .ThenBy(item => item.Title)
+                .ToList();
+
+            for (var rowIndex = 0; rowIndex < dayItems.Count; rowIndex++)
+            {
+                var y = AllDaySectionPadding + (rowIndex * (AllDayItemHeight + AllDayItemGap));
+                var x = (dayIndex * dayWidth) + 2d;
+                var width = Math.Max(0d, dayWidth - 4d);
+
+                layouts.Add(new TimedItemLayout(
+                    dayItems[rowIndex],
+                    dayIndex,
+                    date,
+                    new LayoutRect(x, y, width, AllDayItemHeight)));
+            }
+        }
+
+        return layouts;
+    }
+
+    public static int GetAllDayLaneCount(IReadOnlyList<DateOnly> visibleDates, IEnumerable<CalendarItemViewModel> items)
+    {
+        var laneCount = 0;
+
+        foreach (var date in visibleDates)
+        {
+            laneCount = Math.Max(laneCount, BuildAllDayItems(items, date).Count);
+        }
+
+        return laneCount;
+    }
+
+    private static IEnumerable<List<Segment>> BuildClusters(List<Segment> segments)
+    {
+        if (segments.Count == 0)
+        {
+            yield break;
+        }
+
+        var cluster = new List<Segment> { segments[0] };
+        var clusterEnd = segments[0].EndMinute;
+
+        for (var index = 1; index < segments.Count; index++)
+        {
+            var segment = segments[index];
+
+            if (segment.StartMinute < clusterEnd)
+            {
+                cluster.Add(segment);
+                clusterEnd = Math.Max(clusterEnd, segment.EndMinute);
+                continue;
+            }
+
+            yield return cluster;
+            cluster = [segment];
+            clusterEnd = segment.EndMinute;
+        }
+
+        yield return cluster;
+    }
+
+    private static List<CalendarItemViewModel> BuildAllDayItems(IEnumerable<CalendarItemViewModel> items, DateOnly date)
+    {
+        var dayStart = date.ToDateTime(TimeOnly.MinValue);
+        var dayEnd = dayStart.AddDays(1);
+        var allDayItems = new List<CalendarItemViewModel>();
+
+        foreach (var item in items)
+        {
+            if (!item.IsAllDayEvent)
+            {
+                continue;
+            }
+
+            if (!CalendarItemAccessor.TryGetTimeRange(item, out var start, out var end))
+            {
+                continue;
+            }
+
+            var localStart = start.LocalDateTime;
+            var localEnd = end.LocalDateTime;
+
+            if (localEnd <= localStart)
+            {
+                continue;
+            }
+
+            if (localStart < dayEnd && localEnd > dayStart)
+            {
+                allDayItems.Add(item);
+            }
+        }
+
+        return allDayItems;
+    }
+
+    private static void AssignColumns(List<Segment> segments)
+    {
+        var columnEnds = new List<double>();
+
+        foreach (var segment in segments)
+        {
+            var assignedColumn = -1;
+
+            for (var columnIndex = 0; columnIndex < columnEnds.Count; columnIndex++)
+            {
+                if (columnEnds[columnIndex] <= segment.StartMinute)
+                {
+                    assignedColumn = columnIndex;
+                    columnEnds[columnIndex] = segment.EndMinute;
+                    break;
+                }
+            }
+
+            if (assignedColumn < 0)
+            {
+                assignedColumn = columnEnds.Count;
+                columnEnds.Add(segment.EndMinute);
+            }
+
+            segment.ColumnIndex = assignedColumn;
+        }
+    }
+
+    private sealed record Segment(CalendarItemViewModel Item, double StartMinute, double EndMinute)
+    {
+        public int ColumnIndex { get; set; }
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/Calendar/WinoCalendarTypeSelectorControl.cs b/Wino.Mail.WinUI/Controls/Calendar/WinoCalendarTypeSelectorControl.cs
new file mode 100644
index 00000000..3e2730aa
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/Calendar/WinoCalendarTypeSelectorControl.cs
@@ -0,0 +1,146 @@
+using System.Windows.Input;
+using CommunityToolkit.Diagnostics;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Mail.WinUI.Controls;
+
+namespace Wino.Calendar.Controls;
+
+public partial class WinoCalendarTypeSelectorControl : Control
+{
+    private const string PART_TodayButton = nameof(PART_TodayButton);
+    private const string PART_DayToggle = nameof(PART_DayToggle);
+    private const string PART_WeekToggle = nameof(PART_WeekToggle);
+    private const string PART_WorkWeekToggle = nameof(PART_WorkWeekToggle);
+    private const string PART_MonthToggle = nameof(PART_MonthToggle);
+
+    public static readonly DependencyProperty SelectedTypeProperty = DependencyProperty.Register(
+        nameof(SelectedType),
+        typeof(CalendarDisplayType),
+        typeof(WinoCalendarTypeSelectorControl),
+        new PropertyMetadata(CalendarDisplayType.Week, OnSelectedTypeChanged));
+    public static readonly DependencyProperty DisplayDayCountProperty = DependencyProperty.Register(nameof(DisplayDayCount), typeof(int), typeof(WinoCalendarTypeSelectorControl), new PropertyMetadata(0));
+    public static readonly DependencyProperty TodayClickedCommandProperty = DependencyProperty.Register(nameof(TodayClickedCommand), typeof(ICommand), typeof(WinoCalendarTypeSelectorControl), new PropertyMetadata(null));
+
+    public ICommand? TodayClickedCommand
+    {
+        get { return (ICommand?)GetValue(TodayClickedCommandProperty); }
+        set { SetValue(TodayClickedCommandProperty, value); }
+    }
+
+    public CalendarDisplayType SelectedType
+    {
+        get { return (CalendarDisplayType)GetValue(SelectedTypeProperty); }
+        set { SetValue(SelectedTypeProperty, value); }
+    }
+
+    public int DisplayDayCount
+    {
+        get { return (int)GetValue(DisplayDayCountProperty); }
+        set { SetValue(DisplayDayCountProperty, value); }
+    }
+
+    private AppBarButton? _todayButton;
+    private AppBarToggleButton? _dayToggle;
+    private AppBarToggleButton? _weekToggle;
+    private AppBarToggleButton? _workWeekToggle;
+    private AppBarToggleButton? _monthToggle;
+
+    public WinoCalendarTypeSelectorControl()
+    {
+        DefaultStyleKey = typeof(WinoCalendarTypeSelectorControl);
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        UnregisterHandlers();
+
+        _todayButton = GetTemplateChild(PART_TodayButton) as AppBarButton;
+        _dayToggle = GetTemplateChild(PART_DayToggle) as AppBarToggleButton;
+        _weekToggle = GetTemplateChild(PART_WeekToggle) as AppBarToggleButton;
+        _workWeekToggle = GetTemplateChild(PART_WorkWeekToggle) as AppBarToggleButton;
+        _monthToggle = GetTemplateChild(PART_MonthToggle) as AppBarToggleButton;
+
+        Guard.IsNotNull(_todayButton, nameof(_todayButton));
+        Guard.IsNotNull(_dayToggle, nameof(_dayToggle));
+        Guard.IsNotNull(_weekToggle, nameof(_weekToggle));
+        Guard.IsNotNull(_workWeekToggle, nameof(_workWeekToggle));
+        Guard.IsNotNull(_monthToggle, nameof(_monthToggle));
+
+        _todayButton!.Click += TodayClicked;
+        _dayToggle!.Click += DayToggleClicked;
+        _weekToggle!.Click += WeekToggleClicked;
+        _workWeekToggle!.Click += WorkWeekToggleClicked;
+        _monthToggle!.Click += MonthToggleClicked;
+
+        UpdateToggleButtonStates();
+    }
+
+    private void TodayClicked(object? sender, RoutedEventArgs e) => TodayClickedCommand?.Execute(null);
+
+    private void DayToggleClicked(object sender, RoutedEventArgs e) => SetSelectedType(CalendarDisplayType.Day);
+
+    private void WeekToggleClicked(object sender, RoutedEventArgs e) => SetSelectedType(CalendarDisplayType.Week);
+
+    private void WorkWeekToggleClicked(object sender, RoutedEventArgs e) => SetSelectedType(CalendarDisplayType.WorkWeek);
+
+    private void MonthToggleClicked(object sender, RoutedEventArgs e) => SetSelectedType(CalendarDisplayType.Month);
+
+    private void SetSelectedType(CalendarDisplayType type)
+    {
+        SelectedType = type;
+        UpdateToggleButtonStates();
+    }
+
+    private static void OnSelectedTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is WinoCalendarTypeSelectorControl control)
+        {
+            control.UpdateToggleButtonStates();
+        }
+    }
+
+    private void UnregisterHandlers()
+    {
+        if (_todayButton != null)
+        {
+            _todayButton.Click -= TodayClicked;
+        }
+
+        if (_dayToggle != null)
+        {
+            _dayToggle.Click -= DayToggleClicked;
+        }
+
+        if (_weekToggle != null)
+        {
+            _weekToggle.Click -= WeekToggleClicked;
+        }
+
+        if (_workWeekToggle != null)
+        {
+            _workWeekToggle.Click -= WorkWeekToggleClicked;
+        }
+
+        if (_monthToggle != null)
+        {
+            _monthToggle.Click -= MonthToggleClicked;
+        }
+    }
+
+    private void UpdateToggleButtonStates()
+    {
+        if (_dayToggle == null || _weekToggle == null || _workWeekToggle == null || _monthToggle == null)
+        {
+            return;
+        }
+
+        _dayToggle.IsChecked = SelectedType == CalendarDisplayType.Day;
+        _weekToggle.IsChecked = SelectedType == CalendarDisplayType.Week;
+        _workWeekToggle.IsChecked = SelectedType == CalendarDisplayType.WorkWeek;
+        _monthToggle.IsChecked = SelectedType == CalendarDisplayType.Month;
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/CalendarFlipView/WinoCalendarFlyoutItem.cs b/Wino.Mail.WinUI/Controls/CalendarFlipView/WinoCalendarFlyoutItem.cs
new file mode 100644
index 00000000..86dc16a5
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/CalendarFlipView/WinoCalendarFlyoutItem.cs
@@ -0,0 +1,11 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Wino.Mail.WinUI.Controls.CalendarFlipView;
+
+public partial class WinoCalendarFlyoutItem : FlipViewItem
+{
+    public WinoCalendarFlyoutItem()
+    {
+        DefaultStyleKey = typeof(WinoCalendarFlyoutItem);
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml b/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml
new file mode 100644
index 00000000..dcbeb24e
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml
@@ -0,0 +1,84 @@
+<UserControl
+    x:Class="Wino.Controls.CalendarMailItemDisplayInformationControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
+    xmlns:helpers="using:Wino.Helpers"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch">
+    <Grid x:DefaultBindMode="OneWay">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <controls:MailItemDisplayInformationControl
+            x:Name="BaseMailControl"
+            ActionItem="{x:Bind MailItem, Mode=OneWay}"
+            DisplayMode="{x:Bind DisplayMode, Mode=OneWay}"
+            HoverActionExecuted="BaseMailControlHoverActionExecuted"
+            MailItemInformation="{x:Bind MailItem, Mode=OneWay}"
+            Prefer24HourTimeFormat="{x:Bind Prefer24HourTimeFormat, Mode=OneWay}"
+            ShowPreviewText="False" />
+
+        <Grid
+            x:Name="EventDateContainer"
+            Grid.Row="1"
+            Margin="46,0,12,8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <ContentPresenter
+                x:Name="CalendarInvitationContent"
+                Grid.Column="0"
+                Margin="0,0,4,0"
+                VerticalAlignment="Center"
+                x:Load="{x:Bind MailItem.IsCalendarEvent, Mode=OneWay}"
+                ContentTemplate="{StaticResource CalendarInvitationSymbolControlTemplate}" />
+            <TextBlock
+                x:Name="EventDateText"
+                Grid.Column="1"
+                Margin="4,0,2,0"
+                FontSize="12"
+                Opacity="0.75"
+                Text="{x:Bind EventDateRangeText, Mode=OneWay}"
+                TextTrimming="CharacterEllipsis" />
+        </Grid>
+    </Grid>
+
+    <VisualStateManager.VisualStateGroups>
+        <VisualStateGroup x:Name="SizingStates">
+            <VisualState x:Name="Compact">
+                <VisualState.Setters>
+                    <Setter Target="EventDateText.Margin" Value="53,0,12,6" />
+                    <Setter Target="EventDateText.FontSize" Value="11" />
+                </VisualState.Setters>
+                <VisualState.StateTriggers>
+                    <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.ObjectEquals(DisplayMode, enums:MailListDisplayMode.Compact), Mode=OneWay}" />
+                </VisualState.StateTriggers>
+            </VisualState>
+
+            <VisualState x:Name="Medium">
+                <VisualState.Setters>
+                    <Setter Target="EventDateText.Margin" Value="53,0,12,8" />
+                    <Setter Target="EventDateText.FontSize" Value="12" />
+                </VisualState.Setters>
+                <VisualState.StateTriggers>
+                    <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.ObjectEquals(DisplayMode, enums:MailListDisplayMode.Medium), Mode=OneWay}" />
+                </VisualState.StateTriggers>
+            </VisualState>
+
+            <VisualState x:Name="Spacious">
+                <VisualState.Setters>
+                    <Setter Target="EventDateText.Margin" Value="59,0,12,10" />
+                    <Setter Target="EventDateText.FontSize" Value="12" />
+                </VisualState.Setters>
+                <VisualState.StateTriggers>
+                    <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.ObjectEquals(DisplayMode, enums:MailListDisplayMode.Spacious), Mode=OneWay}" />
+                </VisualState.StateTriggers>
+            </VisualState>
+        </VisualStateGroup>
+    </VisualStateManager.VisualStateGroups>
+</UserControl>
diff --git a/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml.cs b/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml.cs
new file mode 100644
index 00000000..a8bd6042
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/CalendarMailItemDisplayInformationControl.xaml.cs
@@ -0,0 +1,381 @@
+using System;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using MimeKit;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI;
+
+namespace Wino.Controls;
+
+public sealed partial class CalendarMailItemDisplayInformationControl : UserControl
+{
+    private static readonly ConcurrentDictionary<Guid, string> EventDateRangeCache = [];
+
+    private readonly IMimeFileService _mimeFileService;
+    private readonly IPreferencesService _preferencesService;
+    private CancellationTokenSource? _loadingCts;
+
+    [GeneratedDependencyProperty]
+    public partial MailItemViewModel? MailItem { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailListDisplayMode.Spacious)]
+    public partial MailListDisplayMode DisplayMode { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool Prefer24HourTimeFormat { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = "")]
+    public partial string EventDateRangeText { get; set; }
+
+    public event EventHandler<MailOperationPreperationRequest>? HoverActionExecuted;
+
+    public CalendarMailItemDisplayInformationControl()
+    {
+        InitializeComponent();
+
+        _mimeFileService = App.Current.Services.GetRequiredService<IMimeFileService>();
+        _preferencesService = App.Current.Services.GetRequiredService<IPreferencesService>();
+
+        DisplayMode = _preferencesService.MailItemDisplayMode;
+        Prefer24HourTimeFormat = _preferencesService.Prefer24HourTimeFormat;
+
+        Unloaded += OnControlUnloaded;
+    }
+
+    partial void OnMailItemPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        _ = LoadEventDateRangeAsync();
+    }
+
+    private async Task LoadEventDateRangeAsync()
+    {
+        _loadingCts?.Cancel();
+        _loadingCts?.Dispose();
+        _loadingCts = new CancellationTokenSource();
+        var token = _loadingCts.Token;
+
+        if (MailItem?.MailCopy == null)
+        {
+            EventDateRangeText = string.Empty;
+            return;
+        }
+
+        if (EventDateRangeCache.TryGetValue(MailItem.MailCopy.FileId, out var cachedValue))
+        {
+            EventDateRangeText = cachedValue;
+            return;
+        }
+
+        try
+        {
+            var accountId = MailItem.MailCopy.AssignedAccount?.Id;
+            if (accountId == null || accountId == Guid.Empty)
+            {
+                EventDateRangeText = Translator.UnknownDateHeader;
+                return;
+            }
+
+            var isMimeExists = await _mimeFileService.IsMimeExistAsync(accountId.Value, MailItem.MailCopy.FileId);
+            if (!isMimeExists)
+            {
+                EventDateRangeText = Translator.UnknownDateHeader;
+                return;
+            }
+
+            var mimeInfo = await _mimeFileService.GetMimeMessageInformationAsync(MailItem.MailCopy.FileId, accountId.Value, token);
+            if (mimeInfo == null)
+            {
+                EventDateRangeText = Translator.UnknownDateHeader;
+                return;
+            }
+
+            var renderedDateRange = ExtractCalendarDateRange(mimeInfo.MimeMessage);
+
+            EventDateRangeText = string.IsNullOrWhiteSpace(renderedDateRange) ? Translator.UnknownDateHeader : renderedDateRange;
+            EventDateRangeCache.TryAdd(MailItem.MailCopy.FileId, EventDateRangeText);
+        }
+        catch (OperationCanceledException)
+        {
+            // Ignore; newer bind request superseded this one.
+        }
+        catch
+        {
+            EventDateRangeText = Translator.UnknownDateHeader;
+        }
+    }
+
+    private void BaseMailControlHoverActionExecuted(object sender, MailOperationPreperationRequest e)
+        => HoverActionExecuted?.Invoke(this, e);
+
+    private string ExtractCalendarDateRange(MimeMessage message)
+    {
+        var calendarContent = GetCalendarContent(message);
+        if (string.IsNullOrWhiteSpace(calendarContent))
+        {
+            return string.Empty;
+        }
+
+        var unfoldedIcs = UnfoldIcs(calendarContent);
+        var eventSection = ExtractFirstVEventSection(unfoldedIcs);
+
+        if (!TryReadIcsDateValue(eventSection, "DTSTART", out var dtStartValue, out var dtStartTzId))
+        {
+            return string.Empty;
+        }
+
+        if (!TryParseIcsDateTime(dtStartValue, dtStartTzId, out var startLocal, out var isAllDay))
+        {
+            return string.Empty;
+        }
+
+        DateTime endLocal = startLocal;
+        if (TryReadIcsDateValue(eventSection, "DTEND", out var dtEndValue, out var dtEndTzId))
+        {
+            if (!TryParseIcsDateTime(dtEndValue, dtEndTzId, out endLocal, out var endIsAllDay))
+            {
+                endLocal = startLocal;
+            }
+
+            isAllDay = isAllDay && endIsAllDay;
+        }
+
+        return FormatDisplayDateRange(startLocal, endLocal, isAllDay);
+    }
+
+    private static string GetCalendarContent(MimeMessage message)
+    {
+        var calendarTextPart = message.BodyParts
+            .OfType<TextPart>()
+            .FirstOrDefault(x => x.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (calendarTextPart != null)
+        {
+            return calendarTextPart.Text ?? string.Empty;
+        }
+
+        var calendarMimePart = message.BodyParts
+            .OfType<MimePart>()
+            .FirstOrDefault(x => x.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (calendarMimePart == null)
+        {
+            return string.Empty;
+        }
+
+        using var stream = new MemoryStream();
+        calendarMimePart.Content?.DecodeTo(stream);
+        var contentBytes = stream.ToArray();
+
+        if (contentBytes.Length == 0)
+        {
+            return string.Empty;
+        }
+
+        var charset = calendarMimePart.ContentType?.Charset;
+        var encoding = string.IsNullOrWhiteSpace(charset) ? System.Text.Encoding.UTF8 : System.Text.Encoding.GetEncoding(charset);
+        return encoding.GetString(contentBytes);
+    }
+
+    private static string UnfoldIcs(string content)
+        => content
+            .Replace("\r\n ", string.Empty, StringComparison.Ordinal)
+            .Replace("\r\n\t", string.Empty, StringComparison.Ordinal)
+            .Replace("\n ", string.Empty, StringComparison.Ordinal)
+            .Replace("\n\t", string.Empty, StringComparison.Ordinal);
+
+    private static string ExtractFirstVEventSection(string ics)
+    {
+        if (string.IsNullOrWhiteSpace(ics))
+        {
+            return string.Empty;
+        }
+
+        const string beginVevent = "BEGIN:VEVENT";
+        const string endVevent = "END:VEVENT";
+
+        var beginIndex = ics.IndexOf(beginVevent, StringComparison.OrdinalIgnoreCase);
+        if (beginIndex < 0)
+        {
+            return ics;
+        }
+
+        var endIndex = ics.IndexOf(endVevent, beginIndex, StringComparison.OrdinalIgnoreCase);
+        if (endIndex < 0)
+        {
+            return ics[beginIndex..];
+        }
+
+        return ics.Substring(beginIndex, endIndex - beginIndex + endVevent.Length);
+    }
+
+    private static bool TryReadIcsDateValue(string ics, string propertyName, out string value, out string timeZoneId)
+    {
+        value = string.Empty;
+        timeZoneId = string.Empty;
+
+        var lines = ics.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries);
+        foreach (var rawLine in lines)
+        {
+            var line = rawLine.Trim();
+            if (!line.StartsWith(propertyName, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var colonIndex = line.IndexOf(':');
+            if (colonIndex <= 0 || colonIndex == line.Length - 1)
+            {
+                continue;
+            }
+
+            var parameterSection = line[..colonIndex];
+            value = line[(colonIndex + 1)..].Trim();
+
+            var paramsSplit = parameterSection.Split(';', StringSplitOptions.RemoveEmptyEntries);
+            foreach (var parameter in paramsSplit.Skip(1))
+            {
+                var eqIndex = parameter.IndexOf('=');
+                if (eqIndex <= 0 || eqIndex == parameter.Length - 1)
+                {
+                    continue;
+                }
+
+                var name = parameter[..eqIndex].Trim();
+                if (!name.Equals("TZID", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                timeZoneId = parameter[(eqIndex + 1)..].Trim().Trim('"');
+                break;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool TryParseIcsDateTime(string rawValue, string timeZoneId, out DateTime localDateTime, out bool isAllDay)
+    {
+        localDateTime = default;
+        isAllDay = false;
+
+        if (string.IsNullOrWhiteSpace(rawValue))
+        {
+            return false;
+        }
+
+        var value = rawValue.Trim();
+
+        if (value.Length == 8 && DateTime.TryParseExact(value, "yyyyMMdd", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateOnly))
+        {
+            localDateTime = dateOnly.Date;
+            isAllDay = true;
+            return true;
+        }
+
+        var isUtc = value.EndsWith("Z", StringComparison.OrdinalIgnoreCase);
+        if (isUtc)
+        {
+            value = value[..^1];
+        }
+
+        var formats = new[] { "yyyyMMdd'T'HHmmss", "yyyyMMdd'T'HHmm" };
+        if (!DateTime.TryParseExact(value, formats, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
+        {
+            return false;
+        }
+
+        if (isUtc)
+        {
+            localDateTime = DateTime.SpecifyKind(parsedDate, DateTimeKind.Utc).ToLocalTime();
+            return true;
+        }
+
+        if (!string.IsNullOrWhiteSpace(timeZoneId) && TryFindTimeZone(timeZoneId, out var sourceZone))
+        {
+            var unspecifiedTime = DateTime.SpecifyKind(parsedDate, DateTimeKind.Unspecified);
+            localDateTime = TimeZoneInfo.ConvertTime(unspecifiedTime, sourceZone, TimeZoneInfo.Local);
+            return true;
+        }
+
+        localDateTime = DateTime.SpecifyKind(parsedDate, DateTimeKind.Local);
+        return true;
+    }
+
+    private static bool TryFindTimeZone(string timeZoneId, out TimeZoneInfo timeZone)
+    {
+        timeZone = null!;
+
+        try
+        {
+            timeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+            return true;
+        }
+        catch
+        {
+            if (TimeZoneInfo.TryConvertIanaIdToWindowsId(timeZoneId, out var windowsId))
+            {
+                try
+                {
+                    timeZone = TimeZoneInfo.FindSystemTimeZoneById(windowsId);
+                    return true;
+                }
+                catch
+                {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private string FormatDisplayDateRange(DateTime startLocal, DateTime endLocal, bool isAllDay)
+    {
+        if (endLocal < startLocal)
+        {
+            endLocal = startLocal;
+        }
+
+        var culture = CultureInfo.DefaultThreadCurrentUICulture;
+        if (isAllDay)
+        {
+            var adjustedEnd = endLocal.Date > startLocal.Date ? endLocal.Date.AddDays(-1) : startLocal.Date;
+
+            if (adjustedEnd.Date > startLocal.Date)
+            {
+                return $"{startLocal.ToString("d", culture)} - {adjustedEnd.ToString("d", culture)} ({Translator.CalendarItemAllDay})";
+            }
+
+            return $"{startLocal.ToString("d", culture)} ({Translator.CalendarItemAllDay})";
+        }
+
+        var timeFormat = Prefer24HourTimeFormat ? "HH:mm" : "h:mm tt";
+
+        if (startLocal.Date == endLocal.Date)
+        {
+            return $"{startLocal.ToString($"ddd, MMM d {timeFormat}", culture)} - {endLocal.ToString(timeFormat, culture)}";
+        }
+
+        return $"{startLocal.ToString($"ddd, MMM d {timeFormat}", culture)} - {endLocal.ToString($"ddd, MMM d {timeFormat}", culture)}";
+    }
+
+    private void OnControlUnloaded(object sender, RoutedEventArgs e)
+    {
+        _loadingCts?.Cancel();
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml b/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml
new file mode 100644
index 00000000..732d901f
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Wino.Mail.WinUI.Controls.CalendarTitleBarContent"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:calendarControls="using:Wino.Calendar.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Style
+            x:Key="CalendarNavigationButtonStyle"
+            BasedOn="{StaticResource DefaultButtonStyle}"
+            TargetType="Button">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Height" Value="32" />
+
+            <Setter Property="Padding" Value="0" />
+            <!--<Setter Property="Foreground" Value="{ThemeResource SystemColorControlAccentBrush}" />-->
+
+            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="4,0,0,0" Background="Transparent">
+        <Grid Background="Transparent" ColumnSpacing="16">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="128" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Grid VerticalAlignment="Center" ColumnSpacing="6">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Button Click="PreviousDateClicked" Style="{StaticResource CalendarNavigationButtonStyle}">
+                    <Viewbox Width="12">
+                        <PathIcon Data="F1 M 8.72 18.599998 C 8.879999 18.733334 9.059999 18.799999 9.26 18.799999 C 9.459999 18.799999 9.633332 18.719999 9.78 18.559999 C 9.926666 18.4 10 18.219999 10 18.019999 C 10 17.82 9.92 17.653332 9.76 17.52 L 4.52 12.559999 L 17.24 12.559999 C 17.453333 12.559999 17.633331 12.486667 17.779999 12.339999 C 17.926666 12.193334 18 12.013333 18 11.799999 C 18 11.586666 17.926666 11.406667 17.779999 11.259999 C 17.633331 11.113333 17.453333 11.039999 17.24 11.039999 L 4.52 11.039999 L 9.76 6.08 C 9.973333 5.893333 10.046666 5.653332 9.98 5.359999 C 9.913333 5.066666 9.74 4.880001 9.46 4.799999 C 9.179999 4.720001 8.933332 4.786667 8.72 5 L 2.32 11.08 C 2.16 11.24 2.053333 11.426666 2 11.639999 C 1.973333 11.746666 1.973333 11.853333 2 11.959999 C 2.053333 12.173333 2.16 12.360001 2.32 12.52 Z " />
+                    </Viewbox>
+                </Button>
+
+                <Button
+                    Grid.Column="1"
+                    Click="NextDateClicked"
+                    Style="{StaticResource CalendarNavigationButtonStyle}">
+                    <Viewbox Width="12">
+                        <PathIcon Data="F1 M 11.28 5 C 11.12 4.866667 10.94 4.806667 10.74 4.82 C 10.539999 4.833334 10.366666 4.913334 10.219999 5.059999 C 10.073333 5.206665 10 5.379999 10 5.58 C 10 5.779999 10.08 5.946667 10.24 6.08 L 15.48 11.039999 L 2.76 11.039999 C 2.546667 11.039999 2.366667 11.113333 2.22 11.259999 C 2.073333 11.406667 2 11.586666 2 11.799999 C 2 12.013333 2.073333 12.193334 2.22 12.339999 C 2.366667 12.486667 2.546667 12.559999 2.76 12.559999 L 15.48 12.559999 L 10.24 17.52 C 10.026667 17.706665 9.953333 17.946667 10.02 18.24 C 10.086666 18.533333 10.259999 18.719999 10.54 18.799999 C 10.82 18.879999 11.066667 18.813334 11.28 18.599998 L 17.68 12.52 C 17.84 12.360001 17.946667 12.173333 18 11.959999 C 18 11.853333 18 11.746666 18 11.639999 C 17.946667 11.426666 17.84 11.24 17.68 11.08 Z " />
+                    </Viewbox>
+                </Button>
+            </Grid>
+
+            <TextBlock
+                x:Name="VisibleDateRangeTextBlock"
+                Grid.Column="1"
+                MaxHeight="30"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="18"
+                IsHitTestVisible="False"
+                Style="{StaticResource BodyTextBlockStyle}"
+                TextAlignment="Center" />
+            <calendarControls:WinoCalendarTypeSelectorControl
+                x:Name="CalendarTypeSelector"
+                Grid.Column="2"
+                VerticalAlignment="Center" />
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml.cs b/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml.cs
new file mode 100644
index 00000000..df356b84
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/CalendarTitleBarContent.xaml.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows.Input;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Calendar.Controls;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class CalendarTitleBarContent : UserControl
+{
+    public event EventHandler? PreviousDateRequested;
+    public event EventHandler? NextDateRequested;
+
+    public CalendarTitleBarContent()
+    {
+        InitializeComponent();
+    }
+
+    public string VisibleDateRangeText
+    {
+        get => VisibleDateRangeTextBlock.Text;
+        set => VisibleDateRangeTextBlock.Text = value;
+    }
+
+    public ICommand? TodayClickedCommand
+    {
+        get => CalendarTypeSelector.TodayClickedCommand;
+        set => CalendarTypeSelector.TodayClickedCommand = value;
+    }
+
+    public int DisplayDayCount
+    {
+        get => CalendarTypeSelector.DisplayDayCount;
+        set => CalendarTypeSelector.DisplayDayCount = value;
+    }
+
+    public CalendarDisplayType SelectedType
+    {
+        get => CalendarTypeSelector.SelectedType;
+        set => CalendarTypeSelector.SelectedType = value;
+    }
+
+    public long RegisterSelectedTypeChanged(DependencyPropertyChangedCallback callback)
+        => CalendarTypeSelector.RegisterPropertyChangedCallback(WinoCalendarTypeSelectorControl.SelectedTypeProperty, callback);
+
+    public void UnregisterSelectedTypeChanged(long token)
+        => CalendarTypeSelector.UnregisterPropertyChangedCallback(WinoCalendarTypeSelectorControl.SelectedTypeProperty, token);
+
+    private void PreviousDateClicked(object sender, RoutedEventArgs e)
+        => PreviousDateRequested?.Invoke(this, EventArgs.Empty);
+
+    private void NextDateClicked(object sender, RoutedEventArgs e)
+        => NextDateRequested?.Invoke(this, EventArgs.Empty);
+}
diff --git a/Wino.Core.UWP/Controls/ControlConstants.cs b/Wino.Mail.WinUI/Controls/ControlConstants.cs
similarity index 88%
rename from Wino.Core.UWP/Controls/ControlConstants.cs
rename to Wino.Mail.WinUI/Controls/ControlConstants.cs
index db693d77..b66f7e43 100644
--- a/Wino.Core.UWP/Controls/ControlConstants.cs
+++ b/Wino.Mail.WinUI/Controls/ControlConstants.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public static class ControlConstants
 {
@@ -76,6 +76,7 @@ public static class ControlConstants
         { WinoIconGlyph.CalendarToday, "\uE911" },
         { WinoIconGlyph.CalendarDay, "\uE913" },
         { WinoIconGlyph.CalendarWeek, "\uE914" },
+        { WinoIconGlyph.CalendarWorkWeek, "\uE914" },
         { WinoIconGlyph.CalendarMonth, "\uE91c" },
         { WinoIconGlyph.CalendarYear, "\uE917" },
         { WinoIconGlyph.WeatherBlow, "\uE907" },
@@ -100,6 +101,15 @@ public static class ControlConstants
         { WinoIconGlyph.EventJoinOnline, "\uE926" },
         { WinoIconGlyph.ViewMessageSource, "\uE943" },
         { WinoIconGlyph.Apple, "\uE92B" },
-        { WinoIconGlyph.Yahoo, "\uE92C" }
+        { WinoIconGlyph.Yahoo, "\uE92C" },
+        { WinoIconGlyph.People, "\uF007" },
+        { WinoIconGlyph.AttachmentNew, "\uF006" },
+        { WinoIconGlyph.CalendarSettings, "\uF005" },
+        { WinoIconGlyph.SettingsNew, "\uF004" },
+        { WinoIconGlyph.ManageAccounts, "\uF003" },
+        { WinoIconGlyph.SendNew, "\uF002" },
+        { WinoIconGlyph.CalendarShowAs, "\uF001" },
+        { WinoIconGlyph.EventDecline, "\uF000" },
+        { WinoIconGlyph.Dismiss, "\uF008" },
     };
 }
diff --git a/Wino.Core.UWP/Controls/CustomWrapPanel.cs b/Wino.Mail.WinUI/Controls/CustomWrapPanel.cs
similarity index 94%
rename from Wino.Core.UWP/Controls/CustomWrapPanel.cs
rename to Wino.Mail.WinUI/Controls/CustomWrapPanel.cs
index af875259..90230165 100644
--- a/Wino.Core.UWP/Controls/CustomWrapPanel.cs
+++ b/Wino.Mail.WinUI/Controls/CustomWrapPanel.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 
-namespace Wino.Core.UWP.Controls
+namespace Wino.Mail.WinUI.Controls
 {
     using Windows.Foundation;
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Controls;
+    using Microsoft.UI.Xaml;
+    using Microsoft.UI.Xaml.Controls;
 
     namespace CustomControls
     {
diff --git a/Wino.Mail.WinUI/Controls/EditorCommanding.cs b/Wino.Mail.WinUI/Controls/EditorCommanding.cs
new file mode 100644
index 00000000..0be5479d
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/EditorCommanding.cs
@@ -0,0 +1,252 @@
+using System;
+using System.Globalization;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
+using Windows.UI;
+
+namespace Wino.Mail.Controls;
+
+public interface IEditorCommandTarget
+{
+    EditorState CurrentState { get; }
+    EditorCapabilities Capabilities { get; }
+    event EventHandler<EditorState>? StateChanged;
+    event EventHandler<EditorCapabilities>? CapabilitiesChanged;
+    Task ExecuteCommandAsync(EditorCommand command);
+}
+
+public interface IEditorCommandControl
+{
+    IEditorCommandTarget? CommandTarget { get; set; }
+    void AttachCommandTarget(IEditorCommandTarget? target);
+    void DetachCommandTarget();
+}
+
+public enum EditorCommandKind
+{
+    ToggleBold,
+    ToggleItalic,
+    ToggleUnderline,
+    ToggleStrikethrough,
+    ToggleOrderedList,
+    ToggleUnorderedList,
+    Indent,
+    Outdent,
+    SetAlignment,
+    SetFontFamily,
+    SetFontSize,
+    SetParagraphStyle,
+    SetTextColor,
+    SetHighlightColor,
+    SetLineHeight,
+    InsertImage,
+    InsertLink,
+    RemoveLink,
+    InsertEmoji,
+    InsertTable,
+    ToggleBuiltInToolbar,
+    ToggleTheme,
+    ToggleSpellCheck
+}
+
+public enum EditorTextAlignment
+{
+    Left,
+    Center,
+    Right,
+    Justify
+}
+
+public sealed record class EditorCommand(EditorCommandKind Kind, object? Value = null)
+{
+    public static EditorCommand ToggleBold() => new(EditorCommandKind.ToggleBold);
+    public static EditorCommand ToggleItalic() => new(EditorCommandKind.ToggleItalic);
+    public static EditorCommand ToggleUnderline() => new(EditorCommandKind.ToggleUnderline);
+    public static EditorCommand ToggleStrikethrough() => new(EditorCommandKind.ToggleStrikethrough);
+    public static EditorCommand ToggleOrderedList() => new(EditorCommandKind.ToggleOrderedList);
+    public static EditorCommand ToggleUnorderedList() => new(EditorCommandKind.ToggleUnorderedList);
+    public static EditorCommand Indent() => new(EditorCommandKind.Indent);
+    public static EditorCommand Outdent() => new(EditorCommandKind.Outdent);
+    public static EditorCommand SetAlignment(EditorTextAlignment alignment) => new(EditorCommandKind.SetAlignment, alignment);
+    public static EditorCommand SetFontFamily(string fontFamily) => new(EditorCommandKind.SetFontFamily, fontFamily);
+    public static EditorCommand SetFontSize(int fontSize) => new(EditorCommandKind.SetFontSize, fontSize);
+    public static EditorCommand SetParagraphStyle(string tagName) => new(EditorCommandKind.SetParagraphStyle, tagName);
+    public static EditorCommand SetTextColor(string color) => new(EditorCommandKind.SetTextColor, color);
+    public static EditorCommand SetHighlightColor(string color) => new(EditorCommandKind.SetHighlightColor, color);
+    public static EditorCommand SetLineHeight(string lineHeight) => new(EditorCommandKind.SetLineHeight, lineHeight);
+    public static EditorCommand InsertImage() => new(EditorCommandKind.InsertImage);
+    public static EditorCommand InsertEmoji() => new(EditorCommandKind.InsertEmoji);
+    public static EditorCommand InsertLink(EditorLinkCommandArgs args) => new(EditorCommandKind.InsertLink, args);
+    public static EditorCommand RemoveLink() => new(EditorCommandKind.RemoveLink);
+    public static EditorCommand InsertTable(EditorTableCommandArgs args) => new(EditorCommandKind.InsertTable, args);
+    public static EditorCommand ToggleBuiltInToolbar(bool isVisible) => new(EditorCommandKind.ToggleBuiltInToolbar, isVisible);
+    public static EditorCommand ToggleTheme(bool isDarkMode) => new(EditorCommandKind.ToggleTheme, isDarkMode);
+    public static EditorCommand ToggleSpellCheck(bool isEnabled) => new(EditorCommandKind.ToggleSpellCheck, isEnabled);
+}
+
+public sealed record class EditorLinkCommandArgs(
+    [property: JsonPropertyName("url")] string Url,
+    [property: JsonPropertyName("text")] string? Text = null,
+    [property: JsonPropertyName("openInNewWindow")] bool OpenInNewWindow = true);
+
+public sealed record class EditorTableCommandArgs(
+    [property: JsonPropertyName("rows")] int Rows,
+    [property: JsonPropertyName("columns")] int Columns);
+
+public sealed record class EditorColorOption(string Name, string Value)
+{
+    public SolidColorBrush Brush => new(ParseColorValue(Value));
+
+    public static Color ParseColorValue(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return Colors.Transparent;
+        }
+
+        var normalizedValue = value.Trim();
+
+        if (string.Equals(normalizedValue, "transparent", StringComparison.OrdinalIgnoreCase))
+        {
+            return Colors.Transparent;
+        }
+
+        if (TryParseRgbColor(normalizedValue, out var rgbColor))
+        {
+            return rgbColor;
+        }
+
+        if (TryParseNamedColor(normalizedValue, out var namedColor))
+        {
+            return namedColor;
+        }
+
+        var hex = normalizedValue.TrimStart('#');
+        if (hex.Length == 6)
+        {
+            hex = $"FF{hex}";
+        }
+
+        if (hex.Length != 8 || !uint.TryParse(hex, System.Globalization.NumberStyles.HexNumber, null, out var argb))
+        {
+            return Colors.Transparent;
+        }
+
+        return Color.FromArgb(
+            (byte)((argb >> 24) & 0xFF),
+            (byte)((argb >> 16) & 0xFF),
+            (byte)((argb >> 8) & 0xFF),
+            (byte)(argb & 0xFF));
+    }
+
+    private static bool TryParseRgbColor(string value, out Color color)
+    {
+        color = Colors.Transparent;
+
+        var isRgba = value.StartsWith("rgba(", StringComparison.OrdinalIgnoreCase);
+        var isRgb = value.StartsWith("rgb(", StringComparison.OrdinalIgnoreCase);
+        if (!isRgb && !isRgba)
+        {
+            return false;
+        }
+
+        var startIndex = value.IndexOf('(');
+        var endIndex = value.LastIndexOf(')');
+        if (startIndex < 0 || endIndex <= startIndex)
+        {
+            return false;
+        }
+
+        var segments = value[(startIndex + 1)..endIndex]
+            .Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+
+        if ((isRgb && segments.Length != 3) || (isRgba && segments.Length != 4))
+        {
+            return false;
+        }
+
+        if (!byte.TryParse(segments[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out var red) ||
+            !byte.TryParse(segments[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var green) ||
+            !byte.TryParse(segments[2], NumberStyles.Integer, CultureInfo.InvariantCulture, out var blue))
+        {
+            return false;
+        }
+
+        byte alpha = 255;
+        if (isRgba)
+        {
+            if (!double.TryParse(segments[3], NumberStyles.Float, CultureInfo.InvariantCulture, out var alphaValue))
+            {
+                return false;
+            }
+
+            alpha = alphaValue <= 1d
+                ? (byte)Math.Clamp(Math.Round(alphaValue * 255d), 0d, 255d)
+                : (byte)Math.Clamp(Math.Round(alphaValue), 0d, 255d);
+        }
+
+        color = Color.FromArgb(alpha, red, green, blue);
+        return true;
+    }
+
+    private static bool TryParseNamedColor(string value, out Color color)
+    {
+        color = value.ToLowerInvariant() switch
+        {
+            "black" => Colors.Black,
+            "white" => Colors.White,
+            "gray" or "grey" => Colors.Gray,
+            "red" => Colors.Red,
+            "orange" => Colors.Orange,
+            "yellow" => Colors.Yellow,
+            "green" => Colors.Green,
+            "blue" => Colors.Blue,
+            "purple" => Colors.Purple,
+            "pink" => Colors.Pink,
+            _ => Colors.Transparent
+        };
+
+        return !color.Equals(Colors.Transparent) || string.Equals(value, "transparent", StringComparison.OrdinalIgnoreCase);
+    }
+}
+
+public sealed record class EditorParagraphStyleOption(string Name, string Tag);
+
+public sealed record class EditorCapabilities
+{
+    public IReadOnlyList<string> Fonts { get; init; } = Array.Empty<string>();
+    public IReadOnlyList<int> FontSizes { get; init; } = Array.Empty<int>();
+    public IReadOnlyList<EditorColorOption> TextColors { get; init; } = Array.Empty<EditorColorOption>();
+    public IReadOnlyList<EditorColorOption> HighlightColors { get; init; } = Array.Empty<EditorColorOption>();
+    public IReadOnlyList<EditorParagraphStyleOption> ParagraphStyles { get; init; } = Array.Empty<EditorParagraphStyleOption>();
+    public IReadOnlyList<string> LineHeights { get; init; } = Array.Empty<string>();
+    public IReadOnlyList<EditorTextAlignment> Alignments { get; init; } = Array.Empty<EditorTextAlignment>();
+}
+
+public sealed record class EditorState
+{
+    public bool IsBold { get; init; }
+    public bool IsItalic { get; init; }
+    public bool IsUnderline { get; init; }
+    public bool IsStrikethrough { get; init; }
+    public bool IsOrderedList { get; init; }
+    public bool IsUnorderedList { get; init; }
+    public bool CanIndent { get; init; } = true;
+    public bool CanOutdent { get; init; }
+    public bool HasSelection { get; init; }
+    public bool IsDarkMode { get; init; }
+    public bool IsBuiltInToolbarVisible { get; init; }
+    public bool IsSpellCheckEnabled { get; init; } = true;
+    public EditorTextAlignment Alignment { get; init; } = EditorTextAlignment.Left;
+    public string? FontFamily { get; init; }
+    public int? FontSize { get; init; }
+    public string? ParagraphStyle { get; init; }
+    public string? TextColor { get; init; }
+    public string? HighlightColor { get; init; }
+    public string? LineHeight { get; init; }
+    public string? LinkUrl { get; init; }
+    public string? SelectedText { get; init; }
+}
diff --git a/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml b/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml
new file mode 100644
index 00000000..7a809963
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml
@@ -0,0 +1,430 @@
+<UserControl
+    x:Class="Wino.Mail.Controls.EditorTabbedCommandBarControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mail="using:Wino.Mail.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
+    x:Name="Root"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Style
+            x:Key="CompactComboBoxStyle"
+            BasedOn="{StaticResource DefaultComboBoxStyle}"
+            TargetType="ComboBox">
+            <Setter Property="MinWidth" Value="72" />
+            <Setter Property="MaxWidth" Value="132" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Padding" Value="4,0,0,0" />
+        </Style>
+
+        <Style x:Key="CompactPickerContainerStyle" TargetType="AppBarElementContainer">
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="Margin" Value="0,8,0,0" />
+        </Style>
+
+        <Style x:Key="CompactPickerBorderStyle" TargetType="Border">
+            <!--<Setter Property="Background" Value="{ThemeResource ControlFillColorSecondaryBrush}" />-->
+            <Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+            <Setter Property="Padding" Value="0" />
+            <Setter Property="MinHeight" Value="36" />
+            <Setter Property="Margin" Value="4,0" />
+        </Style>
+
+        <DataTemplate x:Key="ColorOptionTemplate" x:DataType="mail:EditorColorOption">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <Grid Width="14" Height="14">
+                    <Rectangle
+                        Fill="{x:Bind Brush}"
+                        RadiusX="3"
+                        RadiusY="3"
+                        Stroke="{ThemeResource TextFillColorSecondaryBrush}"
+                        StrokeThickness="1" />
+                </Grid>
+                <TextBlock VerticalAlignment="Center" Text="{x:Bind Name}" />
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="ParagraphStyleOptionTemplate" x:DataType="mail:EditorParagraphStyleOption">
+            <TextBlock Text="{x:Bind Name}" />
+        </DataTemplate>
+
+    </UserControl.Resources>
+
+    <toolkit:TabbedCommandBar>
+        <toolkit:TabbedCommandBar.Resources>
+            <SolidColorBrush x:Key="TabContentContentBorderBackground" Color="Transparent" />
+            <SolidColorBrush x:Key="TabContentContentBorderBorderBrush" Color="Transparent" />
+            <Thickness x:Key="TabContentBorderBorderThickness">0</Thickness>
+            <Style BasedOn="{StaticResource DefaultAppBarToggleButtonStyle}" TargetType="AppBarToggleButton">
+                <Setter Property="Width" Value="50" />
+            </Style>
+            <Style BasedOn="{StaticResource DefaultAppBarButtonStyle}" TargetType="AppBarButton">
+                <Setter Property="Width" Value="50" />
+            </Style>
+        </toolkit:TabbedCommandBar.Resources>
+
+        <toolkit:TabbedCommandBar.PaneCustomContent>
+            <ContentPresenter Content="{x:Bind PaneCustomContent, Mode=OneWay}" />
+        </toolkit:TabbedCommandBar.PaneCustomContent>
+
+        <toolkit:TabbedCommandBar.MenuItems>
+            <toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="Format">
+                <AppBarToggleButton
+                    x:Name="BoldButton"
+                    Click="BoldButton_Click"
+                    Label="Bold"
+                    ToolTipService.ToolTip="Bold (Ctrl+B)">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource BoldPathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarToggleButton
+                    x:Name="ItalicButton"
+                    Click="ItalicButton_Click"
+                    Label="Italic"
+                    ToolTipService.ToolTip="Italic (Ctrl+I)">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource ItalicPathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarToggleButton
+                    x:Name="UnderlineButton"
+                    Click="UnderlineButton_Click"
+                    Label="Underline"
+                    ToolTipService.ToolTip="Underline (Ctrl+U)">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource UnderlinePathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarToggleButton
+                    x:Name="StrikeButton"
+                    Click="StrikeButton_Click"
+                    Label="Strikethrough"
+                    ToolTipService.ToolTip="Strikethrough">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource StrikePathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarSeparator />
+
+                <AppBarToggleButton
+                    x:Name="BulletListButton"
+                    Click="BulletListButton_Click"
+                    Label="Bullets"
+                    ToolTipService.ToolTip="Bulleted list">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource BulletedListPathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarToggleButton
+                    x:Name="OrderedListButton"
+                    Click="OrderedListButton_Click"
+                    Label="Numbered list"
+                    ToolTipService.ToolTip="Numbered list">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource OrderedListPathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarButton
+                    x:Name="OutdentButton"
+                    Click="OutdentButton_Click"
+                    Label="Outdent"
+                    ToolTipService.ToolTip="Outdent">
+                    <AppBarButton.Icon>
+                        <PathIcon Data="{StaticResource DecreaseIndentPathIcon}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarButton
+                    x:Name="IndentButton"
+                    Click="IndentButton_Click"
+                    Label="Indent"
+                    ToolTipService.ToolTip="Indent">
+                    <AppBarButton.Icon>
+                        <PathIcon Data="{StaticResource IncreaseIndentPathIcon}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Text alignment">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <PathIcon
+                                Width="14"
+                                Height="14"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="{StaticResource AlignLeftPathIcon}"
+                                Foreground="{ThemeResource TextFillColorPrimaryBrush}" />
+                            <ComboBox
+                                x:Name="AlignmentComboBox"
+                                Grid.Column="1"
+                                MinWidth="94"
+                                SelectionChanged="AlignmentComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Font family">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <FontIcon
+                                Margin="10,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Glyph="&#xE8D2;" />
+                            <ComboBox
+                                x:Name="FontFamilyComboBox"
+                                Grid.Column="1"
+                                MinWidth="110"
+                                PlaceholderText="Font"
+                                SelectionChanged="FontFamilyComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                            <ComboBox
+                                x:Name="FontSizeComboBox"
+                                Grid.Column="2"
+                                MinWidth="72"
+                                HorizontalContentAlignment="Center"
+                                PlaceholderText="Size"
+                                SelectionChanged="FontSizeComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Paragraph style">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <PathIcon
+                                Width="14"
+                                Height="14"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="{StaticResource ParagraphPathIcon}"
+                                Foreground="{ThemeResource TextFillColorPrimaryBrush}" />
+                            <ComboBox
+                                x:Name="ParagraphStyleComboBox"
+                                Grid.Column="1"
+                                MinWidth="104"
+                                ItemTemplate="{StaticResource ParagraphStyleOptionTemplate}"
+                                PlaceholderText="Paragraph"
+                                SelectionChanged="ParagraphStyleComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Text color">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid
+                                Width="18"
+                                Height="18"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <Rectangle
+                                    Fill="{x:Bind SelectedTextColorBrush, Mode=OneWay}"
+                                    RadiusX="4"
+                                    RadiusY="4"
+                                    Stroke="{ThemeResource TextFillColorSecondaryBrush}"
+                                    StrokeThickness="1" />
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="11"
+                                    FontWeight="SemiBold"
+                                    Text="A" />
+                            </Grid>
+                            <ComboBox
+                                x:Name="TextColorComboBox"
+                                Grid.Column="1"
+                                MinWidth="104"
+                                ItemTemplate="{StaticResource ColorOptionTemplate}"
+                                PlaceholderText="Text"
+                                SelectionChanged="TextColorComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Highlight color">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Grid
+                                Width="18"
+                                Height="18"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center">
+                                <Rectangle
+                                    Fill="{x:Bind SelectedHighlightColorBrush, Mode=OneWay}"
+                                    RadiusX="4"
+                                    RadiusY="4"
+                                    Stroke="{ThemeResource TextFillColorSecondaryBrush}"
+                                    StrokeThickness="1" />
+                                <Rectangle
+                                    Width="10"
+                                    Height="2"
+                                    Margin="0,0,0,3"
+                                    VerticalAlignment="Bottom"
+                                    Fill="{ThemeResource TextFillColorPrimaryBrush}" />
+                            </Grid>
+                            <ComboBox
+                                x:Name="HighlightColorComboBox"
+                                Grid.Column="1"
+                                MinWidth="108"
+                                ItemTemplate="{StaticResource ColorOptionTemplate}"
+                                PlaceholderText="Highlight"
+                                SelectionChanged="HighlightColorComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+
+                <AppBarElementContainer Style="{StaticResource CompactPickerContainerStyle}" ToolTipService.ToolTip="Line height">
+                    <Border Style="{StaticResource CompactPickerBorderStyle}">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="32" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <FontIcon
+                                Margin="9,0,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Glyph="&#xE8C8;" />
+                            <ComboBox
+                                x:Name="LineHeightComboBox"
+                                Grid.Column="1"
+                                MinWidth="72"
+                                PlaceholderText="Line"
+                                SelectionChanged="LineHeightComboBox_SelectionChanged"
+                                Style="{StaticResource CompactComboBoxStyle}" />
+                        </Grid>
+                    </Border>
+                </AppBarElementContainer>
+            </toolkit:TabbedCommandBarItem>
+
+            <toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="Insert">
+                <AppBarButton
+                    x:Name="ImageButton"
+                    Click="ImageButton_Click"
+                    Label="Image"
+                    ToolTipService.ToolTip="Insert image">
+                    <AppBarButton.Icon>
+                        <PathIcon Data="{StaticResource AddPhotoPathIcon}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarButton
+                    x:Name="EmojiButton"
+                    Click="EmojiButton_Click"
+                    Label="Emoji"
+                    ToolTipService.ToolTip="Insert emoji">
+                    <AppBarButton.Icon>
+                        <PathIcon Data="{StaticResource EmojiPathIcon}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarButton
+                    x:Name="LinkButton"
+                    Click="LinkButton_Click"
+                    Label="Link"
+                    ToolTipService.ToolTip="Insert or edit link">
+                    <AppBarButton.Icon>
+                        <PathIcon Data="{StaticResource AddLinkPathIcon}" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarButton
+                    x:Name="RemoveLinkButton"
+                    Click="RemoveLinkButton_Click"
+                    Label="Remove link"
+                    ToolTipService.ToolTip="Remove link"
+                    Visibility="Collapsed">
+                    <AppBarButton.Icon>
+                        <SymbolIcon Symbol="Remove" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarButton
+                    x:Name="TableButton"
+                    Click="TableButton_Click"
+                    Label="Table"
+                    ToolTipService.ToolTip="Insert table">
+                    <AppBarButton.Icon>
+                        <FontIcon Glyph="&#xE14C;" />
+                    </AppBarButton.Icon>
+                </AppBarButton>
+
+                <AppBarElementContainer ToolTipService.ToolTip="Insert actions">
+                    <ContentPresenter Content="{x:Bind InsertCustomContent, Mode=OneWay}" />
+                </AppBarElementContainer>
+            </toolkit:TabbedCommandBarItem>
+
+            <toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="Options">
+                <AppBarToggleButton
+                    x:Name="BuiltInToolbarButton"
+                    Click="BuiltInToolbarButton_Click"
+                    Label="Web toolbar"
+                    ToolTipService.ToolTip="Toggle built-in web toolbar">
+                    <AppBarToggleButton.Icon>
+                        <PathIcon Data="{StaticResource WebviewToolBarPathIcon}" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarToggleButton
+                    x:Name="SpellCheckButton"
+                    Click="SpellCheckButton_Click"
+                    Label="Spell check"
+                    ToolTipService.ToolTip="Toggle spell check">
+                    <AppBarToggleButton.Icon>
+                        <FontIcon Glyph="&#xEA53;" />
+                    </AppBarToggleButton.Icon>
+                </AppBarToggleButton>
+
+                <AppBarElementContainer ToolTipService.ToolTip="Composer options">
+                    <ContentPresenter Content="{x:Bind OptionsCustomContent, Mode=OneWay}" />
+                </AppBarElementContainer>
+            </toolkit:TabbedCommandBarItem>
+        </toolkit:TabbedCommandBar.MenuItems>
+    </toolkit:TabbedCommandBar>
+</UserControl>
+
+
diff --git a/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml.cs b/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml.cs
new file mode 100644
index 00000000..befdcb61
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/EditorTabbedCommandBarControl.xaml.cs
@@ -0,0 +1,449 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Windows.UI;
+
+namespace Wino.Mail.Controls;
+
+public sealed partial class EditorTabbedCommandBarControl : UserControl, IEditorCommandControl
+{
+    [GeneratedDependencyProperty]
+    public partial IEditorCommandTarget? CommandTarget { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial object? PaneCustomContent { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial object? InsertCustomContent { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial object? OptionsCustomContent { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial EditorColorOption? SelectedTextColorOption { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial EditorColorOption? SelectedHighlightColorOption { get; set; }
+
+    private bool _isApplyingState;
+    private IEditorCommandTarget? _subscribedTarget;
+    private static readonly SolidColorBrush TransparentBrush = new(EditorColorOption.ParseColorValue(null));
+    private IReadOnlyList<EditorColorOption> _textColorOptions = Array.Empty<EditorColorOption>();
+    private IReadOnlyList<EditorColorOption> _highlightColorOptions = Array.Empty<EditorColorOption>();
+
+    public Brush SelectedTextColorBrush => SelectedTextColorOption?.Brush ?? TransparentBrush;
+    public Brush SelectedHighlightColorBrush => SelectedHighlightColorOption?.Brush ?? TransparentBrush;
+
+    public EditorTabbedCommandBarControl()
+    {
+        InitializeComponent();
+
+        Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
+    }
+
+    public void AttachCommandTarget(IEditorCommandTarget? target)
+    {
+        if (_subscribedTarget == target)
+        {
+            return;
+        }
+
+        if (_subscribedTarget != null)
+        {
+            _subscribedTarget.StateChanged -= CommandTarget_StateChanged;
+            _subscribedTarget.CapabilitiesChanged -= CommandTarget_CapabilitiesChanged;
+        }
+
+        _subscribedTarget = target;
+
+        if (_subscribedTarget != null)
+        {
+            _subscribedTarget.StateChanged += CommandTarget_StateChanged;
+            _subscribedTarget.CapabilitiesChanged += CommandTarget_CapabilitiesChanged;
+            ApplyCapabilities(_subscribedTarget.Capabilities);
+            ApplyState(_subscribedTarget.CurrentState);
+        }
+    }
+
+    public void DetachCommandTarget()
+    {
+        if (_subscribedTarget == null)
+        {
+            return;
+        }
+
+        _subscribedTarget.StateChanged -= CommandTarget_StateChanged;
+        _subscribedTarget.CapabilitiesChanged -= CommandTarget_CapabilitiesChanged;
+        _subscribedTarget = null;
+    }
+
+    partial void OnCommandTargetChanged(IEditorCommandTarget? newValue)
+    {
+        AttachCommandTarget(newValue);
+    }
+
+    partial void OnSelectedTextColorOptionChanged(EditorColorOption? newValue) => Bindings.Update();
+
+    partial void OnSelectedHighlightColorOptionChanged(EditorColorOption? newValue) => Bindings.Update();
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        AttachCommandTarget(CommandTarget);
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        DetachCommandTarget();
+    }
+
+    private void CommandTarget_StateChanged(object? sender, EditorState e)
+    {
+        ApplyState(e);
+    }
+
+    private void CommandTarget_CapabilitiesChanged(object? sender, EditorCapabilities e)
+    {
+        ApplyCapabilities(e);
+    }
+
+    private void ApplyCapabilities(EditorCapabilities capabilities)
+    {
+        FontFamilyComboBox.ItemsSource = capabilities.Fonts;
+        FontSizeComboBox.ItemsSource = capabilities.FontSizes;
+        AlignmentComboBox.ItemsSource = capabilities.Alignments;
+        ParagraphStyleComboBox.ItemsSource = capabilities.ParagraphStyles;
+        _textColorOptions = capabilities.TextColors;
+        _highlightColorOptions = capabilities.HighlightColors;
+        TextColorComboBox.ItemsSource = _textColorOptions;
+        HighlightColorComboBox.ItemsSource = _highlightColorOptions;
+        LineHeightComboBox.ItemsSource = capabilities.LineHeights;
+    }
+
+    private void ApplyState(EditorState state)
+    {
+        _isApplyingState = true;
+
+        BoldButton.IsChecked = state.IsBold;
+        ItalicButton.IsChecked = state.IsItalic;
+        UnderlineButton.IsChecked = state.IsUnderline;
+        StrikeButton.IsChecked = state.IsStrikethrough;
+        BulletListButton.IsChecked = state.IsUnorderedList;
+        OrderedListButton.IsChecked = state.IsOrderedList;
+        IndentButton.IsEnabled = state.CanIndent;
+        OutdentButton.IsEnabled = state.CanOutdent;
+        RemoveLinkButton.IsEnabled = !string.IsNullOrWhiteSpace(state.LinkUrl);
+        RemoveLinkButton.Visibility = RemoveLinkButton.IsEnabled ? Visibility.Visible : Visibility.Collapsed;
+        BuiltInToolbarButton.IsChecked = state.IsBuiltInToolbarVisible;
+        SpellCheckButton.IsChecked = state.IsSpellCheckEnabled;
+
+        AlignmentComboBox.SelectedItem = state.Alignment;
+        FontFamilyComboBox.SelectedItem = MatchStringItem(FontFamilyComboBox.ItemsSource, state.FontFamily);
+        FontSizeComboBox.SelectedItem = MatchValueItem<int>(FontSizeComboBox.ItemsSource, state.FontSize);
+        LineHeightComboBox.SelectedItem = MatchStringItem(LineHeightComboBox.ItemsSource, state.LineHeight);
+        ParagraphStyleComboBox.SelectedItem = MatchParagraphItem(state.ParagraphStyle);
+        SelectedTextColorOption = ResolveColorOption(_textColorOptions, state.TextColor);
+        SelectedHighlightColorOption = ResolveColorOption(_highlightColorOptions, state.HighlightColor);
+        TextColorComboBox.SelectedItem = SelectedTextColorOption;
+        HighlightColorComboBox.SelectedItem = SelectedHighlightColorOption;
+
+        _isApplyingState = false;
+    }
+
+    private static object? MatchStringItem(object? itemsSource, string? value)
+    {
+        if (itemsSource is IEnumerable<string> strings)
+        {
+            return strings.FirstOrDefault(item => string.Equals(item, value, StringComparison.OrdinalIgnoreCase));
+        }
+
+        return null;
+    }
+
+    private static object? MatchValueItem<T>(object? itemsSource, T? value) where T : struct
+    {
+        if (!value.HasValue || itemsSource is not IEnumerable<T> values)
+        {
+            return null;
+        }
+
+        foreach (var item in values)
+        {
+            if (EqualityComparer<T>.Default.Equals(item, value.Value))
+            {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    private object? MatchParagraphItem(string? tag)
+    {
+        if (ParagraphStyleComboBox.ItemsSource is not IEnumerable<EditorParagraphStyleOption> styles)
+        {
+            return null;
+        }
+
+        return styles.FirstOrDefault(item => string.Equals(item.Tag, tag, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static EditorColorOption? MatchColorItem(IEnumerable<EditorColorOption> colors, string? value)
+    {
+        var normalizedValue = value ?? string.Empty;
+        var matchedByValue = colors.FirstOrDefault(item => string.Equals(item.Value, normalizedValue, StringComparison.OrdinalIgnoreCase));
+        if (matchedByValue != null)
+        {
+            return matchedByValue;
+        }
+
+        var targetColor = EditorColorOption.ParseColorValue(value);
+        return colors.FirstOrDefault(item => item.Brush.Color.Equals(targetColor));
+    }
+
+    private static EditorColorOption? ResolveColorOption(IEnumerable<EditorColorOption> colors, string? value)
+    {
+        var colorOptions = colors.ToList();
+        var matchedColor = MatchColorItem(colors, value);
+        if (matchedColor != null)
+        {
+            return matchedColor;
+        }
+
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return colorOptions.FirstOrDefault(item => string.IsNullOrWhiteSpace(item.Value));
+        }
+
+        var targetColor = EditorColorOption.ParseColorValue(value);
+        var selectableColors = colorOptions
+            .Where(item => !string.IsNullOrWhiteSpace(item.Value))
+            .ToList();
+
+        if (selectableColors.Count == 0)
+        {
+            return colorOptions.FirstOrDefault();
+        }
+
+        return selectableColors
+            .OrderBy(item => GetColorDistance(item.Brush.Color, targetColor))
+            .First();
+    }
+
+    private static int GetColorDistance(Color left, Color right)
+    {
+        var redDiff = left.R - right.R;
+        var greenDiff = left.G - right.G;
+        var blueDiff = left.B - right.B;
+        return (redDiff * redDiff) + (greenDiff * greenDiff) + (blueDiff * blueDiff);
+    }
+
+    private async Task ExecuteAsync(EditorCommand command)
+    {
+        if (_isApplyingState || CommandTarget == null)
+        {
+            return;
+        }
+
+        await CommandTarget.ExecuteCommandAsync(command);
+    }
+
+    private async void BoldButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleBold());
+    private async void ItalicButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleItalic());
+    private async void UnderlineButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleUnderline());
+    private async void StrikeButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleStrikethrough());
+    private async void BulletListButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleUnorderedList());
+    private async void OrderedListButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.ToggleOrderedList());
+    private async void IndentButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.Indent());
+    private async void OutdentButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.Outdent());
+    private async void ImageButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.InsertImage());
+    private async void EmojiButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.InsertEmoji());
+    private async void RemoveLinkButton_Click(object sender, RoutedEventArgs e) => await ExecuteAsync(EditorCommand.RemoveLink());
+
+    private async void AlignmentComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isApplyingState || AlignmentComboBox.SelectedItem is not EditorTextAlignment alignment)
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetAlignment(alignment));
+    }
+
+    private async void FontFamilyComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isApplyingState || FontFamilyComboBox.SelectedItem is not string fontFamily || string.IsNullOrWhiteSpace(fontFamily))
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetFontFamily(fontFamily));
+    }
+
+    private async void FontSizeComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isApplyingState || FontSizeComboBox.SelectedItem is not int fontSize)
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetFontSize(fontSize));
+    }
+
+    private async void ParagraphStyleComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isApplyingState || ParagraphStyleComboBox.SelectedItem is not EditorParagraphStyleOption paragraphStyle)
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetParagraphStyle(paragraphStyle.Tag));
+    }
+
+    private async void TextColorComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        SelectedTextColorOption = TextColorComboBox.SelectedItem as EditorColorOption;
+
+        if (_isApplyingState || SelectedTextColorOption == null)
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetTextColor(SelectedTextColorOption.Value));
+    }
+
+    private async void HighlightColorComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        SelectedHighlightColorOption = HighlightColorComboBox.SelectedItem as EditorColorOption;
+
+        if (_isApplyingState || SelectedHighlightColorOption == null)
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetHighlightColor(SelectedHighlightColorOption.Value));
+    }
+
+    private async void LineHeightComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_isApplyingState || LineHeightComboBox.SelectedItem is not string lineHeight || string.IsNullOrWhiteSpace(lineHeight))
+        {
+            return;
+        }
+
+        await ExecuteAsync(EditorCommand.SetLineHeight(lineHeight));
+    }
+
+    private async void BuiltInToolbarButton_Click(object sender, RoutedEventArgs e)
+    {
+        await ExecuteAsync(EditorCommand.ToggleBuiltInToolbar(BuiltInToolbarButton.IsChecked == true));
+    }
+
+    private async void SpellCheckButton_Click(object sender, RoutedEventArgs e)
+    {
+        await ExecuteAsync(EditorCommand.ToggleSpellCheck(SpellCheckButton.IsChecked == true));
+    }
+
+    private async void LinkButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (CommandTarget == null)
+        {
+            return;
+        }
+
+        var currentState = CommandTarget.CurrentState;
+        var urlTextBox = new TextBox
+        {
+            Header = "URL",
+            Text = currentState.LinkUrl ?? string.Empty,
+            PlaceholderText = "https://example.com"
+        };
+        var textTextBox = new TextBox
+        {
+            Header = "Text",
+            Text = currentState.SelectedText ?? string.Empty,
+            PlaceholderText = "Link text"
+        };
+        var openInNewWindow = new CheckBox
+        {
+            Content = "Open in new window",
+            IsChecked = true
+        };
+
+        var dialog = new ContentDialog
+        {
+            XamlRoot = XamlRoot,
+            Title = "Insert link",
+            PrimaryButtonText = "Apply",
+            CloseButtonText = "Cancel",
+            DefaultButton = ContentDialogButton.Primary,
+            Content = new StackPanel
+            {
+                Spacing = 12,
+                Children =
+                {
+                    urlTextBox,
+                    textTextBox,
+                    openInNewWindow
+                }
+            }
+        };
+
+        if (await dialog.ShowAsync() == ContentDialogResult.Primary && !string.IsNullOrWhiteSpace(urlTextBox.Text))
+        {
+            await ExecuteAsync(EditorCommand.InsertLink(new EditorLinkCommandArgs(urlTextBox.Text.Trim(), textTextBox.Text.Trim(), openInNewWindow.IsChecked == true)));
+        }
+    }
+
+    private async void TableButton_Click(object sender, RoutedEventArgs e)
+    {
+        var rowsBox = new NumberBox
+        {
+            Header = "Rows",
+            Minimum = 1,
+            Maximum = 10,
+            SmallChange = 1,
+            Value = 2
+        };
+        var columnsBox = new NumberBox
+        {
+            Header = "Columns",
+            Minimum = 1,
+            Maximum = 10,
+            SmallChange = 1,
+            Value = 2
+        };
+
+        var dialog = new ContentDialog
+        {
+            XamlRoot = XamlRoot,
+            Title = "Insert table",
+            PrimaryButtonText = "Insert",
+            CloseButtonText = "Cancel",
+            DefaultButton = ContentDialogButton.Primary,
+            Content = new StackPanel
+            {
+                Spacing = 12,
+                Children =
+                {
+                    rowsBox,
+                    columnsBox
+                }
+            }
+        };
+
+        if (await dialog.ShowAsync() == ContentDialogResult.Primary)
+        {
+            await ExecuteAsync(EditorCommand.InsertTable(new EditorTableCommandArgs((int)Math.Max(1, rowsBox.Value), (int)Math.Max(1, columnsBox.Value))));
+        }
+    }
+
+}
+
+
+
diff --git a/Wino.Core.UWP/Controls/EqualGridPanel.cs b/Wino.Mail.WinUI/Controls/EqualGridPanel.cs
similarity index 94%
rename from Wino.Core.UWP/Controls/EqualGridPanel.cs
rename to Wino.Mail.WinUI/Controls/EqualGridPanel.cs
index e87eee1f..bba8bc70 100644
--- a/Wino.Core.UWP/Controls/EqualGridPanel.cs
+++ b/Wino.Mail.WinUI/Controls/EqualGridPanel.cs
@@ -1,8 +1,8 @@
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Windows.Foundation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public partial class EqualGridPanel : Panel
 {
diff --git a/Wino.Mail.WinUI/Controls/IAiHtmlActionHost.cs b/Wino.Mail.WinUI/Controls/IAiHtmlActionHost.cs
new file mode 100644
index 00000000..24ca2b93
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/IAiHtmlActionHost.cs
@@ -0,0 +1,15 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public interface IAiHtmlActionHost
+{
+    Task<string?> GetCurrentHtmlAsync(CancellationToken cancellationToken);
+    Task ApplyHtmlResultAsync(string html, CancellationToken cancellationToken);
+    Task<string?> TryGetCachedTranslationHtmlAsync(string languageCode, CancellationToken cancellationToken);
+    Task SaveCachedTranslationHtmlAsync(string languageCode, string html, CancellationToken cancellationToken);
+    Task<string?> TryGetCachedSummaryTextAsync(CancellationToken cancellationToken);
+    Task SaveCachedSummaryTextAsync(string summary, CancellationToken cancellationToken);
+    string GetSuggestedSummaryFileName();
+}
diff --git a/Wino.Mail.WinUI/Controls/ImagePreviewControl.cs b/Wino.Mail.WinUI/Controls/ImagePreviewControl.cs
new file mode 100644
index 00000000..7bd51b87
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ImagePreviewControl.cs
@@ -0,0 +1,457 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using EmailValidation;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
+
+namespace Wino.Controls;
+
+/// <summary>
+/// Contact avatar control built on top of PersonPicture.
+/// Priority:
+/// 1) AccountContact file-based picture
+/// 2) Gravatar thumbnail (if enabled)
+/// 3) Initials from display name fallback
+/// </summary>
+public sealed partial class ImagePreviewControl : PersonPicture
+{
+    private sealed record RefreshSnapshot(string DisplayName, string Address, Guid? ContactPictureFileId);
+
+    private static readonly TimeSpan RefreshDebounceDuration = TimeSpan.FromMilliseconds(40);
+
+    [GeneratedDependencyProperty]
+    public partial IMailItemDisplayInformation? MailItemInformation { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial AccountContact? PreviewContact { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial string? Address { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial string? DisplayNameOverride { get; set; }
+
+    private readonly IThumbnailService? _thumbnailService;
+    private readonly IPreferencesService? _preferencesService;
+    private readonly IContactPictureFileService? _contactPictureFileService;
+    private INotifyPropertyChanged? _mailItemInformationPropertySource;
+    private CancellationTokenSource? _refreshCancellationTokenSource;
+    private CancellationTokenSource? _scheduledRefreshCancellationTokenSource;
+    private long _refreshVersion;
+
+    public ImagePreviewControl()
+    {
+        DefaultStyleKey = typeof(PersonPicture);
+
+        try
+        {
+            _thumbnailService = App.Current.Services.GetService<IThumbnailService>();
+            _preferencesService = App.Current.Services.GetService<IPreferencesService>();
+            _contactPictureFileService = App.Current.Services.GetService<IContactPictureFileService>();
+        }
+        catch
+        {
+            // Keep control functional in design-time/test contexts without service provider.
+        }
+
+        Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
+    }
+
+    partial void OnMailItemInformationPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (_mailItemInformationPropertySource != null)
+        {
+            _mailItemInformationPropertySource.PropertyChanged -= MailItemInformationPropertyChanged;
+            _mailItemInformationPropertySource = null;
+        }
+
+        if (e.NewValue is INotifyPropertyChanged observableMailItemInformation)
+        {
+            _mailItemInformationPropertySource = observableMailItemInformation;
+            _mailItemInformationPropertySource.PropertyChanged += MailItemInformationPropertyChanged;
+        }
+
+        RequestRefresh();
+    }
+
+    partial void OnPreviewContactPropertyChanged(DependencyPropertyChangedEventArgs e) => RequestRefresh();
+    partial void OnAddressPropertyChanged(DependencyPropertyChangedEventArgs e) => RequestRefresh();
+    partial void OnDisplayNameOverridePropertyChanged(DependencyPropertyChangedEventArgs e) => RequestRefresh();
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        RequestRefresh();
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        if (_mailItemInformationPropertySource != null)
+        {
+            _mailItemInformationPropertySource.PropertyChanged -= MailItemInformationPropertyChanged;
+            _mailItemInformationPropertySource = null;
+        }
+
+        CancelScheduledRefresh();
+        CancelActiveRefresh();
+    }
+
+    private void MailItemInformationPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        // Refresh only for fields that affect avatar image or initials.
+        if (string.IsNullOrEmpty(e.PropertyName)
+            || e.PropertyName == nameof(IMailItemDisplayInformation.ContactPictureFileId)
+            || e.PropertyName == nameof(IMailItemDisplayInformation.SenderContact)
+            || e.PropertyName == nameof(IMailItemDisplayInformation.FromName)
+            || e.PropertyName == nameof(IMailItemDisplayInformation.FromAddress)
+            || e.PropertyName == nameof(IMailItemDisplayInformation.ThumbnailUpdatedEvent))
+        {
+            RequestRefresh();
+        }
+    }
+
+    private void RequestRefresh()
+    {
+        if (DispatcherQueue == null || DispatcherQueue.HasThreadAccess)
+        {
+            QueueRefresh();
+            return;
+        }
+
+        DispatcherQueue.TryEnqueue(QueueRefresh);
+    }
+
+    private void QueueRefresh()
+    {
+        if (!IsLoaded)
+            return;
+
+        CancelScheduledRefresh();
+
+        var cts = new CancellationTokenSource();
+        _scheduledRefreshCancellationTokenSource = cts;
+
+        _ = DebounceAndRefreshAsync(cts.Token);
+    }
+
+    private async Task DebounceAndRefreshAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            await Task.Delay(RefreshDebounceDuration, cancellationToken).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException)
+        {
+            return;
+        }
+
+        StartRefresh();
+    }
+
+    private void StartRefresh()
+    {
+        CancelActiveRefresh();
+
+        var cts = new CancellationTokenSource();
+        _refreshCancellationTokenSource = cts;
+        var refreshVersion = Interlocked.Increment(ref _refreshVersion);
+        _ = RefreshAsync(refreshVersion, cts.Token);
+    }
+
+    private void CancelScheduledRefresh()
+    {
+        var cts = _scheduledRefreshCancellationTokenSource;
+        _scheduledRefreshCancellationTokenSource = null;
+
+        if (cts != null && !cts.IsCancellationRequested)
+        {
+            cts.Cancel();
+        }
+
+        cts?.Dispose();
+    }
+
+    private void CancelActiveRefresh()
+    {
+        var cts = _refreshCancellationTokenSource;
+        _refreshCancellationTokenSource = null;
+
+        if (cts != null && !cts.IsCancellationRequested)
+        {
+            cts.Cancel();
+        }
+
+        cts?.Dispose();
+    }
+
+    private async Task RefreshAsync(long refreshVersion, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var snapshot = await CaptureSnapshotAsync(refreshVersion, cancellationToken).ConfigureAwait(false);
+            if (snapshot == null)
+                return;
+
+            await ApplyInitialVisualStateAsync(snapshot.DisplayName, refreshVersion, cancellationToken).ConfigureAwait(false);
+
+            // Skip all picture loading if the user has disabled sender pictures.
+            if (_preferencesService?.IsShowSenderPicturesEnabled == false)
+                return;
+
+            // 1) File-based contact picture (preferred — native WIC decode, no base64 overhead).
+            if (snapshot.ContactPictureFileId.HasValue && _contactPictureFileService != null)
+            {
+                var filePath = _contactPictureFileService.GetContactPicturePath(snapshot.ContactPictureFileId.Value);
+                if (!string.IsNullOrEmpty(filePath))
+                {
+                    var fileBitmap = await CreateBitmapFromFileAsync(filePath, cancellationToken).ConfigureAwait(false);
+                    if (fileBitmap != null)
+                    {
+                        await ApplyProfilePictureAsync(fileBitmap, refreshVersion, cancellationToken).ConfigureAwait(false);
+                        return;
+                    }
+                }
+            }
+
+            // 2) Gravatar lookup through thumbnail service (if enabled).
+            if (_preferencesService?.IsGravatarEnabled == true &&
+                _thumbnailService != null &&
+                !string.IsNullOrWhiteSpace(snapshot.Address) &&
+                EmailValidator.Validate(snapshot.Address))
+            {
+                var thumbnailBase64 = await _thumbnailService
+                    .GetThumbnailAsync(snapshot.Address.Trim().ToLowerInvariant(), awaitLoad: true)
+                    .ConfigureAwait(false);
+
+                if (!string.IsNullOrWhiteSpace(thumbnailBase64))
+                {
+                    var thumbnailBitmap = await CreateBitmapFromBase64Async(thumbnailBase64, cancellationToken).ConfigureAwait(false);
+                    if (thumbnailBitmap != null)
+                    {
+                        await ApplyProfilePictureAsync(thumbnailBitmap, refreshVersion, cancellationToken).ConfigureAwait(false);
+                        return;
+                    }
+                }
+            }
+
+            // 3) Initials fallback is already in place via DisplayName + ProfilePicture = null.
+        }
+        catch (OperationCanceledException)
+        {
+            // Expected during virtualization/recycling.
+        }
+        catch
+        {
+            // Keep fallback initials if decoding/network fails.
+        }
+    }
+
+    // DependencyProperty-backed values must be read on UI thread once, then used off-thread.
+    private async Task<RefreshSnapshot?> CaptureSnapshotAsync(long refreshVersion, CancellationToken cancellationToken)
+    {
+        return await ExecuteOnUiThreadAsync(() =>
+        {
+            if (!IsActiveRefresh(refreshVersion, cancellationToken))
+                return null;
+
+            var address = ResolveAddress();
+            var displayName = ResolveDisplayName(address);
+            var contactPictureFileId = PreviewContact?.ContactPictureFileId
+                                       ?? MailItemInformation?.SenderContact?.ContactPictureFileId
+                                       ?? MailItemInformation?.ContactPictureFileId;
+
+            return new RefreshSnapshot(displayName, address, contactPictureFileId);
+        }).ConfigureAwait(false);
+    }
+
+    private string ResolveAddress()
+    {
+        if (!string.IsNullOrWhiteSpace(PreviewContact?.Address))
+            return PreviewContact.Address.Trim();
+
+        if (!string.IsNullOrWhiteSpace(Address))
+            return Address.Trim();
+
+        if (MailItemInformation == null)
+            return string.Empty;
+
+        var contactAddress = MailItemInformation?.SenderContact?.Address;
+        if (!string.IsNullOrWhiteSpace(contactAddress))
+            return contactAddress.Trim();
+
+        if (!string.IsNullOrWhiteSpace(MailItemInformation?.FromAddress))
+            return MailItemInformation.FromAddress.Trim();
+
+        return string.Empty;
+    }
+
+    private string ResolveDisplayName(string resolvedAddress)
+    {
+        if (!string.IsNullOrWhiteSpace(PreviewContact?.Name))
+            return PreviewContact.Name.Trim();
+
+        if (!string.IsNullOrWhiteSpace(DisplayNameOverride))
+            return DisplayNameOverride.Trim();
+
+        var contactName = MailItemInformation?.SenderContact?.Name;
+        if (!string.IsNullOrWhiteSpace(contactName))
+            return contactName.Trim();
+
+        if (!string.IsNullOrWhiteSpace(MailItemInformation?.FromName))
+            return MailItemInformation.FromName.Trim();
+
+        return resolvedAddress.Trim();
+    }
+    private async Task ApplyInitialVisualStateAsync(string displayName, long refreshVersion, CancellationToken cancellationToken)
+    {
+        await ExecuteOnUiThreadAsync(() =>
+        {
+            if (!IsActiveRefresh(refreshVersion, cancellationToken))
+                return;
+
+            DisplayName = displayName;
+            Initials = null;
+            ProfilePicture = null;
+        }).ConfigureAwait(false);
+    }
+
+    private async Task ApplyProfilePictureAsync(BitmapImage bitmapImage, long refreshVersion, CancellationToken cancellationToken)
+    {
+        await ExecuteOnUiThreadAsync(() =>
+        {
+            if (!IsActiveRefresh(refreshVersion, cancellationToken))
+                return;
+
+            DisplayName = string.Empty;
+            Initials = string.Empty;
+            ProfilePicture = bitmapImage;
+        }).ConfigureAwait(false);
+    }
+
+    private bool IsActiveRefresh(long refreshVersion, CancellationToken cancellationToken)
+        => !cancellationToken.IsCancellationRequested && refreshVersion == _refreshVersion;
+
+    private async Task ExecuteOnUiThreadAsync(Action action)
+    {
+        if (DispatcherQueue == null || DispatcherQueue.HasThreadAccess)
+        {
+            action();
+            return;
+        }
+
+        var completion = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var enqueued = DispatcherQueue.TryEnqueue(() =>
+        {
+            try
+            {
+                action();
+                completion.TrySetResult(null);
+            }
+            catch (Exception ex)
+            {
+                completion.TrySetException(ex);
+            }
+        });
+
+        if (!enqueued)
+        {
+            completion.TrySetException(new InvalidOperationException("Failed to dispatch UI update."));
+        }
+
+        await completion.Task.ConfigureAwait(false);
+    }
+
+    private async Task<T> ExecuteOnUiThreadAsync<T>(Func<T> func)
+    {
+        if (DispatcherQueue == null || DispatcherQueue.HasThreadAccess)
+        {
+            return func();
+        }
+
+        var completion = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var enqueued = DispatcherQueue.TryEnqueue(() =>
+        {
+            try
+            {
+                completion.TrySetResult(func());
+            }
+            catch (Exception ex)
+            {
+                completion.TrySetException(ex);
+            }
+        });
+
+        if (!enqueued)
+        {
+            completion.TrySetException(new InvalidOperationException("Failed to dispatch UI update."));
+        }
+
+        return await completion.Task.ConfigureAwait(false);
+    }
+
+    private async Task<BitmapImage?> CreateBitmapFromFileAsync(string filePath, CancellationToken cancellationToken)
+    {
+        byte[] bytes;
+        try
+        {
+            bytes = await File.ReadAllBytesAsync(filePath, cancellationToken).ConfigureAwait(false);
+        }
+        catch
+        {
+            return null;
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        return await ExecuteOnUiThreadAsync(() =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            using var memoryStream = new MemoryStream(bytes);
+            var bitmapImage = new BitmapImage();
+            bitmapImage.SetSource(memoryStream.AsRandomAccessStream());
+            return bitmapImage;
+        }).ConfigureAwait(false);
+    }
+
+    private async Task<BitmapImage?> CreateBitmapFromBase64Async(string base64, CancellationToken cancellationToken)
+    {
+        if (string.IsNullOrWhiteSpace(base64))
+            return null;
+
+        byte[] bytes;
+
+        try
+        {
+            bytes = await Task.Run(() => Convert.FromBase64String(base64), cancellationToken).ConfigureAwait(false);
+        }
+        catch
+        {
+            return null;
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        return await ExecuteOnUiThreadAsync(() =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            using var memoryStream = new MemoryStream(bytes);
+            var bitmapImage = new BitmapImage();
+            bitmapImage.SetSource(memoryStream.AsRandomAccessStream());
+            return bitmapImage;
+        }).ConfigureAwait(false);
+    }
+
+}
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoListView.cs b/Wino.Mail.WinUI/Controls/ListView/WinoListView.cs
new file mode 100644
index 00000000..fa08b548
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoListView.cs
@@ -0,0 +1,341 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.WinUI.Controls.ListView;
+
+public partial class WinoListView : Microsoft.UI.Xaml.Controls.ListView
+{
+    private const string PART_ScrollViewer = "ScrollViewer";
+    private ScrollViewer? internalScrollviewer;
+
+    [GeneratedDependencyProperty]
+    public partial bool IsThreadListView { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial ICommand? LoadMoreCommand { get; set; }
+
+    public event EventHandler<MailDragStateChangedEventArgs>? MailDragStateChanged;
+
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        DragItemsStarting -= ItemDragStarting;
+        DragItemsStarting += ItemDragStarting;
+        DragItemsCompleted -= ItemDragCompleted;
+        DragItemsCompleted += ItemDragCompleted;
+
+        internalScrollviewer = GetTemplateChild(PART_ScrollViewer) as ScrollViewer;
+
+        if (internalScrollviewer == null) return;
+
+        internalScrollviewer.ViewChanged -= InternalScrollVeiwerViewChanged;
+        internalScrollviewer.ViewChanged += InternalScrollVeiwerViewChanged;
+    }
+
+    private void InternalScrollVeiwerViewChanged(object? sender, ScrollViewerViewChangedEventArgs e)
+    {
+        if (internalScrollviewer == null) return;
+
+        // No need to raise init request if there are no items in the list.
+        if (ItemsSource == null) return;
+
+        double progress = internalScrollviewer.VerticalOffset / internalScrollviewer.ScrollableHeight;
+
+        // Trigger when scrolled past 90% of total height
+        if (progress >= 0.9)
+        {
+            bool canLoadMore = LoadMoreCommand?.CanExecute(null) ?? false;
+
+            if (canLoadMore)
+            {
+                LoadMoreCommand?.Execute(null);
+            }
+        }
+    }
+
+    protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
+    {
+        base.PrepareContainerForItemOverride(element, item);
+
+        // Ensure the container's selection state matches the model's state
+        // This is crucial for virtualization scenarios where containers are recycled
+
+        if (item is MailItemViewModel mailItemViewModel
+            && element is WinoMailItemViewModelListViewItem container
+            && container.Item != mailItemViewModel)
+        {
+            container.Item = mailItemViewModel;
+        }
+        else if (item is ThreadMailItemViewModel threadMailItemViewModel
+            && element is WinoThreadMailItemViewModelListViewItem threadContainer
+            && threadContainer.Item != threadMailItemViewModel)
+        {
+            threadContainer.Item = threadMailItemViewModel;
+            threadContainer.IsThreadExpanded = threadMailItemViewModel.IsThreadExpanded;
+        }
+    }
+
+    protected override void ClearContainerForItemOverride(DependencyObject element, object item)
+    {
+        base.ClearContainerForItemOverride(element, item);
+
+        if (item is MailItemViewModel mailItemViewModel && element is WinoMailItemViewModelListViewItem container)
+        {
+            container.Item = null;
+        }
+        else if (item is ThreadMailItemViewModel threadMailItemViewModel && element is WinoThreadMailItemViewModelListViewItem threadContainer)
+        {
+            threadContainer.Item = null;
+            threadContainer.IsThreadExpanded = false;
+        }
+    }
+
+    public WinoMailItemViewModelListViewItem? GetMailItemContainer(MailItemViewModel mailItemViewModel)
+    {
+        foreach (var item in Items)
+        {
+            if (item is MailItemViewModel mailItem && mailItem.Id == mailItemViewModel.Id) return ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
+            if (item is ThreadMailItemViewModel threadMailItem && threadMailItem.GetContainingIds().Contains(mailItemViewModel.MailCopy.UniqueId))
+            {
+                var threadContainer = ContainerFromItem(threadMailItem) as WinoThreadMailItemViewModelListViewItem;
+
+                // Try to get the inner WinoListView.
+                if (threadContainer != null)
+                {
+                    var innerListViewControl = threadContainer.GetWinoListViewControl();
+
+                    return innerListViewControl?.ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<Tuple<WinoMailItemViewModelListViewItem?, WinoThreadMailItemViewModelListViewItem?, WinoListView?>> GetItemContainersAsync(MailItemViewModel mailItemViewModel)
+    {
+        WinoMailItemViewModelListViewItem? itemContainer = null;
+        WinoThreadMailItemViewModelListViewItem? threadContainer = null;
+        WinoListView? innerListView = null;
+
+        int retryCount = 0;
+        int maxRetries = 5;
+
+        foreach (var item in Items)
+        {
+            if (item is MailItemViewModel mailItem && mailItem.Id == mailItemViewModel.Id)
+            {
+                itemContainer = ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
+
+                // Not realized yet.
+                if (itemContainer == null)
+                {
+                    ScrollIntoView(mailItemViewModel);
+
+                    // Wait for the container to be generated.
+                    while (itemContainer == null && retryCount < maxRetries)
+                    {
+                        await Task.Delay(100); // Wait a bit for the UI to update
+                        itemContainer = ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
+                        retryCount++;
+                    }
+                }
+
+                break;
+            }
+            else if (item is ThreadMailItemViewModel threadMailItemViewModel && threadMailItemViewModel.HasUniqueId(mailItemViewModel.MailCopy.UniqueId))
+            {
+                threadContainer = ContainerFromItem(threadMailItemViewModel) as WinoThreadMailItemViewModelListViewItem;
+
+                if (threadContainer == null)
+                {
+                    ScrollIntoView(threadMailItemViewModel);
+
+                    while (threadContainer == null && retryCount < maxRetries)
+                    {
+                        await Task.Delay(100); // Wait a bit for the UI to update
+                        threadContainer = ContainerFromItem(threadMailItemViewModel) as WinoThreadMailItemViewModelListViewItem;
+                        retryCount++;
+                    }
+                }
+
+                // Try to get the inner WinoListView.
+                if (threadContainer != null)
+                {
+                    threadContainer.IsThreadExpanded = true;
+
+                    var innerListViewControl = threadContainer.GetWinoListViewControl();
+
+                    if (innerListViewControl != null)
+                    {
+                        innerListView = innerListViewControl;
+
+                        itemContainer = innerListViewControl.ContainerFromItem(mailItemViewModel) as WinoMailItemViewModelListViewItem;
+
+                        // Item thread has been found but container is not realized yet.
+                        // This could happen when Sent item passed to navigate for Inbox or vice-versa.
+                        // Ideally, we should select the first UniqueId match in the thread in this case.
+
+                        if (itemContainer == null)
+                        {
+                            var realThreadItem = innerListViewControl.Items.Cast<MailItemViewModel>().FirstOrDefault(a => a.UniqueId == mailItemViewModel.MailCopy.UniqueId);
+
+                            if (realThreadItem != null)
+                            {
+                                itemContainer = innerListViewControl.ContainerFromItem(realThreadItem) as WinoMailItemViewModelListViewItem;
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        return new Tuple<WinoMailItemViewModelListViewItem?, WinoThreadMailItemViewModelListViewItem?, WinoListView?>(itemContainer, threadContainer, innerListView);
+    }
+
+    public void ChangeSelectionMode(ListViewSelectionMode mode)
+    {
+        // Not only this control, but also all inner WinoListView controls should change the selection mode.
+        // TODO: New threads added after this call won't have the correct selection mode.
+
+        SelectionMode = mode;
+
+        foreach (var item in Items)
+        {
+            if (item is ThreadMailItemViewModel)
+            {
+                var itemContainer = ContainerFromItem(item) as WinoThreadMailItemViewModelListViewItem;
+                if (itemContainer != null)
+                {
+                    var innerListViewControl = itemContainer.GetWinoListViewControl();
+                    innerListViewControl?.ChangeSelectionMode(mode);
+                }
+            }
+        }
+    }
+
+    public void Cleanup()
+    {
+        DragItemsStarting -= ItemDragStarting;
+        DragItemsCompleted -= ItemDragCompleted;
+
+        if (internalScrollviewer != null)
+        {
+            internalScrollviewer.ViewChanged -= InternalScrollVeiwerViewChanged;
+        }
+    }
+
+    private void ItemDragStarting(object sender, DragItemsStartingEventArgs args)
+    {
+        // Dragging multiple mails from different accounts/folders are supported with the condition below:
+        // All mails belongs to the drag will be matched on the dropped folder's account.
+        // Meaning that if users drag 1 mail from Account A/Inbox and 1 mail from Account B/Inbox,
+        // and drop to Account A/Inbox, the mail from Account B/Inbox will NOT be moved.
+
+        var itemsToDrag = ResolveDraggedMailItems(args);
+
+        if (itemsToDrag.Count == 0)
+        {
+            return;
+        }
+
+        var dragPackage = new MailDragPackage(itemsToDrag.Cast<object>());
+        args.Data.Properties.Add(nameof(MailDragPackage), dragPackage);
+
+        var draggingText = string.Format(Translator.MailsDragging, itemsToDrag.Count);
+        args.Data.SetText(draggingText);
+        args.Data.Properties.Title = draggingText;
+        // args.DragUI.SetContentFromDataPackage();
+
+        MailDragStateChanged?.Invoke(this, new MailDragStateChangedEventArgs(true, itemsToDrag.Count));
+    }
+
+    private void ItemDragCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
+    {
+        MailDragStateChanged?.Invoke(this, new MailDragStateChangedEventArgs(false, 0));
+    }
+
+    private List<MailItemViewModel> ResolveDraggedMailItems(DragItemsStartingEventArgs args)
+    {
+        var draggedItems = ExpandDragItems(args.Items.Cast<object>());
+        var selectedItems = GetSelectedMailItemsFromCurrentList();
+
+        if (selectedItems.Count > 1)
+        {
+            var selectedIds = selectedItems.Select(a => a.UniqueId).ToHashSet();
+            bool dragStartedFromSelection = draggedItems.Any(a => selectedIds.Contains(a.UniqueId));
+
+            if (dragStartedFromSelection)
+            {
+                return selectedItems;
+            }
+        }
+
+        return draggedItems.Count > 0 ? draggedItems : selectedItems;
+    }
+
+    private List<MailItemViewModel> GetSelectedMailItemsFromCurrentList()
+    {
+        if (IsThreadListView)
+        {
+            return Items
+                .Cast<object>()
+                .OfType<MailItemViewModel>()
+                .Where(a => a.IsSelected)
+                .GroupBy(a => a.UniqueId)
+                .Select(a => a.First())
+                .ToList();
+        }
+
+        return Items
+            .Cast<object>()
+            .OfType<IMailListItem>()
+            .SelectMany(a => a.GetSelectedMailItems())
+            .GroupBy(a => a.UniqueId)
+            .Select(a => a.First())
+            .ToList();
+    }
+
+    private static List<MailItemViewModel> ExpandDragItems(IEnumerable<object> dragItems)
+    {
+        var result = new List<MailItemViewModel>();
+
+        foreach (var dragItem in dragItems)
+        {
+            if (dragItem is MailItemViewModel mailItem)
+            {
+                result.Add(mailItem);
+            }
+            else if (dragItem is ThreadMailItemViewModel threadItem)
+            {
+                result.AddRange(threadItem.ThreadEmails);
+            }
+            else if (dragItem is IMailListItem mailListItem)
+            {
+                result.AddRange(mailListItem.GetSelectedMailItems());
+            }
+        }
+
+        return result
+            .GroupBy(a => a.UniqueId)
+            .Select(a => a.First())
+            .ToList();
+    }
+}
+
+public sealed class MailDragStateChangedEventArgs(bool isDragging, int draggedItemCount) : EventArgs
+{
+    public bool IsDragging { get; } = isDragging;
+    public int DraggedItemCount { get; } = draggedItemCount;
+}
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoListViewStyles.xaml b/Wino.Mail.WinUI/Controls/ListView/WinoListViewStyles.xaml
new file mode 100644
index 00000000..22338ac8
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoListViewStyles.xaml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:local="using:Wino.Mail.WinUI.Controls.ListView">
+
+    <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+        <ResourceDictionary Source="/Styles/WinoExpanderStyle.xaml" />
+
+        <ResourceDictionary>
+            <!--  Thread Mail ListViewItem Style  -->
+            <Style
+                x:Key="DefaultThreadListViewItemStyle"
+                BasedOn="{StaticResource DefaultListViewItemStyle}"
+                TargetType="local:WinoThreadMailItemViewModelListViewItem">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="local:WinoThreadMailItemViewModelListViewItem">
+                            <SwipeControl x:Name="ThreadSwipeControl" Tag="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}">
+                                <SwipeControl.LeftItems>
+                                    <controls:WinoSwipeControlItems
+                                        x:Name="LeftSwipeItems"
+                                        IsRightSwipe="False"
+                                        MailItem="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}" />
+                                </SwipeControl.LeftItems>
+                                <SwipeControl.RightItems>
+                                    <controls:WinoSwipeControlItems
+                                        x:Name="RightSwipeItems"
+                                        IsRightSwipe="True"
+                                        MailItem="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}" />
+                                </SwipeControl.RightItems>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="8" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <Grid
+                                        x:Name="RootGrid"
+                                        Grid.ColumnSpan="2"
+                                        Background="{ThemeResource ListViewItemBackground}"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}" />
+                                    <Border
+                                        x:Name="SelectionIndicator"
+                                        Width="4"
+                                        Margin="0,16"
+                                        HorizontalAlignment="Center"
+                                        Background="{ThemeResource ListViewItemSelectionIndicatorBrush}"
+                                        CornerRadius="4"
+                                        Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsCustomSelected, Mode=OneWay}" />
+
+                                    <!--  Expandable Content  -->
+                                    <ContentPresenter
+                                        x:Name="ThreadContent"
+                                        Grid.Column="1"
+                                        Margin="6,0,0,0"
+                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding Content}"
+                                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                                        ContentTransitions="{TemplateBinding ContentTransitions}" />
+
+
+                                </Grid>
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Normal" />
+                                        <VisualState x:Name="PointerOver">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundPointerOver}" />
+                                                <Setter Target="ThreadContent.Foreground" Value="{ThemeResource ListViewItemForegroundPointerOver}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="Selected">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundSelected}" />
+                                                <Setter Target="ThreadContent.Foreground" Value="{ThemeResource ListViewItemForegroundSelected}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="SelectedPointerOver">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundSelectedPointerOver}" />
+                                                <Setter Target="ThreadContent.Foreground" Value="{ThemeResource ListViewItemForegroundSelected}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="Pressed">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundPressed}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="PressedSelected">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundSelectedPressed}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                            </SwipeControl>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <!--  Default Single Mail List View Item Style.  -->
+            <Style
+                x:Key="DefaultMailListViewItemStyle"
+                BasedOn="{StaticResource DefaultListViewItemStyle}"
+                TargetType="local:WinoMailItemViewModelListViewItem">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="local:WinoMailItemViewModelListViewItem">
+                            <SwipeControl x:Name="MailSwipeControl" Tag="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}">
+                                <SwipeControl.LeftItems>
+                                    <controls:WinoSwipeControlItems
+                                        x:Name="LeftSwipeItems"
+                                        IsRightSwipe="False"
+                                        MailItem="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}" />
+                                </SwipeControl.LeftItems>
+                                <SwipeControl.RightItems>
+                                    <controls:WinoSwipeControlItems
+                                        x:Name="RightSwipeItems"
+                                        IsRightSwipe="True"
+                                        MailItem="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Item}" />
+                                </SwipeControl.RightItems>
+                                <Grid
+                                    x:Name="RootGrid"
+                                    Margin="0,2"
+                                    Background="{ThemeResource ListViewItemBackground}"
+                                    CornerRadius="{ThemeResource ControlCornerRadius}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="8" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <Grid
+                                        x:Name="SelectionBackground"
+                                        Grid.ColumnSpan="2"
+                                        Background="{ThemeResource ListViewItemBackgroundSelected}"
+                                        Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsCustomSelected, Mode=OneWay}" />
+                                    <Border
+                                        x:Name="SelectionIndicator"
+                                        Width="4"
+                                        Margin="0,16"
+                                        HorizontalAlignment="Center"
+                                        Background="{ThemeResource ListViewItemSelectionIndicatorBrush}"
+                                        CornerRadius="4"
+                                        Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsCustomSelected, Mode=OneWay}" />
+
+                                    <ContentPresenter
+                                        x:Name="MailContent"
+                                        Grid.Column="1"
+                                        Margin="6,0,0,0"
+                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Background="Transparent"
+                                        Content="{TemplateBinding Content}"
+                                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                                        ContentTransitions="{TemplateBinding ContentTransitions}" />
+
+
+                                </Grid>
+                                <VisualStateManager.VisualStateGroups>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Normal" />
+                                        <VisualState x:Name="PointerOver">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundPointerOver}" />
+                                                <Setter Target="MailContent.Foreground" Value="{ThemeResource ListViewItemForegroundPointerOver}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <!--  Selected states will never work because we don't select items.  -->
+                                        <VisualState x:Name="Selected" />
+                                        <VisualState x:Name="SelectedPointerOver" />
+                                        <VisualState x:Name="Pressed">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundPressed}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="PressedSelected">
+                                            <VisualState.Setters>
+                                                <Setter Target="RootGrid.Background" Value="{ThemeResource ListViewItemBackgroundSelectedPressed}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                    </VisualStateGroup>
+                                </VisualStateManager.VisualStateGroups>
+                            </SwipeControl>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <local:WinoMailItemContainerStyleSelector
+                x:Name="WinoMailItemContainerStyleSelector"
+                MailItemStyle="{StaticResource DefaultMailListViewItemStyle}"
+                ThreadStyle="{StaticResource DefaultThreadListViewItemStyle}" />
+        </ResourceDictionary>
+    </ResourceDictionary.MergedDictionaries>
+
+
+</ResourceDictionary>
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoMailItemContainerStyleSelector.cs b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemContainerStyleSelector.cs
new file mode 100644
index 00000000..528c4487
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemContainerStyleSelector.cs
@@ -0,0 +1,20 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.WinUI.Controls.ListView;
+
+public partial class WinoMailItemContainerStyleSelector : StyleSelector
+{
+    public Style? ThreadStyle { get; set; }
+    public Style? MailItemStyle { get; set; }
+    protected override Style SelectStyleCore(object item, DependencyObject container)
+    {
+        if (item is MailItemViewModel) return MailItemStyle ?? throw new Exception($"Missing style for {nameof(MailItemViewModel)}");
+        if (item is ThreadMailItemViewModel)
+            return ThreadStyle ?? throw new Exception($"Missing style for {nameof(ThreadMailItemViewModel)}");
+
+        return base.SelectStyleCore(item, container);
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoMailItemTemplateSelector.cs b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemTemplateSelector.cs
new file mode 100644
index 00000000..a079f1dd
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemTemplateSelector.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.WinUI.Controls.ListView;
+
+public partial class WinoMailItemTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate? SingleMailItemTemplate { get; set; }
+    public DataTemplate? ThreadMailItemTemplate { get; set; }
+    public DataTemplate? CalendarMailItemTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is MailItemViewModel mailItemViewModel)
+        {
+            // Check if it's a calendar-related item
+            if (mailItemViewModel.MailCopy.ItemType != MailItemType.Mail && CalendarMailItemTemplate != null)
+                return CalendarMailItemTemplate;
+
+            return SingleMailItemTemplate ?? throw new Exception($"Missing template for single mail items.");
+        }
+        else if (item is ThreadMailItemViewModel)
+            return ThreadMailItemTemplate ?? throw new Exception($"Missing template for thread mail items.");
+
+        return base.SelectTemplateCore(item, container);
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
new file mode 100644
index 00000000..91f6816f
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
@@ -0,0 +1,38 @@
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.ViewModels.Data;
+using WinRT;
+
+namespace Wino.Mail.WinUI.Controls.ListView;
+
+[GeneratedBindableCustomProperty]
+public partial class WinoMailItemViewModelListViewItem : ListViewItem
+{
+    [GeneratedDependencyProperty]
+    public partial MailItemViewModel? Item { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsCustomSelected { get; set; }
+
+    public WinoMailItemViewModelListViewItem()
+    {
+        DefaultStyleKey = typeof(WinoMailItemViewModelListViewItem);
+    }
+
+    partial void OnItemPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (e.OldValue is MailItemViewModel oldItem)
+            oldItem.OnSelectionChanged = null;
+
+        if (e.NewValue is MailItemViewModel newItem)
+        {
+            newItem.OnSelectionChanged = (selected) => IsCustomSelected = selected;
+            IsCustomSelected = newItem.IsSelected;
+        }
+        else
+        {
+            IsCustomSelected = false;
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs b/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
new file mode 100644
index 00000000..7114eec7
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
@@ -0,0 +1,55 @@
+using System.Linq;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Controls;
+using Wino.Helpers;
+using Wino.Mail.ViewModels.Data;
+using WinRT;
+
+namespace Wino.Mail.WinUI.Controls.ListView;
+
+[GeneratedBindableCustomProperty]
+public partial class WinoThreadMailItemViewModelListViewItem : ListViewItem
+{
+    [GeneratedDependencyProperty]
+    public partial bool IsThreadExpanded { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial ThreadMailItemViewModel? Item { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsCustomSelected { get; set; }
+
+    public WinoThreadMailItemViewModelListViewItem()
+    {
+        DefaultStyleKey = typeof(WinoThreadMailItemViewModelListViewItem);
+    }
+
+    public WinoListView? GetWinoListViewControl()
+    {
+        var expander = GetExpander();
+
+        if (expander?.Content is WinoListView control) return control;
+
+        return null;
+    }
+
+    public WinoExpander? GetExpander() => WinoVisualTreeHelper.FindDescendants<WinoExpander>(this).FirstOrDefault();
+
+    partial void OnItemPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (e.OldValue is ThreadMailItemViewModel oldItem)
+            oldItem.OnSelectionChanged = null;
+
+        if (e.NewValue is ThreadMailItemViewModel newItem)
+        {
+            newItem.OnSelectionChanged = (selected) => IsCustomSelected = selected;
+            IsCustomSelected = newItem.IsSelected;
+        }
+        else
+        {
+            IsCustomSelected = false;
+        }
+    }
+}
diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
similarity index 88%
rename from Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
rename to Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
index 92d3332a..b08d2f4b 100644
--- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
+++ b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml
@@ -1,10 +1,10 @@
-<UserControl
+<UserControl
     x:Class="Wino.Controls.MailItemDisplayInformationControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
@@ -19,7 +19,8 @@
     FocusVisualSecondaryBrush="{StaticResource SystemControlFocusVisualSecondaryBrush}"
     FocusVisualSecondaryThickness="1"
     PointerEntered="ControlPointerEntered"
-    PointerExited="ControlPointerExited">
+    PointerExited="ControlPointerExited"
+    Unloaded="OnUnloaded">
 
     <UserControl.Resources>
         <Style
@@ -49,7 +50,7 @@
                     VerticalAlignment="Top"
                     Canvas.ZIndex="0"
                     Fill="{ThemeResource SystemAccentColor}"
-                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(MailItem.IsRead), Mode=OneWay}" />
+                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(MailItemInformation.IsRead), Mode=OneWay}" />
             </Grid>
 
 
@@ -59,7 +60,8 @@
                 Background="Transparent"
                 BorderBrush="Transparent"
                 BorderThickness="0.5"
-                CornerRadius="4" />
+                CornerRadius="4"
+                SizeChanged="RootContainerVisualWrapperSizeChanged" />
 
             <Grid x:Name="MainContentContainer">
                 <Grid.ColumnDefinitions>
@@ -73,10 +75,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="14"
-                    FromAddress="{x:Bind MailItem.FromAddress, Mode=OneWay}"
-                    FromName="{x:Bind MailItem.FromName, Mode=OneWay}"
-                    SenderContactPicture="{x:Bind MailItem.SenderContact.Base64ContactPicture}"
-                    ThumbnailUpdatedEvent="{x:Bind IsThumbnailUpdated, Mode=OneWay}"
+                    MailItemInformation="{x:Bind MailItemInformation, Mode=OneWay}"
                     Visibility="{x:Bind IsAvatarVisible, Mode=OneWay}" />
 
                 <Grid
@@ -104,27 +103,27 @@
                             <TextBlock
                                 x:Name="DraftTitle"
                                 Margin="0,0,4,0"
-                                x:Load="{x:Bind MailItem.IsDraft, Mode=OneWay}"
+                                x:Load="{x:Bind MailItemInformation.IsDraft, Mode=OneWay}"
                                 Foreground="{StaticResource DeleteBrush}">
 
-                                <Run Text="[" /><Run Text="{x:Bind domain:Translator.Draft}" /><Run Text="]" /> <Run Text=" " />
+                                <Run Text="[" /><Run Text="{x:Bind domain:Translator.Draft, Mode=OneTime}" /><Run Text="]" /> <Run Text=" " />
                             </TextBlock>
 
                             <!--  Sender  -->
                             <TextBlock
                                 x:Name="SenderTextFromName"
                                 Grid.Column="1"
-                                Text="{x:Bind MailItem.FromName}"
+                                Text="{x:Bind MailItemInformation.FromName, Mode=OneWay}"
                                 TextTrimming="WordEllipsis"
-                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(MailItem.FromName)}" />
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(MailItemInformation.FromName), Mode=OneWay}" />
 
                             <!--  Sender  -->
                             <TextBlock
                                 x:Name="SenderTextFromAddress"
                                 Grid.Column="1"
-                                Text="{x:Bind MailItem.FromAddress}"
+                                Text="{x:Bind MailItemInformation.FromAddress}"
                                 TextTrimming="CharacterEllipsis"
-                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" />
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItemInformation.FromName), Mode=OneWay}" />
 
                             <!--  Hover button  -->
                             <StackPanel
@@ -194,6 +193,7 @@
                                 x:Name="TitleText"
                                 Grid.Column="1"
                                 MaxLines="1"
+                                Text="{x:Bind MailItemInformation.Subject, Mode=OneWay}"
                                 TextTrimming="CharacterEllipsis" />
 
                             <TextBlock
@@ -203,7 +203,7 @@
                                 VerticalAlignment="Center"
                                 FontSize="11"
                                 Opacity="0.7"
-                                Text="{x:Bind helpers:XamlHelpers.GetMailItemDisplaySummaryForListing(MailItem.IsDraft, MailItem.CreationDate, Prefer24HourTimeFormat)}" />
+                                Text="{x:Bind helpers:XamlHelpers.GetMailItemDisplaySummaryForListing(MailItemInformation.IsDraft, MailItemInformation.CreationDate, Prefer24HourTimeFormat), Mode=OneWay}" />
                         </Grid>
 
                         <!--  Message  -->
@@ -219,10 +219,10 @@
                             <Grid x:Name="PreviewTextContainer">
                                 <TextBlock
                                     x:Name="PreviewTextblock"
-                                    x:Load="{x:Bind helpers:XamlHelpers.ShouldDisplayPreview(MailItem.PreviewText), Mode=OneWay}"
+                                    x:Load="{x:Bind helpers:XamlHelpers.ShouldDisplayPreview(MailItemInformation.PreviewText), Mode=OneWay}"
                                     MaxLines="1"
                                     Opacity="0.7"
-                                    Text="{x:Bind MailItem.PreviewText}"
+                                    Text="{x:Bind MailItemInformation.PreviewText, Mode=OneWay}"
                                     TextTrimming="CharacterEllipsis" />
                             </Grid>
 
@@ -236,13 +236,20 @@
 
                                 <ContentPresenter
                                     x:Name="HasAttachmentContent"
-                                    x:Load="{x:Bind MailItem.HasAttachments, Mode=OneWay}"
+                                    x:Load="{x:Bind MailItemInformation.HasAttachments, Mode=OneWay}"
                                     ContentTemplate="{StaticResource AttachmentSymbolControlTemplate}" />
 
                                 <ContentPresenter
                                     x:Name="IsFlaggedContent"
-                                    x:Load="{x:Bind MailItem.IsFlagged, Mode=OneWay}"
+                                    x:Load="{x:Bind MailItemInformation.IsFlagged, Mode=OneWay}"
                                     ContentTemplate="{StaticResource FlaggedSymbolControlTemplate}" />
+
+                                <ProgressRing
+                                    Width="3"
+                                    Height="3"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Bottom"
+                                    IsActive="{x:Bind ActionItem.IsBusy, Mode=OneWay, FallbackValue=False}" />
                             </StackPanel>
                         </Grid>
                     </Grid>
@@ -255,7 +262,7 @@
             <VisualStateGroup x:Name="ReadStates">
                 <VisualState x:Name="Unread">
                     <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind MailItem.IsRead, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}" />
+                        <StateTrigger IsActive="{x:Bind MailItemInformation.IsRead, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}" />
                     </VisualState.StateTriggers>
 
                     <VisualState.Setters>
@@ -327,7 +334,7 @@
                         <Setter Target="ExpandCollapseChevron.(controls:AnimatedIcon.State)" Value="NormalOn" />
                     </VisualState.Setters>
                     <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind IsThreadExpanded, Mode=OneWay}" />
+                        <StateTrigger IsActive="{x:Bind MailItemInformation.IsThreadExpanded, Mode=OneWay}" />
                     </VisualState.StateTriggers>
                 </VisualState>
             </VisualStateGroup>
diff --git a/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml.cs b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml.cs
new file mode 100644
index 00000000..372071bb
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/MailItemDisplayInformationControl.xaml.cs
@@ -0,0 +1,250 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Numerics;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Extensions;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI;
+
+namespace Wino.Controls;
+
+public sealed partial class MailItemDisplayInformationControl : UserControl
+{
+    public ImagePreviewControl GetImagePreviewControl() => ContactImage;
+
+    public bool IsRunningHoverAction { get; set; }
+
+    // Busy animation fields
+    private Compositor? _compositor;
+    private Visual? _contentVisual;
+    private ScalarKeyFrameAnimation? _opacityAnimation;
+    private SpriteVisual? _leftBackgroundVisual;
+    private INotifyPropertyChanged? _actionItemPropertySource;
+
+    [GeneratedDependencyProperty(DefaultValue = MailListDisplayMode.Spacious)]
+    public partial MailListDisplayMode DisplayMode { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool ShowPreviewText { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsAvatarVisible { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsSubjectVisible { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation LeftHoverAction { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation CenterHoverAction { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation RightHoverAction { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsHoverActionsEnabled { get; set; }
+
+    public event EventHandler<MailOperationPreperationRequest>? HoverActionExecuted;
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool Prefer24HourTimeFormat { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial IMailListItem? ActionItem { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial IMailItemDisplayInformation? MailItemInformation { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool IsThreadExpanderVisible { get; set; }
+
+    public MailItemDisplayInformationControl()
+    {
+        InitializeComponent();
+
+        // Initialize properties from IPreferencesService for AOT compatibility
+        var preferencesService = App.Current.Services.GetRequiredService<IPreferencesService>();
+
+        DisplayMode = preferencesService.MailItemDisplayMode;
+        ShowPreviewText = preferencesService.IsShowPreviewEnabled;
+        IsAvatarVisible = preferencesService.IsShowSenderPicturesEnabled;
+        IsHoverActionsEnabled = preferencesService.IsHoverActionsEnabled;
+        Prefer24HourTimeFormat = preferencesService.Prefer24HourTimeFormat;
+        LeftHoverAction = preferencesService.LeftHoverAction;
+        CenterHoverAction = preferencesService.CenterHoverAction;
+        RightHoverAction = preferencesService.RightHoverAction;
+
+        var compositor = this.Visual().Compositor;
+
+        _leftBackgroundVisual = compositor.CreateSpriteVisual();
+        RootContainerVisualWrapper.SetChildVisual(_leftBackgroundVisual);
+        MainContentContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
+
+        RootContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
+        ContentGrid.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
+        ContentStackpanel.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
+        IconsContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
+
+        // Initialize shimmer effect compositor
+        _compositor = this.Visual().Compositor;
+    }
+
+    partial void OnMailItemInformationPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (ActionItem == null && MailItemInformation is IMailListItem mailListItem)
+        {
+            ActionItem = mailListItem;
+        }
+
+        UpdateBusyAnimationState();
+    }
+
+    partial void OnActionItemPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (_actionItemPropertySource != null)
+        {
+            _actionItemPropertySource.PropertyChanged -= ActionItemPropertyChanged;
+            _actionItemPropertySource = null;
+        }
+
+        if (e.NewValue is INotifyPropertyChanged propertyChangedSource)
+        {
+            _actionItemPropertySource = propertyChangedSource;
+            _actionItemPropertySource.PropertyChanged += ActionItemPropertyChanged;
+        }
+
+        UpdateBusyAnimationState();
+    }
+
+    private void StartBusyAnimation()
+    {
+        if (_compositor == null) return;
+
+        // Get the visual for the content area
+        _contentVisual = ElementCompositionPreview.GetElementVisual(MainContentContainer);
+
+        // Create a subtle opacity pulse animation (1.0 -> 0.4 -> 1.0)
+        _opacityAnimation = _compositor.CreateScalarKeyFrameAnimation();
+        _opacityAnimation.InsertKeyFrame(0f, 1f);
+        _opacityAnimation.InsertKeyFrame(0.5f, 0.4f, _compositor.CreateCubicBezierEasingFunction(new Vector2(0.42f, 0f), new Vector2(0.58f, 1f)));
+        _opacityAnimation.InsertKeyFrame(1f, 1f, _compositor.CreateCubicBezierEasingFunction(new Vector2(0.42f, 0f), new Vector2(0.58f, 1f)));
+        _opacityAnimation.Duration = TimeSpan.FromSeconds(1.0);
+        _opacityAnimation.IterationBehavior = AnimationIterationBehavior.Forever;
+
+        // Start animation
+        _contentVisual.StartAnimation("Opacity", _opacityAnimation);
+    }
+
+    private void StopBusyAnimation()
+    {
+        if (_contentVisual != null)
+        {
+            _contentVisual.StopAnimation("Opacity");
+
+            // Reset to default value
+            _contentVisual.Opacity = 1f;
+
+            _contentVisual = null;
+        }
+
+        _opacityAnimation = null;
+    }
+
+    private void UpdateBusyAnimationState()
+    {
+        if (ActionItem?.IsBusy == true)
+        {
+            StartBusyAnimation();
+            return;
+        }
+
+        StopBusyAnimation();
+    }
+
+    private void ActionItemPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (string.IsNullOrEmpty(e.PropertyName) || e.PropertyName == nameof(IMailListItem.IsBusy))
+        {
+            UpdateBusyAnimationState();
+        }
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        if (_actionItemPropertySource != null)
+        {
+            _actionItemPropertySource.PropertyChanged -= ActionItemPropertyChanged;
+            _actionItemPropertySource = null;
+        }
+
+        StopBusyAnimation();
+    }
+
+    private void RootContainerVisualWrapperSizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        if (_leftBackgroundVisual != null)
+        {
+            _leftBackgroundVisual.Size = e.NewSize.ToVector2();
+        }
+    }
+
+    private void ControlPointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (IsHoverActionsEnabled)
+        {
+            HoverActionButtons.Visibility = Visibility.Visible;
+            UnreadContainer.Visibility = Visibility.Collapsed;
+        }
+    }
+
+    private void ControlPointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        if (IsHoverActionsEnabled)
+        {
+            HoverActionButtons.Visibility = Visibility.Collapsed;
+            UnreadContainer.Visibility = Visibility.Visible;
+        }
+    }
+
+    private void ExecuteHoverAction(MailOperation operation)
+    {
+        IsRunningHoverAction = true;
+
+        MailOperationPreperationRequest? package = null;
+
+        if (ActionItem is MailItemViewModel mailItemViewModel)
+            package = new MailOperationPreperationRequest(operation, mailItemViewModel.MailCopy, toggleExecution: true);
+
+        else if (ActionItem is ThreadMailItemViewModel threadMailItemViewModel)
+            package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.ThreadEmails.Select(a => a.MailCopy), toggleExecution: true);
+
+        if (package == null) return;
+
+        HoverActionExecuted?.Invoke(this, package);
+    }
+
+    private void FirstActionClicked(object sender, RoutedEventArgs e)
+    {
+        ExecuteHoverAction(LeftHoverAction);
+    }
+
+    private void SecondActionClicked(object sender, RoutedEventArgs e)
+    {
+        ExecuteHoverAction(CenterHoverAction);
+    }
+
+    private void ThirdActionClicked(object sender, RoutedEventArgs e)
+    {
+        ExecuteHoverAction(RightHoverAction);
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/OperationCommandBar.cs b/Wino.Mail.WinUI/Controls/OperationCommandBar.cs
new file mode 100644
index 00000000..f5233952
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/OperationCommandBar.cs
@@ -0,0 +1,477 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Windows.Input;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Folders;
+using Wino.Core.Domain.Models.Menus;
+using Wino.Helpers;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class OperationCommandBar : CommandBar
+{
+    private const string MailOperationTemplateKey = "OperationCommandBarMailOperationTemplate";
+    private const string FolderOperationTemplateKey = "OperationCommandBarFolderOperationTemplate";
+    private const string AIActionsTemplateKey = "OperationCommandBarAIActionsTemplate";
+    private const string ThemeToggleTemplateKey = "OperationCommandBarThemeToggleTemplate";
+    private const string SeparatorTemplateKey = "OperationCommandBarSeparatorTemplate";
+
+    private readonly IPreferencesService? _preferencesService;
+    private readonly HashSet<INotifyPropertyChanged> _trackedMenuItems = [];
+
+    [GeneratedDependencyProperty]
+    public partial ObservableCollection<IMenuOperation>? MenuItems { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial ICommand? ItemInvokedCommand { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsAIActionsEnabled { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsAIActionsPaneToggleVisible { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsEditorThemeDark { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsEditorThemeToggleVisible { get; set; }
+
+    public event EventHandler<bool>? AIActionsEnabledChanged;
+
+    public OperationCommandBar()
+    {
+        _preferencesService = App.Current.Services.GetService<IPreferencesService>();
+
+        DefaultLabelPosition = CommandBarDefaultLabelPosition.Right;
+        IsDynamicOverflowEnabled = true;
+        OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Auto;
+
+        Loaded += OnLoaded;
+        Unloaded += OnUnloaded;
+        DynamicOverflowItemsChanging += OperationCommandBar_DynamicOverflowItemsChanging;
+    }
+
+    partial void OnMenuItemsPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        if (e.OldValue is INotifyCollectionChanged oldCollection)
+        {
+            oldCollection.CollectionChanged -= MenuItems_CollectionChanged;
+        }
+
+        DetachTrackedMenuItemHandlers();
+
+        if (e.NewValue is ObservableCollection<IMenuOperation> newItems)
+        {
+            newItems.CollectionChanged += MenuItems_CollectionChanged;
+            TrackMenuItemHandlers((IEnumerable<IMenuOperation>)newItems);
+        }
+
+        RefreshCommands();
+    }
+
+    partial void OnIsAIActionsEnabledChanged(bool newValue)
+    {
+        AIActionsEnabledChanged?.Invoke(this, newValue);
+    }
+
+    partial void OnIsAIActionsPaneToggleVisibleChanged(bool newValue)
+    {
+        RefreshCommands();
+    }
+
+    partial void OnIsEditorThemeDarkChanged(bool newValue)
+    {
+        RefreshCommands();
+    }
+
+    partial void OnIsEditorThemeToggleVisibleChanged(bool newValue)
+    {
+        RefreshCommands();
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        RefreshCommands();
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        ClearGeneratedCommands();
+    }
+
+    private void OperationCommandBar_DynamicOverflowItemsChanging(CommandBar sender, DynamicOverflowItemsChangingEventArgs args)
+    {
+        if (args.Action == CommandBarDynamicOverflowAction.AddingToOverflow || sender.SecondaryCommands.Count > 0)
+        {
+            sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Visible;
+        }
+        else
+        {
+            sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed;
+        }
+    }
+
+    private void MenuItems_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.Action == NotifyCollectionChangedAction.Reset)
+        {
+            DetachTrackedMenuItemHandlers();
+
+            if (sender is IEnumerable<IMenuOperation> refreshedItems)
+            {
+                TrackMenuItemHandlers(refreshedItems);
+            }
+        }
+        else
+        {
+            UntrackMenuItemHandlers(e.OldItems);
+            TrackMenuItemHandlers(e.NewItems);
+        }
+
+        RefreshCommands();
+    }
+
+    private void MenuItem_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (string.IsNullOrEmpty(e.PropertyName)
+            || e.PropertyName == nameof(IMenuOperation.IsEnabled)
+            || e.PropertyName == nameof(IMenuOperation.IsSecondaryMenuPreferred)
+            || e.PropertyName == nameof(MenuOperationItemBase<MailOperation>.Operation)
+            || e.PropertyName == nameof(MenuOperationItemBase<MailOperation>.Identifier))
+        {
+            RefreshCommands();
+        }
+    }
+
+    private void TrackMenuItemHandlers(IEnumerable<IMenuOperation> items)
+    {
+        foreach (var item in items)
+        {
+            if (item is INotifyPropertyChanged propertyChanged && _trackedMenuItems.Add(propertyChanged))
+            {
+                propertyChanged.PropertyChanged += MenuItem_PropertyChanged;
+            }
+        }
+    }
+
+    private void TrackMenuItemHandlers(System.Collections.IList? items)
+    {
+        if (items == null)
+        {
+            return;
+        }
+
+        foreach (var item in items)
+        {
+            if (item is IMenuOperation menuItem)
+            {
+                TrackMenuItemHandlers([menuItem]);
+            }
+        }
+    }
+
+    private void UntrackMenuItemHandlers(System.Collections.IList? items)
+    {
+        if (items == null)
+        {
+            return;
+        }
+
+        foreach (var item in items)
+        {
+            if (item is INotifyPropertyChanged propertyChanged && _trackedMenuItems.Remove(propertyChanged))
+            {
+                propertyChanged.PropertyChanged -= MenuItem_PropertyChanged;
+            }
+        }
+    }
+
+    private void DetachTrackedMenuItemHandlers()
+    {
+        foreach (var item in _trackedMenuItems)
+        {
+            item.PropertyChanged -= MenuItem_PropertyChanged;
+        }
+
+        _trackedMenuItems.Clear();
+    }
+
+    private void RefreshCommands()
+    {
+        ClearGeneratedCommands();
+
+        if (IsAIActionsPaneToggleVisible)
+        {
+            PrimaryCommands.Add(CreateAIActionsToggleButton());
+        }
+
+        if (IsEditorThemeToggleVisible)
+        {
+            PrimaryCommands.Add(CreateThemeToggleButton());
+        }
+
+        if (MenuItems == null)
+        {
+            UpdateOverflowButtonVisibility();
+            return;
+        }
+
+        foreach (var item in MenuItems)
+        {
+            var element = CreateCommandElement(item);
+            if (element == null)
+            {
+                continue;
+            }
+
+            if (item.IsSecondaryMenuPreferred)
+            {
+                SecondaryCommands.Add(element);
+            }
+            else
+            {
+                PrimaryCommands.Add(element);
+            }
+        }
+
+        UpdateOverflowButtonVisibility();
+    }
+
+    private void ClearGeneratedCommands()
+    {
+        DetachCommandHandlers(PrimaryCommands);
+        DetachCommandHandlers(SecondaryCommands);
+
+        PrimaryCommands.Clear();
+        SecondaryCommands.Clear();
+    }
+
+    private void DetachCommandHandlers(IEnumerable<ICommandBarElement> commands)
+    {
+        foreach (var command in commands)
+        {
+            switch (command)
+            {
+                case AppBarButton button:
+                    button.Click -= OperationButton_Click;
+                    button.Click -= ThemeButton_Click;
+                    break;
+                case AppBarToggleButton toggleButton:
+                    toggleButton.ClearValue(AppBarToggleButton.IsCheckedProperty);
+                    break;
+            }
+        }
+    }
+
+    private ICommandBarElement? CreateCommandElement(IMenuOperation item)
+    {
+        if (item is MailOperationMenuItem mailOperation && mailOperation.Operation == MailOperation.Seperator)
+        {
+            return LoadCommandBarElementTemplate(SeparatorTemplateKey, new SeparatorCommandBarItemViewModel());
+        }
+
+        if (item is MailOperationMenuItem mailOperationItem)
+        {
+            var button = LoadCommandBarElementTemplate(
+                MailOperationTemplateKey,
+                new MenuOperationCommandBarItemViewModel(
+                    mailOperationItem,
+                    XamlHelpers.GetOperationString(mailOperationItem.Operation),
+                    XamlHelpers.GetWinoIconGlyph(mailOperationItem.Operation),
+                    GetOperationLabelPosition(XamlHelpers.GetOperationString(mailOperationItem.Operation))))
+                as AppBarButton;
+
+            if (button == null)
+            {
+                return null;
+            }
+
+            button.Tag = mailOperationItem;
+            button.Click += OperationButton_Click;
+            return button;
+        }
+
+        if (item is FolderOperationMenuItem folderOperationItem)
+        {
+            var label = XamlHelpers.GetOperationString(folderOperationItem.Operation);
+            var button = LoadCommandBarElementTemplate(
+                FolderOperationTemplateKey,
+                new MenuOperationCommandBarItemViewModel(
+                    folderOperationItem,
+                    label,
+                    XamlHelpers.GetPathGeometry(folderOperationItem.Operation),
+                    GetOperationLabelPosition(label)))
+                as AppBarButton;
+
+            if (button == null)
+            {
+                return null;
+            }
+
+            button.Tag = folderOperationItem;
+            button.Click += OperationButton_Click;
+            return button;
+        }
+
+        return null;
+    }
+
+    private AppBarToggleButton CreateAIActionsToggleButton()
+    {
+        var button = (AppBarToggleButton)LoadCommandBarElementTemplate(
+            AIActionsTemplateKey,
+            new AIActionsCommandBarItemViewModel(Translator.Composer_AiActions, "\uE945"));
+
+        button.SetBinding(AppBarToggleButton.IsCheckedProperty, new Binding
+        {
+            Mode = BindingMode.TwoWay,
+            Path = new PropertyPath(nameof(IsAIActionsEnabled)),
+            Source = this
+        });
+
+        return button;
+    }
+
+    private AppBarButton CreateThemeToggleButton()
+    {
+        var label = IsEditorThemeDark ? Translator.Composer_LightTheme : Translator.Composer_DarkTheme;
+        var icon = IsEditorThemeDark ? WinoIconGlyph.LightEditor : WinoIconGlyph.DarkEditor;
+
+        var button = (AppBarButton)LoadCommandBarElementTemplate(
+            ThemeToggleTemplateKey,
+            new ThemeCommandBarItemViewModel(label, icon));
+
+        button.Click += ThemeButton_Click;
+        return button;
+    }
+
+    private void OperationButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is AppBarButton button && button.Tag is IMenuOperation operation)
+        {
+            ItemInvokedCommand?.Execute(operation);
+        }
+    }
+
+    private void ThemeButton_Click(object sender, RoutedEventArgs e)
+    {
+        IsEditorThemeDark = !IsEditorThemeDark;
+    }
+
+    private object? FindTemplateResource(string key)
+    {
+        if (TryGetResourceRecursive(Resources, key, out var resource))
+        {
+            return resource;
+        }
+
+        return TryGetResourceRecursive(Application.Current.Resources, key, out resource) ? resource : null;
+    }
+
+    private static bool TryGetResourceRecursive(ResourceDictionary dictionary, string key, out object? resource)
+    {
+        if (dictionary.TryGetValue(key, out resource))
+        {
+            return true;
+        }
+
+        foreach (var mergedDictionary in dictionary.MergedDictionaries)
+        {
+            if (TryGetResourceRecursive(mergedDictionary, key, out resource))
+            {
+                return true;
+            }
+        }
+
+        resource = null;
+        return false;
+    }
+
+    private ICommandBarElement LoadCommandBarElementTemplate(string resourceKey, object dataContext)
+    {
+        var template = FindTemplateResource(resourceKey) as DataTemplate
+                       ?? throw new InvalidOperationException($"Unable to resolve resource '{resourceKey}'.");
+
+        if (template.LoadContent() is not ICommandBarElement element)
+        {
+            throw new InvalidOperationException($"Resource '{resourceKey}' did not create an ICommandBarElement.");
+        }
+
+        if (element is FrameworkElement frameworkElement)
+        {
+            frameworkElement.DataContext = dataContext;
+        }
+
+        return element;
+    }
+
+    private CommandBarLabelPosition GetOperationLabelPosition(string label)
+    {
+        return string.IsNullOrWhiteSpace(label) || _preferencesService == null || !_preferencesService.IsShowActionLabelsEnabled
+            ? CommandBarLabelPosition.Collapsed
+            : CommandBarLabelPosition.Default;
+    }
+
+    private void UpdateOverflowButtonVisibility()
+    {
+        OverflowButtonVisibility = SecondaryCommands.Count > 0
+            ? CommandBarOverflowButtonVisibility.Visible
+            : CommandBarOverflowButtonVisibility.Auto;
+    }
+
+    private sealed class MenuOperationCommandBarItemViewModel
+    {
+        public MenuOperationCommandBarItemViewModel(IMenuOperation operation, string label, WinoIconGlyph icon, CommandBarLabelPosition labelPosition)
+        {
+            Operation = operation;
+            Label = label;
+            Icon = icon;
+            ToolTip = label;
+            LabelPosition = labelPosition;
+        }
+
+        public IMenuOperation Operation { get; }
+        public string Label { get; }
+        public WinoIconGlyph Icon { get; }
+        public string ToolTip { get; }
+        public bool IsEnabled => Operation.IsEnabled;
+        public CommandBarLabelPosition LabelPosition { get; }
+    }
+
+    private sealed class AIActionsCommandBarItemViewModel
+    {
+        public AIActionsCommandBarItemViewModel(string toolTip, string glyph)
+        {
+            ToolTip = toolTip;
+            Glyph = glyph;
+        }
+
+        public string ToolTip { get; }
+        public string Glyph { get; }
+    }
+
+    private sealed class ThemeCommandBarItemViewModel
+    {
+        public ThemeCommandBarItemViewModel(string toolTip, WinoIconGlyph icon)
+        {
+            ToolTip = toolTip;
+            Icon = icon;
+        }
+
+        public string ToolTip { get; }
+        public WinoIconGlyph Icon { get; }
+    }
+
+    private sealed class SeparatorCommandBarItemViewModel;
+}
diff --git a/Wino.Mail/Controls/SettingsMenuItemControl.cs b/Wino.Mail.WinUI/Controls/SettingsMenuItemControl.cs
similarity index 97%
rename from Wino.Mail/Controls/SettingsMenuItemControl.cs
rename to Wino.Mail.WinUI/Controls/SettingsMenuItemControl.cs
index d316c964..3e559765 100644
--- a/Wino.Mail/Controls/SettingsMenuItemControl.cs
+++ b/Wino.Mail.WinUI/Controls/SettingsMenuItemControl.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.Windows.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Wino.Controls;
 
diff --git a/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml b/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml
new file mode 100644
index 00000000..7bc0a5df
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml
@@ -0,0 +1,52 @@
+<UserControl
+    x:Class="Wino.Mail.WinUI.Controls.UpdateNotesFlipViewControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Wino.Core.Domain.Models.Updates"
+    mc:Ignorable="d">
+
+    <Grid RowSpacing="12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <FlipView
+            x:Name="UpdateFlipView"
+            ItemsSource="{x:Bind Sections, Mode=OneWay}"
+            SelectionChanged="OnFlipViewSelectionChanged">
+            <FlipView.ItemTemplate>
+                <DataTemplate x:DataType="models:UpdateNoteSection">
+                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                        <StackPanel Padding="8" Spacing="12">
+                            <TextBlock
+                                HorizontalAlignment="Center"
+                                Text="{x:Bind Title, Mode=OneTime}"
+                                TextAlignment="Center"
+                                TextWrapping="WrapWholeWords" />
+                            <Image
+                                Width="{x:Bind ActualImageWidth, Mode=OneTime}"
+                                Height="{x:Bind ActualImageHeight, Mode=OneTime}"
+                                HorizontalAlignment="Center"
+                                Source="{x:Bind ImageUrl, Mode=OneTime}"
+                                Stretch="Uniform" />
+                            <TextBlock
+                                HorizontalAlignment="Stretch"
+                                Text="{x:Bind Description, Mode=OneTime}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </ScrollViewer>
+                </DataTemplate>
+            </FlipView.ItemTemplate>
+        </FlipView>
+
+        <PipsPager
+            x:Name="FlipViewPager"
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            SelectedIndexChanged="OnPipsPagerSelectedIndexChanged"
+            SelectedPageIndex="0" />
+    </Grid>
+</UserControl>
diff --git a/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml.cs b/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml.cs
new file mode 100644
index 00000000..75f236ff
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/UpdateNotesFlipViewControl.xaml.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Models.Updates;
+
+namespace Wino.Mail.WinUI.Controls;
+
+public sealed partial class UpdateNotesFlipViewControl : UserControl
+{
+    public event EventHandler<int>? SelectedIndexChanged;
+
+    public int SelectedIndex => UpdateFlipView.SelectedIndex;
+
+    public IList<UpdateNoteSection>? Sections
+    {
+        get { return (IList<UpdateNoteSection>?)GetValue(SectionsProperty); }
+        set { SetValue(SectionsProperty, value); }
+    }
+
+    public static readonly DependencyProperty SectionsProperty =
+        DependencyProperty.Register(nameof(Sections),
+            typeof(IList<UpdateNoteSection>),
+            typeof(UpdateNotesFlipViewControl),
+            new PropertyMetadata(null, OnSectionsChanged));
+
+    public UpdateNotesFlipViewControl()
+    {
+        InitializeComponent();
+    }
+
+    private static void OnSectionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is UpdateNotesFlipViewControl control)
+            control.UpdatePager();
+    }
+
+    private void OnFlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        FlipViewPager.SelectedPageIndex = UpdateFlipView.SelectedIndex;
+        SelectedIndexChanged?.Invoke(this, UpdateFlipView.SelectedIndex);
+        UpdatePager();
+    }
+
+    private void OnPipsPagerSelectedIndexChanged(PipsPager sender, PipsPagerSelectedIndexChangedEventArgs args)
+    {
+        UpdateFlipView.SelectedIndex = sender.SelectedPageIndex;
+    }
+
+    private void UpdatePager()
+    {
+        FlipViewPager.NumberOfPages = Sections?.Count ?? 0;
+    }
+}
diff --git a/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs b/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs
new file mode 100644
index 00000000..84206270
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/WebViewEditorControl.cs
@@ -0,0 +1,794 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Web.WebView2.Core;
+using Windows.UI.ViewManagement.Core;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Reader;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Extensions;
+
+namespace Wino.Mail.Controls;
+
+public sealed partial class WebViewEditorControl : Control, IDisposable, IEditorCommandTarget
+{
+    private const string PART_WebView = "WebView";
+
+    private static readonly IReadOnlyList<int> DefaultFontSizes = [8, 9, 10, 11, 12, 14, 16, 18, 20, 24, 28, 32, 36];
+    private static readonly IReadOnlyList<EditorColorOption> DefaultTextColors =
+    [
+        new("Default", string.Empty),
+        new("Black", "#000000"),
+        new("Gray", "#666666"),
+        new("Red", "#c62828"),
+        new("Orange", "#ef6c00"),
+        new("Yellow", "#f9a825"),
+        new("Green", "#2e7d32"),
+        new("Blue", "#1565c0"),
+        new("Purple", "#6a1b9a")
+    ];
+    private static readonly IReadOnlyList<EditorColorOption> DefaultHighlightColors =
+    [
+        new("None", string.Empty),
+        new("Yellow", "#fff59d"),
+        new("Green", "#c8e6c9"),
+        new("Blue", "#bbdefb"),
+        new("Pink", "#f8bbd0"),
+        new("Orange", "#ffe0b2")
+    ];
+    private static readonly IReadOnlyList<EditorParagraphStyleOption> DefaultParagraphStyles =
+    [
+        new("Paragraph", "div"),
+        new("Heading 1", "h1"),
+        new("Heading 2", "h2"),
+        new("Heading 3", "h3"),
+        new("Quote", "blockquote"),
+        new("Code", "pre")
+    ];
+    private static readonly IReadOnlyList<string> DefaultLineHeights = ["normal", "1", "1.15", "1.5", "2"];
+    private static readonly IReadOnlyList<EditorTextAlignment> DefaultAlignments =
+        [EditorTextAlignment.Left, EditorTextAlignment.Center, EditorTextAlignment.Right, EditorTextAlignment.Justify];
+
+    private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>()!;
+    private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>()!;
+    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>()!;
+
+    [GeneratedDependencyProperty]
+    public partial bool IsEditorDarkMode { get; set; }
+    async partial void OnIsEditorDarkModeChanged(bool newValue)
+    {
+        UpdateState(GetCurrentStateOrDefault() with { IsDarkMode = newValue });
+        await UpdateEditorThemeAsync();
+    }
+
+    [GeneratedDependencyProperty]
+    public partial bool IsEditorWebViewEditor { get; set; }
+    async partial void OnIsEditorWebViewEditorChanged(bool newValue)
+    {
+        UpdateState(GetCurrentStateOrDefault() with { IsBuiltInToolbarVisible = newValue });
+        await ApplyBuiltInToolbarVisibilityAsync();
+    }
+
+    private WebView2? _chromium;
+    private bool _disposedValue;
+    private bool? _lastAppliedDarkTheme;
+    private readonly TaskCompletionSource<bool> _domLoadedTask = new();
+    private readonly TaskCompletionSource<bool> _editorReadyTask = new();
+    private readonly object _editorInitializationLock = new();
+    private Task? _editorInitializationTask;
+
+    public event EventHandler<EditorState>? StateChanged;
+    public event EventHandler<EditorCapabilities>? CapabilitiesChanged;
+
+    public EditorState CurrentState { get; private set; }
+    public EditorCapabilities Capabilities { get; private set; }
+
+    public WebViewEditorControl()
+    {
+        DefaultStyleKey = typeof(WebViewEditorControl);
+
+        IsEditorDarkMode = WinoApplication.Current.UnderlyingThemeService.IsUnderlyingThemeDark();
+        Capabilities = BuildCapabilities(_fontService.GetFonts());
+        CurrentState = CreateDefaultState();
+    }
+
+    protected override async void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        var newWebView = GetTemplateChild(PART_WebView) as WebView2;
+        if (newWebView == null)
+        {
+            return;
+        }
+
+        if (_chromium != null && !ReferenceEquals(_chromium, newWebView))
+        {
+            DetachChromium(_chromium, closeWebView: false);
+        }
+
+        _chromium = newWebView;
+        await InitializeWebViewAsync();
+    }
+
+    public async Task ExecuteCommandAsync(EditorCommand command)
+    {
+        ObjectDisposedException.ThrowIf(_disposedValue, this);
+        await EnsureEditorReadyAsync();
+
+        if (_chromium == null)
+        {
+            return;
+        }
+
+        switch (command.Kind)
+        {
+            case EditorCommandKind.ToggleBold:
+                await ExecuteEditorCommandAsync("bold");
+                break;
+            case EditorCommandKind.ToggleItalic:
+                await ExecuteEditorCommandAsync("italic");
+                break;
+            case EditorCommandKind.ToggleUnderline:
+                await ExecuteEditorCommandAsync("underline");
+                break;
+            case EditorCommandKind.ToggleStrikethrough:
+                await ExecuteEditorCommandAsync("strikethrough");
+                break;
+            case EditorCommandKind.ToggleOrderedList:
+                await ExecuteEditorCommandAsync("insertorderedlist");
+                break;
+            case EditorCommandKind.ToggleUnorderedList:
+                await ExecuteEditorCommandAsync("insertunorderedlist");
+                break;
+            case EditorCommandKind.Indent:
+                await ExecuteEditorCommandAsync("indent");
+                break;
+            case EditorCommandKind.Outdent:
+                await ExecuteEditorCommandAsync("outdent");
+                break;
+            case EditorCommandKind.SetAlignment when command.Value is EditorTextAlignment alignment:
+                await ExecuteEditorCommandAsync(alignment switch
+                {
+                    EditorTextAlignment.Left => "justifyleft",
+                    EditorTextAlignment.Center => "justifycenter",
+                    EditorTextAlignment.Right => "justifyright",
+                    EditorTextAlignment.Justify => "justifyfull",
+                    _ => "justifyleft"
+                });
+                break;
+            case EditorCommandKind.SetFontFamily when command.Value is string fontFamily:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setFontFamily", JsonSerializer.Serialize(fontFamily, BasicTypesJsonContext.Default.String));
+                break;
+            case EditorCommandKind.SetFontSize when command.Value is int fontSize:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setFontSize", JsonSerializer.Serialize(fontSize, BasicTypesJsonContext.Default.Int32));
+                break;
+            case EditorCommandKind.SetParagraphStyle when command.Value is string paragraphStyle:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setParagraphStyle", JsonSerializer.Serialize(paragraphStyle, BasicTypesJsonContext.Default.String));
+                break;
+            case EditorCommandKind.SetTextColor when command.Value is string textColor:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setTextColor", JsonSerializer.Serialize(textColor, BasicTypesJsonContext.Default.String));
+                break;
+            case EditorCommandKind.SetHighlightColor when command.Value is string highlightColor:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setHighlightColor", JsonSerializer.Serialize(highlightColor, BasicTypesJsonContext.Default.String));
+                break;
+            case EditorCommandKind.SetLineHeight when command.Value is string lineHeight:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setLineHeight", JsonSerializer.Serialize(lineHeight, BasicTypesJsonContext.Default.String));
+                break;
+            case EditorCommandKind.InsertImage:
+                await ShowImagePickerAsync();
+                return;
+            case EditorCommandKind.InsertLink when command.Value is EditorLinkCommandArgs linkArgs:
+                await _chromium.ExecuteScriptFunctionSafeAsync("upsertLink", SerializeLinkArgs(linkArgs));
+                break;
+            case EditorCommandKind.RemoveLink:
+                await _chromium.ExecuteScriptFunctionSafeAsync("removeLink");
+                break;
+            case EditorCommandKind.InsertEmoji:
+                await ShowEmojiPickerAsync();
+                return;
+            case EditorCommandKind.InsertTable when command.Value is EditorTableCommandArgs tableArgs:
+                await _chromium.ExecuteScriptFunctionSafeAsync("insertTableHtml", SerializeTableArgs(tableArgs));
+                break;
+            case EditorCommandKind.ToggleBuiltInToolbar when command.Value is bool isToolbarVisible:
+                IsEditorWebViewEditor = isToolbarVisible;
+                return;
+            case EditorCommandKind.ToggleTheme when command.Value is bool isDarkMode:
+                IsEditorDarkMode = isDarkMode;
+                return;
+            case EditorCommandKind.ToggleSpellCheck when command.Value is bool isSpellCheckEnabled:
+                await _chromium.ExecuteScriptFunctionSafeAsync("setSpellCheck", JsonSerializer.Serialize(isSpellCheckEnabled, BasicTypesJsonContext.Default.Boolean));
+                break;
+            default:
+                throw new InvalidOperationException($"Unsupported editor command: {command.Kind}");
+        }
+
+        await RefreshStateAsync();
+    }
+
+    public async Task EditorIndentAsync() => await ExecuteCommandAsync(EditorCommand.Indent());
+
+    public async Task EditorOutdentAsync() => await ExecuteCommandAsync(EditorCommand.Outdent());
+
+    public void ToggleEditorTheme()
+    {
+        IsEditorDarkMode = !IsEditorDarkMode;
+    }
+
+    public async Task<string?> GetHtmlBodyAsync()
+    {
+        await EnsureEditorReadyAsync();
+
+        if (_chromium == null)
+        {
+            return null;
+        }
+
+        var editorContent = await _chromium.ExecuteScriptFunctionSafeAsync("GetHTMLContent");
+        return JsonSerializer.Deserialize(editorContent, BasicTypesJsonContext.Default.String);
+    }
+
+    public async Task ShowImagePickerAsync()
+    {
+        await EnsureEditorReadyAsync();
+        if (_chromium != null)
+        {
+            await _chromium.ExecuteScriptFunctionSafeAsync("imageInput.click");
+        }
+    }
+
+    public async void ShowImagePicker()
+    {
+        await ShowImagePickerAsync();
+    }
+
+    public async Task InsertImagesAsync(List<ImageInfo> images)
+    {
+        await EnsureEditorReadyAsync();
+        if (_chromium != null)
+        {
+            await _chromium.ExecuteScriptFunctionSafeAsync("insertImages", JsonSerializer.Serialize(images, DomainModelsJsonContext.Default.ListImageInfo));
+            await RefreshStateAsync();
+        }
+    }
+
+    public async Task ShowEmojiPickerAsync()
+    {
+        CoreInputView.GetForCurrentView().TryShow(CoreInputViewKind.Emoji);
+        await FocusEditorAsync(focusControlAsWell: true);
+    }
+
+    public async void ShowEmojiPicker()
+    {
+        await ShowEmojiPickerAsync();
+    }
+
+    public WebView2 GetUnderlyingWebView() => _chromium!;
+
+    public async Task RenderHtmlAsync(string htmlBody)
+    {
+        await EnsureEditorReadyAsync();
+
+        if (_chromium == null)
+        {
+            return;
+        }
+
+        await _chromium.ExecuteScriptFunctionAsync("RenderHTML", JsonSerializer.Serialize(string.IsNullOrEmpty(htmlBody) ? " " : htmlBody, BasicTypesJsonContext.Default.String));
+        await RefreshStateAsync();
+    }
+
+    public async Task FocusEditorAsync(bool focusControlAsWell)
+    {
+        await EnsureEditorReadyAsync();
+
+        if (_chromium == null)
+        {
+            return;
+        }
+
+        await _chromium.ExecuteScriptSafeAsync("focusEditor();");
+
+        if (focusControlAsWell)
+        {
+            _chromium.Focus(FocusState.Keyboard);
+            _chromium.Focus(FocusState.Programmatic);
+        }
+    }
+
+    public async Task UpdateEditorThemeAsync(bool force = false)
+    {
+        if (_chromium?.CoreWebView2 == null)
+        {
+            return;
+        }
+
+        if (!_editorReadyTask.Task.IsCompleted)
+        {
+            return;
+        }
+
+        var isDark = IsEditorDarkMode;
+        if (!force && _lastAppliedDarkTheme == isDark)
+        {
+            return;
+        }
+
+        _lastAppliedDarkTheme = isDark;
+        _chromium.CoreWebView2.Profile.PreferredColorScheme = isDark
+            ? CoreWebView2PreferredColorScheme.Dark
+            : CoreWebView2PreferredColorScheme.Light;
+
+        await _chromium.ExecuteScriptFunctionSafeAsync(isDark ? "SetDarkEditor" : "SetLightEditor");
+        UpdateState(CurrentState with { IsDarkMode = isDark });
+    }
+
+    private async Task InitializeWebViewAsync()
+    {
+        if (_chromium == null)
+        {
+            return;
+        }
+
+        WebViewExtensions.EnsureWebView2Environment();
+        _chromium.CoreWebView2Initialized -= ChromiumInitialized;
+        _chromium.CoreWebView2Initialized += ChromiumInitialized;
+        await _chromium.EnsureCoreWebView2Async();
+    }
+
+    private Task EnsureEditorReadyAsync()
+    {
+        if (_chromium == null || _disposedValue)
+        {
+            return Task.CompletedTask;
+        }
+
+        return EnsureEditorReadyCoreAsync();
+    }
+
+    private async Task EnsureEditorReadyCoreAsync()
+    {
+        await EnsureEditorInitializedAsync();
+        await _editorReadyTask.Task;
+    }
+
+    private Task EnsureEditorInitializedAsync()
+    {
+        lock (_editorInitializationLock)
+        {
+            _editorInitializationTask ??= EnsureEditorInitializedCoreAsync();
+            return _editorInitializationTask;
+        }
+    }
+
+    private async Task EnsureEditorInitializedCoreAsync()
+    {
+        if (_chromium == null || _disposedValue)
+        {
+            _editorReadyTask.TrySetResult(true);
+            return;
+        }
+
+        await _domLoadedTask.Task;
+
+        if (_chromium == null || _disposedValue)
+        {
+            _editorReadyTask.TrySetResult(true);
+            return;
+        }
+
+        var fonts = _fontService.GetFonts();
+        await _chromium.ExecuteScriptFunctionAsync(
+            "initializeJodit",
+            JsonSerializer.Serialize(fonts, BasicTypesJsonContext.Default.ListString),
+            JsonSerializer.Serialize(_preferencesService.ComposerFont, BasicTypesJsonContext.Default.String),
+            JsonSerializer.Serialize(_preferencesService.ComposerFontSize, BasicTypesJsonContext.Default.Int32),
+            JsonSerializer.Serialize(_preferencesService.ReaderFont, BasicTypesJsonContext.Default.String),
+            JsonSerializer.Serialize(_preferencesService.ReaderFontSize, BasicTypesJsonContext.Default.Int32),
+            JsonSerializer.Serialize(DefaultTextColors.Select(option => option.Value).Where(value => !string.IsNullOrWhiteSpace(value)).ToList(), BasicTypesJsonContext.Default.ListString),
+            JsonSerializer.Serialize(DefaultHighlightColors.Select(option => option.Value).Where(value => !string.IsNullOrWhiteSpace(value)).ToList(), BasicTypesJsonContext.Default.ListString));
+
+        UpdateCapabilities(BuildCapabilities(fonts));
+        _editorReadyTask.TrySetResult(true);
+
+        await UpdateEditorThemeAsync(force: true);
+        await ApplyBuiltInToolbarVisibilityAsync(force: true);
+        await RefreshStateAsync();
+    }
+
+    private async Task ExecuteEditorCommandAsync(string command)
+    {
+        if (_chromium != null)
+        {
+            await _chromium.ExecuteScriptFunctionSafeAsync("executeEditorCommand", JsonSerializer.Serialize(command, BasicTypesJsonContext.Default.String));
+        }
+    }
+
+    private async Task ApplyBuiltInToolbarVisibilityAsync(bool force = false)
+    {
+        if (_chromium == null)
+        {
+            return;
+        }
+
+        if (!_editorReadyTask.Task.IsCompleted)
+        {
+            return;
+        }
+
+        await _chromium.ExecuteScriptFunctionSafeAsync("toggleToolbar", JsonSerializer.Serialize(IsEditorWebViewEditor, BasicTypesJsonContext.Default.Boolean));
+        UpdateState(CurrentState with { IsBuiltInToolbarVisible = IsEditorWebViewEditor });
+    }
+
+    private async Task RefreshStateAsync()
+    {
+        if (_chromium == null || !_editorReadyTask.Task.IsCompleted)
+        {
+            return;
+        }
+
+        var stateResult = await _chromium.ExecuteScriptFunctionSafeAsync("getEditorState");
+        if (string.IsNullOrWhiteSpace(stateResult))
+        {
+            return;
+        }
+
+        var snapshot = DeserializeStateSnapshot(stateResult);
+        if (snapshot != null)
+        {
+            UpdateState(MapState(snapshot));
+        }
+    }
+
+    private void ChromiumInitialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
+    {
+        if (args.Exception != null || _chromium?.CoreWebView2 == null)
+        {
+            return;
+        }
+
+        _ = ConfigureChromiumAsync();
+    }
+
+    private async Task ConfigureChromiumAsync()
+    {
+        if (_chromium?.CoreWebView2 == null)
+        {
+            return;
+        }
+
+        var editorBundlePath = (await _nativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty, StringComparison.OrdinalIgnoreCase);
+        _chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.editor", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
+        _chromium.CoreWebView2.DOMContentLoaded -= DomLoaded;
+        _chromium.CoreWebView2.DOMContentLoaded += DomLoaded;
+        _chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
+        _chromium.CoreWebView2.WebMessageReceived += ScriptMessageReceived;
+        _chromium.Source = new Uri("https://app.editor/editor.html");
+    }
+
+    private void DomLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args)
+    {
+        _domLoadedTask.TrySetResult(true);
+        _ = EnsureEditorInitializedAsync();
+    }
+
+    private void ScriptMessageReceived(CoreWebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
+    {
+        using var document = JsonDocument.Parse(args.WebMessageAsJson);
+        if (!document.RootElement.TryGetProperty("type", out var typeElement) ||
+            !string.Equals(typeElement.GetString(), "state", StringComparison.OrdinalIgnoreCase))
+        {
+            return;
+        }
+
+        if (document.RootElement.TryGetProperty("state", out var stateElement))
+        {
+            var snapshot = DeserializeStateSnapshot(stateElement);
+            if (snapshot != null)
+            {
+                UpdateState(MapState(snapshot));
+            }
+        }
+    }
+
+    private EditorState MapState(EditorStateSnapshot snapshot)
+    {
+        return new EditorState
+        {
+            IsBold = snapshot.IsBold,
+            IsItalic = snapshot.IsItalic,
+            IsUnderline = snapshot.IsUnderline,
+            IsStrikethrough = snapshot.IsStrikethrough,
+            IsOrderedList = snapshot.IsOrderedList,
+            IsUnorderedList = snapshot.IsUnorderedList,
+            CanIndent = snapshot.CanIndent,
+            CanOutdent = snapshot.CanOutdent,
+            HasSelection = snapshot.HasSelection,
+            IsDarkMode = IsEditorDarkMode,
+            IsBuiltInToolbarVisible = IsEditorWebViewEditor,
+            IsSpellCheckEnabled = snapshot.IsSpellCheckEnabled,
+            Alignment = ParseAlignment(snapshot.Alignment),
+            FontFamily = string.IsNullOrWhiteSpace(snapshot.FontFamily) ? _preferencesService.ComposerFont : snapshot.FontFamily,
+            FontSize = snapshot.FontSize ?? _preferencesService.ComposerFontSize,
+            ParagraphStyle = string.IsNullOrWhiteSpace(snapshot.ParagraphStyle) ? "div" : snapshot.ParagraphStyle,
+            TextColor = snapshot.TextColor ?? string.Empty,
+            HighlightColor = snapshot.HighlightColor ?? string.Empty,
+            LineHeight = string.IsNullOrWhiteSpace(snapshot.LineHeight) ? "normal" : snapshot.LineHeight,
+            LinkUrl = snapshot.LinkUrl,
+            SelectedText = snapshot.SelectedText
+        };
+    }
+
+    private static EditorTextAlignment ParseAlignment(string? alignment)
+    {
+        return alignment?.ToLowerInvariant() switch
+        {
+            "center" => EditorTextAlignment.Center,
+            "right" => EditorTextAlignment.Right,
+            "justify" => EditorTextAlignment.Justify,
+            _ => EditorTextAlignment.Left
+        };
+    }
+
+    private static string SerializeLinkArgs(EditorLinkCommandArgs args)
+    {
+        var url = JsonSerializer.Serialize(args.Url, BasicTypesJsonContext.Default.String);
+        var text = JsonSerializer.Serialize(args.Text, BasicTypesJsonContext.Default.String);
+        var openInNewWindow = JsonSerializer.Serialize(args.OpenInNewWindow, BasicTypesJsonContext.Default.Boolean);
+        return $"{{\"url\":{url},\"text\":{text},\"openInNewWindow\":{openInNewWindow}}}";
+    }
+
+    private static string SerializeTableArgs(EditorTableCommandArgs args)
+    {
+        var rows = JsonSerializer.Serialize(args.Rows, BasicTypesJsonContext.Default.Int32);
+        var columns = JsonSerializer.Serialize(args.Columns, BasicTypesJsonContext.Default.Int32);
+        return $"{{\"rows\":{rows},\"columns\":{columns}}}";
+    }
+
+    private static EditorStateSnapshot? DeserializeStateSnapshot(string json)
+    {
+        using var document = JsonDocument.Parse(json);
+        return DeserializeStateSnapshot(document.RootElement);
+    }
+
+    private static EditorStateSnapshot? DeserializeStateSnapshot(JsonElement element)
+    {
+        if (element.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined)
+        {
+            return null;
+        }
+
+        return new EditorStateSnapshot
+        {
+            IsBold = GetBoolean(element, "bold"),
+            IsItalic = GetBoolean(element, "italic"),
+            IsUnderline = GetBoolean(element, "underline"),
+            IsStrikethrough = GetBoolean(element, "strikethrough"),
+            IsOrderedList = GetBoolean(element, "orderedList"),
+            IsUnorderedList = GetBoolean(element, "unorderedList"),
+            CanIndent = GetBoolean(element, "canIndent", true),
+            CanOutdent = GetBoolean(element, "canOutdent"),
+            HasSelection = GetBoolean(element, "hasSelection"),
+            IsSpellCheckEnabled = GetBoolean(element, "isSpellCheckEnabled", true),
+            Alignment = GetString(element, "alignment"),
+            FontFamily = GetString(element, "fontFamily"),
+            FontSize = GetNullableInt32(element, "fontSize"),
+            ParagraphStyle = GetString(element, "paragraphStyle"),
+            TextColor = GetString(element, "textColor"),
+            HighlightColor = GetString(element, "highlightColor"),
+            LineHeight = GetString(element, "lineHeight"),
+            LinkUrl = GetString(element, "linkUrl"),
+            SelectedText = GetString(element, "selectedText")
+        };
+    }
+
+    private static bool GetBoolean(JsonElement element, string propertyName, bool defaultValue = false)
+    {
+        if (element.TryGetProperty(propertyName, out var valueElement) && valueElement.ValueKind is JsonValueKind.True or JsonValueKind.False)
+        {
+            return valueElement.GetBoolean();
+        }
+
+        return defaultValue;
+    }
+
+    private static int? GetNullableInt32(JsonElement element, string propertyName)
+    {
+        if (element.TryGetProperty(propertyName, out var valueElement) && valueElement.ValueKind == JsonValueKind.Number && valueElement.TryGetInt32(out var value))
+        {
+            return value;
+        }
+
+        return null;
+    }
+
+    private static string? GetString(JsonElement element, string propertyName)
+    {
+        if (element.TryGetProperty(propertyName, out var valueElement) && valueElement.ValueKind == JsonValueKind.String)
+        {
+            return valueElement.GetString();
+        }
+
+        return null;
+    }
+
+    private static EditorCapabilities BuildCapabilities(IReadOnlyList<string> fonts)
+    {
+        return new EditorCapabilities
+        {
+            Fonts = fonts,
+            FontSizes = DefaultFontSizes,
+            TextColors = DefaultTextColors,
+            HighlightColors = DefaultHighlightColors,
+            ParagraphStyles = DefaultParagraphStyles,
+            LineHeights = DefaultLineHeights,
+            Alignments = DefaultAlignments
+        };
+    }
+
+    private EditorState GetCurrentStateOrDefault()
+    {
+        return CurrentState ?? CreateDefaultState();
+    }
+
+    private EditorState CreateDefaultState()
+    {
+        return new EditorState
+        {
+            IsDarkMode = IsEditorDarkMode,
+            IsBuiltInToolbarVisible = IsEditorWebViewEditor,
+            IsSpellCheckEnabled = true,
+            FontFamily = _preferencesService.ComposerFont,
+            FontSize = _preferencesService.ComposerFontSize,
+            ParagraphStyle = "div",
+            TextColor = string.Empty,
+            HighlightColor = string.Empty,
+            LineHeight = "normal"
+        };
+    }
+
+    private void UpdateState(EditorState newState)
+    {
+        if (newState == CurrentState)
+        {
+            return;
+        }
+
+        CurrentState = newState;
+        StateChanged?.Invoke(this, CurrentState);
+    }
+
+    private void UpdateCapabilities(EditorCapabilities newCapabilities)
+    {
+        if (newCapabilities == Capabilities)
+        {
+            return;
+        }
+
+        Capabilities = newCapabilities;
+        CapabilitiesChanged?.Invoke(this, Capabilities);
+    }
+
+    private void DetachChromium(WebView2 chromium, bool closeWebView)
+    {
+        chromium.CoreWebView2Initialized -= ChromiumInitialized;
+
+        if (chromium.CoreWebView2 != null)
+        {
+            chromium.CoreWebView2.DOMContentLoaded -= DomLoaded;
+            chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
+        }
+
+        if (closeWebView)
+        {
+            chromium.Close();
+        }
+    }
+
+    private void Dispose(bool disposing)
+    {
+        if (!_disposedValue)
+        {
+            if (disposing && _chromium != null)
+            {
+                DetachChromium(_chromium, closeWebView: true);
+                _chromium = null;
+            }
+
+            _disposedValue = true;
+        }
+    }
+
+    public void Dispose()
+    {
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+
+    private sealed class EditorWebMessage
+    {
+        [JsonPropertyName("type")]
+        public string? Type { get; set; }
+
+        [JsonPropertyName("state")]
+        public EditorStateSnapshot? State { get; set; }
+    }
+
+    private sealed class EditorStateSnapshot
+    {
+        [JsonPropertyName("bold")]
+        public bool IsBold { get; set; }
+
+        [JsonPropertyName("italic")]
+        public bool IsItalic { get; set; }
+
+        [JsonPropertyName("underline")]
+        public bool IsUnderline { get; set; }
+
+        [JsonPropertyName("strikethrough")]
+        public bool IsStrikethrough { get; set; }
+
+        [JsonPropertyName("orderedList")]
+        public bool IsOrderedList { get; set; }
+
+        [JsonPropertyName("unorderedList")]
+        public bool IsUnorderedList { get; set; }
+
+        [JsonPropertyName("canIndent")]
+        public bool CanIndent { get; set; }
+
+        [JsonPropertyName("canOutdent")]
+        public bool CanOutdent { get; set; }
+
+        [JsonPropertyName("hasSelection")]
+        public bool HasSelection { get; set; }
+
+        [JsonPropertyName("isSpellCheckEnabled")]
+        public bool IsSpellCheckEnabled { get; set; } = true;
+
+        [JsonPropertyName("alignment")]
+        public string? Alignment { get; set; }
+
+        [JsonPropertyName("fontFamily")]
+        public string? FontFamily { get; set; }
+
+        [JsonPropertyName("fontSize")]
+        public int? FontSize { get; set; }
+
+        [JsonPropertyName("paragraphStyle")]
+        public string? ParagraphStyle { get; set; }
+
+        [JsonPropertyName("textColor")]
+        public string? TextColor { get; set; }
+
+        [JsonPropertyName("highlightColor")]
+        public string? HighlightColor { get; set; }
+
+        [JsonPropertyName("lineHeight")]
+        public string? LineHeight { get; set; }
+
+        [JsonPropertyName("linkUrl")]
+        public string? LinkUrl { get; set; }
+
+        [JsonPropertyName("selectedText")]
+        public string? SelectedText { get; set; }
+    }
+}
+
+
+
+
+
+
+
+
+
diff --git a/Wino.Mail/Controls/WinoExpander.cs b/Wino.Mail.WinUI/Controls/WinoExpander.cs
similarity index 79%
rename from Wino.Mail/Controls/WinoExpander.cs
rename to Wino.Mail.WinUI/Controls/WinoExpander.cs
index 057d3996..ff3adb5e 100644
--- a/Wino.Mail/Controls/WinoExpander.cs
+++ b/Wino.Mail.WinUI/Controls/WinoExpander.cs
@@ -1,8 +1,8 @@
-using CommunityToolkit.Diagnostics;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Markup;
+using CommunityToolkit.Diagnostics;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Markup;
 
 namespace Wino.Controls;
 
@@ -13,9 +13,9 @@ public partial class WinoExpander : Control
     private const string PART_ContentAreaWrapper = "ContentAreaWrapper";
     private const string PART_ContentArea = "ContentArea";
 
-    private ContentControl HeaderGrid;
-    private ContentControl ContentArea;
-    private Grid ContentAreaWrapper;
+    private ContentControl HeaderGrid = null!;
+    private ContentControl ContentArea = null!;
+    private Grid ContentAreaWrapper = null!;
 
     public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(nameof(Header), typeof(UIElement), typeof(WinoExpander), new PropertyMetadata(null));
     public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(UIElement), typeof(WinoExpander), new PropertyMetadata(null));
@@ -50,9 +50,9 @@ public partial class WinoExpander : Control
     {
         base.OnApplyTemplate();
 
-        HeaderGrid = GetTemplateChild(PART_HeaderGrid) as ContentControl;
-        ContentAreaWrapper = GetTemplateChild(PART_ContentAreaWrapper) as Grid;
-        ContentArea = GetTemplateChild(PART_ContentArea) as ContentControl;
+        HeaderGrid = (GetTemplateChild(PART_HeaderGrid) as ContentControl)!;
+        ContentAreaWrapper = (GetTemplateChild(PART_ContentAreaWrapper) as Grid)!;
+        ContentArea = (GetTemplateChild(PART_ContentArea) as ContentControl)!;
 
         Guard.IsNotNull(HeaderGrid, nameof(HeaderGrid));
         Guard.IsNotNull(ContentAreaWrapper, nameof(ContentAreaWrapper));
@@ -62,7 +62,7 @@ public partial class WinoExpander : Control
         clipComposition.Clip = clipComposition.Compositor.CreateInsetClip();
 
         ContentAreaWrapper.SizeChanged += ContentSizeChanged;
-        HeaderGrid.Tapped += HeaderTapped;
+
     }
 
     private void ContentSizeChanged(object sender, SizeChangedEventArgs e)
@@ -71,21 +71,6 @@ public partial class WinoExpander : Control
         TemplateSettings.NegativeContentHeight = -1 * (double)e.NewSize.Height;
     }
 
-    private void HeaderTapped(object sender, Windows.UI.Xaml.Input.TappedRoutedEventArgs e)
-    {
-        // Tapped is delegated from executing hover action like flag or delete.
-        // No need to toggle the expander.
-
-        if (Header is MailItemDisplayInformationControl itemDisplayInformationControl &&
-            itemDisplayInformationControl.IsRunningHoverAction)
-        {
-            itemDisplayInformationControl.IsRunningHoverAction = false;
-            return;
-        }
-
-        IsExpanded = !IsExpanded;
-    }
-
     private static void OnIsExpandedChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
     {
         if (obj is WinoExpander control)
diff --git a/Wino.Core.UWP/Controls/WinoFontIcon.cs b/Wino.Mail.WinUI/Controls/WinoFontIcon.cs
similarity index 87%
rename from Wino.Core.UWP/Controls/WinoFontIcon.cs
rename to Wino.Mail.WinUI/Controls/WinoFontIcon.cs
index da9fe61e..bfe0b926 100644
--- a/Wino.Core.UWP/Controls/WinoFontIcon.cs
+++ b/Wino.Mail.WinUI/Controls/WinoFontIcon.cs
@@ -1,7 +1,7 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public enum WinoIconGlyph
 {
@@ -101,7 +101,15 @@ public enum WinoIconGlyph
     EventJoinOnline,
     ViewMessageSource,
     Apple,
-    Yahoo
+    Yahoo,
+    People,
+    AttachmentNew,
+    CalendarSettings,
+    SettingsNew,
+    ManageAccounts,
+    SendNew,
+    CalendarShowAs,
+    Dismiss
 }
 
 public partial class WinoFontIcon : FontIcon
@@ -116,7 +124,7 @@ public partial class WinoFontIcon : FontIcon
 
     public WinoFontIcon()
     {
-        FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Wino.Core.UWP/Assets/WinoIcons.ttf#WinoIcons");
+        FontFamily = new Microsoft.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
         FontSize = 32;
     }
 
diff --git a/Wino.Core.UWP/Controls/WinoFontIconSource.cs b/Wino.Mail.WinUI/Controls/WinoFontIconSource.cs
similarity index 84%
rename from Wino.Core.UWP/Controls/WinoFontIconSource.cs
rename to Wino.Mail.WinUI/Controls/WinoFontIconSource.cs
index 7b2b0d1a..ed32fbbb 100644
--- a/Wino.Core.UWP/Controls/WinoFontIconSource.cs
+++ b/Wino.Mail.WinUI/Controls/WinoFontIconSource.cs
@@ -1,5 +1,5 @@
-using Windows.UI.Xaml;
-using Wino.Core.UWP.Controls;
+using Microsoft.UI.Xaml;
+using Wino.Mail.WinUI.Controls;
 
 namespace Wino.Controls;
 
@@ -15,7 +15,7 @@ public partial class WinoFontIconSource : Microsoft.UI.Xaml.Controls.FontIconSou
 
     public WinoFontIconSource()
     {
-        FontFamily = new Windows.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
+        FontFamily = new Microsoft.UI.Xaml.Media.FontFamily("ms-appx:///Assets/WinoIcons.ttf#WinoIcons");
         FontSize = 32;
     }
 
diff --git a/Wino.Core.UWP/Controls/WinoInfoBar.cs b/Wino.Mail.WinUI/Controls/WinoInfoBar.cs
similarity index 96%
rename from Wino.Core.UWP/Controls/WinoInfoBar.cs
rename to Wino.Mail.WinUI/Controls/WinoInfoBar.cs
index 4b6f60b0..08a986cd 100644
--- a/Wino.Core.UWP/Controls/WinoInfoBar.cs
+++ b/Wino.Mail.WinUI/Controls/WinoInfoBar.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Numerics;
 using CommunityToolkit.WinUI.Animations;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public partial class WinoInfoBar : InfoBar
 {
@@ -71,7 +71,7 @@ public partial class WinoInfoBar : InfoBar
         }
     }
 
-    private async void TimerTick(object sender, object e)
+    private async void TimerTick(object? sender, object e)
     {
         _dispatcherTimer.Stop();
         _dispatcherTimer.Tick -= TimerTick;
diff --git a/Wino.Core.UWP/Controls/WinoNavigationViewItem.cs b/Wino.Mail.WinUI/Controls/WinoNavigationViewItem.cs
similarity index 92%
rename from Wino.Core.UWP/Controls/WinoNavigationViewItem.cs
rename to Wino.Mail.WinUI/Controls/WinoNavigationViewItem.cs
index 10e5149a..8c2550f2 100644
--- a/Wino.Core.UWP/Controls/WinoNavigationViewItem.cs
+++ b/Wino.Mail.WinUI/Controls/WinoNavigationViewItem.cs
@@ -1,9 +1,9 @@
-using System.Numerics;
+using System.Numerics;
 using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
 
-namespace Wino.Core.UWP.Controls;
+namespace Wino.Mail.WinUI.Controls;
 
 public partial class WinoNavigationViewItem : NavigationViewItem
 {
diff --git a/Wino.Mail.WinUI/Controls/WinoSwipeControlItems.cs b/Wino.Mail.WinUI/Controls/WinoSwipeControlItems.cs
new file mode 100644
index 00000000..43c3f700
--- /dev/null
+++ b/Wino.Mail.WinUI/Controls/WinoSwipeControlItems.cs
@@ -0,0 +1,138 @@
+using System.Linq;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
+using Wino.Helpers;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Controls;
+
+public partial class WinoSwipeControlItems : SwipeItems
+{
+    public static readonly DependencyProperty SwipeOperationProperty = DependencyProperty.Register(nameof(SwipeOperation), typeof(MailOperation), typeof(WinoSwipeControlItems), new PropertyMetadata(default(MailOperation), new PropertyChangedCallback(OnItemsChanged)));
+    public static readonly DependencyProperty MailItemProperty = DependencyProperty.Register(nameof(MailItem), typeof(IMailListItem), typeof(WinoSwipeControlItems), new PropertyMetadata(null));
+    public static readonly DependencyProperty IsRightSwipeProperty = DependencyProperty.Register(nameof(IsRightSwipe), typeof(bool), typeof(WinoSwipeControlItems), new PropertyMetadata(false, new PropertyChangedCallback(OnItemsChanged)));
+
+    public WinoSwipeControlItems()
+    {
+        var preferencesService = WinoApplication.Current.Services.GetRequiredService<IPreferencesService>();
+
+        SwipeOperation = IsRightSwipe ? preferencesService.RightSwipeOperation : preferencesService.LeftSwipeOperation;
+    }
+
+    public IMailListItem MailItem
+    {
+        get { return (IMailListItem)GetValue(MailItemProperty); }
+        set { SetValue(MailItemProperty, value); }
+    }
+
+
+    public MailOperation SwipeOperation
+    {
+        get { return (MailOperation)GetValue(SwipeOperationProperty); }
+        set { SetValue(SwipeOperationProperty, value); }
+    }
+
+    public bool IsRightSwipe
+    {
+        get { return (bool)GetValue(IsRightSwipeProperty); }
+        set { SetValue(IsRightSwipeProperty, value); }
+    }
+
+    private static void OnItemsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        if (obj is WinoSwipeControlItems control)
+        {
+            control.BuildSwipeItems();
+        }
+    }
+
+    private void BuildSwipeItems()
+    {
+        this.Clear();
+
+        var swipeItem = GetSwipeItem(SwipeOperation);
+
+        this.Add(swipeItem);
+    }
+
+    private SwipeItem? GetSwipeItem(MailOperation operation)
+    {
+        if (MailItem == null) return null;
+
+        var finalOperation = operation;
+
+        bool isSingleItem = MailItem is MailItemViewModel;
+
+        if (isSingleItem)
+        {
+            var singleItem = MailItem as MailItemViewModel;
+
+            if (singleItem != null && operation == MailOperation.MarkAsRead && singleItem.IsRead)
+                finalOperation = MailOperation.MarkAsUnread;
+            else if (singleItem != null && operation == MailOperation.MarkAsUnread && !singleItem.IsRead)
+                finalOperation = MailOperation.MarkAsRead;
+        }
+        else
+        {
+            var threadItem = MailItem as ThreadMailItemViewModel;
+
+            if (threadItem != null && operation == MailOperation.MarkAsRead && threadItem.ThreadEmails.All(a => a.IsRead))
+                finalOperation = MailOperation.MarkAsUnread;
+            else if (threadItem != null && operation == MailOperation.MarkAsUnread && threadItem.ThreadEmails.All(a => !a.IsRead))
+                finalOperation = MailOperation.MarkAsRead;
+        }
+
+        var item = new SwipeItem()
+        {
+            IconSource = new WinoFontIconSource() { Icon = XamlHelpers.GetWinoIconGlyph(finalOperation) },
+            Text = XamlHelpers.GetOperationString(finalOperation),
+        };
+
+        item.Invoked += SwipeItemInvoked;
+
+        return item;
+    }
+
+    private void SwipeItemInvoked(SwipeItem sender, SwipeItemInvokedEventArgs args)
+    {
+        var swipeControl = args.SwipeControl;
+        swipeControl.Close();
+
+        if (MailItem == null) return;
+
+        // Determine the final operation based on current settings and mail item state
+        var finalOperation = SwipeOperation;
+
+        bool isSingleItem = MailItem is MailItemViewModel;
+
+        if (isSingleItem)
+        {
+            var singleItem = MailItem as MailItemViewModel;
+
+            if (singleItem != null)
+            {
+                if (SwipeOperation == MailOperation.MarkAsRead && singleItem.IsRead)
+                    finalOperation = MailOperation.MarkAsUnread;
+                else if (SwipeOperation == MailOperation.MarkAsUnread && !singleItem.IsRead)
+                    finalOperation = MailOperation.MarkAsRead;
+            }
+        }
+        else
+        {
+            var threadItem = MailItem as ThreadMailItemViewModel;
+
+            if (threadItem != null && SwipeOperation == MailOperation.MarkAsRead && threadItem.ThreadEmails.All(a => a.IsRead))
+                finalOperation = MailOperation.MarkAsUnread;
+            else if (threadItem != null && SwipeOperation == MailOperation.MarkAsUnread && threadItem.ThreadEmails.All(a => !a.IsRead))
+                finalOperation = MailOperation.MarkAsRead;
+        }
+
+        // Send message to MailListPageViewModel to handle the operation
+        CommunityToolkit.Mvvm.Messaging.WeakReferenceMessenger.Default.Send(new Mail.ViewModels.Messages.SwipeActionRequested(finalOperation, MailItem));
+    }
+}
diff --git a/Wino.Core.UWP/Converters/GridLengthConverter.cs b/Wino.Mail.WinUI/Converters/GridLengthConverter.cs
similarity index 91%
rename from Wino.Core.UWP/Converters/GridLengthConverter.cs
rename to Wino.Mail.WinUI/Converters/GridLengthConverter.cs
index 367e2f0e..1f7bd7ca 100644
--- a/Wino.Core.UWP/Converters/GridLengthConverter.cs
+++ b/Wino.Mail.WinUI/Converters/GridLengthConverter.cs
@@ -1,6 +1,6 @@
 using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
 
 namespace Wino.Converters;
 
diff --git a/Wino.Core.UWP/Converters/HexToColorBrushConverter.cs b/Wino.Mail.WinUI/Converters/HexToColorBrushConverter.cs
similarity index 94%
rename from Wino.Core.UWP/Converters/HexToColorBrushConverter.cs
rename to Wino.Mail.WinUI/Converters/HexToColorBrushConverter.cs
index a1ece0a4..917dec19 100644
--- a/Wino.Core.UWP/Converters/HexToColorBrushConverter.cs
+++ b/Wino.Mail.WinUI/Converters/HexToColorBrushConverter.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Globalization;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
 using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media;
 
-namespace Wino.Core.UWP.Converters;
+namespace Wino.Mail.WinUI.Converters;
 
 public partial class HexToColorBrushConverter : IValueConverter
 {
diff --git a/Wino.Core.UWP/Converters/ReverseBooleanConverter.cs b/Wino.Mail.WinUI/Converters/ReverseBooleanConverter.cs
similarity index 90%
rename from Wino.Core.UWP/Converters/ReverseBooleanConverter.cs
rename to Wino.Mail.WinUI/Converters/ReverseBooleanConverter.cs
index 1e5a9f06..945170bb 100644
--- a/Wino.Core.UWP/Converters/ReverseBooleanConverter.cs
+++ b/Wino.Mail.WinUI/Converters/ReverseBooleanConverter.cs
@@ -1,5 +1,5 @@
-using System;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
 
 namespace Wino.Converters;
 
diff --git a/Wino.Core.UWP/Converters/ReverseBooleanToVisibilityConverter.cs b/Wino.Mail.WinUI/Converters/ReverseBooleanToVisibilityConverter.cs
similarity index 86%
rename from Wino.Core.UWP/Converters/ReverseBooleanToVisibilityConverter.cs
rename to Wino.Mail.WinUI/Converters/ReverseBooleanToVisibilityConverter.cs
index 39e2e0c3..dc3123d9 100644
--- a/Wino.Core.UWP/Converters/ReverseBooleanToVisibilityConverter.cs
+++ b/Wino.Mail.WinUI/Converters/ReverseBooleanToVisibilityConverter.cs
@@ -1,6 +1,6 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
 
 namespace Wino.Converters;
 
diff --git a/Wino.Core.UWP/CoreGeneric.xaml b/Wino.Mail.WinUI/CoreGeneric.xaml
similarity index 85%
rename from Wino.Core.UWP/CoreGeneric.xaml
rename to Wino.Mail.WinUI/CoreGeneric.xaml
index 8bc8392d..7a55851f 100644
--- a/Wino.Core.UWP/CoreGeneric.xaml
+++ b/Wino.Mail.WinUI/CoreGeneric.xaml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.CoreGeneric"
+    x:Class="Wino.Mail.WinUI.CoreGeneric"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:styles="using:Wino.Core.UWP.Styles">
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:styles="using:Wino.Mail.WinUI.Styles">
 
     <ResourceDictionary.MergedDictionaries>
         <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 
-        <ResourceDictionary Source="Styles/Colors.xaml" />
-        <ResourceDictionary Source="Styles/ContentPresenters.xaml" />
-        <ResourceDictionary Source="Styles/Converters.xaml" />
-        <ResourceDictionary Source="Styles/FontIcons.xaml" />
-        <ResourceDictionary Source="Styles/WinoInfoBar.xaml" />
-        <ResourceDictionary Source="Styles/SharedStyles.xaml" />
-        <ResourceDictionary Source="Styles/IconTemplates.xaml" />
+        <ResourceDictionary Source="/Styles/Colors.xaml" />
+        <ResourceDictionary Source="/Styles/ContentPresenters.xaml" />
+        <ResourceDictionary Source="/Styles/Converters.xaml" />
+        <ResourceDictionary Source="/Styles/FontIcons.xaml" />
+        <ResourceDictionary Source="/Styles/WinoInfoBar.xaml" />
+        <ResourceDictionary Source="/Styles/SharedStyles.xaml" />
+        <ResourceDictionary Source="/Styles/IconTemplates.xaml" />
 
         <styles:CustomMessageDialogStyles />
         <styles:DataTemplates />
@@ -69,7 +69,10 @@
             <Style
                 x:Key="WinoDialogStyle"
                 BasedOn="{StaticResource DefaultContentDialogStyle}"
-                TargetType="ContentDialog" />
+                TargetType="ContentDialog">
+                <Setter Property="CornerRadius" Value="8" />
+                <Setter Property="Padding" Value="24" />
+            </Style>
 
             <!--  Wino Navigation View Item  -->
             <Style TargetType="coreControls:WinoNavigationViewItem">
diff --git a/Wino.Core.UWP/CoreGeneric.xaml.cs b/Wino.Mail.WinUI/CoreGeneric.xaml.cs
similarity index 68%
rename from Wino.Core.UWP/CoreGeneric.xaml.cs
rename to Wino.Mail.WinUI/CoreGeneric.xaml.cs
index a480b6a2..9f3730bc 100644
--- a/Wino.Core.UWP/CoreGeneric.xaml.cs
+++ b/Wino.Mail.WinUI/CoreGeneric.xaml.cs
@@ -1,6 +1,6 @@
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 
-namespace Wino.Core.UWP;
+namespace Wino.Mail.WinUI;
 
 public partial class CoreGeneric : ResourceDictionary
 {
diff --git a/Wino.Core.UWP/CoreUWPContainerSetup.cs b/Wino.Mail.WinUI/CoreUWPContainerSetup.cs
similarity index 66%
rename from Wino.Core.UWP/CoreUWPContainerSetup.cs
rename to Wino.Mail.WinUI/CoreUWPContainerSetup.cs
index 5869d67e..0c1b42b2 100644
--- a/Wino.Core.UWP/CoreUWPContainerSetup.cs
+++ b/Wino.Mail.WinUI/CoreUWPContainerSetup.cs
@@ -1,37 +1,41 @@
-using Microsoft.Extensions.DependencyInjection;
-using Windows.ApplicationModel.AppService;
-using Windows.UI.Xaml;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Services;
 using Wino.Core.ViewModels;
+using Wino.Core.WinUI.Services;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Services;
 using Wino.Services;
 
-namespace Wino.Core.UWP;
+namespace Wino.Mail.WinUI;
 
 public static class CoreUWPContainerSetup
 {
     public static void RegisterCoreUWPServices(this IServiceCollection services)
     {
-        var serverConnectionManager = new WinoServerConnectionManager();
-
-        services.AddSingleton<IWinoServerConnectionManager>(serverConnectionManager);
-        services.AddSingleton<IWinoServerConnectionManager<AppServiceConnection>>(serverConnectionManager);
         services.AddSingleton<IApplicationResourceManager<ResourceDictionary>, ApplicationResourceManager>();
+        services.AddSingleton<WinUIDispatcher>();
+        services.AddSingleton<IDispatcher>(provider => provider.GetRequiredService<WinUIDispatcher>());
 
         services.AddSingleton<IUnderlyingThemeService, UnderlyingThemeService>();
+        services.AddSingleton<IWinoWindowManager, WinoWindowManager>();
         services.AddSingleton<INativeAppService, NativeAppService>();
         services.AddSingleton<IStoreManagementService, StoreManagementService>();
-        services.AddSingleton<IBackgroundTaskService, BackgroundTaskService>();
         services.AddSingleton<IPreferencesService, PreferencesService>();
-        services.AddSingleton<IThemeService, ThemeService>();
+        services.AddSingleton<INewThemeService, NewThemeService>();
         services.AddSingleton<IStatePersistanceService, StatePersistenceService>();
+        services.AddSingleton<ISmimeCertificateService, SmimeCertificateService>();
+
         services.AddSingleton<IThumbnailService, ThumbnailService>();
         services.AddSingleton<IDialogServiceBase, DialogServiceBase>();
         services.AddTransient<IConfigurationService, ConfigurationService>();
         services.AddTransient<IFileService, FileService>();
         services.AddTransient<IStoreRatingService, StoreRatingService>();
+        services.AddSingleton<IStoreUpdateService, StoreUpdateService>();
         services.AddTransient<IKeyPressService, KeyPressService>();
+        services.AddTransient<IWebView2RuntimeValidatorService, WebView2RuntimeValidatorService>();
         services.AddTransient<INotificationBuilder, NotificationBuilder>();
+        services.AddSingleton<ICalendarReminderServer, CalendarReminderServer>();
         services.AddTransient<IClipboardService, ClipboardService>();
         services.AddTransient<IStartupBehaviorService, StartupBehaviorService>();
         services.AddSingleton<IPrintService, PrintService>();
@@ -46,5 +50,9 @@ public static class CoreUWPContainerSetup
         services.AddTransient(typeof(AboutPageViewModel));
         services.AddTransient(typeof(SettingsPageViewModel));
         services.AddTransient(typeof(ManageAccountsPagePageViewModel));
+        services.AddTransient(typeof(WelcomeHostPageViewModel));
+        services.AddTransient(typeof(KeyboardShortcutsPageViewModel));
     }
 }
+
+
diff --git a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml b/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml
similarity index 80%
rename from Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml
index 6de492a6..c55645e0 100644
--- a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml
@@ -1,17 +1,15 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.AccountCreationDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Core.UWP.Controls"
+    xmlns:controls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="using:Wino.Dialogs"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Closing="DialogClosing"
-    CornerRadius="8"
+    Style="{StaticResource WinoDialogStyle}"
     mc:Ignorable="d">
 
-    <!--  ContentDialogs do not support VSM.  -->
-
     <controls:AccountCreationDialogControl
         VerticalAlignment="Center"
         CancelClicked="CancelClicked"
diff --git a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml.cs
similarity index 87%
rename from Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml.cs
index f10fbc1d..06c14b6a 100644
--- a/Wino.Core.UWP/Dialogs/AccountCreationDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/AccountCreationDialog.xaml.cs
@@ -1,7 +1,7 @@
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
@@ -10,7 +10,7 @@ namespace Wino.Dialogs;
 public sealed partial class AccountCreationDialog : ContentDialog, IAccountCreationDialog
 {
     private TaskCompletionSource<bool> dialogOpened = new TaskCompletionSource<bool>();
-    public CancellationTokenSource CancellationTokenSource { get; private set; }
+    public CancellationTokenSource? CancellationTokenSource { get; private set; }
 
     public AccountCreationDialogState State
     {
@@ -41,7 +41,7 @@ public sealed partial class AccountCreationDialog : ContentDialog, IAccountCreat
         // Unregister from closing event.
         Closing -= DialogClosing;
 
-        if (cancel && !CancellationTokenSource.IsCancellationRequested)
+        if (cancel && CancellationTokenSource != null && !CancellationTokenSource.IsCancellationRequested)
         {
             CancellationTokenSource.Cancel();
         }
diff --git a/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml b/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml
new file mode 100644
index 00000000..a7011a04
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml
@@ -0,0 +1,37 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.AccountPickerDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shared="using:Wino.Core.Domain.Entities.Shared"
+    Title="{x:Bind domain:Translator.AccountPickerDialog_Title}"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">360</x:Double>
+    </ContentDialog.Resources>
+
+    <ListView
+        Margin="0,8,0,0"
+        IsItemClickEnabled="True"
+        ItemClick="AccountClicked"
+        ItemsSource="{x:Bind AvailableAccounts}"
+        SelectionMode="None">
+        <ListView.ItemContainerStyle>
+            <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                <Setter Property="Padding" Value="12,10" />
+                <Setter Property="CornerRadius" Value="4" />
+                <Setter Property="Margin" Value="0,2" />
+            </Style>
+        </ListView.ItemContainerStyle>
+        <ListView.ItemTemplate>
+            <DataTemplate x:DataType="shared:MailAccount">
+                <TextBlock Style="{ThemeResource BodyTextBlockStyle}" Text="{x:Bind Address}" />
+            </DataTemplate>
+        </ListView.ItemTemplate>
+    </ListView>
+</ContentDialog>
diff --git a/Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml.cs
similarity index 70%
rename from Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml.cs
index f07a4071..1c8c19c6 100644
--- a/Wino.Core.UWP/Dialogs/AccountPickerDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/AccountPickerDialog.xaml.cs
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-using Windows.UI.Xaml.Controls;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities.Shared;
 
 namespace Wino.Dialogs;
 
 public sealed partial class AccountPickerDialog : ContentDialog
 {
-    public MailAccount PickedAccount { get; set; }
+    public MailAccount? PickedAccount { get; set; }
 
-    public List<MailAccount> AvailableAccounts { get; set; }
+    public List<MailAccount> AvailableAccounts { get; set; } = [];
 
     public AccountPickerDialog(List<MailAccount> availableAccounts)
     {
diff --git a/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
new file mode 100644
index 00000000..16fbea2e
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml
@@ -0,0 +1,117 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.AccountReorderDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
+    xmlns:local="using:Wino.Dialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:selectors="using:Wino.Selectors"
+    Title="Reorder Accounts"
+    Closed="DialogClosed"
+    DefaultButton="Secondary"
+    Opened="DialogOpened"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">420</x:Double>
+
+        <DataTemplate x:Key="RootAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
+            <Border
+                Padding="12"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
+                <Grid ColumnSpacing="12">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <FontIcon
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Glyph="&#xE700;"
+                        Opacity="0.5" />
+                    <coreControls:WinoFontIcon
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        FontSize="24"
+                        Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(ProviderDetail.Type, ProviderDetail.SpecialImapProvider)}" />
+                    <StackPanel
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Spacing="2">
+                        <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="{x:Bind StartupEntityTitle}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{x:Bind StartupEntityAddresses}" />
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </DataTemplate>
+        <DataTemplate x:Key="MergedAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
+            <Border
+                Padding="12"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
+                <Grid ColumnSpacing="12">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <FontIcon
+                        VerticalAlignment="Center"
+                        FontSize="16"
+                        Glyph="&#xE700;"
+                        Opacity="0.5" />
+                    <PathIcon
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
+                    <StackPanel
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Spacing="2">
+                        <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="{x:Bind StartupEntityTitle}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{ThemeResource CaptionTextBlockStyle}"
+                            Text="{x:Bind StartupEntityAddresses}" />
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </DataTemplate>
+
+        <selectors:AccountReorderTemplateSelector
+            x:Key="AccountReorderTemplateSelector"
+            MergedAccountReorderTemplate="{StaticResource MergedAccountReorderTemplate}"
+            RootAccountReorderTemplate="{StaticResource RootAccountReorderTemplate}" />
+    </ContentDialog.Resources>
+
+    <ListView
+        AllowDrop="True"
+        CanReorderItems="True"
+        ItemTemplateSelector="{StaticResource AccountReorderTemplateSelector}"
+        ItemsSource="{x:Bind Accounts}"
+        SelectionMode="None">
+        <ListView.ItemContainerStyle>
+            <Style TargetType="ListViewItem">
+                <Setter Property="Margin" Value="0,2" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            </Style>
+        </ListView.ItemContainerStyle>
+    </ListView>
+</ContentDialog>
diff --git a/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
similarity index 65%
rename from Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
index 9bbcae64..37f59975 100644
--- a/Wino.Mail/Dialogs/AccountReorderDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/AccountReorderDialog.xaml.cs
@@ -1,23 +1,25 @@
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
 
 namespace Wino.Dialogs;
 
 public sealed partial class AccountReorderDialog : ContentDialog
 {
-    public ObservableCollection<IAccountProviderDetailViewModel> Accounts { get; }
+    public ObservableCollection<IAccountProviderDetailViewModel> Accounts { get; set; } = null!;
 
     private int count;
     private bool isOrdering = false;
 
-    private readonly IAccountService _accountService = App.Current.Services.GetService<IAccountService>();
+    private readonly IAccountService? _accountService = App.Current.Services.GetService<IAccountService>();
 
-    public AccountReorderDialog(ObservableCollection<IAccountProviderDetailViewModel> accounts)
+    public AccountReorderDialog(ObservableCollection<IAccountProviderDetailViewModel>? accounts)
     {
-        Accounts = accounts;
+        Accounts = accounts ?? throw new ArgumentNullException(nameof(accounts));
 
         count = accounts.Count;
 
@@ -32,7 +34,7 @@ public sealed partial class AccountReorderDialog : ContentDialog
 
     private void DialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args) => Accounts.CollectionChanged -= AccountsChanged;
 
-    private async void AccountsChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    private async void AccountsChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
     {
         if (count - 1 == Accounts.Count)
             isOrdering = true;
@@ -43,7 +45,8 @@ public sealed partial class AccountReorderDialog : ContentDialog
 
             var dict = Accounts.ToDictionary(a => a.StartupEntityId, a => Accounts.IndexOf(a));
 
-            await _accountService.UpdateAccountOrdersAsync(dict);
+            if (_accountService != null)
+                await _accountService.UpdateAccountOrdersAsync(dict);
 
             isOrdering = false;
         }
diff --git a/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml b/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml
new file mode 100644
index 00000000..02da60f2
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml
@@ -0,0 +1,106 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.ContactEditDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    HorizontalContentAlignment="Stretch"
+    DefaultButton="Primary"
+    IsPrimaryButtonEnabled="True"
+    PrimaryButtonClick="SaveClicked"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Save, Mode=OneTime}"
+    SecondaryButtonClick="CancelClicked"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel, Mode=OneTime}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMaxWidth">400</x:Double>
+    </ContentDialog.Resources>
+
+    <StackPanel Spacing="20">
+        <!--  Contact Name  -->
+        <TextBox
+            x:Name="ContactNameTextBox"
+            Header="{x:Bind domain:Translator.ContactEditDialog_NameHeader, Mode=OneTime}"
+            PlaceholderText="{x:Bind domain:Translator.ContactEditDialog_NamePlaceholder, Mode=OneTime}"
+            TextChanged="ValidateInput" />
+
+        <!--  Email Address  -->
+        <TextBox
+            x:Name="EmailAddressTextBox"
+            Header="{x:Bind domain:Translator.ContactEditDialog_EmailHeader, Mode=OneTime}"
+            PlaceholderText="{x:Bind domain:Translator.ContactEditDialog_EmailPlaceholder, Mode=OneTime}"
+            TextChanged="ValidateInput" />
+
+        <!--  Contact Photo  -->
+        <StackPanel>
+            <TextBlock
+                Margin="0,0,0,8"
+                Style="{ThemeResource BodyStrongTextBlockStyle}"
+                Text="{x:Bind domain:Translator.ContactEditDialog_PhotoSection, Mode=OneTime}" />
+            <Border
+                Padding="16"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <controls:ImagePreviewControl
+                        x:Name="ContactPhotoPersonPicture"
+                        Grid.Column="0"
+                        Width="64"
+                        Height="64"
+                        Margin="0,0,16,0" />
+
+                    <StackPanel
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Spacing="8">
+                        <Button
+                            x:Name="ChoosePhotoButton"
+                            Click="ChoosePhotoClicked"
+                            Content="{x:Bind domain:Translator.ContactEditDialog_ChoosePhoto, Mode=OneTime}" />
+                        <Button
+                            x:Name="RemovePhotoButton"
+                            Click="RemovePhotoClicked"
+                            Content="{x:Bind domain:Translator.ContactEditDialog_RemovePhoto, Mode=OneTime}"
+                            Visibility="Collapsed" />
+                    </StackPanel>
+                </Grid>
+            </Border>
+        </StackPanel>
+
+        <!--  Contact Status Info  -->
+        <Border
+            x:Name="RootContactInfoBorder"
+            Padding="16,12"
+            Background="{ThemeResource AccentFillColorDefaultBrush}"
+            CornerRadius="6"
+            Visibility="Collapsed">
+            <TextBlock
+                Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
+                Text="{x:Bind domain:Translator.ContactEditDialog_RootContactInfo, Mode=OneTime}"
+                TextWrapping="Wrap" />
+        </Border>
+
+        <Border
+            x:Name="OverriddenContactInfoBorder"
+            Padding="16,12"
+            Background="{ThemeResource SystemFillColorCautionBrush}"
+            CornerRadius="6"
+            Visibility="Collapsed">
+            <TextBlock
+                Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+                Text="{x:Bind domain:Translator.ContactEditDialog_OverriddenContactInfo, Mode=OneTime}"
+                TextWrapping="Wrap" />
+        </Border>
+    </StackPanel>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml.cs
new file mode 100644
index 00000000..e25d4071
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/ContactEditDialog.xaml.cs
@@ -0,0 +1,188 @@
+using System;
+using System.IO;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
+
+namespace Wino.Dialogs;
+
+public sealed partial class ContactEditDialog : ContentDialog
+{
+    private AccountContact _contact;
+    private IDialogServiceBase? _dialogService;
+    private IContactPictureFileService? _contactPictureFileService;
+    private bool _isEditMode;
+
+    public AccountContact Contact => _contact;
+
+    public ContactEditDialog(AccountContact? contact = null, IDialogServiceBase? dialogService = null)
+    {
+        InitializeComponent();
+
+        _contact = contact ?? new AccountContact();
+        _dialogService = dialogService;
+        _contactPictureFileService = App.Current.Services.GetService<IContactPictureFileService>();
+        _isEditMode = contact != null && !string.IsNullOrEmpty(contact.Address);
+
+        Title = _isEditMode ? Translator.ContactEditDialog_Title : Translator.ContactEditDialog_AddTitle;
+
+        LoadContactData();
+        ValidateInput();
+    }
+
+    private void LoadContactData()
+    {
+        if (_contact != null)
+        {
+            ContactNameTextBox.Text = _contact.Name ?? string.Empty;
+            EmailAddressTextBox.Text = _contact.Address ?? string.Empty;
+
+            // Disable email editing for existing contacts (Address is PK).
+            EmailAddressTextBox.IsEnabled = !_isEditMode;
+
+            if (_contact.IsRootContact)
+                RootContactInfoBorder.Visibility = Visibility.Visible;
+
+            if (_contact.IsOverridden)
+                OverriddenContactInfoBorder.Visibility = Visibility.Visible;
+
+            // Load existing photo — prefer file-based picture, fall back to legacy base64.
+            if (_contact.ContactPictureFileId.HasValue && _contactPictureFileService != null)
+            {
+                var filePath = _contactPictureFileService.GetContactPicturePath(_contact.ContactPictureFileId.Value);
+                if (!string.IsNullOrEmpty(filePath))
+                {
+                    LoadContactPhotoFromFile(filePath);
+                    RemovePhotoButton.Visibility = Visibility.Visible;
+                }
+            }
+            else
+            {
+                ContactPhotoPersonPicture.DisplayName = _contact.Name ?? string.Empty;
+                RemovePhotoButton.Visibility = Visibility.Collapsed;
+            }
+        }
+    }
+
+    private async void ChoosePhotoClicked(object sender, RoutedEventArgs e)
+    {
+        if (_dialogService == null) return;
+
+        try
+        {
+            var files = await _dialogService.PickFilesAsync(".png", ".jpg", ".jpeg");
+
+            if (files?.Count > 0)
+            {
+                var file = files[0];
+
+                if (_contactPictureFileService != null)
+                {
+                    // Delete existing file if replacing.
+                    if (_contact.ContactPictureFileId.HasValue)
+                        await _contactPictureFileService.DeleteContactPictureAsync(_contact.ContactPictureFileId.Value);
+
+                    var fileId = await _contactPictureFileService.SaveContactPictureAsync(file.Data);
+                    _contact.ContactPictureFileId = fileId;
+
+                    var filePath = _contactPictureFileService.GetContactPicturePath(fileId);
+                    if (!string.IsNullOrEmpty(filePath))
+                        LoadContactPhotoFromFile(filePath);
+                }
+                else
+                {
+                    LoadContactPhoto(file.Data);
+                }
+
+                RemovePhotoButton.Visibility = Visibility.Visible;
+            }
+        }
+        catch (Exception)
+        {
+            // Failed to pick photo, ignore.
+        }
+    }
+
+    private void RemovePhotoClicked(object sender, RoutedEventArgs e)
+    {
+        if (_contact.ContactPictureFileId.HasValue && _contactPictureFileService != null)
+            _ = _contactPictureFileService.DeleteContactPictureAsync(_contact.ContactPictureFileId.Value);
+
+        _contact.ContactPictureFileId = null;
+        ContactPhotoPersonPicture.ProfilePicture = null;
+        ContactPhotoPersonPicture.DisplayName = ContactNameTextBox.Text;
+        RemovePhotoButton.Visibility = Visibility.Collapsed;
+    }
+
+    private void LoadContactPhotoFromFile(string filePath)
+    {
+        try
+        {
+            var bytes = File.ReadAllBytes(filePath);
+            using var stream = new MemoryStream(bytes);
+            var bitmap = new BitmapImage();
+            bitmap.SetSource(stream.AsRandomAccessStream());
+            ContactPhotoPersonPicture.ProfilePicture = bitmap;
+        }
+        catch
+        {
+            // Failed to load image, ignore.
+        }
+    }
+
+    private void LoadContactPhoto(byte[] imageBytes)
+    {
+        try
+        {
+            using var stream = new MemoryStream(imageBytes);
+            var bitmap = new BitmapImage();
+            bitmap.SetSource(stream.AsRandomAccessStream());
+            ContactPhotoPersonPicture.ProfilePicture = bitmap;
+        }
+        catch
+        {
+            // Failed to load image, ignore.
+        }
+    }
+
+    private void ValidateInput(object? sender = null, TextChangedEventArgs? e = null)
+    {
+        var hasName = !string.IsNullOrWhiteSpace(ContactNameTextBox.Text);
+        var hasEmail = !string.IsNullOrWhiteSpace(EmailAddressTextBox.Text);
+
+        var isValidEmail = hasEmail && EmailValidation.EmailValidator.Validate(EmailAddressTextBox.Text);
+
+        if (_isEditMode)
+        {
+            // In edit mode, only name is required (email is locked).
+            IsPrimaryButtonEnabled = hasName;
+        }
+        else
+        {
+            // In create mode, both name and valid email are required.
+            IsPrimaryButtonEnabled = hasName && isValidEmail;
+        }
+    }
+
+    private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        _contact.Name = ContactNameTextBox.Text?.Trim();
+
+        if (!_isEditMode)
+            _contact.Address = EmailAddressTextBox.Text?.Trim();
+
+        // Mark as overridden if this was a user edit of an existing contact.
+        if (_isEditMode)
+            _contact.IsOverridden = true;
+    }
+
+    private void CancelClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        // Nothing to do, dialog will close.
+    }
+}
diff --git a/Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml b/Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml
similarity index 87%
rename from Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml
index 2e18c01b..02f2efe1 100644
--- a/Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml
@@ -1,4 +1,4 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.CreateAccountAliasDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -19,12 +19,12 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind domain:Translator.CreateAccountAliasDialog_Description}" />
+        <TextBlock Style="{ThemeResource BodyTextBlockStyle}" Text="{x:Bind domain:Translator.CreateAccountAliasDialog_Description}" />
 
         <StackPanel
             Grid.Row="1"
-            Margin="0,20"
-            Spacing="8">
+            Margin="0,16"
+            Spacing="12">
             <TextBox
                 x:Name="AliasTextBox"
                 Header="{x:Bind domain:Translator.CreateAccountAliasDialog_AliasAddress}"
@@ -37,4 +37,3 @@
         </StackPanel>
     </Grid>
 </ContentDialog>
-
diff --git a/Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml.cs
similarity index 85%
rename from Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml.cs
index 2a0ba0ac..16a7c26c 100644
--- a/Wino.Mail/Dialogs/CreateAccountAliasDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/CreateAccountAliasDialog.xaml.cs
@@ -1,5 +1,5 @@
-using System;
-using Windows.UI.Xaml.Controls;
+using System;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Interfaces;
 
@@ -7,7 +7,7 @@ namespace Wino.Dialogs;
 
 public sealed partial class CreateAccountAliasDialog : ContentDialog, ICreateAccountAliasDialog
 {
-    public MailAccountAlias CreatedAccountAlias { get; set; }
+    public MailAccountAlias CreatedAccountAlias { get; set; } = null!;
     public CreateAccountAliasDialog()
     {
         InitializeComponent();
diff --git a/Wino.Core.UWP/Dialogs/CustomMessageDialogInformationContainer.cs b/Wino.Mail.WinUI/Dialogs/CustomMessageDialogInformationContainer.cs
similarity index 93%
rename from Wino.Core.UWP/Dialogs/CustomMessageDialogInformationContainer.cs
rename to Wino.Mail.WinUI/Dialogs/CustomMessageDialogInformationContainer.cs
index 4715ea3a..b1a214c2 100644
--- a/Wino.Core.UWP/Dialogs/CustomMessageDialogInformationContainer.cs
+++ b/Wino.Mail.WinUI/Dialogs/CustomMessageDialogInformationContainer.cs
@@ -1,4 +1,4 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Dialogs;
diff --git a/Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml b/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml
similarity index 98%
rename from Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml
index 8010ea9c..a0e1ccf4 100644
--- a/Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml
@@ -1,4 +1,4 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.CustomThemeBuilderDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -25,8 +25,12 @@
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </ContentDialog.Resources>
 
-    <StackPanel Spacing="6">
-        <TextBlock x:Name="ErrorTextBlock" Foreground="Gold" />
+    <StackPanel Spacing="8">
+        <muxc:InfoBar
+            x:Name="ErrorInfoBar"
+            IsClosable="False"
+            IsOpen="False"
+            Severity="Warning" />
 
         <controls:SettingsCard Description="{x:Bind domain:Translator.CustomThemeBuilder_ThemeNameDescription}" Header="{x:Bind domain:Translator.CustomThemeBuilder_ThemeNameTitle}">
             <controls:SettingsCard.HeaderIcon>
@@ -63,7 +67,8 @@
                                 x:Name="PreviewAccentColorGrid"
                                 Width="20"
                                 Height="20"
-                                Background="{ThemeResource SystemAccentColor}" />
+                                Background="{ThemeResource SystemAccentColor}"
+                                CornerRadius="4" />
                         </StackPanel>
                     </Button.Content>
                     <Button.Flyout>
diff --git a/Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
similarity index 63%
rename from Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
index d50dcc89..b1e31204 100644
--- a/Wino.Core.UWP/Dialogs/CustomThemeBuilderDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/CustomThemeBuilderDialog.xaml.cs
@@ -1,30 +1,30 @@
-using System;
+using System;
 using CommunityToolkit.WinUI.Helpers;
 using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 
 namespace Wino.Dialogs;
 
 public sealed partial class CustomThemeBuilderDialog : ContentDialog
 {
-    public byte[] WallpaperData { get; private set; }
-    public string AccentColor { get; private set; }
+    public byte[] WallpaperData { get; private set; } = Array.Empty<byte>();
+    public string AccentColor { get; private set; } = string.Empty;
 
-    private IThemeService _themeService;
+    private readonly INewThemeService _themeService;
 
     public CustomThemeBuilderDialog()
     {
         InitializeComponent();
 
-        _themeService = WinoApplication.Current.Services.GetService<IThemeService>();
+        _themeService = WinoApplication.Current.Services.GetRequiredService<INewThemeService>();
     }
 
     private async void ApplyClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
-        if (Array.Empty<byte>() == WallpaperData)
+        if (WallpaperData.Length == 0)
             return;
 
         var deferal = args.GetDeferral();
@@ -35,7 +35,8 @@ public sealed partial class CustomThemeBuilderDialog : ContentDialog
         }
         catch (Exception exception)
         {
-            ErrorTextBlock.Text = exception.Message;
+            ErrorInfoBar.Message = exception.Message;
+            ErrorInfoBar.IsOpen = true;
         }
         finally
         {
@@ -43,13 +44,13 @@ public sealed partial class CustomThemeBuilderDialog : ContentDialog
         }
     }
 
-    private async void BrowseWallpaperClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private async void BrowseWallpaperClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
-        var dialogService = WinoApplication.Current.Services.GetService<IMailDialogService>();
+        var dialogService = WinoApplication.Current.Services.GetRequiredService<IMailDialogService>();
 
         var pickedFileData = await dialogService.PickWindowsFileContentAsync(".jpg", ".png");
 
-        if (pickedFileData == Array.Empty<byte>()) return;
+        if (pickedFileData.Length == 0) return;
 
         IsPrimaryButtonEnabled = true;
 
diff --git a/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml b/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml
new file mode 100644
index 00000000..6dc8f5e3
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml
@@ -0,0 +1,96 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.KeyboardShortcutDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Core.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:local="using:Wino.Dialogs"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{x:Bind domain:Translator.KeyboardShortcuts_Add}"
+    DefaultButton="Primary"
+    PrimaryButtonClick="SaveClicked"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Save}"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <Grid MinWidth="400" MinHeight="300">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.Row="1" Margin="0,0,0,20">
+            <TextBlock
+                Margin="0,0,0,8"
+                Style="{ThemeResource BodyStrongTextBlockStyle}"
+                Text="{x:Bind domain:Translator.KeyboardShortcuts_Mode}" />
+            <StackPanel Orientation="Horizontal" Spacing="16">
+                <RadioButton
+                    Content="{x:Bind domain:Translator.KeyboardShortcuts_ModeMail}"
+                    GroupName="ShortcutMode"
+                    IsChecked="{x:Bind IsMailModeSelected, Mode=TwoWay}" />
+                <RadioButton
+                    Content="{x:Bind domain:Translator.KeyboardShortcuts_ModeCalendar}"
+                    GroupName="ShortcutMode"
+                    IsChecked="{x:Bind IsCalendarModeSelected, Mode=TwoWay}" />
+            </StackPanel>
+        </StackPanel>
+
+        <!--  Action  -->
+        <StackPanel Grid.Row="0" Margin="0,0,0,20">
+            <TextBlock
+                Margin="0,0,0,4"
+                Style="{ThemeResource BodyStrongTextBlockStyle}"
+                Text="{x:Bind domain:Translator.KeyboardShortcuts_Action}" />
+            <ComboBox
+                x:Name="ActionComboBox"
+                HorizontalAlignment="Stretch"
+                ItemsSource="{x:Bind AvailableActions}"
+                SelectedItem="{x:Bind SelectedAction, Mode=TwoWay}">
+                <ComboBox.ItemTemplate>
+
+                    <DataTemplate x:DataType="data:KeyboardShortcutActionViewModel">
+                        <TextBlock Text="{x:Bind DisplayName}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </StackPanel>
+
+        <!--  Key Input  -->
+        <StackPanel Grid.Row="2" Margin="0,0,0,20">
+            <TextBlock
+                Margin="0,0,0,4"
+                Style="{ThemeResource BodyStrongTextBlockStyle}"
+                Text="{x:Bind domain:Translator.KeyboardShortcuts_KeyCombination}" />
+            <TextBox
+                x:Name="KeyInputTextBox"
+                IsReadOnly="True"
+                PlaceholderText="{x:Bind domain:Translator.KeyboardShortcuts_PressKeysHere}"
+                PreviewKeyDown="KeyInputTextBox_PreviewKeyDown" />
+            <TextBlock
+                Margin="0,4,0,0"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Style="{ThemeResource CaptionTextBlockStyle}"
+                Text="{x:Bind domain:Translator.KeyboardShortcuts_FocusArea}" />
+        </StackPanel>
+
+        <!--  Error Message  -->
+        <Border
+            x:Name="ErrorBorder"
+            Grid.Row="4"
+            Padding="12,8"
+            Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+            CornerRadius="4"
+            Visibility="Collapsed">
+            <TextBlock
+                x:Name="ErrorTextBlock"
+                Foreground="{ThemeResource SystemErrorTextColor}"
+                Style="{ThemeResource CaptionTextBlockStyle}" />
+        </Border>
+    </Grid>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml.cs
new file mode 100644
index 00000000..540f3186
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/KeyboardShortcutDialog.xaml.cs
@@ -0,0 +1,207 @@
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Models;
+using Wino.Core.ViewModels.Data;
+
+namespace Wino.Dialogs;
+
+public sealed partial class KeyboardShortcutDialog : ContentDialog
+{
+    public KeyboardShortcutDialogResult Result { get; private set; } = KeyboardShortcutDialogResult.Canceled();
+
+    public List<KeyboardShortcutActionViewModel> AvailableActions { get; private set; } = [];
+
+    public KeyboardShortcutActionViewModel SelectedAction { get; set; } = null!;
+    public WinoApplicationMode SelectedMode { get; set; } = WinoApplicationMode.Mail;
+    public bool IsMailModeSelected
+    {
+        get => SelectedMode == WinoApplicationMode.Mail;
+        set
+        {
+            if (!value || SelectedMode == WinoApplicationMode.Mail) return;
+            SelectedMode = WinoApplicationMode.Mail;
+            RefreshAvailableActions();
+        }
+    }
+
+    public bool IsCalendarModeSelected
+    {
+        get => SelectedMode == WinoApplicationMode.Calendar;
+        set
+        {
+            if (!value || SelectedMode == WinoApplicationMode.Calendar) return;
+            SelectedMode = WinoApplicationMode.Calendar;
+            RefreshAvailableActions();
+        }
+    }
+
+    private ModifierKeys _modifierKeys;
+    private string _key = string.Empty;
+
+    public KeyboardShortcutDialog()
+    {
+        InitializeComponent();
+        RefreshAvailableActions();
+    }
+
+    public KeyboardShortcutDialog(KeyboardShortcut existingShortcut) : this()
+    {
+        if (existingShortcut != null)
+        {
+            SelectedMode = existingShortcut.Mode;
+            _modifierKeys = existingShortcut.ModifierKeys;
+            _key = existingShortcut.Key;
+            RefreshAvailableActions(existingShortcut.Action);
+            KeyInputTextBox.Text = BuildDisplayString(_key, _modifierKeys);
+            Title = Translator.KeyboardShortcuts_EditTitle;
+        }
+    }
+
+    private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        // Clear any previous error
+        ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+
+        // Validate input
+        if (string.IsNullOrWhiteSpace(_key))
+        {
+            ShowError(Translator.KeyboardShortcuts_EnterKey);
+            args.Cancel = true;
+            return;
+        }
+
+        if (SelectedAction == null || SelectedAction.Action == KeyboardShortcutAction.None)
+        {
+            ShowError(Translator.KeyboardShortcuts_SelectOperation);
+            args.Cancel = true;
+            return;
+        }
+
+        Result = KeyboardShortcutDialogResult.Success(SelectedMode, _key, _modifierKeys, SelectedAction.Action);
+    }
+
+    private void KeyInputTextBox_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
+
+        _modifierKeys = GetCurrentModifierKeys();
+        var key = NormalizeKey(e.Key);
+
+        if (!string.IsNullOrEmpty(key))
+        {
+            _key = key;
+        }
+
+        KeyInputTextBox.Text = string.IsNullOrEmpty(_key)
+            ? BuildDisplayString(string.Empty, _modifierKeys)
+            : BuildDisplayString(_key, _modifierKeys);
+
+        e.Handled = true;
+    }
+
+    private void RefreshAvailableActions(KeyboardShortcutAction selectedAction = KeyboardShortcutAction.None)
+    {
+        AvailableActions = GetAvailableActions(SelectedMode);
+        SelectedAction = AvailableActions.FirstOrDefault(x => x.Action == selectedAction) ?? AvailableActions.FirstOrDefault()!;
+        Bindings.Update();
+    }
+
+    private void ShowError(string message)
+    {
+        ErrorTextBlock.Text = message;
+        ErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
+    }
+
+    private static List<KeyboardShortcutActionViewModel> GetAvailableActions(WinoApplicationMode mode)
+    {
+        KeyboardShortcutAction[] actions = mode switch
+        {
+            WinoApplicationMode.Mail =>
+            [
+                KeyboardShortcutAction.NewMail,
+                KeyboardShortcutAction.ToggleReadUnread,
+                KeyboardShortcutAction.ToggleFlag,
+                KeyboardShortcutAction.ToggleArchive,
+                KeyboardShortcutAction.Delete,
+                KeyboardShortcutAction.Move,
+                KeyboardShortcutAction.Reply,
+                KeyboardShortcutAction.ReplyAll,
+                KeyboardShortcutAction.Send
+            ],
+            WinoApplicationMode.Calendar =>
+            [
+                KeyboardShortcutAction.NewEvent,
+                KeyboardShortcutAction.Delete
+            ],
+            _ => []
+        };
+
+        return actions
+            .Select(action => new KeyboardShortcutActionViewModel(mode, action))
+            .ToList();
+    }
+
+    private static ModifierKeys GetCurrentModifierKeys()
+    {
+        var modifiers = ModifierKeys.None;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Control).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Control;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Menu).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Alt;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Shift).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Shift;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.LeftWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down) ||
+            Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.RightWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+        {
+            modifiers |= ModifierKeys.Windows;
+        }
+
+        return modifiers;
+    }
+
+    private static string NormalizeKey(Windows.System.VirtualKey key)
+    {
+        return key switch
+        {
+            Windows.System.VirtualKey.Control or
+            Windows.System.VirtualKey.LeftControl or
+            Windows.System.VirtualKey.RightControl or
+            Windows.System.VirtualKey.Menu or
+            Windows.System.VirtualKey.LeftMenu or
+            Windows.System.VirtualKey.RightMenu or
+            Windows.System.VirtualKey.Shift or
+            Windows.System.VirtualKey.LeftShift or
+            Windows.System.VirtualKey.RightShift or
+            Windows.System.VirtualKey.LeftWindows or
+            Windows.System.VirtualKey.RightWindows => string.Empty,
+            _ => key.ToString()
+        };
+    }
+
+    private static string BuildDisplayString(string key, ModifierKeys modifierKeys)
+    {
+        var parts = new List<string>();
+
+        if (modifierKeys.HasFlag(ModifierKeys.Control))
+            parts.Add("Ctrl");
+        if (modifierKeys.HasFlag(ModifierKeys.Alt))
+            parts.Add("Alt");
+        if (modifierKeys.HasFlag(ModifierKeys.Shift))
+            parts.Add("Shift");
+        if (modifierKeys.HasFlag(ModifierKeys.Windows))
+            parts.Add("Win");
+        if (!string.IsNullOrEmpty(key))
+            parts.Add(key);
+
+        return string.Join("+", parts);
+    }
+}
diff --git a/Wino.Mail/Dialogs/MessageSourceDialog.xaml b/Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml
similarity index 65%
rename from Wino.Mail/Dialogs/MessageSourceDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml
index 4a747d75..b956804e 100644
--- a/Wino.Mail/Dialogs/MessageSourceDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml
@@ -1,4 +1,4 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Mail.Dialogs.MessageSourceDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -19,10 +19,19 @@
     </ContentDialog.Resources>
 
     <ScrollViewer HorizontalScrollBarVisibility="Disabled" HorizontalScrollMode="Disabled">
-        <TextBlock
-            MaxWidth="1000"
-            IsTextSelectionEnabled="True"
-            Text="{x:Bind MessageSource, Mode=OneWay}"
-            TextWrapping="Wrap" />
+        <Border
+            Padding="16"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="6">
+            <TextBlock
+                MaxWidth="1000"
+                FontFamily="Consolas"
+                FontSize="12"
+                IsTextSelectionEnabled="True"
+                Text="{x:Bind MessageSource}"
+                TextWrapping="Wrap" />
+        </Border>
     </ScrollViewer>
 </ContentDialog>
diff --git a/Wino.Mail/Dialogs/MessageSourceDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml.cs
similarity index 53%
rename from Wino.Mail/Dialogs/MessageSourceDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml.cs
index 693922f1..6577208d 100644
--- a/Wino.Mail/Dialogs/MessageSourceDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/MessageSourceDialog.xaml.cs
@@ -1,14 +1,15 @@
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
 
 
 namespace Wino.Mail.Dialogs;
 
 public sealed partial class MessageSourceDialog : ContentDialog
 {
-    private readonly IClipboardService _clipboardService = App.Current.Services.GetService<IClipboardService>();
-    public string MessageSource { get; set; }
+    private readonly IClipboardService? _clipboardService = App.Current.Services.GetService<IClipboardService>();
+    public string MessageSource { get; set; } = string.Empty;
     public bool Copied { get; set; }
     public MessageSourceDialog()
     {
@@ -17,7 +18,7 @@ public sealed partial class MessageSourceDialog : ContentDialog
 
     private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
-        _clipboardService.CopyClipboardAsync(MessageSource);
+        _clipboardService!.CopyClipboardAsync(MessageSource);
         Copied = true;
     }
 }
diff --git a/Wino.Mail/Dialogs/MoveMailDialog.xaml b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
similarity index 69%
rename from Wino.Mail/Dialogs/MoveMailDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
index 570d7ff8..b4fa3bfc 100644
--- a/Wino.Mail/Dialogs/MoveMailDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml
@@ -1,9 +1,9 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.MoveMailDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:folders="using:Wino.Core.Domain.Models.Folders"
@@ -24,15 +24,18 @@
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
 
         <DataTemplate x:Key="FolderStructureMenuFlyoutItemTemplate" x:DataType="folders:IMailItemFolder">
-            <muxc:TreeViewItem IsExpanded="True" ItemsSource="{x:Bind ChildFolders}">
+            <TreeViewItem IsExpanded="True" ItemsSource="{x:Bind ChildFolders}">
                 <StackPanel
-                    Height="32"
+                    Height="36"
                     Orientation="Horizontal"
-                    Spacing="12">
+                    Spacing="14">
                     <coreControls:WinoFontIcon FontSize="20" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(SpecialFolderType)}" />
-                    <TextBlock VerticalAlignment="Center" Text="{x:Bind FolderName}" />
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Style="{ThemeResource BodyTextBlockStyle}"
+                        Text="{x:Bind FolderName}" />
                 </StackPanel>
-            </muxc:TreeViewItem>
+            </TreeViewItem>
         </DataTemplate>
     </ContentDialog.Resources>
 
@@ -42,19 +45,23 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <TextBlock
-            x:Name="InvalidFolderText"
+        <Border
+            x:Name="InvalidFolderBorder"
             Margin="0,0,0,6"
-            Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
-            Visibility="Collapsed" />
+            Padding="12,8"
+            Background="{ThemeResource SystemFillColorCautionBackgroundBrush}"
+            CornerRadius="4"
+            Visibility="Collapsed">
+            <TextBlock x:Name="InvalidFolderText" Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}" />
+        </Border>
 
-        <muxc:TreeView
+        <TreeView
             x:Name="FolderTreeView"
             Grid.Row="1"
             CanDragItems="False"
             CanReorderItems="False"
             ItemTemplate="{StaticResource FolderStructureMenuFlyoutItemTemplate}"
-            ItemsSource="{x:Bind FolderList, Mode=OneWay}"
+            ItemsSource="{x:Bind FolderList}"
             SelectedItem="{x:Bind SelectedFolder, Mode=TwoWay}"
             SelectionMode="Single" />
     </Grid>
diff --git a/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
similarity index 88%
rename from Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
index 99ee6906..736f95ae 100644
--- a/Wino.Mail/Dialogs/MoveMailDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/MoveMailDialog.xaml.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Models.Folders;
 
@@ -17,7 +17,7 @@ public sealed partial class MoveMailDialog : ContentDialog
     public static readonly DependencyProperty SelectedFolderProperty = DependencyProperty.Register(nameof(SelectedFolder), typeof(IMailItemFolder), typeof(MoveMailDialog), new PropertyMetadata(null, OnSelectedFolderChanged));
 
 
-    public List<IMailItemFolder> FolderList { get; set; }
+    public List<IMailItemFolder> FolderList { get; set; } = [];
 
     public MoveMailDialog(List<IMailItemFolder> allFolders)
     {
@@ -45,7 +45,7 @@ public sealed partial class MoveMailDialog : ContentDialog
             if (!SelectedFolder.IsMoveTarget)
             {
                 // Warn users for only proper mail folders. Not ghost folders.
-                InvalidFolderText.Visibility = Visibility.Visible;
+                InvalidFolderBorder.Visibility = Visibility.Visible;
                 InvalidFolderText.Text = string.Format(Translator.MoveMailDialog_InvalidFolderMessage, SelectedFolder.FolderName);
 
                 if (FolderTreeView.SelectedItem != null)
@@ -58,7 +58,7 @@ public sealed partial class MoveMailDialog : ContentDialog
                         container.IsExpanded = !container.IsExpanded;
                     }
                 }
-                SelectedFolder = null;
+                SelectedFolder = null!;
             }
             else
             {
diff --git a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml b/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml
similarity index 78%
rename from Wino.Core.UWP/Dialogs/NewAccountDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml
index 1c69c70f..9eb668bb 100644
--- a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml
@@ -1,5 +1,5 @@
-<ContentDialog
-    x:Class="Wino.Core.UWP.Dialogs.NewAccountDialog"
+<ContentDialog
+    x:Class="Wino.Mail.WinUI.Dialogs.NewAccountDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
@@ -22,22 +22,31 @@
 
     <ContentDialog.Resources>
         <DataTemplate x:Key="NewMailProviderTemplate" x:DataType="accounts:ProviderDetail">
-            <Grid Margin="0,8" Padding="6">
+            <Grid
+                Margin="0,4"
+                Padding="12,10"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <Image
-                    Width="35"
-                    Height="35"
+                    Width="32"
+                    Height="32"
                     Source="{x:Bind ProviderImage}" />
                 <StackPanel
                     Grid.Column="1"
                     Margin="12,0"
                     VerticalAlignment="Center"
                     Spacing="2">
-                    <TextBlock FontWeight="Bold" Text="{x:Bind Name}" />
-                    <TextBlock Text="{x:Bind Description}" />
+                    <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="{x:Bind Name}" />
+                    <TextBlock
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{ThemeResource CaptionTextBlockStyle}"
+                        Text="{x:Bind Description}" />
                 </StackPanel>
             </Grid>
         </DataTemplate>
@@ -95,16 +104,26 @@
                 ItemTemplate="{StaticResource NewMailProviderTemplate}"
                 ItemsSource="{x:Bind Providers}"
                 SelectedItem="{x:Bind SelectedMailProvider, Mode=TwoWay}"
-                SelectionMode="Single" />
+                SelectionMode="Single">
+                <ListView.ItemContainerStyle>
+                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                        <Setter Property="Margin" Value="0,2" />
+                        <Setter Property="Padding" Value="0" />
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                        <Setter Property="CornerRadius" Value="6" />
+                    </Style>
+                </ListView.ItemContainerStyle>
+            </ListView>
         </Grid>
 
         <!--  Known special IMAP login details.  -->
-        <Grid RowSpacing="12" Visibility="{x:Bind IsSpecialImapServerPartVisible, Mode=OneWay}">
+        <Grid RowSpacing="16" Visibility="{x:Bind IsSpecialImapServerPartVisible, Mode=OneWay}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
@@ -142,8 +161,14 @@
                 Header="App-Specific Password"
                 PasswordChanged="ImapPasswordChanged" />
 
-            <HyperlinkButton
+            <ComboBox
                 Grid.Row="4"
+                Header="{x:Bind domain:Translator.ImapCalDavSettingsPage_CalendarModeHeader}"
+                ItemsSource="{x:Bind CalendarModeOptions, Mode=OneWay}"
+                SelectedIndex="{x:Bind SelectedCalendarModeIndex, Mode=TwoWay}" />
+
+            <HyperlinkButton
+                Grid.Row="5"
                 HorizontalAlignment="Right"
                 Click="AppSpecificHelpButtonClicked"
                 Content="How do I get app-specific password?" />
diff --git a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml.cs
similarity index 72%
rename from Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml.cs
index a2fafc04..7622945b 100644
--- a/Wino.Core.UWP/Dialogs/NewAccountDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/NewAccountDialog.xaml.cs
@@ -1,20 +1,21 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Windows.System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.ViewModels.Data;
 using Wino.Helpers;
 
-namespace Wino.Core.UWP.Dialogs;
+namespace Wino.Mail.WinUI.Dialogs;
 
 public sealed partial class NewAccountDialog : ContentDialog
 {
-    private Dictionary<SpecialImapProvider, string> helpingLinks = new Dictionary<SpecialImapProvider, string>()
+    private readonly Dictionary<SpecialImapProvider, string> helpingLinks = new Dictionary<SpecialImapProvider, string>()
     {
         { SpecialImapProvider.iCloud, "https://support.apple.com/en-us/102654" },
         { SpecialImapProvider.Yahoo, "http://help.yahoo.com/kb/SLN15241.html" },
@@ -24,20 +25,27 @@ public sealed partial class NewAccountDialog : ContentDialog
     public static readonly DependencyProperty IsSpecialImapServerPartVisibleProperty = DependencyProperty.Register(nameof(IsSpecialImapServerPartVisible), typeof(bool), typeof(NewAccountDialog), new PropertyMetadata(false));
     public static readonly DependencyProperty SelectedMailProviderProperty = DependencyProperty.Register(nameof(SelectedMailProvider), typeof(ProviderDetail), typeof(NewAccountDialog), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedProviderChanged)));
     public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(nameof(SelectedColor), typeof(AppColorViewModel), typeof(NewAccountDialog), new PropertyMetadata(null, new PropertyChangedCallback(OnSelectedColorChanged)));
+    public static readonly DependencyProperty SelectedCalendarModeIndexProperty = DependencyProperty.Register(nameof(SelectedCalendarModeIndex), typeof(int), typeof(NewAccountDialog), new PropertyMetadata(0));
 
 
-    public AppColorViewModel SelectedColor
+    public AppColorViewModel? SelectedColor
     {
-        get { return (AppColorViewModel)GetValue(SelectedColorProperty); }
+        get { return (AppColorViewModel?)GetValue(SelectedColorProperty); }
         set { SetValue(SelectedColorProperty, value); }
     }
 
+    public int SelectedCalendarModeIndex
+    {
+        get { return (int)GetValue(SelectedCalendarModeIndexProperty); }
+        set { SetValue(SelectedCalendarModeIndexProperty, value); }
+    }
+
     /// <summary>
     /// Gets or sets current selected mail provider in the dialog.
     /// </summary>
-    public ProviderDetail SelectedMailProvider
+    public ProviderDetail? SelectedMailProvider
     {
-        get { return (ProviderDetail)GetValue(SelectedMailProviderProperty); }
+        get { return (ProviderDetail?)GetValue(SelectedMailProviderProperty); }
         set { SetValue(SelectedMailProviderProperty, value); }
     }
 
@@ -56,18 +64,24 @@ public sealed partial class NewAccountDialog : ContentDialog
 
     // List of available mail providers for now.
 
-    public List<IProviderDetail> Providers { get; set; }
+    public List<IProviderDetail> Providers { get; set; } = [];
 
-    public List<AppColorViewModel> AvailableColors { get; set; }
+    public List<AppColorViewModel> AvailableColors { get; set; } = [];
+    public List<string> CalendarModeOptions { get; } =
+    [
+        Translator.ImapCalDavSettingsPage_CalendarModeCalDav,
+        Translator.ImapCalDavSettingsPage_CalendarModeLocalOnly,
+        Translator.ImapCalDavSettingsPage_CalendarModeDisabled
+    ];
 
 
-    public AccountCreationDialogResult Result = null;
+    public AccountCreationDialogResult? Result = null;
 
     public NewAccountDialog()
     {
         InitializeComponent();
 
-        var themeService = WinoApplication.Current.ThemeService.GetAvailableAccountColors();
+        var themeService = WinoApplication.Current.NewThemeService.GetAvailableAccountColors();
         AvailableColors = themeService.Select(a => new AppColorViewModel(a)).ToList();
 
         UpdateSelectedColor();
@@ -99,11 +113,25 @@ public sealed partial class NewAccountDialog : ContentDialog
 
     private void CreateClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
+        if (SelectedMailProvider == null)
+            return;
+
         if (IsSpecialImapServerPartVisible)
         {
             // Special imap detail input.
+            var calendarSupportMode = SelectedCalendarModeIndex switch
+            {
+                1 => ImapCalendarSupportMode.LocalOnly,
+                2 => ImapCalendarSupportMode.Disabled,
+                _ => ImapCalendarSupportMode.CalDav
+            };
 
-            var details = new SpecialImapProviderDetails(SpecialImapAddress.Text.Trim(), AppSpecificPassword.Password.Trim(), DisplayNameTextBox.Text.Trim(), SelectedMailProvider.SpecialImapProvider);
+            var details = new SpecialImapProviderDetails(
+                SpecialImapAddress.Text.Trim(),
+                AppSpecificPassword.Password.Trim(),
+                DisplayNameTextBox.Text.Trim(),
+                SelectedMailProvider.SpecialImapProvider,
+                calendarSupportMode);
             Result = new AccountCreationDialogResult(SelectedMailProvider.Type, AccountNameTextbox.Text.Trim(), details, SelectedColor?.Hex ?? string.Empty);
             Hide();
 
@@ -173,7 +201,11 @@ public sealed partial class NewAccountDialog : ContentDialog
 
     private async void AppSpecificHelpButtonClicked(object sender, RoutedEventArgs e)
     {
-        var helpUrl = helpingLinks[SelectedMailProvider.SpecialImapProvider];
+        if (SelectedMailProvider == null ||
+            !helpingLinks.TryGetValue(SelectedMailProvider.SpecialImapProvider, out var helpUrl))
+        {
+            return;
+        }
 
         await Launcher.LaunchUriAsync(new Uri(helpUrl));
     }
diff --git a/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml b/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml
new file mode 100644
index 00000000..750782ae
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml
@@ -0,0 +1,66 @@
+<ContentDialog
+    x:Class="Wino.Mail.WinUI.Dialogs.PrintDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:printing="using:Wino.Core.Domain.Models.Printing"
+    Title="Print Settings"
+    MinWidth="400"
+    MinHeight="300"
+    DefaultButton="Primary"
+    Loaded="PrintDialog_Loaded"
+    PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
+    PrimaryButtonText="Print"
+    SecondaryButtonClick="ContentDialog_SecondaryButtonClick"
+    SecondaryButtonText="Cancel"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <StackPanel Spacing="20">
+
+        <!--  Printer Selection  -->
+        <ComboBox
+            x:Name="PrinterComboBox"
+            HorizontalAlignment="Stretch"
+            Header="Printer"
+            SelectedItem="{x:Bind PrintSettings.PrinterName, Mode=TwoWay}"
+            SelectionChanged="PrinterComboBox_SelectionChanged" />
+
+        <!--  Copies  -->
+        <NumberBox
+            Header="Copies"
+            Maximum="999"
+            Minimum="1"
+            SpinButtonPlacementMode="Inline"
+            Value="{x:Bind PrintSettings.Copies, Mode=TwoWay}" />
+
+        <!--  Orientation  -->
+        <RadioButtons
+            x:Name="OrientationRadioButtons"
+            Header="Orientation"
+            SelectionChanged="OrientationRadio_SelectionChanged">
+            <RadioButton Content="Portrait" />
+            <RadioButton Content="Landscape" />
+        </RadioButtons>
+
+        <!--  Print Options  -->
+        <StackPanel Spacing="8">
+            <TextBlock
+                Margin="0,0,0,8"
+                Style="{ThemeResource BodyStrongTextBlockStyle}"
+                Text="Options" />
+            <Border
+                Padding="16,12"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
+                <StackPanel Spacing="8">
+                    <CheckBox Content="Print backgrounds" IsChecked="{x:Bind PrintSettings.ShouldPrintBackgrounds, Mode=TwoWay}" />
+                    <CheckBox Content="Print headers and footers" IsChecked="{x:Bind PrintSettings.ShouldPrintHeaderAndFooter, Mode=TwoWay}" />
+                </StackPanel>
+            </Border>
+        </StackPanel>
+    </StackPanel>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml.cs
new file mode 100644
index 00000000..75b7768b
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/PrintDialog.xaml.cs
@@ -0,0 +1,178 @@
+using System.Collections.Generic;
+using System.Drawing.Printing;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+using Serilog;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Printing;
+
+namespace Wino.Mail.WinUI.Dialogs;
+
+/// <summary>
+/// Custom print dialog for configuring WebView2 print settings.
+/// </summary>
+public sealed partial class PrintDialog : ContentDialog
+{
+    public WebView2PrintSettingsModel PrintSettings { get; set; } = new WebView2PrintSettingsModel();
+
+    public PrintDialog()
+    {
+        this.InitializeComponent();
+    }
+
+    /// <summary>
+    /// Initializes the dialog with existing print settings.
+    /// </summary>
+    /// <param name="printSettings">The initial print settings to load.</param>
+    public PrintDialog(WebView2PrintSettingsModel printSettings = default!)
+    {
+        if (printSettings != null) PrintSettings = printSettings;
+
+        this.InitializeComponent();
+    }
+
+    private void PrintDialog_Loaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) => LoadSettingsToUI(PrintSettings);
+
+    private void OrientationRadio_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is RadioButtons radioButtons)
+        {
+            PrintSettings.Orientation = (PrintOrientation)radioButtons.SelectedIndex;
+        }
+    }
+
+    private void PrinterComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is ComboBox comboBox && comboBox.SelectedItem != null)
+        {
+            PrintSettings.PrinterName = comboBox.SelectedItem.ToString();
+        }
+    }
+
+    /// <summary>
+    /// Sets the list of available printers for the dialog.
+    /// </summary>
+    /// <param name="printers">List of available printer names.</param>
+    public void SetAvailablePrinters(IEnumerable<string> printers)
+    {
+        var printerList = printers?.ToList() ?? new List<string>();
+
+        if (this.FindName("PrinterComboBox") is ComboBox printerComboBox)
+        {
+            printerComboBox.ItemsSource = printerList;
+
+            if (printerList.Any())
+            {
+                // Set to first printer or to the one in settings
+                var targetPrinter = !string.IsNullOrEmpty(PrintSettings.PrinterName)
+                    ? PrintSettings.PrinterName
+                    : printerList.First();
+
+                var index = printerList.IndexOf(targetPrinter);
+                printerComboBox.SelectedIndex = index >= 0 ? index : 0;
+
+                // Update the settings model with the selected printer
+                PrintSettings.PrinterName = printerComboBox.SelectedItem?.ToString() ?? string.Empty;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Loads available printers asynchronously and sets them in the dialog.
+    /// </summary>
+    public async Task LoadAvailablePrintersAsync()
+    {
+        try
+        {
+            var printers = await Task.Run(() =>
+            {
+                var printerList = new List<string>();
+
+                // Get all installed printers using System.Drawing.Printing
+                foreach (string printerName in PrinterSettings.InstalledPrinters)
+                {
+                    printerList.Add(printerName);
+                }
+
+                return printerList.AsEnumerable();
+            });
+
+            SetAvailablePrinters(printers);
+        }
+        catch (System.Exception ex)
+        {
+            // Log the exception if logging is available
+            Log.Error(ex, "Error getting available printers");
+
+            // Set empty list if printer discovery fails
+            SetAvailablePrinters(Enumerable.Empty<string>());
+        }
+    }
+
+    private void LoadSettingsToUI(WebView2PrintSettingsModel settings)
+    {
+        if (settings == null) return;
+
+        // Only handle orientation manually since other properties are bound via x:Bind
+        if (this.FindName("OrientationRadioButtons") is RadioButtons orientationRadio)
+        {
+            orientationRadio.SelectedIndex = (int)settings.Orientation;
+        }
+    }
+
+    private void UpdateSettingsFromUI()
+    {
+        // Most properties are bound via x:Bind, only handle orientation manually
+        if (this.FindName("OrientationRadioButtons") is RadioButtons orientationRadio)
+        {
+            PrintSettings.Orientation = (PrintOrientation)orientationRadio.SelectedIndex;
+        }
+
+        // Also update printer name from ComboBox since it uses ItemsSource binding
+        if (this.FindName("PrinterComboBox") is ComboBox printerComboBox &&
+            printerComboBox.SelectedItem != null)
+        {
+            PrintSettings.PrinterName = printerComboBox.SelectedItem.ToString();
+        }
+    }
+
+    /// <summary>
+    /// Validates the current print settings before closing the dialog.
+    /// </summary>
+    /// <returns>True if settings are valid, false otherwise.</returns>
+    private bool ValidateSettings()
+    {
+        // Check if a printer is selected
+        if (this.FindName("PrinterComboBox") is ComboBox printerComboBox &&
+            printerComboBox.SelectedItem == null)
+        {
+            return false;
+        }
+
+        // Copies validation is handled by the bound property with validation in the model
+        if (PrintSettings.Copies <= 0)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        // Update settings from UI before validation
+        UpdateSettingsFromUI();
+
+        // Validate settings before closing
+        if (!ValidateSettings())
+        {
+            args.Cancel = true;
+        }
+    }
+
+    private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        // Cancel was clicked, no validation needed
+    }
+}
diff --git a/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
new file mode 100644
index 00000000..4feadd96
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml
@@ -0,0 +1,62 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.SignatureEditorDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
+    xmlns:controls2="using:Wino.Mail.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    Title="{x:Bind domain:Translator.SignatureEditorDialog_Title}"
+    HorizontalContentAlignment="Stretch"
+    Closed="DialogClosed"
+    DefaultButton="Primary"
+    IsPrimaryButtonEnabled="False"
+    Opened="SignatureDialogOpened"
+    PrimaryButtonClick="SaveClicked"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Save}"
+    SecondaryButtonClick="CancelClicked"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMaxWidth">1200</x:Double>
+    </ContentDialog.Resources>
+
+    <Grid Margin="0,8,0,0" RowSpacing="24">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" MaxHeight="400" />
+        </Grid.RowDefinitions>
+
+        <TextBox
+            x:Name="SignatureNameTextBox"
+            MinWidth="300"
+            MaxWidth="500"
+            HorizontalAlignment="Left"
+            PlaceholderText="{x:Bind domain:Translator.SignatureEditorDialog_SignatureName_Placeholder}"
+            TextChanged="SignatureNameTextBoxTextChanged" />
+
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="300" />
+            </Grid.RowDefinitions>
+            <controls2:EditorTabbedCommandBarControl CommandTarget="{x:Bind WebViewEditor}" />
+            <Border
+                Grid.Row="1"
+                Margin="0,8,0,0"
+                BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="6">
+                <controls2:WebViewEditorControl x:Name="WebViewEditor" />
+            </Border>
+        </Grid>
+    </Grid>
+</ContentDialog>
+
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
similarity index 92%
rename from Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
index 29400f48..57870e68 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/SignatureEditorDialog.xaml.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 
@@ -8,7 +8,7 @@ namespace Wino.Dialogs;
 
 public sealed partial class SignatureEditorDialog : ContentDialog
 {
-    public AccountSignature Result;
+    public AccountSignature Result = null!;
 
     public SignatureEditorDialog()
     {
@@ -51,7 +51,7 @@ public sealed partial class SignatureEditorDialog : ContentDialog
 
     private async void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
-        var newSignature = Regex.Unescape(await WebViewEditor.GetHtmlBodyAsync());
+        var newSignature = Regex.Unescape((await WebViewEditor.GetHtmlBodyAsync())!);
 
         if (Result == null)
         {
diff --git a/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml b/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml
new file mode 100644
index 00000000..dfb8a745
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml
@@ -0,0 +1,86 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.SingleCalendarPickerDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:calendar="using:Wino.Core.Domain.Models.Calendar"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sharedCalendar="using:Wino.Core.Domain.Entities.Calendar"
+    Title="{x:Bind domain:Translator.CalendarEventCompose_PickCalendarTitle}"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">420</x:Double>
+        <Style
+            x:Key="CalendarPickerListItemStyle"
+            BasedOn="{StaticResource DefaultListViewItemStyle}"
+            TargetType="ListViewItem">
+            <Setter Property="Padding" Value="12,10" />
+            <Setter Property="CornerRadius" Value="4" />
+            <Setter Property="Margin" Value="0,2" />
+        </Style>
+    </ContentDialog.Resources>
+
+    <StackPanel Margin="0,8,0,0" Spacing="12">
+        <TextBlock
+            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+            Text="{x:Bind domain:Translator.CalendarEventCompose_DefaultCalendarHint}"
+            TextWrapping="WrapWholeWords" />
+
+        <HyperlinkButton
+            HorizontalAlignment="Left"
+            Click="OpenCalendarSettingsClicked"
+            Content="{x:Bind domain:Translator.CalendarEventCompose_DefaultCalendarSettingsLink}"
+            Padding="0" />
+
+        <ScrollViewer MaxHeight="400">
+            <ItemsControl ItemsSource="{x:Bind AvailableGroups}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate x:DataType="calendar:CalendarPickerAccountGroup">
+                        <StackPanel Margin="0,0,0,12" Spacing="6">
+                            <TextBlock FontWeight="SemiBold">
+                                <Run Text="{x:Bind Account.Name}" />
+                                <Run Text=" (" />
+                                <Run Text="{x:Bind Account.Address}" />
+                                <Run Text=")" />
+                            </TextBlock>
+
+                            <ListView
+                                IsItemClickEnabled="True"
+                                ItemClick="CalendarClicked"
+                                ItemContainerStyle="{StaticResource CalendarPickerListItemStyle}"
+                                ItemsSource="{x:Bind Calendars}"
+                                SelectionMode="None">
+                                <ListView.ItemTemplate>
+                                    <DataTemplate x:DataType="sharedCalendar:AccountCalendar">
+                                        <Grid ColumnSpacing="10">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <Ellipse
+                                                Width="14"
+                                                Height="14"
+                                                VerticalAlignment="Center"
+                                                Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex)}" />
+
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Text="{x:Bind Name}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+    </StackPanel>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml.cs
new file mode 100644
index 00000000..97eb120c
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Dialogs;
+
+public sealed partial class SingleCalendarPickerDialog : ContentDialog
+{
+    public AccountCalendar? PickedCalendar { get; private set; }
+    public bool ShouldNavigateToCalendarSettings { get; private set; }
+
+    public List<CalendarPickerAccountGroup> AvailableGroups { get; } = [];
+
+    public SingleCalendarPickerDialog(List<CalendarPickerAccountGroup> availableGroups)
+    {
+        AvailableGroups = availableGroups;
+
+        InitializeComponent();
+    }
+
+    private void CalendarClicked(object sender, ItemClickEventArgs e)
+    {
+        PickedCalendar = e.ClickedItem as AccountCalendar;
+        Hide();
+    }
+
+    private void OpenCalendarSettingsClicked(object sender, RoutedEventArgs e)
+    {
+        ShouldNavigateToCalendarSettings = true;
+        Hide();
+    }
+}
diff --git a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
similarity index 88%
rename from Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
index 51f82af3..8160a698 100644
--- a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml
@@ -1,10 +1,10 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.SystemFolderConfigurationDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -21,11 +21,11 @@
 
     <ContentDialog.Resources>
         <Style TargetType="ComboBox">
-            <Setter Property="Width" Value="100" />
+            <Setter Property="Width" Value="140" />
         </Style>
     </ContentDialog.Resources>
     <ScrollViewer>
-        <Grid RowSpacing="12">
+        <Grid RowSpacing="16">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
@@ -41,7 +41,7 @@
                     Text="{x:Bind domain:Translator.SystemFolderConfigDialog_MessageSecondLine}" />
             </TextBlock>
 
-            <StackPanel Grid.Row="1" Spacing="6">
+            <StackPanel Grid.Row="1" Spacing="8">
                 <controls1:SettingsCard
                     x:Name="SentCard"
                     Description="{x:Bind domain:Translator.SystemFolderConfigDialog_SentFolderDescription}"
@@ -92,9 +92,15 @@
                     <ComboBox ItemsSource="{x:Bind AvailableFolders}" SelectedItem="{x:Bind Junk, Mode=TwoWay}" />
                 </controls1:SettingsCard>
 
-                <TextBlock x:Name="ValidationErrorTextBlock" Foreground="{StaticResource SystemErrorTextColor}" />
+                <Border
+                    x:Name="ValidationErrorBorder"
+                    Padding="12,8"
+                    Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
+                    CornerRadius="4"
+                    Visibility="Collapsed">
+                    <TextBlock x:Name="ValidationErrorTextBlock" Foreground="{StaticResource SystemErrorTextColor}" />
+                </Border>
             </StackPanel>
         </Grid>
     </ScrollViewer>
 </ContentDialog>
-
diff --git a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
similarity index 58%
rename from Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
index c478cc35..78a7653d 100644
--- a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/SystemFolderConfigurationDialog.xaml.cs
@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Models.Folders;
 
 namespace Wino.Dialogs;
@@ -14,14 +13,14 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
 {
     private bool canDismissDialog = false;
 
-    public SystemFolderConfiguration Configuration { get; set; }
+    public SystemFolderConfiguration? Configuration { get; set; }
     public List<MailItemFolder> AvailableFolders { get; }
 
-    public MailItemFolder Sent { get; set; }
-    public MailItemFolder Draft { get; set; }
-    public MailItemFolder Archive { get; set; }
-    public MailItemFolder Junk { get; set; }
-    public MailItemFolder Trash { get; set; }
+    public MailItemFolder? Sent { get; set; }
+    public MailItemFolder? Draft { get; set; }
+    public MailItemFolder? Archive { get; set; }
+    public MailItemFolder? Junk { get; set; }
+    public MailItemFolder? Trash { get; set; }
 
     public SystemFolderConfigurationDialog(List<MailItemFolder> availableFolders)
     {
@@ -29,11 +28,11 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
 
         AvailableFolders = availableFolders;
 
-        Sent = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Sent);
-        Draft = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Draft);
-        Archive = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Archive);
-        Junk = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Junk);
-        Trash = AvailableFolders.Find(a => a.SpecialFolderType == Core.Domain.Enums.SpecialFolderType.Deleted);
+        Sent = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Sent);
+        Draft = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Draft);
+        Archive = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Archive);
+        Junk = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Junk);
+        Trash = AvailableFolders.Find(a => a.SpecialFolderType == SpecialFolderType.Deleted);
     }
 
     private void DialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
@@ -46,21 +45,25 @@ public sealed partial class SystemFolderConfigurationDialog : ContentDialog
 
     private void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
-        ValidationErrorTextBlock.Text = string.Empty;
+        ValidationErrorTextBlock!.Text = string.Empty;
+        ValidationErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Collapsed;
 
-        var allSpecialFolders = new List<MailItemFolder>()
+        var allSpecialFolders = new List<MailItemFolder?>()
         {
             Sent, Draft, Archive, Trash, Junk
         };
 
         if (allSpecialFolders.Any(a => a != null && a.SpecialFolderType == SpecialFolderType.Inbox))
-            ValidationErrorTextBlock.Text = Translator.SystemFolderConfigDialogValidation_InboxSelected;
+            ValidationErrorTextBlock!.Text = Translator.SystemFolderConfigDialogValidation_InboxSelected;
 
-        if (new HashSet<Guid>(allSpecialFolders.Where(a => a != null).Select(x => x.Id)).Count != allSpecialFolders.Where(a => a != null).Count())
-            ValidationErrorTextBlock.Text = Translator.SystemFolderConfigDialogValidation_DuplicateSystemFolders;
+        if (new HashSet<Guid>(allSpecialFolders.Where(a => a != null).Select(x => x!.Id)).Count != allSpecialFolders.Where(a => a != null).Count())
+            ValidationErrorTextBlock!.Text = Translator.SystemFolderConfigDialogValidation_DuplicateSystemFolders;
+
+        if (!string.IsNullOrEmpty(ValidationErrorTextBlock!.Text))
+            ValidationErrorBorder.Visibility = Microsoft.UI.Xaml.Visibility.Visible;
 
         // Check if we can save.
-        if (string.IsNullOrEmpty(ValidationErrorTextBlock.Text))
+        if (string.IsNullOrEmpty(ValidationErrorTextBlock!.Text))
         {
             var configuration = new SystemFolderConfiguration(Sent, Draft, Archive, Trash, Junk);
 
diff --git a/Wino.Core.UWP/Dialogs/TextInputDialog.xaml b/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml
similarity index 85%
rename from Wino.Core.UWP/Dialogs/TextInputDialog.xaml
rename to Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml
index af4215ce..12b23226 100644
--- a/Wino.Core.UWP/Dialogs/TextInputDialog.xaml
+++ b/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml
@@ -1,4 +1,4 @@
-<ContentDialog
+<ContentDialog
     x:Class="Wino.Dialogs.TextInputDialog"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -21,8 +21,11 @@
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </ContentDialog.Resources>
 
-    <StackPanel Spacing="12">
-        <TextBlock x:Name="DialogDescription" TextWrapping="Wrap" />
+    <StackPanel Spacing="16">
+        <TextBlock
+            x:Name="DialogDescription"
+            Style="{ThemeResource BodyTextBlockStyle}"
+            TextWrapping="Wrap" />
         <TextBox x:Name="FolderTextBox" Text="{x:Bind CurrentInput, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
     </StackPanel>
 </ContentDialog>
diff --git a/Wino.Core.UWP/Dialogs/TextInputDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml.cs
similarity index 94%
rename from Wino.Core.UWP/Dialogs/TextInputDialog.xaml.cs
rename to Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml.cs
index c0fabef2..67a7781f 100644
--- a/Wino.Core.UWP/Dialogs/TextInputDialog.xaml.cs
+++ b/Wino.Mail.WinUI/Dialogs/TextInputDialog.xaml.cs
@@ -1,5 +1,5 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Wino.Dialogs;
 
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml b/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml
new file mode 100644
index 00000000..61abaae1
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml
@@ -0,0 +1,51 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.WinoAccountEmailConfirmationRequiredDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{x:Bind domain:Translator.WinoAccount_EmailConfirmationPendingDialog_Title}"
+    PrimaryButtonClick="ResendClicked"
+    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+    PrimaryButtonText="{x:Bind domain:Translator.WinoAccount_EmailConfirmationPendingDialog_ResendButton}"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Close}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">520</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">520</x:Double>
+    </ContentDialog.Resources>
+
+    <StackPanel Spacing="16">
+        <Border
+            Padding="14"
+            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+            CornerRadius="12">
+            <StackPanel Spacing="8">
+                <TextBlock
+                    x:Name="MessageTextBlock"
+                    TextWrapping="WrapWholeWords" />
+                <TextBlock
+                    x:Name="CountdownTextBlock"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    TextWrapping="WrapWholeWords" />
+            </StackPanel>
+        </Border>
+
+        <ProgressRing
+            x:Name="BusyRing"
+            Width="20"
+            Height="20"
+            HorizontalAlignment="Left"
+            IsActive="False"
+            Visibility="Collapsed" />
+
+        <TextBlock
+            x:Name="ErrorTextBlock"
+            Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+            TextWrapping="WrapWholeWords"
+            Visibility="Collapsed" />
+    </StackPanel>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml.cs
new file mode 100644
index 00000000..f839afcc
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountEmailConfirmationRequiredDialog.xaml.cs
@@ -0,0 +1,124 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.WinUI.Services;
+
+namespace Wino.Dialogs;
+
+public sealed partial class WinoAccountEmailConfirmationRequiredDialog : ContentDialog
+{
+    private readonly IWinoAccountProfileService _profileService;
+    private readonly DispatcherTimer _countdownTimer;
+    private readonly string _email;
+    private readonly string _endpoint;
+    private readonly string _ticket;
+    private DateTimeOffset _resendAvailableAtUtc;
+
+    public WinoAccountEmailConfirmationRequiredDialog(IWinoAccountProfileService profileService, string email, EmailConfirmationRequiredDetailsDto details)
+    {
+        _profileService = profileService;
+        _email = email;
+        _endpoint = details.ResendConfirmationEndpoint;
+        _ticket = details.ResendConfirmationTicket;
+        _resendAvailableAtUtc = details.ResendAvailableAtUtc;
+
+        InitializeComponent();
+
+        MessageTextBlock.Text = string.Format(Translator.WinoAccount_EmailConfirmationPendingDialog_Message, email);
+
+        _countdownTimer = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromSeconds(1)
+        };
+        _countdownTimer.Tick += CountdownTimer_Tick;
+
+        Closing += DialogClosing;
+
+        UpdateCountdown();
+        _countdownTimer.Start();
+    }
+
+    public bool ResendSucceeded { get; private set; }
+
+    private async void ResendClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        args.Cancel = true;
+
+        if (DateTimeOffset.UtcNow < _resendAvailableAtUtc)
+        {
+            UpdateCountdown();
+            return;
+        }
+
+        var deferral = args.GetDeferral();
+
+        try
+        {
+            SetBusyState(true);
+            HideError();
+
+            var response = await _profileService.ResendEmailConfirmationAsync(_endpoint, _ticket);
+            if (!response.IsSuccess)
+            {
+                ShowError(WinoAccountAuthErrorTranslator.Translate(response.ErrorCode));
+                return;
+            }
+
+            ResendSucceeded = true;
+            Hide();
+        }
+        finally
+        {
+            SetBusyState(false);
+            deferral.Complete();
+        }
+    }
+
+    private void CountdownTimer_Tick(object? sender, object e) => UpdateCountdown();
+
+    private void UpdateCountdown()
+    {
+        var remaining = _resendAvailableAtUtc - DateTimeOffset.UtcNow;
+        if (remaining <= TimeSpan.Zero)
+        {
+            IsPrimaryButtonEnabled = true;
+            CountdownTextBlock.Text = Translator.WinoAccount_EmailConfirmationPendingDialog_ReadyToResend;
+            return;
+        }
+
+        IsPrimaryButtonEnabled = false;
+        CountdownTextBlock.Text = string.Format(
+            Translator.WinoAccount_EmailConfirmationPendingDialog_Countdown,
+            $"{Math.Max(0, (int)remaining.TotalMinutes):00}:{Math.Max(0, remaining.Seconds):00}");
+    }
+
+    private void SetBusyState(bool isBusy)
+    {
+        IsPrimaryButtonEnabled = !isBusy && DateTimeOffset.UtcNow >= _resendAvailableAtUtc;
+        IsSecondaryButtonEnabled = !isBusy;
+        BusyRing.IsActive = isBusy;
+        BusyRing.Visibility = isBusy ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private void ShowError(string message)
+    {
+        ErrorTextBlock.Text = message;
+        ErrorTextBlock.Visibility = Visibility.Visible;
+    }
+
+    private void HideError()
+    {
+        ErrorTextBlock.Text = string.Empty;
+        ErrorTextBlock.Visibility = Visibility.Collapsed;
+    }
+
+    private void DialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args)
+    {
+        _countdownTimer.Stop();
+        _countdownTimer.Tick -= CountdownTimer_Tick;
+        Closing -= DialogClosing;
+    }
+}
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml b/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml
new file mode 100644
index 00000000..23485a6a
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml
@@ -0,0 +1,273 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.WinoAccountLoginDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{x:Bind domain:Translator.WinoAccount_LoginDialog_Title}"
+    PrimaryButtonClick="LoginClicked"
+    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_SignIn}"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">520</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">520</x:Double>
+    </ContentDialog.Resources>
+
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <StackPanel Spacing="20">
+
+            <!--  Hero illustration area  -->
+            <Border
+                Height="140"
+                CornerRadius="12">
+                <Border.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                        <GradientStop Offset="0" Color="#1A6EE7B7" />
+                        <GradientStop Offset="0.5" Color="#2038BDF8" />
+                        <GradientStop Offset="1" Color="#1A818CF8" />
+                    </LinearGradientBrush>
+                </Border.Background>
+                <Canvas>
+                    <!--  Background decorative circles  -->
+                    <Ellipse
+                        Canvas.Left="340"
+                        Canvas.Top="-20"
+                        Width="100"
+                        Height="100"
+                        Opacity="0.15">
+                        <Ellipse.Fill>
+                            <RadialGradientBrush>
+                                <GradientStop Offset="0" Color="#38BDF8" />
+                                <GradientStop Offset="1" Color="Transparent" />
+                            </RadialGradientBrush>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <Ellipse
+                        Canvas.Left="20"
+                        Canvas.Top="80"
+                        Width="80"
+                        Height="80"
+                        Opacity="0.1">
+                        <Ellipse.Fill>
+                            <RadialGradientBrush>
+                                <GradientStop Offset="0" Color="#6EE7B7" />
+                                <GradientStop Offset="1" Color="Transparent" />
+                            </RadialGradientBrush>
+                        </Ellipse.Fill>
+                    </Ellipse>
+
+                    <!--  Shield with lock illustration  -->
+                    <Canvas Canvas.Left="190" Canvas.Top="16">
+                        <!--  Shield shape  -->
+                        <Path
+                            Data="M46 4 L82 18 L82 48 C82 66 65 80 46 84 C27 80 10 66 10 48 L10 18 Z"
+                            Opacity="0.9">
+                            <Path.Fill>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                    <GradientStop Offset="0" Color="#6EE7B7" />
+                                    <GradientStop Offset="1" Color="#059669" />
+                                </LinearGradientBrush>
+                            </Path.Fill>
+                        </Path>
+                        <!--  Inner shield  -->
+                        <Path
+                            Data="M46 12 L76 24 L76 48 C76 64 62 76 46 80 C30 76 16 64 16 48 L16 24 Z"
+                            Opacity="0.5">
+                            <Path.Fill>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                    <GradientStop Offset="0" Color="#A7F3D0" />
+                                    <GradientStop Offset="1" Color="#34D399" />
+                                </LinearGradientBrush>
+                            </Path.Fill>
+                        </Path>
+                        <!--  Lock body  -->
+                        <Rectangle
+                            Canvas.Left="32"
+                            Canvas.Top="44"
+                            Width="28"
+                            Height="20"
+                            Fill="White"
+                            RadiusX="5"
+                            RadiusY="5" />
+                        <!--  Lock shackle  -->
+                        <Path
+                            Data="M38 44 L38 38 A8 8 0 0 1 54 38 L54 44"
+                            Stroke="White"
+                            StrokeEndLineCap="Round"
+                            StrokeStartLineCap="Round"
+                            StrokeThickness="4"
+                            Fill="Transparent" />
+                        <!--  Keyhole  -->
+                        <Ellipse
+                            Canvas.Left="42"
+                            Canvas.Top="49"
+                            Width="8"
+                            Height="8"
+                            Fill="#059669" />
+                        <Rectangle
+                            Canvas.Left="44"
+                            Canvas.Top="55"
+                            Width="4"
+                            Height="6"
+                            Fill="#059669"
+                            RadiusX="2"
+                            RadiusY="2" />
+                    </Canvas>
+
+                    <!--  Decorative sparkles  -->
+                    <Ellipse
+                        Canvas.Left="150"
+                        Canvas.Top="30"
+                        Width="6"
+                        Height="6"
+                        Fill="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                        Opacity="0.5" />
+                    <Ellipse
+                        Canvas.Left="320"
+                        Canvas.Top="50"
+                        Width="5"
+                        Height="5"
+                        Fill="#6EE7B7"
+                        Opacity="0.6" />
+                    <Ellipse
+                        Canvas.Left="130"
+                        Canvas.Top="100"
+                        Width="4"
+                        Height="4"
+                        Fill="#38BDF8"
+                        Opacity="0.4" />
+                    <Ellipse
+                        Canvas.Left="360"
+                        Canvas.Top="100"
+                        Width="4"
+                        Height="4"
+                        Fill="#A78BFA"
+                        Opacity="0.5" />
+                </Canvas>
+            </Border>
+
+            <!--  Benefits cards  -->
+            <StackPanel
+                x:Name="BenefitsPanel"
+                Spacing="8">
+                <Border
+                    Padding="14"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    CornerRadius="12">
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            Width="36"
+                            Height="36"
+                            Background="{ThemeResource AccentFillColorDefaultBrush}"
+                            CornerRadius="8"
+                            Opacity="0.15" />
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                            Glyph="&#xE8D7;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.WinoAccount_LoginDialog_BenefitsTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_LoginDialog_BenefitsDescription}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </Grid>
+                </Border>
+
+                <Border
+                    Padding="14"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    CornerRadius="12">
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            Width="36"
+                            Height="36"
+                            Background="{ThemeResource AccentFillColorDefaultBrush}"
+                            CornerRadius="8"
+                            Opacity="0.15" />
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                            Glyph="&#xE946;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.WinoAccount_LoginDialog_DifferenceTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_LoginDialog_DifferenceDescription}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </StackPanel>
+
+            <!--  Input fields  -->
+            <StackPanel Spacing="12">
+                <TextBox
+                    x:Name="EmailTextBox"
+                    Header="{x:Bind domain:Translator.WinoAccount_EmailLabel}"
+                    KeyDown="EmailTextBox_KeyDown"
+                    PlaceholderText="{x:Bind domain:Translator.WinoAccount_EmailPlaceholder}"
+                    TextChanging="InputChanged" />
+
+                <StackPanel x:Name="PasswordPanel">
+                    <PasswordBox
+                        x:Name="PasswordBox"
+                        Header="{x:Bind domain:Translator.WinoAccount_PasswordLabel}"
+                        KeyDown="PasswordBox_KeyDown"
+                        PasswordChanged="InputChanged" />
+                </StackPanel>
+
+                <Border
+                    x:Name="ForgotPasswordInfoPanel"
+                    Padding="14"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    CornerRadius="12"
+                    Visibility="Collapsed">
+                    <TextBlock
+                        Text="{x:Bind domain:Translator.WinoAccount_ForgotPasswordDialog_Description}"
+                        TextWrapping="WrapWholeWords" />
+                </Border>
+            </StackPanel>
+
+            <HyperlinkButton
+                x:Name="ModeToggleButton"
+                HorizontalAlignment="Left"
+                Click="ModeToggleButton_Click"
+                Content="{x:Bind domain:Translator.WinoAccount_LoginDialog_ForgotPasswordLink}" />
+
+            <ProgressRing
+                x:Name="BusyRing"
+                Width="20"
+                Height="20"
+                HorizontalAlignment="Left"
+                IsActive="False"
+                Visibility="Collapsed" />
+
+            <TextBlock
+                x:Name="ErrorTextBlock"
+                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                TextWrapping="WrapWholeWords"
+                Visibility="Collapsed" />
+        </StackPanel>
+    </ScrollViewer>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml.cs
new file mode 100644
index 00000000..de1102f4
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountLoginDialog.xaml.cs
@@ -0,0 +1,201 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Windows.System;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.WinUI.Services;
+
+namespace Wino.Dialogs;
+
+public sealed partial class WinoAccountLoginDialog : ContentDialog
+{
+    private readonly IWinoAccountProfileService _profileService;
+    private bool _isForgotPasswordMode;
+
+    public WinoAccountLoginDialog(IWinoAccountProfileService profileService)
+    {
+        _profileService = profileService;
+        InitializeComponent();
+        UpdateMode();
+    }
+
+    public WinoAccount? Result { get; private set; }
+    public string? PendingConfirmationEmailAddress { get; private set; }
+    public EmailConfirmationRequiredDetailsDto? EmailConfirmationRequiredDetails { get; private set; }
+    public string? PasswordResetEmailAddress { get; private set; }
+
+    private async void LoginClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        args.Cancel = true;
+
+        var validationError = ValidateInput();
+        if (!string.IsNullOrWhiteSpace(validationError))
+        {
+            ShowError(validationError);
+            return;
+        }
+
+        var deferral = args.GetDeferral();
+
+        try
+        {
+            await PerformPrimaryActionAsync();
+        }
+        finally
+        {
+            deferral.Complete();
+        }
+    }
+
+    private async System.Threading.Tasks.Task PerformPrimaryActionAsync()
+    {
+        var validationError = ValidateInput();
+        if (!string.IsNullOrWhiteSpace(validationError))
+        {
+            ShowError(validationError);
+            return;
+        }
+
+        try
+        {
+            SetBusyState(true);
+            HideError();
+
+            if (_isForgotPasswordMode)
+            {
+                var forgotPasswordResponse = await _profileService.ForgotPasswordAsync(EmailTextBox.Text.Trim());
+                if (!forgotPasswordResponse.IsSuccess)
+                {
+                    ShowError(WinoAccountAuthErrorTranslator.Translate(forgotPasswordResponse.ErrorCode));
+                    return;
+                }
+
+                PasswordResetEmailAddress = EmailTextBox.Text.Trim();
+                Hide();
+                return;
+            }
+
+            var result = await _profileService.LoginAsync(EmailTextBox.Text.Trim(), PasswordBox.Password);
+
+            if (!result.IsSuccess || result.Account == null)
+            {
+                var confirmationDetails = WinoAccountEmailConfirmationHelper.Parse(result.ErrorDetails);
+                if (WinoAccountEmailConfirmationHelper.IsEmailConfirmationRequiredError(result.ErrorCode) && confirmationDetails != null)
+                {
+                    PendingConfirmationEmailAddress = EmailTextBox.Text.Trim();
+                    EmailConfirmationRequiredDetails = confirmationDetails;
+                    Hide();
+                    return;
+                }
+
+                ShowError(WinoAccountAuthErrorTranslator.Format(result.ErrorCode, result.ErrorMessage));
+                return;
+            }
+
+            Result = result.Account;
+            Hide();
+        }
+        finally
+        {
+            SetBusyState(false);
+        }
+    }
+
+    private string ValidateInput()
+    {
+        if (string.IsNullOrWhiteSpace(EmailTextBox.Text))
+        {
+            return Translator.WinoAccount_Validation_EmailRequired;
+        }
+
+        if (_isForgotPasswordMode)
+        {
+            return string.Empty;
+        }
+
+        if (string.IsNullOrWhiteSpace(PasswordBox.Password))
+        {
+            return Translator.WinoAccount_Validation_PasswordRequired;
+        }
+
+        return string.Empty;
+    }
+
+    private async void EmailTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter)
+        {
+            if (_isForgotPasswordMode)
+            {
+                e.Handled = true;
+                await PerformPrimaryActionAsync();
+                return;
+            }
+
+            PasswordBox.Focus(FocusState.Programmatic);
+            e.Handled = true;
+        }
+    }
+
+    private async void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter)
+        {
+            e.Handled = true;
+            await PerformPrimaryActionAsync();
+        }
+    }
+
+    private void ModeToggleButton_Click(object sender, RoutedEventArgs e)
+    {
+        _isForgotPasswordMode = !_isForgotPasswordMode;
+        PasswordBox.Password = string.Empty;
+        HideError();
+        UpdateMode();
+    }
+
+    private void InputChanged(TextBox sender, TextBoxTextChangingEventArgs args) => HideError();
+
+    private void InputChanged(object sender, RoutedEventArgs e) => HideError();
+
+    private void SetBusyState(bool isBusy)
+    {
+        IsPrimaryButtonEnabled = !isBusy;
+        IsSecondaryButtonEnabled = !isBusy;
+        BusyRing.IsActive = isBusy;
+        BusyRing.Visibility = isBusy ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private void ShowError(string message)
+    {
+        ErrorTextBlock.Text = message;
+        ErrorTextBlock.Visibility = Visibility.Visible;
+    }
+
+    private void HideError()
+    {
+        ErrorTextBlock.Text = string.Empty;
+        ErrorTextBlock.Visibility = Visibility.Collapsed;
+    }
+
+    private void UpdateMode()
+    {
+        Title = _isForgotPasswordMode
+            ? Translator.WinoAccount_ForgotPasswordDialog_Title
+            : Translator.WinoAccount_LoginDialog_Title;
+
+        PrimaryButtonText = _isForgotPasswordMode
+            ? Translator.WinoAccount_ForgotPasswordDialog_PrimaryButton
+            : Translator.Buttons_SignIn;
+
+        BenefitsPanel.Visibility = _isForgotPasswordMode ? Visibility.Collapsed : Visibility.Visible;
+        PasswordPanel.Visibility = _isForgotPasswordMode ? Visibility.Collapsed : Visibility.Visible;
+        ForgotPasswordInfoPanel.Visibility = _isForgotPasswordMode ? Visibility.Visible : Visibility.Collapsed;
+        ModeToggleButton.Content = _isForgotPasswordMode
+            ? Translator.WinoAccount_ForgotPasswordDialog_BackToSignIn
+            : Translator.WinoAccount_LoginDialog_ForgotPasswordLink;
+    }
+}
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml b/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml
new file mode 100644
index 00000000..a36ba89c
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml
@@ -0,0 +1,300 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.WinoAccountRegistrationDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{x:Bind domain:Translator.WinoAccount_RegisterDialog_Title}"
+    FullSizeDesired="True"
+    PrimaryButtonClick="RegisterClicked"
+    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+    PrimaryButtonText="{x:Bind domain:Translator.WinoAccount_RegisterDialog_PrimaryButton}"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
+    Style="{StaticResource WinoDialogStyle}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">560</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">560</x:Double>
+        <x:Double x:Key="ContentDialogMaxHeight">900</x:Double>
+    </ContentDialog.Resources>
+
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <StackPanel Spacing="20">
+
+            <!--  Hero illustration area  -->
+            <Border Height="140" CornerRadius="12">
+                <Border.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                        <GradientStop Offset="0" Color="#1A818CF8" />
+                        <GradientStop Offset="0.5" Color="#20A78BFA" />
+                        <GradientStop Offset="1" Color="#1AE879F9" />
+                    </LinearGradientBrush>
+                </Border.Background>
+                <Canvas>
+                    <!--  Background decorative circles  -->
+                    <Ellipse
+                        Canvas.Left="370"
+                        Canvas.Top="-10"
+                        Width="90"
+                        Height="90"
+                        Opacity="0.12">
+                        <Ellipse.Fill>
+                            <RadialGradientBrush>
+                                <GradientStop Offset="0" Color="#A78BFA" />
+                                <GradientStop Offset="1" Color="Transparent" />
+                            </RadialGradientBrush>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <Ellipse
+                        Canvas.Left="30"
+                        Canvas.Top="90"
+                        Width="70"
+                        Height="70"
+                        Opacity="0.1">
+                        <Ellipse.Fill>
+                            <RadialGradientBrush>
+                                <GradientStop Offset="0" Color="#38BDF8" />
+                                <GradientStop Offset="1" Color="Transparent" />
+                            </RadialGradientBrush>
+                        </Ellipse.Fill>
+                    </Ellipse>
+
+                    <!--  Person/account illustration  -->
+                    <Canvas Canvas.Left="200" Canvas.Top="12">
+                        <!--  Circular badge background  -->
+                        <Ellipse
+                            Canvas.Left="8"
+                            Canvas.Top="8"
+                            Width="80"
+                            Height="80"
+                            Opacity="0.9">
+                            <Ellipse.Fill>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                    <GradientStop Offset="0" Color="#818CF8" />
+                                    <GradientStop Offset="1" Color="#6366F1" />
+                                </LinearGradientBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <!--  Inner circle  -->
+                        <Ellipse
+                            Canvas.Left="14"
+                            Canvas.Top="14"
+                            Width="68"
+                            Height="68"
+                            Opacity="0.35">
+                            <Ellipse.Fill>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                    <GradientStop Offset="0" Color="#C7D2FE" />
+                                    <GradientStop Offset="1" Color="#A5B4FC" />
+                                </LinearGradientBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <!--  Person head  -->
+                        <Ellipse
+                            Canvas.Left="34"
+                            Canvas.Top="24"
+                            Width="28"
+                            Height="28"
+                            Fill="White" />
+                        <!--  Person body  -->
+                        <Path Data="M28 68 A20 16 0 0 1 68 68" Fill="White" />
+
+                        <!--  Plus badge  -->
+                        <Ellipse
+                            Canvas.Left="62"
+                            Canvas.Top="62"
+                            Width="28"
+                            Height="28">
+                            <Ellipse.Fill>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                    <GradientStop Offset="0" Color="#4ADE80" />
+                                    <GradientStop Offset="1" Color="#16A34A" />
+                                </LinearGradientBrush>
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <!--  Plus sign  -->
+                        <Rectangle
+                            Canvas.Left="73"
+                            Canvas.Top="70"
+                            Width="4"
+                            Height="16"
+                            Fill="White"
+                            RadiusX="2"
+                            RadiusY="2" />
+                        <Rectangle
+                            Canvas.Left="69"
+                            Canvas.Top="74"
+                            Width="12"
+                            Height="4"
+                            Fill="White"
+                            RadiusX="2"
+                            RadiusY="2" />
+                    </Canvas>
+
+                    <!--  Decorative sparkles  -->
+                    <Ellipse
+                        Canvas.Left="140"
+                        Canvas.Top="35"
+                        Width="6"
+                        Height="6"
+                        Fill="#A78BFA"
+                        Opacity="0.5" />
+                    <Ellipse
+                        Canvas.Left="350"
+                        Canvas.Top="55"
+                        Width="5"
+                        Height="5"
+                        Fill="#38BDF8"
+                        Opacity="0.6" />
+                    <Ellipse
+                        Canvas.Left="120"
+                        Canvas.Top="95"
+                        Width="4"
+                        Height="4"
+                        Fill="#6EE7B7"
+                        Opacity="0.4" />
+                    <Ellipse
+                        Canvas.Left="380"
+                        Canvas.Top="105"
+                        Width="4"
+                        Height="4"
+                        Fill="#F472B6"
+                        Opacity="0.5" />
+                </Canvas>
+            </Border>
+
+            <!--  Benefits section  -->
+            <StackPanel Spacing="8">
+                <TextBlock
+                    Margin="0,0,0,4"
+                    Style="{StaticResource BodyStrongTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_BenefitsTitle}" />
+
+                <Border
+                    Padding="14"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    CornerRadius="12">
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            Width="36"
+                            Height="36"
+                            Background="{ThemeResource AccentFillColorDefaultBrush}"
+                            CornerRadius="8"
+                            Opacity="0.15" />
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                            Glyph="&#xE8D7;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_BenefitSyncTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_BenefitSyncDescription}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </Grid>
+                </Border>
+
+                <Border
+                    Padding="14"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    CornerRadius="12">
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            Width="36"
+                            Height="36"
+                            Background="{ThemeResource AccentFillColorDefaultBrush}"
+                            CornerRadius="8"
+                            Opacity="0.15" />
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                            Glyph="&#xEA18;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_BenefitAiTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_BenefitAiDescription}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </Grid>
+                </Border>
+            </StackPanel>
+
+            <TextBlock
+                x:Name="ErrorTextBlock"
+                Foreground="{ThemeResource SystemFillColorCriticalBrush}"
+                TextWrapping="WrapWholeWords"
+                Visibility="Collapsed" />
+
+            <!--  Input fields  -->
+            <StackPanel Spacing="12">
+                <TextBox
+                    x:Name="EmailTextBox"
+                    Header="{x:Bind domain:Translator.WinoAccount_EmailLabel}"
+                    KeyDown="EmailTextBox_KeyDown"
+                    PlaceholderText="{x:Bind domain:Translator.WinoAccount_EmailPlaceholder}"
+                    TextChanging="InputChanged" />
+
+                <PasswordBox
+                    x:Name="PasswordBox"
+                    Header="{x:Bind domain:Translator.WinoAccount_PasswordLabel}"
+                    KeyDown="PasswordBox_KeyDown"
+                    PasswordChanged="InputChanged" />
+
+                <PasswordBox
+                    x:Name="ConfirmPasswordBox"
+                    Header="{x:Bind domain:Translator.WinoAccount_ConfirmPasswordLabel}"
+                    KeyDown="ConfirmPasswordBox_KeyDown"
+                    PasswordChanged="InputChanged" />
+            </StackPanel>
+
+            <Border
+                Padding="14"
+                Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                CornerRadius="12">
+                <StackPanel Spacing="10">
+                    <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_PrivacyTitle}" />
+                    <TextBlock
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{x:Bind domain:Translator.WinoAccount_RegisterDialog_PrivacyDescription}"
+                        TextWrapping="WrapWholeWords" />
+                    <HyperlinkButton
+                        HorizontalAlignment="Left"
+                        Click="PrivacyPolicyLink_Click"
+                        Content="{x:Bind domain:Translator.WinoAccount_RegisterDialog_PrivacyLinkText}" />
+                    <CheckBox
+                        x:Name="PrivacyPolicyCheckBox"
+                        Checked="InputChanged"
+                        Content="{x:Bind domain:Translator.WinoAccount_RegisterDialog_PrivacyCheckbox}"
+                        Unchecked="InputChanged" />
+                </StackPanel>
+            </Border>
+
+            <ProgressRing
+                x:Name="BusyRing"
+                Width="20"
+                Height="20"
+                HorizontalAlignment="Left"
+                IsActive="False"
+                Visibility="Collapsed" />
+        </StackPanel>
+    </ScrollViewer>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml.cs
new file mode 100644
index 00000000..50d43ec1
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountRegistrationDialog.xaml.cs
@@ -0,0 +1,161 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Windows.System;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI.Services;
+
+namespace Wino.Dialogs;
+
+public sealed partial class WinoAccountRegistrationDialog : ContentDialog
+{
+    private const string PrivacyPolicyUrl = "https://www.winomail.app/accounts_policy.html";
+    private readonly IWinoAccountProfileService _profileService;
+
+    public WinoAccountRegistrationDialog(IWinoAccountProfileService profileService)
+    {
+        _profileService = profileService;
+        InitializeComponent();
+    }
+
+    public WinoAccount? Result { get; private set; }
+    public string? ConfirmationEmailAddress { get; private set; }
+
+    private async void RegisterClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        args.Cancel = true;
+
+        var validationError = ValidateInput();
+        if (!string.IsNullOrWhiteSpace(validationError))
+        {
+            ShowError(validationError);
+            return;
+        }
+
+        var deferral = args.GetDeferral();
+
+        try
+        {
+            await PerformRegistrationAsync();
+        }
+        finally
+        {
+            deferral.Complete();
+        }
+    }
+
+    private async System.Threading.Tasks.Task PerformRegistrationAsync()
+    {
+        var validationError = ValidateInput();
+        if (!string.IsNullOrWhiteSpace(validationError))
+        {
+            ShowError(validationError);
+            return;
+        }
+
+        try
+        {
+            SetBusyState(true);
+            HideError();
+
+            var result = await _profileService.RegisterAsync(EmailTextBox.Text.Trim(), PasswordBox.Password);
+
+            if (!result.IsSuccess || result.Account == null)
+            {
+                ShowError(WinoAccountAuthErrorTranslator.Format(result.ErrorCode, result.ErrorMessage));
+                return;
+            }
+
+            ConfirmationEmailAddress = result.Account.Email;
+            Hide();
+        }
+        finally
+        {
+            SetBusyState(false);
+        }
+    }
+
+    private string ValidateInput()
+    {
+        if (string.IsNullOrWhiteSpace(EmailTextBox.Text))
+        {
+            return Translator.WinoAccount_Validation_EmailRequired;
+        }
+
+        if (string.IsNullOrWhiteSpace(PasswordBox.Password))
+        {
+            return Translator.WinoAccount_Validation_PasswordRequired;
+        }
+
+        if (!string.Equals(PasswordBox.Password, ConfirmPasswordBox.Password, StringComparison.Ordinal))
+        {
+            return Translator.WinoAccount_Validation_PasswordMismatch;
+        }
+
+        if (PrivacyPolicyCheckBox.IsChecked != true)
+        {
+            return Translator.WinoAccount_Validation_PrivacyConsentRequired;
+        }
+
+        return string.Empty;
+    }
+
+    private void EmailTextBox_KeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter)
+        {
+            PasswordBox.Focus(FocusState.Programmatic);
+            e.Handled = true;
+        }
+    }
+
+    private void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter)
+        {
+            ConfirmPasswordBox.Focus(FocusState.Programmatic);
+            e.Handled = true;
+        }
+    }
+
+    private async void ConfirmPasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key == VirtualKey.Enter)
+        {
+            e.Handled = true;
+            await PerformRegistrationAsync();
+        }
+    }
+
+    private async void PrivacyPolicyLink_Click(object sender, RoutedEventArgs e)
+    {
+        await Launcher.LaunchUriAsync(new Uri(PrivacyPolicyUrl));
+    }
+
+    private void InputChanged(TextBox sender, TextBoxTextChangingEventArgs args) => HideError();
+
+    private void InputChanged(object sender, RoutedEventArgs e) => HideError();
+
+    private void SetBusyState(bool isBusy)
+    {
+        IsPrimaryButtonEnabled = !isBusy;
+        IsSecondaryButtonEnabled = !isBusy;
+        BusyRing.IsActive = isBusy;
+        BusyRing.Visibility = isBusy ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    private void ShowError(string message)
+    {
+        ErrorTextBlock.Text = message;
+        ErrorTextBlock.Visibility = Visibility.Visible;
+    }
+
+    private void HideError()
+    {
+        ErrorTextBlock.Text = string.Empty;
+        ErrorTextBlock.Visibility = Visibility.Collapsed;
+    }
+}
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml b/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml
new file mode 100644
index 00000000..ce3a3231
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml
@@ -0,0 +1,76 @@
+<ContentDialog
+    x:Class="Wino.Dialogs.WinoAccountSyncExportDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    DefaultButton="Primary"
+    PrimaryButtonClick="ExportClicked"
+    PrimaryButtonStyle="{ThemeResource AccentButtonStyle}"
+    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Export, Mode=OneTime}"
+    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Close, Mode=OneTime}"
+    Style="{StaticResource WinoDialogStyle}"
+    Title="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_Title, Mode=OneTime}"
+    mc:Ignorable="d">
+
+    <ContentDialog.Resources>
+        <x:Double x:Key="ContentDialogMinWidth">520</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">520</x:Double>
+    </ContentDialog.Resources>
+
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <StackPanel Spacing="16">
+            <TextBlock
+                Text="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_Description, Mode=OneTime}"
+                TextWrapping="WrapWholeWords" />
+
+            <StackPanel Spacing="12">
+                <CheckBox
+                    x:Name="PreferencesCheckBox"
+                    Checked="SelectionChanged"
+                    Content="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_IncludePreferences, Mode=OneTime}"
+                    IsChecked="True"
+                    Unchecked="SelectionChanged" />
+
+                <StackPanel Spacing="8">
+                    <CheckBox
+                        x:Name="AccountsCheckBox"
+                        Checked="SelectionChanged"
+                        Content="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_IncludeAccounts, Mode=OneTime}"
+                        IsChecked="True"
+                        Unchecked="SelectionChanged" />
+
+                    <Border
+                        Padding="12"
+                        Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                        CornerRadius="10">
+                        <StackPanel Spacing="6">
+                            <TextBlock
+                                Style="{StaticResource BodyStrongTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_AccountsDisclaimer, Mode=OneTime}"
+                                TextWrapping="WrapWholeWords" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_AccountsRelogin, Mode=OneTime}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </Border>
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel
+                x:Name="ProgressPanel"
+                Spacing="8"
+                Visibility="Collapsed">
+                <TextBlock
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WinoAccount_Management_ExportDialog_InProgress, Mode=OneTime}"
+                    TextWrapping="WrapWholeWords" />
+                <ProgressBar IsIndeterminate="True" />
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</ContentDialog>
diff --git a/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml.cs b/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml.cs
new file mode 100644
index 00000000..4c5a07ad
--- /dev/null
+++ b/Wino.Mail.WinUI/Dialogs/WinoAccountSyncExportDialog.xaml.cs
@@ -0,0 +1,73 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+
+namespace Wino.Dialogs;
+
+public sealed partial class WinoAccountSyncExportDialog : ContentDialog
+{
+    private readonly IWinoAccountDataSyncService _syncService;
+    private bool _isBusy;
+
+    public WinoAccountSyncExportDialog(IWinoAccountDataSyncService syncService)
+    {
+        _syncService = syncService;
+        InitializeComponent();
+        UpdateButtonState();
+    }
+
+    public WinoAccountSyncExportResult? Result { get; private set; }
+
+    public Exception? FailureException { get; private set; }
+
+    private async void ExportClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+    {
+        args.Cancel = true;
+
+        if (!HasSelection())
+        {
+            return;
+        }
+
+        var deferral = args.GetDeferral();
+
+        try
+        {
+            SetBusyState(true);
+            FailureException = null;
+            Result = await _syncService.ExportAsync(new WinoAccountSyncSelection(
+                PreferencesCheckBox.IsChecked == true,
+                AccountsCheckBox.IsChecked == true));
+            Hide();
+        }
+        catch (Exception ex)
+        {
+            FailureException = ex;
+            Hide();
+        }
+        finally
+        {
+            SetBusyState(false);
+            deferral.Complete();
+        }
+    }
+
+    private void SelectionChanged(object sender, RoutedEventArgs e)
+        => UpdateButtonState();
+
+    private void SetBusyState(bool isBusy)
+    {
+        _isBusy = isBusy;
+        ProgressPanel.Visibility = isBusy ? Visibility.Visible : Visibility.Collapsed;
+        IsSecondaryButtonEnabled = !isBusy;
+        UpdateButtonState();
+    }
+
+    private void UpdateButtonState()
+        => IsPrimaryButtonEnabled = !_isBusy && HasSelection();
+
+    private bool HasSelection()
+        => PreferencesCheckBox.IsChecked == true || AccountsCheckBox.IsChecked == true;
+}
diff --git a/Wino.Mail.WinUI/Dispatcher.cs b/Wino.Mail.WinUI/Dispatcher.cs
new file mode 100644
index 00000000..82532d6d
--- /dev/null
+++ b/Wino.Mail.WinUI/Dispatcher.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.WinUI;
+
+public class WinUIDispatcher : IDispatcher
+{
+    private DispatcherQueue? _coreDispatcher;
+
+    public WinUIDispatcher()
+    {
+    }
+
+    public WinUIDispatcher(DispatcherQueue coreDispatcher)
+    {
+        _coreDispatcher = coreDispatcher;
+    }
+
+    public bool HasThreadAccess => _coreDispatcher?.HasThreadAccess == true;
+
+    public void Initialize(DispatcherQueue coreDispatcher)
+    {
+        _coreDispatcher ??= coreDispatcher ?? throw new ArgumentNullException(nameof(coreDispatcher));
+    }
+
+    public Task ExecuteOnUIThread(Action action)
+    {
+        if (action == null)
+            throw new ArgumentNullException(nameof(action));
+
+        if (_coreDispatcher == null)
+            throw new InvalidOperationException("UI dispatcher is not initialized.");
+
+        if (_coreDispatcher.HasThreadAccess)
+        {
+            action();
+            return Task.CompletedTask;
+        }
+
+        return _coreDispatcher.EnqueueAsync(action, DispatcherQueuePriority.Normal);
+    }
+}
diff --git a/Wino.Core.UWP/Extensions/AnimationExtensions.cs b/Wino.Mail.WinUI/Extensions/AnimationExtensions.cs
similarity index 95%
rename from Wino.Core.UWP/Extensions/AnimationExtensions.cs
rename to Wino.Mail.WinUI/Extensions/AnimationExtensions.cs
index 12c4d7d0..444b7d54 100644
--- a/Wino.Core.UWP/Extensions/AnimationExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/AnimationExtensions.cs
@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI.Composition;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Animation;
 
 namespace Wino.Extensions;
 
@@ -76,7 +76,7 @@ public static class AnimationExtensions
 
     public static void Animate(this DependencyObject target, double? from, double to,
       string propertyPath, int duration = 400, int startTime = 0,
-      EasingFunctionBase easing = null, Action completed = null, bool enableDependentAnimation = false)
+      EasingFunctionBase? easing = null, Action? completed = null, bool enableDependentAnimation = false)
     {
         if (easing == null)
         {
diff --git a/Wino.Core.UWP/Extensions/CompositionEnums.cs b/Wino.Mail.WinUI/Extensions/CompositionEnums.cs
similarity index 97%
rename from Wino.Core.UWP/Extensions/CompositionEnums.cs
rename to Wino.Mail.WinUI/Extensions/CompositionEnums.cs
index 06f1f169..6dad6593 100644
--- a/Wino.Core.UWP/Extensions/CompositionEnums.cs
+++ b/Wino.Mail.WinUI/Extensions/CompositionEnums.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Wino.Core.UWP/Extensions/CompositionExtensions.Implicit.cs b/Wino.Mail.WinUI/Extensions/CompositionExtensions.Implicit.cs
similarity index 90%
rename from Wino.Core.UWP/Extensions/CompositionExtensions.Implicit.cs
rename to Wino.Mail.WinUI/Extensions/CompositionExtensions.Implicit.cs
index 17d1b0fb..64f0cfbe 100644
--- a/Wino.Core.UWP/Extensions/CompositionExtensions.Implicit.cs
+++ b/Wino.Mail.WinUI/Extensions/CompositionExtensions.Implicit.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Hosting;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
 
 namespace Wino.Extensions;
 
@@ -21,12 +17,12 @@ public static partial class CompositionExtensions
         var compositor = elementVisual.Compositor;
         ElementCompositionPreview.SetIsTranslationEnabled(element, true);
 
-        ScalarKeyFrameAnimation hideOpacityAnimation = null;
-        ScalarKeyFrameAnimation showOpacityAnimation = null;
-        ScalarKeyFrameAnimation hideOffsetAnimation = null;
-        ScalarKeyFrameAnimation showOffsetAnimation = null;
-        Vector2KeyFrameAnimation hideScaleAnimation = null;
-        Vector2KeyFrameAnimation showeScaleAnimation = null;
+        ScalarKeyFrameAnimation? hideOpacityAnimation = null;
+        ScalarKeyFrameAnimation? showOpacityAnimation = null;
+        ScalarKeyFrameAnimation? hideOffsetAnimation = null;
+        ScalarKeyFrameAnimation? showOffsetAnimation = null;
+        Vector2KeyFrameAnimation? hideScaleAnimation = null;
+        Vector2KeyFrameAnimation? showeScaleAnimation = null;
 
         if (animateOpacity)
         {
@@ -123,7 +119,7 @@ public static partial class CompositionExtensions
     }
 
     public static void EnableImplicitAnimation(this UIElement element, VisualPropertyType typeToAnimate,
-        double duration = 800, double delay = 0, CompositionEasingFunction easing = null)
+        double duration = 800, double delay = 0, CompositionEasingFunction? easing = null)
     {
         var visual = element.Visual();
         var compositor = visual.Compositor;
@@ -146,7 +142,7 @@ public static partial class CompositionExtensions
     }
 
     public static void EnableImplicitAnimation(this Visual visual, VisualPropertyType typeToAnimate,
-        double duration = 800, double delay = 0, CompositionEasingFunction easing = null)
+        double duration = 800, double delay = 0, CompositionEasingFunction? easing = null)
     {
         var compositor = visual.Compositor;
 
@@ -167,8 +163,8 @@ public static partial class CompositionExtensions
         visual.ImplicitAnimations = animationCollection;
     }
 
-    private static KeyFrameAnimation CreateAnimationByType(Compositor compositor, VisualPropertyType type,
-        double duration = 800, double delay = 0, CompositionEasingFunction easing = null)
+    private static KeyFrameAnimation? CreateAnimationByType(Compositor compositor, VisualPropertyType type,
+        double duration = 800, double delay = 0, CompositionEasingFunction? easing = null)
     {
         KeyFrameAnimation animation;
 
diff --git a/Wino.Core.UWP/Extensions/ElementThemeExtensions.cs b/Wino.Mail.WinUI/Extensions/ElementThemeExtensions.cs
similarity index 93%
rename from Wino.Core.UWP/Extensions/ElementThemeExtensions.cs
rename to Wino.Mail.WinUI/Extensions/ElementThemeExtensions.cs
index 4413a2a6..1304ebc7 100644
--- a/Wino.Core.UWP/Extensions/ElementThemeExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/ElementThemeExtensions.cs
@@ -1,7 +1,7 @@
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Mail.WinUI.Extensions;
 
 public static class ElementThemeExtensions
 {
diff --git a/Wino.Mail.WinUI/Extensions/ModifierKeysExtensions.cs b/Wino.Mail.WinUI/Extensions/ModifierKeysExtensions.cs
new file mode 100644
index 00000000..ad69e9a7
--- /dev/null
+++ b/Wino.Mail.WinUI/Extensions/ModifierKeysExtensions.cs
@@ -0,0 +1,58 @@
+using Windows.System;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Mail.WinUI.Extensions;
+
+/// <summary>
+/// Extension methods for converting between Windows VirtualKeyModifiers and Domain ModifierKeys.
+/// </summary>
+public static class ModifierKeysExtensions
+{
+    /// <summary>
+    /// Converts Windows VirtualKeyModifiers to Domain ModifierKeys.
+    /// </summary>
+    /// <param name="virtualKeyModifiers">The Windows VirtualKeyModifiers to convert.</param>
+    /// <returns>The equivalent Domain ModifierKeys.</returns>
+    public static ModifierKeys ToDomainModifierKeys(this VirtualKeyModifiers virtualKeyModifiers)
+    {
+        var modifierKeys = ModifierKeys.None;
+
+        if (virtualKeyModifiers.HasFlag(VirtualKeyModifiers.Control))
+            modifierKeys |= ModifierKeys.Control;
+
+        if (virtualKeyModifiers.HasFlag(VirtualKeyModifiers.Menu)) // Alt key
+            modifierKeys |= ModifierKeys.Alt;
+
+        if (virtualKeyModifiers.HasFlag(VirtualKeyModifiers.Shift))
+            modifierKeys |= ModifierKeys.Shift;
+
+        if (virtualKeyModifiers.HasFlag(VirtualKeyModifiers.Windows))
+            modifierKeys |= ModifierKeys.Windows;
+
+        return modifierKeys;
+    }
+
+    /// <summary>
+    /// Converts Domain ModifierKeys to Windows VirtualKeyModifiers.
+    /// </summary>
+    /// <param name="modifierKeys">The Domain ModifierKeys to convert.</param>
+    /// <returns>The equivalent Windows VirtualKeyModifiers.</returns>
+    public static VirtualKeyModifiers ToVirtualKeyModifiers(this ModifierKeys modifierKeys)
+    {
+        var virtualKeyModifiers = VirtualKeyModifiers.None;
+
+        if (modifierKeys.HasFlag(ModifierKeys.Control))
+            virtualKeyModifiers |= VirtualKeyModifiers.Control;
+
+        if (modifierKeys.HasFlag(ModifierKeys.Alt))
+            virtualKeyModifiers |= VirtualKeyModifiers.Menu; // Alt key
+
+        if (modifierKeys.HasFlag(ModifierKeys.Shift))
+            virtualKeyModifiers |= VirtualKeyModifiers.Shift;
+
+        if (modifierKeys.HasFlag(ModifierKeys.Windows))
+            virtualKeyModifiers |= VirtualKeyModifiers.Windows;
+
+        return virtualKeyModifiers;
+    }
+}
\ No newline at end of file
diff --git a/Wino.Mail.WinUI/Extensions/PrintSettingsExtensions.cs b/Wino.Mail.WinUI/Extensions/PrintSettingsExtensions.cs
new file mode 100644
index 00000000..db40d939
--- /dev/null
+++ b/Wino.Mail.WinUI/Extensions/PrintSettingsExtensions.cs
@@ -0,0 +1,212 @@
+using Microsoft.Web.WebView2.Core;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Printing;
+
+namespace Wino.Mail.WinUI.Extensions;
+
+/// <summary>
+/// Extension methods and utilities for converting between Domain print models and CoreWebView2 print settings.
+/// </summary>
+public static class PrintSettingsExtensions
+{
+    /// <summary>
+    /// Converts a Domain PrintOrientation to CoreWebView2PrintOrientation.
+    /// </summary>
+    public static CoreWebView2PrintOrientation ToCoreWebView2Orientation(this PrintOrientation orientation)
+    {
+        return orientation switch
+        {
+            PrintOrientation.Portrait => CoreWebView2PrintOrientation.Portrait,
+            PrintOrientation.Landscape => CoreWebView2PrintOrientation.Landscape,
+            _ => CoreWebView2PrintOrientation.Portrait
+        };
+    }
+
+    /// <summary>
+    /// Converts a CoreWebView2PrintOrientation to Domain PrintOrientation.
+    /// </summary>
+    public static PrintOrientation ToDomainOrientation(this CoreWebView2PrintOrientation orientation)
+    {
+        return orientation switch
+        {
+            CoreWebView2PrintOrientation.Portrait => PrintOrientation.Portrait,
+            CoreWebView2PrintOrientation.Landscape => PrintOrientation.Landscape,
+            _ => PrintOrientation.Portrait
+        };
+    }
+
+    /// <summary>
+    /// Converts a Domain PrintColorMode to CoreWebView2PrintColorMode.
+    /// </summary>
+    public static CoreWebView2PrintColorMode ToCoreWebView2ColorMode(this PrintColorMode colorMode)
+    {
+        return colorMode switch
+        {
+            PrintColorMode.Default => CoreWebView2PrintColorMode.Default,
+            PrintColorMode.Color => CoreWebView2PrintColorMode.Color,
+            PrintColorMode.Grayscale => CoreWebView2PrintColorMode.Grayscale,
+            _ => CoreWebView2PrintColorMode.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a CoreWebView2PrintColorMode to Domain PrintColorMode.
+    /// </summary>
+    public static PrintColorMode ToDomainColorMode(this CoreWebView2PrintColorMode colorMode)
+    {
+        return colorMode switch
+        {
+            CoreWebView2PrintColorMode.Default => PrintColorMode.Default,
+            CoreWebView2PrintColorMode.Color => PrintColorMode.Color,
+            CoreWebView2PrintColorMode.Grayscale => PrintColorMode.Grayscale,
+            _ => PrintColorMode.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a Domain PrintCollation to CoreWebView2PrintCollation.
+    /// </summary>
+    public static CoreWebView2PrintCollation ToCoreWebView2Collation(this PrintCollation collation)
+    {
+        return collation switch
+        {
+            PrintCollation.Default => CoreWebView2PrintCollation.Default,
+            PrintCollation.Collated => CoreWebView2PrintCollation.Collated,
+            PrintCollation.Uncollated => CoreWebView2PrintCollation.Uncollated,
+            _ => CoreWebView2PrintCollation.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a CoreWebView2PrintCollation to Domain PrintCollation.
+    /// </summary>
+    public static PrintCollation ToDomainCollation(this CoreWebView2PrintCollation collation)
+    {
+        return collation switch
+        {
+            CoreWebView2PrintCollation.Default => PrintCollation.Default,
+            CoreWebView2PrintCollation.Collated => PrintCollation.Collated,
+            CoreWebView2PrintCollation.Uncollated => PrintCollation.Uncollated,
+            _ => PrintCollation.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a Domain PrintDuplex to CoreWebView2PrintDuplex.
+    /// </summary>
+    public static CoreWebView2PrintDuplex ToCoreWebView2Duplex(this PrintDuplex duplex)
+    {
+        // Note: Simplified mapping due to enum value differences
+        return duplex switch
+        {
+            PrintDuplex.Default => CoreWebView2PrintDuplex.Default,
+            _ => CoreWebView2PrintDuplex.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a CoreWebView2PrintDuplex to Domain PrintDuplex.
+    /// </summary>
+    public static PrintDuplex ToDomainDuplex(this CoreWebView2PrintDuplex duplex)
+    {
+        // Note: Simplified mapping due to enum value differences
+        return duplex switch
+        {
+            CoreWebView2PrintDuplex.Default => PrintDuplex.Default,
+            _ => PrintDuplex.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a Domain PrintMediaSize to CoreWebView2PrintMediaSize.
+    /// </summary>
+    public static CoreWebView2PrintMediaSize ToCoreWebView2MediaSize(this PrintMediaSize mediaSize)
+    {
+        // Note: Simplified mapping due to enum value differences
+        return mediaSize switch
+        {
+            PrintMediaSize.Default => CoreWebView2PrintMediaSize.Default,
+            _ => CoreWebView2PrintMediaSize.Default
+        };
+    }
+
+    /// <summary>
+    /// Converts a CoreWebView2PrintMediaSize to Domain PrintMediaSize.
+    /// </summary>
+    public static PrintMediaSize ToDomainMediaSize(this CoreWebView2PrintMediaSize mediaSize)
+    {
+        // Note: Simplified mapping due to enum value differences
+        return mediaSize switch
+        {
+            CoreWebView2PrintMediaSize.Default => PrintMediaSize.Default,
+            _ => PrintMediaSize.Default
+        };
+    }
+
+    /// <summary>
+    /// Creates a CoreWebView2PrintSettings object from a WebView2PrintSettingsModel.
+    /// </summary>
+    /// <param name="model">The domain model containing the print settings.</param>
+    /// <param name="environment">The CoreWebView2Environment to create the settings object.</param>
+    /// <returns>A configured CoreWebView2PrintSettings object.</returns>
+    public static CoreWebView2PrintSettings ToCoreWebView2PrintSettings(
+        this WebView2PrintSettingsModel model, 
+        CoreWebView2Environment environment)
+    {
+        var settings = environment.CreatePrintSettings();
+
+        settings.PrinterName = model.PrinterName;
+        settings.Orientation = model.Orientation.ToCoreWebView2Orientation();
+        settings.ColorMode = model.ColorMode.ToCoreWebView2ColorMode();
+        settings.Collation = model.Collation.ToCoreWebView2Collation();
+        settings.Duplex = model.Duplex.ToCoreWebView2Duplex();
+        settings.MediaSize = model.MediaSize.ToCoreWebView2MediaSize();
+        settings.Copies = model.Copies;
+        settings.MarginTop = model.MarginTop;
+        settings.MarginBottom = model.MarginBottom;
+        settings.MarginLeft = model.MarginLeft;
+        settings.MarginRight = model.MarginRight;
+        settings.ShouldPrintBackgrounds = model.ShouldPrintBackgrounds;
+        settings.ShouldPrintSelectionOnly = model.ShouldPrintSelectionOnly;
+        settings.ShouldPrintHeaderAndFooter = model.ShouldPrintHeaderAndFooter;
+        settings.HeaderTitle = model.HeaderTitle;
+        settings.FooterUri = model.FooterUri;
+        settings.ScaleFactor = model.ScaleFactor;
+        settings.PagesPerSide = model.PagesPerSide;
+        settings.PageRanges = model.PageRanges;
+
+        return settings;
+    }
+
+    /// <summary>
+    /// Updates a WebView2PrintSettingsModel from a CoreWebView2PrintSettings object.
+    /// </summary>
+    /// <param name="model">The domain model to update.</param>
+    /// <param name="settings">The source CoreWebView2PrintSettings.</param>
+    public static void FromCoreWebView2PrintSettings(
+        this WebView2PrintSettingsModel model,
+        CoreWebView2PrintSettings settings)
+    {
+        if (settings == null) return;
+
+        model.PrinterName = settings.PrinterName ?? string.Empty;
+        model.Orientation = settings.Orientation.ToDomainOrientation();
+        model.ColorMode = settings.ColorMode.ToDomainColorMode();
+        model.Collation = settings.Collation.ToDomainCollation();
+        model.Duplex = settings.Duplex.ToDomainDuplex();
+        model.MediaSize = settings.MediaSize.ToDomainMediaSize();
+        model.Copies = settings.Copies;
+        model.MarginTop = settings.MarginTop;
+        model.MarginBottom = settings.MarginBottom;
+        model.MarginLeft = settings.MarginLeft;
+        model.MarginRight = settings.MarginRight;
+        model.ShouldPrintBackgrounds = settings.ShouldPrintBackgrounds;
+        model.ShouldPrintSelectionOnly = settings.ShouldPrintSelectionOnly;
+        model.ShouldPrintHeaderAndFooter = settings.ShouldPrintHeaderAndFooter;
+        model.HeaderTitle = settings.HeaderTitle ?? string.Empty;
+        model.FooterUri = settings.FooterUri ?? string.Empty;
+        model.ScaleFactor = settings.ScaleFactor;
+        model.PagesPerSide = settings.PagesPerSide;
+        model.PageRanges = settings.PageRanges ?? string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/Wino.Core.UWP/Extensions/StartupTaskStateExtensions.cs b/Wino.Mail.WinUI/Extensions/StartupTaskStateExtensions.cs
similarity index 90%
rename from Wino.Core.UWP/Extensions/StartupTaskStateExtensions.cs
rename to Wino.Mail.WinUI/Extensions/StartupTaskStateExtensions.cs
index 87ab5ec2..3bd812f8 100644
--- a/Wino.Core.UWP/Extensions/StartupTaskStateExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/StartupTaskStateExtensions.cs
@@ -1,7 +1,7 @@
-using Windows.ApplicationModel;
+using Windows.ApplicationModel;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Mail.WinUI.Extensions;
 
 public static class StartupTaskStateExtensions
 {
diff --git a/Wino.Core.UWP/Extensions/StorageFileExtensions.cs b/Wino.Mail.WinUI/Extensions/StorageFileExtensions.cs
similarity index 93%
rename from Wino.Core.UWP/Extensions/StorageFileExtensions.cs
rename to Wino.Mail.WinUI/Extensions/StorageFileExtensions.cs
index 7cd6f118..9d7297d6 100644
--- a/Wino.Core.UWP/Extensions/StorageFileExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/StorageFileExtensions.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Wino.Core.Domain.Models.Common;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Mail.WinUI.Extensions;
 
 public static class StorageFileExtensions
 {
diff --git a/Wino.Core.UWP/Extensions/UIExtensions.cs b/Wino.Mail.WinUI/Extensions/UIExtensions.cs
similarity index 93%
rename from Wino.Core.UWP/Extensions/UIExtensions.cs
rename to Wino.Mail.WinUI/Extensions/UIExtensions.cs
index 698b654a..26dfcccd 100644
--- a/Wino.Core.UWP/Extensions/UIExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/UIExtensions.cs
@@ -1,4 +1,4 @@
-using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Extensions;
diff --git a/Wino.Core.UWP/Extensions/UtilExtensions.cs b/Wino.Mail.WinUI/Extensions/UtilExtensions.cs
similarity index 85%
rename from Wino.Core.UWP/Extensions/UtilExtensions.cs
rename to Wino.Mail.WinUI/Extensions/UtilExtensions.cs
index 6360a5df..8ea7d554 100644
--- a/Wino.Core.UWP/Extensions/UtilExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/UtilExtensions.cs
@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Media;
 using Windows.Foundation;
-using Windows.UI.Composition;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Hosting;
-using Windows.UI.Xaml.Media;
 
 namespace Wino.Extensions;
 
@@ -22,9 +22,9 @@ public static class UtilExtensions
         {
             var child = VisualTreeHelper.GetChild(parent, i);
 
-            if (child is FrameworkElement)
+            if (child is FrameworkElement frameworkElement)
             {
-                list.Add(child as FrameworkElement);
+                list.Add(frameworkElement);
             }
 
             list.AddRange(Children(child));
@@ -33,20 +33,13 @@ public static class UtilExtensions
         return list;
     }
 
-    public static T GetChildByName<T>(this DependencyObject parent, string name)
+    public static T? GetChildByName<T>(this DependencyObject parent, string name) where T : class
     {
         var childControls = Children(parent);
         var controls = childControls.OfType<FrameworkElement>();
 
-        if (controls == null)
-        {
-            return default(T);
-        }
-
         var control = controls
-            .Where(x => x.Name.Equals(name))
-            .Cast<T>()
-            .First();
+            .FirstOrDefault(x => x.Name.Equals(name)) as T;
 
         return control;
     }
diff --git a/Wino.Core.UWP/Extensions/WebViewExtensions.cs b/Wino.Mail.WinUI/Extensions/WebViewExtensions.cs
similarity index 58%
rename from Wino.Core.UWP/Extensions/WebViewExtensions.cs
rename to Wino.Mail.WinUI/Extensions/WebViewExtensions.cs
index 1edbe6fb..0682cbf6 100644
--- a/Wino.Core.UWP/Extensions/WebViewExtensions.cs
+++ b/Wino.Mail.WinUI/Extensions/WebViewExtensions.cs
@@ -1,20 +1,38 @@
-using System;
+using System;
 using System.Threading.Tasks;
 
-namespace Wino.Core.UWP.Extensions;
+namespace Wino.Mail.WinUI.Extensions;
 
 public static class WebViewExtensions
 {
+    private static bool _environmentInitialized;
+
+    /// <summary>
+    /// Sets WebView2 environment variables once per process.
+    /// Must be called before any WebView2 is initialized.
+    /// </summary>
+    public static void EnsureWebView2Environment()
+    {
+        if (_environmentInitialized) return;
+
+        Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
+        Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS",
+            "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation,msWebView2CodeCache");
+
+        _environmentInitialized = true;
+    }
+
     /// <summary>
     /// Executes a script function in the WebView2 control.
     /// </summary>
-    /// <param name="isChromiumDisposed">Weird parameter that needed in mailRendering page. TODO: should be reconsidered.</param>
     /// <param name="parameters">Parameters should be serialized to json</param>
-    public static async Task<string> ExecuteScriptFunctionAsync(this Microsoft.UI.Xaml.Controls.WebView2 Chromium, string functionName, bool isChromiumDisposed = false, params string[] parameters)
+    public static async Task<string> ExecuteScriptFunctionAsync(this Microsoft.UI.Xaml.Controls.WebView2 Chromium, string functionName, params string[] parameters)
     {
+        if (Chromium?.CoreWebView2 == null) return string.Empty;
+
         string script = functionName + "(" + string.Join(", ", parameters) + ");";
 
-        return isChromiumDisposed ? string.Empty : await Chromium.ExecuteScriptAsync(script);
+        return await Chromium.ExecuteScriptAsync(script);
     }
 
     public static async Task<string> ExecuteScriptFunctionSafeAsync(this Microsoft.UI.Xaml.Controls.WebView2 Chromium, string functionName, params string[] parameters)
diff --git a/Wino.Mail.WinUI/Helpers/BreadcrumbNavigationHelper.cs b/Wino.Mail.WinUI/Helpers/BreadcrumbNavigationHelper.cs
new file mode 100644
index 00000000..6e50c8c9
--- /dev/null
+++ b/Wino.Mail.WinUI/Helpers/BreadcrumbNavigationHelper.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.ObjectModel;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
+using Wino.Core.Domain.Enums;
+using Wino.Mail.ViewModels.Data;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Helpers;
+
+public static class BreadcrumbNavigationHelper
+{
+    public static bool Navigate(
+        Frame frame,
+        ObservableCollection<BreadcrumbNavigationItemViewModel> pageHistory,
+        BreadcrumbNavigationRequested message,
+        Func<WinoPage, Type> getPageType)
+    {
+        var pageType = getPageType(message.PageType);
+
+        if (pageType == null)
+            return false;
+
+        frame.Navigate(pageType, message.Parameter, new SlideNavigationTransitionInfo
+        {
+            Effect = SlideNavigationTransitionEffect.FromRight
+        });
+
+        SetActiveItem(pageHistory, null);
+        pageHistory.Add(new BreadcrumbNavigationItemViewModel(
+            message,
+            isActive: true,
+            stepNumber: pageHistory.Count + 1,
+            backStackDepth: frame.BackStack.Count + 1));
+
+        return true;
+    }
+
+    public static bool GoBack(
+        Frame frame,
+        ObservableCollection<BreadcrumbNavigationItemViewModel> pageHistory,
+        NavigationTransitionEffect slideEffect)
+    {
+        if (!frame.CanGoBack || pageHistory.Count == 0)
+            return false;
+
+        pageHistory.RemoveAt(pageHistory.Count - 1);
+        frame.GoBack(new SlideNavigationTransitionInfo
+        {
+            Effect = slideEffect == NavigationTransitionEffect.FromLeft
+                ? SlideNavigationTransitionEffect.FromLeft
+                : SlideNavigationTransitionEffect.FromRight
+        });
+
+        SetActiveItem(pageHistory, pageHistory.Count > 0 ? pageHistory[^1] : null);
+        return true;
+    }
+
+    public static bool NavigateTo(
+        Frame frame,
+        ObservableCollection<BreadcrumbNavigationItemViewModel> pageHistory,
+        int targetIndex)
+    {
+        if (targetIndex < 0 || targetIndex >= pageHistory.Count)
+            return false;
+
+        var activeIndex = GetActiveIndex(pageHistory);
+        if (activeIndex <= 0 || targetIndex >= activeIndex)
+            return false;
+
+        var targetItem = pageHistory[targetIndex];
+
+        while (frame.BackStack.Count > targetItem.BackStackDepth)
+        {
+            frame.BackStack.RemoveAt(frame.BackStack.Count - 1);
+        }
+
+        if (!frame.CanGoBack)
+            return false;
+
+        frame.GoBack(new SlideNavigationTransitionInfo
+        {
+            Effect = SlideNavigationTransitionEffect.FromLeft
+        });
+
+        while (pageHistory.Count > targetIndex + 1)
+        {
+            pageHistory.RemoveAt(pageHistory.Count - 1);
+        }
+
+        SetActiveItem(pageHistory, targetItem);
+        return true;
+    }
+
+    private static int GetActiveIndex(ObservableCollection<BreadcrumbNavigationItemViewModel> pageHistory)
+    {
+        for (var i = 0; i < pageHistory.Count; i++)
+        {
+            if (pageHistory[i].IsActive)
+                return i;
+        }
+
+        return -1;
+    }
+
+    private static void SetActiveItem(
+        ObservableCollection<BreadcrumbNavigationItemViewModel> pageHistory,
+        BreadcrumbNavigationItemViewModel? activeItem)
+    {
+        foreach (var item in pageHistory)
+        {
+            item.IsActive = ReferenceEquals(item, activeItem);
+        }
+    }
+}
diff --git a/Wino.Calendar/Helpers/CalendarXamlHelpers.cs b/Wino.Mail.WinUI/Helpers/CalendarXamlHelpers.cs
similarity index 51%
rename from Wino.Calendar/Helpers/CalendarXamlHelpers.cs
rename to Wino.Mail.WinUI/Helpers/CalendarXamlHelpers.cs
index cdc7c4d8..cc928bab 100644
--- a/Wino.Calendar/Helpers/CalendarXamlHelpers.cs
+++ b/Wino.Mail.WinUI/Helpers/CalendarXamlHelpers.cs
@@ -1,8 +1,9 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Ical.Net.CalendarComponents;
 using Ical.Net.DataTypes;
-using Windows.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Collections;
@@ -15,11 +16,8 @@ namespace Wino.Calendar.Helpers;
 public static class CalendarXamlHelpers
 {
     public static CalendarItemViewModel GetFirstAllDayEvent(CalendarEventCollection collection)
-        => (CalendarItemViewModel)collection.AllDayEvents.FirstOrDefault();
+        => collection.AllDayEvents.OfType<CalendarItemViewModel>().FirstOrDefault()!;
 
-    /// <summary>
-    /// Returns full date + duration info in Event Details page details title.
-    /// </summary>
     public static string GetEventDetailsDateString(CalendarItemViewModel calendarItemViewModel, CalendarSettings settings)
     {
         if (calendarItemViewModel == null || settings == null) return string.Empty;
@@ -34,17 +32,17 @@ public static class CalendarXamlHelpers
         {
             return $"{start.ToString($"dd MMMM ddd {timeFormat}", settings.CultureInfo)} - {end.ToString($"dd MMMM ddd {timeFormat}", settings.CultureInfo)}";
         }
-        else
-        {
-            return $"{start.ToString(dateFormat, settings.CultureInfo)} - {end.ToString(timeFormat, settings.CultureInfo)}";
-        }
+
+        return $"{start.ToString(dateFormat, settings.CultureInfo)} - {end.ToString(timeFormat, settings.CultureInfo)}";
     }
 
-    public static string GetRecurrenceString(CalendarItemViewModel calendarItemViewModel)
+    public static string GetRecurrenceString(CalendarItemViewModel calendarItemViewModel, CalendarSettings settings)
     {
-        if (calendarItemViewModel == null || !calendarItemViewModel.IsRecurringChild) return string.Empty;
+        if (calendarItemViewModel == null || string.IsNullOrEmpty(calendarItemViewModel.CalendarItem.Recurrence))
+        {
+            return string.Empty;
+        }
 
-        // Parse recurrence rules
         var calendarEvent = new CalendarEvent
         {
             Start = new CalDateTime(calendarItemViewModel.StartDate),
@@ -52,44 +50,50 @@ public static class CalendarXamlHelpers
         };
 
         var recurrenceLines = Regex.Split(calendarItemViewModel.CalendarItem.Recurrence, Constants.CalendarEventRecurrenceRuleSeperator);
-
-        foreach (var line in recurrenceLines)
+        foreach (var line in recurrenceLines.Where(line => !string.IsNullOrWhiteSpace(line)))
         {
             calendarEvent.RecurrenceRules.Add(new RecurrencePattern(line));
         }
 
-        if (calendarEvent.RecurrenceRules == null || !calendarEvent.RecurrenceRules.Any())
+        var recurrenceRule = calendarEvent.RecurrenceRules.FirstOrDefault();
+        if (recurrenceRule == null)
         {
-            return "No recurrence pattern.";
+            return string.Empty;
         }
 
-        var recurrenceRule = calendarEvent.RecurrenceRules.First();
-        var daysOfWeek = string.Join(", ", recurrenceRule.ByDay.Select(day => day.DayOfWeek.ToString()));
-        string timeZone = calendarEvent.DtStart.TzId ?? "UTC";
+        var frequency = MapFrequency(recurrenceRule.Frequency.ToString());
+        if (!frequency.HasValue)
+        {
+            return string.Empty;
+        }
 
-        return $"Every {daysOfWeek}, effective {calendarEvent.DtStart.Value.ToShortDateString()} " +
-               $"from {calendarEvent.DtStart.Value.ToShortTimeString()} to {calendarEvent.DtEnd.Value.ToShortTimeString()} " +
-               $"{timeZone}.";
+        return CalendarRecurrenceSummaryFormatter.BuildSummary(
+            isRecurring: true,
+            effectiveStart: calendarItemViewModel.Period.Start,
+            effectiveEnd: calendarItemViewModel.Period.End,
+            isAllDay: calendarItemViewModel.IsAllDayEvent,
+            settings: settings,
+            interval: recurrenceRule.Interval <= 0 ? 1 : recurrenceRule.Interval,
+            frequency: frequency.Value,
+            daysOfWeek: recurrenceRule.ByDay?.Select(day => day.DayOfWeek).ToList() ?? [],
+            recurrenceEndDate: recurrenceRule.Until == default ? null : new DateTimeOffset(recurrenceRule.Until));
     }
 
     public static string GetDetailsPopupDurationString(CalendarItemViewModel calendarItemViewModel, CalendarSettings settings)
     {
         if (calendarItemViewModel == null || settings == null) return string.Empty;
 
-        // Single event in a day.
         if (!calendarItemViewModel.IsAllDayEvent && !calendarItemViewModel.IsMultiDayEvent)
         {
             return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} {settings.GetTimeString(calendarItemViewModel.Period.Duration)}";
         }
-        else if (calendarItemViewModel.IsMultiDayEvent)
+
+        if (calendarItemViewModel.IsMultiDayEvent)
         {
             return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} - {calendarItemViewModel.Period.End.ToString("d", settings.CultureInfo)}";
         }
-        else
-        {
-            // All day event.
-            return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} ({Translator.CalendarItemAllDay})";
-        }
+
+        return $"{calendarItemViewModel.Period.Start.ToString("d", settings.CultureInfo)} ({Translator.CalendarItemAllDay})";
     }
 
     public static PopupPlacementMode GetDesiredPlacementModeForEventsDetailsPopup(
@@ -98,9 +102,41 @@ public static class CalendarXamlHelpers
     {
         if (calendarItemViewModel == null) return PopupPlacementMode.Auto;
 
-        // All and/or multi day events always go to the top of the screen.
         if (calendarItemViewModel.IsAllDayEvent || calendarItemViewModel.IsMultiDayEvent) return PopupPlacementMode.Bottom;
 
         return XamlHelpers.GetPlaccementModeForCalendarType(calendarDisplayType);
     }
+
+    public static bool HasOnlineMeetingLink(CalendarItemViewModel calendarItemViewModel)
+        => calendarItemViewModel != null && !string.IsNullOrEmpty(calendarItemViewModel.CalendarItem?.HtmlLink);
+
+    public static string GetAttendeeStatusText(AttendeeStatus status)
+    {
+        return status switch
+        {
+            AttendeeStatus.Accepted => Translator.CalendarAttendeeStatus_Accepted,
+            AttendeeStatus.Declined => Translator.CalendarAttendeeStatus_Declined,
+            AttendeeStatus.Tentative => Translator.CalendarAttendeeStatus_Tentative,
+            AttendeeStatus.NeedsAction => Translator.CalendarAttendeeStatus_NeedsAction,
+            _ => string.Empty
+        };
+    }
+
+    public static Microsoft.UI.Xaml.Visibility GetAttendeeStatusVisibility(AttendeeStatus status)
+    {
+        return Microsoft.UI.Xaml.Visibility.Visible;
+    }
+
+    private static CalendarItemRecurrenceFrequency? MapFrequency(string frequency)
+    {
+        return frequency.ToUpperInvariant() switch
+        {
+            "DAILY" => CalendarItemRecurrenceFrequency.Daily,
+            "WEEKLY" => CalendarItemRecurrenceFrequency.Weekly,
+            "MONTHLY" => CalendarItemRecurrenceFrequency.Monthly,
+            "YEARLY" => CalendarItemRecurrenceFrequency.Yearly,
+            _ => null
+        };
+    }
 }
+
diff --git a/Wino.Mail.WinUI/Helpers/WindowCleanupHelper.cs b/Wino.Mail.WinUI/Helpers/WindowCleanupHelper.cs
new file mode 100644
index 00000000..4aa5b138
--- /dev/null
+++ b/Wino.Mail.WinUI/Helpers/WindowCleanupHelper.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+
+namespace Wino.Mail.WinUI.Helpers;
+
+internal static class WindowCleanupHelper
+{
+    public static void CleanupFrame(Frame? frame)
+    {
+        if (frame == null)
+            return;
+
+        CleanupObject(frame.Content);
+        frame.BackStack.Clear();
+        frame.ForwardStack.Clear();
+        frame.Content = null;
+    }
+
+    public static void CleanupObject(object? instance)
+    {
+        if (instance == null)
+            return;
+
+        var visited = new HashSet<object>(ReferenceEqualityComparer.Instance);
+        CleanupObject(instance, visited);
+    }
+
+    private static void CleanupObject(object? instance, HashSet<object> visited)
+    {
+        if (instance == null || !visited.Add(instance))
+            return;
+
+        switch (instance)
+        {
+            case Views.WinoAppShell shell:
+                shell.PrepareForWindowClose();
+                break;
+            case Frame frame:
+                CleanupFrame(frame);
+                break;
+            case BasePage page:
+                page.PrepareForClose();
+                break;
+        }
+
+        if (instance is DependencyObject dependencyObject)
+        {
+            var childCount = VisualTreeHelper.GetChildrenCount(dependencyObject);
+            for (int i = 0; i < childCount; i++)
+            {
+                CleanupObject(VisualTreeHelper.GetChild(dependencyObject, i), visited);
+            }
+        }
+
+        if (instance is IDisposable disposable)
+        {
+            disposable.Dispose();
+        }
+    }
+
+    private sealed class ReferenceEqualityComparer : IEqualityComparer<object>
+    {
+        public static ReferenceEqualityComparer Instance { get; } = new();
+
+        public new bool Equals(object? x, object? y) => ReferenceEquals(x, y);
+
+        public int GetHashCode(object obj) => System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode(obj);
+    }
+}
diff --git a/Wino.Core.UWP/Helpers/WinoVisualTreeHelper.cs b/Wino.Mail.WinUI/Helpers/WinoVisualTreeHelper.cs
similarity index 69%
rename from Wino.Core.UWP/Helpers/WinoVisualTreeHelper.cs
rename to Wino.Mail.WinUI/Helpers/WinoVisualTreeHelper.cs
index 86f8181c..0082d243 100644
--- a/Wino.Core.UWP/Helpers/WinoVisualTreeHelper.cs
+++ b/Wino.Mail.WinUI/Helpers/WinoVisualTreeHelper.cs
@@ -1,23 +1,25 @@
-using System.Collections.Generic;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Media;
+using System.Collections.Generic;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
 
 namespace Wino.Helpers;
 
 public static class WinoVisualTreeHelper
 {
-    public static T GetChildObject<T>(DependencyObject obj, string name) where T : FrameworkElement
+    public static T? GetChildObject<T>(DependencyObject? obj, string name) where T : FrameworkElement
     {
-        DependencyObject child = null;
-        T grandChild = null;
+        if (obj == null) return null;
+
+        DependencyObject? child = null;
+        T? grandChild = null;
 
         for (int i = 0; i <= VisualTreeHelper.GetChildrenCount(obj) - 1; i++)
         {
             child = VisualTreeHelper.GetChild(obj, i);
 
-            if (child is T && (((T)child).Name == name | string.IsNullOrEmpty(name)))
+            if (child is T typedChild && (typedChild.Name == name || string.IsNullOrEmpty(name)))
             {
-                return (T)child;
+                return typedChild;
             }
             else
             {
@@ -31,7 +33,7 @@ public static class WinoVisualTreeHelper
         return null;
     }
 
-    public static IEnumerable<T> FindDescendants<T>(this DependencyObject depObj) where T : DependencyObject
+    public static IEnumerable<T> FindDescendants<T>(this DependencyObject? depObj) where T : DependencyObject
     {
         if (depObj != null)
         {
diff --git a/Wino.Core.UWP/Helpers/XamlHelpers.cs b/Wino.Mail.WinUI/Helpers/XamlHelpers.cs
similarity index 86%
rename from Wino.Core.UWP/Helpers/XamlHelpers.cs
rename to Wino.Mail.WinUI/Helpers/XamlHelpers.cs
index 721b45d5..60f0f076 100644
--- a/Wino.Core.UWP/Helpers/XamlHelpers.cs
+++ b/Wino.Mail.WinUI/Helpers/XamlHelpers.cs
@@ -1,20 +1,22 @@
-using System;
+using System;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using CommunityToolkit.WinUI.Helpers;
+using Microsoft.UI;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
 using Windows.UI;
 using Windows.UI.Text;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 
 namespace Wino.Helpers;
 
@@ -25,6 +27,7 @@ public static class XamlHelpers
 
     #region Converters
 
+    public static Thickness GetMailItemControlMargin(bool isDisplayedInThread) => isDisplayedInThread ? new Thickness(40, 0, 6, 0) : new Thickness(6, 0, 6, 0);
     public static bool IsMultiple(int count) => count > 1;
     public static bool ReverseIsMultiple(int count) => count < 1;
     public static PopupPlacementMode GetPlaccementModeForCalendarType(CalendarDisplayType type)
@@ -36,14 +39,38 @@ public static class XamlHelpers
         };
     }
 
+    public static Visibility BoolToVisibilityConverter(bool value) => value ? Visibility.Visible : Visibility.Collapsed;
     public static Visibility ReverseBoolToVisibilityConverter(bool value) => value ? Visibility.Collapsed : Visibility.Visible;
     public static Visibility ReverseVisibilityConverter(Visibility visibility) => visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
     public static bool ReverseBoolConverter(bool value) => !value;
-    public static bool ShouldDisplayPreview(string text) => text.Any(x => char.IsLetter(x));
+    public static GridLength DoubleToGridLength(double value) => new(value);
+    public static bool AreEqual(int value1, int value2) => value1 == value2;
+    public static bool ShouldDisplayPreview(string text) => text == null ? false : text.Any(x => char.IsLetter(x));
     public static bool CountToBooleanConverter(int value) => value > 0;
     public static bool ObjectEquals(object obj1, object obj2) => object.Equals(obj1, obj2);
     public static Visibility CountToVisibilityConverter(int value) => value > 0 ? Visibility.Visible : Visibility.Collapsed;
     public static Visibility CountToVisibilityConverterWithThreshold(int value, int threshold) => value > threshold ? Visibility.Visible : Visibility.Collapsed;
+    public static ListViewSelectionMode BoolToSelectionMode(bool isSelectionMode) => isSelectionMode ? ListViewSelectionMode.Multiple : ListViewSelectionMode.None;
+    public static string BoolToSelectionModeText(bool isSelectionMode) => isSelectionMode ? Translator.Buttons_Cancel : Translator.Buttons_Multiselect;
+
+    public static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? Base64ToBitmapImage(string base64String)
+    {
+        if (string.IsNullOrEmpty(base64String))
+            return null;
+
+        try
+        {
+            var imageBytes = Convert.FromBase64String(base64String);
+            using var stream = new System.IO.MemoryStream(imageBytes);
+            var bitmap = new Microsoft.UI.Xaml.Media.Imaging.BitmapImage();
+            bitmap.SetSource(stream.AsRandomAccessStream());
+            return bitmap;
+        }
+        catch
+        {
+            return null;
+        }
+    }
     public static InfoBarSeverity InfoBarSeverityConverter(InfoBarMessageType messageType)
     {
         return messageType switch
@@ -103,9 +130,19 @@ public static class XamlHelpers
     public static Color GetWindowsColorFromHex(string hex) => hex.ToColor();
 
     public static SolidColorBrush GetSolidColorBrushFromHex(string colorHex) => string.IsNullOrEmpty(colorHex) ? new SolidColorBrush(Colors.Transparent) : new SolidColorBrush(colorHex.ToColor());
-    public static Visibility IsSelectionModeMultiple(ListViewSelectionMode mode) => mode == ListViewSelectionMode.Multiple ? Visibility.Visible : Visibility.Collapsed;
     public static FontWeight GetFontWeightBySyncState(bool isSyncing) => isSyncing ? FontWeights.SemiBold : FontWeights.Normal;
+
+    public static Brush GetWizardStepBadgeBrush(bool isActive)
+        => isActive
+            ? (Brush)Application.Current.Resources["AccentFillColorDefaultBrush"]
+            : new SolidColorBrush(Color.FromArgb(30, 128, 128, 128));
+
+    public static Brush GetWizardStepNumberForeground(bool isActive)
+        => isActive
+            ? new SolidColorBrush(Colors.White)
+            : (Brush)Application.Current.Resources["TextFillColorSecondaryBrush"];
     public static FontWeight GetFontWeightByChildSelectedState(bool isChildSelected) => isChildSelected ? FontWeights.SemiBold : FontWeights.Normal;
+    public static FontWeight GetFontWeightByReadState(bool isChildSelected) => isChildSelected ? FontWeights.Normal : FontWeights.SemiBold;
     public static Visibility StringToVisibilityConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
     public static Visibility StringToVisibilityReversedConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Visible : Visibility.Collapsed;
     public static string GetMailItemDisplaySummaryForListing(bool isDraft, DateTime receivedDate, bool prefer24HourTime)
@@ -129,12 +166,12 @@ public static class XamlHelpers
         if (groupObject is string stringObject)
             return stringObject;
 
-        object dateObject = null;
+        object? dateObject = null;
 
         // From regular mail header template
         if (groupObject is DateTime groupedDate)
             dateObject = groupedDate;
-        else if (groupObject is IGrouping<object, IMailItem> groupKey)
+        else if (groupObject is IGrouping<object, MailCopy> groupKey)
         {
             // From semantic group header.
             dateObject = groupKey.Key;
@@ -155,12 +192,12 @@ public static class XamlHelpers
 
             }
             else
-                return dateObject.ToString();
+                return dateObject.ToString() ?? string.Empty;
         }
 
         return Translator.UnknownDateHeader;
     }
-    public static bool ConnectionStatusEquals(WinoServerConnectionStatus winoServerConnectionStatus, WinoServerConnectionStatus connectionStatus) => winoServerConnectionStatus == connectionStatus;
+
 
     #endregion
 
@@ -295,7 +332,11 @@ public static class XamlHelpers
         "<Path " +
         "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation'>" +
         "<Path.Data>" + pathMarkup + "</Path.Data></Path>";
-        var path = XamlReader.Load(xaml) as Windows.UI.Xaml.Shapes.Path;
+        var path = XamlReader.Load(xaml) as Microsoft.UI.Xaml.Shapes.Path;
+        if (path?.Data == null)
+        {
+            return new PathGeometry();
+        }
 
         Geometry geometry = path.Data;
         path.Data = null;
diff --git a/Wino.Mail.WinUI/Interfaces/ICalendarReminderServer.cs b/Wino.Mail.WinUI/Interfaces/ICalendarReminderServer.cs
new file mode 100644
index 00000000..896fbc4e
--- /dev/null
+++ b/Wino.Mail.WinUI/Interfaces/ICalendarReminderServer.cs
@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Wino.Mail.WinUI.Interfaces;
+
+public interface ICalendarReminderServer
+{
+    Task StartAsync();
+}
diff --git a/Wino.Mail.WinUI/Interfaces/ITitleBarSearchHost.cs b/Wino.Mail.WinUI/Interfaces/ITitleBarSearchHost.cs
new file mode 100644
index 00000000..2d58f274
--- /dev/null
+++ b/Wino.Mail.WinUI/Interfaces/ITitleBarSearchHost.cs
@@ -0,0 +1,16 @@
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using Wino.Mail.WinUI.Models;
+
+namespace Wino.Mail.WinUI.Interfaces;
+
+public interface ITitleBarSearchHost
+{
+    string SearchText { get; set; }
+    string SearchPlaceholderText { get; }
+    ObservableCollection<TitleBarSearchSuggestion> SearchSuggestions { get; }
+
+    Task OnTitleBarSearchTextChangedAsync();
+    void OnTitleBarSearchSuggestionChosen(TitleBarSearchSuggestion suggestion);
+    Task OnTitleBarSearchSubmittedAsync(string queryText, TitleBarSearchSuggestion? chosenSuggestion);
+}
diff --git a/Wino.Mail.WinUI/Interfaces/IWinoShellWindow.cs b/Wino.Mail.WinUI/Interfaces/IWinoShellWindow.cs
new file mode 100644
index 00000000..6ee23b92
--- /dev/null
+++ b/Wino.Mail.WinUI/Interfaces/IWinoShellWindow.cs
@@ -0,0 +1,13 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Wino.Mail.WinUI.Interfaces;
+
+public interface IWinoShellWindow
+{
+    void HandleAppActivation(string? launchArguments, string? tileId = null, string? appId = null);
+    TitleBar GetTitleBar();
+    Frame GetMainFrame();
+    FrameworkElement GetRootContent();
+}
diff --git a/Wino.Mail.WinUI/Interfaces/IWinoWindowManager.cs b/Wino.Mail.WinUI/Interfaces/IWinoWindowManager.cs
new file mode 100644
index 00000000..c8a724e4
--- /dev/null
+++ b/Wino.Mail.WinUI/Interfaces/IWinoWindowManager.cs
@@ -0,0 +1,24 @@
+using System;
+using Microsoft.UI.Xaml.Controls;
+using WinUIEx;
+using Wino.Mail.WinUI.Models;
+
+namespace Wino.Mail.WinUI.Interfaces;
+
+public interface IWinoWindowManager
+{
+    event EventHandler<WindowEx?> ActiveWindowChanged;
+    event EventHandler<WindowEx> WindowRemoved;
+
+    WindowEx? ActiveWindow { get; }
+    WindowEx CreateWindow(WinoWindowKind kind, Func<WindowEx> factory, string? name = null);
+    WindowEx? GetWindow(WinoWindowKind kind, string? name = null);
+    WindowEx? GetWindow(string name);
+    void ActivateWindow(WindowEx window);
+    bool ActivateWindow(WinoWindowKind kind, string? name = null);
+    void HideWindow(WindowEx window);
+    bool HideWindow(WinoWindowKind kind, string? name = null);
+    void SetPrimaryNavigationFrame(WinoWindowKind kind, Frame frame, string? name = null);
+    Frame? GetPrimaryNavigationFrame(WinoWindowKind kind, string? name = null);
+    void CloseAllWindows();
+}
diff --git a/Wino.Mail/JS/editor.html b/Wino.Mail.WinUI/JS/editor.html
similarity index 100%
rename from Wino.Mail/JS/editor.html
rename to Wino.Mail.WinUI/JS/editor.html
diff --git a/Wino.Mail.WinUI/JS/editor.js b/Wino.Mail.WinUI/JS/editor.js
new file mode 100644
index 00000000..b8c4a031
--- /dev/null
+++ b/Wino.Mail.WinUI/JS/editor.js
@@ -0,0 +1,849 @@
+const joditConfig = {
+    "useSearch": false,
+    "toolbar": true,
+    "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align,lineHeight,table",
+    "inline": true,
+    "toolbarAdaptive": false,
+    "toolbarInlineForSelection": false,
+    "showCharsCounter": false,
+    "showWordsCounter": false,
+    "showXPathInStatusbar": false,
+    "spellcheck": true,
+    "link": {
+        "processVideoLink": false
+    },
+    "disablePlugins": "add-new-line,backspace",
+    "showPlaceholder": false,
+    "uploader": {
+        "insertImageAsBase64URI": true
+    },
+    "enter": "DIV"
+};
+
+let editor;
+let editorDomObserver;
+let selectionChangeHandler;
+let stateSyncQueued = false;
+let imageInputBound = false;
+let inlineFontsPluginRegistered = false;
+let lastKnownRange = null;
+let availableTextColors = [];
+let availableHighlightColors = [];
+
+function initializeJodit(fonts, defaultComposerFont, defaultComposerFontSize, defaultReaderFont, defaultReaderFontSize, textColors, highlightColors) {
+    if (editor) {
+        scheduleStateSync();
+        return true;
+    }
+
+    availableTextColors = Array.isArray(textColors) ? textColors.map(normalizeColor).filter(Boolean) : [];
+    availableHighlightColors = Array.isArray(highlightColors) ? highlightColors.map(normalizeColor).filter(Boolean) : [];
+
+    const fontsWithFallbackObject = fonts.reduce((acc, font) => {
+        acc[`'${font}',Arial,sans-serif`] = font;
+        return acc;
+    }, {});
+
+    const mergedConfig = {
+        ...joditConfig,
+        controls: {
+            font: {
+                list: Jodit.atom(fontsWithFallbackObject)
+            }
+        },
+        style: { font: `${defaultReaderFontSize}px ${defaultReaderFont}` }
+    };
+
+    if (!inlineFontsPluginRegistered) {
+        Jodit.plugins.add('inlineFonts', jodit => {
+            jodit.events.on('afterEnter', () => {
+                const current = getSelectionElement();
+                if (!current) {
+                    return;
+                }
+
+                current.style.fontFamily = `'${defaultComposerFont}',Arial,sans-serif`;
+                current.style.fontSize = `${defaultComposerFontSize}px`;
+                rememberSelection();
+                scheduleStateSync();
+            });
+        });
+
+        inlineFontsPluginRegistered = true;
+    }
+
+    editor = Jodit.make('#editor', mergedConfig);
+
+    bindImageInput();
+    bindEditorStateTracking();
+    toggleToolbar(false);
+    scheduleStateSync();
+
+    return true;
+}
+
+function RenderHTML(htmlString) {
+    if (!editor) {
+        return;
+    }
+
+    editor.value = htmlString;
+    editor.synchronizeValues();
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function GetHTMLContent() {
+    return editor ? editor.value : '';
+}
+
+function SetLightEditor() {
+    DarkReader.disable();
+}
+
+function SetDarkEditor() {
+    DarkReader.enable();
+}
+
+function toggleToolbar(enable) {
+    const toolbar = document.querySelector('.jodit-toolbar__box');
+    if (toolbar) {
+        toolbar.style.display = enable ? 'flex' : 'none';
+    }
+
+    scheduleStateSync();
+}
+
+function setSpellCheck(enable) {
+    if (!editor || !editor.editor) {
+        return;
+    }
+
+    const isEnabled = !!enable;
+    editor.options.spellcheck = isEnabled;
+    editor.editor.spellcheck = isEnabled;
+    editor.editor.setAttribute('spellcheck', isEnabled ? 'true' : 'false');
+    scheduleStateSync();
+}
+
+function insertImages(imagesInfo) {
+    if (!editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+
+    imagesInfo.forEach(imageInfo => {
+        editor.selection.insertHTML(`<img src="${escapeHtmlAttribute(imageInfo.data)}" alt="${escapeHtmlAttribute(imageInfo.name)}">`);
+    });
+
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function focusEditor() {
+    if (!editor) {
+        return;
+    }
+
+    if (restoreEditorSelection()) {
+        return;
+    }
+
+    editor.selection.focus();
+
+    const lastChild = editor.editor.lastChild;
+    if (lastChild) {
+        editor.selection.setCursorIn(lastChild, false);
+    }
+}
+
+function getEditorState() {
+    return buildEditorState();
+}
+
+function executeEditorCommand(commandName) {
+    if (!editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+    editor.execCommand(commandName);
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function setFontFamily(fontFamily) {
+    applyInlineStyleToSelection({ fontFamily: `'${fontFamily}',Arial,sans-serif` });
+}
+
+function setFontSize(fontSize) {
+    applyInlineStyleToSelection({ fontSize: `${fontSize}px` });
+}
+
+function setTextColor(color) {
+    applyInlineStyleToSelection({ color: color || '' });
+}
+
+function setHighlightColor(color) {
+    applyInlineStyleToSelection({ backgroundColor: color || '' });
+}
+
+function setParagraphStyle(tagName) {
+    if (!editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+
+    const normalizedTag = (tagName || 'div').toLowerCase();
+
+    try {
+        document.execCommand('formatBlock', false, normalizedTag);
+    }
+    catch {
+        const block = getCurrentBlockElement();
+        if (block && block.tagName.toLowerCase() !== normalizedTag) {
+            const replacement = document.createElement(normalizedTag);
+            while (block.firstChild) {
+                replacement.appendChild(block.firstChild);
+            }
+
+            block.parentNode.replaceChild(replacement, block);
+        }
+    }
+
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function setLineHeight(lineHeight) {
+    restoreEditorSelection();
+
+    const block = getCurrentBlockElement();
+    if (!block) {
+        return;
+    }
+
+    block.style.lineHeight = lineHeight || '';
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function upsertLink(linkArgs) {
+    if (!editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+
+    const normalizedUrl = normalizeLinkUrl(linkArgs && linkArgs.url ? linkArgs.url : '');
+    if (!normalizedUrl) {
+        return;
+    }
+
+    const linkText = linkArgs && linkArgs.text ? linkArgs.text.trim() : '';
+    const existingLink = getSelectionElement() ? getSelectionElement().closest('a[href]') : null;
+
+    if (existingLink) {
+        existingLink.setAttribute('href', normalizedUrl);
+        if (linkArgs.openInNewWindow) {
+            existingLink.setAttribute('target', '_blank');
+            existingLink.setAttribute('rel', 'noopener noreferrer');
+        }
+        else {
+            existingLink.removeAttribute('target');
+            existingLink.removeAttribute('rel');
+        }
+
+        if (linkText) {
+            existingLink.textContent = linkText;
+        }
+
+        rememberSelection();
+        scheduleStateSync();
+        return;
+    }
+
+    const selection = window.getSelection();
+    if (selection && selection.rangeCount > 0 && !selection.isCollapsed && isSelectionInsideEditor()) {
+        try {
+            document.execCommand('createLink', false, normalizedUrl);
+            const createdLink = getSelectionElement() ? getSelectionElement().closest('a[href]') : null;
+            if (createdLink) {
+                if (linkArgs.openInNewWindow) {
+                    createdLink.setAttribute('target', '_blank');
+                    createdLink.setAttribute('rel', 'noopener noreferrer');
+                }
+                if (linkText) {
+                    createdLink.textContent = linkText;
+                }
+            }
+        }
+        catch {
+            const selectedText = linkText || selection.toString() || normalizedUrl;
+            editor.selection.insertHTML(`<a href="${escapeHtmlAttribute(normalizedUrl)}" target="_blank" rel="noopener noreferrer">${escapeHtmlText(selectedText)}</a>`);
+        }
+
+        rememberSelection();
+        scheduleStateSync();
+        return;
+    }
+
+    const text = linkText || normalizedUrl;
+    editor.selection.insertHTML(`<a href="${escapeHtmlAttribute(normalizedUrl)}" target="_blank" rel="noopener noreferrer">${escapeHtmlText(text)}</a>`);
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function removeLink() {
+    restoreEditorSelection();
+
+    const selectionElement = getSelectionElement();
+    const linkElement = selectionElement ? selectionElement.closest('a[href]') : null;
+    if (!linkElement) {
+        return;
+    }
+
+    try {
+        document.execCommand('unlink');
+    }
+    catch {
+        unwrapElement(linkElement);
+    }
+
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function insertTableHtml(tableArgs) {
+    if (!editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+
+    const rows = clampInteger(tableArgs && tableArgs.rows, 1, 10);
+    const columns = clampInteger(tableArgs && tableArgs.columns, 1, 10);
+    const htmlRows = [];
+
+    for (let rowIndex = 0; rowIndex < rows; rowIndex += 1) {
+        const cells = [];
+        for (let columnIndex = 0; columnIndex < columns; columnIndex += 1) {
+            cells.push('<td style="border:1px solid #c7c7c7;padding:6px;min-width:32px;"><br></td>');
+        }
+
+        htmlRows.push(`<tr>${cells.join('')}</tr>`);
+    }
+
+    editor.selection.insertHTML(`<table style="border-collapse:collapse;width:100%;">${htmlRows.join('')}</table><div><br></div>`);
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function bindImageInput() {
+    if (imageInputBound) {
+        return;
+    }
+
+    imageInput.addEventListener('change', () => {
+        const file = imageInput.files[0];
+        if (!file) {
+            return;
+        }
+
+        const reader = new FileReader();
+        reader.onload = event => {
+            const base64Image = event.target.result;
+            insertImages([{ data: base64Image, name: file.name }]);
+            imageInput.value = '';
+        };
+        reader.readAsDataURL(file);
+    });
+
+    imageInputBound = true;
+}
+
+function bindEditorStateTracking() {
+    if (!editor || !editor.editor) {
+        return;
+    }
+
+    const syncHandler = () => {
+        rememberSelection();
+        scheduleStateSync();
+    };
+
+    ['keyup', 'mouseup', 'click', 'input', 'focus', 'blur'].forEach(eventName => {
+        editor.editor.addEventListener(eventName, syncHandler);
+    });
+
+    if (editor.events && editor.events.on) {
+        editor.events.on('afterSetMode change afterCommand', syncHandler);
+    }
+
+    editorDomObserver = new MutationObserver(() => scheduleStateSync());
+    editorDomObserver.observe(editor.editor, {
+        subtree: true,
+        childList: true,
+        attributes: true,
+        characterData: true,
+        attributeFilter: ['style', 'class', 'href', 'spellcheck']
+    });
+
+    selectionChangeHandler = () => {
+        if (isSelectionInsideEditor()) {
+            rememberSelection();
+            scheduleStateSync();
+        }
+    };
+
+    document.addEventListener('selectionchange', selectionChangeHandler);
+}
+
+function scheduleStateSync() {
+    if (stateSyncQueued) {
+        return;
+    }
+
+    stateSyncQueued = true;
+    window.requestAnimationFrame(() => {
+        stateSyncQueued = false;
+        notifyState();
+    });
+}
+
+function notifyState() {
+    if (!window.chrome || !window.chrome.webview) {
+        return;
+    }
+
+    window.chrome.webview.postMessage({
+        type: 'state',
+        state: buildEditorState()
+    });
+}
+
+function buildEditorState() {
+    const selectionElement = getSelectionElement();
+    const contextElement = selectionElement || (editor && editor.editor ? editor.editor : document.body);
+    const blockElement = getCurrentBlockElement() || contextElement;
+    const style = window.getComputedStyle(contextElement);
+    const blockStyle = window.getComputedStyle(blockElement);
+    const selection = window.getSelection();
+    const listElement = selectionElement ? selectionElement.closest('ol,ul') : null;
+    const linkElement = selectionElement ? selectionElement.closest('a[href]') : null;
+    const fontSize = parsePixelSize(style.fontSize);
+
+    return {
+        bold: queryCommandState('bold', isBoldStyle(style)),
+        italic: queryCommandState('italic', style.fontStyle === 'italic'),
+        underline: queryCommandState('underline', (style.textDecorationLine || '').includes('underline')),
+        strikethrough: queryCommandState('strikeThrough', (style.textDecorationLine || '').includes('line-through')),
+        orderedList: !!(listElement && listElement.tagName.toLowerCase() === 'ol'),
+        unorderedList: !!(listElement && listElement.tagName.toLowerCase() === 'ul'),
+        canIndent: queryCommandEnabled('indent', true),
+        canOutdent: queryCommandEnabled('outdent', !!listElement || !!(selectionElement && selectionElement.closest('blockquote'))),
+        hasSelection: !!(selection && selection.rangeCount > 0 && !selection.isCollapsed && isSelectionInsideEditor()),
+        isSpellCheckEnabled: !!(editor && editor.editor && editor.editor.spellcheck),
+        alignment: normalizeAlignment(blockStyle.textAlign),
+        fontFamily: normalizeFontFamily(style.fontFamily),
+        fontSize: fontSize,
+        paragraphStyle: normalizeParagraphTag(blockElement),
+        textColor: snapColorToPalette(resolveEditorColorValue(selectionElement, 'color', style.color), availableTextColors),
+        highlightColor: snapColorToPalette(resolveEditorColorValue(selectionElement, 'backgroundColor', style.backgroundColor), availableHighlightColors),
+        lineHeight: normalizeLineHeight(blockStyle.lineHeight, fontSize),
+        linkUrl: linkElement ? linkElement.getAttribute('href') || '' : '',
+        selectedText: selection && isSelectionInsideEditor() ? selection.toString() : ''
+    };
+}
+
+function getSelectionElement() {
+    if (!editor || !editor.editor) {
+        return null;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0) {
+        return editor.editor;
+    }
+
+    const node = selection.anchorNode;
+    if (!node) {
+        return editor.editor;
+    }
+
+    const element = node.nodeType === Node.TEXT_NODE ? node.parentElement : node;
+    if (!element || !editor.editor.contains(element)) {
+        return editor.editor;
+    }
+
+    return element;
+}
+
+function getCurrentBlockElement() {
+    const selectionElement = getSelectionElement();
+    if (!selectionElement) {
+        return null;
+    }
+
+    return selectionElement.closest('h1,h2,h3,h4,h5,h6,p,blockquote,pre,div,li,td,th') || selectionElement;
+}
+
+function rememberSelection() {
+    if (!editor || !editor.editor) {
+        return;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0 || !isSelectionInsideEditor()) {
+        return;
+    }
+
+    try {
+        lastKnownRange = selection.getRangeAt(0).cloneRange();
+    }
+    catch {
+        lastKnownRange = null;
+    }
+}
+
+function restoreEditorSelection() {
+    if (!editor || !editor.editor) {
+        return false;
+    }
+
+    editor.selection.focus();
+
+    if (!lastKnownRange) {
+        return false;
+    }
+
+    try {
+        const selection = window.getSelection();
+        if (!selection) {
+            return false;
+        }
+
+        const restoredRange = lastKnownRange.cloneRange();
+        selection.removeAllRanges();
+        selection.addRange(restoredRange);
+        return true;
+    }
+    catch {
+        lastKnownRange = null;
+        return false;
+    }
+}
+
+function isSelectionInsideEditor() {
+    if (!editor || !editor.editor) {
+        return false;
+    }
+
+    const selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0) {
+        return false;
+    }
+
+    const anchorNode = selection.anchorNode;
+    const focusNode = selection.focusNode;
+    return !!anchorNode && !!focusNode && editor.editor.contains(anchorNode) && editor.editor.contains(focusNode);
+}
+
+function queryCommandState(commandName, fallbackValue) {
+    try {
+        const value = document.queryCommandState(commandName);
+        return typeof value === 'boolean' ? value : fallbackValue;
+    }
+    catch {
+        return fallbackValue;
+    }
+}
+
+function queryCommandEnabled(commandName, fallbackValue) {
+    try {
+        const value = document.queryCommandEnabled(commandName);
+        return typeof value === 'boolean' ? value : fallbackValue;
+    }
+    catch {
+        return fallbackValue;
+    }
+}
+
+function isBoldStyle(style) {
+    const fontWeight = style.fontWeight || '400';
+    const numericWeight = parseInt(fontWeight, 10);
+    return fontWeight === 'bold' || Number.isFinite(numericWeight) && numericWeight >= 600;
+}
+
+function normalizeAlignment(value) {
+    const normalized = (value || '').toLowerCase();
+    if (normalized === 'center' || normalized === 'right' || normalized === 'justify') {
+        return normalized;
+    }
+
+    return 'left';
+}
+
+function normalizeFontFamily(value) {
+    if (!value) {
+        return '';
+    }
+
+    return value.split(',')[0].replace(/["']/g, '').trim();
+}
+
+function normalizeParagraphTag(element) {
+    return element && element.tagName ? element.tagName.toLowerCase() : 'div';
+}
+
+function normalizeLineHeight(value, fontSize) {
+    if (!value || value === 'normal') {
+        return 'normal';
+    }
+
+    const numericValue = parseFloat(value);
+    if (!Number.isFinite(numericValue)) {
+        return value;
+    }
+
+    if (value.endsWith('px') && fontSize) {
+        const ratio = numericValue / fontSize;
+        return Number.isInteger(ratio) ? `${ratio}` : ratio.toFixed(2).replace(/0+$/, '').replace(/\.$/, '');
+    }
+
+    return Number.isInteger(numericValue) ? `${numericValue}` : numericValue.toString();
+}
+
+function parsePixelSize(value) {
+    const numericValue = parseFloat(value || '');
+    return Number.isFinite(numericValue) ? Math.round(numericValue) : null;
+}
+
+function normalizeColor(value) {
+    if (!value || value === 'transparent' || value === 'rgba(0, 0, 0, 0)') {
+        return '';
+    }
+
+    if (value.startsWith('#')) {
+        return value.toLowerCase();
+    }
+
+    const rgbaMatch = value.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/i);
+    if (!rgbaMatch) {
+        return value.toLowerCase();
+    }
+
+    const [, red, green, blue] = rgbaMatch;
+    return `#${toHex(red)}${toHex(green)}${toHex(blue)}`;
+}
+
+function snapColorToPalette(value, palette) {
+    const normalizedColor = normalizeColor(value);
+    if (!normalizedColor) {
+        return '';
+    }
+
+    if (!Array.isArray(palette) || palette.length === 0) {
+        return normalizedColor;
+    }
+
+    if (palette.includes(normalizedColor)) {
+        return normalizedColor;
+    }
+
+    const targetRgb = hexToRgb(normalizedColor);
+    if (!targetRgb) {
+        return normalizedColor;
+    }
+
+    let nearestColor = palette[0];
+    let nearestDistance = Number.MAX_SAFE_INTEGER;
+
+    palette.forEach(candidate => {
+        const candidateRgb = hexToRgb(candidate);
+        if (!candidateRgb) {
+            return;
+        }
+
+        const distance = getColorDistance(targetRgb, candidateRgb);
+        if (distance < nearestDistance) {
+            nearestColor = candidate;
+            nearestDistance = distance;
+        }
+    });
+
+    return nearestColor;
+}
+
+function hexToRgb(value) {
+    const normalized = normalizeColor(value);
+    if (!normalized || !normalized.startsWith('#') || normalized.length !== 7) {
+        return null;
+    }
+
+    return {
+        red: parseInt(normalized.slice(1, 3), 16),
+        green: parseInt(normalized.slice(3, 5), 16),
+        blue: parseInt(normalized.slice(5, 7), 16)
+    };
+}
+
+function getColorDistance(left, right) {
+    const redDiff = left.red - right.red;
+    const greenDiff = left.green - right.green;
+    const blueDiff = left.blue - right.blue;
+    return (redDiff * redDiff) + (greenDiff * greenDiff) + (blueDiff * blueDiff);
+}
+
+function resolveEditorColorValue(selectionElement, propertyName, computedValue) {
+    if (!editor || !editor.editor) {
+        return '';
+    }
+
+    const darkReaderAttributeName = propertyName === 'backgroundColor'
+        ? 'data-darkreader-inline-bgcolor'
+        : 'data-darkreader-inline-color';
+
+    let currentElement = selectionElement;
+    while (currentElement) {
+        if (currentElement.style && currentElement.style[propertyName]) {
+            return currentElement.style[propertyName];
+        }
+
+        const darkReaderValue = currentElement.getAttribute && currentElement.getAttribute(darkReaderAttributeName);
+        if (darkReaderValue) {
+            return darkReaderValue;
+        }
+
+        if (currentElement === editor.editor) {
+            break;
+        }
+
+        currentElement = currentElement.parentElement;
+    }
+
+    return '';
+}
+
+function toHex(value) {
+    return Number(value).toString(16).padStart(2, '0');
+}
+
+function applyInlineStyleToSelection(styles) {
+    if (!editor || !editor.editor) {
+        return;
+    }
+
+    restoreEditorSelection();
+
+    const selection = window.getSelection();
+    if (!selection || selection.rangeCount === 0 || !isSelectionInsideEditor()) {
+        return;
+    }
+
+    const range = selection.getRangeAt(0);
+    if (selection.isCollapsed) {
+        const contextElement = getSelectionElement();
+        if (contextElement) {
+            Object.entries(styles).forEach(([propertyName, propertyValue]) => {
+                contextElement.style[propertyName] = propertyValue || '';
+            });
+        }
+
+        rememberSelection();
+        scheduleStateSync();
+        return;
+    }
+
+    const span = document.createElement('span');
+    Object.entries(styles).forEach(([propertyName, propertyValue]) => {
+        if (propertyValue) {
+            span.style[propertyName] = propertyValue;
+        }
+    });
+
+    try {
+        span.appendChild(range.extractContents());
+        range.insertNode(span);
+        selection.removeAllRanges();
+        const newRange = document.createRange();
+        newRange.selectNodeContents(span);
+        selection.addRange(newRange);
+    }
+    catch {
+        const css = styleObjectToCss(styles);
+        const selectedText = escapeHtmlText(selection.toString());
+        editor.selection.insertHTML(`<span style="${css}">${selectedText}</span>`);
+    }
+
+    rememberSelection();
+    scheduleStateSync();
+}
+
+function styleObjectToCss(styles) {
+    return Object.entries(styles)
+        .filter(([, value]) => value)
+        .map(([propertyName, propertyValue]) => `${camelToKebabCase(propertyName)}:${propertyValue}`)
+        .join(';');
+}
+
+function camelToKebabCase(value) {
+    return value.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`);
+}
+
+function unwrapElement(element) {
+    const parent = element.parentNode;
+    if (!parent) {
+        return;
+    }
+
+    while (element.firstChild) {
+        parent.insertBefore(element.firstChild, element);
+    }
+
+    parent.removeChild(element);
+}
+
+function clampInteger(value, min, max) {
+    const numericValue = parseInt(value, 10);
+    if (!Number.isFinite(numericValue)) {
+        return min;
+    }
+
+    return Math.min(max, Math.max(min, numericValue));
+}
+
+function normalizeLinkUrl(url) {
+    const trimmed = (url || '').trim();
+    if (!trimmed) {
+        return '';
+    }
+
+    if (/^[a-z]+:/i.test(trimmed)) {
+        return trimmed;
+    }
+
+    if (trimmed.includes('@') && !trimmed.includes('/')) {
+        return `mailto:${trimmed}`;
+    }
+
+    return `https://${trimmed}`;
+}
+
+function escapeHtmlAttribute(value) {
+    return `${value || ''}`
+        .replace(/&/g, '&amp;')
+        .replace(/"/g, '&quot;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+
+function escapeHtmlText(value) {
+    return `${value || ''}`
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+
diff --git a/Wino.Mail/JS/global.css b/Wino.Mail.WinUI/JS/global.css
similarity index 100%
rename from Wino.Mail/JS/global.css
rename to Wino.Mail.WinUI/JS/global.css
diff --git a/Wino.Mail/JS/libs/darkreader.js b/Wino.Mail.WinUI/JS/libs/darkreader.js
similarity index 100%
rename from Wino.Mail/JS/libs/darkreader.js
rename to Wino.Mail.WinUI/JS/libs/darkreader.js
diff --git a/Wino.Mail/JS/libs/jodit.min.css b/Wino.Mail.WinUI/JS/libs/jodit.min.css
similarity index 100%
rename from Wino.Mail/JS/libs/jodit.min.css
rename to Wino.Mail.WinUI/JS/libs/jodit.min.css
diff --git a/Wino.Mail/JS/libs/jodit.min.js b/Wino.Mail.WinUI/JS/libs/jodit.min.js
similarity index 100%
rename from Wino.Mail/JS/libs/jodit.min.js
rename to Wino.Mail.WinUI/JS/libs/jodit.min.js
diff --git a/Wino.Mail/JS/libs/linkify-element.min.js b/Wino.Mail.WinUI/JS/libs/linkify-element.min.js
similarity index 100%
rename from Wino.Mail/JS/libs/linkify-element.min.js
rename to Wino.Mail.WinUI/JS/libs/linkify-element.min.js
diff --git a/Wino.Mail/JS/libs/linkify.min.js b/Wino.Mail.WinUI/JS/libs/linkify.min.js
similarity index 100%
rename from Wino.Mail/JS/libs/linkify.min.js
rename to Wino.Mail.WinUI/JS/libs/linkify.min.js
diff --git a/Wino.Mail/JS/reader.html b/Wino.Mail.WinUI/JS/reader.html
similarity index 97%
rename from Wino.Mail/JS/reader.html
rename to Wino.Mail.WinUI/JS/reader.html
index df8c2b68..040890a2 100644
--- a/Wino.Mail/JS/reader.html
+++ b/Wino.Mail.WinUI/JS/reader.html
@@ -85,6 +85,10 @@
                 containerDiv.style.fontSize = size;
             }
 
+            function GetRenderedHtml() {
+                return _htmlString || "";
+            }
+
             function SetLightEditor() {
                 document.documentElement.setAttribute("data-theme", "light");
                 DarkReader.disable();
diff --git a/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
similarity index 90%
rename from Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
index d51a508d..860a415f 100644
--- a/Wino.Mail/MenuFlyouts/AccountSelectorFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/AccountSelectorFlyout.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
@@ -40,7 +40,7 @@ public partial class AccountSelectorFlyout : MenuFlyout, IDisposable
         }
     }
 
-    private async void AccountClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private async void AccountClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
         if (sender is MenuFlyoutItem menuItem && menuItem.Tag is string accountAddress)
         {
diff --git a/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
similarity index 96%
rename from Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
index 24979139..84a67736 100644
--- a/Wino.Mail/MenuFlyouts/FilterMenuFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/FilterMenuFlyout.cs
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using CommunityToolkit.Mvvm.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
@@ -110,7 +110,8 @@ public partial class FilterMenuFlyout : MenuFlyout
 
             var optionModel = button.Tag as SortingOption;
 
-            SelectSortingOption(optionModel);
+            if (optionModel != null)
+                SelectSortingOption(optionModel);
         }
     }
 
@@ -124,7 +125,8 @@ public partial class FilterMenuFlyout : MenuFlyout
 
             var optionModel = button.Tag as FilterOption;
 
-            SelectFilterOption(optionModel);
+            if (optionModel != null)
+                SelectFilterOption(optionModel);
         }
     }
 
diff --git a/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/FolderOperationFlyout.cs
similarity index 92%
rename from Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/FolderOperationFlyout.cs
index dea1ea59..8c57b2f1 100644
--- a/Wino.Mail/MenuFlyouts/FolderOperationFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/FolderOperationFlyout.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Folders;
 
diff --git a/Wino.Mail/MenuFlyouts/FolderOperationMenuFlyoutItem.cs b/Wino.Mail.WinUI/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
similarity index 95%
rename from Wino.Mail/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
rename to Wino.Mail.WinUI/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
index f7731c72..fe7d2b9b 100644
--- a/Wino.Mail/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/FolderOperationMenuFlyoutItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Wino.Core.Domain.Models.Folders;
 
 namespace Wino.MenuFlyouts;
diff --git a/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/MailOperationFlyout.cs
similarity index 92%
rename from Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/MailOperationFlyout.cs
index 70e742b4..df15333b 100644
--- a/Wino.Mail/MenuFlyouts/MailOperationFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/MailOperationFlyout.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Menus;
 
diff --git a/Wino.Mail/MenuFlyouts/MailOperationMenuFlyoutItem.cs b/Wino.Mail.WinUI/MenuFlyouts/MailOperationMenuFlyoutItem.cs
similarity index 95%
rename from Wino.Mail/MenuFlyouts/MailOperationMenuFlyoutItem.cs
rename to Wino.Mail.WinUI/MenuFlyouts/MailOperationMenuFlyoutItem.cs
index aebedbc9..1284e2f7 100644
--- a/Wino.Mail/MenuFlyouts/MailOperationMenuFlyoutItem.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/MailOperationMenuFlyoutItem.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Wino.Core.Domain.Models.Menus;
 
 namespace Wino.MenuFlyouts.Context;
diff --git a/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/MoveButtonFlyout.cs
similarity index 88%
rename from Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/MoveButtonFlyout.cs
index 9eb1d9df..83e8ca53 100644
--- a/Wino.Mail/MenuFlyouts/MoveButtonFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/MoveButtonFlyout.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain.Entities.Mail;
 
 namespace Wino.MenuFlyouts;
@@ -15,7 +15,7 @@ public class MoveButtonMenuItemClickedEventArgs
 
 public partial class MoveButtonFlyout : MenuFlyout
 {
-    public event TypedEventHandler<MoveButtonFlyout, MoveButtonMenuItemClickedEventArgs> MenuItemClick;
+    public event TypedEventHandler<MoveButtonFlyout, MoveButtonMenuItemClickedEventArgs> MenuItemClick = delegate { };
     public static readonly DependencyProperty FoldersProperty = DependencyProperty.Register(nameof(Folders), typeof(List<MailItemFolder>), typeof(MoveButtonFlyout), new PropertyMetadata(null, new PropertyChangedCallback(OnFoldersChanged)));
 
     public List<MailItemFolder> Folders
@@ -66,7 +66,7 @@ public partial class MoveButtonFlyout : MenuFlyout
 
     private void MenuItemClicked(object sender, RoutedEventArgs e)
     {
-        var clickedFolder = (sender as MenuFlyoutItem).Tag as MailItemFolder;
+        var clickedFolder = ((MenuFlyoutItem)sender).Tag as MailItemFolder ?? throw new InvalidOperationException("Clicked folder is null.");
 
         MenuItemClick?.Invoke(this, new MoveButtonMenuItemClickedEventArgs()
         {
diff --git a/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyout.cs
similarity index 79%
rename from Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
rename to Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyout.cs
index e0786f43..25df49a7 100644
--- a/Wino.Mail/MenuFlyouts/WinoOperationFlyout.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyout.cs
@@ -1,13 +1,13 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Wino.MenuFlyouts;
 
 public partial class WinoOperationFlyout<TActionType> : MenuFlyout, IDisposable where TActionType : class
 {
-    public TActionType ClickedOperation { get; set; }
+    public TActionType ClickedOperation { get; set; } = null!;
 
     protected readonly IEnumerable<TActionType> AvailableActions;
 
@@ -22,7 +22,7 @@ public partial class WinoOperationFlyout<TActionType> : MenuFlyout, IDisposable
         Closing += FlyoutClosing;
     }
 
-    private void FlyoutClosing(Windows.UI.Xaml.Controls.Primitives.FlyoutBase sender, Windows.UI.Xaml.Controls.Primitives.FlyoutBaseClosingEventArgs args)
+    private void FlyoutClosing(Microsoft.UI.Xaml.Controls.Primitives.FlyoutBase sender, Microsoft.UI.Xaml.Controls.Primitives.FlyoutBaseClosingEventArgs args)
     {
         Closing -= FlyoutClosing;
 
diff --git a/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
similarity index 90%
rename from Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
rename to Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
index ec7a2223..fa85dbbc 100644
--- a/Wino.Mail/MenuFlyouts/WinoOperationFlyoutItem.cs
+++ b/Wino.Mail.WinUI/MenuFlyouts/WinoOperationFlyoutItem.cs
@@ -1,9 +1,9 @@
-using System;
-using Windows.UI.Xaml.Controls;
+using System;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Menus;
-using Wino.Core.UWP.Controls;
+using Wino.Mail.WinUI.Controls;
 using Wino.Helpers;
 
 namespace Wino.MenuFlyouts;
@@ -37,7 +37,7 @@ public partial class WinoOperationFlyoutItem<TOperationMenuItem> : MenuFlyoutIte
         Click += MenuClicked;
     }
 
-    private void MenuClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+    private void MenuClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
         Clicked(Operation);
     }
diff --git a/Wino.Calendar/Args/TimelineCellSelectedArgs.cs b/Wino.Mail.WinUI/Models/Args/TimelineCellSelectedArgs.cs
similarity index 100%
rename from Wino.Calendar/Args/TimelineCellSelectedArgs.cs
rename to Wino.Mail.WinUI/Models/Args/TimelineCellSelectedArgs.cs
diff --git a/Wino.Calendar/Args/TimelineCellUnselectedArgs.cs b/Wino.Mail.WinUI/Models/Args/TimelineCellUnselectedArgs.cs
similarity index 100%
rename from Wino.Calendar/Args/TimelineCellUnselectedArgs.cs
rename to Wino.Mail.WinUI/Models/Args/TimelineCellUnselectedArgs.cs
diff --git a/Wino.Calendar/Models/CalendarItemMeasurement.cs b/Wino.Mail.WinUI/Models/CalendarItemMeasurement.cs
similarity index 100%
rename from Wino.Calendar/Models/CalendarItemMeasurement.cs
rename to Wino.Mail.WinUI/Models/CalendarItemMeasurement.cs
diff --git a/Wino.Core.UWP/Models/Personalization/CustomAppTheme.cs b/Wino.Mail.WinUI/Models/Personalization/CustomAppTheme.cs
similarity index 77%
rename from Wino.Core.UWP/Models/Personalization/CustomAppTheme.cs
rename to Wino.Mail.WinUI/Models/Personalization/CustomAppTheme.cs
index 78049f61..949738a7 100644
--- a/Wino.Core.UWP/Models/Personalization/CustomAppTheme.cs
+++ b/Wino.Mail.WinUI/Models/Personalization/CustomAppTheme.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Personalization;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Mail.WinUI.Models.Personalization;
 
 /// <summary>
 /// Custom themes that are generated by users.
@@ -20,11 +20,11 @@ public class CustomAppTheme : AppThemeBase
     public override AppThemeType AppThemeType => AppThemeType.Custom;
 
     public override string GetBackgroundPreviewImagePath()
-        => $"ms-appdata:///local/{ThemeService.CustomThemeFolderName}/{Id}_preview.jpg";
+        => $"ms-appdata:///local/{NewThemeService.CustomThemeFolderName}/{Id}_preview.jpg";
 
     public override async Task<string> GetThemeResourceDictionaryContentAsync()
     {
-        var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Wino.Core.UWP/AppThemes/Custom.xaml"));
+        var customAppThemeFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///AppThemes/Custom.xaml"));
         return await FileIO.ReadTextAsync(customAppThemeFile);
     }
 }
diff --git a/Wino.Core.UWP/Models/Personalization/PreDefinedAppTheme.cs b/Wino.Mail.WinUI/Models/Personalization/PreDefinedAppTheme.cs
similarity index 81%
rename from Wino.Core.UWP/Models/Personalization/PreDefinedAppTheme.cs
rename to Wino.Mail.WinUI/Models/Personalization/PreDefinedAppTheme.cs
index 960e5722..5e25e524 100644
--- a/Wino.Core.UWP/Models/Personalization/PreDefinedAppTheme.cs
+++ b/Wino.Mail.WinUI/Models/Personalization/PreDefinedAppTheme.cs
@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Windows.Storage;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.Personalization;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Mail.WinUI.Models.Personalization;
 
 /// <summary>
 ///  Forest, Nighty, Clouds etc. applies to pre-defined themes in Wino.
@@ -23,11 +23,11 @@ public class PreDefinedAppTheme : AppThemeBase
     public override AppThemeType AppThemeType => AppThemeType.PreDefined;
 
     public override string GetBackgroundPreviewImagePath()
-        => $"ms-appx:///Wino.Core.UWP/BackgroundImages/{ThemeName}.jpg";
+        => $"ms-appx:///BackgroundImages/{ThemeName}.jpg";
 
     public override async Task<string> GetThemeResourceDictionaryContentAsync()
     {
-        var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///Wino.Core.UWP/AppThemes/{ThemeName}.xaml"));
+        var xamlDictionaryFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri($"ms-appx:///AppThemes/{ThemeName}.xaml"));
         return await FileIO.ReadTextAsync(xamlDictionaryFile);
     }
 }
diff --git a/Wino.Core.UWP/Models/Personalization/SystemAppTheme.cs b/Wino.Mail.WinUI/Models/Personalization/SystemAppTheme.cs
similarity index 79%
rename from Wino.Core.UWP/Models/Personalization/SystemAppTheme.cs
rename to Wino.Mail.WinUI/Models/Personalization/SystemAppTheme.cs
index f836ffb0..9c671ecc 100644
--- a/Wino.Core.UWP/Models/Personalization/SystemAppTheme.cs
+++ b/Wino.Mail.WinUI/Models/Personalization/SystemAppTheme.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Models.Personalization;
+namespace Wino.Mail.WinUI.Models.Personalization;
 
 // Mica - Acrylic.
 public class SystemAppTheme : PreDefinedAppTheme
diff --git a/Wino.Mail.WinUI/Models/PrintDialogViewModel.cs b/Wino.Mail.WinUI/Models/PrintDialogViewModel.cs
new file mode 100644
index 00000000..5f4498ac
--- /dev/null
+++ b/Wino.Mail.WinUI/Models/PrintDialogViewModel.cs
@@ -0,0 +1,276 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Printing;
+
+namespace Wino.Mail.WinUI.Dialogs;
+
+/// <summary>
+/// ViewModel for the PrintDialog that handles data binding and state management.
+/// </summary>
+public class PrintDialogViewModel : INotifyPropertyChanged
+{
+    private List<string> _availablePrinters = new();
+    private bool _isCustomPageRange = false;
+    private WebView2PrintSettingsModel _printSettings = new();
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    public PrintDialogViewModel()
+    {
+        // Initialize default values
+        PrintSettings.PropertyChanged += OnPrintSettingsChanged;
+    }
+
+    /// <summary>
+    /// The print settings model that will be configured by the dialog.
+    /// </summary>
+    public WebView2PrintSettingsModel PrintSettings
+    {
+        get => _printSettings;
+        set
+        {
+            if (_printSettings != value)
+            {
+                if (_printSettings != null)
+                    _printSettings.PropertyChanged -= OnPrintSettingsChanged;
+                
+                _printSettings = value;
+                
+                if (_printSettings != null)
+                    _printSettings.PropertyChanged += OnPrintSettingsChanged;
+                
+                OnPropertyChanged(nameof(PrintSettings));
+                UpdateDerivedProperties();
+            }
+        }
+    }
+
+    /// <summary>
+    /// List of available printers.
+    /// </summary>
+    public List<string> AvailablePrinters
+    {
+        get => _availablePrinters;
+        set
+        {
+            if (_availablePrinters != value)
+            {
+                _availablePrinters = value ?? new List<string>();
+                OnPropertyChanged(nameof(AvailablePrinters));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the orientation radio buttons.
+    /// </summary>
+    public int OrientationIndex
+    {
+        get => (int)PrintSettings.Orientation;
+        set
+        {
+            if (value >= 0 && value <= 1)
+            {
+                PrintSettings.Orientation = (PrintOrientation)value;
+                OnPropertyChanged(nameof(OrientationIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the color mode radio buttons.
+    /// </summary>
+    public int ColorModeIndex
+    {
+        get => (int)PrintSettings.ColorMode;
+        set
+        {
+            if (value >= 0 && value <= 2)
+            {
+                PrintSettings.ColorMode = (PrintColorMode)value;
+                OnPropertyChanged(nameof(ColorModeIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the collation radio buttons.
+    /// </summary>
+    public int CollationIndex
+    {
+        get => (int)PrintSettings.Collation;
+        set
+        {
+            if (value >= 0 && value <= 2)
+            {
+                PrintSettings.Collation = (PrintCollation)value;
+                OnPropertyChanged(nameof(CollationIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the duplex radio buttons.
+    /// </summary>
+    public int DuplexIndex
+    {
+        get => (int)PrintSettings.Duplex;
+        set
+        {
+            if (value >= 0 && value <= 3)
+            {
+                PrintSettings.Duplex = (PrintDuplex)value;
+                OnPropertyChanged(nameof(DuplexIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the media size combo box.
+    /// </summary>
+    public int MediaSizeIndex
+    {
+        get => (int)PrintSettings.MediaSize;
+        set
+        {
+            if (value >= 0 && value <= 9)
+            {
+                PrintSettings.MediaSize = (PrintMediaSize)value;
+                OnPropertyChanged(nameof(MediaSizeIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the pages per side combo box.
+    /// </summary>
+    public int PagesPerSideIndex
+    {
+        get
+        {
+            var validValues = new[] { 1, 2, 4, 6, 9, 16 };
+            return Array.IndexOf(validValues, PrintSettings.PagesPerSide);
+        }
+        set
+        {
+            var validValues = new[] { 1, 2, 4, 6, 9, 16 };
+            if (value >= 0 && value < validValues.Length)
+            {
+                PrintSettings.PagesPerSide = validValues[value];
+                OnPropertyChanged(nameof(PagesPerSideIndex));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Index for the page range option (0 = All pages, 1 = Custom range).
+    /// </summary>
+    public int PageRangeOptionIndex
+    {
+        get => IsCustomPageRange ? 1 : 0;
+        set
+        {
+            IsCustomPageRange = value == 1;
+            if (!IsCustomPageRange)
+            {
+                PrintSettings.PageRanges = string.Empty;
+            }
+            OnPropertyChanged(nameof(PageRangeOptionIndex));
+        }
+    }
+
+    /// <summary>
+    /// Whether custom page range is selected.
+    /// </summary>
+    public bool IsCustomPageRange
+    {
+        get => _isCustomPageRange;
+        private set
+        {
+            if (_isCustomPageRange != value)
+            {
+                _isCustomPageRange = value;
+                OnPropertyChanged(nameof(IsCustomPageRange));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Scale factor as percentage text for display.
+    /// </summary>
+    public string ScalePercentageText => $"{(int)(PrintSettings.ScaleFactor * 100)}%";
+
+    /// <summary>
+    /// Initializes the dialog with the provided print settings.
+    /// </summary>
+    /// <param name="printSettings">The initial print settings.</param>
+    public void Initialize(WebView2PrintSettingsModel printSettings = default!)
+    {
+        if (printSettings != null)
+        {
+            PrintSettings = printSettings;
+        }
+        else
+        {
+            PrintSettings = new WebView2PrintSettingsModel();
+        }
+
+        UpdateDerivedProperties();
+    }
+
+    /// <summary>
+    /// Sets the list of available printers.
+    /// </summary>
+    /// <param name="printers">List of printer names.</param>
+    public void SetAvailablePrinters(IEnumerable<string> printers)
+    {
+        AvailablePrinters = printers?.ToList() ?? new List<string>();
+        
+        // If current printer is not in the list, select the first one
+        if (AvailablePrinters.Any() && !AvailablePrinters.Contains(PrintSettings.PrinterName))
+        {
+            PrintSettings.PrinterName = AvailablePrinters.First();
+        }
+    }
+
+    private void OnPrintSettingsChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(WebView2PrintSettingsModel.ScaleFactor))
+        {
+            OnPropertyChanged(nameof(ScalePercentageText));
+        }
+        else if (e.PropertyName == nameof(WebView2PrintSettingsModel.PageRanges))
+        {
+            // Update custom page range flag based on whether page ranges is empty
+            if (!string.IsNullOrWhiteSpace(PrintSettings.PageRanges))
+            {
+                IsCustomPageRange = true;
+                OnPropertyChanged(nameof(PageRangeOptionIndex));
+            }
+        }
+    }
+
+    private void UpdateDerivedProperties()
+    {
+        OnPropertyChanged(nameof(OrientationIndex));
+        OnPropertyChanged(nameof(ColorModeIndex));
+        OnPropertyChanged(nameof(CollationIndex));
+        OnPropertyChanged(nameof(DuplexIndex));
+        OnPropertyChanged(nameof(MediaSizeIndex));
+        OnPropertyChanged(nameof(PagesPerSideIndex));
+        OnPropertyChanged(nameof(PageRangeOptionIndex));
+        OnPropertyChanged(nameof(ScalePercentageText));
+        
+        // Update custom page range based on current page ranges value
+        IsCustomPageRange = !string.IsNullOrWhiteSpace(PrintSettings.PageRanges);
+    }
+
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/Wino.Mail.WinUI/Models/TitleBarSearchSuggestion.cs b/Wino.Mail.WinUI/Models/TitleBarSearchSuggestion.cs
new file mode 100644
index 00000000..2ff8b637
--- /dev/null
+++ b/Wino.Mail.WinUI/Models/TitleBarSearchSuggestion.cs
@@ -0,0 +1,8 @@
+namespace Wino.Mail.WinUI.Models;
+
+public sealed class TitleBarSearchSuggestion(string title, string subtitle = "", object? tag = null)
+{
+    public string Title { get; } = title;
+    public string Subtitle { get; } = subtitle;
+    public object? Tag { get; } = tag;
+}
diff --git a/Wino.Mail.WinUI/Models/WinoWindowKind.cs b/Wino.Mail.WinUI/Models/WinoWindowKind.cs
new file mode 100644
index 00000000..6a670d7e
--- /dev/null
+++ b/Wino.Mail.WinUI/Models/WinoWindowKind.cs
@@ -0,0 +1,7 @@
+namespace Wino.Mail.WinUI.Models;
+
+public enum WinoWindowKind
+{
+    Shell,
+    Welcome
+}
diff --git a/Wino.Mail.WinUI/Package.appxmanifest b/Wino.Mail.WinUI/Package.appxmanifest
new file mode 100644
index 00000000..b428feb5
--- /dev/null
+++ b/Wino.Mail.WinUI/Package.appxmanifest
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap uap10 rescap com desktop">
+	
+	<!-- Publisher Cache Folders -->
+	<Extensions>
+		<Extension Category="windows.publisherCacheFolders">
+			<PublisherCacheFolders>
+				<Folder Name="WinoShared" />
+			</PublisherCacheFolders>
+		</Extension>
+	</Extensions>
+	
+  <Identity
+    Name="58272BurakKSE.WinoMailPreview"
+    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
+    Version="2.0.15.0" />
+
+  <mp:PhoneIdentity PhoneProductId="3879fcfb-a561-4599-9103-e0c9b35a271f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>Wino Mail</DisplayName>
+    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$"
+      uap10:Parameters="--mode=mail">
+      <uap:VisualElements
+        DisplayName="Wino Mail"
+        Description="Wino.Mail.WinUI"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\AppEntries\MailAssets\Square150x150Logo.png"
+        Square44x44Logo="Assets\AppEntries\MailAssets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\AppEntries\MailAssets\Wide310x150Logo.png"  Square71x71Logo="Assets\AppEntries\MailAssets\SmallTile.png" Square310x310Logo="Assets\AppEntries\MailAssets\LargeTile.png"/>
+        <uap:SplashScreen Image="Assets\AppEntries\MailAssets\SplashScreen.png" />
+      </uap:VisualElements>
+
+		<Extensions>
+			<uap5:Extension Category="windows.startupTask">
+				<uap5:StartupTask
+					TaskId="WinoStartupId"
+					Enabled="true"
+					DisplayName="Wino Startup Service" />
+			</uap5:Extension>
+
+			<!-- App notification activation -->
+			<desktop:Extension Category="windows.toastNotificationActivation">
+				<desktop:ToastNotificationActivation ToastActivatorCLSID="72c6d2d0-2538-44fe-a1b1-499f47bb1181" />
+			</desktop:Extension>
+
+			<com:Extension Category="windows.comServer">
+				<com:ComServer>
+					<com:ExeServer Executable="Wino.Mail.WinUI.exe" Arguments="----AppNotificationActivated:" DisplayName="Toast activator">
+						<com:Class Id="72c6d2d0-2538-44fe-a1b1-499f47bb1181" DisplayName="Toast activator"/>
+					</com:ExeServer>
+				</com:ComServer>
+			</com:Extension>
+			
+			<!-- Protocol activation: mailto -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="mailto" />
+			</uap:Extension>
+
+			<!-- Protocol activation: Google oAuth -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="google.pw.oauth2">
+					<uap:DisplayName>Google Auth Protocol</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+
+			<!-- Protocol activation: Wino deep links -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="wino">
+					<uap:DisplayName>Wino Mail Protocol</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+
+			<!-- Protocol activation: webcal -->
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="webcal">
+					<uap:DisplayName>Calendar Protocol</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+
+			<uap:Extension Category="windows.protocol">
+				<uap:Protocol Name="webcals">
+					<uap:DisplayName>Calendar Protocol (Secure)</uap:DisplayName>
+				</uap:Protocol>
+			</uap:Extension>
+
+			<!-- File Assosication: EML -->
+			<uap:Extension Category="windows.fileTypeAssociation">
+				<uap:FileTypeAssociation Name="eml">
+					<uap:Logo>EML\eml.png</uap:Logo>
+					<uap:SupportedFileTypes>
+						<uap:FileType>.eml</uap:FileType>
+					</uap:SupportedFileTypes>
+				</uap:FileTypeAssociation>
+			</uap:Extension>
+
+			<!-- File Association: ICS -->
+			<uap:Extension Category="windows.fileTypeAssociation">
+				<uap:FileTypeAssociation Name="ics">
+					<uap:Logo>Assets\AppEntries\CalendarAssets\Square44x44Logo.png</uap:Logo>
+					<uap:SupportedFileTypes>
+						<uap:FileType>.ics</uap:FileType>
+					</uap:SupportedFileTypes>
+				</uap:FileTypeAssociation>
+			</uap:Extension>
+		</Extensions>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/Wino.Mail.WinUI/Program.cs b/Wino.Mail.WinUI/Program.cs
new file mode 100644
index 00000000..76b264be
--- /dev/null
+++ b/Wino.Mail.WinUI/Program.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.Windows.AppNotifications;
+using Microsoft.Windows.AppLifecycle;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Mail.WinUI;
+
+public class Program
+{
+    private const string SingleInstanceKey = "WinoMailSingleInstance";
+    private const string ForceAlternateModeSignalEventName = "Local\\WinoMailForceAlternateMode";
+    private const int VkControl = 0x11;
+
+    private static bool _forceAlternateModeOnLaunch;
+    private static EventWaitHandle? _forceAlternateModeSignalHandle;
+
+    [STAThread]
+    static int Main(string[] args)
+    {
+        WinRT.ComWrappersSupport.InitializeComWrappers();
+        bool isRedirect = DecideRedirection();
+
+        if (!isRedirect)
+        {
+            Application.Start((p) =>
+            {
+                var context = new DispatcherQueueSynchronizationContext(
+                    DispatcherQueue.GetForCurrentThread());
+                SynchronizationContext.SetSynchronizationContext(context);
+                _ = new App();
+            });
+        }
+
+        return 0;
+    }
+
+    private static bool DecideRedirection()
+    {
+        bool isRedirect = false;
+        AppActivationArguments args = AppInstance.GetCurrent().GetActivatedEventArgs();
+        _forceAlternateModeOnLaunch = args.Kind == ExtendedActivationKind.Launch && IsCtrlKeyDown();
+
+        AppInstance keyInstance = AppInstance.FindOrRegisterForKey(SingleInstanceKey);
+
+        if (keyInstance.IsCurrent)
+        {
+            EnsureAlternateModeOverrideSignalHandle();
+            keyInstance.Activated += OnActivated;
+        }
+        else
+        {
+            isRedirect = true;
+
+            if (_forceAlternateModeOnLaunch)
+            {
+                SignalForceAlternateMode();
+            }
+
+            RedirectActivationTo(args, keyInstance);
+        }
+
+        return isRedirect;
+    }
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+    private static extern IntPtr CreateEvent(
+        IntPtr lpEventAttributes, bool bManualReset,
+        bool bInitialState, string lpName);
+
+    [DllImport("kernel32.dll")]
+    private static extern bool SetEvent(IntPtr hEvent);
+
+    [DllImport("ole32.dll")]
+    private static extern uint CoWaitForMultipleObjects(
+        uint dwFlags, uint dwMilliseconds, ulong nHandles,
+        IntPtr[] pHandles, out uint dwIndex);
+
+    [DllImport("user32.dll")]
+    static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport("user32.dll")]
+    private static extern short GetAsyncKeyState(int vKey);
+
+    private static IntPtr redirectEventHandle = IntPtr.Zero;
+
+    public static bool TryConsumeCurrentProcessAlternateModeOverride()
+    {
+        if (!_forceAlternateModeOnLaunch)
+            return false;
+
+        _forceAlternateModeOnLaunch = false;
+        return true;
+    }
+
+    public static bool TryConsumeRedirectedAlternateModeOverride()
+    {
+        try
+        {
+            if (_forceAlternateModeSignalHandle != null)
+            {
+                return _forceAlternateModeSignalHandle.WaitOne(0);
+            }
+
+            if (!EventWaitHandle.TryOpenExisting(ForceAlternateModeSignalEventName, out EventWaitHandle? signal))
+                return false;
+
+            using (signal)
+            {
+                return signal.WaitOne(0);
+            }
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    private static bool IsCtrlKeyDown() => (GetAsyncKeyState(VkControl) & 0x8000) != 0;
+
+    private static void EnsureAlternateModeOverrideSignalHandle()
+    {
+        if (_forceAlternateModeSignalHandle != null)
+            return;
+
+        try
+        {
+            _forceAlternateModeSignalHandle = new EventWaitHandle(false, EventResetMode.AutoReset, ForceAlternateModeSignalEventName);
+        }
+        catch
+        {
+            _forceAlternateModeSignalHandle = null;
+        }
+    }
+
+    private static void SignalForceAlternateMode()
+    {
+        try
+        {
+            if (EventWaitHandle.TryOpenExisting(ForceAlternateModeSignalEventName, out EventWaitHandle? signal))
+            {
+                using (signal)
+                {
+                    signal.Set();
+                }
+
+                return;
+            }
+
+            using EventWaitHandle fallbackSignal = new(false, EventResetMode.AutoReset, ForceAlternateModeSignalEventName);
+            fallbackSignal.Set();
+        }
+        catch
+        {
+            // Ignore signaling failures and continue with normal activation redirection.
+        }
+    }
+
+    // Do the redirection on another thread, and use a non-blocking
+    // wait method to wait for the redirection to complete.
+    public static void RedirectActivationTo(AppActivationArguments args,
+                                            AppInstance keyInstance)
+    {
+        redirectEventHandle = CreateEvent(IntPtr.Zero, true, false, null!);
+        Task.Run(() =>
+        {
+            keyInstance.RedirectActivationToAsync(args).AsTask().Wait();
+            SetEvent(redirectEventHandle);
+        });
+
+        uint CWMO_DEFAULT = 0;
+        uint INFINITE = 0xFFFFFFFF;
+        _ = CoWaitForMultipleObjects(
+           CWMO_DEFAULT, INFINITE, 1,
+           [redirectEventHandle], out uint handleIndex);
+
+        if (ShouldBringWindowToForegroundAfterRedirection(args))
+        {
+            Process process = Process.GetProcessById((int)keyInstance.ProcessId);
+            SetForegroundWindow(process.MainWindowHandle);
+        }
+    }
+
+    private static void OnActivated(object? sender, AppActivationArguments args)
+    {
+        // When a new instance tries to launch, this event fires in the existing instance.
+        // We need to notify the App to handle the activation (e.g., bring window to front, handle protocol).
+        if (Application.Current is App app)
+        {
+            app.HandleRedirectedActivation(args);
+        }
+    }
+
+    private static bool ShouldBringWindowToForegroundAfterRedirection(AppActivationArguments args)
+    {
+        if (args.Kind != ExtendedActivationKind.AppNotification ||
+            args.Data is not AppNotificationActivatedEventArgs toastArgs)
+        {
+            return true;
+        }
+
+        var toastArguments = ToastArguments.Parse(toastArgs.Argument);
+
+        if (toastArguments.TryGetValue(Constants.ToastStoreUpdateActionKey, out string storeUpdateAction) &&
+            storeUpdateAction == Constants.ToastStoreUpdateActionInstall)
+        {
+            return true;
+        }
+
+        if (toastArguments.TryGetValue(Constants.ToastCalendarActionKey, out string calendarAction))
+        {
+            return calendarAction == Constants.ToastCalendarNavigateAction;
+        }
+
+        if (toastArguments.TryGetValue(Constants.ToastActionKey, out MailOperation mailAction))
+        {
+            return mailAction == MailOperation.Navigate;
+        }
+
+        return true;
+    }
+}
diff --git a/Wino.Mail.WinUI/Properties/launchSettings.json b/Wino.Mail.WinUI/Properties/launchSettings.json
new file mode 100644
index 00000000..52fff1db
--- /dev/null
+++ b/Wino.Mail.WinUI/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Wino.Mail.WinUI (Package)": {
+      "commandName": "MsixPackage",
+      "doNotLaunchApp": false,
+      "nativeDebugging": false
+    },
+    "Wino.Mail.WinUI (Unpackaged)": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/Wino.Mail.WinUI/Selectors/AccountProviderViewModelTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/AccountProviderViewModelTemplateSelector.cs
new file mode 100644
index 00000000..35e25afd
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/AccountProviderViewModelTemplateSelector.cs
@@ -0,0 +1,20 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.ViewModels.Data;
+
+namespace Wino.Selectors;
+
+public partial class AccountProviderViewModelTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate? RootAccountTemplate { get; set; }
+    public DataTemplate? MergedAccountTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is MergedAccountProviderDetailViewModel)
+            return MergedAccountTemplate ?? throw new ArgumentException(nameof(MergedAccountTemplate));
+        else
+            return RootAccountTemplate ?? throw new ArgumentException(nameof(RootAccountTemplate));
+    }
+}
diff --git a/Wino.Mail.WinUI/Selectors/AccountReorderTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/AccountReorderTemplateSelector.cs
new file mode 100644
index 00000000..ea008e92
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/AccountReorderTemplateSelector.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.ViewModels.Data;
+
+namespace Wino.Selectors;
+
+public partial class AccountReorderTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate? MergedAccountReorderTemplate { get; set; }
+    public DataTemplate? RootAccountReorderTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is MergedAccountProviderDetailViewModel)
+        {
+            return MergedAccountReorderTemplate ?? throw new ArgumentException(nameof(MergedAccountReorderTemplate));
+        }
+
+        return RootAccountReorderTemplate ?? throw new ArgumentException(nameof(RootAccountReorderTemplate));
+    }
+}
diff --git a/Wino.Mail.WinUI/Selectors/AppThemePreviewTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
new file mode 100644
index 00000000..71c02fc5
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/AppThemePreviewTemplateSelector.cs
@@ -0,0 +1,24 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.WinUI.Models.Personalization;
+
+namespace Wino.Mail.WinUI.Selectors;
+
+public partial class AppThemePreviewTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate SystemThemeTemplate { get; set; } = null!;
+    public DataTemplate PreDefinedThemeTemplate { get; set; } = null!;
+    public DataTemplate CustomAppTemplate { get; set; } = null!;
+
+    protected override DataTemplate SelectTemplateCore(object item)
+    {
+        if (item is SystemAppTheme)
+            return SystemThemeTemplate;
+        else if (item is PreDefinedAppTheme)
+            return PreDefinedThemeTemplate;
+        else if (item is CustomAppTheme)
+            return CustomAppTemplate;
+
+        return base.SelectTemplateCore(item) ?? SystemThemeTemplate;
+    }
+}
diff --git a/Wino.Mail.WinUI/Selectors/CalendarItemShowAsStripeTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/CalendarItemShowAsStripeTemplateSelector.cs
new file mode 100644
index 00000000..a492eda4
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/CalendarItemShowAsStripeTemplateSelector.cs
@@ -0,0 +1,36 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Selectors;
+
+/// <summary>
+/// DataTemplateSelector that selects the appropriate stripe template based on CalendarItemShowAs status.
+/// </summary>
+public partial class CalendarItemShowAsStripeTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate FreeTemplate { get; set; } = null!;
+    public DataTemplate TentativeTemplate { get; set; } = null!;
+    public DataTemplate BusyTemplate { get; set; } = null!;
+    public DataTemplate OutOfOfficeTemplate { get; set; } = null!;
+    public DataTemplate WorkingElsewhereTemplate { get; set; } = null!;
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is CalendarItemViewModel calendarItem)
+        {
+            return calendarItem.CalendarItem.ShowAs switch
+            {
+                CalendarItemShowAs.Free => FreeTemplate,
+                CalendarItemShowAs.Tentative => TentativeTemplate,
+                CalendarItemShowAs.Busy => BusyTemplate,
+                CalendarItemShowAs.OutOfOffice => OutOfOfficeTemplate,
+                CalendarItemShowAs.WorkingElsewhere => WorkingElsewhereTemplate,
+                _ => BusyTemplate // Default to Busy
+            };
+        }
+
+        return base.SelectTemplateCore(item, container) ?? BusyTemplate;
+    }
+}
diff --git a/Wino.Calendar/Selectors/CustomAreaCalendarItemSelector.cs b/Wino.Mail.WinUI/Selectors/CustomAreaCalendarItemSelector.cs
similarity index 59%
rename from Wino.Calendar/Selectors/CustomAreaCalendarItemSelector.cs
rename to Wino.Mail.WinUI/Selectors/CustomAreaCalendarItemSelector.cs
index 253a82a6..8c962126 100644
--- a/Wino.Calendar/Selectors/CustomAreaCalendarItemSelector.cs
+++ b/Wino.Mail.WinUI/Selectors/CustomAreaCalendarItemSelector.cs
@@ -1,15 +1,15 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Calendar.ViewModels.Data;
 
 namespace Wino.Calendar.Selectors;
 
 public partial class CustomAreaCalendarItemSelector : DataTemplateSelector
 {
-    public DataTemplate AllDayTemplate { get; set; }
-    public DataTemplate MultiDayTemplate { get; set; }
+    public DataTemplate? AllDayTemplate { get; set; }
+    public DataTemplate? MultiDayTemplate { get; set; }
 
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    protected override DataTemplate? SelectTemplateCore(object item, DependencyObject container)
     {
         if (item is CalendarItemViewModel calendarItemViewModel)
         {
diff --git a/Wino.Core.UWP/Selectors/CustomWinoMessageDialogIconSelector.cs b/Wino.Mail.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
similarity index 63%
rename from Wino.Core.UWP/Selectors/CustomWinoMessageDialogIconSelector.cs
rename to Wino.Mail.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
index bed04e3f..fc4403fc 100644
--- a/Wino.Core.UWP/Selectors/CustomWinoMessageDialogIconSelector.cs
+++ b/Wino.Mail.WinUI/Selectors/CustomWinoMessageDialogIconSelector.cs
@@ -1,20 +1,20 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Mail.WinUI.Selectors;
 
 public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector
 {
-    public DataTemplate InfoIconTemplate { get; set; }
-    public DataTemplate WarningIconTemplate { get; set; }
-    public DataTemplate QuestionIconTemplate { get; set; }
-    public DataTemplate ErrorIconTemplate { get; set; }
+    public DataTemplate InfoIconTemplate { get; set; } = null!;
+    public DataTemplate WarningIconTemplate { get; set; } = null!;
+    public DataTemplate QuestionIconTemplate { get; set; } = null!;
+    public DataTemplate ErrorIconTemplate { get; set; } = null!;
 
     protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
     {
-        if (item == null) return null;
+        if (item == null) return InfoIconTemplate;
 
         if (item is WinoCustomMessageDialogIcon icon)
         {
@@ -32,6 +32,6 @@ public partial class CustomWinoMessageDialogIconSelector : DataTemplateSelector
                     throw new Exception("Unknown custom message dialog icon.");
             }
         }
-        return base.SelectTemplateCore(item, container);
+        return base.SelectTemplateCore(item, container) ?? InfoIconTemplate;
     }
 }
diff --git a/Wino.Core.UWP/Selectors/FileAttachmentTypeSelector.cs b/Wino.Mail.WinUI/Selectors/FileAttachmentTypeSelector.cs
similarity index 63%
rename from Wino.Core.UWP/Selectors/FileAttachmentTypeSelector.cs
rename to Wino.Mail.WinUI/Selectors/FileAttachmentTypeSelector.cs
index 1bef19a3..0bff79bc 100644
--- a/Wino.Core.UWP/Selectors/FileAttachmentTypeSelector.cs
+++ b/Wino.Mail.WinUI/Selectors/FileAttachmentTypeSelector.cs
@@ -1,21 +1,21 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Core.UWP.Selectors;
+namespace Wino.Mail.WinUI.Selectors;
 
 public partial class FileAttachmentTypeSelector : DataTemplateSelector
 {
-    public DataTemplate None { get; set; }
-    public DataTemplate Executable { get; set; }
-    public DataTemplate Image { get; set; }
-    public DataTemplate Audio { get; set; }
-    public DataTemplate Video { get; set; }
-    public DataTemplate PDF { get; set; }
-    public DataTemplate HTML { get; set; }
-    public DataTemplate RarArchive { get; set; }
-    public DataTemplate Archive { get; set; }
-    public DataTemplate Other { get; set; }
+    public DataTemplate None { get; set; } = null!;
+    public DataTemplate Executable { get; set; } = null!;
+    public DataTemplate Image { get; set; } = null!;
+    public DataTemplate Audio { get; set; } = null!;
+    public DataTemplate Video { get; set; } = null!;
+    public DataTemplate PDF { get; set; } = null!;
+    public DataTemplate HTML { get; set; } = null!;
+    public DataTemplate RarArchive { get; set; } = null!;
+    public DataTemplate Archive { get; set; } = null!;
+    public DataTemplate Other { get; set; } = null!;
 
     protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
     {
diff --git a/Wino.Mail.WinUI/Selectors/MailItemContainerSelector.cs b/Wino.Mail.WinUI/Selectors/MailItemContainerSelector.cs
new file mode 100644
index 00000000..7753345a
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/MailItemContainerSelector.cs
@@ -0,0 +1,27 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.ViewModels.Collections;
+using Wino.Mail.ViewModels.Data;
+
+namespace Wino.Mail.WinUI.Selectors;
+
+public partial class MailItemContainerSelector : DataTemplateSelector
+{
+    public DataTemplate? EmailTemplate { get; set; }
+    public DataTemplate? ThreadExpanderTemplate { get; set; }
+    public DataTemplate? DateGroupHeaderTemplate { get; set; }
+    public DataTemplate? SenderGroupHeaderTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item)
+    {
+        return item switch
+        {
+            MailItemViewModel => EmailTemplate ?? throw new ArgumentNullException(nameof(EmailTemplate)),
+            ThreadMailItemViewModel => ThreadExpanderTemplate ?? throw new ArgumentNullException(nameof(ThreadExpanderTemplate)),
+            DateGroupHeader => DateGroupHeaderTemplate ?? throw new ArgumentNullException(nameof(DateGroupHeaderTemplate)),
+            SenderGroupHeader => SenderGroupHeaderTemplate ?? throw new ArgumentNullException(nameof(SenderGroupHeaderTemplate)),
+            _ => base.SelectTemplateCore(item)
+        };
+    }
+}
diff --git a/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
similarity index 56%
rename from Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
rename to Wino.Mail.WinUI/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
index d3cbc365..700f0b39 100644
--- a/Wino.Mail/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
+++ b/Wino.Mail.WinUI/Selectors/MailItemDisplayModePreviewTemplateSelector.cs
@@ -1,5 +1,6 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
 namespace Wino.Selectors;
@@ -9,9 +10,9 @@ namespace Wino.Selectors;
 /// </summary>
 public partial class MailItemDisplayModePreviewTemplateSelector : DataTemplateSelector
 {
-    public DataTemplate CompactTemplate { get; set; }
-    public DataTemplate MediumTemplate { get; set; }
-    public DataTemplate SpaciousTemplate { get; set; }
+    public DataTemplate? CompactTemplate { get; set; }
+    public DataTemplate? MediumTemplate { get; set; }
+    public DataTemplate? SpaciousTemplate { get; set; }
 
     protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
     {
@@ -20,11 +21,11 @@ public partial class MailItemDisplayModePreviewTemplateSelector : DataTemplateSe
             switch (mode)
             {
                 case MailListDisplayMode.Spacious:
-                    return SpaciousTemplate;
+                    return SpaciousTemplate ?? throw new ArgumentException(nameof(SpaciousTemplate));
                 case MailListDisplayMode.Medium:
-                    return MediumTemplate;
+                    return MediumTemplate ?? throw new ArgumentException(nameof(MediumTemplate));
                 case MailListDisplayMode.Compact:
-                    return CompactTemplate;
+                    return CompactTemplate ?? throw new ArgumentException(nameof(CompactTemplate));
             }
         }
 
diff --git a/Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs
new file mode 100644
index 00000000..3542317a
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/NavigationMenuTemplateSelector.cs
@@ -0,0 +1,75 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain;
+using Wino.Core.Domain.MenuItems;
+
+namespace Wino.Mail.WinUI.Selectors;
+
+public partial class NavigationMenuTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate MenuItemTemplate { get; set; } = null!;
+    public DataTemplate ContactsMenuItemTemplate { get; set; } = null!;
+    public DataTemplate ClickableAccountMenuTemplate { get; set; } = null!;
+    public DataTemplate MergedAccountTemplate { get; set; } = null!;
+    public DataTemplate MergedAccountFolderTemplate { get; set; } = null!;
+    public DataTemplate MergedAccountMoreExpansionItemTemplate { get; set; } = null!;
+    public DataTemplate FolderMenuTemplate { get; set; } = null!;
+    public DataTemplate SettingsItemTemplate { get; set; } = null!;
+    public DataTemplate SettingsShellPageItemTemplate { get; set; } = null!;
+    public DataTemplate SettingsShellSectionItemTemplate { get; set; } = null!;
+    public DataTemplate WinoAccountSettingsShellPageItemTemplate { get; set; } = null!;
+    public DataTemplate StoreUpdateItemTemplate { get; set; } = null!;
+    public DataTemplate MoreItemsFolderTemplate { get; set; } = null!;
+    public DataTemplate RatingItemTemplate { get; set; } = null!;
+    public DataTemplate CreateNewFolderTemplate { get; set; } = null!;
+    public DataTemplate SeperatorTemplate { get; set; } = null!;
+    public DataTemplate NewMailTemplate { get; set; } = null!;
+    public DataTemplate NewContactTemplate { get; set; } = null!;
+    public DataTemplate CalendarNewEventTemplate { get; set; } = null!;
+    public DataTemplate CategoryItemsTemplate { get; set; } = null!;
+    public DataTemplate FixAuthenticationIssueTemplate { get; set; } = null!;
+    public DataTemplate FixMissingFolderConfigTemplate { get; set; } = null!;
+
+    protected override DataTemplate SelectTemplateCore(object item)
+    {
+        if (item is NewCalendarEventMenuItem)
+            return CalendarNewEventTemplate;
+        else if (item is NewContactMenuItem)
+            return NewContactTemplate;
+        else if (item is NewMailMenuItem)
+            return NewMailTemplate;
+        else if (item is ContactsMenuItem)
+            return ContactsMenuItemTemplate;
+        else if (item is SettingsItem)
+            return SettingsItemTemplate;
+        else if (item is SettingsShellPageMenuItem settingsShellPageMenuItem)
+            return string.Equals(settingsShellPageMenuItem.Title, Translator.WinoAccount_SettingsSection_Title, System.StringComparison.Ordinal)
+                ? WinoAccountSettingsShellPageItemTemplate
+                : SettingsShellPageItemTemplate;
+        else if (item is SettingsShellSectionMenuItem)
+            return SettingsShellSectionItemTemplate;
+        else if (item is StoreUpdateMenuItem)
+            return StoreUpdateItemTemplate;
+        else if (item is SeperatorItem)
+            return SeperatorTemplate;
+        else if (item is AccountMenuItem)
+            // Merged inbox account menu items must be nested.
+            return ClickableAccountMenuTemplate;
+        else if (item is RateMenuItem)
+            return RatingItemTemplate;
+        else if (item is MergedAccountMenuItem)
+            return MergedAccountTemplate;
+        else if (item is MergedAccountMoreFolderMenuItem)
+            return MergedAccountMoreExpansionItemTemplate;
+        else if (item is MergedAccountFolderMenuItem)
+            return MergedAccountFolderTemplate;
+        else if (item is FolderMenuItem)
+            return FolderMenuTemplate;
+        else if (item is FixAccountIssuesMenuItem fixAccountIssuesMenuItem)
+            return fixAccountIssuesMenuItem.Account.AttentionReason == Wino.Core.Domain.Enums.AccountAttentionReason.MissingSystemFolderConfiguration
+                    ? FixMissingFolderConfigTemplate : FixAuthenticationIssueTemplate;
+        return MenuItemTemplate;
+    }
+}
+
+
diff --git a/Wino.Mail.WinUI/Selectors/RsvpStatusIconTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/RsvpStatusIconTemplateSelector.cs
new file mode 100644
index 00000000..9e60f18a
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/RsvpStatusIconTemplateSelector.cs
@@ -0,0 +1,30 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Mail.WinUI.Selectors;
+
+public partial class RsvpStatusIconTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate NotRespondedTemplate { get; set; } = null!;
+    public DataTemplate ConfirmedTemplate { get; set; } = null!;
+    public DataTemplate TentativeTemplate { get; set; } = null!;
+    public DataTemplate CancelledTemplate { get; set; } = null!;
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is CalendarItemStatus status)
+        {
+            return status switch
+            {
+                CalendarItemStatus.NotResponded => NotRespondedTemplate,
+                CalendarItemStatus.Accepted => ConfirmedTemplate,
+                CalendarItemStatus.Tentative => TentativeTemplate,
+                CalendarItemStatus.Cancelled => CancelledTemplate,
+                _ => NotRespondedTemplate
+            };
+        }
+        
+        return base.SelectTemplateCore(item, container) ?? NotRespondedTemplate;
+    }
+}
diff --git a/Wino.Mail.WinUI/Selectors/WinoAddOnTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/WinoAddOnTemplateSelector.cs
new file mode 100644
index 00000000..47401360
--- /dev/null
+++ b/Wino.Mail.WinUI/Selectors/WinoAddOnTemplateSelector.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.ViewModels.Data;
+
+namespace Wino.Selectors;
+
+public partial class WinoAddOnTemplateSelector : DataTemplateSelector
+{
+    public DataTemplate? NotPurchasedTemplate { get; set; }
+    public DataTemplate? AiPackPurchasedTemplate { get; set; }
+    public DataTemplate? UnlimitedAccountsPurchasedTemplate { get; set; }
+
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        if (item is not WinoAddOnItemViewModel addOn)
+            throw new ArgumentException(nameof(item));
+
+        if (!addOn.IsPurchased)
+            return NotPurchasedTemplate ?? throw new ArgumentException(nameof(NotPurchasedTemplate));
+
+        return addOn.ProductType switch
+        {
+            WinoAddOnProductType.AI_PACK => AiPackPurchasedTemplate ?? throw new ArgumentException(nameof(AiPackPurchasedTemplate)),
+            WinoAddOnProductType.UNLIMITED_ACCOUNTS => UnlimitedAccountsPurchasedTemplate ?? throw new ArgumentException(nameof(UnlimitedAccountsPurchasedTemplate)),
+            _ => NotPurchasedTemplate ?? throw new ArgumentException(nameof(NotPurchasedTemplate))
+        };
+    }
+}
diff --git a/Wino.Calendar/Selectors/WinoCalendarItemTemplateSelector.cs b/Wino.Mail.WinUI/Selectors/WinoCalendarItemTemplateSelector.cs
similarity index 65%
rename from Wino.Calendar/Selectors/WinoCalendarItemTemplateSelector.cs
rename to Wino.Mail.WinUI/Selectors/WinoCalendarItemTemplateSelector.cs
index 0474a188..3f8fc4f5 100644
--- a/Wino.Calendar/Selectors/WinoCalendarItemTemplateSelector.cs
+++ b/Wino.Mail.WinUI/Selectors/WinoCalendarItemTemplateSelector.cs
@@ -1,15 +1,15 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain.Enums;
 
-namespace Wino.Calendar.Selectors;
+namespace Wino.Selectors;
 
 public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
 {
     public CalendarDisplayType DisplayType { get; set; }
 
-    public DataTemplate DayWeekWorkWeekTemplate { get; set; }
-    public DataTemplate MonthlyTemplate { get; set; }
+    public DataTemplate DayWeekWorkWeekTemplate { get; set; } = null!;
+    public DataTemplate MonthlyTemplate { get; set; } = null!;
 
 
     protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
@@ -22,12 +22,10 @@ public partial class WinoCalendarItemTemplateSelector : DataTemplateSelector
                 return DayWeekWorkWeekTemplate;
             case CalendarDisplayType.Month:
                 return MonthlyTemplate;
-            case CalendarDisplayType.Year:
-                break;
             default:
                 break;
         }
 
-        return base.SelectTemplateCore(item, container);
+        return base.SelectTemplateCore(item, container) ?? DayWeekWorkWeekTemplate;
     }
 }
diff --git a/Wino.Mail.WinUI/Services/AccountCalendarStateService.cs b/Wino.Mail.WinUI/Services/AccountCalendarStateService.cs
new file mode 100644
index 00000000..703a9e25
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/AccountCalendarStateService.cs
@@ -0,0 +1,410 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using CommunityToolkit.Mvvm.Collections;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.UI;
+
+namespace Wino.Mail.WinUI.Services;
+
+/// <summary>
+/// Encapsulated state manager for collectively managing the state of account calendars.
+/// Callers must react to the events to update their state only from this service.
+/// </summary>
+public partial class AccountCalendarStateService : ObservableRecipient,
+    IAccountCalendarStateService,
+    IRecipient<CalendarListAdded>,
+    IRecipient<CalendarListUpdated>,
+    IRecipient<CalendarListDeleted>,
+    IRecipient<AccountRemovedMessage>,
+    IRecipient<AccountUpdatedMessage>,
+    IRecipient<AccountCalendarSynchronizationStateChanged>
+{
+    private readonly object _calendarStateLock = new();
+
+    public IDispatcher? Dispatcher { get; set; }
+
+    public event EventHandler<GroupedAccountCalendarViewModel>? CollectiveAccountGroupSelectionStateChanged;
+    public event EventHandler<AccountCalendarViewModel>? AccountCalendarSelectionStateChanged;
+
+    private readonly ObservableCollection<GroupedAccountCalendarViewModel> _internalGroupedAccountCalendars;
+    private readonly ObservableGroupedCollection<MailAccount, AccountCalendarViewModel> _internalGroupedCalendars;
+
+    [ObservableProperty]
+    public partial ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; set; }
+
+    [ObservableProperty]
+    public partial ReadOnlyObservableGroupedCollection<MailAccount, AccountCalendarViewModel> GroupedCalendars { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsAnySynchronizationInProgress { get; set; }
+
+    public IEnumerable<AccountCalendarViewModel> ActiveCalendars
+    {
+        get
+        {
+            lock (_calendarStateLock)
+            {
+                return _internalGroupedAccountCalendars
+                    .SelectMany(a => a.AccountCalendars)
+                    .Where(b => b.IsChecked)
+                    .ToList();
+            }
+        }
+    }
+
+    public IEnumerable<AccountCalendarViewModel> AllCalendars
+    {
+        get
+        {
+            lock (_calendarStateLock)
+            {
+                return _internalGroupedAccountCalendars
+                    .SelectMany(a => a.AccountCalendars)
+                    .ToList();
+            }
+        }
+    }
+
+    private readonly IAccountService _accountService;
+
+    public AccountCalendarStateService(IAccountService accountService)
+    {
+        _accountService = accountService;
+
+        _internalGroupedAccountCalendars = new ObservableCollection<GroupedAccountCalendarViewModel>();
+        GroupedAccountCalendars = new ReadOnlyObservableCollection<GroupedAccountCalendarViewModel>(_internalGroupedAccountCalendars);
+
+        _internalGroupedCalendars = new ObservableGroupedCollection<MailAccount, AccountCalendarViewModel>();
+        GroupedCalendars = new ReadOnlyObservableGroupedCollection<MailAccount, AccountCalendarViewModel>(_internalGroupedCalendars);
+
+        Messenger.Register<CalendarListAdded>(this);
+        Messenger.Register<CalendarListUpdated>(this);
+        Messenger.Register<CalendarListDeleted>(this);
+        Messenger.Register<AccountRemovedMessage>(this);
+        Messenger.Register<AccountUpdatedMessage>(this);
+        Messenger.Register<AccountCalendarSynchronizationStateChanged>(this);
+    }
+
+    private void SingleGroupCalendarCollectiveStateChanged(object? sender, EventArgs e)
+        => CollectiveAccountGroupSelectionStateChanged?.Invoke(this, sender as GroupedAccountCalendarViewModel ?? throw new InvalidOperationException("Sender must be GroupedAccountCalendarViewModel"));
+
+    private void SingleCalendarSelectionStateChanged(object? sender, AccountCalendarViewModel e)
+        => AccountCalendarSelectionStateChanged?.Invoke(this, e);
+
+    public void AddGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar)
+    {
+        lock (_calendarStateLock)
+        {
+            groupedAccountCalendar.CalendarSelectionStateChanged += SingleCalendarSelectionStateChanged;
+            groupedAccountCalendar.CollectiveSelectionStateChanged += SingleGroupCalendarCollectiveStateChanged;
+
+            _internalGroupedAccountCalendars.Add(groupedAccountCalendar);
+
+            // Maintain the grouped calendars collection
+            var group = _internalGroupedCalendars.FirstOrDefault<ObservableGroup<MailAccount, AccountCalendarViewModel>>(g => g.Key.Id == groupedAccountCalendar.Account.Id);
+            if (group == null)
+            {
+                _internalGroupedCalendars.Add(new ObservableGroup<MailAccount, AccountCalendarViewModel>(groupedAccountCalendar.Account, groupedAccountCalendar.AccountCalendars));
+            }
+            else
+            {
+                foreach (var calendar in groupedAccountCalendar.AccountCalendars)
+                {
+                    group.Add(calendar);
+                }
+            }
+
+            UpdateAggregateSynchronizationState();
+        }
+    }
+
+    public void RemoveGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar)
+    {
+        lock (_calendarStateLock)
+        {
+            groupedAccountCalendar.CalendarSelectionStateChanged -= SingleCalendarSelectionStateChanged;
+            groupedAccountCalendar.CollectiveSelectionStateChanged -= SingleGroupCalendarCollectiveStateChanged;
+
+            _internalGroupedAccountCalendars.Remove(groupedAccountCalendar);
+
+            // Maintain the grouped calendars collection
+            var group = _internalGroupedCalendars.FirstOrDefault<ObservableGroup<MailAccount, AccountCalendarViewModel>>(g => g.Key.Id == groupedAccountCalendar.Account.Id);
+            if (group != null)
+            {
+                foreach (var calendar in groupedAccountCalendar.AccountCalendars.ToList())
+                {
+                    group.Remove(calendar);
+                }
+
+                if (group.Count == 0)
+                {
+                    _internalGroupedCalendars.Remove(group);
+                }
+            }
+
+            UpdateAggregateSynchronizationState();
+        }
+    }
+
+    public void ClearGroupedAccountCalendars()
+    {
+        lock (_calendarStateLock)
+        {
+            while (_internalGroupedAccountCalendars.Any())
+            {
+                RemoveGroupedAccountCalendar(_internalGroupedAccountCalendars[0]);
+            }
+        }
+    }
+
+    public void AddAccountCalendar(AccountCalendarViewModel accountCalendar)
+    {
+        lock (_calendarStateLock)
+        {
+            // Find the group that this calendar belongs to.
+            var group = _internalGroupedAccountCalendars.FirstOrDefault(g => g.Account.Id == accountCalendar.Account.Id);
+
+            if (group == null)
+            {
+                // If the group doesn't exist, create it.
+                group = new GroupedAccountCalendarViewModel(accountCalendar.Account, new[] { accountCalendar });
+                AddGroupedAccountCalendar(group);
+            }
+            else
+            {
+                group.AccountCalendars.Add(accountCalendar);
+
+                // Maintain the grouped calendars collection
+                var calendarGroup = _internalGroupedCalendars.FirstOrDefault<ObservableGroup<MailAccount, AccountCalendarViewModel>>(g => g.Key.Id == accountCalendar.Account.Id);
+                if (calendarGroup == null)
+                {
+                    _internalGroupedCalendars.Add(new ObservableGroup<MailAccount, AccountCalendarViewModel>(accountCalendar.Account, new[] { accountCalendar }));
+                }
+                else
+                {
+                    calendarGroup.Add(accountCalendar);
+                }
+            }
+        }
+    }
+
+    public void RemoveAccountCalendar(AccountCalendarViewModel accountCalendar)
+    {
+        lock (_calendarStateLock)
+        {
+            var group = _internalGroupedAccountCalendars.FirstOrDefault(g => g.Account.Id == accountCalendar.Account.Id);
+
+            // We don't expect but just in case.
+            if (group == null) return;
+
+            group.AccountCalendars.Remove(accountCalendar);
+
+            // Maintain the grouped calendars collection
+            var calendarGroup = _internalGroupedCalendars.FirstOrDefault<ObservableGroup<MailAccount, AccountCalendarViewModel>>(g => g.Key.Id == accountCalendar.Account.Id);
+            if (calendarGroup != null)
+            {
+                calendarGroup.Remove(accountCalendar);
+
+                if (calendarGroup.Count == 0)
+                {
+                    _internalGroupedCalendars.Remove(calendarGroup);
+                }
+            }
+
+            if (group.AccountCalendars.Count == 0)
+            {
+                RemoveGroupedAccountCalendar(group);
+            }
+        }
+    }
+
+    public async void Receive(CalendarListAdded message)
+    {
+        var accountCalendar = message.AccountCalendar;
+        var mailAccount = await _accountService.GetAccountAsync(accountCalendar.AccountId);
+
+        if (mailAccount == null) return;
+
+        var accountCalendarViewModel = new AccountCalendarViewModel(mailAccount, accountCalendar);
+        
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() => AddAccountCalendar(accountCalendarViewModel));
+        }
+        else
+        {
+            AddAccountCalendar(accountCalendarViewModel);
+        }
+    }
+
+    public async void Receive(CalendarListUpdated message)
+    {
+        var accountCalendar = message.AccountCalendar;
+
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() =>
+            {
+                // Find the existing calendar view model
+                var existingCalendar = AllCalendars.FirstOrDefault(c => c.Id == accountCalendar.Id);
+
+                if (existingCalendar != null)
+                {
+                    // Update properties
+                    existingCalendar.Name = accountCalendar.Name;
+                    existingCalendar.TextColorHex = accountCalendar.TextColorHex;
+                    existingCalendar.BackgroundColorHex = accountCalendar.BackgroundColorHex;
+                    existingCalendar.IsExtended = accountCalendar.IsExtended;
+                    existingCalendar.IsPrimary = accountCalendar.IsPrimary;
+                    existingCalendar.IsSynchronizationEnabled = accountCalendar.IsSynchronizationEnabled;
+                    existingCalendar.DefaultShowAs = accountCalendar.DefaultShowAs;
+                }
+            });
+        }
+        else
+        {
+            // Find the existing calendar view model
+            var existingCalendar = AllCalendars.FirstOrDefault(c => c.Id == accountCalendar.Id);
+
+            if (existingCalendar != null)
+            {
+                // Update properties
+                existingCalendar.Name = accountCalendar.Name;
+                existingCalendar.TextColorHex = accountCalendar.TextColorHex;
+                existingCalendar.BackgroundColorHex = accountCalendar.BackgroundColorHex;
+                existingCalendar.IsExtended = accountCalendar.IsExtended;
+                existingCalendar.IsPrimary = accountCalendar.IsPrimary;
+                existingCalendar.IsSynchronizationEnabled = accountCalendar.IsSynchronizationEnabled;
+                existingCalendar.DefaultShowAs = accountCalendar.DefaultShowAs;
+            }
+        }
+    }
+
+    public async void Receive(CalendarListDeleted message)
+    {
+        var accountCalendar = message.AccountCalendar;
+
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() =>
+            {
+                // Find and remove the calendar view model
+                var existingCalendar = AllCalendars.FirstOrDefault(c => c.Id == accountCalendar.Id);
+
+                if (existingCalendar != null)
+                {
+                    RemoveAccountCalendar(existingCalendar);
+                }
+            });
+        }
+        else
+        {
+            // Find and remove the calendar view model
+            var existingCalendar = AllCalendars.FirstOrDefault(c => c.Id == accountCalendar.Id);
+
+            if (existingCalendar != null)
+            {
+                RemoveAccountCalendar(existingCalendar);
+            }
+        }
+    }
+
+    public async void Receive(AccountRemovedMessage message)
+    {
+        var removedAccountId = message.Account.Id;
+
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() =>
+            {
+                GroupedAccountCalendarViewModel? groupedAccount;
+                lock (_calendarStateLock)
+                {
+                    groupedAccount = _internalGroupedAccountCalendars.FirstOrDefault(a => a.Account.Id == removedAccountId);
+                }
+
+                if (groupedAccount != null)
+                {
+                    RemoveGroupedAccountCalendar(groupedAccount);
+                }
+            });
+        }
+        else
+        {
+            GroupedAccountCalendarViewModel? groupedAccount;
+            lock (_calendarStateLock)
+            {
+                groupedAccount = _internalGroupedAccountCalendars.FirstOrDefault(a => a.Account.Id == removedAccountId);
+            }
+
+            if (groupedAccount != null)
+            {
+                RemoveGroupedAccountCalendar(groupedAccount);
+            }
+        }
+    }
+
+    public async void Receive(AccountUpdatedMessage message)
+    {
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() => UpdateGroupedAccount(message.Account));
+        }
+        else
+        {
+            UpdateGroupedAccount(message.Account);
+        }
+    }
+
+    public async void Receive(AccountCalendarSynchronizationStateChanged message)
+    {
+        if (Dispatcher != null)
+        {
+            await Dispatcher.ExecuteOnUIThread(() => UpdateCalendarSynchronizationState(message));
+        }
+        else
+        {
+            UpdateCalendarSynchronizationState(message);
+        }
+    }
+
+    private void UpdateGroupedAccount(MailAccount updatedAccount)
+    {
+        GroupedAccountCalendarViewModel? groupedAccount;
+        lock (_calendarStateLock)
+        {
+            groupedAccount = _internalGroupedAccountCalendars.FirstOrDefault(a => a.Account.Id == updatedAccount.Id);
+        }
+
+        groupedAccount?.UpdateAccount(updatedAccount);
+    }
+
+    private void UpdateCalendarSynchronizationState(AccountCalendarSynchronizationStateChanged message)
+    {
+        GroupedAccountCalendarViewModel? groupedAccount;
+        lock (_calendarStateLock)
+        {
+            groupedAccount = _internalGroupedAccountCalendars.FirstOrDefault(a => a.Account.Id == message.AccountId);
+        }
+
+        if (groupedAccount == null)
+            return;
+
+        groupedAccount.IsSynchronizationInProgress = message.IsSynchronizationInProgress;
+        groupedAccount.SynchronizationStatus = message.SynchronizationStatus;
+        UpdateAggregateSynchronizationState();
+    }
+
+    private void UpdateAggregateSynchronizationState()
+    {
+        IsAnySynchronizationInProgress = _internalGroupedAccountCalendars.Any(a => a.IsSynchronizationInProgress);
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/AiActionOptionsService.cs b/Wino.Mail.WinUI/Services/AiActionOptionsService.cs
new file mode 100644
index 00000000..87ae905c
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/AiActionOptionsService.cs
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Ai;
+
+namespace Wino.Mail.WinUI.Services;
+
+public sealed class AiActionOptionsService : IAiActionOptionsService
+{
+    public IReadOnlyList<AiTranslateLanguageOption> GetTranslateLanguageOptions()
+    {
+        return
+        [
+            new("en-US", Translator.Composer_AiTranslateLanguageEnglish),
+            new("tr-TR", Translator.Composer_AiTranslateLanguageTurkish),
+            new("de-DE", Translator.Composer_AiTranslateLanguageGerman),
+            new("fr-FR", Translator.Composer_AiTranslateLanguageFrench),
+            new("es-ES", Translator.Composer_AiTranslateLanguageSpanish),
+            new("it-IT", Translator.Composer_AiTranslateLanguageItalian),
+            new("pt-BR", Translator.Composer_AiTranslateLanguagePortugueseBrazil),
+            new("nl-NL", Translator.Composer_AiTranslateLanguageDutch),
+            new("pl-PL", Translator.Composer_AiTranslateLanguagePolish),
+            new("ru-RU", Translator.Composer_AiTranslateLanguageRussian),
+            new("ja-JP", Translator.Composer_AiTranslateLanguageJapanese),
+            new("ko-KR", Translator.Composer_AiTranslateLanguageKorean),
+            new("zh-CN", Translator.Composer_AiTranslateLanguageChineseSimplified),
+            new("ar-SA", Translator.Composer_AiTranslateLanguageArabic),
+            new("hi-IN", Translator.Composer_AiTranslateLanguageHindi),
+        ];
+    }
+
+    public IReadOnlyList<AiRewriteModeOption> GetRewriteModeOptions()
+    {
+        return
+        [
+            new("polite", Translator.Composer_AiRewritePolite, Translator.Composer_AiRewritePoliteDescription),
+            new("angry", Translator.Composer_AiRewriteAngry, Translator.Composer_AiRewriteAngryDescription),
+            new("happy", Translator.Composer_AiRewriteHappy, Translator.Composer_AiRewriteHappyDescription),
+            new("formal", Translator.Composer_AiRewriteFormal, Translator.Composer_AiRewriteFormalDescription),
+            new("friendly", Translator.Composer_AiRewriteFriendly, Translator.Composer_AiRewriteFriendlyDescription),
+            new("shorter", Translator.Composer_AiRewriteShorter, Translator.Composer_AiRewriteShorterDescription),
+            new("clearer", Translator.Composer_AiRewriteClearer, Translator.Composer_AiRewriteClearerDescription),
+            new(string.Empty, Translator.Composer_AiRewriteCustom, Translator.Composer_AiRewriteCustomDescription, true),
+        ];
+    }
+}
diff --git a/Wino.Core.UWP/Services/ApplicationResourceManager.cs b/Wino.Mail.WinUI/Services/ApplicationResourceManager.cs
similarity index 91%
rename from Wino.Core.UWP/Services/ApplicationResourceManager.cs
rename to Wino.Mail.WinUI/Services/ApplicationResourceManager.cs
index d572c9e8..aea5d5fd 100644
--- a/Wino.Core.UWP/Services/ApplicationResourceManager.cs
+++ b/Wino.Mail.WinUI/Services/ApplicationResourceManager.cs
@@ -1,7 +1,7 @@
-using System.Linq;
-using Windows.UI.Xaml;
+using System.Linq;
+using Microsoft.UI.Xaml;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 
 namespace Wino.Services;
 
@@ -16,7 +16,7 @@ public class ApplicationResourceManager : IApplicationResourceManager<ResourceDi
         => WinoApplication.Current.Resources.ContainsKey(resourceKey);
 
     public ResourceDictionary GetLastResource()
-        => WinoApplication.Current.Resources.MergedDictionaries.LastOrDefault();
+        => WinoApplication.Current.Resources.MergedDictionaries.LastOrDefault()!;
 
     public void ReplaceResource(string resourceKey, object resource)
         => WinoApplication.Current.Resources[resourceKey] = resource;
diff --git a/Wino.Mail.WinUI/Services/CalendarReminderServer.cs b/Wino.Mail.WinUI/Services/CalendarReminderServer.cs
new file mode 100644
index 00000000..397d50e5
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/CalendarReminderServer.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI.Interfaces;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class CalendarReminderServer : ICalendarReminderServer
+{
+    private static readonly TimeSpan PollingInterval = TimeSpan.FromSeconds(30);
+
+    private readonly ICalendarService _calendarService;
+    private readonly IAccountService _accountService;
+    private readonly INotificationBuilder _notificationBuilder;
+    private readonly ILogger _logger = Log.ForContext<CalendarReminderServer>();
+    private readonly SemaphoreSlim _startLock = new(1, 1);
+    private readonly HashSet<string> _sentReminderKeys = [];
+
+    private Task? _loopTask;
+    private CancellationTokenSource? _loopCts;
+    private DateTime _lastCheckLocal = DateTime.MinValue;
+
+    public CalendarReminderServer(ICalendarService calendarService, IAccountService accountService, INotificationBuilder notificationBuilder)
+    {
+        _calendarService = calendarService;
+        _accountService = accountService;
+        _notificationBuilder = notificationBuilder;
+    }
+
+    public async Task StartAsync()
+    {
+        await _startLock.WaitAsync().ConfigureAwait(false);
+
+        try
+        {
+            if (_loopTask != null)
+                return;
+
+            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+            var hasCalendarAccess = accounts.Exists(a => a.IsCalendarAccessGranted);
+
+            if (!hasCalendarAccess)
+            {
+                _logger.Information("Calendar reminder server will not start because no account has calendar access.");
+                return;
+            }
+
+            _lastCheckLocal = DateTime.Now.AddSeconds(-30);
+            _loopCts = new CancellationTokenSource();
+            _loopTask = RunLoopAsync(_loopCts.Token);
+
+            _logger.Information("Calendar reminder server started.");
+        }
+        finally
+        {
+            _startLock.Release();
+        }
+    }
+
+    private async Task RunLoopAsync(CancellationToken cancellationToken)
+    {
+        using var timer = new PeriodicTimer(PollingInterval);
+
+        try
+        {
+            while (await timer.WaitForNextTickAsync(cancellationToken).ConfigureAwait(false))
+            {
+                await ExecuteTickAsync(cancellationToken).ConfigureAwait(false);
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            // no-op
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Calendar reminder server loop terminated unexpectedly.");
+        }
+    }
+
+    private async Task ExecuteTickAsync(CancellationToken cancellationToken)
+    {
+        var nowLocal = DateTime.Now;
+
+        if (_lastCheckLocal == DateTime.MinValue)
+            _lastCheckLocal = nowLocal.AddSeconds(-PollingInterval.TotalSeconds);
+
+        var dueNotifications = await _calendarService
+            .CheckAndNotifyAsync(_lastCheckLocal, nowLocal, _sentReminderKeys, cancellationToken)
+            .ConfigureAwait(false);
+
+        foreach (var reminder in dueNotifications)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            await _notificationBuilder
+                .CreateCalendarReminderNotificationAsync(reminder.CalendarItem, reminder.ReminderDurationInSeconds)
+                .ConfigureAwait(false);
+        }
+
+        _lastCheckLocal = nowLocal;
+    }
+}
diff --git a/Wino.Core.UWP/Services/ClipboardService.cs b/Wino.Mail.WinUI/Services/ClipboardService.cs
similarity index 83%
rename from Wino.Core.UWP/Services/ClipboardService.cs
rename to Wino.Mail.WinUI/Services/ClipboardService.cs
index bbfb94dc..21552e64 100644
--- a/Wino.Core.UWP/Services/ClipboardService.cs
+++ b/Wino.Mail.WinUI/Services/ClipboardService.cs
@@ -1,8 +1,8 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class ClipboardService : IClipboardService
 {
diff --git a/Wino.Core.UWP/Services/ConfigurationService.cs b/Wino.Mail.WinUI/Services/ConfigurationService.cs
similarity index 73%
rename from Wino.Core.UWP/Services/ConfigurationService.cs
rename to Wino.Mail.WinUI/Services/ConfigurationService.cs
index 83d5c744..afdc47c1 100644
--- a/Wino.Core.UWP/Services/ConfigurationService.cs
+++ b/Wino.Mail.WinUI/Services/ConfigurationService.cs
@@ -1,18 +1,18 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using Windows.Foundation.Collections;
 using Windows.Storage;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class ConfigurationService : IConfigurationService
 {
-    public T Get<T>(string key, T defaultValue = default)
+    public T Get<T>(string key, T defaultValue = default!)
         => GetInternal(key, ApplicationData.Current.LocalSettings.Values, defaultValue);
 
-    public T GetRoaming<T>(string key, T defaultValue = default)
+    public T GetRoaming<T>(string key, T defaultValue = default!)
         => GetInternal(key, ApplicationData.Current.RoamingSettings.Values, defaultValue);
 
     public void Set(string key, object value)
@@ -21,11 +21,13 @@ public class ConfigurationService : IConfigurationService
     public void SetRoaming(string key, object value)
         => SetInternal(key, value, ApplicationData.Current.RoamingSettings.Values);
 
-    private static T GetInternal<T>(string key, IPropertySet collection, T defaultValue = default)
+    private static T GetInternal<T>(string key, IPropertySet collection, T defaultValue = default!)
     {
-        if (collection.TryGetValue(key, out object value))
+        if (collection.TryGetValue(key, out object? value))
         {
             var stringValue = value?.ToString();
+            if (string.IsNullOrWhiteSpace(stringValue))
+                return defaultValue;
 
             if (typeof(T).IsEnum)
                 return (T)Enum.Parse(typeof(T), stringValue);
@@ -40,7 +42,8 @@ public class ConfigurationService : IConfigurationService
                 return (T)(object)TimeSpan.Parse(stringValue);
             }
 
-            return (T)Convert.ChangeType(stringValue, typeof(T));
+            var converted = Convert.ChangeType(stringValue, typeof(T));
+            return converted is T typed ? typed : defaultValue;
         }
 
         return defaultValue;
diff --git a/Wino.Mail/Services/DialogService.cs b/Wino.Mail.WinUI/Services/DialogService.cs
similarity index 52%
rename from Wino.Mail/Services/DialogService.cs
rename to Wino.Mail.WinUI/Services/DialogService.cs
index 546deaa4..37a70557 100644
--- a/Wino.Mail/Services/DialogService.cs
+++ b/Wino.Mail.WinUI/Services/DialogService.cs
@@ -1,20 +1,23 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Folders;
 using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.UWP.Extensions;
-using Wino.Core.UWP.Services;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Mail.WinUI.Services;
 using Wino.Dialogs;
 using Wino.Mail.Dialogs;
 using Wino.Messaging.Server;
@@ -24,38 +27,19 @@ namespace Wino.Services;
 
 public class DialogService : DialogServiceBase, IMailDialogService
 {
-    public DialogService(IThemeService themeService,
+    private readonly IWinoAccountProfileService _winoAccountProfileService;
+    private readonly IWinoAccountDataSyncService _winoAccountDataSyncService;
+
+    public DialogService(INewThemeService themeService,
                          IConfigurationService configurationService,
-                         IApplicationResourceManager<ResourceDictionary> applicationResourceManager) : base(themeService, configurationService, applicationResourceManager)
+                         IApplicationResourceManager<ResourceDictionary> applicationResourceManager,
+                         IWinoAccountProfileService winoAccountProfileService,
+                         IWinoAccountDataSyncService winoAccountDataSyncService) : base(themeService, configurationService, applicationResourceManager)
     {
-
+        _winoAccountProfileService = winoAccountProfileService;
+        _winoAccountDataSyncService = winoAccountDataSyncService;
     }
 
-    public override IAccountCreationDialog GetAccountCreationDialog(AccountCreationDialogResult accountCreationDialogResult)
-    {
-        if (accountCreationDialogResult.SpecialImapProviderDetails == null)
-        {
-            if (accountCreationDialogResult.ProviderType == MailProviderType.IMAP4)
-            {
-                return new NewImapSetupDialog
-                {
-                    RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
-                };
-            }
-            else
-            {
-                return base.GetAccountCreationDialog(accountCreationDialogResult);
-            }
-        }
-        else
-        {
-            // Special IMAP provider like iCloud or Yahoo.
-
-            return base.GetAccountCreationDialog(accountCreationDialogResult);
-        }
-    }
-
-
     public async Task<ICreateAccountAliasDialog> ShowCreateAccountAliasDialogAsync()
     {
         var createAccountAliasDialog = new CreateAccountAliasDialog()
@@ -97,7 +81,7 @@ public class DialogService : DialogServiceBase, IMailDialogService
                     Type = MailSynchronizationType.FullFolders,
                 };
 
-                WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options, SynchronizationSource.Client));
+                WeakReferenceMessenger.Default.Send(new NewMailSynchronizationRequested(options));
             }
         }
         catch (Exception ex)
@@ -143,10 +127,22 @@ public class DialogService : DialogServiceBase, IMailDialogService
 
         await HandleDialogPresentationAsync(accountPicker);
 
-        return accountPicker.PickedAccount;
+        return accountPicker.PickedAccount ?? null!;
     }
 
-    public async Task<AccountSignature> ShowSignatureEditorDialog(AccountSignature signatureModel = null)
+    public async Task<AccountCalendarPickingResult> ShowSingleCalendarPickerDialogAsync(List<CalendarPickerAccountGroup> availableCalendarGroups)
+    {
+        var calendarPicker = new SingleCalendarPickerDialog(availableCalendarGroups)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        await HandleDialogPresentationAsync(calendarPicker);
+
+        return new AccountCalendarPickingResult(calendarPicker.PickedCalendar, calendarPicker.ShouldNavigateToCalendarSettings);
+    }
+
+    public async Task<AccountSignature> ShowSignatureEditorDialog(AccountSignature? signatureModel = null)
     {
         SignatureEditorDialog signatureEditorDialog;
         if (signatureModel != null)
@@ -166,7 +162,7 @@ public class DialogService : DialogServiceBase, IMailDialogService
 
         var result = await HandleDialogPresentationAsync(signatureEditorDialog);
 
-        return result == ContentDialogResult.Primary ? signatureEditorDialog.Result : null;
+        return result == ContentDialogResult.Primary ? signatureEditorDialog.Result : null!;
     }
 
     public async Task ShowMessageSourceDialogAsync(string messageSource)
@@ -192,4 +188,114 @@ public class DialogService : DialogServiceBase, IMailDialogService
 
         await HandleDialogPresentationAsync(accountReorderDialog);
     }
+
+#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
+    public async Task<KeyboardShortcutDialogResult> ShowKeyboardShortcutDialogAsync(KeyboardShortcut existingShortcut = null)
+#pragma warning restore CS8625
+    {
+        var dialog = new KeyboardShortcutDialog(existingShortcut)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        await HandleDialogPresentationAsync(dialog);
+
+        return dialog.Result;
+    }
+
+    public async Task<Core.Domain.Entities.Shared.AccountContact?> ShowEditContactDialogAsync(Core.Domain.Entities.Shared.AccountContact? contact = null)
+    {
+        var dialog = new ContactEditDialog(contact, this)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        var result = await HandleDialogPresentationAsync(dialog);
+
+        if (result == ContentDialogResult.Primary)
+        {
+            return dialog.Contact;
+        }
+
+        return null;
+    }
+
+    public async Task<WinoAccount?> ShowWinoAccountRegistrationDialogAsync()
+    {
+        var dialog = new WinoAccountRegistrationDialog(_winoAccountProfileService)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        await HandleDialogPresentationAsync(dialog);
+
+        if (!string.IsNullOrWhiteSpace(dialog.ConfirmationEmailAddress))
+        {
+            await ShowMessageAsync(
+                string.Format(Translator.WinoAccount_EmailConfirmationSentDialog_Message, dialog.ConfirmationEmailAddress),
+                Translator.WinoAccount_EmailConfirmationSentDialog_Title);
+        }
+
+        return null;
+    }
+
+    public async Task<WinoAccount?> ShowWinoAccountLoginDialogAsync()
+    {
+        var dialog = new WinoAccountLoginDialog(_winoAccountProfileService)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        var result = await HandleDialogPresentationAsync(dialog);
+
+        if (dialog.EmailConfirmationRequiredDetails != null && !string.IsNullOrWhiteSpace(dialog.PendingConfirmationEmailAddress))
+        {
+            var confirmationDialog = new WinoAccountEmailConfirmationRequiredDialog(
+                _winoAccountProfileService,
+                dialog.PendingConfirmationEmailAddress,
+                dialog.EmailConfirmationRequiredDetails)
+            {
+                RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+            };
+
+            await HandleDialogPresentationAsync(confirmationDialog);
+
+            if (confirmationDialog.ResendSucceeded)
+            {
+                await ShowMessageAsync(
+                    string.Format(Translator.WinoAccount_EmailConfirmationResentDialog_Message, dialog.PendingConfirmationEmailAddress),
+                    Translator.WinoAccount_EmailConfirmationResentDialog_Title);
+            }
+
+            return null;
+        }
+
+        if (!string.IsNullOrWhiteSpace(dialog.PasswordResetEmailAddress))
+        {
+            await ShowMessageAsync(
+                string.Format(Translator.WinoAccount_ForgotPasswordDialog_SuccessMessage, dialog.PasswordResetEmailAddress),
+                Translator.WinoAccount_ForgotPasswordDialog_SuccessTitle);
+
+            return null;
+        }
+
+        return dialog.Result;
+    }
+
+    public async Task<WinoAccountSyncExportResult?> ShowWinoAccountExportDialogAsync()
+    {
+        var dialog = new WinoAccountSyncExportDialog(_winoAccountDataSyncService)
+        {
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+        };
+
+        await HandleDialogPresentationAsync(dialog);
+
+        if (dialog.FailureException != null)
+        {
+            throw dialog.FailureException;
+        }
+
+        return dialog.Result;
+    }
 }
diff --git a/Wino.Core.UWP/Services/DialogServiceBase.cs b/Wino.Mail.WinUI/Services/DialogServiceBase.cs
similarity index 69%
rename from Wino.Core.UWP/Services/DialogServiceBase.cs
rename to Wino.Mail.WinUI/Services/DialogServiceBase.cs
index afb431df..f097abc5 100644
--- a/Wino.Core.UWP/Services/DialogServiceBase.cs
+++ b/Wino.Mail.WinUI/Services/DialogServiceBase.cs
@@ -1,57 +1,70 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Serilog;
 using Windows.Storage;
 using Windows.Storage.AccessCache;
 using Windows.Storage.Pickers;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Common;
-using Wino.Core.UWP.Dialogs;
-using Wino.Core.UWP.Extensions;
+using Wino.Core.Domain.Models.Printing;
 using Wino.Dialogs;
+using Wino.Mail.WinUI.Dialogs;
+using Wino.Mail.WinUI.Extensions;
 using Wino.Messaging.Client.Shell;
+using WinRT.Interop;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class DialogServiceBase : IDialogServiceBase
 {
     private SemaphoreSlim _presentationSemaphore = new SemaphoreSlim(1);
 
-    protected IThemeService ThemeService { get; }
+    protected INewThemeService ThemeService { get; }
     protected IConfigurationService ConfigurationService { get; }
-
     protected IApplicationResourceManager<ResourceDictionary> ApplicationResourceManager { get; }
 
-    public DialogServiceBase(IThemeService themeService, IConfigurationService configurationService, IApplicationResourceManager<ResourceDictionary> applicationResourceManager)
+    public DialogServiceBase(INewThemeService themeService, IConfigurationService configurationService, IApplicationResourceManager<ResourceDictionary> applicationResourceManager)
     {
         ThemeService = themeService;
         ConfigurationService = configurationService;
         ApplicationResourceManager = applicationResourceManager;
     }
 
+    protected XamlRoot? GetXamlRoot()
+    {
+        return WinoApplication.MainWindow?.Content?.XamlRoot;
+    }
+
     public async Task<string> PickFilePathAsync(string saveFileName)
     {
         var picker = new FolderPicker()
         {
-            SuggestedStartLocation = PickerLocationId.Desktop
+            SuggestedStartLocation = PickerLocationId.Desktop,
         };
 
         picker.FileTypeFilter.Add("*");
 
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null) return string.Empty;
+
+        nint windowHandle = WindowNative.GetWindowHandle(mainWindow);
+        InitializeWithWindow.Initialize(picker, windowHandle);
+
         var folder = await picker.PickSingleFolderAsync();
         if (folder == null) return string.Empty;
 
         StorageApplicationPermissions.FutureAccessList.Add(folder);
 
-        return folder.Path;
+        return $"{Path.Combine(folder.Path, saveFileName)}";
 
         //var picker = new FileSavePicker
         //{
@@ -83,6 +96,12 @@ public class DialogServiceBase : IDialogServiceBase
             picker.FileTypeFilter.Add(filter.ToString());
         }
 
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null) return returnList;
+
+        nint windowHandle = WindowNative.GetWindowHandle(mainWindow);
+        InitializeWithWindow.Initialize(picker, windowHandle);
+
         var files = await picker.PickMultipleFilesAsync();
         if (files == null) return returnList;
 
@@ -97,7 +116,41 @@ public class DialogServiceBase : IDialogServiceBase
         return returnList;
     }
 
-    private async Task<StorageFile> PickFileAsync(params object[] typeFilters)
+    public async Task<List<PickedFileMetadata>> PickFilesMetadataAsync(params object[] typeFilters)
+    {
+        var returnList = new List<PickedFileMetadata>();
+        var picker = new FileOpenPicker
+        {
+            ViewMode = PickerViewMode.Thumbnail,
+            SuggestedStartLocation = PickerLocationId.Desktop
+        };
+
+        foreach (var filter in typeFilters)
+        {
+            picker.FileTypeFilter.Add(filter.ToString());
+        }
+
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null) return returnList;
+
+        nint windowHandle = WindowNative.GetWindowHandle(mainWindow);
+        InitializeWithWindow.Initialize(picker, windowHandle);
+
+        var files = await picker.PickMultipleFilesAsync();
+        if (files == null) return returnList;
+
+        foreach (var file in files)
+        {
+            StorageApplicationPermissions.FutureAccessList.Add(file);
+
+            var basicProperties = await file.GetBasicPropertiesAsync();
+            returnList.Add(new PickedFileMetadata(file.Path, (long)basicProperties.Size));
+        }
+
+        return returnList;
+    }
+
+    private async Task<StorageFile?> PickFileAsync(params object[] typeFilters)
     {
         var picker = new FileOpenPicker
         {
@@ -109,6 +162,12 @@ public class DialogServiceBase : IDialogServiceBase
             picker.FileTypeFilter.Add(filter.ToString());
         }
 
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null) return null;
+
+        nint windowHandle = WindowNative.GetWindowHandle(mainWindow);
+        InitializeWithWindow.Initialize(picker, windowHandle);
+
         var file = await picker.PickSingleFileAsync();
 
         if (file == null) return null;
@@ -122,7 +181,8 @@ public class DialogServiceBase : IDialogServiceBase
     {
         return new AccountCreationDialog
         {
-            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme()
+            RequestedTheme = ThemeService.RootTheme.ToWindowsElementTheme(),
+            XamlRoot = GetXamlRoot()
         };
     }
 
@@ -156,7 +216,7 @@ public class DialogServiceBase : IDialogServiceBase
 
         if (isDontAskEnabled && ConfigurationService.Get(dontAskAgainConfigurationKey, false)) return false;
 
-        var informationContainer = new CustomMessageDialogInformationContainer(title, description, icon.Value, isDontAskEnabled);
+        var informationContainer = new CustomMessageDialogInformationContainer(title, description, icon ?? WinoCustomMessageDialogIcon.Information, isDontAskEnabled);
 
         var dialog = new ContentDialog
         {
@@ -195,6 +255,8 @@ public class DialogServiceBase : IDialogServiceBase
 
         try
         {
+            dialog.XamlRoot = GetXamlRoot();
+
             return await dialog.ShowAsync();
         }
         catch (Exception ex)
@@ -250,6 +312,12 @@ public class DialogServiceBase : IDialogServiceBase
 
         picker.FileTypeFilter.Add("*");
 
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null) return string.Empty;
+
+        nint windowHandle = WindowNative.GetWindowHandle(mainWindow);
+        InitializeWithWindow.Initialize(picker, windowHandle);
+
         var pickedFolder = await picker.PickSingleFolderAsync();
 
         if (pickedFolder != null)
@@ -284,6 +352,40 @@ public class DialogServiceBase : IDialogServiceBase
 
         await HandleDialogPresentationAsync(dialog);
 
-        return dialog.Result;
+        return dialog.Result ?? null!;
+    }
+
+    public async Task<WebView2PrintSettingsModel> ShowPrintDialogAsync(WebView2PrintSettingsModel initialSettings = default!)
+    {
+        try
+        {
+            // Create the print dialog
+            var dialog = initialSettings != null
+                ? new PrintDialog(initialSettings)
+                : new PrintDialog();
+
+            // Set the XamlRoot for proper display
+            dialog.XamlRoot = GetXamlRoot();
+
+            // Get available printers asynchronously when the dialog is loaded
+            dialog.Loaded += async (sender, e) =>
+            {
+                await dialog.LoadAvailablePrintersAsync();
+            };
+
+            // Show the dialog
+            var result = await HandleDialogPresentationAsync(dialog);
+
+            // Return the settings if user clicked Print, otherwise null
+            return result == ContentDialogResult.Primary
+                ? dialog.PrintSettings
+                : null!;
+        }
+        catch (Exception ex)
+        {
+            // Log the exception if logging is available
+            Log.Error(ex, "Error showing print dialog");
+            return null!;
+        }
     }
 }
diff --git a/Wino.Core.UWP/Services/FileService.cs b/Wino.Mail.WinUI/Services/FileService.cs
similarity index 97%
rename from Wino.Core.UWP/Services/FileService.cs
rename to Wino.Mail.WinUI/Services/FileService.cs
index 6a635363..74327f83 100644
--- a/Wino.Core.UWP/Services/FileService.cs
+++ b/Wino.Mail.WinUI/Services/FileService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
@@ -6,7 +6,7 @@ using Windows.Storage;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class FileService : IFileService
 {
diff --git a/Wino.Mail.WinUI/Services/KeyPressService.cs b/Wino.Mail.WinUI/Services/KeyPressService.cs
new file mode 100644
index 00000000..11fa4b55
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/KeyPressService.cs
@@ -0,0 +1,15 @@
+using Microsoft.UI.Input;
+using Windows.System;
+using Windows.UI.Core;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class KeyPressService : IKeyPressService
+{
+    public bool IsCtrlKeyPressed()
+        => InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+
+    public bool IsShiftKeyPressed()
+        => InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+}
diff --git a/Wino.Mail/Services/MailAuthenticatorConfiguration.cs b/Wino.Mail.WinUI/Services/MailAuthenticatorConfiguration.cs
similarity index 53%
rename from Wino.Mail/Services/MailAuthenticatorConfiguration.cs
rename to Wino.Mail.WinUI/Services/MailAuthenticatorConfiguration.cs
index 26e12f4f..4d82b854 100644
--- a/Wino.Mail/Services/MailAuthenticatorConfiguration.cs
+++ b/Wino.Mail.WinUI/Services/MailAuthenticatorConfiguration.cs
@@ -1,4 +1,4 @@
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Services;
 
@@ -6,26 +6,35 @@ public class MailAuthenticatorConfiguration : IAuthenticatorConfig
 {
     public string OutlookAuthenticatorClientId => "b19c2035-d740-49ff-b297-de6ec561b208";
 
-    public string[] OutlookScope => new string[]
-    {
+    public string[] OutlookScope =>
+    [
         "email",
         "mail.readwrite",
         "offline_access",
         "mail.send",
         "Mail.Send.Shared",
         "Mail.ReadWrite.Shared",
-        "User.Read"
-    };
+        "User.Read",
+        "Calendars.ReadBasic",
+        "Calendars.ReadWrite",
+        "Calendars.ReadWrite.Shared",
+        "Calendars.Read",
+        "Calendars.Read.Shared",
+    ];
 
     public string GmailAuthenticatorClientId => "973025879644-s7b4ur9p3rlgop6a22u7iuptdc0brnrn.apps.googleusercontent.com";
 
-    public string[] GmailScope => new string[]
-    {
+    public string[] GmailScope =>
+    [
         "https://mail.google.com/",
         "https://www.googleapis.com/auth/userinfo.profile",
         "https://www.googleapis.com/auth/gmail.labels",
-        "https://www.googleapis.com/auth/userinfo.email"
-    };
+        "https://www.googleapis.com/auth/userinfo.email",
+        "https://www.googleapis.com/auth/calendar",
+        "https://www.googleapis.com/auth/calendar.events",
+        "https://www.googleapis.com/auth/calendar.settings.readonly",
+        "https://www.googleapis.com/auth/drive.file",
+    ];
 
     public string GmailTokenStoreIdentifier => "WinoMailGmailTokenStore";
 }
diff --git a/Wino.Core.UWP/Services/NativeAppService.cs b/Wino.Mail.WinUI/Services/NativeAppService.cs
similarity index 64%
rename from Wino.Core.UWP/Services/NativeAppService.cs
rename to Wino.Mail.WinUI/Services/NativeAppService.cs
index eb38b19e..aa3b665a 100644
--- a/Wino.Core.UWP/Services/NativeAppService.cs
+++ b/Wino.Mail.WinUI/Services/NativeAppService.cs
@@ -1,27 +1,25 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
-using Windows.Foundation.Metadata;
 using Windows.Storage;
 using Windows.System;
-using Windows.UI.Shell;
 using Wino.Core.Domain.Interfaces;
 
 
 
 #if WINDOWS_UWP
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 #endif
 
 namespace Wino.Services;
 
 public class NativeAppService : INativeAppService
 {
-    private string _mimeMessagesFolder;
-    private string _editorBundlePath;
+    private string _mimeMessagesFolder = string.Empty;
+    private string _editorBundlePath = string.Empty;
 
-    public Func<IntPtr> GetCoreWindowHwnd { get; set; }
+    public Func<IntPtr> GetCoreWindowHwnd { get; set; } = static () => IntPtr.Zero;
 
     public string GetWebAuthenticationBrokerUri()
     {
@@ -88,20 +86,31 @@ public class NativeAppService : INativeAppService
         return string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
     }
 
+    [Obsolete("Not supported for Win SDK")]
     public async Task PinAppToTaskbarAsync()
     {
         // If Start screen manager API's aren't present
-        if (!ApiInformation.IsTypePresent("Windows.UI.Shell.TaskbarManager")) return;
+        //if (!ApiInformation.IsTypePresent("Windows.UI.Shell.TaskbarManager")) return;
 
-        // Get the taskbar manager
-        var taskbarManager = TaskbarManager.GetDefault();
+        //// Get the taskbar manager
+        //var taskbarManager = TaskbarManager.GetDefault();
 
-        // If Taskbar doesn't allow pinning, don't show the tip
-        if (!taskbarManager.IsPinningAllowed) return;
+        //// If Taskbar doesn't allow pinning, don't show the tip
+        //if (!taskbarManager.IsPinningAllowed) return;
 
-        // If already pinned, don't show the tip
-        if (await taskbarManager.IsCurrentAppPinnedAsync()) return;
+        //// If already pinned, don't show the tip
+        //if (await taskbarManager.IsCurrentAppPinnedAsync()) return;
 
-        await taskbarManager.RequestPinCurrentAppAsync();
+        //await taskbarManager.RequestPinCurrentAppAsync();
+    }
+
+    public bool IsAppRunningInBackground()
+        => !Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread().HasThreadAccess;
+
+    public string GetCalendarAttachmentsFolderPath()
+    {
+        var attachmentsFolder = System.IO.Path.Combine(ApplicationData.Current.LocalFolder.Path, "CalendarAttachments");
+        System.IO.Directory.CreateDirectory(attachmentsFolder);
+        return attachmentsFolder;
     }
 }
diff --git a/Wino.Mail.WinUI/Services/NativeTrayIcon.cs b/Wino.Mail.WinUI/Services/NativeTrayIcon.cs
new file mode 100644
index 00000000..7b1da82c
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/NativeTrayIcon.cs
@@ -0,0 +1,437 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Microsoft.UI.Dispatching;
+using Serilog;
+
+namespace Wino.Mail.WinUI.Services;
+
+internal sealed class NativeTrayIcon : IDisposable
+{
+    private const int ImageIcon = 1;
+    private const int LoadFromFile = 0x0010;
+    private const int WmApp = 0x8000;
+    private const int WmNull = 0x0000;
+    private const int WmDestroy = 0x0002;
+    private const int WmClose = 0x0010;
+    private const int WmCommand = 0x0111;
+    private const int WmRButtonUp = 0x0205;
+    private const int WmLButtonDblClk = 0x0203;
+    private const int TpmLeftAlign = 0x0000;
+    private const int TpmBottomAlign = 0x0020;
+    private const int TpmRightButton = 0x0002;
+    private const int TpmReturnCmd = 0x0100;
+    private const int MfString = 0x0000;
+    private const int MfSeparator = 0x0800;
+    private const int MfDisabled = 0x0002;
+    private const int MfGray = 0x0001;
+    private const int NifMessage = 0x00000001;
+    private const int NifIcon = 0x00000002;
+    private const int NifTip = 0x00000004;
+    private const int NifGuid = 0x00000020;
+    private const int NimAdd = 0x00000000;
+    private const int NimModify = 0x00000001;
+    private const int NimDelete = 0x00000002;
+    private const int TrayCallbackMessage = WmApp + 1;
+    private const string WindowClassName = "WinoMail.NativeTrayIconWindow";
+    private static readonly Guid TrayIconGuid = new("6E1330D0-22D5-4F0B-A3BF-C9B2AE536F77");
+    private static readonly object ClassLock = new();
+    private static readonly Dictionary<nint, NativeTrayIcon> Instances = [];
+    private static bool _windowClassRegistered;
+    private static ushort _windowClassAtom;
+    private static uint _taskbarCreatedMessage;
+    private static readonly WindowProcDelegate WindowProc = StaticWindowProc;
+
+    private readonly DispatcherQueue _dispatcherQueue;
+    private readonly string _iconPath;
+    private readonly Func<IReadOnlyList<NativeTrayMenuItem>> _menuFactory;
+    private readonly Func<Task> _primaryAction;
+    private readonly string _toolTipText;
+
+    private nint _messageWindowHandle;
+    private nint _iconHandle;
+    private bool _isCreated;
+    private bool _isDisposed;
+
+    public NativeTrayIcon(
+        DispatcherQueue dispatcherQueue,
+        string iconPath,
+        string toolTipText,
+        Func<IReadOnlyList<NativeTrayMenuItem>> menuFactory,
+        Func<Task> primaryAction)
+    {
+        _dispatcherQueue = dispatcherQueue;
+        _iconPath = iconPath;
+        _toolTipText = toolTipText;
+        _menuFactory = menuFactory;
+        _primaryAction = primaryAction;
+    }
+
+    public void Create()
+    {
+        if (_isDisposed || _isCreated)
+            return;
+
+        EnsureWindowClassRegistered();
+
+        _messageWindowHandle = CreateWindowExW(
+            0,
+            WindowClassName,
+            string.Empty,
+            0,
+            0,
+            0,
+            0,
+            0,
+            nint.Zero,
+            nint.Zero,
+            GetModuleHandleW(null),
+            nint.Zero);
+
+        if (_messageWindowHandle == nint.Zero)
+            throw new InvalidOperationException("Failed to create native tray icon message window.");
+
+        lock (Instances)
+        {
+            Instances[_messageWindowHandle] = this;
+        }
+
+        _iconHandle = LoadImageW(nint.Zero, _iconPath, ImageIcon, 0, 0, LoadFromFile);
+        if (_iconHandle == nint.Zero)
+            throw new InvalidOperationException($"Failed to load tray icon from '{_iconPath}'.");
+
+        AddOrUpdateIcon(NimAdd);
+        _isCreated = true;
+    }
+
+    public void Dispose()
+    {
+        if (_isDisposed)
+            return;
+
+        _isDisposed = true;
+
+        if (_messageWindowHandle != nint.Zero)
+        {
+            RemoveIcon();
+            DestroyWindow(_messageWindowHandle);
+            lock (Instances)
+            {
+                Instances.Remove(_messageWindowHandle);
+            }
+
+            _messageWindowHandle = nint.Zero;
+        }
+
+        if (_iconHandle != nint.Zero)
+        {
+            DestroyIcon(_iconHandle);
+            _iconHandle = nint.Zero;
+        }
+
+        _isCreated = false;
+    }
+
+    private void AddOrUpdateIcon(int message)
+    {
+        var notifyIconData = CreateNotifyIconData();
+        Shell_NotifyIconW(message, ref notifyIconData);
+    }
+
+    private void RemoveIcon()
+    {
+        var notifyIconData = CreateNotifyIconData();
+        Shell_NotifyIconW(NimDelete, ref notifyIconData);
+    }
+
+    private NOTIFYICONDATAW CreateNotifyIconData()
+    {
+        return new NOTIFYICONDATAW
+        {
+            cbSize = (uint)Marshal.SizeOf<NOTIFYICONDATAW>(),
+            hWnd = _messageWindowHandle,
+            uID = 1,
+            uFlags = NifMessage | NifIcon | NifTip | NifGuid,
+            uCallbackMessage = TrayCallbackMessage,
+            hIcon = _iconHandle,
+            szTip = _toolTipText,
+            guidItem = TrayIconGuid
+        };
+    }
+
+    private void ShowContextMenu()
+    {
+        var menuHandle = CreatePopupMenu();
+        if (menuHandle == nint.Zero)
+            return;
+
+        try
+        {
+            var menuItems = _menuFactory();
+            var commandMap = new Dictionary<uint, Func<Task>>();
+            uint commandId = 1;
+
+            foreach (var menuItem in menuItems)
+            {
+                if (menuItem.IsSeparator)
+                {
+                    AppendMenuW(menuHandle, MfSeparator, 0, null);
+                    continue;
+                }
+
+                uint flags = MfString;
+                if (!menuItem.IsEnabled)
+                    flags |= MfDisabled | MfGray;
+
+                AppendMenuW(menuHandle, flags, commandId, menuItem.Text);
+
+                if (menuItem.IsDefault)
+                    SetMenuDefaultItem(menuHandle, commandId, false);
+
+                if (menuItem.IsEnabled)
+                    commandMap[commandId] = menuItem.Action;
+
+                commandId++;
+            }
+
+            SetForegroundWindow(_messageWindowHandle);
+
+            if (!GetCursorPos(out var point))
+                return;
+
+            var selectedCommandId = TrackPopupMenuEx(
+                menuHandle,
+                TpmLeftAlign | TpmBottomAlign | TpmRightButton | TpmReturnCmd,
+                point.X,
+                point.Y,
+                _messageWindowHandle,
+                nint.Zero);
+
+            PostMessageW(_messageWindowHandle, WmNull, 0, 0);
+
+            if (selectedCommandId != 0 && commandMap.TryGetValue((uint)selectedCommandId, out var action))
+                InvokeAction(action);
+        }
+        finally
+        {
+            DestroyMenu(menuHandle);
+        }
+    }
+
+    private void InvokePrimaryAction() => InvokeAction(_primaryAction);
+
+    private void InvokeAction(Func<Task> action)
+    {
+        _dispatcherQueue.TryEnqueue(async () =>
+        {
+            try
+            {
+                await action();
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, "Native tray icon action failed.");
+            }
+        });
+    }
+
+    private nint HandleWindowMessage(uint message, nuint wParam, nint lParam)
+    {
+        if (message == _taskbarCreatedMessage)
+        {
+            if (_isCreated && !_isDisposed)
+                AddOrUpdateIcon(NimAdd);
+
+            return nint.Zero;
+        }
+
+        if (message == TrayCallbackMessage)
+        {
+            switch ((int)lParam)
+            {
+                case WmRButtonUp:
+                    ShowContextMenu();
+                    return nint.Zero;
+                case WmLButtonDblClk:
+                    InvokePrimaryAction();
+                    return nint.Zero;
+            }
+        }
+
+        if (message == WmCommand || message == WmClose || message == WmDestroy)
+            return nint.Zero;
+
+        return DefWindowProcW(_messageWindowHandle, message, wParam, lParam);
+    }
+
+    private static void EnsureWindowClassRegistered()
+    {
+        lock (ClassLock)
+        {
+            if (_windowClassRegistered)
+                return;
+
+            _taskbarCreatedMessage = RegisterWindowMessageW("TaskbarCreated");
+
+            var windowClass = new WNDCLASSW
+            {
+                lpfnWndProc = WindowProc,
+                hInstance = GetModuleHandleW(null),
+                lpszClassName = WindowClassName
+            };
+
+            _windowClassAtom = RegisterClassW(ref windowClass);
+            if (_windowClassAtom == 0)
+                throw new InvalidOperationException("Failed to register native tray icon window class.");
+
+            _windowClassRegistered = true;
+        }
+    }
+
+    private static nint StaticWindowProc(nint windowHandle, uint message, nuint wParam, nint lParam)
+    {
+        lock (Instances)
+        {
+            if (Instances.TryGetValue(windowHandle, out var instance))
+                return instance.HandleWindowMessage(message, wParam, lParam);
+        }
+
+        return DefWindowProcW(windowHandle, message, wParam, lParam);
+    }
+
+    internal sealed record NativeTrayMenuItem(
+        string Text,
+        Func<Task> Action,
+        bool IsSeparator = false,
+        bool IsDefault = false,
+        bool IsEnabled = true)
+    {
+        public static NativeTrayMenuItem Separator() => new(string.Empty, () => Task.CompletedTask, IsSeparator: true);
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    private struct WNDCLASSW
+    {
+        public uint style;
+        public WindowProcDelegate lpfnWndProc;
+        public int cbClsExtra;
+        public int cbWndExtra;
+        public nint hInstance;
+        public nint hIcon;
+        public nint hCursor;
+        public nint hbrBackground;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string? lpszMenuName;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszClassName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    private struct NOTIFYICONDATAW
+    {
+        public uint cbSize;
+        public nint hWnd;
+        public uint uID;
+        public uint uFlags;
+        public uint uCallbackMessage;
+        public nint hIcon;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+        public string szTip;
+        public uint dwState;
+        public uint dwStateMask;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+        public string szInfo;
+        public uint uTimeoutOrVersion;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+        public string szInfoTitle;
+        public uint dwInfoFlags;
+        public Guid guidItem;
+        public nint hBalloonIcon;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct POINT
+    {
+        public int X;
+        public int Y;
+    }
+
+    [UnmanagedFunctionPointer(CallingConvention.Winapi)]
+    private delegate nint WindowProcDelegate(nint windowHandle, uint message, nuint wParam, nint lParam);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    private static extern ushort RegisterClassW(ref WNDCLASSW windowClass);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    private static extern nint CreateWindowExW(
+        int exStyle,
+        string className,
+        string windowName,
+        int style,
+        int x,
+        int y,
+        int width,
+        int height,
+        nint parentHandle,
+        nint menuHandle,
+        nint instanceHandle,
+        nint parameter);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool DestroyWindow(nint windowHandle);
+
+    [DllImport("user32.dll")]
+    private static extern nint DefWindowProcW(nint windowHandle, uint message, nuint wParam, nint lParam);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+    private static extern nint GetModuleHandleW(string? moduleName);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern bool Shell_NotifyIconW(int message, ref NOTIFYICONDATAW notifyIconData);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    private static extern nint LoadImageW(
+        nint instanceHandle,
+        string name,
+        int imageType,
+        int desiredWidth,
+        int desiredHeight,
+        int loadFlags);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool DestroyIcon(nint iconHandle);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern nint CreatePopupMenu();
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    private static extern bool AppendMenuW(nint menuHandle, uint flags, uint itemId, string? newItem);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool DestroyMenu(nint menuHandle);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool SetMenuDefaultItem(nint menuHandle, uint itemId, bool byPosition);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern int TrackPopupMenuEx(
+        nint menuHandle,
+        int flags,
+        int x,
+        int y,
+        nint windowHandle,
+        nint reserved);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool GetCursorPos(out POINT point);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool SetForegroundWindow(nint windowHandle);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    private static extern bool PostMessageW(nint windowHandle, uint message, nuint wParam, nint lParam);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    private static extern uint RegisterWindowMessageW(string message);
+}
diff --git a/Wino.Mail.WinUI/Services/NavigationService.cs b/Wino.Mail.WinUI/Services/NavigationService.cs
new file mode 100644
index 00000000..d6d06dd2
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/NavigationService.cs
@@ -0,0 +1,678 @@
+using System;
+using System.Linq;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Calendar.Views;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Settings;
+using Wino.Helpers;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.ViewModels.Messages;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Mail.WinUI.Services;
+using Wino.Mail.WinUI.Views;
+using Wino.Mail.WinUI.Views.Calendar;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Mails;
+using Wino.Messaging.Client.Navigation;
+using Wino.Views;
+using Wino.Views.Account;
+using Wino.Views.Mail;
+using Wino.Views.Settings;
+using Microsoft.UI.Xaml.Media.Animation;
+
+namespace Wino.Services;
+
+public class NavigationService : NavigationServiceBase, INavigationService
+{
+    private readonly IStatePersistanceService _statePersistanceService;
+    private readonly IDispatcher _dispatcher;
+    private readonly IWinoWindowManager _windowManager;
+    private NavigationTransitionInfo? _pendingInnerShellTransition;
+
+    private WinoPage[] _renderingPageTypes = new WinoPage[]
+    {
+        WinoPage.MailRenderingPage,
+        WinoPage.ComposePage
+    };
+
+    private static readonly WinoPage[] MailOnlyPages =
+    [
+        WinoPage.MailListPage,
+        WinoPage.MailRenderingPage,
+        WinoPage.ComposePage,
+        WinoPage.IdlePage,
+        WinoPage.WelcomePageV2,
+        WinoPage.WelcomeHostPage,
+        WinoPage.ProviderSelectionPage,
+        WinoPage.AccountSetupProgressPage,
+        WinoPage.SpecialImapCredentialsPage
+    ];
+
+    private static readonly WinoPage[] CalendarOnlyPages =
+    [
+        WinoPage.CalendarPage,
+        WinoPage.EventDetailsPage,
+        WinoPage.CalendarEventComposePage
+    ];
+
+    private static readonly WinoPage[] ContactsOnlyPages =
+    [
+        WinoPage.ContactsPage
+    ];
+
+    private static readonly WinoPage[] SettingsOnlyPages =
+    [
+        WinoPage.SettingsPage,
+        WinoPage.SettingOptionsPage,
+        WinoPage.ManageAccountsPage,
+        WinoPage.AccountManagementPage,
+        WinoPage.AccountDetailsPage,
+        WinoPage.MergedAccountDetailsPage,
+        WinoPage.SignatureManagementPage,
+        WinoPage.AboutPage,
+        WinoPage.PersonalizationPage,
+        WinoPage.MessageListPage,
+        WinoPage.ReadComposePanePage,
+        WinoPage.AppPreferencesPage,
+        WinoPage.AliasManagementPage,
+        WinoPage.ImapCalDavSettingsPage,
+        WinoPage.KeyboardShortcutsPage,
+        WinoPage.SignatureAndEncryptionPage,
+        WinoPage.EmailTemplatesPage,
+        WinoPage.CreateEmailTemplatePage,
+        WinoPage.StoragePage,
+        WinoPage.WinoAccountManagementPage,
+        WinoPage.CalendarSettingsPage,
+        WinoPage.CalendarRenderingSettingsPage,
+        WinoPage.CalendarNotificationSettingsPage,
+        WinoPage.CalendarPreferenceSettingsPage,
+        WinoPage.CalendarAccountSettingsPage
+    ];
+
+    public NavigationService(IStatePersistanceService statePersistanceService, IDispatcher dispatcher, IWinoWindowManager windowManager)
+    {
+        _statePersistanceService = statePersistanceService;
+        _dispatcher = dispatcher;
+        _windowManager = windowManager;
+    }
+
+    private bool IsOnNavigationThread()
+        => _dispatcher is WinUIDispatcher winUiDispatcher && winUiDispatcher.HasThreadAccess;
+
+    private T ExecuteOnNavigationThread<T>(Func<T> action)
+    {
+        if (IsOnNavigationThread())
+            return action();
+
+        T result = default!;
+        _dispatcher.ExecuteOnUIThread(() => result = action()).GetAwaiter().GetResult();
+        return result;
+    }
+
+    private void ExecuteOnNavigationThread(Action action)
+    {
+        if (IsOnNavigationThread())
+        {
+            action();
+            return;
+        }
+
+        _dispatcher.ExecuteOnUIThread(action).GetAwaiter().GetResult();
+    }
+
+    public Type? GetPageType(WinoPage winoPage)
+    {
+        return winoPage switch
+        {
+            WinoPage.None => null,
+            WinoPage.IdlePage => typeof(IdlePage),
+            WinoPage.AccountDetailsPage => typeof(AccountDetailsPage),
+            WinoPage.MergedAccountDetailsPage => typeof(MergedAccountDetailsPage),
+            WinoPage.AccountManagementPage => typeof(AccountManagementPage),
+            WinoPage.ManageAccountsPage => typeof(AccountManagementPage),
+            WinoPage.SignatureManagementPage => typeof(SignatureManagementPage),
+            WinoPage.AboutPage => typeof(AboutPage),
+            WinoPage.PersonalizationPage => typeof(PersonalizationPage),
+            WinoPage.MessageListPage => typeof(MessageListPage),
+            WinoPage.ReadComposePanePage => typeof(ReadComposePanePage),
+            WinoPage.MailRenderingPage => typeof(MailRenderingPage),
+            WinoPage.ComposePage => typeof(ComposePage),
+            WinoPage.MailListPage => typeof(MailListPage),
+            WinoPage.SettingsPage => typeof(SettingsPage),
+            WinoPage.WelcomePageV2 => typeof(WelcomePageV2),
+            WinoPage.SettingOptionsPage => typeof(SettingOptionsPage),
+            WinoPage.AppPreferencesPage => typeof(AppPreferencesPage),
+            WinoPage.AliasManagementPage => typeof(AliasManagementPage),
+            WinoPage.ImapCalDavSettingsPage => typeof(ImapCalDavSettingsPage),
+            WinoPage.KeyboardShortcutsPage => typeof(KeyboardShortcutsPage),
+            WinoPage.ContactsPage => typeof(ContactsPage),
+            WinoPage.SignatureAndEncryptionPage => typeof(SignatureAndEncryptionPage),
+            WinoPage.EmailTemplatesPage => typeof(EmailTemplatesPage),
+            WinoPage.CreateEmailTemplatePage => typeof(CreateEmailTemplatePage),
+            WinoPage.StoragePage => typeof(StoragePage),
+            WinoPage.WinoAccountManagementPage => typeof(WinoAccountManagementPage),
+            WinoPage.WelcomeHostPage => typeof(WelcomeHostPage),
+            WinoPage.ProviderSelectionPage => typeof(ProviderSelectionPage),
+            WinoPage.AccountSetupProgressPage => typeof(AccountSetupProgressPage),
+            WinoPage.SpecialImapCredentialsPage => typeof(SpecialImapCredentialsPage),
+            WinoPage.CalendarPage => typeof(CalendarPage),
+            WinoPage.EventDetailsPage => typeof(EventDetailsPage),
+            WinoPage.CalendarEventComposePage => typeof(CalendarEventComposePage),
+            WinoPage.CalendarSettingsPage => typeof(CalendarPreferenceSettingsPage),
+            WinoPage.CalendarRenderingSettingsPage => typeof(CalendarRenderingSettingsPage),
+            WinoPage.CalendarNotificationSettingsPage => typeof(CalendarNotificationSettingsPage),
+            WinoPage.CalendarPreferenceSettingsPage => typeof(CalendarPreferenceSettingsPage),
+            WinoPage.CalendarAccountSettingsPage => typeof(CalendarAccountSettingsPage),
+            _ => null,
+        };
+    }
+
+    public Frame GetCoreFrame(NavigationReferenceFrame frameType)
+        => ExecuteOnNavigationThread(() => GetCoreFrameInternal(frameType) ?? throw new ArgumentException($"Frame '{frameType}' cannot be resolved."));
+
+    private Frame? GetCoreFrameInternal(NavigationReferenceFrame frameType, WinoWindowKind? requestedWindowKind = null)
+    {
+        if (frameType == NavigationReferenceFrame.ShellFrame)
+        {
+            if (requestedWindowKind.HasValue)
+                return _windowManager.GetPrimaryNavigationFrame(requestedWindowKind.Value);
+
+            var activeWindow = _windowManager.ActiveWindow;
+            if (activeWindow != null)
+            {
+                var activeShellWindow = _windowManager.GetWindow(WinoWindowKind.Shell);
+                if (ReferenceEquals(activeWindow, activeShellWindow))
+                    return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell);
+
+                var activeWelcomeWindow = _windowManager.GetWindow(WinoWindowKind.Welcome);
+                if (ReferenceEquals(activeWindow, activeWelcomeWindow))
+                    return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Welcome);
+            }
+
+            return _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell)
+                ?? _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Welcome);
+        }
+
+        var mainFrame = _windowManager.GetPrimaryNavigationFrame(WinoWindowKind.Shell);
+        if (mainFrame == null)
+            return null;
+
+        var contentRoot = mainFrame.Content as FrameworkElement;
+        if (contentRoot == null) return null;
+
+        // Use FindName first — it works immediately after InitializeComponent(),
+        // before the visual tree is built by the layout pass.
+        if (contentRoot.FindName(frameType.ToString()) is Frame namedFrame)
+            return namedFrame;
+
+        // Fall back to visual tree search for deeply nested frames (e.g. RenderingFrame).
+        return WinoVisualTreeHelper.GetChildObject<Frame>(contentRoot, frameType.ToString());
+    }
+
+    public bool ChangeApplicationMode(WinoApplicationMode mode)
+        => ExecuteOnNavigationThread(() => ChangeApplicationModeInternal(mode));
+
+    public bool ChangeApplicationMode(WinoApplicationMode mode, ShellModeActivationContext activationContext)
+        => ExecuteOnNavigationThread(() => ChangeApplicationModeInternal(mode, activationContext));
+
+    public bool CanGoBack()
+        => ExecuteOnNavigationThread(CanGoBackInternal);
+
+    private bool ChangeApplicationModeInternal(WinoApplicationMode mode, ShellModeActivationContext? activationContext = null)
+    {
+        var coreFrame = GetCoreFrameInternal(NavigationReferenceFrame.ShellFrame);
+
+        if (coreFrame == null) return false;
+
+        var currentMode = _statePersistanceService.ApplicationMode;
+        var isInitialShellNavigation = coreFrame.Content is not IShellHost;
+
+        // Update the application mode in state persistence service
+        _statePersistanceService.ApplicationMode = mode;
+        _statePersistanceService.AppModeTitle = GetApplicationModeTitle(mode);
+
+        if (coreFrame.Content is IShellHost activeShell && activeShell.HasShellContent && currentMode == mode)
+            return true;
+
+        _pendingInnerShellTransition = isInitialShellNavigation
+            ? null
+            : GetApplicationModeTransitionInfo(currentMode, mode);
+
+        if (coreFrame.Content is not IShellHost)
+        {
+            coreFrame.BackStack.Clear();
+            coreFrame.ForwardStack.Clear();
+            coreFrame.Navigate(typeof(WinoAppShell), null, new SuppressNavigationTransitionInfo());
+        }
+
+        if (coreFrame.Content is IShellHost shell)
+        {
+            shell.ActivateMode(mode, new ShellModeActivationContext
+            {
+                IsInitialActivation = isInitialShellNavigation,
+                SuppressStartupFlows = activationContext?.SuppressStartupFlows ?? false,
+                Parameter = activationContext?.Parameter
+            });
+
+            ResetCurrentModeBackStackState();
+            return true;
+        }
+
+        _pendingInnerShellTransition = null;
+        return true;
+    }
+
+    public bool Navigate(WinoPage page,
+                         object? parameter = null,
+                         NavigationReferenceFrame frame = NavigationReferenceFrame.InnerShellFrame,
+                         NavigationTransitionType transition = NavigationTransitionType.None)
+        => ExecuteOnNavigationThread(() => NavigateInternal(page, parameter, frame, transition));
+
+    private bool NavigateInternal(WinoPage page,
+                                  object? parameter = null,
+                                  NavigationReferenceFrame frame = NavigationReferenceFrame.InnerShellFrame,
+                                  NavigationTransitionType transition = NavigationTransitionType.None)
+    {
+        if (TryGetSettingsActivationTarget(page, parameter, out var settingsTarget))
+        {
+            if (_statePersistanceService.ApplicationMode != WinoApplicationMode.Settings)
+            {
+                return ChangeApplicationModeInternal(WinoApplicationMode.Settings, new ShellModeActivationContext
+                {
+                    Parameter = settingsTarget
+                });
+            }
+
+            page = WinoPage.SettingsPage;
+            parameter = settingsTarget;
+        }
+
+        var pageType = GetPageType(page);
+        if (pageType == null) return false;
+
+        var currentApplicationMode = _statePersistanceService.ApplicationMode;
+
+        if (!IsPageAllowedInMode(currentApplicationMode, page))
+        {
+            return false;
+        }
+
+        _statePersistanceService.IsReadingMail = _renderingPageTypes.Contains(page);
+        _statePersistanceService.IsEventDetailsVisible = page == WinoPage.EventDetailsPage || page == WinoPage.CalendarEventComposePage;
+
+        Frame? innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+        if (innerShellFrame == null && frame == NavigationReferenceFrame.ShellFrame)
+        {
+            var requestedFrame = GetCoreFrameInternal(NavigationReferenceFrame.ShellFrame, WinoWindowKind.Welcome);
+            if (requestedFrame == null)
+                return false;
+
+            return requestedFrame.Navigate(pageType, parameter, GetNavigationTransitionInfo(transition));
+        }
+
+        if (innerShellFrame != null)
+        {
+            PruneInnerShellBackStackForMode(innerShellFrame, currentApplicationMode);
+
+            // Calendar navigations.
+            if (currentApplicationMode == WinoApplicationMode.Calendar)
+            {
+                var currentFrameType = GetCurrentFrameType(innerShellFrame);
+
+                if (page == WinoPage.CalendarPage &&
+                    parameter is CalendarPageNavigationArgs calendarNavigationArgs)
+                {
+                    var loadCalendarMessage = CreateLoadCalendarMessage(calendarNavigationArgs);
+
+                    // Date changes while CalendarPage is already active should not re-navigate the frame.
+                    if (currentFrameType == pageType)
+                    {
+                        WeakReferenceMessenger.Default.Send(loadCalendarMessage);
+                        return true;
+                    }
+
+                    // If CalendarPage is the previous page, reuse it instead of creating a second instance.
+                    var lastBackStackEntry = innerShellFrame.BackStack.Count > 0 ? innerShellFrame.BackStack[^1] : null;
+                    if (innerShellFrame.CanGoBack && lastBackStackEntry?.SourcePageType == pageType)
+                    {
+                        innerShellFrame.GoBack();
+                        WeakReferenceMessenger.Default.Send(loadCalendarMessage);
+                        return true;
+                    }
+                }
+
+                return NavigateInnerShellFrame(innerShellFrame, pageType, parameter, transition);
+            }
+            else
+            {
+                // Mail navigations.
+                var currentFrameType = GetCurrentFrameType(innerShellFrame);
+                bool isMailListingPageActive = currentFrameType != null && currentFrameType == typeof(MailListPage);
+
+                // Active page is mail list page and we are refreshing the folder.
+                if (isMailListingPageActive && currentFrameType == pageType && parameter is NavigateMailFolderEventArgs folderNavigationArgs)
+                {
+                    // No need for new navigation, just refresh the folder.
+                    WeakReferenceMessenger.Default.Send(new ActiveMailFolderChangedEvent(folderNavigationArgs.BaseFolderMenuItem, folderNavigationArgs.FolderInitLoadAwaitTask));
+                    WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
+
+                    return true;
+                }
+
+                // This page must be opened in the Frame placed in MailListingPage.
+                if (isMailListingPageActive && frame == NavigationReferenceFrame.RenderingFrame)
+                {
+                    var listingFrame = GetCoreFrameInternal(NavigationReferenceFrame.RenderingFrame);
+                    if (listingFrame == null) return false;
+
+                    var transitionInfo = GetNavigationTransitionInfo(transition);
+
+                    // Active page is mail list page and we are opening a mail item.
+                    // No navigation needed, just refresh the rendered mail item.
+                    if (listingFrame.Content != null
+                        && listingFrame.Content.GetType() == GetPageType(WinoPage.MailRenderingPage)
+                        && parameter is MailItemViewModel mailItemViewModel
+                        && page != WinoPage.ComposePage)
+                    {
+                        WeakReferenceMessenger.Default.Send(new ReaderItemRefreshRequestedEvent(mailItemViewModel));
+                    }
+                    else if (listingFrame.Content != null
+                        && listingFrame.Content.GetType() == GetPageType(WinoPage.ComposePage)
+                        && page == WinoPage.ComposePage
+                        && parameter is MailItemViewModel composeDraftViewModel)
+                    {
+                        // ComposePage is already active and we're switching to another draft.
+                        // Reuse existing ComposePage and WebView2 instead of navigating.
+                        WeakReferenceMessenger.Default.Send(new ReaderItemRefreshRequestedEvent(composeDraftViewModel));
+                    }
+                    else if (listingFrame.Content != null
+                        && listingFrame.Content.GetType() == GetPageType(WinoPage.IdlePage)
+                        && pageType == typeof(IdlePage))
+                    {
+                        // Idle -> Idle navigation. Ignore.
+                        return true;
+                    }
+                    else
+                    {
+                        listingFrame.Navigate(pageType, parameter, transitionInfo);
+                    }
+
+                    return true;
+                }
+
+                if ((currentFrameType != null && currentFrameType != pageType) || currentFrameType == null)
+                {
+                    return NavigateInnerShellFrame(innerShellFrame, pageType, parameter, transition);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static bool IsMailOnlyPage(WinoPage page)
+        => MailOnlyPages.Contains(page);
+
+    private static bool IsCalendarOnlyPage(WinoPage page)
+        => CalendarOnlyPages.Contains(page);
+
+    private static bool IsContactsOnlyPage(WinoPage page)
+        => ContactsOnlyPages.Contains(page);
+
+    private static bool IsSettingsOnlyPage(WinoPage page)
+        => SettingsOnlyPages.Contains(page);
+
+    private static bool IsPageAllowedInMode(WinoApplicationMode mode, WinoPage page)
+        => mode switch
+        {
+            WinoApplicationMode.Mail => !IsCalendarOnlyPage(page) && !IsContactsOnlyPage(page) && !IsSettingsOnlyPage(page),
+            WinoApplicationMode.Calendar => !IsMailOnlyPage(page) && !IsContactsOnlyPage(page) && !IsSettingsOnlyPage(page),
+            WinoApplicationMode.Contacts => !IsMailOnlyPage(page) && !IsCalendarOnlyPage(page) && !IsSettingsOnlyPage(page),
+            WinoApplicationMode.Settings => IsSettingsOnlyPage(page),
+            _ => true
+        };
+
+    private static string GetApplicationModeTitle(WinoApplicationMode mode)
+        => mode switch
+        {
+            WinoApplicationMode.Calendar => "Wino Calendar",
+            WinoApplicationMode.Contacts => "Wino Contacts",
+            WinoApplicationMode.Settings => "Wino Settings",
+            _ => "Wino Mail"
+        };
+
+    private static NavigationTransitionInfo GetApplicationModeTransitionInfo(WinoApplicationMode currentMode, WinoApplicationMode targetMode)
+    {
+        var slideEffect = IsNextMode(currentMode, targetMode)
+            ? SlideNavigationTransitionEffect.FromRight
+            : SlideNavigationTransitionEffect.FromLeft;
+
+        return new SlideNavigationTransitionInfo
+        {
+            Effect = slideEffect
+        };
+    }
+
+    private static bool IsNextMode(WinoApplicationMode currentMode, WinoApplicationMode targetMode)
+        => currentMode switch
+        {
+            WinoApplicationMode.Mail => targetMode == WinoApplicationMode.Calendar,
+            WinoApplicationMode.Calendar => targetMode == WinoApplicationMode.Contacts,
+            WinoApplicationMode.Contacts => targetMode == WinoApplicationMode.Settings,
+            WinoApplicationMode.Settings => targetMode == WinoApplicationMode.Mail,
+            _ => false
+        };
+
+    private static bool TryGetSettingsActivationTarget(WinoPage page, object? parameter, out WinoPage targetPage)
+    {
+        targetPage = WinoPage.SettingOptionsPage;
+
+        if (page == WinoPage.SettingsPage)
+        {
+            targetPage = parameter as WinoPage? ?? WinoPage.SettingOptionsPage;
+            return true;
+        }
+
+        if (!IsSettingsOnlyPage(page))
+            return false;
+
+        targetPage = SettingsNavigationInfoProvider.GetRootPage(page);
+        return true;
+    }
+
+    private LoadCalendarMessage CreateLoadCalendarMessage(CalendarPageNavigationArgs args)
+    {
+        var targetDate = args.RequestDefaultNavigation
+            ? DateOnly.FromDateTime(DateTime.Now.Date)
+            : DateOnly.FromDateTime(args.NavigationDate.Date);
+
+        var displayRequest = new CalendarDisplayRequest(_statePersistanceService.CalendarDisplayType, targetDate);
+        return new LoadCalendarMessage(displayRequest, args.ForceReload);
+    }
+
+    private bool NavigateInnerShellFrame(Frame frame, Type pageType, object? parameter, NavigationTransitionType transition)
+    {
+        var transitionInfo = ConsumeInnerShellTransitionOrDefault(transition);
+        var navigationResult = frame.Navigate(pageType, parameter, transitionInfo);
+
+        if (navigationResult)
+        {
+            return true;
+        }
+
+        return navigationResult;
+    }
+
+    private NavigationTransitionInfo ConsumeInnerShellTransitionOrDefault(NavigationTransitionType transition)
+    {
+        if (_pendingInnerShellTransition != null)
+        {
+            var transitionInfo = _pendingInnerShellTransition;
+            _pendingInnerShellTransition = null;
+            return transitionInfo;
+        }
+
+        return GetNavigationTransitionInfo(transition);
+    }
+
+    public void GoBack(Core.Domain.Enums.NavigationTransitionEffect slideEffect = Core.Domain.Enums.NavigationTransitionEffect.FromRight)
+        => ExecuteOnNavigationThread(() => GoBackInternal(slideEffect));
+
+    private void GoBackInternal(Core.Domain.Enums.NavigationTransitionEffect slideEffect = Core.Domain.Enums.NavigationTransitionEffect.FromRight)
+    {
+        var innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+        var currentApplicationMode = _statePersistanceService.ApplicationMode;
+
+        if (currentApplicationMode == WinoApplicationMode.Settings &&
+            innerShellFrame?.Content is SettingsPage settingsPage)
+        {
+            if (settingsPage.CanNavigateBack)
+            {
+                WeakReferenceMessenger.Default.Send(new BackBreadcrumNavigationRequested(slideEffect));
+            }
+
+            return;
+        }
+
+        if (innerShellFrame != null)
+        {
+            PruneInnerShellBackStackForMode(innerShellFrame, currentApplicationMode);
+        }
+
+        if (currentApplicationMode == WinoApplicationMode.Calendar)
+        {
+            if (innerShellFrame?.CanGoBack == true)
+            {
+                innerShellFrame.GoBack();
+            }
+            else if (innerShellFrame != null && innerShellFrame.Content?.GetType() != typeof(CalendarPage))
+            {
+                NavigateToCalendarRoot(innerShellFrame);
+            }
+
+            // Calendar mode: Navigate back from EventDetailsPage
+            _statePersistanceService.IsEventDetailsVisible = false;
+        }
+        else if (currentApplicationMode == WinoApplicationMode.Mail)
+        {
+            if (_statePersistanceService.IsReadingMail && _statePersistanceService.IsReaderNarrowed)
+            {
+                // Mail mode: Clear selections and dispose rendering frame
+                _statePersistanceService.IsReadingMail = false;
+
+                WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested());
+                WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
+            }
+        }
+    }
+
+    private void ResetCurrentModeBackStackState()
+    {
+        var innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+
+        if (innerShellFrame != null)
+        {
+            innerShellFrame.BackStack.Clear();
+            innerShellFrame.ForwardStack.Clear();
+        }
+    }
+
+    private void PruneInnerShellBackStackForMode(Frame frame, WinoApplicationMode mode)
+    {
+        for (int i = frame.BackStack.Count - 1; i >= 0; i--)
+        {
+            var backStackEntry = frame.BackStack[i];
+
+            if (!IsPageTypeAllowedInMode(mode, backStackEntry.SourcePageType))
+            {
+                frame.BackStack.RemoveAt(i);
+            }
+        }
+    }
+
+    private bool IsPageTypeAllowedInMode(WinoApplicationMode mode, Type? pageType)
+    {
+        if (pageType == null)
+            return false;
+
+        foreach (var page in Enum.GetValues<WinoPage>())
+        {
+            if (page == WinoPage.None)
+                continue;
+
+            if (GetPageType(page) == pageType)
+                return IsPageAllowedInMode(mode, page);
+        }
+
+        return false;
+    }
+
+    private void NavigateToCalendarRoot(Frame frame)
+    {
+        if (!frame.Navigate(typeof(CalendarPage), new CalendarPageNavigationArgs
+        {
+            RequestDefaultNavigation = true
+        }, GetNavigationTransitionInfo(NavigationTransitionType.None)))
+        {
+            return;
+        }
+
+        frame.BackStack.Clear();
+        frame.ForwardStack.Clear();
+    }
+
+    private bool CanGoBackInternal()
+    {
+        var innerShellFrame = GetCoreFrameInternal(NavigationReferenceFrame.InnerShellFrame);
+
+        return _statePersistanceService.ApplicationMode switch
+        {
+            WinoApplicationMode.Mail => _statePersistanceService.IsReadingMail && _statePersistanceService.IsReaderNarrowed,
+            WinoApplicationMode.Settings => innerShellFrame?.Content is SettingsPage settingsPage && settingsPage.CanNavigateBack,
+            WinoApplicationMode.Calendar or WinoApplicationMode.Contacts => HasModeScopedBackStack(innerShellFrame, _statePersistanceService.ApplicationMode),
+            _ => false
+        };
+    }
+
+    private bool HasModeScopedBackStack(Frame? innerShellFrame, WinoApplicationMode mode)
+    {
+        if (innerShellFrame == null || innerShellFrame.BackStack.Count == 0)
+            return false;
+
+        for (int i = innerShellFrame.BackStack.Count - 1; i >= 0; i--)
+        {
+            if (IsPageTypeAllowedInMode(mode, innerShellFrame.BackStack[i].SourcePageType))
+                return true;
+        }
+
+        return false;
+    }
+
+    // Standalone EML viewer.
+    //public void NavigateRendering(MimeMessageInformation mimeMessageInformation, NavigationTransitionType transition = NavigationTransitionType.None)
+    //{
+    //    if (mimeMessageInformation == null)
+    //        throw new ArgumentException("MimeMessage cannot be null.");
+
+    //    Navigate(WinoPage.MailRenderingPage, mimeMessageInformation, NavigationReferenceFrame.RenderingFrame, transition);
+    //}
+
+    //// Mail item view model clicked handler.
+    //public void NavigateRendering(IMailItem mailItem, NavigationTransitionType transition = NavigationTransitionType.None)
+    //{
+    //    if (mailItem is MailItemViewModel mailItemViewModel)
+    //        Navigate(WinoPage.MailRenderingPage, mailItemViewModel, NavigationReferenceFrame.RenderingFrame, transition);
+    //    else
+    //        throw new ArgumentException("MailItem must be of type MailItemViewModel.");
+    //}
+
+    //public void NavigateFolder(NavigateMailFolderEventArgs args)
+    //    => Navigate(WinoPage.MailListPage, args, NavigationReferenceFrame.ShellFrame);
+}
diff --git a/Wino.Core.UWP/Services/NavigationServiceBase.cs b/Wino.Mail.WinUI/Services/NavigationServiceBase.cs
similarity index 65%
rename from Wino.Core.UWP/Services/NavigationServiceBase.cs
rename to Wino.Mail.WinUI/Services/NavigationServiceBase.cs
index 4e2fcf37..0749dc4c 100644
--- a/Wino.Core.UWP/Services/NavigationServiceBase.cs
+++ b/Wino.Mail.WinUI/Services/NavigationServiceBase.cs
@@ -1,9 +1,9 @@
-using System;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
+using System;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
 using Wino.Core.Domain.Models.Navigation;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class NavigationServiceBase
 {
@@ -17,10 +17,10 @@ public class NavigationServiceBase
         };
     }
 
-    public Type GetCurrentFrameType(ref Frame _frame)
+    public Type? GetCurrentFrameType(Frame frame)
     {
-        if (_frame != null && _frame.Content != null)
-            return _frame.Content.GetType();
+        if (frame != null && frame.Content != null)
+            return frame.Content.GetType();
 
         return null;
     }
diff --git a/Wino.Core.UWP/Services/ThemeService.cs b/Wino.Mail.WinUI/Services/NewThemeService.cs
similarity index 56%
rename from Wino.Core.UWP/Services/ThemeService.cs
rename to Wino.Mail.WinUI/Services/NewThemeService.cs
index 522f4ffd..589dd30a 100644
--- a/Wino.Core.UWP/Services/ThemeService.cs
+++ b/Wino.Mail.WinUI/Services/NewThemeService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -7,49 +7,51 @@ using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Helpers;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
 using Windows.Storage;
 using Windows.UI;
 using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models;
 using Wino.Core.Domain.Models.Personalization;
-using Wino.Core.UWP.Extensions;
-using Wino.Core.UWP.Models.Personalization;
-using Wino.Core.UWP.Services;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models.Personalization;
+using Wino.Mail.WinUI.Services;
 using Wino.Messaging.Client.Shell;
+using WinUIEx;
 
 namespace Wino.Services;
 
 /// <summary>
-/// Class providing functionality around switching and restoring theme settings
+/// Next-generation theme service with enhanced WinUI support including backdrop management
 /// </summary>
-public class ThemeService : IThemeService
+public class NewThemeService : INewThemeService
 {
     public const string CustomThemeFolderName = "CustomThemes";
 
-    private static string _micaThemeId = "a160b1b0-2ab8-4e97-a803-f4050f036e25";
-    private static string _acrylicThemeId = "fc08e58c-36fd-46e2-a562-26cf277f1467";
+    private static string _defaultThemeId = "00000000-0000-0000-0000-000000000000";
     private static string _cloudsThemeId = "3b621cc2-e270-4a76-8477-737917cccda0";
     private static string _forestThemeId = "8bc89b37-a7c5-4049-86e2-de1ae8858dbd";
     private static string _nightyThemeId = "5b65e04e-fd7e-4c2d-8221-068d3e02d23a";
     private static string _snowflakeThemeId = "e143ddde-2e28-4846-9d98-dad63d6505f1";
     private static string _gardenThemeId = "698e4466-f88c-4799-9c61-f0ea1308ed49";
 
-    private Frame mainApplicationFrame = null;
-
-    public event EventHandler<ApplicationElementTheme> ElementThemeChanged;
-    public event EventHandler<string> AccentColorChanged;
+    public event EventHandler<ApplicationElementTheme>? ElementThemeChanged;
+    public event EventHandler<string>? AccentColorChanged;
+    public event EventHandler<WindowBackdropType>? BackdropChanged;
 
     private const string AccentColorKey = nameof(AccentColorKey);
     private const string CurrentApplicationThemeKey = nameof(CurrentApplicationThemeKey);
+    private const string WindowBackdropTypeKey = nameof(WindowBackdropTypeKey);
 
     // Custom theme
     public const string CustomThemeAccentColorKey = nameof(CustomThemeAccentColorKey);
@@ -60,11 +62,11 @@ public class ThemeService : IThemeService
     private readonly IConfigurationService _configurationService;
     private readonly IUnderlyingThemeService _underlyingThemeService;
     private readonly IApplicationResourceManager<ResourceDictionary> _applicationResourceManager;
+    private readonly IWinoWindowManager _windowManager;
 
     private List<AppThemeBase> preDefinedThemes { get; set; } = new List<AppThemeBase>()
     {
-        new SystemAppTheme("Mica", Guid.Parse(_micaThemeId)),
-        new SystemAppTheme("Acrylic", Guid.Parse(_acrylicThemeId)),
+        new SystemAppTheme("Default", Guid.Parse(_defaultThemeId)),
         new PreDefinedAppTheme("Nighty", Guid.Parse(_nightyThemeId), "#e1b12c", ApplicationElementTheme.Dark),
         new PreDefinedAppTheme("Forest", Guid.Parse(_forestThemeId), "#16a085", ApplicationElementTheme.Dark),
         new PreDefinedAppTheme("Clouds", Guid.Parse(_cloudsThemeId), "#0984e3", ApplicationElementTheme.Light),
@@ -72,13 +74,15 @@ public class ThemeService : IThemeService
         new PreDefinedAppTheme("Garden", Guid.Parse(_gardenThemeId), "#05c46b", ApplicationElementTheme.Light),
     };
 
-    public ThemeService(IConfigurationService configurationService,
-                        IUnderlyingThemeService underlyingThemeService,
-                        IApplicationResourceManager<ResourceDictionary> applicationResourceManager)
+    public NewThemeService(IConfigurationService configurationService,
+                          IUnderlyingThemeService underlyingThemeService,
+                          IApplicationResourceManager<ResourceDictionary> applicationResourceManager,
+                          IWinoWindowManager windowManager)
     {
         _configurationService = configurationService;
         _underlyingThemeService = underlyingThemeService;
         _applicationResourceManager = applicationResourceManager;
+        _windowManager = windowManager;
     }
 
     /// <summary>
@@ -88,16 +92,17 @@ public class ThemeService : IThemeService
     {
         get
         {
-            if (mainApplicationFrame == null) return ApplicationElementTheme.Default;
+            var rootContent = TryGetShellRootContent();
+            if (rootContent == null)
+                return _configurationService.Get(UnderlyingThemeService.SelectedAppThemeKey, ApplicationElementTheme.Default);
 
-            return mainApplicationFrame.RequestedTheme.ToWinoElementTheme();
+            return rootContent.RequestedTheme.ToWinoElementTheme();
         }
         set
         {
-            if (mainApplicationFrame == null)
-                return;
-
-            mainApplicationFrame.RequestedTheme = value.ToWindowsElementTheme();
+            var rootContent = TryGetShellRootContent();
+            if (rootContent != null)
+                rootContent.RequestedTheme = value.ToWindowsElementTheme();
 
             _configurationService.Set(UnderlyingThemeService.SelectedAppThemeKey, value);
 
@@ -108,10 +113,9 @@ public class ThemeService : IThemeService
         }
     }
 
+    private Guid? currentApplicationThemeId;
 
-    private Guid currentApplicationThemeId;
-
-    public Guid CurrentApplicationThemeId
+    public Guid? CurrentApplicationThemeId
     {
         get { return currentApplicationThemeId; }
         set
@@ -120,15 +124,18 @@ public class ThemeService : IThemeService
 
             _configurationService.Set(CurrentApplicationThemeKey, value);
 
-            _ = mainApplicationFrame.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, async () =>
+            var window = GetThemeWindow();
+            if (window != null)
             {
-                await ApplyCustomThemeAsync(false);
-            });
+                window.DispatcherQueue.TryEnqueue(async () =>
+                {
+                    await ApplyCustomThemeAsync(false);
+                });
+            }
         }
     }
 
-
-    private string accentColor;
+    private string accentColor = string.Empty;
 
     public string AccentColor
     {
@@ -144,88 +151,196 @@ public class ThemeService : IThemeService
         }
     }
 
+    private WindowBackdropType currentBackdropType;
+
+    public WindowBackdropType CurrentBackdropType
+    {
+        get { return currentBackdropType; }
+        set
+        {
+            // Only update if the backdrop type has actually changed
+            if (currentBackdropType == value) return;
+
+            currentBackdropType = value;
+            _configurationService.Set(WindowBackdropTypeKey, (int)value);
+
+            var window = GetThemeWindow();
+            if (window != null)
+            {
+                window.DispatcherQueue.TryEnqueue(() =>
+                {
+                    ApplyBackdrop(value);
+                });
+            }
+        }
+    }
+
     public bool IsCustomTheme
     {
         get
         {
-            return currentApplicationThemeId != Guid.Parse(_micaThemeId) &&
-                   currentApplicationThemeId != Guid.Parse(_acrylicThemeId);
+            // If no theme is set, it's not a custom theme
+            if (currentApplicationThemeId == null) return false;
+
+            // Check if current theme is not in predefined themes (all themes now are custom or predefined, no system themes)
+            return !preDefinedThemes.Exists(a => a.Id == currentApplicationThemeId);
         }
     }
 
+    public FrameworkElement GetShellRootContent()
+    {
+        return TryGetShellRootContent() ?? throw new Exception("No root content found");
+    }
+
+    private bool isInitialized = false;
+
     public async Task InitializeAsync()
     {
         // Already initialized. There is no need.
-        if (mainApplicationFrame != null)
-            return;
-
-        // Save reference as this might be null when the user is in another app
-
-        mainApplicationFrame = Window.Current.Content as Frame;
-
-        if (mainApplicationFrame == null) return;
+        if (isInitialized) return;
 
         RootTheme = _configurationService.Get(UnderlyingThemeService.SelectedAppThemeKey, ApplicationElementTheme.Default);
         AccentColor = _configurationService.Get(AccentColorKey, string.Empty);
 
-        // Set the current theme id. Default to Mica.
-        currentApplicationThemeId = _configurationService.Get(CurrentApplicationThemeKey, Guid.Parse(_micaThemeId));
+        // Set the current theme id. Don't set a default for backward compatibility.
+        var storedThemeId = _configurationService.Get<Guid?>(CurrentApplicationThemeKey, null);
+        currentApplicationThemeId = storedThemeId;
 
+        // Load backdrop setting, default to Mica
+        currentBackdropType = (WindowBackdropType)_configurationService.Get(WindowBackdropTypeKey, (int)WindowBackdropType.Mica);
+
+        // Apply backdrop first, then theme
+        ApplyBackdrop(currentBackdropType);
         await ApplyCustomThemeAsync(true);
 
         // Registering to color changes, thus we notice when user changes theme system wide
-        uiSettings.ColorValuesChanged -= UISettingsColorChanged;
-        uiSettings.ColorValuesChanged += UISettingsColorChanged;
+
+        // TODO: WinUI: This event seems to be very unreliable. It causes a crash when the function runs under.
+        //uiSettings.ColorValuesChanged -= UISettingsColorChanged;
+        //uiSettings.ColorValuesChanged += UISettingsColorChanged;
+
+        isInitialized = true;
+    }
+
+    public void ApplyBackdrop(WindowBackdropType backdropType)
+    {
+        if (GetThemeWindow() is not WindowEx windowEx)
+        {
+            Debug.WriteLine("No active WindowEx found, cannot apply backdrop");
+            return;
+        }
+
+        try
+        {
+            Microsoft.UI.Xaml.Media.SystemBackdrop? backdrop = backdropType switch
+            {
+                WindowBackdropType.Mica => new MicaBackdrop() { Kind = Microsoft.UI.Composition.SystemBackdrops.MicaKind.Base },
+                WindowBackdropType.MicaAlt => new MicaBackdrop() { Kind = Microsoft.UI.Composition.SystemBackdrops.MicaKind.BaseAlt },
+                WindowBackdropType.DesktopAcrylic => new DesktopAcrylicBackdrop(),
+                WindowBackdropType.AcrylicBase => new DesktopAcrylicBackdrop(), // Using DesktopAcrylic as base
+                WindowBackdropType.AcrylicThin => new DesktopAcrylicBackdrop(), // Using DesktopAcrylic as thin
+                WindowBackdropType.None => null,
+                _ => new MicaBackdrop() { Kind = Microsoft.UI.Composition.SystemBackdrops.MicaKind.Base }
+            };
+
+            if (windowEx.SystemBackdrop != backdrop)
+            {
+                windowEx.SystemBackdrop = backdrop;
+
+                BackdropChanged?.Invoke(this, backdropType);
+
+                Debug.WriteLine($"Applied backdrop: {backdropType}");
+            }
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Failed to apply backdrop {backdropType}: {ex.Message}");
+        }
+    }
+
+    public async Task SetAccentColorAsync(string hexColor, bool preserveTheme = true)
+    {
+        if (string.IsNullOrEmpty(hexColor))
+        {
+            // Reset to system accent color
+            hexColor = GetSystemAccentColorHex();
+        }
+
+        if (preserveTheme)
+        {
+            // Just update accent color without changing theme
+            AccentColor = hexColor;
+        }
+        else
+        {
+            // This might trigger theme changes
+            AccentColor = hexColor;
+            await ApplyCustomThemeAsync(false);
+        }
     }
 
     private void NotifyThemeUpdate()
     {
-        if (mainApplicationFrame == null || mainApplicationFrame.Dispatcher == null) return;
+        if (TryGetShellRootContent() is not UIElement rootContent) return;
 
-        _ = mainApplicationFrame.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
+        _ = rootContent.DispatcherQueue.EnqueueAsync(() =>
         {
             ElementThemeChanged?.Invoke(this, RootTheme);
             WeakReferenceMessenger.Default.Send(new ApplicationThemeChanged(_underlyingThemeService.IsUnderlyingThemeDark()));
-        });
+        }, Microsoft.UI.Dispatching.DispatcherQueuePriority.High);
     }
 
     private void UISettingsColorChanged(UISettings sender, object args)
     {
-        // Make sure we have a reference to our window so we dispatch a UI change
-        if (mainApplicationFrame != null)
-        {
-            // Dispatch on UI thread so that we have a current appbar to access and change
-
-            _ = mainApplicationFrame.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, () =>
-            {
-                UpdateSystemCaptionButtonColors();
-
-                var accentColor = sender.GetColorValue(UIColorType.Accent);
-                //AccentColorChangedBySystem?.Invoke(this, accentColor.ToHex());
-            });
-        }
-
         NotifyThemeUpdate();
     }
 
     public void UpdateSystemCaptionButtonColors()
     {
-        if (mainApplicationFrame == null) return;
+        var rootContent = TryGetShellRootContent();
+        if (rootContent == null) return;
 
-        _ = mainApplicationFrame.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+        rootContent.DispatcherQueue.TryEnqueue(() =>
         {
-            ApplicationViewTitleBar titleBar = ApplicationView.GetForCurrentView().TitleBar;
+            if (GetThemeWindow() is not WindowEx mainWindow) return;
 
+            var titleBar = mainWindow.AppWindow.TitleBar;
             if (titleBar == null) return;
 
-            if (_underlyingThemeService.IsUnderlyingThemeDark())
+            // Determine if current theme is dark
+            bool isDarkTheme = _underlyingThemeService.IsUnderlyingThemeDark();
+
+            // Set button colors based on theme
+            // Normal and inactive backgrounds are transparent, but hover/pressed have subtle backgrounds
+            titleBar.ButtonBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+            titleBar.ButtonInactiveBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+
+            if (isDarkTheme)
             {
-                titleBar.ButtonForegroundColor = Colors.White;
+                // Dark theme: use light text/icons for better contrast
+                titleBar.ButtonForegroundColor = Color.FromArgb(255, 255, 255, 255); // White
+                titleBar.ButtonInactiveForegroundColor = Color.FromArgb(128, 255, 255, 255); // Semi-transparent white
+                titleBar.ButtonHoverForegroundColor = Color.FromArgb(255, 255, 255, 255); // White
+                titleBar.ButtonPressedForegroundColor = Color.FromArgb(255, 255, 255, 255); // White
+
+                // Subtle hover and pressed backgrounds for dark theme
+                titleBar.ButtonHoverBackgroundColor = Color.FromArgb(20, 255, 255, 255); // Very subtle white overlay
+                titleBar.ButtonPressedBackgroundColor = Color.FromArgb(40, 255, 255, 255); // Slightly more visible white overlay
             }
             else
             {
-                titleBar.ButtonForegroundColor = Colors.Black;
+                // Light theme: use dark text/icons for better contrast
+                titleBar.ButtonForegroundColor = Color.FromArgb(255, 0, 0, 0); // Black
+                titleBar.ButtonInactiveForegroundColor = Color.FromArgb(128, 0, 0, 0); // Semi-transparent black
+                titleBar.ButtonHoverForegroundColor = Color.FromArgb(255, 0, 0, 0); // Black
+                titleBar.ButtonPressedForegroundColor = Color.FromArgb(255, 0, 0, 0); // Black
+
+                // Subtle hover and pressed backgrounds for light theme
+                titleBar.ButtonHoverBackgroundColor = Color.FromArgb(20, 0, 0, 0); // Very subtle black overlay
+                titleBar.ButtonPressedBackgroundColor = Color.FromArgb(40, 0, 0, 0); // Slightly more visible black overlay
             }
+
+            Debug.WriteLine($"Updated title bar button colors for {(isDarkTheme ? "dark" : "light")} theme");
         });
     }
 
@@ -249,13 +364,13 @@ public class ThemeService : IThemeService
             if (_applicationResourceManager.ContainsResourceKey("SystemColorControlAccentBrush"))
                 _applicationResourceManager.ReplaceResource("SystemColorControlAccentBrush", brush);
 
-
             RefreshThemeResource();
         }
     }
 
     private void RefreshThemeResource()
     {
+        var mainApplicationFrame = TryGetShellRootContent();
         if (mainApplicationFrame == null) return;
 
         if (mainApplicationFrame.RequestedTheme == ElementTheme.Dark)
@@ -279,7 +394,14 @@ public class ThemeService : IThemeService
 
     public async Task ApplyCustomThemeAsync(bool isInitializing)
     {
-        AppThemeBase applyingTheme = null;
+        // If no theme ID is set, don't apply any theme (for backward compatibility)
+        if (currentApplicationThemeId == null)
+        {
+            Debug.WriteLine("No theme ID set, skipping theme application");
+            return;
+        }
+
+        AppThemeBase? applyingTheme = null;
 
         var controlThemeList = new List<AppThemeBase>(preDefinedThemes);
 
@@ -295,22 +417,34 @@ public class ThemeService : IThemeService
         else
         {
             // User applied custom theme. Load custom themes and find it there.
-            // Fallback to Mica if nothing found.
 
             var customThemes = await GetCurrentCustomThemesAsync();
 
             controlThemeList.AddRange(customThemes.Select(a => new CustomAppTheme(a)));
 
-            applyingTheme = controlThemeList.Find(a => a.Id == currentApplicationThemeId) ?? preDefinedThemes.First(a => a.Id == Guid.Parse(_micaThemeId));
+            applyingTheme = controlThemeList.Find(a => a.Id == currentApplicationThemeId);
+
+            // If theme ID is not found in available themes, don't apply any theme (backward compatibility)
+            if (applyingTheme == null)
+            {
+                Debug.WriteLine($"Theme with ID {currentApplicationThemeId} not found, skipping theme application");
+                return;
+            }
+        }
+
+        if (applyingTheme == null)
+        {
+            Debug.WriteLine($"Theme with ID {currentApplicationThemeId} not found, skipping theme application");
+            return;
         }
 
         try
         {
             var existingThemeDictionary = _applicationResourceManager.GetLastResource();
 
-            if (existingThemeDictionary != null && existingThemeDictionary.TryGetValue("ThemeName", out object themeNameString))
+            if (existingThemeDictionary != null && existingThemeDictionary.TryGetValue("ThemeName", out object? themeNameString))
             {
-                var themeName = themeNameString.ToString();
+                var themeName = themeNameString?.ToString();
 
                 // Applying different theme.
                 if (themeName != applyingTheme.ThemeName)
@@ -318,6 +452,10 @@ public class ThemeService : IThemeService
                     var resourceDictionaryContent = await applyingTheme.GetThemeResourceDictionaryContentAsync();
 
                     var resourceDictionary = XamlReader.Load(resourceDictionaryContent) as ResourceDictionary;
+                    if (resourceDictionary == null)
+                    {
+                        return;
+                    }
 
                     // Custom themes require special attention for background image because 
                     // they share the same base theme resource dictionary.
@@ -449,7 +587,7 @@ public class ThemeService : IThemeService
         return results;
     }
 
-    private async Task<CustomThemeMetadata> GetCustomMetadataAsync(IStorageFile file)
+    private async Task<CustomThemeMetadata?> GetCustomMetadataAsync(IStorageFile file)
     {
         var fileContent = await FileIO.ReadTextAsync(file);
 
@@ -513,4 +651,47 @@ public class ThemeService : IThemeService
             "#2c3e50",
         };
     }
+
+    public List<BackdropTypeWrapper> GetAvailableBackdropTypes()
+    {
+        return new List<BackdropTypeWrapper>
+        {
+            new BackdropTypeWrapper(WindowBackdropType.None, "None"),
+            new BackdropTypeWrapper(WindowBackdropType.Mica, "Mica"),
+            new BackdropTypeWrapper(WindowBackdropType.MicaAlt, "Mica Alt"),
+            new BackdropTypeWrapper(WindowBackdropType.DesktopAcrylic, "Desktop Acrylic"),
+            new BackdropTypeWrapper(WindowBackdropType.AcrylicBase, "Acrylic Base"),
+            new BackdropTypeWrapper(WindowBackdropType.AcrylicThin, "Acrylic Thin")
+        };
+    }
+
+    private WindowEx? GetThemeWindow() => _windowManager.ActiveWindow ?? WinoApplication.MainWindow;
+
+    private FrameworkElement? TryGetShellRootContent()
+    {
+        var window = GetThemeWindow();
+        if (window == null)
+            return null;
+
+        try
+        {
+            if (window is IWinoShellWindow shellWindow)
+                return shellWindow.GetRootContent();
+
+            return window.Content as FrameworkElement;
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Skipping root content lookup for closed window: {ex.Message}");
+            return null;
+        }
+    }
+
+    public async Task ApplyThemeToActiveWindowAsync()
+    {
+        ApplyBackdrop(currentBackdropType);
+        RootTheme = _configurationService.Get(UnderlyingThemeService.SelectedAppThemeKey, ApplicationElementTheme.Default);
+        await ApplyCustomThemeAsync(false);
+        UpdateSystemCaptionButtonColors();
+    }
 }
diff --git a/Wino.Mail.WinUI/Services/NotificationBuilder.cs b/Wino.Mail.WinUI/Services/NotificationBuilder.cs
new file mode 100644
index 00000000..529b872f
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/NotificationBuilder.cs
@@ -0,0 +1,433 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Serilog;
+using Windows.Data.Xml.Dom;
+using Windows.UI.Notifications;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Extensions;
+using Wino.Core.Domain.Interfaces;
+using Wino.Messaging.UI;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class NotificationBuilder : INotificationBuilder
+{
+    private const string MailApplicationId = "App";
+    private const string NotificationIconRootUri = "ms-appx:///Assets/NotificationIcons/";
+
+    private readonly IAccountService _accountService;
+    private readonly IFolderService _folderService;
+    private readonly IMailService _mailService;
+    private readonly IThumbnailService _thumbnailService;
+    private readonly IPreferencesService _preferencesService;
+
+    public NotificationBuilder(IAccountService accountService,
+                               IFolderService folderService,
+                               IMailService mailService,
+                               IThumbnailService thumbnailService,
+                               IPreferencesService preferencesService)
+    {
+        _accountService = accountService;
+        _folderService = folderService;
+        _mailService = mailService;
+        _thumbnailService = thumbnailService;
+        _preferencesService = preferencesService;
+
+        WeakReferenceMessenger.Default.Register<MailReadStatusChanged>(this, (r, msg) =>
+        {
+            RemoveNotification(msg.UniqueId);
+        });
+    }
+
+    public async Task CreateNotificationsAsync(IEnumerable<MailCopy> downloadedMailItems)
+    {
+        try
+        {
+            // Filter mails to only include Inbox folder items
+            var inboxMailItems = new List<MailCopy>();
+
+            foreach (var item in downloadedMailItems)
+            {
+                var mailItem = await _mailService.GetSingleMailItemAsync(item.UniqueId);
+
+                //if (mailItem == null || mailItem.AssignedFolder == null)
+                //    continue;
+
+                //// Only create notifications for Inbox folder mails
+                //if (mailItem.AssignedFolder.SpecialFolderType != SpecialFolderType.Inbox)
+                //    continue;
+
+                //// Skip folders with synchronization disabled
+                //if (!mailItem.AssignedFolder.IsSynchronizationEnabled)
+                //    continue;
+
+                //// Skip already read mails
+                //if (mailItem.IsRead)
+                //{
+                //    RemoveNotification(mailItem.UniqueId);
+                //    continue;
+                //}
+
+                inboxMailItems.Add(mailItem);
+            }
+
+            var mailCount = inboxMailItems.Count;
+
+            if (mailCount == 0)
+                return;
+
+            // If there are more than 3 mails, just display 1 general toast.
+            if (mailCount > 3)
+            {
+                var builder = new ToastContentBuilder();
+                builder.SetToastScenario(ToastScenario.Default);
+
+                builder.AddText(Translator.Notifications_MultipleNotificationsTitle);
+                builder.AddText(string.Format(Translator.Notifications_MultipleNotificationsMessage, mailCount));
+                builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
+
+                builder.AddButton(GetDismissButton());
+                builder.AddAudio(new ToastAudio()
+                {
+                    Src = new Uri("ms-winsoundevent:Notification.Mail")
+                });
+
+                ShowToast(builder);
+            }
+            else
+            {
+                foreach (var mailItem in inboxMailItems)
+                {
+                    await CreateSingleNotificationAsync(mailItem);
+                }
+
+                await UpdateTaskbarIconBadgeAsync();
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to create notifications.");
+        }
+    }
+
+    private async Task CreateSingleNotificationAsync(MailCopy mailItem)
+    {
+        var builder = new ToastContentBuilder();
+        builder.SetToastScenario(ToastScenario.Default);
+
+        var avatarThumbnail = await _thumbnailService.GetThumbnailAsync(mailItem.FromAddress, awaitLoad: true);
+        if (!string.IsNullOrEmpty(avatarThumbnail))
+        {
+            var tempFile = await Windows.Storage.ApplicationData.Current.TemporaryFolder.CreateFileAsync($"{Guid.NewGuid()}.png", Windows.Storage.CreationCollisionOption.ReplaceExisting);
+            await using (var stream = await tempFile.OpenStreamForWriteAsync())
+            {
+                var bytes = Convert.FromBase64String(avatarThumbnail);
+                await stream.WriteAsync(bytes);
+            }
+            builder.AddAppLogoOverride(new Uri($"ms-appdata:///temp/{tempFile.Name}"), hintCrop: ToastGenericAppLogoCrop.Default);
+        }
+
+        // Override system notification timestamp with received date of the mail.
+        builder.AddCustomTimeStamp(mailItem.CreationDate.ToLocalTime());
+
+        builder.AddText(mailItem.FromName);
+        builder.AddText(mailItem.Subject);
+        builder.AddText(mailItem.PreviewText);
+
+        builder.AddArgument(Constants.ToastMailUniqueIdKey, mailItem.UniqueId.ToString());
+        builder.AddArgument(Constants.ToastActionKey, MailOperation.Navigate);
+        builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
+
+        builder.AddButton(GetMarkAsReadButton(mailItem.UniqueId));
+        builder.AddButton(GetDeleteButton(mailItem.UniqueId));
+        builder.AddButton(GetArchiveButton(mailItem.UniqueId));
+        builder.AddAudio(new ToastAudio()
+        {
+            Src = new Uri("ms-winsoundevent:Notification.Mail")
+        });
+
+        // Use UniqueId as tag to allow removal
+        ShowToast(builder, mailItem.UniqueId.ToString());
+    }
+
+    private ToastButton GetDismissButton()
+        => new ToastButton()
+        .SetDismissActivation()
+        .SetImageUri(GetNotificationIconUri("dismiss"));
+
+    private ToastButton GetArchiveButton(Guid mailUniqueId)
+        => new ToastButton()
+        .SetContent(Translator.MailOperation_Archive)
+        .SetImageUri(GetNotificationIconUri("mail-archive"))
+        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
+        .AddArgument(Constants.ToastActionKey, MailOperation.Archive)
+        .AddArgument(Constants.ToastModeKey, Constants.ToastModeMail)
+        .SetBackgroundActivation();
+
+    private ToastButton GetDeleteButton(Guid mailUniqueId)
+        => new ToastButton()
+        .SetContent(Translator.MailOperation_Delete)
+        .SetImageUri(GetNotificationIconUri("mail-delete"))
+        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
+        .AddArgument(Constants.ToastActionKey, MailOperation.SoftDelete)
+        .AddArgument(Constants.ToastModeKey, Constants.ToastModeMail)
+        .SetBackgroundActivation();
+
+    private ToastButton GetMarkAsReadButton(Guid mailUniqueId)
+        => new ToastButton()
+        .SetContent(Translator.MailOperation_MarkAsRead)
+        .SetImageUri(GetNotificationIconUri("mail-markread"))
+        .AddArgument(Constants.ToastMailUniqueIdKey, mailUniqueId.ToString())
+        .AddArgument(Constants.ToastActionKey, MailOperation.MarkAsRead)
+        .AddArgument(Constants.ToastModeKey, Constants.ToastModeMail)
+        .SetBackgroundActivation();
+
+    public async Task UpdateTaskbarIconBadgeAsync()
+    {
+        int totalUnreadCount = 0;
+
+        try
+        {
+            var badgeUpdater = BadgeUpdateManager.CreateBadgeUpdaterForApplication(MailApplicationId);
+            var accounts = await _accountService.GetAccountsAsync();
+
+            foreach (var account in accounts)
+            {
+                if (!account.Preferences.IsTaskbarBadgeEnabled) continue;
+
+                var accountInbox = await _folderService.GetSpecialFolderByAccountIdAsync(account.Id, SpecialFolderType.Inbox);
+
+                if (accountInbox == null)
+                    continue;
+
+                var inboxUnreadCount = await _folderService.GetFolderNotificationBadgeAsync(accountInbox.Id);
+
+                totalUnreadCount += inboxUnreadCount;
+            }
+
+            if (totalUnreadCount > 0)
+            {
+                // Get the blank badge XML payload for a badge number
+                XmlDocument badgeXml = BadgeUpdateManager.GetTemplateContent(BadgeTemplateType.BadgeNumber);
+
+                // Set the value of the badge in the XML to our number
+                XmlElement? badgeElement = badgeXml.SelectSingleNode("/badge") as XmlElement;
+                if (badgeElement == null)
+                {
+                    badgeUpdater.Clear();
+                    return;
+                }
+                badgeElement.SetAttribute("value", totalUnreadCount.ToString());
+
+                // Create the badge notification
+                BadgeNotification badge = new BadgeNotification(badgeXml);
+
+                // And update the badge
+                badgeUpdater.Update(badge);
+            }
+            else
+                badgeUpdater.Clear();
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error while updating taskbar badge.");
+        }
+    }
+
+    public void RemoveNotification(Guid mailUniqueId)
+    {
+        try
+        {
+            ToastNotificationManager.History.Remove(mailUniqueId.ToString(), null);
+        }
+        catch (ArgumentException)
+        {
+            // Notification does not exists. Ignore.
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, $"Failed to remove notification for mail {mailUniqueId}");
+        }
+    }
+
+    public void CreateAttentionRequiredNotification(MailAccount account)
+    {
+        var builder = new ToastContentBuilder();
+        builder.SetToastScenario(ToastScenario.Default);
+
+        builder.AddText(Translator.Exception_AccountNeedsAttention_Title);
+        builder.AddText(string.Format(Translator.Exception_AccountNeedsAttention_Message, account.Name));
+
+        builder.AddButton(GetDismissButton());
+
+        builder.AddArgument(Constants.ToastMailAccountIdKey, account.Id.ToString());
+        builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
+        builder.AddButton(new ToastButton().SetContent(Translator.Buttons_FixAccount));
+        ShowToast(builder);
+    }
+
+    public void CreateWebView2RuntimeMissingNotification()
+    {
+        var builder = new ToastContentBuilder();
+        builder.SetToastScenario(ToastScenario.Default);
+
+        builder.AddText(Translator.Exception_WebView2RuntimeMissing_Title);
+        builder.AddText(Translator.Exception_WebView2RuntimeMissing_Message);
+
+        builder.AddButton(GetDismissButton());
+        builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeMail);
+        ShowToast(builder);
+    }
+
+    public void CreateStoreUpdateNotification()
+    {
+        var builder = new ToastContentBuilder();
+        builder.SetToastScenario(ToastScenario.Default);
+
+        builder.AddText(Translator.Notifications_StoreUpdateAvailableTitle);
+        builder.AddText(Translator.Notifications_StoreUpdateAvailableMessage);
+        builder.AddArgument(Constants.ToastStoreUpdateActionKey, Constants.ToastStoreUpdateActionInstall);
+        builder.AddButton(GetDismissButton());
+
+        ShowToast(builder, "store-update-available");
+    }
+
+    public Task CreateCalendarReminderNotificationAsync(CalendarItem calendarItem, long reminderDurationInSeconds)
+    {
+        if (calendarItem == null)
+            return Task.CompletedTask;
+
+        var builder = new ToastContentBuilder();
+        builder.SetToastScenario(ToastScenario.Reminder);
+
+        var localStart = calendarItem.GetLocalStartDate();
+        var nowLocal = DateTime.Now;
+        var reminderContext = GetCalendarReminderContext(localStart, nowLocal);
+
+        builder.AddText(calendarItem.Title);
+        builder.AddText($"{reminderContext} - {localStart:g}");
+
+        if (!string.IsNullOrWhiteSpace(calendarItem.Location))
+            builder.AddText(calendarItem.Location);
+
+        builder.AddArgument(Constants.ToastCalendarActionKey, Constants.ToastCalendarNavigateAction);
+        builder.AddArgument(Constants.ToastCalendarItemIdKey, calendarItem.Id.ToString());
+        builder.AddArgument(Constants.ToastModeKey, Constants.ToastModeCalendar);
+
+        var allowedSnoozeMinutes = CalendarReminderSnoozeOptions.GetAllowedSnoozeMinutes(
+            reminderDurationInSeconds,
+            _preferencesService.DefaultReminderDurationInSeconds);
+
+        if (allowedSnoozeMinutes.Count > 0)
+        {
+            var preferredSnoozeMinutes = _preferencesService.DefaultSnoozeDurationInMinutes;
+            var defaultSnoozeMinutes = allowedSnoozeMinutes.Contains(preferredSnoozeMinutes)
+                ? preferredSnoozeMinutes
+                : allowedSnoozeMinutes[0];
+
+            var selectionBox = new ToastSelectionBox(Constants.ToastCalendarSnoozeDurationInputId)
+            {
+                DefaultSelectionBoxItemId = defaultSnoozeMinutes.ToString()
+            };
+
+            foreach (var snoozeMinutes in allowedSnoozeMinutes)
+            {
+                selectionBox.Items.Add(new ToastSelectionBoxItem(
+                    snoozeMinutes.ToString(),
+                    string.Format(Translator.CalendarReminder_SnoozeMinutesOption, snoozeMinutes)));
+            }
+
+            builder.AddToastInput(selectionBox);
+            var snoozeButton = new ToastButton()
+                .SetContent(Translator.CalendarReminder_SnoozeAction)
+                .SetImageUri(GetNotificationIconUri("calendar-snooze"))
+                .AddArgument(Constants.ToastCalendarActionKey, Constants.ToastCalendarSnoozeAction)
+                .AddArgument(Constants.ToastCalendarItemIdKey, calendarItem.Id.ToString())
+                .AddArgument(Constants.ToastModeKey, Constants.ToastModeCalendar)
+                .SetBackgroundActivation();
+
+            builder.AddButton(snoozeButton);
+        }
+
+        builder.AddButton(new ToastButton()
+            .SetDismissActivation()
+            .SetImageUri(GetNotificationIconUri("dismiss")));
+
+        if (Uri.TryCreate(calendarItem.HtmlLink, UriKind.Absolute, out var joinUri))
+        {
+            builder.AddButton(new ToastButton()
+                .SetContent(Translator.CalendarEventDetails_JoinOnline)
+                .SetImageUri(GetNotificationIconUri("calendar-join"))
+                .SetProtocolActivation(joinUri));
+        }
+
+        builder.AddAudio(new ToastAudio()
+        {
+            Src = new Uri("ms-winsoundevent:Notification.Reminder")
+        });
+
+        var tag = $"calendar-reminder-{calendarItem.Id:N}-{reminderDurationInSeconds}";
+        ShowToast(builder, tag);
+
+        return Task.CompletedTask;
+    }
+
+    private static string GetCalendarReminderContext(DateTime localStart, DateTime nowLocal)
+    {
+        var delta = localStart - nowLocal;
+        var absDelta = delta.Duration();
+
+        if (absDelta < TimeSpan.FromMinutes(1))
+            return delta.TotalSeconds >= 0 ? Translator.CalendarReminder_StartingNow : Translator.CalendarReminder_StartedNow;
+
+        if (delta.TotalSeconds > 0)
+        {
+            if (delta.TotalHours >= 1)
+            {
+                var hours = Math.Max(1, (int)Math.Floor(delta.TotalHours));
+                return string.Format(Translator.CalendarReminder_StartsInHours, hours);
+            }
+
+            var minutes = Math.Max(1, (int)Math.Floor(delta.TotalMinutes));
+            return string.Format(Translator.CalendarReminder_StartsInMinutes, minutes);
+        }
+
+        if (absDelta.TotalHours >= 1)
+        {
+            var hoursAgo = Math.Max(1, (int)Math.Floor(absDelta.TotalHours));
+            return string.Format(Translator.CalendarReminder_StartedHoursAgo, hoursAgo);
+        }
+
+        var minutesAgo = Math.Max(1, (int)Math.Floor(absDelta.TotalMinutes));
+        return string.Format(Translator.CalendarReminder_StartedMinutesAgo, minutesAgo);
+    }
+
+    private static void ShowToast(ToastContentBuilder builder, string? tag = null)
+    {
+        var toastNotification = new ToastNotification(builder.GetToastContent().GetXml());
+
+        if (!string.IsNullOrWhiteSpace(tag))
+        {
+            toastNotification.Tag = tag;
+        }
+
+        var notifier = ToastNotificationManager.CreateToastNotifier();
+        notifier.Show(toastNotification);
+    }
+
+    private Uri GetNotificationIconUri(string iconName)
+    {
+        // Keep the URI unqualified so Windows resolves the best matching theme/scale asset from the package.
+        return new($"{NotificationIconRootUri}{iconName}.png");
+    }
+}
+
diff --git a/Wino.Core.UWP/Services/PreferencesService.cs b/Wino.Mail.WinUI/Services/PreferencesService.cs
similarity index 52%
rename from Wino.Core.UWP/Services/PreferencesService.cs
rename to Wino.Mail.WinUI/Services/PreferencesService.cs
index 153cf504..81b0fd6b 100644
--- a/Wino.Core.UWP/Services/PreferencesService.cs
+++ b/Wino.Mail.WinUI/Services/PreferencesService.cs
@@ -1,8 +1,12 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
@@ -11,26 +15,26 @@ using Wino.Core.Domain.Models.Reader;
 using Wino.Core.Domain.Translations;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class PreferencesService(IConfigurationService configurationService) : ObservableObject, IPreferencesService
 {
     private readonly IConfigurationService _configurationService = configurationService;
 
-    public event EventHandler<string> PreferenceChanged;
+    public event EventHandler<string>? PreferenceChanged;
 
     protected override void OnPropertyChanged(PropertyChangedEventArgs e)
     {
         base.OnPropertyChanged(e);
 
-        PreferenceChanged?.Invoke(this, e.PropertyName);
+        PreferenceChanged?.Invoke(this, e.PropertyName ?? string.Empty);
     }
 
-    private void SaveProperty(string propertyName, object value) => _configurationService.Set(propertyName, value);
+    private void SaveProperty(string propertyName, object? value) => _configurationService.Set(propertyName, value ?? string.Empty);
 
-    private void SetPropertyAndSave(string propertyName, object value)
+    private void SetPropertyAndSave(string propertyName, object? value)
     {
-        _configurationService.Set(propertyName, value);
+        _configurationService.Set(propertyName, value ?? string.Empty);
 
         OnPropertyChanged(propertyName);
         Debug.WriteLine($"PreferencesService -> {propertyName}:{value?.ToString()}");
@@ -44,18 +48,65 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
             RenderPlaintextLinks = RenderPlaintextLinks
         };
 
+    public string ExportPreferences()
+    {
+        var settings = new Dictionary<string, object?>(StringComparer.Ordinal);
+
+        foreach (var property in GetSyncablePreferenceProperties())
+        {
+            settings[property.Name] = property.GetValue(this);
+        }
+
+        using var stream = new MemoryStream();
+        using (var writer = new Utf8JsonWriter(stream))
+        {
+            writer.WriteStartObject();
+
+            foreach (var setting in settings)
+            {
+                WritePreferenceValue(writer, setting.Key, setting.Value);
+            }
+
+            writer.WriteEndObject();
+        }
+
+        return Encoding.UTF8.GetString(stream.ToArray());
+    }
+
+    public (int appliedCount, int failedCount) ImportPreferences(string settingsJson)
+    {
+        using var document = JsonDocument.Parse(settingsJson);
+        var rootElement = document.RootElement;
+        var appliedCount = 0;
+        var failedCount = 0;
+
+        foreach (var property in GetSyncablePreferenceProperties())
+        {
+            if (!rootElement.TryGetProperty(property.Name, out var value) || value.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined)
+            {
+                continue;
+            }
+
+            try
+            {
+                property.SetValue(this, ReadPreferenceValue(property.PropertyType, value));
+                appliedCount++;
+            }
+            catch (Exception)
+            {
+                failedCount++;
+            }
+        }
+
+        return (appliedCount, failedCount);
+    }
+
     public MailListDisplayMode MailItemDisplayMode
     {
         get => _configurationService.Get(nameof(MailItemDisplayMode), MailListDisplayMode.Spacious);
         set => SetPropertyAndSave(nameof(MailItemDisplayMode), value);
     }
 
-    public bool IsSemanticZoomEnabled
-    {
-        get => _configurationService.Get(nameof(IsSemanticZoomEnabled), true);
-        set => SetPropertyAndSave(nameof(IsSemanticZoomEnabled), value);
-    }
-
     public bool IsHardDeleteProtectionEnabled
     {
         get => _configurationService.Get(nameof(IsHardDeleteProtectionEnabled), true);
@@ -170,12 +221,6 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
         set => SetPropertyAndSave(nameof(IsLoggingEnabled), value);
     }
 
-    public bool IsMailkitProtocolLoggerEnabled
-    {
-        get => _configurationService.Get(nameof(IsMailkitProtocolLoggerEnabled), false);
-        set => SetPropertyAndSave(nameof(IsMailkitProtocolLoggerEnabled), value);
-    }
-
     public bool IsGravatarEnabled
     {
         get => _configurationService.Get(nameof(IsGravatarEnabled), true);
@@ -227,7 +272,7 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
     public bool IsNavigationPaneOpened
     {
         get => _configurationService.Get(nameof(IsNavigationPaneOpened), true);
-        set => SaveProperty(propertyName: nameof(IsNavigationPaneOpened), value);
+        set => SetPropertyAndSave(propertyName: nameof(IsNavigationPaneOpened), value);
     }
 
     public bool AutoSelectNextItem
@@ -236,12 +281,6 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
         set => SaveProperty(propertyName: nameof(AutoSelectNextItem), value);
     }
 
-    public ServerBackgroundMode ServerTerminationBehavior
-    {
-        get => _configurationService.Get(nameof(ServerTerminationBehavior), ServerBackgroundMode.MinimizedTray);
-        set => SaveProperty(propertyName: nameof(ServerTerminationBehavior), value);
-    }
-
     public string DiagnosticId
     {
         get => _configurationService.Get(nameof(DiagnosticId), Guid.NewGuid().ToString());
@@ -266,15 +305,27 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
         set => SaveProperty(propertyName: nameof(HourHeight), value);
     }
 
+    public bool IsWorkingHoursEnabled
+    {
+        get => _configurationService.Get(nameof(IsWorkingHoursEnabled), true);
+        set => SaveProperty(propertyName: nameof(IsWorkingHoursEnabled), value);
+    }
+
+    public string CalendarTimedDayHeaderDateFormat
+    {
+        get => _configurationService.Get(nameof(CalendarTimedDayHeaderDateFormat), "ddd dd");
+        set => SaveProperty(propertyName: nameof(CalendarTimedDayHeaderDateFormat), string.IsNullOrWhiteSpace(value) ? "ddd dd" : value.Trim());
+    }
+
     public TimeSpan WorkingHourStart
     {
-        get => _configurationService.Get(nameof(WorkingHourStart), new TimeSpan(8, 0, 0));
+        get => _configurationService.Get(nameof(WorkingHourStart), new TimeSpan(9, 0, 0));
         set => SaveProperty(propertyName: nameof(WorkingHourStart), value);
     }
 
     public TimeSpan WorkingHourEnd
     {
-        get => _configurationService.Get(nameof(WorkingHourEnd), new TimeSpan(17, 0, 0));
+        get => _configurationService.Get(nameof(WorkingHourEnd), new TimeSpan(18, 0, 0));
         set => SaveProperty(propertyName: nameof(WorkingHourEnd), value);
     }
 
@@ -290,23 +341,94 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
         set => SaveProperty(propertyName: nameof(WorkingDayEnd), value);
     }
 
+    public long DefaultReminderDurationInSeconds
+    {
+        get => _configurationService.Get(nameof(DefaultReminderDurationInSeconds), 900L); // Default: 15 minutes (900 seconds)
+        set => SaveProperty(propertyName: nameof(DefaultReminderDurationInSeconds), value);
+    }
+
+    public int DefaultSnoozeDurationInMinutes
+    {
+        get => _configurationService.Get(nameof(DefaultSnoozeDurationInMinutes), 5);
+        set => SaveProperty(propertyName: nameof(DefaultSnoozeDurationInMinutes), value);
+    }
+
+    public NewEventButtonBehavior NewEventButtonBehavior
+    {
+        get => _configurationService.Get(nameof(NewEventButtonBehavior), NewEventButtonBehavior.AskEachTime);
+        set => SetPropertyAndSave(nameof(NewEventButtonBehavior), value);
+    }
+
+    public Guid? DefaultNewEventCalendarId
+    {
+        get => _configurationService.Get<Guid?>(nameof(DefaultNewEventCalendarId), null);
+        set => SetPropertyAndSave(nameof(DefaultNewEventCalendarId), value);
+    }
+
     public int EmailSyncIntervalMinutes
     {
         get => _configurationService.Get(nameof(EmailSyncIntervalMinutes), 3);
         set => SetPropertyAndSave(nameof(EmailSyncIntervalMinutes), value);
     }
 
+    public bool IsStoreUpdateNotificationsEnabled
+    {
+        get => _configurationService.Get(nameof(IsStoreUpdateNotificationsEnabled), true);
+        set => SetPropertyAndSave(nameof(IsStoreUpdateNotificationsEnabled), value);
+    }
+
+    public bool IsWinoAccountButtonHidden
+    {
+        get => _configurationService.Get(nameof(IsWinoAccountButtonHidden), false);
+        set => SetPropertyAndSave(nameof(IsWinoAccountButtonHidden), value);
+    }
+
+    public string AiDefaultTranslationLanguageCode
+    {
+        get => _configurationService.Get(nameof(AiDefaultTranslationLanguageCode), "en-US");
+        set => SetPropertyAndSave(nameof(AiDefaultTranslationLanguageCode), string.IsNullOrWhiteSpace(value) ? "en-US" : value.Trim());
+    }
+
+    public string AiSummarizeLanguageCode
+    {
+        get => _configurationService.Get(nameof(AiSummarizeLanguageCode), "en-US");
+        set => SetPropertyAndSave(nameof(AiSummarizeLanguageCode), string.IsNullOrWhiteSpace(value) ? "en-US" : value.Trim());
+    }
+
+    public string AiSummarySavePath
+    {
+        get => _configurationService.Get(nameof(AiSummarySavePath), string.Empty);
+        set => SetPropertyAndSave(nameof(AiSummarySavePath), value?.Trim() ?? string.Empty);
+    }
+
+    public WinoApplicationMode DefaultApplicationMode
+    {
+        get
+        {
+            var configuredMode = _configurationService.Get(nameof(DefaultApplicationMode), WinoApplicationMode.Mail);
+
+            return Enum.IsDefined(typeof(WinoApplicationMode), configuredMode)
+                ? configuredMode
+                : WinoApplicationMode.Mail;
+        }
+        set => SaveProperty(propertyName: nameof(DefaultApplicationMode), value);
+    }
+
     public CalendarSettings GetCurrentCalendarSettings()
     {
         var workingDays = GetDaysBetween(WorkingDayStart, WorkingDayEnd);
 
         return new CalendarSettings(FirstDayOfWeek,
                                     workingDays,
+                                    IsWorkingHoursEnabled,
+                                    WorkingDayStart,
+                                    WorkingDayEnd,
                                     WorkingHourStart,
                                     WorkingHourEnd,
                                     HourHeight,
                                     Prefer24HourTimeFormat ? DayHeaderDisplayType.TwentyFourHour : DayHeaderDisplayType.TwelveHour,
-                                    new CultureInfo(WinoTranslationDictionary.GetLanguageFileNameRelativePath(CurrentLanguage)));
+                                    new CultureInfo(WinoTranslationDictionary.GetLanguageFileNameRelativePath(CurrentLanguage)),
+                                    CalendarTimedDayHeaderDateFormat);
     }
 
     private List<DayOfWeek> GetDaysBetween(DayOfWeek startDay, DayOfWeek endDay)
@@ -331,4 +453,122 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
 
         return daysOfWeek;
     }
+
+    private static void WritePreferenceValue(Utf8JsonWriter writer, string propertyName, object? value)
+    {
+        if (value == null)
+        {
+            writer.WriteNull(propertyName);
+            return;
+        }
+
+        switch (value)
+        {
+            case string stringValue:
+                writer.WriteString(propertyName, stringValue);
+                return;
+            case bool boolValue:
+                writer.WriteBoolean(propertyName, boolValue);
+                return;
+            case int intValue:
+                writer.WriteNumber(propertyName, intValue);
+                return;
+            case long longValue:
+                writer.WriteNumber(propertyName, longValue);
+                return;
+            case double doubleValue:
+                writer.WriteNumber(propertyName, doubleValue);
+                return;
+            case float floatValue:
+                writer.WriteNumber(propertyName, floatValue);
+                return;
+            case Guid guidValue:
+                writer.WriteString(propertyName, guidValue);
+                return;
+            case TimeSpan timeSpanValue:
+                writer.WriteString(propertyName, timeSpanValue.ToString("c", CultureInfo.InvariantCulture));
+                return;
+        }
+
+        var valueType = Nullable.GetUnderlyingType(value.GetType()) ?? value.GetType();
+        if (valueType.IsEnum)
+        {
+            writer.WriteString(propertyName, value.ToString());
+            return;
+        }
+
+        writer.WriteString(propertyName, Convert.ToString(value, CultureInfo.InvariantCulture));
+    }
+
+    private static object? ReadPreferenceValue(Type propertyType, JsonElement value)
+    {
+        var targetType = Nullable.GetUnderlyingType(propertyType) ?? propertyType;
+
+        if (value.ValueKind == JsonValueKind.Null)
+        {
+            return null;
+        }
+
+        if (targetType == typeof(string))
+        {
+            return value.GetString() ?? string.Empty;
+        }
+
+        if (targetType == typeof(bool))
+        {
+            return value.GetBoolean();
+        }
+
+        if (targetType == typeof(int))
+        {
+            return value.GetInt32();
+        }
+
+        if (targetType == typeof(long))
+        {
+            return value.GetInt64();
+        }
+
+        if (targetType == typeof(double))
+        {
+            return value.GetDouble();
+        }
+
+        if (targetType == typeof(float))
+        {
+            return value.GetSingle();
+        }
+
+        if (targetType == typeof(Guid))
+        {
+            return Guid.Parse(value.GetString() ?? string.Empty);
+        }
+
+        if (targetType == typeof(TimeSpan))
+        {
+            return TimeSpan.Parse(value.GetString() ?? string.Empty, CultureInfo.InvariantCulture);
+        }
+
+        if (targetType.IsEnum)
+        {
+            return Enum.Parse(targetType, value.GetString() ?? string.Empty, true);
+        }
+
+        return Convert.ChangeType(value.GetString(), targetType, CultureInfo.InvariantCulture);
+    }
+
+    private static IEnumerable<PropertyInfo> GetSyncablePreferenceProperties()
+    {
+        foreach (var property in typeof(IPreferencesService).GetProperties(BindingFlags.Instance | BindingFlags.Public))
+        {
+            if (!property.CanRead || !property.CanWrite || property.GetIndexParameters().Length > 0)
+            {
+                continue;
+            }
+
+            yield return property;
+        }
+    }
 }
+
+
diff --git a/Wino.Core.UWP/Services/PrintService.cs b/Wino.Mail.WinUI/Services/PrintService.cs
similarity index 94%
rename from Wino.Core.UWP/Services/PrintService.cs
rename to Wino.Mail.WinUI/Services/PrintService.cs
index b1c9a12f..513ee582 100644
--- a/Wino.Core.UWP/Services/PrintService.cs
+++ b/Wino.Mail.WinUI/Services/PrintService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Numerics;
 using System.Threading.Tasks;
@@ -12,7 +12,7 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Printing;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 /// <summary>
 /// Printer service that uses WinRT APIs to print PDF files.
@@ -21,12 +21,13 @@ namespace Wino.Core.UWP.Services;
 /// HTML file is saved as PDF to temporary location.
 /// Then PDF is loaded as PdfDocument and printed using CanvasBitmap for each page.
 /// </summary>
+
 public class PrintService : IPrintService
 {
-    private TaskCompletionSource<PrintingResult> _taskCompletionSource;
-    private CanvasPrintDocument printDocument;
-    private PrintTask printTask;
-    private PdfDocument pdfDocument;
+    private TaskCompletionSource<PrintingResult>? _taskCompletionSource;
+    private CanvasPrintDocument? printDocument;
+    private PrintTask? printTask;
+    private PdfDocument? pdfDocument;
 
     private List<CanvasBitmap> bitmaps = new();
     private Vector2 largestBitmap;
@@ -40,7 +41,7 @@ public class PrintService : IPrintService
     private int bitmapsPerPage;
     private int pageCount = -1;
 
-    private PrintInformation _currentPrintInformation;
+    private PrintInformation? _currentPrintInformation;
 
     public async Task<PrintingResult> PrintPdfFileAsync(string pdfFilePath, string printTitle)
     {
@@ -124,6 +125,9 @@ public class PrintService : IPrintService
 
         printTask = args.Request.CreatePrintTask(_currentPrintInformation.PDFTitle, (createPrintTaskArgs) =>
         {
+            if (printDocument == null)
+                return;
+
             createPrintTaskArgs.SetSource(printDocument);
         });
 
@@ -190,6 +194,9 @@ public class PrintService : IPrintService
 
     private async Task LoadPDFPageBitmapsAsync(CanvasPrintDocument sender)
     {
+        if (pdfDocument == null)
+            return;
+
         ClearBitmaps();
 
         bitmaps ??= new List<CanvasBitmap>();
@@ -225,6 +232,9 @@ public class PrintService : IPrintService
     {
         var detailedOptions = PrintTaskOptionDetails.GetFromPrintTaskOptions(args.PrintTaskOptions);
 
+        if (pdfDocument == null)
+            return;
+
         int pageCountToPrint = (int)pdfDocument.PageCount;
 
         for (uint i = 1; i <= pageCountToPrint; ++i)
@@ -238,7 +248,7 @@ public class PrintService : IPrintService
 
     private void DrawPdfPage(CanvasPrintDocument sender, CanvasDrawingSession ds, uint pageNumber)
     {
-        if (bitmaps?.Count == 0) return;
+        if (bitmaps.Count == 0) return;
 
         var cellAcross = new Vector2(cellSize.X, 0);
         var cellDown = new Vector2(0, cellSize.Y);
diff --git a/Wino.Mail/Services/ProviderService.cs b/Wino.Mail.WinUI/Services/ProviderService.cs
similarity index 83%
rename from Wino.Mail/Services/ProviderService.cs
rename to Wino.Mail.WinUI/Services/ProviderService.cs
index 81083d0f..555f2dd5 100644
--- a/Wino.Mail/Services/ProviderService.cs
+++ b/Wino.Mail.WinUI/Services/ProviderService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
@@ -15,7 +16,7 @@ public class ProviderService : IProviderService
     {
         var details = GetAvailableProviders();
 
-        return details.FirstOrDefault(a => a.Type == type);
+        return details.FirstOrDefault(a => a.Type == type) ?? throw new InvalidOperationException($"Provider detail not found for type: {type}");
     }
 
     public List<IProviderDetail> GetAvailableProviders()
diff --git a/Wino.Mail.WinUI/Services/ReleaseLocalAccountDataCleanupService.cs b/Wino.Mail.WinUI/Services/ReleaseLocalAccountDataCleanupService.cs
new file mode 100644
index 00000000..44edc737
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/ReleaseLocalAccountDataCleanupService.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.WinUI.Services;
+
+public sealed class ReleaseLocalAccountDataCleanupService
+{
+    private const string CleanupCompletedSettingKey = "ReleaseLocalAccountDataCleanup_v1_Completed";
+    private const string LegacyDatabaseFileName = "Wino180.db";
+
+    private readonly IConfigurationService _configurationService;
+    private readonly IApplicationConfiguration _applicationConfiguration;
+    private readonly ILogger _logger = Log.ForContext<ReleaseLocalAccountDataCleanupService>();
+
+    public ReleaseLocalAccountDataCleanupService(IConfigurationService configurationService,
+                                                 IApplicationConfiguration applicationConfiguration)
+    {
+        _configurationService = configurationService;
+        _applicationConfiguration = applicationConfiguration;
+    }
+
+    public async Task RunIfNeededAsync()
+    {
+        if (_configurationService.Get(CleanupCompletedSettingKey, false))
+            return;
+
+        var localFolderPath = _applicationConfiguration.ApplicationDataFolderPath;
+        var publisherPath = _applicationConfiguration.PublisherSharedFolderPath;
+
+        if (string.IsNullOrWhiteSpace(localFolderPath) || !Directory.Exists(localFolderPath))
+        {
+            _configurationService.Set(CleanupCompletedSettingKey, true);
+            return;
+        }
+
+        var cleanupTargets = new List<string>
+        {
+            Path.Combine(localFolderPath, "Mime"),
+            Path.Combine(localFolderPath, "contacts"),
+            Path.Combine(localFolderPath, "CalendarAttachments"),
+            Path.Combine(publisherPath, LegacyDatabaseFileName)
+        };
+
+        foreach (var targetPath in cleanupTargets)
+        {
+            await DeletePathIfExistsAsync(localFolderPath, targetPath).ConfigureAwait(false);
+        }
+
+        _configurationService.Set(CleanupCompletedSettingKey, true);
+        _logger.Information("Completed one-time local account data cleanup for release migration.");
+    }
+
+    private async Task DeletePathIfExistsAsync(string localFolderPath, string targetPath)
+    {
+        try
+        {
+            var fullTargetPath = Path.GetFullPath(targetPath);
+            var fullLocalFolderPath = Path.GetFullPath(localFolderPath);
+
+            if (!fullTargetPath.StartsWith(fullLocalFolderPath, StringComparison.OrdinalIgnoreCase))
+            {
+                _logger.Warning("Skipped startup cleanup for path outside local folder: {TargetPath}", fullTargetPath);
+                return;
+            }
+
+            if (Directory.Exists(fullTargetPath))
+            {
+                await Task.Run(() => Directory.Delete(fullTargetPath, recursive: true)).ConfigureAwait(false);
+                _logger.Information("Deleted legacy startup cleanup directory {TargetPath}", fullTargetPath);
+                return;
+            }
+
+            if (File.Exists(fullTargetPath))
+            {
+                File.Delete(fullTargetPath);
+                _logger.Information("Deleted legacy startup cleanup file {TargetPath}", fullTargetPath);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to delete legacy startup cleanup path {TargetPath}", targetPath);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/SmimeCertificateService.cs b/Wino.Mail.WinUI/Services/SmimeCertificateService.cs
new file mode 100644
index 00000000..ec6c4801
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/SmimeCertificateService.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Core.WinUI.Services;
+
+public class SmimeCertificateService : ISmimeCertificateService
+{
+    private const string CertificateFriendlyName = "Wino Mail Certificate";
+
+    /// <summary>
+    /// Retrieves all personal certificates from the current user's certificate store.
+    /// </summary>
+    /// <remarks>This method enumerates certificates in the current user's "My" certificate store that have a
+    /// private key and at least one extension. The store is opened in read-only mode.</remarks>
+    /// <returns>An enumerable collection of <see cref="X509Certificate2"/> objects representing the personal certificates that
+    /// meet the specified criteria. If no matching certificates are found, the collection will be empty.</returns>
+    public IEnumerable<X509Certificate2> GetCertificates(StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser, string? emailAddress = null)
+    {
+        using var store = new X509Store(storeName, storeLocation);
+        store.Open(OpenFlags.ReadOnly);
+        var certs = store.Certificates.Where(cert => cert.FriendlyName == CertificateFriendlyName);
+        return emailAddress != null ? certs.Where(cert => cert.Subject.Contains(emailAddress, StringComparison.OrdinalIgnoreCase)) : certs;
+    }
+
+
+    public void ImportCertificate(string fileExtension, byte[] rawData, string? password = null, StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser)
+    {
+        X509Certificate2Collection collection = [];
+
+        if (fileExtension is ".p12" or ".pfx")
+        {
+            collection.AddRange(X509CertificateLoader.LoadPkcs12Collection(rawData, password, X509KeyStorageFlags.DefaultKeySet | X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable));
+        } else
+        {
+            collection.Add(X509CertificateLoader.LoadCertificate(rawData));
+        }
+
+        foreach (var cert in collection)
+        {
+            cert.FriendlyName = CertificateFriendlyName;
+        }
+
+        using var store = new X509Store(storeName, storeLocation);
+        store.Open(OpenFlags.ReadWrite);
+        store.AddRange(collection);
+        store.Close();
+    }
+
+    public void RemoveCertificate(string thumbprint, StoreName storeName = StoreName.My, StoreLocation storeLocation = StoreLocation.CurrentUser)
+    {
+        using var store = new X509Store(storeName, storeLocation);
+        store.Open(OpenFlags.ReadWrite);
+        var cert = store.Certificates.FirstOrDefault(c => c.Thumbprint == thumbprint);
+        if (cert != null)
+        {
+            store.Remove(cert);
+        }
+    }
+}
diff --git a/Wino.Core.UWP/Services/StartupBehaviorService.cs b/Wino.Mail.WinUI/Services/StartupBehaviorService.cs
similarity index 88%
rename from Wino.Core.UWP/Services/StartupBehaviorService.cs
rename to Wino.Mail.WinUI/Services/StartupBehaviorService.cs
index c637699a..f66ac928 100644
--- a/Wino.Core.UWP/Services/StartupBehaviorService.cs
+++ b/Wino.Mail.WinUI/Services/StartupBehaviorService.cs
@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using Windows.ApplicationModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
+using Wino.Mail.WinUI.Extensions;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class StartupBehaviorService : IStartupBehaviorService
 {
-    private const string WinoServerTaskId = "WinoServer";
+    private const string WinoServerTaskId = "WinoStartupId";
 
     public async Task<StartupBehaviorResult> ToggleStartupBehavior(bool isEnabled)
     {
diff --git a/Wino.Core.UWP/Services/StatePersistenceService.cs b/Wino.Mail.WinUI/Services/StatePersistenceService.cs
similarity index 58%
rename from Wino.Core.UWP/Services/StatePersistenceService.cs
rename to Wino.Mail.WinUI/Services/StatePersistenceService.cs
index b04707eb..a14528ff 100644
--- a/Wino.Core.UWP/Services/StatePersistenceService.cs
+++ b/Wino.Mail.WinUI/Services/StatePersistenceService.cs
@@ -1,17 +1,19 @@
-using System;
+using System;
 using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
 
 namespace Wino.Services;
 
 public class StatePersistenceService : ObservableObject, IStatePersistanceService
 {
-    public event EventHandler<string> StatePropertyChanged;
+    public event EventHandler<string?>? StatePropertyChanged;
 
     private const string OpenPaneLengthKey = nameof(OpenPaneLengthKey);
     private const string MailListPaneLengthKey = nameof(MailListPaneLengthKey);
+    private const string AppModeTitleKey = nameof(AppModeTitle);
 
     private readonly IConfigurationService _configurationService;
 
@@ -21,28 +23,44 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
 
         _openPaneLength = _configurationService.Get(OpenPaneLengthKey, 320d);
         _mailListPaneLength = _configurationService.Get(MailListPaneLengthKey, 420d);
-        _calendarDisplayType = _configurationService.Get(nameof(CalendarDisplayType), CalendarDisplayType.Week);
+        _appModeTitle = _configurationService.Get(AppModeTitleKey, "Wino Mail");
+        _calendarDisplayType = EnsureValidCalendarDisplayType(_configurationService.Get(nameof(CalendarDisplayType), CalendarDisplayType.Week));
         _dayDisplayCount = _configurationService.Get(nameof(DayDisplayCount), 1);
 
         PropertyChanged += ServicePropertyChanged;
     }
 
-    private void ServicePropertyChanged(object sender, PropertyChangedEventArgs e) => StatePropertyChanged?.Invoke(this, e.PropertyName);
+    private void ServicePropertyChanged(object? sender, PropertyChangedEventArgs e) => StatePropertyChanged?.Invoke(this, e?.PropertyName ?? string.Empty);
 
-    public bool IsBackButtonVisible => IsReadingMail && IsReaderNarrowed;
+    private WinoApplicationMode applicationMode = WinoApplicationMode.Mail;
+
+    public WinoApplicationMode ApplicationMode
+    {
+        get => applicationMode;
+        set => SetProperty(ref applicationMode, value);
+    }
+
+    private bool isEventDetailsVisible;
+
+    public bool IsEventDetailsVisible
+    {
+        get => isEventDetailsVisible;
+        set
+        {
+            if (SetProperty(ref isEventDetailsVisible, value))
+            {
+                IsReaderNarrowed = value;
+                IsReadingMail = value;
+            }
+        }
+    }
 
     private bool isReadingMail;
 
     public bool IsReadingMail
     {
         get => isReadingMail;
-        set
-        {
-            if (SetProperty(ref isReadingMail, value))
-            {
-                OnPropertyChanged(nameof(IsBackButtonVisible));
-            }
-        }
+        set => SetProperty(ref isReadingMail, value);
     }
 
     private bool shouldShiftMailRenderingDesign;
@@ -58,16 +76,10 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
     public bool IsReaderNarrowed
     {
         get => isReaderNarrowed;
-        set
-        {
-            if (SetProperty(ref isReaderNarrowed, value))
-            {
-                OnPropertyChanged(nameof(IsBackButtonVisible));
-            }
-        }
+        set => SetProperty(ref isReaderNarrowed, value);
     }
 
-    private string coreWindowTitle;
+    private string coreWindowTitle = string.Empty;
 
     public string CoreWindowTitle
     {
@@ -81,6 +93,21 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
         }
     }
 
+    private string _appModeTitle;
+
+    public string AppModeTitle
+    {
+        get => _appModeTitle;
+        set
+        {
+            if (SetProperty(ref _appModeTitle, value))
+            {
+                _configurationService.Set(AppModeTitleKey, value);
+                UpdateAppWindowTitle();
+            }
+        }
+    }
+
     private double _openPaneLength;
     public double OpenPaneLength
     {
@@ -113,9 +140,11 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
         get => _calendarDisplayType;
         set
         {
-            if (SetProperty(ref _calendarDisplayType, value))
+            var validValue = EnsureValidCalendarDisplayType(value);
+
+            if (SetProperty(ref _calendarDisplayType, validValue))
             {
-                _configurationService.Set(nameof(CalendarDisplayType), value);
+                _configurationService.Set(nameof(CalendarDisplayType), validValue);
             }
         }
     }
@@ -135,9 +164,21 @@ public class StatePersistenceService : ObservableObject, IStatePersistanceServic
 
     private void UpdateAppCoreWindowTitle()
     {
-        var appView = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView();
+        OnPropertyChanged(nameof(CoreWindowTitle));
+    }
 
-        if (appView != null)
-            appView.Title = CoreWindowTitle;
+    private void UpdateAppWindowTitle()
+    {
+        if (WinoApplication.MainWindow != null)
+        {
+            WinoApplication.MainWindow.Title = AppModeTitle;
+        }
+    }
+
+    private static CalendarDisplayType EnsureValidCalendarDisplayType(CalendarDisplayType displayType)
+    {
+        return Enum.IsDefined(typeof(CalendarDisplayType), displayType)
+            ? displayType
+            : CalendarDisplayType.Week;
     }
 }
diff --git a/Wino.Mail.WinUI/Services/StoreManagementService.cs b/Wino.Mail.WinUI/Services/StoreManagementService.cs
new file mode 100644
index 00000000..86f9a2f9
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/StoreManagementService.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Windows.Services.Store;
+using Wino.Core.Domain.Interfaces;
+using WinRT.Interop;
+using WinoAddOnProductType = Wino.Core.Domain.Enums.WinoAddOnProductType;
+using WinoStorePurchaseResult = Wino.Core.Domain.Enums.StorePurchaseResult;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class StoreManagementService : IStoreManagementService
+{
+    private StoreContext CurrentContext { get; }
+
+    private readonly Dictionary<WinoAddOnProductType, string> productIds = new Dictionary<WinoAddOnProductType, string>()
+    {
+        { WinoAddOnProductType.UNLIMITED_ACCOUNTS, "UnlimitedAccounts" },
+        { WinoAddOnProductType.AI_PACK, "AI_PACK" },
+    };
+
+    private readonly Dictionary<WinoAddOnProductType, string> skuIds = new Dictionary<WinoAddOnProductType, string>()
+    {
+        { WinoAddOnProductType.AI_PACK, "9N2FH734RBVS" },
+        { WinoAddOnProductType.UNLIMITED_ACCOUNTS, "9P02MXZ42GSM" }
+    };
+
+    public StoreManagementService()
+    {
+        CurrentContext = StoreContext.GetDefault();
+    }
+
+    public async Task<bool> HasProductAsync(WinoAddOnProductType productType)
+    {
+        if (!productIds.TryGetValue(productType, out var productKey))
+            return false;
+
+        var appLicense = await CurrentContext.GetAppLicenseAsync();
+
+        if (appLicense == null)
+            return false;
+
+        // Access the valid licenses for durable add-ons for this app.
+        foreach (KeyValuePair<string, StoreLicense> item in appLicense.AddOnLicenses)
+        {
+            StoreLicense addOnLicense = item.Value;
+
+            if (addOnLicense.InAppOfferToken == productKey)
+            {
+                return addOnLicense.IsActive;
+            }
+        }
+
+        return false;
+    }
+
+    public async Task<WinoStorePurchaseResult> PurchaseAsync(WinoAddOnProductType productType)
+    {
+        if (!skuIds.TryGetValue(productType, out var productKey))
+            return WinoStorePurchaseResult.NotPurchased;
+
+        if (await HasProductAsync(productType))
+            return WinoStorePurchaseResult.AlreadyPurchased;
+        else
+        {
+            InitializeStoreContextWithWindow();
+            var result = await CurrentContext.RequestPurchaseAsync(productKey);
+
+            switch (result.Status)
+            {
+                case StorePurchaseStatus.Succeeded:
+                    return WinoStorePurchaseResult.Succeeded;
+                case StorePurchaseStatus.AlreadyPurchased:
+                    return WinoStorePurchaseResult.AlreadyPurchased;
+                default:
+                    return WinoStorePurchaseResult.NotPurchased;
+            }
+        }
+    }
+
+    public async Task<string?> GetCustomerCollectionsIdAsync(string serviceTicket, string publisherUserId)
+    {
+        if (string.IsNullOrWhiteSpace(serviceTicket) || string.IsNullOrWhiteSpace(publisherUserId))
+        {
+            return null;
+        }
+
+        InitializeStoreContextWithWindow();
+        var collectionsId = await CurrentContext.GetCustomerCollectionsIdAsync(serviceTicket, publisherUserId);
+        return string.IsNullOrWhiteSpace(collectionsId) ? null : collectionsId;
+    }
+
+    public async Task<string?> GetCustomerPurchaseIdAsync(string serviceTicket, string publisherUserId)
+    {
+        if (string.IsNullOrWhiteSpace(serviceTicket) || string.IsNullOrWhiteSpace(publisherUserId))
+        {
+            return null;
+        }
+
+        InitializeStoreContextWithWindow();
+        var purchaseId = await CurrentContext.GetCustomerPurchaseIdAsync(serviceTicket, publisherUserId);
+        return string.IsNullOrWhiteSpace(purchaseId) ? null : purchaseId;
+    }
+
+    private void InitializeStoreContextWithWindow()
+    {
+        var mainWindow = WinoApplication.MainWindow;
+        if (mainWindow == null)
+        {
+            return;
+        }
+
+        InitializeWithWindow.Initialize(CurrentContext, WindowNative.GetWindowHandle(mainWindow));
+    }
+}
diff --git a/Wino.Core.UWP/Services/StoreRatingService.cs b/Wino.Mail.WinUI/Services/StoreRatingService.cs
similarity index 89%
rename from Wino.Core.UWP/Services/StoreRatingService.cs
rename to Wino.Mail.WinUI/Services/StoreRatingService.cs
index adbd20ef..a29255fe 100644
--- a/Wino.Core.UWP/Services/StoreRatingService.cs
+++ b/Wino.Mail.WinUI/Services/StoreRatingService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Windows.ApplicationModel.Core;
@@ -7,7 +7,7 @@ using Windows.System;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class StoreRatingService : IStoreRatingService
 {
@@ -62,7 +62,7 @@ public class StoreRatingService : IStoreRatingService
                 var isRateWinoApproved = await _dialogService.ShowWinoCustomMessageDialogAsync(Translator.StoreRatingDialog_Title,
                     Translator.StoreRatingDialog_MessageFirstLine,
                     Translator.Buttons_RateWino,
-                    Domain.Enums.WinoCustomMessageDialogIcon.Question,
+                    Wino.Core.Domain.Enums.WinoCustomMessageDialogIcon.Question,
                     Translator.Buttons_No,
                     RatedStorageKey);
 
@@ -99,9 +99,9 @@ public class StoreRatingService : IStoreRatingService
         {
             case StoreRateAndReviewStatus.Succeeded:
                 if (result.WasUpdated)
-                    _dialogService.InfoBarMessage(Translator.Info_ReviewSuccessTitle, Translator.Info_ReviewUpdatedMessage, Domain.Enums.InfoBarMessageType.Success);
+                    _dialogService.InfoBarMessage(Translator.Info_ReviewSuccessTitle, Translator.Info_ReviewUpdatedMessage, Wino.Core.Domain.Enums.InfoBarMessageType.Success);
                 else
-                    _dialogService.InfoBarMessage(Translator.Info_ReviewSuccessTitle, Translator.Info_ReviewNewMessage, Domain.Enums.InfoBarMessageType.Success);
+                    _dialogService.InfoBarMessage(Translator.Info_ReviewSuccessTitle, Translator.Info_ReviewNewMessage, Wino.Core.Domain.Enums.InfoBarMessageType.Success);
 
                 _configurationService.Set(RatedStorageKey, true);
                 break;
@@ -109,10 +109,10 @@ public class StoreRatingService : IStoreRatingService
                 break;
 
             case StoreRateAndReviewStatus.NetworkError:
-                _dialogService.InfoBarMessage(Translator.Info_ReviewNetworkErrorTitle, Translator.Info_ReviewNetworkErrorMessage, Domain.Enums.InfoBarMessageType.Warning);
+                _dialogService.InfoBarMessage(Translator.Info_ReviewNetworkErrorTitle, Translator.Info_ReviewNetworkErrorMessage, Wino.Core.Domain.Enums.InfoBarMessageType.Warning);
                 break;
             default:
-                _dialogService.InfoBarMessage(Translator.Info_ReviewUnknownErrorTitle, string.Format(Translator.Info_ReviewUnknownErrorMessage, result.ExtendedError.Message), Domain.Enums.InfoBarMessageType.Warning);
+                _dialogService.InfoBarMessage(Translator.Info_ReviewUnknownErrorTitle, string.Format(Translator.Info_ReviewUnknownErrorMessage, result.ExtendedError.Message), Wino.Core.Domain.Enums.InfoBarMessageType.Warning);
                 break;
         }
     }
diff --git a/Wino.Mail.WinUI/Services/StoreUpdateService.cs b/Wino.Mail.WinUI/Services/StoreUpdateService.cs
new file mode 100644
index 00000000..561d562d
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/StoreUpdateService.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Services.Store;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class StoreUpdateService : IStoreUpdateService
+{
+    private const string NotificationShownKeyFormat = "StoreUpdateNotificationShown_{0}";
+
+    private readonly IConfigurationService _configurationService;
+    private readonly INotificationBuilder _notificationBuilder;
+    private readonly IPreferencesService _preferencesService;
+    private readonly INativeAppService _nativeAppService;
+    private readonly SemaphoreSlim _refreshSemaphore = new(1, 1);
+    private readonly StoreContext _storeContext = StoreContext.GetDefault();
+
+    public bool HasAvailableUpdate { get; private set; }
+
+    public StoreUpdateService(IConfigurationService configurationService,
+                              INotificationBuilder notificationBuilder,
+                              IPreferencesService preferencesService,
+                              INativeAppService nativeAppService)
+    {
+        _configurationService = configurationService;
+        _notificationBuilder = notificationBuilder;
+        _preferencesService = preferencesService;
+        _nativeAppService = nativeAppService;
+    }
+
+    public async Task<bool> RefreshAvailabilityAsync(bool showNotification = false)
+    {
+        await _refreshSemaphore.WaitAsync().ConfigureAwait(false);
+
+        try
+        {
+            var updates = await _storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
+            HasAvailableUpdate = updates?.Count > 0;
+
+            if (showNotification &&
+                HasAvailableUpdate &&
+                _preferencesService.IsStoreUpdateNotificationsEnabled &&
+                !HasShownNotificationForCurrentVersion())
+            {
+                _notificationBuilder.CreateStoreUpdateNotification();
+                MarkNotificationShownForCurrentVersion();
+            }
+
+            return HasAvailableUpdate;
+        }
+        catch
+        {
+            HasAvailableUpdate = false;
+            return false;
+        }
+        finally
+        {
+            _refreshSemaphore.Release();
+        }
+    }
+
+    public async Task<bool> StartUpdateAsync()
+    {
+        try
+        {
+            var updates = await _storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
+
+            if (updates == null || updates.Count == 0)
+            {
+                HasAvailableUpdate = false;
+                return false;
+            }
+
+            await _storeContext.RequestDownloadAndInstallStorePackageUpdatesAsync(updates);
+            await RefreshAvailabilityAsync(false).ConfigureAwait(false);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    private bool HasShownNotificationForCurrentVersion()
+        => _configurationService.Get(GetNotificationShownKey(), false);
+
+    private void MarkNotificationShownForCurrentVersion()
+        => _configurationService.Set(GetNotificationShownKey(), true);
+
+    private string GetNotificationShownKey()
+        => string.Format(NotificationShownKeyFormat, _nativeAppService.GetFullAppVersion().Replace(".", "_"));
+}
diff --git a/Wino.Core.UWP/Services/ThumbnailService.cs b/Wino.Mail.WinUI/Services/ThumbnailService.cs
similarity index 83%
rename from Wino.Core.UWP/Services/ThumbnailService.cs
rename to Wino.Mail.WinUI/Services/ThumbnailService.cs
index 7598252a..de3a402a 100644
--- a/Wino.Core.UWP/Services/ThumbnailService.cs
+++ b/Wino.Mail.WinUI/Services/ThumbnailService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,13 +7,12 @@ using System.Net.Mail;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Gravatar;
-using Windows.Networking.Connectivity;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
 using Wino.Messaging.UI;
 using Wino.Services;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class ThumbnailService(IPreferencesService preferencesService, IDatabaseService databaseService) : IThumbnailService
 {
@@ -22,7 +21,7 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
     private static readonly HttpClient _httpClient = new();
     private bool _isInitialized = false;
 
-    private ConcurrentDictionary<string, (string graviton, string favicon)> _cache;
+    private ConcurrentDictionary<string, (string? graviton, string? favicon)> _cache = [];
     private readonly ConcurrentDictionary<string, Task> _requests = [];
 
     private static readonly List<string> _excludedFaviconDomains = [
@@ -44,7 +43,7 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
         "rediffmail.com"
         ];
 
-    public async ValueTask<string> GetThumbnailAsync(string email, bool awaitLoad = false)
+    public async ValueTask<string?> GetThumbnailAsync(string email, bool awaitLoad = false)
     {
         if (string.IsNullOrWhiteSpace(email))
             return null;
@@ -56,8 +55,8 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
         {
             var thumbnailsList = await _databaseService.Connection.Table<Thumbnail>().ToListAsync();
 
-            _cache = new ConcurrentDictionary<string, (string graviton, string favicon)>(
-                thumbnailsList.ToDictionary(x => x.Domain, x => (x.Gravatar, x.Favicon)));
+            _cache = new ConcurrentDictionary<string, (string? graviton, string? favicon)>(
+                thumbnailsList.ToDictionary(x => x.Domain, x => ((string?)x.Gravatar, (string?)x.Favicon)));
             _isInitialized = true;
         }
 
@@ -85,17 +84,17 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
         await _databaseService.Connection.DeleteAllAsync<Thumbnail>();
     }
 
-    private async ValueTask<(string gravatar, string favicon)> GetThumbnailInternal(string email, bool awaitLoad)
+    private async ValueTask<(string? gravatar, string? favicon)> GetThumbnailInternal(string email, bool awaitLoad)
     {
         if (_cache.TryGetValue(email, out var cached))
             return cached;
 
         // No network available, skip fetching Gravatar
         // Do not cache it, since network can be available later
-        bool isInternetAvailable = GetIsInternetAvailable();
+        //bool isInternetAvailable = GetIsInternetAvailable();
 
-        if (!isInternetAvailable)
-            return default;
+        //if (!isInternetAvailable)
+        //    return default;
 
         if (!_requests.TryGetValue(email, out var request))
         {
@@ -112,11 +111,11 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
 
         return default;
 
-        static bool GetIsInternetAvailable()
-        {
-            var connection = NetworkInformation.GetInternetConnectionProfile();
-            return connection != null && connection.GetNetworkConnectivityLevel() == NetworkConnectivityLevel.InternetAccess;
-        }
+        //static bool GetIsInternetAvailable()
+        //{
+        //    var connection = NetworkInformation.GetInternetConnectionProfile();
+        //    return connection != null && connection.GetNetworkConnectivityLevel() == NetworkConnectivityLevel.InternetAccess;
+        //}
     }
 
     private async Task RequestNewThumbnail(string email)
@@ -130,13 +129,14 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
             Gravatar = gravatarBase64,
             Favicon = faviconBase64,
             LastUpdated = DateTime.UtcNow
-        });
+        }, typeof(Thumbnail));
+
         _ = _cache.TryAdd(email, (gravatarBase64, faviconBase64));
 
         WeakReferenceMessenger.Default.Send(new ThumbnailAdded(email));
     }
 
-    private static async Task<string> GetGravatarBase64(string email)
+    private static async Task<string?> GetGravatarBase64(string email)
     {
         try
         {
@@ -156,7 +156,7 @@ public class ThumbnailService(IPreferencesService preferencesService, IDatabaseS
         return null;
     }
 
-    private static async Task<string> GetFaviconBase64(string email)
+    private static async Task<string?> GetFaviconBase64(string email)
     {
         try
         {
diff --git a/Wino.Core.UWP/Services/UnderlyingThemeService.cs b/Wino.Mail.WinUI/Services/UnderlyingThemeService.cs
similarity index 92%
rename from Wino.Core.UWP/Services/UnderlyingThemeService.cs
rename to Wino.Mail.WinUI/Services/UnderlyingThemeService.cs
index 264f7709..241359e5 100644
--- a/Wino.Core.UWP/Services/UnderlyingThemeService.cs
+++ b/Wino.Mail.WinUI/Services/UnderlyingThemeService.cs
@@ -1,8 +1,8 @@
-using Windows.UI.ViewManagement;
+using Windows.UI.ViewManagement;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Core.UWP.Services;
+namespace Wino.Mail.WinUI.Services;
 
 public class UnderlyingThemeService : IUnderlyingThemeService
 {
diff --git a/Wino.Mail.WinUI/Services/WebView2RuntimeValidatorService.cs b/Wino.Mail.WinUI/Services/WebView2RuntimeValidatorService.cs
new file mode 100644
index 00000000..5b8fb458
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/WebView2RuntimeValidatorService.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Web.WebView2.Core;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class WebView2RuntimeValidatorService : IWebView2RuntimeValidatorService
+{
+    public Task<bool> IsRuntimeAvailableAsync()
+    {
+        try
+        {
+            var version = CoreWebView2Environment.GetAvailableBrowserVersionString();
+            var hasRuntime = !string.IsNullOrWhiteSpace(version);
+
+            return Task.FromResult(hasRuntime);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "WebView2 runtime validation failed.");
+            return Task.FromResult(false);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/WinoAccountAiErrorTranslator.cs b/Wino.Mail.WinUI/Services/WinoAccountAiErrorTranslator.cs
new file mode 100644
index 00000000..56ea918f
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/WinoAccountAiErrorTranslator.cs
@@ -0,0 +1,57 @@
+using Wino.Core.Domain;
+using Wino.Mail.Api.Contracts.Common;
+
+namespace Wino.Mail.WinUI.Services;
+
+public static class WinoAccountAiErrorTranslator
+{
+    public static string Translate(string? errorCode)
+    {
+        if (string.IsNullOrWhiteSpace(errorCode))
+        {
+            return Translator.GeneralTitle_Error;
+        }
+
+        return errorCode switch
+        {
+            ApiErrorCodes.AiPackRequired => Translator.WinoAccount_Error_AiPackRequired,
+            ApiErrorCodes.AiQuotaExceeded => Translator.WinoAccount_Error_AiQuotaExceeded,
+            ApiErrorCodes.AiHtmlEmpty => Translator.WinoAccount_Error_AiHtmlEmpty,
+            ApiErrorCodes.AiHtmlTooLarge => Translator.WinoAccount_Error_AiHtmlTooLarge,
+            ApiErrorCodes.AiUnsupportedLanguage => Translator.WinoAccount_Error_AiUnsupportedLanguage,
+            ApiErrorCodes.Forbidden => Translator.WinoAccount_Error_Forbidden,
+            ApiErrorCodes.ValidationFailed => Translator.WinoAccount_Error_ValidationFailed,
+            _ => errorCode
+        };
+    }
+
+    public static string Format(string? errorCode, string? errorMessage)
+    {
+        var translatedCode = Translate(errorCode);
+        var hasCode = !string.IsNullOrWhiteSpace(errorCode);
+        var hasMessage = !string.IsNullOrWhiteSpace(errorMessage);
+
+        if (!hasCode && !hasMessage)
+        {
+            return Translator.GeneralTitle_Error;
+        }
+
+        var formattedCode = translatedCode;
+        if (hasCode && !string.Equals(translatedCode, errorCode, System.StringComparison.Ordinal))
+        {
+            formattedCode = $"{translatedCode} ({errorCode})";
+        }
+
+        if (!hasMessage || string.Equals(errorMessage, translatedCode, System.StringComparison.OrdinalIgnoreCase) || string.Equals(errorMessage, errorCode, System.StringComparison.OrdinalIgnoreCase))
+        {
+            return formattedCode;
+        }
+
+        if (string.IsNullOrWhiteSpace(formattedCode))
+        {
+            return errorMessage!;
+        }
+
+        return $"{formattedCode}{System.Environment.NewLine}{errorMessage}";
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/WinoAccountAuthErrorTranslator.cs b/Wino.Mail.WinUI/Services/WinoAccountAuthErrorTranslator.cs
new file mode 100644
index 00000000..46a5ad3e
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/WinoAccountAuthErrorTranslator.cs
@@ -0,0 +1,67 @@
+using Wino.Core.Domain;
+using Wino.Mail.Api.Contracts.Common;
+
+namespace Wino.Mail.WinUI.Services;
+
+public static class WinoAccountAuthErrorTranslator
+{
+    public static string Translate(string? errorCode)
+    {
+        if (string.IsNullOrWhiteSpace(errorCode))
+        {
+            return Translator.GeneralTitle_Error;
+        }
+
+        return errorCode switch
+        {
+            ApiErrorCodes.InvalidCredentials => Translator.WinoAccount_Error_InvalidCredentials,
+            ApiErrorCodes.AccountLocked => Translator.WinoAccount_Error_AccountLocked,
+            ApiErrorCodes.AccountBanned => Translator.WinoAccount_Error_AccountBanned,
+            ApiErrorCodes.AccountSuspended => Translator.WinoAccount_Error_AccountSuspended,
+            ApiErrorCodes.EmailNotConfirmed => Translator.WinoAccount_Error_EmailNotConfirmed,
+            ApiErrorCodes.EmailConfirmationRequired => Translator.WinoAccount_Error_EmailConfirmationRequired,
+            ApiErrorCodes.EmailConfirmationResendNotAvailable => Translator.WinoAccount_Error_EmailConfirmationResendNotAvailable,
+            ApiErrorCodes.EmailConfirmationResendInvalid => Translator.WinoAccount_Error_EmailConfirmationResendInvalid,
+            ApiErrorCodes.EmailNotRegistered => Translator.WinoAccount_Error_EmailNotRegistered,
+            ApiErrorCodes.RefreshTokenInvalid => Translator.WinoAccount_Error_RefreshTokenInvalid,
+            ApiErrorCodes.EmailAlreadyRegistered => Translator.WinoAccount_Error_EmailAlreadyRegistered,
+            ApiErrorCodes.ExternalLoginEmailRequired => Translator.WinoAccount_Error_ExternalLoginEmailRequired,
+            ApiErrorCodes.ExternalLoginInvalid => Translator.WinoAccount_Error_ExternalLoginInvalid,
+            ApiErrorCodes.ExternalAuthStateInvalid => Translator.WinoAccount_Error_ExternalAuthStateInvalid,
+            ApiErrorCodes.ExternalAuthCodeInvalid => Translator.WinoAccount_Error_ExternalAuthCodeInvalid,
+            ApiErrorCodes.Forbidden => Translator.WinoAccount_Error_Forbidden,
+            ApiErrorCodes.ValidationFailed => Translator.WinoAccount_Error_ValidationFailed,
+            _ => errorCode
+        };
+    }
+
+    public static string Format(string? errorCode, string? errorMessage)
+    {
+        var translatedCode = Translate(errorCode);
+        var hasCode = !string.IsNullOrWhiteSpace(errorCode);
+        var hasMessage = !string.IsNullOrWhiteSpace(errorMessage);
+
+        if (!hasCode && !hasMessage)
+        {
+            return Translator.GeneralTitle_Error;
+        }
+
+        var formattedCode = translatedCode;
+        if (hasCode && !string.Equals(translatedCode, errorCode, System.StringComparison.Ordinal))
+        {
+            formattedCode = $"{translatedCode} ({errorCode})";
+        }
+
+        if (!hasMessage || string.Equals(errorMessage, translatedCode, System.StringComparison.OrdinalIgnoreCase) || string.Equals(errorMessage, errorCode, System.StringComparison.OrdinalIgnoreCase))
+        {
+            return formattedCode;
+        }
+
+        if (string.IsNullOrWhiteSpace(formattedCode))
+        {
+            return errorMessage!;
+        }
+
+        return $"{formattedCode}{System.Environment.NewLine}{errorMessage}";
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/WinoAccountEmailConfirmationHelper.cs b/Wino.Mail.WinUI/Services/WinoAccountEmailConfirmationHelper.cs
new file mode 100644
index 00000000..258eedbf
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/WinoAccountEmailConfirmationHelper.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Text.Json;
+using Wino.Mail.Api.Contracts.Auth;
+
+namespace Wino.Mail.WinUI.Services;
+
+internal static class WinoAccountEmailConfirmationHelper
+{
+    public static bool IsEmailConfirmationRequiredError(string? errorCode)
+        => string.Equals(errorCode, Wino.Mail.Api.Contracts.Common.ApiErrorCodes.EmailNotConfirmed, StringComparison.Ordinal) ||
+           string.Equals(errorCode, Wino.Mail.Api.Contracts.Common.ApiErrorCodes.EmailConfirmationRequired, StringComparison.Ordinal);
+
+    public static EmailConfirmationRequiredDetailsDto? Parse(JsonElement? details)
+    {
+        if (details is not JsonElement element || element.ValueKind is JsonValueKind.Undefined or JsonValueKind.Null)
+        {
+            return null;
+        }
+
+        try
+        {
+            if (!TryGetString(element, "resendConfirmationEndpoint", out var endpoint) ||
+                !TryGetString(element, "resendConfirmationTicket", out var ticket) ||
+                !TryGetDateTimeOffset(element, "resendAvailableAtUtc", out var resendAvailableAtUtc))
+            {
+                return null;
+            }
+
+            DateTimeOffset? latestSentUtc = null;
+            if (element.TryGetProperty("latestConfirmationEmailSentUtc", out var latestSentElement) &&
+                latestSentElement.ValueKind == JsonValueKind.String &&
+                DateTimeOffset.TryParse(latestSentElement.GetString(), out var latestParsed))
+            {
+                latestSentUtc = latestParsed;
+            }
+
+            return new EmailConfirmationRequiredDetailsDto(endpoint, ticket, latestSentUtc, resendAvailableAtUtc);
+        }
+        catch (FormatException)
+        {
+            return null;
+        }
+    }
+
+    private static bool TryGetString(JsonElement element, string propertyName, out string value)
+    {
+        value = string.Empty;
+
+        if (!element.TryGetProperty(propertyName, out var property) || property.ValueKind != JsonValueKind.String)
+        {
+            return false;
+        }
+
+        value = property.GetString() ?? string.Empty;
+        return !string.IsNullOrWhiteSpace(value);
+    }
+
+    private static bool TryGetDateTimeOffset(JsonElement element, string propertyName, out DateTimeOffset value)
+    {
+        value = default;
+
+        if (!element.TryGetProperty(propertyName, out var property) || property.ValueKind != JsonValueKind.String)
+        {
+            return false;
+        }
+
+        return DateTimeOffset.TryParse(property.GetString(), out value);
+    }
+}
diff --git a/Wino.Mail.WinUI/Services/WinoWindowManager.cs b/Wino.Mail.WinUI/Services/WinoWindowManager.cs
new file mode 100644
index 00000000..6d8865ed
--- /dev/null
+++ b/Wino.Mail.WinUI/Services/WinoWindowManager.cs
@@ -0,0 +1,235 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using WinUIEx;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+
+namespace Wino.Mail.WinUI.Services;
+
+public class WinoWindowManager : IWinoWindowManager
+{
+    public event EventHandler<WindowEx?>? ActiveWindowChanged;
+    public event EventHandler<WindowEx>? WindowRemoved;
+
+    private readonly object _syncLock = new();
+    private readonly Dictionary<(WinoWindowKind Kind, string Name), WindowEx> _windows = [];
+    private readonly Dictionary<WindowEx, (WinoWindowKind Kind, string Name)> _windowKeys = [];
+    private readonly Dictionary<(WinoWindowKind Kind, string Name), Frame> _primaryNavigationFrames = [];
+
+    public WindowEx? ActiveWindow { get; private set; }
+
+    public WindowEx CreateWindow(WinoWindowKind kind, Func<WindowEx> factory, string? name = null)
+    {
+        var key = CreateKey(kind, name);
+
+        lock (_syncLock)
+        {
+            if (_windows.TryGetValue(key, out var existingWindow))
+            {
+                ActiveWindow = existingWindow;
+                ActiveWindowChanged?.Invoke(this, existingWindow);
+                return existingWindow;
+            }
+        }
+
+        var newWindow = factory();
+
+        lock (_syncLock)
+        {
+            if (_windows.TryGetValue(key, out var existingWindow))
+            {
+                ActiveWindow = existingWindow;
+                ActiveWindowChanged?.Invoke(this, existingWindow);
+                return existingWindow;
+            }
+
+            TrackWindow(key, newWindow);
+            ActiveWindow = newWindow;
+            ActiveWindowChanged?.Invoke(this, newWindow);
+            return newWindow;
+        }
+    }
+
+    public WindowEx? GetWindow(WinoWindowKind kind, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _windows.TryGetValue(CreateKey(kind, name), out var window);
+            return window;
+        }
+    }
+
+    public WindowEx? GetWindow(string name)
+    {
+        var normalizedName = NormalizeName(name);
+
+        lock (_syncLock)
+        {
+            return _windows
+                .Where(x => x.Key.Name.Equals(normalizedName, StringComparison.OrdinalIgnoreCase))
+                .Select(x => x.Value)
+                .FirstOrDefault();
+        }
+    }
+
+    public void ActivateWindow(WindowEx window)
+    {
+        window.Show();
+        window.BringToFront();
+        window.Activate();
+
+        lock (_syncLock)
+        {
+            ActiveWindow = window;
+        }
+
+        ActiveWindowChanged?.Invoke(this, window);
+    }
+
+    public bool ActivateWindow(WinoWindowKind kind, string? name = null)
+    {
+        var window = GetWindow(kind, name);
+        if (window == null)
+            return false;
+
+        ActivateWindow(window);
+        return true;
+    }
+
+    public void HideWindow(WindowEx window)
+    {
+        window.Hide();
+
+        lock (_syncLock)
+        {
+            if (ReferenceEquals(ActiveWindow, window))
+            {
+                ActiveWindow = null;
+                ActiveWindowChanged?.Invoke(this, null);
+            }
+        }
+    }
+
+    public bool HideWindow(WinoWindowKind kind, string? name = null)
+    {
+        var window = GetWindow(kind, name);
+        if (window == null)
+            return false;
+
+        HideWindow(window);
+        return true;
+    }
+
+    public void SetPrimaryNavigationFrame(WinoWindowKind kind, Frame frame, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _primaryNavigationFrames[CreateKey(kind, name)] = frame;
+        }
+    }
+
+    public Frame? GetPrimaryNavigationFrame(WinoWindowKind kind, string? name = null)
+    {
+        lock (_syncLock)
+        {
+            _primaryNavigationFrames.TryGetValue(CreateKey(kind, name), out var frame);
+            return frame;
+        }
+    }
+
+    private void TrackWindow((WinoWindowKind Kind, string Name) key, WindowEx window)
+    {
+        _windows[key] = window;
+        _windowKeys[window] = key;
+        window.Activated += WindowActivated;
+        window.Closed += WindowClosed;
+    }
+
+    private void WindowActivated(object sender, WindowActivatedEventArgs args)
+    {
+        if (sender is not WindowEx window)
+            return;
+
+        if (args.WindowActivationState == WindowActivationState.Deactivated)
+            return;
+
+        lock (_syncLock)
+        {
+            if (_windowKeys.ContainsKey(window))
+            {
+                ActiveWindow = window;
+                ActiveWindowChanged?.Invoke(this, window);
+            }
+        }
+    }
+
+    private void WindowClosed(object sender, WindowEventArgs args)
+    {
+        if (sender is not WindowEx window)
+            return;
+
+        lock (_syncLock)
+        {
+            if (!_windowKeys.TryGetValue(window, out var key))
+                return;
+
+            window.Activated -= WindowActivated;
+            window.Closed -= WindowClosed;
+
+            _windowKeys.Remove(window);
+            _windows.Remove(key);
+            _primaryNavigationFrames.Remove(key);
+            WindowRemoved?.Invoke(this, window);
+
+            if (ReferenceEquals(ActiveWindow, window))
+            {
+                ActiveWindow = null;
+                ActiveWindowChanged?.Invoke(this, null);
+            }
+        }
+    }
+
+    public void CloseAllWindows()
+    {
+        List<WindowEx> windows;
+        lock (_syncLock)
+        {
+            windows = _windows.Values.Distinct().ToList();
+        }
+
+        foreach (var window in windows)
+        {
+            try
+            {
+                window.Activated -= WindowActivated;
+                window.Closed -= WindowClosed;
+                window.Close();
+            }
+            catch
+            {
+                // Best effort shutdown for all tracked windows.
+            }
+        }
+
+        lock (_syncLock)
+        {
+            _windowKeys.Clear();
+            _windows.Clear();
+            _primaryNavigationFrames.Clear();
+            ActiveWindow = null;
+        }
+
+        ActiveWindowChanged?.Invoke(this, null);
+    }
+
+    private static (WinoWindowKind Kind, string Name) CreateKey(WinoWindowKind kind, string? name)
+    {
+        var resolvedName = NormalizeName(name ?? kind.ToString());
+        return (kind, string.IsNullOrWhiteSpace(resolvedName) ? kind.ToString() : resolvedName);
+    }
+
+    private static string NormalizeName(string name) => name.Trim();
+}
diff --git a/Wino.Mail.WinUI/ShellWindow.xaml b/Wino.Mail.WinUI/ShellWindow.xaml
new file mode 100644
index 00000000..c35d9eda
--- /dev/null
+++ b/Wino.Mail.WinUI/ShellWindow.xaml
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<winuiex:WindowEx
+    x:Class="Wino.Mail.WinUI.ShellWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:local="using:Wino.Mail.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:searchModels="using:Wino.Mail.WinUI.Models"
+    xmlns:syncModels="using:Wino.Core.Domain.Models.Synchronization"
+    xmlns:winuiex="using:WinUIEx"
+    Title="ShellWindow"
+    mc:Ignorable="d">
+
+    <!--  SystemBackdrop will be set by NewThemeService  -->
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.RowSpan="2" Background="{ThemeResource WinoApplicationBackgroundColor}" />
+        <TitleBar
+            x:Name="ShellTitleBar"
+            Title="{x:Bind StatePersistanceService.AppModeTitle, Mode=OneWay}"
+            Margin="-2"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            BackRequested="BackButtonClicked"
+            Background="Transparent"
+            IsPaneToggleButtonVisible="True"
+            PaneToggleRequested="PaneButtonClicked"
+            Subtitle="{x:Bind StatePersistanceService.CoreWindowTitle, Mode=OneWay}">
+            <!--<TitleBar.Resources>
+                <HorizontalAlignment x:Key="TitleBarContentHorizontalAlignment">Stretch</HorizontalAlignment>
+                <VerticalAlignment x:Key="TitleBarContentVerticalAlignment">Stretch</VerticalAlignment>
+            </TitleBar.Resources>-->
+            <TitleBar.Content>
+                <Grid
+                    MinWidth="400"
+                    MaxWidth="520"
+                    Margin="12,0,16,0">
+                    <AutoSuggestBox
+                        x:Name="TitleBarSearchBox"
+                        VerticalAlignment="Center"
+                        BorderBrush="Transparent"
+                        PlaceholderText="{x:Bind domain:Translator.SearchBarPlaceholder}"
+                        QueryIcon="Find"
+                        QuerySubmitted="TitleBarSearchQuerySubmitted"
+                        SuggestionChosen="TitleBarSearchSuggestionChosen"
+                        TextChanged="TitleBarSearchTextChanged">
+                        <AutoSuggestBox.ItemTemplate>
+                            <DataTemplate x:DataType="searchModels:TitleBarSearchSuggestion">
+                                <StackPanel Padding="0,4">
+                                    <TextBlock Text="{x:Bind Title}" TextTrimming="CharacterEllipsis" />
+                                    <TextBlock
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{x:Bind Subtitle}"
+                                        TextTrimming="CharacterEllipsis" />
+                                </StackPanel>
+                            </DataTemplate>
+                        </AutoSuggestBox.ItemTemplate>
+                    </AutoSuggestBox>
+                </Grid>
+            </TitleBar.Content>
+            <TitleBar.RightHeader>
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <Button
+                        x:Name="SyncStatusButton"
+                        Padding="8,4"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Visibility="Collapsed">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <ProgressRing
+                                Width="16"
+                                Height="16"
+                                IsActive="True" />
+                            <TextBlock
+                                x:Name="SyncStatusText"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource CaptionTextBlockStyle}" />
+                        </StackPanel>
+                        <Button.Flyout>
+                            <Flyout x:Name="SyncStatusFlyout" Placement="Bottom">
+                                <ItemsRepeater x:Name="SyncActionsRepeater" ItemsSource="{x:Bind SyncActionItems}">
+                                    <ItemsRepeater.ItemTemplate>
+                                        <DataTemplate x:DataType="syncModels:SynchronizationActionItem">
+                                            <Grid
+                                                MinWidth="280"
+                                                MaxWidth="400"
+                                                Padding="0,6"
+                                                ColumnSpacing="8">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+                                                <ProgressRing
+                                                    Width="16"
+                                                    Height="16"
+                                                    IsActive="True" />
+                                                <StackPanel Grid.Column="1">
+                                                    <TextBlock
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                                        Text="{x:Bind AccountName}" />
+                                                    <TextBlock Text="{x:Bind Description}" TextWrapping="Wrap" />
+                                                </StackPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ItemsRepeater.ItemTemplate>
+                                </ItemsRepeater>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+                    <Button
+                        x:Name="WinoAccountButton"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(PreferencesService.IsWinoAccountButtonHidden), Mode=OneWay}">
+                        <Button.Flyout>
+                            <Flyout x:Name="WinoAccountFlyout" Placement="Bottom">
+                                <Grid MinWidth="320" MaxWidth="360">
+                                    <!--  Signed Out View  -->
+                                    <StackPanel x:Name="WinoAccountSignedOutView" Spacing="16">
+
+                                        <!--  Hero header with gradient and icon  -->
+                                        <Border
+                                            Margin="-16,-16,-16,0"
+                                            Padding="20"
+                                            CornerRadius="8,8,0,0">
+                                            <Border.Background>
+                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                    <GradientStop Offset="0" Color="#1A6EE7B7" />
+                                                    <GradientStop Offset="0.5" Color="#2038BDF8" />
+                                                    <GradientStop Offset="1" Color="#1A818CF8" />
+                                                </LinearGradientBrush>
+                                            </Border.Background>
+                                            <StackPanel Spacing="4">
+                                                <TextBlock
+                                                    Margin="0,8,0,0"
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{x:Bind domain:Translator.WinoAccount_Titlebar_SignedOutTitle}" />
+                                                <TextBlock
+                                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{x:Bind domain:Translator.WinoAccount_Titlebar_SignedOutDescription}"
+                                                    TextWrapping="WrapWholeWords" />
+                                            </StackPanel>
+                                        </Border>
+
+                                        <!--  Benefit cards  -->
+                                        <StackPanel Spacing="8">
+                                            <Border
+                                                Padding="12"
+                                                Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                                                CornerRadius="8">
+                                                <Grid ColumnSpacing="12">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <Border
+                                                        Width="32"
+                                                        Height="32"
+                                                        Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                                        CornerRadius="8"
+                                                        Opacity="0.15" />
+                                                    <FontIcon
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14"
+                                                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                                                        Glyph="&#xE8D7;" />
+                                                    <StackPanel Grid.Column="1" Spacing="2">
+                                                        <TextBlock
+                                                            FontWeight="SemiBold"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                                            Text="{x:Bind domain:Translator.WinoAccount_Titlebar_SyncBenefitTitle}" />
+                                                        <TextBlock
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                                            Text="{x:Bind domain:Translator.WinoAccount_Titlebar_SyncBenefitDescription}"
+                                                            TextWrapping="WrapWholeWords" />
+                                                    </StackPanel>
+                                                </Grid>
+                                            </Border>
+                                            <Border
+                                                Padding="12"
+                                                Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                                                CornerRadius="8">
+                                                <Grid ColumnSpacing="12">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <Border
+                                                        Width="32"
+                                                        Height="32"
+                                                        Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                                        CornerRadius="8"
+                                                        Opacity="0.15" />
+                                                    <FontIcon
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14"
+                                                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                                                        Glyph="&#xE946;" />
+                                                    <StackPanel Grid.Column="1" Spacing="2">
+                                                        <TextBlock
+                                                            FontWeight="SemiBold"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                                            Text="{x:Bind domain:Translator.WinoAccount_Titlebar_AddonsBenefitTitle}" />
+                                                        <TextBlock
+                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                                            Text="{x:Bind domain:Translator.WinoAccount_Titlebar_AddonsBenefitDescription}"
+                                                            TextWrapping="WrapWholeWords" />
+                                                    </StackPanel>
+                                                </Grid>
+                                            </Border>
+                                        </StackPanel>
+
+                                        <!--  Action buttons  -->
+                                        <Grid ColumnSpacing="8">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Button
+                                                HorizontalAlignment="Stretch"
+                                                Click="LoginWinoAccountClicked"
+                                                Content="{x:Bind domain:Translator.WinoAccount_LoginButton_Title}"
+                                                Style="{ThemeResource AccentButtonStyle}" />
+                                            <Button
+                                                Grid.Column="1"
+                                                HorizontalAlignment="Stretch"
+                                                Click="RegisterWinoAccountClicked"
+                                                Content="{x:Bind domain:Translator.WinoAccount_RegisterButton_Title}" />
+                                        </Grid>
+                                    </StackPanel>
+
+                                    <!--  Signed In View  -->
+                                    <StackPanel
+                                        x:Name="WinoAccountSignedInView"
+                                        Spacing="16"
+                                        Visibility="Collapsed">
+
+                                        <!--  Profile header  -->
+                                        <Border
+                                            Margin="-16,-16,-16,0"
+                                            Padding="20"
+                                            CornerRadius="8,8,0,0">
+                                            <Border.Background>
+                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                    <GradientStop Offset="0" Color="#1A6EE7B7" />
+                                                    <GradientStop Offset="0.5" Color="#2038BDF8" />
+                                                    <GradientStop Offset="1" Color="#1A818CF8" />
+                                                </LinearGradientBrush>
+                                            </Border.Background>
+                                            <StackPanel Orientation="Horizontal" Spacing="14">
+                                                <PersonPicture
+                                                    x:Name="WinoAccountFlyoutPicture"
+                                                    Width="48"
+                                                    Height="48"
+                                                    Initials="W" />
+                                                <StackPanel VerticalAlignment="Center" Spacing="2">
+                                                    <TextBlock
+                                                        x:Name="WinoAccountFlyoutEmailText"
+                                                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                                                        TextWrapping="WrapWholeWords" />
+                                                    <TextBlock
+                                                        x:Name="WinoAccountFlyoutStatusText"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                                        TextWrapping="WrapWholeWords" />
+                                                </StackPanel>
+                                            </StackPanel>
+                                        </Border>
+
+                                        <!--  Sign out button  -->
+                                        <Button
+                                            HorizontalAlignment="Stretch"
+                                            Click="SignOutWinoAccountClicked"
+                                            Content="{x:Bind domain:Translator.WinoAccount_SignOutButton_Action}" />
+                                    </StackPanel>
+                                </Grid>
+                            </Flyout>
+                        </Button.Flyout>
+                        <Grid>
+                            <PersonPicture
+                                x:Name="WinoAccountButtonPicture"
+                                Width="30"
+                                Height="30"
+                                Initials="W"
+                                Visibility="Collapsed" />
+                            <Image
+                                x:Name="WinoAccountSignedOutIcon"
+                                Width="25"
+                                Height="30"
+                                Source="/Assets/AppEntries/MailAssets/Square150x150Logo.png" />
+                        </Grid>
+                    </Button>
+                </StackPanel>
+            </TitleBar.RightHeader>
+        </TitleBar>
+
+        <Frame
+            x:Name="MainShellFrame"
+            Grid.Row="1"
+            CacheSize="0"
+            Navigated="MainFrameNavigated" />
+
+        <coreControls:WinoInfoBar
+            x:Name="ShellInfoBar"
+            Grid.RowSpan="2"
+            MaxWidth="700"
+            Margin="0,60,25,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            IsClosable="False"
+            IsOpen="False" />
+    </Grid>
+</winuiex:WindowEx>
diff --git a/Wino.Mail.WinUI/ShellWindow.xaml.cs b/Wino.Mail.WinUI/ShellWindow.xaml.cs
new file mode 100644
index 00000000..ac1a756a
--- /dev/null
+++ b/Wino.Mail.WinUI/ShellWindow.xaml.cs
@@ -0,0 +1,537 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Windows.UI;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Extensions;
+using Wino.Mail.WinUI.Activation;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Mail.WinUI.Helpers;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Mail.WinUI.Views;
+using Wino.Messaging.Client.Shell;
+using Wino.Messaging.UI;
+using WinUIEx;
+
+namespace Wino.Mail.WinUI;
+
+public sealed partial class ShellWindow : WindowEx, IWinoShellWindow,
+    IRecipient<ApplicationThemeChanged>,
+    IRecipient<InfoBarMessageRequested>,
+    IRecipient<TitleBarShellContentUpdated>,
+    IRecipient<SynchronizationActionsAdded>,
+    IRecipient<SynchronizationActionsCompleted>,
+    IRecipient<WinoAccountProfileUpdatedMessage>,
+    IRecipient<WinoAccountProfileDeletedMessage>
+{
+    private bool _allowClose;
+    public IStatePersistanceService StatePersistanceService { get; } = WinoApplication.Current.Services.GetService<IStatePersistanceService>() ?? throw new Exception("StatePersistanceService not registered in DI container.");
+    public IPreferencesService PreferencesService { get; } = WinoApplication.Current.Services.GetService<IPreferencesService>() ?? throw new Exception("PreferencesService not registered in DI container.");
+    public INavigationService NavigationService { get; } = WinoApplication.Current.Services.GetService<INavigationService>() ?? throw new Exception("NavigationService not registered in DI container.");
+    private IMailDialogService MailDialogService { get; } = WinoApplication.Current.Services.GetRequiredService<IMailDialogService>();
+    private IWinoAccountProfileService WinoAccountProfileService { get; } = WinoApplication.Current.Services.GetRequiredService<IWinoAccountProfileService>();
+
+    public ObservableCollection<SynchronizationActionItem> SyncActionItems { get; } = new();
+    private bool _calendarReminderServerStartAttempted;
+    private ITitleBarSearchHost? _activeTitleBarSearchHost;
+    private bool _isBackButtonVisibilityReady;
+    private bool _isSynchronizingTitleBarSearch;
+    private bool _isPreparedForClose;
+
+    public ShellWindow()
+    {
+        RegisterRecipients();
+
+        InitializeComponent();
+        StatePersistanceService.StatePropertyChanged += StatePersistenceServiceChanged;
+
+        MinWidth = 420;
+        MinHeight = 420;
+        ConfigureTitleBar();
+        ApplyTitleBarSearchHost();
+
+        // Handle window closing event to minimize to tray instead of closing
+        Closed += OnWindowClosed;
+
+        // Use the AppWindow.Closing event to handle the close request
+        AppWindow.Closing += OnAppWindowClosing;
+
+        // Register global mouse button listener for back button
+        RegisterMouseBackButtonListener();
+
+        this.SetIcon("Assets/Wino_Icon.ico");
+        Title = StatePersistanceService.AppModeTitle;
+    }
+
+    private void ConfigureTitleBar()
+    {
+        AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+
+        // Apply initial theme colors
+        var themeService = WinoApplication.Current.Services.GetService<INewThemeService>();
+        if (themeService != null)
+        {
+            var underlyingThemeService = WinoApplication.Current.Services.GetService<IUnderlyingThemeService>();
+            if (underlyingThemeService != null)
+            {
+                UpdateTitleBarColors(underlyingThemeService.IsUnderlyingThemeDark());
+            }
+        }
+    }
+
+    private void RegisterMouseBackButtonListener()
+    {
+        // Subscribe to pointer pressed events on the root content
+        if (Content is UIElement rootElement)
+        {
+            rootElement.AddHandler(UIElement.PointerPressedEvent, new Microsoft.UI.Xaml.Input.PointerEventHandler(OnPointerPressed), true);
+        }
+    }
+
+    private void OnPointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
+    {
+        // Check if it's the back button (XButton1)
+        var pointerPoint = e.GetCurrentPoint(null);
+        var properties = pointerPoint.Properties;
+
+        // XButton1 is the back button on most mice
+        if (properties.IsXButton1Pressed)
+        {
+            // Call GoBack on NavigationService
+            NavigationService.GoBack();
+            e.Handled = true;
+        }
+    }
+
+    public void HandleAppActivation(string? launchArguments, string? tileId = null, string? appId = null)
+    {
+        var targetMode = AppModeActivationResolver.Resolve(launchArguments, tileId, appId, PreferencesService.DefaultApplicationMode);
+        NavigationService.ChangeApplicationMode(targetMode);
+    }
+
+    public Microsoft.UI.Xaml.Controls.TitleBar GetTitleBar() => ShellTitleBar;
+
+    public Frame GetMainFrame() => MainShellFrame;
+
+    public FrameworkElement GetRootContent() => Content as Grid ?? throw new Exception("RootContent is not a Grid or empty.");
+
+    private void BackButtonClicked(Microsoft.UI.Xaml.Controls.TitleBar sender, object args)
+    {
+        NavigationService.GoBack();
+    }
+
+    private void MainFrameNavigated(object sender, Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
+    {
+        if (!_calendarReminderServerStartAttempted)
+        {
+            _calendarReminderServerStartAttempted = true;
+            _ = StartCalendarReminderServerAsync();
+        }
+
+        _isBackButtonVisibilityReady = true;
+        ApplyTitleBarSearchHost();
+        RefreshBackButtonVisibility();
+    }
+
+    private async Task StartCalendarReminderServerAsync()
+    {
+        try
+        {
+            var reminderServer = WinoApplication.Current.Services.GetService<ICalendarReminderServer>();
+            if (reminderServer != null)
+            {
+                await reminderServer.StartAsync();
+            }
+        }
+        catch (Exception ex)
+        {
+            _calendarReminderServerStartAttempted = false;
+            Serilog.Log.Error(ex, "Failed to start calendar reminder server.");
+        }
+    }
+
+    private void PaneButtonClicked(Microsoft.UI.Xaml.Controls.TitleBar sender, object args)
+    {
+        PreferencesService.IsNavigationPaneOpened = !PreferencesService.IsNavigationPaneOpened;
+    }
+
+    public void Receive(TitleBarShellContentUpdated message)
+    {
+        ApplyTitleBarSearchHost();
+        RefreshBackButtonVisibility();
+    }
+
+    public void Receive(ApplicationThemeChanged message)
+    {
+        UpdateTitleBarColors(message.IsUnderlyingThemeDark);
+    }
+
+    public void Receive(InfoBarMessageRequested message)
+    {
+        ShowInfoBarMessage(message);
+    }
+
+    public void Receive(SynchronizationActionsAdded message)
+    {
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            foreach (var action in message.Actions)
+                SyncActionItems.Add(action);
+
+            UpdateSyncStatusVisibility();
+        });
+    }
+
+    public void Receive(SynchronizationActionsCompleted message)
+    {
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            var toRemove = SyncActionItems.Where(a => a.AccountId == message.AccountId).ToList();
+
+            foreach (var item in toRemove)
+                SyncActionItems.Remove(item);
+
+            UpdateSyncStatusVisibility();
+        });
+    }
+
+    public void Receive(WinoAccountProfileUpdatedMessage message)
+    {
+        DispatcherQueue.TryEnqueue(() => UpdateWinoAccountState(message.Account));
+    }
+
+    public void Receive(WinoAccountProfileDeletedMessage message)
+    {
+        DispatcherQueue.TryEnqueue(() => UpdateWinoAccountState(null));
+    }
+
+    private void UpdateSyncStatusVisibility()
+    {
+        SyncStatusButton.Visibility = SyncActionItems.Any()
+            ? Visibility.Visible
+            : Visibility.Collapsed;
+
+        var distinctAccounts = SyncActionItems.Select(a => a.AccountId).Distinct().Count();
+
+        SyncStatusText.Text = distinctAccounts switch
+        {
+            0 => string.Empty,
+            1 => string.Format(Translator.SyncAction_SynchronizingAccount, SyncActionItems.First().AccountName),
+            _ => string.Format(Translator.SyncAction_SynchronizingAccounts, distinctAccounts)
+        };
+    }
+
+    private void UpdateTitleBarColors(bool isDarkTheme)
+    {
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            var titleBar = AppWindow.TitleBar;
+            if (titleBar == null) return;
+
+            // Set button colors based on theme
+            // Background is always transparent for all buttons
+            titleBar.ButtonBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+            titleBar.ButtonInactiveBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+            titleBar.ButtonHoverBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+            titleBar.ButtonPressedBackgroundColor = Color.FromArgb(0, 0, 0, 0); // Transparent
+
+            if (isDarkTheme)
+            {
+                // Dark theme: use light text/icons for better contrast
+                titleBar.ButtonForegroundColor = Color.FromArgb(255, 255, 255, 255); // White
+                titleBar.ButtonInactiveForegroundColor = Color.FromArgb(128, 255, 255, 255); // Semi-transparent white
+                titleBar.ButtonHoverForegroundColor = Color.FromArgb(255, 255, 255, 255); // White
+                titleBar.ButtonPressedForegroundColor = Color.FromArgb(200, 255, 255, 255); // Slightly dimmed white
+            }
+            else
+            {
+                // Light theme: use dark text/icons for better contrast
+                titleBar.ButtonForegroundColor = Color.FromArgb(255, 0, 0, 0); // Black
+                titleBar.ButtonInactiveForegroundColor = Color.FromArgb(128, 0, 0, 0); // Semi-transparent black
+                titleBar.ButtonHoverForegroundColor = Color.FromArgb(255, 0, 0, 0); // Black
+                titleBar.ButtonPressedForegroundColor = Color.FromArgb(200, 0, 0, 0); // Slightly dimmed black
+            }
+        });
+    }
+
+    private void ApplyTitleBarSearchHost()
+    {
+        _activeTitleBarSearchHost = ResolveActiveTitleBarSearchHost();
+        SynchronizeTitleBarSearchBox();
+    }
+
+    private void StatePersistenceServiceChanged(object? sender, string propertyName)
+    {
+        if (!DispatcherQueue.HasThreadAccess)
+        {
+            var enqueued = DispatcherQueue.TryEnqueue(() => StatePersistenceServiceChanged(sender, propertyName));
+            if (!enqueued)
+                throw new InvalidOperationException("Could not marshal shell state changes onto the UI thread.");
+
+            return;
+        }
+
+        if (propertyName == nameof(IStatePersistanceService.ApplicationMode) ||
+            propertyName == nameof(IStatePersistanceService.IsReadingMail) ||
+            propertyName == nameof(IStatePersistanceService.IsReaderNarrowed) ||
+            propertyName == nameof(IStatePersistanceService.IsEventDetailsVisible))
+        {
+            RefreshBackButtonVisibility();
+        }
+    }
+
+    private void RefreshBackButtonVisibility()
+    {
+        if (!_isBackButtonVisibilityReady)
+        {
+            ShellTitleBar.IsBackButtonVisible = false;
+            return;
+        }
+
+        ShellTitleBar.IsBackButtonVisible = NavigationService.CanGoBack();
+    }
+
+    private ITitleBarSearchHost? ResolveActiveTitleBarSearchHost()
+    {
+        if (MainShellFrame.Content is WinoAppShell shellPage)
+        {
+            return shellPage.GetShellFrame().Content as ITitleBarSearchHost;
+        }
+
+        return MainShellFrame.Content as ITitleBarSearchHost;
+    }
+
+    private void SynchronizeTitleBarSearchBox()
+    {
+        _isSynchronizingTitleBarSearch = true;
+        try
+        {
+            TitleBarSearchBox.IsEnabled = _activeTitleBarSearchHost != null;
+            TitleBarSearchBox.PlaceholderText = _activeTitleBarSearchHost?.SearchPlaceholderText ?? Translator.SearchBarPlaceholder;
+            TitleBarSearchBox.ItemsSource = _activeTitleBarSearchHost?.SearchSuggestions;
+            TitleBarSearchBox.Text = _activeTitleBarSearchHost?.SearchText ?? string.Empty;
+        }
+        finally
+        {
+            _isSynchronizingTitleBarSearch = false;
+        }
+    }
+
+    private async void TitleBarSearchTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+    {
+        if (_isSynchronizingTitleBarSearch || _activeTitleBarSearchHost == null)
+            return;
+
+        _activeTitleBarSearchHost.SearchText = sender.Text;
+        await _activeTitleBarSearchHost.OnTitleBarSearchTextChangedAsync();
+    }
+
+    private void TitleBarSearchSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+    {
+        if (_activeTitleBarSearchHost == null || args.SelectedItem is not TitleBarSearchSuggestion suggestion)
+            return;
+
+        _activeTitleBarSearchHost.OnTitleBarSearchSuggestionChosen(suggestion);
+        SynchronizeTitleBarSearchBox();
+    }
+
+    private async void TitleBarSearchQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+    {
+        if (_activeTitleBarSearchHost == null)
+            return;
+
+        await _activeTitleBarSearchHost.OnTitleBarSearchSubmittedAsync(args.QueryText, args.ChosenSuggestion as TitleBarSearchSuggestion);
+        SynchronizeTitleBarSearchBox();
+    }
+
+    private void OnAppWindowClosing(object sender, Microsoft.UI.Windowing.AppWindowClosingEventArgs e)
+    {
+        if (_allowClose || (Application.Current as App)?.IsExiting == true)
+            return;
+
+        e.Cancel = true;
+        var windowManager = WinoApplication.Current.Services.GetService<IWinoWindowManager>();
+        windowManager?.HideWindow(this);
+    }
+
+    public void PrepareForClose()
+    {
+        if (_isPreparedForClose)
+            return;
+
+        _isPreparedForClose = true;
+
+        if (MainShellFrame.Content is WinoAppShell shellPage)
+        {
+            shellPage.PrepareForWindowClose();
+        }
+
+        WindowCleanupHelper.CleanupFrame(MainShellFrame);
+
+        _allowClose = true;
+    }
+
+    private void OnWindowClosed(object sender, WindowEventArgs e)
+    {
+        Closed -= OnWindowClosed;
+        AppWindow.Closing -= OnAppWindowClosing;
+        StatePersistanceService.StatePropertyChanged -= StatePersistenceServiceChanged;
+
+        if (MainShellFrame.Content is WinoAppShell shellPage)
+        {
+            shellPage.PrepareForWindowClose();
+        }
+
+        WindowCleanupHelper.CleanupFrame(MainShellFrame);
+        UnregisterRecipients();
+    }
+
+    private void RegisterRecipients()
+    {
+        WeakReferenceMessenger.Default.Register<TitleBarShellContentUpdated>(this);
+        WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Register<InfoBarMessageRequested>(this);
+        WeakReferenceMessenger.Default.Register<SynchronizationActionsAdded>(this);
+        WeakReferenceMessenger.Default.Register<SynchronizationActionsCompleted>(this);
+        WeakReferenceMessenger.Default.Register<WinoAccountProfileUpdatedMessage>(this);
+        WeakReferenceMessenger.Default.Register<WinoAccountProfileDeletedMessage>(this);
+    }
+
+    private void UnregisterRecipients()
+    {
+        WeakReferenceMessenger.Default.Unregister<TitleBarShellContentUpdated>(this);
+        WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Unregister<InfoBarMessageRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<SynchronizationActionsAdded>(this);
+        WeakReferenceMessenger.Default.Unregister<SynchronizationActionsCompleted>(this);
+        WeakReferenceMessenger.Default.Unregister<WinoAccountProfileUpdatedMessage>(this);
+        WeakReferenceMessenger.Default.Unregister<WinoAccountProfileDeletedMessage>(this);
+    }
+
+    private void ShowInfoBarMessage(InfoBarMessageRequested message)
+    {
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            if (string.IsNullOrEmpty(message.ActionButtonTitle) || message.Action == null)
+            {
+                ShellInfoBar.ActionButton = null;
+            }
+            else
+            {
+                ShellInfoBar.ActionButton = new Button()
+                {
+                    Content = message.ActionButtonTitle,
+                    Command = new RelayCommand(message.Action)
+                };
+            }
+
+            ShellInfoBar.Message = message.Message;
+            ShellInfoBar.Title = message.Title;
+            ShellInfoBar.Severity = message.Severity.AsMUXCInfoBarSeverity();
+            ShellInfoBar.IsOpen = true;
+        });
+    }
+
+    private void UpdateWinoAccountState(WinoAccount? account)
+    {
+        var isSignedIn = account != null;
+
+        WinoAccountSignedOutView.Visibility = isSignedIn ? Visibility.Collapsed : Visibility.Visible;
+        WinoAccountSignedInView.Visibility = isSignedIn ? Visibility.Visible : Visibility.Collapsed;
+
+        WinoAccountButtonPicture.Visibility = isSignedIn ? Visibility.Visible : Visibility.Collapsed;
+        WinoAccountSignedOutIcon.Visibility = isSignedIn ? Visibility.Collapsed : Visibility.Visible;
+
+        var initials = GetInitials(account?.Email);
+
+        WinoAccountButtonPicture.Initials = initials;
+        WinoAccountFlyoutPicture.Initials = initials;
+        WinoAccountButtonPicture.DisplayName = account?.Email ?? Translator.WinoAccount_Titlebar_SignedOutTitle;
+        WinoAccountFlyoutPicture.DisplayName = account?.Email ?? Translator.WinoAccount_Titlebar_SignedOutTitle;
+
+        WinoAccountFlyoutEmailText.Text = account?.Email ?? string.Empty;
+        WinoAccountFlyoutStatusText.Text = account == null
+            ? string.Empty
+            : string.Format(Translator.WinoAccount_Titlebar_SignedInStatus, account.AccountStatus);
+    }
+
+    private static string GetInitials(string? email)
+    {
+        if (string.IsNullOrWhiteSpace(email))
+        {
+            return "W";
+        }
+
+        var localPart = email.Split('@')[0];
+        var segments = localPart
+            .Split(['.', '_', '-', ' '], StringSplitOptions.RemoveEmptyEntries)
+            .Where(segment => !string.IsNullOrWhiteSpace(segment))
+            .Take(2)
+            .ToArray();
+
+        if (segments.Length == 0)
+        {
+            return email[..1].ToUpperInvariant();
+        }
+
+        return string.Concat(segments.Select(segment => char.ToUpperInvariant(segment[0])));
+    }
+
+    private async void RegisterWinoAccountClicked(object sender, RoutedEventArgs e)
+    {
+        WinoAccountFlyout.Hide();
+        var account = await MailDialogService.ShowWinoAccountRegistrationDialogAsync();
+        if (account != null)
+        {
+            ShowInfoBarMessage(new InfoBarMessageRequested(
+                InfoBarMessageType.Success,
+                Translator.GeneralTitle_Info,
+                string.Format(Translator.WinoAccount_RegisterSuccessMessage, account.Email)));
+        }
+    }
+
+    private async void LoginWinoAccountClicked(object sender, RoutedEventArgs e)
+    {
+        WinoAccountFlyout.Hide();
+        var account = await MailDialogService.ShowWinoAccountLoginDialogAsync();
+        if (account != null)
+        {
+            ShowInfoBarMessage(new InfoBarMessageRequested(
+                InfoBarMessageType.Success,
+                Translator.GeneralTitle_Info,
+                string.Format(Translator.WinoAccount_LoginSuccessMessage, account.Email)));
+        }
+    }
+
+    private async void SignOutWinoAccountClicked(object sender, RoutedEventArgs e)
+    {
+        var activeAccount = await WinoAccountProfileService.GetActiveAccountAsync();
+        if (activeAccount == null)
+        {
+            ShowInfoBarMessage(new InfoBarMessageRequested(
+                InfoBarMessageType.Warning,
+                Translator.GeneralTitle_Info,
+                Translator.WinoAccount_SignOut_NoAccountMessage));
+            return;
+        }
+
+        await WinoAccountProfileService.SignOutAsync();
+
+        ShowInfoBarMessage(new InfoBarMessageRequested(
+            InfoBarMessageType.Success,
+            Translator.GeneralTitle_Info,
+            string.Format(Translator.WinoAccount_SignOut_SuccessMessage, activeAccount.Email)));
+    }
+
+}
diff --git a/Wino.Mail.WinUI/Styles/CalendarShellNavigationViewStyle.xaml b/Wino.Mail.WinUI/Styles/CalendarShellNavigationViewStyle.xaml
new file mode 100644
index 00000000..16af1345
--- /dev/null
+++ b/Wino.Mail.WinUI/Styles/CalendarShellNavigationViewStyle.xaml
@@ -0,0 +1,915 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
+    xmlns:local="using:Wino.Mail.WinUI.Styles"
+    xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
+    xmlns:winoControls="using:Wino.Mail.WinUI.Controls">
+
+    <ItemsPanelTemplate x:Key="FooterAppModeSwitcherVerticalItemsPanelTemplate">
+        <StackPanel Orientation="Vertical" />
+    </ItemsPanelTemplate>
+
+    <Style x:Key="CalendarShellNavigationViewStyle" TargetType="controls:NavigationView">
+        <Setter Property="PaneToggleButtonStyle" Value="{StaticResource PaneToggleButtonStyle}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="CompactPaneLength" Value="{ThemeResource NavigationViewCompactPaneLength}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NavigationView">
+                    <Grid x:Name="RootGrid">
+                        <!--  Button grid  -->
+                        <Grid
+                            x:Name="PaneToggleButtonGrid"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Canvas.ZIndex="100">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid x:Name="TogglePaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+                            <Grid
+                                x:Name="ButtonHolderGrid"
+                                Grid.Row="1"
+                                Margin="{ThemeResource NavigationViewButtonHolderGridMargin}">
+                                <Button
+                                    x:Name="NavigationViewBackButton"
+                                    Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                    VerticalAlignment="Top"
+                                    IsEnabled="{TemplateBinding IsBackEnabled}"
+                                    Style="{StaticResource NavigationBackButtonNormalStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.BackButtonVisibility}">
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip x:Name="NavigationViewBackButtonToolTip" />
+                                    </ToolTipService.ToolTip>
+                                </Button>
+                                <Button
+                                    x:Name="NavigationViewCloseButton"
+                                    VerticalAlignment="Top"
+                                    Style="{StaticResource NavigationBackButtonNormalStyle}">
+                                    <ToolTipService.ToolTip>
+                                        <ToolTip x:Name="NavigationViewCloseButtonToolTip" />
+                                    </ToolTipService.ToolTip>
+                                </Button>
+                                <Button
+                                    x:Name="TogglePaneButton"
+                                    MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Top"
+                                    AutomationProperties.LandmarkType="Navigation"
+                                    FocusVisualMargin="0"
+                                    Style="{TemplateBinding PaneToggleButtonStyle}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}">
+                                    <TextBlock
+                                        x:Name="PaneTitleTextBlock"
+                                        Grid.Column="0"
+                                        Margin="0,-2,0,0"
+                                        HorizontalAlignment="Left"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource NavigationViewItemHeaderTextStyle}"
+                                        Text="{TemplateBinding PaneTitle}" />
+                                </Button>
+                                <Grid
+                                    x:Name="PaneTitleHolder"
+                                    Height="40"
+                                    Visibility="Collapsed">
+                                    <ContentControl
+                                        x:Name="PaneTitlePresenter"
+                                        Margin="{ThemeResource NavigationViewPaneTitlePresenterMargin}"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsTabStop="False" />
+                                </Grid>
+                            </Grid>
+                        </Grid>
+                        <!--  Content layouts  -->
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <!--  DisplayMode top  -->
+                            <StackPanel
+                                x:Name="TopNavArea"
+                                Grid.Row="0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Top"
+                                Background="{ThemeResource NavigationViewTopPaneBackground}"
+                                Canvas.ZIndex="1"
+                                XYFocusKeyboardNavigation="Enabled">
+                                <Grid
+                                    x:Name="TopNavTopPadding"
+                                    Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}" />
+                                <Grid
+                                    x:Name="TopNavGrid"
+                                    Height="{ThemeResource NavigationViewTopPaneHeight}"
+                                    Margin="{ThemeResource TopNavigationViewTopNavGridMargin}"
+                                    BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                    Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPaneVisibility}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition x:Name="BackButtonPlaceholderOnTopNav" Width="{ThemeResource NavigationBackButtonWidth}" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" MinWidth="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid
+                                        x:Name="TopNavLeftPadding"
+                                        Grid.Column="1"
+                                        Width="0" />
+                                    <ContentControl
+                                        x:Name="PaneHeaderOnTopPane"
+                                        Grid.Column="2"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsTabStop="False" />
+                                    <ContentControl
+                                        x:Name="PaneTitleOnTopPane"
+                                        Grid.Column="2"
+                                        Margin="{ThemeResource NavigationViewItemInnerHeaderMargin}"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsTabStop="False" />
+                                    <!--  Top nav ItemsRepeater  -->
+                                    <controls:ItemsRepeaterScrollHost Grid.Column="3">
+                                        <ScrollViewer
+                                            HorizontalScrollBarVisibility="Hidden"
+                                            HorizontalScrollMode="Disabled"
+                                            VerticalScrollBarVisibility="Hidden"
+                                            VerticalScrollMode="Disabled">
+                                            <controls:ItemsRepeater
+                                                x:Name="TopNavMenuItemsHost"
+                                                AutomationProperties.AccessibilityView="Content"
+                                                AutomationProperties.LandmarkType="Navigation"
+                                                AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}">
+                                                <controls:ItemsRepeater.Layout>
+                                                    <controls:StackLayout Orientation="Horizontal" />
+                                                </controls:ItemsRepeater.Layout>
+                                            </controls:ItemsRepeater>
+                                        </ScrollViewer>
+                                    </controls:ItemsRepeaterScrollHost>
+                                    <Button
+                                        x:Name="TopNavOverflowButton"
+                                        Grid.Column="4"
+                                        Margin="{ThemeResource TopNavigationViewOverflowButtonMargin}"
+                                        Content="More"
+                                        Style="{StaticResource NavigationViewOverflowButtonStyleWhenPaneOnTop}"
+                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OverflowButtonVisibility}">
+                                        <Button.Flyout>
+                                            <Flyout ElementSoundMode="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ElementSoundMode}" Placement="BottomEdgeAlignedRight">
+                                                <Flyout.FlyoutPresenterStyle>
+                                                    <Style TargetType="FlyoutPresenter">
+                                                        <Setter Property="Padding" Value="{ThemeResource TopNavigationViewOverflowMenuPadding}" />
+                                                        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                                                        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+                                                        <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+                                                        <Setter Property="Template">
+                                                            <Setter.Value>
+                                                                <ControlTemplate TargetType="FlyoutPresenter">
+                                                                    <ScrollViewer
+                                                                        x:Name="ScrollViewer"
+                                                                        AutomationProperties.AccessibilityView="Raw"
+                                                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                                        HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                                        VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                                        ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                                                                        <ContentPresenter
+                                                                            x:Name="ContentPresenter"
+                                                                            Padding="{TemplateBinding Padding}"
+                                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                                            Background="{TemplateBinding Background}"
+                                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                                            Content="{TemplateBinding Content}"
+                                                                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                                            CornerRadius="{TemplateBinding CornerRadius}" />
+                                                                    </ScrollViewer>
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </Style>
+                                                </Flyout.FlyoutPresenterStyle>
+                                                <controls:ItemsRepeaterScrollHost>
+                                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                                        <controls:ItemsRepeater x:Name="TopNavMenuItemsOverflowHost" AutomationProperties.AccessibilityView="Content">
+                                                            <controls:ItemsRepeater.Layout>
+                                                                <controls:StackLayout />
+                                                            </controls:ItemsRepeater.Layout>
+                                                        </controls:ItemsRepeater>
+                                                    </ScrollViewer>
+                                                </controls:ItemsRepeaterScrollHost>
+                                            </Flyout>
+                                        </Button.Flyout>
+                                    </Button>
+                                    <ContentControl
+                                        x:Name="PaneCustomContentOnTopPane"
+                                        Grid.Column="5"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsTabStop="False" />
+                                    <Grid
+                                        x:Name="TopPaneAutoSuggestArea"
+                                        Grid.Column="6"
+                                        Height="{ThemeResource NavigationViewTopPaneHeight}">
+                                        <ContentControl
+                                            x:Name="TopPaneAutoSuggestBoxPresenter"
+                                            MinWidth="216"
+                                            Margin="{ThemeResource TopNavigationViewAutoSuggestBoxMargin}"
+                                            HorizontalContentAlignment="Stretch"
+                                            VerticalContentAlignment="Center"
+                                            IsTabStop="False" />
+                                    </Grid>
+                                    <ContentControl
+                                        x:Name="PaneFooterOnTopPane"
+                                        Grid.Column="7"
+                                        HorizontalContentAlignment="Stretch"
+                                        VerticalContentAlignment="Stretch"
+                                        IsTabStop="False" />
+                                    <!--  Top footer menu ItemsRepeater  -->
+                                    <controls:ItemsRepeater
+                                        x:Name="TopFooterMenuItemsHost"
+                                        Grid.Column="8"
+                                        AutomationProperties.AccessibilityView="Content"
+                                        AutomationProperties.LandmarkType="Navigation">
+                                        <controls:ItemsRepeater.Layout>
+                                            <controls:StackLayout Orientation="Horizontal" />
+                                        </controls:ItemsRepeater.Layout>
+                                    </controls:ItemsRepeater>
+                                </Grid>
+                                <Border x:Name="TopNavContentOverlayAreaGrid" Child="{TemplateBinding ContentOverlay}" />
+                            </StackPanel>
+                            <!--  Displaymode (compact/minimal/normal) left  -->
+                            <SplitView
+                                x:Name="RootSplitView"
+                                Grid.Row="1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                BorderThickness="{ThemeResource NavigationViewBorderThickness}"
+                                CompactPaneLength="{TemplateBinding CompactPaneLength}"
+                                CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}"
+                                DisplayMode="Inline"
+                                IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
+                                IsTabStop="False"
+                                OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
+                                PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}">
+                                <SplitView.Pane>
+                                    <Grid
+                                        x:Name="PaneContentGrid"
+                                        Margin="{ThemeResource NavigationViewPaneContentGridMargin}"
+                                        BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}"
+                                        Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="0" />
+                                            <!--  above button margin + back button space  -->
+                                            <RowDefinition x:Name="PaneContentGridToggleButtonRow" Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="0" />
+                                            <!--  above list margin  -->
+                                            <RowDefinition x:Name="ItemsContainerRow" Height="*" />
+                                        </Grid.RowDefinitions>
+                                        <Grid x:Name="ContentPaneTopPadding" Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}" />
+                                        <Grid Grid.Row="2">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition x:Name="PaneHeaderContentBorderRow" />
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition x:Name="PaneHeaderCloseButtonColumn" />
+                                                <ColumnDefinition x:Name="PaneHeaderToggleButtonColumn" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <ContentControl
+                                                x:Name="PaneHeaderContentBorder"
+                                                Grid.Column="2"
+                                                HorizontalContentAlignment="Stretch"
+                                                VerticalContentAlignment="Stretch"
+                                                IsTabStop="False" />
+                                        </Grid>
+                                        <Grid
+                                            x:Name="AutoSuggestArea"
+                                            Grid.Row="3"
+                                            MinHeight="{ThemeResource NavigationViewAutoSuggestAreaHeight}"
+                                            Margin="0,0,0,8"
+                                            VerticalAlignment="Center">
+                                            <ContentControl
+                                                x:Name="PaneAutoSuggestBoxPresenter"
+                                                Margin="{ThemeResource NavigationViewAutoSuggestBoxMargin}"
+                                                HorizontalContentAlignment="Stretch"
+                                                VerticalContentAlignment="Center"
+                                                IsTabStop="False" />
+                                            <Button
+                                                x:Name="PaneAutoSuggestButton"
+                                                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.SmallerPaneToggleButtonWidth}"
+                                                Style="{ThemeResource NavigationViewPaneSearchButtonStyle}"
+                                                Visibility="Collapsed">
+                                                <Button.Resources>
+                                                    <ResourceDictionary>
+                                                        <ResourceDictionary.ThemeDictionaries>
+                                                            <ResourceDictionary x:Key="Default">
+                                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="NavigationViewItemBackgroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="NavigationViewItemBackgroundPressed" />
+                                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="NavigationViewItemBackgroundDisabled" />
+                                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="NavigationViewItemForegroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed" />
+                                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="NavigationViewItemForegroundDisabled" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="NavigationViewItemBorderBrushPointerOver" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="NavigationViewItemBorderBrushPressed" />
+                                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="NavigationViewItemBorderBrushDisabled" />
+                                                            </ResourceDictionary>
+                                                            <ResourceDictionary x:Key="Light">
+                                                                <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="NavigationViewItemBackgroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="NavigationViewItemBackgroundPressed" />
+                                                                <StaticResource x:Key="ButtonBackgroundDisabled" ResourceKey="NavigationViewItemBackgroundDisabled" />
+                                                                <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="NavigationViewItemForegroundPointerOver" />
+                                                                <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed" />
+                                                                <StaticResource x:Key="ButtonForegroundDisabled" ResourceKey="NavigationViewItemForegroundDisabled" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPointerOver" ResourceKey="NavigationViewItemBorderBrushPointerOver" />
+                                                                <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="NavigationViewItemBorderBrushPressed" />
+                                                                <StaticResource x:Key="ButtonBorderBrushDisabled" ResourceKey="NavigationViewItemBorderBrushDisabled" />
+                                                            </ResourceDictionary>
+                                                        </ResourceDictionary.ThemeDictionaries>
+                                                    </ResourceDictionary>
+                                                </Button.Resources>
+                                            </Button>
+                                        </Grid>
+                                        <ContentControl
+                                            x:Name="PaneCustomContentBorder"
+                                            Grid.Row="4"
+                                            HorizontalContentAlignment="Stretch"
+                                            VerticalContentAlignment="Stretch"
+                                            IsTabStop="False" />
+                                        <!--  "Non header" content  -->
+                                        <Grid x:Name="ItemsContainerGrid" Grid.Row="6">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="*" />
+                                                <!--  MenuItems  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  Separator if overflow  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  PaneFooter  -->
+                                                <RowDefinition Height="Auto" />
+                                                <!--  FooterItems  -->
+                                            </Grid.RowDefinitions>
+                                            <!--  MenuItems  -->
+                                            <controls:ItemsRepeaterScrollHost HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                                                <ScrollViewer
+                                                    x:Name="MenuItemsScrollViewer"
+                                                    TabNavigation="Local"
+                                                    VerticalScrollBarVisibility="Auto">
+                                                    <!--  Left nav ItemsRepeater  -->
+                                                    <controls:ItemsRepeater
+                                                        x:Name="MenuItemsHost"
+                                                        AutomationProperties.AccessibilityView="Content"
+                                                        AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}">
+                                                        <controls:ItemsRepeater.Layout>
+                                                            <controls:StackLayout />
+                                                        </controls:ItemsRepeater.Layout>
+                                                    </controls:ItemsRepeater>
+                                                </ScrollViewer>
+                                            </controls:ItemsRepeaterScrollHost>
+                                            <controls:NavigationViewItemSeparator
+                                                x:Name="VisualItemsSeparator"
+                                                Grid.Row="1"
+                                                Margin="0,0,0,2"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Center"
+                                                Visibility="Collapsed" />
+                                            <!--  PaneFooter  -->
+                                            <ContentControl
+                                                x:Name="FooterContentBorder"
+                                                Grid.Row="2"
+                                                Margin="0,0,0,4"
+                                                HorizontalContentAlignment="Stretch"
+                                                VerticalContentAlignment="Stretch"
+                                                IsTabStop="False" />
+
+                                            <Border
+                                                x:Name="FooterAppModeSwitcherBorder"
+                                                Grid.Row="3"
+                                                Margin="8,8,8,12"
+                                                Padding="8"
+                                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                                CornerRadius="{ThemeResource OverlayCornerRadius}">
+                                                <winoControls:AppModeFooterSwitcherControl x:Name="FooterAppModeSwitcher" />
+                                            </Border>
+
+                                            <!--  FooterItems - Disabled  -->
+                                            <controls:ItemsRepeaterScrollHost Grid.Row="3" Visibility="Collapsed">
+                                                <ScrollViewer
+                                                    x:Name="FooterItemsScrollViewer"
+                                                    VerticalAnchorRatio="1"
+                                                    VerticalScrollBarVisibility="Auto">
+                                                    <controls:ItemsRepeater x:Name="FooterMenuItemsHost" AutomationProperties.AccessibilityView="Content">
+                                                        <controls:ItemsRepeater.Layout>
+                                                            <controls:StackLayout />
+                                                        </controls:ItemsRepeater.Layout>
+                                                    </controls:ItemsRepeater>
+                                                </ScrollViewer>
+                                            </controls:ItemsRepeaterScrollHost>
+                                        </Grid>
+                                    </Grid>
+                                </SplitView.Pane>
+                                <SplitView.Content>
+                                    <Grid
+                                        x:Name="ContentGrid"
+                                        Margin="{ThemeResource NavigationViewContentMargin}"
+                                        Background="{ThemeResource NavigationViewContentBackground}"
+                                        BorderBrush="{ThemeResource NavigationViewContentGridBorderBrush}"
+                                        BorderThickness="{ThemeResource NavigationViewContentGridBorderThickness}"
+                                        CornerRadius="{ThemeResource NavigationViewContentGridCornerRadius}">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Grid
+                                            x:Name="ContentTopPadding"
+                                            Grid.ColumnSpan="2"
+                                            Height="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.TopPadding}"
+                                            Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}" />
+                                        <Grid x:Name="ContentLeftPadding" Grid.Row="1" />
+                                        <ContentControl
+                                            x:Name="HeaderContent"
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            MinHeight="{StaticResource PaneToggleButtonHeight}"
+                                            HorizontalContentAlignment="Stretch"
+                                            VerticalContentAlignment="Stretch"
+                                            Content="{TemplateBinding Header}"
+                                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                            IsTabStop="False"
+                                            Style="{StaticResource NavigationViewTitleHeaderContentControlTextStyle}" />
+                                        <ContentPresenter
+                                            x:Name="ContentPresenter"
+                                            Grid.Row="2"
+                                            Grid.ColumnSpan="2"
+                                            Margin="{ThemeResource NavigationViewContentPresenterMargin}"
+                                            AutomationProperties.LandmarkType="Main"
+                                            Content="{TemplateBinding Content}" />
+                                    </Grid>
+                                </SplitView.Content>
+                            </SplitView>
+                            <Grid
+                                x:Name="ShadowCaster"
+                                Grid.RowSpan="2"
+                                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
+                                HorizontalAlignment="Left">
+                                <Grid.RenderTransform>
+                                    <CompositeTransform x:Name="ShadowCasterTransform" />
+                                </Grid.RenderTransform>
+                            </Grid>
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="DisplayModeGroup">
+                                <VisualState x:Name="Compact" />
+                                <VisualState x:Name="Expanded" />
+                                <VisualState x:Name="Minimal">
+                                    <VisualState.Setters>
+                                        <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                                        <Setter Target="NavigationViewBackButton.Style" Value="{ThemeResource NavigationBackButtonSmallStyle}" />
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource NavigationViewMinimalContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource NavigationViewMinimalContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource NavigationViewMinimalContentMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="TopNavigationMinimal">
+                                    <VisualState.Setters>
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource TopNavigationViewContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource TopNavigationViewContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource TopNavigationViewContentMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="MinimalWithBackButton">
+                                    <VisualState.Setters>
+                                        <Setter Target="HeaderContent.Margin" Value="{ThemeResource NavigationViewMinimalHeaderMargin}" />
+                                        <Setter Target="NavigationViewBackButton.Style" Value="{ThemeResource NavigationBackButtonSmallStyle}" />
+                                        <Setter Target="ContentGrid.BorderThickness" Value="{ThemeResource NavigationViewMinimalContentGridBorderThickness}" />
+                                        <Setter Target="ContentGrid.CornerRadius" Value="{ThemeResource NavigationViewMinimalContentGridCornerRadius}" />
+                                        <Setter Target="ContentGrid.Margin" Value="{ThemeResource NavigationViewMinimalContentMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="TogglePaneGroup">
+                                <VisualState x:Name="TogglePaneButtonCollapsed" />
+                                <VisualState x:Name="TogglePaneButtonVisible">
+                                    <VisualState.Setters>
+                                        <!--  Might not need this setter when all the margins/paddings will be adequately set.  -->
+                                        <!--  This MinHeight setter is only here to ensure that AutoSuggestBox doesn't draw over ToggleButton.  -->
+                                        <Setter Target="PaneContentGridToggleButtonRow.MinHeight" Value="{StaticResource NavigationViewPaneHeaderRowMinHeight}" />
+                                        <Setter Target="PaneTitlePresenter.Margin" Value="{ThemeResource NavigationViewItemInnerHeaderMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="HeaderGroup">
+                                <VisualState x:Name="HeaderVisible" />
+                                <VisualState x:Name="HeaderCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="HeaderContent.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="AutoSuggestGroup">
+                                <VisualState x:Name="AutoSuggestBoxVisible" />
+                                <VisualState x:Name="AutoSuggestBoxCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="AutoSuggestArea.Visibility" Value="Collapsed" />
+                                        <Setter Target="TopPaneAutoSuggestArea.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneStateGroup">
+                                <VisualState x:Name="NotClosedCompact" />
+                                <VisualState x:Name="ClosedCompact">
+                                    <VisualState.Setters>
+                                        <Setter Target="PaneAutoSuggestBoxPresenter.Visibility" Value="Collapsed" />
+                                        <Setter Target="PaneAutoSuggestButton.Visibility" Value="Visible" />
+                                        <Setter Target="PaneCustomContentBorder.Visibility" Value="Collapsed" />
+                                        <Setter Target="FooterAppModeSwitcher.ItemsPanel" Value="{StaticResource FooterAppModeSwitcherVerticalItemsPanelTemplate}" />
+                                        <Setter Target="FooterAppModeSwitcher.Orientation" Value="Vertical" />
+                                        <Setter Target="FooterAppModeSwitcherBorder.Margin" Value="0" />
+                                        <Setter Target="FooterAppModeSwitcherBorder.Padding" Value="0" />
+                                        <Setter Target="FooterAppModeSwitcherBorder.Background" Value="Transparent" />
+                                        <Setter Target="FooterAppModeSwitcher.BorderThickness" Value="0" />
+                                        <Setter Target="FooterAppModeSwitcher.Background" Value="Transparent" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneStateListSizeGroup">
+                                <VisualState x:Name="ListSizeFull" />
+                                <VisualState x:Name="ListSizeCompact">
+                                    <VisualState.Setters>
+                                        <Setter Target="PaneContentGrid.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
+                                        <Setter Target="ShadowCaster.Width" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CompactPaneLength}" />
+                                        <Setter Target="PaneTitleTextBlock.Visibility" Value="Collapsed" />
+                                        <Setter Target="PaneHeaderContentBorder.Visibility" Value="Collapsed" />
+                                        <Setter Target="PaneContentGrid.HorizontalAlignment" Value="Left" />
+                                        <Setter Target="PaneCustomContentBorder.HorizontalAlignment" Value="Left" />
+                                        <Setter Target="FooterContentBorder.HorizontalAlignment" Value="Left" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneOverlayGroup">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition From="PaneNotOverlaying" To="PaneOverlaying">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCasterTransform" Storyboard.TargetProperty="TranslateX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="{Binding ElementName=RootSplitView, Path=TemplateSettings.NegativeOpenPaneLengthMinusCompactLength}" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="0.1,0.9 0.2,1.0"
+                                                    KeyTime="0:0:0.35"
+                                                    Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.35" Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="HorizontalAlignment">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="PaneOverlaying" To="PaneNotOverlaying">
+                                        <Storyboard x:Name="ShadowCasterEaseOutStoryboard">
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCasterTransform" Storyboard.TargetProperty="TranslateX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="0.1,0.9 0.2,1.0"
+                                                    KeyTime="0:0:0.12"
+                                                    Value="{Binding ElementName=RootSplitView, Path=TemplateSettings.NegativeOpenPaneLengthMinusCompactLength}" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.12" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ShadowCaster" Storyboard.TargetProperty="HorizontalAlignment">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                </VisualStateGroup.Transitions>
+                                <VisualState x:Name="PaneOverlaying" />
+                                <VisualState x:Name="PaneNotOverlaying">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootSplitView.BorderBrush" Value="Transparent" />
+                                        <Setter Target="ShadowCaster.Opacity" Value="0" />
+                                        <Setter Target="RootSplitView.PaneBackground" Value="{ThemeResource NavigationViewExpandedPaneBackground}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="TitleBarVisibilityGroup">
+                                <VisualState x:Name="TitleBarVisible" />
+                                <VisualState x:Name="TitleBarCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="PaneContentGrid.Margin" Value="0,32,0,0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="OverflowLabelGroup">
+                                <VisualState x:Name="OverflowButtonWithLabel" />
+                                <VisualState x:Name="OverflowButtonNoLabel">
+                                    <VisualState.Setters>
+                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="BackButtonGroup">
+                                <VisualState x:Name="BackButtonVisible" />
+                                <VisualState x:Name="BackButtonCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="BackButtonPlaceholderOnTopNav.Width" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneVisibilityGroup">
+                                <VisualState x:Name="PaneVisible" />
+                                <VisualState x:Name="PaneCollapsed">
+                                    <VisualState.Setters>
+                                        <!--  Note that RootSplitView.DisplayMode is set in code so we don't want to  -->
+                                        <!--  write it here and interfere. But these values work together to hide  -->
+                                        <!--  the left pane.  -->
+                                        <Setter Target="RootSplitView.CompactPaneLength" Value="0" />
+                                        <Setter Target="ShadowCaster.Width" Value="0" />
+                                        <Setter Target="PaneToggleButtonGrid.Visibility" Value="Collapsed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="PaneSeparatorStates">
+                                <VisualState x:Name="SeparatorCollapsed" />
+                                <VisualState x:Name="SeparatorVisible">
+                                    <VisualState.Setters>
+                                        <Setter Target="VisualItemsSeparator.Visibility" Value="Visible" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="controls:NavigationViewItem">
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
+        <Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="Margin" Value="{ThemeResource NavigationViewItemMargin}" />
+        <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="TabNavigation" Value="Once" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NavigationViewItem">
+                    <Grid x:Name="NVIRootGrid">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <primitives:NavigationViewItemPresenter
+                            x:Name="NavigationViewItemPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                            Control.IsTemplateFocusTarget="True"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Icon="{TemplateBinding Icon}"
+                            InfoBadge="{TemplateBinding InfoBadge}"
+                            IsTabStop="false"
+                            UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
+                        <controls:ItemsRepeater
+                            x:Name="NavigationViewItemMenuItemsHost"
+                            Grid.Row="1"
+                            x:Load="False"
+                            Visibility="Collapsed">
+                            <controls:ItemsRepeater.Layout>
+                                <controls:StackLayout Orientation="Vertical" />
+                            </controls:ItemsRepeater.Layout>
+                        </controls:ItemsRepeater>
+                        <FlyoutBase.AttachedFlyout>
+                            <Flyout x:Name="ChildrenFlyout" Placement="RightEdgeAlignedTop">
+                                <Flyout.FlyoutPresenterStyle>
+                                    <Style TargetType="FlyoutPresenter">
+                                        <Setter Property="Padding" Value="{ThemeResource NavigationViewItemChildrenMenuFlyoutPadding}" />
+                                        <!--  Set negative top margin to make the flyout align exactly with the button  -->
+                                        <Setter Property="Margin" Value="0,-4,0,0" />
+                                        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+                                        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                                        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+                                        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                                        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+                                        <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
+                                        <Setter Property="Template">
+                                            <Setter.Value>
+                                                <ControlTemplate TargetType="FlyoutPresenter">
+                                                    <ScrollViewer
+                                                        x:Name="ScrollViewer"
+                                                        AutomationProperties.AccessibilityView="Raw"
+                                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                                        HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                                        VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                                        ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                                                        <ContentPresenter
+                                                            x:Name="ContentPresenter"
+                                                            Padding="{TemplateBinding Padding}"
+                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                            Background="{TemplateBinding Background}"
+                                                            BorderBrush="{TemplateBinding BorderBrush}"
+                                                            BorderThickness="{TemplateBinding BorderThickness}"
+                                                            Content="{TemplateBinding Content}"
+                                                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                            ContentTransitions="{TemplateBinding ContentTransitions}"
+                                                            CornerRadius="{TemplateBinding CornerRadius}" />
+                                                    </ScrollViewer>
+                                                </ControlTemplate>
+                                            </Setter.Value>
+                                        </Setter>
+                                    </Style>
+                                </Flyout.FlyoutPresenterStyle>
+                                <Grid x:Name="FlyoutRootGrid">
+                                    <Grid x:Name="FlyoutContentGrid" />
+                                </Grid>
+                            </Flyout>
+                        </FlyoutBase.AttachedFlyout>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ItemOnNavigationViewListPositionStates">
+                                <VisualState x:Name="OnLeftNavigation">
+                                    <VisualState.Setters>
+                                        <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPane}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="OnTopNavigationPrimary">
+                                    <VisualState.Setters>
+                                        <Setter Target="NavigationViewItemPresenter.Margin" Value="{ThemeResource TopNavigationViewItemMargin}" />
+                                        <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPane}" />
+                                        <Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="OnTopNavigationOverflow">
+                                    <VisualState.Setters>
+                                        <Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="primitives:NavigationViewItemPresenter" />
+    <Style TargetType="controls:NavigationViewItemHeader">
+        <Setter Property="Foreground" Value="{ThemeResource NavigationViewItemHeaderForeground}" />
+        <Setter Property="IsEnabled" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NavigationViewItemHeader">
+                    <Grid x:Name="NavigationViewItemHeaderRootGrid">
+                        <Grid
+                            x:Name="InnerHeaderGrid"
+                            Height="40"
+                            Margin="{ThemeResource NavigationViewItemInnerHeaderMargin}"
+                            HorizontalAlignment="Left">
+                            <TextBlock
+                                x:Name="HeaderText"
+                                Margin="0,-1,0,-1"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource NavigationViewItemHeaderTextStyle}"
+                                Text="{TemplateBinding Content}"
+                                TextWrapping="NoWrap" />
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="PaneStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition From="HeaderTextCollapsed" To="HeaderTextVisible">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="40" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0" Value="0.0" />
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.1" Value="0.0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="0.0,0.35 0.15,1.0"
+                                                    KeyTime="0:0:0.2"
+                                                    Value="1.0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="HeaderTextVisible" To="HeaderTextCollapsed">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="InnerHeaderGrid" Storyboard.TargetProperty="Height">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="0" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0.2" Value="Collapsed" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="HeaderText" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="0.0,0.35 0.15,1.0"
+                                                    KeyTime="0:0:0.1"
+                                                    Value="0.0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                </VisualStateGroup.Transitions>
+                                <VisualState x:Name="HeaderTextVisible" />
+                                <VisualState x:Name="HeaderTextCollapsed">
+                                    <VisualState.Setters>
+                                        <Setter Target="HeaderText.Visibility" Value="Collapsed" />
+                                        <Setter Target="InnerHeaderGrid.Height" Value="0" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DisplayModeStates">
+                                <VisualState x:Name="LeftMode" />
+                                <VisualState x:Name="TopMode">
+                                    <VisualState.Setters>
+                                        <Setter Target="InnerHeaderGrid.Margin" Value="{ThemeResource TopNavigationViewItemInnerHeaderMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="controls:NavigationViewItemSeparator">
+        <Setter Property="IsEnabled" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Grid x:Name="NavigationViewItemSeparatorRootGrid">
+                        <Rectangle
+                            x:Name="SeparatorLine"
+                            Height="{ThemeResource NavigationViewItemSeparatorHeight}"
+                            Margin="{ThemeResource NavigationViewItemSeparatorMargin}"
+                            Fill="{ThemeResource NavigationViewItemSeparatorForeground}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="NavigationSeparatorLineStates">
+                                <VisualState x:Name="HorizontalLine" />
+                                <VisualState x:Name="HorizontalLineCompact">
+                                    <VisualState.Setters>
+                                        <Setter Target="SeparatorLine.Margin" Value="{ThemeResource NavigationViewCompactItemSeparatorMargin}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="VerticalLine">
+                                    <VisualState.Setters>
+                                        <Setter Target="SeparatorLine.Height" Value="24" />
+                                        <Setter Target="SeparatorLine.Width" Value="{ThemeResource TopNavigationViewItemSeparatorWidth}" />
+                                        <Setter Target="SeparatorLine.Margin" Value="{ThemeResource TopNavigationViewItemSeparatorMargin}" />
+                                        <Setter Target="SeparatorLine.VerticalAlignment" Value="Center" />
+                                        <Setter Target="SeparatorLine.Fill" Value="{ThemeResource TopNavigationViewItemSeparatorForeground}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/Wino.Calendar/Styles/CalendarThemeResources.xaml b/Wino.Mail.WinUI/Styles/CalendarThemeResources.xaml
similarity index 100%
rename from Wino.Calendar/Styles/CalendarThemeResources.xaml
rename to Wino.Mail.WinUI/Styles/CalendarThemeResources.xaml
diff --git a/Wino.Mail.WinUI/Styles/CalendarViewStyles.xaml b/Wino.Mail.WinUI/Styles/CalendarViewStyles.xaml
new file mode 100644
index 00000000..b1649546
--- /dev/null
+++ b/Wino.Mail.WinUI/Styles/CalendarViewStyles.xaml
@@ -0,0 +1,708 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
+    xmlns:local="using:Wino.Mail.WinUI.Styles"
+    xmlns:selectors1="using:Wino.Selectors">
+
+    <Style x:Key="WinoCalendarViewStyle" TargetType="CalendarView">
+        <Setter Property="BlackoutStrikethroughBrush" Value="{ThemeResource CalendarViewBlackoutStrikethroughBrush}" />
+        <Setter Property="SelectedHoverBorderBrush" Value="{ThemeResource CalendarViewSelectedHoverBorderBrush}" />
+        <Setter Property="SelectedPressedBorderBrush" Value="{ThemeResource CalendarViewSelectedPressedBorderBrush}" />
+        <Setter Property="SelectedDisabledBorderBrush" Value="{ThemeResource CalendarViewSelectedDisabledBorderBrush}" />
+        <Setter Property="SelectedBorderBrush" Value="{ThemeResource CalendarViewSelectedBorderBrush}" />
+        <Setter Property="HoverBorderBrush" Value="{ThemeResource CalendarViewHoverBorderBrush}" />
+        <Setter Property="PressedBorderBrush" Value="{ThemeResource CalendarViewPressedBorderBrush}" />
+        <Setter Property="CalendarItemBorderBrush" Value="{ThemeResource CalendarViewCalendarItemBorderBrush}" />
+        <Setter Property="TodaySelectedInnerBorderBrush" Value="{ThemeResource CalendarViewTodaySelectedInnerBorderBrush}" />
+        <Setter Property="TodayForeground" Value="{ThemeResource CalendarViewTodayForeground}" />
+        <Setter Property="DisabledForeground" Value="{ThemeResource CalendarViewDisabledForeground}" />
+        <Setter Property="BlackoutForeground" Value="{ThemeResource CalendarViewBlackoutForeground}" />
+        <Setter Property="SelectedForeground" Value="{ThemeResource CalendarViewSelectedForeground}" />
+        <Setter Property="SelectedHoverForeground" Value="{ThemeResource CalendarViewSelectedHoverForeground}" />
+        <Setter Property="SelectedPressedForeground" Value="{ThemeResource CalendarViewSelectedPressedForeground}" />
+        <Setter Property="SelectedDisabledForeground" Value="{ThemeResource CalendarViewSelectedDisabledForeground}" />
+        <Setter Property="PressedForeground" Value="{ThemeResource CalendarViewPressedForeground}" />
+        <Setter Property="OutOfScopeForeground" Value="{ThemeResource CalendarViewOutOfScopeForeground}" />
+        <Setter Property="OutOfScopeHoverForeground" Value="{ThemeResource CalendarViewOutOfScopeHoverForeground}" />
+        <Setter Property="OutOfScopePressedForeground" Value="{ThemeResource CalendarViewOutOfScopePressedForeground}" />
+        <Setter Property="CalendarItemForeground" Value="{ThemeResource CalendarViewCalendarItemForeground}" />
+        <Setter Property="TodayBackground" Value="{ThemeResource CalendarViewTodayBackground}" />
+        <Setter Property="TodayBlackoutBackground" Value="{ThemeResource CalendarViewTodayBlackoutBackground}" />
+        <Setter Property="TodayBlackoutForeground" Value="{ThemeResource CalendarViewTodayBlackoutForeground}" />
+        <Setter Property="TodayHoverBackground" Value="{ThemeResource CalendarViewTodayHoverBackground}" />
+        <Setter Property="TodayPressedBackground" Value="{ThemeResource CalendarViewTodayPressedBackground}" />
+        <Setter Property="TodayDisabledBackground" Value="{ThemeResource CalendarViewTodayDisabledBackground}" />
+        <Setter Property="BlackoutBackground" Value="{ThemeResource CalendarViewBlackoutBackground}" />
+        <Setter Property="OutOfScopeBackground" Value="{ThemeResource CalendarViewOutOfScopeBackground}" />
+        <Setter Property="CalendarItemBackground" Value="{ThemeResource CalendarViewCalendarItemBackground}" />
+        <Setter Property="CalendarItemHoverBackground" Value="{ThemeResource CalendarViewCalendarItemHoverBackground}" />
+        <Setter Property="CalendarItemPressedBackground" Value="{ThemeResource CalendarViewCalendarItemPressedBackground}" />
+        <Setter Property="CalendarItemDisabledBackground" Value="{ThemeResource CalendarViewCalendarItemDisabledBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource CalendarViewForeground}" />
+        <Setter Property="Background" Value="{ThemeResource CalendarViewBackground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource CalendarViewBorderBrush}" />
+        <Setter Property="DayItemFontFamily" Value="XamlAutoFontFamily" />
+        <Setter Property="DayItemFontSize" Value="{ThemeResource CalendarViewDayItemFontSize}" />
+        <Setter Property="DayItemMargin" Value="{ThemeResource CalendarViewDayItemMargin}" />
+        <Setter Property="FirstOfMonthLabelFontFamily" Value="XamlAutoFontFamily" />
+        <Setter Property="FirstOfMonthLabelFontSize" Value="{ThemeResource CalendarViewFirstOfMonthLabelFontSize}" />
+        <Setter Property="FirstOfMonthLabelMargin" Value="{ThemeResource CalendarViewFirstOfMonthLabelMargin}" />
+        <Setter Property="MonthYearItemFontFamily" Value="XamlAutoFontFamily" />
+        <Setter Property="MonthYearItemFontSize" Value="{ThemeResource CalendarViewMonthYearItemFontSize}" />
+        <Setter Property="MonthYearItemMargin" Value="{ThemeResource CalendarViewMonthYearItemMargin}" />
+        <Setter Property="FirstOfYearDecadeLabelFontFamily" Value="XamlAutoFontFamily" />
+        <Setter Property="FirstOfYearDecadeLabelFontSize" Value="{ThemeResource CalendarViewFirstOfYearDecadeLabelFontSize}" />
+        <Setter Property="FirstOfYearDecadeLabelMargin" Value="{ThemeResource CalendarViewFirstOfYearDecadeLabelMargin}" />
+        <Setter Property="TodayFontWeight" Value="{ThemeResource CalendarViewTodayFontWeight}" />
+        <Setter Property="CalendarItemBorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarView">
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Resources>
+                            <Style
+                                x:Key="WeekDayNameStyle"
+                                BasedOn="{StaticResource CaptionTextBlockStyle}"
+                                TargetType="TextBlock">
+                                <Setter Property="HorizontalAlignment" Value="Center" />
+                                <Setter Property="VerticalAlignment" Value="Center" />
+                                <Setter Property="FontWeight" Value="{ThemeResource CalendarViewWeekDayFontWeight}" />
+                                <Setter Property="Margin" Value="{ThemeResource CalendarViewWeekDayMargin}" />
+                                <Setter Property="Padding" Value="{ThemeResource CalendarViewWeekDayPadding}" />
+                            </Style>
+                            <Style x:Key="HeaderNavigationButtonStyle" TargetType="Button">
+                                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                                <Setter Property="VerticalAlignment" Value="Stretch" />
+                                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                                <Setter Property="FontSize" Value="{ThemeResource CalendarViewHeaderNavigationButtonFontSize}" />
+                                <Setter Property="FontWeight" Value="{ThemeResource CalendarViewHeaderNavigationFontWeight}" />
+                                <Setter Property="Background" Value="{ThemeResource CalendarViewNavigationButtonBackground}" />
+                                <Setter Property="Margin" Value="{ThemeResource CalendarViewHeaderNavigationButtonMargin}" />
+                                <Setter Property="Padding" Value="{ThemeResource CalendarViewHeaderNavigationButtonPadding}" />
+                                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+                                <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                                <Setter Property="FocusVisualMargin" Value="{StaticResource CalendarViewNavigationButtonFocusVisualMargin}" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Button">
+                                            <ContentPresenter
+                                                x:Name="Text"
+                                                Padding="{TemplateBinding Padding}"
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Background="{TemplateBinding Background}"
+                                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                                BorderBrush="{ThemeResource CalendarViewNavigationButtonBorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                Content="{TemplateBinding Content}"
+                                                CornerRadius="{TemplateBinding CornerRadius}"
+                                                Foreground="{TemplateBinding Foreground}">
+                                                <VisualStateManager.VisualStateGroups>
+                                                    <VisualStateGroup x:Name="CommonStates">
+                                                        <VisualState x:Name="Normal" />
+                                                        <VisualState x:Name="PointerOver">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Background" Value="{ThemeResource CalendarViewNavigationButtonBackgroundPointerOver}" />
+                                                                <Setter Target="Text.BorderBrush" Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewHeaderNavigationButtonForegroundPointerOver}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Pressed">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Background" Value="{ThemeResource CalendarViewNavigationButtonBackgroundPressed}" />
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewHeaderNavigationButtonForegroundPressed}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Disabled">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewHeaderNavigationButtonForegroundDisabled}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                    </VisualStateGroup>
+                                                </VisualStateManager.VisualStateGroups>
+                                            </ContentPresenter>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                            <Style x:Key="NavigationButtonStyle" TargetType="Button">
+                                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                                <Setter Property="VerticalAlignment" Value="Stretch" />
+                                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+                                <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
+                                <Setter Property="FontSize" Value="{ThemeResource CalendarViewNavigationButtonFontSize}" />
+                                <Setter Property="Background" Value="{ThemeResource CalendarViewNavigationButtonBackground}" />
+                                <Setter Property="Padding" Value="{ThemeResource CalendarViewNavigationButtonPadding}" />
+                                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+                                <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                                <Setter Property="FocusVisualMargin" Value="{StaticResource CalendarViewNavigationButtonFocusVisualMargin}" />
+                                <Setter Property="IsTabStop" Value="True" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="Button">
+                                            <ContentPresenter
+                                                x:Name="Text"
+                                                Padding="{TemplateBinding Padding}"
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                AutomationProperties.AccessibilityView="Raw"
+                                                Background="{TemplateBinding Background}"
+                                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                                                BorderBrush="{ThemeResource CalendarViewNavigationButtonBorderBrush}"
+                                                BorderThickness="{TemplateBinding BorderThickness}"
+                                                Content="{TemplateBinding Content}"
+                                                CornerRadius="{TemplateBinding CornerRadius}">
+                                                <VisualStateManager.VisualStateGroups>
+                                                    <VisualStateGroup x:Name="CommonStates">
+                                                        <VisualState x:Name="Normal" />
+                                                        <VisualState x:Name="PointerOver">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Background" Value="{ThemeResource CalendarViewNavigationButtonBackgroundPointerOver}" />
+                                                                <Setter Target="Text.BorderBrush" Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewNavigationButtonForegroundPointerOver}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Pressed">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Background" Value="{ThemeResource CalendarViewNavigationButtonBackgroundPressed}" />
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewNavigationButtonForegroundPressed}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                        <VisualState x:Name="Disabled">
+                                                            <VisualState.Setters>
+                                                                <Setter Target="Text.Foreground" Value="{ThemeResource CalendarViewNavigationButtonForegroundDisabled}" />
+                                                            </VisualState.Setters>
+                                                        </VisualState>
+                                                    </VisualStateGroup>
+                                                </VisualStateManager.VisualStateGroups>
+                                            </ContentPresenter>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                            <Style x:Key="ScrollViewerStyle" TargetType="ScrollViewer">
+                                <Setter Property="HorizontalScrollMode" Value="Disabled" />
+                                <Setter Property="VerticalScrollMode" Value="Enabled" />
+                                <Setter Property="VerticalSnapPointsType" Value="Optional" />
+                                <Setter Property="ZoomMode" Value="Disabled" />
+                                <Setter Property="TabNavigation" Value="Once" />
+                                <Setter Property="BringIntoViewOnFocusChange" Value="False" />
+                                <Setter Property="Template" Value="{StaticResource ScrollViewerScrollBarlessTemplate}" />
+                            </Style>
+                        </Border.Resources>
+                        <Grid
+                            MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.MinViewWidth}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Button
+                                    x:Name="HeaderButton"
+                                    HorizontalContentAlignment="Left"
+                                    Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HeaderText}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreViews}"
+                                    Style="{StaticResource HeaderNavigationButtonStyle}" />
+                                <Button
+                                    x:Name="PreviousButton"
+                                    Grid.Column="1"
+                                    Margin="{ThemeResource CalendarViewNavigationPreviousButtonMargin}"
+                                    HorizontalContentAlignment="Center"
+                                    Content="&#xEDDB;"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}"
+                                    Style="{StaticResource NavigationButtonStyle}" />
+                                <Button
+                                    x:Name="NextButton"
+                                    Grid.Column="2"
+                                    Margin="{ThemeResource CalendarViewNavigationNextButtonMargin}"
+                                    HorizontalContentAlignment="Center"
+                                    Content="&#xEDDC;"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}"
+                                    Style="{StaticResource NavigationButtonStyle}" />
+                            </Grid>
+                            <Border
+                                Grid.Row="1"
+                                Height="1"
+                                Background="{TemplateBinding BorderBrush}" />
+                            <Grid x:Name="Views" Grid.Row="2">
+                                <Grid.Clip>
+                                    <RectangleGeometry Rect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.ClipRect}" />
+                                </Grid.Clip>
+                                <Border x:Name="BackgroundLayer">
+                                    <Border.RenderTransform>
+                                        <ScaleTransform x:Name="BackgroundTransform" CenterX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterX}" CenterY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterY}" />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Grid x:Name="MonthView">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.RenderTransform>
+                                        <ScaleTransform x:Name="MonthViewTransform" CenterX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterX}" CenterY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterY}" />
+                                    </Grid.RenderTransform>
+                                    <Grid
+                                        x:Name="WeekDayNames"
+                                        Margin="2,2,2,0"
+                                        Background="{TemplateBinding Background}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock
+                                            x:Name="WeekDay1"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay1}" />
+                                        <TextBlock
+                                            x:Name="WeekDay2"
+                                            Grid.Column="1"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay2}" />
+                                        <TextBlock
+                                            x:Name="WeekDay3"
+                                            Grid.Column="2"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay3}" />
+                                        <TextBlock
+                                            x:Name="WeekDay4"
+                                            Grid.Column="3"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay4}" />
+                                        <TextBlock
+                                            x:Name="WeekDay5"
+                                            Grid.Column="4"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay5}" />
+                                        <TextBlock
+                                            x:Name="WeekDay6"
+                                            Grid.Column="5"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay6}" />
+                                        <TextBlock
+                                            x:Name="WeekDay7"
+                                            Grid.Column="6"
+                                            Foreground="{TemplateBinding CalendarItemForeground}"
+                                            Style="{StaticResource WeekDayNameStyle}"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.WeekDay7}" />
+                                    </Grid>
+                                    <ScrollViewer
+                                        x:Name="MonthViewScrollViewer"
+                                        Grid.Row="1"
+                                        Margin="2"
+                                        IsFocusEngagementEnabled="True"
+                                        Style="{StaticResource ScrollViewerStyle}">
+                                        <CalendarPanel x:Name="MonthViewPanel" />
+                                    </ScrollViewer>
+                                </Grid>
+                                <ScrollViewer
+                                    x:Name="YearViewScrollViewer"
+                                    Margin="2"
+                                    IsFocusEngagementEnabled="True"
+                                    Style="{StaticResource ScrollViewerStyle}"
+                                    UseLayoutRounding="False"
+                                    Visibility="Collapsed">
+                                    <ScrollViewer.RenderTransform>
+                                        <ScaleTransform x:Name="YearViewTransform" CenterX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterX}" CenterY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterY}" />
+                                    </ScrollViewer.RenderTransform>
+                                    <CalendarPanel x:Name="YearViewPanel" />
+                                </ScrollViewer>
+                                <ScrollViewer
+                                    x:Name="DecadeViewScrollViewer"
+                                    Margin="2"
+                                    IsFocusEngagementEnabled="True"
+                                    Style="{StaticResource ScrollViewerStyle}"
+                                    UseLayoutRounding="False"
+                                    Visibility="Collapsed">
+                                    <ScrollViewer.RenderTransform>
+                                        <ScaleTransform x:Name="DecadeViewTransform" CenterX="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterX}" CenterY="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.CenterY}" />
+                                    </ScrollViewer.RenderTransform>
+                                    <CalendarPanel x:Name="DecadeViewPanel" />
+                                </ScrollViewer>
+                            </Grid>
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay1" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay2" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay3" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay4" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay5" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay6" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="WeekDay7" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource CalendarViewWeekDayForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="HeaderButtonStates">
+                                <VisualState x:Name="ViewChanged" />
+                                <VisualState x:Name="ViewChanging">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="HeaderButton"
+                                            Storyboard.TargetProperty="Opacity"
+                                            From="0"
+                                            To="1"
+                                            Duration="0:0:0.167" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DisplayModeStates">
+                                <VisualState x:Name="Month" />
+                                <VisualState x:Name="Year">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MonthViewScrollViewer" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="False" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="0" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Decade">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MonthViewScrollViewer" Storyboard.TargetProperty="IsEnabled">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="False" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="0" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition From="Month" To="Year">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0.84" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0.84" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="1.29" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="1.29" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundLayer" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.000" Value="0" />
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.200" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="Year" To="Month">
+                                        <Storyboard>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="IsHitTestVisible">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="1.29" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="1.29" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundLayer" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.000" Value="0" />
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.200" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="Year" To="Decade">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0.84" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0.84" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="1.29" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="1.29" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundLayer" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.000" Value="0" />
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.200" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                    <VisualTransition From="Decade" To="Year">
+                                        <Storyboard>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MonthView" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="IsHitTestVisible">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="False" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="0" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewScrollViewer" Storyboard.TargetProperty="Opacity">
+                                                <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="1.29" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="DecadeViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.150"
+                                                    Value="1.29" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="YearViewTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundTransform" Storyboard.TargetProperty="ScaleX">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundTransform" Storyboard.TargetProperty="ScaleY">
+                                                <DiscreteDoubleKeyFrame KeyTime="0:0:0.150" Value="0.84" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="BackgroundLayer" Storyboard.TargetProperty="Opacity">
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.000" Value="0" />
+                                                <LinearDoubleKeyFrame KeyTime="0:0:0.200" Value="0" />
+                                                <SplineDoubleKeyFrame
+                                                    KeySpline="{StaticResource ControlFastOutSlowInKeySpline}"
+                                                    KeyTime="0:0:0.500"
+                                                    Value="1" />
+                                            </DoubleAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualTransition>
+                                </VisualStateGroup.Transitions>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+
+</ResourceDictionary>
diff --git a/Wino.Core.UWP/Styles/Colors.xaml b/Wino.Mail.WinUI/Styles/Colors.xaml
similarity index 98%
rename from Wino.Core.UWP/Styles/Colors.xaml
rename to Wino.Mail.WinUI/Styles/Colors.xaml
index e60ea73c..e9f33274 100644
--- a/Wino.Core.UWP/Styles/Colors.xaml
+++ b/Wino.Mail.WinUI/Styles/Colors.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Microsoft.UI.Xaml.Media">
diff --git a/Wino.Core.UWP/Styles/ContentPresenters.xaml b/Wino.Mail.WinUI/Styles/ContentPresenters.xaml
similarity index 71%
rename from Wino.Core.UWP/Styles/ContentPresenters.xaml
rename to Wino.Mail.WinUI/Styles/ContentPresenters.xaml
index 3b1b4422..ede0e3e3 100644
--- a/Wino.Core.UWP/Styles/ContentPresenters.xaml
+++ b/Wino.Mail.WinUI/Styles/ContentPresenters.xaml
@@ -1,7 +1,7 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Core.UWP.Controls">
+    xmlns:controls="using:Wino.Mail.WinUI.Controls">
 
     <!--  Flagged  -->
     <DataTemplate x:Key="FlaggedSymbolControlTemplate">
@@ -29,4 +29,14 @@
                 Icon="Attachment" />
         </Viewbox>
     </DataTemplate>
+
+    <!--  Calendar invitation  -->
+    <DataTemplate x:Key="CalendarInvitationSymbolControlTemplate">
+        <Viewbox
+            Width="14"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Bottom">
+            <controls:WinoFontIcon Margin="2,0,0,0" Icon="Calendar" />
+        </Viewbox>
+    </DataTemplate>
 </ResourceDictionary>
diff --git a/Wino.Core.UWP/Styles/Converters.xaml b/Wino.Mail.WinUI/Styles/Converters.xaml
similarity index 95%
rename from Wino.Core.UWP/Styles/Converters.xaml
rename to Wino.Mail.WinUI/Styles/Converters.xaml
index ec5a46a4..7cfbd9aa 100644
--- a/Wino.Core.UWP/Styles/Converters.xaml
+++ b/Wino.Mail.WinUI/Styles/Converters.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="using:Wino.Converters">
diff --git a/Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml b/Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml
similarity index 97%
rename from Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml
rename to Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml
index d37a275d..a888b8f1 100644
--- a/Wino.Core.UWP/Styles/CustomMessageDialogStyles.xaml
+++ b/Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.Styles.CustomMessageDialogStyles"
+    x:Class="Wino.Mail.WinUI.Styles.CustomMessageDialogStyles"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:dialogs="using:Wino.Dialogs"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:local="using:Wino.Styles"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:selectors="using:Wino.Core.UWP.Selectors">
+    xmlns:selectors="using:Wino.Mail.WinUI.Selectors">
 
     <!--  Icon templates  -->
     <DataTemplate x:Key="WinoCustomMessageDialogInformationIconTemplate">
@@ -15,14 +15,14 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Data="F1 M 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.637695 11.072592 18.413086 11.870117 C 18.188477 12.667644 17.872721 13.413086 17.46582 14.106445 C 17.058918 14.799805 16.570637 15.431315 16.000977 16.000977 C 15.431314 16.570639 14.799804 17.05892 14.106445 17.46582 C 13.413085 17.872721 12.666015 18.188477 11.865234 18.413086 C 11.064453 18.637695 10.234375 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.748047 13.481445 16.396484 C 14.083658 16.044922 14.63216 15.621745 15.126953 15.126953 C 15.621744 14.632162 16.044922 14.083659 16.396484 13.481445 C 16.748047 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 8.4375 5.625 C 8.4375 5.364584 8.528646 5.14323 8.710938 4.960938 C 8.893229 4.778646 9.114583 4.6875 9.375 4.6875 C 9.635416 4.6875 9.856771 4.778646 10.039062 4.960938 C 10.221354 5.14323 10.3125 5.364584 10.3125 5.625 C 10.3125 5.885417 10.221354 6.106771 10.039062 6.289062 C 9.856771 6.471354 9.635416 6.5625 9.375 6.5625 C 9.114583 6.5625 8.893229 6.471354 8.710938 6.289062 C 8.528646 6.106771 8.4375 5.885417 8.4375 5.625 Z M 8.75 13.125 L 8.75 8.125 C 8.75 7.95573 8.811849 7.809246 8.935547 7.685547 C 9.059244 7.56185 9.205729 7.5 9.375 7.5 C 9.544271 7.5 9.690755 7.56185 9.814453 7.685547 C 9.93815 7.809246 10 7.95573 10 8.125 L 10 13.125 C 10 13.294271 9.93815 13.440756 9.814453 13.564453 C 9.690755 13.688151 9.544271 13.75 9.375 13.75 C 9.205729 13.75 9.059244 13.688151 8.935547 13.564453 C 8.811849 13.440756 8.75 13.294271 8.75 13.125 Z "
-            Fill="#0f80d7" />
+            Fill="{ThemeResource SystemAccentColor}" />
     </DataTemplate>
     <DataTemplate x:Key="WinoCustomMessageDialogQuestionIconTemplate">
         <Path
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Data="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8m8-6.5a6.5 6.5 0 1 0 0 13a6.5 6.5 0 0 0 0-13M6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.76 2.76 0 0 1 1.637.525c.503.377.863.965.863 1.725c0 .448-.115.83-.329 1.15c-.205.307-.47.513-.692.662c-.109.072-.22.138-.313.195l-.006.004a6 6 0 0 0-.26.16a1 1 0 0 0-.276.245a.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661q.154-.1.313-.195l.007-.004c.1-.061.182-.11.258-.161a1 1 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.61.61 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1 1 0 0 0-.34.398M9 11a1 1 0 1 1-2 0a1 1 0 0 1 2 0"
-            Fill="#0984e3" />
+            Fill="{ThemeResource SystemAccentColor}" />
     </DataTemplate>
     <DataTemplate x:Key="WinoCustomMessageDialogWarningIconTemplate">
         <Path
@@ -59,8 +59,8 @@
             </Grid.RowDefinitions>
 
             <!--  Title  -->
-            <StackPanel Orientation="Horizontal" Spacing="12">
-                <Viewbox Width="28" HorizontalAlignment="Left">
+            <StackPanel Orientation="Horizontal" Spacing="8">
+                <Viewbox Width="22" HorizontalAlignment="Left">
                     <ContentControl Content="{x:Bind Icon}" ContentTemplateSelector="{StaticResource CustomWinoMessageDialogIconSelector}" />
                 </Viewbox>
 
diff --git a/Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml.cs b/Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml.cs
new file mode 100644
index 00000000..a8b2b809
--- /dev/null
+++ b/Wino.Mail.WinUI/Styles/CustomMessageDialogStyles.xaml.cs
@@ -0,0 +1,11 @@
+using Microsoft.UI.Xaml;
+
+namespace Wino.Mail.WinUI.Styles;
+
+public partial class CustomMessageDialogStyles : ResourceDictionary
+{
+    public CustomMessageDialogStyles()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Core.UWP/Styles/DataTemplates.xaml b/Wino.Mail.WinUI/Styles/DataTemplates.xaml
similarity index 51%
rename from Wino.Core.UWP/Styles/DataTemplates.xaml
rename to Wino.Mail.WinUI/Styles/DataTemplates.xaml
index 2c2d8bf3..e0334f2b 100644
--- a/Wino.Core.UWP/Styles/DataTemplates.xaml
+++ b/Wino.Mail.WinUI/Styles/DataTemplates.xaml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
-    x:Class="Wino.Core.UWP.Styles.DataTemplates"
+    x:Class="Wino.Mail.WinUI.Styles.DataTemplates"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:coreSelectors="using:Wino.Mail.WinUI.Selectors"
     xmlns:coreViewModelData="using:Wino.Core.ViewModels.Data"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:helpers="using:Wino.Helpers"
-    xmlns:local="using:Wino.Core.UWP.Styles"
+    xmlns:local="using:Wino.Mail.WinUI.Styles"
     xmlns:menu="using:Wino.Core.Domain.MenuItems"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:personalization="using:Wino.Core.UWP.Models.Personalization"
+    xmlns:personalization="using:Wino.Mail.WinUI.Models.Personalization"
+    xmlns:selectors1="using:Wino.Selectors"
+    xmlns:shared="using:Wino.Core.Domain.Entities.Shared"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
     xmlns:winuiControls="using:CommunityToolkit.WinUI.Controls">
 
@@ -20,31 +24,14 @@
     <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
     <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
 
-    <!--  Root Account Template  -->
-    <DataTemplate x:Key="RootAccountTemplate" x:DataType="viewModelData:AccountProviderDetailViewModel">
-        <winuiControls:SettingsCard
-            Margin="0,2,0,0"
-            Command="{Binding ViewModel.NavigateAccountDetailsCommand, Mode=OneWay, ElementName=root}"
-            CommandParameter="{x:Bind}"
-            Description="{x:Bind Account.Address}"
-            Header="{x:Bind Account.Name}"
-            IsClickEnabled="True">
-            <winuiControls:SettingsCard.HeaderIcon>
-                <coreControls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Account)}" />
-            </winuiControls:SettingsCard.HeaderIcon>
-        </winuiControls:SettingsCard>
-    </DataTemplate>
+
 
     <!--#region Navigation Menu Templates-->
 
-    <!--  Manage Accounts etc. Other navigatable.  -->
-    <DataTemplate x:Key="ManageAccountsTemplate" x:DataType="menu:ManageAccountsMenuItem">
-        <coreControls:WinoNavigationViewItem Content="{x:Bind domain:Translator.MenuManageAccounts}" DataContext="{x:Bind}">
+    <DataTemplate x:Key="ContactsTemplate" x:DataType="menu:ContactsMenuItem">
+        <coreControls:WinoNavigationViewItem Content="{x:Bind domain:Translator.ContactsPage_Title}" DataContext="{x:Bind}">
             <muxc:NavigationViewItem.Icon>
-                <PathIcon
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Data="F1 M 2.5 3.75 L 2.5 3.671875 C 2.5 3.164062 2.600911 2.687176 2.802734 2.241211 C 3.004557 1.795248 3.277995 1.40625 3.623047 1.074219 C 3.968099 0.742188 4.366862 0.480145 4.819336 0.288086 C 5.27181 0.096029 5.748698 0 6.25 0 C 6.770833 0 7.259114 0.097656 7.714844 0.292969 C 8.170572 0.488281 8.567708 0.755209 8.90625 1.09375 C 9.244791 1.432293 9.511719 1.829428 9.707031 2.285156 C 9.902344 2.740887 10 3.229168 10 3.75 C 10 4.270834 9.902344 4.759115 9.707031 5.214844 C 9.511719 5.670573 9.244791 6.067709 8.90625 6.40625 C 8.567708 6.744792 8.170572 7.011719 7.714844 7.207031 C 7.259114 7.402344 6.770833 7.5 6.25 7.5 C 5.729167 7.5 5.240885 7.402344 4.785156 7.207031 C 4.329427 7.011719 3.932292 6.744792 3.59375 6.40625 C 3.255208 6.067709 2.988281 5.670573 2.792969 5.214844 C 2.597656 4.759115 2.5 4.270834 2.5 3.75 Z M 8.75 3.75 L 8.75 3.701172 C 8.75 3.362631 8.681641 3.045248 8.544922 2.749023 C 8.408203 2.452801 8.225911 2.194012 7.998047 1.972656 C 7.770182 1.751303 7.504883 1.575521 7.202148 1.445312 C 6.899414 1.315105 6.582031 1.25 6.25 1.25 C 5.904948 1.25 5.581055 1.316732 5.27832 1.450195 C 4.975586 1.58366 4.711914 1.762695 4.487305 1.987305 C 4.262695 2.211914 4.083659 2.477215 3.950195 2.783203 C 3.816731 3.089193 3.75 3.411459 3.75 3.75 C 3.75 4.095053 3.816731 4.418946 3.950195 4.72168 C 4.083659 5.024415 4.262695 5.288087 4.487305 5.512695 C 4.711914 5.737306 4.975586 5.916342 5.27832 6.049805 C 5.581055 6.183269 5.904948 6.25 6.25 6.25 C 6.588542 6.25 6.910807 6.183269 7.216797 6.049805 C 7.522786 5.916342 7.788085 5.737306 8.012695 5.512695 C 8.237305 5.288087 8.416341 5.024415 8.549805 4.72168 C 8.683268 4.418946 8.75 4.095053 8.75 3.75 Z M 12.5 6.201172 C 12.5 5.862631 12.568359 5.545248 12.705078 5.249023 C 12.841797 4.9528 13.024088 4.694011 13.251953 4.472656 C 13.479816 4.251303 13.745116 4.075521 14.047852 3.945312 C 14.350585 3.815105 14.667968 3.75 15 3.75 C 15.338541 3.75 15.660807 3.816732 15.966797 3.950195 C 16.272785 4.08366 16.538086 4.262696 16.762695 4.487305 C 16.987305 4.711915 17.16634 4.977215 17.299805 5.283203 C 17.433268 5.589193 17.5 5.911459 17.5 6.25 C 17.5 6.582031 17.434895 6.899414 17.304688 7.202148 C 17.174479 7.504883 16.998697 7.770183 16.777344 7.998047 C 16.555988 8.225912 16.297199 8.408203 16.000977 8.544922 C 15.704752 8.681641 15.387369 8.75 15.048828 8.75 C 14.684244 8.75 14.34733 8.684896 14.038086 8.554688 C 13.728841 8.424479 13.460286 8.245443 13.232422 8.017578 C 13.004557 7.789714 12.82552 7.521159 12.695312 7.211914 C 12.565104 6.90267 12.5 6.565756 12.5 6.201172 Z M 16.25 6.25 C 16.25 6.08073 16.217447 5.919598 16.152344 5.766602 C 16.087238 5.613607 15.997721 5.480144 15.883789 5.366211 C 15.769856 5.252279 15.636393 5.162761 15.483398 5.097656 C 15.330403 5.032553 15.169271 5.000001 15 5 C 14.824218 5.000001 14.661457 5.032553 14.511719 5.097656 C 14.361979 5.162761 14.230143 5.252279 14.116211 5.366211 C 14.002277 5.480144 13.91276 5.611979 13.847656 5.761719 C 13.782552 5.911459 13.75 6.074219 13.75 6.25 C 13.75 6.425781 13.782552 6.59017 13.847656 6.743164 C 13.91276 6.896159 14.00065 7.027995 14.111328 7.138672 C 14.222005 7.24935 14.353841 7.33724 14.506836 7.402344 C 14.65983 7.467448 14.824218 7.5 15 7.5 C 15.17578 7.5 15.338541 7.467448 15.488281 7.402344 C 15.638021 7.33724 15.769856 7.247722 15.883789 7.133789 C 15.997721 7.019857 16.087238 6.888021 16.152344 6.738281 C 16.217447 6.588542 16.25 6.425781 16.25 6.25 Z M 10.048828 7.5 C 10.387369 7.5 10.704752 7.568359 11.000977 7.705078 C 11.2972 7.841797 11.555989 8.024089 11.777344 8.251953 C 11.998697 8.479818 12.174479 8.745117 12.304688 9.047852 C 12.434896 9.350586 12.5 9.667969 12.5 10 C 12.5 10.345053 12.434896 10.670573 12.304688 10.976562 C 12.174479 11.282553 11.99707 11.547852 11.772461 11.772461 C 11.547852 11.99707 11.282552 12.174479 10.976562 12.304688 C 10.670572 12.434896 10.345052 12.5 10 12.5 C 9.667969 12.5 9.350586 12.434896 9.047852 12.304688 C 8.745117 12.174479 8.479817 11.998698 8.251953 11.777344 C 8.024088 11.55599 7.841796 11.297201 7.705078 11.000977 C 7.568359 10.704753 7.5 10.38737 7.5 10.048828 C 7.5 9.684245 7.565104 9.347331 7.695312 9.038086 C 7.825521 8.728842 8.004557 8.460287 8.232422 8.232422 C 8.460286 8.004558 8.728841 7.825521 9.038086 7.695312 C 9.34733 7.565104 9.684244 7.5 10.048828 7.5 Z M 1.875 8.75 L 6.464844 8.75 C 6.321614 9.140625 6.25 9.557292 6.25 10 L 1.875 10 C 1.731771 10 1.617839 10.02767 1.533203 10.083008 C 1.448568 10.138347 1.385091 10.209961 1.342773 10.297852 C 1.300456 10.385742 1.272786 10.483398 1.259766 10.59082 C 1.246745 10.698242 1.240234 10.807292 1.240234 10.917969 C 1.240234 10.976562 1.241862 11.033529 1.245117 11.088867 C 1.248372 11.144206 1.25 11.197917 1.25 11.25 C 1.25 11.640625 1.32487 12.010092 1.474609 12.358398 C 1.624349 12.706706 1.822917 13.024089 2.070312 13.310547 C 2.317708 13.597006 2.602539 13.849284 2.924805 14.067383 C 3.24707 14.285482 3.580729 14.462891 3.925781 14.599609 C 3.854167 14.807943 3.806966 15.014648 3.78418 15.219727 C 3.761393 15.424805 3.75 15.638021 3.75 15.859375 C 3.261719 15.703125 2.791341 15.478516 2.338867 15.185547 C 1.886393 14.892578 1.48763 14.549154 1.142578 14.155273 C 0.797526 13.761394 0.520833 13.323568 0.3125 12.841797 C 0.104167 12.360026 0 11.848959 0 11.308594 L 0 10.625 C 0 10.371094 0.048828 10.130209 0.146484 9.902344 C 0.244141 9.674479 0.379232 9.474284 0.551758 9.301758 C 0.724284 9.129232 0.924479 8.994141 1.152344 8.896484 C 1.380208 8.798828 1.621094 8.75 1.875 8.75 Z M 10.107422 11.25 C 10.263672 11.25 10.411783 11.212565 10.551758 11.137695 C 10.691731 11.062826 10.813802 10.966797 10.917969 10.849609 C 11.022135 10.732422 11.103516 10.598959 11.162109 10.449219 C 11.220703 10.299479 11.25 10.14974 11.25 10 C 11.25 9.830729 11.217447 9.669597 11.152344 9.516602 C 11.087239 9.363607 10.997721 9.230144 10.883789 9.116211 C 10.769856 9.002279 10.636393 8.912761 10.483398 8.847656 C 10.330403 8.782553 10.169271 8.75 10 8.75 C 9.824219 8.75 9.661458 8.782553 9.511719 8.847656 C 9.361979 8.912761 9.230143 9.002279 9.116211 9.116211 C 9.002278 9.230144 8.91276 9.361979 8.847656 9.511719 C 8.782552 9.661459 8.75 9.824219 8.75 10 C 8.75 10.201823 8.785807 10.379232 8.857422 10.532227 C 8.929036 10.685222 9.025064 10.81543 9.145508 10.922852 C 9.26595 11.030273 9.40918 11.111654 9.575195 11.166992 C 9.741211 11.222331 9.918619 11.25 10.107422 11.25 Z M 16.25 15.625 C 16.25 15.371094 16.220703 15.120443 16.162109 14.873047 C 16.546223 14.794922 16.897785 14.669597 17.216797 14.49707 C 17.535807 14.324545 17.809244 14.111328 18.037109 13.857422 C 18.264973 13.603516 18.440754 13.310547 18.564453 12.978516 C 18.68815 12.646484 18.75 12.278646 18.75 11.875 C 18.75 11.705729 18.68815 11.559245 18.564453 11.435547 C 18.440754 11.31185 18.29427 11.25 18.125 11.25 L 13.535156 11.25 C 13.678385 10.859375 13.75 10.442709 13.75 10 L 18.125 10 C 18.378906 10 18.619791 10.048828 18.847656 10.146484 C 19.07552 10.244141 19.275715 10.379232 19.448242 10.551758 C 19.620768 10.724284 19.755859 10.924479 19.853516 11.152344 C 19.951172 11.380209 20 11.621094 20 11.875 C 20 12.460938 19.907227 12.991537 19.72168 13.466797 C 19.536133 13.942058 19.277344 14.360352 18.945312 14.72168 C 18.613281 15.083008 18.216145 15.382487 17.753906 15.620117 C 17.291666 15.857748 16.783854 16.0319 16.230469 16.142578 C 16.236979 16.051432 16.241861 15.96517 16.245117 15.883789 C 16.248371 15.802409 16.25 15.716146 16.25 15.625 Z M 5 15.625 C 5 15.364584 5.048828 15.120443 5.146484 14.892578 C 5.244141 14.664714 5.377604 14.466146 5.546875 14.296875 C 5.716146 14.127604 5.914713 13.994141 6.142578 13.896484 C 6.370442 13.798828 6.614583 13.75 6.875 13.75 L 13.125 13.75 C 13.385416 13.75 13.629557 13.798828 13.857422 13.896484 C 14.085286 13.994141 14.283854 14.127604 14.453125 14.296875 C 14.622395 14.466146 14.755858 14.664714 14.853516 14.892578 C 14.951171 15.120443 14.999999 15.364584 15 15.625 C 14.999999 16.341146 14.86328 16.971029 14.589844 17.514648 C 14.316405 18.058268 13.950194 18.513998 13.491211 18.881836 C 13.032226 19.249674 12.501627 19.527994 11.899414 19.716797 C 11.2972 19.9056 10.664062 20 10 20 C 9.335938 20 8.701172 19.907227 8.095703 19.72168 C 7.490234 19.536133 6.958008 19.259439 6.499023 18.891602 C 6.040039 18.523764 5.675456 18.066406 5.405273 17.519531 C 5.135091 16.972656 5 16.341146 5 15.625 Z M 13.75 15.625 C 13.75 15.455729 13.68815 15.309245 13.564453 15.185547 C 13.440755 15.06185 13.294271 15 13.125 15 L 6.875 15 C 6.705729 15 6.559244 15.06185 6.435547 15.185547 C 6.311849 15.309245 6.25 15.455729 6.25 15.625 C 6.25 16.165365 6.354167 16.632486 6.5625 17.026367 C 6.770833 17.420248 7.049153 17.744141 7.397461 17.998047 C 7.745768 18.251953 8.144531 18.440756 8.59375 18.564453 C 9.042969 18.68815 9.511719 18.75 10 18.75 C 10.488281 18.75 10.957031 18.68815 11.40625 18.564453 C 11.855469 18.440756 12.254231 18.251953 12.602539 17.998047 C 12.950846 17.744141 13.229166 17.420248 13.4375 17.026367 C 13.645833 16.632486 13.75 16.165365 13.75 15.625 Z " />
+                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE716;" />
             </muxc:NavigationViewItem.Icon>
         </coreControls:WinoNavigationViewItem>
     </DataTemplate>
@@ -69,6 +56,82 @@
         </coreControls:WinoNavigationViewItem>
     </DataTemplate>
 
+    <DataTemplate x:Key="SettingsShellPageItemTemplate" x:DataType="menu:SettingsShellPageMenuItem">
+        <coreControls:WinoNavigationViewItem Content="{x:Bind Title}" DataContext="{x:Bind}">
+            <muxc:NavigationViewItem.Icon>
+                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind Glyph}" />
+            </muxc:NavigationViewItem.Icon>
+        </coreControls:WinoNavigationViewItem>
+    </DataTemplate>
+
+    <DataTemplate x:Key="SettingsShellWinoAccountItemTemplate" x:DataType="menu:SettingsShellPageMenuItem">
+        <coreControls:WinoNavigationViewItem Content="{x:Bind Title}" DataContext="{x:Bind}">
+            <muxc:NavigationViewItem.Icon>
+                <BitmapIcon ShowAsMonochrome="False" UriSource="/Assets/Wino_Icon.ico" />
+                <!--<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind Glyph}" />-->
+            </muxc:NavigationViewItem.Icon>
+        </coreControls:WinoNavigationViewItem>
+    </DataTemplate>
+
+    <DataTemplate x:Key="SettingsShellSectionItemTemplate" x:DataType="menu:SettingsShellSectionMenuItem">
+        <coreControls:WinoNavigationViewItem
+            Margin="0,12,0,4"
+            HorizontalContentAlignment="Stretch"
+            DataContext="{x:Bind}"
+            IsEnabled="False"
+            SelectsOnInvoked="False">
+            <Grid ColumnSpacing="10">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <Border
+                    Width="24"
+                    Height="24"
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    CornerRadius="12">
+                    <FontIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                        FontSize="12"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="{x:Bind Glyph}" />
+                </Border>
+
+                <TextBlock
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    CharacterSpacing="40"
+                    FontWeight="SemiBold"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind Title}"
+                    TextWrapping="NoWrap" />
+
+                <Border
+                    Grid.Column="2"
+                    Height="1"
+                    Margin="2,0,0,0"
+                    VerticalAlignment="Center"
+                    Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+            </Grid>
+        </coreControls:WinoNavigationViewItem>
+    </DataTemplate>
+
+    <!--  Store Update Item  -->
+    <DataTemplate x:Key="StoreUpdateItemTemplate" x:DataType="menu:StoreUpdateMenuItem">
+        <coreControls:WinoNavigationViewItem Content="{x:Bind domain:Translator.MenuUpdateAvailable}" DataContext="{x:Bind}">
+            <muxc:NavigationViewItem.Icon>
+                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE896;" />
+            </muxc:NavigationViewItem.Icon>
+        </coreControls:WinoNavigationViewItem>
+    </DataTemplate>
+
     <!--  Rating Item  -->
     <DataTemplate x:Key="RatingItemTemplate" x:DataType="menu:RateMenuItem">
         <coreControls:WinoNavigationViewItem
@@ -227,6 +290,87 @@
         <Setter Property="FontWeight" Value="SemiBold" />
     </Style>
 
+    <DataTemplate x:Key="ContactTokenTemplate" x:DataType="shared:IContactDisplayItem">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <ToolTipService.ToolTip>
+                <ToolTip Content="{x:Bind Address}" />
+            </ToolTipService.ToolTip>
+
+            <Viewbox Width="24">
+                <controls:ImagePreviewControl
+                    Address="{x:Bind Address}"
+                    DisplayNameOverride="{x:Bind DisplayName}"
+                    PreviewContact="{x:Bind PreviewContact}" />
+            </Viewbox>
+
+            <TextBlock
+                Grid.Column="1"
+                Margin="6,0,8,0"
+                VerticalAlignment="Center"
+                Text="{x:Bind DisplayName}" />
+        </Grid>
+    </DataTemplate>
+
+    <DataTemplate x:Key="ContactSuggestionTemplate" x:DataType="shared:IContactDisplayItem">
+        <Grid Margin="0,12" ColumnSpacing="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <controls:ImagePreviewControl
+                Width="40"
+                Height="40"
+                Address="{x:Bind Address}"
+                DisplayNameOverride="{x:Bind DisplayName}"
+                PreviewContact="{x:Bind PreviewContact}" />
+
+            <TextBlock Grid.Column="1">
+                <Run FontWeight="SemiBold" Text="{x:Bind DisplayName}" />
+                <LineBreak />
+                <Run Text="{x:Bind Address}" />
+            </TextBlock>
+        </Grid>
+    </DataTemplate>
+
+    <!--  ShowAs Status Stripe Templates  -->
+    <DataTemplate x:Key="FreeStripeTemplate" x:DataType="data:CalendarItemViewModel">
+        <Border Background="#4CAF50" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="TentativeStripeTemplate" x:DataType="data:CalendarItemViewModel">
+        <Border Background="#FFC107" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="BusyStripeTemplate" x:DataType="data:CalendarItemViewModel">
+        <Border Background="#F44336" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="OutOfOfficeStripeTemplate" x:DataType="data:CalendarItemViewModel">
+        <Border Background="#9C27B0" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="WorkingElsewhereStripeTemplate" x:DataType="data:CalendarItemViewModel">
+        <Border Background="#2196F3" />
+    </DataTemplate>
+
+    <!--  ShowAs Status Stripe Selector  -->
+    <selectors1:CalendarItemShowAsStripeTemplateSelector
+        x:Key="ShowAsStripeSelector"
+        BusyTemplate="{StaticResource BusyStripeTemplate}"
+        FreeTemplate="{StaticResource FreeStripeTemplate}"
+        OutOfOfficeTemplate="{StaticResource OutOfOfficeStripeTemplate}"
+        TentativeTemplate="{StaticResource TentativeStripeTemplate}"
+        WorkingElsewhereTemplate="{StaticResource WorkingElsewhereStripeTemplate}" />
+
     <!--#endregion-->
 
 </ResourceDictionary>
+
+
+
+
diff --git a/Wino.Core.UWP/Styles/DataTemplates.xaml.cs b/Wino.Mail.WinUI/Styles/DataTemplates.xaml.cs
similarity index 69%
rename from Wino.Core.UWP/Styles/DataTemplates.xaml.cs
rename to Wino.Mail.WinUI/Styles/DataTemplates.xaml.cs
index b83047fc..bb9011cb 100644
--- a/Wino.Core.UWP/Styles/DataTemplates.xaml.cs
+++ b/Wino.Mail.WinUI/Styles/DataTemplates.xaml.cs
@@ -1,6 +1,6 @@
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 
-namespace Wino.Core.UWP.Styles;
+namespace Wino.Mail.WinUI.Styles;
 
 public partial class DataTemplates : ResourceDictionary
 {
diff --git a/Wino.Core.UWP/Styles/FontIcons.xaml b/Wino.Mail.WinUI/Styles/FontIcons.xaml
similarity index 99%
rename from Wino.Core.UWP/Styles/FontIcons.xaml
rename to Wino.Mail.WinUI/Styles/FontIcons.xaml
index 37409b5d..ef9815de 100644
--- a/Wino.Core.UWP/Styles/FontIcons.xaml
+++ b/Wino.Mail.WinUI/Styles/FontIcons.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <!--  Attachments  -->
     <x:String x:Key="AttachPathIcon">M128.5,799.5C128.5,778.5 132.5,758.25 140.5,738.75C148.5,719.25 160,702 175,687L525,337C531.333,330.667 538.833,327.5 547.5,327.5C556.167,327.5 563.667,330.667 570,337C576.333,343.333 579.5,350.833 579.5,359.5C579.5,368.167 576.333,375.667 570,382L220,732C211.333,740.667 204.5,750.917 199.5,762.75C194.5,774.583 192,786.833 192,799.5C192,812.833 194.5,825.333 199.5,837C204.5,848.667 211.333,858.833 220,867.5C228.667,876.167 238.833,883 250.5,888C262.167,893 274.667,895.5 288,895.5C300.667,895.5 312.833,893.167 324.5,888.5C336.167,883.833 346.5,877 355.5,868L775,456.5C793,438.833 807,418.083 817,394.25C827,370.417 832,346 832,321C832,295.667 827.083,271.333 817.25,248C807.417,224.667 794,204.083 777,186.25C760,168.417 740.083,154.25 717.25,143.75C694.417,133.25 670,128 644,128C617.333,128 592.083,132.583 568.25,141.75C544.417,150.917 523,165 504,184L120,568C113.667,574.333 106.167,577.5 97.5,577.5C88.8333,577.5 81.3333,574.333 75,568C68.6667,561.667 65.5,554.167 65.5,545.5C65.5,536.833 68.6667,529.333 75,523L459,139C472.333,125.667 485.75,114.25 499.25,104.75C512.75,95.25 526.917,87.5 541.75,81.5C556.583,75.5 572.083,71.0834 588.25,68.25C604.417,65.4167 621.833,64.0001 640.5,64C675.833,64.0001 709,70.8334 740,84.5C771,98.1667 798.083,116.667 821.25,140C844.417,163.333 862.667,190.583 876,221.75C889.333,252.917 896,286.167 896,321.5C896,338.167 894.25,354.75 890.75,371.25C887.25,387.75 882.25,403.833 875.75,419.5C869.25,435.167 861.25,450.083 851.75,464.25C842.25,478.417 831.667,491.167 820,502.5L400.5,914C385.167,929 367.75,940.333 348.25,948C328.75,955.667 308.333,959.5 287,959.5C265,959.5 244.333,955.25 225,946.75C205.667,938.25 188.917,926.75 174.75,912.25C160.583,897.75 149.333,880.833 141,861.5C132.667,842.167 128.5,821.5 128.5,799.5Z</x:String>
diff --git a/Wino.Core.UWP/Styles/IconTemplates.xaml b/Wino.Mail.WinUI/Styles/IconTemplates.xaml
similarity index 59%
rename from Wino.Core.UWP/Styles/IconTemplates.xaml
rename to Wino.Mail.WinUI/Styles/IconTemplates.xaml
index 89dad769..c237a044 100644
--- a/Wino.Core.UWP/Styles/IconTemplates.xaml
+++ b/Wino.Mail.WinUI/Styles/IconTemplates.xaml
@@ -1,48 +1,48 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:selectors="using:Wino.Core.UWP.Selectors">
+    xmlns:selectors="using:Wino.Mail.WinUI.Selectors">
 
     <!--  Attachment Icon Templates  -->
 
     <DataTemplate x:Key="NoneTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_none.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_none.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ExecutableTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_executable.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_executable.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ImageTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_image.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_image.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="VideoTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_video.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_video.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="AudioTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_audio.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_audio.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="PDFTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_pdf.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_pdf.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="HTMLTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_html.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_html.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="RarTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_rar.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_rar.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="ArchiveTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_archive.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_archive.png" />
     </DataTemplate>
 
     <DataTemplate x:Key="OtherTemplate">
-        <Image Source="ms-appx:///Wino.Core.UWP/Assets/FileTypes/type_other.png" />
+        <Image Source="ms-appx:///Assets/FileTypes/type_other.png" />
     </DataTemplate>
 
     <selectors:FileAttachmentTypeSelector
diff --git a/Wino.Mail.WinUI/Styles/ImagePreviewControl.xaml b/Wino.Mail.WinUI/Styles/ImagePreviewControl.xaml
new file mode 100644
index 00000000..8af4a0f4
--- /dev/null
+++ b/Wino.Mail.WinUI/Styles/ImagePreviewControl.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Controls">
+
+    <Style TargetType="controls:ImagePreviewControl">
+        <Style.Setters>
+            <Setter Property="Width" Value="44" />
+            <Setter Property="Height" Value="44" />
+        </Style.Setters>
+    </Style>
+</ResourceDictionary>
diff --git a/Wino.Mail/Styles/ItemContainerStyles.xaml b/Wino.Mail.WinUI/Styles/ItemContainerStyles.xaml
similarity index 97%
rename from Wino.Mail/Styles/ItemContainerStyles.xaml
rename to Wino.Mail.WinUI/Styles/ItemContainerStyles.xaml
index 58f03d90..61bd89d4 100644
--- a/Wino.Mail/Styles/ItemContainerStyles.xaml
+++ b/Wino.Mail.WinUI/Styles/ItemContainerStyles.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -106,15 +106,15 @@
                             </Grid>
                         </primitives:NavigationViewItemPresenter>
 
-                        <muxc:ItemsRepeater
+                        <ItemsRepeater
                             x:Name="NavigationViewItemMenuItemsHost"
                             Grid.Row="1"
                             x:Load="False"
                             Visibility="Collapsed">
-                            <muxc:ItemsRepeater.Layout>
-                                <muxc:StackLayout Orientation="Vertical" Spacing="0" />
-                            </muxc:ItemsRepeater.Layout>
-                        </muxc:ItemsRepeater>
+                            <ItemsRepeater.Layout>
+                                <StackLayout Orientation="Vertical" Spacing="0" />
+                            </ItemsRepeater.Layout>
+                        </ItemsRepeater>
 
 
                         <!--  Custom selecotr pipe.  -->
diff --git a/Wino.Mail.WinUI/Styles/OperationCommandBar.xaml b/Wino.Mail.WinUI/Styles/OperationCommandBar.xaml
new file mode 100644
index 00000000..77fd8d25
--- /dev/null
+++ b/Wino.Mail.WinUI/Styles/OperationCommandBar.xaml
@@ -0,0 +1,64 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Wino.Mail.WinUI.Controls">
+
+    <Style BasedOn="{StaticResource DefaultCommandBarStyle}" TargetType="controls:OperationCommandBar">
+        <Setter Property="DefaultLabelPosition" Value="Right" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="IsDynamicOverflowEnabled" Value="True" />
+        <Setter Property="OverflowButtonVisibility" Value="Auto" />
+    </Style>
+
+    <DataTemplate x:Key="OperationCommandBarMailOperationTemplate">
+        <AppBarButton
+            MinWidth="40"
+            IsEnabled="{Binding IsEnabled}"
+            Label="{Binding Label}"
+            LabelPosition="{Binding LabelPosition}"
+            ToolTipService.ToolTip="{Binding ToolTip}">
+            <AppBarButton.Icon>
+                <controls:WinoFontIcon Icon="{Binding Icon}" />
+            </AppBarButton.Icon>
+        </AppBarButton>
+    </DataTemplate>
+
+    <DataTemplate x:Key="OperationCommandBarFolderOperationTemplate">
+        <AppBarButton
+            MinWidth="40"
+            IsEnabled="{Binding IsEnabled}"
+            Label="{Binding Label}"
+            LabelPosition="{Binding LabelPosition}"
+            ToolTipService.ToolTip="{Binding ToolTip}">
+            <AppBarButton.Icon>
+                <controls:WinoFontIcon Icon="{Binding Icon}" />
+            </AppBarButton.Icon>
+        </AppBarButton>
+    </DataTemplate>
+
+    <DataTemplate x:Key="OperationCommandBarAIActionsTemplate">
+        <AppBarToggleButton
+            MinWidth="40"
+            LabelPosition="Collapsed"
+            ToolTipService.ToolTip="{Binding ToolTip}">
+            <AppBarToggleButton.Icon>
+                <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{Binding Glyph}" />
+            </AppBarToggleButton.Icon>
+        </AppBarToggleButton>
+    </DataTemplate>
+
+    <DataTemplate x:Key="OperationCommandBarThemeToggleTemplate">
+        <AppBarButton
+            MinWidth="40"
+            LabelPosition="Collapsed"
+            ToolTipService.ToolTip="{Binding ToolTip}">
+            <AppBarButton.Icon>
+                <controls:WinoFontIcon Icon="{Binding Icon}" />
+            </AppBarButton.Icon>
+        </AppBarButton>
+    </DataTemplate>
+
+    <DataTemplate x:Key="OperationCommandBarSeparatorTemplate">
+        <AppBarSeparator />
+    </DataTemplate>
+</ResourceDictionary>
diff --git a/Wino.Core.UWP/Styles/SharedStyles.xaml b/Wino.Mail.WinUI/Styles/SharedStyles.xaml
similarity index 94%
rename from Wino.Core.UWP/Styles/SharedStyles.xaml
rename to Wino.Mail.WinUI/Styles/SharedStyles.xaml
index 6c479cb4..d3b4a93e 100644
--- a/Wino.Core.UWP/Styles/SharedStyles.xaml
+++ b/Wino.Mail.WinUI/Styles/SharedStyles.xaml
@@ -2,7 +2,18 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Wino.Core.UWP.Styles">
+    xmlns:local="using:Wino.Mail.WinUI.Styles">
+
+    <Style
+        x:Key="TransparentActionButtonStyle"
+        BasedOn="{StaticResource DefaultButtonStyle}"
+        TargetType="Button">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="12,8" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+    </Style>
 
     <!--  Horizontally Stretched List View Item Container Style  -->
     <Style x:Key="StretchedItemContainerStyle" TargetType="ListViewItem">
diff --git a/Wino.Mail/Styles/WebViewEditorControl.xaml b/Wino.Mail.WinUI/Styles/WebViewEditorControl.xaml
similarity index 86%
rename from Wino.Mail/Styles/WebViewEditorControl.xaml
rename to Wino.Mail.WinUI/Styles/WebViewEditorControl.xaml
index f76cdc54..4e0cb9cf 100644
--- a/Wino.Mail/Styles/WebViewEditorControl.xaml
+++ b/Wino.Mail.WinUI/Styles/WebViewEditorControl.xaml
@@ -9,9 +9,9 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:WebViewEditorControl">
-                        <Grid CornerRadius="3">
+                        <Grid CornerRadius="{StaticResource ControlCornerRadius}">
                             <Grid Background="White" Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}" />
-                            <muxc:WebView2 x:Name="WebView" />
+                            <WebView2 x:Name="WebView" />
                         </Grid>
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/Wino.Calendar/Styles/WinoCalendarTypeSelectorControl.xaml b/Wino.Mail.WinUI/Styles/WinoCalendarTypeSelectorControl.xaml
similarity index 85%
rename from Wino.Calendar/Styles/WinoCalendarTypeSelectorControl.xaml
rename to Wino.Mail.WinUI/Styles/WinoCalendarTypeSelectorControl.xaml
index 51aff54a..02e8caf8 100644
--- a/Wino.Calendar/Styles/WinoCalendarTypeSelectorControl.xaml
+++ b/Wino.Mail.WinUI/Styles/WinoCalendarTypeSelectorControl.xaml
@@ -2,8 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Wino.Calendar.Controls"
-    xmlns:controls1="using:Wino.Core.UWP.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+    xmlns:controls1="using:Wino.Mail.WinUI.Controls">
 
     <Style TargetType="controls:WinoCalendarTypeSelectorControl">
         <Style.Setters>
@@ -16,7 +15,6 @@
                             DefaultLabelPosition="Right">
 
                             <CommandBar.PrimaryCommands>
-                                <!--  Today  -->
                                 <AppBarButton
                                     x:Name="PART_TodayButton"
                                     Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
@@ -28,8 +26,6 @@
 
                                 <AppBarSeparator />
 
-                                <!--  Day  -->
-                                <!--  TODO: Specific days  -->
                                 <AppBarToggleButton
                                     x:Name="PART_DayToggle"
                                     Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
@@ -39,9 +35,6 @@
                                     </AppBarToggleButton.Icon>
                                 </AppBarToggleButton>
 
-                                <!--  Week  -->
-                                <!--  TODO: Work week  -->
-
                                 <AppBarToggleButton
                                     x:Name="PART_WeekToggle"
                                     Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
@@ -51,7 +44,15 @@
                                     </AppBarToggleButton.Icon>
                                 </AppBarToggleButton>
 
-                                <!--  Month  -->
+                                <AppBarToggleButton
+                                    x:Name="PART_WorkWeekToggle"
+                                    Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
+                                    Label="Work Week">
+                                    <AppBarToggleButton.Icon>
+                                        <controls1:WinoFontIcon Icon="CalendarWorkWeek" />
+                                    </AppBarToggleButton.Icon>
+                                </AppBarToggleButton>
+
                                 <AppBarToggleButton
                                     x:Name="PART_MonthToggle"
                                     Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
@@ -60,24 +61,11 @@
                                         <controls1:WinoFontIcon FontSize="44" Icon="CalendarMonth" />
                                     </AppBarToggleButton.Icon>
                                 </AppBarToggleButton>
-
-                                <!--  Year  -->
-                                <AppBarToggleButton
-                                    x:Name="PART_YearToggle"
-                                    Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
-                                    Label="Year">
-                                    <AppBarToggleButton.Icon>
-                                        <controls1:WinoFontIcon Icon="CalendarYear" />
-                                    </AppBarToggleButton.Icon>
-                                </AppBarToggleButton>
-
                             </CommandBar.PrimaryCommands>
                         </CommandBar>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style.Setters>
-
     </Style>
 </ResourceDictionary>
-
diff --git a/Wino.Mail/Styles/WinoExpanderStyle.xaml b/Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml
similarity index 84%
rename from Wino.Mail/Styles/WinoExpanderStyle.xaml
rename to Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml
index 0e455ff9..5de9c9d4 100644
--- a/Wino.Mail/Styles/WinoExpanderStyle.xaml
+++ b/Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     x:Class="Wino.Styles.WinoExpanderStyle"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -48,15 +48,8 @@
                         <VisualState.Storyboard>
                             <Storyboard>
                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentArea" Storyboard.TargetProperty="Visibility">
-                                    <DiscreteObjectKeyFrame KeyTime="0:0:0.111" Value="Collapsed" />
+                                    <DiscreteObjectKeyFrame KeyTime="0:0:0.011" Value="Collapsed" />
                                 </ObjectAnimationUsingKeyFrames>
-                                <DoubleAnimationUsingKeyFrames Storyboard.TargetName="ContentArea" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-                                    <DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
-                                    <SplineDoubleKeyFrame
-                                        KeySpline="1.0, 1.0, 0.0, 1.0"
-                                        KeyTime="0:0:0.111"
-                                        Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.NegativeContentHeight}" />
-                                </DoubleAnimationUsingKeyFrames>
                             </Storyboard>
                         </VisualState.Storyboard>
                     </VisualState>
diff --git a/Wino.Mail/Styles/WinoExpanderStyle.xaml.cs b/Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml.cs
similarity index 85%
rename from Wino.Mail/Styles/WinoExpanderStyle.xaml.cs
rename to Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml.cs
index 5c6720ca..864e153d 100644
--- a/Wino.Mail/Styles/WinoExpanderStyle.xaml.cs
+++ b/Wino.Mail.WinUI/Styles/WinoExpanderStyle.xaml.cs
@@ -1,4 +1,4 @@
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 
 namespace Wino.Styles;
 
diff --git a/Wino.Core.UWP/Styles/WinoInfoBar.xaml b/Wino.Mail.WinUI/Styles/WinoInfoBar.xaml
similarity index 99%
rename from Wino.Core.UWP/Styles/WinoInfoBar.xaml
rename to Wino.Mail.WinUI/Styles/WinoInfoBar.xaml
index 8b9452b2..20ab914a 100644
--- a/Wino.Core.UWP/Styles/WinoInfoBar.xaml
+++ b/Wino.Mail.WinUI/Styles/WinoInfoBar.xaml
@@ -1,8 +1,8 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:local="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <ResourceDictionary.ThemeDictionaries>
diff --git a/Wino.Mail.WinUI/ViewModels/ContactsShellClient.cs b/Wino.Mail.WinUI/ViewModels/ContactsShellClient.cs
new file mode 100644
index 00000000..fe530331
--- /dev/null
+++ b/Wino.Mail.WinUI/ViewModels/ContactsShellClient.cs
@@ -0,0 +1,72 @@
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Contacts;
+
+namespace Wino.Mail.WinUI.ViewModels;
+
+public sealed class ContactsShellClient(INavigationService navigationService) : CoreBaseViewModel, IShellClient
+{
+    private readonly NewContactMenuItem _newContactMenuItem = new();
+
+    public WinoApplicationMode Mode => WinoApplicationMode.Contacts;
+    public MenuItemCollection? MenuItems { get; private set; }
+    public object? SelectedMenuItem { get; set; }
+    public bool HandlesNavigationSelection => false;
+
+    protected override void OnDispatcherAssigned()
+    {
+        base.OnDispatcherAssigned();
+        MenuItems ??= new MenuItemCollection(Dispatcher);
+
+        if (MenuItems.Count == 0)
+        {
+            MenuItems.Add(_newContactMenuItem);
+        }
+    }
+
+    public void Activate(ShellModeActivationContext activationContext)
+    {
+        OnNavigatedTo(NavigationMode.New, activationContext);
+
+        if (MenuItems?.Count == 0)
+        {
+            MenuItems.Add(_newContactMenuItem);
+        }
+
+        navigationService.Navigate(WinoPage.ContactsPage, null, NavigationReferenceFrame.InnerShellFrame);
+    }
+
+    public void Deactivate()
+    {
+        OnNavigatedFrom(NavigationMode.New, null!);
+    }
+
+    public void PrepareForShellShutdown()
+    {
+        SelectedMenuItem = null;
+        if (MenuItems != null)
+        {
+            MenuItems.Clear();
+            MenuItems.Add(_newContactMenuItem);
+        }
+    }
+
+    public Task HandleNavigationItemInvokedAsync(IMenuItem? menuItem)
+    {
+        if (menuItem is NewContactMenuItem)
+        {
+            WeakReferenceMessenger.Default.Send(new NewContactRequested());
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task HandleNavigationSelectionChangedAsync(IMenuItem? menuItem) => Task.CompletedTask;
+}
diff --git a/Wino.Mail.WinUI/ViewModels/SettingsShellClient.cs b/Wino.Mail.WinUI/ViewModels/SettingsShellClient.cs
new file mode 100644
index 00000000..45abe10e
--- /dev/null
+++ b/Wino.Mail.WinUI/ViewModels/SettingsShellClient.cs
@@ -0,0 +1,167 @@
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Settings;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.Client.Shell;
+
+namespace Wino.Mail.WinUI.ViewModels;
+
+public partial class SettingsShellClient(INavigationService navigationService) :
+    CoreBaseViewModel,
+    IShellClient,
+    IRecipient<ActiveSettingsPageChanged>,
+    IRecipient<LanguageChanged>
+{
+    private bool _hasRegisteredPersistentRecipients;
+
+    public WinoApplicationMode Mode => WinoApplicationMode.Settings;
+    public MenuItemCollection? MenuItems { get; private set; }
+
+    [ObservableProperty]
+    public partial object? SelectedMenuItem { get; set; } = null;
+
+    public bool HandlesNavigationSelection => true;
+
+    protected override void OnDispatcherAssigned()
+    {
+        base.OnDispatcherAssigned();
+        MenuItems ??= new MenuItemCollection(Dispatcher);
+        RebuildMenuItems();
+    }
+
+    public void Activate(ShellModeActivationContext activationContext)
+    {
+        if (!_hasRegisteredPersistentRecipients)
+        {
+            RegisterRecipients();
+            _hasRegisteredPersistentRecipients = true;
+        }
+
+        RebuildMenuItems();
+
+        var targetPage = activationContext.Parameter as WinoPage? ?? WinoPage.SettingOptionsPage;
+        SetSelectedRootPage(SettingsNavigationInfoProvider.GetRootPage(targetPage));
+
+        navigationService.Navigate(WinoPage.SettingsPage, targetPage, NavigationReferenceFrame.InnerShellFrame);
+    }
+
+    public void Deactivate()
+    {
+    }
+
+    public void PrepareForShellShutdown()
+    {
+        if (_hasRegisteredPersistentRecipients)
+        {
+            UnregisterRecipients();
+            _hasRegisteredPersistentRecipients = false;
+        }
+
+        SelectedMenuItem = null;
+        MenuItems?.Clear();
+    }
+
+    public Task HandleNavigationItemInvokedAsync(IMenuItem? menuItem)
+    {
+        if (menuItem is not SettingsShellPageMenuItem settingsMenuItem)
+            return Task.CompletedTask;
+
+        var currentPage = (SelectedMenuItem as SettingsShellPageMenuItem)?.PageType;
+        if (currentPage == settingsMenuItem.PageType && settingsMenuItem.PageType != WinoPage.SettingOptionsPage)
+            return Task.CompletedTask;
+
+        SetSelectedRootPage(settingsMenuItem.PageType);
+        Messenger.Send(new SettingsRootNavigationRequested(settingsMenuItem.PageType));
+        return Task.CompletedTask;
+    }
+
+    public Task HandleNavigationSelectionChangedAsync(IMenuItem? menuItem)
+    {
+        if (menuItem is not SettingsShellPageMenuItem settingsMenuItem)
+            return Task.CompletedTask;
+
+        if ((SelectedMenuItem as SettingsShellPageMenuItem)?.PageType == settingsMenuItem.PageType)
+            return Task.CompletedTask;
+
+        SetSelectedRootPage(settingsMenuItem.PageType);
+        Messenger.Send(new SettingsRootNavigationRequested(settingsMenuItem.PageType));
+        return Task.CompletedTask;
+    }
+
+    public override Task KeyboardShortcutHook(KeyboardShortcutTriggerDetails args) => Task.CompletedTask;
+
+    public void Receive(ActiveSettingsPageChanged message)
+    {
+        SetSelectedRootPage(message.RootPage);
+    }
+
+    public void Receive(LanguageChanged message)
+    {
+        var selectedPage = (SelectedMenuItem as SettingsShellPageMenuItem)?.PageType ?? WinoPage.SettingOptionsPage;
+        RebuildMenuItems();
+        SetSelectedRootPage(selectedPage);
+    }
+
+    private void RebuildMenuItems()
+    {
+        if (MenuItems == null)
+            return;
+
+        var selectedPage = (SelectedMenuItem as SettingsShellPageMenuItem)?.PageType ?? WinoPage.SettingOptionsPage;
+
+        MenuItems.Clear();
+
+        foreach (var item in SettingsNavigationInfoProvider.GetNavigationItems())
+        {
+            if (item.IsSeparator)
+            {
+                MenuItems.Add(new SettingsShellSectionMenuItem(item.Title, item.Glyph));
+                continue;
+            }
+
+            if (!item.PageType.HasValue)
+                continue;
+
+            MenuItems.Add(new SettingsShellPageMenuItem(item.PageType.Value, item.Title, item.Description, item.Glyph));
+        }
+
+        SetSelectedRootPage(selectedPage);
+    }
+
+    private void SetSelectedRootPage(WinoPage pageType)
+    {
+        if (MenuItems == null)
+            return;
+
+        var rootPage = SettingsNavigationInfoProvider.GetRootPage(pageType);
+        var selectedItem = MenuItems.OfType<SettingsShellPageMenuItem>()
+            .FirstOrDefault(item => item.PageType == rootPage);
+
+        if (ReferenceEquals(SelectedMenuItem, selectedItem))
+            return;
+
+        SelectedMenuItem = selectedItem;
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+        Messenger.Register<ActiveSettingsPageChanged>(this);
+        Messenger.Register<LanguageChanged>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+        Messenger.Unregister<ActiveSettingsPageChanged>(this);
+        Messenger.Unregister<LanguageChanged>(this);
+    }
+}
diff --git a/Wino.Mail.WinUI/ViewModels/WinoAppShellViewModel.cs b/Wino.Mail.WinUI/ViewModels/WinoAppShellViewModel.cs
new file mode 100644
index 00000000..a741a3cc
--- /dev/null
+++ b/Wino.Mail.WinUI/ViewModels/WinoAppShellViewModel.cs
@@ -0,0 +1,121 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.ViewModels;
+
+namespace Wino.Mail.WinUI.ViewModels;
+
+public sealed class WinoAppShellViewModel : CoreBaseViewModel, IShellViewModel
+{
+    private readonly Dictionary<WinoApplicationMode, IShellClient> _shellClients;
+    private WinoApplicationMode _currentMode;
+
+    public WinoAppShellViewModel(IMailShellClient mailClient,
+                                 ICalendarShellClient calendarClient,
+                                 IEnumerable<IShellClient> shellClients,
+                                 IPreferencesService preferencesService,
+                                 IStatePersistanceService statePersistenceService,
+                                 INavigationService navigationService)
+    {
+        MailClient = mailClient;
+        CalendarClient = calendarClient;
+        PreferencesService = preferencesService;
+        StatePersistenceService = statePersistenceService;
+        NavigationService = navigationService;
+
+        _shellClients = shellClients.ToDictionary(client => client.Mode);
+
+        foreach (var client in _shellClients.Values)
+        {
+            client.PropertyChanged += ChildPropertyChanged;
+        }
+
+        StatePersistenceService.StatePropertyChanged += StatePersistenceServiceChanged;
+    }
+
+    public IMailShellClient MailClient { get; }
+    public ICalendarShellClient CalendarClient { get; }
+    public IPreferencesService PreferencesService { get; }
+    public IStatePersistanceService StatePersistenceService { get; }
+    public INavigationService NavigationService { get; }
+
+    public WinoApplicationMode CurrentMode
+    {
+        get => _currentMode;
+        private set
+        {
+            if (SetProperty(ref _currentMode, value))
+            {
+                OnPropertyChanged(nameof(CurrentClient));
+                OnPropertyChanged(nameof(CurrentMenuItems));
+                OnPropertyChanged(nameof(IsMailMode));
+                OnPropertyChanged(nameof(IsCalendarMode));
+                OnPropertyChanged(nameof(IsContactsMode));
+                OnPropertyChanged(nameof(IsSettingsMode));
+                OnPropertyChanged(nameof(SelectedMenuItem));
+            }
+        }
+    }
+
+    public IShellClient CurrentClient => GetClient(CurrentMode);
+    public bool IsMailMode => CurrentMode == WinoApplicationMode.Mail;
+    public bool IsCalendarMode => CurrentMode == WinoApplicationMode.Calendar;
+    public bool IsContactsMode => CurrentMode == WinoApplicationMode.Contacts;
+    public bool IsSettingsMode => CurrentMode == WinoApplicationMode.Settings;
+    public MenuItemCollection? CurrentMenuItems => CurrentClient.MenuItems;
+
+    public object? SelectedMenuItem
+    {
+        get => CurrentClient.SelectedMenuItem;
+        set
+        {
+            if (!ReferenceEquals(CurrentClient.SelectedMenuItem, value))
+            {
+                CurrentClient.SelectedMenuItem = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
+    public override void OnNavigatedTo(Core.Domain.Models.Navigation.NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+        CurrentMode = StatePersistenceService.ApplicationMode;
+    }
+
+    public IShellClient GetClient(WinoApplicationMode mode)
+        => _shellClients[mode];
+
+    public void SetCurrentMode(WinoApplicationMode mode)
+    {
+        CurrentMode = mode;
+        OnPropertyChanged(nameof(CurrentMenuItems));
+    }
+
+    private void ChildPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (ReferenceEquals(sender, CurrentClient))
+        {
+            if (e.PropertyName == nameof(IShellClient.SelectedMenuItem))
+            {
+                OnPropertyChanged(nameof(SelectedMenuItem));
+            }
+
+            if (e.PropertyName == nameof(IShellClient.MenuItems))
+            {
+                OnPropertyChanged(nameof(CurrentMenuItems));
+            }
+        }
+    }
+
+    private void StatePersistenceServiceChanged(object? sender, string propertyName)
+    {
+        if (propertyName == nameof(IStatePersistanceService.ApplicationMode))
+        {
+            SetCurrentMode(StatePersistenceService.ApplicationMode);
+        }
+    }
+}
diff --git a/Wino.Mail/Views/Abstract/AboutPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
similarity index 85%
rename from Wino.Mail/Views/Abstract/AboutPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
index e2e1725f..c5c5f636 100644
--- a/Wino.Mail/Views/Abstract/AboutPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AboutPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
index 04c78aea..285f84c2 100644
--- a/Wino.Mail/Views/Abstract/AccountDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountDetailsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
index a5cffe05..cf5edeb3 100644
--- a/Wino.Mail/Views/Abstract/AccountManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/AccountSetupProgressPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AccountSetupProgressPageAbstract.cs
new file mode 100644
index 00000000..8b0a2ee3
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/AccountSetupProgressPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class AccountSetupProgressPageAbstract : BasePage<AccountSetupProgressPageViewModel>
+{
+}
diff --git a/Wino.Mail/Views/Abstract/AliasManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/AliasManagementPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
index 9d0052d1..7ae52444 100644
--- a/Wino.Mail/Views/Abstract/AliasManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AliasManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail/Views/Abstract/AppPreferencesPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/AppPreferencesPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
index 878facfa..25541712 100644
--- a/Wino.Mail/Views/Abstract/AppPreferencesPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/AppPreferencesPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarAccountSettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarAccountSettingsPageAbstract.cs
new file mode 100644
index 00000000..33ddb038
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarAccountSettingsPageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Calendar.ViewModels;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class CalendarAccountSettingsPageAbstract : BasePage<CalendarAccountSettingsPageViewModel> { }
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarEventComposePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarEventComposePageAbstract.cs
new file mode 100644
index 00000000..07392be8
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarEventComposePageAbstract.cs
@@ -0,0 +1,5 @@
+using Wino.Calendar.ViewModels;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class CalendarEventComposePageAbstract : BasePage<CalendarEventComposePageViewModel> { }
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarNotificationSettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarNotificationSettingsPageAbstract.cs
new file mode 100644
index 00000000..6879f6c3
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarNotificationSettingsPageAbstract.cs
@@ -0,0 +1,5 @@
+using Wino.Calendar.ViewModels;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class CalendarNotificationSettingsPageAbstract : BasePage<CalendarNotificationSettingsPageViewModel> { }
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarPageAbstract.cs
new file mode 100644
index 00000000..c5ba5cb5
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarPageAbstract.cs
@@ -0,0 +1,12 @@
+using Wino.Calendar.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Calendar.Views.Abstract;
+
+public abstract class CalendarPageAbstract : BasePage<CalendarPageViewModel>
+{
+    protected CalendarPageAbstract()
+    {
+        NavigationCacheMode = Microsoft.UI.Xaml.Navigation.NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarPreferenceSettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarPreferenceSettingsPageAbstract.cs
new file mode 100644
index 00000000..77065c8f
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarPreferenceSettingsPageAbstract.cs
@@ -0,0 +1,5 @@
+using Wino.Calendar.ViewModels;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class CalendarPreferenceSettingsPageAbstract : BasePage<CalendarPreferenceSettingsPageViewModel> { }
diff --git a/Wino.Mail.WinUI/Views/Abstract/CalendarRenderingSettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CalendarRenderingSettingsPageAbstract.cs
new file mode 100644
index 00000000..f83cc0bf
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CalendarRenderingSettingsPageAbstract.cs
@@ -0,0 +1,5 @@
+using Wino.Calendar.ViewModels;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class CalendarRenderingSettingsPageAbstract : BasePage<CalendarRenderingSettingsPageViewModel> { }
diff --git a/Wino.Mail/Views/Abstract/ComposePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
similarity index 85%
rename from Wino.Mail/Views/Abstract/ComposePageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
index ed6c5879..d28981bb 100644
--- a/Wino.Mail/Views/Abstract/ComposePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/ComposePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/ContactsAppShellAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ContactsAppShellAbstract.cs
new file mode 100644
index 00000000..254233c1
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ContactsAppShellAbstract.cs
@@ -0,0 +1,9 @@
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class ContactsAppShellAbstract : BasePage
+{
+    protected ContactsAppShellAbstract()
+    {
+        NavigationCacheMode = Microsoft.UI.Xaml.Navigation.NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/ContactsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ContactsPageAbstract.cs
new file mode 100644
index 00000000..5f68fbb2
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ContactsPageAbstract.cs
@@ -0,0 +1,13 @@
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Mail.WinUI;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class ContactsPageAbstract : BasePage<ContactsPageViewModel>
+{
+    protected ContactsPageAbstract()
+    {
+        NavigationCacheMode = NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/CreateEmailTemplatePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/CreateEmailTemplatePageAbstract.cs
new file mode 100644
index 00000000..75d454dd
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/CreateEmailTemplatePageAbstract.cs
@@ -0,0 +1,7 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class CreateEmailTemplatePageAbstract : SettingsPageBase<CreateEmailTemplatePageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/EmailTemplatesPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/EmailTemplatesPageAbstract.cs
new file mode 100644
index 00000000..79809225
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/EmailTemplatesPageAbstract.cs
@@ -0,0 +1,7 @@
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class EmailTemplatesPageAbstract : SettingsPageBase<EmailTemplatesPageViewModel>
+{
+}
diff --git a/Wino.Calendar/Views/Abstract/EventDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/EventDetailsPageAbstract.cs
similarity index 67%
rename from Wino.Calendar/Views/Abstract/EventDetailsPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/EventDetailsPageAbstract.cs
index 9b9df6bb..620935a5 100644
--- a/Wino.Calendar/Views/Abstract/EventDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/EventDetailsPageAbstract.cs
@@ -1,6 +1,5 @@
 using Wino.Calendar.ViewModels;
-using Wino.Core.UWP;
 
-namespace Wino.Calendar.Views.Abstract;
+namespace Wino.Mail.WinUI.Views.Abstract;
 
 public abstract class EventDetailsPageAbstract : BasePage<EventDetailsPageViewModel> { }
diff --git a/Wino.Mail/Views/Abstract/IdlePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
similarity index 84%
rename from Wino.Mail/Views/Abstract/IdlePageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
index 73280adb..e2ca1152 100644
--- a/Wino.Mail/Views/Abstract/IdlePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/IdlePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/ImapCalDavSettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ImapCalDavSettingsPageAbstract.cs
new file mode 100644
index 00000000..768f50db
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ImapCalDavSettingsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.WinUI;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class ImapCalDavSettingsPageAbstract : BasePage<ImapCalDavSettingsPageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/KeyboardShortuctsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/KeyboardShortuctsPageAbstract.cs
new file mode 100644
index 00000000..d7497289
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/KeyboardShortuctsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Core.ViewModels;
+using Wino.Views.Abstract;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class KeyboardShortcutsPageAbstract : SettingsPageBase<KeyboardShortcutsPageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
new file mode 100644
index 00000000..8deb59fc
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/MailListPageAbstract.cs
@@ -0,0 +1,13 @@
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Mail.WinUI;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public partial class MailListPageAbstract : BasePage<MailListPageViewModel>
+{
+    protected MailListPageAbstract()
+    {
+        NavigationCacheMode = NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
similarity index 94%
rename from Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
index 918e3a16..3f7a35e4 100644
--- a/Wino.Mail/Views/Abstract/MailRenderingPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MailRenderingPageAbstract.cs
@@ -1,5 +1,5 @@
-using Windows.UI.Xaml;
-using Wino.Core.UWP;
+using Microsoft.UI.Xaml;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Core.UWP/Views/Abstract/ManageAccountsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
similarity index 58%
rename from Wino.Core.UWP/Views/Abstract/ManageAccountsPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
index 742763ad..4d61c001 100644
--- a/Wino.Core.UWP/Views/Abstract/ManageAccountsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/ManageAccountsPageAbstract.cs
@@ -1,6 +1,6 @@
-using Wino.Core.ViewModels;
+using Wino.Core.ViewModels;
 
-namespace Wino.Core.UWP.Views.Abstract;
+namespace Wino.Mail.WinUI.Views.Abstract;
 
 public abstract class ManageAccountsPageAbstract : BasePage<ManageAccountsPagePageViewModel>
 {
diff --git a/Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
similarity index 87%
rename from Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
index 6ea69ace..59df6904 100644
--- a/Wino.Mail/Views/Abstract/MergedAccountDetailsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MergedAccountDetailsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail/Views/Abstract/MessageListPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/MessageListPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
index af6462e3..4ac04ff9 100644
--- a/Wino.Mail/Views/Abstract/MessageListPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/MessageListPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs
similarity index 81%
rename from Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs
index 600aaf06..38cfb686 100644
--- a/Wino.Mail/Views/Abstract/PersonalizationPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/PersonalizationPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.ViewModels;
+using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
 
diff --git a/Wino.Mail.WinUI/Views/Abstract/ProviderSelectionPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ProviderSelectionPageAbstract.cs
new file mode 100644
index 00000000..8c65495a
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/ProviderSelectionPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class ProviderSelectionPageAbstract : BasePage<ProviderSelectionPageViewModel>
+{
+}
diff --git a/Wino.Mail/Views/Abstract/ReadComposePanePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
similarity index 86%
rename from Wino.Mail/Views/Abstract/ReadComposePanePageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
index 9af5b594..301777c3 100644
--- a/Wino.Mail/Views/Abstract/ReadComposePanePageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/ReadComposePanePageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Core.UWP/Views/Abstract/SettingOptionsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs
similarity index 81%
rename from Wino.Core.UWP/Views/Abstract/SettingOptionsPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs
index 34a3b020..b946d273 100644
--- a/Wino.Core.UWP/Views/Abstract/SettingOptionsPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingOptionsPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.ViewModels;
+using Wino.Core.ViewModels;
 
 namespace Wino.Views.Abstract;
 
diff --git a/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs
new file mode 100644
index 00000000..80502527
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingsPageAbstract.cs
@@ -0,0 +1,13 @@
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Mail.WinUI;
+using Wino.Core.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class SettingsPageAbstract : BasePage<SettingsPageViewModel>
+{
+    protected SettingsPageAbstract()
+    {
+        NavigationCacheMode = NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Core.UWP/Views/Abstract/SettingsPageBase.cs b/Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs
similarity index 90%
rename from Wino.Core.UWP/Views/Abstract/SettingsPageBase.cs
rename to Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs
index efb19ffa..5db86903 100644
--- a/Wino.Core.UWP/Views/Abstract/SettingsPageBase.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/SettingsPageBase.cs
@@ -1,6 +1,6 @@
-using Windows.UI.Xaml;
-using Wino.Core.UWP;
+using Microsoft.UI.Xaml;
 using Wino.Core.ViewModels;
+using Wino.Mail.WinUI;
 
 namespace Wino.Views.Abstract;
 
diff --git a/Wino.Mail.WinUI/Views/Abstract/SignatureAndEncryptionPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SignatureAndEncryptionPageAbstract.cs
new file mode 100644
index 00000000..6c75ebf3
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SignatureAndEncryptionPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Views.Abstract;
+
+public abstract class SignatureAndEncryptionPageAbstract : BasePage<SignatureAndEncryptionPageViewModel>
+{
+}
diff --git a/Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
similarity index 87%
rename from Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs
rename to Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
index 8130f9f0..708c9454 100644
--- a/Wino.Mail/Views/Abstract/SignatureManagementPageAbstract.cs
+++ b/Wino.Mail.WinUI/Views/Abstract/SignatureManagementPageAbstract.cs
@@ -1,4 +1,4 @@
-using Wino.Core.UWP;
+using Wino.Mail.WinUI;
 using Wino.Mail.ViewModels;
 
 namespace Wino.Views.Abstract;
diff --git a/Wino.Mail.WinUI/Views/Abstract/SpecialImapCredentialsPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/SpecialImapCredentialsPageAbstract.cs
new file mode 100644
index 00000000..7d5fb3bb
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/SpecialImapCredentialsPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Mail.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class SpecialImapCredentialsPageAbstract : BasePage<SpecialImapCredentialsPageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/StoragePageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/StoragePageAbstract.cs
new file mode 100644
index 00000000..e3fee54a
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/StoragePageAbstract.cs
@@ -0,0 +1,6 @@
+using Wino.Mail.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Views.Abstract;
+
+public abstract class StoragePageAbstract : BasePage<StoragePageViewModel> { }
diff --git a/Wino.Mail.WinUI/Views/Abstract/WelcomeHostPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/WelcomeHostPageAbstract.cs
new file mode 100644
index 00000000..8f91bcbd
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/WelcomeHostPageAbstract.cs
@@ -0,0 +1,8 @@
+using Wino.Core.ViewModels;
+using Wino.Mail.WinUI;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class WelcomeHostPageAbstract : BasePage<WelcomeHostPageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/WelcomePageV2Abstract.cs b/Wino.Mail.WinUI/Views/Abstract/WelcomePageV2Abstract.cs
new file mode 100644
index 00000000..ac4b2b5c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/WelcomePageV2Abstract.cs
@@ -0,0 +1,9 @@
+using Wino.Mail.WinUI;
+using Wino.Mail.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class WelcomePageV2Abstract : BasePage<WelcomePageV2ViewModel>
+{
+
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/WinoAccountManagementPageAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/WinoAccountManagementPageAbstract.cs
new file mode 100644
index 00000000..ee436e61
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/WinoAccountManagementPageAbstract.cs
@@ -0,0 +1,7 @@
+using Wino.Core.ViewModels;
+
+namespace Wino.Views.Abstract;
+
+public abstract class WinoAccountManagementPageAbstract : SettingsPageBase<WinoAccountManagementPageViewModel>
+{
+}
diff --git a/Wino.Mail.WinUI/Views/Abstract/WinoAppShellAbstract.cs b/Wino.Mail.WinUI/Views/Abstract/WinoAppShellAbstract.cs
new file mode 100644
index 00000000..ae75aba6
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Abstract/WinoAppShellAbstract.cs
@@ -0,0 +1,11 @@
+using Wino.Mail.WinUI.ViewModels;
+
+namespace Wino.Mail.WinUI.Views.Abstract;
+
+public abstract class WinoAppShellAbstract : BasePage<WinoAppShellViewModel>
+{
+    protected WinoAppShellAbstract()
+    {
+        NavigationCacheMode = Microsoft.UI.Xaml.Navigation.NavigationCacheMode.Disabled;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
new file mode 100644
index 00000000..ed123e9c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
@@ -0,0 +1,499 @@
+<abstract:AccountDetailsPageAbstract
+    x:Class="Wino.Views.AccountDetailsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
+    xmlns:calendar="using:Wino.Core.Domain.Entities.Calendar"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:controls1="using:Wino.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Core.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:folders="using:Wino.Core.Domain.Models.Folders"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
+    xmlns:local="using:Wino.Views"
+    xmlns:mailViewModels="using:Wino.Mail.ViewModels"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    x:Name="PageRoot"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Key="FolderStructureMenuFlyoutItemTemplate" x:DataType="folders:IMailItemFolder">
+            <TreeViewItem
+                CanDrag="False"
+                IsExpanded="True"
+                ItemsSource="{x:Bind ChildFolders}">
+                <Grid Height="32">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="200" />
+                    </Grid.ColumnDefinitions>
+                    <coreControls:WinoFontIcon FontSize="20" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(SpecialFolderType)}" />
+                    <TextBlock
+                        Grid.Column="1"
+                        Margin="12,0"
+                        VerticalAlignment="Center"
+                        Text="{x:Bind FolderName}" />
+
+                    <Grid Grid.Column="2">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <CheckBox
+                            MinWidth="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Checked="SyncFolderToggled"
+                            IsChecked="{x:Bind IsSynchronizationEnabled}"
+                            Tag="{x:Bind}"
+                            Unchecked="SyncFolderToggled"
+                            Visibility="{x:Bind IsMoveTarget}" />
+
+                        <CheckBox
+                            Grid.Column="1"
+                            MinWidth="0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Checked="UnreadBadgeCheckboxToggled"
+                            IsChecked="{x:Bind ShowUnreadCount}"
+                            Tag="{x:Bind}"
+                            Unchecked="UnreadBadgeCheckboxToggled"
+                            Visibility="{x:Bind IsMoveTarget}" />
+                    </Grid>
+                </Grid>
+            </TreeViewItem>
+        </DataTemplate>
+    </Page.Resources>
+
+    <ScrollViewer>
+        <Grid RowSpacing="12">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <controls:Segmented
+                x:Name="TabSelector"
+                Grid.Row="0"
+                HorizontalAlignment="Center"
+                SelectionChanged="OnTabSelectionChanged">
+                <controls:SegmentedItem Content="{x:Bind domain:Translator.AccountDetailsPage_TabGeneral, Mode=OneTime}">
+                    <controls:SegmentedItem.Icon>
+                        <SymbolIcon Symbol="ContactInfo" />
+                    </controls:SegmentedItem.Icon>
+                </controls:SegmentedItem>
+                <controls:SegmentedItem Content="{x:Bind domain:Translator.AccountDetailsPage_TabMail, Mode=OneTime}">
+                    <controls:SegmentedItem.Icon>
+                        <SymbolIcon Symbol="Mail" />
+                    </controls:SegmentedItem.Icon>
+                </controls:SegmentedItem>
+                <controls:SegmentedItem Content="{x:Bind domain:Translator.AccountDetailsPage_TabCalendar, Mode=OneTime}">
+                    <controls:SegmentedItem.Icon>
+                        <FontIcon Glyph="&#xE163;" />
+                    </controls:SegmentedItem.Icon>
+                </controls:SegmentedItem>
+            </controls:Segmented>
+
+            <Grid
+                x:Name="GeneralSettingsPanel"
+                Grid.Row="2"
+                Visibility="Collapsed">
+                <StackPanel>
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.AccountEditDialog_Message}" Header="{x:Bind domain:Translator.AccountDetailsPage_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <SymbolIcon Symbol="Contact" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <TextBox
+                            Width="250"
+                            PlaceholderText="{x:Bind domain:Translator.AccountSettingsDialog_AccountNamePlaceholder}"
+                            Text="{x:Bind ViewModel.AccountName, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsEditAccountDetails_Description}" Header="{x:Bind domain:Translator.AccountSettingsDialog_AccountName}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <SymbolIcon Symbol="Mail" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <TextBox
+                            Width="250"
+                            PlaceholderText="{x:Bind domain:Translator.AccountSettingsDialog_AccountNamePlaceholder}"
+                            Text="{x:Bind ViewModel.SenderName, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        ContentAlignment="Vertical"
+                        Description="{x:Bind domain:Translator.AccountDetailsPage_ColorPicker_Description}"
+                        Header="{x:Bind domain:Translator.AccountDetailsPage_ColorPicker_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 6.328125 11.835938 C 6.035156 11.835938 5.768229 11.894531 5.527344 12.011719 C 5.286458 12.128906 5.050456 12.259115 4.819336 12.402344 C 4.588216 12.545573 4.348958 12.675781 4.101562 12.792969 C 3.854167 12.910156 3.580729 12.96875 3.28125 12.96875 C 2.877604 12.96875 2.49349 12.871094 2.128906 12.675781 C 1.764323 12.480469 1.435547 12.255859 1.142578 12.001953 C 0.745443 11.656901 0.455729 11.261394 0.273438 10.81543 C 0.091146 10.369467 0 9.886068 0 9.365234 C 0 8.844401 0.071615 8.325195 0.214844 7.807617 C 0.358073 7.290039 0.533854 6.796875 0.742188 6.328125 C 0.970052 5.820312 1.233724 5.328776 1.533203 4.853516 C 1.832682 4.378256 2.158203 3.925781 2.509766 3.496094 C 2.828776 3.105469 3.167318 2.736004 3.525391 2.387695 C 3.883463 2.039389 4.277344 1.728516 4.707031 1.455078 C 5.442708 0.986328 6.225586 0.628256 7.055664 0.380859 C 7.885742 0.133465 8.736979 0.009766 9.609375 0.009766 C 10.436197 0.009766 11.25 0.117188 12.050781 0.332031 C 12.851562 0.546875 13.616536 0.849609 14.345703 1.240234 C 15.23763 1.728516 16.033527 2.298178 16.733398 2.949219 C 17.433268 3.600262 18.025715 4.322917 18.510742 5.117188 C 18.995768 5.911459 19.365234 6.769206 19.619141 7.69043 C 19.873047 8.611654 20 9.583334 20 10.605469 C 20 11.230469 19.952799 11.850586 19.858398 12.46582 C 19.763996 13.081055 19.62565 13.688151 19.443359 14.287109 C 19.300129 14.74935 19.119465 15.213217 18.901367 15.678711 C 18.683268 16.144205 18.427734 16.59017 18.134766 17.016602 C 17.841797 17.443033 17.516275 17.843424 17.158203 18.217773 C 16.800129 18.592123 16.411133 18.916016 15.991211 19.189453 C 15.571289 19.462891 15.12207 19.677734 14.643555 19.833984 C 14.165039 19.990234 13.662109 20.068359 13.134766 20.068359 C 12.841797 20.068359 12.553711 20.042318 12.270508 19.990234 C 11.987305 19.93815 11.708984 19.863281 11.435547 19.765625 C 10.86263 19.563803 10.371094 19.31315 9.960938 19.013672 C 9.550781 18.714193 9.210611 18.365885 8.94043 17.96875 C 8.670247 17.571615 8.465169 17.12565 8.325195 16.630859 C 8.185221 16.136068 8.095703 15.592448 8.056641 15 C 8.030599 14.641928 8.012695 14.283854 8.00293 13.925781 C 7.993164 13.567709 7.945963 13.212891 7.861328 12.861328 C 7.835286 12.763672 7.805989 12.659506 7.773438 12.548828 C 7.740885 12.438151 7.688802 12.347006 7.617188 12.275391 C 7.545573 12.197266 7.457682 12.128906 7.353516 12.070312 C 7.249349 12.011719 7.138672 11.966146 7.021484 11.933594 C 6.904297 11.901042 6.785481 11.876628 6.665039 11.860352 C 6.544596 11.844076 6.432292 11.835938 6.328125 11.835938 Z M 13.134766 18.818359 C 13.623047 18.818359 14.088541 18.725586 14.53125 18.540039 C 14.973958 18.354492 15.384114 18.108725 15.761719 17.802734 C 16.276041 17.386068 16.722004 16.894531 17.099609 16.328125 C 17.477213 15.761719 17.789713 15.157878 18.037109 14.516602 C 18.284504 13.875326 18.466797 13.214519 18.583984 12.53418 C 18.701172 11.853842 18.759766 11.191406 18.759766 10.546875 C 18.759766 9.641928 18.647461 8.785808 18.422852 7.978516 C 18.198242 7.171225 17.871094 6.420898 17.441406 5.727539 C 17.011719 5.03418 16.487629 4.404297 15.869141 3.837891 C 15.25065 3.271484 14.547525 2.773438 13.759766 2.34375 C 13.128255 1.998699 12.460938 1.728516 11.757812 1.533203 C 11.054688 1.337891 10.338541 1.240234 9.609375 1.240234 C 8.710938 1.240234 7.869466 1.383465 7.084961 1.669922 C 6.300456 1.956381 5.582682 2.351889 4.931641 2.856445 C 4.280599 3.361004 3.697917 3.953451 3.183594 4.633789 C 2.669271 5.314128 2.236328 6.048178 1.884766 6.835938 C 1.702474 7.233074 1.551107 7.64323 1.430664 8.066406 C 1.310221 8.489584 1.25 8.922526 1.25 9.365234 C 1.25 9.703776 1.302083 10.011394 1.40625 10.288086 C 1.510417 10.564779 1.689453 10.817058 1.943359 11.044922 C 2.014974 11.110026 2.104492 11.181641 2.211914 11.259766 C 2.319336 11.337891 2.431641 11.411133 2.548828 11.479492 C 2.666016 11.547852 2.783203 11.606445 2.900391 11.655273 C 3.017578 11.704102 3.125 11.728516 3.222656 11.728516 C 3.404948 11.728516 3.60026 11.668295 3.808594 11.547852 C 4.016927 11.427409 4.246419 11.297201 4.49707 11.157227 C 4.747721 11.017253 5.022786 10.887045 5.322266 10.766602 C 5.621745 10.646159 5.957031 10.585938 6.328125 10.585938 C 6.529948 10.585938 6.731771 10.603842 6.933594 10.639648 C 7.135416 10.675456 7.330729 10.722656 7.519531 10.78125 C 7.942708 10.917969 8.268229 11.113281 8.496094 11.367188 C 8.723958 11.621094 8.891602 11.912436 8.999023 12.241211 C 9.106445 12.569987 9.173177 12.928061 9.199219 13.31543 C 9.22526 13.7028 9.249674 14.098308 9.272461 14.501953 C 9.295247 14.9056 9.337564 15.309245 9.399414 15.712891 C 9.461263 16.116537 9.580078 16.499023 9.755859 16.860352 C 9.931641 17.22168 10.185547 17.552084 10.517578 17.851562 C 10.849609 18.151041 11.295572 18.398438 11.855469 18.59375 C 12.272135 18.74349 12.698566 18.818359 13.134766 18.818359 Z M 8.75 4.6875 C 8.75 4.427084 8.841146 4.20573 9.023438 4.023438 C 9.205729 3.841146 9.427083 3.75 9.6875 3.75 C 9.947916 3.75 10.169271 3.841146 10.351562 4.023438 C 10.533854 4.20573 10.625 4.427084 10.625 4.6875 C 10.625 4.947917 10.533854 5.169271 10.351562 5.351562 C 10.169271 5.533854 9.947916 5.625 9.6875 5.625 C 9.427083 5.625 9.205729 5.533854 9.023438 5.351562 C 8.841146 5.169271 8.75 4.947917 8.75 4.6875 Z M 12.5 5.9375 C 12.5 5.677084 12.591146 5.455729 12.773438 5.273438 C 12.955729 5.091146 13.177083 5.000001 13.4375 5 C 13.697916 5.000001 13.91927 5.091146 14.101562 5.273438 C 14.283854 5.455729 14.375 5.677084 14.375 5.9375 C 14.375 6.197917 14.283854 6.419271 14.101562 6.601562 C 13.91927 6.783855 13.697916 6.875001 13.4375 6.875 C 13.177083 6.875001 12.955729 6.783855 12.773438 6.601562 C 12.591146 6.419271 12.5 6.197917 12.5 5.9375 Z M 14.6875 8.75 C 14.6875 8.489584 14.778646 8.268229 14.960938 8.085938 C 15.143229 7.903646 15.364582 7.812501 15.625 7.8125 C 15.885416 7.812501 16.10677 7.903646 16.289062 8.085938 C 16.471354 8.268229 16.5625 8.489584 16.5625 8.75 C 16.5625 9.010417 16.471354 9.231771 16.289062 9.414062 C 16.10677 9.596354 15.885416 9.6875 15.625 9.6875 C 15.364582 9.6875 15.143229 9.596354 14.960938 9.414062 C 14.778646 9.231771 14.6875 9.010417 14.6875 8.75 Z M 14.6875 12.5 C 14.6875 12.239584 14.778646 12.018229 14.960938 11.835938 C 15.143229 11.653646 15.364582 11.5625 15.625 11.5625 C 15.885416 11.5625 16.10677 11.653646 16.289062 11.835938 C 16.471354 12.018229 16.5625 12.239584 16.5625 12.5 C 16.5625 12.760417 16.471354 12.981771 16.289062 13.164062 C 16.10677 13.346354 15.885416 13.4375 15.625 13.4375 C 15.364582 13.4375 15.143229 13.346354 14.960938 13.164062 C 14.778646 12.981771 14.6875 12.760417 14.6875 12.5 Z M 12.1875 15 C 12.187499 14.739584 12.278645 14.518229 12.460938 14.335938 C 12.643229 14.153646 12.864583 14.0625 13.125 14.0625 C 13.385416 14.0625 13.606771 14.153646 13.789062 14.335938 C 13.971354 14.518229 14.062499 14.739584 14.0625 15 C 14.062499 15.260417 13.971354 15.481771 13.789062 15.664062 C 13.606771 15.846354 13.385416 15.9375 13.125 15.9375 C 12.864583 15.9375 12.643229 15.846354 12.460938 15.664062 C 12.278645 15.481771 12.187499 15.260417 12.1875 15 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <GridView
+                                ItemTemplate="{StaticResource AccountColorTemplate}"
+                                ItemsSource="{x:Bind ViewModel.AvailableColors}"
+                                SelectedItem="{x:Bind ViewModel.SelectedColor, Mode=TwoWay}" />
+
+                            <Button
+                                Grid.Row="1"
+                                Width="100"
+                                HorizontalAlignment="Right"
+                                Command="{x:Bind ViewModel.ResetColorCommand}"
+                                Content="{x:Bind domain:Translator.Buttons_Reset}" />
+                        </Grid>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard
+                        Description="{x:Bind domain:Translator.SettingsEditAccountDetails_ImapCalDavSettings_Description}"
+                        Header="{x:Bind domain:Translator.SettingsEditAccountDetails_ImapCalDavSettings_Title}"
+                        Visibility="{x:Bind ViewModel.IsImapServer, Mode=OneWay}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 20 10 C 20 10.768229 19.913736 11.518555 19.741211 12.250977 C 19.568684 12.983398 19.322916 13.680014 19.003906 14.34082 C 18.684895 15.001628 18.295898 15.621745 17.836914 16.201172 C 17.37793 16.7806 16.863605 17.303061 16.293945 17.768555 C 15.724283 18.234049 15.102538 18.634439 14.428711 18.969727 C 13.754882 19.305014 13.043619 19.560547 12.294922 19.736328 C 12.431641 19.423828 12.5 19.095053 12.5 18.75 L 12.5 16.396484 C 12.695312 15.973308 12.864583 15.540365 13.007812 15.097656 C 13.151041 14.654948 13.271484 14.205729 13.369141 13.75 L 12.5 13.75 L 12.5 12.5 L 13.583984 12.5 C 13.636067 12.083334 13.676758 11.668295 13.706055 11.254883 C 13.735352 10.841472 13.75 10.423178 13.75 10 C 13.75 9.576823 13.735352 9.158529 13.706055 8.745117 C 13.676758 8.331706 13.636067 7.916667 13.583984 7.5 L 6.40625 7.5 C 6.354166 7.929688 6.315104 8.346354 6.289062 8.75 L 5.039062 8.75 C 5.052083 8.541667 5.066731 8.333334 5.083008 8.125 C 5.099284 7.916668 5.123698 7.708334 5.15625 7.5 L 1.611328 7.5 C 1.552734 7.708334 1.499023 7.916668 1.450195 8.125 C 1.401367 8.333334 1.363932 8.541667 1.337891 8.75 C 1.103516 8.75 0.882161 8.774414 0.673828 8.823242 C 0.465495 8.87207 0.257161 8.951823 0.048828 9.0625 C 0.126953 8.209637 0.307617 7.392579 0.59082 6.611328 C 0.874023 5.830079 1.241862 5.104168 1.694336 4.433594 C 2.14681 3.763021 2.672526 3.154297 3.271484 2.607422 C 3.870443 2.060547 4.524739 1.595053 5.234375 1.210938 C 5.94401 0.826824 6.700846 0.528973 7.504883 0.317383 C 8.308919 0.105795 9.140625 0 10 0 C 10.917969 0 11.803385 0.118816 12.65625 0.356445 C 13.509114 0.594076 14.305013 0.93099 15.043945 1.367188 C 15.782877 1.803387 16.456705 2.325848 17.06543 2.93457 C 17.674152 3.543295 18.196613 4.217123 18.632812 4.956055 C 19.06901 5.694987 19.405924 6.490886 19.643555 7.34375 C 19.881184 8.196615 20 9.082031 20 10 Z M 13.369141 6.25 C 13.317057 6.009115 13.242188 5.717773 13.144531 5.375977 C 13.046875 5.03418 12.926432 4.679362 12.783203 4.311523 C 12.639973 3.943686 12.473957 3.575848 12.285156 3.208008 C 12.096354 2.84017 11.884766 2.511395 11.650391 2.22168 C 11.416016 1.931967 11.162109 1.697592 10.888672 1.518555 C 10.615234 1.33952 10.31901 1.25 10 1.25 C 9.680989 1.25 9.384766 1.33952 9.111328 1.518555 C 8.837891 1.697592 8.583984 1.931967 8.349609 2.22168 C 8.115234 2.511395 7.903646 2.84017 7.714844 3.208008 C 7.526042 3.575848 7.360026 3.943686 7.216797 4.311523 C 7.073567 4.679362 6.953125 5.03418 6.855469 5.375977 C 6.757812 5.717773 6.682942 6.009115 6.630859 6.25 Z M 5.351562 6.25 C 5.429688 5.859375 5.522461 5.463867 5.629883 5.063477 C 5.737305 4.663086 5.864258 4.269206 6.010742 3.881836 C 6.157227 3.494467 6.326497 3.116863 6.518555 2.749023 C 6.710612 2.381186 6.923828 2.037762 7.158203 1.71875 C 6.598307 1.907553 6.067708 2.151693 5.566406 2.451172 C 5.065104 2.750652 4.597981 3.092449 4.165039 3.476562 C 3.732096 3.860678 3.341471 4.287109 2.993164 4.755859 C 2.644857 5.224609 2.34375 5.722656 2.089844 6.25 Z M 17.900391 6.25 C 17.652994 5.722656 17.353516 5.226237 17.001953 4.760742 C 16.650391 4.295248 16.258137 3.868816 15.825195 3.481445 C 15.392252 3.094076 14.925129 2.752279 14.423828 2.456055 C 13.922525 2.159832 13.395182 1.917318 12.841797 1.728516 C 13.082682 2.047527 13.297525 2.389324 13.486328 2.753906 C 13.675129 3.11849 13.842772 3.496094 13.989258 3.886719 C 14.135741 4.277345 14.262694 4.672853 14.370117 5.073242 C 14.477538 5.473634 14.570312 5.865887 14.648438 6.25 Z M 14.84375 7.5 C 14.902344 7.916667 14.943033 8.331706 14.96582 8.745117 C 14.988605 9.158529 14.999999 9.576823 15 10 C 14.999999 10.423178 14.988605 10.841472 14.96582 11.254883 C 14.943033 11.668295 14.902344 12.083334 14.84375 12.5 L 18.388672 12.5 C 18.629557 11.699219 18.75 10.865886 18.75 10 C 18.75 9.134115 18.629557 8.300781 18.388672 7.5 Z M 10 10 C 10.169271 10 10.330403 10.032553 10.483398 10.097656 C 10.636393 10.162761 10.769856 10.252279 10.883789 10.366211 C 10.997721 10.480144 11.087239 10.613607 11.152344 10.766602 C 11.217447 10.919597 11.25 11.080729 11.25 11.25 L 11.25 16.25 C 11.25 16.419271 11.217447 16.580404 11.152344 16.733398 C 11.087239 16.886393 10.997721 17.019857 10.883789 17.133789 C 10.769856 17.247721 10.636393 17.33724 10.483398 17.402344 C 10.330403 17.467447 10.169271 17.5 10 17.5 L 7.5 17.5 L 7.5 18.75 L 7.841797 18.75 C 7.952474 18.75 8.061523 18.75651 8.168945 18.769531 C 8.276367 18.782553 8.374023 18.810221 8.461914 18.852539 C 8.549805 18.894857 8.619791 18.956705 8.671875 19.038086 C 8.723958 19.119467 8.75 19.231771 8.75 19.375 C 8.75 19.544271 8.68815 19.690756 8.564453 19.814453 C 8.440755 19.93815 8.294271 20 8.125 20 L 3.125 20 C 2.955729 20 2.809245 19.93815 2.685547 19.814453 C 2.561849 19.690756 2.5 19.544271 2.5 19.375 C 2.5 19.231771 2.526042 19.119467 2.578125 19.038086 C 2.630208 18.956705 2.700195 18.894857 2.788086 18.852539 C 2.875977 18.810221 2.973633 18.782553 3.081055 18.769531 C 3.188477 18.75651 3.297526 18.75 3.408203 18.75 L 3.75 18.75 L 3.75 17.5 L 1.25 17.5 C 1.080729 17.5 0.919596 17.467447 0.766602 17.402344 C 0.613607 17.33724 0.480143 17.247721 0.366211 17.133789 C 0.252279 17.019857 0.16276 16.886393 0.097656 16.733398 C 0.032552 16.580404 0 16.419271 0 16.25 L 0 11.25 C 0 11.080729 0.032552 10.919597 0.097656 10.766602 C 0.16276 10.613607 0.252279 10.480144 0.366211 10.366211 C 0.480143 10.252279 0.613607 10.162761 0.766602 10.097656 C 0.919596 10.032553 1.080729 10 1.25 10 Z M 17.900391 13.75 L 14.648438 13.75 C 14.570312 14.140625 14.477538 14.536133 14.370117 14.936523 C 14.262694 15.336914 14.135741 15.730795 13.989258 16.118164 C 13.842772 16.505533 13.673502 16.883139 13.481445 17.250977 C 13.289388 17.618814 13.076172 17.96224 12.841797 18.28125 C 13.395182 18.092447 13.922525 17.848307 14.423828 17.548828 C 14.925129 17.24935 15.392252 16.907553 15.825195 16.523438 C 16.258137 16.139322 16.648762 15.712891 16.99707 15.244141 C 17.345377 14.775391 17.646484 14.277344 17.900391 13.75 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <Button
+                            Width="160"
+                            HorizontalAlignment="Right"
+                            Command="{x:Bind ViewModel.EditImapCalDavSettingsCommand}"
+                            Content="{x:Bind domain:Translator.SettingsEditAccountDetails_ImapCalDavSettings_Action}"
+                            Style="{ThemeResource AccentButtonStyle}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.Buttons_Save}" Header="{x:Bind domain:Translator.SettingsEditAccountDetails_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <SymbolIcon Symbol="Save" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <Button
+                            Width="100"
+                            HorizontalAlignment="Right"
+                            Command="{x:Bind ViewModel.SaveChangesCommand}"
+                            Content="{x:Bind domain:Translator.Buttons_Save}"
+                            Style="{ThemeResource AccentButtonStyle}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsDeleteAccount_Description}" Header="{x:Bind domain:Translator.SettingsDeleteAccount_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <SymbolIcon Symbol="Delete" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <Button
+                            Width="100"
+                            Background="{ThemeResource DeleteBrush}"
+                            Command="{x:Bind ViewModel.DeleteAccountCommand}"
+                            Content="{x:Bind domain:Translator.Buttons_Delete}" />
+                    </controls:SettingsCard>
+                </StackPanel>
+
+
+            </Grid>
+
+            <!--  Mail Settings Panel  -->
+            <Grid
+                x:Name="MailSettingsPanel"
+                Grid.Row="2"
+                Visibility="Collapsed">
+                <StackPanel Spacing="4">
+                    <StackPanel.ChildrenTransitions>
+                        <TransitionCollection>
+                            <RepositionThemeTransition IsStaggeringEnabled="False" />
+                        </TransitionCollection>
+                    </StackPanel.ChildrenTransitions>
+
+
+                    <controls:SettingsCard
+                        Command="{x:Bind ViewModel.EditAliasesCommand}"
+                        Description="{x:Bind domain:Translator.SettingsManageAliases_Description}"
+                        Header="{x:Bind domain:Translator.SettingsManageAliases_Title}"
+                        IsClickEnabled="True">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.440104 0 10.089518 0.130209 10.698242 0.390625 C 11.306966 0.651043 11.837564 1.007488 12.290039 1.459961 C 12.742513 1.912436 13.098958 2.443035 13.359375 3.051758 C 13.619791 3.660482 13.75 4.309896 13.75 5 C 13.75 5.690104 13.619791 6.339519 13.359375 6.948242 C 13.098958 7.556967 12.742513 8.087565 12.290039 8.540039 C 11.837564 8.992514 11.306966 9.348959 10.698242 9.609375 C 10.089518 9.869792 9.440104 10 8.75 10 C 8.059896 10 7.410481 9.869792 6.801758 9.609375 C 6.193034 9.348959 5.662435 8.992514 5.209961 8.540039 C 4.757487 8.087565 4.401042 7.556967 4.140625 6.948242 C 3.880208 6.339519 3.75 5.690104 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 0 13.681641 C 0 13.349609 0.068359 13.035482 0.205078 12.739258 C 0.341797 12.443034 0.525716 12.184245 0.756836 11.962891 C 0.987956 11.741537 1.254883 11.567383 1.557617 11.44043 C 1.860352 11.313477 2.177734 11.25 2.509766 11.25 L 15 11.25 C 15.455729 11.25 15.87565 11.363933 16.259766 11.591797 C 16.643879 11.819662 16.949869 12.132162 17.177734 12.529297 C 17.067057 12.509766 16.962891 12.5 16.865234 12.5 C 16.676432 12.5 16.495768 12.52767 16.323242 12.583008 C 16.150715 12.638347 15.986328 12.714844 15.830078 12.8125 C 15.7194 12.708334 15.59082 12.630209 15.444336 12.578125 C 15.297852 12.526042 15.149739 12.5 15 12.5 L 2.509766 12.5 C 2.333984 12.5 2.169596 12.532553 2.016602 12.597656 C 1.863607 12.662761 1.730143 12.750651 1.616211 12.861328 C 1.502279 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.394531 1.359049 14.964193 1.577148 15.458984 C 1.795247 15.953776 2.089844 16.385092 2.460938 16.75293 C 2.832031 17.120768 3.261719 17.430014 3.75 17.680664 C 4.238281 17.931314 4.754231 18.134766 5.297852 18.291016 C 5.841471 18.447266 6.396484 18.561197 6.962891 18.632812 C 7.529297 18.704428 8.072916 18.74349 8.59375 18.75 L 9.814453 19.960938 C 9.638672 19.973959 9.461263 19.983725 9.282227 19.990234 C 9.103189 19.996744 8.925781 20 8.75 20 C 8.085938 20 7.408854 19.954428 6.71875 19.863281 C 6.028646 19.772135 5.3597 19.624023 4.711914 19.418945 C 4.064127 19.213867 3.453776 18.948568 2.880859 18.623047 C 2.307943 18.297525 1.808268 17.900391 1.381836 17.431641 C 0.955404 16.962891 0.61849 16.419271 0.371094 15.800781 C 0.123698 15.182292 0 14.475912 0 13.681641 Z M 8.75 16.875 C 8.75 16.705729 8.811849 16.559244 8.935547 16.435547 L 11.435547 13.935547 C 11.559244 13.81185 11.705729 13.75 11.875 13.75 C 12.04427 13.75 12.190754 13.81185 12.314453 13.935547 C 12.43815 14.059245 12.5 14.205729 12.5 14.375 C 12.5 14.544271 12.43815 14.690756 12.314453 14.814453 L 10.888672 16.25 L 17.861328 16.25 L 16.435547 14.814453 C 16.311848 14.690756 16.25 14.544271 16.25 14.375 C 16.25 14.205729 16.311848 14.059245 16.435547 13.935547 C 16.559244 13.81185 16.705729 13.75 16.875 13.75 C 17.04427 13.75 17.190754 13.81185 17.314453 13.935547 L 19.814453 16.435547 C 19.93815 16.559244 20 16.705729 20 16.875 C 20 17.044271 19.93815 17.190756 19.814453 17.314453 L 17.314453 19.814453 C 17.190754 19.93815 17.04427 20 16.875 20 C 16.705729 20 16.559244 19.93815 16.435547 19.814453 C 16.311848 19.690756 16.25 19.544271 16.25 19.375 C 16.25 19.205729 16.311848 19.059244 16.435547 18.935547 L 17.861328 17.5 L 10.888672 17.5 L 12.314453 18.935547 C 12.43815 19.059244 12.5 19.205729 12.5 19.375 C 12.5 19.544271 12.43815 19.690756 12.314453 19.814453 C 12.190754 19.93815 12.04427 20 11.875 20 C 11.705729 20 11.559244 19.93815 11.435547 19.814453 L 8.935547 17.314453 C 8.811849 17.190756 8.75 17.044271 8.75 16.875 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsFolderOptions_Description}" Header="{x:Bind domain:Translator.SettingsFolderOptions_Title}">
+                        <controls:SettingsExpander.HeaderIcon>
+                            <PathIcon Data="F1 M 3.056641 18.75 C 2.646484 18.75 2.255859 18.666992 1.884766 18.500977 C 1.513672 18.334961 1.189779 18.113607 0.913086 17.836914 C 0.636393 17.560221 0.415039 17.236328 0.249023 16.865234 C 0.083008 16.494141 0 16.103516 0 15.693359 L 0 4.306641 C 0 3.896484 0.083008 3.505859 0.249023 3.134766 C 0.415039 2.763672 0.636393 2.439779 0.913086 2.163086 C 1.189779 1.886395 1.513672 1.665039 1.884766 1.499023 C 2.255859 1.333008 2.646484 1.25 3.056641 1.25 L 6.875 1.25 C 7.324219 1.25 7.711588 1.319988 8.037109 1.459961 C 8.36263 1.599936 8.653971 1.787109 8.911133 2.021484 C 9.168294 2.255859 9.407552 2.522787 9.628906 2.822266 C 9.85026 3.121746 10.078125 3.43099 10.3125 3.75 L 16.943359 3.75 C 17.353516 3.75 17.744141 3.833008 18.115234 3.999023 C 18.486328 4.165039 18.810221 4.386394 19.086914 4.663086 C 19.363605 4.939779 19.584961 5.263672 19.750977 5.634766 C 19.916992 6.005859 20 6.396484 20 6.806641 L 20 9.902344 C 19.817707 9.674479 19.622395 9.456381 19.414062 9.248047 C 19.205729 9.039714 18.984375 8.847656 18.75 8.671875 L 18.75 6.875 C 18.75 6.621095 18.701172 6.380209 18.603516 6.152344 C 18.505859 5.924479 18.370768 5.724284 18.198242 5.551758 C 18.025715 5.379232 17.82552 5.244142 17.597656 5.146484 C 17.369791 5.048829 17.128906 5.000001 16.875 5 L 10.185547 5 C 9.957682 5.14974 9.736328 5.299479 9.521484 5.449219 C 9.306641 5.598959 9.086914 5.732423 8.862305 5.849609 C 8.637695 5.966798 8.40332 6.062826 8.15918 6.137695 C 7.915039 6.212565 7.649739 6.25 7.363281 6.25 L 1.25 6.25 L 1.25 15.625 C 1.25 15.878906 1.298828 16.119791 1.396484 16.347656 C 1.494141 16.575521 1.629232 16.775717 1.801758 16.948242 C 1.974284 17.120768 2.174479 17.255859 2.402344 17.353516 C 2.630208 17.451172 2.871094 17.5 3.125 17.5 L 7.900391 17.5 C 8.011067 17.721354 8.129883 17.936197 8.256836 18.144531 C 8.383789 18.352865 8.522135 18.554688 8.671875 18.75 Z M 7.363281 5 C 7.539062 5.000001 7.701823 4.977215 7.851562 4.931641 C 8.001302 4.886068 8.147786 4.825847 8.291016 4.750977 C 8.434244 4.676107 8.570963 4.5931 8.701172 4.501953 C 8.83138 4.410808 8.964844 4.316406 9.101562 4.21875 C 8.951822 4.016928 8.805338 3.813477 8.662109 3.608398 C 8.51888 3.40332 8.36263 3.219402 8.193359 3.056641 C 8.024088 2.893881 7.833658 2.760418 7.62207 2.65625 C 7.410481 2.552084 7.161458 2.5 6.875 2.5 L 3.125 2.5 C 2.871094 2.5 2.630208 2.548828 2.402344 2.646484 C 2.174479 2.744141 1.974284 2.879232 1.801758 3.051758 C 1.629232 3.224285 1.494141 3.42448 1.396484 3.652344 C 1.298828 3.880209 1.25 4.121094 1.25 4.375 L 1.25 5 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 16.875 13.75 C 17.04427 13.75 17.190754 13.688151 17.314453 13.564453 C 17.43815 13.440756 17.5 13.294271 17.5 13.125 L 17.5 11.25 C 17.5 11.080729 17.43815 10.934245 17.314453 10.810547 C 17.190754 10.68685 17.04427 10.625 16.875 10.625 C 16.751301 10.625 16.650391 10.647787 16.572266 10.693359 C 16.494141 10.738933 16.430664 10.799154 16.381836 10.874023 C 16.333008 10.948894 16.298828 11.035156 16.279297 11.132812 C 16.259766 11.230469 16.25 11.331381 16.25 11.435547 C 15.94401 11.272787 15.642902 11.149089 15.34668 11.064453 C 15.050455 10.979818 14.726562 10.9375 14.375 10.9375 C 14.140625 10.9375 13.901367 10.961914 13.657227 11.010742 C 13.413086 11.05957 13.173828 11.131186 12.939453 11.225586 C 12.705078 11.319987 12.482096 11.43392 12.270508 11.567383 C 12.058919 11.700847 11.875 11.855469 11.71875 12.03125 C 11.660156 12.096354 11.614583 12.163086 11.582031 12.231445 C 11.549479 12.299805 11.533203 12.379558 11.533203 12.470703 C 11.533203 12.646484 11.595052 12.796225 11.71875 12.919922 C 11.842447 13.04362 11.992188 13.105469 12.167969 13.105469 C 12.278645 13.105469 12.39746 13.058269 12.524414 12.963867 C 12.651366 12.869467 12.799479 12.763672 12.96875 12.646484 C 13.138021 12.529297 13.334961 12.423503 13.55957 12.329102 C 13.78418 12.234701 14.049479 12.1875 14.355469 12.1875 C 14.583333 12.1875 14.794922 12.211914 14.990234 12.260742 C 15.185547 12.30957 15.384114 12.389323 15.585938 12.5 L 15.332031 12.5 C 15.214844 12.5 15.099283 12.504883 14.985352 12.514648 C 14.871419 12.524414 14.76888 12.550456 14.677734 12.592773 C 14.586588 12.635092 14.513346 12.698568 14.458008 12.783203 C 14.402669 12.867839 14.375 12.981771 14.375 13.125 C 14.375 13.294271 14.436849 13.440756 14.560547 13.564453 C 14.684244 13.688151 14.830729 13.75 15 13.75 Z M 12.5 17.314453 C 12.805989 17.477213 13.107096 17.600912 13.40332 17.685547 C 13.699544 17.770182 14.023438 17.8125 14.375 17.8125 C 14.609375 17.8125 14.85026 17.788086 15.097656 17.739258 C 15.345051 17.69043 15.584309 17.618814 15.81543 17.524414 C 16.046549 17.430014 16.266275 17.31608 16.474609 17.182617 C 16.682941 17.049154 16.868488 16.894531 17.03125 16.71875 C 17.154947 16.588541 17.216797 16.438803 17.216797 16.269531 C 17.216797 16.100262 17.154947 15.953776 17.03125 15.830078 C 16.907551 15.706381 16.761066 15.644531 16.591797 15.644531 C 16.461588 15.644531 16.334635 15.691732 16.210938 15.786133 C 16.087238 15.880534 15.94401 15.986328 15.78125 16.103516 C 15.618489 16.220703 15.426432 16.326498 15.205078 16.420898 C 14.983724 16.515299 14.713541 16.5625 14.394531 16.5625 C 14.166666 16.5625 13.955078 16.538086 13.759766 16.489258 C 13.564453 16.44043 13.365885 16.360678 13.164062 16.25 L 13.417969 16.25 C 13.528646 16.25 13.64095 16.245117 13.754883 16.235352 C 13.868814 16.225586 13.971354 16.199545 14.0625 16.157227 C 14.153646 16.114908 14.228516 16.051432 14.287109 15.966797 C 14.345703 15.882162 14.375 15.768229 14.375 15.625 C 14.375 15.455729 14.31315 15.309245 14.189453 15.185547 C 14.065754 15.06185 13.91927 15 13.75 15 L 11.875 15 C 11.705729 15 11.559244 15.06185 11.435547 15.185547 C 11.311849 15.309245 11.25 15.455729 11.25 15.625 L 11.25 17.5 C 11.25 17.669271 11.311849 17.815756 11.435547 17.939453 C 11.559244 18.06315 11.705729 18.125 11.875 18.125 C 11.998697 18.125 12.099609 18.102213 12.177734 18.056641 C 12.255859 18.011068 12.319336 17.950846 12.368164 17.875977 C 12.416992 17.801107 12.451172 17.714844 12.470703 17.617188 C 12.490234 17.519531 12.5 17.418619 12.5 17.314453 Z " />
+                        </controls:SettingsExpander.HeaderIcon>
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard
+                                ActionIcon="Add"
+                                Description="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Description}"
+                                Header="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Title}"
+                                IsActionIconVisible="True">
+                                <controls:SettingsCard.Content>
+                                    <Button Command="{x:Bind ViewModel.SetupSpecialFoldersCommand}" Content="{x:Bind domain:Translator.SettingConfigureSpecialFolders_Button}" />
+                                </controls:SettingsCard.Content>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
+                                ContentAlignment="Vertical">
+                                <ScrollViewer>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="200" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+
+                                        <!--  Headers  -->
+                                        <Grid Grid.Column="1">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+
+                                            <TextBlock
+                                                FontWeight="SemiBold"
+                                                Text="Synchronize"
+                                                TextWrapping="Wrap" />
+                                            <TextBlock
+                                                Grid.Column="1"
+                                                FontWeight="SemiBold"
+                                                Text="Unread Badge"
+                                                TextWrapping="Wrap" />
+                                        </Grid>
+
+                                        <!--  TODO: Items here are draggable. Which is causing tree view to crash.  -->
+                                        <TreeView
+                                            x:Name="FolderTreeView"
+                                            Grid.Row="1"
+                                            Grid.ColumnSpan="2"
+                                            CanDragItems="False"
+                                            CanReorderItems="False"
+                                            ItemTemplate="{StaticResource FolderStructureMenuFlyoutItemTemplate}"
+                                            ItemsSource="{x:Bind ViewModel.CurrentFolders, Mode=OneWay}"
+                                            SelectionMode="None" />
+                                    </Grid>
+                                </ScrollViewer>
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+
+                    <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsNotificationsAndTaskbar_Description}" Header="{x:Bind domain:Translator.SettingsNotificationsAndTaskbar_Title}">
+                        <controls:SettingsExpander.HeaderIcon>
+                            <PathIcon
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="F1 M 8.125 16.25 C 7.871094 16.25 7.630208 16.201172 7.402344 16.103516 C 7.174479 16.005859 6.974283 15.870769 6.801758 15.698242 C 6.629231 15.525717 6.494141 15.325521 6.396484 15.097656 C 6.298828 14.869792 6.25 14.628906 6.25 14.375 L 6.25 5.625 C 6.25 5.371094 6.298828 5.130209 6.396484 4.902344 C 6.494141 4.67448 6.629231 4.474285 6.801758 4.301758 C 6.974283 4.129232 7.174479 3.994141 7.402344 3.896484 C 7.630208 3.798828 7.871094 3.75 8.125 3.75 L 18.125 3.75 C 18.378906 3.75 18.619791 3.798828 18.847656 3.896484 C 19.07552 3.994141 19.275715 4.129232 19.448242 4.301758 C 19.620768 4.474285 19.755859 4.67448 19.853516 4.902344 C 19.951172 5.130209 20 5.371094 20 5.625 L 20 14.375 C 20 14.628906 19.951172 14.869792 19.853516 15.097656 C 19.755859 15.325521 19.620768 15.525717 19.448242 15.698242 C 19.275715 15.870769 19.07552 16.005859 18.847656 16.103516 C 18.619791 16.201172 18.378906 16.25 18.125 16.25 Z M 18.125 15 C 18.29427 15 18.440754 14.938151 18.564453 14.814453 C 18.68815 14.690756 18.75 14.544271 18.75 14.375 L 18.75 5.625 C 18.75 5.455729 18.68815 5.309245 18.564453 5.185547 C 18.440754 5.06185 18.29427 5.000001 18.125 5 L 8.125 5 C 7.955729 5.000001 7.809245 5.06185 7.685547 5.185547 C 7.561849 5.309245 7.5 5.455729 7.5 5.625 L 7.5 14.375 C 7.5 14.544271 7.561849 14.690756 7.685547 14.814453 C 7.809245 14.938151 7.955729 15 8.125 15 Z M 0.625 7.5 C 0.455729 7.5 0.309245 7.438151 0.185547 7.314453 C 0.061849 7.190756 0 7.044271 0 6.875 C 0 6.705729 0.061849 6.559245 0.185547 6.435547 C 0.309245 6.31185 0.455729 6.25 0.625 6.25 L 4.375 6.25 C 4.544271 6.25 4.690755 6.31185 4.814453 6.435547 C 4.938151 6.559245 5 6.705729 5 6.875 C 5 7.044271 4.938151 7.190756 4.814453 7.314453 C 4.690755 7.438151 4.544271 7.5 4.375 7.5 Z M 9.375 7.5 C 9.205729 7.5 9.059244 7.438151 8.935547 7.314453 C 8.811849 7.190756 8.75 7.044271 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 L 16.875 6.25 C 17.04427 6.25 17.190754 6.31185 17.314453 6.435547 C 17.43815 6.559245 17.5 6.705729 17.5 6.875 C 17.5 7.044271 17.43815 7.190756 17.314453 7.314453 C 17.190754 7.438151 17.04427 7.5 16.875 7.5 Z M 1.875 10 C 1.705729 10 1.559245 9.938151 1.435547 9.814453 C 1.311849 9.690756 1.25 9.544271 1.25 9.375 C 1.25 9.205729 1.311849 9.059245 1.435547 8.935547 C 1.559245 8.81185 1.705729 8.75 1.875 8.75 L 4.375 8.75 C 4.544271 8.75 4.690755 8.81185 4.814453 8.935547 C 4.938151 9.059245 5 9.205729 5 9.375 C 5 9.544271 4.938151 9.690756 4.814453 9.814453 C 4.690755 9.938151 4.544271 10 4.375 10 Z M 9.375 10 C 9.205729 10 9.059244 9.938151 8.935547 9.814453 C 8.811849 9.690756 8.75 9.544271 8.75 9.375 C 8.75 9.205729 8.811849 9.059245 8.935547 8.935547 C 9.059244 8.81185 9.205729 8.75 9.375 8.75 L 10.625 8.75 C 10.794271 8.75 10.940755 8.81185 11.064453 8.935547 C 11.18815 9.059245 11.25 9.205729 11.25 9.375 C 11.25 9.544271 11.18815 9.690756 11.064453 9.814453 C 10.940755 9.938151 10.794271 10 10.625 10 Z M 13.75 13.75 C 13.574219 13.75 13.40983 13.717448 13.256836 13.652344 C 13.103841 13.58724 12.972005 13.49935 12.861328 13.388672 C 12.75065 13.277995 12.66276 13.146159 12.597656 12.993164 C 12.532552 12.84017 12.5 12.675781 12.5 12.5 L 12.5 10 C 12.5 9.824219 12.532552 9.661459 12.597656 9.511719 C 12.66276 9.361979 12.752278 9.230144 12.866211 9.116211 C 12.980143 9.002279 13.111979 8.912761 13.261719 8.847656 C 13.411458 8.782553 13.574219 8.75 13.75 8.75 L 16.25 8.75 C 16.41927 8.75 16.580402 8.782553 16.733398 8.847656 C 16.886393 8.912761 17.019855 9.002279 17.133789 9.116211 C 17.247721 9.230144 17.337238 9.363607 17.402344 9.516602 C 17.467447 9.669597 17.5 9.830729 17.5 10 L 17.5 12.5 C 17.5 12.675781 17.467447 12.838542 17.402344 12.988281 C 17.337238 13.138021 17.247721 13.269857 17.133789 13.383789 C 17.019855 13.497722 16.88802 13.58724 16.738281 13.652344 C 16.588541 13.717448 16.425781 13.75 16.25 13.75 Z M 13.75 10 L 13.75 12.5 L 16.25 12.5 L 16.25 10 Z M 3.125 12.5 C 2.955729 12.5 2.809245 12.438151 2.685547 12.314453 C 2.561849 12.190756 2.5 12.044271 2.5 11.875 C 2.5 11.705729 2.561849 11.559245 2.685547 11.435547 C 2.809245 11.31185 2.955729 11.25 3.125 11.25 L 4.375 11.25 C 4.544271 11.25 4.690755 11.31185 4.814453 11.435547 C 4.938151 11.559245 5 11.705729 5 11.875 C 5 12.044271 4.938151 12.190756 4.814453 12.314453 C 4.690755 12.438151 4.544271 12.5 4.375 12.5 Z M 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 C 8.75 11.705729 8.811849 11.559245 8.935547 11.435547 C 9.059244 11.31185 9.205729 11.25 9.375 11.25 L 10.625 11.25 C 10.794271 11.25 10.940755 11.31185 11.064453 11.435547 C 11.18815 11.559245 11.25 11.705729 11.25 11.875 C 11.25 12.044271 11.18815 12.190756 11.064453 12.314453 C 10.940755 12.438151 10.794271 12.5 10.625 12.5 Z " />
+                        </controls:SettingsExpander.HeaderIcon>
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsNotifications_Description}" Header="{x:Bind domain:Translator.SettingsNotifications_Title}">
+                                <controls:SettingsCard.HeaderIcon>
+                                    <PathIcon Data="F1 M 0 0 L 20 0 L 20 16.25 L 13.75 16.25 L 10 20 L 6.25 16.25 L 0 16.25 Z M 16.25 7.5 L 3.75 7.5 L 3.75 8.75 L 16.25 8.75 Z M 16.25 3.75 L 3.75 3.75 L 3.75 5 L 16.25 5 Z M 11.25 11.25 L 3.75 11.25 L 3.75 12.5 L 11.25 12.5 Z " />
+                                </controls:SettingsCard.HeaderIcon>
+                                <ToggleSwitch IsOn="{x:Bind ViewModel.AreNotificationsEnabled, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsTaskbarBadge_Description}" Header="{x:Bind domain:Translator.SettingsTaskbarBadge_Title}">
+                                <controls:SettingsCard.HeaderIcon>
+                                    <PathIcon Data="F1 M 3.330078 10 C 3.330078 9.388021 3.409831 8.797201 3.569336 8.227539 C 3.728841 7.657879 3.95345 7.125652 4.243164 6.630859 C 4.532877 6.136068 4.879557 5.68685 5.283203 5.283203 C 5.686849 4.879559 6.136067 4.532879 6.630859 4.243164 C 7.125651 3.953451 7.657877 3.728842 8.227539 3.569336 C 8.7972 3.409832 9.388021 3.330078 10 3.330078 C 10.611979 3.330078 11.202799 3.409832 11.772461 3.569336 C 12.342121 3.728842 12.874348 3.953451 13.369141 4.243164 C 13.863932 4.532879 14.31315 4.879559 14.716797 5.283203 C 15.120441 5.68685 15.467121 6.136068 15.756836 6.630859 C 16.046549 7.125652 16.271158 7.657879 16.430664 8.227539 C 16.590168 8.797201 16.669922 9.388021 16.669922 10 C 16.669922 10.611979 16.590168 11.2028 16.430664 11.772461 C 16.271158 12.342123 16.046549 12.87435 15.756836 13.369141 C 15.467121 13.863933 15.120441 14.313151 14.716797 14.716797 C 14.31315 15.120443 13.863932 15.467123 13.369141 15.756836 C 12.874348 16.046551 12.342121 16.27116 11.772461 16.430664 C 11.202799 16.59017 10.611979 16.669922 10 16.669922 C 9.388021 16.669922 8.7972 16.59017 8.227539 16.430664 C 7.657877 16.27116 7.125651 16.046551 6.630859 15.756836 C 6.136067 15.467123 5.686849 15.120443 5.283203 14.716797 C 4.879557 14.313151 4.532877 13.863933 4.243164 13.369141 C 3.95345 12.87435 3.728841 12.342123 3.569336 11.772461 C 3.409831 11.2028 3.330078 10.611979 3.330078 10 Z " />
+                                </controls:SettingsCard.HeaderIcon>
+                                <ToggleSwitch IsOn="{x:Bind ViewModel.IsTaskbarBadgeEnabled, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+
+
+
+                    <!--  TODO  -->
+                    <!--<controls:SettingsCard
+        Header="Special Folders"
+        IsClickEnabled="True"
+        Command="{x:Bind ViewModel.SpecialFoldersCommand}"
+        Description="Setup functional folders for Wino to work with like Spam, Trash, Archive etc.">
+        <controls:SettingsCard.HeaderIcon>
+            <PathIcon Data="F1 M 3.056641 18.75 C 2.646484 18.75 2.255859 18.666992 1.884766 18.500977 C 1.513672 18.334961 1.189779 18.113607 0.913086 17.836914 C 0.636393 17.560221 0.415039 17.236328 0.249023 16.865234 C 0.083008 16.494141 0 16.103516 0 15.693359 L 0 4.306641 C 0 3.896484 0.083008 3.505859 0.249023 3.134766 C 0.415039 2.763672 0.636393 2.439779 0.913086 2.163086 C 1.189779 1.886395 1.513672 1.665039 1.884766 1.499023 C 2.255859 1.333008 2.646484 1.25 3.056641 1.25 L 6.875 1.25 C 7.324219 1.25 7.709961 1.319988 8.032227 1.459961 C 8.354492 1.599936 8.645833 1.787109 8.90625 2.021484 C 9.166666 2.255859 9.407552 2.522787 9.628906 2.822266 C 9.85026 3.121746 10.078125 3.43099 10.3125 3.75 L 15.673828 3.75 C 16.077473 3.75 16.464844 3.831381 16.835938 3.994141 C 17.207031 4.156902 17.532551 4.376629 17.8125 4.65332 C 18.092447 4.930014 18.317057 5.250651 18.486328 5.615234 C 18.655598 5.979818 18.743488 6.363933 18.75 6.767578 C 19.055988 7.008464 19.293619 7.301433 19.462891 7.646484 C 19.63216 7.991537 19.716797 8.359375 19.716797 8.75 C 19.716797 8.808594 19.716797 8.865561 19.716797 8.920898 C 19.716797 8.976237 19.710285 9.033203 19.697266 9.091797 L 18.730469 16.054688 C 18.678385 16.425781 18.561197 16.775717 18.378906 17.104492 C 18.196613 17.433268 17.96875 17.719727 17.695312 17.963867 C 17.421875 18.208008 17.112629 18.400064 16.767578 18.540039 C 16.422525 18.680014 16.061197 18.75 15.683594 18.75 Z M 17.392578 6.259766 C 17.327473 6.070964 17.236328 5.900065 17.119141 5.74707 C 17.001953 5.594076 16.865234 5.46224 16.708984 5.351562 C 16.552734 5.240886 16.383463 5.154623 16.201172 5.092773 C 16.018879 5.030926 15.826822 5.000001 15.625 5 L 9.6875 5 L 8.378906 3.251953 C 8.203125 3.017578 7.981771 2.83366 7.714844 2.700195 C 7.447917 2.566732 7.167969 2.5 6.875 2.5 L 3.125 2.5 C 2.871094 2.5 2.630208 2.548828 2.402344 2.646484 C 2.174479 2.744141 1.974284 2.879232 1.801758 3.051758 C 1.629232 3.224285 1.494141 3.42448 1.396484 3.652344 C 1.298828 3.880209 1.25 4.121094 1.25 4.375 L 1.25 15.625 C 1.25 15.664062 1.251628 15.701498 1.254883 15.737305 C 1.258138 15.773112 1.259766 15.810547 1.259766 15.849609 L 2.832031 8.242188 C 2.890625 7.95573 2.996419 7.690431 3.149414 7.446289 C 3.302409 7.202149 3.487956 6.992188 3.706055 6.816406 C 3.924154 6.640626 4.168294 6.502279 4.438477 6.401367 C 4.708659 6.300456 4.990234 6.25 5.283203 6.25 L 17.226562 6.25 C 17.259113 6.25 17.286783 6.25 17.30957 6.25 C 17.332355 6.25 17.360025 6.253256 17.392578 6.259766 Z M 15.634766 17.5 C 15.869141 17.5 16.092121 17.459311 16.303711 17.37793 C 16.515299 17.296549 16.704102 17.182617 16.870117 17.036133 C 17.036133 16.889648 17.172852 16.71875 17.280273 16.523438 C 17.387695 16.328125 17.457682 16.113281 17.490234 15.878906 L 18.457031 8.925781 C 18.463541 8.893229 18.466797 8.863933 18.466797 8.837891 C 18.466797 8.81185 18.466797 8.782553 18.466797 8.75 C 18.466797 8.580729 18.434244 8.419597 18.369141 8.266602 C 18.304035 8.113607 18.216145 7.980144 18.105469 7.866211 C 17.994791 7.752279 17.864582 7.662762 17.714844 7.597656 C 17.565104 7.532553 17.402344 7.5 17.226562 7.5 L 5.283203 7.5 C 5.133463 7.5 4.991862 7.524414 4.858398 7.573242 C 4.724935 7.62207 4.602864 7.69043 4.492188 7.77832 C 4.38151 7.866211 4.287109 7.972006 4.208984 8.095703 C 4.130859 8.219401 4.078776 8.352865 4.052734 8.496094 L 2.246094 17.275391 C 2.526042 17.425131 2.81901 17.5 3.125 17.5 Z " />
+        </controls:SettingsCard.HeaderIcon>
+    </controls:SettingsCard>-->
+
+                    <controls:SettingsCard
+                        Command="{x:Bind ViewModel.EditSignatureCommand}"
+                        Description="{x:Bind domain:Translator.SettingsSignature_Description}"
+                        Header="{x:Bind domain:Translator.SettingsSignature_Title}"
+                        IsClickEnabled="True">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 17.060547 2.832031 C 17.151691 2.884115 17.226562 2.958984 17.285156 3.056641 C 17.34375 3.154297 17.373047 3.258465 17.373047 3.369141 C 17.373047 3.421225 17.366535 3.470053 17.353516 3.515625 C 17.340494 3.561199 17.324219 3.606771 17.304688 3.652344 L 10.400391 17.470703 C 10.341797 17.5944 10.25065 17.685547 10.126953 17.744141 L 8.4375 18.59375 C 8.229166 18.697916 8.004557 18.75 7.763672 18.75 C 7.73112 18.75 7.700195 18.75 7.670898 18.75 C 7.641602 18.75 7.610677 18.746744 7.578125 18.740234 L 7.119141 19.658203 C 7.067057 19.762369 6.99056 19.845377 6.889648 19.907227 C 6.788736 19.969076 6.679687 20 6.5625 20 C 6.393229 20 6.246745 19.93815 6.123047 19.814453 C 5.999349 19.690756 5.9375 19.544271 5.9375 19.375 C 5.9375 19.296875 5.960286 19.199219 6.005859 19.082031 C 6.051432 18.964844 6.105143 18.842773 6.166992 18.71582 C 6.228841 18.588867 6.292317 18.470053 6.357422 18.359375 C 6.422526 18.248697 6.471354 18.157553 6.503906 18.085938 C 6.334635 17.825521 6.25 17.542318 6.25 17.236328 L 6.25 15.625 C 6.25 15.520834 6.272786 15.426433 6.318359 15.341797 L 11.943359 4.091797 L 11.308594 3.779297 L 8.994141 8.408203 C 8.942057 8.51237 8.86556 8.595378 8.764648 8.657227 C 8.663736 8.719076 8.554688 8.75 8.4375 8.75 C 8.268229 8.75 8.121744 8.688151 7.998047 8.564453 C 7.874349 8.440756 7.8125 8.294271 7.8125 8.125 C 7.8125 8.040365 7.835286 7.945964 7.880859 7.841797 L 10.214844 3.173828 C 10.31901 2.965496 10.458984 2.801107 10.634766 2.680664 C 10.810547 2.560223 11.015625 2.5 11.25 2.5 C 11.477864 2.5 11.694336 2.55534 11.899414 2.666016 C 12.104492 2.776693 12.304688 2.880859 12.5 2.978516 L 13.193359 1.591797 C 13.245441 1.481121 13.321939 1.396484 13.422852 1.337891 C 13.523763 1.279297 13.632812 1.25 13.75 1.25 C 13.834635 1.25 13.90625 1.263021 13.964844 1.289062 C 14.042969 1.132812 14.119466 0.978191 14.194336 0.825195 C 14.269205 0.672201 14.353841 0.533855 14.448242 0.410156 C 14.542643 0.286459 14.658202 0.187176 14.794922 0.112305 C 14.93164 0.037436 15.104166 0 15.3125 0 C 15.520833 0 15.7194 0.048828 15.908203 0.146484 L 16.826172 0.605469 C 17.034504 0.709637 17.198893 0.847982 17.319336 1.020508 C 17.439777 1.193035 17.5 1.39974 17.5 1.640625 C 17.5 1.86198 17.449543 2.068686 17.348633 2.260742 C 17.247721 2.452801 17.151691 2.64323 17.060547 2.832031 Z M 15.087891 1.845703 L 15.9375 2.265625 L 16.220703 1.699219 L 15.371094 1.279297 Z M 15.908203 3.652344 L 14.033203 2.714844 L 7.5 15.771484 L 7.5 17.236328 C 7.5 17.307943 7.526041 17.369791 7.578125 17.421875 C 7.630208 17.473959 7.692057 17.5 7.763672 17.5 C 7.789713 17.5 7.843424 17.483725 7.924805 17.451172 C 8.006185 17.418619 8.100586 17.376303 8.208008 17.324219 C 8.31543 17.272135 8.429361 17.21517 8.549805 17.15332 C 8.670247 17.091471 8.785807 17.03125 8.896484 16.972656 C 9.007161 16.914062 9.104817 16.861979 9.189453 16.816406 C 9.274088 16.770834 9.335938 16.738281 9.375 16.71875 Z M 17.5 7.5 C 17.845051 7.5 18.168945 7.565104 18.47168 7.695312 C 18.774414 7.825521 19.039713 8.004558 19.267578 8.232422 C 19.495441 8.460287 19.674479 8.725586 19.804688 9.02832 C 19.934895 9.331055 20 9.654948 20 10 C 20 10.345053 19.934895 10.668945 19.804688 10.97168 C 19.674479 11.274414 19.495441 11.539714 19.267578 11.767578 C 19.039713 11.995443 18.774414 12.174479 18.47168 12.304688 C 18.168945 12.434896 17.845051 12.5 17.5 12.5 L 14.6875 12.5 L 15.3125 11.25 L 17.5 11.25 C 17.675781 11.25 17.838541 11.217448 17.988281 11.152344 C 18.13802 11.08724 18.269855 10.997722 18.383789 10.883789 C 18.497721 10.769857 18.587238 10.638021 18.652344 10.488281 C 18.717447 10.338542 18.75 10.175781 18.75 10 C 18.75 9.824219 18.717447 9.661459 18.652344 9.511719 C 18.587238 9.361979 18.497721 9.230144 18.383789 9.116211 C 18.269855 9.002279 18.13802 8.912761 17.988281 8.847656 C 17.838541 8.782553 17.675781 8.75 17.5 8.75 C 17.330729 8.75 17.184244 8.688151 17.060547 8.564453 C 16.936848 8.440756 16.875 8.294271 16.875 8.125 C 16.875 7.95573 16.936848 7.809246 17.060547 7.685547 C 17.184244 7.56185 17.330729 7.5 17.5 7.5 Z M 1.25 15.625 C 1.25 16.054688 1.33138 16.459961 1.494141 16.84082 C 1.656901 17.22168 1.879883 17.553711 2.163086 17.836914 C 2.446289 18.120117 2.77832 18.3431 3.15918 18.505859 C 3.540039 18.668619 3.945312 18.75 4.375 18.75 L 4.804688 18.75 C 4.772135 18.847656 4.744466 18.948568 4.72168 19.052734 C 4.698893 19.1569 4.6875 19.264322 4.6875 19.375 C 4.6875 19.485678 4.698893 19.5931 4.72168 19.697266 C 4.744466 19.801432 4.772135 19.902344 4.804688 20 L 4.375 20 C 3.769531 20 3.201497 19.884439 2.670898 19.65332 C 2.140299 19.422201 1.67806 19.109701 1.28418 18.71582 C 0.890299 18.321939 0.577799 17.859701 0.34668 17.329102 C 0.11556 16.798502 0 16.230469 0 15.625 C 0 15.019531 0.11556 14.451498 0.34668 13.920898 C 0.577799 13.3903 0.890299 12.928061 1.28418 12.53418 C 1.67806 12.1403 2.140299 11.8278 2.670898 11.59668 C 3.201497 11.365561 3.769531 11.25 4.375 11.25 L 6.5625 11.25 L 5.9375 12.5 L 4.375 12.5 C 3.945312 12.5 3.540039 12.583008 3.15918 12.749023 C 2.77832 12.915039 2.446289 13.139648 2.163086 13.422852 C 1.879883 13.706055 1.656901 14.036459 1.494141 14.414062 C 1.33138 14.791667 1.25 15.195312 1.25 15.625 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsSignatureEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+
+                    <controls:SettingsCard
+                        Description="{x:Bind domain:Translator.SettingsFocusedInbox_Description}"
+                        Header="{x:Bind domain:Translator.SettingsFocusedInbox_Title}"
+                        Visibility="{x:Bind ViewModel.IsFocusedInboxSupportedForAccount, Mode=OneWay}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 1.875 4.6875 C 1.72526 4.335938 1.515299 4.025065 1.245117 3.754883 C 0.974935 3.484701 0.664062 3.27474 0.3125 3.125 C 0.664062 2.975262 0.974935 2.765301 1.245117 2.495117 C 1.515299 2.224936 1.72526 1.914062 1.875 1.5625 C 2.02474 1.914062 2.2347 2.224936 2.504883 2.495117 C 2.775065 2.765301 3.085938 2.975262 3.4375 3.125 C 3.085938 3.27474 2.775065 3.484701 2.504883 3.754883 C 2.2347 4.025065 2.02474 4.335938 1.875 4.6875 Z M 18.125 5.3125 C 18.274738 5.664062 18.484699 5.974936 18.754883 6.245117 C 19.025064 6.5153 19.335938 6.725261 19.6875 6.875 C 19.335938 7.02474 19.025064 7.234701 18.754883 7.504883 C 18.484699 7.775065 18.274738 8.085938 18.125 8.4375 C 17.97526 8.085938 17.765299 7.775065 17.495117 7.504883 C 17.224934 7.234701 16.914062 7.02474 16.5625 6.875 C 16.914062 6.725261 17.224934 6.5153 17.495117 6.245117 C 17.765299 5.974936 17.97526 5.664062 18.125 5.3125 Z M 14.375 6.25 C 14.06901 5.540365 13.649088 4.91862 13.115234 4.384766 C 12.58138 3.850912 11.959635 3.43099 11.25 3.125 C 11.959635 2.819012 12.58138 2.39909 13.115234 1.865234 C 13.649088 1.331381 14.06901 0.709637 14.375 0 C 14.680989 0.709637 15.100911 1.331381 15.634766 1.865234 C 16.168619 2.39909 16.790363 2.819012 17.5 3.125 C 16.790363 3.43099 16.168619 3.850912 15.634766 4.384766 C 15.100911 4.91862 14.680989 5.540365 14.375 6.25 Z M 14.375 1.894531 C 14.010416 2.356771 13.60026 2.766928 13.144531 3.125 C 13.60026 3.489584 14.010416 3.89974 14.375 4.355469 C 14.733072 3.89974 15.143229 3.489584 15.605469 3.125 C 15.143229 2.766928 14.733072 2.356771 14.375 1.894531 Z M 7.294922 7.666016 C 6.988932 7.666017 6.700846 7.60254 6.430664 7.475586 C 6.160481 7.348634 5.924479 7.177735 5.722656 6.962891 C 5.520833 6.748048 5.362956 6.500652 5.249023 6.220703 C 5.135091 5.940756 5.078125 5.651042 5.078125 5.351562 C 5.078125 4.967448 5.157877 4.607748 5.317383 4.272461 C 5.476888 3.937176 5.690104 3.644207 5.957031 3.393555 C 6.223958 3.142904 6.531575 2.944336 6.879883 2.797852 C 7.22819 2.651367 7.591146 2.578125 7.96875 2.578125 C 8.515625 2.578125 9.002278 2.693686 9.428711 2.924805 C 9.855143 3.155926 10.214844 3.460287 10.507812 3.837891 C 10.800781 4.215495 11.023763 4.645183 11.176758 5.126953 C 11.329752 5.608725 11.40625 6.100262 11.40625 6.601562 C 11.40625 7.285156 11.295572 7.924805 11.074219 8.520508 C 10.852864 9.116211 10.548502 9.658203 10.161133 10.146484 C 9.773763 10.634766 9.316406 11.066081 8.789062 11.44043 C 8.261719 11.814779 7.695312 12.128906 7.089844 12.382812 C 7.03125 12.408854 6.95638 12.421875 6.865234 12.421875 C 6.715495 12.421875 6.588542 12.368164 6.484375 12.260742 C 6.380208 12.15332 6.328125 12.02474 6.328125 11.875 C 6.328125 11.640625 6.438802 11.471354 6.660156 11.367188 C 7.154948 11.132812 7.612305 10.880534 8.032227 10.610352 C 8.452148 10.34017 8.819986 10.030925 9.135742 9.682617 C 9.451497 9.334311 9.708658 8.937175 9.907227 8.491211 C 10.105794 8.045248 10.234375 7.532553 10.292969 6.953125 C 10.299479 6.888021 10.304361 6.824545 10.307617 6.762695 C 10.310872 6.700848 10.3125 6.637371 10.3125 6.572266 C 10.3125 6.233725 10.263672 5.891928 10.166016 5.546875 C 10.068359 5.201824 9.921875 4.889324 9.726562 4.609375 C 9.53125 4.329428 9.287109 4.10319 8.994141 3.930664 C 8.701172 3.758139 8.359375 3.671875 7.96875 3.671875 C 7.747396 3.671875 7.529297 3.71582 7.314453 3.803711 C 7.099609 3.891602 6.907552 4.010417 6.738281 4.160156 C 6.56901 4.309896 6.432292 4.487306 6.328125 4.692383 C 6.223958 4.897462 6.171875 5.117188 6.171875 5.351562 C 6.171875 5.501303 6.201172 5.649414 6.259766 5.795898 C 6.318359 5.942383 6.398112 6.072592 6.499023 6.186523 C 6.599935 6.300456 6.720377 6.393229 6.860352 6.464844 C 7.000325 6.536459 7.148438 6.572266 7.304688 6.572266 C 7.460938 6.572266 7.584635 6.547852 7.675781 6.499023 C 7.766927 6.450195 7.841797 6.386719 7.900391 6.308594 C 7.958984 6.230469 8.006185 6.149089 8.041992 6.064453 C 8.077799 5.979818 8.116861 5.898438 8.15918 5.820312 C 8.201497 5.742188 8.256836 5.678712 8.325195 5.629883 C 8.393555 5.581056 8.486328 5.556642 8.603516 5.556641 C 8.753255 5.556642 8.883463 5.61198 8.994141 5.722656 C 9.104817 5.833334 9.160156 5.963542 9.160156 6.113281 C 9.160156 6.145834 9.153646 6.188151 9.140625 6.240234 C 9.088541 6.448568 9.002278 6.640626 8.881836 6.816406 C 8.761393 6.992188 8.619791 7.143556 8.457031 7.270508 C 8.294271 7.397462 8.113606 7.495118 7.915039 7.563477 C 7.716471 7.631837 7.509765 7.666017 7.294922 7.666016 Z M 15.888672 8.75 L 18.564453 11.435547 L 17.685547 12.314453 L 16.25 10.888672 L 16.25 20 L 2.5 20 L 2.5 10.888672 L 1.064453 12.314453 L 0.185547 11.435547 L 2.861328 8.75 L 8.28125 8.75 C 8.053385 9.016928 7.801106 9.25293 7.524414 9.458008 C 7.247721 9.663086 6.953125 9.84375 6.640625 10 L 3.75 10 L 3.75 18.75 L 15 18.75 L 15 10 L 11.767578 10 C 11.878255 9.798178 11.979166 9.5931 12.070312 9.384766 C 12.161458 9.176433 12.242838 8.964844 12.314453 8.75 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsFocusedInboxEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard
+                        Description="{x:Bind domain:Translator.SettingsAccountManagementAppendMessage_Description}"
+                        Header="{x:Bind domain:Translator.SettingsAccountManagementAppendMessage_Title}"
+                        Visibility="{x:Bind ViewModel.IsAppendMessageSettingVisible, Mode=OneWay}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="F1 M 0 5.625 C 0 4.850261 0.148112 4.121094 0.444336 3.4375 C 0.74056 2.753906 1.142578 2.158203 1.650391 1.650391 C 2.158203 1.142578 2.753906 0.740561 3.4375 0.444336 C 4.121094 0.148113 4.85026 0 5.625 0 C 6.139323 0 6.635742 0.066732 7.114258 0.200195 C 7.592773 0.33366 8.040364 0.522461 8.457031 0.766602 C 8.873697 1.010742 9.254557 1.30534 9.599609 1.650391 C 9.944661 1.995443 10.239258 2.376303 10.483398 2.792969 C 10.727539 3.209637 10.916341 3.657227 11.049805 4.135742 C 11.183268 4.614259 11.25 5.110678 11.25 5.625 C 11.25 6.39974 11.101888 7.128907 10.805664 7.8125 C 10.509439 8.496094 10.107422 9.091797 9.599609 9.599609 C 9.091797 10.107422 8.496094 10.50944 7.8125 10.805664 C 7.128906 11.101889 6.399739 11.25 5.625 11.25 C 4.84375 11.25 4.111328 11.103516 3.427734 10.810547 C 2.744141 10.517578 2.148438 10.117188 1.640625 9.609375 C 1.132812 9.101562 0.732422 8.505859 0.439453 7.822266 C 0.146484 7.138672 0 6.40625 0 5.625 Z M 10.566406 15 C 10.214844 15 9.874674 14.936523 9.545898 14.80957 C 9.217122 14.682617 8.917643 14.510092 8.647461 14.291992 C 8.377278 14.073894 8.147786 13.815104 7.958984 13.515625 C 7.770182 13.216146 7.639974 12.893881 7.568359 12.548828 C 7.972005 12.431641 8.369141 12.278646 8.759766 12.089844 C 8.785807 12.324219 8.852539 12.542318 8.959961 12.744141 C 9.067383 12.945964 9.205729 13.121745 9.375 13.271484 C 9.544271 13.421225 9.736328 13.538412 9.951172 13.623047 C 10.166016 13.707683 10.390625 13.75 10.625 13.75 L 15.625 13.75 C 15.878906 13.75 16.119791 13.701172 16.347656 13.603516 C 16.57552 13.505859 16.775715 13.370769 16.948242 13.198242 C 17.120768 13.025717 17.255859 12.825521 17.353516 12.597656 C 17.451172 12.369792 17.5 12.128906 17.5 11.875 L 17.5 4.375 C 17.5 4.121094 17.451172 3.880209 17.353516 3.652344 C 17.255859 3.42448 17.120768 3.224285 16.948242 3.051758 C 16.775715 2.879232 16.57552 2.744141 16.347656 2.646484 C 16.119791 2.548828 15.878906 2.5 15.625 2.5 L 12.099609 2.5 C 11.988932 2.278646 11.870117 2.063803 11.743164 1.855469 C 11.616211 1.647137 11.477864 1.445312 11.328125 1.25 L 15.693359 1.25 C 16.103516 1.25 16.494141 1.333008 16.865234 1.499023 C 17.236328 1.665039 17.560221 1.886395 17.836914 2.163086 C 18.113605 2.439779 18.334961 2.763672 18.500977 3.134766 C 18.666992 3.505859 18.75 3.896484 18.75 4.306641 L 18.75 11.943359 C 18.75 12.353516 18.666992 12.744141 18.500977 13.115234 C 18.334961 13.486328 18.113605 13.810222 17.836914 14.086914 C 17.560221 14.363607 17.236328 14.584961 16.865234 14.750977 C 16.494141 14.916992 16.103516 15 15.693359 15 Z M 5.625 8.828125 C 5.820312 8.828125 5.986328 8.759766 6.123047 8.623047 L 8.623047 6.123047 C 8.759766 5.986328 8.828125 5.820312 8.828125 5.625 C 8.828125 5.429688 8.759766 5.263672 8.623047 5.126953 L 6.123047 2.626953 C 5.986328 2.490234 5.820312 2.421875 5.625 2.421875 C 5.429688 2.421875 5.263672 2.490234 5.126953 2.626953 C 4.990234 2.763672 4.921875 2.929688 4.921875 3.125 C 4.921875 3.320312 4.990234 3.486328 5.126953 3.623047 L 6.503906 5 L 3.125 5 C 2.955729 5.000001 2.809245 5.06185 2.685547 5.185547 C 2.561849 5.309245 2.5 5.455729 2.5 5.625 C 2.5 5.794271 2.561849 5.940756 2.685547 6.064453 C 2.809245 6.188151 2.955729 6.25 3.125 6.25 L 6.503906 6.25 L 5.126953 7.626953 C 4.990234 7.763672 4.921875 7.929688 4.921875 8.125 C 4.921875 8.320312 4.990234 8.486328 5.126953 8.623047 C 5.263672 8.759766 5.429688 8.828125 5.625 8.828125 Z M 4.306641 18.75 C 3.896484 18.75 3.505859 18.666992 3.134766 18.500977 C 2.763672 18.334961 2.439779 18.113607 2.163086 17.836914 C 1.886393 17.560221 1.665039 17.236328 1.499023 16.865234 C 1.333008 16.494141 1.25 16.103516 1.25 15.693359 L 1.25 11.328125 C 1.445312 11.477865 1.647135 11.616211 1.855469 11.743164 C 2.063802 11.870117 2.278646 11.988933 2.5 12.099609 L 2.5 15.625 C 2.5 15.878906 2.548828 16.119791 2.646484 16.347656 C 2.744141 16.575521 2.879232 16.775717 3.051758 16.948242 C 3.224284 17.120768 3.424479 17.255859 3.652344 17.353516 C 3.880208 17.451172 4.121094 17.5 4.375 17.5 L 9.375 17.5 C 9.576822 17.5 9.76888 17.470703 9.951172 17.412109 C 10.133463 17.353516 10.302734 17.268881 10.458984 17.158203 C 10.615234 17.047525 10.751953 16.915689 10.869141 16.762695 C 10.986328 16.609701 11.077474 16.438803 11.142578 16.25 L 12.441406 16.25 C 12.369791 16.608072 12.237955 16.940104 12.045898 17.246094 C 11.853841 17.552084 11.621094 17.815756 11.347656 18.037109 C 11.074219 18.258463 10.768229 18.432617 10.429688 18.55957 C 10.091146 18.686523 9.739583 18.75 9.375 18.75 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsAppendMessageSettinEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                </StackPanel>
+            </Grid>
+
+            <!--  Calendar Settings Panel  -->
+            <Grid
+                x:Name="CalendarSettingsPanel"
+                Grid.Row="2"
+                Visibility="Collapsed">
+                <StackPanel MaxWidth="900" Spacing="12">
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendarDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendar, Mode=OneTime}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <FontIcon Glyph="&#xE735;" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <ComboBox ItemsSource="{x:Bind ViewModel.AccountCalendars, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedPrimaryCalendar, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendar:AccountCalendar">
+                                    <TextBlock Text="{x:Bind Name}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <!--  Calendars List  -->
+                    <ItemsControl ItemsSource="{x:Bind ViewModel.AccountCalendarSettingsItems, Mode=OneWay}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate x:DataType="mailViewModels:AccountCalendarSettingsItemViewModel">
+                                <controls:SettingsExpander
+                                    Margin="0,0,0,8"
+                                    Description="{x:Bind TimeZone, Mode=OneWay}"
+                                    Header="{x:Bind Name, Mode=OneWay}"
+                                    IsExpanded="False">
+                                    <controls:SettingsExpander.HeaderIcon>
+                                        <SymbolIcon Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" Symbol="Calendar" />
+                                    </controls:SettingsExpander.HeaderIcon>
+                                    <controls:SettingsExpander.Items>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_AccountColorDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_AccountColor, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE790;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <Button
+                                                MinWidth="40"
+                                                MinHeight="40"
+                                                Padding="4"
+                                                Tag="{x:Bind}">
+                                                <Button.Flyout>
+                                                    <Flyout Placement="BottomEdgeAlignedLeft">
+                                                        <GridView
+                                                            Width="220"
+                                                            IsItemClickEnabled="True"
+                                                            ItemClick="CalendarColorItemClick"
+                                                            ItemTemplate="{StaticResource AccountColorTemplate}"
+                                                            ItemsSource="{x:Bind AvailableColors, Mode=OneWay}"
+                                                            SelectedItem="{x:Bind SelectedColor, Mode=TwoWay}"
+                                                            SelectionMode="Single"
+                                                            Tag="{x:Bind}" />
+                                                    </Flyout>
+                                                </Button.Flyout>
+                                                <Border
+                                                    Width="24"
+                                                    Height="24"
+                                                    Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
+                                                    CornerRadius="4" />
+                                            </Button>
+                                        </controls:SettingsCard>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabledDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabled, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE895;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <ToggleSwitch
+                                                IsOn="{x:Bind IsSynchronizationEnabled, Mode=OneWay}"
+                                                Tag="{x:Bind}"
+                                                Toggled="CalendarSynchronizationToggled" />
+                                        </controls:SettingsCard>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAsDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAs, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE163;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <ComboBox
+                                                ItemsSource="{x:Bind ShowAsOptions, Mode=OneWay}"
+                                                SelectedItem="{x:Bind SelectedShowAsOption, Mode=OneWay}"
+                                                SelectionChanged="CalendarShowAsSelectionChanged"
+                                                Tag="{x:Bind}">
+                                                <ComboBox.ItemTemplate>
+                                                    <DataTemplate x:DataType="mailViewModels:AccountCalendarShowAsOption">
+                                                        <TextBlock Text="{x:Bind DisplayText}" />
+                                                    </DataTemplate>
+                                                </ComboBox.ItemTemplate>
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+
+                </StackPanel>
+            </Grid>
+        </Grid>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="TabStates">
+                <VisualState x:Name="GeneralTab">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.AreEqual(ViewModel.SelectedTabIndex, 0), Mode=OneWay}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="GeneralSettingsPanel.Visibility" Value="Visible" />
+                        <Setter Target="MailSettingsPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="CalendarSettingsPanel.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="MailTab">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.AreEqual(ViewModel.SelectedTabIndex, 1), Mode=OneWay}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="GeneralSettingsPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="MailSettingsPanel.Visibility" Value="Visible" />
+                        <Setter Target="CalendarSettingsPanel.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="CalendarTab">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind helpers:XamlHelpers.AreEqual(ViewModel.SelectedTabIndex, 2), Mode=OneWay}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="GeneralSettingsPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="MailSettingsPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="CalendarSettingsPanel.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </ScrollViewer>
+</abstract:AccountDetailsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
new file mode 100644
index 00000000..76f64bfd
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
@@ -0,0 +1,80 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.ViewModels.Data;
+using Wino.Core.Domain.Models.Folders;
+using Wino.Mail.ViewModels;
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
+{
+    public AccountDetailsPage()
+    {
+        InitializeComponent();
+
+        NavigationCacheMode = NavigationCacheMode.Enabled;
+    }
+
+    private void OnTabSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (TabSelector.SelectedItem != null)
+            ViewModel.SelectedTabIndex = TabSelector.Items.IndexOf(TabSelector.SelectedItem);
+    }
+
+    private async void SyncFolderToggled(object sender, RoutedEventArgs e)
+    {
+        if (sender is CheckBox checkBox && checkBox.Tag is IMailItemFolder folder)
+        {
+            await ViewModel.FolderSyncToggledAsync(folder, checkBox.IsChecked.GetValueOrDefault());
+        }
+    }
+
+    private async void UnreadBadgeCheckboxToggled(object sender, RoutedEventArgs e)
+    {
+        if (sender is CheckBox checkBox && checkBox.Tag is IMailItemFolder folder)
+        {
+            await ViewModel.FolderShowUnreadToggled(folder, checkBox.IsChecked.GetValueOrDefault());
+        }
+    }
+
+    private async void CalendarSynchronizationToggled(object sender, RoutedEventArgs e)
+    {
+        if (sender is ToggleSwitch { Tag: AccountCalendarSettingsItemViewModel calendarItem } toggleSwitch)
+        {
+            calendarItem.IsSynchronizationEnabled = toggleSwitch.IsOn;
+            await ViewModel.UpdateCalendarSynchronizationAsync(calendarItem.Calendar, toggleSwitch.IsOn);
+        }
+    }
+
+    private async void CalendarShowAsSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is ComboBox { Tag: AccountCalendarSettingsItemViewModel calendarItem, SelectedItem: AccountCalendarShowAsOption option })
+        {
+            calendarItem.SelectedShowAsOption = option;
+            await ViewModel.UpdateCalendarDefaultShowAsAsync(calendarItem.Calendar, option);
+        }
+    }
+
+    private async void CalendarColorItemClick(object sender, ItemClickEventArgs e)
+    {
+        if (sender is GridView { Tag: AccountCalendarSettingsItemViewModel calendarItem } && e.ClickedItem is AppColorViewModel color)
+        {
+            await ViewModel.UpdateCalendarColorAsync(calendarItem, color);
+        }
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        var targetTabIndex = ViewModel.SelectedTabIndex;
+        if (targetTabIndex < 0 || targetTabIndex >= TabSelector.Items.Count)
+        {
+            targetTabIndex = 0;
+        }
+
+        TabSelector.SelectedItem = TabSelector.Items[targetTabIndex];
+    }
+}
diff --git a/Wino.Mail/Views/Account/AccountManagementPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
similarity index 97%
rename from Wino.Mail/Views/Account/AccountManagementPage.xaml
rename to Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
index 11583622..1587bf30 100644
--- a/Wino.Mail/Views/Account/AccountManagementPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml
@@ -1,14 +1,15 @@
-<abstract:AccountManagementPageAbstract
+<abstract:AccountManagementPageAbstract
     x:Class="Wino.Views.AccountManagementPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:helpers="using:Wino.Helpers"
+    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:selectors="using:Wino.Selectors"
@@ -18,7 +19,20 @@
     mc:Ignorable="d">
 
     <Page.Resources>
-
+        <!--  Root Account Template  -->
+        <DataTemplate x:Key="RootAccountTemplate" x:DataType="viewModelData:AccountProviderDetailViewModel">
+            <winuiControls:SettingsCard
+                Margin="0,2,0,0"
+                Click="RootAccountTemplate_Click"
+                CommandParameter="{x:Bind}"
+                Description="{x:Bind Account.Address}"
+                Header="{x:Bind Account.Name}"
+                IsClickEnabled="True">
+                <winuiControls:SettingsCard.HeaderIcon>
+                    <coreControls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Account)}" />
+                </winuiControls:SettingsCard.HeaderIcon>
+            </winuiControls:SettingsCard>
+        </DataTemplate>
 
         <!--  Merged Account Template  -->
         <DataTemplate x:Key="MergedAccountTemplate" x:DataType="data:MergedAccountProviderDetailViewModel">
@@ -28,7 +42,7 @@
                     <winuiControls:SettingsCard
                         HorizontalAlignment="Stretch"
                         HorizontalContentAlignment="Stretch"
-                        Command="{Binding ViewModel.EditMergedAccountsCommand, Mode=OneWay, ElementName=root}"
+                        Click="EditMergedAccounts_Click"
                         CommandParameter="{x:Bind}"
                         Description="{x:Bind domain:Translator.SettingsEditLinkedInbox_Description}"
                         Header="{x:Bind domain:Translator.SettingsEditLinkedInbox_Title}"
@@ -150,7 +164,7 @@
                                 Spacing="12">
 
                                 <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind ViewModel.UsedAccountsString, Mode=OneWay}" />
-                                <muxc:ProgressBar
+                                <ProgressBar
                                     Maximum="{x:Bind ViewModel.FREE_ACCOUNT_COUNT}"
                                     ShowError="{x:Bind ViewModel.IsAccountCreationBlocked, Mode=OneWay}"
                                     ShowPaused="{x:Bind ViewModel.IsAccountCreationAlmostOnLimit, Mode=OneWay}"
@@ -194,9 +208,14 @@
                         <winuiControls:SettingsCard Description="{x:Bind domain:Translator.SettingsStartupItem_Description}" Header="{x:Bind domain:Translator.SettingsStartupItem_Title}">
                             <ComboBox
                                 MinWidth="150"
-                                DisplayMemberPath="StartupEntityTitle"
                                 ItemsSource="{x:Bind ViewModel.Accounts, Mode=OneTime}"
-                                SelectedItem="{x:Bind ViewModel.StartupAccount, Mode=TwoWay}" />
+                                SelectedItem="{x:Bind ViewModel.StartupAccount, Mode=TwoWay}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate x:DataType="interfaces:IAccountProviderDetailViewModel">
+                                        <TextBlock Text="{x:Bind StartupEntityTitle}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
                             <winuiControls:SettingsCard.HeaderIcon>
                                 <SymbolIcon Symbol="Account" />
                             </winuiControls:SettingsCard.HeaderIcon>
@@ -211,7 +230,6 @@
                                 <PathIcon Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
                             </winuiControls:SettingsCard.HeaderIcon>
                         </winuiControls:SettingsCard>
-
                         <winuiControls:SettingsCard
                             Command="{x:Bind ViewModel.ReorderAccountsCommand}"
                             Description="{x:Bind domain:Translator.SettingsReorderAccounts_Description}"
diff --git a/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml.cs
new file mode 100644
index 00000000..c887f882
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/AccountManagementPage.xaml.cs
@@ -0,0 +1,32 @@
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.ViewModels.Data;
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class AccountManagementPage : AccountManagementPageAbstract
+{
+    public AccountManagementPage()
+    {
+        InitializeComponent();
+    }
+
+    private void EditMergedAccounts_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard card && card.CommandParameter is MergedAccountProviderDetailViewModel mergedAccount)
+        {
+            ViewModel.EditMergedAccountsCommand.Execute(mergedAccount);
+        }
+    }
+
+    private void RootAccountTemplate_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard card && card.CommandParameter is AccountProviderDetailViewModel accountDetails)
+        {
+            ViewModel.NavigateAccountDetailsCommand.Execute(accountDetails);
+        }
+    }
+
+}
diff --git a/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml b/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml
new file mode 100644
index 00000000..0f982859
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml
@@ -0,0 +1,270 @@
+<abstract:ImapCalDavSettingsPageAbstract
+    x:Class="Wino.Views.ImapCalDavSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel
+            Padding="36,28,36,36"
+            HorizontalAlignment="Stretch"
+            Spacing="24">
+
+            <!--  Page Header  -->
+            <StackPanel Spacing="4">
+                <TextBlock
+                    FontSize="28"
+                    FontWeight="SemiBold"
+                    Text="{x:Bind ViewModel.PageTitle, Mode=OneWay}" />
+                <TextBlock
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind ViewModel.SubtitleText, Mode=OneWay}"
+                    TextWrapping="WrapWholeWords" />
+                <TextBlock
+                    Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind ViewModel.ProviderHint, Mode=OneWay}"
+                    TextWrapping="WrapWholeWords"
+                    Visibility="{x:Bind ViewModel.HasProviderHint, Mode=OneWay}" />
+            </StackPanel>
+
+            <!--  Setup Mode Selector  -->
+            <SelectorBar x:Name="SetupModeSelector" SelectionChanged="OnSetupModeSelectionChanged">
+                <SelectorBarItem Icon="Library" Text="{x:Bind ViewModel.BasicTabText, Mode=OneWay}" />
+                <SelectorBarItem Icon="Setting" Text="{x:Bind ViewModel.AdvancedTabText, Mode=OneWay}" />
+            </SelectorBar>
+
+            <!--  Basic Setup Card  -->
+            <Border
+                Padding="20"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="8"
+                Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsAdvancedSetupSelected), Mode=OneWay}">
+                <StackPanel Spacing="16">
+                    <StackPanel Spacing="2">
+                        <TextBlock
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind ViewModel.BasicSectionTitleText, Mode=OneWay}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ViewModel.BasicSectionDescriptionText, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+
+                    <Grid ColumnSpacing="12">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Column="0"
+                            Header="{x:Bind ViewModel.DisplayNameHeaderText, Mode=OneWay}"
+                            PlaceholderText="{x:Bind ViewModel.DisplayNamePlaceholderText, Mode=OneWay}"
+                            Text="{x:Bind ViewModel.DisplayName, Mode=TwoWay}" />
+                        <TextBox
+                            Grid.Column="1"
+                            Header="{x:Bind ViewModel.EmailAddressHeaderText, Mode=OneWay}"
+                            PlaceholderText="{x:Bind ViewModel.EmailAddressPlaceholderText, Mode=OneWay}"
+                            Text="{x:Bind ViewModel.EmailAddress, Mode=TwoWay}" />
+                    </Grid>
+
+                    <PasswordBox Header="{x:Bind ViewModel.PasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.Password, Mode=TwoWay}" />
+
+                    <CheckBox Content="{x:Bind ViewModel.EnableCalendarSupportText, Mode=OneWay}" IsChecked="{x:Bind ViewModel.IsCalendarSupportEnabled, Mode=TwoWay}" />
+
+                    <Button
+                        HorizontalAlignment="Left"
+                        Command="{x:Bind ViewModel.AutoDiscoverSettingsCommand}"
+                        Content="{x:Bind ViewModel.AutoDiscoverButtonText, Mode=OneWay}"
+                        Style="{ThemeResource AccentButtonStyle}" />
+                </StackPanel>
+            </Border>
+
+            <!--  Advanced Setup Card  -->
+            <Border
+                Padding="20"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="8"
+                Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsBasicSetupSelected), Mode=OneWay}">
+                <StackPanel Spacing="20">
+                    <StackPanel Spacing="2">
+                        <TextBlock
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind ViewModel.AdvancedSectionTitleText, Mode=OneWay}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ViewModel.AdvancedSectionDescriptionText, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+
+                    <Grid ColumnSpacing="24">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <!--  Incoming (IMAP) Settings  -->
+                        <Border
+                            Padding="16"
+                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="6">
+                            <StackPanel Spacing="10">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="14" Glyph="&#xE896;" />
+                                    <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.IncomingSectionTitleText, Mode=OneWay}" />
+                                </StackPanel>
+                                <TextBox Header="{x:Bind ViewModel.IncomingServerHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServer, Mode=TwoWay}" />
+                                <TextBox Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServerPort, Mode=TwoWay}" />
+                                <TextBox Header="{x:Bind ViewModel.IncomingUsernameHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.IncomingServerUsername, Mode=TwoWay}" />
+                                <PasswordBox Header="{x:Bind ViewModel.IncomingPasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.IncomingServerPassword, Mode=TwoWay}" />
+                                <ComboBox
+                                    HorizontalAlignment="Stretch"
+                                    Header="{x:Bind ViewModel.ConnectionSecurityHeaderText, Mode=OneWay}"
+                                    ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurityDisplayNames}"
+                                    SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerConnectionSecurityIndex, Mode=TwoWay}" />
+                                <ComboBox
+                                    HorizontalAlignment="Stretch"
+                                    Header="{x:Bind ViewModel.AuthenticationMethodHeaderText, Mode=OneWay}"
+                                    ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethodDisplayNames}"
+                                    SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerAuthenticationMethodIndex, Mode=TwoWay}" />
+                            </StackPanel>
+                        </Border>
+
+                        <!--  Outgoing (SMTP) Settings  -->
+                        <Border
+                            Grid.Column="1"
+                            Padding="16"
+                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                            CornerRadius="6">
+                            <StackPanel Spacing="10">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <FontIcon FontSize="14" Glyph="&#xE898;" />
+                                    <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.OutgoingSectionTitleText, Mode=OneWay}" />
+                                </StackPanel>
+                                <TextBox Header="{x:Bind ViewModel.OutgoingServerHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServer, Mode=TwoWay}" />
+                                <TextBox Header="{x:Bind ViewModel.PortHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServerPort, Mode=TwoWay}" />
+                                <TextBox Header="{x:Bind ViewModel.OutgoingUsernameHeaderText, Mode=OneWay}" Text="{x:Bind ViewModel.OutgoingServerUsername, Mode=TwoWay}" />
+                                <PasswordBox Header="{x:Bind ViewModel.OutgoingPasswordHeaderText, Mode=OneWay}" Password="{x:Bind ViewModel.OutgoingServerPassword, Mode=TwoWay}" />
+                                <ComboBox
+                                    HorizontalAlignment="Stretch"
+                                    Header="{x:Bind ViewModel.ConnectionSecurityHeaderText, Mode=OneWay}"
+                                    ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurityDisplayNames}"
+                                    SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerConnectionSecurityIndex, Mode=TwoWay}" />
+                                <ComboBox
+                                    HorizontalAlignment="Stretch"
+                                    Header="{x:Bind ViewModel.AuthenticationMethodHeaderText, Mode=OneWay}"
+                                    ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethodDisplayNames}"
+                                    SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerAuthenticationMethodIndex, Mode=TwoWay}" />
+                            </StackPanel>
+                        </Border>
+                    </Grid>
+                </StackPanel>
+            </Border>
+
+            <!--  Calendar Settings Card  -->
+            <Border
+                Padding="20"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="8">
+                <StackPanel Spacing="16">
+                    <StackPanel Spacing="2">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <FontIcon FontSize="16" Glyph="&#xE787;" />
+                            <TextBlock
+                                FontSize="16"
+                                FontWeight="SemiBold"
+                                Text="{x:Bind ViewModel.CalendarSectionTitleText, Mode=OneWay}" />
+                        </StackPanel>
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ViewModel.CalendarSectionDescriptionText, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+
+                    <ComboBox
+                        HorizontalAlignment="Stretch"
+                        Header="{x:Bind ViewModel.CalendarModeHeaderText, Mode=OneWay}"
+                        IsEnabled="{x:Bind ViewModel.IsCalendarModeSelectionVisible, Mode=OneWay}"
+                        ItemsSource="{x:Bind ViewModel.AvailableCalendarSupportModeTitles}"
+                        SelectedIndex="{x:Bind ViewModel.SelectedCalendarSupportModeIndex, Mode=TwoWay}" />
+
+                    <TextBlock
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{x:Bind ViewModel.SelectedCalendarSupportDescription, Mode=OneWay}"
+                        TextWrapping="WrapWholeWords" />
+
+                    <HyperlinkButton
+                        Command="{x:Bind ViewModel.ShowLocalCalendarExplanationCommand}"
+                        Content="{x:Bind ViewModel.LocalCalendarLearnMoreText, Mode=OneWay}"
+                        IsEnabled="{x:Bind ViewModel.IsLocalCalendarModeSelected, Mode=OneWay}" />
+
+                    <Grid ColumnSpacing="12" Visibility="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBox
+                            Grid.Column="0"
+                            Header="{x:Bind ViewModel.CalDavServiceUrlHeaderText, Mode=OneWay}"
+                            Text="{x:Bind ViewModel.CalDavServiceUrl, Mode=TwoWay}" />
+                        <TextBox
+                            Grid.Column="1"
+                            Header="{x:Bind ViewModel.CalDavUsernameHeaderText, Mode=OneWay}"
+                            Text="{x:Bind ViewModel.CalDavUsername, Mode=TwoWay}" />
+                    </Grid>
+
+                    <PasswordBox
+                        Header="{x:Bind ViewModel.CalDavPasswordHeaderText, Mode=OneWay}"
+                        Password="{x:Bind ViewModel.CalDavPassword, Mode=TwoWay}"
+                        Visibility="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}" />
+                </StackPanel>
+            </Border>
+
+            <!--  Action Bar  -->
+            <Grid Margin="0,4,0,0" ColumnSpacing="8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Button
+                    Grid.Column="0"
+                    Command="{x:Bind ViewModel.TestImapConnectionCommand}"
+                    Content="{x:Bind ViewModel.TestImapButtonText, Mode=OneWay}" />
+                <Button
+                    Grid.Column="1"
+                    Command="{x:Bind ViewModel.TestCalDavConnectionCommand}"
+                    Content="{x:Bind ViewModel.TestCalDavButtonText, Mode=OneWay}"
+                    IsEnabled="{x:Bind ViewModel.IsCalDavSettingsVisible, Mode=OneWay}" />
+                <Button
+                    Grid.Column="3"
+                    Command="{x:Bind ViewModel.CancelCommand}"
+                    Content="{x:Bind ViewModel.CancelButtonText, Mode=OneWay}" />
+                <Button
+                    Grid.Column="4"
+                    Command="{x:Bind ViewModel.SaveCommand}"
+                    Content="{x:Bind ViewModel.SaveButtonText, Mode=OneWay}"
+                    Style="{ThemeResource AccentButtonStyle}" />
+            </Grid>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:ImapCalDavSettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml.cs
new file mode 100644
index 00000000..baa63e43
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/ImapCalDavSettingsPage.xaml.cs
@@ -0,0 +1,31 @@
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class ImapCalDavSettingsPage : ImapCalDavSettingsPageAbstract
+{
+    public ImapCalDavSettingsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void OnSetupModeSelectionChanged(SelectorBar sender, SelectorBarSelectionChangedEventArgs e)
+    {
+        ViewModel.SelectedSetupTabIndex = SetupModeSelector.SelectedItem == null ? 0 : SetupModeSelector.Items.IndexOf(SetupModeSelector.SelectedItem);
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        var tabIndex = ViewModel.SelectedSetupTabIndex;
+        if (tabIndex < 0 || tabIndex >= SetupModeSelector.Items.Count)
+        {
+            tabIndex = 0;
+        }
+
+        SetupModeSelector.SelectedItem = SetupModeSelector.Items[tabIndex];
+    }
+}
diff --git a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
similarity index 98%
rename from Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
rename to Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
index 5c8b9813..dc0648f3 100644
--- a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml
@@ -1,11 +1,11 @@
-<abstract:MergedAccountDetailsPageAbstract
+<abstract:MergedAccountDetailsPageAbstract
     x:Class="Wino.Views.Account.MergedAccountDetailsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls1="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Mail.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
@@ -18,7 +18,7 @@
         <DataTemplate x:Key="LinkedAccountTemplate" x:DataType="data:AccountProviderDetailViewModel">
             <controls:SettingsCard
                 Margin="0,2,0,0"
-                Command="{Binding ViewModel.UnlinkAccountCommand, Mode=OneWay, ElementName=MainPage}"
+                Click="UnlinkAccount_Click"
                 CommandParameter="{x:Bind}"
                 Description="{x:Bind Account.Address}"
                 Header="{x:Bind Account.Name}"
@@ -38,7 +38,7 @@
         <DataTemplate x:Key="UnlinkedAccountTemplate" x:DataType="data:AccountProviderDetailViewModel">
             <controls:SettingsCard
                 Margin="0,2,0,0"
-                Command="{Binding ViewModel.LinkAccountCommand, Mode=OneWay, ElementName=MainPage}"
+                Click="LinkAccount_Click"
                 CommandParameter="{x:Bind}"
                 Description="{x:Bind Account.Address}"
                 FlowDirection="RightToLeft"
diff --git a/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml.cs
new file mode 100644
index 00000000..c590126d
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Account/MergedAccountDetailsPage.xaml.cs
@@ -0,0 +1,31 @@
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
+using Wino.Mail.ViewModels.Data;
+using Wino.Views.Abstract;
+
+
+namespace Wino.Views.Account;
+
+public sealed partial class MergedAccountDetailsPage : MergedAccountDetailsPageAbstract
+{
+    public MergedAccountDetailsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void UnlinkAccount_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard card && card.CommandParameter is AccountProviderDetailViewModel account)
+        {
+            ViewModel.UnlinkAccountCommand.Execute(account);
+        }
+    }
+
+    private void LinkAccount_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard card && card.CommandParameter is AccountProviderDetailViewModel account)
+        {
+            ViewModel.LinkAccountCommand.Execute(account);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml b/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml
new file mode 100644
index 00000000..d5d9c006
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml
@@ -0,0 +1,127 @@
+<abstract:AccountSetupProgressPageAbstract
+    x:Class="Wino.Views.AccountSetupProgressPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d">
+
+    <Grid Padding="0,8">
+        <StackPanel
+            MaxWidth="500"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Spacing="24">
+
+            <!--  Title  -->
+            <TextBlock
+                HorizontalAlignment="Center"
+                Style="{StaticResource SubtitleTextBlockStyle}"
+                Text="{x:Bind domain:Translator.AccountSetup_Title}" />
+
+            <!--  Steps List  -->
+            <ListView
+                IsItemClickEnabled="False"
+                ItemsSource="{x:Bind ViewModel.Steps, Mode=OneWay}"
+                SelectionMode="None">
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem">
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                        <Setter Property="Padding" Value="0,6" />
+                        <Setter Property="MinHeight" Value="0" />
+                    </Style>
+                </ListView.ItemContainerStyle>
+                <ListView.ItemTemplate>
+                    <DataTemplate x:DataType="accounts:AccountSetupStepModel">
+                        <Grid ColumnSpacing="12">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="28" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <!--  Status indicator  -->
+                            <Grid
+                                Width="20"
+                                Height="20"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
+
+                                <!--  Pending: gray circle  -->
+                                <FontIcon
+                                    FontSize="16"
+                                    Foreground="{ThemeResource TextFillColorDisabledBrush}"
+                                    Glyph="&#xEA3A;"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(IsPending), Mode=OneWay}" />
+
+                                <!--  InProgress: progress ring  -->
+                                <winuiControls:ProgressRing
+                                    Width="16"
+                                    Height="16"
+                                    IsActive="{x:Bind IsInProgress, Mode=OneWay}"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(IsInProgress), Mode=OneWay}" />
+
+                                <!--  Succeeded: green check  -->
+                                <FontIcon
+                                    FontSize="16"
+                                    Foreground="#107C10"
+                                    Glyph="&#xE73E;"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(IsSucceeded), Mode=OneWay}" />
+
+                                <!--  Failed: red error  -->
+                                <FontIcon
+                                    FontSize="16"
+                                    Foreground="#D13438"
+                                    Glyph="&#xEA39;"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(IsFailed), Mode=OneWay}" />
+                            </Grid>
+
+                            <!--  Step text  -->
+                            <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                                <TextBlock Text="{x:Bind Title}" />
+                                <TextBlock
+                                    Foreground="#D13438"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind ErrorMessage, Mode=OneWay}"
+                                    TextWrapping="Wrap"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(IsFailed), Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+
+            <!--  Success InfoBar  -->
+            <winuiControls:InfoBar
+                IsClosable="False"
+                IsOpen="{x:Bind ViewModel.IsSetupComplete, Mode=OneWay}"
+                Message="{x:Bind domain:Translator.AccountSetup_SuccessMessage}"
+                Severity="Success" />
+
+            <!--  Failure InfoBar + Buttons  -->
+            <StackPanel Spacing="12" Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(ViewModel.IsSetupFailed), Mode=OneWay}">
+                <winuiControls:InfoBar
+                    IsClosable="False"
+                    IsOpen="True"
+                    Message="{x:Bind ViewModel.FailureMessage, Mode=OneWay}"
+                    Severity="Error" />
+
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    Orientation="Horizontal"
+                    Spacing="8">
+                    <Button Command="{x:Bind ViewModel.GoBackCommand}" Content="{x:Bind domain:Translator.AccountSetup_GoBackButton}" />
+                    <Button
+                        Command="{x:Bind ViewModel.TryAgainCommand}"
+                        Content="{x:Bind domain:Translator.AccountSetup_TryAgainButton}"
+                        Style="{StaticResource AccentButtonStyle}" />
+                </StackPanel>
+            </StackPanel>
+
+        </StackPanel>
+    </Grid>
+</abstract:AccountSetupProgressPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml.cs b/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml.cs
new file mode 100644
index 00000000..e0802503
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/AccountSetupProgressPage.xaml.cs
@@ -0,0 +1,11 @@
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class AccountSetupProgressPage : AccountSetupProgressPageAbstract
+{
+    public AccountSetupProgressPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml
new file mode 100644
index 00000000..7f7b4639
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml
@@ -0,0 +1,74 @@
+<abstract:CalendarAccountSettingsPageAbstract
+    x:Class="Wino.Mail.WinUI.Views.Calendar.CalendarAccountSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Style="{StaticResource PageStyle}"
+    mc:Ignorable="d">
+
+    <Grid Padding="20" RowSpacing="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!--  Page Header  -->
+        <StackPanel Grid.Row="0" Spacing="4">
+            <TextBlock Style="{StaticResource TitleTextBlockStyle}" Text="{x:Bind domain:Translator.CalendarAccountSettings_Title, Mode=OneTime}" />
+            <TextBlock
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Style="{StaticResource BodyTextBlockStyle}"
+                Text="{x:Bind ViewModel.Account.Name, Mode=OneWay}"
+                TextWrapping="Wrap" />
+        </StackPanel>
+
+        <!--  Settings Cards  -->
+        <ScrollViewer Grid.Row="1">
+            <StackPanel MaxWidth="900" Spacing="4">
+
+                <!--  Account Color  -->
+                <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_AccountColorDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_AccountColor, Mode=OneTime}">
+                    <controls:SettingsCard.HeaderIcon>
+                        <FontIcon Glyph="&#xE790;" />
+                    </controls:SettingsCard.HeaderIcon>
+                    <Border
+                        Width="40"
+                        Height="40"
+                        Background="{x:Bind ViewModel.AccountColorHex, Mode=OneWay}"
+                        CornerRadius="4" />
+                </controls:SettingsCard>
+
+                <!--  Enable Synchronization  -->
+                <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabledDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabled, Mode=OneTime}">
+                    <controls:SettingsCard.HeaderIcon>
+                        <FontIcon Glyph="&#xE895;" />
+                    </controls:SettingsCard.HeaderIcon>
+                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsSyncEnabled, Mode=TwoWay}" />
+                </controls:SettingsCard>
+
+                <!--  Default Show As Status  -->
+                <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAsDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAs, Mode=OneTime}">
+                    <controls:SettingsCard.HeaderIcon>
+                        <FontIcon Glyph="&#xE163;" />
+                    </controls:SettingsCard.HeaderIcon>
+                    <ComboBox
+                        MinWidth="150"
+                        ItemsSource="{x:Bind ViewModel.ShowAsOptions, Mode=OneWay}"
+                        SelectedItem="{x:Bind ViewModel.SelectedDefaultShowAsOption, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="calendarViewModels:ShowAsOption">
+                                <TextBlock Text="{x:Bind DisplayText}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </controls:SettingsCard>
+
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</abstract:CalendarAccountSettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml.cs
new file mode 100644
index 00000000..0d74d993
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml.cs
@@ -0,0 +1,11 @@
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Mail.WinUI.Views.Calendar;
+
+public sealed partial class CalendarAccountSettingsPage : CalendarAccountSettingsPageAbstract
+{
+    public CalendarAccountSettingsPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml
new file mode 100644
index 00000000..c31681ed
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml
@@ -0,0 +1,588 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<abstract:CalendarEventComposePageAbstract
+    x:Class="Wino.Calendar.Views.CalendarEventComposePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mailControls="using:Wino.Mail.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shared="using:Wino.Core.Domain.Entities.Shared"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
+    Style="{StaticResource PageStyle}"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <Style
+            x:Key="FieldToggleButtonStyle"
+            BasedOn="{StaticResource DefaultToggleButtonStyle}"
+            TargetType="ToggleButton">
+            <Setter Property="Padding" Value="12,6" />
+            <Setter Property="MinWidth" Value="0" />
+            <Setter Property="MinHeight" Value="0" />
+            <Setter Property="CornerRadius" Value="4" />
+        </Style>
+
+    </Page.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!--  Top Bar  -->
+        <Border
+            Background="{ThemeResource WinoContentZoneBackgroud}"
+            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="7">
+            <Grid Padding="12,6" ColumnSpacing="12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <!--  Left: Calendar, Show As, Reminder  -->
+                <StackPanel Orientation="Horizontal" Spacing="12">
+
+                    <!--  Calendar  -->
+                    <StackPanel
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <coreControls:WinoFontIcon FontSize="14" Icon="Calendar" />
+                        <Button
+                            Padding="10,6"
+                            HorizontalContentAlignment="Left"
+                            Style="{StaticResource DefaultButtonStyle}">
+                            <Button.Flyout>
+                                <Flyout x:Name="CalendarSelectionFlyout" Placement="BottomEdgeAlignedLeft">
+                                    <ScrollViewer MaxHeight="360">
+                                        <ItemsControl ItemsSource="{x:Bind ViewModel.AvailableCalendarGroups, Mode=OneWay}">
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
+                                                    <StackPanel
+                                                        MinWidth="320"
+                                                        Padding="0,0,0,12"
+                                                        Spacing="6">
+                                                        <TextBlock FontWeight="SemiBold">
+                                                            <Run Text="{x:Bind Account.Name}" />
+                                                            <Run Text=" (" />
+                                                            <Run Text="{x:Bind Account.Address}" />
+                                                            <Run Text=")" />
+                                                        </TextBlock>
+
+                                                        <ListView
+                                                            IsItemClickEnabled="True"
+                                                            ItemClick="ComposeCalendarClicked"
+                                                            ItemsSource="{x:Bind AccountCalendars}"
+                                                            SelectionMode="None">
+                                                            <ListView.ItemTemplate>
+                                                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                                                    <Grid ColumnSpacing="10">
+                                                                        <Grid.ColumnDefinitions>
+                                                                            <ColumnDefinition Width="Auto" />
+                                                                            <ColumnDefinition Width="*" />
+                                                                        </Grid.ColumnDefinitions>
+
+                                                                        <Ellipse
+                                                                            Width="14"
+                                                                            Height="14"
+                                                                            VerticalAlignment="Center"
+                                                                            Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
+
+                                                                        <TextBlock
+                                                                            Grid.Column="1"
+                                                                            VerticalAlignment="Center"
+                                                                            Text="{x:Bind Name}" />
+                                                                    </Grid>
+                                                                </DataTemplate>
+                                                            </ListView.ItemTemplate>
+                                                        </ListView>
+                                                    </StackPanel>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </ScrollViewer>
+                                </Flyout>
+                            </Button.Flyout>
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <Ellipse
+                                    Width="10"
+                                    Height="10"
+                                    VerticalAlignment="Center"
+                                    Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedCalendar.BackgroundColorHex), Mode=OneWay}" />
+                                <StackPanel Spacing="0">
+                                    <TextBlock Text="{x:Bind ViewModel.SelectedCalendarDisplayText, Mode=OneWay}" />
+                                    <TextBlock
+                                        FontSize="11"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind ViewModel.SelectedCalendarAccountText, Mode=OneWay}"
+                                        Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(ViewModel.SelectedCalendarAccountText), Mode=OneWay}" />
+                                </StackPanel>
+                                <FontIcon Glyph="&#xE70D;" />
+                            </StackPanel>
+                        </Button>
+                    </StackPanel>
+
+                    <!--  Show As  -->
+                    <StackPanel
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <coreControls:WinoFontIcon FontSize="14" Icon="CalendarShowAs" />
+                        <ComboBox
+                            VerticalAlignment="Center"
+                            ItemsSource="{x:Bind ViewModel.ShowAsOptions}"
+                            SelectedItem="{x:Bind ViewModel.SelectedShowAsOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:ShowAsOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+
+                    <!--  Reminder  -->
+                    <StackPanel
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <coreControls:WinoFontIcon FontSize="14" Icon="Reminder" />
+                        <ComboBox
+                            VerticalAlignment="Center"
+                            ItemsSource="{x:Bind ViewModel.ReminderOptions}"
+                            SelectedItem="{x:Bind ViewModel.SelectedReminderOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:ReminderOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+                </StackPanel>
+
+                <StackPanel
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Spacing="4">
+                    <AppBarButton Command="{x:Bind ViewModel.CancelCommand}" Label="{x:Bind domain:Translator.Buttons_Discard}">
+                        <AppBarButton.Icon>
+                            <coreControls:WinoFontIcon Icon="Delete" />
+                        </AppBarButton.Icon>
+                    </AppBarButton>
+                    <AppBarButton Command="{x:Bind ViewModel.CreateCommand}" Label="{x:Bind domain:Translator.Buttons_Save}">
+                        <AppBarButton.Icon>
+                            <coreControls:WinoFontIcon Icon="Save" />
+                        </AppBarButton.Icon>
+                    </AppBarButton>
+                </StackPanel>
+            </Grid>
+        </Border>
+
+        <!--  Scrollable Content  -->
+        <ScrollViewer Grid.Row="1" MaxWidth="1200">
+            <StackPanel
+                Padding="40,24,40,40"
+                HorizontalAlignment="Stretch"
+                Spacing="0">
+
+                <!--  Title  -->
+                <TextBox
+                    FontSize="24"
+                    PlaceholderText="{x:Bind domain:Translator.CalendarEventCompose_TitlePlaceholder}"
+                    Text="{x:Bind ViewModel.Title, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                    <TextBox.Style>
+                        <Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
+                            <Setter Property="Background" Value="Transparent" />
+                            <Setter Property="BorderThickness" Value="0" />
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <!--<Setter Property="Padding" Value="0,8" />-->
+                        </Style>
+                    </TextBox.Style>
+                </TextBox>
+
+                <!--  Divider  -->
+                <Border
+                    Height="1"
+                    Margin="0,0,0,20"
+                    Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+                <!--  Date Row  -->
+                <StackPanel
+                    Margin="0,0,0,12"
+                    Orientation="Horizontal"
+                    Spacing="12">
+                    <DatePicker Date="{x:Bind ViewModel.StartDate, Mode=TwoWay}" Header="{x:Bind domain:Translator.CalendarEventCompose_StartDate}" />
+
+                    <ToggleButton
+                        VerticalAlignment="Bottom"
+                        Content="{x:Bind domain:Translator.CalendarEventCompose_AllDay}"
+                        IsChecked="{x:Bind ViewModel.IsAllDay, Mode=TwoWay}"
+                        Style="{StaticResource FieldToggleButtonStyle}" />
+                </StackPanel>
+
+                <!--  Time Row  -->
+                <StackPanel
+                    Margin="0,0,0,8"
+                    Orientation="Horizontal"
+                    Spacing="12"
+                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsAllDay), Mode=OneWay}">
+                    <TimePicker
+                        ClockIdentifier="{x:Bind ViewModel.TimePickerClockIdentifier, Mode=OneWay}"
+                        Header="{x:Bind domain:Translator.CalendarEventCompose_StartTime}"
+                        SelectedTime="{x:Bind ViewModel.StartTime, Mode=TwoWay}" />
+
+                    <TextBlock
+                        Margin="0,28,0,0"
+                        VerticalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="—" />
+
+                    <TimePicker
+                        ClockIdentifier="{x:Bind ViewModel.TimePickerClockIdentifier, Mode=OneWay}"
+                        Header="{x:Bind domain:Translator.CalendarEventCompose_EndTime}"
+                        SelectedTime="{x:Bind ViewModel.EndTime, Mode=TwoWay}" />
+                </StackPanel>
+
+                <!--  All Day End Date  -->
+                <DatePicker
+                    Margin="0,0,0,8"
+                    Date="{x:Bind ViewModel.AllDayEndDate, Mode=TwoWay}"
+                    Header="{x:Bind domain:Translator.CalendarEventCompose_EndDate}"
+                    Visibility="{x:Bind ViewModel.IsAllDay, Mode=OneWay}" />
+
+                <!--  Date/Time Summary  -->
+                <TextBlock
+                    Margin="0,0,0,16"
+                    FontSize="13"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="{x:Bind ViewModel.RecurrenceSummary, Mode=OneWay}"
+                    TextWrapping="Wrap" />
+
+                <!--  Location  -->
+                <TextBox
+                    Margin="0,0,0,12"
+                    PlaceholderText="{x:Bind domain:Translator.CalendarEventCompose_LocationPlaceholder}"
+                    Text="{x:Bind ViewModel.Location, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                <!--  Recurring Toggle  -->
+                <ToggleButton
+                    Margin="0,0,0,4"
+                    IsChecked="{x:Bind ViewModel.IsRecurring, Mode=TwoWay}"
+                    Style="{StaticResource FieldToggleButtonStyle}">
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <coreControls:WinoFontIcon FontSize="14" Icon="CalendarEventRepeat" />
+                        <TextBlock Text="{x:Bind domain:Translator.CalendarEventCompose_Recurring}" />
+                    </StackPanel>
+                </ToggleButton>
+
+                <!--  Recurrence Panel  -->
+                <Border
+                    Margin="0,8,0,4"
+                    Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="{StaticResource ControlCornerRadius}"
+                    Visibility="{x:Bind ViewModel.IsRecurring, Mode=OneWay}">
+                    <StackPanel Spacing="12">
+                        <Grid ColumnSpacing="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventCompose_RepeatEvery}" />
+                            <ComboBox
+                                Grid.Column="1"
+                                ItemsSource="{x:Bind ViewModel.RecurrenceIntervalOptions}"
+                                SelectedItem="{x:Bind ViewModel.SelectedRecurrenceInterval, Mode=TwoWay}" />
+                            <TextBlock
+                                Grid.Column="2"
+                                VerticalAlignment="Center"
+                                Text="{x:Bind domain:Translator.CalendarEventCompose_Every}" />
+                            <ComboBox
+                                Grid.Column="3"
+                                ItemsSource="{x:Bind ViewModel.RecurrenceFrequencyOptions}"
+                                SelectedItem="{x:Bind ViewModel.SelectedRecurrenceFrequencyOption, Mode=TwoWay}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate x:DataType="calendarViewModels:CalendarComposeFrequencyOption">
+                                        <TextBlock Text="{x:Bind DisplayText}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                            <TextBlock
+                                Grid.Column="4"
+                                VerticalAlignment="Center"
+                                Text="{x:Bind domain:Translator.CalendarEventCompose_ForWeekdays}"
+                                Visibility="{x:Bind ViewModel.IsDailyRecurrenceSelected, Mode=OneWay}" />
+                            <ItemsControl
+                                Grid.Column="5"
+                                IsEnabled="{x:Bind ViewModel.IsDailyRecurrenceSelected, Mode=OneWay}"
+                                ItemsSource="{x:Bind ViewModel.WeekdayOptions}"
+                                Visibility="{x:Bind ViewModel.IsDailyRecurrenceSelected, Mode=OneWay}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal" Spacing="4" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate x:DataType="calendarViewModels:CalendarComposeWeekdayOption">
+                                        <ToggleButton
+                                            Width="32"
+                                            Height="32"
+                                            Padding="0"
+                                            IsChecked="{x:Bind IsSelected, Mode=TwoWay}">
+                                            <TextBlock HorizontalAlignment="Center" Text="{x:Bind Label}" />
+                                        </ToggleButton>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                            <TextBlock
+                                Grid.Column="6"
+                                VerticalAlignment="Center"
+                                Text="{x:Bind domain:Translator.CalendarEventCompose_Until}" />
+                            <CalendarDatePicker
+                                Grid.Column="7"
+                                Date="{x:Bind ViewModel.RecurrenceEndDate, Mode=TwoWay}"
+                                PlaceholderText="{x:Bind domain:Translator.CalendarEventCompose_NoEndDate}" />
+                            <Button
+                                Grid.Column="8"
+                                Command="{x:Bind ViewModel.ClearRecurrenceEndDateCommand}"
+                                Style="{StaticResource TransparentActionButtonStyle}">
+                                <coreControls:WinoFontIcon FontSize="14" Icon="Dismiss" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+                </Border>
+
+                <!--  People & Attachments Toggle Row  -->
+                <StackPanel
+                    Margin="0,12,0,4"
+                    Orientation="Horizontal"
+                    Spacing="8">
+                    <ToggleButton x:Name="PeopleToggle" Style="{StaticResource FieldToggleButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="14" Icon="People" />
+                            <TextBlock Text="{x:Bind domain:Translator.CalendarEventDetails_People}" />
+                        </StackPanel>
+                    </ToggleButton>
+
+                    <ToggleButton x:Name="AttachmentsToggle" Style="{StaticResource FieldToggleButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="14" Icon="Attachment" />
+                            <TextBlock Text="{x:Bind domain:Translator.CalendarEventDetails_Attachments}" />
+                        </StackPanel>
+                    </ToggleButton>
+                </StackPanel>
+
+                <!--  People Pane  -->
+                <Border
+                    Margin="0,8,0,0"
+                    Padding="16"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="{StaticResource ControlCornerRadius}"
+                    Visibility="{x:Bind PeopleToggle.IsChecked, Mode=OneWay}">
+                    <StackPanel Spacing="8">
+                        <toolkit:TokenizingTextBox
+                            x:Name="AttendeeBox"
+                            BorderThickness="0"
+                            ItemsSource="{x:Bind ViewModel.Attendees, Mode=OneWay}"
+                            LostFocus="AddressBoxLostFocus"
+                            PlaceholderText="{x:Bind domain:Translator.CalendarEventDetails_InviteSomeone}"
+                            SuggestedItemTemplate="{StaticResource ContactSuggestionTemplate}"
+                            TokenDelimiter=";"
+                            TokenItemAdding="TokenItemAdding"
+                            TokenItemTemplate="{StaticResource ContactTokenTemplate}" />
+
+                        <ListView
+                            Margin="-8,0,-8,-8"
+                            ItemsSource="{x:Bind ViewModel.Attendees, Mode=OneWay}"
+                            SelectionMode="None">
+                            <ListView.ItemContainerStyle>
+                                <Style TargetType="ListViewItem">
+                                    <Setter Property="Padding" Value="8,4" />
+                                    <Setter Property="MinHeight" Value="0" />
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="data:CalendarComposeAttendeeViewModel">
+                                    <Grid ColumnSpacing="10">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <controls:ImagePreviewControl
+                                            Width="32"
+                                            Height="32"
+                                            Address="{x:Bind Email}"
+                                            DisplayNameOverride="{x:Bind DisplayName}"
+                                            PreviewContact="{x:Bind ResolvedContact}" />
+
+                                        <StackPanel
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Spacing="1">
+                                            <TextBlock
+                                                FontSize="13"
+                                                Text="{x:Bind DisplayName}"
+                                                TextTrimming="CharacterEllipsis" />
+                                            <TextBlock
+                                                FontSize="11"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{x:Bind Email}"
+                                                TextTrimming="CharacterEllipsis"
+                                                Visibility="{x:Bind HasDistinctDisplayName}" />
+                                        </StackPanel>
+
+                                        <Button
+                                            Grid.Column="2"
+                                            Padding="6,4"
+                                            VerticalAlignment="Center"
+                                            Click="RemoveAttendeeClicked"
+                                            Style="{StaticResource TransparentActionButtonStyle}"
+                                            Tag="{x:Bind}">
+                                            <coreControls:WinoFontIcon FontSize="12" Icon="Delete" />
+                                        </Button>
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </StackPanel>
+                </Border>
+
+                <!--  Attachments Pane  -->
+                <Border
+                    x:Name="AttachmentsPane"
+                    Margin="0,8,0,0"
+                    Padding="16"
+                    AllowDrop="True"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    CornerRadius="{StaticResource ControlCornerRadius}"
+                    DragLeave="AttachmentsPane_DragLeave"
+                    DragOver="AttachmentsPane_DragOver"
+                    Drop="AttachmentsPane_Drop"
+                    ToolTipService.ToolTip="{x:Bind ViewModel.AttachmentsDisabledTooltipText, Mode=OneWay}"
+                    Visibility="{x:Bind AttachmentsToggle.IsChecked, Mode=OneWay}">
+                    <StackPanel Spacing="8">
+                        <Button
+                            HorizontalAlignment="Left"
+                            Command="{x:Bind ViewModel.AddAttachmentsCommand}"
+                            IsEnabled="{x:Bind ViewModel.CanAddAttachments, Mode=OneWay}"
+                            Style="{StaticResource TransparentActionButtonStyle}">
+                            <StackPanel Orientation="Horizontal" Spacing="8">
+                                <coreControls:WinoFontIcon FontSize="14" Icon="AttachmentNew" />
+                                <TextBlock
+                                    FontSize="18"
+                                    FontWeight="SemiBold"
+                                    Text="+" />
+                            </StackPanel>
+                        </Button>
+
+                        <GridView
+                            Margin="-8,0,-8,-8"
+                            ItemsSource="{x:Bind ViewModel.Attachments, Mode=OneWay}"
+                            SelectionMode="None">
+                            <!--<ListView.ItemContainerStyle>
+                                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                                    <Setter Property="Padding" Value="8,4" />
+                                    <Setter Property="MinHeight" Value="0" />
+                                </Style>
+                            </ListView.ItemContainerStyle>-->
+                            <GridView.ItemTemplate>
+                                <DataTemplate x:DataType="data:CalendarComposeAttachmentViewModel">
+                                    <Grid Height="44" ColumnSpacing="8">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="32" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <ContentControl
+                                            VerticalAlignment="Center"
+                                            Content="{x:Bind AttachmentType}"
+                                            ContentTemplateSelector="{StaticResource FileTypeIconSelector}" />
+
+                                        <StackPanel
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            Spacing="1">
+                                            <TextBlock
+                                                FontSize="13"
+                                                Text="{x:Bind FileName}"
+                                                TextTrimming="CharacterEllipsis" />
+                                            <TextBlock
+                                                FontSize="11"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{x:Bind ReadableSize}" />
+                                        </StackPanel>
+
+                                        <Button
+                                            Grid.Column="2"
+                                            Padding="6,4"
+                                            VerticalAlignment="Center"
+                                            Click="RemoveAttachmentClicked"
+                                            Style="{StaticResource TransparentActionButtonStyle}"
+                                            Tag="{x:Bind}">
+                                            <coreControls:WinoFontIcon
+                                                FontSize="20"
+                                                Foreground="{ThemeResource DeleteBrush}"
+                                                Icon="Delete" />
+                                        </Button>
+                                    </Grid>
+                                </DataTemplate>
+                            </GridView.ItemTemplate>
+                        </GridView>
+                    </StackPanel>
+                </Border>
+
+                <!--  Notes Header  -->
+                <StackPanel
+                    Margin="0,20,0,8"
+                    Orientation="Horizontal"
+                    Spacing="8">
+                    <coreControls:WinoFontIcon
+                        FontSize="14"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Icon="Draft" />
+                    <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.CalendarEventCompose_Notes}" />
+                </StackPanel>
+                <!--  Notes Editor  -->
+                <mailControls:EditorTabbedCommandBarControl CommandTarget="{x:Bind NotesEditor}">
+                    <mailControls:EditorTabbedCommandBarControl.PaneCustomContent>
+                        <toolkit:TabbedCommandBarItem
+                            CommandAlignment="Right"
+                            IsDynamicOverflowEnabled="True"
+                            OverflowButtonAlignment="Left">
+                            <AppBarButton Click="ToggleNotesEditorThemeClicked" ToolTipService.ToolTip="{x:Bind GetEditorThemeToolTip(NotesEditor.IsEditorDarkMode), Mode=OneWay}">
+                                <AppBarButton.Icon>
+                                    <coreControls:WinoFontIcon Icon="{x:Bind GetEditorThemeIcon(NotesEditor.IsEditorDarkMode), Mode=OneWay}" />
+                                </AppBarButton.Icon>
+                            </AppBarButton>
+                        </toolkit:TabbedCommandBarItem>
+                    </mailControls:EditorTabbedCommandBarControl.PaneCustomContent>
+                </mailControls:EditorTabbedCommandBarControl>
+                <mailControls:WebViewEditorControl
+                    x:Name="NotesEditor"
+                    MinHeight="500"
+                    IsEditorDarkMode="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=OneWay}" />
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</abstract:CalendarEventComposePageAbstract>
+
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml.cs
new file mode 100644
index 00000000..86c7ed28
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI.Controls;
+using EmailValidation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.Foundation;
+using Windows.Storage;
+using Wino.Core.Domain;
+using Wino.Messaging.Client.Shell;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Mail.WinUI.Controls;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Calendar.Views;
+
+public sealed partial class CalendarEventComposePage : CalendarEventComposePageAbstract,
+    IRecipient<ApplicationThemeChanged>
+{
+    private readonly List<IDisposable> _disposables = [];
+
+    public CalendarEventComposePage()
+    {
+        InitializeComponent();
+    }
+
+    public WinoIconGlyph GetEditorThemeIcon(bool isDarkMode) => isDarkMode ? WinoIconGlyph.LightEditor : WinoIconGlyph.DarkEditor;
+
+    public string GetEditorThemeToolTip(bool isDarkMode) => isDarkMode ? Translator.Composer_LightTheme : Translator.Composer_DarkTheme;
+
+    private void ToggleNotesEditorThemeClicked(object sender, RoutedEventArgs e)
+    {
+        NotesEditor.ToggleEditorTheme();
+    }
+
+    protected override async void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        _disposables.Add(GetSuggestionBoxDisposable(AttendeeBox));
+        _disposables.Add(NotesEditor);
+
+        ViewModel.GetHtmlNotesAsync = async () => await NotesEditor.GetHtmlBodyAsync() ?? string.Empty;
+        await NotesEditor.RenderHtmlAsync(" ");
+    }
+
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        base.OnNavigatingFrom(e);
+
+        foreach (var disposable in _disposables)
+        {
+            disposable.Dispose();
+        }
+
+        _disposables.Clear();
+    }
+
+    private IDisposable GetSuggestionBoxDisposable(TokenizingTextBox box)
+    {
+        return Observable.FromEventPattern<TypedEventHandler<AutoSuggestBox, AutoSuggestBoxTextChangedEventArgs>, AutoSuggestBoxTextChangedEventArgs>(
+                handler => box.TextChanged += handler,
+                handler => box.TextChanged -= handler)
+            .Throttle(TimeSpan.FromMilliseconds(120))
+            .ObserveOn(SynchronizationContext.Current!)
+            .Subscribe(async eventPattern =>
+            {
+                if (eventPattern.EventArgs.Reason != AutoSuggestionBoxTextChangeReason.UserInput)
+                    return;
+
+                if (eventPattern.Sender is not AutoSuggestBox senderBox || senderBox.Text.Length < 2)
+                    return;
+
+                var addresses = await ViewModel.SearchContactsAsync(senderBox.Text).ConfigureAwait(false);
+                await ViewModel.ExecuteUIThread(() => senderBox.ItemsSource = addresses);
+            });
+    }
+
+    private async void TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
+    {
+        if (!EmailValidator.Validate(args.TokenText))
+        {
+            args.Cancel = true;
+            ViewModel.NotifyInvalidEmail(args.TokenText);
+            return;
+        }
+
+        var deferral = args.GetDeferral();
+
+        try
+        {
+            var attendee = await ViewModel.GetAttendeeAsync(args.TokenText);
+            if (attendee == null)
+            {
+                args.Cancel = true;
+                ViewModel.NotifyAddressExists();
+                return;
+            }
+
+            args.Item = attendee;
+        }
+        finally
+        {
+            deferral.Complete();
+        }
+    }
+
+    private async void AddressBoxLostFocus(object sender, RoutedEventArgs e)
+    {
+        if (sender is not TokenizingTextBox tokenizingTextBox)
+            return;
+
+        if (tokenizingTextBox.Items.LastOrDefault() is not ITokenStringContainer info)
+            return;
+
+        var currentText = info.Text;
+        if (string.IsNullOrWhiteSpace(currentText) || !EmailValidator.Validate(currentText))
+            return;
+
+        var attendee = await ViewModel.GetAttendeeAsync(currentText);
+        if (attendee == null)
+        {
+            tokenizingTextBox.Text = string.Empty;
+            return;
+        }
+
+        ViewModel.AddAttendee(attendee);
+        tokenizingTextBox.Text = string.Empty;
+    }
+
+    private void RemoveAttendeeClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button { Tag: CalendarComposeAttendeeViewModel attendee })
+        {
+            ViewModel.RemoveAttendeeCommand.Execute(attendee);
+        }
+    }
+
+    private void RemoveAttachmentClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button { Tag: CalendarComposeAttachmentViewModel attachment })
+        {
+            ViewModel.RemoveAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    private void ComposeCalendarClicked(object sender, ItemClickEventArgs e)
+    {
+        if (e.ClickedItem is AccountCalendarViewModel calendar)
+        {
+            ViewModel.SelectedCalendar = calendar;
+            CalendarSelectionFlyout.Hide();
+        }
+    }
+
+    private void AttachmentsPane_DragOver(object sender, DragEventArgs e)
+    {
+        if (!ViewModel.CanAddAttachments)
+        {
+            e.AcceptedOperation = DataPackageOperation.None;
+            return;
+        }
+
+        e.AcceptedOperation = e.DataView.Contains(StandardDataFormats.StorageItems)
+            ? DataPackageOperation.Copy
+            : DataPackageOperation.None;
+
+        if (e.AcceptedOperation == DataPackageOperation.Copy)
+        {
+            e.DragUIOverride.Caption = Translator.ComposerAttachmentsDragDropAttach_Message;
+            e.DragUIOverride.IsCaptionVisible = true;
+            e.DragUIOverride.IsGlyphVisible = true;
+            e.DragUIOverride.IsContentVisible = true;
+        }
+    }
+
+    private void AttachmentsPane_DragLeave(object sender, DragEventArgs e)
+    {
+    }
+
+    private async void AttachmentsPane_Drop(object sender, DragEventArgs e)
+    {
+        if (!ViewModel.CanAddAttachments || !e.DataView.Contains(StandardDataFormats.StorageItems))
+        {
+            return;
+        }
+
+        var storageItems = await e.DataView.GetStorageItemsAsync();
+        var files = storageItems.OfType<StorageFile>();
+
+        foreach (var file in files)
+        {
+            var basicProperties = await file.GetBasicPropertiesAsync();
+            await ViewModel.ExecuteUIThread(() => ViewModel.TryAddAttachment(file.Path, (long)basicProperties.Size));
+        }
+    }
+
+    public void Receive(ApplicationThemeChanged message)
+    {
+        ViewModel.IsDarkWebviewRenderer = message.IsUnderlyingThemeDark;
+        NotesEditor.IsEditorDarkMode = message.IsUnderlyingThemeDark;
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+        WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+        WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml
new file mode 100644
index 00000000..a957dc61
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml
@@ -0,0 +1,29 @@
+<abstract:CalendarNotificationSettingsPageAbstract
+    x:Class="Wino.Mail.WinUI.Views.Calendar.CalendarNotificationSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <controls:SettingsCard Description="Set a default reminder for all new calendar events." Header="Default reminder">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE7F4;" />
+                </controls:SettingsCard.HeaderIcon>
+                <ComboBox ItemsSource="{x:Bind ViewModel.ReminderOptions, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedDefaultReminderIndex, Mode=TwoWay}" />
+            </controls:SettingsCard>
+
+            <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Description}" Header="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Header}">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE823;" />
+                </controls:SettingsCard.HeaderIcon>
+                <ComboBox ItemsSource="{x:Bind ViewModel.SnoozeOptions, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedDefaultSnoozeIndex, Mode=TwoWay}" />
+            </controls:SettingsCard>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:CalendarNotificationSettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml.cs
new file mode 100644
index 00000000..09e89d81
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarNotificationSettingsPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace Wino.Mail.WinUI.Views.Calendar;
+
+public sealed partial class CalendarNotificationSettingsPage : Wino.Mail.WinUI.Views.Abstract.CalendarNotificationSettingsPageAbstract
+{
+    public CalendarNotificationSettingsPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml
new file mode 100644
index 00000000..cbafe416
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml
@@ -0,0 +1,248 @@
+<abstract:CalendarPageAbstract
+    x:Class="Wino.Calendar.Views.CalendarPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
+    xmlns:calendarControls="using:Wino.Calendar.Controls"
+    xmlns:collections="using:CommunityToolkit.Mvvm.Collections"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:winoControls="using:Wino.Mail.WinUI.Controls"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <CollectionViewSource
+            x:Name="GroupedCalendarEnumerableViewSource"
+            IsSourceGrouped="True"
+            Source="{x:Bind ViewModel.AccountCalendarStateService.GroupedCalendars, Mode=OneWay}" />
+    </Page.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <winoControls:CalendarTitleBarContent
+            x:Name="CalendarToolbar"
+            Grid.Row="0"
+            Margin="4,0,7,8" />
+
+        <Border
+            Grid.Row="1"
+            Margin="4,0,7,7"
+            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="7">
+            <calendarControls:CalendarPeriodControl
+                x:Name="CalendarSurface"
+                CalendarItems="{x:Bind ViewModel.CalendarItems, Mode=OneWay}"
+                CalendarSettings="{x:Bind ViewModel.CurrentSettings, Mode=OneWay}"
+                DefaultHourBackground="{ThemeResource CalendarDefaultHourBackgroundBrush}"
+                EmptySlotTapped="CalendarSurfaceEmptySlotTapped"
+                IsEnabled="{x:Bind ViewModel.IsCalendarEnabled, Mode=OneWay}"
+                SelectedDateTime="{x:Bind ViewModel.SelectedQuickEventDate, Mode=OneWay}"
+                SelectedSlotBackground="{ThemeResource CalendarSelectedHourBackgroundBrush}"
+                VisibleRange="{x:Bind ViewModel.CurrentVisibleRange, Mode=OneWay}"
+                WorkHourBackground="{ThemeResource CalendarWorkHourBackgroundBrush}" />
+        </Border>
+
+        <Canvas
+            x:Name="CalendarOverlayCanvas"
+            Grid.RowSpan="2"
+            IsHitTestVisible="False">
+            <Grid
+                x:Name="TeachingTipPositionerGrid"
+                Background="Transparent"
+                IsHitTestVisible="False"
+                Visibility="Visible" />
+
+            <Popup
+                x:Name="QuickEventPopupDialog"
+                ActualPlacementChanged="PopupPlacementChanged"
+                Closed="QuickEventPopupClosed"
+                DesiredPlacement="{x:Bind helpers:XamlHelpers.GetPlaccementModeForCalendarType(ViewModel.StatePersistanceService.CalendarDisplayType), Mode=OneWay}"
+                IsLightDismissEnabled="True"
+                PlacementTarget="{x:Bind TeachingTipPositionerGrid}">
+                <Popup.ChildTransitions>
+                    <TransitionCollection>
+                        <PopupThemeTransition />
+                    </TransitionCollection>
+                </Popup.ChildTransitions>
+
+                <Grid
+                    MinWidth="440"
+                    MaxWidth="520"
+                    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+                    BorderBrush="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay, TargetNullValue='LightGray'}"
+                    BorderThickness="1"
+                    CornerRadius="8"
+                    RowSpacing="12">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <Button
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay, TargetNullValue='LightGray'}"
+                        CornerRadius="8,8,0,0">
+                        <Button.Content>
+                            <Grid
+                                Height="36"
+                                Padding="12,0"
+                                ColumnSpacing="10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock
+                                    VerticalAlignment="Center"
+                                    Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.SelectedQuickEventAccountCalendar.Account.Name, Mode=OneWay}" />
+
+                                <TextBlock
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    FontWeight="SemiBold"
+                                    Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}"
+                                    Text="{x:Bind ViewModel.SelectedQuickEventAccountCalendarName, Mode=OneWay}"
+                                    TextTrimming="CharacterEllipsis" />
+
+                                <FontIcon
+                                    Grid.Column="2"
+                                    VerticalAlignment="Center"
+                                    Foreground="{x:Bind helpers:XamlHelpers.GetReadableTextColor(ViewModel.SelectedQuickEventAccountCalendar.BackgroundColorHex), Mode=OneWay}"
+                                    Glyph="&#xE70D;" />
+                            </Grid>
+                        </Button.Content>
+                        <Button.Flyout>
+                            <Flyout x:Name="QuickEventAccountSelectorFlyout" Placement="Bottom">
+                                <ListView
+                                    MaxHeight="300"
+                                    ItemsSource="{x:Bind GroupedCalendarEnumerableViewSource.View, Mode=OneWay}"
+                                    SelectedItem="{x:Bind ViewModel.SelectedQuickEventAccountCalendar, Mode=TwoWay}"
+                                    SelectionChanged="QuickEventAccountSelectorSelectionChanged">
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                            <StackPanel
+                                                Margin="0,0,16,0"
+                                                Orientation="Horizontal"
+                                                Spacing="8">
+                                                <Ellipse
+                                                    Width="14"
+                                                    Height="14"
+                                                    Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
+                                                <TextBlock VerticalAlignment="Center" Text="{x:Bind Name, Mode=OneWay}" />
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                    <ListView.GroupStyle>
+                                        <GroupStyle>
+                                            <GroupStyle.HeaderTemplate>
+                                                <DataTemplate x:DataType="collections:IReadOnlyObservableGroup">
+                                                    <TextBlock FontWeight="SemiBold" Text="{x:Bind Key.ToString()}" />
+                                                </DataTemplate>
+                                            </GroupStyle.HeaderTemplate>
+                                        </GroupStyle>
+                                    </ListView.GroupStyle>
+                                </ListView>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+
+                    <Grid
+                        Grid.Row="1"
+                        Padding="12"
+                        RowSpacing="16">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Grid ColumnSpacing="12">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBox
+                                FontSize="16"
+                                PlaceholderText="{x:Bind domain:Translator.QuickEventDialog_EventName}"
+                                Text="{x:Bind ViewModel.EventName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                            <CheckBox
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Content="{x:Bind domain:Translator.QuickEventDialog_IsAllDay}"
+                                IsChecked="{x:Bind ViewModel.IsAllDay, Mode=TwoWay}" />
+                        </Grid>
+
+                        <Grid Grid.Row="1" ColumnSpacing="12">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <ComboBox
+                                IsEditable="True"
+                                IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsAllDay), Mode=OneWay}"
+                                ItemsSource="{x:Bind ViewModel.HourSelectionStrings, Mode=OneWay}"
+                                SelectedItem="{x:Bind ViewModel.SelectedStartTimeString, Mode=TwoWay}"
+                                TextSubmitted="StartTimeDurationSubmitted" />
+
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Text="-" />
+
+                            <ComboBox
+                                Grid.Column="2"
+                                IsEditable="True"
+                                IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsAllDay), Mode=OneWay}"
+                                ItemsSource="{x:Bind ViewModel.HourSelectionStrings, Mode=OneWay}"
+                                SelectedItem="{x:Bind ViewModel.SelectedEndTimeString, Mode=TwoWay}"
+                                TextSubmitted="EndTimeDurationSubmitted" />
+                        </Grid>
+
+                        <TextBox
+                            Grid.Row="2"
+                            PlaceholderText="{x:Bind domain:Translator.QuickEventDialog_Location}"
+                            Text="{x:Bind ViewModel.Location, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <Grid Grid.Row="3" ColumnSpacing="12">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <Button
+                                HorizontalAlignment="Stretch"
+                                Click="MoreDetailsClicked"
+                                Content="{x:Bind domain:Translator.QuickEventDialogMoreDetailsButtonText}" />
+
+                            <Button
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                Click="SaveQuickEventClicked"
+                                Content="{x:Bind domain:Translator.Buttons_Save}"
+                                IsEnabled="{x:Bind ViewModel.CanSaveQuickEvent, Mode=OneWay}"
+                                Style="{ThemeResource AccentButtonStyle}" />
+                        </Grid>
+                    </Grid>
+                </Grid>
+            </Popup>
+        </Canvas>
+    </Grid>
+</abstract:CalendarPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml.cs
new file mode 100644
index 00000000..1a4c3787
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarPage.xaml.cs
@@ -0,0 +1,339 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Calendar.Controls;
+using Wino.Calendar.Views.Abstract;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Calendar.Views;
+
+public sealed partial class CalendarPage : CalendarPageAbstract, ITitleBarSearchHost
+{
+    private const int PopupDialogOffset = 12;
+    private ICalendarShellClient CalendarShellClient { get; } = WinoApplication.Current.Services.GetRequiredService<ICalendarShellClient>();
+    private CancellationTokenSource? _searchCancellationTokenSource;
+    private long _calendarTypeSelectorChangedToken;
+    private bool _suppressSelectionResetOnPopupClose;
+
+    public ObservableCollection<TitleBarSearchSuggestion> SearchSuggestions { get; } = [];
+
+    public string SearchText { get; set; } = string.Empty;
+
+    public string SearchPlaceholderText => Translator.SearchBarPlaceholder;
+
+    public CalendarPage()
+    {
+        InitializeComponent();
+        _calendarTypeSelectorChangedToken = CalendarToolbar.RegisterSelectedTypeChanged(CalendarTypeSelectorSelectedTypeChanged);
+        CalendarToolbar.PreviousDateRequested += CalendarToolbarPreviousDateRequested;
+        CalendarToolbar.NextDateRequested += CalendarToolbarNextDateRequested;
+        ViewModel.PropertyChanged += ViewModelPropertyChanged;
+        CalendarShellClient.PropertyChanged += CalendarShellClientPropertyChanged;
+        CalendarShellClient.StatePersistenceService.StatePropertyChanged += CalendarStatePersistenceServiceChanged;
+        Unloaded += CalendarPageUnloaded;
+        RefreshCalendarToolbar();
+    }
+
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        CloseQuickEventPopup(clearSelection: true);
+        base.OnNavigatingFrom(e);
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+        RefreshCalendarToolbar();
+
+        if (e.NavigationMode == NavigationMode.Back && ViewModel.RestoreVisibleState())
+        {
+            return;
+        }
+
+        var anchorDate = DateOnly.FromDateTime(DateTime.Now.Date);
+
+        if (e.Parameter is CalendarPageNavigationArgs args && !args.RequestDefaultNavigation)
+        {
+            anchorDate = DateOnly.FromDateTime(args.NavigationDate.Date);
+        }
+
+        var request = new CalendarDisplayRequest(ViewModel.StatePersistanceService.CalendarDisplayType, anchorDate);
+        WeakReferenceMessenger.Default.Send(new LoadCalendarMessage(request));
+    }
+
+    public async Task OnTitleBarSearchTextChangedAsync()
+    {
+        _searchCancellationTokenSource?.Cancel();
+        _searchCancellationTokenSource?.Dispose();
+        _searchCancellationTokenSource = null;
+
+        SearchSuggestions.Clear();
+
+        if (string.IsNullOrWhiteSpace(SearchText))
+            return;
+
+        _searchCancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = _searchCancellationTokenSource.Token;
+
+        try
+        {
+            await Task.Delay(150, cancellationToken);
+            var results = await ViewModel.SearchCalendarItemsAsync(SearchText, 6, cancellationToken);
+
+            if (cancellationToken.IsCancellationRequested)
+                return;
+
+            foreach (var result in results)
+            {
+                var subtitleParts = new[]
+                {
+                    result.AssignedCalendar?.MailAccount?.Name,
+                    result.AssignedCalendar?.Name,
+                    result.LocalStartDate.ToString("g")
+                }.Where(part => !string.IsNullOrWhiteSpace(part));
+
+                SearchSuggestions.Add(new TitleBarSearchSuggestion(result.Title, string.Join(" • ", subtitleParts), result));
+            }
+        }
+        catch (OperationCanceledException)
+        {
+        }
+    }
+
+    public void OnTitleBarSearchSuggestionChosen(TitleBarSearchSuggestion suggestion)
+    {
+        SearchText = suggestion.Title;
+    }
+
+    public async Task OnTitleBarSearchSubmittedAsync(string queryText, TitleBarSearchSuggestion? chosenSuggestion)
+    {
+        SearchText = queryText;
+
+        if (chosenSuggestion?.Tag is CalendarItem selectedItem)
+        {
+            ViewModel.OpenCalendarSearchResult(selectedItem);
+            return;
+        }
+
+        var result = (await ViewModel.SearchCalendarItemsAsync(queryText, 1, CancellationToken.None)).FirstOrDefault();
+        if (result != null)
+        {
+            ViewModel.OpenCalendarSearchResult(result);
+        }
+    }
+
+    private void CalendarSurfaceEmptySlotTapped(object sender, CalendarEmptySlotTappedEventArgs e)
+    {
+        if (ViewModel.DisplayDetailsCalendarItemViewModel != null)
+        {
+            ViewModel.DisplayDetailsCalendarItemViewModel = null;
+            return;
+        }
+
+        ViewModel.SelectedQuickEventDate = e.ClickedDate;
+        ViewModel.IsAllDay = ViewModel.CurrentVisibleRange?.DisplayType == CalendarDisplayType.Month;
+
+        var transform = CalendarSurface.TransformToVisual(CalendarOverlayCanvas);
+        var canvasPoint = transform.TransformPoint(e.AnchorPoint);
+
+        TeachingTipPositionerGrid.Width = 1;
+        TeachingTipPositionerGrid.Height = 1;
+
+        Canvas.SetLeft(TeachingTipPositionerGrid, canvasPoint.X);
+        Canvas.SetTop(TeachingTipPositionerGrid, canvasPoint.Y);
+
+        if (!ViewModel.IsAllDay)
+        {
+            var startTime = e.ClickedDate.TimeOfDay;
+            var endTime = startTime.Add(TimeSpan.FromMinutes(30));
+            ViewModel.SelectQuickEventTimeRange(startTime, endTime);
+        }
+
+        _suppressSelectionResetOnPopupClose = true;
+        QuickEventPopupDialog.IsOpen = false;
+        QuickEventPopupDialog.IsOpen = true;
+        _suppressSelectionResetOnPopupClose = false;
+    }
+
+    private void QuickEventAccountSelectorSelectionChanged(object sender, SelectionChangedEventArgs e)
+        => QuickEventAccountSelectorFlyout.Hide();
+
+    private void QuickEventPopupClosed(object sender, object e)
+    {
+        if (!_suppressSelectionResetOnPopupClose)
+        {
+            ViewModel.SelectedQuickEventDate = null;
+        }
+    }
+
+    private void PopupPlacementChanged(object sender, object e)
+    {
+        if (sender is not Popup popup)
+        {
+            return;
+        }
+
+        popup.HorizontalOffset = 0;
+        popup.VerticalOffset = 0;
+
+        switch (popup.ActualPlacement)
+        {
+            case PopupPlacementMode.Top:
+                popup.VerticalOffset = PopupDialogOffset * -1;
+                break;
+            case PopupPlacementMode.Bottom:
+                popup.VerticalOffset = PopupDialogOffset;
+                break;
+            case PopupPlacementMode.Left:
+                popup.HorizontalOffset = PopupDialogOffset * -1;
+                break;
+            case PopupPlacementMode.Right:
+                popup.HorizontalOffset = PopupDialogOffset;
+                break;
+        }
+    }
+
+    private void StartTimeDurationSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArgs args)
+        => ViewModel.SelectedStartTimeString = args.Text;
+
+    private void EndTimeDurationSubmitted(ComboBox sender, ComboBoxTextSubmittedEventArgs args)
+        => ViewModel.SelectedEndTimeString = args.Text;
+
+    private void CalendarTypeSelectorSelectedTypeChanged(DependencyObject sender, DependencyProperty dp)
+    {
+        var selectedType = CalendarToolbar.SelectedType;
+        if (CalendarShellClient.StatePersistenceService.CalendarDisplayType != selectedType)
+        {
+            CalendarShellClient.StatePersistenceService.CalendarDisplayType = selectedType;
+        }
+    }
+
+    private void CalendarToolbarPreviousDateRequested(object? sender, EventArgs e)
+        => CalendarShellClient.PreviousDateRangeCommand.Execute(null);
+
+    private void CalendarToolbarNextDateRequested(object? sender, EventArgs e)
+        => CalendarShellClient.NextDateRangeCommand.Execute(null);
+
+    private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(ViewModel.VisibleDateRangeText))
+        {
+            RefreshCalendarToolbar();
+        }
+    }
+
+    private void CalendarShellClientPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(ICalendarShellClient.VisibleDateRangeText))
+        {
+            RefreshCalendarToolbar();
+        }
+    }
+
+    private void CalendarStatePersistenceServiceChanged(object? sender, string propertyName)
+    {
+        if (propertyName == nameof(IStatePersistanceService.CalendarDisplayType) ||
+            propertyName == nameof(IStatePersistanceService.DayDisplayCount))
+        {
+            RefreshCalendarToolbar();
+        }
+    }
+
+    private void RefreshCalendarToolbar()
+    {
+        CalendarToolbar.VisibleDateRangeText = CalendarShellClient.VisibleDateRangeText;
+        CalendarToolbar.TodayClickedCommand = CalendarShellClient.TodayClickedCommand;
+        CalendarToolbar.DisplayDayCount = CalendarShellClient.StatePersistenceService.DayDisplayCount;
+
+        if (CalendarToolbar.SelectedType != CalendarShellClient.StatePersistenceService.CalendarDisplayType)
+        {
+            CalendarToolbar.SelectedType = CalendarShellClient.StatePersistenceService.CalendarDisplayType;
+        }
+    }
+
+    private void CalendarPageUnloaded(object sender, RoutedEventArgs e)
+    {
+        CloseQuickEventPopup(clearSelection: true);
+        CalendarToolbar.UnregisterSelectedTypeChanged(_calendarTypeSelectorChangedToken);
+        CalendarToolbar.PreviousDateRequested -= CalendarToolbarPreviousDateRequested;
+        CalendarToolbar.NextDateRequested -= CalendarToolbarNextDateRequested;
+        ViewModel.PropertyChanged -= ViewModelPropertyChanged;
+        CalendarShellClient.PropertyChanged -= CalendarShellClientPropertyChanged;
+        CalendarShellClient.StatePersistenceService.StatePropertyChanged -= CalendarStatePersistenceServiceChanged;
+        _searchCancellationTokenSource?.Cancel();
+        _searchCancellationTokenSource?.Dispose();
+        Unloaded -= CalendarPageUnloaded;
+    }
+
+    private async void SaveQuickEventClicked(object sender, RoutedEventArgs e)
+    {
+        if (!ViewModel.SaveQuickEventCommand.CanExecute(null))
+        {
+            return;
+        }
+
+        _suppressSelectionResetOnPopupClose = true;
+
+        try
+        {
+            QuickEventPopupDialog.IsOpen = false;
+            await ViewModel.SaveQuickEventCommand.ExecuteAsync(null);
+        }
+        finally
+        {
+            _suppressSelectionResetOnPopupClose = false;
+            ViewModel.SelectedQuickEventDate = null;
+        }
+    }
+
+    private void MoreDetailsClicked(object sender, RoutedEventArgs e)
+    {
+        if (!ViewModel.GoToEventComposePageCommand.CanExecute(null))
+        {
+            return;
+        }
+
+        _suppressSelectionResetOnPopupClose = true;
+
+        try
+        {
+            QuickEventPopupDialog.IsOpen = false;
+            ViewModel.GoToEventComposePageCommand.Execute(null);
+        }
+        finally
+        {
+            _suppressSelectionResetOnPopupClose = false;
+            ViewModel.SelectedQuickEventDate = null;
+        }
+    }
+
+    private void CloseQuickEventPopup(bool clearSelection)
+    {
+        _suppressSelectionResetOnPopupClose = !clearSelection;
+        QuickEventPopupDialog.IsOpen = false;
+        _suppressSelectionResetOnPopupClose = false;
+
+        if (clearSelection)
+        {
+            ViewModel.SelectedQuickEventDate = null;
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml
new file mode 100644
index 00000000..965c0bc0
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml
@@ -0,0 +1,51 @@
+<abstract:CalendarPreferenceSettingsPageAbstract
+    x:Class="Wino.Mail.WinUI.Views.Calendar.CalendarPreferenceSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarSettings_NewEventBehavior_Description}" Header="{x:Bind domain:Translator.CalendarSettings_NewEventBehavior_Header}">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE163;" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.Content>
+                    <StackPanel Spacing="12">
+                        <ComboBox ItemsSource="{x:Bind ViewModel.NewEventBehaviorOptions, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedNewEventBehaviorOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:CalendarNewEventBehaviorOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <ComboBox
+                            ItemsSource="{x:Bind ViewModel.AvailableNewEventCalendars, Mode=OneWay}"
+                            SelectedItem="{x:Bind ViewModel.SelectedNewEventCalendar, Mode=TwoWay}"
+                            Visibility="{x:Bind ViewModel.ShouldShowSpecificNewEventCalendar, Mode=OneWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                    <StackPanel Orientation="Vertical" Spacing="2">
+                                        <TextBlock Text="{x:Bind Name}" />
+                                        <TextBlock
+                                            FontSize="12"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{x:Bind Account.Address}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+                </controls:SettingsCard.Content>
+            </controls:SettingsCard>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:CalendarPreferenceSettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml.cs
new file mode 100644
index 00000000..196c0fb9
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarPreferenceSettingsPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace Wino.Mail.WinUI.Views.Calendar;
+
+public sealed partial class CalendarPreferenceSettingsPage : Wino.Mail.WinUI.Views.Abstract.CalendarPreferenceSettingsPageAbstract
+{
+    public CalendarPreferenceSettingsPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml b/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml
new file mode 100644
index 00000000..2692c0e1
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml
@@ -0,0 +1,176 @@
+<abstract:CalendarRenderingSettingsPageAbstract
+    x:Class="Wino.Mail.WinUI.Views.Calendar.CalendarRenderingSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <controls:SettingsCard Description="Adjust the day that week starts." Header="First day of week">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE787;" />
+                </controls:SettingsCard.HeaderIcon>
+                <ComboBox ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedFirstDayOfWeekIndex, Mode=TwoWay}" />
+            </controls:SettingsCard>
+
+            <controls:SettingsExpander Description="Set the day range for your working hours." Header="Working days">
+                <controls:SettingsExpander.HeaderIcon>
+                    <FontIcon Glyph="&#xE8EF;" />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" ContentAlignment="Vertical">
+                        <controls:SettingsCard.Content>
+                            <StackPanel Spacing="16">
+                                <StackPanel Spacing="6">
+                                    <TextBlock FontWeight="SemiBold" Text="Highlight working hours" />
+                                    <ToggleSwitch
+                                        IsOn="{x:Bind ViewModel.IsWorkingHoursEnabled, Mode=TwoWay}"
+                                        OffContent="Off"
+                                        OnContent="On" />
+                                </StackPanel>
+
+                                <Grid RowSpacing="12">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="50" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="From" />
+                                        <ComboBox
+                                            Grid.Column="1"
+                                            IsEnabled="{x:Bind ViewModel.IsWorkingHoursEnabled, Mode=OneWay}"
+                                            ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}"
+                                            SelectedIndex="{x:Bind ViewModel.WorkingDayStartIndex, Mode=TwoWay}" />
+                                        <TimePicker
+                                            x:Name="WorkHourStartPicker"
+                                            Grid.Column="2"
+                                            Margin="12,0"
+                                            IsEnabled="{x:Bind ViewModel.IsWorkingHoursEnabled, Mode=OneWay}"
+                                            Time="{x:Bind ViewModel.WorkingHourStart, Mode=TwoWay}" />
+                                    </Grid>
+
+                                    <Grid Grid.Row="1">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="50" />
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="To" />
+                                        <ComboBox
+                                            Grid.Column="1"
+                                            IsEnabled="{x:Bind ViewModel.IsWorkingHoursEnabled, Mode=OneWay}"
+                                            ItemsSource="{x:Bind ViewModel.DayNames, Mode=OneWay}"
+                                            SelectedIndex="{x:Bind ViewModel.WorkingDayEndIndex, Mode=TwoWay}" />
+                                        <TimePicker
+                                            x:Name="WorkHourEndPicker"
+                                            Grid.Column="2"
+                                            Margin="12,0"
+                                            IsEnabled="{x:Bind ViewModel.IsWorkingHoursEnabled, Mode=OneWay}"
+                                            Time="{x:Bind ViewModel.WorkingHourEnd, Mode=TwoWay}" />
+                                    </Grid>
+                                </Grid>
+                            </StackPanel>
+                        </controls:SettingsCard.Content>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+
+            <controls:SettingsExpander Description="Adjust calendar timeline rendering options." Header="Calendar rendering" IsExpanded="True">
+                <controls:SettingsExpander.HeaderIcon>
+                    <FontIcon Glyph="&#xE9D2;" />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        ContentAlignment="Vertical"
+                        Description="How many pixels should 1 hour representation occupy in daily/weekly calendars."
+                        Header="Hour height">
+                        <StackPanel Spacing="12">
+                            <Slider
+                                x:Name="HourCellSlider"
+                                LargeChange="10"
+                                Maximum="120"
+                                Minimum="40"
+                                SmallChange="5"
+                                StepFrequency="5"
+                                Value="{x:Bind ViewModel.CellHourHeight, Mode=TwoWay}" />
+                            <Grid ColumnSpacing="12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock VerticalAlignment="Bottom" Text="00:00" />
+                                <Grid
+                                    Grid.Column="1"
+                                    Width="100"
+                                    Height="{x:Bind HourCellSlider.Value, Mode=OneWay}"
+                                    VerticalAlignment="Center"
+                                    BorderBrush="Black"
+                                    BorderThickness="1">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="1" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+                                    <Rectangle Grid.Row="1" HorizontalAlignment="Stretch" Stroke="Black" StrokeThickness="0.5" />
+                                </Grid>
+                            </Grid>
+                        </StackPanel>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="Set whether you want to use AM/PM or 24 hour clock identifier." Header="Clock identifier for headers">
+                        <StackPanel Spacing="8">
+                            <ToggleSwitch
+                                HorizontalAlignment="Right"
+                                IsOn="{x:Bind ViewModel.Is24HourHeaders, Mode=TwoWay}"
+                                OffContent="12h"
+                                OnContent="24h" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Text="{x:Bind ViewModel.TimedHourLabelPreview, Mode=OneWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarSettings_TimedDayHeaderFormat_Description}" Header="{x:Bind domain:Translator.CalendarSettings_TimedDayHeaderFormat_Header}">
+                        <StackPanel Spacing="8">
+                            <TextBox PlaceholderText="ddd dd" Text="{x:Bind ViewModel.TimedDayHeaderDateFormat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <ComboBox ItemsSource="{x:Bind ViewModel.TimedDayHeaderFormatPresets, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedTimedDayHeaderFormatPresetIndex, Mode=TwoWay}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Text="{x:Bind ViewModel.TimedDayHeaderFormatPreview, Mode=OneWay}"
+                                TextWrapping="WrapWholeWords" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+        </StackPanel>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="ClockIdentifierStates">
+                <VisualState x:Name="TwelveHour" />
+                <VisualState x:Name="TwentyFourHour">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind ViewModel.Is24HourHeaders, Mode=OneWay}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="WorkHourStartPicker.ClockIdentifier" Value="24HourClock" />
+                        <Setter Target="WorkHourEndPicker.ClockIdentifier" Value="24HourClock" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </ScrollViewer>
+</abstract:CalendarRenderingSettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml.cs
new file mode 100644
index 00000000..6cad889f
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/CalendarRenderingSettingsPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace Wino.Mail.WinUI.Views.Calendar;
+
+public sealed partial class CalendarRenderingSettingsPage : Wino.Mail.WinUI.Views.Abstract.CalendarRenderingSettingsPageAbstract
+{
+    public CalendarRenderingSettingsPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml b/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml
new file mode 100644
index 00000000..116a766f
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml
@@ -0,0 +1,660 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<abstract:EventDetailsPageAbstract
+    x:Class="Wino.Calendar.Views.EventDetailsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendar="using:Wino.Core.Domain.Entities.Calendar"
+    xmlns:calendarHelpers="using:Wino.Calendar.Helpers"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:ctControls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:local="using:Wino.Calendar.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:selectors="using:Wino.Mail.WinUI.Selectors"
+    Style="{StaticResource PageStyle}"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <selectors:RsvpStatusIconTemplateSelector x:Key="RsvpStatusIconSelector">
+            <selectors:RsvpStatusIconTemplateSelector.NotRespondedTemplate>
+                <DataTemplate>
+                    <coreControls:WinoFontIcon
+                        FontSize="20"
+                        Foreground="{ThemeResource SystemAccentColor}"
+                        Icon="EventRespond" />
+                </DataTemplate>
+            </selectors:RsvpStatusIconTemplateSelector.NotRespondedTemplate>
+            <selectors:RsvpStatusIconTemplateSelector.ConfirmedTemplate>
+                <DataTemplate>
+                    <coreControls:WinoFontIcon
+                        FontSize="20"
+                        Foreground="#527257"
+                        Icon="EventAccept" />
+                </DataTemplate>
+            </selectors:RsvpStatusIconTemplateSelector.ConfirmedTemplate>
+            <selectors:RsvpStatusIconTemplateSelector.TentativeTemplate>
+                <DataTemplate>
+                    <coreControls:WinoFontIcon
+                        FontSize="20"
+                        Foreground="#805682"
+                        Icon="EventTentative" />
+                </DataTemplate>
+            </selectors:RsvpStatusIconTemplateSelector.TentativeTemplate>
+            <selectors:RsvpStatusIconTemplateSelector.CancelledTemplate>
+                <DataTemplate>
+                    <coreControls:WinoFontIcon
+                        FontSize="20"
+                        Foreground="{ThemeResource DeleteBrush}"
+                        Icon="EventDecline" />
+                </DataTemplate>
+            </selectors:RsvpStatusIconTemplateSelector.CancelledTemplate>
+        </selectors:RsvpStatusIconTemplateSelector>
+
+        <Style x:Key="ActionBarElementContainerStackStyle" TargetType="StackPanel">
+            <Setter Property="Spacing" Value="6" />
+            <Setter Property="Padding" Value="10,0,4,0" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Orientation" Value="Horizontal" />
+        </Style>
+
+        <Style x:Key="EventDetailsPanelGridStyle" TargetType="Grid">
+            <Setter Property="Padding" Value="12,6" />
+            <Setter Property="Margin" Value="0,12" />
+            <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorSecondaryBrush}" />
+            <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+        </Style>
+
+        <Style
+            x:Key="EventDetailsPanelTitleStyle"
+            BasedOn="{StaticResource SubtitleTextBlockStyle}"
+            TargetType="TextBlock">
+            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="Margin" Value="0,0,0,20" />
+        </Style>
+    </Page.Resources>
+    <Grid Padding="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!--  Action Bar  -->
+        <Border
+            VerticalAlignment="Top"
+            Background="{ThemeResource WinoContentZoneBackgroud}"
+            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="7">
+            <Grid Padding="8">
+                <ctControls:WrapPanel
+                    x:Name="ActionBarWrapGrid"
+                    HorizontalAlignment="Left"
+                    HorizontalSpacing="4"
+                    VerticalSpacing="4">
+
+                    <!--  Save  -->
+                    <Button Command="{x:Bind ViewModel.SaveCommand}" Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="Save" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Buttons_Save}" />
+                        </StackPanel>
+                    </Button>
+
+                    <!--  Delete  -->
+                    <Button Command="{x:Bind ViewModel.DeleteCommand}" Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="Delete" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Buttons_Delete}" />
+                        </StackPanel>
+                    </Button>
+
+                    <Border
+                        Width="1"
+                        Height="24"
+                        Margin="4,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+                    <!--  Join Online  -->
+                    <Button
+                        Command="{x:Bind ViewModel.JoinOnlineCommand}"
+                        IsEnabled="{x:Bind calendarHelpers:CalendarXamlHelpers.HasOnlineMeetingLink(ViewModel.CurrentEvent), Mode=OneWay}"
+                        Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="EventJoinOnline" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventDetails_JoinOnline}" />
+                        </StackPanel>
+                    </Button>
+
+                    <Border
+                        Width="1"
+                        Height="24"
+                        Margin="4,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+                    <!--  RSVP Button  -->
+                    <Button
+                        Background="{ThemeResource CardBackgroundFillColorDefault}"
+                        Command="{x:Bind ViewModel.ToggleRsvpPanelCommand}"
+                        Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <ContentControl Content="{x:Bind ViewModel.CurrentRsvpStatus, Mode=OneWay}" ContentTemplateSelector="{StaticResource RsvpStatusIconSelector}" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind ViewModel.CurrentRsvpText, Mode=OneWay}" />
+                        </StackPanel>
+                    </Button>
+
+                    <Border
+                        Width="1"
+                        Height="24"
+                        Margin="4,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+                    <!--  Show as  -->
+                    <StackPanel
+                        Padding="12,0"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="8">
+                        <coreControls:WinoFontIcon FontSize="20" Icon="CalendarShowAs" />
+                        <ComboBox
+                            Width="150"
+                            VerticalAlignment="Center"
+                            ItemsSource="{x:Bind ViewModel.ShowAsOptions}"
+                            SelectedItem="{x:Bind ViewModel.SelectedShowAsOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:ShowAsOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+
+                    <!--  Reminder  -->
+                    <Button Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="Reminder" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventDetails_Reminder}" />
+                        </StackPanel>
+                        <Button.Flyout>
+                            <Flyout>
+                                <ListView
+                                    Width="200"
+                                    MaxHeight="300"
+                                    ItemsSource="{x:Bind ViewModel.ReminderOptions}"
+                                    SelectionMode="None">
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate x:DataType="calendarViewModels:ReminderOption">
+                                            <CheckBox Content="{x:Bind DisplayText}" IsChecked="{x:Bind IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                </ListView>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+
+                    <Border
+                        Width="1"
+                        Height="24"
+                        Margin="4,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+                    <!--  Test Notification  -->
+                    <Button Command="{x:Bind ViewModel.CreateTestNotificationCommand}" Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="Reminder" />
+                            <TextBlock VerticalAlignment="Center" Text="Test notification" />
+                        </StackPanel>
+                    </Button>
+
+                    <!--  Edit Series  -->
+                    <Border
+                        Width="1"
+                        Height="24"
+                        Margin="4,0"
+                        VerticalAlignment="Center"
+                        Background="{ThemeResource DividerStrokeColorDefaultBrush}"
+                        Visibility="{x:Bind ViewModel.CanEditSeries, Mode=OneWay}" />
+
+                    <Button
+                        Command="{x:Bind ViewModel.ViewSeriesCommand}"
+                        Style="{StaticResource TransparentActionButtonStyle}"
+                        Visibility="{x:Bind ViewModel.CanEditSeries, Mode=OneWay}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon FontSize="16" Icon="EventEditSeries" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventDetails_EditSeries}" />
+                        </StackPanel>
+                    </Button>
+                </ctControls:WrapPanel>
+            </Grid>
+        </Border>
+
+        <!--  RSVP Panel  -->
+        <Border
+            Grid.Row="1"
+            Margin="0,8,0,0"
+            Padding="16"
+            VerticalAlignment="Top"
+            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="7"
+            Visibility="{x:Bind ViewModel.IsRsvpPanelVisible, Mode=OneWay}">
+            <Grid RowSpacing="6">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <!--  Close Button  -->
+                <Button
+                    Grid.Column="1"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Command="{x:Bind ViewModel.CloseRsvpPanelCommand}"
+                    Style="{StaticResource TransparentActionButtonStyle}">
+                    <coreControls:WinoFontIcon FontSize="16" Icon="Dismiss" />
+                </Button>
+
+                <!--  RSVP Buttons  -->
+                <StackPanel Orientation="Horizontal" Spacing="4">
+                    <!--  Accept  -->
+                    <Button
+                        Command="{x:Bind ViewModel.SendRsvpResponseCommand}"
+                        CommandParameter="{x:Bind enums:AttendeeStatus.Accepted}"
+                        Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon
+                                FontSize="20"
+                                Foreground="#527257"
+                                Icon="EventAccept" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventRsvpPanel_Accept, Mode=OneTime}" />
+                        </StackPanel>
+                    </Button>
+
+                    <!--  Tentative  -->
+                    <Button
+                        Command="{x:Bind ViewModel.SendRsvpResponseCommand}"
+                        CommandParameter="{x:Bind enums:AttendeeStatus.Tentative}"
+                        Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon
+                                FontSize="20"
+                                Foreground="#805682"
+                                Icon="EventTentative" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventRsvpPanel_Tentative, Mode=OneTime}" />
+                        </StackPanel>
+                    </Button>
+
+                    <!--  Decline  -->
+                    <Button
+                        Command="{x:Bind ViewModel.SendRsvpResponseCommand}"
+                        CommandParameter="{x:Bind enums:AttendeeStatus.Declined}"
+                        Style="{StaticResource TransparentActionButtonStyle}">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <coreControls:WinoFontIcon
+                                FontSize="20"
+                                Foreground="{ThemeResource DeleteBrush}"
+                                Icon="EventDecline" />
+                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.CalendarEventRsvpPanel_Decline, Mode=OneTime}" />
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+
+                <!--  Reply Message TextBox  -->
+                <TextBox
+                    Grid.Row="1"
+                    Grid.ColumnSpan="2"
+                    VerticalAlignment="Center"
+                    AcceptsReturn="True"
+                    PlaceholderText="{x:Bind domain:Translator.CalendarEventRsvpPanel_AddMessage, Mode=OneTime}"
+                    Text="{x:Bind ViewModel.RsvpMessage, Mode=TwoWay}"
+                    TextWrapping="Wrap">
+                    <TextBox.Header>
+                        <StackPanel Orientation="Horizontal" />
+                    </TextBox.Header>
+                </TextBox>
+            </Grid>
+        </Border>
+
+        <!--  Event details  -->
+        <ScrollViewer Grid.Row="2">
+            <Grid ColumnSpacing="8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <!--  Details  -->
+                <Grid x:Name="DetailsGrid" Style="{StaticResource EventDetailsPanelGridStyle}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="{x:Bind domain:Translator.CalendarEventDetails_Details}" />
+
+                    <!--  Read-Only Event  -->
+                    <Grid
+                        x:Name="ReadOnlyDetailsGrid"
+                        Grid.Row="1"
+                        RowSpacing="6">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <!--  Title  -->
+                        <TextBlock
+                            Style="{StaticResource SubheaderTextBlockStyle}"
+                            Text="{x:Bind ViewModel.CurrentEvent.Title, Mode=OneWay}"
+                            TextWrapping="Wrap" />
+
+                        <!--  Date and Duration  -->
+                        <TextBlock
+                            Grid.Row="1"
+                            Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetEventDetailsDateString(ViewModel.CurrentEvent, ViewModel.CurrentSettings), Mode=OneWay}"
+                            TextWrapping="Wrap" />
+
+                        <!--  Recurrence Info  -->
+                        <Grid
+                            Grid.Row="2"
+                            ColumnSpacing="6"
+                            Visibility="{x:Bind ViewModel.CurrentEvent.IsRecurringParent, Mode=OneWay}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <coreControls:WinoFontIcon FontSize="14" Icon="CalendarEventRepeat" />
+                            <TextBlock
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetRecurrenceString(ViewModel.CurrentEvent, ViewModel.CurrentSettings), Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </Grid>
+
+                        <!--  WebView  -->
+                        <WebView2 x:Name="EventDetailsWebView" Grid.Row="3" />
+                    </Grid>
+                </Grid>
+
+                <!--  People  -->
+                <Grid
+                    x:Name="PeopleGrid"
+                    Grid.Column="1"
+                    Style="{StaticResource EventDetailsPanelGridStyle}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="{x:Bind domain:Translator.CalendarEventDetails_People}" />
+
+                    <Grid Grid.Row="1" RowSpacing="6">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <AutoSuggestBox
+                            Margin="6,0"
+                            BorderThickness="0"
+                            PlaceholderText="{x:Bind domain:Translator.CalendarEventDetails_InviteSomeone}"
+                            Visibility="{x:Bind ViewModel.IsCurrentUserOrganizer, Mode=OneWay}" />
+
+                        <ListView
+                            Grid.Row="1"
+                            Margin="-12,0"
+                            IsItemClickEnabled="True"
+                            ItemsSource="{x:Bind ViewModel.CurrentEvent.Attendees, Mode=OneWay}"
+                            SelectionMode="None">
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="calendar:CalendarEventAttendee">
+                                    <Grid Margin="0,6" ColumnSpacing="12">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <controls:ImagePreviewControl
+                                            Width="40"
+                                            Height="40"
+                                            Address="{x:Bind Email}"
+                                            DisplayNameOverride="{x:Bind Name}" />
+
+                                        <Grid Grid.Column="1" RowSpacing="4">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+
+                                            <TextBlock FontWeight="SemiBold" Text="{x:Bind Name}" />
+                                            <TextBlock
+                                                Grid.Row="1"
+                                                FontSize="13"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{x:Bind Email}" />
+                                            <StackPanel
+                                                Grid.Row="2"
+                                                Orientation="Horizontal"
+                                                Spacing="6">
+                                                <Border
+                                                    Padding="6,2"
+                                                    Background="{ThemeResource AccentFillColorDefaultBrush}"
+                                                    CornerRadius="4"
+                                                    Visibility="{x:Bind IsOrganizer}">
+                                                    <TextBlock
+                                                        FontSize="11"
+                                                        FontWeight="SemiBold"
+                                                        Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
+                                                        Text="{x:Bind domain:Translator.CalendarEventDetails_Organizer}" />
+                                                </Border>
+
+                                            </StackPanel>
+                                        </Grid>
+                                        <Border
+                                            Grid.Column="2"
+                                            Padding="6,2"
+                                            HorizontalAlignment="Right"
+                                            VerticalAlignment="Center"
+                                            Background="{ThemeResource CardStrokeColorDefaultBrush}"
+                                            CornerRadius="4"
+                                            Visibility="{x:Bind calendarHelpers:CalendarXamlHelpers.GetAttendeeStatusVisibility(AttendenceStatus)}">
+                                            <TextBlock
+                                                FontSize="11"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Text="{x:Bind calendarHelpers:CalendarXamlHelpers.GetAttendeeStatusText(AttendenceStatus)}" />
+                                        </Border>
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </Grid>
+                </Grid>
+
+                <!--  Attachments  -->
+                <Grid
+                    x:Name="AttachmentsGrid"
+                    Grid.Column="2"
+                    Style="{StaticResource EventDetailsPanelGridStyle}"
+                    Visibility="{x:Bind ViewModel.HasAttachments, Mode=OneWay}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock Style="{StaticResource EventDetailsPanelTitleStyle}" Text="{x:Bind domain:Translator.CalendarEventDetails_Attachments}" />
+
+                    <ListView
+                        Grid.Row="1"
+                        Margin="-12,0"
+                        IsItemClickEnabled="True"
+                        ItemClick="AttachmentClicked"
+                        ItemsSource="{x:Bind ViewModel.Attachments, Mode=OneWay}"
+                        SelectionMode="None">
+                        <ListView.ItemTemplate>
+                            <DataTemplate x:DataType="data:CalendarAttachmentViewModel">
+                                <Grid Height="51">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="50" />
+                                        <RowDefinition Height="*" />
+                                    </Grid.RowDefinitions>
+                                    <Grid
+                                        Grid.Row="0"
+                                        Height="50"
+                                        Margin="-8,0,0,0"
+                                        Background="Transparent"
+                                        ColumnSpacing="3">
+                                        <ToolTipService.ToolTip>
+                                            <ToolTip Content="{x:Bind FileName}" />
+                                        </ToolTipService.ToolTip>
+                                        <Grid.ContextFlyout>
+                                            <MenuFlyout Placement="Right">
+                                                <MenuFlyoutItem
+                                                    Click="OpenCalendarAttachment_Click"
+                                                    CommandParameter="{x:Bind}"
+                                                    Text="{x:Bind domain:Translator.Buttons_Open}">
+                                                    <MenuFlyoutItem.Icon>
+                                                        <PathIcon Data="{StaticResource OpenFilePathIcon}" />
+                                                    </MenuFlyoutItem.Icon>
+                                                </MenuFlyoutItem>
+                                                <MenuFlyoutItem
+                                                    Click="SaveCalendarAttachment_Click"
+                                                    CommandParameter="{x:Bind}"
+                                                    Text="{x:Bind domain:Translator.Buttons_Save}">
+                                                    <MenuFlyoutItem.Icon>
+                                                        <PathIcon Data="{StaticResource SaveAttachmentPathIcon}" />
+                                                    </MenuFlyoutItem.Icon>
+                                                </MenuFlyoutItem>
+                                            </MenuFlyout>
+                                        </Grid.ContextFlyout>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="40" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <!--  Icon  -->
+                                        <ContentControl
+                                            VerticalAlignment="Center"
+                                            Content="{x:Bind AttachmentType}"
+                                            ContentTemplateSelector="{StaticResource FileTypeIconSelector}" />
+
+                                        <!--  Name && Size  -->
+                                        <Grid
+                                            Grid.Column="1"
+                                            MaxWidth="200"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Center">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
+
+                                            <TextBlock
+                                                FontSize="13"
+                                                MaxLines="1"
+                                                Text="{x:Bind FileName}"
+                                                TextTrimming="CharacterEllipsis"
+                                                TextWrapping="Wrap" />
+
+                                            <TextBlock
+                                                Grid.Row="1"
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Bottom"
+                                                FontSize="11"
+                                                Foreground="Gray"
+                                                Text="{x:Bind ReadableSize}" />
+                                        </Grid>
+                                    </Grid>
+                                    <ProgressBar
+                                        Grid.Row="1"
+                                        Margin="0,-5,0,0"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Top"
+                                        IsIndeterminate="{x:Bind IsBusy, Mode=OneWay}"
+                                        ShowError="False"
+                                        ShowPaused="False"
+                                        Visibility="{x:Bind IsBusy, Mode=OneWay}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </Grid>
+            </Grid>
+        </ScrollViewer>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="WindowWidthStates">
+                <VisualState x:Name="WideState">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1200" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="MediumState">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="800" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <!--  Details takes left side (full height), People and Attachments share right side vertically  -->
+                        <Setter Target="DetailsGrid.(Grid.Row)" Value="0" />
+                        <Setter Target="DetailsGrid.(Grid.Column)" Value="0" />
+                        <Setter Target="DetailsGrid.(Grid.RowSpan)" Value="2" />
+                        <Setter Target="DetailsGrid.(Grid.ColumnSpan)" Value="1" />
+                        <Setter Target="PeopleGrid.(Grid.Row)" Value="0" />
+                        <Setter Target="PeopleGrid.(Grid.Column)" Value="1" />
+                        <Setter Target="PeopleGrid.(Grid.ColumnSpan)" Value="2" />
+                        <!--  People grid spans both rows when attachments are hidden  -->
+                        <Setter Target="PeopleGrid.(Grid.RowSpan)" Value="2" />
+                        <Setter Target="AttachmentsGrid.(Grid.Row)" Value="1" />
+                        <Setter Target="AttachmentsGrid.(Grid.Column)" Value="1" />
+                        <Setter Target="AttachmentsGrid.(Grid.ColumnSpan)" Value="2" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="NarrowState">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <!--  Stack all panels vertically  -->
+                        <Setter Target="DetailsGrid.(Grid.Row)" Value="0" />
+                        <Setter Target="DetailsGrid.(Grid.Column)" Value="0" />
+                        <Setter Target="DetailsGrid.(Grid.ColumnSpan)" Value="3" />
+                        <Setter Target="PeopleGrid.(Grid.Row)" Value="1" />
+                        <Setter Target="PeopleGrid.(Grid.Column)" Value="0" />
+                        <Setter Target="PeopleGrid.(Grid.ColumnSpan)" Value="3" />
+                        <Setter Target="AttachmentsGrid.(Grid.Row)" Value="2" />
+                        <Setter Target="AttachmentsGrid.(Grid.Column)" Value="0" />
+                        <Setter Target="AttachmentsGrid.(Grid.ColumnSpan)" Value="3" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</abstract:EventDetailsPageAbstract>
+
diff --git a/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml.cs b/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml.cs
new file mode 100644
index 00000000..54c157d1
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml.cs
@@ -0,0 +1,229 @@
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.Web.WebView2.Core;
+using Windows.System;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Mail.WinUI.Views.Abstract;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Shell;
+
+namespace Wino.Calendar.Views;
+
+public sealed partial class EventDetailsPage : EventDetailsPageAbstract,
+    IRecipient<ApplicationThemeChanged>,
+    IRecipient<CalendarDescriptionRenderingRequested>
+{
+    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>()!;
+    private TaskCompletionSource<bool> DOMLoadedTask = new TaskCompletionSource<bool>();
+
+    public EventDetailsPage()
+    {
+        InitializeComponent();
+
+        WebViewExtensions.EnsureWebView2Environment();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        EventDetailsWebView.CoreWebView2Initialized -= CoreWebViewInitialized;
+        EventDetailsWebView.CoreWebView2Initialized += CoreWebViewInitialized;
+
+        _ = EventDetailsWebView.EnsureCoreWebView2Async();
+    }
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        base.OnNavigatedFrom(e);
+
+        DisposeWebView2();
+    }
+
+    private async void CoreWebViewInitialized(Microsoft.UI.Xaml.Controls.WebView2 sender, CoreWebView2InitializedEventArgs args)
+    {
+        if (EventDetailsWebView.CoreWebView2 == null) return;
+
+        var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
+
+        EventDetailsWebView.CoreWebView2.SetVirtualHostNameToFolderMapping("wino.mail", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
+
+        EventDetailsWebView.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
+        EventDetailsWebView.CoreWebView2.DOMContentLoaded += DOMContentLoaded;
+
+        EventDetailsWebView.CoreWebView2.NewWindowRequested -= WindowRequested;
+        EventDetailsWebView.CoreWebView2.NewWindowRequested += WindowRequested;
+
+        EventDetailsWebView.NavigationStarting -= WebViewNavigationStarting;
+        EventDetailsWebView.NavigationStarting += WebViewNavigationStarting;
+
+        EventDetailsWebView.Source = new Uri("https://wino.mail/reader.html");
+    }
+
+    private void DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args)
+    {
+        DOMLoadedTask.TrySetResult(true);
+        _ = RenderDescriptionAsync();
+    }
+
+    private async Task RenderDescriptionAsync()
+    {
+        if (DispatcherQueue != null && !DispatcherQueue.HasThreadAccess)
+        {
+            await DispatcherQueue.EnqueueAsync(RenderDescriptionAsync);
+            return;
+        }
+
+        if (ViewModel?.CurrentEvent?.CalendarItem == null)
+            return;
+
+        await DOMLoadedTask.Task;
+
+        await UpdateEditorThemeAsync();
+        await UpdateReaderFontPropertiesAsync();
+
+        var description = ViewModel.CurrentEvent.CalendarItem.Description ?? string.Empty;
+
+        if (string.IsNullOrEmpty(description))
+        {
+            await EventDetailsWebView.ExecuteScriptFunctionAsync("RenderHTML", JsonSerializer.Serialize(" ", BasicTypesJsonContext.Default.String));
+        }
+        else
+        {
+            await EventDetailsWebView.ExecuteScriptFunctionAsync("RenderHTML",
+                JsonSerializer.Serialize(description, BasicTypesJsonContext.Default.String),
+                JsonSerializer.Serialize(true, BasicTypesJsonContext.Default.Boolean));
+        }
+    }
+
+    private async void WindowRequested(CoreWebView2 sender, CoreWebView2NewWindowRequestedEventArgs args)
+    {
+        args.Handled = true;
+
+        try
+        {
+            await Launcher.LaunchUriAsync(new Uri(args.Uri));
+        }
+        catch (Exception) { }
+    }
+
+    private async void WebViewNavigationStarting(Microsoft.UI.Xaml.Controls.WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
+    {
+        if (args.Uri == "https://wino.mail/reader.html")
+            return;
+
+        args.Cancel = !args.Uri.StartsWith("data:text/html");
+
+        if (args.Cancel && Uri.TryCreate(args.Uri, UriKind.Absolute, out Uri? newUri) && newUri != null)
+        {
+            await Launcher.LaunchUriAsync(newUri);
+        }
+    }
+
+    private void DisposeWebView2()
+    {
+        if (EventDetailsWebView == null) return;
+
+        EventDetailsWebView.CoreWebView2Initialized -= CoreWebViewInitialized;
+        EventDetailsWebView.NavigationStarting -= WebViewNavigationStarting;
+
+        if (EventDetailsWebView.CoreWebView2 != null)
+        {
+            EventDetailsWebView.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
+            EventDetailsWebView.CoreWebView2.NewWindowRequested -= WindowRequested;
+        }
+
+        EventDetailsWebView.Close();
+    }
+
+    private async Task UpdateEditorThemeAsync()
+    {
+        if (DispatcherQueue != null && !DispatcherQueue.HasThreadAccess)
+        {
+            await DispatcherQueue.EnqueueAsync(UpdateEditorThemeAsync);
+            return;
+        }
+
+        await DOMLoadedTask.Task;
+
+        if (ViewModel.IsDarkWebviewRenderer)
+        {
+            EventDetailsWebView.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
+            await EventDetailsWebView.ExecuteScriptSafeAsync("SetDarkEditor();");
+        }
+        else
+        {
+            EventDetailsWebView.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
+            await EventDetailsWebView.ExecuteScriptSafeAsync("SetLightEditor();");
+        }
+    }
+
+    private async Task UpdateReaderFontPropertiesAsync()
+    {
+        await EventDetailsWebView.ExecuteScriptFunctionAsync("ChangeFontSize", JsonSerializer.Serialize(_preferencesService.ReaderFontSize, BasicTypesJsonContext.Default.Int32));
+
+        var fontName = _preferencesService.ReaderFont;
+        fontName += ", sans-serif";
+
+        await EventDetailsWebView.ExecuteScriptFunctionAsync("ChangeFontFamily", JsonSerializer.Serialize(fontName, BasicTypesJsonContext.Default.String));
+    }
+
+    void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
+    {
+        ViewModel.IsDarkWebviewRenderer = message.IsUnderlyingThemeDark;
+        _ = UpdateEditorThemeAsync();
+    }
+
+    void IRecipient<CalendarDescriptionRenderingRequested>.Receive(CalendarDescriptionRenderingRequested message)
+    {
+        _ = RenderDescriptionAsync();
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+        WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Register<CalendarDescriptionRenderingRequested>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+        WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Unregister<CalendarDescriptionRenderingRequested>(this);
+    }
+
+    private void AttachmentClicked(object sender, ItemClickEventArgs e)
+    {
+        if (e.ClickedItem is CalendarAttachmentViewModel attachmentViewModel)
+        {
+            ViewModel?.OpenAttachmentCommand.Execute(attachmentViewModel);
+        }
+    }
+
+    private void OpenCalendarAttachment_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is CalendarAttachmentViewModel attachment)
+        {
+            ViewModel?.OpenAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    private void SaveCalendarAttachment_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is CalendarAttachmentViewModel attachment)
+        {
+            ViewModel?.SaveAttachmentCommand.Execute(attachment);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml b/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml
new file mode 100644
index 00000000..1c86542d
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml
@@ -0,0 +1,49 @@
+<abstract:ContactsAppShellAbstract
+    x:Class="Wino.Mail.WinUI.Views.Contacts.ContactsAppShell"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+    <Grid
+        x:Name="RootGrid"
+        Padding="0"
+        ColumnSpacing="0"
+        RowSpacing="0">
+        <muxc:NavigationView
+            x:Name="navigationView"
+            Grid.Row="1"
+            Grid.ColumnSpan="3"
+            Margin="-1,-1,0,0"
+            HorizontalContentAlignment="Stretch"
+            VerticalContentAlignment="Stretch"
+            AlwaysShowHeader="True"
+            DisplayModeChanged="NavigationViewDisplayModeChanged"
+            IsBackButtonVisible="Collapsed"
+            IsPaneOpen="{x:Bind PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
+            IsPaneToggleButtonVisible="False"
+            IsSettingsVisible="False"
+            IsTabStop="True"
+            IsTitleBarAutoPaddingEnabled="False"
+            OpenPaneLength="{x:Bind StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
+            PaneDisplayMode="Auto"
+            ScrollViewer.VerticalScrollBarVisibility="Hidden"
+            Style="{StaticResource CalendarShellNavigationViewStyle}">
+            <Grid>
+                <Frame
+                    x:Name="InnerShellFrame"
+                    Padding="0,0,7,7"
+                    IsNavigationStackEnabled="False" />
+
+                <coreControls:WinoInfoBar
+                    x:Name="ShellInfoBar"
+                    MaxWidth="700"
+                    Margin="0,60,25,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    IsClosable="False"
+                    IsOpen="False" />
+            </Grid>
+        </muxc:NavigationView>
+    </Grid>
+</abstract:ContactsAppShellAbstract>
diff --git a/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml.cs b/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml.cs
new file mode 100644
index 00000000..f9153ac0
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Contacts/ContactsAppShell.xaml.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+
+namespace Wino.Mail.WinUI.Views.Contacts;
+
+public sealed partial class ContactsAppShell : Views.Abstract.ContactsAppShellAbstract
+{
+    public IPreferencesService PreferencesService { get; } = WinoApplication.Current.Services.GetRequiredService<IPreferencesService>();
+    public IStatePersistanceService StatePersistenceService { get; } = WinoApplication.Current.Services.GetRequiredService<IStatePersistanceService>();
+    public INavigationService NavigationService { get; } = WinoApplication.Current.Services.GetRequiredService<INavigationService>();
+
+    public ContactsAppShell()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        if (e.NavigationMode == Microsoft.UI.Xaml.Navigation.NavigationMode.New && InnerShellFrame.Content == null)
+        {
+            NavigationService.Navigate(WinoPage.ContactsPage, null, NavigationReferenceFrame.InnerShellFrame, NavigationTransitionType.None);
+        }
+    }
+
+    private void NavigationViewDisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
+    {
+        InnerShellFrame.Margin = args.DisplayMode == NavigationViewDisplayMode.Minimal
+            ? new Thickness(7, 0, 0, 0)
+            : new Thickness(0);
+    }
+}
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail.WinUI/Views/Mail/ComposePage.xaml
similarity index 60%
rename from Wino.Mail/Views/ComposePage.xaml
rename to Wino.Mail.WinUI/Views/Mail/ComposePage.xaml
index a0f0a02f..826cbc09 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail.WinUI/Views/Mail/ComposePage.xaml
@@ -1,17 +1,18 @@
-<abstract:ComposePageAbstract
-    x:Class="Wino.Views.ComposePage"
+<abstract:ComposePageAbstract
+    x:Class="Wino.Views.Mail.ComposePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:Wino.Mail.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:customcontrols="using:Wino.Mail.WinUI.Controls.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Mail.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
     xmlns:helpers="using:Wino.Helpers"
+    xmlns:mail="using:Wino.Core.Domain.Entities.Mail"
     xmlns:mailkit="using:MimeKit"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -24,53 +25,6 @@
     mc:Ignorable="d">
 
     <Page.Resources>
-        <DataTemplate x:Key="TokenBoxTemplate" x:DataType="entities:AccountContact">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <ToolTipService.ToolTip>
-                    <ToolTip Content="{x:Bind Address}" />
-                </ToolTipService.ToolTip>
-
-                <!--  TODO: Display contact info.  -->
-                <!--<Grid.ContextFlyout>
-                    <MenuFlyout Placement="RightEdgeAlignedBottom">
-                        <MenuFlyoutItem Text="{x:Bind domain:Translator.ViewContactDetails}" />
-                    </MenuFlyout>
-                </Grid.ContextFlyout>-->
-
-                <Viewbox Width="24">
-                    <controls:ImagePreviewControl
-                        FromAddress="{x:Bind Address}"
-                        FromName="{x:Bind Name}"
-                        SenderContactPicture="{x:Bind Base64ContactPicture}" />
-                </Viewbox>
-
-                <TextBlock
-                    Grid.Column="1"
-                    Margin="6,0,8,0"
-                    VerticalAlignment="Center"
-                    Text="{x:Bind Name}" />
-            </Grid>
-        </DataTemplate>
-        <DataTemplate x:Key="SuggestionBoxTemplate" x:DataType="entities:AccountContact">
-            <Grid Margin="0,12" ColumnSpacing="6">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <controls:ImagePreviewControl
-                    FromAddress="{x:Bind Address}"
-                    FromName="{x:Bind Name}"
-                    SenderContactPicture="{x:Bind Base64ContactPicture}" />
-                <TextBlock Grid.Column="1">
-                    <Run FontWeight="SemiBold" Text="{x:Bind Name}" /><LineBreak /><Run Text="{x:Bind Address}" />
-                </TextBlock>
-            </Grid>
-        </DataTemplate>
-
         <!--  Attachment Template  -->
         <!--  Margin -8 0 is used to remove the padding from the ListViewItem  -->
         <DataTemplate x:Key="ComposerFileAttachmentTemplate" x:DataType="data:MailAttachmentViewModel">
@@ -83,12 +37,12 @@
                 <Grid.ContextFlyout>
                     <MenuFlyout>
                         <MenuFlyoutItem
-                            Command="{Binding ElementName=root, Path=ViewModel.OpenAttachmentCommand}"
-                            CommandParameter="{Binding}"
+                            Click="OpenAttachment_Click"
+                            CommandParameter="{x:Bind}"
                             Text="{x:Bind domain:Translator.Buttons_Open}" />
                         <MenuFlyoutItem
-                            Command="{Binding ElementName=root, Path=ViewModel.SaveAttachmentCommand}"
-                            CommandParameter="{Binding}"
+                            Click="SaveAttachment_Click"
+                            CommandParameter="{x:Bind}"
                             Text="{x:Bind domain:Translator.Buttons_Save}" />
                     </MenuFlyout>
                 </Grid.ContextFlyout>
@@ -138,8 +92,8 @@
                     VerticalAlignment="Stretch"
                     Background="Transparent"
                     BorderThickness="0"
-                    Command="{Binding ElementName=root, Path=ViewModel.RemoveAttachmentCommand}"
-                    CommandParameter="{Binding}">
+                    Click="RemoveAttachment_Click"
+                    CommandParameter="{x:Bind}">
                     <SymbolIcon
                         Grid.Column="2"
                         VerticalAlignment="Center"
@@ -178,268 +132,178 @@
                 </Grid.RowDefinitions>
 
                 <!--  Format  -->
-                <toolkit:TabbedCommandBar>
-                    <toolkit:TabbedCommandBar.Resources>
-                        <SolidColorBrush x:Key="TabContentContentBorderBackground" Color="Transparent" />
-                        <SolidColorBrush x:Key="TabContentContentBorderBorderBrush" Color="Transparent" />
-                        <Thickness x:Key="TabContentBorderBorderThickness">0</Thickness>
-                    </toolkit:TabbedCommandBar.Resources>
-                    <toolkit:TabbedCommandBar.PaneCustomContent>
+                <controls1:EditorTabbedCommandBarControl CommandTarget="{x:Bind WebViewEditor}">
+                    <controls1:EditorTabbedCommandBarControl.PaneCustomContent>
                         <toolkit:TabbedCommandBarItem
                             CommandAlignment="Right"
                             IsDynamicOverflowEnabled="True"
                             OverflowButtonAlignment="Left">
+                            <AppBarElementContainer Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverter(ViewModel.AvailableEmailTemplates.Count), Mode=OneWay}">
+                                <ComboBox
+                                    x:Name="EmailTemplatesComboBox"
+                                    MinWidth="220"
+                                    Margin="0,8,8,0"
+                                    ItemsSource="{x:Bind ViewModel.AvailableEmailTemplates, Mode=OneWay}"
+                                    PlaceholderText="{x:Bind domain:Translator.Composer_EmailTemplatesPlaceholder}"
+                                    SelectionChanged="EmailTemplateSelectionChanged">
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate x:DataType="mail:EmailTemplate">
+                                            <TextBlock Text="{x:Bind Name}" />
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
+                                </ComboBox>
+                            </AppBarElementContainer>
                             <AppBarButton
-                                Width="Auto"
                                 MinWidth="40"
-                                Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Visibility="{x:Bind ViewModel.IsDraftBusy, Mode=OneWay}">
+                                <ProgressRing IsActive="True" />
+                            </AppBarButton>
+                            <AppBarToggleButton
+                                x:Name="ComposeAiActionsToggleButton"
+                                Checked="ComposeAiActionsToggleButton_Checked"
+                                MinWidth="40"
+                                HorizontalContentAlignment="Center"
                                 LabelPosition="Collapsed"
-                                ToolTipService.ToolTip="Light Theme"
-                                Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay}">
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Composer_AiActions}">
+                                <AppBarToggleButton.Icon>
+                                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE945;" />
+                                </AppBarToggleButton.Icon>
+                            </AppBarToggleButton>
+                            <AppBarButton Click="ToggleEditorThemeClicked" ToolTipService.ToolTip="{x:Bind GetEditorThemeToolTip(WebViewEditor.IsEditorDarkMode), Mode=OneWay}">
                                 <AppBarButton.Icon>
-                                    <coreControls:WinoFontIcon Icon="LightEditor" />
+                                    <coreControls:WinoFontIcon Icon="{x:Bind GetEditorThemeIcon(WebViewEditor.IsEditorDarkMode), Mode=OneWay}" />
                                 </AppBarButton.Icon>
                             </AppBarButton>
-
-                            <AppBarButton
-                                Width="Auto"
-                                MinWidth="40"
-                                Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
-                                LabelPosition="Collapsed"
-                                ToolTipService.ToolTip="Dark Theme"
-                                Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
-                                <AppBarButton.Icon>
-                                    <coreControls:WinoFontIcon Icon="DarkEditor" />
-                                </AppBarButton.Icon>
-                            </AppBarButton>
-
                             <AppBarButton Command="{x:Bind ViewModel.DiscardCommand}" Label="{x:Bind domain:Translator.Buttons_Discard}">
                                 <AppBarButton.Icon>
                                     <coreControls:WinoFontIcon Icon="Delete" />
                                 </AppBarButton.Icon>
                             </AppBarButton>
-                            <AppBarButton Command="{x:Bind ViewModel.SendCommand}" Label="{x:Bind domain:Translator.Buttons_Send}">
+
+                            <AppBarButton
+                                Command="{x:Bind ViewModel.SendCommand}"
+                                Label="{x:Bind domain:Translator.Buttons_Send}"
+                                Visibility="{x:Bind ViewModel.ShouldShowSendButton, Mode=OneWay}">
                                 <AppBarButton.Icon>
                                     <coreControls:WinoFontIcon Icon="Send" />
                                 </AppBarButton.Icon>
                             </AppBarButton>
-                        </toolkit:TabbedCommandBarItem>
-                    </toolkit:TabbedCommandBar.PaneCustomContent>
-                    <toolkit:TabbedCommandBar.MenuItems>
-                        <toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="{x:Bind domain:Translator.EditorToolbarOption_Format}">
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}"
-                                Label="Bold">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource BoldPathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}"
-                                Label="Italic">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource ItalicPathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}"
-                                Label="Underline">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource UnderlinePathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}"
-                                Label="Stroke">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource StrikePathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-
-                            <AppBarSeparator />
-
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}"
-                                Label="Bullet List">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource BulletedListPathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}"
-                                Label="Ordered List">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource OrderedListPathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
-
-                            <AppBarSeparator />
-
                             <AppBarButton
-                                Width="Auto"
-                                MinWidth="40"
-                                Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
-                                IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
-                                Label="Outdent">
-                                <AppBarButton.Content>
-                                    <Viewbox Width="16">
-                                        <PathIcon Data="{StaticResource DecreaseIndentPathIcon}" />
-                                    </Viewbox>
-                                </AppBarButton.Content>
+                                Command="{x:Bind ViewModel.SendToServerCommand}"
+                                Label="{x:Bind domain:Translator.Buttons_SendToServer}"
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Composer_LocalDraftSyncInfo}"
+                                Visibility="{x:Bind ViewModel.ShouldShowSendToServerButton, Mode=OneWay}">
+                                <AppBarButton.Icon>
+                                    <coreControls:WinoFontIcon Icon="SendNew" />
+                                </AppBarButton.Icon>
                             </AppBarButton>
-
-                            <AppBarButton
-                                Width="Auto"
-                                MinWidth="40"
-                                Click="{x:Bind WebViewEditor.EditorIndentAsync}"
-                                IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
-                                Label="Indent">
-                                <AppBarButton.Content>
-                                    <Viewbox Width="16">
-                                        <PathIcon Data="{StaticResource IncreaseIndentPathIcon}" />
-                                    </Viewbox>
-                                </AppBarButton.Content>
-                            </AppBarButton>
-
-                            <AppBarElementContainer
-                                Width="Auto"
-                                MinWidth="40"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center">
-                                <ComboBox
-                                    x:Name="AlignmentListView"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent"
-                                    BorderBrush="Transparent"
-                                    SelectedIndex="{x:Bind WebViewEditor.EditorAlignmentSelectedIndex, Mode=TwoWay}">
-                                    <ComboBoxItem IsSelected="True" Tag="left">
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Viewbox Width="16">
-                                                <PathIcon Data="{StaticResource AlignLeftPathIcon}" />
-                                            </Viewbox>
-                                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Left}" />
-                                        </StackPanel>
-                                    </ComboBoxItem>
-
-                                    <ComboBoxItem Tag="center">
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Viewbox Width="16">
-                                                <PathIcon Data="{StaticResource AlignCenterPathIcon}" />
-                                            </Viewbox>
-                                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Center}" />
-                                        </StackPanel>
-                                    </ComboBoxItem>
-
-                                    <ComboBoxItem Tag="right">
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Viewbox Width="16">
-                                                <PathIcon Data="{StaticResource AlignRightPathIcon}" />
-                                            </Viewbox>
-                                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Right}" />
-                                        </StackPanel>
-                                    </ComboBoxItem>
-
-                                    <ComboBoxItem Tag="justify">
-                                        <StackPanel Orientation="Horizontal" Spacing="8">
-                                            <Viewbox Width="16">
-                                                <PathIcon Data="{StaticResource AlignJustifyPathIcon}" />
-                                            </Viewbox>
-                                            <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Justify}" />
-                                        </StackPanel>
-                                    </ComboBoxItem>
-                                </ComboBox>
-                            </AppBarElementContainer>
-
-                            <AppBarSeparator />
-
-                            <AppBarToggleButton
-                                Width="Auto"
-                                MinWidth="40"
-                                IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
-                                Label="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}"
-                                ToolTipService.ToolTip="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}">
-                                <AppBarToggleButton.Icon>
-                                    <PathIcon Data="{StaticResource WebviewToolBarPathIcon}" />
-                                </AppBarToggleButton.Icon>
-                            </AppBarToggleButton>
                         </toolkit:TabbedCommandBarItem>
+                    </controls1:EditorTabbedCommandBarControl.PaneCustomContent>
 
-                        <!--  Insert  -->
-                        <toolkit:TabbedCommandBarItem Header="{x:Bind domain:Translator.EditorToolbarOption_Insert}">
+                    <controls1:EditorTabbedCommandBarControl.InsertCustomContent>
+                        <StackPanel Orientation="Horizontal">
                             <AppBarButton
                                 x:Name="FilesButton"
                                 Command="{x:Bind ViewModel.AttachFilesCommand}"
-                                Label="{x:Bind domain:Translator.Files}">
+                                LabelPosition="Collapsed">
                                 <AppBarButton.Icon>
                                     <PathIcon Data="{StaticResource AttachPathIcon}" />
                                 </AppBarButton.Icon>
                             </AppBarButton>
+                        </StackPanel>
+                    </controls1:EditorTabbedCommandBarControl.InsertCustomContent>
 
-                            <AppBarButton Click="{x:Bind WebViewEditor.ShowImagePicker}" Label="{x:Bind domain:Translator.Photos}">
-                                <AppBarButton.Icon>
-                                    <PathIcon Data="{StaticResource AddPhotoPathIcon}" />
-                                </AppBarButton.Icon>
-                            </AppBarButton>
-
-                            <AppBarButton Click="{x:Bind WebViewEditor.ShowEmojiPicker}" Label="{x:Bind domain:Translator.Emoji}">
-                                <AppBarButton.Icon>
-                                    <PathIcon Data="{StaticResource EmojiPathIcon}" />
-                                </AppBarButton.Icon>
-                            </AppBarButton>
-                        </toolkit:TabbedCommandBarItem>
-
-                        <!--  Options  -->
-                        <toolkit:TabbedCommandBarItem Header="{x:Bind domain:Translator.EditorToolbarOption_Options}">
-                            <AppBarElementContainer>
-                                <muxc:ToggleSplitButton x:Name="ImportanceSplitButton" IsChecked="{x:Bind ViewModel.IsImportanceSelected, Mode=TwoWay}">
+                    <controls1:EditorTabbedCommandBarControl.OptionsCustomContent>
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <ToggleSplitButton x:Name="ImportanceSplitButton" IsChecked="{x:Bind ViewModel.IsImportanceSelected, Mode=TwoWay}">
+                                <ToggleSplitButton.Content>
                                     <Viewbox Width="16" Height="16">
                                         <SymbolIcon x:Name="ImportanceSplitButtonContent" Symbol="Important" />
                                     </Viewbox>
-                                    <muxc:ToggleSplitButton.Flyout>
-                                        <Flyout x:Name="ImportanceFlyout" Placement="Bottom">
-                                            <StackPanel Orientation="Horizontal">
-                                                <StackPanel.Resources>
-                                                    <Style TargetType="Button">
-                                                        <Setter Property="Padding" Value="4" />
-                                                        <Setter Property="MinWidth" Value="0" />
-                                                        <Setter Property="MinHeight" Value="0" />
-                                                        <Setter Property="Margin" Value="6" />
-                                                        <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
-                                                    </Style>
-                                                </StackPanel.Resources>
-                                                <Button Click="ImportanceClicked">
-                                                    <Button.Tag>
-                                                        <mailkit:MessageImportance>High</mailkit:MessageImportance>
-                                                    </Button.Tag>
-                                                    <SymbolIcon Symbol="Important" />
-                                                </Button>
-                                                <Button Click="ImportanceClicked">
-                                                    <Button.Tag>
-                                                        <mailkit:MessageImportance>Low</mailkit:MessageImportance>
-                                                    </Button.Tag>
-                                                    <SymbolIcon Symbol="Priority" />
-                                                </Button>
-                                            </StackPanel>
-                                        </Flyout>
-                                    </muxc:ToggleSplitButton.Flyout>
-                                </muxc:ToggleSplitButton>
-                            </AppBarElementContainer>
-                        </toolkit:TabbedCommandBarItem>
-                    </toolkit:TabbedCommandBar.MenuItems>
-                </toolkit:TabbedCommandBar>
+                                </ToggleSplitButton.Content>
+                                <ToggleSplitButton.Flyout>
+                                    <Flyout x:Name="ImportanceFlyout" Placement="Bottom">
+                                        <StackPanel Orientation="Horizontal">
+                                            <StackPanel.Resources>
+                                                <Style TargetType="Button">
+                                                    <Setter Property="Padding" Value="4" />
+                                                    <Setter Property="MinWidth" Value="0" />
+                                                    <Setter Property="MinHeight" Value="0" />
+                                                    <Setter Property="Margin" Value="6" />
+                                                    <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
+                                                </Style>
+                                            </StackPanel.Resources>
+                                            <Button Click="ImportanceClicked">
+                                                <Button.Tag>
+                                                    <mailkit:MessageImportance>High</mailkit:MessageImportance>
+                                                </Button.Tag>
+                                                <SymbolIcon Symbol="Important" />
+                                            </Button>
+                                            <Button Click="ImportanceClicked">
+                                                <Button.Tag>
+                                                    <mailkit:MessageImportance>Low</mailkit:MessageImportance>
+                                                </Button.Tag>
+                                                <SymbolIcon Symbol="Priority" />
+                                            </Button>
+                                        </StackPanel>
+                                    </Flyout>
+                                </ToggleSplitButton.Flyout>
+                            </ToggleSplitButton>
+                            <muxc:ToggleSplitButton
+                                x:Name="SignatureToggleButton"
+                                Margin="8,0,0,0"
+                                IsChecked="{x:Bind ViewModel.IsSmimeSignatureEnabled, Mode=TwoWay}"
+                                IsEnabled="{x:Bind ViewModel.AreCertificatesAvailable, Mode=OneWay}"
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Composer_EnableSmimeSignature}">
+                                <muxc:ToggleSplitButton.Content>
+                                    <Viewbox
+                                        Width="16"
+                                        Height="16"
+                                        Margin="0,0,4,0">
+                                        <PathIcon Data="M15 18c.835.629 1.875 1.001 3 1.001a4.978 4.978 0 0 0 3-.999v3.246a.75.75 0 0 1-1.09.67l-.09-.055L18 20.591l-1.82 1.272a.75.75 0 0 1-1.172-.51l-.007-.105L15 18.001Zm4.25-14.996a2.75 2.75 0 0 1 2.745 2.582l.005.168.001 5.246a5.027 5.027 0 0 0-1.5-1.331L20.5 5.754a1.25 1.25 0 0 0-1.122-1.244l-.128-.006H4.75a1.25 1.25 0 0 0-1.244 1.122l-.006.128v9.5c0 .647.492 1.18 1.122 1.243l.128.007h8.92c.1.172.21.338.33.496v1.004H4.75a2.75 2.75 0 0 1-2.745-2.583L2 15.254v-9.5a2.75 2.75 0 0 1 2.582-2.745l.168-.005h14.5ZM18 10A4 4 0 1 1 18 18 4 4 0 0 1 18 10Zm-6.75 2.5a.75.75 0 0 1 .102 1.493L11.25 14h-4.5a.75.75 0 0 1-.102-1.493l.102-.007h4.5Zm6-5.5a.75.75 0 0 1 .102 1.493l-.102.007H6.75a.75.75 0 0 1-.102-1.493L6.75 7h10.5Z" />
+                                    </Viewbox>
+                                </muxc:ToggleSplitButton.Content>
+                                <muxc:ToggleSplitButton.Flyout>
+                                    <Flyout Placement="Bottom">
+                                        <ListView
+                                            Width="320"
+                                            ItemsSource="{x:Bind ViewModel.AvailableCertificates, Mode=OneWay}"
+                                            SelectedItem="{x:Bind ViewModel.SelectedSigningCertificate, Mode=TwoWay}">
+                                            <ListView.ItemTemplate>
+                                                <DataTemplate xmlns:x509="using:System.Security.Cryptography.X509Certificates" x:DataType="x509:X509Certificate2">
+                                                    <StackPanel Padding="8,4" Orientation="Vertical">
+                                                        <TextBlock FontWeight="SemiBold" Text="{x:Bind Subject}" />
+                                                        <TextBlock FontSize="12" Text="{x:Bind Issuer}" />
+                                                        <TextBlock>
+                                                            <Run Text="{x:Bind domain:Translator.Composer_CertificateExpires, Mode=OneTime}" />
+                                                            <Run Text="{x:Bind NotAfter, Mode=OneTime}" />
+                                                        </TextBlock>
+                                                    </StackPanel>
+                                                </DataTemplate>
+                                            </ListView.ItemTemplate>
+                                        </ListView>
+                                    </Flyout>
+                                </muxc:ToggleSplitButton.Flyout>
+                            </muxc:ToggleSplitButton>
+                            <ToggleButton
+                                x:Name="EncryptionToggleButton"
+                                Margin="8,0,0,0"
+                                IsChecked="{x:Bind ViewModel.IsSmimeEncryptionEnabled, Mode=TwoWay}"
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Composer_EnableSmimeEncryption}">
+                                <ToggleButton.Content>
+                                    <Viewbox
+                                        Width="16"
+                                        Height="16"
+                                        Margin="0,0,4,0">
+                                        <PathIcon Data="M12 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 20 10.25v9.5A2.25 2.25 0 0 1 17.75 22H6.25A2.25 2.25 0 0 1 4 19.75v-9.5A2.25 2.25 0 0 1 6.25 8H8V6a4 4 0 0 1 4-4Zm5.75 7.5H6.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 0 0 .75-.75v-9.5a.75.75 0 0 0-.75-.75Zm-5.75 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 9.5 6v2h5V6A2.5 2.5 0 0 0 12 3.5Z" />
+                                    </Viewbox>
+                                </ToggleButton.Content>
+                            </ToggleButton>
+                        </StackPanel>
+                    </controls1:EditorTabbedCommandBarControl.OptionsCustomContent>
+                </controls1:EditorTabbedCommandBarControl>
 
                 <!--  Mime Info  -->
                 <Grid
@@ -454,6 +318,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
 
                     <Grid.ColumnDefinitions>
@@ -470,10 +335,15 @@
                     <ComboBox
                         x:Name="AccountsComboBox"
                         Grid.Column="1"
-                        DisplayMemberPath="AliasAddress"
                         IsEditable="False"
                         ItemsSource="{x:Bind ViewModel.AvailableAliases, Mode=OneWay}"
-                        SelectedItem="{x:Bind ViewModel.SelectedAlias, Mode=TwoWay}" />
+                        SelectedItem="{x:Bind ViewModel.SelectedAlias, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="mail:MailAccountAlias">
+                                <TextBlock Text="{x:Bind AliasAddress}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
 
                     <!--  To  -->
                     <TextBlock
@@ -500,11 +370,11 @@
                             ItemsSource="{x:Bind ViewModel.ToItems, Mode=OneTime}"
                             LostFocus="AddressBoxLostFocus"
                             PlaceholderText="{x:Bind domain:Translator.ComposerToPlaceholder}"
-                            SuggestedItemTemplate="{StaticResource SuggestionBoxTemplate}"
+                            SuggestedItemTemplate="{StaticResource ContactSuggestionTemplate}"
                             Tag="ToBox"
                             TokenDelimiter=";"
                             TokenItemAdding="TokenItemAdding"
-                            TokenItemTemplate="{StaticResource TokenBoxTemplate}" />
+                            TokenItemTemplate="{StaticResource ContactTokenTemplate}" />
 
                         <Button
                             x:Name="CCBCCShowButton"
@@ -519,7 +389,7 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
                                     Data="F1 M 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.420572 0 10.056966 0.128582 10.65918 0.385742 C 11.261393 0.642904 11.791992 0.99284 12.250977 1.435547 C 12.709961 1.878256 13.074544 2.397461 13.344727 2.993164 C 13.614908 3.588867 13.75 4.225262 13.75 4.902344 C 13.75 5.332031 13.707682 5.742188 13.623047 6.132812 C 13.538411 6.523438 13.395182 6.907553 13.193359 7.285156 C 12.307942 7.434896 11.484375 7.734375 10.722656 8.183594 C 11.295572 7.819012 11.735025 7.353517 12.041016 6.787109 C 12.347005 6.220704 12.5 5.598959 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.723633 2.65625 11.381836 2.324219 C 11.040039 1.992188 10.641275 1.730145 10.185547 1.538086 C 9.729817 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.501303 5.096028 5.979818 5.288086 6.435547 C 5.480143 6.891276 5.742188 7.290039 6.074219 7.631836 C 6.40625 7.973633 6.795247 8.245443 7.241211 8.447266 C 7.687174 8.649089 8.164062 8.75 8.671875 8.75 C 9.023438 8.75 9.360352 8.709311 9.682617 8.62793 C 10.004883 8.54655 10.322266 8.417969 10.634766 8.242188 C 9.873047 8.704428 9.222005 9.290365 8.681641 10 L 8.662109 10 C 8.011067 10 7.389323 9.868164 6.796875 9.604492 C 6.204427 9.34082 5.681966 8.984375 5.229492 8.535156 C 4.777018 8.085938 4.417317 7.565104 4.150391 6.972656 C 3.883463 6.380209 3.75 5.755209 3.75 5.097656 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 0 13.701172 C 0 13.375651 0.066732 13.064779 0.200195 12.768555 C 0.333659 12.472331 0.512695 12.211914 0.737305 11.987305 C 0.961914 11.762695 1.222331 11.583659 1.518555 11.450195 C 1.814779 11.316732 2.125651 11.25 2.451172 11.25 L 7.900391 11.25 C 7.809244 11.451823 7.722981 11.656901 7.641602 11.865234 C 7.560221 12.073568 7.490234 12.285156 7.431641 12.5 L 2.5 12.5 C 2.324219 12.5 2.161458 12.532553 2.011719 12.597656 C 1.861979 12.662761 1.730143 12.752279 1.616211 12.866211 C 1.502279 12.980144 1.41276 13.111979 1.347656 13.261719 C 1.282552 13.411459 1.25 13.574219 1.25 13.75 C 1.25 14.407553 1.359049 14.986979 1.577148 15.488281 C 1.795247 15.989584 2.091471 16.425781 2.46582 16.796875 C 2.840169 17.167969 3.273112 17.478842 3.764648 17.729492 C 4.256185 17.980143 4.777018 18.180338 5.327148 18.330078 C 5.877278 18.479818 6.438802 18.58724 7.011719 18.652344 C 7.584635 18.717447 8.138021 18.75 8.671875 18.75 C 8.847656 18.977865 9.033203 19.192709 9.228516 19.394531 C 9.423828 19.596354 9.635416 19.785156 9.863281 19.960938 C 9.674479 19.973959 9.488932 19.983725 9.306641 19.990234 C 9.124349 19.996744 8.938802 20 8.75 20 C 7.897135 20 7.042643 19.939779 6.186523 19.819336 C 5.330403 19.698893 4.511719 19.462891 3.730469 19.111328 C 3.157552 18.850912 2.641602 18.543295 2.182617 18.188477 C 1.723633 17.833658 1.333008 17.431641 1.010742 16.982422 C 0.688477 16.533203 0.439453 16.035156 0.263672 15.488281 C 0.087891 14.941406 0 14.345703 0 13.701172 Z M 15 15 L 16.875 15 C 17.04427 15 17.190754 14.938151 17.314453 14.814453 C 17.43815 14.690756 17.5 14.544271 17.5 14.375 C 17.5 14.205729 17.43815 14.059245 17.314453 13.935547 C 17.190754 13.81185 17.04427 13.75 16.875 13.75 L 15 13.75 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.81185 11.435547 13.935547 C 11.311849 14.059245 11.25 14.205729 11.25 14.375 C 11.25 14.544271 11.311849 14.690756 11.435547 14.814453 C 11.559244 14.938151 11.705729 15 11.875 15 L 13.75 15 L 13.75 16.875 C 13.75 17.044271 13.811849 17.190756 13.935547 17.314453 C 14.059244 17.43815 14.205729 17.5 14.375 17.5 C 14.544271 17.5 14.690755 17.43815 14.814453 17.314453 C 14.93815 17.190756 14.999999 17.044271 15 16.875 Z " />
-                                <TextBlock VerticalAlignment="Center" Text="Cc &amp; Bcc" />
+                                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Composer_CcBcc}" />
                             </StackPanel>
                         </Button>
                     </Grid>
@@ -542,11 +412,11 @@
                         ItemsSource="{x:Bind ViewModel.CCItems, Mode=OneTime}"
                         LostFocus="AddressBoxLostFocus"
                         PlaceholderText="{x:Bind domain:Translator.ComposerToPlaceholder}"
-                        SuggestedItemTemplate="{StaticResource SuggestionBoxTemplate}"
+                        SuggestedItemTemplate="{StaticResource ContactSuggestionTemplate}"
                         Tag="CCBox"
                         TokenDelimiter=";"
                         TokenItemAdding="TokenItemAdding"
-                        TokenItemTemplate="{StaticResource TokenBoxTemplate}"
+                        TokenItemTemplate="{StaticResource ContactTokenTemplate}"
                         Visibility="{x:Bind ViewModel.IsCCBCCVisible, Mode=OneWay}" />
 
                     <TextBlock
@@ -565,11 +435,11 @@
                         ItemsSource="{x:Bind ViewModel.BCCItems, Mode=OneTime}"
                         LostFocus="AddressBoxLostFocus"
                         PlaceholderText="{x:Bind domain:Translator.ComposerToPlaceholder}"
-                        SuggestedItemTemplate="{StaticResource SuggestionBoxTemplate}"
+                        SuggestedItemTemplate="{StaticResource ContactSuggestionTemplate}"
                         Tag="BCCBox"
                         TokenDelimiter=";"
                         TokenItemAdding="TokenItemAdding"
-                        TokenItemTemplate="{StaticResource TokenBoxTemplate}"
+                        TokenItemTemplate="{StaticResource ContactTokenTemplate}"
                         Visibility="{x:Bind ViewModel.IsCCBCCVisible, Mode=OneWay}" />
 
                     <!--  Subject  -->
@@ -587,10 +457,19 @@
                         BorderThickness="0"
                         Text="{x:Bind ViewModel.Subject, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
+                    <coreControls:AiActionsPanel
+                        x:Name="ComposeAiActionsPanel"
+                        Grid.Row="5"
+                        Grid.ColumnSpan="2"
+                        Margin="0,8,0,0"
+                        AvailableActions="Rewrite"
+                        HtmlHost="{x:Bind}"
+                        Visibility="{x:Bind GetAiActionsPanelVisibility(ComposeAiActionsToggleButton.IsChecked), Mode=OneWay}" />
+
                     <!--  Attachments  -->
                     <ListView
                         x:Name="AttachmentsListView"
-                        Grid.Row="5"
+                        Grid.Row="6"
                         Grid.ColumnSpan="2"
                         ui:ListViewExtensions.Command="{x:Bind ViewModel.OpenAttachmentCommand}"
                         x:Load="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.IncludedAttachments.Count), Mode=OneWay}"
@@ -705,3 +584,5 @@
 
 
 </abstract:ComposePageAbstract>
+
+
diff --git a/Wino.Mail/Views/ComposePage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/ComposePage.xaml.cs
similarity index 67%
rename from Wino.Mail/Views/ComposePage.xaml.cs
rename to Wino.Mail.WinUI/Views/Mail/ComposePage.xaml.cs
index 19efa9d0..94624486 100644
--- a/Wino.Mail/Views/ComposePage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Mail/ComposePage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
@@ -7,43 +7,66 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI.Controls;
 using EmailValidation;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml.Navigation;
 using MimeKit;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Foundation;
 using Windows.Storage;
 using Windows.UI.Core.Preview;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Navigation;
 using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP.Extensions;
 using Wino.Mail.ViewModels.Data;
+using Wino.Mail.ViewModels.Messages;
+using Wino.Mail.WinUI.Controls;
+using Wino.Mail.WinUI.Extensions;
 using Wino.Messaging.Client.Mails;
 using Wino.Messaging.Client.Shell;
 using Wino.Views.Abstract;
 
-namespace Wino.Views;
+namespace Wino.Views.Mail;
 
 public sealed partial class ComposePage : ComposePageAbstract,
+    IAiHtmlActionHost,
     IRecipient<CreateNewComposeMailRequested>,
-    IRecipient<ApplicationThemeChanged>
+    IRecipient<ApplicationThemeChanged>,
+    IRecipient<ReaderItemRefreshRequestedEvent>
 {
     public WebView2 GetWebView() => WebViewEditor.GetUnderlyingWebView();
 
+    public Visibility GetAiActionsPanelVisibility(bool? isChecked) => isChecked == true ? Visibility.Visible : Visibility.Collapsed;
+
     private readonly List<IDisposable> _disposables = [];
-    private readonly SystemNavigationManagerPreview _navManagerPreview = SystemNavigationManagerPreview.GetForCurrentView();
 
     public ComposePage()
     {
         InitializeComponent();
-        _navManagerPreview.CloseRequested += OnClose;
     }
 
-    private async void GlobalFocusManagerGotFocus(object sender, FocusManagerGotFocusEventArgs e)
+    public WinoIconGlyph GetEditorThemeIcon(bool isDarkMode) => isDarkMode ? WinoIconGlyph.LightEditor : WinoIconGlyph.DarkEditor;
+
+    public string GetEditorThemeToolTip(bool isDarkMode) => isDarkMode ? Translator.Composer_LightTheme : Translator.Composer_DarkTheme;
+
+    private void ToggleEditorThemeClicked(object sender, RoutedEventArgs e)
+    {
+        WebViewEditor.ToggleEditorTheme();
+    }
+
+    private async void EmailTemplateSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is not ComboBox comboBox || comboBox.SelectedItem is not EmailTemplate template)
+            return;
+
+        await WebViewEditor.RenderHtmlAsync(template.HtmlContent);
+        comboBox.SelectedItem = null;
+    }
+
+    private async void GlobalFocusManagerGotFocus(object? sender, FocusManagerGotFocusEventArgs e)
     {
         // In order to delegate cursor to the inner editor for WebView2.
         // When the control got focus, we invoke script to focus the editor.
@@ -62,7 +85,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
             x => box.TextChanged += x,
             x => box.TextChanged -= x)
                 .Throttle(TimeSpan.FromMilliseconds(120))
-                .ObserveOn(SynchronizationContext.Current)
+                .ObserveOn(SynchronizationContext.Current!)
                 .Subscribe(t =>
                 {
                     if (t.EventArgs.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
@@ -236,9 +259,14 @@ public sealed partial class ComposePage : ComposePageAbstract,
 
         FocusManager.GotFocus += GlobalFocusManagerGotFocus;
 
-        // TODO: disabled animation for now, since it's still not working properly.
-        //var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
-        //anim?.TryStart(GetWebView());
+        var webView = GetWebView();
+
+        if (webView != null)
+        {
+            var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
+
+            anim?.TryStart(webView);
+        }
 
         _disposables.Add(GetSuggestionBoxDisposable(ToBox));
         _disposables.Add(GetSuggestionBoxDisposable(CCBox));
@@ -258,6 +286,11 @@ public sealed partial class ComposePage : ComposePageAbstract,
         ViewModel.IsCCBCCVisible = true;
     }
 
+    private async void ComposeAiActionsToggleButton_Checked(object sender, RoutedEventArgs e)
+    {
+        await ComposeAiActionsPanel.RefreshAvailabilityAsync();
+    }
+
     private async void TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
     {
         // Check is valid email.
@@ -297,15 +330,28 @@ public sealed partial class ComposePage : ComposePageAbstract,
         WebViewEditor.IsEditorDarkMode = message.IsUnderlyingThemeDark;
     }
 
+    void IRecipient<ReaderItemRefreshRequestedEvent>.Receive(ReaderItemRefreshRequestedEvent message)
+    {
+        if (message.MailItemViewModel == null || !message.MailItemViewModel.IsDraft) return;
+
+        // Reset the initial focus flag so ToBox gets focus for the new draft.
+        isInitialFocusHandled = false;
+    }
+
     private void ImportanceClicked(object sender, RoutedEventArgs e)
     {
         ImportanceFlyout.Hide();
         ImportanceSplitButton.IsChecked = true;
 
-        if (sender is Button senderButton)
+        if (sender is Button senderButton && senderButton.Tag is MessageImportance importance)
         {
-            ViewModel.SelectedMessageImportance = (MessageImportance)senderButton.Tag;
-            ((ImportanceSplitButton.Content as Viewbox).Child as SymbolIcon).Symbol = (senderButton.Content as SymbolIcon).Symbol;
+            ViewModel.SelectedMessageImportance = importance;
+            if (ImportanceSplitButton.Content is Viewbox viewbox &&
+                viewbox.Child is SymbolIcon symbolIcon &&
+                senderButton.Content is SymbolIcon contentIcon)
+            {
+                symbolIcon.Symbol = contentIcon.Symbol;
+            }
         }
     }
 
@@ -329,7 +375,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
                     _ => null
                 };
 
-                AccountContact addedItem = null;
+                AccountContact? addedItem = null;
 
                 if (addressCollection != null)
                     addedItem = await ViewModel.GetAddressInformationAsync(currentText, addressCollection);
@@ -372,11 +418,96 @@ public sealed partial class ComposePage : ComposePageAbstract,
         base.OnNavigatingFrom(e);
 
         FocusManager.GotFocus -= GlobalFocusManagerGotFocus;
-        _navManagerPreview.CloseRequested -= OnClose;
+        ComposeAiActionsPanel.CancelPendingOperation();
         await ViewModel.UpdateMimeChangesAsync();
 
         DisposeDisposables();
     }
+
+    public async Task<string?> GetCurrentHtmlAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        var html = await WebViewEditor.GetHtmlBodyAsync();
+        cancellationToken.ThrowIfCancellationRequested();
+        return html;
+    }
+
+    public async Task ApplyHtmlResultAsync(string html, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        await WebViewEditor.RenderHtmlAsync(html);
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    public Task<string?> TryGetCachedTranslationHtmlAsync(string languageCode, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.FromResult<string?>(null);
+    }
+
+    public Task SaveCachedTranslationHtmlAsync(string languageCode, string html, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.CompletedTask;
+    }
+
+    public Task<string?> TryGetCachedSummaryTextAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.FromResult<string?>(null);
+    }
+
+    public Task SaveCachedSummaryTextAsync(string summary, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.CompletedTask;
+    }
+
+    public string GetSuggestedSummaryFileName() => "email-summary.txt";
+
+    private void OpenAttachment_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is MailAttachmentViewModel attachment)
+        {
+            ViewModel.OpenAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    private void SaveAttachment_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is MailAttachmentViewModel attachment)
+        {
+            ViewModel.SaveAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    private void RemoveAttachment_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is MailAttachmentViewModel attachment)
+        {
+            ViewModel.RemoveAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        WeakReferenceMessenger.Default.Register<CreateNewComposeMailRequested>(this);
+        WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Register<ReaderItemRefreshRequestedEvent>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        WeakReferenceMessenger.Default.Unregister<CreateNewComposeMailRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
+        WeakReferenceMessenger.Default.Unregister<ReaderItemRefreshRequestedEvent>(this);
+    }
+
+    // TODO: Save mime on closing the app.
     private async void OnClose(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
     {
         var deferral = e.GetDeferral();
diff --git a/Wino.Mail/Views/IdlePage.xaml b/Wino.Mail.WinUI/Views/Mail/IdlePage.xaml
similarity index 88%
rename from Wino.Mail/Views/IdlePage.xaml
rename to Wino.Mail.WinUI/Views/Mail/IdlePage.xaml
index 2bba6489..d060ddc9 100644
--- a/Wino.Mail/Views/IdlePage.xaml
+++ b/Wino.Mail.WinUI/Views/Mail/IdlePage.xaml
@@ -1,5 +1,5 @@
-<abstract:IdlePageAbstract
-    x:Class="Wino.Views.IdlePage"
+<abstract:IdlePageAbstract
+    x:Class="Wino.Views.Mail.IdlePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
diff --git a/Wino.Mail/Views/IdlePage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/IdlePage.xaml.cs
similarity index 70%
rename from Wino.Mail/Views/IdlePage.xaml.cs
rename to Wino.Mail.WinUI/Views/Mail/IdlePage.xaml.cs
index feb699b6..1203b8ac 100644
--- a/Wino.Mail/Views/IdlePage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Mail/IdlePage.xaml.cs
@@ -1,6 +1,6 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
-namespace Wino.Views;
+namespace Wino.Views.Mail;
 
 public sealed partial class IdlePage : IdlePageAbstract
 {
diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml
similarity index 62%
rename from Wino.Mail/Views/MailListPage.xaml
rename to Wino.Mail.WinUI/Views/Mail/MailListPage.xaml
index 8befa449..fac7b3f0 100644
--- a/Wino.Mail/Views/MailListPage.xaml
+++ b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml
@@ -1,46 +1,42 @@
-<abstract:MailListPageAbstract
-    x:Class="Wino.Views.MailListPage"
+<abstract:MailListPageAbstract
+    x:Class="Wino.Views.Mail.MailListPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:advanced="using:Wino.Mail.WinUI.Controls.Advanced"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:collections="using:CommunityToolkit.Mvvm.Collections"
     xmlns:controls="using:Wino.Controls"
     xmlns:converters="using:Wino.Converters"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Mail.ViewModels.Collections"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
-    xmlns:i="using:Microsoft.Xaml.Interactivity"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:listview="using:Wino.Controls.Advanced"
-    xmlns:local="using:Wino.Behaviors"
+    xmlns:listview="using:Wino.Mail.WinUI.Controls.ListView"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:menuflyouts="using:Wino.MenuFlyouts"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:selectors="using:Wino.Selectors"
+    xmlns:selectors1="using:Wino.Mail.WinUI.Selectors"
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
-    xmlns:wino="using:Wino.Core.UWP"
+    xmlns:wino="using:Wino.Mail.WinUI"
     x:Name="root"
     KeyboardAcceleratorPlacementMode="Hidden"
     SizeChanged="PageSizeChanged"
     mc:Ignorable="d">
 
     <Page.Resources>
-        <CollectionViewSource
-            x:Name="MailCollectionViewSource"
-            IsSourceGrouped="True"
-            Source="{x:Bind ViewModel.MailCollection.MailItems, Mode=OneWay}" />
+        <x:Double x:Key="ItemContainerDisabledOpacity">1</x:Double>
 
         <Thickness x:Key="ExpanderHeaderPadding">0,0,0,0</Thickness>
         <Thickness x:Key="ExpanderChevronMargin">0,0,12,0</Thickness>
         <Thickness x:Key="ExpanderHeaderBorderThickness">0,0,0,0</Thickness>
 
-        <SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush">Transparent</SolidColorBrush>
-        <SolidColorBrush x:Key="CardBackgroundFillColorSecondaryBrush">Transparent</SolidColorBrush>
         <SolidColorBrush x:Key="ExpanderContentBorderBrush">Transparent</SolidColorBrush>
 
         <StaticResource x:Key="ExpanderContentBackground" ResourceKey="CardBackgroundFillColorSecondaryBrush" />
@@ -49,10 +45,86 @@
         <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="#FF4C4A48" />
         <SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="#FFFFFFFF" />
 
-        <!--  Header Templates  -->
+        <SolidColorBrush x:Key="ButtonBackgroundDisabled">Transparent</SolidColorBrush>
+
+        <!--  Single Mail Item Template  -->
+        <DataTemplate x:Key="SingleMailItemTemplate" x:DataType="viewModelData:MailItemViewModel">
+            <controls:MailItemDisplayInformationControl
+                x:DefaultBindMode="OneWay"
+                ActionItem="{x:Bind}"
+                ContextRequested="MailItemContextRequested"
+                HoverActionExecuted="MailItemDisplayInformationControl_HoverActionExecuted"
+                MailItemInformation="{x:Bind}" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="ThreadMailItemTemplate" x:DataType="viewModelData:ThreadMailItemViewModel">
+            <controls:WinoExpander
+                x:Name="ExpanderPart"
+                Margin="0,2"
+                IsExpanded="{x:Bind IsThreadExpanded, Mode=TwoWay}">
+                <controls:WinoExpander.Header>
+                    <controls:MailItemDisplayInformationControl
+                        x:DefaultBindMode="OneWay"
+                        ActionItem="{x:Bind}"
+                        CanDrag="True"
+                        ContextRequested="MailItemContextRequested"
+                        DragStarting="ThreadHeaderDragStart"
+                        DropCompleted="ThreadHeaderDragFinished"
+                        HoverActionExecuted="MailItemDisplayInformationControl_HoverActionExecuted"
+                        IsThreadExpanderVisible="True"
+                        MailItemInformation="{x:Bind}"
+                        Tapped="ThreadHeaderTapped" />
+                </controls:WinoExpander.Header>
+                <controls:WinoExpander.Content>
+                    <listview:WinoListView
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
+                        toolkitExt:ScrollViewerExtensions.VerticalScrollBarMargin="0"
+                        CanDragItems="True"
+                        ChoosingItemContainer="WinoListViewChoosingItemContainer"
+                        IsItemClickEnabled="True"
+                        IsThreadListView="True"
+                        ItemClick="WinoListViewItemClicked"
+                        ItemContainerStyle="{StaticResource DefaultMailListViewItemStyle}"
+                        ItemTemplate="{StaticResource SingleMailItemTemplate}"
+                        ItemsSource="{x:Bind ThreadEmails, Mode=OneTime}"
+                        ProcessKeyboardAccelerators="WinoListViewProcessKeyboardAccelerators"
+                        SelectionMode="Extended">
+                        <listview:WinoListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel Margin="8,0,12,0" AreStickyGroupHeadersEnabled="True" />
+                            </ItemsPanelTemplate>
+                        </listview:WinoListView.ItemsPanel>
+                    </listview:WinoListView>
+                </controls:WinoExpander.Content>
+            </controls:WinoExpander>
+
+        </DataTemplate>
+
+        <!--  Calendar Mail Item Template  -->
+        <DataTemplate x:Key="CalendarMailItemTemplate" x:DataType="viewModelData:MailItemViewModel">
+            <controls:CalendarMailItemDisplayInformationControl
+                x:DefaultBindMode="OneWay"
+                ContextRequested="MailItemContextRequested"
+                HoverActionExecuted="MailItemDisplayInformationControl_HoverActionExecuted"
+                MailItem="{x:Bind}" />
+        </DataTemplate>
+
+        <listview:WinoMailItemTemplateSelector
+            x:Key="MailItemTemplateSelector"
+            CalendarMailItemTemplate="{StaticResource CalendarMailItemTemplate}"
+            SingleMailItemTemplate="{StaticResource SingleMailItemTemplate}"
+            ThreadMailItemTemplate="{StaticResource ThreadMailItemTemplate}" />
+
+        <CollectionViewSource
+            x:Name="MailCollectionViewSource"
+            IsSourceGrouped="True"
+            Source="{x:Bind ViewModel.MailCollection.MailItems, Mode=OneWay}" />
+
         <DataTemplate x:Key="MailGroupHeaderDefaultTemplate" x:DataType="collections:IReadOnlyObservableGroup">
             <Grid
-                Margin="4,2"
+                Margin="0,0,0,6"
                 AllowFocusOnInteraction="False"
                 Background="{ThemeResource MailListHeaderBackgroundColor}"
                 CornerRadius="6">
@@ -65,179 +137,8 @@
                     Text="{x:Bind helpers:XamlHelpers.GetMailGroupDateString(Key)}" />
             </Grid>
         </DataTemplate>
-
-        <!--  Swipe Items  -->
-        <!--
-            TODO: Temporarily disabled. WinUI2 - SwipeControl crash.
-            https://github.com/microsoft/microsoft-ui-xaml/issues/2527
-        -->
-
-        <!--<muxc:SwipeItems x:Key="LeftSwipeItems" Mode="Execute">
-            <muxc:SwipeItem BehaviorOnInvoked="Close"
-                            Invoked="LeftSwipeItemInvoked"
-                            Text="{x:Bind domain:Translator.MailOperation_Delete}">
-                <muxc:SwipeItem.IconSource>
-                    <coreControls:WinoFontIconSource Icon="Delete" />
-                </muxc:SwipeItem.IconSource>
-                <muxc:SwipeItem.Background>
-                    <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                        <GradientStop Offset="0.0" Color="#FFF5A6A6" />
-                        <GradientStop Offset="0.5" Color="#FFEF4444" />
-                        <GradientStop Offset="1.0" Color="#FFF32525" />
-                    </LinearGradientBrush>
-                </muxc:SwipeItem.Background>
-            </muxc:SwipeItem>
-        </muxc:SwipeItems>
-
-        -->
-
-        <!--
-        <muxc:SwipeItems x:Key="RightSwipeItems" Mode="Execute">
-            <muxc:SwipeItem BehaviorOnInvoked="Close"
-                            Invoked="RightSwipeItemInvoked"
-                            Text="{x:Bind domain:Translator.MarkReadUnread}">
-                <muxc:SwipeItem.IconSource>
-                    <coreControls:WinoFontIconSource Icon="MarkRead" />
-                </muxc:SwipeItem.IconSource>
-            </muxc:SwipeItem>
-        </muxc:SwipeItems>-->
-
-        <!--  Single Mail Item Template  -->
-        <DataTemplate x:Key="SingleMailItemTemplate" x:DataType="viewModelData:MailItemViewModel">
-            <controls:MailItemDisplayInformationControl
-                x:DefaultBindMode="OneWay"
-                CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
-                ContextRequested="MailItemContextRequested"
-                DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
-                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
-                IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
-                IsCustomFocused="{x:Bind IsCustomFocused, Mode=OneWay}"
-                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
-                IsThumbnailUpdated="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}"
-                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
-                MailItem="{x:Bind MailCopy, Mode=OneWay}"
-                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
-                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
-                ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}" />
-        </DataTemplate>
-
-        <!--  Single Mail Item Template for Threads  -->
-        <DataTemplate x:Key="ThreadSingleMailItemTemplate" x:DataType="viewModelData:MailItemViewModel">
-            <controls:MailItemDisplayInformationControl
-                x:DefaultBindMode="OneWay"
-                CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
-                ContextRequested="MailItemContextRequested"
-                DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
-                FocusVisualMargin="8"
-                FocusVisualPrimaryBrush="{StaticResource SystemControlRevealFocusVisualBrush}"
-                FocusVisualPrimaryThickness="2"
-                FocusVisualSecondaryBrush="{StaticResource SystemControlFocusVisualSecondaryBrush}"
-                FocusVisualSecondaryThickness="1"
-                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
-                IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
-                IsCustomFocused="{x:Bind IsCustomFocused, Mode=OneWay}"
-                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
-                IsThumbnailUpdated="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}"
-                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
-                MailItem="{x:Bind MailCopy, Mode=OneWay}"
-                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
-                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
-                ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}" />
-        </DataTemplate>
-
-        <!--  Mail Item Content Selector  -->
-        <selectors:MailItemDisplaySelector x:Key="MailItemDisplaySelector" SingleMailItemTemplate="{StaticResource SingleMailItemTemplate}">
-            <selectors:MailItemDisplaySelector.ThreadMailItemTemplate>
-                <DataTemplate x:DataType="viewModelData:ThreadMailItemViewModel">
-                    <controls:WinoExpander
-                        x:Name="ThreadExpander"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Stretch"
-                        IsExpanded="{x:Bind IsThreadExpanded, Mode=TwoWay}">
-                        <controls:WinoExpander.Header>
-                            <controls:MailItemDisplayInformationControl
-                                x:DefaultBindMode="OneWay"
-                                Background="Transparent"
-                                BorderThickness="0"
-                                CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
-                                ConnectedExpander="{Binding ElementName=ThreadExpander}"
-                                ContextRequested="MailItemContextRequested"
-                                DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
-                                DragStarting="ThreadHeaderDragStart"
-                                DropCompleted="ThreadHeaderDragFinished"
-                                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
-                                IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
-                                IsHitTestVisible="True"
-                                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
-                                IsThreadExpanded="{x:Bind IsThreadExpanded, Mode=TwoWay}"
-                                IsThreadExpanderVisible="True"
-                                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
-                                MailItem="{x:Bind MailItem, Mode=OneWay}"
-                                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
-                                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
-                                ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}" />
-                        </controls:WinoExpander.Header>
-                        <controls:WinoExpander.Content>
-                            <listview:WinoListView
-                                x:Name="ThreadItemsList"
-                                toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
-                                IsThreadListView="True"
-                                ItemTemplate="{StaticResource ThreadSingleMailItemTemplate}"
-                                ItemsSource="{x:Bind ThreadItems}"
-                                ScrollViewer.VerticalScrollBarVisibility="Hidden">
-                                <ListView.ItemContainerTransitions>
-                                    <TransitionCollection>
-                                        <EdgeUIThemeTransition />
-                                    </TransitionCollection>
-                                </ListView.ItemContainerTransitions>
-                            </listview:WinoListView>
-                        </controls:WinoExpander.Content>
-                    </controls:WinoExpander>
-                </DataTemplate>
-            </selectors:MailItemDisplaySelector.ThreadMailItemTemplate>
-        </selectors:MailItemDisplaySelector>
-
-        <SolidColorBrush x:Key="ButtonBackgroundDisabled">Transparent</SolidColorBrush>
     </Page.Resources>
 
-    <Page.KeyboardAccelerators>
-        <KeyboardAccelerator
-            Key="A"
-            Invoked="SelectAllInvoked"
-            Modifiers="Control" />
-
-        <KeyboardAccelerator Key="Delete" Invoked="DeleteAllInvoked" />
-    </Page.KeyboardAccelerators>
-    <wino:BasePage.ShellContent>
-        <Grid>
-            <!--  Hidden focus receiver...  -->
-            <TextBox
-                Grid.Column="1"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Bottom"
-                Opacity="0"
-                Visibility="Collapsed" />
-
-            <AutoSuggestBox
-                x:Name="SearchBar"
-                Margin="2,0,-2,0"
-                VerticalAlignment="Center"
-                BorderBrush="Transparent"
-                GotFocus="SearchBoxFocused"
-                LostFocus="SearchBarUnfocused"
-                PlaceholderText="{x:Bind domain:Translator.SearchBarPlaceholder}"
-                QueryIcon="Find"
-                Text="{x:Bind ViewModel.SearchQuery, Mode=TwoWay}"
-                TextChanged="SearchBar_TextChanged">
-                <i:Interaction.Behaviors>
-                    <i:EventTriggerBehavior EventName="QuerySubmitted">
-                        <i:InvokeCommandAction Command="{x:Bind ViewModel.PerformSearchCommand}" />
-                    </i:EventTriggerBehavior>
-                </i:Interaction.Behaviors>
-            </AutoSuggestBox>
-        </Grid>
-    </wino:BasePage.ShellContent>
-
     <Grid x:Name="RootGrid" Padding="0,2,0,0">
         <Grid.ColumnDefinitions>
             <ColumnDefinition x:Name="MailListColumn" Width="{x:Bind ViewModel.MailListLength, Mode=OneWay, Converter={StaticResource GridLengthConverter}}" />
@@ -248,12 +149,17 @@
         <Border
             x:Name="MailListContainer"
             Grid.Column="0"
+            Margin="6,2"
             Padding="5,5,5,0"
             HorizontalAlignment="Stretch"
             Background="{ThemeResource WinoContentZoneBackgroud}"
             BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
-            CornerRadius="7">
+            CornerRadius="{ThemeResource OverlayCornerRadius}"
+            Translation="0,0,20">
+            <Border.Shadow>
+                <ThemeShadow />
+            </Border.Shadow>
             <Grid x:Name="MailListGrid">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -267,15 +173,15 @@
                     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                     CornerRadius="8"
                     Visibility="{x:Bind ViewModel.PreferencesService.IsMailListActionBarEnabled}">
-                    <CommandBar
+                    <coreControls:OperationCommandBar
                         HorizontalAlignment="Left"
                         DefaultLabelPosition="Collapsed"
-                        IsEnabled="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.SelectedItemCount), Mode=OneWay}"
+                        IsEnabled="{x:Bind helpers:XamlHelpers.CountToBooleanConverter(ViewModel.MailCollection.SelectedItemsCount), Mode=OneWay}"
+                        IsAIActionsPaneToggleVisible="False"
+                        ItemInvokedCommand="{x:Bind ViewModel.ExecuteTopBarActionCommand}"
+                        MenuItems="{x:Bind ViewModel.ActionItems, Mode=OneWay}"
                         OverflowButtonVisibility="Auto">
-                        <interactivity:Interaction.Behaviors>
-                            <local:BindableCommandBarBehavior ItemClickedCommand="{x:Bind ViewModel.ExecuteTopBarActionCommand}" PrimaryCommands="{x:Bind ViewModel.ActionItems, Mode=OneWay}" />
-                        </interactivity:Interaction.Behaviors>
-                    </CommandBar>
+                    </coreControls:OperationCommandBar>
                 </Grid>
 
                 <!--  Pivot + Sync + Multi Select  -->
@@ -299,8 +205,7 @@
                         VerticalAlignment="Center"
                         Canvas.ZIndex="100"
                         Checked="SelectAllCheckboxChecked"
-                        Unchecked="SelectAllCheckboxUnchecked"
-                        Visibility="{x:Bind helpers:XamlHelpers.IsSelectionModeMultiple(MailListView.SelectionMode), Mode=OneWay}" />
+                        Unchecked="SelectAllCheckboxUnchecked" />
 
 
                     <!--  Folders  -->
@@ -364,13 +269,13 @@
                             Unchecked="SelectionModeToggleUnchecked">
                             <coreControls:WinoFontIcon FontSize="16" Icon="MultiSelect" />
                         </ToggleButton>
-                        <muxc:DropDownButton
+                        <DropDownButton
                             Height="36"
                             Background="Transparent"
                             BorderThickness="0"
                             Content="{x:Bind ViewModel.SelectedFilterOption.Title, Mode=OneWay}"
                             ToolTipService.ToolTip="Filter">
-                            <muxc:DropDownButton.Flyout>
+                            <DropDownButton.Flyout>
                                 <menuflyouts:FilterMenuFlyout
                                     x:Name="FilterMenuFlyout"
                                     AreOpenCloseAnimationsEnabled="True"
@@ -381,11 +286,11 @@
                                     SelectedSortingOption="{x:Bind ViewModel.SelectedSortingOption, Mode=TwoWay}"
                                     SelectedSortingOptionChangedCommand="{x:Bind ViewModel.SelectedSortingChangedCommand}"
                                     SortingOptions="{x:Bind ViewModel.SortingOptions, Mode=OneTime}" />
-                            </muxc:DropDownButton.Flyout>
-                        </muxc:DropDownButton>
+                            </DropDownButton.Flyout>
+                        </DropDownButton>
                     </StackPanel>
 
-                    <muxc:InfoBar
+                    <InfoBar
                         Title="{x:Bind domain:Translator.InfoBarTitle_SynchronizationDisabledFolder}"
                         Grid.Row="0"
                         Grid.ColumnSpan="3"
@@ -393,10 +298,10 @@
                         IsOpen="{x:Bind ViewModel.IsFolderSynchronizationEnabled, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}"
                         Message="{x:Bind domain:Translator.InfoBarMessage_SynchronizationDisabledFolder}"
                         Severity="Informational">
-                        <muxc:InfoBar.ActionButton>
+                        <InfoBar.ActionButton>
                             <Button Command="{x:Bind ViewModel.EnableFolderSynchronizationCommand}" Content="Enable" />
-                        </muxc:InfoBar.ActionButton>
-                    </muxc:InfoBar>
+                        </InfoBar.ActionButton>
+                    </InfoBar>
                 </Grid>
 
                 <!--  No items createria  -->
@@ -433,7 +338,7 @@
                         Text="{x:Bind domain:Translator.NoMessageEmptyFolder}"
                         Visibility="{x:Bind ViewModel.IsFolderEmpty, Mode=OneWay}" />
 
-                    <muxc:ProgressRing
+                    <ProgressRing
                         x:Name="LoadingProgressIndicator"
                         Grid.Row="2"
                         HorizontalAlignment="Center"
@@ -448,70 +353,60 @@
                         <RowDefinition Height="*" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <muxc:RefreshContainer RefreshRequested="PullToRefreshRequested" Visibility="{x:Bind ViewModel.IsEmpty, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}">
-                        <SemanticZoom x:Name="SemanticZoomContainer" CanChangeViews="{x:Bind ViewModel.PreferencesService.IsSemanticZoomEnabled, Mode=OneWay}">
-                            <SemanticZoom.ZoomedInView>
-                                <listview:WinoListView
-                                    x:Name="MailListView"
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Stretch"
-                                    toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
-                                    toolkitExt:ScrollViewerExtensions.VerticalScrollBarMargin="0"
-                                    ItemDeletedCommand="{x:Bind ViewModel.ExecuteMailOperationCommand}"
-                                    ItemTemplateSelector="{StaticResource MailItemDisplaySelector}"
-                                    ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}"
-                                    LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}"
-                                    ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                    <ListView.ItemContainerTransitions>
-                                        <TransitionCollection>
-                                            <AddDeleteThemeTransition />
-                                        </TransitionCollection>
-                                    </ListView.ItemContainerTransitions>
-                                    <ListView.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <ItemsStackPanel Margin="8,0,12,0" AreStickyGroupHeadersEnabled="True" />
-                                        </ItemsPanelTemplate>
-                                    </ListView.ItemsPanel>
-                                    <ListView.Resources>
-                                        <ResourceDictionary>
-                                            <Style BasedOn="{StaticResource MailListHeaderStyle}" TargetType="ListViewHeaderItem" />
-                                        </ResourceDictionary>
-                                    </ListView.Resources>
-                                    <ListView.GroupStyle>
-                                        <GroupStyle HeaderTemplate="{StaticResource MailGroupHeaderDefaultTemplate}" HidesIfEmpty="True" />
-                                    </ListView.GroupStyle>
 
-                                </listview:WinoListView>
-                            </SemanticZoom.ZoomedInView>
-                            <SemanticZoom.ZoomedOutView>
-                                <ListView
-                                    x:Name="ZoomOutList"
-                                    x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(SemanticZoomContainer.IsZoomedInViewActive), Mode=OneWay}"
-                                    ItemsSource="{x:Bind MailCollectionViewSource.View.CollectionGroups}">
-                                    <ListView.Resources>
-                                        <Style TargetType="ListViewItem">
-                                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                                            <Setter Property="VerticalContentAlignment" Value="Stretch" />
-                                            <Setter Property="Margin" Value="12" />
-                                            <Setter Property="Padding" Value="0" />
-                                        </Style>
-                                    </ListView.Resources>
-                                    <ListView.ItemTemplate>
-                                        <DataTemplate x:DataType="ICollectionViewGroup">
-                                            <Grid Background="{ThemeResource MailListHeaderBackgroundColor}" CornerRadius="6">
-                                                <TextBlock
-                                                    Margin="12,0"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Center"
-                                                    FontWeight="SemiBold"
-                                                    Text="{x:Bind helpers:XamlHelpers.GetMailGroupDateString(Group)}" />
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ListView.ItemTemplate>
-                                </ListView>
-                            </SemanticZoom.ZoomedOutView>
-                        </SemanticZoom>
-                    </muxc:RefreshContainer>
+                    <listview:WinoListView
+                        x:Name="MailListView"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
+                        toolkitExt:ScrollViewerExtensions.VerticalScrollBarMargin="0"
+                        CanDragItems="True"
+                        ChoosingItemContainer="WinoListViewChoosingItemContainer"
+                        IsItemClickEnabled="True"
+                        ItemClick="WinoListViewItemClicked"
+                        ItemContainerStyleSelector="{StaticResource WinoMailItemContainerStyleSelector}"
+                        ItemTemplateSelector="{StaticResource MailItemTemplateSelector}"
+                        ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}"
+                        LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}"
+                        ProcessKeyboardAccelerators="WinoListViewProcessKeyboardAccelerators"
+                        SelectionMode="None">
+                        <listview:WinoListView.ItemContainerTransitions>
+                            <TransitionCollection>
+                                <AddDeleteThemeTransition />
+                            </TransitionCollection>
+                        </listview:WinoListView.ItemContainerTransitions>
+                        <listview:WinoListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel AreStickyGroupHeadersEnabled="True" GroupPadding="10,10,10,0" />
+                            </ItemsPanelTemplate>
+                        </listview:WinoListView.ItemsPanel>
+                        <listview:WinoListView.Resources>
+                            <ResourceDictionary>
+                                <Style BasedOn="{StaticResource MailListHeaderStyle}" TargetType="ListViewHeaderItem" />
+                            </ResourceDictionary>
+                        </listview:WinoListView.Resources>
+                        <listview:WinoListView.GroupStyle>
+                            <GroupStyle HeaderTemplate="{StaticResource MailGroupHeaderDefaultTemplate}" HidesIfEmpty="True" />
+                        </listview:WinoListView.GroupStyle>
+                    </listview:WinoListView>
+
+                    <Border
+                        x:Name="DraggingMessageBorder"
+                        Grid.Row="0"
+                        Margin="14"
+                        Padding="10,6"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Bottom"
+                        x:Load="{x:Bind ViewModel.IsDragInProgress, Mode=OneWay}"
+                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1"
+                        CornerRadius="8">
+                        <TextBlock
+                            FontSize="12"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind ViewModel.DraggingMessageText, Mode=OneWay}" />
+                    </Border>
 
                     <!--  Try online search panel.  -->
                     <Grid Grid.Row="1" Visibility="{x:Bind ViewModel.IsOnlineSearchButtonVisible, Mode=OneWay}">
@@ -527,14 +422,14 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
 
-                                <muxc:AnimatedIcon x:Name="SearchAnimatedIcon" Width="30">
-                                    <muxc:AnimatedIcon.Source>
+                                <AnimatedIcon x:Name="SearchAnimatedIcon" Width="30">
+                                    <AnimatedIcon.Source>
                                         <animatedvisuals:AnimatedFindVisualSource />
-                                    </muxc:AnimatedIcon.Source>
-                                    <muxc:AnimatedIcon.FallbackIconSource>
-                                        <muxc:SymbolIconSource Symbol="Find" />
-                                    </muxc:AnimatedIcon.FallbackIconSource>
-                                </muxc:AnimatedIcon>
+                                    </AnimatedIcon.Source>
+                                    <AnimatedIcon.FallbackIconSource>
+                                        <SymbolIconSource Symbol="Find" />
+                                    </AnimatedIcon.FallbackIconSource>
+                                </AnimatedIcon>
 
                                 <Grid
                                     Grid.Column="1"
diff --git a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
new file mode 100644
index 00000000..1b4d4d30
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs
@@ -0,0 +1,923 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Collections;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml.Navigation;
+using MoreLinq;
+using Windows.Foundation;
+using Windows.System;
+using Wino.Controls;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Menus;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.ViewModels.Messages;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Controls.ListView;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.MenuFlyouts.Context;
+using Wino.Messaging.Client.Mails;
+using Wino.Views.Abstract;
+using WinRT;
+
+// object, IMailListItem
+// Register generic types from CommunityToolkit.Mvvm for AOT compatibility when passed across WinRT boundary
+[assembly: GeneratedWinRTExposedExternalType(typeof(ObservableGroup<object, IMailListItem>))]
+[assembly: GeneratedWinRTExposedExternalType(typeof(ReadOnlyObservableGroup<object, IMailListItem>))]
+[assembly: GeneratedWinRTExposedExternalType(typeof(ReadOnlyObservableGroupedCollection<object, IMailListItem>))]
+
+namespace Wino.Views.Mail;
+
+public sealed partial class MailListPage : MailListPageAbstract,
+    IRecipient<ClearMailSelectionsRequested>,
+    IRecipient<ActiveMailItemChangedEvent>,
+    IRecipient<SelectMailItemContainerEvent>,
+    IRecipient<DisposeRenderingFrameRequested>,
+    ITitleBarSearchHost
+{
+    private const double RENDERING_COLUMN_MIN_WIDTH = 375;
+    private const int IDLE_NAVIGATION_DELAY_MS = 120;
+    private int _idleNavigationRequestVersion = 0;
+
+    private IStatePersistanceService StatePersistenceService { get; } = WinoApplication.Current.Services.GetService<IStatePersistanceService>() ?? throw new Exception($"Can't resolve {nameof(KeyPressService)}");
+    private IKeyPressService KeyPressService { get; } = WinoApplication.Current.Services.GetService<IKeyPressService>() ?? throw new Exception($"Can't resolve {nameof(KeyPressService)}");
+    public ObservableCollection<TitleBarSearchSuggestion> SearchSuggestions { get; } = [];
+    public string SearchText
+    {
+        get => ViewModel.SearchQuery;
+        set => ViewModel.SearchQuery = value;
+    }
+
+    public string SearchPlaceholderText => Translator.SearchBarPlaceholder;
+
+    public MailListPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        Bindings.Update();
+
+        if (ViewModel.ActiveFolder != null)
+        {
+            ViewModel.StatePersistenceService.CoreWindowTitle = $"{ViewModel.ActiveFolder.AssignedAccountName} - {ViewModel.ActiveFolder.FolderName}";
+        }
+
+        ViewModel.MailCollection.ItemSelectionChanged += WinoMailCollectionSelectionChanged;
+        MailListView.MailDragStateChanged += MailListViewMailDragStateChanged;
+
+        UpdateSelectAllButtonStatus();
+        UpdateAdaptiveness();
+
+        // Delegate to ViewModel.
+        if (e.Parameter is NavigateMailFolderEventArgs folderNavigationArgs)
+        {
+            WeakReferenceMessenger.Default.Send(new ActiveMailFolderChangedEvent(folderNavigationArgs.BaseFolderMenuItem, folderNavigationArgs.FolderInitLoadAwaitTask));
+        }
+    }
+
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        base.OnNavigatedFrom(e);
+
+        InvalidatePendingIdleNavigation();
+
+        this.Bindings.StopTracking();
+
+        ViewModel.MailCollection.ItemSelectionChanged -= WinoMailCollectionSelectionChanged;
+        MailListView.MailDragStateChanged -= MailListViewMailDragStateChanged;
+        SelectAllCheckbox.Checked -= SelectAllCheckboxChecked;
+        SelectAllCheckbox.Unchecked -= SelectAllCheckboxUnchecked;
+        ViewModel.SetDragState(false);
+
+        MailListView.Cleanup();
+
+        RenderingFrame.Navigate(typeof(IdlePage));
+
+        GC.Collect();
+    }
+
+    private void UpdateSelectAllButtonStatus()
+    {
+        // Check all checkbox if all is selected.
+        // Unhook events to prevent selection overriding.
+
+        DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
+        {
+            SelectAllCheckbox.Checked -= SelectAllCheckboxChecked;
+            SelectAllCheckbox.Unchecked -= SelectAllCheckboxUnchecked;
+
+            SelectAllCheckbox.IsChecked = ViewModel.MailCollection.IsAllItemsSelected;
+
+            SelectAllCheckbox.Checked += SelectAllCheckboxChecked;
+            SelectAllCheckbox.Unchecked += SelectAllCheckboxUnchecked;
+        });
+    }
+
+    private void SelectionModeToggleChecked(object sender, RoutedEventArgs e) => ChangeSelectionMode(ListViewSelectionMode.Multiple);
+
+    private void MailItemDisplayInformationControl_HoverActionExecuted(object sender, MailOperationPreperationRequest e)
+    {
+        ViewModel.ExecuteHoverActionCommand.Execute(e);
+    }
+
+    private async void FolderPivotChanged(object sender, SelectionChangedEventArgs e)
+    {
+        foreach (var addedItem in e.AddedItems)
+        {
+            if (addedItem is FolderPivotViewModel pivotItem)
+            {
+                pivotItem.IsSelected = true;
+            }
+        }
+
+        foreach (var removedItem in e.RemovedItems)
+        {
+            if (removedItem is FolderPivotViewModel pivotItem)
+            {
+                pivotItem.IsSelected = false;
+            }
+        }
+
+        SelectAllCheckbox.IsChecked = false;
+        SelectionModeToggle.IsChecked = false;
+
+        if (ViewModel.MailCollection.SelectedItemsCount > 0)
+        {
+            await ViewModel.MailCollection.UnselectAllAsync();
+        }
+
+        UpdateSelectAllButtonStatus();
+        ViewModel.SelectedPivotChangedCommand.Execute(null);
+    }
+
+    private void ChangeSelectionMode(ListViewSelectionMode mode)
+    {
+        MailListView.ChangeSelectionMode(mode);
+
+        if (ViewModel?.PivotFolders != null)
+        {
+            ViewModel.PivotFolders.ForEach(a => a.IsExtendedMode = mode == ListViewSelectionMode.Extended);
+        }
+    }
+
+    private void SelectionModeToggleUnchecked(object sender, RoutedEventArgs e)
+    {
+        ChangeSelectionMode(ListViewSelectionMode.Extended);
+    }
+
+    private async void SelectAllCheckboxChecked(object sender, RoutedEventArgs e)
+    {
+        await ViewModel.MailCollection.SelectAllAsync();
+    }
+
+    private async void SelectAllCheckboxUnchecked(object sender, RoutedEventArgs e)
+    {
+        await ViewModel.MailCollection.UnselectAllAsync();
+    }
+
+    private void WinoListViewChoosingItemContainer(ListViewBase sender, ChoosingItemContainerEventArgs args)
+    {
+        if (args.Item is ThreadMailItemViewModel && args.ItemContainer is not WinoThreadMailItemViewModelListViewItem)
+        {
+            args.ItemContainer = new WinoThreadMailItemViewModelListViewItem()
+            {
+                Item = args.Item as ThreadMailItemViewModel
+            };
+        }
+        else if (args.Item is MailItemViewModel && args.ItemContainer is not WinoMailItemViewModelListViewItem)
+        {
+            args.ItemContainer = new WinoMailItemViewModelListViewItem()
+            {
+                Item = args.Item as MailItemViewModel
+            };
+        }
+    }
+
+    private async void MailItemContextRequested(UIElement sender, ContextRequestedEventArgs args)
+    {
+        // Context is requested from a single mail point, but we might have multiple selected items.
+        // This menu should be calculated based on all selected items by providers.
+
+        if (sender is MailItemDisplayInformationControl control && args.TryGetPosition(sender, out Point p))
+        {
+            IEnumerable<MailItemViewModel> targetItems;
+
+            if (control.ActionItem is ThreadMailItemViewModel threadItem)
+            {
+                await SelectThreadForContextMenuAsync(threadItem);
+            }
+            else if (control.ActionItem is MailItemViewModel mailItem && !ViewModel.MailCollection.SelectedItems.Contains(mailItem))
+            {
+                // Right clicked item is not selected. Select.
+                await WinoClickItemInternalAsync(mailItem, true);
+            }
+
+            // Default to all selected items.
+            targetItems = ViewModel.MailCollection.SelectedItems;
+            var availableActions = ViewModel.GetAvailableMailActions(targetItems);
+
+            if (availableActions == null || !availableActions.Any()) return;
+
+            var clickedOperation = await GetMailOperationFromFlyoutAsync(availableActions, control, p.X, p.Y);
+
+            if (clickedOperation == null) return;
+
+            var prepRequest = new MailOperationPreperationRequest(clickedOperation.Operation, targetItems.Select(a => a.MailCopy));
+
+            await ViewModel.ExecuteMailOperationAsync(prepRequest);
+        }
+    }
+
+    private async Task SelectThreadForContextMenuAsync(ThreadMailItemViewModel threadItem)
+    {
+        bool isThreadFullySelected = threadItem.IsSelected && threadItem.ThreadEmails.All(a => a.IsSelected);
+        bool hasSelectionsOutsideThread = ViewModel.MailCollection.SelectedItems.Any(a => !threadItem.ThreadEmails.Contains(a));
+
+        // No-op to avoid visual collapse/re-expand flicker on right-click.
+        if (threadItem.IsThreadExpanded && isThreadFullySelected && !hasSelectionsOutsideThread)
+        {
+            return;
+        }
+
+        // Context menu on a thread should target the whole thread and keep it expanded.
+        await ViewModel.MailCollection.UnselectAllAsync();
+        await ViewModel.MailCollection.ExecuteWithoutRaiseSelectionChangedAsync(item =>
+        {
+            if (item is ThreadMailItemViewModel thread && !ReferenceEquals(thread, threadItem))
+            {
+                thread.IsThreadExpanded = false;
+            }
+        }, true);
+
+        threadItem.IsSelected = true;
+        threadItem.IsThreadExpanded = true;
+
+        foreach (var threadMail in threadItem.ThreadEmails)
+        {
+            threadMail.IsSelected = true;
+        }
+    }
+
+    private async Task<MailOperationMenuItem> GetMailOperationFromFlyoutAsync(IEnumerable<MailOperationMenuItem> availableActions,
+                                                                              UIElement showAtElement,
+                                                                              double x,
+                                                                              double y)
+    {
+        var source = new TaskCompletionSource<MailOperationMenuItem>();
+
+        var flyout = new MailOperationFlyout(availableActions, source);
+
+        flyout.ShowAt(showAtElement, new FlyoutShowOptions()
+        {
+            ShowMode = FlyoutShowMode.Standard,
+            Position = new Point(x + 30, y - 20)
+        });
+
+        return await source.Task;
+    }
+
+    async void IRecipient<ClearMailSelectionsRequested>.Receive(ClearMailSelectionsRequested message)
+    {
+        await ViewModel.MailCollection.UnselectAllAsync();
+    }
+
+    void IRecipient<ActiveMailItemChangedEvent>.Receive(ActiveMailItemChangedEvent message)
+    {
+        // No active mail item. Go to empty page.
+        if (message.SelectedMailItemViewModel == null)
+        {
+            _ = NavigateIdleWhenSelectionSettlesAsync();
+        }
+        else
+        {
+            InvalidatePendingIdleNavigation();
+
+            // Navigate to composing page.
+            if (message.SelectedMailItemViewModel.IsDraft)
+            {
+                NavigationTransitionType composerPageTransition = NavigationTransitionType.None;
+
+                // Dispose active rendering if there is any and go to composer.
+                if (IsRenderingPageActive())
+                {
+                    // Prepare WebView2 animation from Rendering to Composing page.
+                    PrepareRenderingPageWebViewTransition();
+
+                    // Dispose existing HTML content from rendering page webview.
+                    WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
+                }
+                else if (IsComposingPageActive())
+                {
+                    // Composer is already active. Skip connected animation since the page
+                    // will be reused in-place (no navigation occurs).
+                    // NavigationService will send ReaderItemRefreshRequestedEvent instead.
+                }
+                else
+                    composerPageTransition = NavigationTransitionType.DrillIn;
+
+                ViewModel.NavigationService.Navigate(WinoPage.ComposePage, message.SelectedMailItemViewModel, NavigationReferenceFrame.RenderingFrame, composerPageTransition);
+            }
+            else
+            {
+                // Find the MIME and go to rendering page.
+
+                if (message.SelectedMailItemViewModel == null) return;
+
+                if (IsComposingPageActive())
+                {
+                    PrepareComposePageWebViewTransition();
+                }
+
+                ViewModel.NavigationService.Navigate(WinoPage.MailRenderingPage, message.SelectedMailItemViewModel, NavigationReferenceFrame.RenderingFrame);
+            }
+        }
+
+        UpdateAdaptiveness();
+    }
+
+    private bool IsRenderingPageActive() => RenderingFrame.Content is MailRenderingPage;
+    private bool IsComposingPageActive() => RenderingFrame.Content is ComposePage;
+
+    private void InvalidatePendingIdleNavigation()
+    {
+        unchecked
+        {
+            _idleNavigationRequestVersion++;
+        }
+    }
+
+    private async Task NavigateIdleWhenSelectionSettlesAsync()
+    {
+        int requestVersion = ++_idleNavigationRequestVersion;
+
+        await Task.Delay(IDLE_NAVIGATION_DELAY_MS);
+
+        if (requestVersion != _idleNavigationRequestVersion) return;
+        if (ViewModel.MailCollection.SelectedItemsCount != 0) return;
+
+        if (IsRenderingPageActive())
+        {
+            WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
+        }
+
+        // Ensure rendering frame actually navigates away from Compose/Rendering pages.
+        // Otherwise those pages keep their messenger registrations alive.
+        ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);
+        UpdateAdaptiveness();
+    }
+
+    private void PrepareComposePageWebViewTransition()
+    {
+        var webView = GetComposerPageWebView();
+
+        if (webView != null)
+        {
+            var animation = ConnectedAnimationService.GetForCurrentView().PrepareToAnimate("WebViewConnectedAnimation", webView);
+            animation.Configuration = new BasicConnectedAnimationConfiguration();
+        }
+    }
+
+    private void PrepareRenderingPageWebViewTransition()
+    {
+        var webView = GetRenderingPageWebView();
+
+        if (webView != null)
+        {
+            var animation = ConnectedAnimationService.GetForCurrentView().PrepareToAnimate("WebViewConnectedAnimation", webView);
+            animation.Configuration = new BasicConnectedAnimationConfiguration();
+        }
+    }
+
+    #region Connected Animation Helpers
+
+    private WebView2? GetRenderingPageWebView()
+    {
+        if (RenderingFrame.Content is MailRenderingPage renderingPage)
+            return renderingPage.GetWebView();
+
+        return null;
+    }
+
+    private WebView2? GetComposerPageWebView()
+    {
+        if (RenderingFrame.Content is ComposePage composePage)
+            return composePage.GetWebView();
+
+        return null;
+    }
+
+    #endregion
+
+    public async void Receive(SelectMailItemContainerEvent message)
+    {
+        if (message.MailUniqueId == Guid.Empty) return;
+
+        // Find the item from the collection.
+        // Folder should be initialized already.
+
+        var item = ViewModel.MailCollection.Find(message.MailUniqueId);
+
+        if (item == null) return;
+
+        await DispatcherQueue.EnqueueAsync(async () =>
+        {
+            var collectionContainer = await MailListView.GetItemContainersAsync(item);
+
+            if (collectionContainer.Item1 == null && collectionContainer.Item2 == null) return;
+
+            // Automatically scroll to the selected item.
+            // This is useful when creating draft.
+
+            if (message.ScrollToItem)
+            {
+                // Scroll to thread if available.
+                // Find the item index on the UI. This is different than ListView.
+
+                int scrollIndex = -1;
+                if (collectionContainer.Item2 != null)
+                {
+                    scrollIndex = ViewModel.MailCollection.IndexOf(collectionContainer.Item2.Item);
+                }
+                else if (collectionContainer.Item1 != null)
+                {
+                    scrollIndex = ViewModel.MailCollection.IndexOf(collectionContainer.Item1.Item);
+                }
+
+                if (scrollIndex >= 0)
+                {
+                    await MailListView.SmoothScrollIntoViewWithIndexAsync(scrollIndex);
+                }
+            }
+
+            await WinoClickItemInternalAsync(item, true);
+        });
+    }
+
+    /// <summary>
+    /// Thread header is mail info display control and it can be dragged spearately out of ListView.
+    /// We need to prepare a drag package for it from the items inside.
+    /// </summary>
+    private void ThreadHeaderDragStart(UIElement sender, DragStartingEventArgs args)
+    {
+        if (sender is MailItemDisplayInformationControl control && control.ActionItem is ThreadMailItemViewModel threadItem)
+        {
+            args.AllowedOperations = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
+
+            // Dragging a thread header should move all mails in that thread.
+            var draggedThreadItems = threadItem.ThreadEmails.Cast<IMailListItem>().ToList();
+            var dragCount = draggedThreadItems.Count;
+            var draggingText = string.Format(Translator.MailsDragging, dragCount);
+
+            ViewModel.SetDragState(true, dragCount);
+
+            var dragPackage = new MailDragPackage(draggedThreadItems);
+
+            args.Data.Properties.Add(nameof(MailDragPackage), dragPackage);
+            args.Data.SetText(draggingText);
+            args.Data.Properties.Title = draggingText;
+            args.DragUI.SetContentFromDataPackage();
+        }
+    }
+
+    private void ThreadHeaderDragFinished(UIElement sender, DropCompletedEventArgs args)
+    {
+        ViewModel.SetDragState(false);
+    }
+
+    private void MailListViewMailDragStateChanged(object? sender, MailDragStateChangedEventArgs e)
+    {
+        ViewModel.SetDragState(e.IsDragging, e.DraggedItemCount);
+    }
+
+    private async void ThreadHeaderTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (sender is not MailItemDisplayInformationControl control) return;
+
+        // Hover action button clicks bubble a tap as well; skip selecting in that case.
+        if (control.IsRunningHoverAction)
+        {
+            control.IsRunningHoverAction = false;
+            return;
+        }
+
+        if (control.ActionItem is ThreadMailItemViewModel threadItem)
+        {
+            await WinoClickItemInternalAsync(threadItem);
+        }
+    }
+
+    private async void LeftSwipeItemInvoked(Microsoft.UI.Xaml.Controls.SwipeItem sender, Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs args)
+    {
+        // Delete item for now.
+
+        var swipeControl = args.SwipeControl;
+
+        swipeControl.Close();
+
+        if (swipeControl.Tag is MailItemViewModel mailItemViewModel)
+        {
+            var package = new MailOperationPreperationRequest(MailOperation.SoftDelete, mailItemViewModel.MailCopy);
+            await ViewModel.ExecuteMailOperationAsync(package);
+        }
+        else if (swipeControl.Tag is ThreadMailItemViewModel threadMailItemViewModel)
+        {
+            var package = new MailOperationPreperationRequest(MailOperation.SoftDelete, threadMailItemViewModel.ThreadEmails.Select(a => a.MailCopy));
+            await ViewModel.ExecuteMailOperationAsync(package);
+        }
+    }
+
+    private async void RightSwipeItemInvoked(Microsoft.UI.Xaml.Controls.SwipeItem sender, Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs args)
+    {
+        // Toggle status only for now.
+
+        var swipeControl = args.SwipeControl;
+
+        swipeControl.Close();
+
+        if (swipeControl.Tag is MailItemViewModel mailItemViewModel)
+        {
+            var operation = mailItemViewModel.IsRead ? MailOperation.MarkAsUnread : MailOperation.MarkAsRead;
+            var package = new MailOperationPreperationRequest(operation, mailItemViewModel.MailCopy);
+
+            await ViewModel.ExecuteMailOperationAsync(package);
+        }
+        else if (swipeControl.Tag is ThreadMailItemViewModel threadMailItemViewModel)
+        {
+            bool isAllRead = threadMailItemViewModel.ThreadEmails.All(a => a.IsRead);
+
+            var operation = isAllRead ? MailOperation.MarkAsUnread : MailOperation.MarkAsRead;
+            var package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.ThreadEmails.Select(a => a.MailCopy));
+
+            await ViewModel.ExecuteMailOperationAsync(package);
+        }
+    }
+
+    public async Task OnTitleBarSearchTextChangedAsync()
+    {
+        if (string.IsNullOrWhiteSpace(SearchText))
+        {
+            ViewModel.IsOnlineSearchButtonVisible = false;
+            await ViewModel.PerformSearchAsync();
+        }
+    }
+
+    public void Receive(DisposeRenderingFrameRequested message)
+    {
+        ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);
+        UpdateAdaptiveness();
+    }
+
+    protected override void RegisterRecipients()
+    {
+        WeakReferenceMessenger.Default.Register<ClearMailSelectionsRequested>(this);
+        WeakReferenceMessenger.Default.Register<ActiveMailItemChangedEvent>(this);
+        WeakReferenceMessenger.Default.Register<SelectMailItemContainerEvent>(this);
+        WeakReferenceMessenger.Default.Register<DisposeRenderingFrameRequested>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        WeakReferenceMessenger.Default.Unregister<ClearMailSelectionsRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<ActiveMailItemChangedEvent>(this);
+        WeakReferenceMessenger.Default.Unregister<SelectMailItemContainerEvent>(this);
+        WeakReferenceMessenger.Default.Unregister<DisposeRenderingFrameRequested>(this);
+    }
+
+    private void PageSizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        ViewModel.MaxMailListLength = e.NewSize.Width - RENDERING_COLUMN_MIN_WIDTH;
+
+        StatePersistenceService.IsReaderNarrowed = e.NewSize.Width < StatePersistenceService.MailListPaneLength + RENDERING_COLUMN_MIN_WIDTH;
+
+        UpdateAdaptiveness();
+    }
+
+    private void MailListSizerManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+    {
+        StatePersistenceService.MailListPaneLength = ViewModel.MailListLength;
+    }
+
+    private void UpdateAdaptiveness()
+    {
+        bool isMultiSelectionEnabled = ViewModel.IsMultiSelectionModeEnabled;
+
+        if (StatePersistenceService.IsReaderNarrowed)
+        {
+            if (ViewModel.MailCollection.HasSingleItemSelected && !isMultiSelectionEnabled)
+            {
+                VisualStateManager.GoToState(this, "NarrowRenderer", true);
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "NarrowMailList", true);
+            }
+        }
+        else
+        {
+            if (ViewModel.MailCollection.HasSingleItemSelected && !isMultiSelectionEnabled)
+            {
+                VisualStateManager.GoToState(this, "BothPanelsMailSelected", true);
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "BothPanelsNoMailSelected", true);
+            }
+        }
+    }
+
+
+
+    private void WinoMailCollectionSelectionChanged(object? sender, EventArgs args)
+    {
+        UpdateSelectAllButtonStatus();
+        UpdateAdaptiveness();
+    }
+
+    private async void WinoListViewProcessKeyboardAccelerators(UIElement sender, ProcessKeyboardAcceleratorEventArgs args)
+    {
+        args.Handled = true;
+
+        if (args.Key == VirtualKey.Delete)
+        {
+            ViewModel.ExecuteMailOperationCommand.Execute(MailOperation.SoftDelete);
+        }
+        else if (args.Key == VirtualKey.A && args.Modifiers.HasFlag(VirtualKeyModifiers.Control))
+        {
+            await ViewModel.MailCollection.ToggleSelectAllAsync();
+        }
+        else if (args.Key == VirtualKey.Escape)
+        {
+            // Unselect the selected items.
+            await ViewModel.MailCollection.UnselectAllAsync();
+        }
+        else
+        {
+            args.Handled = false;
+        }
+    }
+
+    private async Task WinoClickItemInternalAsync(object? clickedItem, bool selectExpandThread = false)
+    {
+        if (clickedItem == null) return;
+
+        // Requirements (summary):
+        // CTRL pressed -> multi-select behaviour
+        //   * Clicking single item toggles only that item.
+        //   * Clicking thread header toggles selection of thread AND all its children (all on or all off).
+        //   * Clicking an item inside a thread toggles only that child item.
+        // CTRL NOT pressed -> single-select (exclusive) with toggle support (can leave zero selected)
+        //   * Clicking thread header: unselect everything else, collapse all other threads, select only the thread + first child.
+        //       If already in that state (thread selected and first child selected), clicking again unselects all (nothing selected).
+        //   * Clicking a single (non-thread) item OR a child item: collapse & unselect all others then toggle that item's selection.
+        //       If it was selected, result is nothing selected.
+
+        // Treat toolbar multi-select mode the same as holding CTRL for click selection behavior.
+        bool isCtrlPressed = KeyPressService.IsCtrlKeyPressed() || ViewModel.IsMultiSelectionModeEnabled;
+
+        // Lazily built caches for this invocation.
+        List<ThreadMailItemViewModel>? threadItems = null;
+        Dictionary<string, ThreadMailItemViewModel>? threadById = null;
+
+        List<ThreadMailItemViewModel> GetThreadItems()
+        {
+            if (threadItems != null) return threadItems;
+
+            threadItems = [];
+
+            foreach (var group in ViewModel.MailCollection.MailItems)
+            {
+                foreach (var item in group)
+                {
+                    if (item is ThreadMailItemViewModel thread)
+                    {
+                        threadItems.Add(thread);
+                    }
+                }
+            }
+
+            return threadItems;
+        }
+
+        ThreadMailItemViewModel? FindParentThread(MailItemViewModel mail)
+        {
+            if (string.IsNullOrEmpty(mail.ThreadId))
+            {
+                return null;
+            }
+
+            threadById ??= GetThreadItems()
+                .Where(t => !string.IsNullOrEmpty(t.ThreadId))
+                .GroupBy(t => t.ThreadId, StringComparer.Ordinal)
+                .ToDictionary(g => g.Key, g => g.First(), StringComparer.Ordinal);
+
+            return threadById.TryGetValue(mail.ThreadId, out var threadItem) ? threadItem : null;
+        }
+
+        void CollapseAllThreadsExcept(ThreadMailItemViewModel? except)
+        {
+            foreach (var thread in GetThreadItems())
+            {
+                if (!ReferenceEquals(thread, except) && thread.IsThreadExpanded)
+                {
+                    thread.IsThreadExpanded = false;
+                }
+            }
+        }
+
+        static void SyncThreadSelectionFromChildren(ThreadMailItemViewModel? thread)
+        {
+            if (thread == null) return;
+
+            bool hasSelectedChildren = false;
+            foreach (var child in thread.ThreadEmails)
+            {
+                if (child.IsSelected)
+                {
+                    hasSelectedChildren = true;
+                    break;
+                }
+            }
+
+            thread.IsSelected = hasSelectedChildren;
+
+            // Keep thread open while it has selected children.
+            if (hasSelectedChildren && !thread.IsThreadExpanded)
+            {
+                thread.IsThreadExpanded = true;
+            }
+        }
+
+        if (isCtrlPressed)
+        {
+            switch (clickedItem)
+            {
+                case ThreadMailItemViewModel thread:
+                    {
+                        // Determine if thread + all children currently selected
+                        bool allSelected = thread.IsSelected && thread.ThreadEmails.All(e => e.IsSelected);
+                        if (allSelected)
+                        {
+                            // Unselect thread & all children
+                            thread.IsSelected = false;
+                            foreach (var child in thread.ThreadEmails)
+                                child.IsSelected = false;
+                        }
+                        else
+                        {
+                            // Select thread & all children (do NOT disturb other selections in CTRL mode)
+                            thread.IsSelected = true;
+                            foreach (var child in thread.ThreadEmails)
+                                child.IsSelected = true;
+                            // Keep it expanded so user can see items
+                            thread.IsThreadExpanded = true;
+                        }
+                        break;
+                    }
+                case MailItemViewModel mail:
+                    {
+                        // Toggle just this item; no collapse/unselect of others in multi-select mode.
+                        mail.IsSelected = !mail.IsSelected;
+                        SyncThreadSelectionFromChildren(FindParentThread(mail));
+                        break;
+                    }
+            }
+            return; // Multi-select path ends here.
+        }
+
+        // SINGLE-SELECTION (exclusive) MODE WITH TOGGLE SUPPORT
+        if (clickedItem is ThreadMailItemViewModel clickedThread)
+        {
+            bool wasThreadSelected = clickedThread.IsSelected;
+            bool wasThreadExpanded = clickedThread.IsThreadExpanded;
+
+            // Check if any child in this thread is already selected (e.g., from notification click)
+            var alreadySelectedChild = clickedThread.ThreadEmails.FirstOrDefault(e => e.IsSelected);
+
+            // Reset everything first (exclusive selection scenario)
+            await ViewModel.MailCollection.UnselectAllAsync();
+            CollapseAllThreadsExcept(clickedThread);
+
+            if (wasThreadSelected && wasThreadExpanded)
+            {
+                // Toggle off -> leave nothing selected (all unselected, thread collapsed)
+                clickedThread.IsThreadExpanded = false;
+                return;
+            }
+
+            // Select thread header
+            clickedThread.IsSelected = true;
+
+            // If a child was already selected (e.g., from notification), keep that selection
+            // Otherwise, select the first child
+            if (alreadySelectedChild != null)
+            {
+                alreadySelectedChild.IsSelected = true;
+            }
+            else
+            {
+                var firstChild = clickedThread.ThreadEmails.FirstOrDefault();
+                if (firstChild != null)
+                {
+                    firstChild.IsSelected = true;
+                }
+            }
+
+            clickedThread.IsThreadExpanded = true; // Show contents of active thread
+        }
+        else if (clickedItem is MailItemViewModel clickedMail)
+        {
+            bool wasSelected = clickedMail.IsSelected;
+
+            // Determine if this mail belongs to an already selected & expanded thread.
+            // If so, we only want to switch the selection inside that thread without collapsing or unselecting the thread header.
+            ThreadMailItemViewModel? parentThread = FindParentThread(clickedMail);
+
+            bool isInSelectedExpandedThread = parentThread != null && parentThread.IsSelected && parentThread.IsThreadExpanded;
+
+            if (isInSelectedExpandedThread)
+            {
+                // Switch selection within the thread: unselect previously selected children, select the clicked one.
+                if (parentThread?.ThreadEmails != null)
+                {
+                    foreach (var child in parentThread.ThreadEmails)
+                    {
+                        child.IsSelected = child == clickedMail && !wasSelected; // If clicking an already selected child -> toggle off (none selected in thread except header)
+                    }
+                }
+
+                SyncThreadSelectionFromChildren(parentThread);
+                return; // Done.
+            }
+
+            // Normal single-item (non-thread or entering a thread via child) behavior.
+            await ViewModel.MailCollection.UnselectAllAsync();
+
+            // If parent thread is already expanded, keep it as-is to avoid collapse/expand animation.
+            if (parentThread != null && parentThread.IsThreadExpanded)
+            {
+                CollapseAllThreadsExcept(parentThread);
+            }
+            else
+            {
+                CollapseAllThreadsExcept(null);
+            }
+
+            if (parentThread != null && selectExpandThread)
+            {
+                // We're clicking an item inside a thread; select & expand the thread header as well.
+                parentThread.IsSelected = true;
+                parentThread.IsThreadExpanded = true;
+            }
+
+            if (!wasSelected)
+            {
+                clickedMail.IsSelected = true; // Toggle on
+            }
+
+            SyncThreadSelectionFromChildren(parentThread);
+        }
+    }
+
+    private async void WinoListViewItemClicked(object sender, ItemClickEventArgs e)
+    {
+        if (sender is not WinoListView listView) return;
+
+        await WinoClickItemInternalAsync(e.ClickedItem);
+    }
+
+    public void OnTitleBarSearchSuggestionChosen(TitleBarSearchSuggestion suggestion)
+    {
+    }
+
+    public Task OnTitleBarSearchSubmittedAsync(string queryText, TitleBarSearchSuggestion? chosenSuggestion)
+    {
+        SearchText = queryText;
+
+        if (ViewModel.PerformSearchCommand.CanExecute(null))
+        {
+            ViewModel.PerformSearchCommand.Execute(null);
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
similarity index 79%
rename from Wino.Mail/Views/MailRenderingPage.xaml
rename to Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
index c6a8a93a..9a32f838 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml
@@ -1,25 +1,26 @@
-<abstract:MailRenderingPageAbstract
-    x:Class="Wino.Views.MailRenderingPage"
+<abstract:MailRenderingPageAbstract
+    x:Class="Wino.Views.Mail.MailRenderingPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:Wino.Controls"
-    xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:customcontrols="using:Wino.Mail.WinUI.Controls.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
     xmlns:helpers="using:Wino.Helpers"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:local="using:Wino.Behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
     x:Name="root"
-    muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
     IsDarkEditor="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}"
     mc:Ignorable="d">
 
+    <Page.KeyboardAccelerators>
+        <KeyboardAccelerator Key="Escape" Invoked="EscapeInvoked" />
+    </Page.KeyboardAccelerators>
     <Page.Resources>
         <DataTemplate x:Key="InternetAddressTemplate" x:DataType="viewModelData:AccountContactViewModel">
             <HyperlinkButton
@@ -44,10 +45,7 @@
                                 Grid.RowSpan="2"
                                 Width="36"
                                 Height="36"
-                                FromAddress="{x:Bind Address}"
-                                FromName="{x:Bind Name}"
-                                SenderContactPicture="{x:Bind Base64ContactPicture}"
-                                ThumbnailUpdatedEvent="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}" />
+                                MailItemInformation="{x:Bind}" />
 
                             <TextBlock Grid.Column="1" Text="{x:Bind Name}" />
 
@@ -55,7 +53,7 @@
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Padding="0"
-                                Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}"
+                                Click="CopyAddress_Click"
                                 CommandParameter="{x:Bind Address}"
                                 Content="{x:Bind Address}" />
                         </Grid>
@@ -84,7 +82,7 @@
                     <Grid.ContextFlyout>
                         <MenuFlyout Placement="Right">
                             <MenuFlyoutItem
-                                Command="{Binding ElementName=root, Path=ViewModel.OpenAttachmentCommand}"
+                                Click="OpenAttachment_Click"
                                 CommandParameter="{x:Bind}"
                                 Text="{x:Bind domain:Translator.Buttons_Open}">
                                 <MenuFlyoutItem.Icon>
@@ -92,7 +90,7 @@
                                 </MenuFlyoutItem.Icon>
                             </MenuFlyoutItem>
                             <MenuFlyoutItem
-                                Command="{Binding ElementName=root, Path=ViewModel.SaveAttachmentCommand}"
+                                Click="SaveAttachment_Click"
                                 CommandParameter="{x:Bind}"
                                 Text="{x:Bind domain:Translator.Buttons_Save}">
                                 <MenuFlyoutItem.Icon>
@@ -138,7 +136,7 @@
                             Text="{x:Bind ReadableSize}" />
                     </Grid>
                 </Grid>
-                <muxc:ProgressBar
+                <ProgressBar
                     Grid.Row="1"
                     Margin="0,-5,0,0"
                     HorizontalAlignment="Stretch"
@@ -152,7 +150,10 @@
     </Page.Resources>
 
     <!--  Attachments and WebView2  -->
-    <Grid x:Name="RendererGridFrame" RowSpacing="7">
+    <Grid
+        x:Name="RendererGridFrame"
+        Margin="0,2,0,0"
+        RowSpacing="7">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -167,7 +168,11 @@
             Background="{ThemeResource WinoContentZoneBackgroud}"
             BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
-            CornerRadius="7">
+            CornerRadius="{ThemeResource OverlayCornerRadius}"
+            Translation="0,0,20">
+            <Border.Shadow>
+                <ThemeShadow />
+            </Border.Shadow>
             <Grid Margin="8">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
@@ -175,11 +180,14 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <Grid Grid.Row="0" Margin="5,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
                     <TextBlock
@@ -206,23 +214,72 @@
                             <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Unsubscribe}" />
                         </StackPanel>
                     </HyperlinkButton>
+
+
+                    <!--  S/MIME Signed Email Indicator  -->
+                    <HyperlinkButton
+                        Grid.Column="2"
+                        Margin="0,0,0,4"
+                        VerticalAlignment="Center"
+                        Command="{x:Bind ViewModel.ShowSmimeSigningCertificateInfoCommand}"
+                        ToolTipService.ToolTip="{x:Bind domain:Translator.SmimeSignedTooltip}"
+                        Visibility="{x:Bind ViewModel.IsSmimeSigned, Mode=OneWay}">
+                        <Grid
+                            Width="Auto"
+                            Height="Auto"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch">
+                            <Viewbox
+                                Width="16"
+                                Height="16"
+                                Margin="0,0,4,0">
+                                <PathIcon Data="M15 18c.835.629 1.875 1.001 3 1.001a4.978 4.978 0 0 0 3-.999v3.246a.75.75 0 0 1-1.09.67l-.09-.055L18 20.591l-1.82 1.272a.75.75 0 0 1-1.172-.51l-.007-.105L15 18.001Zm4.25-14.996a2.75 2.75 0 0 1 2.745 2.582l.005.168.001 5.246a5.027 5.027 0 0 0-1.5-1.331L20.5 5.754a1.25 1.25 0 0 0-1.122-1.244l-.128-.006H4.75a1.25 1.25 0 0 0-1.244 1.122l-.006.128v9.5c0 .647.492 1.18 1.122 1.243l.128.007h8.92c.1.172.21.338.33.496v1.004H4.75a2.75 2.75 0 0 1-2.745-2.583L2 15.254v-9.5a2.75 2.75 0 0 1 2.582-2.745l.168-.005h14.5ZM18 10A4 4 0 1 1 18 18 4 4 0 0 1 18 10Zm-6.75 2.5a.75.75 0 0 1 .102 1.493L11.25 14h-4.5a.75.75 0 0 1-.102-1.493l.102-.007h4.5Zm6-5.5a.75.75 0 0 1 .102 1.493l-.102.007H6.75a.75.75 0 0 1-.102-1.493L6.75 7h10.5Z" />
+                            </Viewbox>
+                            <muxc:InfoBadge
+                                Width="8"
+                                Height="8"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Style="{ThemeResource CautionIconInfoBadgeStyle}"
+                                Visibility="{x:Bind ViewModel.SmimeSignaturesInvalid, Mode=OneWay}" />
+                            <muxc:InfoBadge
+                                Width="8"
+                                Height="8"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Style="{ThemeResource SuccessIconInfoBadgeStyle}"
+                                Visibility="{x:Bind ViewModel.SmimeSignaturesValid, Mode=OneWay}" />
+                        </Grid>
+                    </HyperlinkButton>
+
+                    <!--  S/MIME Encrypted Email Indicator  -->
+                    <Viewbox
+                        Grid.Column="3"
+                        Width="16"
+                        Height="16"
+                        Margin="0,0,0,4"
+                        VerticalAlignment="Center"
+                        ToolTipService.ToolTip="{x:Bind domain:Translator.SmimeEncryptedTooltip}"
+                        Visibility="{x:Bind ViewModel.IsSmimeEncrypted, Mode=OneWay}">
+                        <PathIcon Data="M12 2a4 4 0 0 1 4 4v2h1.75A2.25 2.25 0 0 1 20 10.25v9.5A2.25 2.25 0 0 1 17.75 22H6.25A2.25 2.25 0 0 1 4 19.75v-9.5A2.25 2.25 0 0 1 6.25 8H8V6a4 4 0 0 1 4-4Zm5.75 7.5H6.25a.75.75 0 0 0-.75.75v9.5c0 .414.336.75.75.75h11.5a.75.75 0 0 0 .75-.75v-9.5a.75.75 0 0 0-.75-.75Zm-5.75 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3Zm0-10A2.5 2.5 0 0 0 9.5 6v2h5V6A2.5 2.5 0 0 0 12 3.5Z" />
+                    </Viewbox>
                 </Grid>
-                <CommandBar
-                    x:Name="RendererBar"
+                <coreControls:OperationCommandBar
+                    x:Name="RendererCommandBar"
                     Grid.Row="1"
                     HorizontalContentAlignment="Stretch"
                     DefaultLabelPosition="Right"
-                    DynamicOverflowItemsChanging="BarDynamicOverflowChanging"
-                    IsDynamicOverflowEnabled="True"
-                    OverflowButtonVisibility="Auto">
-                    <interactivity:Interaction.Behaviors>
-                        <local:BindableCommandBarBehavior ItemClickedCommand="{x:Bind ViewModel.OperationClickedCommand}" PrimaryCommands="{x:Bind ViewModel.MenuItems, Mode=OneWay}" />
-                    </interactivity:Interaction.Behaviors>
-                    <CommandBar.Content>
+                    IsAIActionsPaneToggleVisible="True"
+                    IsEditorThemeDark="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}"
+                    IsEditorThemeToggleVisible="True"
+                    ItemInvokedCommand="{x:Bind ViewModel.OperationClickedCommand}"
+                    MenuItems="{x:Bind ViewModel.MenuItems, Mode=OneWay}">
+                    <coreControls:OperationCommandBar.Content>
                         <Grid Padding="0,5">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
@@ -234,9 +291,7 @@
                                 Width="36"
                                 Height="36"
                                 FontSize="16"
-                                FromAddress="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
-                                FromName="{x:Bind ViewModel.FromName, Mode=OneWay}"
-                                SenderContactPicture="{x:Bind ViewModel.ContactPicture, Mode=OneWay}" />
+                                MailItemInformation="{x:Bind ViewModel.CurrentMailItemDisplayInformation, Mode=OneWay}" />
 
                             <Grid
                                 Grid.Column="1"
@@ -263,8 +318,8 @@
                                 </StackPanel>
                             </Grid>
                         </Grid>
-                    </CommandBar.Content>
-                </CommandBar>
+                    </coreControls:OperationCommandBar.Content>
+                </coreControls:OperationCommandBar>
 
                 <ScrollViewer
                     Grid.Row="2"
@@ -354,8 +409,16 @@
                     </Grid>
                 </ScrollViewer>
 
+                <coreControls:AiActionsPanel
+                    x:Name="ReaderAiActionsPanel"
+                    Grid.Row="3"
+                    Margin="0,8,0,0"
+                    AvailableActions="Translate, Summarize"
+                    HtmlHost="{x:Bind}"
+                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(RendererCommandBar.IsAIActionsEnabled), Mode=OneWay}" />
+
                 <!--  Attachments  -->
-                <Grid Grid.Row="3">
+                <Grid Grid.Row="4">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
@@ -385,25 +448,25 @@
                         Visibility="{x:Bind helpers:XamlHelpers.CountToVisibilityConverterWithThreshold(ViewModel.Attachments.Count, 1), Mode=OneWay}" />
                 </Grid>
 
-                <muxc:InfoBar
+                <InfoBar
                     x:Name="ImageLoadingDisabledMessage"
-                    Grid.Row="4"
+                    Grid.Row="5"
                     HorizontalContentAlignment="Stretch"
                     x:Load="{x:Bind ViewModel.IsImageRenderingDisabled, Mode=OneWay}"
                     IsOpen="True"
                     Message="{x:Bind domain:Translator.ImageRenderingDisabled}"
                     Severity="Warning">
-                    <muxc:InfoBar.ActionButton>
+                    <InfoBar.ActionButton>
                         <Button
                             HorizontalAlignment="Right"
                             Command="{x:Bind ViewModel.ForceImageLoadingCommand}"
                             Content="{x:Bind domain:Translator.Buttons_EnableImageRendering}" />
-                    </muxc:InfoBar.ActionButton>
-                </muxc:InfoBar>
+                    </InfoBar.ActionButton>
+                </InfoBar>
 
-                <muxc:ProgressBar
+                <ProgressBar
                     x:Name="DownloadingProgressBar"
-                    Grid.Row="3"
+                    Grid.Row="4"
                     Margin="12,1"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Top"
@@ -418,16 +481,18 @@
             Background="{ThemeResource WinoContentZoneBackgroud}"
             BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
             BorderThickness="1"
-            CornerRadius="7">
-            <Grid Margin="1" CornerRadius="7">
+            CornerRadius="{ThemeResource OverlayCornerRadius}">
+            <Grid Margin="1" CornerRadius="{ThemeResource OverlayCornerRadius}">
+
                 <Grid Background="White" Visibility="{x:Bind IsDarkEditor, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}" />
 
-                <muxc:WebView2
-                    x:Name="Chromium"
-                    FontFamily="Segoe UI"
-                    NavigationStarting="WebViewNavigationStarting" />
+                <WebView2 x:Name="Chromium" NavigationStarting="WebViewNavigationStarting">
+                    <WebView2.KeyboardAccelerators>
+                        <KeyboardAccelerator Key="Escape" Invoked="EscapeInvoked" />
+                    </WebView2.KeyboardAccelerators>
+                </WebView2>
 
-                <muxc:ProgressRing
+                <ProgressRing
                     Width="50"
                     Height="50"
                     HorizontalAlignment="Center"
diff --git a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
new file mode 100644
index 00000000..d6f8277d
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml.cs
@@ -0,0 +1,460 @@
+using System;
+using System.IO;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.Web.WebView2.Core;
+using Windows.System;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Printing;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI;
+using Wino.Mail.WinUI.Controls;
+using Wino.Mail.WinUI.Extensions;
+using Wino.Messaging.Client.Mails;
+using Wino.Messaging.Client.Shell;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Mail;
+
+public sealed partial class MailRenderingPage : MailRenderingPageAbstract,
+    IAiHtmlActionHost,
+    IRecipient<HtmlRenderingRequested>,
+    IRecipient<CancelRenderingContentRequested>,
+    IRecipient<ApplicationThemeChanged>
+{
+    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>()!;
+    private readonly IMailDialogService _dialogService = App.Current.Services.GetService<IMailDialogService>()!;
+    private readonly IMimeFileService _mimeFileService = App.Current.Services.GetRequiredService<IMimeFileService>();
+
+    private bool isRenderingInProgress = false;
+    private bool? _lastAppliedDarkTheme;
+    private TaskCompletionSource<bool> DOMLoadedTask = new TaskCompletionSource<bool>();
+    private string _currentRenderedHtml = string.Empty;
+
+    public WebView2 GetWebView() => Chromium;
+
+    public MailRenderingPage()
+    {
+        InitializeComponent();
+
+        WebViewExtensions.EnsureWebView2Environment();
+
+        ViewModel.DirectPrintFuncAsync = DirectPrintAsync;
+
+        ViewModel.SaveHTMLasPDFFunc = new Func<string, Task<bool>>((path) =>
+        {
+            return Chromium.CoreWebView2.PrintToPdfAsync(path, null).AsTask();
+        });
+
+    }
+
+    private async Task<PrintingResult> DirectPrintAsync(WebView2PrintSettingsModel settings)
+    {
+        if (Chromium.CoreWebView2 == null) return PrintingResult.Failed;
+
+        try
+        {
+            var nativeSettings = settings.ToCoreWebView2PrintSettings(Chromium.CoreWebView2.Environment);
+            var res = await Chromium.CoreWebView2.PrintAsync(nativeSettings);
+
+            return res switch
+            {
+                CoreWebView2PrintStatus.Succeeded => PrintingResult.Submitted,
+                _ => PrintingResult.Failed,
+            };
+        }
+        catch (Exception)
+        {
+            return PrintingResult.Failed;
+        }
+    }
+
+    public override async void OnEditorThemeChanged()
+    {
+        base.OnEditorThemeChanged();
+
+        await UpdateEditorThemeAsync();
+    }
+
+    private async Task RenderInternalAsync(string htmlBody)
+    {
+        isRenderingInProgress = true;
+        _currentRenderedHtml = htmlBody ?? string.Empty;
+
+        await DOMLoadedTask.Task;
+
+        await UpdateEditorThemeAsync();
+        await UpdateReaderFontPropertiesAsync();
+
+        if (string.IsNullOrEmpty(htmlBody))
+        {
+            await Chromium.ExecuteScriptFunctionAsync("RenderHTML", JsonSerializer.Serialize(" ", BasicTypesJsonContext.Default.String));
+        }
+        else
+        {
+            var shouldLinkifyText = ViewModel.CurrentRenderModel?.MailRenderingOptions?.RenderPlaintextLinks ?? true;
+            await Chromium.ExecuteScriptFunctionAsync("RenderHTML",
+                JsonSerializer.Serialize(htmlBody, BasicTypesJsonContext.Default.String),
+                JsonSerializer.Serialize(shouldLinkifyText, BasicTypesJsonContext.Default.Boolean));
+        }
+
+        isRenderingInProgress = false;
+    }
+
+    private async void WindowRequested(CoreWebView2 sender, CoreWebView2NewWindowRequestedEventArgs args)
+    {
+        args.Handled = true;
+
+        try
+        {
+            await Launcher.LaunchUriAsync(new Uri(args.Uri));
+        }
+        catch (Exception) { }
+    }
+
+    private void DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => DOMLoadedTask.TrySetResult(true);
+
+    async void IRecipient<HtmlRenderingRequested>.Receive(HtmlRenderingRequested message)
+    {
+        // Ensure WebView2 is fully initialized before first render.
+        // OnNavigatedTo starts initialization fire-and-forget; this await
+        // guarantees the core is ready before we invoke any script.
+        await Chromium.EnsureCoreWebView2Async();
+
+        if (message == null || string.IsNullOrEmpty(message.HtmlBody))
+        {
+            await RenderInternalAsync(string.Empty);
+            return;
+        }
+
+        await RenderInternalAsync(message.HtmlBody);
+    }
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        base.OnNavigatedFrom(e);
+
+        // Disposing the page.
+        // Make sure the WebView2 is disposed properly.
+
+        ViewModel.SaveHTMLasPDFFunc = null;
+        ViewModel.DirectPrintFuncAsync = null;
+        _currentRenderedHtml = string.Empty;
+        RendererCommandBar.AIActionsEnabledChanged -= RendererCommandBar_AIActionsEnabledChanged;
+        RendererCommandBar.IsAIActionsEnabled = false;
+        ReaderAiActionsPanel.CancelPendingOperation();
+
+        DisposeWebView2();
+    }
+
+    public Task<string?> GetCurrentHtmlAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return Task.FromResult<string?>(_currentRenderedHtml);
+    }
+
+    public async Task ApplyHtmlResultAsync(string html, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        await RenderInternalAsync(html);
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    private async void RendererCommandBar_AIActionsEnabledChanged(object? sender, bool isEnabled)
+    {
+        if (isEnabled)
+        {
+            await ReaderAiActionsPanel.RefreshAvailabilityAsync();
+        }
+    }
+
+    public async Task<string?> TryGetCachedTranslationHtmlAsync(string languageCode, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (!ViewModel.CurrentMailAccountId.HasValue || !ViewModel.CurrentMailFileId.HasValue || string.IsNullOrWhiteSpace(languageCode))
+        {
+            return null;
+        }
+
+        return await _mimeFileService.GetTranslatedHtmlAsync(
+            ViewModel.CurrentMailAccountId.Value,
+            ViewModel.CurrentMailFileId.Value,
+            languageCode,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task SaveCachedTranslationHtmlAsync(string languageCode, string html, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (!ViewModel.CurrentMailAccountId.HasValue || !ViewModel.CurrentMailFileId.HasValue || string.IsNullOrWhiteSpace(languageCode))
+        {
+            return;
+        }
+
+        await _mimeFileService.SaveTranslatedHtmlAsync(
+            ViewModel.CurrentMailAccountId.Value,
+            ViewModel.CurrentMailFileId.Value,
+            languageCode,
+            html,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task<string?> TryGetCachedSummaryTextAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (!ViewModel.CurrentMailAccountId.HasValue || !ViewModel.CurrentMailFileId.HasValue)
+        {
+            return null;
+        }
+
+        return await _mimeFileService.GetSummaryTextAsync(
+            ViewModel.CurrentMailAccountId.Value,
+            ViewModel.CurrentMailFileId.Value,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task SaveCachedSummaryTextAsync(string summary, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (!ViewModel.CurrentMailAccountId.HasValue || !ViewModel.CurrentMailFileId.HasValue)
+        {
+            return;
+        }
+
+        await _mimeFileService.SaveSummaryTextAsync(
+            ViewModel.CurrentMailAccountId.Value,
+            ViewModel.CurrentMailFileId.Value,
+            summary,
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    public string GetSuggestedSummaryFileName()
+    {
+        var subject = string.IsNullOrWhiteSpace(ViewModel.Subject) ? "email-summary" : ViewModel.Subject;
+        return $"{SanitizeFileNamePart(subject)}.txt";
+    }
+
+    private void DisposeWebView2()
+    {
+        if (Chromium == null) return;
+
+        Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
+        Chromium.NavigationStarting -= WebViewNavigationStarting;
+
+        if (Chromium.CoreWebView2 != null)
+        {
+            Chromium.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
+            Chromium.CoreWebView2.NewWindowRequested -= WindowRequested;
+        }
+
+        Chromium.Close();
+        GC.Collect();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        // Initialize WebView2 wiring before base navigation invokes ViewModel rendering.
+        // Base.OnNavigatedTo triggers VM.OnNavigatedTo, which can send HtmlRenderingRequested.
+        DOMLoadedTask = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        RendererCommandBar.AIActionsEnabledChanged -= RendererCommandBar_AIActionsEnabledChanged;
+        RendererCommandBar.AIActionsEnabledChanged += RendererCommandBar_AIActionsEnabledChanged;
+        RendererCommandBar.IsAIActionsEnabled = false;
+        Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
+        Chromium.CoreWebView2Initialized += CoreWebViewInitialized;
+        _ = Chromium.EnsureCoreWebView2Async();
+
+        base.OnNavigatedTo(e);
+
+        var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
+        anim?.TryStart(Chromium);
+
+        // We don't have shell initialized here. It's only standalone EML viewing.
+        // Shift command bar from top to adjust the design.
+
+        if (ViewModel.StatePersistenceService.ShouldShiftMailRenderingDesign)
+            RendererGridFrame.Margin = new Thickness(0, 24, 0, 0);
+        else
+            RendererGridFrame.Margin = new Thickness(0, 0, 0, 0);
+    }
+
+    private async void CoreWebViewInitialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
+    {
+        if (Chromium.CoreWebView2 == null) return;
+
+        var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
+
+        Chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("wino.mail", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
+
+        Chromium.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
+        Chromium.CoreWebView2.DOMContentLoaded += DOMContentLoaded;
+
+        Chromium.CoreWebView2.NewWindowRequested -= WindowRequested;
+        Chromium.CoreWebView2.NewWindowRequested += WindowRequested;
+
+        Chromium.Source = new Uri("https://wino.mail/reader.html");
+    }
+
+
+    async void IRecipient<CancelRenderingContentRequested>.Receive(CancelRenderingContentRequested message)
+    {
+        await Chromium.EnsureCoreWebView2Async();
+
+        if (!isRenderingInProgress)
+        {
+            await RenderInternalAsync(string.Empty);
+        }
+    }
+
+    private async void WebViewNavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
+    {
+        // This is our reader.
+        if (args.Uri == "https://wino.mail/reader.html")
+            return;
+
+        // Cancel all external navigations since it's navigating to different address inside the WebView2.
+        args.Cancel = !args.Uri.StartsWith("data:text/html");
+
+        // TODO: Check external link navigation setting is enabled.
+        // Open all external urls in launcher.
+
+        if (args.Cancel && Uri.TryCreate(args.Uri, UriKind.Absolute, out Uri? newUri) && newUri != null)
+        {
+            await Launcher.LaunchUriAsync(newUri);
+        }
+    }
+
+    private void AttachmentClicked(object sender, ItemClickEventArgs e)
+    {
+        if (e.ClickedItem is MailAttachmentViewModel attachmentViewModel)
+        {
+            ViewModel?.OpenAttachmentCommand.Execute(attachmentViewModel);
+        }
+    }
+
+    private async Task UpdateEditorThemeAsync()
+    {
+        await DOMLoadedTask.Task;
+
+        var isDark = ViewModel.IsDarkWebviewRenderer;
+
+        if (_lastAppliedDarkTheme == isDark) return;
+
+        _lastAppliedDarkTheme = isDark;
+
+        if (isDark)
+        {
+            Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
+
+            await Chromium.ExecuteScriptSafeAsync("SetDarkEditor();");
+        }
+        else
+        {
+            Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
+
+            await Chromium.ExecuteScriptSafeAsync("SetLightEditor();");
+        }
+    }
+
+    private async Task UpdateReaderFontPropertiesAsync()
+    {
+        await Chromium.ExecuteScriptFunctionAsync("ChangeFontSize", JsonSerializer.Serialize(_preferencesService.ReaderFontSize, BasicTypesJsonContext.Default.Int32));
+
+        // Prepare font family name with fallback to sans-serif by default.
+        var fontName = _preferencesService.ReaderFont;
+
+        // If font family name is not supported by the browser, fallback to sans-serif.
+        fontName += ", sans-serif";
+
+        await Chromium.ExecuteScriptFunctionAsync("ChangeFontFamily", JsonSerializer.Serialize(fontName, BasicTypesJsonContext.Default.String));
+    }
+
+    void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
+    {
+        ViewModel.IsDarkWebviewRenderer = message.IsUnderlyingThemeDark;
+    }
+
+    private void InternetAddressClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is HyperlinkButton hyperlinkButton)
+        {
+            hyperlinkButton.ContextFlyout.ShowAt(hyperlinkButton);
+        }
+    }
+
+    private void CopyAddress_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is HyperlinkButton button && button.CommandParameter is string address)
+        {
+            ViewModel.CopyClipboardCommand.Execute(address);
+        }
+    }
+
+    private void OpenAttachment_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is MailAttachmentViewModel attachment)
+        {
+            ViewModel.OpenAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    private void SaveAttachment_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is MenuFlyoutItem item && item.CommandParameter is MailAttachmentViewModel attachment)
+        {
+            ViewModel.SaveAttachmentCommand.Execute(attachment);
+        }
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        WeakReferenceMessenger.Default.Register<HtmlRenderingRequested>(this);
+        WeakReferenceMessenger.Default.Register<CancelRenderingContentRequested>(this);
+        WeakReferenceMessenger.Default.Register<ApplicationThemeChanged>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        WeakReferenceMessenger.Default.Unregister<HtmlRenderingRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<CancelRenderingContentRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<ApplicationThemeChanged>(this);
+    }
+
+    private void EscapeInvoked(Microsoft.UI.Xaml.Input.KeyboardAccelerator sender, Microsoft.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args)
+    {
+        WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested());
+    }
+
+    private static string SanitizeFileNamePart(string value)
+    {
+        var invalidCharacters = Path.GetInvalidFileNameChars();
+        var sanitizedChars = value.Trim().ToCharArray();
+
+        for (var i = 0; i < sanitizedChars.Length; i++)
+        {
+            if (Array.IndexOf(invalidCharacters, sanitizedChars[i]) >= 0)
+            {
+                sanitizedChars[i] = '_';
+            }
+        }
+
+        var sanitized = new string(sanitizedChars).Trim();
+        return string.IsNullOrWhiteSpace(sanitized) ? "email-summary" : sanitized;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml b/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml
new file mode 100644
index 00000000..340f71f5
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml
@@ -0,0 +1,17 @@
+<abstract:ManageAccountsPageAbstract
+    x:Class="Wino.Views.ManageAccountsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Style="{StaticResource PageStyle}"
+    mc:Ignorable="d">
+
+    <Border Style="{StaticResource PageRootBorderStyle}">
+        <Grid
+            MaxWidth="900"
+            Padding="20"
+            HorizontalAlignment="Stretch" />
+    </Border>
+</abstract:ManageAccountsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml.cs b/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml.cs
new file mode 100644
index 00000000..f1545fc8
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/ManageAccountsPage.xaml.cs
@@ -0,0 +1,12 @@
+using Wino.Core.Domain;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class ManageAccountsPage : ManageAccountsPageAbstract
+{
+    public ManageAccountsPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml b/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml
new file mode 100644
index 00000000..dbf939e1
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml
@@ -0,0 +1,124 @@
+<abstract:ProviderSelectionPageAbstract
+    x:Class="Wino.Views.ProviderSelectionPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
+    xmlns:coreViewModelData="using:Wino.Core.ViewModels.Data"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        VerticalScrollBarVisibility="Auto">
+        <StackPanel
+            MaxWidth="480"
+            Margin="0,24,0,24"
+            HorizontalAlignment="Stretch"
+            Spacing="20">
+
+            <!--  Title  -->
+            <StackPanel Spacing="4">
+                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind domain:Translator.ProviderSelection_Title}" />
+                <TextBlock
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.ProviderSelection_Subtitle}" />
+            </StackPanel>
+
+            <!--  Account Name + Color Picker  -->
+            <Grid ColumnSpacing="12">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <TextBox
+                    Header="{x:Bind domain:Translator.ProviderSelection_AccountNameHeader}"
+                    PlaceholderText="{x:Bind domain:Translator.ProviderSelection_AccountNamePlaceholder}"
+                    Text="{x:Bind ViewModel.AccountName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                <Button Grid.Column="1" VerticalAlignment="Bottom">
+                    <Grid>
+                        <!--  No color selected placeholder  -->
+                        <FontIcon
+                            FontSize="16"
+                            Glyph="&#xE771;"
+                            Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsColorSelected), Mode=OneWay}" />
+                        <!--  Color swatch  -->
+                        <Ellipse
+                            Width="16"
+                            Height="16"
+                            Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(ViewModel.SelectedColor.Hex), Mode=OneWay}"
+                            Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(ViewModel.IsColorSelected), Mode=OneWay}" />
+                    </Grid>
+                    <Button.Flyout>
+                        <Flyout Placement="TopEdgeAlignedLeft">
+                            <StackPanel Spacing="8">
+                                <GridView
+                                    Width="150"
+                                    ItemTemplate="{StaticResource AccountColorTemplate}"
+                                    ItemsSource="{x:Bind ViewModel.AvailableColors, Mode=OneWay}"
+                                    SelectedItem="{x:Bind ViewModel.SelectedColor, Mode=TwoWay}" />
+                                <HyperlinkButton
+                                    HorizontalAlignment="Center"
+                                    Command="{x:Bind ViewModel.ClearColorCommand}"
+                                    Content="{x:Bind domain:Translator.ProviderSelection_ClearColor}"
+                                    Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(ViewModel.IsColorSelected), Mode=OneWay}" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </Grid>
+
+            <!--  Provider List  -->
+            <ItemsView
+                HorizontalContentAlignment="Stretch"
+                ItemsSource="{x:Bind ViewModel.Providers, Mode=OneWay}"
+                SelectionChanged="ProviderSelectionChanged"
+                SelectionMode="Single">
+
+                <ItemsView.ItemTemplate>
+                    <DataTemplate x:DataType="interfaces:IProviderDetail">
+                        <ItemContainer Padding="12,10" HorizontalAlignment="Stretch">
+                            <Grid Padding="16" ColumnSpacing="12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Image
+                                    Width="32"
+                                    Height="32"
+                                    Source="{x:Bind ProviderImage}" />
+                                <StackPanel
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Spacing="2">
+                                    <TextBlock FontWeight="SemiBold" Text="{x:Bind Name}" />
+                                    <TextBlock
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{x:Bind Description}" />
+                                </StackPanel>
+                            </Grid>
+                        </ItemContainer>
+                    </DataTemplate>
+                </ItemsView.ItemTemplate>
+            </ItemsView>
+
+            <!--  Continue Button  -->
+            <Button
+                HorizontalAlignment="Stretch"
+                Command="{x:Bind ViewModel.ProceedCommand}"
+                Content="{x:Bind domain:Translator.ProviderSelection_ContinueButton}"
+                IsEnabled="{x:Bind ViewModel.CanProceed, Mode=OneWay}"
+                Style="{StaticResource AccentButtonStyle}" />
+
+        </StackPanel>
+    </ScrollViewer>
+</abstract:ProviderSelectionPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml.cs b/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml.cs
new file mode 100644
index 00000000..4749969c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/ProviderSelectionPage.xaml.cs
@@ -0,0 +1,17 @@
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class ProviderSelectionPage : ProviderSelectionPageAbstract
+{
+    public ProviderSelectionPage()
+    {
+        InitializeComponent();
+    }
+
+    private void ProviderSelectionChanged(ItemsView sender, ItemsViewSelectionChangedEventArgs args)
+    {
+        ViewModel.SelectedProvider = sender.SelectedItem as Wino.Core.Domain.Interfaces.IProviderDetail;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml
new file mode 100644
index 00000000..849d2fca
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml
@@ -0,0 +1,237 @@
+<abstract:SettingOptionsPageAbstract
+    x:Class="Wino.Views.Settings.SettingOptionsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mailViewModelData="using:Wino.Mail.ViewModels.Data"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:personalization="using:Wino.Core.Domain.Models.Personalization"
+    xmlns:selectors="using:Wino.Selectors"
+    xmlns:settingsModels="using:Wino.Core.Domain.Models.Settings"
+    xmlns:translations="using:Wino.Core.Domain.Models.Translations"
+    xmlns:viewModelData="using:Wino.Core.ViewModels.Data"
+    x:Name="root"
+    Title="{x:Bind domain:Translator.SettingsHome_Title}"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Key="RootAccountTemplate" x:DataType="mailViewModelData:AccountProviderDetailViewModel">
+            <controls:SettingsCard
+                Margin="0,2,0,0"
+                Click="AccountSettingClicked"
+                CommandParameter="{x:Bind}"
+                Description="{x:Bind Account.Address}"
+                Header="{x:Bind Account.Name}"
+                IsClickEnabled="True">
+                <controls:SettingsCard.HeaderIcon>
+                    <coreControls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Account)}" />
+                </controls:SettingsCard.HeaderIcon>
+            </controls:SettingsCard>
+        </DataTemplate>
+
+        <DataTemplate x:Key="MergedAccountTemplate" x:DataType="viewModelData:MergedAccountProviderDetailViewModel">
+            <controls:SettingsExpander Description="{x:Bind AccountAddresses}" Header="{x:Bind MergedInbox.Name}">
+                <controls:SettingsExpander.HeaderIcon>
+                    <PathIcon Data="F1 M 2.5 4.296875 C 2.5 3.710938 2.618815 3.157553 2.856445 2.636719 C 3.094075 2.115887 3.413086 1.660156 3.813477 1.269531 C 4.213867 0.878906 4.677734 0.569662 5.205078 0.341797 C 5.732422 0.113934 6.289062 0 6.875 0 C 7.473958 0 8.038736 0.115561 8.569336 0.34668 C 9.099935 0.577801 9.563802 0.891928 9.960938 1.289062 C 10.358072 1.686199 10.6722 2.150066 10.90332 2.680664 C 11.134439 3.211264 11.25 3.776043 11.25 4.375 C 11.25 4.973959 11.134439 5.538737 10.90332 6.069336 C 10.6722 6.599936 10.358072 7.063803 9.960938 7.460938 C 9.563802 7.858073 9.099935 8.172201 8.569336 8.40332 C 8.038736 8.63444 7.473958 8.75 6.875 8.75 C 6.25651 8.75 5.680338 8.632812 5.146484 8.398438 C 4.61263 8.164062 4.150391 7.845053 3.759766 7.441406 C 3.369141 7.037761 3.061523 6.565756 2.836914 6.025391 C 2.612305 5.485026 2.5 4.908854 2.5 4.296875 Z M 10 4.306641 C 10 3.883465 9.915364 3.486328 9.746094 3.115234 C 9.576822 2.744141 9.348958 2.420248 9.0625 2.143555 C 8.776041 1.866863 8.44401 1.648764 8.066406 1.489258 C 7.688802 1.329754 7.291666 1.25 6.875 1.25 C 6.438802 1.25 6.031901 1.331381 5.654297 1.494141 C 5.276692 1.656902 4.946289 1.879883 4.663086 2.163086 C 4.379883 2.446289 4.156901 2.776693 3.994141 3.154297 C 3.83138 3.531902 3.75 3.938803 3.75 4.375 C 3.75 4.811199 3.83138 5.2181 3.994141 5.595703 C 4.156901 5.973308 4.379883 6.303711 4.663086 6.586914 C 4.946289 6.870117 5.276692 7.0931 5.654297 7.255859 C 6.031901 7.41862 6.438802 7.5 6.875 7.5 C 7.324219 7.5 7.739258 7.416992 8.120117 7.250977 C 8.500977 7.084961 8.83138 6.857097 9.111328 6.567383 C 9.391275 6.27767 9.609375 5.939128 9.765625 5.551758 C 9.921875 5.164389 10 4.74935 10 4.306641 Z M 12.5 5.556641 C 12.5 5.133464 12.584635 4.736328 12.753906 4.365234 C 12.923176 3.994141 13.151041 3.670248 13.4375 3.393555 C 13.723958 3.116863 14.055989 2.898764 14.433594 2.739258 C 14.811197 2.579754 15.208332 2.5 15.625 2.5 C 16.061197 2.5 16.468098 2.581381 16.845703 2.744141 C 17.223307 2.906902 17.553711 3.129883 17.836914 3.413086 C 18.120117 3.696289 18.343098 4.026693 18.505859 4.404297 C 18.668619 4.781902 18.75 5.188803 18.75 5.625 C 18.75 6.061198 18.668619 6.4681 18.505859 6.845703 C 18.343098 7.223308 18.120117 7.553711 17.836914 7.836914 C 17.553711 8.120117 17.223307 8.3431 16.845703 8.505859 C 16.468098 8.66862 16.061197 8.75 15.625 8.75 C 15.175781 8.75 14.760742 8.666992 14.379883 8.500977 C 13.999023 8.334961 13.668619 8.107097 13.388672 7.817383 C 13.108724 7.52767 12.890625 7.189128 12.734375 6.801758 C 12.578125 6.414389 12.5 5.99935 12.5 5.556641 Z M 17.5 5.625 C 17.5 5.371094 17.451172 5.130209 17.353516 4.902344 C 17.255859 4.67448 17.120768 4.474285 16.948242 4.301758 C 16.775715 4.129232 16.57552 3.994141 16.347656 3.896484 C 16.119791 3.798828 15.878906 3.75 15.625 3.75 C 15.371094 3.75 15.130208 3.798828 14.902344 3.896484 C 14.674479 3.994141 14.474283 4.129232 14.301758 4.301758 C 14.129231 4.474285 13.994141 4.67448 13.896484 4.902344 C 13.798828 5.130209 13.75 5.371094 13.75 5.625 C 13.75 5.878906 13.798828 6.119792 13.896484 6.347656 C 13.994141 6.575521 14.129231 6.775717 14.301758 6.948242 C 14.474283 7.120769 14.674479 7.255859 14.902344 7.353516 C 15.130208 7.451172 15.371094 7.5 15.625 7.5 C 15.878906 7.5 16.119791 7.451172 16.347656 7.353516 C 16.57552 7.255859 16.775715 7.120769 16.948242 6.948242 C 17.120768 6.775717 17.255859 6.575521 17.353516 6.347656 C 17.451172 6.119792 17.5 5.878906 17.5 5.625 Z M 0 12.460938 C 0 12.18099 0.047201 11.894531 0.141602 11.601562 C 0.236003 11.308594 0.371094 11.043295 0.546875 10.805664 C 0.722656 10.568034 0.935872 10.37435 1.186523 10.224609 C 1.437174 10.07487 1.71875 10 2.03125 10 L 11.71875 10 C 12.031249 10 12.312824 10.07487 12.563477 10.224609 C 12.814127 10.37435 13.027344 10.568034 13.203125 10.805664 C 13.378906 11.043295 13.513997 11.308594 13.608398 11.601562 C 13.702799 11.894531 13.75 12.18099 13.75 12.460938 C 13.75 13.027344 13.691406 13.572592 13.574219 14.09668 C 13.457031 14.620769 13.276367 15.113933 13.032227 15.576172 C 12.788086 16.038412 12.482096 16.463217 12.114258 16.850586 C 11.746419 17.237955 11.311849 17.574869 10.810547 17.861328 C 10.517578 18.0306 10.209961 18.172201 9.887695 18.286133 C 9.56543 18.400064 9.238281 18.491211 8.90625 18.55957 C 8.574219 18.62793 8.237305 18.676758 7.895508 18.706055 C 7.55371 18.735352 7.213541 18.75 6.875 18.75 C 6.191406 18.75 5.514323 18.68815 4.84375 18.564453 C 4.173177 18.440756 3.538411 18.206381 2.939453 17.861328 C 2.431641 17.568359 1.993815 17.229818 1.625977 16.845703 C 1.258138 16.461588 0.953776 16.040039 0.712891 15.581055 C 0.472005 15.12207 0.292969 14.630534 0.175781 14.106445 C 0.058594 13.582357 0 13.033854 0 12.460938 Z M 13.642578 17.5 C 13.961588 17.115887 14.235025 16.689453 14.462891 16.220703 C 15.068359 16.175131 15.633138 16.062826 16.157227 15.883789 C 16.681314 15.704753 17.135416 15.450847 17.519531 15.12207 C 17.903645 14.793295 18.204752 14.386394 18.422852 13.901367 C 18.640949 13.416342 18.75 12.845053 18.75 12.1875 C 18.75 12.089844 18.735352 11.987305 18.706055 11.879883 C 18.676758 11.772461 18.634439 11.67155 18.579102 11.577148 C 18.523762 11.482748 18.453775 11.404623 18.369141 11.342773 C 18.284504 11.280925 18.186848 11.25 18.076172 11.25 L 15.136719 11.25 C 15.065104 11.028646 14.980468 10.812175 14.882812 10.600586 C 14.785155 10.388998 14.671223 10.188803 14.541016 10 L 18.076172 10 C 18.362629 10 18.624674 10.063477 18.862305 10.19043 C 19.099934 10.317383 19.303385 10.483398 19.472656 10.688477 C 19.641926 10.893555 19.772135 11.12793 19.863281 11.391602 C 19.954426 11.655273 20 11.920573 20 12.1875 C 20 13.190104 19.775391 14.078776 19.326172 14.853516 C 18.876953 15.628256 18.209635 16.256512 17.324219 16.738281 C 16.764322 17.044271 16.168619 17.247721 15.537109 17.348633 C 14.905598 17.449545 14.274088 17.5 13.642578 17.5 Z M 12.5 12.5 C 12.5 12.389323 12.483724 12.260742 12.451172 12.114258 C 12.418619 11.967773 12.368164 11.831055 12.299805 11.704102 C 12.231445 11.577148 12.145182 11.469727 12.041016 11.381836 C 11.936849 11.293945 11.816406 11.25 11.679688 11.25 L 2.070312 11.25 C 1.933594 11.25 1.813151 11.293945 1.708984 11.381836 C 1.604818 11.469727 1.518555 11.577148 1.450195 11.704102 C 1.381836 11.831055 1.33138 11.967773 1.298828 12.114258 C 1.266276 12.260742 1.25 12.389323 1.25 12.5 C 1.25 13.365886 1.391602 14.112956 1.674805 14.741211 C 1.958008 15.369467 2.35026 15.888672 2.851562 16.298828 C 3.352864 16.708984 3.94694 17.011719 4.633789 17.207031 C 5.320638 17.402344 6.067708 17.5 6.875 17.5 C 7.682291 17.5 8.429361 17.402344 9.116211 17.207031 C 9.80306 17.011719 10.397135 16.708984 10.898438 16.298828 C 11.399739 15.888672 11.791992 15.369467 12.075195 14.741211 C 12.358398 14.112956 12.5 13.365886 12.5 12.5 Z " />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard
+                        Click="MergedAccountSettingClicked"
+                        CommandParameter="{x:Bind}"
+                        Description="{x:Bind domain:Translator.SettingsEditLinkedInbox_Description}"
+                        Header="{x:Bind domain:Translator.SettingsEditLinkedInbox_Title}"
+                        IsClickEnabled="True">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 5.625 15 C 4.85026 15 4.121094 14.851889 3.4375 14.555664 C 2.753906 14.25944 2.158203 13.857422 1.650391 13.349609 C 1.142578 12.841797 0.74056 12.246094 0.444336 11.5625 C 0.148112 10.878906 0 10.14974 0 9.375 C 0 8.600261 0.148112 7.871094 0.444336 7.1875 C 0.74056 6.503906 1.142578 5.908203 1.650391 5.400391 C 2.158203 4.892578 2.753906 4.490561 3.4375 4.194336 C 4.121094 3.898113 4.85026 3.75 5.625 3.75 L 8.125 3.75 C 8.294271 3.75 8.440755 3.81185 8.564453 3.935547 C 8.68815 4.059246 8.75 4.20573 8.75 4.375 C 8.75 4.544271 8.68815 4.690756 8.564453 4.814453 C 8.440755 4.938152 8.294271 5.000001 8.125 5 L 5.625 5 C 5.019531 5.000001 4.451497 5.113934 3.920898 5.341797 C 3.390299 5.569662 2.926432 5.882162 2.529297 6.279297 C 2.132161 6.676434 1.819661 7.140301 1.591797 7.670898 C 1.363932 8.201498 1.25 8.769531 1.25 9.375 C 1.25 9.980469 1.363932 10.548503 1.591797 11.079102 C 1.819661 11.609701 2.132161 12.073568 2.529297 12.470703 C 2.926432 12.867839 3.390299 13.180339 3.920898 13.408203 C 4.451497 13.636068 5.019531 13.75 5.625 13.75 L 8.125 13.75 C 8.294271 13.75 8.440755 13.81185 8.564453 13.935547 C 8.68815 14.059245 8.75 14.205729 8.75 14.375 C 8.75 14.544271 8.68815 14.690756 8.564453 14.814453 C 8.440755 14.938151 8.294271 15 8.125 15 Z M 11.875 15 C 11.705729 15 11.559244 14.938151 11.435547 14.814453 C 11.311849 14.690756 11.25 14.544271 11.25 14.375 C 11.25 14.205729 11.311849 14.059245 11.435547 13.935547 C 11.559244 13.81185 11.705729 13.75 11.875 13.75 L 14.375 13.75 C 14.980469 13.75 15.548502 13.636068 16.079102 13.408203 C 16.609699 13.180339 17.073566 12.867839 17.470703 12.470703 C 17.867838 12.073568 18.180338 11.609701 18.408203 11.079102 C 18.636066 10.548503 18.75 9.980469 18.75 9.375 C 18.75 8.769531 18.636066 8.201498 18.408203 7.670898 C 18.180338 7.140301 17.867838 6.676434 17.470703 6.279297 C 17.073566 5.882162 16.609699 5.569662 16.079102 5.341797 C 15.548502 5.113934 14.980469 5.000001 14.375 5 L 11.875 5 C 11.705729 5.000001 11.559244 4.938152 11.435547 4.814453 C 11.311849 4.690756 11.25 4.544271 11.25 4.375 C 11.25 4.20573 11.311849 4.059246 11.435547 3.935547 C 11.559244 3.81185 11.705729 3.75 11.875 3.75 L 14.375 3.75 C 15.149739 3.75 15.878906 3.898113 16.5625 4.194336 C 17.246094 4.490561 17.841797 4.892578 18.349609 5.400391 C 18.857422 5.908203 19.259439 6.503906 19.555664 7.1875 C 19.851887 7.871094 20 8.600261 20 9.375 C 20 10.14974 19.851887 10.878906 19.555664 11.5625 C 19.259439 12.246094 18.857422 12.841797 18.349609 13.349609 C 17.841797 13.857422 17.246094 14.25944 16.5625 14.555664 C 15.878906 14.851889 15.149739 15 14.375 15 Z M 5.556641 10 C 5.38737 10 5.252278 9.934896 5.151367 9.804688 C 5.050456 9.674479 5 9.53125 5 9.375 C 5 9.21875 5.050456 9.075521 5.151367 8.945312 C 5.252278 8.815104 5.38737 8.75 5.556641 8.75 L 14.443359 8.75 C 14.61263 8.75 14.747721 8.815104 14.848633 8.945312 C 14.949543 9.075521 14.999999 9.21875 15 9.375 C 14.999999 9.53125 14.949543 9.674479 14.848633 9.804688 C 14.747721 9.934896 14.61263 10 14.443359 10 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                    </controls:SettingsCard>
+                    <controls:SettingsCard
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        ContentAlignment="Vertical">
+                        <ListView
+                            Padding="-12,0"
+                            IsItemClickEnabled="False"
+                            ItemTemplate="{StaticResource RootAccountTemplate}"
+                            ItemsSource="{x:Bind HoldingAccounts}"
+                            SelectionMode="None" />
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+        </DataTemplate>
+
+        <selectors:AccountProviderViewModelTemplateSelector
+            x:Key="AccountProviderViewModelTemplateSelector"
+            MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
+            RootAccountTemplate="{StaticResource RootAccountTemplate}" />
+    </Page.Resources>
+
+    <ScrollViewer Padding="0,0,16,0" VerticalScrollBarVisibility="Auto">
+        <StackPanel Margin="0,8,0,24" Spacing="16">
+            <StackPanel.ChildrenTransitions>
+                <TransitionCollection>
+                    <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True" />
+                </TransitionCollection>
+            </StackPanel.ChildrenTransitions>
+
+            <!--  About hero card.  -->
+            <Border
+                Padding="24,20"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="8">
+                <Grid ColumnSpacing="16" RowSpacing="16">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="12">
+                        <Image
+                            Width="56"
+                            Height="56"
+                            VerticalAlignment="Top"
+                            Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                            Stretch="Uniform" />
+                        <StackPanel VerticalAlignment="Center">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Style="{StaticResource TitleTextBlockStyle}"
+                                Text="Wino Mail" />
+                            <TextBlock
+                                VerticalAlignment="Top"
+                                Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind ViewModel.VersionText, Mode=OneWay}" />
+                        </StackPanel>
+                    </StackPanel>
+
+                    <StackPanel
+                        Grid.Column="1"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="12">
+                        <Button
+                            Command="{x:Bind ViewModel.NavigateExternalCommand}"
+                            CommandParameter="{x:Bind ViewModel.PaypalUrl, Mode=OneWay}"
+                            Style="{StaticResource DefaultButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.SettingsPaypal_Title}">
+                            <Viewbox Width="18" Height="18">
+                                <Path
+                                    Data="M385.52,51.09C363.84,26.52,324.71,16,274.63,16H129.25a20.75,20.75,0,0,0-20.54,17.48l-60.55,382a12.43,12.43,0,0,0,10.39,14.22,12.58,12.58,0,0,0,1.94.15h89.76l22.54-142.29-.7,4.46a20.67,20.67,0,0,1,20.47-17.46h42.65c83.77,0,149.36-33.86,168.54-131.8.57-2.9,1.05-5.72,1.49-8.48h0C410.94,98.06,405.19,73.41,385.52,51.09Z"
+                                    Fill="{ThemeResource TextFillColorPrimaryBrush}"
+                                    Stretch="Uniform" />
+                            </Viewbox>
+                        </Button>
+
+                        <Button
+                            Command="{x:Bind ViewModel.NavigateExternalCommand}"
+                            CommandParameter="{x:Bind ViewModel.GitHubUrl, Mode=OneWay}"
+                            Style="{StaticResource DefaultButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.SettingsAboutGithub_Title}">
+                            <Viewbox Width="18" Height="18">
+                                <Path
+                                    Data="m 12.2135 0 c -6.7538 0 -12.2135 5.5 -12.2135 12.3042 c 0 5.439 3.4983 10.043 8.3513 11.6725 c 0.6067 0.1225 0.829 -0.2647 0.829 -0.5905 c 0 -0.2853 -0.02 -1.263 -0.02 -2.2817 c -3.3975 0.7335 -4.105 -1.4668 -4.105 -1.4668 c -0.546 -1.426 -1.355 -1.7925 -1.355 -1.7925 c -1.112 -0.7538 0.081 -0.7538 0.081 -0.7538 c 1.2335 0.0815 1.8807 1.263 1.8807 1.263 c 1.0918 1.874 2.851 1.3445 3.5587 1.0185 c 0.101 -0.7945 0.4247 -1.3445 0.7685 -1.65 c -2.7097 -0.2853 -5.5607 -1.3445 -5.5607 -6.0708 c 0 -1.3445 0.485 -2.4445 1.2535 -3.3 c -0.1212 -0.3055 -0.546 -1.5687 0.1215 -3.2595 c 0 0 1.0313 -0.326 3.3565 1.263 a 11.7425 11.7425 90 0 1 3.0535 -0.4075 c 1.0313 0 2.0825 0.1428 3.0533 0.4075 c 2.3255 -1.589 3.3567 -1.263 3.3567 -1.263 c 0.6675 1.6908 0.2425 2.954 0.1212 3.2595 c 0.7888 0.8555 1.2538 1.9555 1.2538 3.3 c 0 4.7263 -2.851 5.765 -5.581 6.0708 c 0.445 0.387 0.829 1.1202 0.829 2.2815 c 0 1.65 -0.02 2.9743 -0.02 3.3815 c 0 0.326 0.2225 0.7132 0.829 0.591 c 4.853 -1.63 8.3513 -6.2338 8.3513 -11.6728 c 0.02 -6.8043 -5.4598 -12.3043 -12.1933 -12.3043 z"
+                                    Fill="{ThemeResource TextFillColorPrimaryBrush}"
+                                    Stretch="Uniform" />
+                            </Viewbox>
+                        </Button>
+
+                        <Button
+                            Command="{x:Bind ViewModel.NavigateExternalCommand}"
+                            CommandParameter="Store"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.SettingsStore_Title}">
+                            <Viewbox Width="18" Height="18">
+                                <Path
+                                    Data="F1 M 19.003906 3.251953 L 19.003906 15.947266 C 19.003906 16.357422 18.920898 16.748047 18.754883 17.119141 C 18.588867 17.490234 18.367512 17.814127 18.09082 18.09082 C 17.814127 18.367514 17.490234 18.588867 17.119141 18.754883 C 16.748047 18.920898 16.357422 19.003906 15.947266 19.003906 L 3.056641 19.003906 C 2.646484 19.003906 2.255859 18.920898 1.884766 18.754883 C 1.513672 18.588867 1.189779 18.367514 0.913086 18.09082 C 0.636393 17.814127 0.415039 17.490234 0.249023 17.119141 C 0.083008 16.748047 0 16.357422 0 15.947266 L 0 3.251953 C 0 3.076172 0.032552 2.913412 0.097656 2.763672 C 0.16276 2.613934 0.252279 2.482098 0.366211 2.368164 C 0.480143 2.254232 0.611979 2.164715 0.761719 2.099609 C 0.911458 2.034506 1.074219 2.001953 1.25 2.001953 L 4.003906 2.001953 L 4.003906 0.996094 C 4.003906 0.859375 4.029948 0.730795 4.082031 0.610352 C 4.134114 0.48991 4.205729 0.384115 4.296875 0.292969 C 4.388021 0.201824 4.493815 0.130209 4.614258 0.078125 C 4.7347 0.026043 4.863281 0 5 0 L 14.003906 0 C 14.140624 0 14.269205 0.026043 14.389648 0.078125 C 14.510091 0.130209 14.615885 0.201824 14.707031 0.292969 C 14.798177 0.384115 14.869791 0.48991 14.921875 0.610352 C 14.973957 0.730795 14.999999 0.859375 15 0.996094 L 15 2.001953 L 17.753906 2.001953 C 17.923176 2.001953 18.084309 2.034506 18.237305 2.099609 C 18.390299 2.164715 18.523762 2.254232 18.637695 2.368164 C 18.751627 2.482098 18.841145 2.615561 18.90625 2.768555 C 18.971354 2.921551 19.003906 3.082684 19.003906 3.251953 Z M 14.003906 0.996094 L 5 0.996094 L 5 2.001953 L 14.003906 2.001953 Z M 5 10 L 9.003906 10 L 9.003906 5.996094 L 5 5.996094 Z M 10 10 L 14.003906 10 L 14.003906 5.996094 L 10 5.996094 Z M 5 15 L 9.003906 15 L 9.003906 10.996094 L 5 10.996094 Z M 10 15 L 14.003906 15 L 14.003906 10.996094 L 10 10.996094 Z "
+                                    Fill="{ThemeResource TextFillColorPrimaryBrush}"
+                                    Stretch="Uniform" />
+                            </Viewbox>
+                        </Button>
+                    </StackPanel>
+                </Grid>
+            </Border>
+
+
+            <Border
+                Padding="12,0,34,20"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="8">
+                <StackPanel Spacing="4">
+                    <TextBlock
+                        Margin="20,16,0,0"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="Quick settings" />
+                    <TextBlock Margin="20,0,0,12" Text="Use navigation menu to fully customize and access all features of Wino." />
+
+                    <controls:SettingsCard
+                        Margin="16,0,0,0"
+                        Description="{x:Bind domain:Translator.SettingsLanguage_Description}"
+                        Header="{x:Bind domain:Translator.SettingsLanguage_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 4.550781 12.265625 C 3.893229 12.089844 3.28776 11.808269 2.734375 11.420898 C 2.18099 11.033529 1.700846 10.576172 1.293945 10.048828 C 0.887044 9.521484 0.569661 8.938803 0.341797 8.300781 C 0.113932 7.662762 0 7.005209 0 6.328125 C 0 5.748698 0.073242 5.188803 0.219727 4.648438 C 0.366211 4.108073 0.572917 3.603516 0.839844 3.134766 C 1.106771 2.666016 1.429036 2.239584 1.806641 1.855469 C 2.184245 1.471355 2.604167 1.140951 3.066406 0.864258 C 3.528646 0.587566 4.02832 0.37435 4.56543 0.224609 C 5.102539 0.074871 5.664062 0 6.25 0 C 7.115885 0 7.92806 0.162762 8.686523 0.488281 C 9.444986 0.813803 10.107422 1.259766 10.673828 1.826172 C 11.240234 2.392578 11.686197 3.055014 12.011719 3.813477 C 12.337239 4.57194 12.5 5.384115 12.5 6.25 L 11.25 6.25 C 11.25 6.041668 11.236979 5.833334 11.210938 5.625 C 11.184896 5.416667 11.145833 5.208334 11.09375 5 L 8.701172 5 C 8.714192 5.208334 8.725586 5.416667 8.735352 5.625 C 8.745117 5.833334 8.75 6.041668 8.75 6.25 C 8.75 6.673178 8.732096 7.086589 8.696289 7.490234 C 8.660481 7.893881 8.616536 8.304037 8.564453 8.720703 L 8.564453 8.75 L 5.205078 8.75 C 5.23763 8.938803 5.275065 9.122722 5.317383 9.301758 C 5.3597 9.480795 5.406901 9.661459 5.458984 9.84375 L 5.449219 9.853516 C 5.299479 10.257162 5.149739 10.65918 5 11.05957 C 4.85026 11.459961 4.700521 11.861979 4.550781 12.265625 Z M 5.205078 3.75 L 7.294922 3.75 C 7.26888 3.613281 7.226562 3.416342 7.167969 3.15918 C 7.109375 2.90202 7.036133 2.641602 6.948242 2.37793 C 6.860352 2.114258 6.757812 1.875 6.640625 1.660156 C 6.523438 1.445312 6.396484 1.308594 6.259766 1.25 L 6.240234 1.25 C 6.103515 1.308594 5.976562 1.445312 5.859375 1.660156 C 5.742188 1.875 5.639648 2.114258 5.551758 2.37793 C 5.463867 2.641602 5.390625 2.90202 5.332031 3.15918 C 5.273438 3.416342 5.23112 3.613281 5.205078 3.75 Z M 1.914062 3.75 L 3.935547 3.75 C 4.052734 2.988281 4.251302 2.255859 4.53125 1.552734 C 3.977865 1.754559 3.476562 2.044271 3.027344 2.421875 C 2.578125 2.79948 2.207031 3.242188 1.914062 3.75 Z M 10.585938 3.75 C 10.292969 3.242188 9.921875 2.79948 9.472656 2.421875 C 9.023438 2.044271 8.522135 1.754559 7.96875 1.552734 C 8.248697 2.255859 8.447266 2.988281 8.564453 3.75 Z M 1.40625 5 C 1.354167 5.208334 1.315104 5.416667 1.289062 5.625 C 1.263021 5.833334 1.25 6.041668 1.25 6.25 C 1.25 6.458334 1.263021 6.666667 1.289062 6.875 C 1.315104 7.083334 1.354167 7.291667 1.40625 7.5 L 3.798828 7.5 C 3.785807 7.291667 3.774414 7.083334 3.764648 6.875 C 3.754883 6.666667 3.75 6.458334 3.75 6.25 C 3.75 6.041668 3.754883 5.833334 3.764648 5.625 C 3.774414 5.416667 3.785807 5.208334 3.798828 5 Z M 7.451172 5 L 5.048828 5 C 5.035807 5.208334 5.024414 5.416667 5.014648 5.625 C 5.004883 5.833334 5 6.041668 5 6.25 C 5 6.458334 5.004883 6.666667 5.014648 6.875 C 5.024414 7.083334 5.035807 7.291667 5.048828 7.5 L 7.451172 7.5 C 7.464192 7.291667 7.475585 7.083334 7.485352 6.875 C 7.495117 6.666667 7.5 6.458334 7.5 6.25 C 7.5 6.041668 7.495117 5.833334 7.485352 5.625 C 7.475585 5.416667 7.464192 5.208334 7.451172 5 Z M 20 8.125 L 20 10 C 20 10.169271 19.93815 10.315756 19.814453 10.439453 C 19.690754 10.563151 19.54427 10.625 19.375 10.625 C 19.205729 10.625 19.059244 10.563151 18.935547 10.439453 C 18.811848 10.315756 18.75 10.169271 18.75 10 L 18.75 8.75 L 11.25 8.75 L 11.25 10 C 11.25 10.169271 11.18815 10.315756 11.064453 10.439453 C 10.940755 10.563151 10.794271 10.625 10.625 10.625 C 10.455729 10.625 10.309244 10.563151 10.185547 10.439453 C 10.061849 10.315756 10 10.169271 10 10 L 10 8.125 C 10 7.95573 10.061849 7.809246 10.185547 7.685547 C 10.309244 7.56185 10.455729 7.5 10.625 7.5 L 14.375 7.5 C 14.375 7.447917 14.373372 7.394206 14.370117 7.338867 C 14.366861 7.283529 14.365234 7.226563 14.365234 7.167969 C 14.365234 7.057292 14.371744 6.948242 14.384766 6.84082 C 14.397786 6.733398 14.425455 6.635742 14.467773 6.547852 C 14.51009 6.459961 14.573566 6.388347 14.658203 6.333008 C 14.742838 6.27767 14.856771 6.25 15 6.25 C 15.143229 6.25 15.255533 6.27767 15.336914 6.333008 C 15.418294 6.388347 15.480143 6.459961 15.522461 6.547852 C 15.564777 6.635742 15.592447 6.733398 15.605469 6.84082 C 15.618489 6.948242 15.625 7.057292 15.625 7.167969 L 15.625 7.5 L 19.375 7.5 C 19.54427 7.5 19.690754 7.56185 19.814453 7.685547 C 19.93815 7.809246 20 7.95573 20 8.125 Z M 1.923828 8.75 C 2.216797 9.257812 2.587891 9.698894 3.037109 10.073242 C 3.486328 10.447592 3.984375 10.738933 4.53125 10.947266 C 4.251302 10.244141 4.052734 9.511719 3.935547 8.75 Z M 20 13.125 C 20 13.294271 19.93815 13.440756 19.814453 13.564453 C 19.690754 13.688151 19.54427 13.75 19.375 13.75 L 16.25 13.75 L 16.25 16.25 C 16.25 16.425781 16.217447 16.588543 16.152344 16.738281 C 16.087238 16.888021 15.997721 17.019857 15.883789 17.133789 C 15.769856 17.247721 15.638021 17.33724 15.488281 17.402344 C 15.338541 17.467447 15.17578 17.5 15 17.5 L 14.375 17.5 C 14.205729 17.5 14.059244 17.43815 13.935547 17.314453 C 13.811849 17.190756 13.75 17.044271 13.75 16.875 C 13.75 16.731771 13.777669 16.619467 13.833008 16.538086 C 13.888346 16.456705 13.95996 16.394857 14.047852 16.352539 C 14.135741 16.310221 14.233397 16.282553 14.34082 16.269531 C 14.448241 16.256512 14.557291 16.25 14.667969 16.25 L 15 16.25 L 15 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.688151 11.435547 13.564453 C 11.311849 13.440756 11.25 13.294271 11.25 13.125 C 11.25 12.955729 11.311849 12.809245 11.435547 12.685547 C 11.559244 12.56185 11.705729 12.5 11.875 12.5 L 15 12.5 C 14.999999 12.415365 15.027668 12.314453 15.083008 12.197266 C 15.138346 12.080078 15.205078 11.962891 15.283203 11.845703 C 15.361328 11.728516 15.439453 11.617839 15.517578 11.513672 C 15.595703 11.409506 15.657552 11.321615 15.703125 11.25 L 13.125 11.25 C 12.955729 11.25 12.809244 11.188151 12.685547 11.064453 C 12.561849 10.940756 12.5 10.794271 12.5 10.625 C 12.5 10.455729 12.561849 10.309245 12.685547 10.185547 C 12.809244 10.06185 12.955729 10 13.125 10 L 16.875 10 C 17.04427 10 17.190754 10.06185 17.314453 10.185547 C 17.43815 10.309245 17.5 10.455729 17.5 10.625 C 17.5 10.748698 17.464191 10.862631 17.392578 10.966797 L 16.376953 12.5 L 19.375 12.5 C 19.54427 12.5 19.690754 12.56185 19.814453 12.685547 C 19.93815 12.809245 20 12.955729 20 13.125 Z M 10.9375 18.125 C 10.9375 18.300781 10.877278 18.448893 10.756836 18.569336 C 10.636393 18.689779 10.488281 18.75 10.3125 18.75 C 10.182291 18.75 10.063477 18.712564 9.956055 18.637695 C 9.848633 18.562826 9.772135 18.463541 9.726562 18.339844 L 8.945312 16.25 L 6.054688 16.25 L 5.273438 18.339844 C 5.227864 18.463541 5.151367 18.562826 5.043945 18.637695 C 4.936523 18.712564 4.817708 18.75 4.6875 18.75 C 4.518229 18.75 4.371745 18.68815 4.248047 18.564453 C 4.124349 18.440756 4.0625 18.294271 4.0625 18.125 C 4.0625 18.033854 4.075521 17.958984 4.101562 17.900391 L 5.039062 15.419922 C 5.358073 14.580078 5.6722 13.74349 5.981445 12.910156 C 6.290689 12.076823 6.601562 11.240234 6.914062 10.400391 C 6.959635 10.276693 7.03776 10.185547 7.148438 10.126953 C 7.259114 10.068359 7.376302 10.039062 7.5 10.039062 C 7.630208 10.039062 7.747396 10.068359 7.851562 10.126953 C 7.955729 10.185547 8.033854 10.276693 8.085938 10.400391 C 8.398438 11.240234 8.707682 12.076823 9.013672 12.910156 C 9.319661 13.74349 9.635416 14.580078 9.960938 15.419922 L 10.898438 17.900391 C 10.924479 17.958984 10.9375 18.033854 10.9375 18.125 Z M 7.5 12.402344 L 6.523438 15 L 8.476562 15 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <ComboBox ItemsSource="{x:Bind ViewModel.AvailableLanguages, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLanguage, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="translations:AppLanguageModel">
+                                    <TextBlock Text="{x:Bind DisplayName}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard
+                        Margin="16,0,0,0"
+                        Description="{x:Bind domain:Translator.SettingsElementTheme_Description}"
+                        Header="{x:Bind domain:Translator.SettingsElementTheme_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 19.990234 1.796875 C 19.990234 2.011719 19.952799 2.231445 19.87793 2.456055 C 19.803059 2.680664 19.703775 2.880859 19.580078 3.056641 L 17.910156 5.488281 C 16.582031 7.428386 15.157877 9.272461 13.637695 11.020508 C 12.117513 12.768555 10.488281 14.43685 8.75 16.025391 C 8.743489 16.494141 8.662109 16.928711 8.505859 17.329102 C 8.349609 17.729492 8.095703 18.089193 7.744141 18.408203 C 7.444661 18.681641 7.109375 18.917643 6.738281 19.116211 C 6.367187 19.314779 5.979817 19.480795 5.576172 19.614258 C 5.172526 19.747721 4.760742 19.845377 4.34082 19.907227 C 3.920898 19.969076 3.51237 20 3.115234 20 C 2.945963 20 2.740885 19.991861 2.5 19.975586 C 2.259115 19.959311 2.011719 19.933268 1.757812 19.897461 C 1.503906 19.861654 1.259766 19.820963 1.025391 19.775391 C 0.791016 19.729818 0.595703 19.677734 0.439453 19.619141 C 0.302734 19.567057 0.195312 19.492188 0.117188 19.394531 C 0.039062 19.296875 0 19.173178 0 19.023438 C 0 18.834635 0.07487 18.675131 0.224609 18.544922 C 0.478516 18.336588 0.738932 18.126627 1.005859 17.915039 C 1.272786 17.703451 1.520182 17.477213 1.748047 17.236328 C 1.94987 17.027996 2.088216 16.795248 2.163086 16.538086 C 2.237956 16.280924 2.291667 16.012369 2.324219 15.732422 C 2.330729 15.680339 2.333984 15.638021 2.333984 15.605469 C 2.333984 15.572917 2.333984 15.550131 2.333984 15.537109 L 2.333984 15.517578 C 2.327474 15.517578 2.324219 15.514323 2.324219 15.507812 C 2.324219 15.494792 2.325846 15.473633 2.329102 15.444336 C 2.332357 15.415039 2.340495 15.364584 2.353516 15.292969 C 2.392578 14.947917 2.486979 14.617514 2.636719 14.301758 C 2.786458 13.986003 2.985026 13.704428 3.232422 13.457031 C 3.460286 13.229167 3.719075 13.045248 4.008789 12.905273 C 4.298502 12.7653 4.599609 12.659506 4.912109 12.587891 C 6.363932 10.634766 7.919921 8.789062 9.580078 7.050781 C 11.240233 5.312501 13.011066 3.668621 14.892578 2.119141 L 16.806641 0.546875 C 17.001953 0.384115 17.215168 0.255535 17.446289 0.161133 C 17.677408 0.066732 17.919922 0.019531 18.173828 0.019531 C 18.414713 0.019531 18.645832 0.066732 18.867188 0.161133 C 19.088541 0.255535 19.282227 0.382488 19.448242 0.541992 C 19.614258 0.701498 19.746094 0.890301 19.84375 1.108398 C 19.941406 1.326498 19.990234 1.55599 19.990234 1.796875 Z M 18.740234 1.806641 C 18.740234 1.656902 18.681641 1.529949 18.564453 1.425781 C 18.447266 1.321615 18.317057 1.269531 18.173828 1.269531 C 18.06315 1.269531 17.962238 1.292318 17.871094 1.337891 C 17.779947 1.383465 17.692057 1.442059 17.607422 1.513672 L 15.683594 3.085938 C 13.951822 4.498699 12.319336 5.99935 10.786133 7.587891 C 9.25293 9.176433 7.805989 10.85612 6.445312 12.626953 C 6.927083 12.770183 7.34375 13.00944 7.695312 13.344727 C 8.046875 13.680014 8.313802 14.082031 8.496094 14.550781 C 10.078125 13.079428 11.567383 11.531576 12.963867 9.907227 C 14.360351 8.282878 15.667316 6.575521 16.884766 4.785156 L 18.535156 2.363281 C 18.587238 2.285156 18.634439 2.197266 18.676758 2.099609 C 18.719074 2.001953 18.740234 1.904297 18.740234 1.806641 Z M 7.5 16.005859 C 7.5 15.797526 7.478841 15.587565 7.436523 15.375977 C 7.394206 15.164389 7.327474 14.96582 7.236328 14.780273 C 7.145182 14.594727 7.026367 14.427084 6.879883 14.277344 C 6.733398 14.127604 6.552734 14.010417 6.337891 13.925781 C 6.253255 13.893229 6.144205 13.855795 6.010742 13.813477 C 5.877278 13.771159 5.764974 13.75 5.673828 13.75 C 5.400391 13.75 5.118815 13.802084 4.829102 13.90625 C 4.539388 14.010417 4.296875 14.156901 4.101562 14.345703 C 3.886719 14.554037 3.75 14.780273 3.691406 15.024414 C 3.632812 15.268555 3.59375 15.5306 3.574219 15.810547 C 3.561198 16.018881 3.528646 16.233725 3.476562 16.455078 C 3.424479 16.676432 3.36263 16.884766 3.291016 17.080078 C 3.219401 17.262369 3.142904 17.425131 3.061523 17.568359 C 2.980143 17.711588 2.88737 17.843424 2.783203 17.963867 C 2.679036 18.084311 2.565104 18.201498 2.441406 18.31543 C 2.317708 18.429361 2.184245 18.544922 2.041016 18.662109 C 2.216797 18.68815 2.394206 18.709311 2.573242 18.725586 C 2.752279 18.741861 2.932943 18.75 3.115234 18.75 C 3.388672 18.75 3.686523 18.728842 4.008789 18.686523 C 4.331055 18.644205 4.654948 18.577475 4.980469 18.486328 C 5.305989 18.395182 5.620117 18.279623 5.922852 18.139648 C 6.225586 17.999674 6.494141 17.827148 6.728516 17.62207 C 6.962891 17.416992 7.150065 17.18099 7.290039 16.914062 C 7.430013 16.647137 7.5 16.344402 7.5 16.005859 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <controls:SettingsCard.Content>
+                            <ComboBox ItemsSource="{x:Bind ViewModel.ElementThemes, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedElementTheme, Mode=TwoWay}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate x:DataType="personalization:ElementThemeContainer">
+                                        <TextBlock Text="{x:Bind Title}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                        </controls:SettingsCard.Content>
+                    </controls:SettingsCard>
+                    <TextBlock
+                        Margin="20,16,0,0"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="Manage account settings" />
+                    <TextBlock Margin="20,0,0,12" Text="Add new account or manage individidual account settings." />
+                    <Button
+                        Margin="20,0,0,12"
+                        HorizontalAlignment="Left"
+                        Click="ManageAccountsClicked"
+                        Content="{x:Bind domain:Translator.MenuManageAccounts}" />
+                    <ListView
+                        x:Name="AccountsList"
+                        IsItemClickEnabled="False"
+                        ItemTemplateSelector="{StaticResource AccountProviderViewModelTemplateSelector}"
+                        ItemsSource="{x:Bind ViewModel.Accounts, Mode=OneWay}"
+                        SelectionMode="None" />
+                </StackPanel>
+            </Border>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:SettingOptionsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml.cs b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml.cs
new file mode 100644
index 00000000..f58b3ae2
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml.cs
@@ -0,0 +1,82 @@
+using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Settings;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.ViewModels.Data;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class SettingOptionsPage : SettingOptionsPageAbstract
+{
+    public SettingOptionsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void SettingOptionClicked(object sender, RoutedEventArgs e)
+    {
+        WinoPage? page = sender switch
+        {
+            FrameworkElement element when element.Tag is WinoPage p => p,
+            _ => null
+        };
+
+        if (page.HasValue)
+        {
+            ViewModel.NavigateSubDetailCommand.Execute(page.Value);
+        }
+    }
+
+    private void AccountSettingClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard settingsCard && settingsCard.CommandParameter is AccountProviderDetailViewModel account)
+        {
+            ViewModel.NavigateToAccount(account);
+        }
+    }
+
+    private void MergedAccountSettingClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is SettingsCard settingsCard && settingsCard.CommandParameter is MergedAccountProviderDetailViewModel account)
+        {
+            ViewModel.NavigateToAccount(account);
+        }
+    }
+
+    private void AddAccountSettingClicked(object sender, RoutedEventArgs e)
+    {
+        ViewModel.NavigateToAddAccount();
+    }
+
+    private void ManageAccountsClicked(object sender, RoutedEventArgs e)
+    {
+        ViewModel.NavigateToManageAccounts();
+    }
+
+    private void SettingsSearchTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+    {
+        if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput || string.IsNullOrWhiteSpace(sender.Text))
+        {
+            ViewModel.UpdateSearchSuggestions(sender.Text);
+        }
+    }
+
+    private void SettingsSearchSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+    {
+        if (args.SelectedItem is SettingsNavigationItemInfo selectedSetting)
+        {
+            ViewModel.SearchQuery = selectedSetting.Title;
+        }
+    }
+
+    private void SettingsSearchQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
+    {
+        var selectedSetting = args.ChosenSuggestion as SettingsNavigationItemInfo
+                              ?? ViewModel.GetBestSearchSuggestion(args.QueryText);
+
+        ViewModel.NavigateToSetting(selectedSetting);
+    }
+}
diff --git a/Wino.Mail/Views/Settings/AboutPage.xaml b/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml
similarity index 95%
rename from Wino.Mail/Views/Settings/AboutPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/AboutPage.xaml
index 2c55af63..3a9f92ee 100644
--- a/Wino.Mail/Views/Settings/AboutPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml
@@ -1,4 +1,4 @@
-<abstract:AboutPageAbstract
+<abstract:AboutPageAbstract
     x:Class="Wino.Views.Settings.AboutPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -17,9 +17,12 @@
                 </TransitionCollection>
             </StackPanel.ChildrenTransitions>
             <Image
-                Width="50"
-                Height="50"
-                Source="ms-appx:///Images/StoreLogo.png" />
+                Width="128"
+                Height="128"
+                Margin="0,0,0,12"
+                HorizontalAlignment="Center"
+                Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                Stretch="Uniform" />
             <TextBlock
                 Margin="0,6,0,4"
                 HorizontalAlignment="Center"
@@ -32,6 +35,26 @@
                 Style="{StaticResource BodyTextBlockStyle}"
                 Text="{x:Bind domain:Translator.SettingsAboutWinoDescription}" />
 
+            <controls:SettingsCard
+                Command="{x:Bind ViewModel.NavigateCommand}"
+                CommandParameter="{x:Bind ViewModel.WebsiteUrl}"
+                Description="{x:Bind domain:Translator.SettingsWebsite_Description}"
+                Header="{x:Bind domain:Translator.SettingsWebsite_Title}"
+                IsClickEnabled="True">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Glyph="&#xE774;" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <PathIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="{StaticResource OpenInNewWindowPathIcon}" />
+                </controls:SettingsCard.ActionIcon>
+            </controls:SettingsCard>
+
             <controls:SettingsCard
                 Command="{x:Bind ViewModel.NavigateCommand}"
                 CommandParameter="{x:Bind ViewModel.GitHubUrl}"
@@ -174,7 +197,7 @@
 
             <controls:SettingsCard Header="Wino Mail">
                 <controls:SettingsCard.HeaderIcon>
-                    <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Images/StoreLogo.png" />
+                    <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png" />
                 </controls:SettingsCard.HeaderIcon>
                 <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" IsTextSelectionEnabled="True">
                     <Run Text="{x:Bind domain:Translator.SettingsAboutVersion}" /><Run Text="{x:Bind ViewModel.VersionName}" />
diff --git a/Wino.Mail/Views/Settings/AboutPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml.cs
similarity index 84%
rename from Wino.Mail/Views/Settings/AboutPage.xaml.cs
rename to Wino.Mail.WinUI/Views/Settings/AboutPage.xaml.cs
index 6bc28703..7e608183 100644
--- a/Wino.Mail/Views/Settings/AboutPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Settings/AboutPage.xaml.cs
@@ -1,4 +1,4 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
 
diff --git a/Wino.Mail/Views/Settings/AliasManagementPage.xaml b/Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml
similarity index 90%
rename from Wino.Mail/Views/Settings/AliasManagementPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml
index 059b0c19..b695ee78 100644
--- a/Wino.Mail/Views/Settings/AliasManagementPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml
@@ -1,9 +1,8 @@
-<abstract:AliasManagementPageAbstract
+<abstract:AliasManagementPageAbstract
     x:Class="Wino.Views.Settings.AliasManagementPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -15,6 +14,7 @@
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:reader="using:Wino.Core.Domain.Models.Reader"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
+    xmlns:x509="using:System.Security.Cryptography.X509Certificates"
     x:Name="root"
     mc:Ignorable="d">
 
@@ -25,7 +25,9 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="50" />
                     <ColumnDefinition Width="50" />
-                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
                 <Grid VerticalAlignment="Center">
@@ -62,15 +64,38 @@
 
                 <RadioButton
                     Grid.Column="2"
-                    Command="{Binding ElementName=root, Path=ViewModel.SetAliasPrimaryCommand}"
-                    CommandParameter="{Binding}"
-                    IsChecked="{x:Bind IsPrimary, Mode=OneWay}" />
+                    Click="SetAliasPrimary_Click"
+                    CommandParameter="{x:Bind}"
+                    IsChecked="{x:Bind IsPrimary}" />
+
+
+                <ComboBox
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    DropDownClosed="SigningCertificateDropDownClosed"
+                    IsEnabled="{x:Bind IsSmimeEncryptionEnabled}"
+                    ItemsSource="{x:Bind Certificates}"
+                    PlaceholderText="{x:Bind domain:Translator.SettingsSignatureAndEncryption_SigningCertificatePlaceholder}"
+                    SelectedItem="{x:Bind SelectedSigningCertificate, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="x509:X509Certificate2">
+                            <TextBlock Text="{x:Bind Subject}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <CheckBox
+                    Grid.Column="4"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Click="SmimeClicked"
+                    IsChecked="{x:Bind IsSmimeEncryptionEnabled, Mode=OneTime}" />
 
                 <Button
-                    Grid.Column="3"
+                    Grid.Column="5"
                     HorizontalAlignment="Right"
-                    Command="{Binding ElementName=root, Path=ViewModel.DeleteAliasCommand}"
-                    CommandParameter="{Binding}"
+                    Click="DeleteAlias_Click"
+                    CommandParameter="{x:Bind}"
                     IsEnabled="{x:Bind CanDelete}">
                     <Button.Content>
                         <PathIcon Data="F1 M 19.375 3.125 C 19.375 3.26823 19.34733 3.382162 19.291992 3.466797 C 19.236652 3.551434 19.16341 3.61491 19.072266 3.657227 C 18.981119 3.699545 18.880207 3.727215 18.769531 3.740234 C 18.658854 3.753256 18.544922 3.759766 18.427734 3.759766 C 18.362629 3.759766 18.297525 3.758139 18.232422 3.754883 C 18.167316 3.751629 18.108723 3.75 18.056641 3.75 L 16.435547 17.783203 C 16.396484 18.095703 16.305338 18.387045 16.162109 18.657227 C 16.018879 18.927408 15.836588 19.161783 15.615234 19.360352 C 15.39388 19.55892 15.139974 19.71517 14.853516 19.829102 C 14.567057 19.943033 14.267578 20 13.955078 20 L 6.044922 20 C 5.732422 20 5.432942 19.943033 5.146484 19.829102 C 4.860026 19.71517 4.60612 19.55892 4.384766 19.360352 C 4.163411 19.161783 3.98112 18.927408 3.837891 18.657227 C 3.694661 18.387045 3.603516 18.095703 3.564453 17.783203 L 1.943359 3.75 C 1.878255 3.75 1.813151 3.751629 1.748047 3.754883 C 1.682943 3.758139 1.617839 3.759766 1.552734 3.759766 C 1.442057 3.759766 1.33138 3.753256 1.220703 3.740234 C 1.110026 3.727215 1.010742 3.697918 0.922852 3.652344 C 0.834961 3.606771 0.763346 3.541668 0.708008 3.457031 C 0.652669 3.372396 0.625 3.261719 0.625 3.125 C 0.625 2.95573 0.686849 2.809246 0.810547 2.685547 C 0.934245 2.56185 1.080729 2.5 1.25 2.5 L 6.933594 2.5 C 6.998697 2.141928 7.127278 1.809896 7.319336 1.503906 C 7.511393 1.197918 7.745768 0.932617 8.022461 0.708008 C 8.299153 0.483398 8.606771 0.309246 8.945312 0.185547 C 9.283854 0.06185 9.635416 0 10 0 C 10.364583 0 10.716146 0.06185 11.054688 0.185547 C 11.393229 0.309246 11.700846 0.483398 11.977539 0.708008 C 12.25423 0.932617 12.488605 1.197918 12.680664 1.503906 C 12.872721 1.809896 13.001302 2.141928 13.066406 2.5 L 18.75 2.5 C 18.91927 2.5 19.065754 2.56185 19.189453 2.685547 C 19.31315 2.809246 19.375 2.95573 19.375 3.125 Z M 8.232422 2.5 L 11.767578 2.5 C 11.702474 2.311199 11.611328 2.140301 11.494141 1.987305 C 11.376953 1.834311 11.240234 1.702475 11.083984 1.591797 C 10.927734 1.481121 10.758463 1.396484 10.576172 1.337891 C 10.39388 1.279297 10.201822 1.25 10 1.25 C 9.798177 1.25 9.606119 1.279297 9.423828 1.337891 C 9.241536 1.396484 9.072266 1.481121 8.916016 1.591797 C 8.759766 1.702475 8.623047 1.834311 8.505859 1.987305 C 8.388672 2.140301 8.297525 2.311199 8.232422 2.5 Z M 16.796875 3.75 L 3.203125 3.75 L 4.804688 17.646484 C 4.84375 17.972006 4.978841 18.237305 5.209961 18.442383 C 5.441081 18.647461 5.719401 18.75 6.044922 18.75 L 13.955078 18.75 C 14.111328 18.75 14.261067 18.72233 14.404297 18.666992 C 14.547525 18.611654 14.674479 18.535156 14.785156 18.4375 C 14.895833 18.339844 14.986979 18.222656 15.058594 18.085938 C 15.130208 17.949219 15.175781 17.802734 15.195312 17.646484 Z M 7.5 14.375 L 7.5 8.125 C 7.5 7.95573 7.561849 7.809246 7.685547 7.685547 C 7.809245 7.56185 7.955729 7.5 8.125 7.5 C 8.294271 7.5 8.440755 7.56185 8.564453 7.685547 C 8.68815 7.809246 8.75 7.95573 8.75 8.125 L 8.75 14.375 C 8.75 14.544271 8.68815 14.690756 8.564453 14.814453 C 8.440755 14.938151 8.294271 15 8.125 15 C 7.955729 15 7.809245 14.938151 7.685547 14.814453 C 7.561849 14.690756 7.5 14.544271 7.5 14.375 Z M 11.25 14.375 L 11.25 8.125 C 11.25 7.95573 11.311849 7.809246 11.435547 7.685547 C 11.559244 7.56185 11.705729 7.5 11.875 7.5 C 12.04427 7.5 12.190754 7.56185 12.314453 7.685547 C 12.43815 7.809246 12.5 7.95573 12.5 8.125 L 12.5 14.375 C 12.5 14.544271 12.43815 14.690756 12.314453 14.814453 C 12.190754 14.938151 12.04427 15 11.875 15 C 11.705729 15 11.559244 14.938151 11.435547 14.814453 C 11.311849 14.690756 11.25 14.544271 11.25 14.375 Z " />
@@ -99,6 +124,8 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="50" />
                     <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="50" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
@@ -174,6 +201,16 @@
                     Grid.Row="2"
                     Grid.Column="2"
                     Text="{x:Bind domain:Translator.AccountAlias_Column_IsPrimaryAlias}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="3"
+                    Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_SigningCertificate}" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="4"
+                    Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_EncryptionCertificate}" />
             </Grid>
         </ListView.Header>
     </ListView>
diff --git a/Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml.cs
new file mode 100644
index 00000000..b3b89fb9
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/AliasManagementPage.xaml.cs
@@ -0,0 +1,56 @@
+using System.Security.Cryptography.X509Certificates;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class AliasManagementPage : AliasManagementPageAbstract
+{
+    public AliasManagementPage()
+    {
+        InitializeComponent();
+    }
+
+    private void SetAliasPrimary_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is RadioButton button && button.CommandParameter is MailAccountAlias alias)
+        {
+            ViewModel.SetAliasPrimaryCommand.Execute(alias);
+        }
+    }
+
+    private void DeleteAlias_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is MailAccountAlias alias)
+        {
+            ViewModel.DeleteAliasCommand.Execute(alias);
+        }
+    }
+
+    private async void SigningCertificateDropDownClosed(object sender, object e)
+    {
+        var (alias, cert) = GetAliasAndSelectedCertificateForCombobox(sender);
+        if (alias is not null)
+        {
+            await ViewModel.SetSelectedSigningCertificate(alias, cert);
+        }
+    }
+
+    private static (MailAccountAlias? alias, X509Certificate2? cert) GetAliasAndSelectedCertificateForCombobox(object sender)
+    {
+        var comboBox = sender as ComboBox;
+        var alias = comboBox?.DataContext as MailAccountAlias;
+        var selected = comboBox?.SelectedItem as X509Certificate2;
+
+        return (alias, selected);
+    }
+    private async void SmimeClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        var checkBox = sender as CheckBox;
+        if (checkBox?.DataContext is MailAccountAlias alias)
+        {
+            await ViewModel.SetAliasSmimeEncryption(alias, checkBox.IsChecked ?? false);
+        }
+    }
+}
diff --git a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml b/Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml
similarity index 62%
rename from Wino.Mail/Views/Settings/AppPreferencesPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml
index d9cb3fc2..6530aa27 100644
--- a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml
@@ -1,4 +1,4 @@
-<abstract:AppPreferencesPageAbstract
+<abstract:AppPreferencesPageAbstract
     x:Class="Wino.Views.Settings.AppPreferencesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,11 +7,26 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Wino.Core.Domain.Models.Ai"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:translations="using:Wino.Core.Domain.Models.Translations"
     mc:Ignorable="d">
 
     <ScrollViewer>
         <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsLanguage_Description}" Header="{x:Bind domain:Translator.SettingsLanguage_Title}">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE775;" />
+                </controls:SettingsCard.HeaderIcon>
+                <ComboBox ItemsSource="{x:Bind ViewModel.AvailableLanguages, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedLanguage, Mode=TwoWay}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="translations:AppLanguageModel">
+                            <TextBlock Text="{x:Bind DisplayName}" />
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </controls:SettingsCard>
+
             <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_StartupBehavior_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_StartupBehavior_Title}">
                 <ToggleButton
                     x:Name="StartupEnabledToggleButton"
@@ -23,13 +38,6 @@
                 </controls:SettingsCard.HeaderIcon>
             </controls:SettingsCard>
 
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_CloseBehavior_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_CloseBehavior_Title}">
-                <ComboBox ItemsSource="{x:Bind ViewModel.AppTerminationBehavior, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedAppTerminationBehavior, Mode=TwoWay}" />
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 1.591797 15.244141 C 1.591797 15.055339 1.635742 14.912109 1.723633 14.814453 C 1.811523 14.716797 1.930339 14.625651 2.080078 14.541016 C 2.26237 14.443359 2.457682 14.363607 2.666016 14.301758 C 2.874349 14.239909 3.072917 14.169922 3.261719 14.091797 C 3.834635 13.863933 4.394531 13.606771 4.941406 13.320312 C 5.488281 13.033854 6.005859 12.705078 6.494141 12.333984 C 7.106119 11.871745 7.643229 11.352539 8.105469 10.776367 C 8.567708 10.200195 8.95345 9.584961 9.262695 8.930664 C 9.571939 8.276367 9.804688 7.587891 9.960938 6.865234 C 10.117188 6.142578 10.195312 5.400391 10.195312 4.638672 C 10.195312 4.007162 10.144856 3.390301 10.043945 2.788086 C 9.943033 2.185873 9.830729 1.578777 9.707031 0.966797 C 9.700521 0.934246 9.695638 0.904949 9.692383 0.878906 C 9.689127 0.852865 9.6875 0.823568 9.6875 0.791016 C 9.6875 0.582684 9.759114 0.406902 9.902344 0.263672 C 10.045572 0.120443 10.221354 0.048828 10.429688 0.048828 C 10.800781 0.048828 11.183268 0.083008 11.577148 0.151367 C 11.971028 0.219727 12.361653 0.314129 12.749023 0.43457 C 13.136393 0.555014 13.515624 0.694988 13.886719 0.854492 C 14.257812 1.013998 14.602863 1.184896 14.921875 1.367188 C 15.690104 1.809896 16.383463 2.342123 17.001953 2.963867 C 17.620441 3.585613 18.144531 4.270834 18.574219 5.019531 C 19.003906 5.76823 19.334309 6.567384 19.56543 7.416992 C 19.796549 8.266602 19.912109 9.134115 19.912109 10.019531 C 19.912109 10.9375 19.793293 11.821289 19.555664 12.670898 C 19.318033 13.520508 18.981119 14.314779 18.544922 15.053711 C 18.108723 15.792644 17.587891 16.464844 16.982422 17.070312 C 16.376953 17.675781 15.703125 18.194986 14.960938 18.62793 C 14.21875 19.060873 13.422852 19.396158 12.573242 19.633789 C 11.723633 19.87142 10.839844 19.990234 9.921875 19.990234 C 9.140625 19.990234 8.352864 19.890951 7.558594 19.692383 C 6.764323 19.493814 6.005859 19.208984 5.283203 18.837891 C 4.560547 18.466797 3.891602 18.014322 3.276367 17.480469 C 2.661133 16.946615 2.141927 16.3444 1.71875 15.673828 C 1.634115 15.54362 1.591797 15.400391 1.591797 15.244141 Z M 9.921875 18.730469 C 10.722656 18.730469 11.495768 18.626303 12.241211 18.417969 C 12.986652 18.209635 13.683268 17.918295 14.331055 17.543945 C 14.978841 17.169598 15.568033 16.717123 16.098633 16.186523 C 16.62923 15.655925 17.084961 15.068359 17.46582 14.423828 C 17.84668 13.779297 18.141275 13.084311 18.349609 12.338867 C 18.557941 11.593425 18.662109 10.820312 18.662109 10.019531 C 18.662109 9.290365 18.575846 8.583984 18.40332 7.900391 C 18.230793 7.216798 17.983398 6.569012 17.661133 5.957031 C 17.338867 5.345053 16.951496 4.778646 16.499023 4.257812 C 16.046549 3.73698 15.538736 3.276367 14.975586 2.875977 C 14.412435 2.475586 13.802083 2.145184 13.144531 1.884766 C 12.486979 1.62435 11.796874 1.448568 11.074219 1.357422 C 11.184896 1.897787 11.274414 2.439779 11.342773 2.983398 C 11.411133 3.52702 11.445312 4.075521 11.445312 4.628906 C 11.445312 5.579428 11.336263 6.500652 11.118164 7.392578 C 10.900064 8.284506 10.569661 9.150391 10.126953 9.990234 C 9.749349 10.706381 9.309896 11.342773 8.808594 11.899414 C 8.307291 12.456055 7.758789 12.954102 7.163086 13.393555 C 6.567382 13.833008 5.929361 14.222006 5.249023 14.560547 C 4.568685 14.899089 3.863932 15.208334 3.134766 15.488281 C 3.544922 16.002604 4.005534 16.461588 4.516602 16.865234 C 5.027669 17.268881 5.574544 17.609049 6.157227 17.885742 C 6.739908 18.162436 7.348632 18.372396 7.983398 18.515625 C 8.618164 18.658854 9.264322 18.730469 9.921875 18.730469 Z " />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>
-
             <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_SearchMode_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_SearchMode_Title}">
                 <ComboBox ItemsSource="{x:Bind ViewModel.SearchModes, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedDefaultSearchMode, Mode=TwoWay}" />
                 <controls:SettingsCard.HeaderIcon>
@@ -37,8 +45,15 @@
                 </controls:SettingsCard.HeaderIcon>
             </controls:SettingsCard>
 
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_ApplicationMode_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_ApplicationMode_Title}">
+                <ComboBox ItemsSource="{x:Bind ViewModel.ApplicationModes, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedDefaultApplicationMode, Mode=TwoWay}" />
+                <controls:SettingsCard.HeaderIcon>
+                    <PathIcon Data="F1 M 2.5 3.125 C 2.5 2.955729 2.561849 2.809245 2.685547 2.685547 C 2.809244 2.56185 2.955729 2.5 3.125 2.5 L 16.875 2.5 C 17.044271 2.5 17.190756 2.56185 17.314453 2.685547 C 17.43815 2.809245 17.5 2.955729 17.5 3.125 L 17.5 16.875 C 17.5 17.044271 17.43815 17.190756 17.314453 17.314453 C 17.190756 17.43815 17.044271 17.5 16.875 17.5 L 3.125 17.5 C 2.955729 17.5 2.809244 17.43815 2.685547 17.314453 C 2.561849 17.190756 2.5 17.044271 2.5 16.875 Z M 3.75 3.75 L 3.75 16.25 L 16.25 16.25 L 16.25 3.75 Z M 9.375 5 C 9.375 4.830729 9.436849 4.684245 9.560547 4.560547 C 9.684244 4.43685 9.830729 4.375 10 4.375 C 10.169271 4.375 10.315755 4.43685 10.439453 4.560547 C 10.56315 4.684245 10.625 4.830729 10.625 5 L 10.625 15 C 10.625 15.169271 10.56315 15.315756 10.439453 15.439453 C 10.315755 15.56315 10.169271 15.625 10 15.625 C 9.830729 15.625 9.684244 15.56315 9.560547 15.439453 C 9.436849 15.315756 9.375 15.169271 9.375 15 Z " />
+                </controls:SettingsCard.HeaderIcon>
+            </controls:SettingsCard>
+
             <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_EmailSyncInterval_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_EmailSyncInterval_Title}">
-                <muxc:NumberBox
+                <NumberBox
                     Minimum="1"
                     PlaceholderText="3"
                     SpinButtonPlacementMode="Inline"
@@ -47,6 +62,80 @@
                     <PathIcon Data="F1 M 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.234375 0 11.062825 0.112305 11.860352 0.336914 C 12.657877 0.561523 13.404947 0.877279 14.101562 1.28418 C 14.798176 1.691082 15.431314 2.179363 16.000977 2.749023 C 16.570637 3.318686 17.058918 3.951824 17.46582 4.648438 C 17.872721 5.345053 18.188477 6.092123 18.413086 6.889648 C 18.637695 7.687175 18.75 8.515625 18.75 9.375 C 18.75 10.240886 18.637695 11.072592 18.413086 11.870117 C 18.188477 12.667644 17.872721 13.413086 17.46582 14.106445 C 17.058918 14.799805 16.570637 15.431315 16.000977 16.000977 C 15.431314 16.570639 14.799804 17.05892 14.106445 17.46582 C 13.413085 17.872721 12.666015 18.188477 11.865234 18.413086 C 11.064453 18.637695 10.234375 18.75 9.375 18.75 C 8.509114 18.75 7.675781 18.639322 6.875 18.417969 C 6.074219 18.196615 5.327148 17.882486 4.633789 17.475586 C 3.94043 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.80957 1.274414 14.116211 C 0.867513 13.422852 0.553385 12.675781 0.332031 11.875 C 0.110677 11.074219 0 10.240886 0 9.375 Z M 17.5 9.375 C 17.5 8.626303 17.403971 7.905273 17.211914 7.211914 C 17.019855 6.518556 16.746418 5.87077 16.391602 5.268555 C 16.036783 4.666342 15.613606 4.119467 15.12207 3.62793 C 14.630533 3.136395 14.083658 2.713217 13.481445 2.358398 C 12.879231 2.003582 12.231445 1.730145 11.538086 1.538086 C 10.844727 1.346029 10.123697 1.25 9.375 1.25 C 8.626302 1.25 7.905273 1.346029 7.211914 1.538086 C 6.518555 1.730145 5.870768 2.003582 5.268555 2.358398 C 4.666341 2.713217 4.119466 3.136395 3.62793 3.62793 C 3.136393 4.119467 2.713216 4.666342 2.358398 5.268555 C 2.003581 5.87077 1.730143 6.518556 1.538086 7.211914 C 1.346029 7.905273 1.25 8.626303 1.25 9.375 C 1.25 10.123698 1.346029 10.844727 1.538086 11.538086 C 1.730143 12.231445 2.001953 12.879232 2.353516 13.481445 C 2.705078 14.083659 3.128255 14.632162 3.623047 15.126953 C 4.117838 15.621745 4.666341 16.044922 5.268555 16.396484 C 5.870768 16.748047 6.518555 17.019857 7.211914 17.211914 C 7.905273 17.403971 8.626302 17.5 9.375 17.5 C 10.123697 17.5 10.844727 17.403971 11.538086 17.211914 C 12.231445 17.019857 12.879231 16.748047 13.481445 16.396484 C 14.083658 16.044922 14.63216 15.621745 15.126953 15.126953 C 15.621744 14.632162 16.044922 14.083659 16.396484 13.481445 C 16.748047 12.879232 17.019855 12.231445 17.211914 11.538086 C 17.403971 10.844727 17.5 10.123698 17.5 9.375 Z M 9.375 10 C 9.205729 10 9.059244 9.938151 8.935547 9.814453 C 8.811849 9.690756 8.75 9.544271 8.75 9.375 L 8.75 4.375 C 8.75 4.20573 8.811849 4.059246 8.935547 3.935547 C 9.059244 3.81185 9.205729 3.75 9.375 3.75 C 9.544271 3.75 9.690755 3.81185 9.814453 3.935547 C 9.93815 4.059246 10 4.20573 10 4.375 L 10 8.75 L 13.125 8.75 C 13.294271 8.75 13.440755 8.81185 13.564453 8.935547 C 13.68815 9.059245 13.75 9.205729 13.75 9.375 C 13.75 9.544271 13.68815 9.690756 13.564453 9.814453 C 13.440755 9.938151 13.294271 10 13.125 10 Z " />
                 </controls:SettingsCard.HeaderIcon>
             </controls:SettingsCard>
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_HideWinoAccountButton_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_HideWinoAccountButton_Title}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsWinoAccountButtonHidden, Mode=TwoWay}" />
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE77B;" />
+                </controls:SettingsCard.HeaderIcon>
+            </controls:SettingsCard>
+
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_StoreUpdateNotifications_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_StoreUpdateNotifications_Title}">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsStoreUpdateNotificationsEnabled, Mode=TwoWay}" />
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE896;" />
+                </controls:SettingsCard.HeaderIcon>
+            </controls:SettingsCard>
+
+            <controls:SettingsExpander
+                Description="{x:Bind domain:Translator.SettingsAppPreferences_AiActions_Description}"
+                Header="{x:Bind domain:Translator.SettingsAppPreferences_AiActions_Title}"
+                IsExpanded="True">
+                <controls:SettingsExpander.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE734;" />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_AiDefaultTranslationLanguage_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_AiDefaultTranslationLanguage_Title}">
+                        <ComboBox ItemsSource="{x:Bind ViewModel.AvailableAiLanguages, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedDefaultTranslationLanguage, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="models:AiTranslateLanguageOption">
+                                    <TextBlock Text="{x:Bind Label}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarizeLanguage_Description}" Header="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarizeLanguage_Title}">
+                        <ComboBox ItemsSource="{x:Bind ViewModel.AvailableAiLanguages, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedSummarizeLanguage, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="models:AiTranslateLanguageOption">
+                                    <TextBlock Text="{x:Bind Label}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
+                    <controls:SettingsCard
+                        Description="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarySavePath_Description}"
+                        Header="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarySavePath_Title}"
+                        HorizontalContentAlignment="Stretch"
+                        VerticalContentAlignment="Stretch"
+                        ContentAlignment="Vertical">
+                        <StackPanel Spacing="8">
+                            <Grid ColumnSpacing="12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox
+                                    Grid.Column="0"
+                                    IsReadOnly="True"
+                                    PlaceholderText="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarySavePath_Placeholder}"
+                                    Text="{x:Bind ViewModel.SummarySavePath, Mode=OneWay}" />
+                                <Button
+                                    Grid.Column="1"
+                                    Command="{x:Bind ViewModel.BrowseSummarySavePathCommand}"
+                                    Content="{x:Bind domain:Translator.Buttons_Browse}" />
+                            </Grid>
+                            <TextBlock
+                                Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.SettingsAppPreferences_AiSummarySavePath_InvalidHint}"
+                                TextWrapping="WrapWholeWords"
+                                Visibility="{x:Bind ViewModel.HasInvalidSummarySavePath, Mode=OneWay}" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
         </StackPanel>
 
         <VisualStateManager.VisualStateGroups>
@@ -64,3 +153,6 @@
         </VisualStateManager.VisualStateGroups>
     </ScrollViewer>
 </abstract:AppPreferencesPageAbstract>
+
+
+
diff --git a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml.cs
similarity index 86%
rename from Wino.Mail/Views/Settings/AppPreferencesPage.xaml.cs
rename to Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml.cs
index 5c41c0df..457cba4d 100644
--- a/Wino.Mail/Views/Settings/AppPreferencesPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Settings/AppPreferencesPage.xaml.cs
@@ -1,4 +1,4 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
 
diff --git a/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml b/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml
new file mode 100644
index 00000000..5de0a0e8
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml
@@ -0,0 +1,275 @@
+<abstract:ContactsPageAbstract
+    x:Class="Wino.Views.Settings.ContactsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:Wino.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:listview="using:Wino.Mail.WinUI.Controls.ListView"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkitExt="using:CommunityToolkit.WinUI"
+    xmlns:viewModels="using:Wino.Mail.ViewModels.Data"
+    x:Name="root"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Key="ContactTemplate" x:DataType="viewModels:AccountContactViewModel">
+            <Grid Margin="0,0,0,8" Padding="0,4">
+                <Border
+                    Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    CornerRadius="8" />
+
+                <Grid Padding="12" ColumnSpacing="12">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <controls:ImagePreviewControl
+                        Grid.Column="0"
+                        Width="40"
+                        Height="40"
+                        MailItemInformation="{x:Bind Mode=OneWay}" />
+
+                    <StackPanel
+                        Grid.Column="1"
+                        VerticalAlignment="Center"
+                        Spacing="2">
+                        <TextBlock
+                            FontSize="14"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind Name, Mode=OneTime, TargetNullValue=''}"
+                            TextTrimming="CharacterEllipsis" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind Address, Mode=OneTime}"
+                            TextTrimming="CharacterEllipsis" />
+                        <Border
+                            x:Name="ModifiedBorder"
+                            Padding="6,2"
+                            HorizontalAlignment="Left"
+                            x:Load="{x:Bind IsOverridden, Mode=OneTime}"
+                            Background="{ThemeResource SubtleFillColorSecondaryBrush}"
+                            CornerRadius="4">
+                            <TextBlock Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind domain:Translator.ContactStatus_Modified, Mode=OneTime}" />
+                        </Border>
+                    </StackPanel>
+
+                    <StackPanel
+                        Grid.Column="2"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="4">
+                        <Button
+                            Click="EditContact_Click"
+                            CommandParameter="{x:Bind}"
+                            Style="{StaticResource SubtleButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.ContactAction_Edit, Mode=OneTime}">
+                            <FontIcon FontSize="14" Glyph="&#xE70F;" />
+                        </Button>
+                        <Button
+                            Click="PickContactPhoto_Click"
+                            CommandParameter="{x:Bind}"
+                            Style="{StaticResource SubtleButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.ContactAction_ChangePhoto, Mode=OneTime}">
+                            <FontIcon FontSize="14" Glyph="&#xE91B;" />
+                        </Button>
+                        <Button
+                            Click="DeleteContact_Click"
+                            CommandParameter="{x:Bind}"
+                            Style="{StaticResource SubtleButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.ContactAction_Delete, Mode=OneTime}">
+                            <FontIcon FontSize="14" Glyph="&#xE74D;" />
+                        </Button>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </DataTemplate>
+    </Page.Resources>
+
+    <Grid
+        MaxWidth="980"
+        Padding="24,20,24,16"
+        RowSpacing="12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0">
+            <StackPanel>
+                <TextBlock
+                    FontSize="28"
+                    FontWeight="SemiBold"
+                    Text="{x:Bind domain:Translator.ContactsPage_Title, Mode=OneTime}" />
+                <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind domain:Translator.ContactsPage_Subtitle, Mode=OneTime}" />
+            </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="1" ColumnSpacing="8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <Button
+                Grid.Column="1"
+                Command="{x:Bind ViewModel.ReloadContactsCommand}"
+                Style="{StaticResource SubtleButtonStyle}"
+                ToolTipService.ToolTip="{x:Bind domain:Translator.Buttons_Refresh, Mode=OneTime}">
+                <FontIcon FontSize="14" Glyph="&#xE72C;" />
+            </Button>
+
+            <Button
+                Grid.Column="2"
+                Command="{x:Bind ViewModel.ToggleSelectionCommand}"
+                Style="{StaticResource SubtleButtonStyle}">
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <FontIcon FontSize="14" Glyph="&#xE762;" />
+                    <TextBlock Text="{x:Bind helpers:XamlHelpers.BoolToSelectionModeText(ViewModel.IsSelectionMode), Mode=OneWay}" />
+                </StackPanel>
+            </Button>
+        </Grid>
+
+        <Grid
+            x:Name="SelectionModeGrid"
+            Grid.Row="2"
+            x:Load="{x:Bind ViewModel.IsSelectionMode, Mode=OneWay}"
+            ColumnSpacing="8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock VerticalAlignment="Center">
+                <Run Text="{x:Bind ViewModel.SelectedContactsCount, Mode=OneWay}" />
+                <Run Text=" " />
+                <Run Text="{x:Bind domain:Translator.ContactSelection_Selected, Mode=OneTime}" />
+            </TextBlock>
+
+            <Button
+                Grid.Column="1"
+                Click="SelectAllContacts_Click"
+                Style="{StaticResource SubtleButtonStyle}">
+                <TextBlock Text="{x:Bind domain:Translator.ContactSelection_SelectAll, Mode=OneTime}" />
+            </Button>
+
+            <Button
+                Grid.Column="2"
+                Click="ClearSelection_Click"
+                Style="{StaticResource SubtleButtonStyle}">
+                <TextBlock Text="{x:Bind domain:Translator.ContactSelection_Clear, Mode=OneTime}" />
+            </Button>
+
+            <Button
+                Grid.Column="3"
+                Command="{x:Bind ViewModel.DeleteSelectedContactsCommand}"
+                Style="{StaticResource SubtleButtonStyle}">
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <FontIcon FontSize="14" Glyph="&#xE74D;" />
+                    <TextBlock Text="{x:Bind domain:Translator.ContactsPage_DeleteSelectedContacts, Mode=OneTime}" />
+                </StackPanel>
+            </Button>
+        </Grid>
+
+        <Grid Grid.Row="3">
+            <Border
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="10">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <Grid
+                        Grid.Row="0"
+                        Padding="12,10"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="0,0,0,1">
+                        <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}">
+                            <Run Text="{x:Bind ViewModel.TotalContactsCount, Mode=OneWay}" />
+                            <Run Text=" " />
+                            <Run Text="{x:Bind domain:Translator.ContactsPage_ContactsCountSuffix, Mode=OneTime}" />
+                        </TextBlock>
+                    </Grid>
+
+                    <listview:WinoListView
+                        x:Name="ContactsListView"
+                        Grid.Row="1"
+                        Margin="6"
+                        toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
+                        IsMultiSelectCheckBoxEnabled="{x:Bind ViewModel.IsSelectionMode, Mode=OneWay}"
+                        ItemTemplate="{StaticResource ContactTemplate}"
+                        ItemsSource="{x:Bind ViewModel.Contacts, Mode=OneWay}"
+                        LoadMoreCommand="{x:Bind ViewModel.LoadMoreContactsCommand}"
+                        SelectionChanged="ContactsListView_SelectionChanged"
+                        SelectionMode="{x:Bind helpers:XamlHelpers.BoolToSelectionMode(ViewModel.IsSelectionMode), Mode=OneWay}">
+                        <listview:WinoListView.ItemContainerTransitions>
+                            <TransitionCollection>
+                                <AddDeleteThemeTransition />
+                                <ContentThemeTransition />
+                                <EntranceThemeTransition IsStaggeringEnabled="True" />
+                            </TransitionCollection>
+                        </listview:WinoListView.ItemContainerTransitions>
+                    </listview:WinoListView>
+
+                    <ProgressRing
+                        Grid.Row="2"
+                        Width="24"
+                        Height="24"
+                        Margin="0,8,0,10"
+                        HorizontalAlignment="Center"
+                        IsActive="{x:Bind ViewModel.IsLoadingMore, Mode=OneWay}"
+                        Visibility="{x:Bind ViewModel.IsLoadingMore, Mode=OneWay}" />
+                </Grid>
+            </Border>
+
+            <Grid
+                x:Name="LoadingGrid"
+                x:Load="{x:Bind ViewModel.IsLoading, Mode=OneWay}"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}">
+                <ProgressRing
+                    Width="48"
+                    Height="48"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    IsActive="True" />
+            </Grid>
+
+            <StackPanel
+                x:Name="IsEmptyPanel"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                x:Load="{x:Bind ViewModel.IsEmpty, Mode=OneWay}"
+                Spacing="10">
+                <FontIcon
+                    FontSize="40"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Glyph="&#xE716;" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="{x:Bind domain:Translator.ContactsPage_NoContacts, Mode=OneTime}" />
+                <Button Command="{x:Bind ViewModel.AddContactCommand}" Style="{StaticResource AccentButtonStyle}">
+                    <TextBlock Text="{x:Bind domain:Translator.ContactsPage_AddFirstContact, Mode=OneTime}" />
+                </Button>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</abstract:ContactsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml.cs
new file mode 100644
index 00000000..724bdafa
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/ContactsPage.xaml.cs
@@ -0,0 +1,146 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain;
+using Wino.Mail.ViewModels;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class ContactsPage : ContactsPageAbstract, ITitleBarSearchHost
+{
+    public ObservableCollection<TitleBarSearchSuggestion> SearchSuggestions { get; } = [];
+
+    public string SearchText
+    {
+        get => ViewModel.SearchQuery;
+        set => ViewModel.SearchQuery = value;
+    }
+
+    public string SearchPlaceholderText => Translator.ContactsPage_SearchPlaceholder;
+
+    public ContactsPage()
+    {
+        InitializeComponent();
+
+        ViewModel.PropertyChanged += ViewModelPropertyChanged;
+        Unloaded += ContactsPageUnloaded;
+    }
+
+    private void EditContact_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
+        {
+            ViewModel.EditContactCommand.Execute(contact);
+        }
+    }
+
+    private void PickContactPhoto_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
+        {
+            ViewModel.PickContactPhotoCommand.Execute(contact);
+        }
+    }
+
+    private void DeleteContact_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is AccountContactViewModel contact)
+        {
+            ViewModel.DeleteContactCommand.Execute(contact);
+        }
+    }
+
+    private void ContactsListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is not ListView)
+            return;
+
+        if (!ViewModel.IsSelectionMode)
+        {
+            ClearSelection();
+            return;
+        }
+
+        foreach (var removedItem in e.RemovedItems.OfType<AccountContactViewModel>())
+        {
+            var selectedContact = ViewModel.SelectedContacts.FirstOrDefault(c =>
+                string.Equals(c.Address, removedItem.Address, StringComparison.OrdinalIgnoreCase));
+
+            if (selectedContact != null)
+            {
+                ViewModel.SelectedContacts.Remove(selectedContact);
+            }
+        }
+
+        foreach (var addedItem in e.AddedItems.OfType<AccountContactViewModel>())
+        {
+            var alreadySelected = ViewModel.SelectedContacts.Any(c =>
+                string.Equals(c.Address, addedItem.Address, StringComparison.OrdinalIgnoreCase));
+
+            if (!alreadySelected)
+            {
+                ViewModel.SelectedContacts.Add(addedItem);
+            }
+        }
+    }
+
+    private void SelectAllContacts_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (!ViewModel.IsSelectionMode)
+            return;
+
+        ContactsListView.SelectAll();
+    }
+
+    private void ClearSelection_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        ClearSelection();
+    }
+
+    private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(ContactsPageViewModel.IsSelectionMode) && !ViewModel.IsSelectionMode)
+        {
+            ClearSelection();
+        }
+    }
+
+    private void ContactsPageUnloaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        ViewModel.PropertyChanged -= ViewModelPropertyChanged;
+        Unloaded -= ContactsPageUnloaded;
+    }
+
+    private void ClearSelection()
+    {
+        ContactsListView.SelectionChanged -= ContactsListView_SelectionChanged;
+        ContactsListView.SelectedItems.Clear();
+        ContactsListView.SelectionChanged += ContactsListView_SelectionChanged;
+        ViewModel.SelectedContacts.Clear();
+    }
+
+    public Task OnTitleBarSearchTextChangedAsync() => Task.CompletedTask;
+
+    public void OnTitleBarSearchSuggestionChosen(TitleBarSearchSuggestion suggestion)
+    {
+    }
+
+    public Task OnTitleBarSearchSubmittedAsync(string queryText, TitleBarSearchSuggestion? chosenSuggestion)
+    {
+        SearchText = queryText;
+
+        if (ViewModel.ReloadContactsCommand.CanExecute(null))
+        {
+            ViewModel.ReloadContactsCommand.Execute(null);
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml b/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml
new file mode 100644
index 00000000..61a16d4a
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml
@@ -0,0 +1,72 @@
+<abstract:CreateEmailTemplatePageAbstract
+    x:Class="Wino.Views.Settings.CreateEmailTemplatePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mailControls="using:Wino.Mail.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid RowSpacing="12">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <controls:SettingsCard
+            Grid.Row="0"
+            Header="{x:Bind domain:Translator.SettingsEmailTemplates_NameTitle}"
+            IsClickEnabled="False">
+            <TextBox
+                x:Name="TemplateNameTextBox"
+                PlaceholderText="{x:Bind domain:Translator.SettingsEmailTemplates_NamePlaceholder}"
+                Text="{x:Bind ViewModel.TemplateName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        </controls:SettingsCard>
+
+        <controls:SettingsCard
+            Grid.Row="1"
+            Header="{x:Bind domain:Translator.SettingsEmailTemplates_DescriptionTitle}"
+            IsClickEnabled="False">
+            <TextBox
+                AcceptsReturn="True"
+                PlaceholderText="{x:Bind domain:Translator.SettingsEmailTemplates_DescriptionPlaceholder}"
+                Text="{x:Bind ViewModel.TemplateDescription, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+        </controls:SettingsCard>
+
+        <StackPanel Grid.Row="2" Spacing="8">
+            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsEmailTemplates_ContentTitle}" />
+            <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="{x:Bind domain:Translator.SettingsEmailTemplates_ContentDescription}" />
+            <mailControls:EditorTabbedCommandBarControl CommandTarget="{x:Bind WebViewEditor}" />
+            <Border
+                MinHeight="420"
+                Background="{ThemeResource WinoContentZoneBackgroud}"
+                BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="7">
+                <mailControls:WebViewEditorControl x:Name="WebViewEditor" />
+            </Border>
+        </StackPanel>
+
+        <StackPanel
+            Grid.Row="3"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal"
+            Spacing="8">
+            <Button
+                Click="DeleteClicked"
+                Content="{x:Bind domain:Translator.Buttons_Delete}"
+                Style="{StaticResource AccentButtonStyle}"
+                Visibility="{x:Bind helpers:XamlHelpers.BoolToVisibilityConverter(ViewModel.IsExistingTemplate), Mode=OneWay}" />
+            <Button
+                Click="SaveClicked"
+                Content="{x:Bind domain:Translator.Buttons_Save}"
+                Style="{StaticResource AccentButtonStyle}" />
+        </StackPanel>
+    </Grid>
+</abstract:CreateEmailTemplatePageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml.cs
new file mode 100644
index 00000000..2ddf6946
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/CreateEmailTemplatePage.xaml.cs
@@ -0,0 +1,42 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class CreateEmailTemplatePage : CreateEmailTemplatePageAbstract
+{
+    public CreateEmailTemplatePage()
+    {
+        InitializeComponent();
+    }
+
+    protected async override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        var htmlContent = await ViewModel.LoadAsync(e.Parameter);
+        await WebViewEditor.RenderHtmlAsync(htmlContent);
+
+        if (!ViewModel.IsExistingTemplate)
+        {
+            TemplateNameTextBox.Focus(FocusState.Programmatic);
+        }
+    }
+
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        base.OnNavigatingFrom(e);
+        WebViewEditor.Dispose();
+    }
+
+    private async void SaveClicked(object sender, RoutedEventArgs e)
+    {
+        await ViewModel.SaveAsync(await WebViewEditor.GetHtmlBodyAsync() ?? string.Empty);
+    }
+
+    private async void DeleteClicked(object sender, RoutedEventArgs e)
+    {
+        await ViewModel.DeleteAsync();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml b/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml
new file mode 100644
index 00000000..8026c28f
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml
@@ -0,0 +1,44 @@
+<abstract:EmailTemplatesPageAbstract
+    x:Class="Wino.Views.Settings.EmailTemplatesPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:entities="using:Wino.Core.Domain.Entities.Mail"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <controls:SettingsCard
+                Click="NewTemplateClicked"
+                Description="{x:Bind domain:Translator.SettingsEmailTemplates_NewTemplateDescription}"
+                Header="{x:Bind domain:Translator.SettingsEmailTemplates_NewTemplateTitle}"
+                IsClickEnabled="True">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE710;" />
+                </controls:SettingsCard.HeaderIcon>
+            </controls:SettingsCard>
+
+            <ItemsControl ItemsSource="{x:Bind ViewModel.EmailTemplates, Mode=OneWay}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate x:DataType="entities:EmailTemplate">
+                        <controls:SettingsCard
+                            Margin="0,0,0,4"
+                            Click="TemplateClicked"
+                            Description="{x:Bind Description}"
+                            Header="{x:Bind Name}"
+                            IsClickEnabled="True"
+                            Tag="{x:Bind}">
+                            <controls:SettingsCard.HeaderIcon>
+                                <FontIcon Glyph="&#xE70F;" />
+                            </controls:SettingsCard.HeaderIcon>
+                        </controls:SettingsCard>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:EmailTemplatesPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml.cs
new file mode 100644
index 00000000..1c5cac1f
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/EmailTemplatesPage.xaml.cs
@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class EmailTemplatesPage : EmailTemplatesPageAbstract
+{
+    public EmailTemplatesPage()
+    {
+        InitializeComponent();
+    }
+
+    protected async override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+        await ViewModel.LoadAsync();
+    }
+
+    private void NewTemplateClicked(object sender, RoutedEventArgs e)
+    {
+        ViewModel.CreateTemplate();
+    }
+
+    private void TemplateClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is FrameworkElement element && element.Tag is EmailTemplate template)
+        {
+            ViewModel.OpenTemplate(template);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml b/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml
new file mode 100644
index 00000000..6a674f5b
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml
@@ -0,0 +1,102 @@
+<abstract:KeyboardShortcutsPageAbstract
+    x:Class="Wino.Views.Settings.KeyboardShortcutsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Core.ViewModels.Data"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="root"
+    Title="{x:Bind domain:Translator.Settings_KeyboardShortcuts_Title}"
+    mc:Ignorable="d">
+
+    <!--  Main Content  -->
+    <Grid Grid.Row="0">
+        <!--  Shortcuts List  -->
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <StackPanel
+            Grid.Row="0"
+            Margin="0,0,0,12"
+            Orientation="Horizontal">
+            <Button
+                Margin="0,0,8,0"
+                Command="{x:Bind ViewModel.StartAddingShortcutCommand}"
+                Content="{x:Bind domain:Translator.KeyboardShortcuts_Add}" />
+            <Button
+                Command="{x:Bind ViewModel.ResetToDefaultsCommand}"
+                Content="{x:Bind domain:Translator.KeyboardShortcuts_ResetToDefaults}"
+                Style="{ThemeResource AccentButtonStyle}" />
+        </StackPanel>
+
+        <ListView
+            Grid.Row="1"
+            ItemsSource="{x:Bind ViewModel.Shortcuts, Mode=OneWay}"
+            SelectionMode="None">
+            <ListView.ItemTemplate>
+                <DataTemplate x:DataType="data:KeyboardShortcutViewModel">
+                    <Border
+                        Margin="0,4"
+                        Padding="16,12"
+                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1"
+                        CornerRadius="4">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <StackPanel Grid.Column="0">
+                                <TextBlock
+                                    Margin="0,0,0,4"
+                                    Style="{ThemeResource BodyStrongTextBlockStyle}"
+                                    Text="{x:Bind ActionDisplayName}" />
+                                <TextBlock
+                                    Opacity="0.8"
+                                    Style="{ThemeResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind DisplayName}" />
+                            </StackPanel>
+
+                            <TextBlock
+                                Grid.Column="1"
+                                Margin="8,0"
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{ThemeResource CaptionTextBlockStyle}"
+                                Text="{x:Bind ModeDisplayName}" />
+
+                            <Button
+                                Grid.Column="2"
+                                Margin="4,0"
+                                Click="EditShortcut_Click"
+                                CommandParameter="{x:Bind}"
+                                Content="&#xE70F;"
+                                FontFamily="Segoe MDL2 Assets"
+                                Style="{ThemeResource SubtleButtonStyle}"
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Buttons_Edit}" />
+
+                            <Button
+                                Grid.Column="3"
+                                Margin="4,0"
+                                Click="DeleteShortcut_Click"
+                                CommandParameter="{x:Bind}"
+                                Content="&#xE74D;"
+                                FontFamily="Segoe MDL2 Assets"
+                                Style="{ThemeResource SubtleButtonStyle}"
+                                ToolTipService.ToolTip="{x:Bind domain:Translator.Buttons_Delete}" />
+                        </Grid>
+                    </Border>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </Grid>
+</abstract:KeyboardShortcutsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml.cs
new file mode 100644
index 00000000..ac97c17a
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/KeyboardShortcutsPage.xaml.cs
@@ -0,0 +1,29 @@
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.ViewModels.Data;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class KeyboardShortcutsPage : KeyboardShortcutsPageAbstract
+{
+    public KeyboardShortcutsPage()
+    {
+        this.InitializeComponent();
+    }
+
+    private void EditShortcut_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is KeyboardShortcutViewModel shortcut)
+        {
+            ViewModel.StartEditingShortcutCommand.Execute(shortcut);
+        }
+    }
+
+    private void DeleteShortcut_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is KeyboardShortcutViewModel shortcut)
+        {
+            ViewModel.DeleteShortcutCommand.Execute(shortcut);
+        }
+    }
+}
diff --git a/Wino.Mail/Views/Settings/MessageListPage.xaml b/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml
similarity index 82%
rename from Wino.Mail/Views/Settings/MessageListPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml
index 036cd906..dac301a9 100644
--- a/Wino.Mail/Views/Settings/MessageListPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml
@@ -1,9 +1,10 @@
-<abstract:MessageListPageAbstract
+<abstract:MessageListPageAbstract
     x:Class="Wino.Views.Settings.MessageListPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:controls1="using:Wino.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -18,6 +19,38 @@
                 </TransitionCollection>
             </StackPanel.ChildrenTransitions>
 
+            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsMailSpacing_Description}" Header="{x:Bind domain:Translator.SettingsMailSpacing_Title}">
+                <controls:SettingsExpander.HeaderIcon>
+                    <PathIcon Data="F1 M 17.5 9.375 C 17.832031 9.375 18.149414 9.440104 18.452148 9.570312 C 18.754883 9.700521 19.020182 9.876303 19.248047 10.097656 C 19.47591 10.319011 19.658203 10.579428 19.794922 10.878906 C 19.931641 11.178386 20 11.494141 20 11.826172 L 20 15.048828 C 20 15.37435 19.933268 15.685222 19.799805 15.981445 C 19.66634 16.27767 19.487305 16.538086 19.262695 16.762695 C 19.038086 16.987305 18.777668 17.166342 18.481445 17.299805 C 18.185221 17.433268 17.874348 17.5 17.548828 17.5 L 2.451172 17.5 C 2.125651 17.5 1.814779 17.433268 1.518555 17.299805 C 1.222331 17.166342 0.961914 16.987305 0.737305 16.762695 C 0.512695 16.538086 0.333659 16.27767 0.200195 15.981445 C 0.066732 15.685222 0 15.37435 0 15.048828 L 0 4.951172 C 0 4.625651 0.066732 4.314779 0.200195 4.018555 C 0.333659 3.722332 0.512695 3.461914 0.737305 3.237305 C 0.961914 3.012695 1.222331 2.83366 1.518555 2.700195 C 1.814779 2.566732 2.125651 2.5 2.451172 2.5 L 12.548828 2.5 C 12.887369 2.5 13.203125 2.565105 13.496094 2.695312 C 13.789062 2.825521 14.044596 3.00293 14.262695 3.227539 C 14.480793 3.452148 14.654947 3.712566 14.785156 4.008789 C 14.915364 4.305014 14.986979 4.619141 15 4.951172 C 15.00651 5.022787 15.009766 5.094402 15.009766 5.166016 C 15.009766 5.237631 15.009766 5.309245 15.009766 5.380859 C 15.009766 5.5306 15.008138 5.677084 15.004883 5.820312 C 15.001627 5.963542 14.999999 6.106771 15 6.25 C 15.33203 6.25 15.649413 6.315104 15.952148 6.445312 C 16.254883 6.575521 16.520182 6.751303 16.748047 6.972656 C 16.97591 7.194011 17.156574 7.4528 17.290039 7.749023 C 17.423502 8.045248 17.493488 8.362631 17.5 8.701172 Z M 1.25 15 C 1.25 15.175781 1.282552 15.34017 1.347656 15.493164 C 1.41276 15.646159 1.500651 15.777995 1.611328 15.888672 C 1.722005 15.99935 1.853841 16.08724 2.006836 16.152344 C 2.159831 16.217449 2.324219 16.25 2.5 16.25 L 6.582031 16.25 C 6.360677 15.859375 6.25 15.442709 6.25 15 L 6.25 8.701172 C 6.25 8.362631 6.318359 8.045248 6.455078 7.749023 C 6.591797 7.4528 6.774088 7.194011 7.001953 6.972656 C 7.229817 6.751303 7.495117 6.575521 7.797852 6.445312 C 8.100586 6.315104 8.417969 6.25 8.75 6.25 L 13.75 6.25 L 13.75 5 C 13.75 4.830729 13.717447 4.669597 13.652344 4.516602 C 13.587239 4.363607 13.497721 4.230144 13.383789 4.116211 C 13.269855 4.002279 13.136393 3.912762 12.983398 3.847656 C 12.830403 3.782553 12.669271 3.75 12.5 3.75 L 2.5 3.75 C 2.324219 3.75 2.161458 3.782553 2.011719 3.847656 C 1.861979 3.912762 1.730143 4.002279 1.616211 4.116211 C 1.502279 4.230144 1.41276 4.361979 1.347656 4.511719 C 1.282552 4.661459 1.25 4.82422 1.25 5 Z M 12.207031 16.25 C 11.985677 15.859375 11.875 15.442709 11.875 15 L 11.875 11.826172 C 11.875 11.487631 11.943359 11.170248 12.080078 10.874023 C 12.216797 10.5778 12.399088 10.319011 12.626953 10.097656 C 12.854817 9.876303 13.120117 9.700521 13.422852 9.570312 C 13.725586 9.440104 14.042969 9.375 14.375 9.375 L 16.25 9.375 L 16.25 8.75 C 16.25 8.580729 16.217447 8.419597 16.152344 8.266602 C 16.087238 8.113607 15.997721 7.980144 15.883789 7.866211 C 15.769856 7.752279 15.636393 7.662762 15.483398 7.597656 C 15.330403 7.532553 15.169271 7.5 15 7.5 L 8.75 7.5 C 8.574219 7.5 8.411458 7.532553 8.261719 7.597656 C 8.111979 7.662762 7.980143 7.752279 7.866211 7.866211 C 7.752278 7.980144 7.66276 8.111979 7.597656 8.261719 C 7.532552 8.411459 7.5 8.574219 7.5 8.75 L 7.5 15 C 7.5 15.175781 7.532552 15.34017 7.597656 15.493164 C 7.66276 15.646159 7.750651 15.777995 7.861328 15.888672 C 7.972005 15.99935 8.103841 16.08724 8.256836 16.152344 C 8.40983 16.217449 8.574219 16.25 8.75 16.25 Z M 18.75 11.875 C 18.75 11.705729 18.717447 11.544597 18.652344 11.391602 C 18.587238 11.238607 18.497721 11.105144 18.383789 10.991211 C 18.269855 10.877279 18.136393 10.787761 17.983398 10.722656 C 17.830402 10.657553 17.66927 10.625 17.5 10.625 L 14.375 10.625 C 14.199219 10.625 14.036458 10.657553 13.886719 10.722656 C 13.736979 10.787761 13.605143 10.877279 13.491211 10.991211 C 13.377278 11.105144 13.28776 11.236979 13.222656 11.386719 C 13.157551 11.536459 13.124999 11.699219 13.125 11.875 L 13.125 15 C 13.124999 15.175781 13.157551 15.34017 13.222656 15.493164 C 13.28776 15.646159 13.37565 15.777995 13.486328 15.888672 C 13.597004 15.99935 13.72884 16.08724 13.881836 16.152344 C 14.03483 16.217449 14.199219 16.25 14.375 16.25 L 17.5 16.25 C 17.675781 16.25 17.838541 16.217449 17.988281 16.152344 C 18.13802 16.08724 18.269855 15.997722 18.383789 15.883789 C 18.497721 15.769857 18.587238 15.638021 18.652344 15.488281 C 18.717447 15.338542 18.75 15.175781 18.75 15 Z " />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard VerticalAlignment="Center" HorizontalContentAlignment="Center">
+                        <controls:SettingsCard.Header>
+                            <controls1:MailItemDisplayInformationControl
+                                x:Name="PreviewMailItemDisplayInformationControl"
+                                DisplayMode="{x:Bind ViewModel.SelectedMailSpacingMode, Mode=OneWay}"
+                                MailItemInformation="{x:Bind ViewModel.DemoPreviewMailItemInformation, Mode=OneWay}" />
+                        </controls:SettingsCard.Header>
+                        <controls:SettingsCard.Content>
+                            <RadioButtons SelectedIndex="{x:Bind ViewModel.SelectedMailSpacingIndex, Mode=TwoWay}">
+                                <RadioButton Content="{x:Bind domain:Translator.SettingsPersonalizationMailDisplayCompactMode}" />
+                                <RadioButton Content="{x:Bind domain:Translator.SettingsPersonalizationMailDisplayMediumMode}" />
+                                <RadioButton Content="{x:Bind domain:Translator.SettingsPersonalizationMailDisplaySpaciousMode}" />
+                            </RadioButtons>
+                        </controls:SettingsCard.Content>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+
+            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsPaneLengthReset_Description}" Header="{x:Bind domain:Translator.SettingsPaneLengthReset_Title}">
+                <controls:SettingsCard.HeaderIcon>
+                    <PathIcon Data="F1 M 3.056641 17.5 C 2.646484 17.5 2.255859 17.416992 1.884766 17.250977 C 1.513672 17.084961 1.189779 16.863607 0.913086 16.586914 C 0.636393 16.310221 0.415039 15.986328 0.249023 15.615234 C 0.083008 15.244141 0 14.853516 0 14.443359 L 0 5.556641 C 0 5.146485 0.083008 4.75586 0.249023 4.384766 C 0.415039 4.013673 0.636393 3.689779 0.913086 3.413086 C 1.189779 3.136395 1.513672 2.915039 1.884766 2.749023 C 2.255859 2.583008 2.646484 2.5 3.056641 2.5 L 16.943359 2.5 C 17.353516 2.5 17.744141 2.583008 18.115234 2.749023 C 18.486328 2.915039 18.810221 3.136395 19.086914 3.413086 C 19.363605 3.689779 19.584961 4.013673 19.750977 4.384766 C 19.916992 4.75586 20 5.146485 20 5.556641 L 20 14.443359 C 20 14.853516 19.916992 15.244141 19.750977 15.615234 C 19.584961 15.986328 19.363605 16.310221 19.086914 16.586914 C 18.810221 16.863607 18.486328 17.084961 18.115234 17.250977 C 17.744141 17.416992 17.353516 17.5 16.943359 17.5 Z M 12.5 16.25 L 12.5 3.75 L 3.125 3.75 C 2.871094 3.75 2.630208 3.798828 2.402344 3.896484 C 2.174479 3.994141 1.974284 4.129232 1.801758 4.301758 C 1.629232 4.474285 1.494141 4.67448 1.396484 4.902344 C 1.298828 5.130209 1.25 5.371094 1.25 5.625 L 1.25 14.375 C 1.25 14.628906 1.298828 14.869792 1.396484 15.097656 C 1.494141 15.325521 1.629232 15.525717 1.801758 15.698242 C 1.974284 15.870769 2.174479 16.005859 2.402344 16.103516 C 2.630208 16.201172 2.871094 16.25 3.125 16.25 Z M 16.875 16.25 C 17.128906 16.25 17.369791 16.201172 17.597656 16.103516 C 17.82552 16.005859 18.025715 15.870769 18.198242 15.698242 C 18.370768 15.525717 18.505859 15.325521 18.603516 15.097656 C 18.701172 14.869792 18.75 14.628906 18.75 14.375 L 18.75 5.625 C 18.75 5.371094 18.701172 5.130209 18.603516 4.902344 C 18.505859 4.67448 18.370768 4.474285 18.198242 4.301758 C 18.025715 4.129232 17.82552 3.994141 17.597656 3.896484 C 17.369791 3.798828 17.128906 3.75 16.875 3.75 L 13.75 3.75 L 13.75 16.25 Z M 7.5 11.875 C 7.5 11.705729 7.561849 11.559245 7.685547 11.435547 L 9.121094 10 L 3.125 10 C 2.955729 10 2.809245 9.938151 2.685547 9.814453 C 2.561849 9.690756 2.5 9.544271 2.5 9.375 C 2.5 9.205729 2.561849 9.059245 2.685547 8.935547 C 2.809245 8.81185 2.955729 8.75 3.125 8.75 L 9.121094 8.75 L 7.685547 7.314453 C 7.561849 7.190756 7.5 7.044271 7.5 6.875 C 7.5 6.705729 7.561849 6.559245 7.685547 6.435547 C 7.809245 6.31185 7.955729 6.25 8.125 6.25 C 8.294271 6.25 8.440755 6.31185 8.564453 6.435547 L 11.064453 8.935547 C 11.18815 9.059245 11.25 9.205729 11.25 9.375 C 11.25 9.544271 11.18815 9.690756 11.064453 9.814453 L 8.564453 12.314453 C 8.440755 12.438151 8.294271 12.5 8.125 12.5 C 7.955729 12.5 7.809245 12.438151 7.685547 12.314453 C 7.561849 12.190756 7.5 12.044271 7.5 11.875 Z " />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.Content>
+                    <Button Command="{x:Bind ViewModel.ResetMailListPaneLengthCommand}" Content="{x:Bind domain:Translator.Buttons_Reset}" />
+                </controls:SettingsCard.Content>
+            </controls:SettingsCard>
+
             <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsHoverActions_Description}" Header="{x:Bind domain:Translator.SettingsHoverActions_Title}">
                 <controls:SettingsExpander.HeaderIcon>
                     <PathIcon Data="F1 M 19.980469 12.802734 C 19.980469 13.206381 19.895832 13.59375 19.726562 13.964844 L 18.466797 16.777344 C 18.304035 17.141928 18.066406 17.447916 17.753906 17.695312 C 17.441406 17.942709 17.089844 18.108725 16.699219 18.193359 L 14.335938 18.691406 C 14.153645 18.723959 13.987629 18.740234 13.837891 18.740234 C 13.447266 18.740234 13.082682 18.658854 12.744141 18.496094 C 12.405599 18.333334 12.106119 18.108725 11.845703 17.822266 C 11.539713 17.490234 11.223958 17.163086 10.898438 16.84082 C 10.572916 16.518555 10.231119 16.21582 9.873047 15.932617 C 9.514974 15.649414 9.140625 15.393881 8.75 15.166016 C 8.359375 14.938151 7.949219 14.746094 7.519531 14.589844 C 7.591146 14.752604 7.661133 14.916992 7.729492 15.083008 C 7.797852 15.249023 7.832031 15.423178 7.832031 15.605469 C 7.832031 15.846354 7.768555 16.069336 7.641602 16.274414 C 7.514648 16.479492 7.340495 16.634115 7.119141 16.738281 L 5.878906 17.324219 C 5.709635 17.402344 5.530599 17.441406 5.341797 17.441406 C 5.08138 17.441406 4.845377 17.369791 4.633789 17.226562 C 4.4222 17.083334 4.270833 16.891275 4.179688 16.650391 L 3.222656 14.189453 L 1.650391 16.015625 C 1.461589 16.236979 1.227214 16.347656 0.947266 16.347656 C 0.680339 16.347656 0.455729 16.25651 0.273438 16.074219 C 0.091146 15.891928 0 15.667318 0 15.400391 L 0 3.847656 C 0 3.58073 0.091146 3.356121 0.273438 3.173828 C 0.455729 2.991537 0.680339 2.900391 0.947266 2.900391 C 1.181641 2.900391 1.393229 2.985027 1.582031 3.154297 L 9.658203 10.703125 C 9.847005 10.878906 9.954427 11.08724 9.980469 11.328125 C 10.195312 11.354167 10.408528 11.381836 10.620117 11.411133 C 10.831705 11.44043 11.041666 11.474609 11.25 11.513672 L 11.25 6.875 C 11.25 6.621095 11.298828 6.380209 11.396484 6.152344 C 11.494141 5.924479 11.629231 5.724284 11.801758 5.551758 C 11.974283 5.379232 12.174479 5.244142 12.402344 5.146484 C 12.630207 5.048829 12.871093 5.000001 13.125 5 C 13.378905 5.000001 13.619791 5.048829 13.847656 5.146484 C 14.075521 5.244142 14.275716 5.379232 14.448242 5.551758 C 14.620768 5.724284 14.755858 5.924479 14.853516 6.152344 C 14.951171 6.380209 14.999999 6.621095 15 6.875 L 15 9.492188 L 17.734375 10.058594 C 18.144531 10.143229 18.522135 10.315756 18.867188 10.576172 C 19.212238 10.836589 19.479166 11.1556 19.667969 11.533203 C 19.765625 11.728516 19.842121 11.933594 19.897461 12.148438 C 19.952799 12.363281 19.980469 12.581381 19.980469 12.802734 Z M 5.341797 16.191406 L 6.582031 15.605469 L 5.351562 12.539062 C 5.305989 12.428386 5.283203 12.311198 5.283203 12.1875 C 5.283203 11.927084 5.374349 11.705729 5.556641 11.523438 C 5.738932 11.341146 5.960286 11.25 6.220703 11.25 L 8.417969 11.25 L 1.25 4.560547 L 1.25 14.560547 L 2.607422 12.978516 C 2.698568 12.87435 2.80599 12.792969 2.929688 12.734375 C 3.053385 12.675781 3.183594 12.646484 3.320312 12.646484 C 3.509114 12.646484 3.683268 12.701823 3.842773 12.8125 C 4.002278 12.923178 4.117838 13.066406 4.189453 13.242188 Z M 18.730469 12.8125 C 18.730469 12.630209 18.699543 12.454428 18.637695 12.285156 C 18.575846 12.115886 18.489582 11.962891 18.378906 11.826172 C 18.268229 11.689453 18.136393 11.573894 17.983398 11.479492 C 17.830402 11.385092 17.66276 11.318359 17.480469 11.279297 L 14.248047 10.615234 C 14.104816 10.582683 13.986002 10.50944 13.891602 10.395508 C 13.7972 10.281576 13.75 10.14974 13.75 10 L 13.75 6.875 C 13.75 6.705729 13.68815 6.559245 13.564453 6.435547 C 13.440755 6.31185 13.294271 6.25 13.125 6.25 C 12.955729 6.25 12.809244 6.31185 12.685547 6.435547 C 12.561849 6.559245 12.5 6.705729 12.5 6.875 L 12.5 12.294922 C 12.5 12.464193 12.439778 12.610678 12.319336 12.734375 C 12.198893 12.858073 12.054036 12.919922 11.884766 12.919922 C 11.767578 12.919922 11.652018 12.903646 11.538086 12.871094 C 11.424153 12.838542 11.311849 12.809245 11.201172 12.783203 C 10.810547 12.698568 10.416666 12.630209 10.019531 12.578125 C 9.622396 12.526042 9.222005 12.5 8.818359 12.5 C 8.68815 12.5 8.55957 12.503256 8.432617 12.509766 C 8.305664 12.516276 8.185221 12.53418 8.071289 12.563477 C 7.957356 12.592773 7.849935 12.643229 7.749023 12.714844 C 7.648112 12.786459 7.558594 12.884115 7.480469 13.007812 C 7.5 13.11849 7.558594 13.204753 7.65625 13.266602 C 7.753906 13.328451 7.848307 13.375651 7.939453 13.408203 C 8.447266 13.610026 8.916016 13.836264 9.345703 14.086914 C 9.775391 14.337565 10.183919 14.611003 10.571289 14.907227 C 10.958658 15.203451 11.333008 15.525717 11.694336 15.874023 C 12.055664 16.222332 12.418619 16.595053 12.783203 16.992188 C 12.919922 17.141928 13.079427 17.262369 13.261719 17.353516 C 13.44401 17.444662 13.639322 17.490234 13.847656 17.490234 C 13.886719 17.490234 13.925781 17.490234 13.964844 17.490234 C 14.003906 17.490234 14.042969 17.483725 14.082031 17.470703 L 16.445312 16.972656 C 16.640625 16.927084 16.814777 16.842447 16.967773 16.71875 C 17.120768 16.595053 17.239582 16.442057 17.324219 16.259766 L 18.59375 13.447266 C 18.684895 13.245443 18.730469 13.033854 18.730469 12.8125 Z " />
@@ -107,14 +140,6 @@
                 <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=TwoWay}" />
             </controls:SettingsCard>
 
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsSemanticZoom_Description}" Header="{x:Bind domain:Translator.SettingsSemanticZoom_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 4.306641 18.75 C 3.896484 18.75 3.505859 18.666992 3.134766 18.500977 C 2.763672 18.334961 2.439779 18.113607 2.163086 17.836914 C 1.886393 17.560221 1.665039 17.236328 1.499023 16.865234 C 1.333008 16.494141 1.25 16.103516 1.25 15.693359 L 1.25 4.306641 C 1.25 3.896484 1.333008 3.505859 1.499023 3.134766 C 1.665039 2.763672 1.886393 2.439779 2.163086 2.163086 C 2.439779 1.886395 2.763672 1.665039 3.134766 1.499023 C 3.505859 1.333008 3.896484 1.25 4.306641 1.25 L 15.693359 1.25 C 16.103516 1.25 16.494141 1.333008 16.865234 1.499023 C 17.236328 1.665039 17.560221 1.886395 17.836914 2.163086 C 18.113605 2.439779 18.334961 2.763672 18.500977 3.134766 C 18.666992 3.505859 18.75 3.896484 18.75 4.306641 L 18.75 15.693359 C 18.75 16.103516 18.666992 16.494141 18.500977 16.865234 C 18.334961 17.236328 18.113605 17.560221 17.836914 17.836914 C 17.560221 18.113607 17.236328 18.334961 16.865234 18.500977 C 16.494141 18.666992 16.103516 18.75 15.693359 18.75 L 11.875 18.75 L 11.875 17.5 L 15.625 17.5 C 15.878906 17.5 16.119791 17.451172 16.347656 17.353516 C 16.57552 17.255859 16.775715 17.120768 16.948242 16.948242 C 17.120768 16.775717 17.255859 16.575521 17.353516 16.347656 C 17.451172 16.119791 17.5 15.878906 17.5 15.625 L 17.5 6.25 L 2.5 6.25 L 2.5 15.625 C 2.5 15.878906 2.548828 16.119791 2.646484 16.347656 C 2.744141 16.575521 2.879232 16.775717 3.051758 16.948242 C 3.224284 17.120768 3.424479 17.255859 3.652344 17.353516 C 3.880208 17.451172 4.121094 17.5 4.375 17.5 L 8.125 17.5 L 8.125 18.75 Z M 2.5 5 L 17.5 5 L 17.5 4.375 C 17.5 4.121094 17.451172 3.880209 17.353516 3.652344 C 17.255859 3.42448 17.120768 3.224285 16.948242 3.051758 C 16.775715 2.879232 16.57552 2.744141 16.347656 2.646484 C 16.119791 2.548828 15.878906 2.5 15.625 2.5 L 4.375 2.5 C 4.121094 2.5 3.880208 2.548828 3.652344 2.646484 C 3.424479 2.744141 3.224284 2.879232 3.051758 3.051758 C 2.879232 3.224285 2.744141 3.42448 2.646484 3.652344 C 2.548828 3.880209 2.5 4.121094 2.5 4.375 Z M 8.75 8.75 C 8.75 8.574219 8.782552 8.411459 8.847656 8.261719 C 8.91276 8.111979 9.002278 7.980144 9.116211 7.866211 C 9.230143 7.752279 9.361979 7.662762 9.511719 7.597656 C 9.661458 7.532553 9.824219 7.5 10 7.5 C 10.169271 7.5 10.330403 7.532553 10.483398 7.597656 C 10.636393 7.662762 10.769856 7.752279 10.883789 7.866211 C 10.997721 7.980144 11.087239 8.113607 11.152344 8.266602 C 11.217447 8.419597 11.25 8.580729 11.25 8.75 C 11.25 8.925781 11.217447 9.088542 11.152344 9.238281 C 11.087239 9.388021 10.997721 9.519857 10.883789 9.633789 C 10.769856 9.747722 10.638021 9.83724 10.488281 9.902344 C 10.338541 9.967448 10.175781 10 10 10 C 9.824219 10 9.65983 9.967448 9.506836 9.902344 C 9.353841 9.83724 9.222005 9.74935 9.111328 9.638672 C 9.00065 9.527995 8.91276 9.396159 8.847656 9.243164 C 8.782552 9.09017 8.75 8.925781 8.75 8.75 Z M 9.375 14.462891 L 8.525391 15.166016 C 8.408203 15.263672 8.274739 15.3125 8.125 15.3125 C 7.955729 15.3125 7.809245 15.250651 7.685547 15.126953 C 7.561849 15.003256 7.5 14.856771 7.5 14.6875 C 7.5 14.485678 7.574869 14.326172 7.724609 14.208984 L 9.599609 12.646484 C 9.716797 12.548828 9.85026 12.5 10 12.5 C 10.149739 12.5 10.283203 12.548828 10.400391 12.646484 L 12.275391 14.208984 C 12.42513 14.326172 12.5 14.485678 12.5 14.6875 C 12.5 14.856771 12.43815 15.003256 12.314453 15.126953 C 12.190754 15.250651 12.04427 15.3125 11.875 15.3125 C 11.72526 15.3125 11.591797 15.263672 11.474609 15.166016 L 10.625 14.462891 L 10.625 19.375 C 10.625 19.544271 10.56315 19.690756 10.439453 19.814453 C 10.315755 19.93815 10.169271 20 10 20 C 9.830729 20 9.684244 19.93815 9.560547 19.814453 C 9.436849 19.690756 9.375 19.544271 9.375 19.375 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsSemanticZoomEnabled, Mode=TwoWay}" />
-            </controls:SettingsCard>
-
             <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsDeleteProtection_Description}" Header="{x:Bind domain:Translator.SettingsDeleteProtection_Title}">
                 <controls:SettingsCard.HeaderIcon>
                     <PathIcon Data="F1 M 17.5 7.65625 L 17.5 17.548828 C 17.5 17.87435 17.433268 18.185221 17.299805 18.481445 C 17.16634 18.77767 16.987305 19.038086 16.762695 19.262695 C 16.538086 19.487305 16.277668 19.666342 15.981445 19.799805 C 15.685221 19.933268 15.374349 20 15.048828 20 L 8.75 20 L 8.75 18.75 L 15 18.75 C 15.17578 18.75 15.338541 18.717447 15.488281 18.652344 C 15.638021 18.58724 15.769856 18.497721 15.883789 18.383789 C 15.997721 18.269857 16.087238 18.138021 16.152344 17.988281 C 16.217447 17.838541 16.25 17.675781 16.25 17.5 L 16.25 7.65625 C 16.25 7.630209 16.25 7.604167 16.25 7.578125 C 16.25 7.552084 16.246744 7.526042 16.240234 7.5 L 12.451172 7.5 C 12.11263 7.5 11.795247 7.431641 11.499023 7.294922 C 11.202799 7.158203 10.94401 6.975912 10.722656 6.748047 C 10.501302 6.520184 10.325521 6.254884 10.195312 5.952148 C 10.065104 5.649415 10 5.332032 10 5 L 10 1.259766 C 9.973958 1.253256 9.947916 1.25 9.921875 1.25 C 9.895833 1.25 9.869791 1.25 9.84375 1.25 L 5 1.25 C 4.824219 1.25 4.661458 1.282553 4.511719 1.347656 C 4.361979 1.412762 4.230143 1.502279 4.116211 1.616211 C 4.002278 1.730145 3.91276 1.86198 3.847656 2.011719 C 3.782552 2.161459 3.75 2.324219 3.75 2.5 L 3.75 8.75 C 3.307292 8.75 2.890625 8.821615 2.5 8.964844 L 2.5 2.451172 C 2.5 2.125652 2.566732 1.814779 2.700195 1.518555 C 2.833659 1.222332 3.012695 0.961914 3.237305 0.737305 C 3.461914 0.512695 3.722331 0.33366 4.018555 0.200195 C 4.314778 0.066732 4.625651 0 4.951172 0 L 9.84375 0 C 10.175781 0 10.494791 0.063477 10.800781 0.19043 C 11.106771 0.317383 11.376953 0.498047 11.611328 0.732422 L 16.767578 5.888672 C 17.001953 6.123047 17.182617 6.393229 17.30957 6.699219 C 17.436523 7.005209 17.5 7.324219 17.5 7.65625 Z M 11.25 5 C 11.25 5.175782 11.282552 5.34017 11.347656 5.493164 C 11.41276 5.646159 11.50065 5.777995 11.611328 5.888672 C 11.722005 5.99935 11.853841 6.08724 12.006836 6.152344 C 12.15983 6.217448 12.324219 6.25 12.5 6.25 L 15.371094 6.25 L 11.25 2.128906 Z M 7.5 14.375 L 7.5 19.375 C 7.5 19.544271 7.43815 19.690756 7.314453 19.814453 C 7.190755 19.93815 7.044271 20 6.875 20 L 0.625 20 C 0.455729 20 0.309245 19.93815 0.185547 19.814453 C 0.061849 19.690756 0 19.544271 0 19.375 L 0 14.375 C 0 14.231771 0.027669 14.119467 0.083008 14.038086 C 0.138346 13.956706 0.209961 13.894857 0.297852 13.852539 C 0.385742 13.810222 0.485026 13.782553 0.595703 13.769531 C 0.70638 13.756511 0.817057 13.75 0.927734 13.75 L 1.25 13.75 L 1.25 12.5 C 1.25 12.154948 1.315104 11.829428 1.445312 11.523438 C 1.575521 11.217448 1.75293 10.952148 1.977539 10.727539 C 2.202148 10.50293 2.467448 10.325521 2.773438 10.195312 C 3.079427 10.065104 3.404948 10 3.75 10 C 4.095052 10 4.420573 10.065104 4.726562 10.195312 C 5.032552 10.325521 5.297852 10.50293 5.522461 10.727539 C 5.74707 10.952148 5.924479 11.217448 6.054688 11.523438 C 6.184896 11.829428 6.25 12.154948 6.25 12.5 L 6.25 13.75 L 6.582031 13.75 C 6.692708 13.75 6.803385 13.756511 6.914062 13.769531 C 7.024739 13.782553 7.124023 13.810222 7.211914 13.852539 C 7.299805 13.894857 7.369792 13.958334 7.421875 14.042969 C 7.473958 14.127604 7.5 14.238281 7.5 14.375 Z M 2.5 13.75 L 5 13.75 L 5 12.5 C 5 12.324219 4.967448 12.161459 4.902344 12.011719 C 4.837239 11.861979 4.747721 11.730144 4.633789 11.616211 C 4.519856 11.502279 4.388021 11.412761 4.238281 11.347656 C 4.088542 11.282553 3.925781 11.25 3.75 11.25 C 3.574219 11.25 3.411458 11.282553 3.261719 11.347656 C 3.111979 11.412761 2.980143 11.502279 2.866211 11.616211 C 2.752279 11.730144 2.66276 11.861979 2.597656 12.011719 C 2.532552 12.161459 2.5 12.324219 2.5 12.5 Z M 5 16.875 C 5 16.705729 4.967448 16.544596 4.902344 16.391602 C 4.837239 16.238607 4.747721 16.105145 4.633789 15.991211 C 4.519856 15.877279 4.386393 15.787761 4.233398 15.722656 C 4.080403 15.657553 3.919271 15.625 3.75 15.625 C 3.574219 15.625 3.411458 15.657553 3.261719 15.722656 C 3.111979 15.787761 2.980143 15.877279 2.866211 15.991211 C 2.752279 16.105145 2.66276 16.23698 2.597656 16.386719 C 2.532552 16.536459 2.5 16.699219 2.5 16.875 C 2.5 17.050781 2.532552 17.21517 2.597656 17.368164 C 2.66276 17.521158 2.750651 17.652994 2.861328 17.763672 C 2.972005 17.87435 3.103841 17.96224 3.256836 18.027344 C 3.409831 18.092447 3.574219 18.125 3.75 18.125 C 3.925781 18.125 4.088542 18.092447 4.238281 18.027344 C 4.388021 17.96224 4.519856 17.872721 4.633789 17.758789 C 4.747721 17.644857 4.837239 17.513021 4.902344 17.363281 C 4.967448 17.213541 5 17.050781 5 16.875 Z " />
@@ -140,16 +165,16 @@
                         VerticalContentAlignment="Stretch"
                         ContentAlignment="Vertical">
                         <StackPanel>
-                            <muxc:RadioButtons SelectedIndex="{x:Bind ViewModel.SelectedMarkAsOptionIndex, Mode=TwoWay}">
+                            <RadioButtons SelectedIndex="{x:Bind ViewModel.SelectedMarkAsOptionIndex, Mode=TwoWay}">
                                 <RadioButton Content="{x:Bind domain:Translator.SettingsMarkAsRead_WhenSelected}" />
                                 <RadioButton Content="{x:Bind domain:Translator.SettingsMarkAsRead_DontChange}" />
                                 <RadioButton
                                     x:Name="TimerMarkAsRadio"
                                     Content="{x:Bind domain:Translator.SettingsMarkAsRead_Timer}"
                                     Visibility="Collapsed" />
-                            </muxc:RadioButtons>
+                            </RadioButtons>
 
-                            <muxc:NumberBox
+                            <NumberBox
                                 HorizontalAlignment="Left"
                                 Header="{x:Bind domain:Translator.SettingsMarkAsRead_SecondsToWait}"
                                 IsEnabled="{x:Bind TimerMarkAsRadio.IsChecked.GetValueOrDefault(), Mode=OneWay}"
diff --git a/Wino.Mail/Views/Settings/MessageListPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml.cs
similarity index 85%
rename from Wino.Mail/Views/Settings/MessageListPage.xaml.cs
rename to Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml.cs
index f5ac9b01..60631932 100644
--- a/Wino.Mail/Views/Settings/MessageListPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Settings/MessageListPage.xaml.cs
@@ -1,4 +1,4 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
 
diff --git a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
similarity index 86%
rename from Wino.Calendar/Views/Settings/PersonalizationPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
index 0a66743a..1c93662a 100644
--- a/Wino.Calendar/Views/Settings/PersonalizationPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml
@@ -1,18 +1,64 @@
-<abstract:PersonalizationPageAbstract
-    x:Class="Wino.Calendar.Views.Settings.PersonalizationPage"
+<abstract:PersonalizationPageAbstract
+    x:Class="Wino.Views.Settings.PersonalizationPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Calendar.Views.Abstract"
+    xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:controls1="using:Wino.Controls"
+    xmlns:coreSelectors="using:Wino.Mail.WinUI.Selectors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="using:Wino.Core.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Calendar.Views.Settings"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mailSelectors="using:Wino.Selectors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:personalization="using:Wino.Mail.WinUI.Models.Personalization"
+    xmlns:personalization1="using:Wino.Core.Domain.Models.Personalization"
+    xmlns:selectors="using:Wino.Selectors"
     xmlns:toolkitExt="using:CommunityToolkit.WinUI"
+    xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
+    x:Name="root"
+    Title="Personalization"
     mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Key="CompactDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
+            <controls1:MailItemDisplayInformationControl
+                DisplayMode="Compact"
+                MailItemInformation="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailItemInformation}"
+                ShowPreviewText="False" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="MediumDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
+            <controls1:MailItemDisplayInformationControl
+                DisplayMode="Medium"
+                MailItemInformation="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailItemInformation}"
+                ShowPreviewText="True" />
+        </DataTemplate>
+
+        <DataTemplate x:Key="SpaciousDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
+            <controls1:MailItemDisplayInformationControl
+                DisplayMode="Spacious"
+                MailItemInformation="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailItemInformation}"
+                ShowPreviewText="True" />
+        </DataTemplate>
+
+        <mailSelectors:MailItemDisplayModePreviewTemplateSelector
+            x:Key="MailItemDisplayModePreviewTemplateSelector"
+            CompactTemplate="{StaticResource CompactDisplayModePreviewTemplate}"
+            MediumTemplate="{StaticResource MediumDisplayModePreviewTemplate}"
+            SpaciousTemplate="{StaticResource SpaciousDisplayModePreviewTemplate}" />
+    </Page.Resources>
+
     <ScrollViewer>
-        <StackPanel Spacing="3">
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <StackPanel.ChildrenTransitions>
+                <TransitionCollection>
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </TransitionCollection>
+            </StackPanel.ChildrenTransitions>
+
             <!--  Accent Color  -->
             <controls:SettingsExpander
                 Description="{x:Bind domain:Translator.SettingsAccentColor_Description}"
@@ -53,24 +99,27 @@
                 </controls:SettingsCard.HeaderIcon>
                 <controls:SettingsCard.Content>
                     <ComboBox
-                        DisplayMemberPath="Title"
                         IsEnabled="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay}"
                         ItemsSource="{x:Bind ViewModel.ElementThemes}"
-                        SelectedItem="{x:Bind ViewModel.SelectedElementTheme, Mode=TwoWay}" />
+                        SelectedItem="{x:Bind ViewModel.SelectedElementTheme, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="personalization1:ElementThemeContainer">
+                                <TextBlock Text="{x:Bind Title}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
                 </controls:SettingsCard.Content>
             </controls:SettingsCard>
 
             <TextBlock
                 x:Name="ElementThemeSelectionDisabledTextBlock"
+                Margin="4,0,0,0"
                 x:Load="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}"
                 Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
                 Text="{x:Bind domain:Translator.SettingsElementThemeSelectionDisabled}" />
 
             <!--  App Themes  -->
-            <controls:SettingsExpander
-                Description="{x:Bind domain:Translator.SettingsApplicationTheme_Description}"
-                Header="{x:Bind domain:Translator.SettingsApplicationTheme_Title}"
-                IsExpanded="True">
+            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsApplicationTheme_Description}" Header="{x:Bind domain:Translator.SettingsApplicationTheme_Title}">
                 <controls:SettingsExpander.HeaderIcon>
                     <PathIcon Data="F1 M 5 3.75 C 5 3.554688 5.056966 3.372396 5.170898 3.203125 C 5.284831 3.033855 5.432942 2.913412 5.615234 2.841797 C 5.712891 2.802734 5.810547 2.765301 5.908203 2.729492 C 6.005859 2.693686 6.103516 2.659506 6.201172 2.626953 C 6.520182 2.509766 6.80664 2.320965 7.060547 2.060547 C 7.314453 1.800131 7.503255 1.513672 7.626953 1.201172 C 7.685547 1.057943 7.740885 0.914715 7.792969 0.771484 C 7.845052 0.628256 7.910156 0.499676 7.988281 0.385742 C 8.066406 0.271811 8.165689 0.179037 8.286133 0.107422 C 8.406575 0.035809 8.561197 0 8.75 0 C 8.971354 0 9.14388 0.047201 9.267578 0.141602 C 9.391275 0.236004 9.495442 0.361328 9.580078 0.517578 C 9.664713 0.673828 9.744466 0.847982 9.819336 1.040039 C 9.894205 1.232098 9.988606 1.424154 10.102539 1.616211 C 10.216471 1.80827 10.366211 1.993816 10.551758 2.172852 C 10.737305 2.351889 10.986328 2.5 11.298828 2.617188 L 11.884766 2.841797 C 12.067057 2.913412 12.215168 3.033855 12.329102 3.203125 C 12.443033 3.372396 12.5 3.554688 12.5 3.75 C 12.5 3.951824 12.444661 4.134115 12.333984 4.296875 C 12.223307 4.459636 12.073567 4.576823 11.884766 4.648438 L 11.298828 4.873047 C 10.986328 4.996746 10.737305 5.146485 10.551758 5.322266 C 10.366211 5.498048 10.216471 5.683595 10.102539 5.878906 C 9.988606 6.07422 9.895833 6.267904 9.824219 6.459961 C 9.752604 6.652019 9.674479 6.824545 9.589844 6.977539 C 9.505208 7.130534 9.399414 7.255859 9.272461 7.353516 C 9.145508 7.451172 8.971354 7.5 8.75 7.5 C 8.548177 7.5 8.365885 7.444662 8.203125 7.333984 C 8.040364 7.223309 7.923177 7.073568 7.851562 6.884766 L 7.626953 6.298828 C 7.503255 5.986328 7.353515 5.735678 7.177734 5.546875 C 7.001953 5.358074 6.816406 5.206707 6.621094 5.092773 C 6.425781 4.978842 6.232096 4.886068 6.040039 4.814453 C 5.847981 4.74284 5.673828 4.666342 5.517578 4.584961 C 5.361328 4.503581 5.236002 4.399414 5.141602 4.272461 C 5.0472 4.145508 5 3.971355 5 3.75 Z M 10.751953 3.75 C 10.302734 3.561199 9.903971 3.292645 9.555664 2.944336 C 9.207356 2.596029 8.938802 2.197266 8.75 1.748047 C 8.561197 2.197266 8.292643 2.596029 7.944336 2.944336 C 7.596028 3.292645 7.197266 3.561199 6.748047 3.75 C 7.197266 3.938803 7.596028 4.207357 7.944336 4.555664 C 8.292643 4.903972 8.561197 5.302734 8.75 5.751953 C 8.938802 5.302734 9.207356 4.903972 9.555664 4.555664 C 9.903971 4.207357 10.302734 3.938803 10.751953 3.75 Z M 10 10 C 10 9.772136 10.065104 9.563803 10.195312 9.375 C 10.325521 9.186198 10.494791 9.049479 10.703125 8.964844 L 12.03125 8.457031 C 12.389322 8.320312 12.672525 8.139648 12.880859 7.915039 C 13.089192 7.690431 13.256836 7.451173 13.383789 7.197266 C 13.510742 6.94336 13.613281 6.684571 13.691406 6.420898 C 13.769531 6.157228 13.859049 5.921225 13.959961 5.712891 C 14.060872 5.504558 14.189453 5.333659 14.345703 5.200195 C 14.501953 5.066732 14.720052 5.000001 15 5 C 15.214843 5.000001 15.419921 5.063478 15.615234 5.19043 C 15.810546 5.317384 15.947265 5.485027 16.025391 5.693359 C 16.116535 5.921225 16.202799 6.144206 16.28418 6.362305 C 16.365559 6.580404 16.451822 6.803386 16.542969 7.03125 C 16.679688 7.382812 16.860352 7.662761 17.084961 7.871094 C 17.30957 8.079428 17.548828 8.24707 17.802734 8.374023 C 18.056641 8.500977 18.31543 8.606771 18.579102 8.691406 C 18.842773 8.776042 19.078775 8.868815 19.287109 8.969727 C 19.495441 9.070639 19.66634 9.199219 19.799805 9.355469 C 19.933268 9.511719 20 9.726562 20 10 C 20 10.221354 19.934895 10.426433 19.804688 10.615234 C 19.674479 10.804037 19.505207 10.940756 19.296875 11.025391 L 17.958984 11.542969 C 17.60091 11.679688 17.317707 11.860352 17.109375 12.084961 C 16.901041 12.30957 16.733398 12.550456 16.606445 12.807617 C 16.479492 13.064779 16.375324 13.323568 16.293945 13.583984 C 16.212564 13.844401 16.123047 14.078776 16.025391 14.287109 C 15.927733 14.495443 15.80078 14.666342 15.644531 14.799805 C 15.48828 14.933269 15.273437 15 15 15 C 14.772135 15 14.563802 14.936523 14.375 14.80957 C 14.186197 14.682617 14.049479 14.511719 13.964844 14.296875 L 13.457031 12.96875 C 13.320312 12.617188 13.141275 12.33724 12.919922 12.128906 C 12.698567 11.920573 12.45931 11.751303 12.202148 11.621094 C 11.944986 11.490886 11.686197 11.385092 11.425781 11.303711 C 11.165364 11.222331 10.929361 11.129558 10.717773 11.025391 C 10.506185 10.921225 10.333658 10.792644 10.200195 10.639648 C 10.066731 10.486654 10 10.273438 10 10 Z M 18.486328 10 C 18.128254 9.863281 17.792969 9.726562 17.480469 9.589844 C 17.167969 9.453125 16.883137 9.29362 16.625977 9.111328 C 16.368814 8.929037 16.136066 8.709311 15.927734 8.452148 C 15.7194 8.194987 15.537108 7.87435 15.380859 7.490234 L 15 6.513672 L 14.628906 7.480469 C 14.479166 7.871094 14.30013 8.194987 14.091797 8.452148 C 13.883463 8.709311 13.647461 8.929037 13.383789 9.111328 C 13.120117 9.29362 12.832031 9.451498 12.519531 9.584961 C 12.207031 9.718425 11.871744 9.856771 11.513672 10 C 11.884765 10.136719 12.226562 10.271811 12.539062 10.405273 C 12.851562 10.538737 13.136393 10.696615 13.393555 10.878906 C 13.650716 11.061198 13.880208 11.282553 14.082031 11.542969 C 14.283854 11.803386 14.46289 12.128906 14.619141 12.519531 L 15 13.486328 C 15.136718 13.128256 15.271809 12.792969 15.405273 12.480469 C 15.538736 12.167969 15.696614 11.881511 15.878906 11.621094 C 16.061197 11.360678 16.280924 11.12793 16.538086 10.922852 C 16.795246 10.717773 17.119141 10.537109 17.509766 10.380859 Z M 1.25 14.365234 C 1.25 14.12435 1.318359 13.90625 1.455078 13.710938 C 1.591797 13.515625 1.770833 13.372396 1.992188 13.28125 L 3.691406 12.626953 C 4.0625 12.483725 4.357096 12.288412 4.575195 12.041016 C 4.793294 11.79362 4.970703 11.526693 5.107422 11.240234 C 5.244141 10.953776 5.356445 10.662436 5.444336 10.366211 C 5.532227 10.069987 5.633138 9.803061 5.74707 9.56543 C 5.861002 9.3278 6.002604 9.132487 6.171875 8.979492 C 6.341146 8.826498 6.575521 8.75 6.875 8.75 C 7.109375 8.75 7.325846 8.818359 7.524414 8.955078 C 7.722981 9.091797 7.867838 9.270834 7.958984 9.492188 C 8.069661 9.778646 8.180338 10.063477 8.291016 10.34668 C 8.401692 10.629883 8.512369 10.914714 8.623047 11.201172 C 8.727213 11.474609 8.863932 11.705729 9.033203 11.894531 C 9.202474 12.083334 9.388021 12.242839 9.589844 12.373047 C 9.791666 12.503256 10.003255 12.612305 10.224609 12.700195 C 10.445963 12.788086 10.665689 12.869467 10.883789 12.944336 C 11.101888 13.019206 11.308594 13.092448 11.503906 13.164062 C 11.699219 13.235678 11.870117 13.323568 12.016602 13.427734 C 12.163086 13.531901 12.280273 13.658854 12.368164 13.808594 C 12.456055 13.958334 12.5 14.143881 12.5 14.365234 C 12.5 14.60612 12.433268 14.825847 12.299805 15.024414 C 12.16634 15.222982 11.985676 15.367839 11.757812 15.458984 C 11.471354 15.569662 11.186523 15.680339 10.90332 15.791016 C 10.620117 15.901693 10.335286 16.012371 10.048828 16.123047 C 9.684244 16.266277 9.392903 16.459961 9.174805 16.704102 C 8.956705 16.948242 8.779297 17.21517 8.642578 17.504883 C 8.505859 17.794596 8.390299 18.087564 8.295898 18.383789 C 8.201497 18.680014 8.098958 18.946939 7.988281 19.18457 C 7.877604 19.422201 7.73763 19.617514 7.568359 19.770508 C 7.399088 19.923502 7.167969 20 6.875 20 C 6.627604 20 6.40625 19.933268 6.210938 19.799805 C 6.015625 19.666342 5.872396 19.482422 5.78125 19.248047 L 5.126953 17.548828 C 4.983724 17.177734 4.788411 16.883139 4.541016 16.665039 C 4.29362 16.446941 4.026692 16.27116 3.740234 16.137695 C 3.453776 16.004232 3.162435 15.891928 2.866211 15.800781 C 2.569987 15.709636 2.30306 15.608725 2.06543 15.498047 C 1.827799 15.38737 1.632487 15.245769 1.479492 15.073242 C 1.326497 14.900717 1.25 14.664714 1.25 14.365234 Z M 11.103516 14.365234 C 10.856119 14.267578 10.605469 14.17155 10.351562 14.077148 C 10.097656 13.982748 9.847005 13.886719 9.599609 13.789062 C 9.163411 13.619792 8.805338 13.411459 8.525391 13.164062 C 8.245442 12.916667 8.009439 12.636719 7.817383 12.324219 C 7.625325 12.011719 7.45931 11.67155 7.319336 11.303711 C 7.179362 10.935873 7.03125 10.550131 6.875 10.146484 C 6.71875 10.556641 6.570638 10.944011 6.430664 11.308594 C 6.29069 11.673178 6.124674 12.011719 5.932617 12.324219 C 5.74056 12.636719 5.50293 12.916667 5.219727 13.164062 C 4.936523 13.411459 4.576823 13.619792 4.140625 13.789062 L 2.646484 14.365234 C 3.05013 14.521484 3.434245 14.669597 3.798828 14.80957 C 4.163411 14.949545 4.501953 15.115561 4.814453 15.307617 C 5.126953 15.499675 5.406901 15.737305 5.654297 16.020508 C 5.901692 16.303711 6.113281 16.663412 6.289062 17.099609 L 6.875 18.603516 L 7.460938 17.089844 C 7.630208 16.653646 7.840169 16.295572 8.09082 16.015625 C 8.341471 15.735678 8.621419 15.499675 8.930664 15.307617 C 9.239908 15.115561 9.57845 14.949545 9.946289 14.80957 C 10.314127 14.669597 10.699869 14.521484 11.103516 14.365234 Z " />
                 </controls:SettingsExpander.HeaderIcon>
@@ -104,6 +153,37 @@
                     </controls:SettingsCard>
                 </controls:SettingsExpander.Items>
             </controls:SettingsExpander>
+
+            <!--  Backdrop Selection  -->
+            <controls:SettingsCard
+                Description="{x:Bind domain:Translator.SettingsWindowBackdrop_Description}"
+                Header="{x:Bind domain:Translator.SettingsWindowBackdrop_Title}"
+                IsEnabled="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay}">
+                <controls:SettingsCard.HeaderIcon>
+                    <PathIcon Data="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm-1-13h2v6h-2zm0 8h2v2h-2z" />
+                </controls:SettingsCard.HeaderIcon>
+
+                <controls:SettingsCard.Content>
+                    <ComboBox
+                        Width="150"
+                        ItemsSource="{x:Bind ViewModel.AvailableBackdropTypes, Mode=OneWay}"
+                        SelectedItem="{x:Bind ViewModel.SelectedBackdropType, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="personalization1:BackdropTypeWrapper">
+                                <TextBlock Text="{x:Bind DisplayName}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </controls:SettingsCard.Content>
+            </controls:SettingsCard>
+
+            <TextBlock
+                x:Name="WindowBackdropSelectionDisabledTextBlock"
+                Margin="4,0,0,0"
+                x:Load="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}"
+                Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
+                Text="{x:Bind domain:Translator.SettingsWindowBackdrop_Disabled}" />
+
         </StackPanel>
     </ScrollViewer>
 </abstract:PersonalizationPageAbstract>
diff --git a/Wino.Mail/Views/Settings/PersonalizationPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml.cs
similarity index 86%
rename from Wino.Mail/Views/Settings/PersonalizationPage.xaml.cs
rename to Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml.cs
index be606947..3fe4e8a5 100644
--- a/Wino.Mail/Views/Settings/PersonalizationPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Settings/PersonalizationPage.xaml.cs
@@ -1,4 +1,4 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
 
diff --git a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml b/Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml
similarity index 61%
rename from Wino.Mail/Views/Settings/ReadComposePanePage.xaml
rename to Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml
index 3de52350..1d07a04d 100644
--- a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml
@@ -1,4 +1,4 @@
-<abstract:ReadComposePanePageAbstract
+<abstract:ReadComposePanePageAbstract
     x:Class="Wino.Views.Settings.ReadComposePanePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -18,7 +18,6 @@
                 </TransitionCollection>
             </StackPanel.ChildrenTransitions>
 
-            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsReader_Title}" />
             <controls:SettingsExpander
                 Description="{x:Bind domain:Translator.SettingsReaderFontFamily_Description}"
                 Header="{x:Bind domain:Translator.SettingsReaderFont_Title}"
@@ -41,7 +40,7 @@
                     </controls:SettingsCard>
 
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsFontSize_Title}">
-                        <muxc:NumberBox
+                        <NumberBox
                             LargeChange="5"
                             SmallChange="1"
                             SpinButtonPlacementMode="Inline"
@@ -55,54 +54,35 @@
                             Text="The quick brown fox jumps over the lazy dog"
                             TextWrapping="WrapWholeWords" />
                     </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
 
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Description}" Header="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 0 7.5 C 0 6.822917 0.169271 6.191406 0.507812 5.605469 C 0.839844 5.039062 1.289062 4.589844 1.855469 4.257812 C 2.441406 3.919271 3.072917 3.75 3.75 3.75 L 16.25 3.75 C 16.927082 3.75 17.558594 3.919271 18.144531 4.257812 C 18.710938 4.589844 19.160156 5.039062 19.492188 5.605469 C 19.830729 6.191406 20 6.822917 20 7.5 L 20 11.25 C 20 11.927084 19.830729 12.558594 19.492188 13.144531 C 19.160156 13.710938 18.710938 14.160156 18.144531 14.492188 C 17.558594 14.830729 16.927082 15 16.25 15 L 3.75 15 C 3.072917 15 2.441406 14.830729 1.855469 14.492188 C 1.289062 14.160156 0.839844 13.710938 0.507812 13.144531 C 0.169271 12.558594 0 11.927084 0 11.25 Z M 3.75 5 C 3.294271 5.000001 2.875977 5.112306 2.495117 5.336914 C 2.114258 5.561524 1.811523 5.864259 1.586914 6.245117 C 1.362305 6.625978 1.25 7.044271 1.25 7.5 L 1.25 11.25 C 1.25 11.705729 1.362305 12.124023 1.586914 12.504883 C 1.811523 12.885742 2.114258 13.188477 2.495117 13.413086 C 2.875977 13.637695 3.294271 13.75 3.75 13.75 L 16.25 13.75 C 16.705729 13.75 17.124023 13.637695 17.504883 13.413086 C 17.885742 13.188477 18.188477 12.885742 18.413086 12.504883 C 18.637695 12.124023 18.75 11.705729 18.75 11.25 L 18.75 7.5 C 18.75 7.044271 18.637695 6.625978 18.413086 6.245117 C 18.188477 5.864259 17.885742 5.561524 17.504883 5.336914 C 17.124023 5.112306 16.705729 5.000001 16.25 5 Z M 8.75 9.375 C 8.75 9.199219 8.810221 9.051107 8.930664 8.930664 C 9.051106 8.810222 9.199219 8.75 9.375 8.75 L 15 8.75 C 15.17578 8.75 15.323893 8.810222 15.444336 8.930664 C 15.564778 9.051107 15.625 9.199219 15.625 9.375 C 15.625 9.550781 15.564778 9.698894 15.444336 9.819336 C 15.323893 9.939779 15.17578 10 15 10 L 9.375 10 C 9.199219 10 9.051106 9.939779 8.930664 9.819336 C 8.810221 9.698894 8.75 9.550781 8.75 9.375 Z M 7.5 9.375 C 7.5 9.713542 7.415364 10.026042 7.246094 10.3125 C 7.076823 10.598959 6.848958 10.826823 6.5625 10.996094 C 6.276042 11.165365 5.963542 11.25 5.625 11.25 C 5.286458 11.25 4.973958 11.165365 4.6875 10.996094 C 4.401042 10.826823 4.173177 10.598959 4.003906 10.3125 C 3.834635 10.026042 3.75 9.713542 3.75 9.375 C 3.75 9.036459 3.834635 8.723959 4.003906 8.4375 C 4.173177 8.151042 4.401042 7.923178 4.6875 7.753906 C 4.973958 7.584636 5.286458 7.5 5.625 7.5 C 5.963542 7.5 6.276042 7.584636 6.5625 7.753906 C 6.848958 7.923178 7.076823 8.151042 7.246094 8.4375 C 7.415364 8.723959 7.5 9.036459 7.5 9.375 Z " />
-                </controls:SettingsCard.HeaderIcon>
-                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsShowActionLabelsEnabled, Mode=TwoWay}" />
-            </controls:SettingsCard>
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Description}" Header="{x:Bind domain:Translator.SettingsMailRendering_ActionLabels_Title}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <PathIcon Data="F1 M 0 7.5 C 0 6.822917 0.169271 6.191406 0.507812 5.605469 C 0.839844 5.039062 1.289062 4.589844 1.855469 4.257812 C 2.441406 3.919271 3.072917 3.75 3.75 3.75 L 16.25 3.75 C 16.927082 3.75 17.558594 3.919271 18.144531 4.257812 C 18.710938 4.589844 19.160156 5.039062 19.492188 5.605469 C 19.830729 6.191406 20 6.822917 20 7.5 L 20 11.25 C 20 11.927084 19.830729 12.558594 19.492188 13.144531 C 19.160156 13.710938 18.710938 14.160156 18.144531 14.492188 C 17.558594 14.830729 16.927082 15 16.25 15 L 3.75 15 C 3.072917 15 2.441406 14.830729 1.855469 14.492188 C 1.289062 14.160156 0.839844 13.710938 0.507812 13.144531 C 0.169271 12.558594 0 11.927084 0 11.25 Z M 3.75 5 C 3.294271 5.000001 2.875977 5.112306 2.495117 5.336914 C 2.114258 5.561524 1.811523 5.864259 1.586914 6.245117 C 1.362305 6.625978 1.25 7.044271 1.25 7.5 L 1.25 11.25 C 1.25 11.705729 1.362305 12.124023 1.586914 12.504883 C 1.811523 12.885742 2.114258 13.188477 2.495117 13.413086 C 2.875977 13.637695 3.294271 13.75 3.75 13.75 L 16.25 13.75 C 16.705729 13.75 17.124023 13.637695 17.504883 13.413086 C 17.885742 13.188477 18.188477 12.885742 18.413086 12.504883 C 18.637695 12.124023 18.75 11.705729 18.75 11.25 L 18.75 7.5 C 18.75 7.044271 18.637695 6.625978 18.413086 6.245117 C 18.188477 5.864259 17.885742 5.561524 17.504883 5.336914 C 17.124023 5.112306 16.705729 5.000001 16.25 5 Z M 8.75 9.375 C 8.75 9.199219 8.810221 9.051107 8.930664 8.930664 C 9.051106 8.810222 9.199219 8.75 9.375 8.75 L 15 8.75 C 15.17578 8.75 15.323893 8.810222 15.444336 8.930664 C 15.564778 9.051107 15.625 9.199219 15.625 9.375 C 15.625 9.550781 15.564778 9.698894 15.444336 9.819336 C 15.323893 9.939779 15.17578 10 15 10 L 9.375 10 C 9.199219 10 9.051106 9.939779 8.930664 9.819336 C 8.810221 9.698894 8.75 9.550781 8.75 9.375 Z M 7.5 9.375 C 7.5 9.713542 7.415364 10.026042 7.246094 10.3125 C 7.076823 10.598959 6.848958 10.826823 6.5625 10.996094 C 6.276042 11.165365 5.963542 11.25 5.625 11.25 C 5.286458 11.25 4.973958 11.165365 4.6875 10.996094 C 4.401042 10.826823 4.173177 10.598959 4.003906 10.3125 C 3.834635 10.026042 3.75 9.713542 3.75 9.375 C 3.75 9.036459 3.834635 8.723959 4.003906 8.4375 C 4.173177 8.151042 4.401042 7.923178 4.6875 7.753906 C 4.973958 7.584636 5.286458 7.5 5.625 7.5 C 5.963542 7.5 6.276042 7.584636 6.5625 7.753906 C 6.848958 7.923178 7.076823 8.151042 7.246094 8.4375 C 7.415364 8.723959 7.5 9.036459 7.5 9.375 Z " />
+                        </controls:SettingsCard.HeaderIcon>
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.IsShowActionLabelsEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
 
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsExternalContent_Description}" Header="{x:Bind domain:Translator.SettingsExternalContent_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 4.023438 13.75 C 3.476562 13.75 2.958984 13.636068 2.470703 13.408203 C 1.982422 13.180339 1.554362 12.875977 1.186523 12.495117 C 0.818685 12.114258 0.528971 11.674805 0.317383 11.176758 C 0.105794 10.678711 0 10.159506 0 9.619141 C 0 9.065756 0.094401 8.535156 0.283203 8.027344 C 0.472005 7.519531 0.737305 7.068686 1.079102 6.674805 C 1.420898 6.280926 1.829427 5.961915 2.304688 5.717773 C 2.779948 5.473634 3.304036 5.338543 3.876953 5.3125 L 4.189453 5.302734 C 4.261067 4.501953 4.453125 3.776043 4.765625 3.125 C 5.078125 2.473959 5.488281 1.915691 5.996094 1.450195 C 6.503906 0.984701 7.097981 0.626629 7.77832 0.375977 C 8.458658 0.125326 9.199219 0 10 0 C 10.800781 0 11.541341 0.126953 12.22168 0.380859 C 12.902018 0.634766 13.496093 0.99284 14.003906 1.455078 C 14.511718 1.917318 14.921874 2.473959 15.234375 3.125 C 15.546874 3.776043 15.738932 4.501953 15.810547 5.302734 L 15.966797 5.302734 C 16.513672 5.302734 17.032877 5.416667 17.524414 5.644531 C 18.015949 5.872396 18.44401 6.176758 18.808594 6.557617 C 19.173176 6.938477 19.462891 7.379558 19.677734 7.880859 C 19.892578 8.382162 20 8.902995 20 9.443359 L 20 9.667969 C 20 9.700521 20 9.736328 20 9.775391 C 20 9.814453 19.996744 9.850261 19.990234 9.882812 C 19.573566 9.375 19.108072 8.932292 18.59375 8.554688 C 18.489582 8.248698 18.346354 7.972006 18.164062 7.724609 C 17.98177 7.477214 17.770182 7.267253 17.529297 7.094727 C 17.28841 6.922201 17.021484 6.788737 16.728516 6.694336 C 16.435547 6.599936 16.129557 6.552735 15.810547 6.552734 C 15.472005 6.552735 15.192057 6.446941 14.970703 6.235352 C 14.749349 6.023764 14.61263 5.755209 14.560547 5.429688 C 14.527994 5.195312 14.49056 4.967448 14.448242 4.746094 C 14.405924 4.52474 14.342447 4.300131 14.257812 4.072266 C 14.088541 3.603516 13.862304 3.193359 13.579102 2.841797 C 13.295897 2.490234 12.970377 2.195639 12.602539 1.958008 C 12.2347 1.720379 11.831055 1.542969 11.391602 1.425781 C 10.952148 1.308594 10.488281 1.25 10 1.25 C 9.511719 1.25 9.047852 1.308594 8.608398 1.425781 C 8.168945 1.542969 7.765299 1.71875 7.397461 1.953125 C 7.029622 2.1875 6.704102 2.480469 6.420898 2.832031 C 6.137695 3.183594 5.911458 3.59375 5.742188 4.0625 C 5.657552 4.290365 5.594075 4.514975 5.551758 4.736328 C 5.50944 4.957683 5.472005 5.188803 5.439453 5.429688 C 5.38737 5.813803 5.236002 6.097006 4.985352 6.279297 C 4.7347 6.46159 4.423828 6.552735 4.052734 6.552734 C 3.655599 6.552735 3.286133 6.635743 2.944336 6.801758 C 2.602539 6.967774 2.306315 7.189129 2.055664 7.46582 C 1.805013 7.742514 1.608073 8.059896 1.464844 8.417969 C 1.321615 8.776042 1.25 9.147136 1.25 9.53125 C 1.25 9.928386 1.321615 10.30599 1.464844 10.664062 C 1.608073 11.022136 1.806641 11.337891 2.060547 11.611328 C 2.314453 11.884766 2.61556 12.101237 2.963867 12.260742 C 3.312174 12.420248 3.691406 12.5 4.101562 12.5 L 7.431641 12.5 C 7.373047 12.708334 7.327474 12.916667 7.294922 13.125 C 7.26237 13.333334 7.236328 13.541667 7.216797 13.75 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 14.375 17.578125 C 14.570312 17.578125 14.736328 17.509766 14.873047 17.373047 L 17.373047 14.873047 C 17.509766 14.736328 17.578125 14.570312 17.578125 14.375 C 17.578125 14.179688 17.509766 14.013672 17.373047 13.876953 C 17.236328 13.740234 17.070312 13.671875 16.875 13.671875 C 16.679688 13.671875 16.513672 13.740234 16.376953 13.876953 L 15 15.253906 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 15.253906 L 12.373047 13.876953 C 12.236328 13.740234 12.070312 13.671875 11.875 13.671875 C 11.679688 13.671875 11.513672 13.740234 11.376953 13.876953 C 11.240234 14.013672 11.171875 14.179688 11.171875 14.375 C 11.171875 14.570312 11.240234 14.736328 11.376953 14.873047 L 13.876953 17.373047 C 14.013672 17.509766 14.179688 17.578125 14.375 17.578125 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsLoadImages_Title}">
                         <controls:SettingsCard.HeaderIcon>
                             <PathIcon Data="F1 M 4.921875 16.25 C 4.433594 16.25 3.966471 16.150717 3.520508 15.952148 C 3.074544 15.753581 2.683919 15.486654 2.348633 15.151367 C 2.013346 14.816081 1.746419 14.425456 1.547852 13.979492 C 1.349284 13.533529 1.25 13.066406 1.25 12.578125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 12.578125 1.25 C 13.066406 1.25 13.533528 1.349285 13.979492 1.547852 C 14.425455 1.74642 14.81608 2.013348 15.151367 2.348633 C 15.486653 2.68392 15.75358 3.074545 15.952148 3.520508 C 16.150715 3.966473 16.25 4.433594 16.25 4.921875 L 16.25 12.578125 C 16.25 13.066406 16.150715 13.533529 15.952148 13.979492 C 15.75358 14.425456 15.486653 14.816081 15.151367 15.151367 C 14.81608 15.486654 14.425455 15.753581 13.979492 15.952148 C 13.533528 16.150717 13.066406 16.25 12.578125 16.25 Z M 8.75 8.90625 C 9.082031 8.90625 9.401041 8.969727 9.707031 9.09668 C 10.013021 9.223633 10.283203 9.404297 10.517578 9.638672 L 14.658203 13.769531 C 14.768879 13.580729 14.853515 13.377279 14.912109 13.15918 C 14.970702 12.941081 14.999999 12.721354 15 12.5 L 15 4.951172 C 14.999999 4.625651 14.933268 4.314779 14.799805 4.018555 C 14.666341 3.722332 14.487305 3.461914 14.262695 3.237305 C 14.038086 3.012695 13.777669 2.83366 13.481445 2.700195 C 13.185221 2.566732 12.874348 2.5 12.548828 2.5 L 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 12.5 C 2.5 12.721354 2.529297 12.941081 2.587891 13.15918 C 2.646484 13.377279 2.73112 13.580729 2.841797 13.769531 L 6.982422 9.638672 C 7.216797 9.404297 7.486979 9.223633 7.792969 9.09668 C 8.098958 8.969727 8.417969 8.90625 8.75 8.90625 Z M 10.625 5.625 C 10.625 5.449219 10.657552 5.286459 10.722656 5.136719 C 10.78776 4.98698 10.877278 4.855145 10.991211 4.741211 C 11.105143 4.627279 11.236979 4.537761 11.386719 4.472656 C 11.536458 4.407553 11.699219 4.375 11.875 4.375 C 12.04427 4.375 12.205402 4.407553 12.358398 4.472656 C 12.511393 4.537761 12.644856 4.627279 12.758789 4.741211 C 12.872721 4.855145 12.962239 4.988607 13.027344 5.141602 C 13.092447 5.294597 13.124999 5.455729 13.125 5.625 C 13.124999 5.800781 13.092447 5.963542 13.027344 6.113281 C 12.962239 6.263021 12.872721 6.394857 12.758789 6.508789 C 12.644856 6.622722 12.513021 6.71224 12.363281 6.777344 C 12.213541 6.842449 12.050781 6.875001 11.875 6.875 C 11.699219 6.875001 11.53483 6.842449 11.381836 6.777344 C 11.228841 6.71224 11.097005 6.62435 10.986328 6.513672 C 10.87565 6.402996 10.78776 6.27116 10.722656 6.118164 C 10.657552 5.96517 10.625 5.800781 10.625 5.625 Z M 7.5 18.75 C 6.966146 18.75 6.455078 18.642578 5.966797 18.427734 C 5.478516 18.212891 5.058594 17.903646 4.707031 17.5 L 13.193359 17.5 C 13.785807 17.5 14.344075 17.382812 14.868164 17.148438 C 15.392252 16.914062 15.849609 16.59668 16.240234 16.196289 C 16.630859 15.795898 16.938477 15.332031 17.163086 14.804688 C 17.387695 14.277344 17.5 13.717448 17.5 13.125 L 17.5 4.707031 C 17.903645 5.058595 18.212891 5.478517 18.427734 5.966797 C 18.642578 6.455079 18.75 6.966146 18.75 7.5 L 18.75 13.125 C 18.75 13.89974 18.601887 14.628906 18.305664 15.3125 C 18.009439 15.996094 17.607422 16.591797 17.099609 17.099609 C 16.591797 17.607422 15.996094 18.009439 15.3125 18.305664 C 14.628906 18.601889 13.899739 18.75 13.125 18.75 Z M 12.5 15 C 12.721354 15 12.94108 14.970703 13.15918 14.912109 C 13.377278 14.853516 13.580729 14.768881 13.769531 14.658203 L 9.638672 10.517578 C 9.391275 10.270183 9.095052 10.146484 8.75 10.146484 C 8.404947 10.146484 8.108724 10.270183 7.861328 10.517578 L 3.730469 14.658203 C 3.919271 14.768881 4.122721 14.853516 4.34082 14.912109 C 4.558919 14.970703 4.778646 15 5 15 Z " />
                         </controls:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.RenderImages, Mode=TwoWay}" />
                     </controls:SettingsCard>
+
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsLoadStyles_Title}">
                         <controls:SettingsCard.HeaderIcon>
                             <PathIcon Data="F1 M 6.328125 11.835938 C 6.035156 11.835938 5.768229 11.894531 5.527344 12.011719 C 5.286458 12.128906 5.050456 12.259115 4.819336 12.402344 C 4.588216 12.545573 4.348958 12.675781 4.101562 12.792969 C 3.854167 12.910156 3.580729 12.96875 3.28125 12.96875 C 2.877604 12.96875 2.49349 12.871094 2.128906 12.675781 C 1.764323 12.480469 1.435547 12.255859 1.142578 12.001953 C 0.745443 11.656901 0.455729 11.261394 0.273438 10.81543 C 0.091146 10.369467 0 9.886068 0 9.365234 C 0 8.844401 0.071615 8.325195 0.214844 7.807617 C 0.358073 7.290039 0.533854 6.796875 0.742188 6.328125 C 0.970052 5.820312 1.233724 5.328776 1.533203 4.853516 C 1.832682 4.378256 2.158203 3.925781 2.509766 3.496094 C 2.828776 3.105469 3.167318 2.736004 3.525391 2.387695 C 3.883463 2.039389 4.277344 1.728516 4.707031 1.455078 C 5.442708 0.986328 6.225586 0.628256 7.055664 0.380859 C 7.885742 0.133465 8.736979 0.009766 9.609375 0.009766 C 10.436197 0.009766 11.25 0.117188 12.050781 0.332031 C 12.851562 0.546875 13.616536 0.849609 14.345703 1.240234 C 15.23763 1.728516 16.033527 2.298178 16.733398 2.949219 C 17.433268 3.600262 18.025715 4.322917 18.510742 5.117188 C 18.995768 5.911459 19.365234 6.769206 19.619141 7.69043 C 19.873047 8.611654 20 9.583334 20 10.605469 C 20 11.230469 19.952799 11.850586 19.858398 12.46582 C 19.763996 13.081055 19.62565 13.688151 19.443359 14.287109 C 19.300129 14.74935 19.119465 15.213217 18.901367 15.678711 C 18.683268 16.144205 18.427734 16.59017 18.134766 17.016602 C 17.841797 17.443033 17.516275 17.843424 17.158203 18.217773 C 16.800129 18.592123 16.411133 18.916016 15.991211 19.189453 C 15.571289 19.462891 15.12207 19.677734 14.643555 19.833984 C 14.165039 19.990234 13.662109 20.068359 13.134766 20.068359 C 12.841797 20.068359 12.553711 20.042318 12.270508 19.990234 C 11.987305 19.93815 11.708984 19.863281 11.435547 19.765625 C 10.86263 19.563803 10.371094 19.31315 9.960938 19.013672 C 9.550781 18.714193 9.210611 18.365885 8.94043 17.96875 C 8.670247 17.571615 8.465169 17.12565 8.325195 16.630859 C 8.185221 16.136068 8.095703 15.592448 8.056641 15 C 8.030599 14.641928 8.012695 14.283854 8.00293 13.925781 C 7.993164 13.567709 7.945963 13.212891 7.861328 12.861328 C 7.835286 12.763672 7.805989 12.659506 7.773438 12.548828 C 7.740885 12.438151 7.688802 12.347006 7.617188 12.275391 C 7.545573 12.197266 7.457682 12.128906 7.353516 12.070312 C 7.249349 12.011719 7.138672 11.966146 7.021484 11.933594 C 6.904297 11.901042 6.785481 11.876628 6.665039 11.860352 C 6.544596 11.844076 6.432292 11.835938 6.328125 11.835938 Z M 13.134766 18.818359 C 13.623047 18.818359 14.088541 18.725586 14.53125 18.540039 C 14.973958 18.354492 15.384114 18.108725 15.761719 17.802734 C 16.276041 17.386068 16.722004 16.894531 17.099609 16.328125 C 17.477213 15.761719 17.789713 15.157878 18.037109 14.516602 C 18.284504 13.875326 18.466797 13.214519 18.583984 12.53418 C 18.701172 11.853842 18.759766 11.191406 18.759766 10.546875 C 18.759766 9.641928 18.647461 8.785808 18.422852 7.978516 C 18.198242 7.171225 17.871094 6.420898 17.441406 5.727539 C 17.011719 5.03418 16.487629 4.404297 15.869141 3.837891 C 15.25065 3.271484 14.547525 2.773438 13.759766 2.34375 C 13.128255 1.998699 12.460938 1.728516 11.757812 1.533203 C 11.054688 1.337891 10.338541 1.240234 9.609375 1.240234 C 8.710938 1.240234 7.869466 1.383465 7.084961 1.669922 C 6.300456 1.956381 5.582682 2.351889 4.931641 2.856445 C 4.280599 3.361004 3.697917 3.953451 3.183594 4.633789 C 2.669271 5.314128 2.236328 6.048178 1.884766 6.835938 C 1.702474 7.233074 1.551107 7.64323 1.430664 8.066406 C 1.310221 8.489584 1.25 8.922526 1.25 9.365234 C 1.25 9.703776 1.302083 10.011394 1.40625 10.288086 C 1.510417 10.564779 1.689453 10.817058 1.943359 11.044922 C 2.014974 11.110026 2.104492 11.181641 2.211914 11.259766 C 2.319336 11.337891 2.431641 11.411133 2.548828 11.479492 C 2.666016 11.547852 2.783203 11.606445 2.900391 11.655273 C 3.017578 11.704102 3.125 11.728516 3.222656 11.728516 C 3.404948 11.728516 3.60026 11.668295 3.808594 11.547852 C 4.016927 11.427409 4.246419 11.297201 4.49707 11.157227 C 4.747721 11.017253 5.022786 10.887045 5.322266 10.766602 C 5.621745 10.646159 5.957031 10.585938 6.328125 10.585938 C 6.529948 10.585938 6.731771 10.603842 6.933594 10.639648 C 7.135416 10.675456 7.330729 10.722656 7.519531 10.78125 C 7.942708 10.917969 8.268229 11.113281 8.496094 11.367188 C 8.723958 11.621094 8.891602 11.912436 8.999023 12.241211 C 9.106445 12.569987 9.173177 12.928061 9.199219 13.31543 C 9.22526 13.7028 9.249674 14.098308 9.272461 14.501953 C 9.295247 14.9056 9.337564 15.309245 9.399414 15.712891 C 9.461263 16.116537 9.580078 16.499023 9.755859 16.860352 C 9.931641 17.22168 10.185547 17.552084 10.517578 17.851562 C 10.849609 18.151041 11.295572 18.398438 11.855469 18.59375 C 12.272135 18.74349 12.698566 18.818359 13.134766 18.818359 Z M 8.75 4.6875 C 8.75 4.427084 8.841146 4.20573 9.023438 4.023438 C 9.205729 3.841146 9.427083 3.75 9.6875 3.75 C 9.947916 3.75 10.169271 3.841146 10.351562 4.023438 C 10.533854 4.20573 10.625 4.427084 10.625 4.6875 C 10.625 4.947917 10.533854 5.169271 10.351562 5.351562 C 10.169271 5.533854 9.947916 5.625 9.6875 5.625 C 9.427083 5.625 9.205729 5.533854 9.023438 5.351562 C 8.841146 5.169271 8.75 4.947917 8.75 4.6875 Z M 12.5 5.9375 C 12.5 5.677084 12.591146 5.455729 12.773438 5.273438 C 12.955729 5.091146 13.177083 5.000001 13.4375 5 C 13.697916 5.000001 13.91927 5.091146 14.101562 5.273438 C 14.283854 5.455729 14.375 5.677084 14.375 5.9375 C 14.375 6.197917 14.283854 6.419271 14.101562 6.601562 C 13.91927 6.783855 13.697916 6.875001 13.4375 6.875 C 13.177083 6.875001 12.955729 6.783855 12.773438 6.601562 C 12.591146 6.419271 12.5 6.197917 12.5 5.9375 Z M 14.6875 8.75 C 14.6875 8.489584 14.778646 8.268229 14.960938 8.085938 C 15.143229 7.903646 15.364582 7.812501 15.625 7.8125 C 15.885416 7.812501 16.10677 7.903646 16.289062 8.085938 C 16.471354 8.268229 16.5625 8.489584 16.5625 8.75 C 16.5625 9.010417 16.471354 9.231771 16.289062 9.414062 C 16.10677 9.596354 15.885416 9.6875 15.625 9.6875 C 15.364582 9.6875 15.143229 9.596354 14.960938 9.414062 C 14.778646 9.231771 14.6875 9.010417 14.6875 8.75 Z M 14.6875 12.5 C 14.6875 12.239584 14.778646 12.018229 14.960938 11.835938 C 15.143229 11.653646 15.364582 11.5625 15.625 11.5625 C 15.885416 11.5625 16.10677 11.653646 16.289062 11.835938 C 16.471354 12.018229 16.5625 12.239584 16.5625 12.5 C 16.5625 12.760417 16.471354 12.981771 16.289062 13.164062 C 16.10677 13.346354 15.885416 13.4375 15.625 13.4375 C 15.364582 13.4375 15.143229 13.346354 14.960938 13.164062 C 14.778646 12.981771 14.6875 12.760417 14.6875 12.5 Z M 12.1875 15 C 12.187499 14.739584 12.278645 14.518229 12.460938 14.335938 C 12.643229 14.153646 12.864583 14.0625 13.125 14.0625 C 13.385416 14.0625 13.606771 14.153646 13.789062 14.335938 C 13.971354 14.518229 14.062499 14.739584 14.0625 15 C 14.062499 15.260417 13.971354 15.481771 13.789062 15.664062 C 13.606771 15.846354 13.385416 15.9375 13.125 15.9375 C 12.864583 15.9375 12.643229 15.846354 12.460938 15.664062 C 12.278645 15.481771 12.187499 15.260417 12.1875 15 Z " />
                         </controls:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.RenderStyles, Mode=TwoWay}" />
                     </controls:SettingsCard>
+
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsLoadPlaintextLinks_Title}">
                         <controls:SettingsCard.HeaderIcon>
                             <PathIcon Data="{StaticResource AddLinkPathIcon}" />
                         </controls:SettingsCard.HeaderIcon>
                         <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.RenderPlaintextLinks, Mode=TwoWay}" />
                     </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
 
-            <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsComposer_Title}" />
-            <controls:SettingsExpander
-                Description="{x:Bind domain:Translator.SettingsComposerFontFamily_Description}"
-                Header="{x:Bind domain:Translator.SettingsComposerFont_Title}"
-                IsExpanded="True">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="F1 M 0 11.865234 C 0 11.813151 0.029297 11.699219 0.087891 11.523438 C 0.146484 11.347656 0.219727 11.139323 0.307617 10.898438 C 0.395508 10.657553 0.494792 10.398764 0.605469 10.12207 C 0.716146 9.845378 0.82194 9.581706 0.922852 9.331055 C 1.023763 9.080404 1.116536 8.854167 1.201172 8.652344 C 1.285807 8.450521 1.344401 8.304037 1.376953 8.212891 L 4.414062 0.400391 C 4.466146 0.276693 4.544271 0.179037 4.648438 0.107422 C 4.752604 0.035809 4.869792 0 5 0 C 5.143229 0 5.262044 0.035809 5.356445 0.107422 C 5.450846 0.179037 5.527344 0.276693 5.585938 0.400391 C 5.644531 0.5306 5.698242 0.665691 5.74707 0.805664 C 5.795898 0.945639 5.846354 1.08073 5.898438 1.210938 L 6.630859 3.105469 C 7.001953 4.05599 7.371419 5.003256 7.739258 5.947266 C 8.107096 6.891276 8.476562 7.838542 8.847656 8.789062 L 8.183594 10.537109 L 7.617188 9.072266 L 2.382812 9.072266 L 1.210938 12.099609 C 1.158854 12.223308 1.079102 12.320964 0.97168 12.392578 C 0.864258 12.464193 0.745443 12.5 0.615234 12.5 C 0.439453 12.5 0.292969 12.436523 0.175781 12.30957 C 0.058594 12.182617 0 12.034506 0 11.865234 Z M 5 2.353516 L 2.871094 7.822266 L 7.128906 7.822266 Z M 5.625 20 C 5.455729 20 5.309245 19.93815 5.185547 19.814453 C 5.061849 19.690756 5 19.544271 5 19.375 C 5 19.238281 5.027669 19.127604 5.083008 19.042969 C 5.138346 18.958334 5.211588 18.893229 5.302734 18.847656 C 5.39388 18.802084 5.494792 18.772787 5.605469 18.759766 C 5.716146 18.746744 5.830078 18.740234 5.947266 18.740234 C 6.038411 18.740234 6.126302 18.741861 6.210938 18.745117 C 6.295573 18.748373 6.373698 18.75 6.445312 18.75 L 11.914062 4.160156 C 11.959635 4.036459 12.036133 3.937176 12.143555 3.862305 C 12.250976 3.787436 12.369791 3.75 12.5 3.75 C 12.630208 3.75 12.749023 3.785809 12.856445 3.857422 C 12.963867 3.929037 13.040364 4.026693 13.085938 4.150391 L 18.671875 18.75 C 18.743488 18.75 18.813477 18.748373 18.881836 18.745117 C 18.950195 18.741861 19.020182 18.740234 19.091797 18.740234 C 19.202473 18.740234 19.31315 18.746744 19.423828 18.759766 C 19.534504 18.772787 19.63216 18.802084 19.716797 18.847656 C 19.801432 18.893229 19.869791 18.958334 19.921875 19.042969 C 19.973957 19.127604 20 19.238281 20 19.375 C 20 19.544271 19.93815 19.690756 19.814453 19.814453 C 19.690754 19.93815 19.54427 20 19.375 20 L 16.875 20 C 16.705729 20 16.559244 19.93815 16.435547 19.814453 C 16.311848 19.690756 16.25 19.544271 16.25 19.375 C 16.25 19.22526 16.280924 19.108072 16.342773 19.023438 C 16.404621 18.938803 16.482746 18.876953 16.577148 18.837891 C 16.671549 18.798828 16.777344 18.774414 16.894531 18.764648 C 17.011719 18.754883 17.128906 18.75 17.246094 18.75 L 17.333984 18.75 L 15.898438 15 L 9.179688 15 L 7.773438 18.75 C 7.890625 18.75 8.006185 18.754883 8.120117 18.764648 C 8.234049 18.774414 8.338216 18.798828 8.432617 18.837891 C 8.527018 18.876953 8.603516 18.938803 8.662109 19.023438 C 8.720703 19.108072 8.75 19.22526 8.75 19.375 C 8.75 19.544271 8.68815 19.690756 8.564453 19.814453 C 8.440755 19.93815 8.294271 20 8.125 20 Z M 12.509766 6.142578 L 9.648438 13.75 L 15.419922 13.75 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsFontFamily_Title}">
                         <ComboBox ItemsSource="{x:Bind ViewModel.AvailableFonts}" SelectedItem="{x:Bind ViewModel.CurrentComposerFont, Mode=TwoWay}">
                             <ComboBox.ItemTemplate>
@@ -114,7 +94,7 @@
                     </controls:SettingsCard>
 
                     <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsFontSize_Title}">
-                        <muxc:NumberBox
+                        <NumberBox
                             LargeChange="5"
                             SmallChange="1"
                             SpinButtonPlacementMode="Inline"
diff --git a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml.cs
similarity index 86%
rename from Wino.Mail/Views/Settings/ReadComposePanePage.xaml.cs
rename to Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml.cs
index 5a740a73..eae01652 100644
--- a/Wino.Mail/Views/Settings/ReadComposePanePage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Settings/ReadComposePanePage.xaml.cs
@@ -1,4 +1,4 @@
-using Wino.Views.Abstract;
+using Wino.Views.Abstract;
 
 namespace Wino.Views.Settings;
 
diff --git a/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml b/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml
new file mode 100644
index 00000000..1ca3823d
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml
@@ -0,0 +1,185 @@
+<abstract:SignatureAndEncryptionPageAbstract
+    x:Class="Wino.Views.Settings.SignatureAndEncryptionPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:crypt="using:System.Security.Cryptography.X509Certificates"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <StackPanel.ChildrenTransitions>
+                <TransitionCollection>
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </TransitionCollection>
+            </StackPanel.ChildrenTransitions>
+            <controls:SettingsExpander
+                Description="{x:Bind domain:Translator.SettingsSignatureAndEncryption_MyCertificatesDescription, Mode=OneTime}"
+                Header="{x:Bind domain:Translator.SettingsSignatureAndEncryption_MyCertificatesHeader, Mode=OneTime}"
+                IsExpanded="True">
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard>
+                        <!--TODO: Not working
+                        <TextBlock Visibility="{Binding ViewModel.PersonalCertificatesEmpty, Mode=OneWay}">
+                            <Run Text="There are no items." />
+                        </TextBlock>-->
+
+                        <ListView
+                            x:Name="PersonalCertList"
+                            MaxHeight="180"
+                            ItemsSource="{x:Bind ViewModel.PersonalCertificates, Mode=OneWay}"
+                            SelectionChanged="PersonalCertList_SelectionChanged"
+                            SelectionMode="Multiple">
+                            <ListView.Header>
+                                <Grid Padding="16,12" ColumnSpacing="16">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="26" />
+                                        <ColumnDefinition Width="300" />
+                                        <ColumnDefinition Width="120" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_NameColumn, Mode=OneTime}" />
+                                    <TextBlock
+                                        Grid.Column="2"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_ExpiresColumn, Mode=OneTime}" />
+                                    <TextBlock
+                                        Grid.Column="3"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_ThumbprintColumn, Mode=OneTime}" />
+                                </Grid>
+                            </ListView.Header>
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="crypt:X509Certificate2">
+                                    <Grid ColumnSpacing="16">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="0" />
+                                            <ColumnDefinition Width="300" />
+                                            <ColumnDefinition Width="120" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="1" Text="{x:Bind Subject}" />
+                                        <TextBlock
+                                            Grid.Column="2"
+                                            FontSize="10"
+                                            Foreground="Gray"
+                                            Text="{x:Bind NotAfter}" />
+                                        <TextBlock
+                                            Grid.Column="3"
+                                            FontSize="10"
+                                            Foreground="Gray"
+                                            Text="{x:Bind Thumbprint}" />
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+
+                            <ListView.ItemContainerStyle>
+                                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                        </ListView>
+                    </controls:SettingsCard>
+                    <controls:SettingsCard>
+                        <StackPanel Orientation="Horizontal" Spacing="12">
+                            <Button Command="{x:Bind ViewModel.RemovePersonalCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Remove}" />
+                            <Button Command="{x:Bind ViewModel.ExportPersonalCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Export}" />
+                            <Button Command="{x:Bind ViewModel.ImportPersonalCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Import}" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+            <controls:SettingsExpander
+                Description="{x:Bind domain:Translator.SettingsSignatureAndEncryption_RecipientCertificatesDescription, Mode=OneTime}"
+                Header="{x:Bind domain:Translator.SettingsSignatureAndEncryption_RecipientCertificatesHeader, Mode=OneTime}"
+                IsExpanded="False">
+                <controls:SettingsExpander.Items>
+                    <!--<StackPanel Padding="12" Spacing="12">-->
+
+                    <!--TODO: Not working
+                     <TextBlock Visibility="{Binding ViewModel.RecipientCertificatesEmpty, Mode=OneWay}">
+                         <Run Text="There are no items." />
+                     </TextBlock>-->
+
+                    <controls:SettingsCard>
+                        <ListView
+                            x:Name="RecipientCertList"
+                            Height="180"
+                            ItemsSource="{x:Bind ViewModel.RecipientCertificates, Mode=OneWay}"
+                            SelectionChanged="RecipientCertList_SelectionChanged"
+                            SelectionMode="Multiple">
+                            <ListView.Header>
+                                <Grid Padding="16,12" ColumnSpacing="16">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="26" />
+                                        <ColumnDefinition Width="300" />
+                                        <ColumnDefinition Width="120" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_NameColumn, Mode=OneTime}" />
+                                    <TextBlock
+                                        Grid.Column="2"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_ExpiresColumn, Mode=OneTime}" />
+                                    <TextBlock
+                                        Grid.Column="3"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind domain:Translator.SettingsSignatureAndEncryption_ThumbprintColumn, Mode=OneTime}" />
+                                </Grid>
+                            </ListView.Header>
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="crypt:X509Certificate2">
+                                    <Grid ColumnSpacing="16">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="0" />
+                                            <ColumnDefinition Width="300" />
+                                            <ColumnDefinition Width="120" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="1" Text="{x:Bind Subject}" />
+                                        <TextBlock
+                                            Grid.Column="2"
+                                            FontSize="10"
+                                            Foreground="Gray"
+                                            Text="{x:Bind NotAfter}" />
+                                        <TextBlock
+                                            Grid.Column="3"
+                                            FontSize="10"
+                                            Foreground="Gray"
+                                            Text="{x:Bind Thumbprint}" />
+                                    </Grid>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+
+                            <ListView.ItemContainerStyle>
+                                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                </Style>
+                            </ListView.ItemContainerStyle>
+                        </ListView>
+                    </controls:SettingsCard>
+                    <controls:SettingsCard>
+                        <StackPanel
+                            HorizontalAlignment="Right"
+                            Orientation="Horizontal"
+                            Spacing="12">
+                            <Button Command="{x:Bind ViewModel.RemoveRecipientCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Remove}" />
+                            <Button Command="{x:Bind ViewModel.ExportRecipientCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Export}" />
+                            <Button Command="{x:Bind ViewModel.ImportRecipientCertificatesCommand}" Content="{x:Bind domain:Translator.Buttons_Import}" />
+                        </StackPanel>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:SignatureAndEncryptionPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml.cs
new file mode 100644
index 00000000..87eb0181
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/SignatureAndEncryptionPage.xaml.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class SignatureAndEncryptionPage : SignatureAndEncryptionPageAbstract
+{
+    public SignatureAndEncryptionPage()
+    {
+        InitializeComponent();
+    }
+
+    private void PersonalCertList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        foreach (var item in e.RemovedItems.OfType<X509Certificate2>())
+        {
+            ViewModel.SelectedPersonalCertificates.Remove(item);
+        }
+
+        ViewModel.SelectedPersonalCertificates.AddRange(e.AddedItems.OfType<X509Certificate2>());
+    }
+
+    private void RecipientCertList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        foreach (var item in e.RemovedItems.OfType<X509Certificate2>())
+        {
+            ViewModel.SelectedRecipientCertificates.Remove(item);
+        }
+
+        ViewModel.SelectedRecipientCertificates.AddRange(e.AddedItems.OfType<X509Certificate2>());
+    }
+}
diff --git a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml b/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml
similarity index 97%
rename from Wino.Mail/Views/Settings/SignatureManagementPage.xaml
rename to Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml
index 743bf037..8589e400 100644
--- a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
+++ b/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml
@@ -1,4 +1,4 @@
-<abstract:SignatureManagementPageAbstract
+<abstract:SignatureManagementPageAbstract
     x:Class="Wino.Views.Settings.SignatureManagementPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,6 +12,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:reader="using:Wino.Core.Domain.Models.Reader"
+    xmlns:system="using:System"
     x:Name="root"
     mc:Ignorable="d">
 
@@ -19,7 +20,7 @@
         <DataTemplate x:Key="SignatureDialogTemplate" x:DataType="entities:AccountSignature">
             <controls1:SwitchPresenter Value="{x:Bind Id}">
                 <!--  Case for "None" signature  -->
-                <controls1:Case Value="{Binding ViewModel.EmptyGuid, Mode=OneTime, ElementName=root}" />
+                <controls1:Case Value="{x:Bind system:Guid.Empty}" />
 
                 <!--  Default case for regular signatures  -->
                 <controls1:Case IsDefault="True">
@@ -34,14 +35,14 @@
                             <controls1:SettingsCard Header="{x:Bind domain:Translator.SettingsSignature_EditSignature_Title}">
                                 <Button
                                     Width="65"
-                                    Command="{Binding ViewModel.OpenSignatureEditorEditCommand, Mode=OneWay, ElementName=root}"
+                                    Click="EditSignature_Click"
                                     CommandParameter="{x:Bind}"
                                     Content="{x:Bind domain:Translator.Buttons_Edit}" />
                             </controls1:SettingsCard>
                             <controls1:SettingsCard Header="{x:Bind domain:Translator.SettingsSignature_DeleteSignature_Title}">
                                 <Button
                                     Background="Red"
-                                    Command="{Binding ViewModel.DeleteSignatureCommand, Mode=OneWay, ElementName=root}"
+                                    Click="DeleteSignature_Click"
                                     CommandParameter="{x:Bind}"
                                     Content="{x:Bind domain:Translator.Buttons_Delete}" />
                             </controls1:SettingsCard>
diff --git a/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml.cs
new file mode 100644
index 00000000..9837bbf6
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/SignatureManagementPage.xaml.cs
@@ -0,0 +1,29 @@
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class SignatureManagementPage : SignatureManagementPageAbstract
+{
+    public SignatureManagementPage()
+    {
+        InitializeComponent();
+    }
+
+    private void EditSignature_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is AccountSignature signature)
+        {
+            ViewModel.OpenSignatureEditorEditCommand.Execute(signature);
+        }
+    }
+
+    private void DeleteSignature_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is AccountSignature signature)
+        {
+            ViewModel.DeleteSignatureCommand.Execute(signature);
+        }
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml b/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml
new file mode 100644
index 00000000..0acfa2e4
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml
@@ -0,0 +1,114 @@
+<abstract:StoragePageAbstract
+    x:Class="Wino.Views.Settings.StoragePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mailData="using:Wino.Mail.ViewModels.Data"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="root"
+    mc:Ignorable="d">
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+            <Grid
+                Padding="16"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="{ThemeResource OverlayCornerRadius}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <StackPanel Orientation="Horizontal" Spacing="12">
+                    <PathIcon>
+                        <PathIcon.Data>
+                            M5 7h14a3 3 0 0 1 2.995 2.824L22 10v4a3 3 0 0 1-2.824 2.995L19 17H5a3 3 0 0 1-2.995-2.824L2 14v-4a3 3 0 0 1 2.824-2.995L5 7h14H5Zm14 1.5H5A1.5 1.5 0 0 0 3.5 10v4A1.5 1.5 0 0 0 5 15.5h14a1.5 1.5 0 0 0 1.5-1.5v-4A1.5 1.5 0 0 0 19 8.5ZM18 10a1 1 0 1 1 0 2 1 1 0 0 1 0-2Zm-4 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z
+                        </PathIcon.Data>
+                    </PathIcon>
+                    <StackPanel Spacing="2">
+                        <TextBlock Style="{ThemeResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.SettingsStorage_Title}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Text="{x:Bind domain:Translator.SettingsStorage_Description}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+                </StackPanel>
+
+                <Grid Grid.Row="1" Margin="0,12,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="{x:Bind ViewModel.SummaryText, Mode=OneWay}"
+                        TextWrapping="WrapWholeWords" />
+
+                    <Button
+                        Grid.Column="1"
+                        Margin="12,0,0,0"
+                        Command="{x:Bind ViewModel.RefreshStorageCommand}"
+                        Content="{x:Bind domain:Translator.SettingsStorage_ScanFolder}"
+                        IsEnabled="{x:Bind ViewModel.IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}"
+                        Style="{StaticResource AccentButtonStyle}" />
+                </Grid>
+            </Grid>
+
+            <ItemsControl ItemsSource="{x:Bind ViewModel.AccountStorageItems, Mode=OneWay}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate x:DataType="mailData:AccountStorageItemViewModel">
+                        <controls:SettingsExpander Description="{x:Bind SizeDescription}" Header="{x:Bind AccountName}">
+                            <controls:SettingsExpander.HeaderIcon>
+                                <coreControls:WinoFontIcon FontSize="64" Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(Account)}" />
+                            </controls:SettingsExpander.HeaderIcon>
+
+                            <controls:SettingsExpander.Items>
+                                <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsStorage_DeleteAll_Description}" Header="{x:Bind domain:Translator.SettingsStorage_DeleteAll_Title}">
+                                    <Button
+                                        Command="{x:Bind DeleteAllCommand}"
+                                        CommandParameter="{x:Bind}"
+                                        Content="{x:Bind domain:Translator.SettingsStorage_DeleteAll_Button}"
+                                        IsEnabled="{x:Bind IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}" />
+                                </controls:SettingsCard>
+
+                                <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsStorage_DeleteOld_Description}" Header="{x:Bind domain:Translator.SettingsStorage_DeleteOld_Title}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <Button
+                                            Command="{x:Bind DeleteOneMonthCommand}"
+                                            CommandParameter="{x:Bind}"
+                                            Content="{x:Bind domain:Translator.SettingsStorage_DeleteOld_1Month}"
+                                            IsEnabled="{x:Bind IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}" />
+                                        <Button
+                                            Command="{x:Bind DeleteThreeMonthsCommand}"
+                                            CommandParameter="{x:Bind}"
+                                            Content="{x:Bind domain:Translator.SettingsStorage_DeleteOld_3Months}"
+                                            IsEnabled="{x:Bind IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}" />
+                                        <Button
+                                            Command="{x:Bind DeleteSixMonthsCommand}"
+                                            CommandParameter="{x:Bind}"
+                                            Content="{x:Bind domain:Translator.SettingsStorage_DeleteOld_6Months}"
+                                            IsEnabled="{x:Bind IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}" />
+                                        <Button
+                                            Command="{x:Bind DeleteYearCommand}"
+                                            CommandParameter="{x:Bind}"
+                                            Content="{x:Bind domain:Translator.SettingsStorage_DeleteOld_1Year}"
+                                            IsEnabled="{x:Bind IsBusy, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}" />
+                                    </StackPanel>
+                                </controls:SettingsCard>
+                            </controls:SettingsExpander.Items>
+                        </controls:SettingsExpander>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:StoragePageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml.cs
new file mode 100644
index 00000000..ab436941
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/StoragePage.xaml.cs
@@ -0,0 +1,11 @@
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class StoragePage : StoragePageAbstract
+{
+    public StoragePage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml b/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml
new file mode 100644
index 00000000..01d05821
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml
@@ -0,0 +1,398 @@
+<abstract:WinoAccountManagementPageAbstract
+    x:Class="Wino.Views.Settings.WinoAccountManagementPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:selectors="using:Wino.Selectors"
+    xmlns:viewModelData="using:Wino.Core.ViewModels.Data"
+    x:Name="root"
+    Title="{x:Bind domain:Translator.WinoAccount_SettingsSection_Title}"
+    mc:Ignorable="d">
+
+    <Page.Resources>
+        <DataTemplate x:Key="AddOnNotPurchasedTemplate" x:DataType="viewModelData:WinoAddOnItemViewModel">
+            <controls:SettingsCard ActionIcon="Add" IsActionIconVisible="True">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind IconGlyph}" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.Header>
+                    <StackPanel Spacing="8">
+                        <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.GetTranslatedString(NameKey)}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.GetTranslatedString(DescriptionKey)}"
+                            TextWrapping="WrapWholeWords" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.GetTranslatedString(KeywordsKey)}"
+                            TextWrapping="WrapWholeWords" />
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Spacing="8"
+                            Visibility="{x:Bind ShowLoadingState, Mode=OneWay}">
+                            <ProgressRing
+                                Width="18"
+                                Height="18"
+                                IsActive="{x:Bind ShowLoadingState, Mode=OneWay}" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Busy}" />
+                        </StackPanel>
+                        <TextBlock
+                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ErrorText, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords"
+                            Visibility="{x:Bind ShowErrorState, Mode=OneWay}" />
+                        <StackPanel
+                            Margin="0,4,0,0"
+                            Orientation="Horizontal"
+                            Spacing="12">
+                            <Button
+                                Command="{x:Bind PurchaseCommand}"
+                                CommandParameter="{x:Bind}"
+                                Content="{x:Bind domain:Translator.Buttons_Purchase}"
+                                Style="{StaticResource AccentButtonStyle}"
+                                Visibility="{x:Bind ShowPurchaseState, Mode=OneWay}" />
+                            <ProgressRing
+                                Width="18"
+                                Height="18"
+                                IsActive="{x:Bind IsPurchaseInProgress, Mode=OneWay}"
+                                Visibility="{x:Bind IsPurchaseInProgress, Mode=OneWay}" />
+                        </StackPanel>
+                    </StackPanel>
+                </controls:SettingsCard.Header>
+            </controls:SettingsCard>
+        </DataTemplate>
+
+        <DataTemplate x:Key="AiPackPurchasedTemplate" x:DataType="viewModelData:WinoAddOnItemViewModel">
+            <controls:SettingsExpander IsExpanded="True">
+                <controls:SettingsExpander.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind IconGlyph}" />
+                </controls:SettingsExpander.HeaderIcon>
+                <controls:SettingsExpander.Header>
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.GetTranslatedString(NameKey)}" />
+                        <Border
+                            Padding="8,2"
+                            Background="{ThemeResource SystemAccentColor}"
+                            CornerRadius="4">
+                            <TextBlock
+                                FontSize="10"
+                                FontWeight="Bold"
+                                Foreground="White"
+                                Text="PRO" />
+                        </Border>
+                    </StackPanel>
+                </controls:SettingsExpander.Header>
+                <controls:SettingsExpander.Description>
+                    <StackPanel Orientation="Horizontal" Spacing="4">
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.WinoAccount_Management_AiPackSubscriptionActive}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text=" · " />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind RenewalText, Mode=OneWay}" />
+                    </StackPanel>
+                </controls:SettingsExpander.Description>
+                <controls:SettingsExpander.Items>
+                    <controls:SettingsCard HorizontalContentAlignment="Stretch">
+                        <controls:SettingsCard.Header>
+                            <StackPanel Spacing="8">
+                                <StackPanel
+                                    MinWidth="400"
+                                    Spacing="8"
+                                    Visibility="{x:Bind ShowUsageSummary, Mode=OneWay}">
+                                    <StackPanel Orientation="Horizontal" Spacing="4">
+                                        <TextBlock
+                                            FontSize="24"
+                                            FontWeight="Bold"
+                                            Text="{x:Bind UsageCount, Mode=OneWay}" />
+                                        <TextBlock
+                                            Margin="0,0,0,2"
+                                            VerticalAlignment="Bottom"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Style="{StaticResource CaptionTextBlockStyle}">
+                                            <Run Text="/ " />
+                                            <Run Text="{x:Bind UsageLimit, Mode=OneWay}" />
+                                        </TextBlock>
+                                    </StackPanel>
+                                    <ProgressBar
+                                        Height="8"
+                                        Maximum="100"
+                                        Value="{x:Bind UsagePercentage, Mode=OneWay}" />
+                                    <Grid>
+                                        <TextBlock
+                                            HorizontalAlignment="Left"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                            Text="{x:Bind domain:Translator.WinoAccount_Management_AiPackRequestsUsed}" />
+                                        <TextBlock
+                                            HorizontalAlignment="Right"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Style="{StaticResource CaptionTextBlockStyle}"
+                                            Text="{x:Bind UsageResetText, Mode=OneWay}" />
+                                    </Grid>
+                                </StackPanel>
+                                <StackPanel
+                                    Orientation="Horizontal"
+                                    Spacing="8"
+                                    Visibility="{x:Bind ShowLoadingState, Mode=OneWay}">
+                                    <ProgressRing
+                                        Width="18"
+                                        Height="18"
+                                        IsActive="{x:Bind ShowLoadingState, Mode=OneWay}" />
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{x:Bind domain:Translator.Busy}" />
+                                </StackPanel>
+                                <TextBlock
+                                    Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{x:Bind ErrorText, Mode=OneWay}"
+                                    TextWrapping="WrapWholeWords"
+                                    Visibility="{x:Bind ShowErrorState, Mode=OneWay}" />
+                            </StackPanel>
+                        </controls:SettingsCard.Header>
+                    </controls:SettingsCard>
+                </controls:SettingsExpander.Items>
+            </controls:SettingsExpander>
+        </DataTemplate>
+
+        <DataTemplate x:Key="UnlimitedAccountsPurchasedTemplate" x:DataType="viewModelData:WinoAddOnItemViewModel">
+            <controls:SettingsCard>
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="{x:Bind IconGlyph}" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.Header>
+                    <StackPanel Spacing="8">
+                        <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.GetTranslatedString(NameKey)}" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.GetTranslatedString(DescriptionKey)}"
+                            TextWrapping="WrapWholeWords" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.GetTranslatedString(KeywordsKey)}"
+                            TextWrapping="WrapWholeWords" />
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Spacing="8"
+                            Visibility="{x:Bind ShowLoadingState, Mode=OneWay}">
+                            <ProgressRing
+                                Width="18"
+                                Height="18"
+                                IsActive="{x:Bind ShowLoadingState, Mode=OneWay}" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Busy}" />
+                        </StackPanel>
+                        <TextBlock
+                            Foreground="{ThemeResource SystemFillColorCautionBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind ErrorText, Mode=OneWay}"
+                            TextWrapping="WrapWholeWords"
+                            Visibility="{x:Bind ShowErrorState, Mode=OneWay}" />
+                        <Border
+                            Padding="12,4"
+                            HorizontalAlignment="Left"
+                            Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                            CornerRadius="12"
+                            Visibility="{x:Bind ShowPurchaseState, Mode=OneWay}">
+                            <TextBlock
+                                Foreground="{ThemeResource SystemFillColorSuccessBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Purchased}" />
+                        </Border>
+                    </StackPanel>
+                </controls:SettingsCard.Header>
+            </controls:SettingsCard>
+        </DataTemplate>
+
+        <selectors:WinoAddOnTemplateSelector
+            x:Key="WinoAddOnTemplateSelector"
+            AiPackPurchasedTemplate="{StaticResource AiPackPurchasedTemplate}"
+            NotPurchasedTemplate="{StaticResource AddOnNotPurchasedTemplate}"
+            UnlimitedAccountsPurchasedTemplate="{StaticResource UnlimitedAccountsPurchasedTemplate}" />
+    </Page.Resources>
+
+    <ScrollViewer>
+        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+
+            <StackPanel
+                x:Name="SignedOutPanel"
+                HorizontalAlignment="Stretch"
+                x:Load="{x:Bind ViewModel.IsSignedOut, Mode=OneWay}"
+                Spacing="{StaticResource SettingsCardSpacing}">
+
+                <StackPanel
+                    Padding="0,40,0,40"
+                    HorizontalAlignment="Stretch"
+                    Spacing="16">
+
+                    <Image
+                        Width="64"
+                        Height="64"
+                        HorizontalAlignment="Center"
+                        Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png" />
+
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="20"
+                        FontWeight="SemiBold"
+                        Text="{x:Bind domain:Translator.WinoAccount_Management_SignedOutTitle}" />
+
+                    <TextBlock
+                        MaxWidth="360"
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource BodyTextBlockStyle}"
+                        Text="{x:Bind domain:Translator.WinoAccount_Management_SignedOutDescription}"
+                        TextAlignment="Center"
+                        TextWrapping="WrapWholeWords" />
+
+                    <StackPanel
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal"
+                        Spacing="12">
+                        <Button
+                            Command="{x:Bind ViewModel.SignInCommand}"
+                            Content="{x:Bind domain:Translator.Buttons_SignIn}"
+                            Style="{StaticResource AccentButtonStyle}" />
+                        <Button Command="{x:Bind ViewModel.RegisterCommand}" Content="{x:Bind domain:Translator.Buttons_CreateAccount}" />
+                    </StackPanel>
+
+                    <TextBlock
+                        Margin="0,16,0,4"
+                        HorizontalAlignment="Center"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="{x:Bind domain:Translator.WinoAccount_Management_AddOnsSectionHeader}" />
+
+                    <ListView
+                        x:Name="SignedOutAddOnsList"
+                        ItemContainerStyle="{StaticResource StretchedItemContainerStyle}"
+                        ItemTemplateSelector="{StaticResource WinoAddOnTemplateSelector}"
+                        ItemsSource="{x:Bind ViewModel.AddOns, Mode=OneWay}"
+                        SelectionMode="None" />
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel
+                x:Name="SignedInPanel"
+                x:Load="{x:Bind ViewModel.IsSignedIn, Mode=OneWay}"
+                Spacing="{StaticResource SettingsCardSpacing}">
+
+                <TextBlock
+                    Margin="0,0,0,4"
+                    Style="{StaticResource BodyStrongTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WinoAccount_Management_ProfileSectionHeader}" />
+
+                <controls:SettingsCard Header="{x:Bind ViewModel.AccountEmail, Mode=OneWay}">
+                    <controls:SettingsCard.HeaderIcon>
+                        <PathIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Data="F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.440104 0 10.089518 0.130209 10.698242 0.390625 C 11.306966 0.651043 11.837564 1.007488 12.290039 1.459961 C 12.742513 1.912436 13.098958 2.443035 13.359375 3.051758 C 13.619791 3.660482 13.75 4.309896 13.75 5 C 13.75 5.690104 13.619791 6.339519 13.359375 6.948242 C 13.098958 7.556967 12.742513 8.087565 12.290039 8.540039 C 11.837564 8.992514 11.306966 9.348959 10.698242 9.609375 C 10.089518 9.869792 9.440104 10 8.75 10 C 8.059896 10 7.410481 9.869792 6.801758 9.609375 C 6.193034 9.348959 5.662435 8.992514 5.209961 8.540039 C 4.757487 8.087565 4.401042 7.556967 4.140625 6.948242 C 3.880208 6.339519 3.75 5.690104 3.75 5 Z M 5 5 L 5 5.078125 C 5 5.585938 5.100911 6.062826 5.302734 6.508789 C 5.504557 6.954753 5.777995 7.34375 6.123047 7.675781 C 6.468099 8.007812 6.866862 8.269857 7.319336 8.461914 C 7.77181 8.653972 8.248697 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 C 12.5 4.479167 12.402344 3.990887 12.207031 3.535156 C 12.011719 3.079428 11.744791 2.682293 11.40625 2.34375 C 11.067708 2.005209 10.670572 1.738281 10.214844 1.542969 C 9.759114 1.347656 9.270833 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 Z M 20 14.375 L 20 18.125 C 20 18.385416 19.951172 18.629557 19.853516 18.857422 C 19.755859 19.085287 19.622395 19.283854 19.453125 19.453125 C 19.283854 19.622396 19.085285 19.755859 18.857422 19.853516 C 18.629557 19.951172 18.385416 20 18.125 20 L 11.875 20 C 11.614583 20 11.370442 19.951172 11.142578 19.853516 C 10.914713 19.755859 10.716146 19.622396 10.546875 19.453125 C 10.377604 19.283854 10.244141 19.085287 10.146484 18.857422 C 10.048828 18.629557 10 18.385416 10 18.125 L 10 14.375 C 10 14.114584 10.048828 13.870443 10.146484 13.642578 C 10.244141 13.414714 10.377604 13.216146 10.546875 13.046875 C 10.716146 12.877604 10.914713 12.744141 11.142578 12.646484 C 11.370442 12.548828 11.614583 12.5 11.875 12.5 L 12.5 12.5 L 12.5 11.25 C 12.5 11.080729 12.532552 10.921225 12.597656 10.771484 C 12.66276 10.621745 12.753906 10.488281 12.871094 10.371094 C 13.118488 10.123698 13.411457 10 13.75 10 L 16.25 10 C 16.41927 10 16.578775 10.032553 16.728516 10.097656 C 16.878254 10.162761 17.011719 10.253906 17.128906 10.371094 C 17.376301 10.61849 17.5 10.911459 17.5 11.25 L 17.5 12.5 L 18.125 12.5 C 18.385416 12.5 18.629557 12.548828 18.857422 12.646484 C 19.085285 12.744141 19.283854 12.877604 19.453125 13.046875 C 19.622395 13.216146 19.755859 13.414714 19.853516 13.642578 C 19.951172 13.870443 20 14.114584 20 14.375 Z M 11.25 11.25 C 10.800781 11.25 10.382486 11.360678 9.995117 11.582031 C 9.607747 11.803386 9.303385 12.109375 9.082031 12.5 L 2.5 12.5 C 2.324219 12.5 2.159831 12.532553 2.006836 12.597656 C 1.853841 12.662761 1.722005 12.750651 1.611328 12.861328 C 1.500651 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.420573 1.360677 15.008139 1.582031 15.512695 C 1.803385 16.017252 2.102865 16.455078 2.480469 16.826172 C 2.858073 17.197266 3.297526 17.50651 3.798828 17.753906 C 4.30013 18.001303 4.827474 18.198242 5.380859 18.344727 C 5.934244 18.491211 6.50065 18.595377 7.080078 18.657227 C 7.659505 18.719076 8.216146 18.75 8.75 18.75 C 8.75 19.205729 8.860677 19.622396 9.082031 20 L 8.75 20 C 8.190104 20 7.618814 19.973959 7.036133 19.921875 C 6.45345 19.869791 5.878906 19.775391 5.3125 19.638672 C 4.746094 19.501953 4.197591 19.319662 3.666992 19.091797 C 3.136393 18.863932 2.646484 18.574219 2.197266 18.222656 C 1.474609 17.66276 0.927734 17.005209 0.556641 16.25 C 0.185547 15.494792 0 14.661458 0 13.75 C 0 13.404948 0.065104 13.081055 0.195312 12.77832 C 0.325521 12.475586 0.504557 12.210287 0.732422 11.982422 C 0.960286 11.754558 1.225586 11.575521 1.52832 11.445312 C 1.831055 11.315104 2.154948 11.25 2.5 11.25 Z M 16.25 11.25 L 13.75 11.25 L 13.75 12.5 L 16.25 12.5 Z " />
+                    </controls:SettingsCard.HeaderIcon>
+                    <StackPanel Orientation="Horizontal" Spacing="8">
+                        <Border
+                            Padding="12,4"
+                            Background="{ThemeResource SystemFillColorSuccessBackgroundBrush}"
+                            CornerRadius="12">
+                            <TextBlock
+                                Foreground="{ThemeResource SystemFillColorSuccessBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind ViewModel.AccountStatusText, Mode=OneWay}" />
+                        </Border>
+                        <StackPanel
+                            Orientation="Horizontal"
+                            Spacing="6"
+                            Visibility="{x:Bind ViewModel.IsBusy, Mode=OneWay}">
+                            <ProgressRing
+                                Width="16"
+                                Height="16"
+                                VerticalAlignment="Center"
+                                IsActive="{x:Bind ViewModel.IsBusy, Mode=OneWay}" />
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Busy}" />
+                        </StackPanel>
+                    </StackPanel>
+                </controls:SettingsCard>
+
+                <controls:SettingsCard
+                    Command="{x:Bind ViewModel.ChangePasswordCommand}"
+                    Description="{x:Bind domain:Translator.WinoAccount_ChangePassword_Description}"
+                    Header="{x:Bind domain:Translator.WinoAccount_ChangePassword_Title}"
+                    IsClickEnabled="True">
+                    <controls:SettingsCard.HeaderIcon>
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                    </controls:SettingsCard.HeaderIcon>
+                </controls:SettingsCard>
+
+                <controls:SettingsCard
+                    Command="{x:Bind ViewModel.SignOutCommand}"
+                    Description="{x:Bind domain:Translator.WinoAccount_Management_SignOutDescription}"
+                    Header="{x:Bind domain:Translator.WinoAccount_Management_SignOutTitle}"
+                    IsClickEnabled="True">
+                    <controls:SettingsCard.HeaderIcon>
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xF3B1;" />
+                    </controls:SettingsCard.HeaderIcon>
+                </controls:SettingsCard>
+
+                <TextBlock
+                    Margin="0,12,0,4"
+                    Style="{StaticResource BodyStrongTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WinoAccount_Management_AddOnsSectionHeader}" />
+
+                <ListView
+                    x:Name="SignedInAddOnsList"
+                    ItemContainerStyle="{StaticResource StretchedItemContainerStyle}"
+                    ItemTemplateSelector="{StaticResource WinoAddOnTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.AddOns, Mode=OneWay}"
+                    SelectionMode="None" />
+
+                <TextBlock
+                    Margin="0,12,0,4"
+                    Style="{StaticResource BodyStrongTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WinoAccount_Management_DataSectionHeader}" />
+
+                <controls:SettingsCard Description="{x:Bind domain:Translator.WinoAccount_Management_SyncPreferencesDescription}" Header="{x:Bind domain:Translator.WinoAccount_Management_SyncPreferencesTitle}">
+                    <controls:SettingsCard.HeaderIcon>
+                        <PathIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Data="F1 M 18.330078 3.330078 L 18.330078 7.5 C 18.330078 7.727865 18.248697 7.923178 18.085938 8.085938 C 17.923176 8.248698 17.727863 8.330078 17.5 8.330078 L 13.330078 8.330078 C 13.102213 8.330078 12.9069 8.248698 12.744141 8.085938 C 12.58138 7.923178 12.5 7.727865 12.5 7.5 C 12.5 7.272136 12.58138 7.076823 12.744141 6.914062 C 12.9069 6.751303 13.102213 6.669923 13.330078 6.669922 L 15.78125 6.669922 C 15.481771 6.149089 15.120442 5.681967 14.697266 5.268555 C 14.274088 4.855145 13.808593 4.505209 13.300781 4.21875 C 12.792968 3.932293 12.25423 3.712566 11.68457 3.55957 C 11.114908 3.406576 10.530599 3.330078 9.931641 3.330078 C 9.384766 3.330078 8.846028 3.401693 8.31543 3.544922 C 7.784831 3.688152 7.280273 3.891602 6.801758 4.155273 C 6.323242 4.418945 5.878906 4.737956 5.46875 5.112305 C 5.058594 5.486654 4.703776 5.901693 4.404297 6.357422 C 4.254557 6.585287 4.127604 6.816407 4.023438 7.050781 C 3.919271 7.285157 3.815104 7.526043 3.710938 7.773438 C 3.639323 7.942709 3.538411 8.0778 3.408203 8.178711 C 3.277995 8.279623 3.11849 8.330078 2.929688 8.330078 C 2.701823 8.330078 2.504883 8.250326 2.338867 8.09082 C 2.172852 7.931315 2.089844 7.734375 2.089844 7.5 C 2.089844 7.415365 2.10612 7.32422 2.138672 7.226562 C 2.41862 6.412761 2.81901 5.66569 3.339844 4.985352 C 3.860677 4.305014 4.464518 3.719076 5.151367 3.227539 C 5.838216 2.736004 6.588541 2.353516 7.402344 2.080078 C 8.216146 1.806641 9.052734 1.669922 9.912109 1.669922 C 10.576172 1.669922 11.227213 1.743164 11.865234 1.889648 C 12.503255 2.036133 13.111979 2.250977 13.691406 2.53418 C 14.270832 2.817383 14.811197 3.167318 15.3125 3.583984 C 15.813802 4.000652 16.266275 4.475912 16.669922 5.009766 L 16.669922 3.330078 C 16.669922 3.102215 16.751301 2.906902 16.914062 2.744141 C 17.076822 2.581381 17.272135 2.5 17.5 2.5 C 17.727863 2.5 17.923176 2.581381 18.085938 2.744141 C 18.248697 2.906902 18.330078 3.102215 18.330078 3.330078 Z M 17.861328 12.5 C 17.861328 12.584636 17.845051 12.675781 17.8125 12.773438 C 17.532551 13.58724 17.13216 14.334311 16.611328 15.014648 C 16.090494 15.694987 15.486653 16.280924 14.799805 16.772461 C 14.112955 17.263998 13.362629 17.646484 12.548828 17.919922 C 11.735025 18.193359 10.898438 18.330078 10.039062 18.330078 C 9.375 18.330078 8.728841 18.258463 8.100586 18.115234 C 7.472331 17.972006 6.871745 17.762045 6.298828 17.485352 C 5.725911 17.208658 5.188802 16.865234 4.6875 16.455078 C 4.186198 16.044922 3.733724 15.576172 3.330078 15.048828 L 3.330078 16.669922 C 3.330078 16.897787 3.248698 17.0931 3.085938 17.255859 C 2.923177 17.418619 2.727865 17.5 2.5 17.5 C 2.272135 17.5 2.076823 17.418619 1.914062 17.255859 C 1.751302 17.0931 1.669922 16.897787 1.669922 16.669922 L 1.669922 12.5 C 1.669922 12.272136 1.751302 12.076823 1.914062 11.914062 C 2.076823 11.751303 2.272135 11.669922 2.5 11.669922 L 6.669922 11.669922 C 6.897786 11.669922 7.093099 11.751303 7.255859 11.914062 C 7.418619 12.076823 7.5 12.272136 7.5 12.5 C 7.5 12.727865 7.418619 12.923178 7.255859 13.085938 C 7.093099 13.248698 6.897786 13.330078 6.669922 13.330078 L 4.179688 13.330078 C 4.479167 13.850912 4.840495 14.318034 5.263672 14.731445 C 5.686849 15.144857 6.150716 15.494792 6.655273 15.78125 C 7.15983 16.067709 7.696939 16.287436 8.266602 16.44043 C 8.836263 16.593424 9.420572 16.669922 10.019531 16.669922 C 10.566406 16.669922 11.106771 16.598307 11.640625 16.455078 C 12.174479 16.31185 12.680664 16.108398 13.15918 15.844727 C 13.637695 15.581055 14.080403 15.262045 14.487305 14.887695 C 14.894205 14.513347 15.247396 14.095053 15.546875 13.632812 C 15.696614 13.404948 15.821939 13.173828 15.922852 12.939453 C 16.023762 12.705078 16.129557 12.464193 16.240234 12.216797 C 16.311848 12.047526 16.414387 11.912436 16.547852 11.811523 C 16.681314 11.710612 16.842447 11.660156 17.03125 11.660156 C 17.148438 11.660156 17.257486 11.682943 17.358398 11.728516 C 17.459309 11.774089 17.547199 11.834311 17.62207 11.90918 C 17.696939 11.98405 17.755533 12.07194 17.797852 12.172852 C 17.840168 12.273764 17.861328 12.382812 17.861328 12.5 Z " />
+                    </controls:SettingsCard.HeaderIcon>
+                    <StackPanel Orientation="Horizontal" Spacing="6">
+                        <Button Command="{x:Bind ViewModel.ExportSettingsCommand}" Content="{x:Bind domain:Translator.Buttons_Export}" />
+                        <Button Command="{x:Bind ViewModel.ImportSettingsCommand}" Content="{x:Bind domain:Translator.Buttons_Import}" />
+                    </StackPanel>
+                </controls:SettingsCard>
+
+            </StackPanel>
+        </StackPanel>
+    </ScrollViewer>
+</abstract:WinoAccountManagementPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml.cs b/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml.cs
new file mode 100644
index 00000000..f2c28075
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/Settings/WinoAccountManagementPage.xaml.cs
@@ -0,0 +1,11 @@
+using Wino.Views.Abstract;
+
+namespace Wino.Views.Settings;
+
+public sealed partial class WinoAccountManagementPage : WinoAccountManagementPageAbstract
+{
+    public WinoAccountManagementPage()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/Wino.Core.UWP/Views/SettingsPage.xaml b/Wino.Mail.WinUI/Views/SettingsPage.xaml
similarity index 75%
rename from Wino.Core.UWP/Views/SettingsPage.xaml
rename to Wino.Mail.WinUI/Views/SettingsPage.xaml
index eda5449a..20e0ac46 100644
--- a/Wino.Core.UWP/Views/SettingsPage.xaml
+++ b/Wino.Mail.WinUI/Views/SettingsPage.xaml
@@ -1,4 +1,4 @@
-<abstract:SettingsPageAbstract
+<abstract:SettingsPageAbstract
     x:Class="Wino.Views.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -16,8 +16,9 @@
             MaxWidth="900"
             Padding="20"
             HorizontalAlignment="Stretch"
-            RowSpacing="20">
+            RowSpacing="4">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
@@ -27,7 +28,7 @@
                 ItemClicked="BreadItemClicked"
                 ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
                 <winuiControls:BreadcrumbBar.ItemTemplate>
-                    <DataTemplate>
+                    <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
                         <winuiControls:BreadcrumbBarItem Margin="0,0,8,0">
                             <winuiControls:BreadcrumbBarItem.ContentTemplate>
                                 <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
@@ -35,7 +36,7 @@
                                         Margin="0,0,8,10"
                                         FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
                                         Style="{StaticResource TitleTextBlockStyle}"
-                                        Text="{Binding Title}" />
+                                        Text="{x:Bind Title}" />
                                 </DataTemplate>
                             </winuiControls:BreadcrumbBarItem.ContentTemplate>
                         </winuiControls:BreadcrumbBarItem>
@@ -43,7 +44,15 @@
                 </winuiControls:BreadcrumbBar.ItemTemplate>
             </winuiControls:BreadcrumbBar>
 
-            <Frame x:Name="SettingsFrame" Grid.Row="1" />
+            <TextBlock
+                Grid.Row="1"
+                Margin="0,-4,0,4"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Style="{StaticResource BodyStrongTextBlockStyle}"
+                Text="{x:Bind ViewModel.CurrentDescription, Mode=OneWay}"
+                TextWrapping="WrapWholeWords" />
+
+            <Frame x:Name="SettingsFrame" Grid.Row="2" />
         </Grid>
     </Border>
 </abstract:SettingsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/SettingsPage.xaml.cs b/Wino.Mail.WinUI/Views/SettingsPage.xaml.cs
new file mode 100644
index 00000000..4d69addb
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/SettingsPage.xaml.cs
@@ -0,0 +1,283 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Settings;
+using Wino.Helpers;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI.Interfaces;
+using Wino.Mail.WinUI.Models;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.UI;
+using Wino.Views.Abstract;
+using Wino.Views.Settings;
+
+namespace Wino.Views;
+
+public sealed partial class SettingsPage : SettingsPageAbstract, 
+    IRecipient<BreadcrumbNavigationRequested>,
+    IRecipient<BackBreadcrumNavigationRequested>,
+    IRecipient<SettingsRootNavigationRequested>,
+    IRecipient<MergedInboxRenamed>,
+    IRecipient<AccountUpdatedMessage>,
+    ITitleBarSearchHost
+{
+    public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = [];
+    public ObservableCollection<TitleBarSearchSuggestion> SearchSuggestions { get; } = [];
+    public string SearchText { get; set; } = string.Empty;
+    public string SearchPlaceholderText => Translator.SettingsHome_SearchPlaceholder;
+
+    public SettingsPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        // Register for frame navigation events to track back button visibility
+        SettingsFrame.Navigated -= SettingsFrameNavigated;
+        SettingsFrame.Navigated += SettingsFrameNavigated;
+
+        var initialPage = e.Parameter as WinoPage? ?? WinoPage.SettingOptionsPage;
+        NavigateToRootPage(initialPage);
+    }
+
+    public override void OnLanguageChanged()
+    {
+        base.OnLanguageChanged();
+
+        // Update Settings header in breadcrumb.
+
+        var settingsHeader = PageHistory.FirstOrDefault();
+
+        if (settingsHeader == null) return;
+
+        settingsHeader.Title = Translator.MenuSettings;
+        var manageAccountsEntry = PageHistory.FirstOrDefault(a =>
+            a.Request.PageType == WinoPage.ManageAccountsPage || a.Request.PageType == WinoPage.AccountManagementPage);
+
+        if (manageAccountsEntry != null)
+        {
+            manageAccountsEntry.Title = Translator.SettingsManageAccountSettings_Title;
+        }
+
+        var winoAccountEntry = PageHistory.FirstOrDefault(a => a.Request.PageType == WinoPage.WinoAccountManagementPage);
+
+        if (winoAccountEntry != null)
+        {
+            winoAccountEntry.Title = Translator.WinoAccount_SettingsSection_Title;
+        }
+
+        _ = RefreshCurrentPageStateAsync();
+        UpdateWindowTitle();
+    }
+
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        // Unregister frame navigation event
+        SettingsFrame.Navigated -= SettingsFrameNavigated;
+
+        base.OnNavigatingFrom(e);
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        WeakReferenceMessenger.Default.Register<BreadcrumbNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Register<BackBreadcrumNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Register<SettingsRootNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Register<MergedInboxRenamed>(this);
+        WeakReferenceMessenger.Default.Register<AccountUpdatedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        WeakReferenceMessenger.Default.Unregister<BreadcrumbNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<BackBreadcrumNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<SettingsRootNavigationRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<MergedInboxRenamed>(this);
+        WeakReferenceMessenger.Default.Unregister<AccountUpdatedMessage>(this);
+    }
+
+    void IRecipient<BreadcrumbNavigationRequested>.Receive(BreadcrumbNavigationRequested message)
+    {
+        NavigateBreadcrumb(message);
+    }
+
+    private void SettingsFrameNavigated(object sender, NavigationEventArgs e)
+    {
+        UpdateBackNavigationState();
+        _ = RefreshCurrentPageStateAsync();
+    }
+
+    private void GoBackFrame(Core.Domain.Enums.NavigationTransitionEffect slideEffect)
+    {
+        if (!BreadcrumbNavigationHelper.GoBack(SettingsFrame, PageHistory, slideEffect))
+            return;
+
+        UpdateBackNavigationState();
+        _ = RefreshCurrentPageStateAsync();
+        UpdateWindowTitle();
+    }
+
+    private void BreadItemClicked(Microsoft.UI.Xaml.Controls.BreadcrumbBar sender, Microsoft.UI.Xaml.Controls.BreadcrumbBarItemClickedEventArgs args)
+    {
+        if (!BreadcrumbNavigationHelper.NavigateTo(SettingsFrame, PageHistory, args.Index))
+            return;
+
+        UpdateBackNavigationState();
+        _ = RefreshCurrentPageStateAsync();
+        UpdateWindowTitle();
+    }
+
+    public void Receive(BackBreadcrumNavigationRequested message)
+    {
+        GoBackFrame(message.SlideEffect);
+    }
+
+    public void Receive(SettingsRootNavigationRequested message)
+    {
+        var currentRootPage = SettingsNavigationInfoProvider.GetRootPage(PageHistory.LastOrDefault()?.Request.PageType ?? WinoPage.SettingOptionsPage);
+        if (message.PageType != WinoPage.SettingOptionsPage && currentRootPage == message.PageType)
+            return;
+
+        NavigateToRootPage(message.PageType);
+    }
+
+    public void Receive(AccountUpdatedMessage message)
+    {
+        var activePage = PageHistory.LastOrDefault(a => a.Request.PageType == WinoPage.AccountDetailsPage);
+
+        if (activePage == null)
+            return;
+
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            activePage.Title = message.Account.Name;
+            _ = RefreshCurrentPageStateAsync();
+            UpdateWindowTitle();
+        });
+    }
+
+    public void Receive(MergedInboxRenamed message)
+    {
+        var activePage = PageHistory.LastOrDefault(a => a.Request.PageType == WinoPage.MergedAccountDetailsPage);
+
+        if (activePage == null)
+            return;
+
+        DispatcherQueue.TryEnqueue(() =>
+        {
+            activePage.Title = message.NewName;
+            _ = RefreshCurrentPageStateAsync();
+            UpdateWindowTitle();
+        });
+    }
+
+    private void NavigateBreadcrumb(BreadcrumbNavigationRequested message)
+    {
+        if (!BreadcrumbNavigationHelper.Navigate(SettingsFrame, PageHistory, message, ViewModel.NavigationService.GetPageType))
+            return;
+
+        UpdateBackNavigationState();
+        _ = RefreshCurrentPageStateAsync();
+        UpdateWindowTitle();
+    }
+
+    private void NavigateToRootPage(WinoPage targetPage)
+    {
+        PageHistory.Clear();
+        SettingsFrame.BackStack.Clear();
+        SettingsFrame.ForwardStack.Clear();
+
+        NavigateBreadcrumb(new BreadcrumbNavigationRequested(Translator.MenuSettings, WinoPage.SettingOptionsPage));
+
+        if (targetPage != WinoPage.SettingOptionsPage)
+        {
+            NavigateBreadcrumb(new BreadcrumbNavigationRequested(
+                SettingsNavigationInfoProvider.GetPageTitle(targetPage),
+                targetPage));
+            return;
+        }
+
+        UpdateWindowTitle();
+    }
+
+    public void ResetForModeSwitch()
+    {
+        while (PageHistory.Count > 1 && SettingsFrame.CanGoBack)
+        {
+            if (!BreadcrumbNavigationHelper.GoBack(SettingsFrame, PageHistory, Core.Domain.Enums.NavigationTransitionEffect.FromRight))
+                break;
+        }
+
+        SettingsFrame.ForwardStack.Clear();
+        UpdateBackNavigationState();
+        _ = RefreshCurrentPageStateAsync();
+        UpdateWindowTitle();
+    }
+
+    private void UpdateBackNavigationState()
+    {
+        WeakReferenceMessenger.Default.Send(new TitleBarShellContentUpdated());
+    }
+
+    public bool CanNavigateBack => PageHistory.Count > 1 && SettingsFrame.CanGoBack;
+
+    private async Task RefreshCurrentPageStateAsync()
+    {
+        var activePage = PageHistory.LastOrDefault()?.Request.PageType ?? WinoPage.SettingOptionsPage;
+        var rootPage = SettingsNavigationInfoProvider.GetRootPage(activePage);
+        await ViewModel.UpdateActivePageAsync(rootPage);
+        WeakReferenceMessenger.Default.Send(new ActiveSettingsPageChanged(rootPage));
+    }
+
+    private void UpdateWindowTitle()
+    {
+        var activeTitle = PageHistory.LastOrDefault()?.Title;
+        ViewModel.StatePersistenceService.CoreWindowTitle = string.IsNullOrWhiteSpace(activeTitle)
+            ? Translator.MenuSettings
+            : activeTitle;
+    }
+
+    public Task OnTitleBarSearchTextChangedAsync()
+    {
+        SearchSuggestions.Clear();
+
+        foreach (var item in SettingsNavigationInfoProvider.Search(SearchText, ViewModel.ManageAccountsDescription).Take(6))
+        {
+            SearchSuggestions.Add(new TitleBarSearchSuggestion(item.Title, item.Description, item));
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public void OnTitleBarSearchSuggestionChosen(TitleBarSearchSuggestion suggestion)
+    {
+        SearchText = suggestion.Title;
+    }
+
+    public Task OnTitleBarSearchSubmittedAsync(string queryText, TitleBarSearchSuggestion? chosenSuggestion)
+    {
+        SearchText = queryText;
+
+        var selectedSetting = chosenSuggestion?.Tag as SettingsNavigationItemInfo
+                              ?? SettingsNavigationInfoProvider.Search(queryText, ViewModel.ManageAccountsDescription).FirstOrDefault();
+
+        if (selectedSetting?.PageType is WinoPage pageType)
+        {
+            Receive(new SettingsRootNavigationRequested(pageType));
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml b/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml
new file mode 100644
index 00000000..70232e37
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml
@@ -0,0 +1,147 @@
+<abstract:SpecialImapCredentialsPageAbstract
+    x:Class="Wino.Views.SpecialImapCredentialsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <ScrollViewer
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        VerticalScrollBarVisibility="Auto">
+        <StackPanel
+            MaxWidth="440"
+            Margin="0,24,0,24"
+            HorizontalAlignment="Center"
+            Spacing="20">
+
+            <!--  Provider logo  -->
+            <Image
+                Height="48"
+                HorizontalAlignment="Center"
+                Source="{x:Bind ViewModel.WizardContext.SelectedProvider.ProviderImage, Mode=OneWay}"
+                Stretch="Uniform" />
+
+            <!--  Title / subtitle  -->
+            <StackPanel Spacing="4">
+                <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind ViewModel.WizardContext.SelectedProvider.Name, Mode=OneWay}" />
+                <TextBlock
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.ProviderSelection_SpecialImap_Subtitle}" />
+            </StackPanel>
+
+            <!--  Display Name  -->
+            <TextBox
+                Header="{x:Bind domain:Translator.ProviderSelection_DisplayNameHeader}"
+                PlaceholderText="{x:Bind domain:Translator.ProviderSelection_DisplayNamePlaceholder}"
+                Text="{x:Bind ViewModel.DisplayName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+            <!--  Email  -->
+            <TextBox
+                Header="{x:Bind domain:Translator.ProviderSelection_EmailHeader}"
+                PlaceholderText="{x:Bind domain:Translator.ProviderSelection_EmailPlaceholder}"
+                Text="{x:Bind ViewModel.EmailAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+            <!--  App-Specific Password  -->
+            <PasswordBox
+                x:Name="AppPasswordBox"
+                Header="{x:Bind domain:Translator.ProviderSelection_AppPasswordHeader}"
+                PasswordChanged="AppPasswordChanged" />
+
+            <HyperlinkButton
+                HorizontalAlignment="Right"
+                Command="{x:Bind ViewModel.OpenAppPasswordHelpCommand}"
+                Content="{x:Bind domain:Translator.ProviderSelection_AppPasswordHelp}" />
+
+            <!--  Divider  -->
+            <Rectangle Height="1" Fill="{ThemeResource CardStrokeColorDefaultBrush}" />
+
+            <!--  Calendar Mode  -->
+            <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind domain:Translator.ProviderSelection_CalendarModeHeader}" />
+
+            <ListView
+                x:Name="CalendarModeListView"
+                IsItemClickEnabled="False"
+                SelectionChanged="CalendarModeSelectionChanged"
+                SelectionMode="Single">
+                <!--  Disabled  -->
+                <ListViewItem>
+                    <Grid Padding="12" ColumnSpacing="10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <FontIcon
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Glyph="&#xEA67;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.ProviderSelection_CalendarMode_DisabledTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.ProviderSelection_CalendarMode_DisabledDescription}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </Grid>
+                </ListViewItem>
+                <!--  CalDAV  -->
+                <ListViewItem>
+                    <Grid Padding="12" ColumnSpacing="10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <FontIcon
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Glyph="&#xE753;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.ProviderSelection_CalendarMode_CalDavTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind ViewModel.CalendarModeCalDavDescription, Mode=OneWay}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </Grid>
+                </ListViewItem>
+                <!--  Local  -->
+                <ListViewItem>
+                    <Grid Padding="12" ColumnSpacing="10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <FontIcon
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Glyph="&#xE7F8;" />
+                        <StackPanel Grid.Column="1" Spacing="2">
+                            <TextBlock FontWeight="SemiBold" Text="{x:Bind domain:Translator.ProviderSelection_CalendarMode_LocalTitle}" />
+                            <TextBlock
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                Style="{StaticResource CaptionTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.ProviderSelection_CalendarMode_LocalDescription}"
+                                TextWrapping="Wrap" />
+                        </StackPanel>
+                    </Grid>
+                </ListViewItem>
+            </ListView>
+
+            <!--  Continue Button  -->
+            <Button
+                HorizontalAlignment="Stretch"
+                Command="{x:Bind ViewModel.ProceedCommand}"
+                Content="{x:Bind domain:Translator.ProviderSelection_ContinueButton}"
+                IsEnabled="{x:Bind ViewModel.CanProceed, Mode=OneWay}"
+                Style="{StaticResource AccentButtonStyle}" />
+
+        </StackPanel>
+    </ScrollViewer>
+
+</abstract:SpecialImapCredentialsPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml.cs b/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml.cs
new file mode 100644
index 00000000..71c2b6e4
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/SpecialImapCredentialsPage.xaml.cs
@@ -0,0 +1,25 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Mail.WinUI.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class SpecialImapCredentialsPage : SpecialImapCredentialsPageAbstract
+{
+    public SpecialImapCredentialsPage()
+    {
+        InitializeComponent();
+    }
+
+    private void CalendarModeSelectionChanged(object sender, SelectionChangedEventArgs args)
+    {
+        if (sender is ListView lv)
+            ViewModel.SelectedCalendarModeIndex = lv.SelectedIndex;
+    }
+
+    private void AppPasswordChanged(object sender, RoutedEventArgs e)
+    {
+        if (sender is PasswordBox pb)
+            ViewModel.AppSpecificPassword = pb.Password;
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml b/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml
new file mode 100644
index 00000000..6169cb9c
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml
@@ -0,0 +1,67 @@
+<abstract:WelcomeHostPageAbstract
+    x:Class="Wino.Views.WelcomeHostPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="using:Wino.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
+    xmlns:winuiControls="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d">
+
+    <Grid RowSpacing="0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <!--  Wizard step indicator bar  -->
+        <Border
+            Padding="24,20"
+            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+            BorderThickness="0,0,0,1">
+            <winuiControls:BreadcrumbBar
+                x:Name="Breadcrumb"
+                HorizontalAlignment="Center"
+                ItemClicked="BreadItemClicked"
+                ItemsSource="{x:Bind PageHistory, Mode=OneWay}">
+                <winuiControls:BreadcrumbBar.ItemTemplate>
+                    <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
+                        <winuiControls:BreadcrumbBarItem>
+                            <winuiControls:BreadcrumbBarItem.ContentTemplate>
+                                <DataTemplate x:DataType="viewModelData:BreadcrumbNavigationItemViewModel">
+                                    <StackPanel
+                                        Margin="8,0"
+                                        Orientation="Horizontal"
+                                        Spacing="8">
+                                        <Border
+                                            Width="24"
+                                            Height="24"
+                                            Background="{x:Bind helpers:XamlHelpers.GetWizardStepBadgeBrush(IsActive), Mode=OneWay}"
+                                            CornerRadius="12">
+                                            <TextBlock
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontSize="11"
+                                                FontWeight="SemiBold"
+                                                Foreground="{x:Bind helpers:XamlHelpers.GetWizardStepNumberForeground(IsActive), Mode=OneWay}"
+                                                Text="{x:Bind StepNumber, Mode=OneWay}" />
+                                        </Border>
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightBySyncState(IsActive), Mode=OneWay}"
+                                            Style="{StaticResource BodyTextBlockStyle}"
+                                            Text="{x:Bind Title, Mode=OneWay}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </winuiControls:BreadcrumbBarItem.ContentTemplate>
+                        </winuiControls:BreadcrumbBarItem>
+                    </DataTemplate>
+                </winuiControls:BreadcrumbBar.ItemTemplate>
+            </winuiControls:BreadcrumbBar>
+        </Border>
+
+        <Frame x:Name="WizardFrame" Grid.Row="1" />
+    </Grid>
+</abstract:WelcomeHostPageAbstract>
diff --git a/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml.cs b/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml.cs
new file mode 100644
index 00000000..2b4ecd82
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/WelcomeHostPage.xaml.cs
@@ -0,0 +1,76 @@
+using System.Collections.ObjectModel;
+using System.Linq;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml.Media.Animation;
+using Microsoft.UI.Xaml.Navigation;
+using Wino.Core.Domain.Enums;
+using Wino.Helpers;
+using Wino.Mail.ViewModels.Data;
+using Wino.Mail.WinUI.Views.Abstract;
+using Wino.Messaging.Client.Navigation;
+
+namespace Wino.Views;
+
+public sealed partial class WelcomeHostPage : WelcomeHostPageAbstract,
+    IRecipient<BreadcrumbNavigationRequested>,
+    IRecipient<BackBreadcrumNavigationRequested>
+{
+    public ObservableCollection<BreadcrumbNavigationItemViewModel> PageHistory { get; set; } = [];
+
+    public WelcomeHostPage()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+        ResetWizard();
+    }
+
+    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);
+    }
+
+    public void Receive(BreadcrumbNavigationRequested message)
+    {
+        BreadcrumbNavigationHelper.Navigate(WizardFrame, PageHistory, message, ViewModel.NavigationService.GetPageType);
+    }
+
+    public void Receive(BackBreadcrumNavigationRequested message)
+    {
+        GoBackFrame();
+    }
+
+    public void ResetWizard()
+    {
+        PageHistory.Clear();
+        WizardFrame.BackStack.Clear();
+        WizardFrame.ForwardStack.Clear();
+
+        // Navigate to the welcome/get-started page without adding it to the wizard breadcrumb.
+        // Breadcrumb steps only start after the user clicks "Get Started".
+        var welcomePageType = ViewModel.NavigationService.GetPageType(WinoPage.WelcomePageV2);
+        WizardFrame.Navigate(welcomePageType, null, new SuppressNavigationTransitionInfo());
+    }
+
+    private void GoBackFrame()
+    {
+        BreadcrumbNavigationHelper.GoBack(WizardFrame, PageHistory, NavigationTransitionEffect.FromLeft);
+    }
+
+    private void BreadItemClicked(Microsoft.UI.Xaml.Controls.BreadcrumbBar sender, Microsoft.UI.Xaml.Controls.BreadcrumbBarItemClickedEventArgs args)
+    {
+        BreadcrumbNavigationHelper.NavigateTo(WizardFrame, PageHistory, args.Index);
+    }
+}
diff --git a/Wino.Mail.WinUI/Views/WelcomePageV2.xaml b/Wino.Mail.WinUI/Views/WelcomePageV2.xaml
new file mode 100644
index 00000000..61d27459
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/WelcomePageV2.xaml
@@ -0,0 +1,182 @@
+<abstract:WelcomePageV2Abstract
+    x:Class="Wino.Views.WelcomePageV2"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abstract="using:Wino.Views.Abstract"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:Wino.Core.Domain.Models.Updates"
+    mc:Ignorable="d">
+
+    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <Grid
+            MaxWidth="900"
+            Margin="0,48,0,40"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            RowSpacing="32">
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <!--  Brand  -->
+            <StackPanel HorizontalAlignment="Center" Spacing="4">
+                <Image
+                    Width="128"
+                    Height="128"
+                    Margin="0,0,0,12"
+                    HorizontalAlignment="Center"
+                    Source="ms-appx:///Assets/AppEntries/MailAssets/Square150x150Logo.scale-100.png"
+                    Stretch="Uniform" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    FontSize="28"
+                    FontWeight="SemiBold"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_Title}" />
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_AppDescription}" />
+            </StackPanel>
+
+            <!--  FlipView  -->
+            <Grid
+                Grid.Row="1"
+                MaxHeight="300"
+                VerticalAlignment="Center">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Border
+                    Padding="0"
+                    VerticalAlignment="Center"
+                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                    BorderThickness="1"
+                    CornerRadius="12">
+                    <FlipView
+                        x:Name="UpdateFlipView"
+                        MinHeight="200"
+                        Background="Transparent"
+                        ItemsSource="{x:Bind ViewModel.UpdateSections, Mode=OneWay}"
+                        SelectionChanged="OnFlipViewSelectionChanged">
+                        <FlipView.ItemTemplate>
+                            <DataTemplate x:DataType="models:UpdateNoteSection">
+                                <Grid Padding="48,40" ColumnSpacing="40">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="200" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <!--  Illustration  -->
+                                    <Border Height="160" CornerRadius="8">
+                                        <Image
+                                            Width="{x:Bind ActualImageWidth, Mode=OneTime}"
+                                            Height="{x:Bind ActualImageHeight, Mode=OneTime}"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Source="{x:Bind ImageUrl, Mode=OneTime}"
+                                            Stretch="Uniform" />
+                                    </Border>
+
+                                    <!--  Content  -->
+                                    <StackPanel
+                                        Grid.Column="1"
+                                        VerticalAlignment="Center"
+                                        Spacing="8">
+                                        <TextBlock Text="{x:Bind Title, Mode=OneTime}" TextWrapping="WrapWholeWords" />
+                                        <TextBlock
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{x:Bind Description, Mode=OneTime}"
+                                            TextWrapping="WrapWholeWords" />
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </FlipView.ItemTemplate>
+                    </FlipView>
+                </Border>
+
+                <!--  PipsPager  -->
+                <PipsPager
+                    x:Name="FlipViewPager"
+                    Grid.Row="1"
+                    Margin="0,16,0,0"
+                    HorizontalAlignment="Center"
+                    NumberOfPages="{x:Bind ViewModel.UpdateSections.Count, Mode=OneWay}"
+                    SelectedIndexChanged="OnPipsPagerSelectedIndexChanged"
+                    SelectedPageIndex="0" />
+            </Grid>
+
+            <!--  Divider  -->
+            <Border
+                Grid.Row="2"
+                Height="1"
+                HorizontalAlignment="Stretch"
+                Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+            <!--  Get Started  -->
+            <StackPanel
+                Grid.Row="3"
+                MaxWidth="600"
+                HorizontalAlignment="Center"
+                Spacing="8">
+                <HyperlinkButton
+                    HorizontalAlignment="Center"
+                    Command="{x:Bind ViewModel.ImportFromWinoAccountCommand}"
+                    Content="{x:Bind domain:Translator.WelcomeWindow_ImportFromWinoAccount}" />
+
+                <StackPanel
+                    x:Name="ImportProgressPanel"
+                    HorizontalAlignment="Stretch"
+                    Spacing="8"
+                    Visibility="{x:Bind ViewModel.IsImportInProgress, Mode=OneWay}">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Style="{StaticResource CaptionTextBlockStyle}"
+                        Text="{x:Bind domain:Translator.WelcomeWindow_ImportInProgress}" />
+                    <ProgressBar IsIndeterminate="True" />
+                </StackPanel>
+
+                <TextBlock
+                    x:Name="ImportStatusTextBlock"
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource CaptionTextBlockStyle}"
+                    Text="{x:Bind ViewModel.ImportStatusMessage, Mode=OneWay}"
+                    TextAlignment="Center"
+                    TextWrapping="WrapWholeWords"
+                    Visibility="{x:Bind ViewModel.HasImportStatus, Mode=OneWay}" />
+
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Style="{StaticResource BodyTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedDescription}" />
+
+                <Button
+                    MinWidth="240"
+                    Padding="12,10"
+                    HorizontalAlignment="Center"
+                    Command="{x:Bind ViewModel.GetStartedCommand}"
+                    Style="{StaticResource AccentButtonStyle}">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        FontSize="14"
+                        FontWeight="SemiBold"
+                        Text="{x:Bind domain:Translator.WelcomeWindow_GetStartedButton}" />
+                </Button>
+            </StackPanel>
+
+        </Grid>
+    </ScrollViewer>
+
+</abstract:WelcomePageV2Abstract>
diff --git a/Wino.Mail.WinUI/Views/WelcomePageV2.xaml.cs b/Wino.Mail.WinUI/Views/WelcomePageV2.xaml.cs
new file mode 100644
index 00000000..908f3e01
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/WelcomePageV2.xaml.cs
@@ -0,0 +1,22 @@
+using Microsoft.UI.Xaml.Controls;
+using Wino.Views.Abstract;
+
+namespace Wino.Views;
+
+public sealed partial class WelcomePageV2 : WelcomePageV2Abstract
+{
+    public WelcomePageV2()
+    {
+        InitializeComponent();
+    }
+
+    private void OnFlipViewSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        FlipViewPager.SelectedPageIndex = UpdateFlipView.SelectedIndex;
+    }
+
+    private void OnPipsPagerSelectedIndexChanged(PipsPager sender, PipsPagerSelectedIndexChangedEventArgs args)
+    {
+        UpdateFlipView.SelectedIndex = sender.SelectedPageIndex;
+    }
+}
diff --git a/Wino.Mail/AppShell.xaml b/Wino.Mail.WinUI/Views/WinoAppShell.xaml
similarity index 52%
rename from Wino.Mail/AppShell.xaml
rename to Wino.Mail.WinUI/Views/WinoAppShell.xaml
index a05fcffd..46421db6 100644
--- a/Wino.Mail/AppShell.xaml
+++ b/Wino.Mail.WinUI/Views/WinoAppShell.xaml
@@ -1,17 +1,17 @@
-<abstract:AppShellAbstract
-    x:Class="Wino.Views.AppShell"
+<abstract:WinoAppShellAbstract
+    x:Class="Wino.Mail.WinUI.Views.WinoAppShell"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:advanced="using:Wino.Controls.Advanced"
-    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
     xmlns:animations="using:CommunityToolkit.WinUI.Animations"
+    xmlns:communityControls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:coreConverters="using:Wino.Core.UWP.Converters"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
+    xmlns:coreControls="using:Wino.Mail.WinUI.Controls"
+    xmlns:coreConverters="using:Wino.Mail.WinUI.Converters"
+    xmlns:coreSelectors="using:Wino.Mail.WinUI.Selectors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
@@ -19,7 +19,8 @@
     xmlns:menu="using:Wino.Core.Domain.MenuItems"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     x:Name="Root"
-    muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
+    Loaded="OnLoaded"
+    PreviewKeyDown="OnPreviewKeyDown"
     mc:Ignorable="d">
 
     <Page.Resources>
@@ -78,32 +79,47 @@
                             MaxLines="1"
                             Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Parameter.Address, Mode=OneWay}"
-                            TextTrimming="CharacterEllipsis" />
+                            TextTrimming="CharacterEllipsis"
+                            Visibility="{x:Bind IsSynchronizationProgressVisible, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}" />
+
+                        <TextBlock
+                            x:Name="SyncStatusText"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            MaxLines="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind SynchronizationStatus, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis"
+                            Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}" />
                     </StackPanel>
 
-                    <PathIcon
-                        x:Name="AttentionIcon"
-                        Grid.Column="2"
+                    <Button
+                        Grid.Column="1"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        x:Load="{x:Bind IsAttentionRequired, Mode=OneWay}"
-                        Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z "
-                        Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}" />
+                        Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                        BorderBrush="{ThemeResource InfoBarWarningSeverityIconBackground}"
+                        BorderThickness="1"
+                        Click="AttentionIconClicked"
+                        Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
+                        ToolTipService.ToolTip="{x:Bind domain:Translator.Info_AccountAttentionRequiredClickableMessage, Mode=OneWay}"
+                        Visibility="{x:Bind IsAttentionRequired, Mode=OneWay}">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <PathIcon x:Name="AttentionIcon" Data="F1 M 2.021484 18.769531 C 1.767578 18.769531 1.52832 18.720703 1.303711 18.623047 C 1.079102 18.525391 0.880534 18.391928 0.708008 18.222656 C 0.535482 18.053385 0.398763 17.856445 0.297852 17.631836 C 0.19694 17.407227 0.146484 17.167969 0.146484 16.914062 C 0.146484 16.614584 0.211589 16.328125 0.341797 16.054688 L 7.695312 1.347656 C 7.851562 1.035156 8.082682 0.784506 8.388672 0.595703 C 8.694661 0.406902 9.023438 0.3125 9.375 0.3125 C 9.726562 0.3125 10.055338 0.406902 10.361328 0.595703 C 10.667317 0.784506 10.898438 1.035156 11.054688 1.347656 L 18.408203 16.054688 C 18.53841 16.328125 18.603516 16.614584 18.603516 16.914062 C 18.603516 17.167969 18.553059 17.407227 18.452148 17.631836 C 18.351236 17.856445 18.216145 18.053385 18.046875 18.222656 C 17.877604 18.391928 17.679035 18.525391 17.451172 18.623047 C 17.223307 18.720703 16.982422 18.769531 16.728516 18.769531 Z M 16.728516 17.519531 C 16.884766 17.519531 17.027994 17.460938 17.158203 17.34375 C 17.28841 17.226562 17.353516 17.086588 17.353516 16.923828 C 17.353516 16.806641 17.330729 16.702475 17.285156 16.611328 L 9.931641 1.904297 C 9.879557 1.793621 9.80306 1.708984 9.702148 1.650391 C 9.601236 1.591797 9.492188 1.5625 9.375 1.5625 C 9.257812 1.5625 9.148763 1.593426 9.047852 1.655273 C 8.946939 1.717123 8.870442 1.800131 8.818359 1.904297 L 1.464844 16.611328 C 1.419271 16.702475 1.396484 16.803387 1.396484 16.914062 C 1.396484 17.083334 1.459961 17.226562 1.586914 17.34375 C 1.713867 17.460938 1.858724 17.519531 2.021484 17.519531 Z M 8.75 11.875 L 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 C 9.544271 6.25 9.690755 6.31185 9.814453 6.435547 C 9.93815 6.559245 10 6.705729 10 6.875 L 10 11.875 C 10 12.044271 9.93815 12.190756 9.814453 12.314453 C 9.690755 12.438151 9.544271 12.5 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 Z M 8.4375 14.375 C 8.4375 14.114584 8.528646 13.893229 8.710938 13.710938 C 8.893229 13.528646 9.114583 13.4375 9.375 13.4375 C 9.635416 13.4375 9.856771 13.528646 10.039062 13.710938 C 10.221354 13.893229 10.3125 14.114584 10.3125 14.375 C 10.3125 14.635417 10.221354 14.856771 10.039062 15.039062 C 9.856771 15.221354 9.635416 15.3125 9.375 15.3125 C 9.114583 15.3125 8.893229 15.221354 8.710938 15.039062 C 8.528646 14.856771 8.4375 14.635417 8.4375 14.375 Z " />
+                            <TextBlock Text="{x:Bind domain:Translator.Info_AccountAttentionRequiredAction, Mode=OneWay}" />
+                        </StackPanel>
+                    </Button>
 
                     <muxc:ProgressRing
                         x:Name="SynchronizationProgressBar"
-                        Grid.ColumnSpan="3"
-                        Width="10"
-                        Height="10"
-                        HorizontalAlignment="Right"
+                        Grid.Column="2"
+                        Width="16"
+                        Height="16"
+                        Margin="8,0"
+                        HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
-                        Foreground="{ThemeResource AppBarItemForegroundThemeBrush}"
                         IsActive="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}"
-                        IsIndeterminate="{x:Bind IsProgressIndeterminate}"
-                        Maximum="100"
-                        Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}"
-                        Value="{x:Bind SynchronizationProgress, Mode=OneWay}" />
+                        IsIndeterminate="{x:Bind IsProgressIndeterminate, Mode=OneWay}"
+                        Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}" />
                 </Grid>
             </controls:AccountNavigationItem>
         </DataTemplate>
@@ -149,6 +165,7 @@
                     <coreControls:WinoFontIcon Icon="NewMail" />
                 </muxc:NavigationViewItem.Icon>
                 <TextBlock
+                    Margin="0,-2,0,0"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
@@ -253,6 +270,10 @@
                 </coreControls:WinoNavigationViewItem.Icon>
 
                 <Grid Height="50">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
                     <StackPanel VerticalAlignment="Center" Spacing="0">
                         <TextBlock
                             x:Name="AccountNameTextblock"
@@ -264,12 +285,34 @@
 
                         <TextBlock
                             FontSize="12"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                             MaxLines="1"
                             Style="{StaticResource CaptionTextBlockStyle}"
-                            TextTrimming="CharacterEllipsis">
-                            <Run Text="{x:Bind MergedAccountCount}" /><Run Text="{x:Bind domain:Translator.MenuMergedAccountItemAccountsSuffix}" />
+                            Text="{x:Bind SynchronizationStatus, Mode=OneWay}"
+                            TextTrimming="CharacterEllipsis"
+                            Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}" />
+
+                        <TextBlock
+                            FontSize="12"
+                            MaxLines="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            TextTrimming="CharacterEllipsis"
+                            Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(IsSynchronizationProgressVisible), Mode=OneWay}">
+                            <Run Text="{x:Bind MergedAccountCount, Mode=OneWay}" /><Run Text="{x:Bind domain:Translator.MenuMergedAccountItemAccountsSuffix}" />
                         </TextBlock>
                     </StackPanel>
+
+                    <muxc:ProgressRing
+                        x:Name="SynchronizationProgressBar"
+                        Grid.Column="1"
+                        Width="16"
+                        Height="16"
+                        Margin="8,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        IsActive="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}"
+                        IsIndeterminate="{x:Bind IsProgressIndeterminate, Mode=OneWay}"
+                        Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}" />
                 </Grid>
             </controls:AccountNavigationItem>
         </DataTemplate>
@@ -338,9 +381,25 @@
             </coreControls:WinoNavigationViewItem>
         </DataTemplate>
 
+        <DataTemplate x:Key="NewContactTemplate" x:DataType="menu:NewContactMenuItem">
+            <coreControls:WinoNavigationViewItem
+                Height="50"
+                DataContext="{x:Bind}"
+                SelectsOnInvoked="False">
+                <muxc:NavigationViewItem.Icon>
+                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE710;" />
+                </muxc:NavigationViewItem.Icon>
+                <TextBlock
+                    Margin="0,-2,0,0"
+                    VerticalAlignment="Center"
+                    FontSize="16"
+                    Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                    Text="{x:Bind domain:Translator.ContactsPane_NewContact}" />
+            </coreControls:WinoNavigationViewItem>
+        </DataTemplate>
+
         <coreSelectors:NavigationMenuTemplateSelector
             x:Key="NavigationMenuTemplateSelector"
-            AccountManagementTemplate="{StaticResource ManageAccountsTemplate}"
             ClickableAccountMenuTemplate="{StaticResource ClickableAccountMenuTemplate}"
             FixAuthenticationIssueTemplate="{StaticResource FixAuthenticationIssueTemplate}"
             FixMissingFolderConfigTemplate="{StaticResource FixMissingFolderConfig}"
@@ -348,10 +407,15 @@
             MergedAccountFolderTemplate="{StaticResource MergedAccountFolderMenuItemTemplate}"
             MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
             MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
+            NewContactTemplate="{StaticResource NewContactTemplate}"
             NewMailTemplate="{StaticResource CreateNewMailTemplate}"
             RatingItemTemplate="{StaticResource RatingItemTemplate}"
             SeperatorTemplate="{StaticResource SeperatorTemplate}"
-            SettingsItemTemplate="{StaticResource SettingsItemTemplate}" />
+            SettingsShellPageItemTemplate="{StaticResource SettingsShellPageItemTemplate}"
+            SettingsShellSectionItemTemplate="{StaticResource SettingsShellSectionItemTemplate}"
+            StoreUpdateItemTemplate="{StaticResource StoreUpdateItemTemplate}"
+            WinoAccountSettingsShellPageItemTemplate="{StaticResource SettingsShellWinoAccountItemTemplate}" />
+
     </Page.Resources>
 
     <Grid
@@ -359,21 +423,6 @@
         Padding="0"
         ColumnSpacing="0"
         RowSpacing="0">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="48" />
-            <ColumnDefinition Width="*" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="48" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <Grid
-            Grid.RowSpan="2"
-            Grid.ColumnSpan="2"
-            Background="{ThemeResource WinoApplicationBackgroundColor}"
-            IsHitTestVisible="False" />
-
         <muxc:NavigationView
             x:Name="navigationView"
             Grid.Row="1"
@@ -383,7 +432,6 @@
             VerticalContentAlignment="Stretch"
             AlwaysShowHeader="True"
             DisplayModeChanged="NavigationViewDisplayModeChanged"
-            FooterMenuItemsSource="{x:Bind ViewModel.FooterItems, Mode=OneWay}"
             IsBackButtonVisible="Collapsed"
             IsPaneOpen="{x:Bind ViewModel.PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
             IsPaneToggleButtonVisible="False"
@@ -392,18 +440,196 @@
             IsTitleBarAutoPaddingEnabled="False"
             ItemInvoked="NavigationViewItemInvoked"
             MenuItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
-            MenuItemsSource="{x:Bind ViewModel.MenuItems, Mode=OneWay}"
             OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=TwoWay}"
+            PaneClosed="NavigationPaneClosed"
             PaneDisplayMode="Auto"
+            PaneOpened="NavigationPaneOpened"
             PaneOpening="NavigationPaneOpening"
             ScrollViewer.VerticalScrollBarVisibility="Hidden"
-            SelectedItem="{x:Bind ViewModel.SelectedMenuItem, Mode=TwoWay}"
-            SelectionChanged="MenuSelectionChanged">
+            SelectionChanged="MenuSelectionChanged"
+            Style="{StaticResource CalendarShellNavigationViewStyle}">
             <muxc:NavigationView.ContentTransitions>
                 <TransitionCollection>
                     <AddDeleteThemeTransition />
                 </TransitionCollection>
             </muxc:NavigationView.ContentTransitions>
+            <muxc:NavigationView.PaneCustomContent>
+                <Grid
+                    x:Name="PaneCustomContent"
+                    Padding="0,0,0,6"
+                    Visibility="Collapsed">
+                    <Grid x:Name="CalendarPaneContent" Visibility="Collapsed">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <coreControls:WinoNavigationViewItem
+                            x:Name="NewCalendarEventNavigationItem"
+                            Grid.Row="0"
+                            Height="50"
+                            Margin="0,0,0,12"
+                            AutomationProperties.Name="{x:Bind domain:Translator.CalendarEventCompose_NewEventButton, Mode=OneTime}"
+                            IsTabStop="True"
+                            KeyDown="NewCalendarEventNavigationItemKeyDown"
+                            SelectsOnInvoked="False"
+                            Tapped="NewCalendarEventNavigationItemTapped">
+                            <muxc:NavigationViewItem.Icon>
+                                <coreControls:WinoFontIcon Icon="NewMail" />
+                            </muxc:NavigationViewItem.Icon>
+                            <TextBlock
+                                Margin="0,-2,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="16"
+                                Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.CalendarEventCompose_NewEventButton, Mode=OneTime}" />
+                        </coreControls:WinoNavigationViewItem>
+
+                        <coreControls:WinoNavigationViewItem
+                            x:Name="SynchronizeCalendarsNavigationItem"
+                            Grid.Row="1"
+                            Height="50"
+                            Margin="0,0,0,12"
+                            AutomationProperties.Name="{x:Bind domain:Translator.Buttons_Sync, Mode=OneTime}"
+                            IsEnabled="{x:Bind ViewModel.CalendarClient.CanSynchronizeCalendars, Mode=OneWay}"
+                            IsTabStop="True"
+                            KeyDown="SynchronizeCalendarsNavigationItemKeyDown"
+                            SelectsOnInvoked="False"
+                            Tapped="SynchronizeCalendarsNavigationItemTapped">
+                            <muxc:NavigationViewItem.Icon>
+                                <coreControls:WinoFontIcon Icon="Sync" />
+                            </muxc:NavigationViewItem.Icon>
+                            <TextBlock
+                                Margin="0,-2,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="16"
+                                Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.Buttons_Sync, Mode=OneTime}" />
+                        </coreControls:WinoNavigationViewItem>
+
+                        <muxc:CalendarView
+                            x:Name="VisibleDateRangeCalendarView"
+                            Grid.Row="2"
+                            Margin="12,0"
+                            HorizontalAlignment="Stretch"
+                            SelectedDatesChanged="VisibleDateRangeCalendarViewSelectedDatesChanged"
+                            SelectionMode="Multiple"
+                            Style="{StaticResource WinoCalendarViewStyle}" />
+
+                        <ListView
+                            x:Name="CalendarHostListView"
+                            Grid.Row="3"
+                            SelectionMode="None">
+                            <ListView.Header>
+                                <TextBlock
+                                    Margin="20,12,12,12"
+                                    FontSize="16"
+                                    Text="Calendars" />
+                            </ListView.Header>
+                            <ListView.ItemTemplate>
+                                <DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
+                                    <muxc:Expander
+                                        HorizontalAlignment="Stretch"
+                                        HorizontalContentAlignment="Stretch"
+                                        IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
+                                        <muxc:Expander.Header>
+                                            <Grid>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                </Grid.ColumnDefinitions>
+
+                                                <CheckBox
+                                                    Width="26"
+                                                    MinWidth="0"
+                                                    IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
+                                                    IsThreeState="True" />
+
+                                                <Ellipse
+                                                    Grid.Column="1"
+                                                    Width="12"
+                                                    Height="12"
+                                                    Margin="8,0,10,0"
+                                                    VerticalAlignment="Center"
+                                                    Fill="{x:Bind AccountColorHex, Converter={StaticResource HexToColorBrushConverter}, Mode=OneWay}" />
+
+                                                <StackPanel
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Spacing="2">
+                                                    <TextBlock VerticalAlignment="Center" TextWrapping="Wrap">
+                                                        <Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
+                                                        <Run FontSize="12" Text=" (" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
+                                                    </TextBlock>
+                                                    <ProgressBar
+                                                        Height="4"
+                                                        IsIndeterminate="True"
+                                                        ShowPaused="False"
+                                                        ShowError="False"
+                                                        Visibility="{x:Bind IsSynchronizationProgressVisible, Mode=OneWay}" />
+                                                </StackPanel>
+                                            </Grid>
+                                        </muxc:Expander.Header>
+                                        <muxc:Expander.Content>
+                                            <ItemsControl ItemsSource="{x:Bind AccountCalendars}">
+                                                <ItemsControl.ItemTemplate>
+                                                    <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                                        <CheckBox
+                                                            HorizontalAlignment="Stretch"
+                                                            VerticalAlignment="Center"
+                                                            HorizontalContentAlignment="Stretch"
+                                                            VerticalContentAlignment="Stretch"
+                                                            IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
+                                                            <Grid Margin="0,0,0,5" ColumnSpacing="6">
+                                                                <Grid.ColumnDefinitions>
+                                                                    <ColumnDefinition Width="Auto" />
+                                                                    <ColumnDefinition Width="*" />
+                                                                </Grid.ColumnDefinitions>
+
+                                                                <Ellipse
+                                                                    Width="20"
+                                                                    Height="20"
+                                                                    Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
+
+                                                                <TextBlock
+                                                                    Grid.Column="1"
+                                                                    VerticalAlignment="Center"
+                                                                    FontSize="14"
+                                                                    Text="{x:Bind Name, Mode=OneWay}"
+                                                                    TextWrapping="Wrap" />
+                                                            </Grid>
+                                                        </CheckBox>
+                                                    </DataTemplate>
+                                                </ItemsControl.ItemTemplate>
+                                            </ItemsControl>
+                                        </muxc:Expander.Content>
+                                    </muxc:Expander>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </Grid>
+
+                    <StackPanel
+                        x:Name="ContactsPaneContent"
+                        Margin="20,20,16,0"
+                        Spacing="6"
+                        Visibility="Collapsed">
+                        <TextBlock
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            Text="{x:Bind domain:Translator.ContactsPane_DescriptionTitle, Mode=OneTime}"
+                            TextWrapping="WrapWholeWords" />
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource BodyTextBlockStyle}"
+                            Text="{x:Bind domain:Translator.ContactsPane_DescriptionBody, Mode=OneTime}"
+                            TextWrapping="WrapWholeWords" />
+                    </StackPanel>
+                </Grid>
+            </muxc:NavigationView.PaneCustomContent>
             <Grid ColumnSpacing="0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
@@ -419,13 +645,14 @@
                     IsHitTestVisible="{x:Bind navigationView.IsPaneOpen, Mode=OneWay}"
                     IsTabStop="False"
                     Maximum="1000"
-                    Minimum="116" />
+                    Minimum="160" />
 
                 <!--  Main Content  -->
                 <Frame
-                    x:Name="ShellFrame"
+                    x:Name="InnerShellFrame"
                     Padding="0,0,7,7"
-                    IsNavigationStackEnabled="False"
+                    CacheSize="0"
+                    IsNavigationStackEnabled="True"
                     Navigated="ShellFrameContentNavigated">
                     <Frame.ContentTransitions>
                         <TransitionCollection>
@@ -453,21 +680,36 @@
             </Grid>
         </muxc:NavigationView>
 
-        <coreControls:WinoAppTitleBar
-            x:Name="RealAppBar"
-            Grid.ColumnSpan="2"
-            BackButtonClicked="BackButtonClicked"
-            Canvas.ZIndex="150"
-            ConnectionStatus="{x:Bind ViewModel.ActiveConnectionStatus, Mode=OneWay}"
-            CoreWindowText="{x:Bind ViewModel.StatePersistenceService.CoreWindowTitle, Mode=OneWay}"
-            IsBackButtonVisible="{x:Bind ViewModel.StatePersistenceService.IsBackButtonVisible, Mode=OneWay}"
-            IsDragArea="True"
-            IsNavigationPaneOpen="{x:Bind navigationView.IsPaneOpen, Mode=TwoWay}"
-            IsReaderNarrowed="{x:Bind ViewModel.StatePersistenceService.IsReaderNarrowed, Mode=OneWay}"
-            NavigationViewDisplayMode="{x:Bind navigationView.DisplayMode, Mode=OneWay}"
-            OpenPaneLength="{x:Bind ViewModel.StatePersistenceService.OpenPaneLength, Mode=OneWay}"
-            ReadingPaneLength="{x:Bind ViewModel.StatePersistenceService.MailListPaneLength, Mode=OneWay}"
-            ReconnectCommand="{x:Bind ViewModel.ReconnectServerCommand}"
-            SystemReserved="180" />
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LowResolutionStates">
+                <VisualState x:Name="BigScreen">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1200" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="navigationView.IsPaneOpen" Value="True" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="SmallScreen">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="navigationView.IsPaneOpen" Value="False" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+
+            <VisualStateGroup x:Name="ShellStateContentGroup">
+                <VisualState x:Name="DefaultShellContentState" />
+                <VisualState x:Name="EventDetailsContentState">
+                    <VisualState.Setters>
+                        <Setter Target="CalendarHostListView.IsEnabled" Value="False" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
-</abstract:AppShellAbstract>
+</abstract:WinoAppShellAbstract>
+
+
diff --git a/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs b/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs
new file mode 100644
index 00000000..4f2767c7
--- /dev/null
+++ b/Wino.Mail.WinUI/Views/WinoAppShell.xaml.cs
@@ -0,0 +1,911 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.System;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.MenuItems;
+using Wino.Core.Domain.Models;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Folders;
+using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Calendar.ViewModels;
+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;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Mails;
+using Wino.Messaging.Client.Shell;
+using Wino.Messaging.UI;
+using Wino.Views;
+
+namespace Wino.Mail.WinUI.Views;
+
+public sealed partial class WinoAppShell : Views.Abstract.WinoAppShellAbstract,
+    IShellHost,
+    IRecipient<AccountMenuItemExtended>,
+    IRecipient<NavigateMailFolderEvent>,
+    IRecipient<CreateNewMailWithMultipleAccountsRequested>,
+    IRecipient<CalendarDisplayTypeChangedMessage>,
+    IRecipient<AccountCreatedMessage>
+{
+    private const string StateDefaultShellContent = "DefaultShellContentState";
+    private const string StateEventDetailsContent = "EventDetailsContentState";
+    private WinoApplicationMode? _activeMode;
+    private bool _isSyncingNavigationViewSelection;
+    private bool _isSynchronizingVisibleDateRangeCalendar;
+    private bool _isPreparedForWindowClose;
+
+    public WinoAppShell()
+    {
+        InitializeComponent();
+
+        var pageDispatcher = new WinUIDispatcher(DispatcherQueue);
+        ViewModel.MailClient.Dispatcher = pageDispatcher;
+        ViewModel.CalendarClient.Dispatcher = pageDispatcher;
+        ViewModel.GetClient(WinoApplicationMode.Contacts).Dispatcher = pageDispatcher;
+        ViewModel.GetClient(WinoApplicationMode.Settings).Dispatcher = pageDispatcher;
+
+        ViewModel.MailClient.PropertyChanged += MailClientPropertyChanged;
+        ViewModel.CalendarClient.PropertyChanged += CalendarClientPropertyChanged;
+        ViewModel.PropertyChanged += ViewModelPropertyChanged;
+        ViewModel.PreferencesService.PreferenceChanged += PreferencesServiceChanged;
+        ViewModel.StatePersistenceService.StatePropertyChanged += StatePersistenceServiceChanged;
+
+        InitializeCalendarControls();
+        UpdateEventDetailsVisualState();
+    }
+
+    public bool HasShellContent => InnerShellFrame.Content != null;
+
+    public Frame GetShellFrame() => InnerShellFrame;
+
+    public void ActivateMode(WinoApplicationMode mode, ShellModeActivationContext activationContext)
+    {
+        if (_activeMode == mode && InnerShellFrame.Content != null)
+            return;
+
+        DeactivateCurrentMode();
+        ResetShellModeNavigationState();
+
+        _activeMode = mode;
+        ViewModel.SetCurrentMode(mode);
+
+        RefreshNavigationViewBindings(syncMailSelection: mode != WinoApplicationMode.Mail);
+
+        ApplyModeLayout();
+        UpdateTitleBarSubtitle();
+
+        ViewModel.CurrentClient.Activate(activationContext);
+        ResetShellModeNavigationState();
+        NotifyTitleBarContentChanged();
+    }
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        base.OnNavigatedFrom(e);
+
+        if (!_isPreparedForWindowClose)
+        {
+            DeactivateCurrentMode();
+            DetachLifetimeSubscriptions();
+        }
+
+        Bindings.StopTracking();
+    }
+
+    public void PrepareForWindowClose()
+    {
+        if (_isPreparedForWindowClose)
+            return;
+
+        _isPreparedForWindowClose = true;
+
+        DeactivateAllShellClients();
+        WeakReferenceMessenger.Default.Unregister<LanguageChanged>(this);
+        UnregisterRecipients();
+        DetachLifetimeSubscriptions();
+        Bindings.StopTracking();
+
+        navigationView.MenuItemsSource = null;
+        CalendarHostListView.ItemsSource = null;
+        WindowCleanupHelper.CleanupFrame(InnerShellFrame);
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        UpdateNavigationPaneLayout(navigationView.DisplayMode);
+        RefreshNavigationViewBindings();
+        RefreshCalendarControls();
+
+        if (_activeMode == null)
+        {
+            ActivateMode(ViewModel.StatePersistenceService.ApplicationMode, new ShellModeActivationContext
+            {
+                IsInitialActivation = true
+            });
+        }
+    }
+
+    private void ApplyModeLayout()
+    {
+        RefreshCalendarControls();
+        UpdateEventDetailsVisualState();
+        UpdateTitleBarSubtitle();
+        UpdateNavigationPaneLayout(navigationView.DisplayMode);
+        NotifyTitleBarContentChanged();
+    }
+
+    private void DeactivateCurrentMode()
+    {
+        if (_activeMode == WinoApplicationMode.Mail)
+        {
+            WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested());
+            WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
+            ViewModel.StatePersistenceService.IsReadingMail = false;
+            ViewModel.MailClient.Deactivate();
+        }
+        else if (_activeMode == WinoApplicationMode.Calendar)
+        {
+            ViewModel.StatePersistenceService.IsEventDetailsVisible = false;
+            ViewModel.CalendarClient.Deactivate();
+        }
+        else if (_activeMode == WinoApplicationMode.Contacts)
+        {
+            ViewModel.CurrentClient.Deactivate();
+        }
+        else if (_activeMode == WinoApplicationMode.Settings)
+        {
+            if (InnerShellFrame.Content is SettingsPage settingsPage)
+            {
+                settingsPage.ResetForModeSwitch();
+            }
+
+            ViewModel.CurrentClient.Deactivate();
+        }
+    }
+
+    private void DeactivateAllShellClients()
+    {
+        ViewModel.StatePersistenceService.IsReadingMail = false;
+        ViewModel.StatePersistenceService.IsEventDetailsVisible = false;
+
+        ViewModel.MailClient.Deactivate();
+        ViewModel.CalendarClient.Deactivate();
+
+        if (ViewModel.GetClient(WinoApplicationMode.Contacts) is ContactsShellClient contactsClient)
+        {
+            contactsClient.PrepareForShellShutdown();
+        }
+
+        if (ViewModel.GetClient(WinoApplicationMode.Settings) is SettingsShellClient settingsClient)
+        {
+            settingsClient.PrepareForShellShutdown();
+        }
+
+        if (ViewModel.MailClient is MailAppShellViewModel mailClient)
+        {
+            mailClient.PrepareForShellShutdown();
+        }
+
+        if (ViewModel.CalendarClient is CalendarAppShellViewModel calendarClient)
+        {
+            calendarClient.PrepareForShellShutdown();
+        }
+    }
+
+    private void DetachLifetimeSubscriptions()
+    {
+        ViewModel.MailClient.PropertyChanged -= MailClientPropertyChanged;
+        ViewModel.CalendarClient.PropertyChanged -= CalendarClientPropertyChanged;
+        ViewModel.PropertyChanged -= ViewModelPropertyChanged;
+        ViewModel.PreferencesService.PreferenceChanged -= PreferencesServiceChanged;
+        ViewModel.StatePersistenceService.StatePropertyChanged -= StatePersistenceServiceChanged;
+    }
+
+    private void ResetShellModeNavigationState()
+    {
+        InnerShellFrame.BackStack.Clear();
+        InnerShellFrame.ForwardStack.Clear();
+    }
+
+    private void UpdateTitleBarSubtitle()
+    {
+        if (ViewModel.IsContactsMode)
+        {
+            ViewModel.StatePersistenceService.CoreWindowTitle = string.Empty;
+            return;
+        }
+
+        if (ViewModel.IsCalendarMode)
+        {
+            ViewModel.StatePersistenceService.CoreWindowTitle = string.Empty;
+            return;
+        }
+
+        ViewModel.StatePersistenceService.CoreWindowTitle = string.Empty;
+    }
+
+    private void InitializeCalendarControls()
+    {
+        CalendarHostListView.ItemsSource = ViewModel.CalendarClient.GroupedAccountCalendars;
+
+        RefreshCalendarControls();
+    }
+
+    private void RefreshCalendarControls()
+    {
+        CalendarHostListView.ItemsSource = ViewModel.CalendarClient.GroupedAccountCalendars;
+        SynchronizeVisibleDateRangeCalendar();
+    }
+
+    private void RefreshNavigationViewBindings(bool syncMailSelection = true)
+    {
+        navigationView.MenuItemsSource = ViewModel.CurrentMenuItems;
+        SetNavigationViewSelectedItem(ViewModel.CurrentClient.HandlesNavigationSelection && syncMailSelection
+            ? ViewModel.SelectedMenuItem
+            : null);
+    }
+
+    private void UpdateEventDetailsVisualState()
+    {
+        VisualStateManager.GoToState(this,
+            ViewModel.StatePersistenceService.IsEventDetailsVisible ? StateEventDetailsContent : StateDefaultShellContent,
+            false);
+    }
+
+    private async void NewCalendarEventNavigationItemTapped(object sender, TappedRoutedEventArgs e)
+    {
+        e.Handled = true;
+        await InvokeNewCalendarEventAsync();
+    }
+
+    private async void AttentionIconClicked(object sender, RoutedEventArgs e)
+    {
+        if (sender is not FrameworkElement { DataContext: AccountMenuItem accountMenuItem })
+            return;
+
+        if (ViewModel.MailClient is MailAppShellViewModel mailClient)
+        {
+            await mailClient.HandleAccountAttentionAsync(accountMenuItem.Parameter);
+        }
+    }
+
+    private async void NewCalendarEventNavigationItemKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key is not (VirtualKey.Enter or VirtualKey.Space))
+            return;
+
+        e.Handled = true;
+        await InvokeNewCalendarEventAsync();
+    }
+
+    private Task InvokeNewCalendarEventAsync()
+        => ViewModel.CalendarClient.HandleNavigationItemInvokedAsync(new NewCalendarEventMenuItem());
+
+    private async void SynchronizeCalendarsNavigationItemTapped(object sender, TappedRoutedEventArgs e)
+    {
+        e.Handled = true;
+        await InvokeCalendarSynchronizationAsync();
+    }
+
+    private async void SynchronizeCalendarsNavigationItemKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.Key is not (VirtualKey.Enter or VirtualKey.Space))
+            return;
+
+        e.Handled = true;
+        await InvokeCalendarSynchronizationAsync();
+    }
+
+    private Task InvokeCalendarSynchronizationAsync()
+    {
+        if (ViewModel.CalendarClient.SyncCommand.CanExecute(null))
+        {
+            ViewModel.CalendarClient.SyncCommand.Execute(null);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public void Receive(CalendarDisplayTypeChangedMessage message) => NotifyTitleBarContentChanged();
+
+    public void Receive(AccountCreatedMessage message)
+    {
+        _ = DispatcherQueue.EnqueueAsync(async () =>
+        {
+            ViewModel.NavigationService.ChangeApplicationMode(WinoApplicationMode.Mail);
+            await ViewModel.MailClient.HandleAccountCreatedAsync(message.Account);
+        });
+    }
+
+    private async void NavigationViewItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args)
+    {
+        if (_isSyncingNavigationViewSelection)
+            return;
+
+        if (ViewModel.IsCalendarMode)
+        {
+            if (args.InvokedItemContainer is FrameworkElement { DataContext: IMenuItem menuItem })
+            {
+                await ViewModel.CalendarClient.HandleNavigationItemInvokedAsync(menuItem);
+            }
+
+            return;
+        }
+
+        if (args.InvokedItemContainer is WinoNavigationViewItem winoNavigationViewItem)
+        {
+            if (winoNavigationViewItem.SelectsOnInvoked)
+                return;
+
+            await ViewModel.CurrentClient.HandleNavigationItemInvokedAsync(winoNavigationViewItem.DataContext as IMenuItem);
+        }
+    }
+
+    private async void MenuSelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
+    {
+        if (_isSyncingNavigationViewSelection)
+            return;
+
+        if (!ViewModel.CurrentClient.HandlesNavigationSelection)
+            return;
+
+        if (ReferenceEquals(args.SelectedItem, ViewModel.SelectedMenuItem))
+            return;
+
+        if (args.SelectedItem is IMenuItem invokedMenuItem)
+        {
+            await ViewModel.CurrentClient.HandleNavigationSelectionChangedAsync(invokedMenuItem);
+        }
+    }
+
+    public void Receive(AccountMenuItemExtended message)
+    {
+        if (!ViewModel.IsMailMode)
+            return;
+
+        _ = DispatcherQueue.EnqueueAsync(async () =>
+        {
+            if (message.FolderId == default)
+                return;
+
+            if (ViewModel.MailClient.MenuItems!.TryGetFolderMenuItem(message.FolderId, out IBaseFolderMenuItem foundMenuItem))
+            {
+                foundMenuItem.Expand();
+                await ViewModel.MailClient.NavigateFolderAsync(foundMenuItem);
+                SetNavigationViewSelectedItem(foundMenuItem);
+
+                if (message.NavigateMailItem != null)
+                {
+                    WeakReferenceMessenger.Default.Send(new MailItemNavigationRequested(message.NavigateMailItem.UniqueId, ScrollToItem: true));
+                }
+
+                return;
+            }
+
+            if (message.NavigateMailItem == null)
+                return;
+
+            if (ViewModel.MailClient.MenuItems!.TryGetAccountMenuItem(message.NavigateMailItem.AssignedAccount.Id, out IAccountMenuItem accountMenuItem))
+            {
+                await ViewModel.MailClient.ChangeLoadedAccountAsync(accountMenuItem, navigateInbox: false);
+
+                if (ViewModel.MailClient.MenuItems!.TryGetFolderMenuItem(message.FolderId, out IBaseFolderMenuItem accountFolderMenuItem))
+                {
+                    accountFolderMenuItem.Expand();
+                    await ViewModel.MailClient.NavigateFolderAsync(accountFolderMenuItem);
+                    SetNavigationViewSelectedItem(accountFolderMenuItem);
+                    WeakReferenceMessenger.Default.Send(new MailItemNavigationRequested(message.NavigateMailItem.UniqueId, ScrollToItem: true));
+                }
+            }
+        });
+    }
+
+    public void Receive(NavigateMailFolderEvent message)
+    {
+        if (!ViewModel.IsMailMode || message.BaseFolderMenuItem == null)
+            return;
+
+        if (navigationView.SelectedItem != message.BaseFolderMenuItem)
+        {
+            var navigateFolderArgs = new NavigateMailFolderEventArgs(message.BaseFolderMenuItem, message.FolderInitLoadAwaitTask);
+
+            ViewModel.NavigationService.Navigate(WinoPage.MailListPage, navigateFolderArgs, NavigationReferenceFrame.InnerShellFrame);
+
+            SetNavigationViewSelectedItem(message.BaseFolderMenuItem);
+        }
+        else
+        {
+            message.FolderInitLoadAwaitTask?.TrySetResult(true);
+        }
+    }
+
+    private void ShellFrameContentNavigated(object sender, NavigationEventArgs e)
+    {
+        NotifyTitleBarContentChanged();
+
+        if (ViewModel.IsMailMode)
+        {
+            RefreshNavigationViewBindings();
+        }
+    }
+
+    private async void MenuItemContextRequested(UIElement sender, ContextRequestedEventArgs args)
+    {
+        if (!ViewModel.IsMailMode)
+            return;
+
+        if (sender is WinoNavigationViewItem menuItem &&
+            menuItem.DataContext is IBaseFolderMenuItem baseFolderMenuItem &&
+            baseFolderMenuItem.IsMoveTarget &&
+            args.TryGetPosition(sender, out Point p))
+        {
+            args.Handled = true;
+
+            var source = new TaskCompletionSource<FolderOperationMenuItem>();
+            var actions = ViewModel.MailClient.GetFolderContextMenuActions(baseFolderMenuItem);
+            var flyout = new FolderOperationFlyout(actions, source);
+
+            flyout.ShowAt(menuItem, new FlyoutShowOptions
+            {
+                ShowMode = FlyoutShowMode.Standard,
+                Position = new Point(p.X + 30, p.Y - 20)
+            });
+
+            var operation = await source.Task;
+            flyout.Dispose();
+
+            if (operation != null)
+            {
+                await ViewModel.MailClient.PerformFolderOperationAsync(operation.Operation, baseFolderMenuItem);
+            }
+        }
+    }
+
+    public void Receive(CreateNewMailWithMultipleAccountsRequested message)
+    {
+        if (!ViewModel.IsMailMode)
+            return;
+
+        var container = navigationView.ContainerFromMenuItem(ViewModel.MailClient.CreatePrimaryMenuItem);
+        var flyout = new AccountSelectorFlyout(message.AllAccounts, ViewModel.MailClient.CreateNewMailForAsync);
+
+        flyout.ShowAt(container, new FlyoutShowOptions
+        {
+            ShowMode = FlyoutShowMode.Auto,
+            Placement = FlyoutPlacementMode.Right
+        });
+    }
+
+    private void NavigationPaneOpening(NavigationView sender, object args)
+    {
+        if (!ViewModel.IsMailMode)
+            return;
+
+        if (sender.DisplayMode == NavigationViewDisplayMode.Minimal && sender.SelectedItem is IFolderMenuItem selectedFolderMenuItem)
+        {
+            selectedFolderMenuItem.Expand();
+        }
+    }
+
+    private void NavigationPaneOpened(NavigationView sender, object args)
+        => UpdateNavigationPaneLayout(sender.DisplayMode);
+
+    private void NavigationPaneClosed(NavigationView sender, object args)
+        => UpdateNavigationPaneLayout(sender.DisplayMode);
+
+    private void NavigationViewDisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
+        => UpdateNavigationPaneLayout(args.DisplayMode);
+
+    private void MailClientPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(IShellClient.SelectedMenuItem) && ViewModel.IsMailMode)
+        {
+            SetNavigationViewSelectedItem(ViewModel.MailClient.SelectedMenuItem);
+        }
+    }
+
+    private void CalendarClientPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (!DispatcherQueue.HasThreadAccess)
+        {
+            var enqueued = DispatcherQueue.TryEnqueue(() => CalendarClientPropertyChanged(sender, e));
+
+            if (!enqueued)
+                throw new InvalidOperationException("Could not marshal calendar property changes onto the UI thread.");
+
+            return;
+        }
+
+        if (e.PropertyName == nameof(ICalendarShellClient.CurrentVisibleRange) ||
+            e.PropertyName == nameof(ICalendarShellClient.VisibleDateRangeText))
+        {
+            SynchronizeVisibleDateRangeCalendar();
+            UpdateTitleBarSubtitle();
+        }
+    }
+
+    private void VisibleDateRangeCalendarViewSelectedDatesChanged(CalendarView sender, CalendarViewSelectedDatesChangedEventArgs args)
+    {
+        if (_isSynchronizingVisibleDateRangeCalendar)
+            return;
+
+        DateTimeOffset? interactedDate = null;
+
+        if (args.AddedDates.Count > 0)
+        {
+            interactedDate = args.AddedDates[0];
+        }
+        else if (args.RemovedDates.Count > 0)
+        {
+            interactedDate = args.RemovedDates[0];
+        }
+
+        if (interactedDate is null)
+            return;
+
+        var clickedArgs = new CalendarViewDayClickedEventArgs(interactedDate.Value.DateTime);
+
+        if (ViewModel.CalendarClient.DateClickedCommand.CanExecute(clickedArgs))
+        {
+            ViewModel.CalendarClient.DateClickedCommand.Execute(clickedArgs);
+        }
+    }
+
+    private void SynchronizeVisibleDateRangeCalendar()
+    {
+        if (!DispatcherQueue.HasThreadAccess)
+        {
+            var enqueued = DispatcherQueue.TryEnqueue(SynchronizeVisibleDateRangeCalendar);
+
+            if (!enqueued)
+                throw new InvalidOperationException("Could not marshal visible date range calendar synchronization onto the UI thread.");
+
+            return;
+        }
+
+        _isSynchronizingVisibleDateRangeCalendar = true;
+
+        try
+        {
+            VisibleDateRangeCalendarView.FirstDayOfWeek = MapFirstDayOfWeek(ViewModel.PreferencesService.FirstDayOfWeek);
+            VisibleDateRangeCalendarView.SelectedDates.Clear();
+
+            var currentRange = ViewModel.CalendarClient.CurrentVisibleRange;
+            if (currentRange == null)
+                return;
+
+            foreach (var date in currentRange.Dates)
+            {
+                VisibleDateRangeCalendarView.SelectedDates.Add(new DateTimeOffset(date.ToDateTime(TimeOnly.MinValue)));
+            }
+
+            VisibleDateRangeCalendarView.SetDisplayDate(new DateTimeOffset(currentRange.AnchorDate.ToDateTime(TimeOnly.MinValue)));
+        }
+        finally
+        {
+            _isSynchronizingVisibleDateRangeCalendar = false;
+        }
+    }
+
+    private void PreferencesServiceChanged(object? sender, string propertyName)
+    {
+        if (propertyName == nameof(IPreferencesService.FirstDayOfWeek))
+        {
+            SynchronizeVisibleDateRangeCalendar();
+        }
+    }
+
+    private static Windows.Globalization.DayOfWeek MapFirstDayOfWeek(DayOfWeek dayOfWeek)
+        => dayOfWeek switch
+        {
+            DayOfWeek.Sunday => Windows.Globalization.DayOfWeek.Sunday,
+            DayOfWeek.Monday => Windows.Globalization.DayOfWeek.Monday,
+            DayOfWeek.Tuesday => Windows.Globalization.DayOfWeek.Tuesday,
+            DayOfWeek.Wednesday => Windows.Globalization.DayOfWeek.Wednesday,
+            DayOfWeek.Thursday => Windows.Globalization.DayOfWeek.Thursday,
+            DayOfWeek.Friday => Windows.Globalization.DayOfWeek.Friday,
+            DayOfWeek.Saturday => Windows.Globalization.DayOfWeek.Saturday,
+            _ => Windows.Globalization.DayOfWeek.Monday
+        };
+
+    private void ViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName != nameof(ViewModel.SelectedMenuItem) || !ViewModel.CurrentClient.HandlesNavigationSelection)
+            return;
+
+        SetNavigationViewSelectedItem(ViewModel.SelectedMenuItem);
+    }
+
+    private void SetNavigationViewSelectedItem(object? item)
+    {
+        if (ReferenceEquals(navigationView.SelectedItem, item))
+            return;
+
+        _isSyncingNavigationViewSelection = true;
+        try
+        {
+            navigationView.SelectedItem = item;
+        }
+        finally
+        {
+            _isSyncingNavigationViewSelection = false;
+        }
+    }
+
+    private void StatePersistenceServiceChanged(object? sender, string propertyName)
+    {
+        if (propertyName == nameof(IStatePersistanceService.CalendarDisplayType))
+        {
+            NotifyTitleBarContentChanged();
+            return;
+        }
+
+        if (propertyName == nameof(IStatePersistanceService.DayDisplayCount))
+        {
+            NotifyTitleBarContentChanged();
+            return;
+        }
+
+        if (propertyName == nameof(IStatePersistanceService.IsEventDetailsVisible))
+        {
+            UpdateEventDetailsVisualState();
+            NotifyTitleBarContentChanged();
+        }
+    }
+
+    private static void NotifyTitleBarContentChanged()
+        => WeakReferenceMessenger.Default.Send(new TitleBarShellContentUpdated());
+
+    private void UpdateNavigationPaneLayout(NavigationViewDisplayMode displayMode)
+    {
+        if (displayMode == NavigationViewDisplayMode.Expanded && navigationView.IsPaneOpen)
+        {
+            if (ViewModel.IsCalendarMode)
+            {
+                PaneCustomContent.Visibility = Visibility.Visible;
+                CalendarPaneContent.Visibility = Visibility.Visible;
+                ContactsPaneContent.Visibility = Visibility.Collapsed;
+                InnerShellFrame.Margin = new Thickness(0);
+                return;
+            }
+
+            if (ViewModel.IsContactsMode)
+            {
+                PaneCustomContent.Visibility = Visibility.Visible;
+                CalendarPaneContent.Visibility = Visibility.Collapsed;
+                ContactsPaneContent.Visibility = Visibility.Visible;
+                InnerShellFrame.Margin = new Thickness(0);
+                return;
+            }
+        }
+
+        CalendarPaneContent.Visibility = Visibility.Collapsed;
+        ContactsPaneContent.Visibility = Visibility.Collapsed;
+        PaneCustomContent.Visibility = Visibility.Collapsed;
+        InnerShellFrame.Margin = displayMode == NavigationViewDisplayMode.Minimal
+            ? new Thickness(7, 0, 0, 0)
+            : new Thickness(0);
+    }
+
+    private async void OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        if (e.KeyStatus.RepeatCount > 1 || ShouldIgnoreShortcut())
+            return;
+
+        var key = NormalizeKey(e.Key);
+        if (string.IsNullOrEmpty(key))
+            return;
+
+        var mode = ViewModel.CurrentMode;
+        var shortcutService = WinoApplication.Current.Services.GetRequiredService<IKeyboardShortcutService>();
+        var shortcut = await shortcutService.GetShortcutForKeyAsync(mode, key, GetCurrentModifierKeys());
+
+        if (shortcut == null)
+            return;
+
+        var details = new KeyboardShortcutTriggerDetails
+        {
+            ShortcutId = shortcut.Id,
+            Mode = shortcut.Mode,
+            Action = shortcut.Action,
+            Key = shortcut.Key,
+            ModifierKeys = shortcut.ModifierKeys,
+            Sender = sender,
+            Origin = FocusManager.GetFocusedElement(XamlRoot)
+        };
+
+        await ViewModel.CurrentClient.KeyboardShortcutHook(details);
+
+        if (InnerShellFrame.Content is BasePage activePage && activePage.AssociatedViewModel != null)
+        {
+            await activePage.AssociatedViewModel.KeyboardShortcutHook(details);
+        }
+
+        if (details.Handled)
+        {
+            e.Handled = true;
+        }
+    }
+
+    private bool ShouldIgnoreShortcut()
+    {
+        var focusedElement = FocusManager.GetFocusedElement(XamlRoot);
+
+        if (focusedElement is TextBox or AutoSuggestBox or PasswordBox or RichEditBox or ComboBox)
+            return true;
+
+        if (focusedElement is FrameworkElement frameworkElement)
+        {
+            var typeName = frameworkElement.GetType().Name;
+            if (typeName.Contains("WebView", StringComparison.OrdinalIgnoreCase))
+                return true;
+        }
+
+        return false;
+    }
+
+    private async void ItemDroppedOnFolder(object sender, DragEventArgs e)
+    {
+        if (sender is WinoNavigationViewItem droppedContainer)
+        {
+            droppedContainer.IsDraggingItemOver = false;
+
+            if (CanContinueDragDrop(droppedContainer, e) && droppedContainer.DataContext is IBaseFolderMenuItem draggingFolder)
+            {
+                var dragPackage = e.DataView.Properties[nameof(MailDragPackage)] as MailDragPackage;
+                if (dragPackage == null)
+                    return;
+
+                e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
+                var mailCopies = ExtractMailCopies(dragPackage).ToList();
+                await ViewModel.MailClient.PerformMoveOperationAsync(mailCopies, draggingFolder);
+            }
+        }
+    }
+
+    private void ItemDragLeaveFromFolder(object sender, DragEventArgs e)
+    {
+        if (sender is WinoNavigationViewItem leavingContainer)
+        {
+            leavingContainer.IsDraggingItemOver = false;
+        }
+    }
+
+    private bool CanContinueDragDrop(WinoNavigationViewItem interactingContainer, DragEventArgs args)
+    {
+        if (!ViewModel.IsMailMode || !args.DataView.Properties.ContainsKey(nameof(MailDragPackage)))
+            return false;
+
+        var dragPackage = args.DataView.Properties[nameof(MailDragPackage)] as MailDragPackage;
+        if (dragPackage == null || !dragPackage.DraggingMails.Any())
+            return false;
+
+        if (interactingContainer.IsSelected)
+            return false;
+
+        if (interactingContainer.DataContext is not IBaseFolderMenuItem folderMenuItem || !folderMenuItem.IsMoveTarget)
+            return false;
+
+        var draggedAccountIds = folderMenuItem.HandlingFolders.Select(a => a.MailAccountId);
+        var draggedMails = ExtractMailCopies(dragPackage).ToList();
+
+        return draggedMails.Any() && draggedMails.Any(a => draggedAccountIds.Contains(a.AssignedAccount.Id));
+    }
+
+    private static IEnumerable<MailCopy> ExtractMailCopies(MailDragPackage dragPackage)
+    {
+        foreach (var item in dragPackage.DraggingMails)
+        {
+            if (item is MailCopy mailCopy)
+            {
+                yield return mailCopy;
+            }
+            else if (item is MailItemViewModel singleMailItemViewModel)
+            {
+                yield return singleMailItemViewModel.MailCopy;
+            }
+            else if (item is ThreadMailItemViewModel threadViewModel)
+            {
+                foreach (var threadMail in threadViewModel.ThreadEmails)
+                {
+                    yield return threadMail.MailCopy;
+                }
+            }
+        }
+    }
+
+    private void ItemDragEnterOnFolder(object sender, DragEventArgs e)
+    {
+        if (sender is WinoNavigationViewItem droppedContainer && CanContinueDragDrop(droppedContainer, e))
+        {
+            droppedContainer.IsDraggingItemOver = true;
+
+            if (droppedContainer.DataContext is IBaseFolderMenuItem draggingFolder)
+            {
+                e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
+                e.DragUIOverride.Caption = string.Format(Translator.DragMoveToFolderCaption, draggingFolder.FolderName);
+            }
+        }
+    }
+
+    private static ModifierKeys GetCurrentModifierKeys()
+    {
+        var modifiers = ModifierKeys.None;
+
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Control).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Control;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Menu).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Alt;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Shift).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+            modifiers |= ModifierKeys.Shift;
+        if (Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.LeftWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down) ||
+            Microsoft.UI.Input.InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.RightWindows).HasFlag(Windows.UI.Core.CoreVirtualKeyStates.Down))
+        {
+            modifiers |= ModifierKeys.Windows;
+        }
+
+        return modifiers;
+    }
+
+    private static string NormalizeKey(Windows.System.VirtualKey key)
+    {
+        return key switch
+        {
+            Windows.System.VirtualKey.Control or
+            Windows.System.VirtualKey.LeftControl or
+            Windows.System.VirtualKey.RightControl or
+            Windows.System.VirtualKey.Menu or
+            Windows.System.VirtualKey.LeftMenu or
+            Windows.System.VirtualKey.RightMenu or
+            Windows.System.VirtualKey.Shift or
+            Windows.System.VirtualKey.LeftShift or
+            Windows.System.VirtualKey.RightShift or
+            Windows.System.VirtualKey.LeftWindows or
+            Windows.System.VirtualKey.RightWindows => string.Empty,
+            _ => key.ToString()
+        };
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        WeakReferenceMessenger.Default.Register<AccountMenuItemExtended>(this);
+        WeakReferenceMessenger.Default.Register<CreateNewMailWithMultipleAccountsRequested>(this);
+        WeakReferenceMessenger.Default.Register<NavigateMailFolderEvent>(this);
+        WeakReferenceMessenger.Default.Register<CalendarDisplayTypeChangedMessage>(this);
+        WeakReferenceMessenger.Default.Register<AccountCreatedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        WeakReferenceMessenger.Default.Unregister<AccountMenuItemExtended>(this);
+        WeakReferenceMessenger.Default.Unregister<CreateNewMailWithMultipleAccountsRequested>(this);
+        WeakReferenceMessenger.Default.Unregister<NavigateMailFolderEvent>(this);
+        WeakReferenceMessenger.Default.Unregister<CalendarDisplayTypeChangedMessage>(this);
+        WeakReferenceMessenger.Default.Unregister<AccountCreatedMessage>(this);
+    }
+}
diff --git a/Wino.Calendar/MainPage.xaml b/Wino.Mail.WinUI/WelcomeWindow.xaml
similarity index 51%
rename from Wino.Calendar/MainPage.xaml
rename to Wino.Mail.WinUI/WelcomeWindow.xaml
index f9187649..f4b46e4e 100644
--- a/Wino.Calendar/MainPage.xaml
+++ b/Wino.Mail.WinUI/WelcomeWindow.xaml
@@ -1,12 +1,14 @@
-<Page
-    x:Class="Wino.Calendar.MainPage"
+<?xml version="1.0" encoding="utf-8" ?>
+<winuiex:WindowEx
+    x:Class="Wino.Mail.WinUI.WelcomeWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Wino.Calendar"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    xmlns:winuiex="using:WinUIEx"
     mc:Ignorable="d">
 
-    <Grid />
-</Page>
+    <Grid Background="{ThemeResource WinoApplicationBackgroundColor}">
+        <Frame x:Name="RootFrame" />
+    </Grid>
+</winuiex:WindowEx>
diff --git a/Wino.Mail.WinUI/WelcomeWindow.xaml.cs b/Wino.Mail.WinUI/WelcomeWindow.xaml.cs
new file mode 100644
index 00000000..d97a1075
--- /dev/null
+++ b/Wino.Mail.WinUI/WelcomeWindow.xaml.cs
@@ -0,0 +1,77 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Wino.Core.Domain.Interfaces;
+using Wino.Mail.WinUI.Helpers;
+using Wino.Mail.WinUI.Interfaces;
+using WinUIEx;
+
+namespace Wino.Mail.WinUI;
+
+public sealed partial class WelcomeWindow : WindowEx
+{
+    private bool _allowClose;
+    private bool _isPreparedForClose;
+
+    public Frame GetRootFrame() => RootFrame;
+
+    public WelcomeWindow()
+    {
+        InitializeComponent();
+
+        MinWidth = 980;
+        MinHeight = 900;
+        Title = "Wino Mail";
+        this.SetIcon("Assets/Wino_Icon.ico");
+
+        ConfigureWindowChrome();
+        AppWindow.Closing += OnAppWindowClosing;
+        Closed += OnWindowClosed;
+    }
+
+    private void ConfigureWindowChrome()
+    {
+        AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;
+
+        Width = 980;
+        Height = 720;
+
+        this.CenterOnScreen();
+
+        var themeService = WinoApplication.Current.Services.GetService<INewThemeService>();
+        themeService?.UpdateSystemCaptionButtonColors();
+    }
+
+    private void OnAppWindowClosing(object sender, AppWindowClosingEventArgs e)
+    {
+        if (_allowClose || (Application.Current as App)?.IsExiting == true)
+            return;
+
+        e.Cancel = true;
+
+        var windowManager = WinoApplication.Current.Services.GetService<IWinoWindowManager>();
+        windowManager?.HideWindow(this);
+    }
+
+    public void AllowClose()
+    {
+        _allowClose = true;
+    }
+
+    public void PrepareForClose()
+    {
+        if (_isPreparedForClose)
+            return;
+
+        _isPreparedForClose = true;
+        WindowCleanupHelper.CleanupFrame(RootFrame);
+    }
+
+    private void OnWindowClosed(object sender, WindowEventArgs e)
+    {
+        Closed -= OnWindowClosed;
+        AppWindow.Closing -= OnAppWindowClosing;
+        PrepareForClose();
+    }
+}
diff --git a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
new file mode 100644
index 00000000..87965fa0
--- /dev/null
+++ b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
@@ -0,0 +1,397 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net10.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <RootNamespace>Wino.Mail.WinUI</RootNamespace>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Platform Condition="'$(Platform)' == '' or '$(Platform)' == 'AnyCPU'">x64</Platform>
+    <Platforms>x86;x64;ARM64</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+    <UseWinUI>true</UseWinUI>
+    <EnableMsixTooling>true</EnableMsixTooling>
+    <Nullable>enable</Nullable>
+
+	<!-- AOT / Trimming -->
+	<PublishAot Condition="'$(Configuration)' == 'Debug'">False</PublishAot>
+	<PublishAot Condition="'$(Configuration)' != 'Debug'">True</PublishAot>
+	<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+	<NoWarn>$(NoWarn);CS8305</NoWarn>
+	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
+	<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
+
+	<!-- Trimming -->
+	<PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed>
+	<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
+	
+	  
+	<!-- Single instancing -->
+    <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+</PropertyGroup>
+
+<ItemGroup>
+	<TrimmerRootAssembly Include="Google.Apis.Auth" />
+	<TrimmerRootAssembly Include="Google.Apis.Drive.v3" />
+	<TrimmerRootAssembly Include="Google.Apis.Gmail.v1" />
+</ItemGroup>
+
+  <ItemGroup>
+    <Content Remove="Assets\BadgeLogo.scale-100.png" />
+    <Content Remove="Assets\BadgeLogo.scale-125.png" />
+    <Content Remove="Assets\BadgeLogo.scale-150.png" />
+    <Content Remove="Assets\BadgeLogo.scale-200.png" />
+    <Content Remove="Assets\BadgeLogo.scale-400.png" />
+    <Content Remove="Assets\CalendarAppBase.png" />
+    <Content Remove="Assets\CalendarLargeTile.png" />
+    <Content Remove="Assets\CalendarSmallTile.png" />
+    <Content Remove="Assets\CalendarSquare150x150Logo.png" />
+    <Content Remove="Assets\CalendarSquare44x44Logo.png" />
+    <Content Remove="Assets\LargeTile.scale-100.png" />
+    <Content Remove="Assets\LargeTile.scale-125.png" />
+    <Content Remove="Assets\LargeTile.scale-150.png" />
+    <Content Remove="Assets\LargeTile.scale-200.png" />
+    <Content Remove="Assets\LargeTile.scale-400.png" />
+    <Content Remove="Assets\SmallTile.scale-100.png" />
+    <Content Remove="Assets\SmallTile.scale-125.png" />
+    <Content Remove="Assets\SmallTile.scale-150.png" />
+    <Content Remove="Assets\SmallTile.scale-200.png" />
+    <Content Remove="Assets\SmallTile.scale-400.png" />
+    <Content Remove="Assets\SplashScreen.scale-100.png" />
+    <Content Remove="Assets\SplashScreen.scale-125.png" />
+    <Content Remove="Assets\SplashScreen.scale-150.png" />
+    <Content Remove="Assets\SplashScreen.scale-400.png" />
+    <Content Remove="Assets\Square150x150Logo.scale-100.png" />
+    <Content Remove="Assets\Square150x150Logo.scale-125.png" />
+    <Content Remove="Assets\Square150x150Logo.scale-150.png" />
+    <Content Remove="Assets\Square150x150Logo.scale-400.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-unplated_targetsize-32.png" />
+    <Content Remove="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
+    <Content Remove="Assets\Square44x44Logo.scale-100.png" />
+    <Content Remove="Assets\Square44x44Logo.scale-125.png" />
+    <Content Remove="Assets\Square44x44Logo.scale-150.png" />
+    <Content Remove="Assets\Square44x44Logo.scale-400.png" />
+    <Content Remove="Assets\Square44x44Logo.targetsize-16.png" />
+    <Content Remove="Assets\Square44x44Logo.targetsize-24.png" />
+    <Content Remove="Assets\Square44x44Logo.targetsize-256.png" />
+    <Content Remove="Assets\Square44x44Logo.targetsize-32.png" />
+    <Content Remove="Assets\Square44x44Logo.targetsize-48.png" />
+    <Content Remove="Assets\StoreLogo.backup.png" />
+    <Content Remove="Assets\StoreLogo.scale-100.png" />
+    <Content Remove="Assets\StoreLogo.scale-125.png" />
+    <Content Remove="Assets\StoreLogo.scale-150.png" />
+    <Content Remove="Assets\StoreLogo.scale-200.png" />
+    <Content Remove="Assets\StoreLogo.scale-400.png" />
+    <Content Remove="Assets\Wide310x150Logo.scale-100.png" />
+    <Content Remove="Assets\Wide310x150Logo.scale-125.png" />
+    <Content Remove="Assets\Wide310x150Logo.scale-150.png" />
+    <Content Remove="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Remove="Assets\AppEntries\MailAssets\Square44x44Logo.altform-unplated_targetsize-24.png" />
+    <Content Remove="Assets\AppEntries\CalendarAssets\Square44x44Logo.altform-unplated_targetsize-24.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="Assets\AIPackIcon.png" />
+    <None Remove="Assets\CalendarWide310x150Logo.png" />
+    <None Remove="Assets\UpdateNotes\Images\Calendar.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Security.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Thread.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Notification.svg" />
+    <None Remove="Assets\UpdateNotes\Images\More.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Mail.svg" />
+    <None Remove="Assets\UpdateNotes\Images\Customize.svg" />
+    <None Remove="BackgroundImages\Acrylic.jpg" />
+    <None Remove="BackgroundImages\Clouds.jpg" />
+    <None Remove="BackgroundImages\Forest.jpg" />
+    <None Remove="BackgroundImages\Garden.jpg" />
+    <None Remove="BackgroundImages\Mica.jpg" />
+    <None Remove="BackgroundImages\Nighty.jpg" />
+    <None Remove="BackgroundImages\Snowflake.jpg" />
+    <None Remove="Controls\ListView\WinoListViewStyles.xaml" />
+    <None Remove="Controls\Calendar\CalendarPeriodControl.xaml" />
+    <None Remove="ShellWindow.xaml" />
+    <None Remove="Styles\CalendarShellNavigationViewStyle.xaml" />
+    <None Remove="Styles\CalendarThemeResources.xaml" />
+    <None Remove="Styles\CalendarViewStyles.xaml" />
+    <None Remove="Styles\WinoCalendarTypeSelectorControl.xaml" />
+    <None Remove="Views\Calendar\CalendarAppShell.xaml" />
+    <None Remove="Views\Calendar\CalendarPage.xaml" />
+    <None Remove="Views\Calendar\EventDetailsPage.xaml" />
+    <None Remove="Views\Settings\ContactsPage.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Remove="AppThemes\Acrylic.xaml" />
+    <Page Remove="AppThemes\Clouds.xaml" />
+    <Page Remove="AppThemes\Custom.xaml" />
+    <Page Remove="AppThemes\Default.xaml" />
+    <Page Remove="AppThemes\Forest.xaml" />
+    <Page Remove="AppThemes\Garden.xaml" />
+    <Page Remove="AppThemes\Nighty.xaml" />
+    <Page Remove="AppThemes\Snowflake.xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="AppThemes\Acrylic.xaml" />
+    <Content Include="AppThemes\Clouds.xaml" />
+    <Content Include="AppThemes\Custom.xaml" />
+    <Content Include="AppThemes\Default.xaml" />
+    <Content Include="AppThemes\Forest.xaml" />
+    <Content Include="AppThemes\Garden.xaml" />
+    <Content Include="AppThemes\Nighty.xaml" />
+    <Content Include="AppThemes\Snowflake.xaml" />
+    <Content Include="Assets\ReleaseNotes\vnext.md" />
+    <Content Include="Assets\UpdateNotes\vnext.json" />
+    <Content Include="Assets\UpdateNotes\features.json" />
+    <Content Include="Assets\UpdateNotes\Images\Calendar.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Security.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Thread.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Notification.svg" />
+    <Content Include="Assets\UpdateNotes\Images\More.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Mail.svg" />
+    <Content Include="Assets\UpdateNotes\Images\Customize.svg" />
+    <Content Include="Assets\Wino_Icon.ico" />
+    <Content Include="BackgroundImages\Acrylic.jpg" />
+    <Content Include="BackgroundImages\Clouds.jpg" />
+    <Content Include="BackgroundImages\Forest.jpg" />
+    <Content Include="BackgroundImages\Garden.jpg" />
+    <Content Include="BackgroundImages\Mica.jpg" />
+    <Content Include="BackgroundImages\Nighty.jpg" />
+    <Content Include="BackgroundImages\Snowflake.jpg" />
+    <Content Include="JS\editor.html" />
+    <Content Include="JS\editor.js" />
+    <Content Include="JS\global.css" />
+    <Content Include="JS\libs\darkreader.js" />
+    <Content Include="JS\libs\jodit.min.css" />
+    <Content Include="JS\libs\jodit.min.js" />
+    <Content Include="JS\libs\linkify-element.min.js" />
+    <Content Include="JS\libs\linkify.min.js" />
+    <Content Include="JS\reader.html" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+
+  <!--
+    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+    Tools extension to be activated for this project even if the Windows App SDK Nuget
+    package has not yet been restored.
+  -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+	
+  <ItemGroup>
+	<PackageReference Include="CommunityToolkit.Common" />
+	<PackageReference Include="CommunityToolkit.Diagnostics" />
+	<PackageReference Include="CommunityToolkit.Mvvm" />
+	<PackageReference Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.TabbedCommandBar" />
+    <PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" />
+    <PackageReference Include="CommunityToolkit.WinUI.Extensions" />
+    <PackageReference Include="CommunityToolkit.WinUI.Lottie" />
+	  
+    <PackageReference Include="Microsoft.Graphics.Win2D" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+	<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+	<PackageReference Include="Microsoft.Identity.Client" />
+	  
+	<PackageReference Include="ColorHashSharp" />
+	<PackageReference Include="gravatar-dotnet" />
+	<PackageReference Include="Sentry.Serilog" />
+	<PackageReference Include="sqlite-net-pcl" />
+	<PackageReference Include="EmailValidation" />
+	<PackageReference Include="System.Drawing.Common" />
+	<PackageReference Include="SkiaSharp.Views.WinUI" />
+	<PackageReference Include="WinUIEx" />
+	<PackageReference Include="Wino.Mail.Contracts" />
+  </ItemGroup>
+  <ItemGroup>
+	<ProjectReference Include="..\Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj" />
+	<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
+	<ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj" />
+	<ProjectReference Include="..\Wino.Mail.ViewModels\Wino.Mail.ViewModels.csproj" />
+	<ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Views\Settings\ContactsPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Controls\ListView\WinoListViewStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="ShellWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="MailAppShell.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Controls\MailItemDisplayInformationControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\AccountReorderDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\CreateAccountAliasDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\MessageSourceDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\MoveMailDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\SignatureEditorDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Dialogs\SystemFolderConfigurationDialog.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Styles\ImagePreviewControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Styles\ItemContainerStyles.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Styles\WebViewEditorControl.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Styles\WinoExpanderStyle.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Account\AccountDetailsPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Account\AccountManagementPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Account\ImapCalDavSettingsPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Account\MergedAccountDetailsPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\ComposePage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\IdlePage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\MailListPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\MailRenderingPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\AboutPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\AliasManagementPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\AppPreferencesPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\CreateEmailTemplatePage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\EmailTemplatesPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\MessageListPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\PersonalizationPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\ReadComposePanePage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\Settings\SignatureManagementPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Update="Views\WelcomePage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Views\Mail\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Controls\Calendar\CalendarPeriodControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Styles\CalendarViewStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Styles\CalendarShellNavigationViewStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Styles\CalendarThemeResources.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Styles\WinoCalendarTypeSelectorControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Views\Calendar\CalendarAppShell.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Views\Calendar\CalendarPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Views\Calendar\EventDetailsPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <!--
+    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
+    Explorer "Package and Publish" context menu entry to be enabled for this project even if
+    the Windows App SDK Nuget package has not yet been restored.
+  -->
+  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+  </PropertyGroup>
+
+  <!-- Publish Properties -->
+  <PropertyGroup>  
+    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundle>Always</AppxBundle>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <PackageCertificateThumbprint>2661584A2F31D3419FFF8AA09A2C16B1991B8290</PackageCertificateThumbprint>
+  </PropertyGroup>
+</Project>
diff --git a/Wino.Mail.WinUI/WinoApplication.cs b/Wino.Mail.WinUI/WinoApplication.cs
new file mode 100644
index 00000000..1b84d7ac
--- /dev/null
+++ b/Wino.Mail.WinUI/WinoApplication.cs
@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.Windows.Globalization;
+using Nito.AsyncEx;
+using Serilog;
+using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.Core;
+using Windows.Foundation.Metadata;
+using Windows.Storage;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Translations;
+using Wino.Core.Services;
+using Wino.Messaging.Client.Shell;
+using Wino.Services;
+using WinUIEx;
+
+namespace Wino.Mail.WinUI;
+
+public abstract class WinoApplication : Application, IRecipient<LanguageChanged>
+{
+    public new static WinoApplication Current => (WinoApplication)Application.Current;
+    public const string WinoLaunchLogPrefix = "[Wino Launch] ";
+
+    public IServiceProvider Services { get; }
+    protected IWinoLogger LogInitializer { get; }
+    protected IApplicationConfiguration AppConfiguration { get; }
+    public INewThemeService NewThemeService { get; }
+    public IUnderlyingThemeService UnderlyingThemeService { get; }
+    public IThumbnailService ThumbnailService { get; }
+    protected IDatabaseService DatabaseService { get; }
+    protected ITranslationService TranslationService { get; }
+
+    public static WindowEx? MainWindow { get; set; }
+
+    protected WinoApplication()
+    {
+        ConfigurePrelaunch();
+
+        Services = ConfigureServices();
+
+        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+        TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
+        UnhandledException += OnAppUnhandledException;
+
+        LogInitializer = Services.GetRequiredService<IWinoLogger>();
+        AppConfiguration = Services.GetRequiredService<IApplicationConfiguration>();
+
+        NewThemeService = Services.GetRequiredService<INewThemeService>();
+        DatabaseService = Services.GetRequiredService<IDatabaseService>();
+        TranslationService = Services.GetRequiredService<ITranslationService>();
+        UnderlyingThemeService = Services.GetRequiredService<IUnderlyingThemeService>();
+        ThumbnailService = Services.GetRequiredService<IThumbnailService>();
+
+        // Make sure the paths are setup on app start.
+        AppConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
+        AppConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
+        AppConfiguration.ApplicationTempFolderPath = ApplicationData.Current.TemporaryFolder.Path;
+
+        ConfigureLogging();
+    }
+
+    private void CurrentDomain_UnhandledException(object? sender, System.UnhandledExceptionEventArgs e)
+        => Log.Fatal(e.ExceptionObject as Exception, "AppDomain Unhandled Exception");
+
+    private void OnUnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
+        => Log.Error(e.Exception, "Unobserved Task Exception");
+
+    private void OnAppUnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+    {
+        Log.Fatal(e.Exception, "Unhandled Exception");
+        e.Handled = true;
+    }
+
+    public IEnumerable<IInitializeAsync> GetActivationServices()
+    {
+        yield return DatabaseService;
+        yield return TranslationService;
+        yield return Services.GetRequiredService<SynchronizationManagerInitializer>();
+    }
+
+    public Task InitializeServicesAsync() => GetActivationServices().Select(a => a.InitializeAsync()).WhenAll();
+
+    public bool IsInteractiveLaunchArgs(object args) => args is IActivatedEventArgs;
+
+    public void LogActivation(string log) => Log.Information($"{WinoLaunchLogPrefix}{log}");
+
+    protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+    {
+        base.OnLaunched(args);
+
+        LogActivation("OnLaunched.");
+    }
+
+    private void ConfigurePrelaunch()
+    {
+        if (ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch"))
+            CoreApplication.EnablePrelaunch(true);
+    }
+
+    public abstract IServiceProvider ConfigureServices();
+
+    public void ConfigureLogging()
+    {
+        string logFilePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.ClientLogFile);
+        LogInitializer.SetupLogger(logFilePath);
+    }
+
+    public virtual void OnLanguageChanged(AppLanguageModel languageModel)
+    {
+        var newCulture = new CultureInfo(languageModel.Code);
+
+        ApplicationLanguages.PrimaryLanguageOverride = languageModel.Code;
+
+        CultureInfo.DefaultThreadCurrentCulture = newCulture;
+        CultureInfo.DefaultThreadCurrentUICulture = newCulture;
+    }
+
+    public void Receive(LanguageChanged message) => OnLanguageChanged(TranslationService.CurrentLanguageModel);
+}
diff --git a/Wino.Mail.WinUI/app.manifest b/Wino.Mail.WinUI/app.manifest
new file mode 100644
index 00000000..2713a1e2
--- /dev/null
+++ b/Wino.Mail.WinUI/app.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="Wino.Mail.WinUI.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/Wino.Mail/Activation/DefaultActivationHandler.cs b/Wino.Mail/Activation/DefaultActivationHandler.cs
deleted file mode 100644
index 85deddbf..00000000
--- a/Wino.Mail/Activation/DefaultActivationHandler.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Wino.Views;
-
-namespace Wino.Activation;
-
-internal class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
-{
-    protected override Task HandleInternalAsync(IActivatedEventArgs args)
-    {
-        (Window.Current.Content as Frame).Navigate(typeof(AppShell), null, new DrillInNavigationTransitionInfo());
-
-        return Task.CompletedTask;
-    }
-
-    // Only navigate if Frame content doesn't exist.
-    protected override bool CanHandleInternal(IActivatedEventArgs args)
-        => (Window.Current?.Content as Frame)?.Content == null;
-}
diff --git a/Wino.Mail/Activation/FileActivationHandler.cs b/Wino.Mail/Activation/FileActivationHandler.cs
deleted file mode 100644
index ae1c4284..00000000
--- a/Wino.Mail/Activation/FileActivationHandler.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Activation;
-using Windows.Storage;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
-using Wino.Views;
-
-namespace Wino.Activation;
-
-internal class FileActivationHandler : ActivationHandler<FileActivatedEventArgs>
-{
-    private readonly INativeAppService _nativeAppService;
-    private readonly IMimeFileService _mimeFileService;
-    private readonly IStatePersistanceService _statePersistanceService;
-    private readonly INavigationService _winoNavigationService;
-
-    public FileActivationHandler(INativeAppService nativeAppService,
-                                 IMimeFileService mimeFileService,
-                                 IStatePersistanceService statePersistanceService,
-                                 INavigationService winoNavigationService)
-    {
-        _nativeAppService = nativeAppService;
-        _mimeFileService = mimeFileService;
-        _statePersistanceService = statePersistanceService;
-        _winoNavigationService = winoNavigationService;
-    }
-
-    protected override async Task HandleInternalAsync(FileActivatedEventArgs args)
-    {
-        // Always handle the last item passed.
-        // Multiple files are not supported.
-
-        var file = args.Files.Last() as StorageFile;
-
-        // Only EML files are supported now.
-        var fileExtension = Path.GetExtension(file.Path);
-
-        if (string.Equals(fileExtension, ".eml", StringComparison.OrdinalIgnoreCase))
-        {
-            var fileBytes = await file.ToByteArrayAsync();
-            var directoryName = Path.GetDirectoryName(file.Path);
-
-            var messageInformation = await _mimeFileService.GetMimeMessageInformationAsync(fileBytes, directoryName).ConfigureAwait(false);
-
-            if (_nativeAppService.IsAppRunning())
-            {
-                // TODO: Activate another Window and go to mail rendering page.
-                _winoNavigationService.Navigate(WinoPage.MailRenderingPage, messageInformation, NavigationReferenceFrame.RenderingFrame);
-            }
-            else
-            {
-                _statePersistanceService.ShouldShiftMailRenderingDesign = true;
-                (Window.Current.Content as Frame).Navigate(typeof(MailRenderingPage), messageInformation, new DrillInNavigationTransitionInfo());
-            }
-        }
-    }
-
-    protected override bool CanHandleInternal(FileActivatedEventArgs args) => args.Files.Any();
-
-}
diff --git a/Wino.Mail/Activation/ToastNotificationActivationHandler.cs b/Wino.Mail/Activation/ToastNotificationActivationHandler.cs
deleted file mode 100644
index 2067d1c1..00000000
--- a/Wino.Mail/Activation/ToastNotificationActivationHandler.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.WinUI.Notifications;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-using Windows.ApplicationModel.Activation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Interfaces;
-using Wino.Messaging.Client.Accounts;
-
-namespace Wino.Activation;
-
-/// <summary>
-/// This handler will only handle the toasts that runs on foreground.
-/// Background executions are not handled here like mark as read or delete.
-/// </summary>
-internal class ToastNotificationActivationHandler : ActivationHandler<ToastNotificationActivatedEventArgs>
-{
-    private readonly IMailService _mailService;
-    private readonly IFolderService _folderService;
-
-    private ToastArguments _toastArguments;
-
-    public ToastNotificationActivationHandler(IMailService mailService,
-                                              IFolderService folderService)
-    {
-        _mailService = mailService;
-        _folderService = folderService;
-    }
-
-    protected override async Task HandleInternalAsync(ToastNotificationActivatedEventArgs args)
-    {
-        // Create the mail item navigation event.
-        // If the app is running, it'll be picked up by the Messenger.
-        // Otherwise we'll save it and handle it when the shell loads all accounts.
-
-        // Parse the mail unique id and perform above actions.
-        if (Guid.TryParse(_toastArguments[Constants.ToastMailUniqueIdKey], out Guid mailItemUniqueId))
-        {
-            var account = await _mailService.GetMailAccountByUniqueIdAsync(mailItemUniqueId).ConfigureAwait(false);
-            if (account == null) return;
-
-            var mailItem = await _mailService.GetSingleMailItemAsync(mailItemUniqueId).ConfigureAwait(false);
-            if (mailItem == null) return;
-
-            var message = new AccountMenuItemExtended(mailItem.AssignedFolder.Id, mailItem);
-
-            // Delegate this event to LaunchProtocolService so app shell can pick it up on launch if app doesn't work.
-            var launchProtocolService = App.Current.Services.GetService<ILaunchProtocolService>();
-            launchProtocolService.LaunchParameter = message;
-
-            // Send the messsage anyways. Launch protocol service will be ignored if the message is picked up by subscriber shell.
-            WeakReferenceMessenger.Default.Send(message);
-        }
-    }
-
-    protected override bool CanHandleInternal(ToastNotificationActivatedEventArgs args)
-    {
-        try
-        {
-            _toastArguments = ToastArguments.Parse(args.Argument);
-
-            return
-                _toastArguments.Contains(Constants.ToastMailUniqueIdKey) &&
-                _toastArguments.Contains(Constants.ToastActionKey);
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Couldn't handle parsing toast notification arguments for foreground navigate.");
-        }
-
-        return false;
-    }
-}
diff --git a/Wino.Mail/Animations/Synchronization.cs b/Wino.Mail/Animations/Synchronization.cs
deleted file mode 100644
index 0a76a6d0..00000000
--- a/Wino.Mail/Animations/Synchronization.cs
+++ /dev/null
@@ -1,557 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//       LottieGen version:
-//           8.1.240821.1+077322fa26
-//       
-//       Command:
-//           LottieGen -Language CSharp -Public -WinUIVersion 2.6 -InputFile synchronization.json
-//       
-//       Input file:
-//           synchronization.json (2404 bytes created 18:54+01:00 Dec 21 2024)
-//       
-//       LottieGen source:
-//           http://aka.ms/Lottie
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-// ___________________________________________________________
-// |       Object stats       | UAP v15 count | UAP v7 count |
-// |__________________________|_______________|______________|
-// | All CompositionObjects   |            26 |           26 |
-// |--------------------------+---------------+--------------|
-// | Expression animators     |             1 |            1 |
-// | KeyFrame animators       |             1 |            1 |
-// | Reference parameters     |             1 |            1 |
-// | Expression operations    |             0 |            0 |
-// |--------------------------+---------------+--------------|
-// | Animated brushes         |             - |            - |
-// | Animated gradient stops  |             - |            - |
-// | ExpressionAnimations     |             1 |            1 |
-// | PathKeyFrameAnimations   |             - |            - |
-// |--------------------------+---------------+--------------|
-// | ContainerVisuals         |             1 |            1 |
-// | ShapeVisuals             |             1 |            1 |
-// |--------------------------+---------------+--------------|
-// | ContainerShapes          |             1 |            1 |
-// | CompositionSpriteShapes  |             2 |            2 |
-// |--------------------------+---------------+--------------|
-// | Brushes                  |             1 |            1 |
-// | Gradient stops           |             - |            - |
-// | CompositionVisualSurface |             - |            - |
-// -----------------------------------------------------------
-using Microsoft.Graphics.Canvas.Geometry;
-using System;
-using System.Collections.Generic;
-using System.Numerics;
-using Windows.Graphics;
-using Windows.UI;
-using Windows.UI.Composition;
-
-namespace AnimatedVisuals
-{
-    // Name:        main_libary_shelf_icon_sync
-    // Frame rate:  60 fps
-    // Frame count: 61
-    // Duration:    1016.7 mS
-    sealed class Synchronization
-        : Microsoft.UI.Xaml.Controls.IAnimatedVisualSource
-        , Microsoft.UI.Xaml.Controls.IAnimatedVisualSource2
-    {
-        // Animation duration: 1.017 seconds.
-        internal const long c_durationTicks = 10166666;
-
-        public Microsoft.UI.Xaml.Controls.IAnimatedVisual TryCreateAnimatedVisual(Compositor compositor)
-        {
-            object ignored = null;
-            return TryCreateAnimatedVisual(compositor, out ignored);
-        }
-
-        public Microsoft.UI.Xaml.Controls.IAnimatedVisual TryCreateAnimatedVisual(Compositor compositor, out object diagnostics)
-        {
-            diagnostics = null;
-
-            if (Synchronization_AnimatedVisual_UAPv15.IsRuntimeCompatible())
-            {
-                var res = 
-                    new Synchronization_AnimatedVisual_UAPv15(
-                        compositor
-                        );
-                    return res;
-            }
-
-            if (Synchronization_AnimatedVisual_UAPv7.IsRuntimeCompatible())
-            {
-                var res = 
-                    new Synchronization_AnimatedVisual_UAPv7(
-                        compositor
-                        );
-                    return res;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the number of frames in the animation.
-        /// </summary>
-        public double FrameCount => 61d;
-
-        /// <summary>
-        /// Gets the frame rate of the animation.
-        /// </summary>
-        public double Framerate => 60d;
-
-        /// <summary>
-        /// Gets the duration of the animation.
-        /// </summary>
-        public TimeSpan Duration => TimeSpan.FromTicks(10166666);
-
-        /// <summary>
-        /// Converts a zero-based frame number to the corresponding progress value denoting the
-        /// start of the frame.
-        /// </summary>
-        public double FrameToProgress(double frameNumber)
-        {
-            return frameNumber / 61d;
-        }
-
-        /// <summary>
-        /// Returns a map from marker names to corresponding progress values.
-        /// </summary>
-        public IReadOnlyDictionary<string, double> Markers =>
-            new Dictionary<string, double>
-            {
-            };
-
-        /// <summary>
-        /// Sets the color property with the given name, or does nothing if no such property
-        /// exists.
-        /// </summary>
-        public void SetColorProperty(string propertyName, Color value)
-        {
-        }
-
-        /// <summary>
-        /// Sets the scalar property with the given name, or does nothing if no such property
-        /// exists.
-        /// </summary>
-        public void SetScalarProperty(string propertyName, double value)
-        {
-        }
-
-        sealed class Synchronization_AnimatedVisual_UAPv15
-            : Microsoft.UI.Xaml.Controls.IAnimatedVisual
-        {
-            const long c_durationTicks = 10166666;
-            readonly Compositor _c;
-            readonly ExpressionAnimation _reusableExpressionAnimation;
-            AnimationController _animationController_0;
-            CompositionColorBrush _colorBrush_AlmostDarkSlateGray_FF2D3846;
-            ContainerVisual _root;
-
-            void BindProperty(
-                CompositionObject target,
-                string animatedPropertyName,
-                string expression,
-                string referenceParameterName,
-                CompositionObject referencedObject)
-            {
-                _reusableExpressionAnimation.ClearAllParameters();
-                _reusableExpressionAnimation.Expression = expression;
-                _reusableExpressionAnimation.SetReferenceParameter(referenceParameterName, referencedObject);
-                target.StartAnimation(animatedPropertyName, _reusableExpressionAnimation);
-            }
-
-            ScalarKeyFrameAnimation CreateScalarKeyFrameAnimation(float initialProgress, float initialValue, CompositionEasingFunction initialEasingFunction)
-            {
-                var result = _c.CreateScalarKeyFrameAnimation();
-                result.Duration = TimeSpan.FromTicks(c_durationTicks);
-                result.InsertKeyFrame(initialProgress, initialValue, initialEasingFunction);
-                return result;
-            }
-
-            CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, Matrix3x2 transformMatrix, CompositionBrush fillBrush)
-            {
-                var result = _c.CreateSpriteShape(geometry);
-                result.TransformMatrix = transformMatrix;
-                result.FillBrush = fillBrush;
-                return result;
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            AnimationController AnimationController_0()
-            {
-                var result = _animationController_0 = _c.CreateAnimationController();
-                result.Pause();
-                BindProperty(result, "Progress", "_.Progress", "_", _root);
-                return result;
-            }
-
-            // - - - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // - - ShapeGroup: Group 2 Offset:<28.255, 18.903>
-            CanvasGeometry Geometry_0()
-            {
-                CanvasGeometry result;
-                using (var builder = new CanvasPathBuilder(null))
-                {
-                    builder.SetFilledRegionDetermination(CanvasFilledRegionDetermination.Winding);
-                    builder.BeginFigure(new Vector2(11.7449999F, 5.09700012F));
-                    builder.AddCubicBezier(new Vector2(11.7449999F, -3.66000009F), new Vector2(4.56699991F, -10.9189997F), new Vector2(-4.25500011F, -10.9189997F));
-                    builder.AddCubicBezier(new Vector2(-8.6239996F, -10.9189997F), new Vector2(-12.7040005F, -9.20300007F), new Vector2(-15.7449999F, -6.08900023F));
-                    builder.AddLine(new Vector2(-12.8739996F, -3.32599998F));
-                    builder.AddCubicBezier(new Vector2(-10.5930004F, -5.66200018F), new Vector2(-7.53200006F, -6.94799995F), new Vector2(-4.25500011F, -6.94799995F));
-                    builder.AddCubicBezier(new Vector2(2.36199999F, -6.94799995F), new Vector2(7.74499989F, -1.47099996F), new Vector2(7.74499989F, 5.09700012F));
-                    builder.AddLine(new Vector2(3.74499989F, 5.09700012F));
-                    builder.AddLine(new Vector2(9.74499989F, 10.9189997F));
-                    builder.AddLine(new Vector2(15.7449999F, 5.09700012F));
-                    builder.AddLine(new Vector2(11.7449999F, 5.09700012F));
-                    builder.EndFigure(CanvasFigureLoop.Closed);
-                    result = CanvasGeometry.CreatePath(builder);
-                }
-                return result;
-            }
-
-            // - - - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // - - ShapeGroup: Group 1 Offset:<19.745, 29.096>
-            CanvasGeometry Geometry_1()
-            {
-                CanvasGeometry result;
-                using (var builder = new CanvasPathBuilder(null))
-                {
-                    builder.SetFilledRegionDetermination(CanvasFilledRegionDetermination.Winding);
-                    builder.BeginFigure(new Vector2(4.25500011F, 6.94799995F));
-                    builder.AddCubicBezier(new Vector2(-2.36199999F, 6.94799995F), new Vector2(-7.74499989F, 1.472F), new Vector2(-7.74499989F, -5.09499979F));
-                    builder.AddLine(new Vector2(-3.74499989F, -5.09499979F));
-                    builder.AddLine(new Vector2(-9.74499989F, -10.9189997F));
-                    builder.AddLine(new Vector2(-15.7449999F, -5.09499979F));
-                    builder.AddLine(new Vector2(-11.7449999F, -5.09499979F));
-                    builder.AddCubicBezier(new Vector2(-11.7449999F, 3.66199994F), new Vector2(-4.56699991F, 10.9189997F), new Vector2(4.25500011F, 10.9189997F));
-                    builder.AddCubicBezier(new Vector2(8.6260004F, 10.9189997F), new Vector2(12.7060003F, 9.20300007F), new Vector2(15.7449999F, 6.08900023F));
-                    builder.AddLine(new Vector2(12.8739996F, 3.32500005F));
-                    builder.AddCubicBezier(new Vector2(10.5930004F, 5.66099977F), new Vector2(7.53200006F, 6.94799995F), new Vector2(4.25500011F, 6.94799995F));
-                    builder.EndFigure(CanvasFigureLoop.Closed);
-                    result = CanvasGeometry.CreatePath(builder);
-                }
-                return result;
-            }
-
-            CompositionColorBrush ColorBrush_AlmostDarkSlateGray_FF2D3846()
-            {
-                return _colorBrush_AlmostDarkSlateGray_FF2D3846 = _c.CreateColorBrush(Color.FromArgb(0xFF, 0x2D, 0x38, 0x46));
-            }
-
-            // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            CompositionContainerShape ContainerShape()
-            {
-                var result = _c.CreateContainerShape();
-                result.CenterPoint = new Vector2(24F, 24F);
-                var shapes = result.Shapes;
-                // ShapeGroup: Group 2 Offset:<28.255, 18.903>
-                shapes.Add(SpriteShape_0());
-                // ShapeGroup: Group 1 Offset:<19.745, 29.096>
-                shapes.Add(SpriteShape_1());
-                result.StartAnimation("RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_360(), AnimationController_0());
-                return result;
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // ShapeGroup: Group 2 Offset:<28.255, 18.903>
-            CompositionPathGeometry PathGeometry_0()
-            {
-                return _c.CreatePathGeometry(new CompositionPath(Geometry_0()));
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // ShapeGroup: Group 1 Offset:<19.745, 29.096>
-            CompositionPathGeometry PathGeometry_1()
-            {
-                return _c.CreatePathGeometry(new CompositionPath(Geometry_1()));
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Path 1
-            CompositionSpriteShape SpriteShape_0()
-            {
-                // Offset:<28.255, 18.903>
-                var geometry = PathGeometry_0();
-                var result = CreateSpriteShape(geometry, new Matrix3x2(1F, 0F, 0F, 1F, 28.2549992F, 18.9029999F), ColorBrush_AlmostDarkSlateGray_FF2D3846());;
-                return result;
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Path 1
-            CompositionSpriteShape SpriteShape_1()
-            {
-                // Offset:<19.745, 29.096>
-                var geometry = PathGeometry_1();
-                var result = CreateSpriteShape(geometry, new Matrix3x2(1F, 0F, 0F, 1F, 19.7450008F, 29.0960007F), _colorBrush_AlmostDarkSlateGray_FF2D3846);;
-                return result;
-            }
-
-            // The root of the composition.
-            ContainerVisual Root()
-            {
-                var result = _root = _c.CreateContainerVisual();
-                var propertySet = result.Properties;
-                propertySet.InsertScalar("Progress", 0F);
-                // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-                result.Children.InsertAtTop(ShapeVisual_0());
-                return result;
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Rotation
-            ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_360()
-            {
-                // Frame 0.
-                var result = CreateScalarKeyFrameAnimation(0F, 0F, HoldThenStepEasingFunction());
-                // Frame 61.
-                result.InsertKeyFrame(1F, 360F, _c.CreateCubicBezierEasingFunction(new Vector2(0.314999998F, 0F), new Vector2(0.465000004F, 0.861999989F)));
-                return result;
-            }
-
-            // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            ShapeVisual ShapeVisual_0()
-            {
-                var result = _c.CreateShapeVisual();
-                result.Size = new Vector2(48F, 48F);
-                result.Shapes.Add(ContainerShape());
-                return result;
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // RotationAngleInDegrees
-            StepEasingFunction HoldThenStepEasingFunction()
-            {
-                var result = _c.CreateStepEasingFunction();
-                result.IsFinalStepSingleFrame = true;
-                return result;
-            }
-
-            internal Synchronization_AnimatedVisual_UAPv15(
-                Compositor compositor
-                )
-            {
-                _c = compositor;
-                _reusableExpressionAnimation = compositor.CreateExpressionAnimation();
-                Root();
-            }
-
-            public Visual RootVisual => _root;
-            public TimeSpan Duration => TimeSpan.FromTicks(c_durationTicks);
-            public Vector2 Size => new Vector2(48F, 48F);
-            void IDisposable.Dispose() => _root?.Dispose();
-
-            internal static bool IsRuntimeCompatible()
-            {
-                return Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 15);
-            }
-        }
-
-        sealed class Synchronization_AnimatedVisual_UAPv7
-            : Microsoft.UI.Xaml.Controls.IAnimatedVisual
-        {
-            const long c_durationTicks = 10166666;
-            readonly Compositor _c;
-            readonly ExpressionAnimation _reusableExpressionAnimation;
-            CompositionColorBrush _colorBrush_AlmostDarkSlateGray_FF2D3846;
-            ContainerVisual _root;
-
-            void BindProperty(
-                CompositionObject target,
-                string animatedPropertyName,
-                string expression,
-                string referenceParameterName,
-                CompositionObject referencedObject)
-            {
-                _reusableExpressionAnimation.ClearAllParameters();
-                _reusableExpressionAnimation.Expression = expression;
-                _reusableExpressionAnimation.SetReferenceParameter(referenceParameterName, referencedObject);
-                target.StartAnimation(animatedPropertyName, _reusableExpressionAnimation);
-            }
-
-            ScalarKeyFrameAnimation CreateScalarKeyFrameAnimation(float initialProgress, float initialValue, CompositionEasingFunction initialEasingFunction)
-            {
-                var result = _c.CreateScalarKeyFrameAnimation();
-                result.Duration = TimeSpan.FromTicks(c_durationTicks);
-                result.InsertKeyFrame(initialProgress, initialValue, initialEasingFunction);
-                return result;
-            }
-
-            CompositionSpriteShape CreateSpriteShape(CompositionGeometry geometry, Matrix3x2 transformMatrix, CompositionBrush fillBrush)
-            {
-                var result = _c.CreateSpriteShape(geometry);
-                result.TransformMatrix = transformMatrix;
-                result.FillBrush = fillBrush;
-                return result;
-            }
-
-            // - - - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // - - ShapeGroup: Group 2 Offset:<28.255, 18.903>
-            CanvasGeometry Geometry_0()
-            {
-                CanvasGeometry result;
-                using (var builder = new CanvasPathBuilder(null))
-                {
-                    builder.SetFilledRegionDetermination(CanvasFilledRegionDetermination.Winding);
-                    builder.BeginFigure(new Vector2(11.7449999F, 5.09700012F));
-                    builder.AddCubicBezier(new Vector2(11.7449999F, -3.66000009F), new Vector2(4.56699991F, -10.9189997F), new Vector2(-4.25500011F, -10.9189997F));
-                    builder.AddCubicBezier(new Vector2(-8.6239996F, -10.9189997F), new Vector2(-12.7040005F, -9.20300007F), new Vector2(-15.7449999F, -6.08900023F));
-                    builder.AddLine(new Vector2(-12.8739996F, -3.32599998F));
-                    builder.AddCubicBezier(new Vector2(-10.5930004F, -5.66200018F), new Vector2(-7.53200006F, -6.94799995F), new Vector2(-4.25500011F, -6.94799995F));
-                    builder.AddCubicBezier(new Vector2(2.36199999F, -6.94799995F), new Vector2(7.74499989F, -1.47099996F), new Vector2(7.74499989F, 5.09700012F));
-                    builder.AddLine(new Vector2(3.74499989F, 5.09700012F));
-                    builder.AddLine(new Vector2(9.74499989F, 10.9189997F));
-                    builder.AddLine(new Vector2(15.7449999F, 5.09700012F));
-                    builder.AddLine(new Vector2(11.7449999F, 5.09700012F));
-                    builder.EndFigure(CanvasFigureLoop.Closed);
-                    result = CanvasGeometry.CreatePath(builder);
-                }
-                return result;
-            }
-
-            // - - - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // - - ShapeGroup: Group 1 Offset:<19.745, 29.096>
-            CanvasGeometry Geometry_1()
-            {
-                CanvasGeometry result;
-                using (var builder = new CanvasPathBuilder(null))
-                {
-                    builder.SetFilledRegionDetermination(CanvasFilledRegionDetermination.Winding);
-                    builder.BeginFigure(new Vector2(4.25500011F, 6.94799995F));
-                    builder.AddCubicBezier(new Vector2(-2.36199999F, 6.94799995F), new Vector2(-7.74499989F, 1.472F), new Vector2(-7.74499989F, -5.09499979F));
-                    builder.AddLine(new Vector2(-3.74499989F, -5.09499979F));
-                    builder.AddLine(new Vector2(-9.74499989F, -10.9189997F));
-                    builder.AddLine(new Vector2(-15.7449999F, -5.09499979F));
-                    builder.AddLine(new Vector2(-11.7449999F, -5.09499979F));
-                    builder.AddCubicBezier(new Vector2(-11.7449999F, 3.66199994F), new Vector2(-4.56699991F, 10.9189997F), new Vector2(4.25500011F, 10.9189997F));
-                    builder.AddCubicBezier(new Vector2(8.6260004F, 10.9189997F), new Vector2(12.7060003F, 9.20300007F), new Vector2(15.7449999F, 6.08900023F));
-                    builder.AddLine(new Vector2(12.8739996F, 3.32500005F));
-                    builder.AddCubicBezier(new Vector2(10.5930004F, 5.66099977F), new Vector2(7.53200006F, 6.94799995F), new Vector2(4.25500011F, 6.94799995F));
-                    builder.EndFigure(CanvasFigureLoop.Closed);
-                    result = CanvasGeometry.CreatePath(builder);
-                }
-                return result;
-            }
-
-            CompositionColorBrush ColorBrush_AlmostDarkSlateGray_FF2D3846()
-            {
-                return _colorBrush_AlmostDarkSlateGray_FF2D3846 = _c.CreateColorBrush(Color.FromArgb(0xFF, 0x2D, 0x38, 0x46));
-            }
-
-            // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            CompositionContainerShape ContainerShape()
-            {
-                var result = _c.CreateContainerShape();
-                result.CenterPoint = new Vector2(24F, 24F);
-                var shapes = result.Shapes;
-                // ShapeGroup: Group 2 Offset:<28.255, 18.903>
-                shapes.Add(SpriteShape_0());
-                // ShapeGroup: Group 1 Offset:<19.745, 29.096>
-                shapes.Add(SpriteShape_1());
-                result.StartAnimation("RotationAngleInDegrees", RotationAngleInDegreesScalarAnimation_0_to_360());
-                var controller = result.TryGetAnimationController("RotationAngleInDegrees");
-                controller.Pause();
-                BindProperty(controller, "Progress", "_.Progress", "_", _root);
-                return result;
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // ShapeGroup: Group 2 Offset:<28.255, 18.903>
-            CompositionPathGeometry PathGeometry_0()
-            {
-                return _c.CreatePathGeometry(new CompositionPath(Geometry_0()));
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // ShapeGroup: Group 1 Offset:<19.745, 29.096>
-            CompositionPathGeometry PathGeometry_1()
-            {
-                return _c.CreatePathGeometry(new CompositionPath(Geometry_1()));
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Path 1
-            CompositionSpriteShape SpriteShape_0()
-            {
-                // Offset:<28.255, 18.903>
-                var geometry = PathGeometry_0();
-                var result = CreateSpriteShape(geometry, new Matrix3x2(1F, 0F, 0F, 1F, 28.2549992F, 18.9029999F), ColorBrush_AlmostDarkSlateGray_FF2D3846());;
-                return result;
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Path 1
-            CompositionSpriteShape SpriteShape_1()
-            {
-                // Offset:<19.745, 29.096>
-                var geometry = PathGeometry_1();
-                var result = CreateSpriteShape(geometry, new Matrix3x2(1F, 0F, 0F, 1F, 19.7450008F, 29.0960007F), _colorBrush_AlmostDarkSlateGray_FF2D3846);;
-                return result;
-            }
-
-            // The root of the composition.
-            ContainerVisual Root()
-            {
-                var result = _root = _c.CreateContainerVisual();
-                var propertySet = result.Properties;
-                propertySet.InsertScalar("Progress", 0F);
-                // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-                result.Children.InsertAtTop(ShapeVisual_0());
-                return result;
-            }
-
-            // - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // Rotation
-            ScalarKeyFrameAnimation RotationAngleInDegreesScalarAnimation_0_to_360()
-            {
-                // Frame 0.
-                var result = CreateScalarKeyFrameAnimation(0F, 0F, HoldThenStepEasingFunction());
-                // Frame 61.
-                result.InsertKeyFrame(1F, 360F, _c.CreateCubicBezierEasingFunction(new Vector2(0.314999998F, 0F), new Vector2(0.465000004F, 0.861999989F)));
-                return result;
-            }
-
-            // Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            ShapeVisual ShapeVisual_0()
-            {
-                var result = _c.CreateShapeVisual();
-                result.Size = new Vector2(48F, 48F);
-                result.Shapes.Add(ContainerShape());
-                return result;
-            }
-
-            // - - Shape tree root for layer: main_library_shelf_icon_sync Outlines
-            // RotationAngleInDegrees
-            StepEasingFunction HoldThenStepEasingFunction()
-            {
-                var result = _c.CreateStepEasingFunction();
-                result.IsFinalStepSingleFrame = true;
-                return result;
-            }
-
-            internal Synchronization_AnimatedVisual_UAPv7(
-                Compositor compositor
-                )
-            {
-                _c = compositor;
-                _reusableExpressionAnimation = compositor.CreateExpressionAnimation();
-                Root();
-            }
-
-            public Visual RootVisual => _root;
-            public TimeSpan Duration => TimeSpan.FromTicks(c_durationTicks);
-            public Vector2 Size => new Vector2(48F, 48F);
-            void IDisposable.Dispose() => _root?.Dispose();
-
-            internal static bool IsRuntimeCompatible()
-            {
-                return Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7);
-            }
-        }
-    }
-}
diff --git a/Wino.Mail/App.xaml b/Wino.Mail/App.xaml
deleted file mode 100644
index d044da41..00000000
--- a/Wino.Mail/App.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<uwp:WinoApplication
-    x:Class="Wino.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Controls"
-    xmlns:selectors="using:Wino.Selectors"
-    xmlns:styles="using:Wino.Styles"
-    xmlns:uwp="using:Wino.Core.UWP"
-    xmlns:wino="using:Wino">
-
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <uwp:CoreGeneric />
-                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
-                <ResourceDictionary Source="Styles/ItemContainerStyles.xaml" />
-                <ResourceDictionary Source="Styles/ImagePreviewControl.xaml" />
-                <ResourceDictionary Source="Styles/WebViewEditorControl.xaml" />
-
-                <styles:WinoExpanderStyle />
-
-                <!--  Last item must always be the default theme.  -->
-                <ResourceDictionary Source="ms-appx:///Wino.Core.UWP/AppThemes/Mica.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</uwp:WinoApplication>
diff --git a/Wino.Mail/App.xaml.cs b/Wino.Mail/App.xaml.cs
deleted file mode 100644
index dfa86da8..00000000
--- a/Wino.Mail/App.xaml.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.WinUI.Notifications;
-using Microsoft.Extensions.DependencyInjection;
-using Nito.AsyncEx;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Background;
-using Windows.UI.Core.Preview;
-using Windows.UI.Notifications;
-using Wino.Activation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.UWP;
-using Wino.Mail.Services;
-using Wino.Mail.ViewModels;
-using Wino.Messaging.Client.Connection;
-using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.Client.Shell;
-using Wino.Messaging.Server;
-using Wino.Services;
-
-namespace Wino;
-
-public sealed partial class App : WinoApplication,
-    IRecipient<NewMailSynchronizationRequested>
-{
-    private BackgroundTaskDeferral connectionBackgroundTaskDeferral;
-    private BackgroundTaskDeferral toastActionBackgroundTaskDeferral;
-
-    public App()
-    {
-        InitializeComponent();
-
-        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-        WeakReferenceMessenger.Default.Register<LanguageChanged>(this);
-        WeakReferenceMessenger.Default.Register<NewMailSynchronizationRequested>(this);
-    }
-
-    public override async void OnResuming(object sender, object e)
-    {
-        // App Service connection was lost on suspension.
-        // We must restore it.
-        // Server might be running already, but re-launching it will trigger a new connection attempt.
-
-        try
-        {
-            await AppServiceConnectionManager.ConnectAsync();
-        }
-        catch (OperationCanceledException)
-        {
-            // Ignore
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "Failed to connect to server after resuming the app.");
-        }
-    }
-
-    public override IServiceProvider ConfigureServices()
-    {
-        var services = new ServiceCollection();
-
-        services.RegisterViewModelService();
-        services.RegisterSharedServices();
-        services.RegisterCoreUWPServices();
-        services.RegisterCoreViewModels();
-
-        RegisterUWPServices(services);
-        RegisterViewModels(services);
-        RegisterActivationHandlers(services);
-
-        return services.BuildServiceProvider();
-    }
-
-    #region Dependency Injection
-
-    private void RegisterActivationHandlers(IServiceCollection services)
-    {
-        services.AddTransient<ProtocolActivationHandler>();
-        services.AddTransient<ToastNotificationActivationHandler>();
-        services.AddTransient<FileActivationHandler>();
-    }
-
-    private void RegisterUWPServices(IServiceCollection services)
-    {
-        services.AddSingleton<INavigationService, NavigationService>();
-        services.AddSingleton<IMailDialogService, DialogService>();
-        services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
-        services.AddTransient<IProviderService, ProviderService>();
-        services.AddSingleton<IAuthenticatorConfig, MailAuthenticatorConfiguration>();
-    }
-
-    private void RegisterViewModels(IServiceCollection services)
-    {
-        services.AddSingleton(typeof(AppShellViewModel));
-
-        services.AddTransient(typeof(MailListPageViewModel));
-        services.AddTransient(typeof(MailRenderingPageViewModel));
-        services.AddTransient(typeof(AccountManagementViewModel));
-        services.AddTransient(typeof(WelcomePageViewModel));
-
-        services.AddTransient(typeof(ComposePageViewModel));
-        services.AddTransient(typeof(IdlePageViewModel));
-
-        services.AddTransient(typeof(EditAccountDetailsPageViewModel));
-        services.AddTransient(typeof(AccountDetailsPageViewModel));
-        services.AddTransient(typeof(SignatureManagementPageViewModel));
-        services.AddTransient(typeof(MessageListPageViewModel));
-        services.AddTransient(typeof(ReadComposePanePageViewModel));
-        services.AddTransient(typeof(MergedAccountDetailsPageViewModel));
-        services.AddTransient(typeof(LanguageTimePageViewModel));
-        services.AddTransient(typeof(AppPreferencesPageViewModel));
-        services.AddTransient(typeof(AliasManagementPageViewModel));
-    }
-
-    #endregion
-
-    protected override async void OnBackgroundActivated(BackgroundActivatedEventArgs args)
-    {
-        base.OnBackgroundActivated(args);
-
-        if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails appServiceTriggerDetails)
-        {
-            LogActivation("OnBackgroundActivated -> AppServiceTriggerDetails received.");
-
-            // Only accept connections from callers in the same package
-            if (appServiceTriggerDetails.CallerPackageFamilyName == Package.Current.Id.FamilyName)
-            {
-                // Connection established from the fulltrust process
-
-                connectionBackgroundTaskDeferral = args.TaskInstance.GetDeferral();
-                args.TaskInstance.Canceled += OnConnectionBackgroundTaskCanceled;
-
-                AppServiceConnectionManager.Connection = appServiceTriggerDetails.AppServiceConnection;
-
-                WeakReferenceMessenger.Default.Send(new WinoServerConnectionEstablished());
-            }
-        }
-        else if (args.TaskInstance.TriggerDetails is ToastNotificationActionTriggerDetail toastNotificationActionTriggerDetail)
-        {
-            // Notification action is triggered and the app is not running.
-
-            LogActivation("OnBackgroundActivated -> ToastNotificationActionTriggerDetail received.");
-
-            toastActionBackgroundTaskDeferral = args.TaskInstance.GetDeferral();
-            args.TaskInstance.Canceled += OnToastActionClickedBackgroundTaskCanceled;
-
-            await InitializeServicesAsync();
-
-            var toastArguments = ToastArguments.Parse(toastNotificationActionTriggerDetail.Argument);
-
-            // All toast activation mail actions are handled here like mark as read or delete.
-            // This should not launch the application on the foreground.
-
-            // Get the action and mail item id.
-            // Prepare package and send to delegator.
-
-            if (toastArguments.TryGetValue(Constants.ToastActionKey, out MailOperation action) &&
-                                toastArguments.TryGetValue(Constants.ToastMailUniqueIdKey, out string mailUniqueIdString) &&
-                                Guid.TryParse(mailUniqueIdString, out Guid mailUniqueId))
-            {
-
-                // At this point server should've already been connected.
-
-                var processor = base.Services.GetService<IWinoRequestProcessor>();
-                var delegator = base.Services.GetService<IWinoRequestDelegator>();
-                var mailService = base.Services.GetService<IMailService>();
-
-                var mailItem = await mailService.GetSingleMailItemAsync(mailUniqueId);
-
-                if (mailItem != null)
-                {
-                    var package = new MailOperationPreperationRequest(action, mailItem);
-
-                    await delegator.ExecuteAsync(package);
-                }
-            }
-
-            toastActionBackgroundTaskDeferral.Complete();
-        }
-        else
-        {
-            // Other background activations might have handlers.
-            // AppServiceTrigger is handled here because delegating it to handlers somehow make it not work...
-
-            await ActivateWinoAsync(args);
-        }
-    }
-
-    private void OnToastActionClickedBackgroundTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-    {
-        sender.Canceled -= OnToastActionClickedBackgroundTaskCanceled;
-
-        Log.Information($"Toast action background task was canceled. Reason: {reason}");
-
-        toastActionBackgroundTaskDeferral?.Complete();
-        toastActionBackgroundTaskDeferral = null;
-    }
-
-    protected override IEnumerable<ActivationHandler> GetActivationHandlers()
-    {
-        yield return Services.GetService<ProtocolActivationHandler>();
-        yield return Services.GetService<ToastNotificationActivationHandler>();
-        yield return Services.GetService<FileActivationHandler>();
-    }
-
-    public void OnConnectionBackgroundTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-    {
-        sender.Canceled -= OnConnectionBackgroundTaskCanceled;
-
-        Log.Information($"Server connection background task was canceled. Reason: {reason}");
-
-        connectionBackgroundTaskDeferral?.Complete();
-        connectionBackgroundTaskDeferral = null;
-
-        AppServiceConnectionManager.Connection = null;
-    }
-
-    public async void Receive(NewMailSynchronizationRequested message)
-    {
-        try
-        {
-            var synchronizationResultResponse = await AppServiceConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(message);
-            synchronizationResultResponse.ThrowIfFailed();
-        }
-        catch (WinoServerException serverException)
-        {
-            // TODO: Exception context is lost.
-            var dialogService = Services.GetService<IMailDialogService>();
-
-            dialogService.InfoBarMessage(Translator.Info_SyncFailedTitle, serverException.Message, InfoBarMessageType.Error);
-        }
-    }
-
-    protected override async void OnApplicationCloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
-    {
-        Log.Information("App close requested.");
-
-        var deferral = e.GetDeferral();
-
-        // Wino should notify user on app close if:
-        // 1. Startup behavior is not Enabled.
-        // 2. Server terminate behavior is set to Terminate.
-
-        // User has some accounts. Check if Wino Server runs on system startup.
-
-        var dialogService = base.Services.GetService<IMailDialogService>();
-        var startupBehaviorService = base.Services.GetService<IStartupBehaviorService>();
-        var preferencesService = base.Services.GetService<IPreferencesService>();
-
-        var currentStartupBehavior = await startupBehaviorService.GetCurrentStartupBehaviorAsync();
-
-        bool? isGoToAppPreferencesRequested = null;
-
-        if (preferencesService.ServerTerminationBehavior == ServerBackgroundMode.Terminate)
-        {
-            // Starting the server is fine, but check if server termination behavior is set to terminate.
-            // This state will kill the server once the app is terminated.
-
-            isGoToAppPreferencesRequested = await dialogService.ShowWinoCustomMessageDialogAsync(Translator.AppCloseBackgroundSynchronizationWarningTitle,
-                                                             $"{Translator.AppCloseTerminateBehaviorWarningMessageFirstLine}\n{Translator.AppCloseTerminateBehaviorWarningMessageSecondLine}\n\n{Translator.AppCloseTerminateBehaviorWarningMessageThirdLine}",
-                                                             Translator.Buttons_Yes,
-                                                             WinoCustomMessageDialogIcon.Warning,
-                                                             Translator.Buttons_No,
-                                                             "DontAskTerminateServerBehavior");
-        }
-
-        if (isGoToAppPreferencesRequested == null && currentStartupBehavior != StartupBehaviorResult.Enabled)
-        {
-            // Startup behavior is not enabled.
-
-            isGoToAppPreferencesRequested = await dialogService.ShowWinoCustomMessageDialogAsync(Translator.AppCloseBackgroundSynchronizationWarningTitle,
-                                                             $"{Translator.AppCloseStartupLaunchDisabledWarningMessageFirstLine}\n{Translator.AppCloseStartupLaunchDisabledWarningMessageSecondLine}\n\n{Translator.AppCloseStartupLaunchDisabledWarningMessageThirdLine}",
-                                                             Translator.Buttons_Yes,
-                                                             WinoCustomMessageDialogIcon.Warning,
-                                                             Translator.Buttons_No,
-                                                             "DontAskDisabledStartup");
-        }
-
-        if (isGoToAppPreferencesRequested == true)
-        {
-            WeakReferenceMessenger.Default.Send(new NavigateAppPreferencesRequested());
-            e.Handled = true;
-        }
-        else if (preferencesService.ServerTerminationBehavior == ServerBackgroundMode.Terminate)
-        {
-            try
-            {
-                var isServerKilled = await AppServiceConnectionManager.GetResponseAsync<bool, TerminateServerRequested>(new TerminateServerRequested());
-
-                isServerKilled.ThrowIfFailed();
-
-                Log.Information("Server is killed.");
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Failed to kill server.");
-            }
-        }
-
-        deferral.Complete();
-    }
-
-    protected override ActivationHandler<IActivatedEventArgs> GetDefaultActivationHandler()
-        => new DefaultActivationHandler();
-}
diff --git a/Wino.Mail/AppShell.xaml.cs b/Wino.Mail/AppShell.xaml.cs
deleted file mode 100644
index b83f4315..00000000
--- a/Wino.Mail/AppShell.xaml.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using Windows.ApplicationModel.Core;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.UWP;
-using Wino.Core.UWP.Controls;
-using Wino.Extensions;
-using Wino.Mail.ViewModels.Data;
-using Wino.MenuFlyouts;
-using Wino.MenuFlyouts.Context;
-using Wino.Messaging.Client.Accounts;
-using Wino.Messaging.Client.Mails;
-using Wino.Messaging.Client.Shell;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class AppShell : AppShellAbstract,
-    IRecipient<AccountMenuItemExtended>,
-    IRecipient<NavigateMailFolderEvent>,
-    IRecipient<CreateNewMailWithMultipleAccountsRequested>,
-    IRecipient<InfoBarMessageRequested>
-{
-    public AppShell() : base()
-    {
-        InitializeComponent();
-
-        var coreTitleBar = CoreApplication.GetCurrentView().TitleBar;
-
-
-
-
-        coreTitleBar.LayoutMetricsChanged += TitleBarLayoutUpdated;
-    }
-
-    private void TitleBarLayoutUpdated(CoreApplicationViewTitleBar sender, object args) => UpdateTitleBarLayout(sender);
-
-    private void UpdateTitleBarLayout(CoreApplicationViewTitleBar coreTitleBar) => RealAppBar.SystemReserved = coreTitleBar.SystemOverlayRightInset;
-
-    private async void ItemDroppedOnFolder(object sender, DragEventArgs e)
-    {
-        // Validate package content.
-        if (sender is WinoNavigationViewItem droppedContainer)
-        {
-            droppedContainer.IsDraggingItemOver = false;
-
-            if (CanContinueDragDrop(droppedContainer, e))
-            {
-                if (droppedContainer.DataContext is IBaseFolderMenuItem draggingFolder)
-                {
-                    var mailCopies = new List<MailCopy>();
-
-                    var dragPackage = e.DataView.Properties[nameof(MailDragPackage)] as MailDragPackage;
-                    e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
-
-                    // Extract mail copies from IMailItem.
-                    // ThreadViewModels will be divided into pieces.
-
-                    foreach (var item in dragPackage.DraggingMails)
-                    {
-                        if (item is MailItemViewModel singleMailItemViewModel)
-                        {
-                            mailCopies.Add(singleMailItemViewModel.MailCopy);
-                        }
-                        else if (item is ThreadMailItemViewModel threadViewModel)
-                        {
-                            mailCopies.AddRange(threadViewModel.GetMailCopies());
-                        }
-                    }
-
-                    await ViewModel.PerformMoveOperationAsync(mailCopies, draggingFolder);
-                }
-            }
-        }
-    }
-
-    private void ItemDragLeaveFromFolder(object sender, DragEventArgs e)
-    {
-        if (sender is WinoNavigationViewItem leavingContainer)
-        {
-            leavingContainer.IsDraggingItemOver = false;
-        }
-    }
-
-    private bool CanContinueDragDrop(WinoNavigationViewItem interactingContainer, DragEventArgs args)
-    {
-        // TODO: Maybe override caption with some information why the validation failed?
-        // Note: Caption has a max length. It may be trimmed in some languages.
-
-        if (interactingContainer == null || !args.DataView.Properties.ContainsKey(nameof(MailDragPackage))) return false;
-
-        var dragPackage = args.DataView.Properties[nameof(MailDragPackage)] as MailDragPackage;
-
-        // Invalid package.
-        if (!dragPackage.DraggingMails.Any()) return false;
-
-        // Check whether source and target folder are the same.
-        if (interactingContainer.IsSelected) return false;
-
-        // Check if the interacting container is a folder.
-        if (!(interactingContainer.DataContext is IBaseFolderMenuItem folderMenuItem)) return false;
-
-        // Check if the folder is a move target.
-        if (!folderMenuItem.IsMoveTarget) return false;
-
-        // Check whether the moving item's account has at least one same as the target folder's account.
-        var draggedAccountIds = folderMenuItem.HandlingFolders.Select(a => a.MailAccountId);
-
-        if (!dragPackage.DraggingMails.Any(a => draggedAccountIds.Contains(a.AssignedAccount.Id))) return false;
-
-        return true;
-    }
-
-    private void ItemDragEnterOnFolder(object sender, DragEventArgs e)
-    {
-        // Validate package content.
-        if (sender is WinoNavigationViewItem droppedContainer && CanContinueDragDrop(droppedContainer, e))
-        {
-            droppedContainer.IsDraggingItemOver = true;
-
-            var draggingFolder = droppedContainer.DataContext as IBaseFolderMenuItem;
-
-            e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
-            e.DragUIOverride.Caption = string.Format(Translator.DragMoveToFolderCaption, draggingFolder.FolderName);
-        }
-    }
-
-    public async void Receive(AccountMenuItemExtended message)
-    {
-        await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.High, async () =>
-        {
-            if (message.FolderId == default) return;
-
-            if (ViewModel.MenuItems.TryGetFolderMenuItem(message.FolderId, out IBaseFolderMenuItem foundMenuItem))
-            {
-                foundMenuItem.Expand();
-
-                await ViewModel.NavigateFolderAsync(foundMenuItem);
-
-                navigationView.SelectedItem = foundMenuItem;
-
-                if (message.NavigateMailItem == null) return;
-
-                // At this point folder is navigated and items are loaded.
-                WeakReferenceMessenger.Default.Send(new MailItemNavigationRequested(message.NavigateMailItem.UniqueId, ScrollToItem: true));
-            }
-            else if (ViewModel.MenuItems.TryGetAccountMenuItem(message.NavigateMailItem.AssignedAccount.Id, out IAccountMenuItem accountMenuItem))
-            {
-                // Loaded account is different. First change the folder items and navigate.
-
-                await ViewModel.ChangeLoadedAccountAsync(accountMenuItem, navigateInbox: false);
-
-                // Find the folder.
-
-                if (ViewModel.MenuItems.TryGetFolderMenuItem(message.FolderId, out IBaseFolderMenuItem accountFolderMenuItem))
-                {
-                    accountFolderMenuItem.Expand();
-
-                    await ViewModel.NavigateFolderAsync(accountFolderMenuItem);
-
-                    navigationView.SelectedItem = accountFolderMenuItem;
-
-                    // At this point folder is navigated and items are loaded.
-                    WeakReferenceMessenger.Default.Send(new MailItemNavigationRequested(message.NavigateMailItem.UniqueId, ScrollToItem: true));
-                }
-            }
-        });
-    }
-
-    private async void MenuSelectionChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs args)
-    {
-        if (args.SelectedItem is IMenuItem invokedMenuItem)
-        {
-            await ViewModel.MenuItemInvokedOrSelectedAsync(invokedMenuItem);
-        }
-    }
-
-    private async void NavigationViewItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
-    {
-        // SelectsOnInvoked is handled in MenuSelectionChanged.
-        // This part is only for the items that are not selectable.
-        if (args.InvokedItemContainer is WinoNavigationViewItem winoNavigationViewItem)
-        {
-            if (winoNavigationViewItem.SelectsOnInvoked) return;
-
-            await ViewModel.MenuItemInvokedOrSelectedAsync(winoNavigationViewItem.DataContext as IMenuItem);
-        }
-    }
-
-    public void Receive(NavigateMailFolderEvent message)
-    {
-        if (message.BaseFolderMenuItem == null) return;
-
-        if (navigationView.SelectedItem != message.BaseFolderMenuItem)
-        {
-            var navigateFolderArgs = new NavigateMailFolderEventArgs(message.BaseFolderMenuItem, message.FolderInitLoadAwaitTask);
-
-            ViewModel.NavigationService.Navigate(WinoPage.MailListPage, navigateFolderArgs, NavigationReferenceFrame.ShellFrame);
-
-            // Prevent double navigation.
-            navigationView.SelectionChanged -= MenuSelectionChanged;
-            navigationView.SelectedItem = message.BaseFolderMenuItem;
-            navigationView.SelectionChanged += MenuSelectionChanged;
-        }
-        else
-        {
-            // Complete the init task since we are already on the right page.
-            message.FolderInitLoadAwaitTask?.TrySetResult(true);
-        }
-    }
-
-    private void ShellFrameContentNavigated(object sender, Windows.UI.Xaml.Navigation.NavigationEventArgs e)
-        => RealAppBar.ShellFrameContent = (e.Content as BasePage).ShellContent;
-
-    private void BackButtonClicked(WinoAppTitleBar sender, RoutedEventArgs args)
-    {
-        WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested());
-        WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
-    }
-
-    private async void MenuItemContextRequested(UIElement sender, ContextRequestedEventArgs args)
-    {
-        // Delegate this request to ViewModel.
-        // VM will prepare available actions for this folder and show Menu Flyout.
-
-        if (sender is WinoNavigationViewItem menuItem &&
-            menuItem.DataContext is IBaseFolderMenuItem baseFolderMenuItem &&
-            baseFolderMenuItem.IsMoveTarget &&
-            args.TryGetPosition(sender, out Point p))
-        {
-            args.Handled = true;
-
-            var source = new TaskCompletionSource<FolderOperationMenuItem>();
-
-            var actions = ViewModel.GetFolderContextMenuActions(baseFolderMenuItem);
-            var flyout = new FolderOperationFlyout(actions, source);
-
-            flyout.ShowAt(menuItem, new FlyoutShowOptions()
-            {
-                ShowMode = FlyoutShowMode.Standard,
-                Position = new Point(p.X + 30, p.Y - 20)
-            });
-
-            var operation = await source.Task;
-
-            flyout.Dispose();
-
-            // No action selected.
-            if (operation == null) return;
-
-            await ViewModel.PerformFolderOperationAsync(operation.Operation, baseFolderMenuItem);
-        }
-    }
-
-    public void Receive(CreateNewMailWithMultipleAccountsRequested message)
-    {
-        // Find the NewMail menu item container.
-
-        var container = navigationView.ContainerFromMenuItem(ViewModel.CreateMailMenuItem);
-
-        var flyout = new AccountSelectorFlyout(message.AllAccounts, ViewModel.CreateNewMailForAsync);
-
-        flyout.ShowAt(container, new FlyoutShowOptions()
-        {
-            ShowMode = FlyoutShowMode.Auto,
-            Placement = FlyoutPlacementMode.Right
-        });
-    }
-
-    private void NavigationPaneOpening(Microsoft.UI.Xaml.Controls.NavigationView sender, object args)
-    {
-        // It's annoying that NavigationView doesn't respect expansion state of the items in Minimal display mode.
-        // Expanded items are collaped, and users need to expand them again.
-        // Regardless of the reason, we will expand the selected item if it's a folder with parent account for visibility.
-
-        if (sender.DisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Minimal && sender.SelectedItem is IFolderMenuItem selectedFolderMenuItem)
-        {
-            selectedFolderMenuItem.Expand();
-        }
-    }
-
-    /// <summary>
-    /// InfoBar message is requested.
-    /// </summary>
-    public async void Receive(InfoBarMessageRequested message)
-    {
-        await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-        {
-            if (string.IsNullOrEmpty(message.ActionButtonTitle) || message.Action == null)
-            {
-                ShellInfoBar.ActionButton = null;
-            }
-            else
-            {
-                ShellInfoBar.ActionButton = new Button()
-                {
-                    Content = message.ActionButtonTitle,
-                    Command = new RelayCommand(message.Action)
-                };
-            }
-
-            ShellInfoBar.Message = message.Message;
-            ShellInfoBar.Title = message.Title;
-            ShellInfoBar.Severity = message.Severity.AsMUXCInfoBarSeverity();
-            ShellInfoBar.IsOpen = true;
-        });
-    }
-
-    private void NavigationViewDisplayModeChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewDisplayModeChangedEventArgs args)
-    {
-        if (args.DisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Minimal)
-        {
-            ShellFrame.Margin = new Thickness(7, 0, 0, 0);
-        }
-        else
-        {
-            ShellFrame.Margin = new Thickness(0);
-        }
-    }
-}
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-100.png b/Wino.Mail/Assets/BadgeLogo.scale-100.png
deleted file mode 100644
index 1534c12e..00000000
Binary files a/Wino.Mail/Assets/BadgeLogo.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-125.png b/Wino.Mail/Assets/BadgeLogo.scale-125.png
deleted file mode 100644
index 534de075..00000000
Binary files a/Wino.Mail/Assets/BadgeLogo.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-150.png b/Wino.Mail/Assets/BadgeLogo.scale-150.png
deleted file mode 100644
index 0470789a..00000000
Binary files a/Wino.Mail/Assets/BadgeLogo.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-200.png b/Wino.Mail/Assets/BadgeLogo.scale-200.png
deleted file mode 100644
index 842c6f84..00000000
Binary files a/Wino.Mail/Assets/BadgeLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/BadgeLogo.scale-400.png b/Wino.Mail/Assets/BadgeLogo.scale-400.png
deleted file mode 100644
index ab34364e..00000000
Binary files a/Wino.Mail/Assets/BadgeLogo.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-100.png b/Wino.Mail/Assets/LargeTile.scale-100.png
deleted file mode 100644
index aca6e4e2..00000000
Binary files a/Wino.Mail/Assets/LargeTile.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-125.png b/Wino.Mail/Assets/LargeTile.scale-125.png
deleted file mode 100644
index b80bf9d4..00000000
Binary files a/Wino.Mail/Assets/LargeTile.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-150.png b/Wino.Mail/Assets/LargeTile.scale-150.png
deleted file mode 100644
index 1ed2a001..00000000
Binary files a/Wino.Mail/Assets/LargeTile.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-200.png b/Wino.Mail/Assets/LargeTile.scale-200.png
deleted file mode 100644
index a8e471dd..00000000
Binary files a/Wino.Mail/Assets/LargeTile.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/LargeTile.scale-400.png b/Wino.Mail/Assets/LargeTile.scale-400.png
deleted file mode 100644
index 54cea310..00000000
Binary files a/Wino.Mail/Assets/LargeTile.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/NotificationIcons/archive.png b/Wino.Mail/Assets/NotificationIcons/archive.png
deleted file mode 100644
index 40dc3dd1..00000000
Binary files a/Wino.Mail/Assets/NotificationIcons/archive.png and /dev/null differ
diff --git a/Wino.Mail/Assets/NotificationIcons/delete.png b/Wino.Mail/Assets/NotificationIcons/delete.png
deleted file mode 100644
index bc46276e..00000000
Binary files a/Wino.Mail/Assets/NotificationIcons/delete.png and /dev/null differ
diff --git a/Wino.Mail/Assets/NotificationIcons/dismiss.png b/Wino.Mail/Assets/NotificationIcons/dismiss.png
deleted file mode 100644
index 63086036..00000000
Binary files a/Wino.Mail/Assets/NotificationIcons/dismiss.png and /dev/null differ
diff --git a/Wino.Mail/Assets/NotificationIcons/markread.png b/Wino.Mail/Assets/NotificationIcons/markread.png
deleted file mode 100644
index 114ab059..00000000
Binary files a/Wino.Mail/Assets/NotificationIcons/markread.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-100.png b/Wino.Mail/Assets/SmallTile.scale-100.png
deleted file mode 100644
index f0d52390..00000000
Binary files a/Wino.Mail/Assets/SmallTile.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-125.png b/Wino.Mail/Assets/SmallTile.scale-125.png
deleted file mode 100644
index 4a0404cf..00000000
Binary files a/Wino.Mail/Assets/SmallTile.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-150.png b/Wino.Mail/Assets/SmallTile.scale-150.png
deleted file mode 100644
index f801334e..00000000
Binary files a/Wino.Mail/Assets/SmallTile.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-200.png b/Wino.Mail/Assets/SmallTile.scale-200.png
deleted file mode 100644
index bb2c20c9..00000000
Binary files a/Wino.Mail/Assets/SmallTile.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SmallTile.scale-400.png b/Wino.Mail/Assets/SmallTile.scale-400.png
deleted file mode 100644
index c931a5dd..00000000
Binary files a/Wino.Mail/Assets/SmallTile.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-100.png b/Wino.Mail/Assets/SplashScreen.scale-100.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/Wino.Mail/Assets/SplashScreen.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-125.png b/Wino.Mail/Assets/SplashScreen.scale-125.png
deleted file mode 100644
index ceb2dff6..00000000
Binary files a/Wino.Mail/Assets/SplashScreen.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-150.png b/Wino.Mail/Assets/SplashScreen.scale-150.png
deleted file mode 100644
index 885d9bc2..00000000
Binary files a/Wino.Mail/Assets/SplashScreen.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-200.png b/Wino.Mail/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/Wino.Mail/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/SplashScreen.scale-400.png b/Wino.Mail/Assets/SplashScreen.scale-400.png
deleted file mode 100644
index fa77f2b7..00000000
Binary files a/Wino.Mail/Assets/SplashScreen.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-100.png b/Wino.Mail/Assets/Square150x150Logo.scale-100.png
deleted file mode 100644
index a5f235b8..00000000
Binary files a/Wino.Mail/Assets/Square150x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-125.png b/Wino.Mail/Assets/Square150x150Logo.scale-125.png
deleted file mode 100644
index be92b5ae..00000000
Binary files a/Wino.Mail/Assets/Square150x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-150.png b/Wino.Mail/Assets/Square150x150Logo.scale-150.png
deleted file mode 100644
index d0039797..00000000
Binary files a/Wino.Mail/Assets/Square150x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-200.png b/Wino.Mail/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index 430e6fa3..00000000
Binary files a/Wino.Mail/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square150x150Logo.scale-400.png b/Wino.Mail/Assets/Square150x150Logo.scale-400.png
deleted file mode 100644
index 9726829b..00000000
Binary files a/Wino.Mail/Assets/Square150x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-100.png b/Wino.Mail/Assets/Square44x44Logo.scale-100.png
deleted file mode 100644
index 7432521d..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-125.png b/Wino.Mail/Assets/Square44x44Logo.scale-125.png
deleted file mode 100644
index fe38dbdf..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-150.png b/Wino.Mail/Assets/Square44x44Logo.scale-150.png
deleted file mode 100644
index 1ee950af..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-200.png b/Wino.Mail/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index 807e9ed4..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.scale-400.png b/Wino.Mail/Assets/Square44x44Logo.scale-400.png
deleted file mode 100644
index f4457476..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 9acb3cc8..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-16.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png
deleted file mode 100644
index c1e08a4f..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-24.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index 37f8decd..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-256.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png
deleted file mode 100644
index 93c856d9..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-32.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png b/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index a2ca3afc..00000000
Binary files a/Wino.Mail/Assets/Square44x44Logo.targetsize-48.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.backup.png b/Wino.Mail/Assets/StoreLogo.backup.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.backup.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-100.png b/Wino.Mail/Assets/StoreLogo.scale-100.png
deleted file mode 100644
index 4c4b4b34..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-125.png b/Wino.Mail/Assets/StoreLogo.scale-125.png
deleted file mode 100644
index 1c325127..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-150.png b/Wino.Mail/Assets/StoreLogo.scale-150.png
deleted file mode 100644
index bb194ef7..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-200.png b/Wino.Mail/Assets/StoreLogo.scale-200.png
deleted file mode 100644
index b77a5ddc..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/StoreLogo.scale-400.png b/Wino.Mail/Assets/StoreLogo.scale-400.png
deleted file mode 100644
index 8d0a133e..00000000
Binary files a/Wino.Mail/Assets/StoreLogo.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-100.png b/Wino.Mail/Assets/Wide310x150Logo.scale-100.png
deleted file mode 100644
index f330133d..00000000
Binary files a/Wino.Mail/Assets/Wide310x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-125.png b/Wino.Mail/Assets/Wide310x150Logo.scale-125.png
deleted file mode 100644
index e4656fa7..00000000
Binary files a/Wino.Mail/Assets/Wide310x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-150.png b/Wino.Mail/Assets/Wide310x150Logo.scale-150.png
deleted file mode 100644
index 884084b3..00000000
Binary files a/Wino.Mail/Assets/Wide310x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-200.png b/Wino.Mail/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/Wino.Mail/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Mail/Assets/Wide310x150Logo.scale-400.png b/Wino.Mail/Assets/Wide310x150Logo.scale-400.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/Wino.Mail/Assets/Wide310x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
deleted file mode 100644
index d2deb5cf..00000000
--- a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-using System.Collections;
-using System.Collections.Specialized;
-using System.Windows.Input;
-using CommunityToolkit.WinUI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Xaml.Interactivity;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Menus;
-using Wino.Core.UWP.Controls;
-using Wino.Helpers;
-
-namespace Wino.Behaviors;
-
-public partial class BindableCommandBarBehavior : Behavior<CommandBar>
-{
-    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
-    public static readonly DependencyProperty PrimaryCommandsProperty = DependencyProperty.Register(
-        "PrimaryCommands", typeof(object), typeof(BindableCommandBarBehavior),
-        new PropertyMetadata(null, UpdateCommands));
-
-    [GeneratedDependencyProperty]
-    public partial ICommand ItemClickedCommand { get; set; }
-
-    public object PrimaryCommands
-    {
-        get { return GetValue(PrimaryCommandsProperty); }
-        set { SetValue(PrimaryCommandsProperty, value); }
-    }
-
-    protected override void OnDetaching()
-    {
-        base.OnDetaching();
-
-        AttachChanges(false);
-
-        if (PrimaryCommands is IEnumerable enumerable)
-        {
-            foreach (var item in enumerable)
-            {
-                if (item is ButtonBase button)
-                {
-                    button.Click -= Button_Click;
-                }
-            }
-        }
-    }
-
-    private void UpdatePrimaryCommands()
-    {
-        if (AssociatedObject == null)
-            return;
-
-        if (PrimaryCommands == null)
-            return;
-
-        if (AssociatedObject.PrimaryCommands is IEnumerable enumerableObjects)
-        {
-            foreach (var item in enumerableObjects)
-            {
-                if (item is ButtonBase button)
-                {
-                    button.Click -= Button_Click;
-                }
-            }
-        }
-
-        if (AssociatedObject.SecondaryCommands is IEnumerable secondaryObject)
-        {
-            foreach (var item in secondaryObject)
-            {
-                if (item is ButtonBase button)
-                {
-                    button.Click -= Button_Click;
-                }
-            }
-        }
-
-        AssociatedObject.PrimaryCommands.Clear();
-        AssociatedObject.SecondaryCommands.Clear();
-
-        if (PrimaryCommands is not IEnumerable enumerable) return;
-
-        foreach (var command in enumerable)
-        {
-            if (command is MailOperationMenuItem mailOperationMenuItem)
-            {
-                ICommandBarElement menuItem = null;
-
-                if (mailOperationMenuItem.Operation == Core.Domain.Enums.MailOperation.Seperator)
-                {
-                    menuItem = new AppBarSeparator();
-                }
-                else
-                {
-                    var label = XamlHelpers.GetOperationString(mailOperationMenuItem.Operation);
-                    var labelPosition = string.IsNullOrWhiteSpace(label) || !_preferencesService.IsShowActionLabelsEnabled ?
-                        CommandBarLabelPosition.Collapsed : CommandBarLabelPosition.Default;
-                    menuItem = new AppBarButton
-                    {
-                        Width = double.NaN,
-                        MinWidth = 40,
-                        Icon = new WinoFontIcon() { Glyph = ControlConstants.WinoIconFontDictionary[XamlHelpers.GetWinoIconGlyph(mailOperationMenuItem.Operation)] },
-                        Label = label,
-                        LabelPosition = labelPosition,
-                        DataContext = mailOperationMenuItem,
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(label))
-                    {
-                        var toolTip = new ToolTip
-                        {
-                            Content = label
-                        };
-                        ToolTipService.SetToolTip((DependencyObject)menuItem, toolTip);
-                    }
-
-                    ((AppBarButton)menuItem).Click -= Button_Click;
-                    ((AppBarButton)menuItem).Click += Button_Click;
-                }
-
-                if (mailOperationMenuItem.IsSecondaryMenuPreferred)
-                {
-                    AssociatedObject.SecondaryCommands.Add(menuItem);
-                }
-                else
-                {
-                    AssociatedObject.PrimaryCommands.Add(menuItem);
-                }
-            }
-
-            //if (dependencyObject is ICommandBarElement icommandBarElement)
-            //{
-            //    if (dependencyObject is ButtonBase button)
-            //    {
-            //        button.Click -= Button_Click;
-            //        button.Click += Button_Click;
-            //    }
-
-            //    if (command is MailOperationMenuItem mailOperationMenuItem)
-            //    {
-
-            //    }
-            //}
-        }
-    }
-
-    private void Button_Click(object sender, RoutedEventArgs e)
-    {
-        ItemClickedCommand?.Execute(((ButtonBase)sender).DataContext);
-    }
-
-    protected override void OnAttached()
-    {
-        base.OnAttached();
-
-        AttachChanges(true);
-
-        UpdatePrimaryCommands();
-    }
-
-    private void PrimaryCommandsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-    {
-        UpdatePrimaryCommands();
-    }
-
-    private static void UpdateCommands(DependencyObject dependencyObject,
-        DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-    {
-        if (dependencyObject is not BindableCommandBarBehavior behavior) return;
-
-        if (dependencyPropertyChangedEventArgs.OldValue is INotifyCollectionChanged oldList)
-        {
-            oldList.CollectionChanged -= behavior.PrimaryCommandsCollectionChanged;
-        }
-
-        behavior.AttachChanges(true);
-        behavior.UpdatePrimaryCommands();
-    }
-
-    private void AttachChanges(bool register)
-    {
-        if (PrimaryCommands is null) return;
-
-        if (PrimaryCommands is INotifyCollectionChanged collectionChanged)
-        {
-            if (register)
-            {
-                collectionChanged.CollectionChanged -= PrimaryCommandsCollectionChanged;
-                collectionChanged.CollectionChanged += PrimaryCommandsCollectionChanged;
-            }
-            else
-                collectionChanged.CollectionChanged -= PrimaryCommandsCollectionChanged;
-        }
-    }
-}
diff --git a/Wino.Mail/Controls/Advanced/WinoListView.cs b/Wino.Mail/Controls/Advanced/WinoListView.cs
deleted file mode 100644
index eaa95c3a..00000000
--- a/Wino.Mail/Controls/Advanced/WinoListView.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using MoreLinq;
-using Serilog;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Extensions;
-using Wino.Mail.ViewModels.Data;
-using Wino.Mail.ViewModels.Messages;
-
-namespace Wino.Controls.Advanced;
-
-/// <summary>
-/// Custom ListView control that handles multiple selection with Extended/Multiple selection mode
-/// and supports threads.
-/// </summary>
-public partial class WinoListView : ListView, IDisposable
-{
-    private ILogger logger = Log.ForContext<WinoListView>();
-
-    private const string PART_ScrollViewer = "ScrollViewer";
-    private ScrollViewer internalScrollviewer;
-
-    /// <summary>
-    /// Gets or sets whether this ListView belongs to thread items.
-    /// This is important for detecting selected items etc.
-    /// </summary>
-    public bool IsThreadListView
-    {
-        get { return (bool)GetValue(IsThreadListViewProperty); }
-        set { SetValue(IsThreadListViewProperty, value); }
-    }
-
-    public ICommand ItemDeletedCommand
-    {
-        get { return (ICommand)GetValue(ItemDeletedCommandProperty); }
-        set { SetValue(ItemDeletedCommandProperty, value); }
-    }
-
-    public ICommand LoadMoreCommand
-    {
-        get { return (ICommand)GetValue(LoadMoreCommandProperty); }
-        set { SetValue(LoadMoreCommandProperty, value); }
-    }
-
-    public bool IsThreadScrollingEnabled
-    {
-        get { return (bool)GetValue(IsThreadScrollingEnabledProperty); }
-        set { SetValue(IsThreadScrollingEnabledProperty, value); }
-    }
-
-    public static readonly DependencyProperty IsThreadScrollingEnabledProperty = DependencyProperty.Register(nameof(IsThreadScrollingEnabled), typeof(bool), typeof(WinoListView), new PropertyMetadata(false));
-    public static readonly DependencyProperty LoadMoreCommandProperty = DependencyProperty.Register(nameof(LoadMoreCommand), typeof(ICommand), typeof(WinoListView), new PropertyMetadata(null));
-    public static readonly DependencyProperty IsThreadListViewProperty = DependencyProperty.Register(nameof(IsThreadListView), typeof(bool), typeof(WinoListView), new PropertyMetadata(false, new PropertyChangedCallback(OnIsThreadViewChanged)));
-    public static readonly DependencyProperty ItemDeletedCommandProperty = DependencyProperty.Register(nameof(ItemDeletedCommand), typeof(ICommand), typeof(WinoListView), new PropertyMetadata(null));
-
-    public WinoListView()
-    {
-        CanDragItems = true;
-        IsItemClickEnabled = true;
-        IsMultiSelectCheckBoxEnabled = true;
-        IsRightTapEnabled = true;
-        SelectionMode = ListViewSelectionMode.Extended;
-        ShowsScrollingPlaceholders = false;
-        SingleSelectionFollowsFocus = true;
-
-        DragItemsCompleted += ItemDragCompleted;
-        DragItemsStarting += ItemDragStarting;
-        SelectionChanged += SelectedItemsChanged;
-        ProcessKeyboardAccelerators += ProcessDelKey;
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        internalScrollviewer = GetTemplateChild(PART_ScrollViewer) as ScrollViewer;
-
-        if (internalScrollviewer == null)
-        {
-            logger.Warning("WinoListView does not have an internal ScrollViewer. Infinite scrolling behavior might be effected.");
-            return;
-        }
-
-        internalScrollviewer.ViewChanged -= InternalScrollVeiwerViewChanged;
-        internalScrollviewer.ViewChanged += InternalScrollVeiwerViewChanged;
-    }
-
-    private static void OnIsThreadViewChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoListView winoListView)
-        {
-            winoListView.AdjustThreadViewContainerVisuals();
-        }
-    }
-
-    private void AdjustThreadViewContainerVisuals()
-    {
-        if (IsThreadListView)
-        {
-            ItemContainerTransitions.Clear();
-        }
-    }
-
-    private double lastestRaisedOffset = 0;
-    private int lastItemSize = 0;
-
-    // TODO: This is buggy. Does not work all the time. Debug.
-
-    private void InternalScrollVeiwerViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
-    {
-        if (internalScrollviewer == null) return;
-
-        // No need to raise init request if there are no items in the list.
-        if (Items.Count == 0) return;
-
-        // If the scrolling is finished, check the current viewport height.
-        if (e.IsIntermediate)
-        {
-            var currentOffset = internalScrollviewer.VerticalOffset;
-            var maxOffset = internalScrollviewer.ScrollableHeight;
-
-            if (currentOffset + 10 >= maxOffset && lastestRaisedOffset != maxOffset && Items.Count != lastItemSize)
-            {
-                // We must load more.
-                lastestRaisedOffset = maxOffset;
-                lastItemSize = Items.Count;
-
-                LoadMoreCommand?.Execute(null);
-            }
-        }
-    }
-
-    private void ProcessDelKey(UIElement sender, Windows.UI.Xaml.Input.ProcessKeyboardAcceleratorEventArgs args)
-    {
-        if (args.Key == Windows.System.VirtualKey.Delete)
-        {
-            args.Handled = true;
-
-            ItemDeletedCommand?.Execute(MailOperation.SoftDelete);
-        }
-    }
-
-    private void ItemDragCompleted(ListViewBase sender, DragItemsCompletedEventArgs args)
-    {
-        if (args.Items.Any(a => a is MailItemViewModel))
-        {
-            args.Items.Cast<MailItemViewModel>().ForEach(a => a.IsCustomFocused = false);
-        }
-    }
-
-    private void ItemDragStarting(object sender, DragItemsStartingEventArgs args)
-    {
-        // Dragging multiple mails from different accounts/folders are supported with the condition below:
-        // All mails belongs to the drag will be matched on the dropped folder's account.
-        // Meaning that if users drag 1 mail from Account A/Inbox and 1 mail from Account B/Inbox,
-        // and drop to Account A/Inbox, the mail from Account B/Inbox will NOT be moved.
-
-        if (IsThreadListView)
-        {
-            var allItems = args.Items.Cast<MailItemViewModel>();
-
-            // Highlight all items
-            allItems.ForEach(a => a.IsCustomFocused = true);
-
-            // Set native drag arg properties.
-
-            var dragPackage = new MailDragPackage(allItems.Cast<IMailItem>());
-
-            args.Data.Properties.Add(nameof(MailDragPackage), dragPackage);
-        }
-        else
-        {
-            var dragPackage = new MailDragPackage(args.Items.Cast<IMailItem>());
-
-            args.Data.Properties.Add(nameof(MailDragPackage), dragPackage);
-        }
-    }
-
-    public void ChangeSelectionMode(ListViewSelectionMode selectionMode)
-    {
-        SelectionMode = selectionMode;
-
-        if (!IsThreadListView)
-        {
-            Items.Where(a => a is ThreadMailItemViewModel).Cast<ThreadMailItemViewModel>().ForEach(c =>
-            {
-                var threadListView = GetThreadInternalListView(c);
-
-                if (threadListView != null)
-                {
-                    threadListView.SelectionMode = selectionMode;
-                }
-            });
-        }
-    }
-
-    /// <summary>
-    /// Finds the container for given mail item and adds it to selected items.
-    /// </summary>
-    /// <param name="mailItemViewModel">Mail to be added to selected items.</param>
-    /// <returns>Whether selection was successful or not.</returns>
-    public bool SelectMailItemContainer(MailItemViewModel mailItemViewModel)
-    {
-        var itemContainer = ContainerFromItem(mailItemViewModel);
-
-        // This item might be in thread container.
-        if (itemContainer == null)
-        {
-            bool found = false;
-
-            Items.OfType<ThreadMailItemViewModel>().ForEach(c =>
-            {
-                if (!found)
-                {
-                    var threadListView = GetThreadInternalListView(c);
-
-                    if (threadListView != null)
-                        found = threadListView.SelectMailItemContainer(mailItemViewModel);
-                }
-            });
-
-            return found;
-        }
-
-        SelectedItems.Add(mailItemViewModel);
-        return true;
-    }
-
-    /// <summary>
-    /// Recursively clears all selections except the given mail.
-    /// </summary>
-    /// <param name="exceptViewModel">Exceptional mail item to be not unselected.</param>
-    /// <param name="preserveThreadExpanding">Whether expansion states of thread containers should stay as it is or not.</param>
-    public void ClearSelections(MailItemViewModel exceptViewModel = null, bool preserveThreadExpanding = false)
-    {
-        SelectedItems.Clear();
-
-        Items.Where(a => a is ThreadMailItemViewModel).Cast<ThreadMailItemViewModel>().ForEach(c =>
-        {
-            var threadListView = GetThreadInternalListView(c);
-
-            if (threadListView == null)
-                return;
-
-            if (exceptViewModel != null)
-            {
-                if (!threadListView.SelectedItems.Contains(exceptViewModel))
-                {
-                    if (!preserveThreadExpanding)
-                    {
-                        c.IsThreadExpanded = false;
-                    }
-
-                    threadListView.SelectedItems.Clear();
-                }
-            }
-            else
-            {
-                if (!preserveThreadExpanding)
-                {
-                    c.IsThreadExpanded = false;
-                }
-
-                threadListView.SelectedItems.Clear();
-            }
-        });
-    }
-
-    /// <summary>
-    /// Recursively selects all mails, including thread items.
-    /// </summary>
-    public void SelectAllWino()
-    {
-        SelectAll();
-
-        Items.Where(a => a is ThreadMailItemViewModel).Cast<ThreadMailItemViewModel>().ForEach(c =>
-        {
-            c.IsThreadExpanded = true;
-
-            var threadListView = GetThreadInternalListView(c);
-
-            threadListView?.SelectAll();
-        });
-    }
-
-    // SelectedItems changed.
-    private void SelectedItemsChanged(object sender, SelectionChangedEventArgs e)
-    {
-        if (e.RemovedItems != null)
-        {
-            foreach (var removedItem in e.RemovedItems)
-            {
-                if (removedItem is MailItemViewModel removedMailItemViewModel)
-                {
-                    // Mail item un-selected.
-
-                    removedMailItemViewModel.IsSelected = false;
-                    WeakReferenceMessenger.Default.Send(new MailItemSelectionRemovedEvent(removedMailItemViewModel));
-                }
-                else if (removedItem is ThreadMailItemViewModel removedThreadItemViewModel)
-                {
-                    removedThreadItemViewModel.IsThreadExpanded = false;
-                }
-            }
-        }
-
-        if (e.AddedItems != null)
-        {
-            foreach (var addedItem in e.AddedItems)
-            {
-                if (addedItem is MailItemViewModel addedMailItemViewModel)
-                {
-                    // Mail item selected.
-
-                    addedMailItemViewModel.IsSelected = true;
-
-                    WeakReferenceMessenger.Default.Send(new MailItemSelectedEvent(addedMailItemViewModel));
-                }
-                else if (addedItem is ThreadMailItemViewModel threadMailItemViewModel)
-                {
-                    if (IsThreadScrollingEnabled)
-                    {
-                        if (internalScrollviewer != null && ContainerFromItem(threadMailItemViewModel) is FrameworkElement threadFrameworkElement)
-                        {
-                            internalScrollviewer.ScrollToElement(threadFrameworkElement, true, true, bringToTopOrLeft: true);
-                        }
-                    }
-
-                    // Try to select first item.
-                    if (GetThreadInternalListView(threadMailItemViewModel) is WinoListView internalListView)
-                    {
-                        internalListView.SelectFirstItem();
-                    }
-                }
-            }
-        }
-
-        if (!IsThreadListView)
-        {
-            if (SelectionMode == ListViewSelectionMode.Extended && SelectedItems.Count == 1)
-            {
-                // Only 1 single item is selected in extended mode for main list view.
-                // We should un-select all thread items.
-
-                Items.Where(a => a is ThreadMailItemViewModel).Cast<ThreadMailItemViewModel>().ForEach(c =>
-                {
-                    // c.IsThreadExpanded = false;
-
-                    var threadListView = GetThreadInternalListView(c);
-
-                    threadListView?.SelectedItems.Clear();
-                });
-            }
-        }
-    }
-
-    public async void SelectFirstItem()
-    {
-        if (Items.Count > 0)
-        {
-            if (Items[0] is MailItemViewModel firstMailItemViewModel)
-            {
-                // Make sure the invisible container is realized.
-                await Task.Delay(250);
-
-                if (ContainerFromItem(firstMailItemViewModel) is ListViewItem firstItemContainer)
-                {
-                    firstItemContainer.IsSelected = true;
-                }
-
-                firstMailItemViewModel.IsSelected = true;
-            }
-        }
-    }
-
-    private WinoListView GetThreadInternalListView(ThreadMailItemViewModel threadMailItemViewModel)
-    {
-        var itemContainer = ContainerFromItem(threadMailItemViewModel);
-
-        if (itemContainer is ListViewItem listItem)
-        {
-            var expander = listItem.GetChildByName<WinoExpander>("ThreadExpander");
-
-            if (expander != null)
-                return expander.Content as WinoListView;
-        }
-
-        return null;
-    }
-
-    public void Dispose()
-    {
-        DragItemsCompleted -= ItemDragCompleted;
-        DragItemsStarting -= ItemDragStarting;
-        SelectionChanged -= SelectedItemsChanged;
-        ProcessKeyboardAccelerators -= ProcessDelKey;
-
-        if (internalScrollviewer != null)
-        {
-            internalScrollviewer.ViewChanged -= InternalScrollVeiwerViewChanged;
-        }
-
-        foreach (var item in Items)
-        {
-            if (item is ThreadMailItemViewModel threadMailItemViewModel)
-            {
-                var threadListView = GetThreadInternalListView(threadMailItemViewModel);
-                threadListView?.Dispose();
-            }
-        }
-    }
-}
diff --git a/Wino.Mail/Controls/ImagePreviewControl.cs b/Wino.Mail/Controls/ImagePreviewControl.cs
deleted file mode 100644
index 6037ecb9..00000000
--- a/Wino.Mail/Controls/ImagePreviewControl.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Fernandezja.ColorHashSharp;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
-using Windows.UI.Xaml.Shapes;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Controls;
-
-public partial class ImagePreviewControl : Control
-{
-    private const string PART_EllipseInitialsGrid = "EllipseInitialsGrid";
-    private const string PART_InitialsTextBlock = "InitialsTextBlock";
-    private const string PART_KnownHostImage = "KnownHostImage";
-    private const string PART_Ellipse = "Ellipse";
-    private const string PART_FaviconSquircle = "FaviconSquircle";
-    private const string PART_FaviconImage = "FaviconImage";
-
-    #region Dependency Properties
-
-    public static readonly DependencyProperty FromNameProperty = DependencyProperty.Register(nameof(FromName), typeof(string), typeof(ImagePreviewControl), new PropertyMetadata(string.Empty, OnInformationChanged));
-    public static readonly DependencyProperty FromAddressProperty = DependencyProperty.Register(nameof(FromAddress), typeof(string), typeof(ImagePreviewControl), new PropertyMetadata(string.Empty, OnInformationChanged));
-    public static readonly DependencyProperty SenderContactPictureProperty = DependencyProperty.Register(nameof(SenderContactPicture), typeof(string), typeof(ImagePreviewControl), new PropertyMetadata(string.Empty, new PropertyChangedCallback(OnInformationChanged)));
-    public static readonly DependencyProperty ThumbnailUpdatedEventProperty = DependencyProperty.Register(nameof(ThumbnailUpdatedEvent), typeof(bool), typeof(ImagePreviewControl), new PropertyMetadata(false, new PropertyChangedCallback(OnInformationChanged)));
-
-    public bool ThumbnailUpdatedEvent
-    {
-        get { return (bool)GetValue(ThumbnailUpdatedEventProperty); }
-        set { SetValue(ThumbnailUpdatedEventProperty, value); }
-    }
-
-    /// <summary>
-    /// Gets or sets base64 string of the sender contact picture.
-    /// </summary>
-    public string SenderContactPicture
-    {
-        get { return (string)GetValue(SenderContactPictureProperty); }
-        set { SetValue(SenderContactPictureProperty, value); }
-    }
-
-    public string FromName
-    {
-        get { return (string)GetValue(FromNameProperty); }
-        set { SetValue(FromNameProperty, value); }
-    }
-
-    public string FromAddress
-    {
-        get { return (string)GetValue(FromAddressProperty); }
-        set { SetValue(FromAddressProperty, value); }
-    }
-
-    #endregion
-
-    private Ellipse Ellipse;
-    private Grid InitialsGrid;
-    private TextBlock InitialsTextblock;
-    private Image KnownHostImage;
-    private Border FaviconSquircle;
-    private Image FaviconImage;
-    private CancellationTokenSource contactPictureLoadingCancellationTokenSource;
-
-    public ImagePreviewControl()
-    {
-        DefaultStyleKey = nameof(ImagePreviewControl);
-    }
-
-    protected override void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        InitialsGrid = GetTemplateChild(PART_EllipseInitialsGrid) as Grid;
-        InitialsTextblock = GetTemplateChild(PART_InitialsTextBlock) as TextBlock;
-        KnownHostImage = GetTemplateChild(PART_KnownHostImage) as Image;
-        Ellipse = GetTemplateChild(PART_Ellipse) as Ellipse;
-        FaviconSquircle = GetTemplateChild(PART_FaviconSquircle) as Border;
-        FaviconImage = GetTemplateChild(PART_FaviconImage) as Image;
-
-        UpdateInformation();
-    }
-
-    private static void OnInformationChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is ImagePreviewControl control)
-            control.UpdateInformation();
-    }
-
-    private async void UpdateInformation()
-    {
-        if ((KnownHostImage == null && FaviconSquircle == null) || InitialsGrid == null || InitialsTextblock == null || (string.IsNullOrEmpty(FromName) && string.IsNullOrEmpty(FromAddress)))
-            return;
-
-        // Cancel active image loading if exists.
-        if (!contactPictureLoadingCancellationTokenSource?.IsCancellationRequested ?? false)
-        {
-            contactPictureLoadingCancellationTokenSource.Cancel();
-        }
-
-        string contactPicture = SenderContactPicture;
-
-        var isAvatarThumbnail = false;
-
-        if (string.IsNullOrEmpty(contactPicture) && !string.IsNullOrEmpty(FromAddress))
-        {
-            contactPicture = await App.Current.ThumbnailService.GetThumbnailAsync(FromAddress);
-            isAvatarThumbnail = true;
-        }
-
-        if (!string.IsNullOrEmpty(contactPicture))
-        {
-            if (isAvatarThumbnail && FaviconSquircle != null && FaviconImage != null)
-            {
-                // Show favicon in squircle
-                FaviconSquircle.Visibility = Visibility.Visible;
-                InitialsGrid.Visibility = Visibility.Collapsed;
-                KnownHostImage.Visibility = Visibility.Collapsed;
-
-                var bitmapImage = await GetBitmapImageAsync(contactPicture);
-
-                if (bitmapImage != null)
-                {
-                    FaviconImage.Source = bitmapImage;
-                }
-            }
-            else
-            {
-                // Show normal avatar (tondo)
-                FaviconSquircle.Visibility = Visibility.Collapsed;
-                KnownHostImage.Visibility = Visibility.Collapsed;
-                InitialsGrid.Visibility = Visibility.Visible;
-                contactPictureLoadingCancellationTokenSource = new CancellationTokenSource();
-                try
-                {
-                    var brush = await GetContactImageBrushAsync(contactPicture);
-
-                    if (brush != null)
-                    {
-                        if (!contactPictureLoadingCancellationTokenSource?.Token.IsCancellationRequested ?? false)
-                        {
-                            Ellipse.Fill = brush;
-                            InitialsTextblock.Text = string.Empty;
-                        }
-                    }
-                }
-                catch (Exception)
-                {
-                    Debugger.Break();
-                }
-            }
-        }
-        else
-        {
-            FaviconSquircle.Visibility = Visibility.Collapsed;
-            KnownHostImage.Visibility = Visibility.Collapsed;
-            InitialsGrid.Visibility = Visibility.Visible;
-
-            var colorHash = new ColorHash();
-            var rgb = colorHash.Rgb(FromAddress);
-
-            Ellipse.Fill = new SolidColorBrush(Color.FromArgb(rgb.A, rgb.R, rgb.G, rgb.B));
-            InitialsTextblock.Text = ExtractInitialsFromName(FromName);
-        }
-    }
-
-    private static async Task<ImageBrush> GetContactImageBrushAsync(string base64)
-    {
-        // Load the image from base64 string.
-        
-        var bitmapImage = await GetBitmapImageAsync(base64);
-
-        if (bitmapImage == null) return null;
-
-        return new ImageBrush() { ImageSource = bitmapImage };
-    }
-
-    private static async Task<BitmapImage> GetBitmapImageAsync(string base64)
-    {
-        try
-        {
-            var bitmapImage = new BitmapImage();
-            var imageArray = Convert.FromBase64String(base64);
-            var imageStream = new MemoryStream(imageArray);
-            var randomAccessImageStream = imageStream.AsRandomAccessStream();
-            randomAccessImageStream.Seek(0);
-            await bitmapImage.SetSourceAsync(randomAccessImageStream);
-            return bitmapImage;
-        }
-        catch (Exception) { }
-
-        return null;
-    }
-
-    public string ExtractInitialsFromName(string name)
-    {
-        // Change from name to from address in case of name doesn't exists.
-        if (string.IsNullOrEmpty(name))
-        {
-            name = FromAddress;
-        }
-
-        // first remove all: punctuation, separator chars, control chars, and numbers (unicode style regexes)
-        string initials = Regex.Replace(name, @"[\p{P}\p{S}\p{C}\p{N}]+", "");
-
-        // Replacing all possible whitespace/separator characters (unicode style), with a single, regular ascii space.
-        initials = Regex.Replace(initials, @"\p{Z}+", " ");
-
-        // Remove all Sr, Jr, I, II, III, IV, V, VI, VII, VIII, IX at the end of names
-        initials = Regex.Replace(initials.Trim(), @"\s+(?:[JS]R|I{1,3}|I[VX]|VI{0,3})$", "", RegexOptions.IgnoreCase);
-
-        // Extract up to 2 initials from the remaining cleaned name.
-        initials = Regex.Replace(initials, @"^(\p{L})[^\s]*(?:\s+(?:\p{L}+\s+(?=\p{L}))?(?:(\p{L})\p{L}*)?)?$", "$1$2").Trim();
-
-        if (initials.Length > 2)
-        {
-            // Worst case scenario, everything failed, just grab the first two letters of what we have left.
-            initials = initials.Substring(0, 2);
-        }
-
-        return initials.ToUpperInvariant();
-    }
-}
diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
deleted file mode 100644
index 52fe43c6..00000000
--- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using System.Windows.Input;
-using CommunityToolkit.WinUI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Extensions;
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Controls;
-
-public sealed partial class MailItemDisplayInformationControl : UserControl
-{
-    public ImagePreviewControl GetImagePreviewControl() => ContactImage;
-
-    public bool IsRunningHoverAction { get; set; }
-
-    public static readonly DependencyProperty DisplayModeProperty = DependencyProperty.Register(nameof(DisplayMode), typeof(MailListDisplayMode), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailListDisplayMode.Spacious));
-    public static readonly DependencyProperty ShowPreviewTextProperty = DependencyProperty.Register(nameof(ShowPreviewText), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsCustomFocusedProperty = DependencyProperty.Register(nameof(IsCustomFocused), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsAvatarVisibleProperty = DependencyProperty.Register(nameof(IsAvatarVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsSubjectVisibleProperty = DependencyProperty.Register(nameof(IsSubjectVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty ConnectedExpanderProperty = DependencyProperty.Register(nameof(ConnectedExpander), typeof(WinoExpander), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty LeftHoverActionProperty = DependencyProperty.Register(nameof(LeftHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty CenterHoverActionProperty = DependencyProperty.Register(nameof(CenterHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty RightHoverActionProperty = DependencyProperty.Register(nameof(RightHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty HoverActionExecutedCommandProperty = DependencyProperty.Register(nameof(HoverActionExecutedCommand), typeof(ICommand), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty MailItemProperty = DependencyProperty.Register(nameof(MailItem), typeof(IMailItem), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null, new PropertyChangedCallback(OnMailItemChanged)));
-    public static readonly DependencyProperty IsHoverActionsEnabledProperty = DependencyProperty.Register(nameof(IsHoverActionsEnabled), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty Prefer24HourTimeFormatProperty = DependencyProperty.Register(nameof(Prefer24HourTimeFormat), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThreadExpanderVisibleProperty = DependencyProperty.Register(nameof(IsThreadExpanderVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThreadExpandedProperty = DependencyProperty.Register(nameof(IsThreadExpanded), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThumbnailUpdatedProperty = DependencyProperty.Register(nameof(IsThumbnailUpdated), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-
-    public bool IsThumbnailUpdated
-    {
-        get { return (bool)GetValue(IsThumbnailUpdatedProperty); }
-        set { SetValue(IsThumbnailUpdatedProperty, value); }
-    }
-
-    public bool IsThreadExpanded
-    {
-        get { return (bool)GetValue(IsThreadExpandedProperty); }
-        set { SetValue(IsThreadExpandedProperty, value); }
-    }
-
-    public bool IsThreadExpanderVisible
-    {
-        get { return (bool)GetValue(IsThreadExpanderVisibleProperty); }
-        set { SetValue(IsThreadExpanderVisibleProperty, value); }
-    }
-
-    public bool Prefer24HourTimeFormat
-    {
-        get { return (bool)GetValue(Prefer24HourTimeFormatProperty); }
-        set { SetValue(Prefer24HourTimeFormatProperty, value); }
-    }
-
-    public bool IsHoverActionsEnabled
-    {
-        get { return (bool)GetValue(IsHoverActionsEnabledProperty); }
-        set { SetValue(IsHoverActionsEnabledProperty, value); }
-    }
-
-    public IMailItem MailItem
-    {
-        get { return (IMailItem)GetValue(MailItemProperty); }
-        set { SetValue(MailItemProperty, value); }
-    }
-
-    public ICommand HoverActionExecutedCommand
-    {
-        get { return (ICommand)GetValue(HoverActionExecutedCommandProperty); }
-        set { SetValue(HoverActionExecutedCommandProperty, value); }
-    }
-
-    public MailOperation LeftHoverAction
-    {
-        get { return (MailOperation)GetValue(LeftHoverActionProperty); }
-        set { SetValue(LeftHoverActionProperty, value); }
-    }
-
-    public MailOperation CenterHoverAction
-    {
-        get { return (MailOperation)GetValue(CenterHoverActionProperty); }
-        set { SetValue(CenterHoverActionProperty, value); }
-    }
-
-    public MailOperation RightHoverAction
-    {
-        get { return (MailOperation)GetValue(RightHoverActionProperty); }
-        set { SetValue(RightHoverActionProperty, value); }
-    }
-
-    public WinoExpander ConnectedExpander
-    {
-        get { return (WinoExpander)GetValue(ConnectedExpanderProperty); }
-        set { SetValue(ConnectedExpanderProperty, value); }
-    }
-
-    public bool IsSubjectVisible
-    {
-        get { return (bool)GetValue(IsSubjectVisibleProperty); }
-        set { SetValue(IsSubjectVisibleProperty, value); }
-    }
-
-    public bool IsAvatarVisible
-    {
-        get { return (bool)GetValue(IsAvatarVisibleProperty); }
-        set { SetValue(IsAvatarVisibleProperty, value); }
-    }
-
-    public bool IsCustomFocused
-    {
-        get { return (bool)GetValue(IsCustomFocusedProperty); }
-        set { SetValue(IsCustomFocusedProperty, value); }
-    }
-
-    public bool ShowPreviewText
-    {
-        get { return (bool)GetValue(ShowPreviewTextProperty); }
-        set { SetValue(ShowPreviewTextProperty, value); }
-    }
-
-    public MailListDisplayMode DisplayMode
-    {
-        get { return (MailListDisplayMode)GetValue(DisplayModeProperty); }
-        set { SetValue(DisplayModeProperty, value); }
-    }
-
-    public MailItemDisplayInformationControl()
-    {
-        this.InitializeComponent();
-
-        var compositor = this.Visual().Compositor;
-
-        var leftBackgroundVisual = compositor.CreateSpriteVisual();
-        RootContainerVisualWrapper.SetChildVisual(leftBackgroundVisual);
-        MainContentContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
-
-        RootContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
-        ContentGrid.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
-        ContentStackpanel.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
-        IconsContainer.EnableImplicitAnimation(VisualPropertyType.Offset, 400);
-
-        RootContainerVisualWrapper.SizeChanged += (s, e) => leftBackgroundVisual.Size = e.NewSize.ToVector2();
-    }
-
-    private static void OnMailItemChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is MailItemDisplayInformationControl control)
-        {
-            control.UpdateInformation();
-        }
-    }
-
-    private void UpdateInformation()
-    {
-        if (MailItem == null) return;
-
-        TitleText.Text = string.IsNullOrWhiteSpace(MailItem.Subject) ? Translator.MailItemNoSubject : MailItem.Subject;
-    }
-
-    private void ControlPointerEntered(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        if (IsHoverActionsEnabled)
-        {
-            HoverActionButtons.Visibility = Visibility.Visible;
-            UnreadContainer.Visibility = Visibility.Collapsed;
-        }
-    }
-
-    private void ControlPointerExited(object sender, Windows.UI.Xaml.Input.PointerRoutedEventArgs e)
-    {
-        if (IsHoverActionsEnabled)
-        {
-            HoverActionButtons.Visibility = Visibility.Collapsed;
-            UnreadContainer.Visibility = Visibility.Visible;
-        }
-    }
-
-    private void ExecuteHoverAction(MailOperation operation)
-    {
-        IsRunningHoverAction = true;
-
-        MailOperationPreperationRequest package = null;
-
-        if (MailItem is MailCopy mailCopy)
-            package = new MailOperationPreperationRequest(operation, mailCopy, toggleExecution: true);
-        else if (MailItem is ThreadMailItemViewModel threadMailItemViewModel)
-            package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.GetMailCopies(), toggleExecution: true);
-        else if (MailItem is ThreadMailItem threadMailItem)
-            package = new MailOperationPreperationRequest(operation, threadMailItem.ThreadItems.Cast<MailItemViewModel>().Select(a => a.MailCopy), toggleExecution: true);
-
-        if (package == null) return;
-
-        HoverActionExecutedCommand?.Execute(package);
-    }
-
-    private void FirstActionClicked(object sender, RoutedEventArgs e)
-    {
-        ExecuteHoverAction(LeftHoverAction);
-    }
-
-    private void SecondActionClicked(object sender, RoutedEventArgs e)
-    {
-        ExecuteHoverAction(CenterHoverAction);
-    }
-
-    private void ThirdActionClicked(object sender, RoutedEventArgs e)
-    {
-        ExecuteHoverAction(RightHoverAction);
-    }
-}
diff --git a/Wino.Mail/Controls/WebViewEditorControl.cs b/Wino.Mail/Controls/WebViewEditorControl.cs
deleted file mode 100644
index b7c5b75c..00000000
--- a/Wino.Mail/Controls/WebViewEditorControl.cs
+++ /dev/null
@@ -1,357 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Threading.Tasks;
-using CommunityToolkit.WinUI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.Web.WebView2.Core;
-using Windows.UI.ViewManagement.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models;
-using Wino.Core.Domain.Models.Reader;
-using Wino.Core.UWP;
-using Wino.Core.UWP.Extensions;
-
-namespace Wino.Mail.Controls;
-public sealed partial class WebViewEditorControl : Control, IDisposable
-{
-    private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>();
-    private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>();
-    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorDarkMode { get; set; }
-    async partial void OnIsEditorDarkModeChanged(bool newValue)
-    {
-        await UpdateEditorThemeAsync();
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorBold { get; set; }
-    private bool _isEditorBoldInternal;
-    async partial void OnIsEditorBoldChanged(bool newValue)
-    {
-        if (newValue != _isEditorBoldInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("bold", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorItalic { get; set; }
-    private bool _isEditorItalicInternal;
-    async partial void OnIsEditorItalicChanged(bool newValue)
-    {
-        if (newValue != _isEditorItalicInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("italic", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorUnderline { get; set; }
-    private bool _isEditorUnderlineInternal;
-    async partial void OnIsEditorUnderlineChanged(bool newValue)
-    {
-        if (newValue != _isEditorUnderlineInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("underline", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorStrikethrough { get; set; }
-    private bool _isEditorStrikethroughInternal;
-    async partial void OnIsEditorStrikethroughChanged(bool newValue)
-    {
-        if (newValue != _isEditorStrikethroughInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("strikethrough", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorOl { get; set; }
-    private bool _isEditorOlInternal;
-    async partial void OnIsEditorOlChanged(bool newValue)
-    {
-        if (newValue != _isEditorOlInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("insertorderedlist", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorUl { get; set; }
-    private bool _isEditorUlInternal;
-    async partial void OnIsEditorUlChanged(bool newValue)
-    {
-        if (newValue != _isEditorUlInternal)
-        {
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("insertunorderedlist", BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty(DefaultValue = true)]
-    public partial bool IsEditorIndentEnabled { get; private set; }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorOutdentEnabled { get; private set; }
-
-    [GeneratedDependencyProperty]
-    public partial int EditorAlignmentSelectedIndex { get; set; }
-    private int _editorAlignmentSelectedIndexInternal;
-    async partial void OnEditorAlignmentSelectedIndexChanged(int newValue)
-    {
-        if (newValue != _editorAlignmentSelectedIndexInternal)
-        {
-            var alignmentAction = newValue switch
-            {
-                0 => "justifyleft",
-                1 => "justifycenter",
-                2 => "justifyright",
-                3 => "justifyfull",
-                _ => throw new ArgumentOutOfRangeException(nameof(newValue))
-            };
-
-            await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize(alignmentAction, BasicTypesJsonContext.Default.String));
-        }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool IsEditorWebViewEditor { get; set; }
-
-    async partial void OnIsEditorWebViewEditorChanged(bool newValue)
-    {
-        await _chromium.ExecuteScriptFunctionSafeAsync("toggleToolbar", JsonSerializer.Serialize(newValue, BasicTypesJsonContext.Default.Boolean));
-    }
-
-    private const string PART_WebView = "WebView";
-    private WebView2 _chromium;
-    private bool _disposedValue;
-    private readonly TaskCompletionSource<bool> _domLoadedTask = new();
-
-    public WebViewEditorControl()
-    {
-        this.DefaultStyleKey = typeof(WebViewEditorControl);
-
-        IsEditorDarkMode = WinoApplication.Current.UnderlyingThemeService.IsUnderlyingThemeDark();
-    }
-
-    protected override async void OnApplyTemplate()
-    {
-        base.OnApplyTemplate();
-
-        _chromium = GetTemplateChild(PART_WebView) as WebView2;
-
-        await InitializeComponent();
-    }
-
-    private async Task InitializeComponent()
-    {
-        Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
-        Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation");
-        _chromium.CoreWebView2Initialized += ChromiumInitialized;
-
-        await _chromium.EnsureCoreWebView2Async();
-    }
-
-    public async void EditorIndentAsync()
-    {
-        await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("indent", BasicTypesJsonContext.Default.String));
-    }
-
-    public async void EditorOutdentAsync()
-    {
-        await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("outdent", BasicTypesJsonContext.Default.String));
-    }
-
-    public void ToggleEditorTheme()
-    {
-        IsEditorDarkMode = !IsEditorDarkMode;
-    }
-
-    public async Task<string> GetHtmlBodyAsync()
-    {
-        var editorContent = await _chromium.ExecuteScriptFunctionSafeAsync("GetHTMLContent");
-
-        return JsonSerializer.Deserialize(editorContent, BasicTypesJsonContext.Default.String);
-    }
-
-    public async void ShowImagePicker()
-    {
-        await _chromium.ExecuteScriptFunctionSafeAsync("imageInput.click");
-    }
-
-    public async Task InsertImagesAsync(List<ImageInfo> images)
-    {
-        await _chromium.ExecuteScriptFunctionSafeAsync("insertImages", JsonSerializer.Serialize(images, DomainModelsJsonContext.Default.ListImageInfo));
-    }
-
-    public async void ShowEmojiPicker()
-    {
-        CoreInputView.GetForCurrentView().TryShow(CoreInputViewKind.Emoji);
-
-        await FocusEditorAsync(focusControlAsWell: true);
-    }
-
-    public WebView2 GetUnderlyingWebView() => _chromium;
-
-    public async Task RenderHtmlAsync(string htmlBody)
-    {
-        await _domLoadedTask.Task;
-
-        await UpdateEditorThemeAsync();
-        await InitializeEditorAsync();
-
-        await _chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(string.IsNullOrEmpty(htmlBody) ? " " : htmlBody, BasicTypesJsonContext.Default.String));
-    }
-
-    private async Task<string> InitializeEditorAsync()
-    {
-        var fonts = _fontService.GetFonts();
-        var composerFont = _preferencesService.ComposerFont;
-        int composerFontSize = _preferencesService.ComposerFontSize;
-        var readerFont = _preferencesService.ReaderFont;
-        int readerFontSize = _preferencesService.ReaderFontSize;
-        return await _chromium.ExecuteScriptFunctionAsync("initializeJodit", false,
-            JsonSerializer.Serialize(fonts, BasicTypesJsonContext.Default.ListString),
-            JsonSerializer.Serialize(composerFont, BasicTypesJsonContext.Default.String),
-            JsonSerializer.Serialize(composerFontSize, BasicTypesJsonContext.Default.Int32),
-            JsonSerializer.Serialize(readerFont, BasicTypesJsonContext.Default.String),
-            JsonSerializer.Serialize(readerFontSize, BasicTypesJsonContext.Default.Int32));
-    }
-
-    private async void ChromiumInitialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
-    {
-        var editorBundlePath = (await _nativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
-
-        _chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.editor", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
-        _chromium.Source = new Uri("https://app.editor/editor.html");
-
-        _chromium.CoreWebView2.DOMContentLoaded += DomLoaded;
-
-        _chromium.CoreWebView2.WebMessageReceived += ScriptMessageReceived;
-    }
-
-    public async Task UpdateEditorThemeAsync()
-    {
-        await _domLoadedTask.Task;
-
-        if (IsEditorDarkMode)
-        {
-            _chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
-            await _chromium.ExecuteScriptFunctionSafeAsync("SetDarkEditor");
-        }
-        else
-        {
-            _chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
-            await _chromium.ExecuteScriptFunctionSafeAsync("SetLightEditor");
-        }
-    }
-
-    /// <summary>
-    /// Places the cursor in the composer.
-    /// </summary>
-    /// <param name="focusControlAsWell">Whether control itself should be focused as well or not.</param>
-    public async Task FocusEditorAsync(bool focusControlAsWell)
-    {
-        await _chromium.ExecuteScriptSafeAsync("editor.selection.setCursorIn(editor.editor.firstChild, true)");
-
-        if (focusControlAsWell)
-        {
-            _chromium.Focus(FocusState.Keyboard);
-            _chromium.Focus(FocusState.Programmatic);
-        }
-    }
-
-    private void ScriptMessageReceived(CoreWebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
-    {
-        var change = JsonSerializer.Deserialize(args.WebMessageAsJson, DomainModelsJsonContext.Default.WebViewMessage);
-
-        if (change.Type == "bold")
-        {
-            _isEditorBoldInternal = change.Value == "true";
-            IsEditorBold = _isEditorBoldInternal;
-        }
-        else if (change.Type == "italic")
-        {
-            _isEditorItalicInternal = change.Value == "true";
-            IsEditorItalic = _isEditorItalicInternal;
-        }
-        else if (change.Type == "underline")
-        {
-            _isEditorUnderlineInternal = change.Value == "true";
-            IsEditorUnderline = _isEditorUnderlineInternal;
-        }
-        else if (change.Type == "strikethrough")
-        {
-            _isEditorStrikethroughInternal = change.Value == "true";
-            IsEditorStrikethrough = _isEditorStrikethroughInternal;
-        }
-        else if (change.Type == "ol")
-        {
-            _isEditorOlInternal = change.Value == "true";
-            IsEditorOl = _isEditorOlInternal;
-        }
-        else if (change.Type == "ul")
-        {
-            _isEditorUlInternal = change.Value == "true";
-            IsEditorUl = _isEditorUlInternal;
-        }
-        else if (change.Type == "indent")
-        {
-            IsEditorIndentEnabled = change.Value != "disabled";
-        }
-        else if (change.Type == "outdent")
-        {
-            IsEditorOutdentEnabled = change.Value != "disabled";
-        }
-        else if (change.Type == "alignment")
-        {
-            var parsedValue = change.Value switch
-            {
-                "jodit-icon_left" => 0,
-                "jodit-icon_center" => 1,
-                "jodit-icon_right" => 2,
-                "jodit-icon_justify" => 3,
-                _ => 0
-            };
-            _editorAlignmentSelectedIndexInternal = parsedValue;
-            EditorAlignmentSelectedIndex = _editorAlignmentSelectedIndexInternal;
-        }
-    }
-
-    private void DomLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => _domLoadedTask.TrySetResult(true);
-
-    private void Dispose(bool disposing)
-    {
-        if (!_disposedValue)
-        {
-            if (disposing && _chromium != null)
-            {
-                _chromium.CoreWebView2Initialized -= ChromiumInitialized;
-
-                if (_chromium.CoreWebView2 != null)
-                {
-                    _chromium.CoreWebView2.DOMContentLoaded -= DomLoaded;
-                    _chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
-                }
-
-                _chromium.Close();
-            }
-            _disposedValue = true;
-        }
-    }
-
-    public void Dispose()
-    {
-        // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
-}
diff --git a/Wino.Mail/Controls/WinoSwipeControlItems.cs b/Wino.Mail/Controls/WinoSwipeControlItems.cs
deleted file mode 100644
index 3803390e..00000000
--- a/Wino.Mail/Controls/WinoSwipeControlItems.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Linq;
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Helpers;
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Controls;
-
-public partial class WinoSwipeControlItems : SwipeItems
-{
-    public static readonly DependencyProperty SwipeOperationProperty = DependencyProperty.Register(nameof(SwipeOperation), typeof(MailOperation), typeof(WinoSwipeControlItems), new PropertyMetadata(default(MailOperation), new PropertyChangedCallback(OnItemsChanged)));
-    public static readonly DependencyProperty MailItemProperty = DependencyProperty.Register(nameof(MailItem), typeof(IMailItem), typeof(WinoSwipeControlItems), new PropertyMetadata(null));
-
-    public IMailItem MailItem
-    {
-        get { return (IMailItem)GetValue(MailItemProperty); }
-        set { SetValue(MailItemProperty, value); }
-    }
-
-
-    public MailOperation SwipeOperation
-    {
-        get { return (MailOperation)GetValue(SwipeOperationProperty); }
-        set { SetValue(SwipeOperationProperty, value); }
-    }
-
-    private static void OnItemsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is WinoSwipeControlItems control)
-        {
-            control.BuildSwipeItems();
-        }
-    }
-
-    private void BuildSwipeItems()
-    {
-        this.Clear();
-
-        var swipeItem = GetSwipeItem(SwipeOperation);
-
-        this.Add(swipeItem);
-    }
-
-    private SwipeItem GetSwipeItem(MailOperation operation)
-    {
-        if (MailItem == null) return null;
-
-        var finalOperation = operation;
-
-        bool isSingleItem = MailItem is MailItemViewModel;
-
-        if (isSingleItem)
-        {
-            var singleItem = MailItem as MailItemViewModel;
-
-            if (operation == MailOperation.MarkAsRead && singleItem.IsRead)
-                finalOperation = MailOperation.MarkAsUnread;
-            else if (operation == MailOperation.MarkAsUnread && !singleItem.IsRead)
-                finalOperation = MailOperation.MarkAsRead;
-        }
-        else
-        {
-            var threadItem = MailItem as ThreadMailItemViewModel;
-
-            if (operation == MailOperation.MarkAsRead && threadItem.ThreadItems.All(a => a.IsRead))
-                finalOperation = MailOperation.MarkAsUnread;
-            else if (operation == MailOperation.MarkAsUnread && threadItem.ThreadItems.All(a => !a.IsRead))
-                finalOperation = MailOperation.MarkAsRead;
-        }
-
-        var item = new SwipeItem()
-        {
-            IconSource = new WinoFontIconSource() { Icon = XamlHelpers.GetWinoIconGlyph(finalOperation) },
-            Text = XamlHelpers.GetOperationString(finalOperation),
-        };
-
-        return item;
-    }
-}
diff --git a/Wino.Mail/Dialogs/AccountReorderDialog.xaml b/Wino.Mail/Dialogs/AccountReorderDialog.xaml
deleted file mode 100644
index ed0ede20..00000000
--- a/Wino.Mail/Dialogs/AccountReorderDialog.xaml
+++ /dev/null
@@ -1,85 +0,0 @@
-<ContentDialog
-    x:Class="Wino.Dialogs.AccountReorderDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
-    xmlns:local="using:Wino.Dialogs"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:selectors="using:Wino.Selectors"
-    Title="Reorder Accounts"
-    Closed="DialogClosed"
-    DefaultButton="Secondary"
-    Opened="DialogOpened"
-    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
-    Style="{StaticResource WinoDialogStyle}"
-    mc:Ignorable="d">
-
-    <ContentDialog.Resources>
-        <DataTemplate x:Key="RootAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
-            <Grid Padding="12" ColumnSpacing="24">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <coreControls:WinoFontIcon
-                    Grid.RowSpan="2"
-                    VerticalAlignment="Center"
-                    FontSize="24"
-                    Icon="{x:Bind helpers:XamlHelpers.GetProviderIcon(ProviderDetail.Type, ProviderDetail.SpecialImapProvider)}" />
-                <TextBlock
-                    Grid.Column="1"
-                    FontWeight="SemiBold"
-                    Text="{x:Bind StartupEntityTitle}" />
-                <TextBlock
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Text="{x:Bind StartupEntityAddresses}" />
-            </Grid>
-        </DataTemplate>
-        <DataTemplate x:Key="MergedAccountReorderTemplate" x:DataType="interfaces:IAccountProviderDetailViewModel">
-            <Grid Padding="12" ColumnSpacing="24">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <PathIcon
-                    Grid.RowSpan="2"
-                    VerticalAlignment="Center"
-                    Data="F1 M 8.613281 17.5 C 8.75 17.942709 8.945312 18.359375 9.199219 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 6.572266 C 18.580729 6.344402 18.390299 6.132813 18.178711 5.9375 C 17.967121 5.742188 17.740885 5.566407 17.5 5.410156 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.619141 2.5 4.303385 2.568359 4.003906 2.705078 C 3.704427 2.841797 3.44401 3.02409 3.222656 3.251953 C 3.001302 3.479818 2.825521 3.745117 2.695312 4.047852 C 2.565104 4.350587 2.5 4.66797 2.5 5 L 13.310547 5 C 12.60091 5.266928 11.998697 5.683594 11.503906 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.38737 2.568359 15.704753 2.705078 16.000977 C 2.841797 16.297201 3.024088 16.55599 3.251953 16.777344 C 3.479818 16.998697 3.745117 17.174479 4.047852 17.304688 C 4.350586 17.434896 4.667969 17.5 5 17.5 Z M 18.125 9.443359 C 18.125 9.866537 18.040363 10.263672 17.871094 10.634766 C 17.701822 11.005859 17.473957 11.329753 17.1875 11.606445 C 16.901041 11.883139 16.56901 12.101237 16.191406 12.260742 C 15.813802 12.420248 15.416666 12.5 15 12.5 C 14.563802 12.5 14.1569 12.41862 13.779297 12.255859 C 13.401691 12.0931 13.071288 11.870117 12.788086 11.586914 C 12.504882 11.303711 12.2819 10.973308 12.119141 10.595703 C 11.95638 10.2181 11.875 9.811198 11.875 9.375 C 11.875 8.938803 11.95638 8.531901 12.119141 8.154297 C 12.2819 7.776693 12.504882 7.446289 12.788086 7.163086 C 13.071288 6.879883 13.401691 6.656901 13.779297 6.494141 C 14.1569 6.331381 14.563802 6.25 15 6.25 C 15.449218 6.25 15.864257 6.333008 16.245117 6.499023 C 16.625977 6.665039 16.956379 6.892904 17.236328 7.182617 C 17.516275 7.472331 17.734375 7.810873 17.890625 8.198242 C 18.046875 8.585612 18.125 9.000651 18.125 9.443359 Z M 20 16.25 C 20 16.666666 19.926758 17.049154 19.780273 17.397461 C 19.633789 17.745768 19.435221 18.058268 19.18457 18.334961 C 18.933918 18.611654 18.642578 18.854166 18.310547 19.0625 C 17.978516 19.270834 17.626953 19.444986 17.255859 19.584961 C 16.884766 19.724936 16.505533 19.829102 16.118164 19.897461 C 15.730794 19.96582 15.358072 20 15 20 C 14.654947 20 14.291992 19.96582 13.911133 19.897461 C 13.530273 19.829102 13.154297 19.726562 12.783203 19.589844 C 12.412109 19.453125 12.058919 19.282227 11.723633 19.077148 C 11.388346 18.87207 11.092122 18.632812 10.834961 18.359375 C 10.577799 18.085938 10.374349 17.779947 10.224609 17.441406 C 10.074869 17.102865 10 16.731771 10 16.328125 L 10 15.78125 C 10 15.501303 10.052083 15.237631 10.15625 14.990234 C 10.260416 14.742839 10.405273 14.526367 10.59082 14.34082 C 10.776367 14.155273 10.991211 14.010417 11.235352 13.90625 C 11.479492 13.802084 11.744791 13.75 12.03125 13.75 L 17.96875 13.75 C 18.248697 13.75 18.512369 13.803711 18.759766 13.911133 C 19.00716 14.018555 19.222004 14.163412 19.404297 14.345703 C 19.586588 14.527995 19.731445 14.742839 19.838867 14.990234 C 19.946289 15.237631 20 15.501303 20 15.78125 Z " />
-                <TextBlock
-                    Grid.Column="1"
-                    FontWeight="SemiBold"
-                    Text="{x:Bind StartupEntityTitle}" />
-                <TextBlock
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Text="{x:Bind StartupEntityAddresses}" />
-            </Grid>
-        </DataTemplate>
-
-        <selectors:AccountReorderTemplateSelector
-            x:Key="AccountReorderTemplateSelector"
-            MergedAccountReorderTemplate="{StaticResource MergedAccountReorderTemplate}"
-            RootAccountReorderTemplate="{StaticResource RootAccountReorderTemplate}" />
-    </ContentDialog.Resources>
-
-    <ListView
-        AllowDrop="True"
-        CanReorderItems="True"
-        ItemTemplateSelector="{StaticResource AccountReorderTemplateSelector}"
-        ItemsSource="{x:Bind Accounts}"
-        SelectionMode="None" />
-</ContentDialog>
diff --git a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml
deleted file mode 100644
index f161ddd3..00000000
--- a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<ContentDialog
-    x:Class="Wino.Dialogs.NewImapSetupDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Wino.Dialogs"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Closed="ImapSetupDialogClosed"
-    Closing="OnDialogClosing"
-    DefaultButton="Secondary"
-    FullSizeDesired="False"
-    Opened="ImapSetupDialogOpened"
-    Style="{StaticResource WinoDialogStyle}"
-    mc:Ignorable="d">
-
-    <ContentDialog.Resources>
-        <Thickness x:Key="ContentDialogPadding">0,0,0,0</Thickness>
-        <!--<x:Double x:Key="ContentDialogMinWidth">768</x:Double>-->
-        <x:Double x:Key="ContentDialogMaxWidth">1920</x:Double>
-        <!--<x:Double x:Key="ContentDialogMinHeight">768</x:Double>
-        <x:Double x:Key="ContentDialogMaxHeight">2000</x:Double>-->
-    </ContentDialog.Resources>
-
-    <Frame x:Name="ImapFrame" />
-</ContentDialog>
diff --git a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs b/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
deleted file mode 100644
index e2cf46f3..00000000
--- a/Wino.Mail/Dialogs/NewImapSetupDialog.xaml.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Accounts;
-using Wino.Messaging.Client.Mails;
-using Wino.Views.ImapSetup;
-
-namespace Wino.Dialogs;
-
-public enum ImapSetupState
-{
-    Welcome,
-    AutoDiscovery,
-    TestingConnection,
-    PreparingFolder
-}
-
-public sealed partial class NewImapSetupDialog : ContentDialog,
-    IRecipient<ImapSetupNavigationRequested>,
-    IRecipient<ImapSetupBackNavigationRequested>,
-    IRecipient<ImapSetupDismissRequested>,
-    IImapAccountCreationDialog
-{
-    private TaskCompletionSource<CustomServerInformation> _getServerInfoTaskCompletionSource = new TaskCompletionSource<CustomServerInformation>();
-    private TaskCompletionSource<bool> dialogOpened = new TaskCompletionSource<bool>();
-    private bool isDismissRequested = false;
-
-    public NewImapSetupDialog()
-    {
-        InitializeComponent();
-    }
-
-    // Not used for now.
-    public AccountCreationDialogState State { get; set; }
-
-    public void Complete(bool cancel)
-    {
-        if (!_getServerInfoTaskCompletionSource.Task.IsCompleted)
-            _getServerInfoTaskCompletionSource.TrySetResult(null);
-
-        isDismissRequested = true;
-
-        Hide();
-    }
-
-    public Task<CustomServerInformation> GetCustomServerInformationAsync() => _getServerInfoTaskCompletionSource.Task;
-
-    public async void Receive(ImapSetupBackNavigationRequested message)
-    {
-        // Frame go back
-        if (message.PageType == null)
-        {
-            if (ImapFrame.CanGoBack)
-            {
-                // Go back using Dispatcher to allow navigations in OnNavigatedTo.
-                await Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
-                {
-                    ImapFrame.GoBack();
-                });
-            }
-        }
-        else
-        {
-            ImapFrame.Navigate(message.PageType, message.Parameter, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromLeft });
-        }
-    }
-
-    public void Receive(ImapSetupNavigationRequested message)
-    {
-        ImapFrame.Navigate(message.PageType, message.Parameter, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
-    }
-
-    public void Receive(ImapSetupDismissRequested message) => _getServerInfoTaskCompletionSource.TrySetResult(message.CompletedServerInformation);
-
-    public async Task ShowDialogAsync(CancellationTokenSource cancellationTokenSource)
-    {
-        Opened += DialogOpened;
-
-        _ = ShowAsync();
-
-        await dialogOpened.Task;
-    }
-
-    private void DialogOpened(ContentDialog sender, ContentDialogOpenedEventArgs args)
-    {
-        Opened -= DialogOpened;
-
-        dialogOpened?.SetResult(true);
-    }
-
-    public void ShowPreparingFolders()
-    {
-        ImapFrame.Navigate(typeof(PreparingImapFoldersPage), new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromLeft });
-    }
-
-    public void StartImapConnectionSetup(MailAccount account) => ImapFrame.Navigate(typeof(WelcomeImapSetupPage), account, new DrillInNavigationTransitionInfo());
-    public void StartImapConnectionSetup(AccountCreationDialogResult accountCreationDialogResult) => ImapFrame.Navigate(typeof(WelcomeImapSetupPage), accountCreationDialogResult, new DrillInNavigationTransitionInfo());
-
-    private void ImapSetupDialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args) => WeakReferenceMessenger.Default.UnregisterAll(this);
-
-    private void ImapSetupDialogOpened(ContentDialog sender, ContentDialogOpenedEventArgs args) => WeakReferenceMessenger.Default.RegisterAll(this);
-
-    // Don't hide the dialog unless dismiss is requested from the inner pages specifically.
-    private void OnDialogClosing(ContentDialog sender, ContentDialogClosingEventArgs args) => args.Cancel = !isDismissRequested;
-}
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
deleted file mode 100644
index 774c0e72..00000000
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
+++ /dev/null
@@ -1,266 +0,0 @@
-<ContentDialog
-    x:Class="Wino.Dialogs.SignatureEditorDialog"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
-    xmlns:controls="using:Wino.Controls"
-    xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:controls2="using:Wino.Mail.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    Title="{x:Bind domain:Translator.SignatureEditorDialog_Title}"
-    HorizontalContentAlignment="Stretch"
-    Closed="DialogClosed"
-    DefaultButton="Primary"
-    IsPrimaryButtonEnabled="False"
-    Opened="SignatureDialogOpened"
-    PrimaryButtonClick="SaveClicked"
-    PrimaryButtonText="{x:Bind domain:Translator.Buttons_Save}"
-    SecondaryButtonClick="CancelClicked"
-    SecondaryButtonText="{x:Bind domain:Translator.Buttons_Cancel}"
-    Style="{StaticResource WinoDialogStyle}"
-    mc:Ignorable="d">
-
-    <ContentDialog.Resources>
-        <x:Double x:Key="ContentDialogMaxWidth">1200</x:Double>
-    </ContentDialog.Resources>
-
-    <Grid Margin="0,20,0,0" RowSpacing="30">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" MaxHeight="400" />
-        </Grid.RowDefinitions>
-
-        <TextBox
-            x:Name="SignatureNameTextBox"
-            MinWidth="300"
-            MaxWidth="500"
-            HorizontalAlignment="Left"
-            PlaceholderText="{x:Bind domain:Translator.SignatureEditorDialog_SignatureName_Placeholder}"
-            TextChanged="SignatureNameTextBoxTextChanged" />
-
-        <Grid Grid.Row="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="300" />
-            </Grid.RowDefinitions>
-
-            <CommandBar
-                Grid.Row="0"
-                HorizontalAlignment="Left"
-                Background="Transparent"
-                DefaultLabelPosition="Collapsed"
-                IsOpen="False">
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
-                    LabelPosition="Collapsed"
-                    ToolTipService.ToolTip="Light Theme"
-                    Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay}">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="LightEditor" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
-                    LabelPosition="Collapsed"
-                    ToolTipService.ToolTip="Dark Theme"
-                    Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
-                    <AppBarButton.Icon>
-                        <coreControls:WinoFontIcon Icon="DarkEditor" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarSeparator />
-
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}"
-                    Label="Bold"
-                    ToolTipService.ToolTip="Bold">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource BoldPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}"
-                    Label="Italic"
-                    ToolTipService.ToolTip="Italic">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource ItalicPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}"
-                    Label="Underline"
-                    ToolTipService.ToolTip="Underline">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource UnderlinePathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}"
-                    Label="Stroke"
-                    ToolTipService.ToolTip="Stroke">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource StrikePathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-                <AppBarSeparator />
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}"
-                    Label="Bullet List"
-                    ToolTipService.ToolTip="Bullet List">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource BulletedListPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}"
-                    Label="Ordered List"
-                    ToolTipService.ToolTip="Ordered List">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource OrderedListPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-
-                <AppBarSeparator />
-
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
-                    IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
-                    Label="Decrease Indent"
-                    ToolTipService.ToolTip="Decrease Indent">
-                    <AppBarButton.Icon>
-                        <PathIcon Data="{StaticResource DecreaseIndentPathIcon}" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.EditorIndentAsync}"
-                    IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
-                    Label="Increase Indent"
-                    ToolTipService.ToolTip="Increase Indent">
-                    <AppBarButton.Icon>
-                        <PathIcon Data="{StaticResource IncreaseIndentPathIcon}" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarElementContainer
-                    Width="Auto"
-                    MinWidth="40"
-                    VerticalAlignment="Center">
-                    <ComboBox
-                        Background="Transparent"
-                        BorderBrush="Transparent"
-                        SelectedIndex="{x:Bind WebViewEditor.EditorAlignmentSelectedIndex, Mode=TwoWay}">
-                        <ComboBoxItem IsSelected="True" Tag="left">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Viewbox Width="16">
-                                    <PathIcon Data="{StaticResource AlignLeftPathIcon}" />
-                                </Viewbox>
-                                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Left}" />
-                            </StackPanel>
-                        </ComboBoxItem>
-
-                        <ComboBoxItem Tag="center">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Viewbox Width="16">
-                                    <PathIcon Data="{StaticResource AlignCenterPathIcon}" />
-                                </Viewbox>
-                                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Center}" />
-                            </StackPanel>
-                        </ComboBoxItem>
-
-                        <ComboBoxItem Tag="right">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Viewbox Width="16">
-                                    <PathIcon Data="{StaticResource AlignRightPathIcon}" />
-                                </Viewbox>
-                                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Right}" />
-                            </StackPanel>
-                        </ComboBoxItem>
-
-                        <ComboBoxItem Tag="justify">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <Viewbox Width="16">
-                                    <PathIcon Data="{StaticResource AlignJustifyPathIcon}" />
-                                </Viewbox>
-                                <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.Justify}" />
-                            </StackPanel>
-                        </ComboBoxItem>
-                    </ComboBox>
-                </AppBarElementContainer>
-                <AppBarSeparator />
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.ShowImagePicker}"
-                    Label="Add Image"
-                    ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}">
-                    <AppBarButton.Icon>
-                        <PathIcon Data="{StaticResource AddPhotoPathIcon}" />
-                    </AppBarButton.Icon>
-                    <AppBarButton.Content>
-                        <StackPanel Orientation="Horizontal" Spacing="8">
-                            <Viewbox Width="16" VerticalAlignment="Center">
-                                <PathIcon Data="{StaticResource AddPhotoPathIcon}" />
-                            </Viewbox>
-                            <TextBlock Text="{x:Bind domain:Translator.Photos}" />
-                        </StackPanel>
-                    </AppBarButton.Content>
-                </AppBarButton>
-                <AppBarButton
-                    Width="Auto"
-                    MinWidth="40"
-                    Click="{x:Bind WebViewEditor.ShowEmojiPicker}"
-                    Label="Add Emoji"
-                    ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}">
-                    <AppBarButton.Icon>
-                        <PathIcon Data="{StaticResource EmojiPathIcon}" />
-                    </AppBarButton.Icon>
-                </AppBarButton>
-
-                <AppBarToggleButton
-                    Width="Auto"
-                    MinWidth="40"
-                    IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
-                    Label="Webview ToolBar"
-                    ToolTipService.ToolTip="Webview ToolBar">
-                    <AppBarToggleButton.Icon>
-                        <PathIcon Data="{StaticResource WebviewToolBarPathIcon}" />
-                    </AppBarToggleButton.Icon>
-                </AppBarToggleButton>
-            </CommandBar>
-            <Border
-                Grid.Row="1"
-                Margin="0,6,0,0"
-                BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                CornerRadius="3">
-                <controls2:WebViewEditorControl x:Name="WebViewEditor" />
-            </Border>
-        </Grid>
-    </Grid>
-</ContentDialog>
diff --git a/Wino.Mail/GlobalSuppressions.cs b/Wino.Mail/GlobalSuppressions.cs
deleted file mode 100644
index 7d5444aa..00000000
--- a/Wino.Mail/GlobalSuppressions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Minor Code Smell", "S2094:Classes should not be empty", Justification = "<Pending>", Scope = "type", Target = "~T:Wino.PubSub.BackBreadcrumNavigationRequest")]
diff --git a/Wino.Mail/JS/editor.js b/Wino.Mail/JS/editor.js
deleted file mode 100644
index f2e55a7a..00000000
--- a/Wino.Mail/JS/editor.js
+++ /dev/null
@@ -1,130 +0,0 @@
-const joditConfig = {
-    "useSearch": false,
-    "toolbar": true,
-    "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align,lineHeight,table",
-    "inline": true,
-    "toolbarAdaptive": false,
-    "toolbarInlineForSelection": false,
-    "showCharsCounter": false,
-    "showWordsCounter": false,
-    "showXPathInStatusbar": false,
-    "link": {
-        "processVideoLink": false
-    },
-    "disablePlugins": "add-new-line,backspace",
-    "showPlaceholder": false,
-    "uploader": {
-        "insertImageAsBase64URI": true
-    },
-    "enter": "DIV"
-}
-
-// This method should be called first all the time. 
-function initializeJodit(fonts, defaultComposerFont, defaultComposerFontSize, defaultReaderFont, defaultReaderFontSize) {
-    const fontsWithFallabckObject = fonts.reduce((acc, font) => { acc[`'${font}',Arial,sans-serif`] = font; return acc; }, {});
-    const mergedConfig = {
-        ...joditConfig,
-        controls: {
-            font: {
-                list: Jodit.atom(fontsWithFallabckObject)
-            }
-        },
-        style: { font: `${defaultReaderFontSize}px ${defaultReaderFont}` },
-    }
-
-    Jodit.plugins.add('inlineFonts', jodit => {
-        jodit.events.on('afterEnter', e => {
-            const current = jodit.selection.current().parentNode;
-            current.style.fontFamily = `'${defaultComposerFont}',Arial,sans-serif`;
-            current.style.fontSize = `${defaultComposerFontSize}px`;
-        });
-    });
-
-    // Don't add const/let/var here, it should be global
-    editor = Jodit.make("#editor", mergedConfig);
-
-    // Handle the image input change event
-    imageInput.addEventListener('change', () => {
-        const file = imageInput.files[0];
-        if (file) {
-            const reader = new FileReader();
-            reader.onload = function (event) {
-                const base64Image = event.target.result;
-                insertImages([{ data: base64Image, name: file.name }]);
-            };
-            reader.readAsDataURL(file);
-        }
-    });
-
-    // Listeners for button events
-    const disabledButtons = ["indent", "outdent"];
-    const ariaPressedButtons = ["bold", "italic", "underline", "strikethrough", "ul", "ol"];
-
-    const alignmentButton = document.querySelector(`[ref='left']`).firstChild.firstChild;
-    const alignmentObserver = new MutationObserver(function () {
-        const value = alignmentButton.firstChild.getAttribute('class').split(' ')[0];
-        window.chrome.webview.postMessage({ type: 'alignment', value: value });
-    });
-    alignmentObserver.observe(alignmentButton, { childList: true, attributes: true, attributeFilter: ["class"] });
-
-    const ariaObservers = ariaPressedButtons.map(button => {
-        const buttonContainer = document.querySelector(`[ref='${button}']`);
-        const observer = new MutationObserver(function () { pressedChanged(buttonContainer) });
-        observer.observe(buttonContainer.firstChild, { attributes: true, attributeFilter: ["aria-pressed"] });
-
-        return observer;
-    });
-
-    const disabledObservers = disabledButtons.map(button => {
-        const buttonContainer = document.querySelector(`[ref='${button}']`);
-        const observer = new MutationObserver(function () { disabledButtonChanged(buttonContainer) });
-        observer.observe(buttonContainer.firstChild, { attributes: true, attributeFilter: ["disabled"] });
-
-        return observer;
-    });
-
-    function pressedChanged(buttonContainer) {
-        const ref = buttonContainer.getAttribute('ref');
-        const value = buttonContainer.firstChild.getAttribute('aria-pressed');
-        window.chrome.webview.postMessage({ type: ref, value: value });
-    }
-
-    function disabledButtonChanged(buttonContainer) {
-        const ref = buttonContainer.getAttribute('ref');
-        const value = buttonContainer.firstChild.getAttribute('disabled');
-        window.chrome.webview.postMessage({ type: ref, value: value });
-    }
-}
-
-function RenderHTML(htmlString) {
-    editor.s.insertHTML(htmlString);
-    editor.synchronizeValues();
-}
-
-function GetHTMLContent() {
-    return editor.value;
-}
-
-function SetLightEditor() {
-    DarkReader.disable();
-}
-
-function SetDarkEditor() {
-    DarkReader.enable();
-}
-
-function toggleToolbar(enable) {
-    const toolbar = document.querySelector('.jodit-toolbar__box');
-    if (enable) {
-        toolbar.style.display = 'flex';
-    }
-    else {
-        toolbar.style.display = 'none';
-    }
-}
-
-function insertImages(imagesInfo) {
-    imagesInfo.forEach(imageInfo => {
-        editor.selection.insertHTML(`<img src="${imageInfo.data}" alt="${imageInfo.name}">`);
-    });
-};
diff --git a/Wino.Mail/Package.appxmanifest b/Wino.Mail/Package.appxmanifest
deleted file mode 100644
index 2f57c530..00000000
--- a/Wino.Mail/Package.appxmanifest
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  IgnorableNamespaces="uap mp rescap">
-
-	<!-- Publisher Cache Folders -->
-	<Extensions>
-		<Extension Category="windows.publisherCacheFolders">
-			<PublisherCacheFolders>
-				<Folder Name="WinoShared" />
-			</PublisherCacheFolders>
-		</Extension>
-	</Extensions>
-	
-  <Identity
-    Name="58272BurakKSE.WinoMailPreview"
-    Publisher="CN=bkaan"
-    Version="1.9.1.0" />
-
-  <mp:PhoneIdentity PhoneProductId="0f6f3c1b-6ffd-4212-9c91-a16e8d1fa437" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>Wino Mail</DisplayName>
-    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="Wino.Mail.App">
-      <uap:VisualElements
-        DisplayName="Wino Mail"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="Mail client designed for Windows 11"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png"  BackgroundColor="transparent" uap5:Optional="true" />
-        <uap:LockScreen BadgeLogo="Assets\BadgeLogo.png" Notification="badgeAndTileText"/>
-      </uap:VisualElements>
-      <Extensions>
-		<!-- App updated task. Notifies about new version after each Store update. -->
-		<Extension Category="windows.updateTask" EntryPoint="Wino.BackgroundTasks.AppUpdatedTask" />
-		  
-		<!-- Protocol activation: mailto -->
-		<uap:Extension Category="windows.protocol">
-			<uap:Protocol Name="mailto" />
-		</uap:Extension>
-		  
-		<!-- Protocol activation: Google oAuth -->
-        <uap:Extension Category="windows.protocol">
-          <uap:Protocol Name="google.pw.oauth2">
-            <uap:DisplayName>Google Auth Protocol</uap:DisplayName>
-          </uap:Protocol>
-        </uap:Extension>
-
-		<!-- File Assosication: EML -->
-		<uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="eml">
-            <uap:Logo>EML\eml.png</uap:Logo>
-            <uap:SupportedFileTypes>
-              <uap:FileType>.eml</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-
-		<uap5:Extension Category="windows.startupTask">
-			<uap5:StartupTask
-			    TaskId="WinoStartupId"
-			    Enabled="false"
-			    DisplayName="Wino Startup Service" />
-		</uap5:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-	<rescap:Capability Name="confirmAppClose" />
-    <Capability Name="internetClient" />
-    <Capability Name="privateNetworkClientServer"/>
-    <Capability Name="internetClientServer"/>
-  </Capabilities>
-</Package>
diff --git a/Wino.Mail/Properties/launchSettings.json b/Wino.Mail/Properties/launchSettings.json
deleted file mode 100644
index 70247dd4..00000000
--- a/Wino.Mail/Properties/launchSettings.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "profiles": {
-    "Wino.Mail": {
-      "commandName": "MsixPackage"
-    }
-  }
-}
diff --git a/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs b/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
deleted file mode 100644
index 63df9f5c..00000000
--- a/Wino.Mail/Selectors/AccountProviderViewModelTemplateSelector.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.ViewModels.Data;
-
-namespace Wino.Selectors;
-
-public partial class AccountProviderViewModelTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate RootAccountTemplate { get; set; }
-    public DataTemplate MergedAccountTemplate { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-    {
-        if (item is MergedAccountProviderDetailViewModel)
-            return MergedAccountTemplate;
-        else
-            return RootAccountTemplate;
-    }
-}
diff --git a/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs b/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
deleted file mode 100644
index cd16d721..00000000
--- a/Wino.Mail/Selectors/AccountReorderTemplateSelector.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.ViewModels.Data;
-
-namespace Wino.Selectors;
-
-public partial class AccountReorderTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate MergedAccountReorderTemplate { get; set; }
-    public DataTemplate RootAccountReorderTemplate { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-    {
-        if (item is MergedAccountProviderDetailViewModel)
-        {
-            return MergedAccountReorderTemplate;
-        }
-
-        return RootAccountReorderTemplate;
-    }
-}
diff --git a/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs b/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
deleted file mode 100644
index d5c21506..00000000
--- a/Wino.Mail/Selectors/MailItemContainerStyleSelector.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Selectors;
-
-public partial class MailItemContainerStyleSelector : StyleSelector
-{
-    public Style Thread { get; set; }
-
-    protected override Style SelectStyleCore(object item, DependencyObject container)
-    {
-        if (item is ThreadMailItemViewModel)
-            return Thread;
-        else
-            return base.SelectStyleCore(item, container);
-    }
-}
diff --git a/Wino.Mail/Selectors/MailItemDisplaySelector.cs b/Wino.Mail/Selectors/MailItemDisplaySelector.cs
deleted file mode 100644
index 5afb854e..00000000
--- a/Wino.Mail/Selectors/MailItemDisplaySelector.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Mail.ViewModels.Data;
-
-namespace Wino.Selectors;
-
-public partial class MailItemDisplaySelector : DataTemplateSelector
-{
-    public DataTemplate SingleMailItemTemplate { get; set; }
-    public DataTemplate ThreadMailItemTemplate { get; set; }
-
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-    {
-        if (item is MailItemViewModel)
-            return SingleMailItemTemplate;
-        else if (item is ThreadMailItemViewModel)
-            return ThreadMailItemTemplate;
-
-        return base.SelectTemplateCore(item, container);
-    }
-}
diff --git a/Wino.Mail/Services/NavigationService.cs b/Wino.Mail/Services/NavigationService.cs
deleted file mode 100644
index 2211331f..00000000
--- a/Wino.Mail/Services/NavigationService.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Linq;
-using CommunityToolkit.Mvvm.Messaging;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.UWP.Services;
-using Wino.Helpers;
-using Wino.Mail.ViewModels.Data;
-using Wino.Mail.ViewModels.Messages;
-using Wino.Messaging.Client.Mails;
-using Wino.Views;
-using Wino.Views.Account;
-using Wino.Views.Settings;
-
-namespace Wino.Services;
-
-public class NavigationService : NavigationServiceBase, INavigationService
-{
-    private readonly IStatePersistanceService _statePersistanceService;
-
-    private WinoPage[] _renderingPageTypes = new WinoPage[]
-    {
-        WinoPage.MailRenderingPage,
-        WinoPage.ComposePage
-    };
-
-    public NavigationService(IStatePersistanceService statePersistanceService)
-    {
-        _statePersistanceService = statePersistanceService;
-    }
-
-    public Type GetPageType(WinoPage winoPage)
-    {
-        return winoPage switch
-        {
-            WinoPage.None => null,
-            WinoPage.IdlePage => typeof(IdlePage),
-            WinoPage.AccountDetailsPage => typeof(AccountDetailsPage),
-            WinoPage.MergedAccountDetailsPage => typeof(MergedAccountDetailsPage),
-            WinoPage.AccountManagementPage => typeof(AccountManagementPage),
-            WinoPage.ManageAccountsPage => typeof(ManageAccountsPage),
-            WinoPage.SignatureManagementPage => typeof(SignatureManagementPage),
-            WinoPage.AboutPage => typeof(AboutPage),
-            WinoPage.PersonalizationPage => typeof(PersonalizationPage),
-            WinoPage.MessageListPage => typeof(MessageListPage),
-            WinoPage.ReadComposePanePage => typeof(ReadComposePanePage),
-            WinoPage.MailRenderingPage => typeof(MailRenderingPage),
-            WinoPage.ComposePage => typeof(ComposePage),
-            WinoPage.MailListPage => typeof(MailListPage),
-            WinoPage.SettingsPage => typeof(SettingsPage),
-            WinoPage.WelcomePage => typeof(WelcomePage),
-            WinoPage.SettingOptionsPage => typeof(SettingOptionsPage),
-            WinoPage.AppPreferencesPage => typeof(AppPreferencesPage),
-            WinoPage.AliasManagementPage => typeof(AliasManagementPage),
-            WinoPage.LanguageTimePage => typeof(LanguageTimePage),
-            WinoPage.EditAccountDetailsPage => typeof(EditAccountDetailsPage),
-            _ => null,
-        };
-    }
-
-    public Frame GetCoreFrame(NavigationReferenceFrame frameType)
-    {
-        if (Window.Current.Content is Frame appFrame)
-            return WinoVisualTreeHelper.GetChildObject<Frame>(appFrame.Content as UIElement, frameType.ToString());
-
-        return null;
-    }
-
-    public bool Navigate(WinoPage page,
-                         object parameter = null,
-                         NavigationReferenceFrame frame = NavigationReferenceFrame.ShellFrame,
-                         NavigationTransitionType transition = NavigationTransitionType.None)
-    {
-        var pageType = GetPageType(page);
-        Frame shellFrame = GetCoreFrame(NavigationReferenceFrame.ShellFrame);
-
-        _statePersistanceService.IsReadingMail = _renderingPageTypes.Contains(page);
-
-        if (shellFrame != null)
-        {
-            var currentFrameType = GetCurrentFrameType(ref shellFrame);
-
-            bool isMailListingPageActive = currentFrameType != null && currentFrameType == typeof(MailListPage);
-
-            // Active page is mail list page and we are refreshing the folder.
-            if (isMailListingPageActive && currentFrameType == pageType && parameter is NavigateMailFolderEventArgs folderNavigationArgs)
-            {
-                // No need for new navigation, just refresh the folder.
-                WeakReferenceMessenger.Default.Send(new ActiveMailFolderChangedEvent(folderNavigationArgs.BaseFolderMenuItem, folderNavigationArgs.FolderInitLoadAwaitTask));
-                WeakReferenceMessenger.Default.Send(new DisposeRenderingFrameRequested());
-
-                return true;
-            }
-
-            var transitionInfo = GetNavigationTransitionInfo(transition);
-
-            // This page must be opened in the Frame placed in MailListingPage.
-            if (isMailListingPageActive && frame == NavigationReferenceFrame.RenderingFrame)
-            {
-                var listingFrame = GetCoreFrame(NavigationReferenceFrame.RenderingFrame);
-
-                if (listingFrame == null) return false;
-
-                // Active page is mail list page and we are opening a mail item.
-                // No navigation needed, just refresh the rendered mail item.
-                if (listingFrame.Content != null
-                    && listingFrame.Content.GetType() == GetPageType(WinoPage.MailRenderingPage)
-                    && parameter is MailItemViewModel mailItemViewModel
-                    && page != WinoPage.ComposePage)
-                {
-                    WeakReferenceMessenger.Default.Send(new NewMailItemRenderingRequestedEvent(mailItemViewModel));
-                }
-                else if (listingFrame.Content != null
-                    && listingFrame.Content.GetType() == GetPageType(WinoPage.IdlePage)
-                    && pageType == typeof(IdlePage))
-                {
-                    // Idle -> Idle navigation. Ignore.
-                    return true;
-                }
-                else
-                {
-                    listingFrame.Navigate(pageType, parameter, transitionInfo);
-                }
-
-                return true;
-            }
-
-            if ((currentFrameType != null && currentFrameType != pageType) || currentFrameType == null)
-            {
-                return shellFrame.Navigate(pageType, parameter, transitionInfo);
-            }
-        }
-
-        return false;
-    }
-
-    public void GoBack() => throw new NotImplementedException("GoBack method is not implemented in Wino Mail.");
-
-    // Standalone EML viewer.
-    //public void NavigateRendering(MimeMessageInformation mimeMessageInformation, NavigationTransitionType transition = NavigationTransitionType.None)
-    //{
-    //    if (mimeMessageInformation == null)
-    //        throw new ArgumentException("MimeMessage cannot be null.");
-
-    //    Navigate(WinoPage.MailRenderingPage, mimeMessageInformation, NavigationReferenceFrame.RenderingFrame, transition);
-    //}
-
-    //// Mail item view model clicked handler.
-    //public void NavigateRendering(IMailItem mailItem, NavigationTransitionType transition = NavigationTransitionType.None)
-    //{
-    //    if (mailItem is MailItemViewModel mailItemViewModel)
-    //        Navigate(WinoPage.MailRenderingPage, mailItemViewModel, NavigationReferenceFrame.RenderingFrame, transition);
-    //    else
-    //        throw new ArgumentException("MailItem must be of type MailItemViewModel.");
-    //}
-
-    //public void NavigateFolder(NavigateMailFolderEventArgs args)
-    //    => Navigate(WinoPage.MailListPage, args, NavigationReferenceFrame.ShellFrame);
-}
diff --git a/Wino.Mail/Services/SettingsBuilderService.cs b/Wino.Mail/Services/SettingsBuilderService.cs
deleted file mode 100644
index 8c2718b5..00000000
--- a/Wino.Mail/Services/SettingsBuilderService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Settings;
-
-namespace Wino.Services;
-
-public class SettingsBuilderService : ISettingsBuilderService
-{
-    public List<SettingOption> GetSettingItems()
-        => new List<SettingOption>()
-        {
-            new SettingOption(Translator.SettingsManageAccountSettings_Title, Translator.SettingsManageAccountSettings_Description, WinoPage.AccountManagementPage,"F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.420572 0 10.056966 0.128582 10.65918 0.385742 C 11.261393 0.642904 11.791992 0.99284 12.250977 1.435547 C 12.709961 1.878256 13.074544 2.397461 13.344727 2.993164 C 13.614908 3.588867 13.75 4.225262 13.75 4.902344 C 13.75 5.397137 13.689778 5.87077 13.569336 6.323242 C 13.448893 6.775717 13.258463 7.213542 12.998047 7.636719 C 12.229817 7.799479 11.510416 8.079428 10.839844 8.476562 C 10.169271 8.873698 9.583333 9.378256 9.082031 9.990234 C 9.042969 9.996745 9.005533 10 8.969727 10 C 8.933919 10 8.899739 10 8.867188 10 L 8.652344 10 C 7.97526 10 7.338867 9.864909 6.743164 9.594727 C 6.147461 9.324545 5.628255 8.959961 5.185547 8.500977 C 4.742838 8.041993 4.392903 7.511395 4.135742 6.90918 C 3.878581 6.306967 3.75 5.670573 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 12.148438 19.365234 C 11.777344 19.208984 11.41276 19.010416 11.054688 18.769531 C 11.113281 18.561197 11.170247 18.357748 11.225586 18.15918 C 11.280924 17.960611 11.308594 17.753906 11.308594 17.539062 C 11.308594 17.252604 11.259766 16.977539 11.162109 16.713867 C 11.064453 16.450195 10.930989 16.210938 10.761719 15.996094 C 10.592447 15.78125 10.390625 15.597331 10.15625 15.444336 C 9.921875 15.291342 9.664713 15.182292 9.384766 15.117188 L 8.779297 14.980469 C 8.759766 14.778646 8.75 14.576823 8.75 14.375 C 8.75 14.179688 8.759766 13.977865 8.779297 13.769531 L 9.384766 13.632812 C 9.664713 13.567709 9.921875 13.458659 10.15625 13.305664 C 10.390625 13.15267 10.592447 12.96875 10.761719 12.753906 C 10.930989 12.539062 11.064453 12.299805 11.162109 12.036133 C 11.259766 11.772461 11.308594 11.497396 11.308594 11.210938 C 11.308594 10.996094 11.280924 10.789389 11.225586 10.59082 C 11.170247 10.392253 11.113281 10.188803 11.054688 9.980469 C 11.41276 9.739584 11.777344 9.541016 12.148438 9.384766 C 12.324219 9.560547 12.488606 9.720053 12.641602 9.863281 C 12.794596 10.006511 12.957356 10.131836 13.129883 10.239258 C 13.302408 10.34668 13.487955 10.429688 13.686523 10.488281 C 13.885091 10.546875 14.114583 10.576172 14.375 10.576172 C 14.635416 10.576172 14.866535 10.546875 15.068359 10.488281 C 15.270182 10.429688 15.455729 10.34668 15.625 10.239258 C 15.79427 10.131836 15.955402 10.006511 16.108398 9.863281 C 16.261393 9.720053 16.425781 9.560547 16.601562 9.384766 C 16.972656 9.541016 17.337238 9.739584 17.695312 9.980469 C 17.636719 10.188803 17.579752 10.392253 17.524414 10.59082 C 17.469074 10.789389 17.441406 10.996094 17.441406 11.210938 C 17.441406 11.497396 17.488605 11.772461 17.583008 12.036133 C 17.677408 12.299805 17.810871 12.539062 17.983398 12.753906 C 18.155924 12.96875 18.359375 13.15267 18.59375 13.305664 C 18.828125 13.458659 19.085285 13.567709 19.365234 13.632812 L 19.970703 13.769531 C 19.990234 13.977865 20 14.179688 20 14.375 C 20 14.576823 19.990234 14.778646 19.970703 14.980469 L 19.365234 15.117188 C 19.085285 15.182292 18.828125 15.291342 18.59375 15.444336 C 18.359375 15.597331 18.155924 15.78125 17.983398 15.996094 C 17.810871 16.210938 17.677408 16.450195 17.583008 16.713867 C 17.488605 16.977539 17.441406 17.252604 17.441406 17.539062 C 17.441406 17.753906 17.469074 17.960611 17.524414 18.15918 C 17.579752 18.357748 17.636719 18.561197 17.695312 18.769531 C 17.337238 19.010416 16.972656 19.208984 16.601562 19.365234 C 16.425781 19.189453 16.261393 19.029947 16.108398 18.886719 C 15.955402 18.74349 15.79427 18.618164 15.625 18.510742 C 15.455729 18.40332 15.270182 18.320312 15.068359 18.261719 C 14.866535 18.203125 14.635416 18.173828 14.375 18.173828 C 14.108072 18.173828 13.875324 18.203125 13.676758 18.261719 C 13.478189 18.320312 13.294271 18.40332 13.125 18.510742 C 12.955729 18.618164 12.794596 18.74349 12.641602 18.886719 C 12.488606 19.029947 12.324219 19.189453 12.148438 19.365234 Z M 0 13.75 C 0 13.404948 0.065104 13.081055 0.195312 12.77832 C 0.325521 12.475586 0.504557 12.210287 0.732422 11.982422 C 0.960286 11.754558 1.225586 11.575521 1.52832 11.445312 C 1.831055 11.315104 2.154948 11.25 2.5 11.25 L 8.251953 11.25 C 8.043619 11.660156 7.880859 12.076823 7.763672 12.5 L 2.5 12.5 C 2.324219 12.5 2.159831 12.532553 2.006836 12.597656 C 1.853841 12.662761 1.722005 12.750651 1.611328 12.861328 C 1.500651 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.420573 1.360677 15.008139 1.582031 15.512695 C 1.803385 16.017252 2.102865 16.455078 2.480469 16.826172 C 2.858073 17.197266 3.297526 17.50651 3.798828 17.753906 C 4.30013 18.001303 4.827474 18.198242 5.380859 18.344727 C 5.934244 18.491211 6.50065 18.595377 7.080078 18.657227 C 7.659505 18.719076 8.216146 18.75 8.75 18.75 L 9.072266 18.75 C 9.449869 19.199219 9.866536 19.5931 10.322266 19.931641 C 10.061849 19.964193 9.801432 19.983725 9.541016 19.990234 C 9.280599 19.996744 9.016927 20 8.75 20 C 8.190104 20 7.618814 19.973959 7.036133 19.921875 C 6.45345 19.869791 5.878906 19.775391 5.3125 19.638672 C 4.746094 19.501953 4.197591 19.319662 3.666992 19.091797 C 3.136393 18.863932 2.646484 18.574219 2.197266 18.222656 C 1.474609 17.66276 0.927734 17.005209 0.556641 16.25 C 0.185547 15.494792 0 14.661458 0 13.75 Z M 15.625 14.375 C 15.625 14.205729 15.592447 14.044597 15.527344 13.891602 C 15.462239 13.738607 15.372721 13.605144 15.258789 13.491211 C 15.144855 13.377279 15.011393 13.287761 14.858398 13.222656 C 14.705403 13.157553 14.544271 13.125 14.375 13.125 C 14.199219 13.125 14.036458 13.157553 13.886719 13.222656 C 13.736979 13.287761 13.605143 13.377279 13.491211 13.491211 C 13.377278 13.605144 13.28776 13.736979 13.222656 13.886719 C 13.157551 14.036459 13.124999 14.199219 13.125 14.375 C 13.124999 14.550781 13.157551 14.71517 13.222656 14.868164 C 13.28776 15.021159 13.37565 15.152995 13.486328 15.263672 C 13.597004 15.37435 13.72884 15.46224 13.881836 15.527344 C 14.03483 15.592448 14.199219 15.625 14.375 15.625 C 14.550781 15.625 14.713541 15.592448 14.863281 15.527344 C 15.01302 15.46224 15.144855 15.372722 15.258789 15.258789 C 15.372721 15.144857 15.462239 15.013021 15.527344 14.863281 C 15.592447 14.713542 15.625 14.550781 15.625 14.375 Z "),
-            new SettingOption(Translator.SettingsAppPreferences_Title, Translator.SettingsAppPreferences_Description, WinoPage.AppPreferencesPage,"F1 M 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 L 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 Z M 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 5 L 17.5 5 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 6.25 L 2.5 6.25 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 12.724609 8.935547 C 12.724609 9.195964 12.762044 9.446615 12.836914 9.6875 C 12.911783 9.928386 13.020832 10.151367 13.164062 10.356445 C 13.307291 10.561523 13.476562 10.742188 13.671875 10.898438 C 13.867188 11.054688 14.088541 11.178386 14.335938 11.269531 C 14.348957 11.367188 14.358723 11.466472 14.365234 11.567383 C 14.371744 11.668295 14.375 11.770834 14.375 11.875 C 14.375 11.979167 14.371744 12.081706 14.365234 12.182617 C 14.358723 12.283529 14.348957 12.382812 14.335938 12.480469 C 14.088541 12.571615 13.867188 12.695312 13.671875 12.851562 C 13.476562 13.007812 13.307291 13.188477 13.164062 13.393555 C 13.020832 13.598633 12.911783 13.821615 12.836914 14.0625 C 12.762044 14.303386 12.724609 14.554037 12.724609 14.814453 C 12.724609 14.886068 12.727864 14.960938 12.734375 15.039062 C 12.740885 15.117188 12.75065 15.192058 12.763672 15.263672 C 12.470703 15.511068 12.145182 15.712891 11.787109 15.869141 C 11.546224 15.621745 11.274414 15.43457 10.97168 15.307617 C 10.668945 15.180664 10.345052 15.117188 10 15.117188 C 9.654947 15.117188 9.331055 15.180664 9.02832 15.307617 C 8.725586 15.43457 8.453775 15.621745 8.212891 15.869141 C 7.854817 15.712891 7.529296 15.511068 7.236328 15.263672 C 7.249349 15.192058 7.259114 15.117188 7.265625 15.039062 C 7.272135 14.960938 7.275391 14.886068 7.275391 14.814453 C 7.275391 14.554037 7.237956 14.303386 7.163086 14.0625 C 7.088216 13.821615 6.979167 13.598633 6.835938 13.393555 C 6.692708 13.188477 6.52181 13.007812 6.323242 12.851562 C 6.124674 12.695312 5.904948 12.571615 5.664062 12.480469 C 5.651042 12.382812 5.641276 12.283529 5.634766 12.182617 C 5.628255 12.081706 5.625 11.979167 5.625 11.875 C 5.625 11.770834 5.628255 11.668295 5.634766 11.567383 C 5.641276 11.466472 5.651042 11.367188 5.664062 11.269531 C 5.904948 11.178386 6.124674 11.054688 6.323242 10.898438 C 6.52181 10.742188 6.692708 10.561523 6.835938 10.356445 C 6.979167 10.151367 7.088216 9.928386 7.163086 9.6875 C 7.237956 9.446615 7.275391 9.195964 7.275391 8.935547 C 7.275391 8.863933 7.272135 8.789062 7.265625 8.710938 C 7.259114 8.632812 7.249349 8.557943 7.236328 8.486328 C 7.529296 8.238933 7.854817 8.037109 8.212891 7.880859 C 8.440755 8.121745 8.712564 8.307292 9.02832 8.4375 C 9.344075 8.567709 9.667969 8.632812 10 8.632812 C 10.332031 8.632812 10.655924 8.567709 10.97168 8.4375 C 11.287435 8.307292 11.559244 8.121745 11.787109 7.880859 C 12.145182 8.037109 12.470703 8.238933 12.763672 8.486328 C 12.75065 8.557943 12.740885 8.632812 12.734375 8.710938 C 12.727864 8.789062 12.724609 8.863933 12.724609 8.935547 Z M 10.9375 11.875 C 10.9375 11.614584 10.846354 11.393229 10.664062 11.210938 C 10.481771 11.028646 10.260416 10.9375 10 10.9375 C 9.739583 10.9375 9.518229 11.028646 9.335938 11.210938 C 9.153646 11.393229 9.0625 11.614584 9.0625 11.875 C 9.0625 12.135417 9.153646 12.356771 9.335938 12.539062 C 9.518229 12.721354 9.739583 12.8125 10 12.8125 C 10.260416 12.8125 10.481771 12.721354 10.664062 12.539062 C 10.846354 12.356771 10.9375 12.135417 10.9375 11.875 Z "),
-            new SettingOption(Translator.SettingsLanguageTime_Title, Translator.SettingsLanguageTime_Description, WinoPage.LanguageTimePage,"F1 M 4.765625 12.324219 C 4.088542 12.167969 3.458659 11.899414 2.875977 11.518555 C 2.293294 11.137695 1.788737 10.680339 1.362305 10.146484 C 0.935872 9.612631 0.602214 9.020183 0.361328 8.369141 C 0.120443 7.7181 0 7.044271 0 6.347656 C 0 5.468751 0.159505 4.645184 0.478516 3.876953 C 0.797526 3.108725 1.236979 2.436523 1.796875 1.860352 C 2.356771 1.28418 3.017578 0.830078 3.779297 0.498047 C 4.541016 0.166016 5.364583 0 6.25 0 C 7.115885 0 7.92806 0.162762 8.686523 0.488281 C 9.444986 0.813803 10.107422 1.259766 10.673828 1.826172 C 11.240234 2.392578 11.686197 3.055014 12.011719 3.813477 C 12.337239 4.57194 12.5 5.384115 12.5 6.25 L 11.25 6.25 L 11.25 6.152344 C 11.25 5.475261 11.114908 4.838867 10.844727 4.243164 C 10.574544 3.647461 10.209961 3.128256 9.750977 2.685547 C 9.291992 2.24284 8.761393 1.892904 8.15918 1.635742 C 7.556966 1.378582 6.920573 1.25 6.25 1.25 C 5.579427 1.25 4.943034 1.378582 4.34082 1.635742 C 3.738607 1.892904 3.208008 2.24284 2.749023 2.685547 C 2.290039 3.128256 1.925456 3.647461 1.655273 4.243164 C 1.385091 4.838867 1.25 5.475261 1.25 6.152344 L 1.25 6.328125 C 1.25 6.901042 1.352539 7.454428 1.557617 7.988281 C 1.762695 8.522136 2.045898 9.005534 2.407227 9.438477 C 2.768555 9.87142 3.191732 10.239258 3.676758 10.541992 C 4.161784 10.844727 4.6875 11.048178 5.253906 11.152344 Z M 5.625 7.5 C 5.455729 7.5 5.309245 7.438151 5.185547 7.314453 C 5.061849 7.190756 5 7.044271 5 6.875 L 5 3.125 C 5 2.95573 5.061849 2.809246 5.185547 2.685547 C 5.309245 2.56185 5.455729 2.5 5.625 2.5 C 5.794271 2.5 5.940755 2.56185 6.064453 2.685547 C 6.188151 2.809246 6.25 2.95573 6.25 3.125 L 6.25 6.25 L 8.125 6.25 C 8.294271 6.25 8.440755 6.31185 8.564453 6.435547 C 8.68815 6.559245 8.75 6.705729 8.75 6.875 C 8.75 7.044271 8.68815 7.190756 8.564453 7.314453 C 8.440755 7.438151 8.294271 7.5 8.125 7.5 Z M 10 10 L 10 8.125 C 10 7.95573 10.061849 7.809246 10.185547 7.685547 C 10.309244 7.56185 10.455729 7.5 10.625 7.5 L 14.375 7.5 C 14.375 7.447917 14.373372 7.394206 14.370117 7.338867 C 14.366861 7.283529 14.365234 7.226563 14.365234 7.167969 C 14.365234 7.057292 14.371744 6.948242 14.384766 6.84082 C 14.397786 6.733398 14.425455 6.635742 14.467773 6.547852 C 14.51009 6.459961 14.573566 6.388347 14.658203 6.333008 C 14.742838 6.27767 14.856771 6.25 15 6.25 C 15.143229 6.25 15.255533 6.27767 15.336914 6.333008 C 15.418294 6.388347 15.480143 6.459961 15.522461 6.547852 C 15.564777 6.635742 15.592447 6.733398 15.605469 6.84082 C 15.618489 6.948242 15.625 7.057292 15.625 7.167969 L 15.625 7.5 L 19.375 7.5 C 19.54427 7.5 19.690754 7.56185 19.814453 7.685547 C 19.93815 7.809246 20 7.95573 20 8.125 L 20 10 C 20 10.169271 19.93815 10.315756 19.814453 10.439453 C 19.690754 10.563151 19.54427 10.625 19.375 10.625 C 19.205729 10.625 19.059244 10.563151 18.935547 10.439453 C 18.811848 10.315756 18.75 10.169271 18.75 10 L 18.75 8.75 L 11.25 8.75 L 11.25 10 C 11.25 10.169271 11.18815 10.315756 11.064453 10.439453 C 10.940755 10.563151 10.794271 10.625 10.625 10.625 C 10.455729 10.625 10.309244 10.563151 10.185547 10.439453 C 10.061849 10.315756 10 10.169271 10 10 Z M 14.375 17.5 C 14.205729 17.5 14.059244 17.43815 13.935547 17.314453 C 13.811849 17.190756 13.75 17.044271 13.75 16.875 C 13.75 16.731771 13.777669 16.619467 13.833008 16.538086 C 13.888346 16.456705 13.95996 16.394857 14.047852 16.352539 C 14.135741 16.310221 14.233397 16.282553 14.34082 16.269531 C 14.448241 16.256512 14.557291 16.25 14.667969 16.25 L 15 16.25 L 15 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.688151 11.435547 13.564453 C 11.311849 13.440756 11.25 13.294271 11.25 13.125 C 11.25 12.955729 11.311849 12.809245 11.435547 12.685547 C 11.559244 12.56185 11.705729 12.5 11.875 12.5 L 15 12.5 C 14.999999 12.376303 15.035807 12.259115 15.107422 12.148438 L 15.703125 11.25 L 13.125 11.25 C 12.955729 11.25 12.809244 11.188151 12.685547 11.064453 C 12.561849 10.940756 12.5 10.794271 12.5 10.625 C 12.5 10.455729 12.561849 10.309245 12.685547 10.185547 C 12.809244 10.06185 12.955729 10 13.125 10 L 16.875 10 C 17.04427 10 17.190754 10.06185 17.314453 10.185547 C 17.43815 10.309245 17.5 10.455729 17.5 10.625 C 17.5 10.748698 17.464191 10.862631 17.392578 10.966797 L 16.376953 12.5 L 19.375 12.5 C 19.54427 12.5 19.690754 12.56185 19.814453 12.685547 C 19.93815 12.809245 20 12.955729 20 13.125 C 20 13.294271 19.93815 13.440756 19.814453 13.564453 C 19.690754 13.688151 19.54427 13.75 19.375 13.75 L 16.25 13.75 L 16.25 16.25 C 16.25 16.425781 16.217447 16.588543 16.152344 16.738281 C 16.087238 16.888021 15.997721 17.019857 15.883789 17.133789 C 15.769856 17.247721 15.638021 17.33724 15.488281 17.402344 C 15.338541 17.467447 15.17578 17.5 15 17.5 Z M 4.0625 18.125 C 4.0625 18.046875 4.075521 17.972006 4.101562 17.900391 C 4.257812 17.477213 4.41569 17.05892 4.575195 16.645508 C 4.7347 16.232096 4.892578 15.813803 5.048828 15.390625 L 6.914062 10.400391 C 6.959635 10.276693 7.036133 10.185547 7.143555 10.126953 C 7.250977 10.068359 7.369792 10.039062 7.5 10.039062 C 7.630208 10.039062 7.749023 10.068359 7.856445 10.126953 C 7.963867 10.185547 8.040364 10.276693 8.085938 10.400391 L 9.951172 15.390625 C 10.107422 15.813803 10.265299 16.232096 10.424805 16.645508 C 10.58431 17.05892 10.742188 17.477213 10.898438 17.900391 C 10.924479 17.972006 10.9375 18.046875 10.9375 18.125 C 10.9375 18.300781 10.877278 18.448893 10.756836 18.569336 C 10.636393 18.689779 10.488281 18.75 10.3125 18.75 C 10.175781 18.75 10.056966 18.714193 9.956055 18.642578 C 9.855143 18.570963 9.778646 18.470053 9.726562 18.339844 L 8.945312 16.25 L 6.054688 16.25 L 5.273438 18.339844 C 5.227864 18.463541 5.151367 18.562826 5.043945 18.637695 C 4.936523 18.712564 4.817708 18.75 4.6875 18.75 C 4.511719 18.75 4.363606 18.689779 4.243164 18.569336 C 4.122721 18.448893 4.0625 18.300781 4.0625 18.125 Z M 7.5 12.402344 L 6.523438 15 L 8.476562 15 Z "),
-            new SettingOption(Translator.SettingsPersonalization_Title, Translator.SettingsPersonalization_Description, WinoPage.PersonalizationPage,"F1 M 10 17.5 L 10 18.75 L 12.5 18.75 L 12.5 20 L 6.25 20 L 6.25 18.75 L 8.75 18.75 L 8.75 17.5 L 0 17.5 L 0 6.25 L 10 6.25 L 8.740234 7.5 L 1.25 7.5 L 1.25 16.25 L 17.5 16.25 L 17.5 8.75 L 18.75 7.5 L 18.75 17.5 Z M 5 13.75 C 5.175781 13.75 5.338542 13.717448 5.488281 13.652344 C 5.638021 13.58724 5.769856 13.497722 5.883789 13.383789 C 5.997721 13.269857 6.087239 13.138021 6.152344 12.988281 C 6.217448 12.838542 6.25 12.675781 6.25 12.5 C 6.25 12.18099 6.306966 11.878256 6.420898 11.591797 C 6.53483 11.305339 6.69108 11.051433 6.889648 10.830078 C 7.088216 10.608725 7.322591 10.424805 7.592773 10.27832 C 7.862955 10.131836 8.157552 10.042318 8.476562 10.009766 L 15.419922 3.066406 C 15.602213 2.884115 15.813802 2.744141 16.054688 2.646484 C 16.295572 2.548828 16.542969 2.5 16.796875 2.5 C 17.063801 2.5 17.31608 2.550457 17.553711 2.651367 C 17.79134 2.752279 17.998047 2.890625 18.173828 3.066406 C 18.349609 3.242188 18.487955 3.448895 18.588867 3.686523 C 18.689777 3.924154 18.740234 4.179688 18.740234 4.453125 C 18.740234 4.707031 18.691406 4.954428 18.59375 5.195312 C 18.496094 5.436199 18.356119 5.647787 18.173828 5.830078 L 11.230469 12.773438 C 11.197916 13.085938 11.110025 13.378906 10.966797 13.652344 C 10.823567 13.925781 10.639648 14.161784 10.415039 14.360352 C 10.19043 14.55892 9.936523 14.71517 9.65332 14.829102 C 9.370117 14.943034 9.06901 15 8.75 15 L 2.5 15 L 2.5 13.75 Z M 16.796875 3.75 C 16.608072 3.75 16.445312 3.818359 16.308594 3.955078 L 11.962891 8.300781 C 12.333984 8.58724 12.66276 8.916016 12.949219 9.287109 L 17.294922 4.941406 C 17.431641 4.804688 17.5 4.641928 17.5 4.453125 C 17.5 4.257812 17.430012 4.091797 17.290039 3.955078 C 17.150064 3.818359 16.985676 3.75 16.796875 3.75 Z M 10.175781 10.087891 C 10.572916 10.348308 10.901692 10.677084 11.162109 11.074219 L 12.060547 10.185547 C 11.787109 9.794922 11.455078 9.462891 11.064453 9.189453 Z M 10 12.5 C 10 12.324219 9.967447 12.161459 9.902344 12.011719 C 9.837239 11.861979 9.747721 11.730144 9.633789 11.616211 C 9.519856 11.502279 9.388021 11.412761 9.238281 11.347656 C 9.088541 11.282553 8.925781 11.25 8.75 11.25 C 8.574219 11.25 8.411458 11.282553 8.261719 11.347656 C 8.111979 11.412761 7.980143 11.502279 7.866211 11.616211 C 7.752278 11.730144 7.66276 11.861979 7.597656 12.011719 C 7.532552 12.161459 7.5 12.324219 7.5 12.5 C 7.5 12.942709 7.389322 13.359375 7.167969 13.75 L 8.75 13.75 C 8.919271 13.75 9.080403 13.717448 9.233398 13.652344 C 9.386393 13.58724 9.519856 13.497722 9.633789 13.383789 C 9.747721 13.269857 9.837239 13.136394 9.902344 12.983398 C 9.967447 12.830404 10 12.669271 10 12.5 Z "),
-            new SettingOption(Translator.SettingsMessageList_Title, Translator.SettingsMessageList_Description, WinoPage.MessageListPage,"F1 M 20 1.25 L 20 12.5 L 18.75 12.5 L 18.75 2.5 L 1.25 2.5 L 1.25 13.75 L 3.75 13.75 L 3.75 16.611328 L 6.611328 13.75 L 13.75 13.75 L 13.75 15 L 7.138672 15 L 2.5 19.638672 L 2.5 15 L 0 15 L 0 1.25 Z M 16.875 13.75 L 20 16.875 L 16.875 20 L 15.986328 19.111328 L 17.607422 17.5 L 11.25 17.5 L 11.25 16.25 L 17.607422 16.25 L 15.986328 14.638672 Z "),
-            new SettingOption(Translator.SettingsReadComposePane_Title, Translator.SettingsReadComposePane_Description, WinoPage.ReadComposePanePage,"F1 M 20 2.5 L 20 3.75 L 8.75 3.75 L 8.75 2.5 Z M 17.5 15 L 0 15 L 0 13.75 L 17.5 13.75 Z M 2.5 10 L 20 10 L 20 11.25 L 2.5 11.25 Z M 2.5 17.5 L 20 17.5 L 20 18.75 L 2.5 18.75 Z M 3.125 7.5 C 2.695312 7.5 2.291667 7.416992 1.914062 7.250977 C 1.536458 7.084961 1.206055 6.860352 0.922852 6.577148 C 0.639648 6.293945 0.415039 5.963542 0.249023 5.585938 C 0.083008 5.208334 0 4.804688 0 4.375 C 0 3.945312 0.083008 3.541668 0.249023 3.164062 C 0.415039 2.786459 0.639648 2.456055 0.922852 2.172852 C 1.206055 1.889648 1.536458 1.665039 1.914062 1.499023 C 2.291667 1.333008 2.695312 1.25 3.125 1.25 C 3.554688 1.25 3.958333 1.333008 4.335938 1.499023 C 4.713542 1.665039 5.043945 1.889648 5.327148 2.172852 C 5.610352 2.456055 5.834961 2.786459 6.000977 3.164062 C 6.166992 3.541668 6.25 3.945312 6.25 4.375 L 5 4.375 C 5 4.114584 4.951172 3.870443 4.853516 3.642578 C 4.755859 3.414715 4.622396 3.216146 4.453125 3.046875 C 4.283854 2.877605 4.085286 2.744141 3.857422 2.646484 C 3.629557 2.548828 3.385417 2.5 3.125 2.5 C 2.864583 2.5 2.620443 2.548828 2.392578 2.646484 C 2.164713 2.744141 1.966146 2.877605 1.796875 3.046875 C 1.627604 3.216146 1.494141 3.414715 1.396484 3.642578 C 1.298828 3.870443 1.25 4.114584 1.25 4.375 C 1.25 4.635418 1.298828 4.879559 1.396484 5.107422 C 1.494141 5.335287 1.627604 5.533854 1.796875 5.703125 C 1.966146 5.872396 2.164713 6.005859 2.392578 6.103516 C 2.620443 6.201172 2.864583 6.25 3.125 6.25 L 17.5 6.25 L 17.5 7.5 Z "),
-            new SettingOption(Translator.SettingsAbout_Title, Translator.SettingsAbout_Description, WinoPage.AboutPage,"F1 M 9.375 18.75 C 8.509114 18.75 7.677409 18.639322 6.879883 18.417969 C 6.082356 18.196615 5.335286 17.882486 4.638672 17.475586 C 3.942057 17.068686 3.308919 16.580404 2.739258 16.010742 C 2.169596 15.441081 1.681315 14.807943 1.274414 14.111328 C 0.867513 13.414714 0.553385 12.667644 0.332031 11.870117 C 0.110677 11.072592 0 10.240886 0 9.375 C 0 8.509115 0.110677 7.677409 0.332031 6.879883 C 0.553385 6.082357 0.867513 5.335287 1.274414 4.638672 C 1.681315 3.942059 2.169596 3.30892 2.739258 2.739258 C 3.308919 2.169598 3.942057 1.681316 4.638672 1.274414 C 5.335286 0.867514 6.082356 0.553387 6.879883 0.332031 C 7.677409 0.110678 8.509114 0 9.375 0 C 10.240885 0 11.072591 0.110678 11.870117 0.332031 C 12.667643 0.553387 13.414713 0.867514 14.111328 1.274414 C 14.807942 1.681316 15.44108 2.169598 16.010742 2.739258 C 16.580402 3.30892 17.068684 3.942059 17.475586 4.638672 C 17.882486 5.335287 18.196613 6.082357 18.417969 6.879883 C 18.639322 7.677409 18.75 8.509115 18.75 9.375 C 18.75 10.240886 18.639322 11.072592 18.417969 11.870117 C 18.196613 12.667644 17.882486 13.414714 17.475586 14.111328 C 17.068684 14.807943 16.580402 15.441081 16.010742 16.010742 C 15.44108 16.580404 14.807942 17.068686 14.111328 17.475586 C 13.414713 17.882486 12.667643 18.196615 11.870117 18.417969 C 11.072591 18.639322 10.240885 18.75 9.375 18.75 Z M 9.375 1.25 C 8.626302 1.25 7.906901 1.347656 7.216797 1.542969 C 6.526692 1.738281 5.880533 2.011719 5.27832 2.363281 C 4.676106 2.714844 4.127604 3.138021 3.632812 3.632812 C 3.138021 4.127604 2.714844 4.676107 2.363281 5.27832 C 2.011719 5.880534 1.738281 6.52832 1.542969 7.22168 C 1.347656 7.915039 1.25 8.632812 1.25 9.375 C 1.25 10.117188 1.347656 10.834961 1.542969 11.52832 C 1.738281 12.22168 2.011719 12.869467 2.363281 13.47168 C 2.714844 14.073894 3.138021 14.622396 3.632812 15.117188 C 4.127604 15.611979 4.676106 16.035156 5.27832 16.386719 C 5.880533 16.738281 6.526692 17.011719 7.216797 17.207031 C 7.906901 17.402344 8.626302 17.5 9.375 17.5 C 10.117188 17.5 10.834961 17.402344 11.52832 17.207031 C 12.221679 17.011719 12.869465 16.738281 13.47168 16.386719 C 14.073893 16.035156 14.622396 15.611979 15.117188 15.117188 C 15.611979 14.622396 16.035156 14.073894 16.386719 13.47168 C 16.738281 12.869467 17.011719 12.223308 17.207031 11.533203 C 17.402344 10.8431 17.5 10.123698 17.5 9.375 C 17.5 8.632812 17.402344 7.915039 17.207031 7.22168 C 17.011719 6.52832 16.738281 5.880534 16.386719 5.27832 C 16.035156 4.676107 15.611979 4.127604 15.117188 3.632812 C 14.622396 3.138021 14.073893 2.714844 13.47168 2.363281 C 12.869465 2.011719 12.221679 1.738281 11.52832 1.542969 C 10.834961 1.347656 10.117188 1.25 9.375 1.25 Z M 8.75 7.5 L 10 7.5 L 10 13.75 L 8.75 13.75 Z M 8.75 5 L 10 5 L 10 6.25 L 8.75 6.25 Z "),
-        };
-}
diff --git a/Wino.Mail/Styles/ImagePreviewControl.xaml b/Wino.Mail/Styles/ImagePreviewControl.xaml
deleted file mode 100644
index b09c2143..00000000
--- a/Wino.Mail/Styles/ImagePreviewControl.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Controls">
-
-    <Style TargetType="controls:ImagePreviewControl">
-        <Style.Setters>
-            <Setter Property="Width" Value="34" />
-            <Setter Property="Height" Value="34" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="controls:ImagePreviewControl">
-                        <Grid>
-                            <!--  Ellipse Initials  -->
-                            <Grid x:Name="EllipseInitialsGrid">
-                                <Ellipse
-                                    x:Name="Ellipse"
-                                    Grid.RowSpan="2"
-                                    Width="{TemplateBinding Width}"
-                                    Height="{TemplateBinding Height}"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                                <TextBlock
-                                    x:Name="InitialsTextBlock"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    FontWeight="SemiBold"
-                                    Foreground="White" />
-                            </Grid>
-
-                            <!--  Squircle for favicon  -->
-                            <Border
-                                x:Name="FaviconSquircle"
-                                Width="{TemplateBinding Width}"
-                                Height="{TemplateBinding Height}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Background="Transparent"
-                                CornerRadius="6"
-                                Visibility="Collapsed">
-                                <Image x:Name="FaviconImage" Stretch="Fill" />
-                            </Border>
-
-                            <Image
-                                x:Name="KnownHostImage"
-                                Width="{TemplateBinding Width}"
-                                Height="{TemplateBinding Height}"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Stretch="UniformToFill"
-                                Visibility="Collapsed" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style.Setters>
-    </Style>
-</ResourceDictionary>
diff --git a/Wino.Mail/Views/Abstract/AppShellAbstract.cs b/Wino.Mail/Views/Abstract/AppShellAbstract.cs
deleted file mode 100644
index 9f1572fd..00000000
--- a/Wino.Mail/Views/Abstract/AppShellAbstract.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Mail.ViewModels;
-
-namespace Wino.Views.Abstract;
-
-public abstract class AppShellAbstract : BasePage<AppShellViewModel>
-{
-}
diff --git a/Wino.Mail/Views/Abstract/EditAccountDetailsPageAbstract.cs b/Wino.Mail/Views/Abstract/EditAccountDetailsPageAbstract.cs
deleted file mode 100644
index 91cf2854..00000000
--- a/Wino.Mail/Views/Abstract/EditAccountDetailsPageAbstract.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Mail.ViewModels;
-
-namespace Wino.Views.Abstract;
-public partial class EditAccountDetailsPageAbstract : BasePage<EditAccountDetailsPageViewModel> { }
diff --git a/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs b/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs
deleted file mode 100644
index 6d739c56..00000000
--- a/Wino.Mail/Views/Abstract/LanguageTimePageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Mail.ViewModels;
-
-namespace Wino.Views.Abstract;
-
-public abstract class LanguageTimePageAbstract : BasePage<LanguageTimePageViewModel> { }
diff --git a/Wino.Mail/Views/Abstract/MailListPageAbstract.cs b/Wino.Mail/Views/Abstract/MailListPageAbstract.cs
deleted file mode 100644
index 84dfb9c0..00000000
--- a/Wino.Mail/Views/Abstract/MailListPageAbstract.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Mail.ViewModels;
-
-namespace Wino.Views.Abstract;
-
-public partial class MailListPageAbstract : BasePage<MailListPageViewModel>;
diff --git a/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs b/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs
deleted file mode 100644
index b3844953..00000000
--- a/Wino.Mail/Views/Abstract/WelcomePageAbstract.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Wino.Core.UWP;
-using Wino.Mail.ViewModels;
-
-namespace Wino.Views.Abstract;
-
-public abstract class WelcomePageAbstract : BasePage<WelcomePageViewModel>
-{
-
-}
diff --git a/Wino.Mail/Views/Account/AccountDetailsPage.xaml b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
deleted file mode 100644
index 8317a8e6..00000000
--- a/Wino.Mail/Views/Account/AccountDetailsPage.xaml
+++ /dev/null
@@ -1,254 +0,0 @@
-<abstract:AccountDetailsPageAbstract
-    x:Class="Wino.Views.AccountDetailsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:controls1="using:Wino.Controls"
-    xmlns:coreControls="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:folders="using:Wino.Core.Domain.Models.Folders"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-    xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
-    xmlns:local="using:Wino.Views"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    x:Name="root"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <DataTemplate x:Key="FolderStructureMenuFlyoutItemTemplate" x:DataType="folders:IMailItemFolder">
-            <muxc:TreeViewItem
-                CanDrag="False"
-                IsExpanded="True"
-                ItemsSource="{x:Bind ChildFolders}">
-                <Grid Height="32">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="200" />
-                    </Grid.ColumnDefinitions>
-                    <coreControls:WinoFontIcon FontSize="20" Icon="{x:Bind helpers:XamlHelpers.GetSpecialFolderPathIconGeometry(SpecialFolderType)}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="12,0"
-                        VerticalAlignment="Center"
-                        Text="{x:Bind FolderName}" />
-
-                    <Grid Grid.Column="2">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <CheckBox
-                            MinWidth="0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Checked="SyncFolderToggled"
-                            IsChecked="{x:Bind IsSynchronizationEnabled, Mode=OneWay}"
-                            Tag="{Binding}"
-                            Unchecked="SyncFolderToggled"
-                            Visibility="{x:Bind IsMoveTarget}" />
-
-                        <CheckBox
-                            Grid.Column="1"
-                            MinWidth="0"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Checked="UnreadBadgeCheckboxToggled"
-                            IsChecked="{x:Bind ShowUnreadCount, Mode=OneWay}"
-                            Tag="{Binding}"
-                            Unchecked="UnreadBadgeCheckboxToggled"
-                            Visibility="{x:Bind IsMoveTarget}" />
-                    </Grid>
-                </Grid>
-            </muxc:TreeViewItem>
-        </DataTemplate>
-    </Page.Resources>
-
-    <ScrollViewer>
-        <StackPanel Spacing="4">
-            <StackPanel.ChildrenTransitions>
-                <TransitionCollection>
-                    <RepositionThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </StackPanel.ChildrenTransitions>
-
-            <controls:SettingsCard
-                Command="{x:Bind ViewModel.EditAccountDetailsCommand}"
-                Description="{x:Bind domain:Translator.SettingsEditAccountDetails_Description}"
-                Header="{x:Bind domain:Translator.SettingsEditAccountDetails_Title}"
-                IsClickEnabled="True">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 4.921875 18.75 C 4.433594 18.75 3.966471 18.650717 3.520508 18.452148 C 3.074544 18.25358 2.683919 17.986654 2.348633 17.651367 C 2.013346 17.31608 1.746419 16.925455 1.547852 16.479492 C 1.349284 16.033529 1.25 15.566406 1.25 15.078125 L 1.25 4.921875 C 1.25 4.433594 1.349284 3.966473 1.547852 3.520508 C 1.746419 3.074545 2.013346 2.68392 2.348633 2.348633 C 2.683919 2.013348 3.074544 1.74642 3.520508 1.547852 C 3.966471 1.349285 4.433594 1.25 4.921875 1.25 L 15.078125 1.25 C 15.566406 1.25 16.033527 1.349285 16.479492 1.547852 C 16.925455 1.74642 17.31608 2.013348 17.651367 2.348633 C 17.986652 2.68392 18.25358 3.074545 18.452148 3.520508 C 18.650715 3.966473 18.75 4.433594 18.75 4.921875 L 18.75 15.078125 C 18.75 15.566406 18.650715 16.033529 18.452148 16.479492 C 18.25358 16.925455 17.986652 17.31608 17.651367 17.651367 C 17.31608 17.986654 16.925455 18.25358 16.479492 18.452148 C 16.033527 18.650717 15.566406 18.75 15.078125 18.75 Z M 15.048828 17.5 C 15.374349 17.5 15.685221 17.433268 15.981445 17.299805 C 16.277668 17.166342 16.538086 16.987305 16.762695 16.762695 C 16.987305 16.538086 17.16634 16.27767 17.299805 15.981445 C 17.433268 15.685222 17.5 15.37435 17.5 15.048828 L 17.5 4.951172 C 17.5 4.625651 17.433268 4.314779 17.299805 4.018555 C 17.16634 3.722332 16.987305 3.461914 16.762695 3.237305 C 16.538086 3.012695 16.277668 2.83366 15.981445 2.700195 C 15.685221 2.566732 15.374349 2.5 15.048828 2.5 L 4.951172 2.5 C 4.625651 2.5 4.314778 2.566732 4.018555 2.700195 C 3.722331 2.83366 3.461914 3.012695 3.237305 3.237305 C 3.012695 3.461914 2.833659 3.722332 2.700195 4.018555 C 2.566732 4.314779 2.5 4.625651 2.5 4.951172 L 2.5 15.048828 C 2.5 15.37435 2.566732 15.685222 2.700195 15.981445 C 2.833659 16.27767 3.012695 16.538086 3.237305 16.762695 C 3.461914 16.987305 3.722331 17.166342 4.018555 17.299805 C 4.314778 17.433268 4.625651 17.5 4.951172 17.5 Z M 7.5 7.451172 C 7.5 7.112631 7.568359 6.795248 7.705078 6.499023 C 7.841796 6.202801 8.024088 5.944012 8.251953 5.722656 C 8.479817 5.501303 8.745117 5.325521 9.047852 5.195312 C 9.350586 5.065105 9.667969 5.000001 10 5 C 10.338541 5.000001 10.660807 5.066732 10.966797 5.200195 C 11.272786 5.333659 11.538086 5.512695 11.762695 5.737305 C 11.987304 5.961914 12.16634 6.227214 12.299805 6.533203 C 12.433268 6.839193 12.5 7.161459 12.5 7.5 C 12.5 7.845053 12.433268 8.168945 12.299805 8.47168 C 12.16634 8.774414 11.987304 9.038086 11.762695 9.262695 C 11.538086 9.487305 11.272786 9.666342 10.966797 9.799805 C 10.660807 9.933269 10.338541 10 10 10 C 9.648438 10 9.319661 9.933269 9.013672 9.799805 C 8.707682 9.666342 8.442383 9.48405 8.217773 9.25293 C 7.993164 9.021811 7.817382 8.751628 7.69043 8.442383 C 7.563476 8.133139 7.5 7.802734 7.5 7.451172 Z M 11.25 7.5 C 11.25 7.330729 11.217447 7.169597 11.152344 7.016602 C 11.087239 6.863607 10.997721 6.730145 10.883789 6.616211 C 10.769856 6.502279 10.636393 6.412761 10.483398 6.347656 C 10.330403 6.282553 10.169271 6.25 10 6.25 C 9.824219 6.25 9.661458 6.282553 9.511719 6.347656 C 9.361979 6.412761 9.230143 6.502279 9.116211 6.616211 C 9.002278 6.730145 8.91276 6.86198 8.847656 7.011719 C 8.782552 7.161459 8.75 7.324219 8.75 7.5 C 8.75 7.675781 8.782552 7.84017 8.847656 7.993164 C 8.91276 8.146159 9.00065 8.277995 9.111328 8.388672 C 9.222005 8.49935 9.353841 8.58724 9.506836 8.652344 C 9.65983 8.717448 9.824219 8.75 10 8.75 C 10.175781 8.75 10.338541 8.717448 10.488281 8.652344 C 10.638021 8.58724 10.769856 8.497722 10.883789 8.383789 C 10.997721 8.269857 11.087239 8.138021 11.152344 7.988281 C 11.217447 7.838542 11.25 7.675781 11.25 7.5 Z M 5.488281 12.880859 C 5.488281 12.639975 5.530599 12.41862 5.615234 12.216797 C 5.69987 12.014975 5.81543 11.842448 5.961914 11.699219 C 6.108398 11.55599 6.282552 11.445312 6.484375 11.367188 C 6.686198 11.289062 6.907552 11.25 7.148438 11.25 L 12.851562 11.25 C 13.092447 11.25 13.313801 11.289062 13.515625 11.367188 C 13.717447 11.445312 13.891602 11.55599 14.038086 11.699219 C 14.18457 11.842448 14.30013 12.014975 14.384766 12.216797 C 14.4694 12.41862 14.511719 12.639975 14.511719 12.880859 C 14.511719 13.525391 14.379883 14.0625 14.116211 14.492188 C 13.852539 14.921875 13.505859 15.266928 13.076172 15.527344 C 12.646484 15.787761 12.163086 15.973308 11.625977 16.083984 C 11.088867 16.194662 10.546875 16.25 10 16.25 C 9.453125 16.25 8.911133 16.194662 8.374023 16.083984 C 7.836914 15.973308 7.353516 15.787761 6.923828 15.527344 C 6.494141 15.266928 6.147461 14.921875 5.883789 14.492188 C 5.620117 14.0625 5.488281 13.525391 5.488281 12.880859 Z M 13.261719 12.832031 C 13.261719 12.701823 13.221028 12.613933 13.139648 12.568359 C 13.058268 12.522787 12.962239 12.5 12.851562 12.5 L 7.148438 12.5 C 7.03776 12.5 6.941731 12.522787 6.860352 12.568359 C 6.778971 12.613933 6.738281 12.701823 6.738281 12.832031 C 6.738281 13.294271 6.839192 13.666992 7.041016 13.950195 C 7.242838 14.233398 7.501627 14.453125 7.817383 14.609375 C 8.133138 14.765625 8.483072 14.869792 8.867188 14.921875 C 9.251302 14.973959 9.628906 15 10 15 C 10.371094 15 10.748697 14.973959 11.132812 14.921875 C 11.516927 14.869792 11.866861 14.765625 12.182617 14.609375 C 12.498371 14.453125 12.75716 14.233398 12.958984 13.950195 C 13.160807 13.666992 13.261719 13.294271 13.261719 12.832031 Z " />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>
-
-            <controls:SettingsCard
-                Command="{x:Bind ViewModel.EditAliasesCommand}"
-                Description="{x:Bind domain:Translator.SettingsManageAliases_Description}"
-                Header="{x:Bind domain:Translator.SettingsManageAliases_Title}"
-                IsClickEnabled="True">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.440104 0 10.089518 0.130209 10.698242 0.390625 C 11.306966 0.651043 11.837564 1.007488 12.290039 1.459961 C 12.742513 1.912436 13.098958 2.443035 13.359375 3.051758 C 13.619791 3.660482 13.75 4.309896 13.75 5 C 13.75 5.690104 13.619791 6.339519 13.359375 6.948242 C 13.098958 7.556967 12.742513 8.087565 12.290039 8.540039 C 11.837564 8.992514 11.306966 9.348959 10.698242 9.609375 C 10.089518 9.869792 9.440104 10 8.75 10 C 8.059896 10 7.410481 9.869792 6.801758 9.609375 C 6.193034 9.348959 5.662435 8.992514 5.209961 8.540039 C 4.757487 8.087565 4.401042 7.556967 4.140625 6.948242 C 3.880208 6.339519 3.75 5.690104 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 0 13.681641 C 0 13.349609 0.068359 13.035482 0.205078 12.739258 C 0.341797 12.443034 0.525716 12.184245 0.756836 11.962891 C 0.987956 11.741537 1.254883 11.567383 1.557617 11.44043 C 1.860352 11.313477 2.177734 11.25 2.509766 11.25 L 15 11.25 C 15.455729 11.25 15.87565 11.363933 16.259766 11.591797 C 16.643879 11.819662 16.949869 12.132162 17.177734 12.529297 C 17.067057 12.509766 16.962891 12.5 16.865234 12.5 C 16.676432 12.5 16.495768 12.52767 16.323242 12.583008 C 16.150715 12.638347 15.986328 12.714844 15.830078 12.8125 C 15.7194 12.708334 15.59082 12.630209 15.444336 12.578125 C 15.297852 12.526042 15.149739 12.5 15 12.5 L 2.509766 12.5 C 2.333984 12.5 2.169596 12.532553 2.016602 12.597656 C 1.863607 12.662761 1.730143 12.750651 1.616211 12.861328 C 1.502279 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.394531 1.359049 14.964193 1.577148 15.458984 C 1.795247 15.953776 2.089844 16.385092 2.460938 16.75293 C 2.832031 17.120768 3.261719 17.430014 3.75 17.680664 C 4.238281 17.931314 4.754231 18.134766 5.297852 18.291016 C 5.841471 18.447266 6.396484 18.561197 6.962891 18.632812 C 7.529297 18.704428 8.072916 18.74349 8.59375 18.75 L 9.814453 19.960938 C 9.638672 19.973959 9.461263 19.983725 9.282227 19.990234 C 9.103189 19.996744 8.925781 20 8.75 20 C 8.085938 20 7.408854 19.954428 6.71875 19.863281 C 6.028646 19.772135 5.3597 19.624023 4.711914 19.418945 C 4.064127 19.213867 3.453776 18.948568 2.880859 18.623047 C 2.307943 18.297525 1.808268 17.900391 1.381836 17.431641 C 0.955404 16.962891 0.61849 16.419271 0.371094 15.800781 C 0.123698 15.182292 0 14.475912 0 13.681641 Z M 8.75 16.875 C 8.75 16.705729 8.811849 16.559244 8.935547 16.435547 L 11.435547 13.935547 C 11.559244 13.81185 11.705729 13.75 11.875 13.75 C 12.04427 13.75 12.190754 13.81185 12.314453 13.935547 C 12.43815 14.059245 12.5 14.205729 12.5 14.375 C 12.5 14.544271 12.43815 14.690756 12.314453 14.814453 L 10.888672 16.25 L 17.861328 16.25 L 16.435547 14.814453 C 16.311848 14.690756 16.25 14.544271 16.25 14.375 C 16.25 14.205729 16.311848 14.059245 16.435547 13.935547 C 16.559244 13.81185 16.705729 13.75 16.875 13.75 C 17.04427 13.75 17.190754 13.81185 17.314453 13.935547 L 19.814453 16.435547 C 19.93815 16.559244 20 16.705729 20 16.875 C 20 17.044271 19.93815 17.190756 19.814453 17.314453 L 17.314453 19.814453 C 17.190754 19.93815 17.04427 20 16.875 20 C 16.705729 20 16.559244 19.93815 16.435547 19.814453 C 16.311848 19.690756 16.25 19.544271 16.25 19.375 C 16.25 19.205729 16.311848 19.059244 16.435547 18.935547 L 17.861328 17.5 L 10.888672 17.5 L 12.314453 18.935547 C 12.43815 19.059244 12.5 19.205729 12.5 19.375 C 12.5 19.544271 12.43815 19.690756 12.314453 19.814453 C 12.190754 19.93815 12.04427 20 11.875 20 C 11.705729 20 11.559244 19.93815 11.435547 19.814453 L 8.935547 17.314453 C 8.811849 17.190756 8.75 17.044271 8.75 16.875 Z " />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>
-
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsFolderOptions_Description}" Header="{x:Bind domain:Translator.SettingsFolderOptions_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 3.056641 18.75 C 2.646484 18.75 2.255859 18.666992 1.884766 18.500977 C 1.513672 18.334961 1.189779 18.113607 0.913086 17.836914 C 0.636393 17.560221 0.415039 17.236328 0.249023 16.865234 C 0.083008 16.494141 0 16.103516 0 15.693359 L 0 4.306641 C 0 3.896484 0.083008 3.505859 0.249023 3.134766 C 0.415039 2.763672 0.636393 2.439779 0.913086 2.163086 C 1.189779 1.886395 1.513672 1.665039 1.884766 1.499023 C 2.255859 1.333008 2.646484 1.25 3.056641 1.25 L 6.875 1.25 C 7.324219 1.25 7.711588 1.319988 8.037109 1.459961 C 8.36263 1.599936 8.653971 1.787109 8.911133 2.021484 C 9.168294 2.255859 9.407552 2.522787 9.628906 2.822266 C 9.85026 3.121746 10.078125 3.43099 10.3125 3.75 L 16.943359 3.75 C 17.353516 3.75 17.744141 3.833008 18.115234 3.999023 C 18.486328 4.165039 18.810221 4.386394 19.086914 4.663086 C 19.363605 4.939779 19.584961 5.263672 19.750977 5.634766 C 19.916992 6.005859 20 6.396484 20 6.806641 L 20 9.902344 C 19.817707 9.674479 19.622395 9.456381 19.414062 9.248047 C 19.205729 9.039714 18.984375 8.847656 18.75 8.671875 L 18.75 6.875 C 18.75 6.621095 18.701172 6.380209 18.603516 6.152344 C 18.505859 5.924479 18.370768 5.724284 18.198242 5.551758 C 18.025715 5.379232 17.82552 5.244142 17.597656 5.146484 C 17.369791 5.048829 17.128906 5.000001 16.875 5 L 10.185547 5 C 9.957682 5.14974 9.736328 5.299479 9.521484 5.449219 C 9.306641 5.598959 9.086914 5.732423 8.862305 5.849609 C 8.637695 5.966798 8.40332 6.062826 8.15918 6.137695 C 7.915039 6.212565 7.649739 6.25 7.363281 6.25 L 1.25 6.25 L 1.25 15.625 C 1.25 15.878906 1.298828 16.119791 1.396484 16.347656 C 1.494141 16.575521 1.629232 16.775717 1.801758 16.948242 C 1.974284 17.120768 2.174479 17.255859 2.402344 17.353516 C 2.630208 17.451172 2.871094 17.5 3.125 17.5 L 7.900391 17.5 C 8.011067 17.721354 8.129883 17.936197 8.256836 18.144531 C 8.383789 18.352865 8.522135 18.554688 8.671875 18.75 Z M 7.363281 5 C 7.539062 5.000001 7.701823 4.977215 7.851562 4.931641 C 8.001302 4.886068 8.147786 4.825847 8.291016 4.750977 C 8.434244 4.676107 8.570963 4.5931 8.701172 4.501953 C 8.83138 4.410808 8.964844 4.316406 9.101562 4.21875 C 8.951822 4.016928 8.805338 3.813477 8.662109 3.608398 C 8.51888 3.40332 8.36263 3.219402 8.193359 3.056641 C 8.024088 2.893881 7.833658 2.760418 7.62207 2.65625 C 7.410481 2.552084 7.161458 2.5 6.875 2.5 L 3.125 2.5 C 2.871094 2.5 2.630208 2.548828 2.402344 2.646484 C 2.174479 2.744141 1.974284 2.879232 1.801758 3.051758 C 1.629232 3.224285 1.494141 3.42448 1.396484 3.652344 C 1.298828 3.880209 1.25 4.121094 1.25 4.375 L 1.25 5 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 16.875 13.75 C 17.04427 13.75 17.190754 13.688151 17.314453 13.564453 C 17.43815 13.440756 17.5 13.294271 17.5 13.125 L 17.5 11.25 C 17.5 11.080729 17.43815 10.934245 17.314453 10.810547 C 17.190754 10.68685 17.04427 10.625 16.875 10.625 C 16.751301 10.625 16.650391 10.647787 16.572266 10.693359 C 16.494141 10.738933 16.430664 10.799154 16.381836 10.874023 C 16.333008 10.948894 16.298828 11.035156 16.279297 11.132812 C 16.259766 11.230469 16.25 11.331381 16.25 11.435547 C 15.94401 11.272787 15.642902 11.149089 15.34668 11.064453 C 15.050455 10.979818 14.726562 10.9375 14.375 10.9375 C 14.140625 10.9375 13.901367 10.961914 13.657227 11.010742 C 13.413086 11.05957 13.173828 11.131186 12.939453 11.225586 C 12.705078 11.319987 12.482096 11.43392 12.270508 11.567383 C 12.058919 11.700847 11.875 11.855469 11.71875 12.03125 C 11.660156 12.096354 11.614583 12.163086 11.582031 12.231445 C 11.549479 12.299805 11.533203 12.379558 11.533203 12.470703 C 11.533203 12.646484 11.595052 12.796225 11.71875 12.919922 C 11.842447 13.04362 11.992188 13.105469 12.167969 13.105469 C 12.278645 13.105469 12.39746 13.058269 12.524414 12.963867 C 12.651366 12.869467 12.799479 12.763672 12.96875 12.646484 C 13.138021 12.529297 13.334961 12.423503 13.55957 12.329102 C 13.78418 12.234701 14.049479 12.1875 14.355469 12.1875 C 14.583333 12.1875 14.794922 12.211914 14.990234 12.260742 C 15.185547 12.30957 15.384114 12.389323 15.585938 12.5 L 15.332031 12.5 C 15.214844 12.5 15.099283 12.504883 14.985352 12.514648 C 14.871419 12.524414 14.76888 12.550456 14.677734 12.592773 C 14.586588 12.635092 14.513346 12.698568 14.458008 12.783203 C 14.402669 12.867839 14.375 12.981771 14.375 13.125 C 14.375 13.294271 14.436849 13.440756 14.560547 13.564453 C 14.684244 13.688151 14.830729 13.75 15 13.75 Z M 12.5 17.314453 C 12.805989 17.477213 13.107096 17.600912 13.40332 17.685547 C 13.699544 17.770182 14.023438 17.8125 14.375 17.8125 C 14.609375 17.8125 14.85026 17.788086 15.097656 17.739258 C 15.345051 17.69043 15.584309 17.618814 15.81543 17.524414 C 16.046549 17.430014 16.266275 17.31608 16.474609 17.182617 C 16.682941 17.049154 16.868488 16.894531 17.03125 16.71875 C 17.154947 16.588541 17.216797 16.438803 17.216797 16.269531 C 17.216797 16.100262 17.154947 15.953776 17.03125 15.830078 C 16.907551 15.706381 16.761066 15.644531 16.591797 15.644531 C 16.461588 15.644531 16.334635 15.691732 16.210938 15.786133 C 16.087238 15.880534 15.94401 15.986328 15.78125 16.103516 C 15.618489 16.220703 15.426432 16.326498 15.205078 16.420898 C 14.983724 16.515299 14.713541 16.5625 14.394531 16.5625 C 14.166666 16.5625 13.955078 16.538086 13.759766 16.489258 C 13.564453 16.44043 13.365885 16.360678 13.164062 16.25 L 13.417969 16.25 C 13.528646 16.25 13.64095 16.245117 13.754883 16.235352 C 13.868814 16.225586 13.971354 16.199545 14.0625 16.157227 C 14.153646 16.114908 14.228516 16.051432 14.287109 15.966797 C 14.345703 15.882162 14.375 15.768229 14.375 15.625 C 14.375 15.455729 14.31315 15.309245 14.189453 15.185547 C 14.065754 15.06185 13.91927 15 13.75 15 L 11.875 15 C 11.705729 15 11.559244 15.06185 11.435547 15.185547 C 11.311849 15.309245 11.25 15.455729 11.25 15.625 L 11.25 17.5 C 11.25 17.669271 11.311849 17.815756 11.435547 17.939453 C 11.559244 18.06315 11.705729 18.125 11.875 18.125 C 11.998697 18.125 12.099609 18.102213 12.177734 18.056641 C 12.255859 18.011068 12.319336 17.950846 12.368164 17.875977 C 12.416992 17.801107 12.451172 17.714844 12.470703 17.617188 C 12.490234 17.519531 12.5 17.418619 12.5 17.314453 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        ActionIcon="Add"
-                        Description="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Description}"
-                        Header="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Title}"
-                        IsActionIconVisible="True">
-                        <controls:SettingsCard.Content>
-                            <Button Command="{x:Bind ViewModel.SetupSpecialFoldersCommand}" Content="{x:Bind domain:Translator.SettingConfigureSpecialFolders_Button}" />
-                        </controls:SettingsCard.Content>
-                    </controls:SettingsCard>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <ScrollViewer>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="200" />
-                                </Grid.ColumnDefinitions>
-
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="*" />
-                                </Grid.RowDefinitions>
-
-                                <!--  Headers  -->
-                                <Grid Grid.Column="1">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBlock
-                                        FontWeight="SemiBold"
-                                        Text="Synchronize"
-                                        TextWrapping="Wrap" />
-                                    <TextBlock
-                                        Grid.Column="1"
-                                        FontWeight="SemiBold"
-                                        Text="Unread Badge"
-                                        TextWrapping="Wrap" />
-                                </Grid>
-
-                                <!--  TODO: Items here are draggable. Which is causing tree view to crash.  -->
-                                <muxc:TreeView
-                                    x:Name="FolderTreeView"
-                                    Grid.Row="1"
-                                    Grid.ColumnSpan="2"
-                                    CanDragItems="False"
-                                    CanReorderItems="False"
-                                    ItemTemplate="{StaticResource FolderStructureMenuFlyoutItemTemplate}"
-                                    ItemsSource="{x:Bind ViewModel.CurrentFolders, Mode=OneWay}"
-                                    SelectionMode="None" />
-                            </Grid>
-                        </ScrollViewer>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsNotificationsAndTaskbar_Description}" Header="{x:Bind domain:Translator.SettingsNotificationsAndTaskbar_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="F1 M 8.125 16.25 C 7.871094 16.25 7.630208 16.201172 7.402344 16.103516 C 7.174479 16.005859 6.974283 15.870769 6.801758 15.698242 C 6.629231 15.525717 6.494141 15.325521 6.396484 15.097656 C 6.298828 14.869792 6.25 14.628906 6.25 14.375 L 6.25 5.625 C 6.25 5.371094 6.298828 5.130209 6.396484 4.902344 C 6.494141 4.67448 6.629231 4.474285 6.801758 4.301758 C 6.974283 4.129232 7.174479 3.994141 7.402344 3.896484 C 7.630208 3.798828 7.871094 3.75 8.125 3.75 L 18.125 3.75 C 18.378906 3.75 18.619791 3.798828 18.847656 3.896484 C 19.07552 3.994141 19.275715 4.129232 19.448242 4.301758 C 19.620768 4.474285 19.755859 4.67448 19.853516 4.902344 C 19.951172 5.130209 20 5.371094 20 5.625 L 20 14.375 C 20 14.628906 19.951172 14.869792 19.853516 15.097656 C 19.755859 15.325521 19.620768 15.525717 19.448242 15.698242 C 19.275715 15.870769 19.07552 16.005859 18.847656 16.103516 C 18.619791 16.201172 18.378906 16.25 18.125 16.25 Z M 18.125 15 C 18.29427 15 18.440754 14.938151 18.564453 14.814453 C 18.68815 14.690756 18.75 14.544271 18.75 14.375 L 18.75 5.625 C 18.75 5.455729 18.68815 5.309245 18.564453 5.185547 C 18.440754 5.06185 18.29427 5.000001 18.125 5 L 8.125 5 C 7.955729 5.000001 7.809245 5.06185 7.685547 5.185547 C 7.561849 5.309245 7.5 5.455729 7.5 5.625 L 7.5 14.375 C 7.5 14.544271 7.561849 14.690756 7.685547 14.814453 C 7.809245 14.938151 7.955729 15 8.125 15 Z M 0.625 7.5 C 0.455729 7.5 0.309245 7.438151 0.185547 7.314453 C 0.061849 7.190756 0 7.044271 0 6.875 C 0 6.705729 0.061849 6.559245 0.185547 6.435547 C 0.309245 6.31185 0.455729 6.25 0.625 6.25 L 4.375 6.25 C 4.544271 6.25 4.690755 6.31185 4.814453 6.435547 C 4.938151 6.559245 5 6.705729 5 6.875 C 5 7.044271 4.938151 7.190756 4.814453 7.314453 C 4.690755 7.438151 4.544271 7.5 4.375 7.5 Z M 9.375 7.5 C 9.205729 7.5 9.059244 7.438151 8.935547 7.314453 C 8.811849 7.190756 8.75 7.044271 8.75 6.875 C 8.75 6.705729 8.811849 6.559245 8.935547 6.435547 C 9.059244 6.31185 9.205729 6.25 9.375 6.25 L 16.875 6.25 C 17.04427 6.25 17.190754 6.31185 17.314453 6.435547 C 17.43815 6.559245 17.5 6.705729 17.5 6.875 C 17.5 7.044271 17.43815 7.190756 17.314453 7.314453 C 17.190754 7.438151 17.04427 7.5 16.875 7.5 Z M 1.875 10 C 1.705729 10 1.559245 9.938151 1.435547 9.814453 C 1.311849 9.690756 1.25 9.544271 1.25 9.375 C 1.25 9.205729 1.311849 9.059245 1.435547 8.935547 C 1.559245 8.81185 1.705729 8.75 1.875 8.75 L 4.375 8.75 C 4.544271 8.75 4.690755 8.81185 4.814453 8.935547 C 4.938151 9.059245 5 9.205729 5 9.375 C 5 9.544271 4.938151 9.690756 4.814453 9.814453 C 4.690755 9.938151 4.544271 10 4.375 10 Z M 9.375 10 C 9.205729 10 9.059244 9.938151 8.935547 9.814453 C 8.811849 9.690756 8.75 9.544271 8.75 9.375 C 8.75 9.205729 8.811849 9.059245 8.935547 8.935547 C 9.059244 8.81185 9.205729 8.75 9.375 8.75 L 10.625 8.75 C 10.794271 8.75 10.940755 8.81185 11.064453 8.935547 C 11.18815 9.059245 11.25 9.205729 11.25 9.375 C 11.25 9.544271 11.18815 9.690756 11.064453 9.814453 C 10.940755 9.938151 10.794271 10 10.625 10 Z M 13.75 13.75 C 13.574219 13.75 13.40983 13.717448 13.256836 13.652344 C 13.103841 13.58724 12.972005 13.49935 12.861328 13.388672 C 12.75065 13.277995 12.66276 13.146159 12.597656 12.993164 C 12.532552 12.84017 12.5 12.675781 12.5 12.5 L 12.5 10 C 12.5 9.824219 12.532552 9.661459 12.597656 9.511719 C 12.66276 9.361979 12.752278 9.230144 12.866211 9.116211 C 12.980143 9.002279 13.111979 8.912761 13.261719 8.847656 C 13.411458 8.782553 13.574219 8.75 13.75 8.75 L 16.25 8.75 C 16.41927 8.75 16.580402 8.782553 16.733398 8.847656 C 16.886393 8.912761 17.019855 9.002279 17.133789 9.116211 C 17.247721 9.230144 17.337238 9.363607 17.402344 9.516602 C 17.467447 9.669597 17.5 9.830729 17.5 10 L 17.5 12.5 C 17.5 12.675781 17.467447 12.838542 17.402344 12.988281 C 17.337238 13.138021 17.247721 13.269857 17.133789 13.383789 C 17.019855 13.497722 16.88802 13.58724 16.738281 13.652344 C 16.588541 13.717448 16.425781 13.75 16.25 13.75 Z M 13.75 10 L 13.75 12.5 L 16.25 12.5 L 16.25 10 Z M 3.125 12.5 C 2.955729 12.5 2.809245 12.438151 2.685547 12.314453 C 2.561849 12.190756 2.5 12.044271 2.5 11.875 C 2.5 11.705729 2.561849 11.559245 2.685547 11.435547 C 2.809245 11.31185 2.955729 11.25 3.125 11.25 L 4.375 11.25 C 4.544271 11.25 4.690755 11.31185 4.814453 11.435547 C 4.938151 11.559245 5 11.705729 5 11.875 C 5 12.044271 4.938151 12.190756 4.814453 12.314453 C 4.690755 12.438151 4.544271 12.5 4.375 12.5 Z M 9.375 12.5 C 9.205729 12.5 9.059244 12.438151 8.935547 12.314453 C 8.811849 12.190756 8.75 12.044271 8.75 11.875 C 8.75 11.705729 8.811849 11.559245 8.935547 11.435547 C 9.059244 11.31185 9.205729 11.25 9.375 11.25 L 10.625 11.25 C 10.794271 11.25 10.940755 11.31185 11.064453 11.435547 C 11.18815 11.559245 11.25 11.705729 11.25 11.875 C 11.25 12.044271 11.18815 12.190756 11.064453 12.314453 C 10.940755 12.438151 10.794271 12.5 10.625 12.5 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsNotifications_Description}" Header="{x:Bind domain:Translator.SettingsNotifications_Title}">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 0 0 L 20 0 L 20 16.25 L 13.75 16.25 L 10 20 L 6.25 16.25 L 0 16.25 Z M 16.25 7.5 L 3.75 7.5 L 3.75 8.75 L 16.25 8.75 Z M 16.25 3.75 L 3.75 3.75 L 3.75 5 L 16.25 5 Z M 11.25 11.25 L 3.75 11.25 L 3.75 12.5 L 11.25 12.5 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.AreNotificationsEnabled, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsTaskbarBadge_Description}" Header="{x:Bind domain:Translator.SettingsTaskbarBadge_Title}">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 3.330078 10 C 3.330078 9.388021 3.409831 8.797201 3.569336 8.227539 C 3.728841 7.657879 3.95345 7.125652 4.243164 6.630859 C 4.532877 6.136068 4.879557 5.68685 5.283203 5.283203 C 5.686849 4.879559 6.136067 4.532879 6.630859 4.243164 C 7.125651 3.953451 7.657877 3.728842 8.227539 3.569336 C 8.7972 3.409832 9.388021 3.330078 10 3.330078 C 10.611979 3.330078 11.202799 3.409832 11.772461 3.569336 C 12.342121 3.728842 12.874348 3.953451 13.369141 4.243164 C 13.863932 4.532879 14.31315 4.879559 14.716797 5.283203 C 15.120441 5.68685 15.467121 6.136068 15.756836 6.630859 C 16.046549 7.125652 16.271158 7.657879 16.430664 8.227539 C 16.590168 8.797201 16.669922 9.388021 16.669922 10 C 16.669922 10.611979 16.590168 11.2028 16.430664 11.772461 C 16.271158 12.342123 16.046549 12.87435 15.756836 13.369141 C 15.467121 13.863933 15.120441 14.313151 14.716797 14.716797 C 14.31315 15.120443 13.863932 15.467123 13.369141 15.756836 C 12.874348 16.046551 12.342121 16.27116 11.772461 16.430664 C 11.202799 16.59017 10.611979 16.669922 10 16.669922 C 9.388021 16.669922 8.7972 16.59017 8.227539 16.430664 C 7.657877 16.27116 7.125651 16.046551 6.630859 15.756836 C 6.136067 15.467123 5.686849 15.120443 5.283203 14.716797 C 4.879557 14.313151 4.532877 13.863933 4.243164 13.369141 C 3.95345 12.87435 3.728841 12.342123 3.569336 11.772461 C 3.409831 11.2028 3.330078 10.611979 3.330078 10 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsTaskbarBadgeEnabled, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-
-
-            <!--  TODO  -->
-            <!--<controls:SettingsCard
-                Header="Special Folders"
-                IsClickEnabled="True"
-                Command="{x:Bind ViewModel.SpecialFoldersCommand}"
-                Description="Setup functional folders for Wino to work with like Spam, Trash, Archive etc.">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 3.056641 18.75 C 2.646484 18.75 2.255859 18.666992 1.884766 18.500977 C 1.513672 18.334961 1.189779 18.113607 0.913086 17.836914 C 0.636393 17.560221 0.415039 17.236328 0.249023 16.865234 C 0.083008 16.494141 0 16.103516 0 15.693359 L 0 4.306641 C 0 3.896484 0.083008 3.505859 0.249023 3.134766 C 0.415039 2.763672 0.636393 2.439779 0.913086 2.163086 C 1.189779 1.886395 1.513672 1.665039 1.884766 1.499023 C 2.255859 1.333008 2.646484 1.25 3.056641 1.25 L 6.875 1.25 C 7.324219 1.25 7.709961 1.319988 8.032227 1.459961 C 8.354492 1.599936 8.645833 1.787109 8.90625 2.021484 C 9.166666 2.255859 9.407552 2.522787 9.628906 2.822266 C 9.85026 3.121746 10.078125 3.43099 10.3125 3.75 L 15.673828 3.75 C 16.077473 3.75 16.464844 3.831381 16.835938 3.994141 C 17.207031 4.156902 17.532551 4.376629 17.8125 4.65332 C 18.092447 4.930014 18.317057 5.250651 18.486328 5.615234 C 18.655598 5.979818 18.743488 6.363933 18.75 6.767578 C 19.055988 7.008464 19.293619 7.301433 19.462891 7.646484 C 19.63216 7.991537 19.716797 8.359375 19.716797 8.75 C 19.716797 8.808594 19.716797 8.865561 19.716797 8.920898 C 19.716797 8.976237 19.710285 9.033203 19.697266 9.091797 L 18.730469 16.054688 C 18.678385 16.425781 18.561197 16.775717 18.378906 17.104492 C 18.196613 17.433268 17.96875 17.719727 17.695312 17.963867 C 17.421875 18.208008 17.112629 18.400064 16.767578 18.540039 C 16.422525 18.680014 16.061197 18.75 15.683594 18.75 Z M 17.392578 6.259766 C 17.327473 6.070964 17.236328 5.900065 17.119141 5.74707 C 17.001953 5.594076 16.865234 5.46224 16.708984 5.351562 C 16.552734 5.240886 16.383463 5.154623 16.201172 5.092773 C 16.018879 5.030926 15.826822 5.000001 15.625 5 L 9.6875 5 L 8.378906 3.251953 C 8.203125 3.017578 7.981771 2.83366 7.714844 2.700195 C 7.447917 2.566732 7.167969 2.5 6.875 2.5 L 3.125 2.5 C 2.871094 2.5 2.630208 2.548828 2.402344 2.646484 C 2.174479 2.744141 1.974284 2.879232 1.801758 3.051758 C 1.629232 3.224285 1.494141 3.42448 1.396484 3.652344 C 1.298828 3.880209 1.25 4.121094 1.25 4.375 L 1.25 15.625 C 1.25 15.664062 1.251628 15.701498 1.254883 15.737305 C 1.258138 15.773112 1.259766 15.810547 1.259766 15.849609 L 2.832031 8.242188 C 2.890625 7.95573 2.996419 7.690431 3.149414 7.446289 C 3.302409 7.202149 3.487956 6.992188 3.706055 6.816406 C 3.924154 6.640626 4.168294 6.502279 4.438477 6.401367 C 4.708659 6.300456 4.990234 6.25 5.283203 6.25 L 17.226562 6.25 C 17.259113 6.25 17.286783 6.25 17.30957 6.25 C 17.332355 6.25 17.360025 6.253256 17.392578 6.259766 Z M 15.634766 17.5 C 15.869141 17.5 16.092121 17.459311 16.303711 17.37793 C 16.515299 17.296549 16.704102 17.182617 16.870117 17.036133 C 17.036133 16.889648 17.172852 16.71875 17.280273 16.523438 C 17.387695 16.328125 17.457682 16.113281 17.490234 15.878906 L 18.457031 8.925781 C 18.463541 8.893229 18.466797 8.863933 18.466797 8.837891 C 18.466797 8.81185 18.466797 8.782553 18.466797 8.75 C 18.466797 8.580729 18.434244 8.419597 18.369141 8.266602 C 18.304035 8.113607 18.216145 7.980144 18.105469 7.866211 C 17.994791 7.752279 17.864582 7.662762 17.714844 7.597656 C 17.565104 7.532553 17.402344 7.5 17.226562 7.5 L 5.283203 7.5 C 5.133463 7.5 4.991862 7.524414 4.858398 7.573242 C 4.724935 7.62207 4.602864 7.69043 4.492188 7.77832 C 4.38151 7.866211 4.287109 7.972006 4.208984 8.095703 C 4.130859 8.219401 4.078776 8.352865 4.052734 8.496094 L 2.246094 17.275391 C 2.526042 17.425131 2.81901 17.5 3.125 17.5 Z " />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>-->
-
-            <controls:SettingsCard
-                Command="{x:Bind ViewModel.EditSignatureCommand}"
-                Description="{x:Bind domain:Translator.SettingsSignature_Description}"
-                Header="{x:Bind domain:Translator.SettingsSignature_Title}"
-                IsClickEnabled="True">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 17.060547 2.832031 C 17.151691 2.884115 17.226562 2.958984 17.285156 3.056641 C 17.34375 3.154297 17.373047 3.258465 17.373047 3.369141 C 17.373047 3.421225 17.366535 3.470053 17.353516 3.515625 C 17.340494 3.561199 17.324219 3.606771 17.304688 3.652344 L 10.400391 17.470703 C 10.341797 17.5944 10.25065 17.685547 10.126953 17.744141 L 8.4375 18.59375 C 8.229166 18.697916 8.004557 18.75 7.763672 18.75 C 7.73112 18.75 7.700195 18.75 7.670898 18.75 C 7.641602 18.75 7.610677 18.746744 7.578125 18.740234 L 7.119141 19.658203 C 7.067057 19.762369 6.99056 19.845377 6.889648 19.907227 C 6.788736 19.969076 6.679687 20 6.5625 20 C 6.393229 20 6.246745 19.93815 6.123047 19.814453 C 5.999349 19.690756 5.9375 19.544271 5.9375 19.375 C 5.9375 19.296875 5.960286 19.199219 6.005859 19.082031 C 6.051432 18.964844 6.105143 18.842773 6.166992 18.71582 C 6.228841 18.588867 6.292317 18.470053 6.357422 18.359375 C 6.422526 18.248697 6.471354 18.157553 6.503906 18.085938 C 6.334635 17.825521 6.25 17.542318 6.25 17.236328 L 6.25 15.625 C 6.25 15.520834 6.272786 15.426433 6.318359 15.341797 L 11.943359 4.091797 L 11.308594 3.779297 L 8.994141 8.408203 C 8.942057 8.51237 8.86556 8.595378 8.764648 8.657227 C 8.663736 8.719076 8.554688 8.75 8.4375 8.75 C 8.268229 8.75 8.121744 8.688151 7.998047 8.564453 C 7.874349 8.440756 7.8125 8.294271 7.8125 8.125 C 7.8125 8.040365 7.835286 7.945964 7.880859 7.841797 L 10.214844 3.173828 C 10.31901 2.965496 10.458984 2.801107 10.634766 2.680664 C 10.810547 2.560223 11.015625 2.5 11.25 2.5 C 11.477864 2.5 11.694336 2.55534 11.899414 2.666016 C 12.104492 2.776693 12.304688 2.880859 12.5 2.978516 L 13.193359 1.591797 C 13.245441 1.481121 13.321939 1.396484 13.422852 1.337891 C 13.523763 1.279297 13.632812 1.25 13.75 1.25 C 13.834635 1.25 13.90625 1.263021 13.964844 1.289062 C 14.042969 1.132812 14.119466 0.978191 14.194336 0.825195 C 14.269205 0.672201 14.353841 0.533855 14.448242 0.410156 C 14.542643 0.286459 14.658202 0.187176 14.794922 0.112305 C 14.93164 0.037436 15.104166 0 15.3125 0 C 15.520833 0 15.7194 0.048828 15.908203 0.146484 L 16.826172 0.605469 C 17.034504 0.709637 17.198893 0.847982 17.319336 1.020508 C 17.439777 1.193035 17.5 1.39974 17.5 1.640625 C 17.5 1.86198 17.449543 2.068686 17.348633 2.260742 C 17.247721 2.452801 17.151691 2.64323 17.060547 2.832031 Z M 15.087891 1.845703 L 15.9375 2.265625 L 16.220703 1.699219 L 15.371094 1.279297 Z M 15.908203 3.652344 L 14.033203 2.714844 L 7.5 15.771484 L 7.5 17.236328 C 7.5 17.307943 7.526041 17.369791 7.578125 17.421875 C 7.630208 17.473959 7.692057 17.5 7.763672 17.5 C 7.789713 17.5 7.843424 17.483725 7.924805 17.451172 C 8.006185 17.418619 8.100586 17.376303 8.208008 17.324219 C 8.31543 17.272135 8.429361 17.21517 8.549805 17.15332 C 8.670247 17.091471 8.785807 17.03125 8.896484 16.972656 C 9.007161 16.914062 9.104817 16.861979 9.189453 16.816406 C 9.274088 16.770834 9.335938 16.738281 9.375 16.71875 Z M 17.5 7.5 C 17.845051 7.5 18.168945 7.565104 18.47168 7.695312 C 18.774414 7.825521 19.039713 8.004558 19.267578 8.232422 C 19.495441 8.460287 19.674479 8.725586 19.804688 9.02832 C 19.934895 9.331055 20 9.654948 20 10 C 20 10.345053 19.934895 10.668945 19.804688 10.97168 C 19.674479 11.274414 19.495441 11.539714 19.267578 11.767578 C 19.039713 11.995443 18.774414 12.174479 18.47168 12.304688 C 18.168945 12.434896 17.845051 12.5 17.5 12.5 L 14.6875 12.5 L 15.3125 11.25 L 17.5 11.25 C 17.675781 11.25 17.838541 11.217448 17.988281 11.152344 C 18.13802 11.08724 18.269855 10.997722 18.383789 10.883789 C 18.497721 10.769857 18.587238 10.638021 18.652344 10.488281 C 18.717447 10.338542 18.75 10.175781 18.75 10 C 18.75 9.824219 18.717447 9.661459 18.652344 9.511719 C 18.587238 9.361979 18.497721 9.230144 18.383789 9.116211 C 18.269855 9.002279 18.13802 8.912761 17.988281 8.847656 C 17.838541 8.782553 17.675781 8.75 17.5 8.75 C 17.330729 8.75 17.184244 8.688151 17.060547 8.564453 C 16.936848 8.440756 16.875 8.294271 16.875 8.125 C 16.875 7.95573 16.936848 7.809246 17.060547 7.685547 C 17.184244 7.56185 17.330729 7.5 17.5 7.5 Z M 1.25 15.625 C 1.25 16.054688 1.33138 16.459961 1.494141 16.84082 C 1.656901 17.22168 1.879883 17.553711 2.163086 17.836914 C 2.446289 18.120117 2.77832 18.3431 3.15918 18.505859 C 3.540039 18.668619 3.945312 18.75 4.375 18.75 L 4.804688 18.75 C 4.772135 18.847656 4.744466 18.948568 4.72168 19.052734 C 4.698893 19.1569 4.6875 19.264322 4.6875 19.375 C 4.6875 19.485678 4.698893 19.5931 4.72168 19.697266 C 4.744466 19.801432 4.772135 19.902344 4.804688 20 L 4.375 20 C 3.769531 20 3.201497 19.884439 2.670898 19.65332 C 2.140299 19.422201 1.67806 19.109701 1.28418 18.71582 C 0.890299 18.321939 0.577799 17.859701 0.34668 17.329102 C 0.11556 16.798502 0 16.230469 0 15.625 C 0 15.019531 0.11556 14.451498 0.34668 13.920898 C 0.577799 13.3903 0.890299 12.928061 1.28418 12.53418 C 1.67806 12.1403 2.140299 11.8278 2.670898 11.59668 C 3.201497 11.365561 3.769531 11.25 4.375 11.25 L 6.5625 11.25 L 5.9375 12.5 L 4.375 12.5 C 3.945312 12.5 3.540039 12.583008 3.15918 12.749023 C 2.77832 12.915039 2.446289 13.139648 2.163086 13.422852 C 1.879883 13.706055 1.656901 14.036459 1.494141 14.414062 C 1.33138 14.791667 1.25 15.195312 1.25 15.625 Z " />
-                </controls:SettingsCard.HeaderIcon>
-                <ToggleSwitch IsOn="{x:Bind ViewModel.IsSignatureEnabled, Mode=TwoWay}" />
-            </controls:SettingsCard>
-
-
-            <controls:SettingsCard
-                Description="{x:Bind domain:Translator.SettingsFocusedInbox_Description}"
-                Header="{x:Bind domain:Translator.SettingsFocusedInbox_Title}"
-                Visibility="{x:Bind ViewModel.IsFocusedInboxSupportedForAccount, Mode=OneWay}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 1.875 4.6875 C 1.72526 4.335938 1.515299 4.025065 1.245117 3.754883 C 0.974935 3.484701 0.664062 3.27474 0.3125 3.125 C 0.664062 2.975262 0.974935 2.765301 1.245117 2.495117 C 1.515299 2.224936 1.72526 1.914062 1.875 1.5625 C 2.02474 1.914062 2.2347 2.224936 2.504883 2.495117 C 2.775065 2.765301 3.085938 2.975262 3.4375 3.125 C 3.085938 3.27474 2.775065 3.484701 2.504883 3.754883 C 2.2347 4.025065 2.02474 4.335938 1.875 4.6875 Z M 18.125 5.3125 C 18.274738 5.664062 18.484699 5.974936 18.754883 6.245117 C 19.025064 6.5153 19.335938 6.725261 19.6875 6.875 C 19.335938 7.02474 19.025064 7.234701 18.754883 7.504883 C 18.484699 7.775065 18.274738 8.085938 18.125 8.4375 C 17.97526 8.085938 17.765299 7.775065 17.495117 7.504883 C 17.224934 7.234701 16.914062 7.02474 16.5625 6.875 C 16.914062 6.725261 17.224934 6.5153 17.495117 6.245117 C 17.765299 5.974936 17.97526 5.664062 18.125 5.3125 Z M 14.375 6.25 C 14.06901 5.540365 13.649088 4.91862 13.115234 4.384766 C 12.58138 3.850912 11.959635 3.43099 11.25 3.125 C 11.959635 2.819012 12.58138 2.39909 13.115234 1.865234 C 13.649088 1.331381 14.06901 0.709637 14.375 0 C 14.680989 0.709637 15.100911 1.331381 15.634766 1.865234 C 16.168619 2.39909 16.790363 2.819012 17.5 3.125 C 16.790363 3.43099 16.168619 3.850912 15.634766 4.384766 C 15.100911 4.91862 14.680989 5.540365 14.375 6.25 Z M 14.375 1.894531 C 14.010416 2.356771 13.60026 2.766928 13.144531 3.125 C 13.60026 3.489584 14.010416 3.89974 14.375 4.355469 C 14.733072 3.89974 15.143229 3.489584 15.605469 3.125 C 15.143229 2.766928 14.733072 2.356771 14.375 1.894531 Z M 7.294922 7.666016 C 6.988932 7.666017 6.700846 7.60254 6.430664 7.475586 C 6.160481 7.348634 5.924479 7.177735 5.722656 6.962891 C 5.520833 6.748048 5.362956 6.500652 5.249023 6.220703 C 5.135091 5.940756 5.078125 5.651042 5.078125 5.351562 C 5.078125 4.967448 5.157877 4.607748 5.317383 4.272461 C 5.476888 3.937176 5.690104 3.644207 5.957031 3.393555 C 6.223958 3.142904 6.531575 2.944336 6.879883 2.797852 C 7.22819 2.651367 7.591146 2.578125 7.96875 2.578125 C 8.515625 2.578125 9.002278 2.693686 9.428711 2.924805 C 9.855143 3.155926 10.214844 3.460287 10.507812 3.837891 C 10.800781 4.215495 11.023763 4.645183 11.176758 5.126953 C 11.329752 5.608725 11.40625 6.100262 11.40625 6.601562 C 11.40625 7.285156 11.295572 7.924805 11.074219 8.520508 C 10.852864 9.116211 10.548502 9.658203 10.161133 10.146484 C 9.773763 10.634766 9.316406 11.066081 8.789062 11.44043 C 8.261719 11.814779 7.695312 12.128906 7.089844 12.382812 C 7.03125 12.408854 6.95638 12.421875 6.865234 12.421875 C 6.715495 12.421875 6.588542 12.368164 6.484375 12.260742 C 6.380208 12.15332 6.328125 12.02474 6.328125 11.875 C 6.328125 11.640625 6.438802 11.471354 6.660156 11.367188 C 7.154948 11.132812 7.612305 10.880534 8.032227 10.610352 C 8.452148 10.34017 8.819986 10.030925 9.135742 9.682617 C 9.451497 9.334311 9.708658 8.937175 9.907227 8.491211 C 10.105794 8.045248 10.234375 7.532553 10.292969 6.953125 C 10.299479 6.888021 10.304361 6.824545 10.307617 6.762695 C 10.310872 6.700848 10.3125 6.637371 10.3125 6.572266 C 10.3125 6.233725 10.263672 5.891928 10.166016 5.546875 C 10.068359 5.201824 9.921875 4.889324 9.726562 4.609375 C 9.53125 4.329428 9.287109 4.10319 8.994141 3.930664 C 8.701172 3.758139 8.359375 3.671875 7.96875 3.671875 C 7.747396 3.671875 7.529297 3.71582 7.314453 3.803711 C 7.099609 3.891602 6.907552 4.010417 6.738281 4.160156 C 6.56901 4.309896 6.432292 4.487306 6.328125 4.692383 C 6.223958 4.897462 6.171875 5.117188 6.171875 5.351562 C 6.171875 5.501303 6.201172 5.649414 6.259766 5.795898 C 6.318359 5.942383 6.398112 6.072592 6.499023 6.186523 C 6.599935 6.300456 6.720377 6.393229 6.860352 6.464844 C 7.000325 6.536459 7.148438 6.572266 7.304688 6.572266 C 7.460938 6.572266 7.584635 6.547852 7.675781 6.499023 C 7.766927 6.450195 7.841797 6.386719 7.900391 6.308594 C 7.958984 6.230469 8.006185 6.149089 8.041992 6.064453 C 8.077799 5.979818 8.116861 5.898438 8.15918 5.820312 C 8.201497 5.742188 8.256836 5.678712 8.325195 5.629883 C 8.393555 5.581056 8.486328 5.556642 8.603516 5.556641 C 8.753255 5.556642 8.883463 5.61198 8.994141 5.722656 C 9.104817 5.833334 9.160156 5.963542 9.160156 6.113281 C 9.160156 6.145834 9.153646 6.188151 9.140625 6.240234 C 9.088541 6.448568 9.002278 6.640626 8.881836 6.816406 C 8.761393 6.992188 8.619791 7.143556 8.457031 7.270508 C 8.294271 7.397462 8.113606 7.495118 7.915039 7.563477 C 7.716471 7.631837 7.509765 7.666017 7.294922 7.666016 Z M 15.888672 8.75 L 18.564453 11.435547 L 17.685547 12.314453 L 16.25 10.888672 L 16.25 20 L 2.5 20 L 2.5 10.888672 L 1.064453 12.314453 L 0.185547 11.435547 L 2.861328 8.75 L 8.28125 8.75 C 8.053385 9.016928 7.801106 9.25293 7.524414 9.458008 C 7.247721 9.663086 6.953125 9.84375 6.640625 10 L 3.75 10 L 3.75 18.75 L 15 18.75 L 15 10 L 11.767578 10 C 11.878255 9.798178 11.979166 9.5931 12.070312 9.384766 C 12.161458 9.176433 12.242838 8.964844 12.314453 8.75 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <ToggleSwitch IsOn="{x:Bind ViewModel.IsFocusedInboxEnabled, Mode=TwoWay}" />
-            </controls:SettingsCard>
-
-            <controls:SettingsCard
-                Description="{x:Bind domain:Translator.SettingsAccountManagementAppendMessage_Description}"
-                Header="{x:Bind domain:Translator.SettingsAccountManagementAppendMessage_Title}"
-                Visibility="{x:Bind ViewModel.IsAppendMessageSettingVisible, Mode=OneWay}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Data="F1 M 0 5.625 C 0 4.850261 0.148112 4.121094 0.444336 3.4375 C 0.74056 2.753906 1.142578 2.158203 1.650391 1.650391 C 2.158203 1.142578 2.753906 0.740561 3.4375 0.444336 C 4.121094 0.148113 4.85026 0 5.625 0 C 6.139323 0 6.635742 0.066732 7.114258 0.200195 C 7.592773 0.33366 8.040364 0.522461 8.457031 0.766602 C 8.873697 1.010742 9.254557 1.30534 9.599609 1.650391 C 9.944661 1.995443 10.239258 2.376303 10.483398 2.792969 C 10.727539 3.209637 10.916341 3.657227 11.049805 4.135742 C 11.183268 4.614259 11.25 5.110678 11.25 5.625 C 11.25 6.39974 11.101888 7.128907 10.805664 7.8125 C 10.509439 8.496094 10.107422 9.091797 9.599609 9.599609 C 9.091797 10.107422 8.496094 10.50944 7.8125 10.805664 C 7.128906 11.101889 6.399739 11.25 5.625 11.25 C 4.84375 11.25 4.111328 11.103516 3.427734 10.810547 C 2.744141 10.517578 2.148438 10.117188 1.640625 9.609375 C 1.132812 9.101562 0.732422 8.505859 0.439453 7.822266 C 0.146484 7.138672 0 6.40625 0 5.625 Z M 10.566406 15 C 10.214844 15 9.874674 14.936523 9.545898 14.80957 C 9.217122 14.682617 8.917643 14.510092 8.647461 14.291992 C 8.377278 14.073894 8.147786 13.815104 7.958984 13.515625 C 7.770182 13.216146 7.639974 12.893881 7.568359 12.548828 C 7.972005 12.431641 8.369141 12.278646 8.759766 12.089844 C 8.785807 12.324219 8.852539 12.542318 8.959961 12.744141 C 9.067383 12.945964 9.205729 13.121745 9.375 13.271484 C 9.544271 13.421225 9.736328 13.538412 9.951172 13.623047 C 10.166016 13.707683 10.390625 13.75 10.625 13.75 L 15.625 13.75 C 15.878906 13.75 16.119791 13.701172 16.347656 13.603516 C 16.57552 13.505859 16.775715 13.370769 16.948242 13.198242 C 17.120768 13.025717 17.255859 12.825521 17.353516 12.597656 C 17.451172 12.369792 17.5 12.128906 17.5 11.875 L 17.5 4.375 C 17.5 4.121094 17.451172 3.880209 17.353516 3.652344 C 17.255859 3.42448 17.120768 3.224285 16.948242 3.051758 C 16.775715 2.879232 16.57552 2.744141 16.347656 2.646484 C 16.119791 2.548828 15.878906 2.5 15.625 2.5 L 12.099609 2.5 C 11.988932 2.278646 11.870117 2.063803 11.743164 1.855469 C 11.616211 1.647137 11.477864 1.445312 11.328125 1.25 L 15.693359 1.25 C 16.103516 1.25 16.494141 1.333008 16.865234 1.499023 C 17.236328 1.665039 17.560221 1.886395 17.836914 2.163086 C 18.113605 2.439779 18.334961 2.763672 18.500977 3.134766 C 18.666992 3.505859 18.75 3.896484 18.75 4.306641 L 18.75 11.943359 C 18.75 12.353516 18.666992 12.744141 18.500977 13.115234 C 18.334961 13.486328 18.113605 13.810222 17.836914 14.086914 C 17.560221 14.363607 17.236328 14.584961 16.865234 14.750977 C 16.494141 14.916992 16.103516 15 15.693359 15 Z M 5.625 8.828125 C 5.820312 8.828125 5.986328 8.759766 6.123047 8.623047 L 8.623047 6.123047 C 8.759766 5.986328 8.828125 5.820312 8.828125 5.625 C 8.828125 5.429688 8.759766 5.263672 8.623047 5.126953 L 6.123047 2.626953 C 5.986328 2.490234 5.820312 2.421875 5.625 2.421875 C 5.429688 2.421875 5.263672 2.490234 5.126953 2.626953 C 4.990234 2.763672 4.921875 2.929688 4.921875 3.125 C 4.921875 3.320312 4.990234 3.486328 5.126953 3.623047 L 6.503906 5 L 3.125 5 C 2.955729 5.000001 2.809245 5.06185 2.685547 5.185547 C 2.561849 5.309245 2.5 5.455729 2.5 5.625 C 2.5 5.794271 2.561849 5.940756 2.685547 6.064453 C 2.809245 6.188151 2.955729 6.25 3.125 6.25 L 6.503906 6.25 L 5.126953 7.626953 C 4.990234 7.763672 4.921875 7.929688 4.921875 8.125 C 4.921875 8.320312 4.990234 8.486328 5.126953 8.623047 C 5.263672 8.759766 5.429688 8.828125 5.625 8.828125 Z M 4.306641 18.75 C 3.896484 18.75 3.505859 18.666992 3.134766 18.500977 C 2.763672 18.334961 2.439779 18.113607 2.163086 17.836914 C 1.886393 17.560221 1.665039 17.236328 1.499023 16.865234 C 1.333008 16.494141 1.25 16.103516 1.25 15.693359 L 1.25 11.328125 C 1.445312 11.477865 1.647135 11.616211 1.855469 11.743164 C 2.063802 11.870117 2.278646 11.988933 2.5 12.099609 L 2.5 15.625 C 2.5 15.878906 2.548828 16.119791 2.646484 16.347656 C 2.744141 16.575521 2.879232 16.775717 3.051758 16.948242 C 3.224284 17.120768 3.424479 17.255859 3.652344 17.353516 C 3.880208 17.451172 4.121094 17.5 4.375 17.5 L 9.375 17.5 C 9.576822 17.5 9.76888 17.470703 9.951172 17.412109 C 10.133463 17.353516 10.302734 17.268881 10.458984 17.158203 C 10.615234 17.047525 10.751953 16.915689 10.869141 16.762695 C 10.986328 16.609701 11.077474 16.438803 11.142578 16.25 L 12.441406 16.25 C 12.369791 16.608072 12.237955 16.940104 12.045898 17.246094 C 11.853841 17.552084 11.621094 17.815756 11.347656 18.037109 C 11.074219 18.258463 10.768229 18.432617 10.429688 18.55957 C 10.091146 18.686523 9.739583 18.75 9.375 18.75 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <ToggleSwitch IsOn="{x:Bind ViewModel.IsAppendMessageSettinEnabled, Mode=TwoWay}" />
-            </controls:SettingsCard>
-
-            <controls:SettingsCard
-                Margin="0,-4,0,0"
-                ActionIcon="{x:Null}"
-                ActionIconToolTip="{x:Bind domain:Translator.SettingsDeleteAccount_Title}"
-                Command="{x:Bind ViewModel.DeleteAccountCommand}"
-                Description="{x:Bind domain:Translator.SettingsDeleteAccount_Description}"
-                Header="{x:Bind domain:Translator.SettingsDeleteAccount_Title}">
-                <Button
-                    Background="Red"
-                    Command="{x:Bind ViewModel.DeleteAccountCommand}"
-                    Content="{x:Bind domain:Translator.Buttons_Delete}" />
-                <controls:SettingsCard.HeaderIcon>
-                    <SymbolIcon Symbol="Delete" />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>
-        </StackPanel>
-    </ScrollViewer>
-</abstract:AccountDetailsPageAbstract>
diff --git a/Wino.Mail/Views/Account/AccountDetailsPage.xaml.cs b/Wino.Mail/Views/Account/AccountDetailsPage.xaml.cs
deleted file mode 100644
index d20ce986..00000000
--- a/Wino.Mail/Views/Account/AccountDetailsPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
-{
-    public AccountDetailsPage()
-    {
-        InitializeComponent();
-    }
-
-    private async void SyncFolderToggled(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-    {
-        if (sender is CheckBox checkBox && checkBox.Tag is IMailItemFolder folder)
-        {
-            await ViewModel.FolderSyncToggledAsync(folder, checkBox.IsChecked.GetValueOrDefault());
-        }
-    }
-
-    private async void UnreadBadgeCheckboxToggled(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-    {
-        if (sender is CheckBox checkBox && checkBox.Tag is IMailItemFolder folder)
-        {
-            await ViewModel.FolderShowUnreadToggled(folder, checkBox.IsChecked.GetValueOrDefault());
-        }
-    }
-}
diff --git a/Wino.Mail/Views/Account/AccountManagementPage.xaml.cs b/Wino.Mail/Views/Account/AccountManagementPage.xaml.cs
deleted file mode 100644
index 384935a6..00000000
--- a/Wino.Mail/Views/Account/AccountManagementPage.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using Windows.UI.Xaml.Navigation;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class AccountManagementPage : AccountManagementPageAbstract
-{
-    public AccountManagementPage()
-    {
-        InitializeComponent();
-
-        NavigationCacheMode = NavigationCacheMode.Enabled;
-    }
-}
diff --git a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml.cs b/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml.cs
deleted file mode 100644
index 137ad3d7..00000000
--- a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Wino.Views.Abstract;
-
-
-namespace Wino.Views.Account;
-
-public sealed partial class MergedAccountDetailsPage : MergedAccountDetailsPageAbstract
-{
-    public MergedAccountDetailsPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
deleted file mode 100644
index f09ff94e..00000000
--- a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
+++ /dev/null
@@ -1,278 +0,0 @@
-<Page
-    x:Class="Wino.Views.ImapSetup.AdvancedImapSetupPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    d:Background="Black"
-    d:RequestedTheme="Dark"
-    mc:Ignorable="d">
-
-    <Grid RowSpacing="4">
-        <Grid Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(HasValidationErrors), Mode=OneWay}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <ScrollViewer x:Name="MainScrollviewer" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
-                <StackPanel Padding="0,0,16,0" Spacing="12">
-                    <TextBlock
-                        Margin="1,0,0,0"
-                        d:Text="Advanced IMAP / SMTP Configuration"
-                        Style="{StaticResource TitleTextBlockStyle}"
-                        Text="{x:Bind domain:Translator.IMAPSetupDialog_Title}" />
-
-                    <TextBox
-                        x:Name="AddressBox"
-                        d:Header="Mail"
-                        Header="{x:Bind domain:Translator.IMAPSetupDialog_MailAddress}"
-                        PlaceholderText="{x:Bind domain:Translator.IMAPSetupDialog_MailAddressPlaceholder}" />
-
-                    <TextBox
-                        x:Name="DisplayNameBox"
-                        d:Header="Display Name"
-                        Header="{x:Bind domain:Translator.IMAPSetupDialog_DisplayName}"
-                        PlaceholderText="{x:Bind domain:Translator.IMAPSetupDialog_DisplayNamePlaceholder}" />
-
-                    <CheckBox Content="{x:Bind domain:Translator.IMAPSetupDialog_UseSameConfig}" IsChecked="{x:Bind UseSameCredentialsForSending, Mode=TwoWay}" />
-
-                    <muxc:TabView
-                        d:SelectedIndex="0"
-                        CanReorderTabs="False"
-                        IsAddTabButtonVisible="False"
-                        TabWidthMode="Equal">
-                        <muxc:TabViewItem Header="IMAP Settings" IsClosable="False">
-                            <!--  IMAP  -->
-                            <StackPanel Padding="12" Spacing="10">
-                                <!--  Server + Port  -->
-                                <Grid ColumnSpacing="6">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBox
-                                        x:Name="IncomingServerBox"
-                                        d:Header="Incoming Server"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_IncomingMailServer}"
-                                        PlaceholderText="eg. imap.gmail.com"
-                                        TextChanged="IncomingServerChanged" />
-
-                                    <TextBox
-                                        x:Name="IncomingServerPortBox"
-                                        Grid.Column="1"
-                                        d:Header="Port"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_IncomingMailServerPort}"
-                                        Text="993" />
-                                </Grid>
-
-                                <!--  Username + Password  -->
-                                <StackPanel Spacing="6">
-                                    <TextBox
-                                        x:Name="UsernameBox"
-                                        d:Header="Username"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_Username}"
-                                        PlaceholderText="{x:Bind domain:Translator.IMAPSetupDialog_UsernamePlaceholder}"
-                                        TextChanged="IncomingUsernameChanged" />
-
-                                    <PasswordBox
-                                        x:Name="PasswordBox"
-                                        d:Header="Password"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_Password}"
-                                        PasswordChanged="IncomingPasswordChanged" />
-                                </StackPanel>
-
-                                <!--  Security and Authentication  -->
-                                <Grid ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <!--  Security  -->
-                                    <StackPanel Spacing="6">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            d:Text="Connection security"
-                                            Text="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}" />
-                                        <ComboBox
-                                            x:Name="IncomingConnectionSecurity"
-                                            HorizontalAlignment="Stretch"
-                                            DisplayMemberPath="DisplayName"
-                                            ItemsSource="{x:Bind AvailableConnectionSecurities}"
-                                            SelectedIndex="0" />
-                                    </StackPanel>
-
-                                    <!--  Authentication  -->
-                                    <StackPanel Grid.Column="1" Spacing="6">
-                                        <TextBlock
-                                            HorizontalAlignment="Center"
-                                            d:Text="Authentication method"
-                                            Text="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}" />
-                                        <ComboBox
-                                            x:Name="IncomingAuthenticationMethod"
-                                            HorizontalAlignment="Stretch"
-                                            DisplayMemberPath="DisplayName"
-                                            ItemsSource="{x:Bind AvailableAuthenticationMethods}"
-                                            SelectedIndex="0" />
-                                    </StackPanel>
-                                </Grid>
-
-                            </StackPanel>
-                        </muxc:TabViewItem>
-                        <muxc:TabViewItem Header="SMTP Settings" IsClosable="False">
-                            <!--  SMTP  -->
-                            <StackPanel Padding="12" Spacing="10">
-                                <!--  Server + Port  -->
-                                <Grid ColumnSpacing="6">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBox
-                                        x:Name="OutgoingServerBox"
-                                        d:Header="Outgoing Server"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServer}"
-                                        PlaceholderText="eg. smtp.gmail.com"
-                                        TextChanged="OutgoingServerChanged" />
-
-                                    <TextBox
-                                        x:Name="OutgoingServerPort"
-                                        Grid.Column="1"
-                                        d:Header="Port"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerPort}"
-                                        Text="465" />
-                                </Grid>
-
-                                <!--  Username + Password  -->
-                                <StackPanel x:Name="OutgoingAuthenticationPanel" Spacing="6">
-                                    <TextBox
-                                        x:Name="OutgoingUsernameBox"
-                                        d:Header="UserName"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerUsername}"
-                                        IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(UseSameCredentialsForSending), Mode=OneWay}" />
-                                    <PasswordBox
-                                        x:Name="OutgoingPasswordBox"
-                                        d:Header="Password"
-                                        Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerPassword}"
-                                        IsEnabled="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(UseSameCredentialsForSending), Mode=OneWay}" />
-                                </StackPanel>
-
-                                <!--  Security and Authentication  -->
-                                <Grid ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>
-                                    <!--  Security  -->
-                                    <StackPanel Spacing="6">
-                                        <TextBlock HorizontalAlignment="Center" Text="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}" />
-                                        <ComboBox
-                                            x:Name="OutgoingConnectionSecurity"
-                                            HorizontalAlignment="Stretch"
-                                            DisplayMemberPath="DisplayName"
-                                            ItemsSource="{x:Bind AvailableConnectionSecurities}"
-                                            SelectedIndex="0" />
-                                    </StackPanel>
-
-                                    <!--  Authentication  -->
-                                    <StackPanel Grid.Column="1" Spacing="6">
-                                        <TextBlock HorizontalAlignment="Center" Text="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}" />
-                                        <ComboBox
-                                            x:Name="OutgoingAuthenticationMethod"
-                                            HorizontalAlignment="Stretch"
-                                            DisplayMemberPath="DisplayName"
-                                            ItemsSource="{x:Bind AvailableAuthenticationMethods}"
-                                            SelectedIndex="0" />
-                                    </StackPanel>
-                                </Grid>
-                            </StackPanel>
-                        </muxc:TabViewItem>
-                        <muxc:TabViewItem Header="Proxy" IsClosable="False">
-                            <!--  Proxy  -->
-                            <StackPanel Padding="12" Spacing="10">
-                                <TextBlock Text="Define your optional proxy server for the connection if your mail server requires it. This is optional." />
-                                <Grid ColumnSpacing="12">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBox x:Name="ProxyServerBox" Header="Proxy server" />
-                                    <muxc:NumberBox
-                                        x:Name="ProxyServerPortBox"
-                                        Grid.Column="1"
-                                        Header="Port" />
-                                </Grid>
-                            </StackPanel>
-                        </muxc:TabViewItem>
-                    </muxc:TabView>
-                </StackPanel>
-            </ScrollViewer>
-
-            <!--  Buttons  -->
-            <Grid
-                Grid.Row="1"
-                Padding="{StaticResource ImapSetupDialogSubPagePadding}"
-                VerticalAlignment="Bottom"
-                Background="{ThemeResource ContentDialogBackground}"
-                ColumnSpacing="6">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Button
-                    HorizontalAlignment="Stretch"
-                    d:Content="Cancel"
-                    Click="CancelClicked"
-                    Content="{x:Bind domain:Translator.Buttons_Cancel}" />
-
-                <Button
-                    Grid.Column="1"
-                    HorizontalAlignment="Stretch"
-                    d:Content="Sign In"
-                    Click="SignInClicked"
-                    Content="{x:Bind domain:Translator.Buttons_SignIn}"
-                    Style="{ThemeResource AccentButtonStyle}" />
-            </Grid>
-        </Grid>
-
-        <!--  Validation errors  -->
-        <Grid
-            Padding="12"
-            RowSpacing="12"
-            Visibility="{x:Bind HasValidationErrors, Mode=OneWay}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <TextBlock
-                HorizontalAlignment="Center"
-                FontWeight="SemiBold"
-                Text="{x:Bind domain:Translator.IMAPAdvancedSetupDialog_ValidationErrorTitle}" />
-
-            <ItemsControl Grid.Row="1" ItemsSource="{x:Bind ValidationErrors, Mode=OneWay}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate x:DataType="x:String">
-                        <TextBlock>
-                            <Run Text="• " /><Run Text="{x:Bind}" />
-                        </TextBlock>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-
-            <Button
-                Grid.Row="2"
-                HorizontalAlignment="Center"
-                Click="ValidationsGoBackClicked"
-                Content="{x:Bind domain:Translator.Buttons_TryAgain}"
-                Style="{StaticResource AccentButtonStyle}" />
-
-        </Grid>
-    </Grid>
-</Page>
diff --git a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
deleted file mode 100644
index e1fadaf9..00000000
--- a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.Messaging;
-using CommunityToolkit.WinUI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.AutoDiscovery;
-using Wino.Messaging.Client.Mails;
-
-
-namespace Wino.Views.ImapSetup;
-
-public sealed partial class AdvancedImapSetupPage : Page
-{
-    public static readonly DependencyProperty UseSameCredentialsForSendingProperty = DependencyProperty.Register(nameof(UseSameCredentialsForSending), typeof(bool), typeof(AdvancedImapSetupPage), new PropertyMetadata(true, OnUseSameCredentialsForSendingChanged));
-    public static readonly DependencyProperty ValidationErrorsProperty = DependencyProperty.Register(nameof(ValidationErrors), typeof(List<string>), typeof(AdvancedImapSetupPage), new PropertyMetadata(new List<string>()));
-
-    public List<ImapAuthenticationMethodModel> AvailableAuthenticationMethods { get; } = new List<ImapAuthenticationMethodModel>()
-    {
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Auto, Translator.ImapAuthenticationMethod_Auto),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.None, Translator.ImapAuthenticationMethod_None),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.NormalPassword, Translator.ImapAuthenticationMethod_Plain),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.EncryptedPassword, Translator.ImapAuthenticationMethod_EncryptedPassword),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.Ntlm, Translator.ImapAuthenticationMethod_Ntlm),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.CramMd5, Translator.ImapAuthenticationMethod_CramMD5),
-        new ImapAuthenticationMethodModel(Core.Domain.Enums.ImapAuthenticationMethod.DigestMd5, Translator.ImapAuthenticationMethod_DigestMD5)
-    };
-
-    public List<ImapConnectionSecurityModel> AvailableConnectionSecurities { get; set; } = new List<ImapConnectionSecurityModel>()
-    {
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.Auto, Translator.ImapConnectionSecurity_Auto),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.SslTls, Translator.ImapConnectionSecurity_SslTls),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.StartTls, Translator.ImapConnectionSecurity_StartTls),
-        new ImapConnectionSecurityModel(Core.Domain.Enums.ImapConnectionSecurity.None, Translator.ImapConnectionSecurity_None)
-    };
-
-    public bool UseSameCredentialsForSending
-    {
-        get { return (bool)GetValue(UseSameCredentialsForSendingProperty); }
-        set { SetValue(UseSameCredentialsForSendingProperty, value); }
-    }
-
-    public List<string> ValidationErrors
-    {
-        get { return (List<string>)GetValue(ValidationErrorsProperty); }
-        set { SetValue(ValidationErrorsProperty, value); }
-    }
-
-    [GeneratedDependencyProperty]
-    public partial bool HasValidationErrors { get; set; }
-
-    public AdvancedImapSetupPage()
-    {
-        InitializeComponent();
-
-        NavigationCacheMode = NavigationCacheMode.Enabled;
-    }
-
-    private static void OnUseSameCredentialsForSendingChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-    {
-        if (obj is AdvancedImapSetupPage page)
-        {
-            page.UpdateOutgoingAuthenticationPanel();
-        }
-    }
-
-    private void UpdateOutgoingAuthenticationPanel()
-    {
-        if (UseSameCredentialsForSending)
-        {
-            OutgoingUsernameBox.Text = UsernameBox.Text;
-            OutgoingPasswordBox.Password = PasswordBox.Password;
-        }
-        else
-        {
-            OutgoingUsernameBox.Text = string.Empty;
-            OutgoingPasswordBox.Password = string.Empty;
-        }
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        // Don't override settings on back scenarios.
-        // User is trying to try again the same configuration.
-
-        if (e.NavigationMode == NavigationMode.Back) return;
-
-        // Connection is succesfull but error occurred.
-        // Imap and Smptp settings exists here at this point.
-
-        if (e.Parameter is AutoDiscoverySettings preDefinedSettings && preDefinedSettings.UserMinimalSettings != null)
-        {
-            // TODO: Auto discovery settings adjustments.
-
-            UsernameBox.Text = preDefinedSettings.UserMinimalSettings.Email;
-            AddressBox.Text = preDefinedSettings.UserMinimalSettings.Email;
-            DisplayNameBox.Text = preDefinedSettings.UserMinimalSettings.DisplayName;
-            PasswordBox.Password = preDefinedSettings.UserMinimalSettings.Password;
-
-            var serverInfo = preDefinedSettings.ToServerInformation();
-
-            IncomingServerBox.Text = serverInfo.IncomingServer;
-            IncomingServerPortBox.Text = serverInfo.IncomingServerPort;
-
-            OutgoingPasswordBox.Password = serverInfo.OutgoingServerPassword;
-            OutgoingServerPort.Text = serverInfo.OutgoingServerPort;
-            OutgoingUsernameBox.Text = serverInfo.OutgoingServerUsername;
-
-            UseSameCredentialsForSending = OutgoingUsernameBox.Text == UsernameBox.Text;
-        }
-        else if (e.Parameter is AutoDiscoveryMinimalSettings autoDiscoveryMinimalSettings)
-        {
-            // Auto discovery failed. Only minimal settings are passed.
-
-            UsernameBox.Text = autoDiscoveryMinimalSettings.Email;
-            AddressBox.Text = autoDiscoveryMinimalSettings.Email;
-            DisplayNameBox.Text = autoDiscoveryMinimalSettings.DisplayName;
-            PasswordBox.Password = autoDiscoveryMinimalSettings.Password;
-        }
-    }
-
-    private void CancelClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new ImapSetupDismissRequested(null));
-
-    private string GetServerWithoutPort(string server)
-    {
-        var splitted = server.Split(':');
-
-        if (splitted.Length > 1)
-        {
-            return splitted[0];
-        }
-
-        return server;
-    }
-
-    private void SignInClicked(object sender, RoutedEventArgs e)
-    {
-        var errors = new List<string>();
-
-        // Validate email and display name
-        if (string.IsNullOrWhiteSpace(AddressBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationEmailRequired);
-        else if (!EmailValidation.EmailValidator.Validate(AddressBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationEmailInvalid);
-
-        if (string.IsNullOrWhiteSpace(DisplayNameBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationDisplayNameRequired);
-
-        // Validate incoming server details
-        if (string.IsNullOrWhiteSpace(IncomingServerBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationIncomingServerRequired);
-        if (string.IsNullOrWhiteSpace(IncomingServerPortBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationIncomingPortRequired);
-        else if (!int.TryParse(IncomingServerPortBox.Text, out int inPort) || inPort <= 0 || inPort > 65535)
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationIncomingPortInvalid);
-
-        // Validate outgoing server details  
-        if (string.IsNullOrWhiteSpace(OutgoingServerBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingServerRequired);
-        if (string.IsNullOrWhiteSpace(OutgoingServerPort.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPortRequired);
-        else if (!int.TryParse(OutgoingServerPort.Text, out int outPort) || outPort <= 0 || outPort > 65535)
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPortInvalid);
-
-        // Validate authentication details
-        if (string.IsNullOrWhiteSpace(UsernameBox.Text))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationUsernameRequired);
-        if (string.IsNullOrWhiteSpace(PasswordBox.Password))
-            errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationPasswordRequired);
-
-        // Validate outgoing credentials if not using same as incoming
-        if (!UseSameCredentialsForSending)
-        {
-            if (string.IsNullOrWhiteSpace(OutgoingUsernameBox.Text))
-                errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingUsernameRequired);
-            if (string.IsNullOrWhiteSpace(OutgoingPasswordBox.Password))
-                errors.Add(Translator.IMAPAdvancedSetupDialog_ValidationOutgoingPasswordRequired);
-        }
-
-        // Show validation errors if any
-        HasValidationErrors = errors.Count > 0;
-
-        if (HasValidationErrors)
-        {
-            ValidationErrors = errors;
-            return;
-        }
-
-        var info = new CustomServerInformation()
-        {
-            IncomingServer = GetServerWithoutPort(IncomingServerBox.Text),
-            Id = Guid.NewGuid(),
-
-            IncomingServerPassword = PasswordBox.Password,
-            IncomingServerType = Core.Domain.Enums.CustomIncomingServerType.IMAP4,
-            IncomingServerUsername = UsernameBox.Text,
-            IncomingAuthenticationMethod = (IncomingAuthenticationMethod.SelectedItem as ImapAuthenticationMethodModel).ImapAuthenticationMethod,
-            IncomingServerSocketOption = (IncomingConnectionSecurity.SelectedItem as ImapConnectionSecurityModel).ImapConnectionSecurity,
-            IncomingServerPort = IncomingServerPortBox.Text,
-
-            OutgoingServer = GetServerWithoutPort(OutgoingServerBox.Text),
-            OutgoingServerPort = OutgoingServerPort.Text,
-            OutgoingServerPassword = OutgoingPasswordBox.Password,
-            OutgoingAuthenticationMethod = (OutgoingAuthenticationMethod.SelectedItem as ImapAuthenticationMethodModel).ImapAuthenticationMethod,
-            OutgoingServerSocketOption = (OutgoingConnectionSecurity.SelectedItem as ImapConnectionSecurityModel).ImapConnectionSecurity,
-            OutgoingServerUsername = OutgoingUsernameBox.Text,
-
-            ProxyServer = ProxyServerBox.Text,
-            ProxyServerPort = ProxyServerPortBox.Text,
-            Address = AddressBox.Text,
-            DisplayName = DisplayNameBox.Text,
-            MaxConcurrentClients = 5
-        };
-
-        if (UseSameCredentialsForSending)
-        {
-            info.OutgoingServerUsername = info.IncomingServerUsername;
-            info.OutgoingServerPassword = info.IncomingServerPassword;
-        }
-        else
-        {
-            info.OutgoingServerUsername = OutgoingUsernameBox.Text;
-            info.OutgoingServerPassword = OutgoingPasswordBox.Password;
-        }
-
-        WeakReferenceMessenger.Default.Send(new ImapSetupNavigationRequested(typeof(TestingImapConnectionPage), info));
-    }
-
-    private void IncomingServerChanged(object sender, TextChangedEventArgs e)
-    {
-        if (sender is TextBox senderTextBox)
-        {
-            var splitted = senderTextBox.Text.Split(':');
-
-            if (splitted.Length > 1)
-            {
-                IncomingServerPortBox.Text = splitted[splitted.Length - 1];
-            }
-        }
-    }
-
-    private void OutgoingServerChanged(object sender, TextChangedEventArgs e)
-    {
-        if (sender is TextBox senderTextBox)
-        {
-            var splitted = senderTextBox.Text.Split(':');
-
-            if (splitted.Length > 1)
-            {
-                OutgoingServerPort.Text = splitted[splitted.Length - 1];
-            }
-        }
-    }
-
-    private void IncomingUsernameChanged(object sender, TextChangedEventArgs e)
-    {
-        if (UseSameCredentialsForSending)
-        {
-            OutgoingUsernameBox.Text = UsernameBox.Text;
-        }
-    }
-
-    private void IncomingPasswordChanged(object sender, RoutedEventArgs e)
-    {
-        if (UseSameCredentialsForSending)
-        {
-            OutgoingPasswordBox.Password = PasswordBox.Password;
-        }
-    }
-
-    private void ValidationsGoBackClicked(object sender, RoutedEventArgs e)
-    {
-        ValidationErrors.Clear();
-        HasValidationErrors = false;
-    }
-}
diff --git a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml
deleted file mode 100644
index 36fd7771..00000000
--- a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Page
-    x:Class="Wino.Views.ImapSetup.ImapConnectionFailedPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Views.ImapSetup"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Padding="24" RowSpacing="6">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind domain:Translator.IMAPSetupDialog_ConnectionFailedTitle}" />
-
-        <TextBlock
-            x:Name="ConnectionFailedMessage"
-            Grid.Row="1"
-            Style="{StaticResource BodyTextBlockStyle}" />
-
-        <!--  Protocol Log Area  -->
-        <Grid
-            x:Name="ProtocolLogGrid"
-            Grid.Row="2"
-            ColumnSpacing="12"
-            Visibility="Collapsed">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock
-                x:Name="ProtocolLogHeader"
-                VerticalAlignment="Center"
-                Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
-                Text="{x:Bind domain:Translator.ProtocolLogAvailable_Message}" />
-
-            <Button
-                Grid.Column="1"
-                Click="CopyProtocolLogButtonClicked"
-                Content="{x:Bind domain:Translator.Buttons_Copy}" />
-        </Grid>
-
-        <!--  Dismis / GoBack  -->
-        <Grid
-            Grid.Row="3"
-            VerticalAlignment="Bottom"
-            ColumnSpacing="12">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Button
-                HorizontalAlignment="Stretch"
-                Click="CloseClicked"
-                Content="{x:Bind domain:Translator.Buttons_Close}" />
-
-            <Button
-                Grid.Column="1"
-                HorizontalAlignment="Stretch"
-                Click="TryAgainClicked"
-                Content="{x:Bind domain:Translator.Buttons_TryAgain}"
-                Style="{ThemeResource AccentButtonStyle}" />
-        </Grid>
-    </Grid>
-</Page>
diff --git a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs b/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
deleted file mode 100644
index 6fdec93e..00000000
--- a/Wino.Mail/Views/ImapSetup/ImapConnectionFailedPage.xaml.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Messaging.Client.Mails;
-
-namespace Wino.Views.ImapSetup;
-
-public sealed partial class ImapConnectionFailedPage : Page
-{
-    private string _protocolLog;
-
-    private readonly IClipboardService _clipboardService = App.Current.Services.GetService<IClipboardService>();
-    private readonly IMailDialogService _dialogService = App.Current.Services.GetService<IMailDialogService>();
-
-    public ImapConnectionFailedPage()
-    {
-        InitializeComponent();
-    }
-
-    private async void CopyProtocolLogButtonClicked(object sender, RoutedEventArgs e)
-    {
-        await _clipboardService.CopyClipboardAsync(_protocolLog);
-
-        _dialogService.InfoBarMessage(Translator.ClipboardTextCopied_Title, string.Format(Translator.ClipboardTextCopied_Message, "Log"), Core.Domain.Enums.InfoBarMessageType.Information);
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        if (e.Parameter is ImapConnectionFailedPackage failedPackage)
-        {
-            ConnectionFailedMessage.Text = failedPackage.ErrorMessage;
-
-            ProtocolLogGrid.Visibility = !string.IsNullOrEmpty(failedPackage.ProtocolLog) ? Visibility.Visible : Visibility.Collapsed;
-            _protocolLog = failedPackage.ProtocolLog;
-        }
-    }
-
-    private void TryAgainClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new ImapSetupBackNavigationRequested());
-
-    private void CloseClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new ImapSetupDismissRequested());
-}
diff --git a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml
deleted file mode 100644
index b1597994..00000000
--- a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Page
-    x:Class="Wino.Views.ImapSetup.PreparingImapFoldersPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Views.ImapSetup"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
-
-    <Grid>
-        <!--  Preparing Folders Panel  -->
-        <StackPanel
-            x:Name="PreparingFoldersPanel"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center">
-
-            <Viewbox
-                Width="26"
-                Height="26"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-                <PathIcon Data="M1024,317.5L1024,507C1014.67,495.333 1004.67,484.167 994,473.5C983.333,462.833 972,453 960,444L960,320C960,311.333 958.333,303.083 955,295.25C951.667,287.417 947.083,280.583 941.25,274.75C935.417,268.917 928.583,264.333 920.75,261C912.917,257.667 904.667,256 896,256L522,256L458,298.5C436,312.833 412.333,320 387,320L64,320L64,832C64,841 65.6667,849.417 69,857.25C72.3333,865.083 76.8333,871.833 82.5,877.5C88.1667,883.167 94.9167,887.667 102.75,891C110.583,894.333 119,896 128,896L404.5,896C410.167,907.333 416.25,918.333 422.75,929C429.25,939.667 436.333,950 444,960L125.5,960C108.833,960 92.9167,956.583 77.75,949.75C62.5833,942.917 49.25,933.75 37.75,922.25C26.25,910.75 17.0833,897.417 10.25,882.25C3.41667,867.083 0,851.167 0,834.5L0,189.5C0,172.833 3.41667,156.917 10.25,141.75C17.0833,126.583 26.25,113.25 37.75,101.75C49.25,90.25 62.5833,81.0834 77.75,74.25C92.9167,67.4167 108.833,64.0001 125.5,64L368,64C388,64.0001 407.167,68.5001 425.5,77.5C443.833,86.5001 458.833,99.0001 470.5,115L528,192L898.5,192C915.167,192 931.083,195.417 946.25,202.25C961.417,209.083 974.75,218.25 986.25,229.75C997.75,241.25 1006.92,254.583 1013.75,269.75C1020.58,284.917 1024,300.833 1024,317.5ZM466,216L419,153.5C413,145.5 405.5,139.25 396.5,134.75C387.5,130.25 378,128 368,128L128,128C119,128 110.667,129.667 103,133C95.3333,136.333 88.5833,140.917 82.75,146.75C76.9167,152.583 72.3333,159.333 69,167C65.6667,174.667 64,183 64,192L64,256L387,256C394.333,256 401.5,254.667 408.5,252C415.5,249.333 422.25,246 428.75,242C435.25,238 441.583,233.667 447.75,229C453.917,224.333 460,220 466,216ZM1024,736C1024,775.667 1016.42,813 1001.25,848C986.083,883 965.5,913.5 939.5,939.5C913.5,965.5 883,986.083 848,1001.25C813,1016.42 775.667,1024 736,1024C696,1024 658.5,1016.5 623.5,1001.5C588.5,986.5 558,966 532,940C506,914 485.5,883.5 470.5,848.5C455.5,813.5 448,776 448,736C448,696.333 455.583,659 470.75,624C485.917,589 506.5,558.5 532.5,532.5C558.5,506.5 589,485.917 624,470.75C659,455.583 696.333,448 736,448C762.333,448 787.75,451.417 812.25,458.25C836.75,465.083 859.667,474.75 881,487.25C902.333,499.75 921.833,514.833 939.5,532.5C957.167,550.167 972.25,569.667 984.75,591C997.25,612.333 1006.92,635.25 1013.75,659.75C1020.58,684.25 1024,709.667 1024,736ZM896,576C896,567.333 892.833,559.833 886.5,553.5C880.167,547.167 872.667,544 864,544C857.667,544 852.5,545.167 848.5,547.5C844.5,549.833 841.25,552.917 838.75,556.75C836.25,560.583 834.5,565 833.5,570C832.5,575 832,580.167 832,585.5C816.333,577.167 800.917,570.833 785.75,566.5C770.583,562.167 754,560 736,560C724,560 711.75,561.25 699.25,563.75C686.75,566.25 674.5,569.917 662.5,574.75C650.5,579.583 639.083,585.417 628.25,592.25C617.417,599.083 608,607 600,616C597,619.333 594.667,622.75 593,626.25C591.333,629.75 590.5,633.833 590.5,638.5C590.5,647.5 593.667,655.167 600,661.5C606.333,667.833 614,671 623,671C628.667,671 634.75,668.583 641.25,663.75C647.75,658.917 655.333,653.5 664,647.5C672.667,641.5 682.75,636.083 694.25,631.25C705.75,626.417 719.333,624 735,624C746.667,624 757.5,625.25 767.5,627.75C777.5,630.25 787.667,634.333 798,640L785,640C779,640 773.083,640.25 767.25,640.75C761.417,641.25 756.167,642.583 751.5,644.75C746.833,646.917 743.083,650.167 740.25,654.5C737.417,658.833 736,664.667 736,672C736,680.667 739.167,688.167 745.5,694.5C751.833,700.833 759.333,704 768,704L864,704C872.667,704 880.167,700.833 886.5,694.5C892.833,688.167 896,680.667 896,672ZM881.5,833C881.5,824.333 878.333,816.833 872,810.5C865.667,804.167 858.167,801 849.5,801C842.833,801 836.333,803.417 830,808.25C823.667,813.083 816.333,818.5 808,824.5C799.667,830.5 789.833,835.917 778.5,840.75C767.167,845.583 753.333,848 737,848C725.333,848 714.5,846.75 704.5,844.25C694.5,841.75 684.333,837.667 674,832L687,832C692.667,832 698.417,831.75 704.25,831.25C710.083,830.75 715.333,829.417 720,827.25C724.667,825.083 728.5,821.833 731.5,817.5C734.5,813.167 736,807.333 736,800C736,791.333 732.833,783.833 726.5,777.5C720.167,771.167 712.667,768 704,768L608,768C599.333,768 591.833,771.167 585.5,777.5C579.167,783.833 576,791.333 576,800L576,896C576,904.667 579.167,912.167 585.5,918.5C591.833,924.833 599.333,928 608,928C614.333,928 619.5,926.833 623.5,924.5C627.5,922.167 630.75,919.083 633.25,915.25C635.75,911.417 637.5,907 638.5,902C639.5,897 640,891.833 640,886.5C655.667,894.833 671.083,901.167 686.25,905.5C701.417,909.833 718,912 736,912C748,912 760.333,910.75 773,908.25C785.667,905.75 797.917,902.083 809.75,897.25C821.583,892.417 832.833,886.583 843.5,879.75C854.167,872.917 863.667,865 872,856C878.333,849.333 881.5,841.667 881.5,833Z" />
-            </Viewbox>
-
-            <TextBlock Text="{x:Bind domain:Translator.PreparingFoldersMessage}" />
-            <muxc:ProgressBar Margin="0,4,0,0" IsIndeterminate="True" />
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs b/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
deleted file mode 100644
index 157d8a03..00000000
--- a/Wino.Mail/Views/ImapSetup/PreparingImapFoldersPage.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace Wino.Views.ImapSetup;
-
-/// <summary>
-/// An empty page that can be used on its own or navigated to within a Frame.
-/// </summary>
-public sealed partial class PreparingImapFoldersPage : Page
-{
-    public PreparingImapFoldersPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml
deleted file mode 100644
index da4c0409..00000000
--- a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml
+++ /dev/null
@@ -1,104 +0,0 @@
-<Page
-    x:Class="Wino.Views.ImapSetup.TestingImapConnectionPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Wino.Controls"
-    xmlns:controls1="using:Wino.Core.UWP.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Views.ImapSetup"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
-
-    <Grid>
-        <!--  Testing Connection Panel  -->
-        <StackPanel
-            x:Name="TestingConnectionPanel"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center">
-
-            <Viewbox
-                Width="26"
-                Height="26"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-                <PathIcon Data="F1 M 18.75 18.125 C 18.75 18.294271 18.68815 18.440756 18.564453 18.564453 C 18.440754 18.68815 18.29427 18.75 18.125 18.75 L 13.75 18.75 C 13.75 18.925781 13.717447 19.088541 13.652344 19.238281 C 13.587239 19.388021 13.497721 19.519857 13.383789 19.633789 C 13.269855 19.747721 13.13802 19.83724 12.988281 19.902344 C 12.838541 19.967447 12.675781 20 12.5 20 L 6.25 20 C 6.074219 20 5.909831 19.967447 5.756836 19.902344 C 5.603841 19.83724 5.472005 19.74935 5.361328 19.638672 C 5.250651 19.527994 5.16276 19.396158 5.097656 19.243164 C 5.032552 19.09017 5 18.925781 5 18.75 L 0.625 18.75 C 0.455729 18.75 0.309245 18.68815 0.185547 18.564453 C 0.061849 18.440756 0 18.294271 0 18.125 C 0 17.955729 0.061849 17.809244 0.185547 17.685547 C 0.309245 17.56185 0.455729 17.5 0.625 17.5 L 5 17.5 C 5 17.154949 5.120442 16.86198 5.361328 16.621094 C 5.608724 16.373699 5.904948 16.25 6.25 16.25 L 7.5 16.25 C 7.5 16.074219 7.532552 15.911459 7.597656 15.761719 C 7.66276 15.611979 7.752278 15.480144 7.866211 15.366211 C 7.980143 15.252279 8.111979 15.162761 8.261719 15.097656 C 8.411458 15.032553 8.574219 15 8.75 15 L 8.75 13.75 L 6.875 13.75 C 6.621094 13.75 6.380208 13.701172 6.152344 13.603516 C 5.924479 13.505859 5.724284 13.370769 5.551758 13.198242 C 5.379231 13.025717 5.244141 12.825521 5.146484 12.597656 C 5.048828 12.369792 5 12.128906 5 11.875 L 5 1.875 C 5 1.621094 5.048828 1.380209 5.146484 1.152344 C 5.244141 0.92448 5.379231 0.724285 5.551758 0.551758 C 5.724284 0.379232 5.924479 0.244141 6.152344 0.146484 C 6.380208 0.048828 6.621094 0 6.875 0 L 11.875 0 C 12.128906 0 12.369791 0.048828 12.597656 0.146484 C 12.825521 0.244141 13.025716 0.379232 13.198242 0.551758 C 13.370768 0.724285 13.505859 0.92448 13.603516 1.152344 C 13.701172 1.380209 13.75 1.621094 13.75 1.875 L 13.75 11.875 C 13.75 12.128906 13.701172 12.369792 13.603516 12.597656 C 13.505859 12.825521 13.370768 13.025717 13.198242 13.198242 C 13.025716 13.370769 12.825521 13.505859 12.597656 13.603516 C 12.369791 13.701172 12.128906 13.75 11.875 13.75 L 10 13.75 L 10 15 C 10.169271 15 10.330403 15.032553 10.483398 15.097656 C 10.636393 15.162761 10.769856 15.252279 10.883789 15.366211 C 10.997721 15.480144 11.087239 15.613607 11.152344 15.766602 C 11.217447 15.919597 11.25 16.080729 11.25 16.25 L 12.5 16.25 C 12.669271 16.25 12.828775 16.282553 12.978516 16.347656 C 13.128255 16.41276 13.261719 16.503906 13.378906 16.621094 C 13.626302 16.86849 13.75 17.161459 13.75 17.5 L 18.125 17.5 C 18.29427 17.5 18.440754 17.56185 18.564453 17.685547 C 18.68815 17.809244 18.75 17.955729 18.75 18.125 Z M 11.875 12.5 C 12.04427 12.5 12.190754 12.438151 12.314453 12.314453 C 12.43815 12.190756 12.5 12.044271 12.5 11.875 L 12.5 1.875 C 12.5 1.70573 12.43815 1.559246 12.314453 1.435547 C 12.190754 1.31185 12.04427 1.25 11.875 1.25 L 6.875 1.25 C 6.705729 1.25 6.559244 1.31185 6.435547 1.435547 C 6.311849 1.559246 6.25 1.70573 6.25 1.875 L 6.25 11.875 C 6.25 12.044271 6.311849 12.190756 6.435547 12.314453 C 6.559244 12.438151 6.705729 12.5 6.875 12.5 Z M 10.625 2.5 C 10.794271 2.5 10.940755 2.56185 11.064453 2.685547 C 11.18815 2.809246 11.25 2.95573 11.25 3.125 C 11.25 3.294271 11.18815 3.440756 11.064453 3.564453 C 10.940755 3.688152 10.794271 3.75 10.625 3.75 L 8.125 3.75 C 7.955729 3.75 7.809245 3.688152 7.685547 3.564453 C 7.561849 3.440756 7.5 3.294271 7.5 3.125 C 7.5 2.95573 7.561849 2.809246 7.685547 2.685547 C 7.809245 2.56185 7.955729 2.5 8.125 2.5 Z M 10.625 5 C 10.794271 5.000001 10.940755 5.06185 11.064453 5.185547 C 11.18815 5.309245 11.25 5.455729 11.25 5.625 C 11.25 5.794271 11.18815 5.940756 11.064453 6.064453 C 10.940755 6.188151 10.794271 6.25 10.625 6.25 L 8.125 6.25 C 7.955729 6.25 7.809245 6.188151 7.685547 6.064453 C 7.561849 5.940756 7.5 5.794271 7.5 5.625 C 7.5 5.455729 7.561849 5.309245 7.685547 5.185547 C 7.809245 5.06185 7.955729 5.000001 8.125 5 Z M 12.5 18.75 L 12.5 17.5 L 10.625 17.5 C 10.481771 17.5 10.367838 17.47233 10.283203 17.416992 C 10.198567 17.361654 10.135091 17.290039 10.092773 17.202148 C 10.050455 17.114258 10.022786 17.016602 10.009766 16.90918 C 9.996744 16.801758 9.990234 16.692709 9.990234 16.582031 C 9.990234 16.523438 9.991861 16.466471 9.995117 16.411133 C 9.998372 16.355795 10 16.302084 10 16.25 L 8.75 16.25 L 8.75 16.582031 C 8.75 16.692709 8.743489 16.801758 8.730469 16.90918 C 8.717447 17.016602 8.689778 17.114258 8.647461 17.202148 C 8.605143 17.290039 8.543294 17.361654 8.461914 17.416992 C 8.380533 17.47233 8.268229 17.5 8.125 17.5 L 6.25 17.5 L 6.25 18.75 Z " />
-            </Viewbox>
-
-            <TextBlock Text="{x:Bind domain:Translator.TestingImapConnectionMessage}" />
-
-            <muxc:ProgressBar Margin="0,4,0,0" IsIndeterminate="True" />
-        </StackPanel>
-
-        <!--  Allow untrusted certificate dialog  -->
-        <Grid
-            x:Name="CertificateDialog"
-            MaxWidth="600"
-            Padding="20"
-            RowSpacing="12"
-            Visibility="Collapsed">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <controls1:WinoFontIcon FontSize="46" Icon="Certificate" />
-
-            <TextBlock
-                Grid.Row="1"
-                Margin="0,16,0,6"
-                TextWrapping="WrapWholeWords">
-                <Run Text="{x:Bind domain:Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row0}" />
-                <LineBreak />
-                <Run Text="{x:Bind domain:Translator.IMAPSetupDialog_CertificateAllowanceRequired_Row1}" />
-            </TextBlock>
-
-            <!--  Cert details  -->
-            <StackPanel Grid.Row="2" Spacing="6">
-                <TextBlock TextWrapping="Wrap">
-                    <Run FontWeight="SemiBold" Text="{x:Bind domain:Translator.IMAPSetupDialog_CertificateIssuer}" />
-                    <LineBreak />
-                    <Run x:Name="CertIssuer" />
-                </TextBlock>
-
-                <TextBlock>
-                    <Run FontWeight="SemiBold" Text="{x:Bind domain:Translator.IMAPSetupDialog_CertificateValidFrom}" />
-                    <LineBreak />
-                    <Run x:Name="CertValidFrom" />
-                </TextBlock>
-
-                <TextBlock>
-                    <Run FontWeight="SemiBold" Text="{x:Bind domain:Translator.IMAPSetupDialog_CertificateValidTo}" />
-                    <LineBreak />
-                    <Run x:Name="CertValidTo" />
-                </TextBlock>
-            </StackPanel>
-
-            <Grid
-                Grid.Row="3"
-                Margin="0,16"
-                ColumnSpacing="12">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Button
-                    x:Name="DenyCertificateButton"
-                    HorizontalAlignment="Stretch"
-                    Click="DenyClicked"
-                    Content="{x:Bind domain:Translator.Buttons_Deny}" />
-
-                <Button
-                    x:Name="AllowCertificateButton"
-                    Grid.Column="1"
-                    HorizontalAlignment="Stretch"
-                    Click="AllowClicked"
-                    Content="{x:Bind domain:Translator.Buttons_Allow}"
-                    Style="{StaticResource AccentButtonStyle}" />
-            </Grid>
-        </Grid>
-    </Grid>
-</Page>
diff --git a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs b/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
deleted file mode 100644
index d180852c..00000000
--- a/Wino.Mail/Views/ImapSetup/TestingImapConnectionPage.xaml.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.AutoDiscovery;
-using Wino.Core.Domain.Models.Connectivity;
-using Wino.Messaging.Client.Mails;
-using Wino.Messaging.Server;
-
-
-namespace Wino.Views.ImapSetup;
-
-public sealed partial class TestingImapConnectionPage : Page
-{
-    private IWinoServerConnectionManager _winoServerConnectionManager = App.Current.Services.GetService<IWinoServerConnectionManager>();
-    private AutoDiscoverySettings autoDiscoverySettings;
-    private CustomServerInformation serverInformationToTest;
-
-    public TestingImapConnectionPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override async void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        // We can only go back to this page from failed connection page.
-        // We must go back once again in that case to actual setup dialog.
-        if (e.NavigationMode == NavigationMode.Back)
-        {
-            WeakReferenceMessenger.Default.Send(new ImapSetupBackNavigationRequested());
-        }
-        else
-        {
-            // Test connection
-
-            // Discovery settings are passed.
-            // Create server information out of the discovery settings.
-            if (e.Parameter is AutoDiscoverySettings parameterAutoDiscoverySettings)
-            {
-                autoDiscoverySettings = parameterAutoDiscoverySettings;
-                serverInformationToTest = autoDiscoverySettings.ToServerInformation();
-            }
-            else if (e.Parameter is CustomServerInformation customServerInformation)
-            {
-                // Only server information is passed.
-                serverInformationToTest = customServerInformation;
-            }
-
-            // Make sure that certificate dialog must be present in case of SSL handshake fails.
-            await PerformTestAsync(allowSSLHandshake: false);
-        }
-    }
-
-    private async Task PerformTestAsync(bool allowSSLHandshake)
-    {
-        CertificateDialog.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-        TestingConnectionPanel.Visibility = Windows.UI.Xaml.Visibility.Visible;
-
-        await Task.Delay(1000);
-
-        var testResultResponse = await _winoServerConnectionManager
-            .GetResponseAsync<ImapConnectivityTestResults, ImapConnectivityTestRequested>(new ImapConnectivityTestRequested(serverInformationToTest, allowSSLHandshake));
-
-        if (!testResultResponse.IsSuccess)
-        {
-            // Wino Server is connection is failed.
-            ReturnWithError(testResultResponse.Message);
-        }
-        else
-        {
-            var testResultData = testResultResponse.Data;
-
-            if (testResultData.IsSuccess)
-            {
-                // All success. Finish setup with validated server information.
-                ReturnWithSuccess();
-            }
-            else
-            {
-                // Check if certificate UI is required.
-
-                if (testResultData.IsCertificateUIRequired)
-                {
-                    // Certificate UI is required. Show certificate dialog.
-
-                    CertIssuer.Text = testResultData.CertificateIssuer;
-                    CertValidFrom.Text = testResultData.CertificateValidFromDateString;
-                    CertValidTo.Text = testResultData.CertificateExpirationDateString;
-
-                    TestingConnectionPanel.Visibility = Windows.UI.Xaml.Visibility.Collapsed;
-                    CertificateDialog.Visibility = Windows.UI.Xaml.Visibility.Visible;
-                }
-                else
-                {
-                    // Connection test failed. Show error dialog.
-
-                    var protocolLog = testResultData.FailureProtocolLog;
-
-                    ReturnWithError(testResultData.FailedReason, protocolLog);
-                }
-            }
-        }
-    }
-
-    private void ReturnWithError(string error, string protocolLog = "")
-    {
-        var failurePackage = new ImapConnectionFailedPackage(error, protocolLog, autoDiscoverySettings);
-        WeakReferenceMessenger.Default.Send(new ImapSetupBackNavigationRequested(typeof(ImapConnectionFailedPage), failurePackage));
-    }
-
-    private void ReturnWithSuccess()
-        => WeakReferenceMessenger.Default.Send(new ImapSetupDismissRequested(serverInformationToTest));
-
-    private void DenyClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-        => ReturnWithError(Translator.IMAPSetupDialog_CertificateDenied, string.Empty);
-
-    private async void AllowClicked(object sender, Windows.UI.Xaml.RoutedEventArgs e)
-    {
-        // Run the test again, but this time allow SSL handshake.
-        // Any authentication error will be shown to the user after this test.
-
-        await PerformTestAsync(allowSSLHandshake: true);
-    }
-}
diff --git a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
deleted file mode 100644
index bf18315e..00000000
--- a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
+++ /dev/null
@@ -1,118 +0,0 @@
-<Page
-    x:Class="Wino.Views.ImapSetup.WelcomeImapSetupPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:local="using:Wino.Views.ImapSetup"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
-
-    <Grid RowSpacing="4">
-        <Grid x:Name="MainSetupPanel">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <ScrollViewer x:Name="MainScrollviewer" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock
-                        Margin="1,0,0,0"
-                        Style="{StaticResource TitleTextBlockStyle}"
-                        Text="{x:Bind domain:Translator.BasicIMAPSetupDialog_Title}" />
-
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="0,12,0,0"
-                        Text="{x:Bind domain:Translator.BasicIMAPSetupDialog_Description}" />
-
-                    <HyperlinkButton
-                        Grid.Row="2"
-                        Margin="-1,0,0,0"
-                        Padding="0"
-                        Content="{x:Bind domain:Translator.BasicIMAPSetupDialog_LearnMore}"
-                        NavigateUri="https://go.microsoft.com/fwlink/?linkid=852269" />
-
-                    <StackPanel
-                        Grid.Row="3"
-                        Margin="0,12,0,0"
-                        Spacing="12">
-                        <TextBox
-                            x:Name="DisplayNameBox"
-                            Header="{x:Bind domain:Translator.BasicIMAPSetupDialog_DisplayName}"
-                            PlaceholderText="{x:Bind domain:Translator.BasicIMAPSetupDialog_DisplayNamePlaceholder}" />
-
-                        <TextBox
-                            x:Name="AddressBox"
-                            Header="{x:Bind domain:Translator.BasicIMAPSetupDialog_MailAddress}"
-                            PlaceholderText="{x:Bind domain:Translator.BasicIMAPSetupDialog_MailAddressPlaceholder}" />
-
-                        <PasswordBox x:Name="PasswordBox" Header="{x:Bind domain:Translator.BasicIMAPSetupDialog_Password}" />
-
-                        <TextBlock Text="{x:Bind domain:Translator.BasicIMAPSetupDialog_CredentialLocalMessage}" />
-
-                        <Button HorizontalAlignment="Right" Click="AdvancedConfigurationClicked">
-                            <StackPanel Orientation="Horizontal" Spacing="6">
-                                <PathIcon Data="F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.420572 0 10.056966 0.128582 10.65918 0.385742 C 11.261393 0.642904 11.791992 0.99284 12.250977 1.435547 C 12.709961 1.878256 13.074544 2.397461 13.344727 2.993164 C 13.614908 3.588867 13.75 4.225262 13.75 4.902344 C 13.75 5.397137 13.689778 5.87077 13.569336 6.323242 C 13.448893 6.775717 13.258463 7.213542 12.998047 7.636719 C 12.229817 7.799479 11.510416 8.079428 10.839844 8.476562 C 10.169271 8.873698 9.583333 9.378256 9.082031 9.990234 C 9.042969 9.996745 9.005533 10 8.969727 10 C 8.933919 10 8.899739 10 8.867188 10 L 8.652344 10 C 7.97526 10 7.338867 9.864909 6.743164 9.594727 C 6.147461 9.324545 5.628255 8.959961 5.185547 8.500977 C 4.742838 8.041993 4.392903 7.511395 4.135742 6.90918 C 3.878581 6.306967 3.75 5.670573 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 12.148438 19.365234 C 11.777344 19.208984 11.41276 19.010416 11.054688 18.769531 C 11.113281 18.561197 11.170247 18.357748 11.225586 18.15918 C 11.280924 17.960611 11.308594 17.753906 11.308594 17.539062 C 11.308594 17.252604 11.259766 16.977539 11.162109 16.713867 C 11.064453 16.450195 10.930989 16.210938 10.761719 15.996094 C 10.592447 15.78125 10.390625 15.597331 10.15625 15.444336 C 9.921875 15.291342 9.664713 15.182292 9.384766 15.117188 L 8.779297 14.980469 C 8.759766 14.778646 8.75 14.576823 8.75 14.375 C 8.75 14.179688 8.759766 13.977865 8.779297 13.769531 L 9.384766 13.632812 C 9.664713 13.567709 9.921875 13.458659 10.15625 13.305664 C 10.390625 13.15267 10.592447 12.96875 10.761719 12.753906 C 10.930989 12.539062 11.064453 12.299805 11.162109 12.036133 C 11.259766 11.772461 11.308594 11.497396 11.308594 11.210938 C 11.308594 10.996094 11.280924 10.789389 11.225586 10.59082 C 11.170247 10.392253 11.113281 10.188803 11.054688 9.980469 C 11.41276 9.739584 11.777344 9.541016 12.148438 9.384766 C 12.324219 9.560547 12.488606 9.720053 12.641602 9.863281 C 12.794596 10.006511 12.957356 10.131836 13.129883 10.239258 C 13.302408 10.34668 13.487955 10.429688 13.686523 10.488281 C 13.885091 10.546875 14.114583 10.576172 14.375 10.576172 C 14.635416 10.576172 14.866535 10.546875 15.068359 10.488281 C 15.270182 10.429688 15.455729 10.34668 15.625 10.239258 C 15.79427 10.131836 15.955402 10.006511 16.108398 9.863281 C 16.261393 9.720053 16.425781 9.560547 16.601562 9.384766 C 16.972656 9.541016 17.337238 9.739584 17.695312 9.980469 C 17.636719 10.188803 17.579752 10.392253 17.524414 10.59082 C 17.469074 10.789389 17.441406 10.996094 17.441406 11.210938 C 17.441406 11.497396 17.488605 11.772461 17.583008 12.036133 C 17.677408 12.299805 17.810871 12.539062 17.983398 12.753906 C 18.155924 12.96875 18.359375 13.15267 18.59375 13.305664 C 18.828125 13.458659 19.085285 13.567709 19.365234 13.632812 L 19.970703 13.769531 C 19.990234 13.977865 20 14.179688 20 14.375 C 20 14.576823 19.990234 14.778646 19.970703 14.980469 L 19.365234 15.117188 C 19.085285 15.182292 18.828125 15.291342 18.59375 15.444336 C 18.359375 15.597331 18.155924 15.78125 17.983398 15.996094 C 17.810871 16.210938 17.677408 16.450195 17.583008 16.713867 C 17.488605 16.977539 17.441406 17.252604 17.441406 17.539062 C 17.441406 17.753906 17.469074 17.960611 17.524414 18.15918 C 17.579752 18.357748 17.636719 18.561197 17.695312 18.769531 C 17.337238 19.010416 16.972656 19.208984 16.601562 19.365234 C 16.425781 19.189453 16.261393 19.029947 16.108398 18.886719 C 15.955402 18.74349 15.79427 18.618164 15.625 18.510742 C 15.455729 18.40332 15.270182 18.320312 15.068359 18.261719 C 14.866535 18.203125 14.635416 18.173828 14.375 18.173828 C 14.108072 18.173828 13.875324 18.203125 13.676758 18.261719 C 13.478189 18.320312 13.294271 18.40332 13.125 18.510742 C 12.955729 18.618164 12.794596 18.74349 12.641602 18.886719 C 12.488606 19.029947 12.324219 19.189453 12.148438 19.365234 Z M 0 13.75 C 0 13.404948 0.065104 13.081055 0.195312 12.77832 C 0.325521 12.475586 0.504557 12.210287 0.732422 11.982422 C 0.960286 11.754558 1.225586 11.575521 1.52832 11.445312 C 1.831055 11.315104 2.154948 11.25 2.5 11.25 L 8.251953 11.25 C 8.043619 11.660156 7.880859 12.076823 7.763672 12.5 L 2.5 12.5 C 2.324219 12.5 2.159831 12.532553 2.006836 12.597656 C 1.853841 12.662761 1.722005 12.750651 1.611328 12.861328 C 1.500651 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.420573 1.360677 15.008139 1.582031 15.512695 C 1.803385 16.017252 2.102865 16.455078 2.480469 16.826172 C 2.858073 17.197266 3.297526 17.50651 3.798828 17.753906 C 4.30013 18.001303 4.827474 18.198242 5.380859 18.344727 C 5.934244 18.491211 6.50065 18.595377 7.080078 18.657227 C 7.659505 18.719076 8.216146 18.75 8.75 18.75 L 9.072266 18.75 C 9.449869 19.199219 9.866536 19.5931 10.322266 19.931641 C 10.061849 19.964193 9.801432 19.983725 9.541016 19.990234 C 9.280599 19.996744 9.016927 20 8.75 20 C 8.190104 20 7.618814 19.973959 7.036133 19.921875 C 6.45345 19.869791 5.878906 19.775391 5.3125 19.638672 C 4.746094 19.501953 4.197591 19.319662 3.666992 19.091797 C 3.136393 18.863932 2.646484 18.574219 2.197266 18.222656 C 1.474609 17.66276 0.927734 17.005209 0.556641 16.25 C 0.185547 15.494792 0 14.661458 0 13.75 Z M 15.625 14.375 C 15.625 14.205729 15.592447 14.044597 15.527344 13.891602 C 15.462239 13.738607 15.372721 13.605144 15.258789 13.491211 C 15.144855 13.377279 15.011393 13.287761 14.858398 13.222656 C 14.705403 13.157553 14.544271 13.125 14.375 13.125 C 14.199219 13.125 14.036458 13.157553 13.886719 13.222656 C 13.736979 13.287761 13.605143 13.377279 13.491211 13.491211 C 13.377278 13.605144 13.28776 13.736979 13.222656 13.886719 C 13.157551 14.036459 13.124999 14.199219 13.125 14.375 C 13.124999 14.550781 13.157551 14.71517 13.222656 14.868164 C 13.28776 15.021159 13.37565 15.152995 13.486328 15.263672 C 13.597004 15.37435 13.72884 15.46224 13.881836 15.527344 C 14.03483 15.592448 14.199219 15.625 14.375 15.625 C 14.550781 15.625 14.713541 15.592448 14.863281 15.527344 C 15.01302 15.46224 15.144855 15.372722 15.258789 15.258789 C 15.372721 15.144857 15.462239 15.013021 15.527344 14.863281 C 15.592447 14.713542 15.625 14.550781 15.625 14.375 Z " />
-                                <TextBlock Text="{x:Bind domain:Translator.BasicIMAPSetupDialog_AdvancedConfiguration}" />
-                            </StackPanel>
-                        </Button>
-                    </StackPanel>
-                </Grid>
-            </ScrollViewer>
-
-            <!--  Buttons  -->
-            <Grid
-                Grid.Row="1"
-                Padding="{StaticResource ImapSetupDialogSubPagePadding}"
-                VerticalAlignment="Bottom"
-                Background="{ThemeResource ContentDialogBackground}"
-                ColumnSpacing="6">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Button
-                    HorizontalAlignment="Stretch"
-                    Click="SignInClicked"
-                    Content="{x:Bind domain:Translator.Buttons_SignIn}"
-                    Style="{ThemeResource AccentButtonStyle}" />
-
-                <Button
-                    Grid.Column="1"
-                    HorizontalAlignment="Stretch"
-                    Click="CancelClicked"
-                    Content="{x:Bind domain:Translator.Buttons_Cancel}" />
-            </Grid>
-        </Grid>
-
-        <!--  Auto Discovery In-Progress Panel  -->
-        <StackPanel
-            x:Name="AutoDiscoveryPanel"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Visibility="Collapsed">
-
-            <Viewbox
-                Width="26"
-                Height="26"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center">
-                <PathIcon Data="F1 M 20 10 C 20 10.924479 19.881184 11.811523 19.643555 12.661133 C 19.405924 13.510742 19.070637 14.306641 18.637695 15.048828 C 18.204752 15.791016 17.683918 16.466473 17.075195 17.075195 C 16.466471 17.68392 15.791016 18.204752 15.048828 18.637695 C 14.306641 19.070639 13.509114 19.405924 12.65625 19.643555 C 11.803385 19.881186 10.917969 20 10 20 C 9.075521 20 8.188477 19.881186 7.338867 19.643555 C 6.489257 19.405924 5.693359 19.070639 4.951172 18.637695 C 4.208984 18.204752 3.533528 17.68392 2.924805 17.075195 C 2.316081 16.466473 1.795247 15.791016 1.362305 15.048828 C 0.929362 14.306641 0.594076 13.509115 0.356445 12.65625 C 0.118815 11.803386 0 10.917969 0 10 C 0 9.082031 0.118815 8.196615 0.356445 7.34375 C 0.594076 6.490886 0.929362 5.693359 1.362305 4.951172 C 1.795247 4.208984 2.316081 3.533529 2.924805 2.924805 C 3.533528 2.316082 4.208984 1.795248 4.951172 1.362305 C 5.693359 0.929363 6.490885 0.594076 7.34375 0.356445 C 8.196614 0.118816 9.082031 0 10 0 C 10.917969 0 11.803385 0.118816 12.65625 0.356445 C 13.509114 0.594076 14.306641 0.929363 15.048828 1.362305 C 15.791016 1.795248 16.466471 2.316082 17.075195 2.924805 C 17.683918 3.533529 18.204752 4.208984 18.637695 4.951172 C 19.070637 5.693359 19.405924 6.490886 19.643555 7.34375 C 19.881184 8.196615 20 9.082031 20 10 Z M 6.630859 6.25 L 13.369141 6.25 C 13.317057 5.996094 13.242188 5.696615 13.144531 5.351562 C 13.046875 5.006511 12.926432 4.648438 12.783203 4.277344 C 12.639973 3.90625 12.475585 3.540039 12.290039 3.178711 C 12.104491 2.817383 11.896158 2.49349 11.665039 2.207031 C 11.433919 1.920574 11.180013 1.689453 10.90332 1.513672 C 10.626627 1.337891 10.325521 1.25 10 1.25 C 9.674479 1.25 9.373372 1.337891 9.09668 1.513672 C 8.819986 1.689453 8.56608 1.920574 8.334961 2.207031 C 8.103841 2.49349 7.895508 2.817383 7.709961 3.178711 C 7.524414 3.540039 7.360026 3.90625 7.216797 4.277344 C 7.073567 4.648438 6.953125 5.006511 6.855469 5.351562 C 6.757812 5.696615 6.682942 5.996094 6.630859 6.25 Z M 2.089844 6.25 L 5.351562 6.25 C 5.501302 5.442709 5.717773 4.654948 6.000977 3.886719 C 6.28418 3.11849 6.663411 2.39909 7.138672 1.728516 C 6.591797 1.897787 6.067708 2.132162 5.566406 2.431641 C 5.065104 2.731121 4.597981 3.079428 4.165039 3.476562 C 3.732096 3.873699 3.338216 4.306641 2.983398 4.775391 C 2.628581 5.244141 2.330729 5.735678 2.089844 6.25 Z M 12.861328 1.728516 C 13.336588 2.39909 13.71582 3.11849 13.999023 3.886719 C 14.282227 4.654948 14.498697 5.442709 14.648438 6.25 L 17.910156 6.25 C 17.66276 5.735678 17.363281 5.244141 17.011719 4.775391 C 16.660156 4.306641 16.267902 3.873699 15.834961 3.476562 C 15.402018 3.079428 14.934896 2.731121 14.433594 2.431641 C 13.932291 2.132162 13.408202 1.897787 12.861328 1.728516 Z M 5.15625 12.5 C 5.097656 12.083334 5.056966 11.668295 5.03418 11.254883 C 5.011393 10.841472 5 10.423178 5 10 C 5 9.576823 5.011393 9.158529 5.03418 8.745117 C 5.056966 8.331706 5.097656 7.916667 5.15625 7.5 L 1.611328 7.5 C 1.494141 7.910156 1.404622 8.32194 1.342773 8.735352 C 1.280924 9.148764 1.25 9.570312 1.25 10 C 1.25 10.429688 1.280924 10.851237 1.342773 11.264648 C 1.404622 11.678061 1.494141 12.089844 1.611328 12.5 Z M 13.59375 12.5 C 13.652343 12.083334 13.693033 11.668295 13.71582 11.254883 C 13.738606 10.841472 13.75 10.423178 13.75 10 C 13.75 9.576823 13.738606 9.158529 13.71582 8.745117 C 13.693033 8.331706 13.652343 7.916667 13.59375 7.5 L 6.40625 7.5 C 6.347656 7.916667 6.306966 8.331706 6.28418 8.745117 C 6.261393 9.158529 6.25 9.576823 6.25 10 C 6.25 10.423178 6.261393 10.841472 6.28418 11.254883 C 6.306966 11.668295 6.347656 12.083334 6.40625 12.5 Z M 18.388672 7.5 L 14.84375 7.5 C 14.902344 7.916667 14.943033 8.331706 14.96582 8.745117 C 14.988605 9.158529 14.999999 9.576823 15 10 C 14.999999 10.423178 14.988605 10.841472 14.96582 11.254883 C 14.943033 11.668295 14.902344 12.083334 14.84375 12.5 L 18.388672 12.5 C 18.505859 12.089844 18.595377 11.678061 18.657227 11.264648 C 18.719074 10.851237 18.75 10.429688 18.75 10 C 18.75 9.570312 18.719074 9.148764 18.657227 8.735352 C 18.595377 8.32194 18.505859 7.910156 18.388672 7.5 Z M 7.138672 18.271484 C 6.663411 17.600912 6.28418 16.88151 6.000977 16.113281 C 5.717773 15.345053 5.501302 14.557292 5.351562 13.75 L 2.089844 13.75 C 2.330729 14.257812 2.626953 14.747722 2.978516 15.219727 C 3.330078 15.691732 3.723958 16.124676 4.160156 16.518555 C 4.596354 16.912436 5.065104 17.260742 5.566406 17.563477 C 6.067708 17.866211 6.591797 18.102213 7.138672 18.271484 Z M 13.369141 13.75 L 6.630859 13.75 C 6.682942 14.003906 6.757812 14.303386 6.855469 14.648438 C 6.953125 14.99349 7.073567 15.351562 7.216797 15.722656 C 7.360026 16.09375 7.524414 16.459961 7.709961 16.821289 C 7.895508 17.182617 8.103841 17.50651 8.334961 17.792969 C 8.56608 18.079428 8.819986 18.310547 9.09668 18.486328 C 9.373372 18.662109 9.674479 18.75 10 18.75 C 10.325521 18.75 10.626627 18.662109 10.90332 18.486328 C 11.180013 18.310547 11.433919 18.079428 11.665039 17.792969 C 11.896158 17.50651 12.104491 17.182617 12.290039 16.821289 C 12.475585 16.459961 12.639973 16.09375 12.783203 15.722656 C 12.926432 15.351562 13.046875 14.99349 13.144531 14.648438 C 13.242188 14.303386 13.317057 14.003906 13.369141 13.75 Z M 17.910156 13.75 L 14.648438 13.75 C 14.498697 14.557292 14.282227 15.345053 13.999023 16.113281 C 13.71582 16.88151 13.336588 17.600912 12.861328 18.271484 C 13.408202 18.102213 13.932291 17.867838 14.433594 17.568359 C 14.934896 17.268881 15.402018 16.920572 15.834961 16.523438 C 16.267902 16.126303 16.660156 15.693359 17.011719 15.224609 C 17.363281 14.755859 17.66276 14.264323 17.910156 13.75 Z " />
-            </Viewbox>
-
-            <TextBlock Text="{x:Bind domain:Translator.AutoDiscoveryProgressMessage}" />
-            <muxc:ProgressBar Margin="0,4,0,0" IsIndeterminate="True" />
-        </StackPanel>
-    </Grid>
-</Page>
diff --git a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
deleted file mode 100644
index 0e9e49a6..00000000
--- a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Accounts;
-using Wino.Core.Domain.Models.AutoDiscovery;
-using Wino.Messaging.Client.Mails;
-
-
-namespace Wino.Views.ImapSetup;
-
-public sealed partial class WelcomeImapSetupPage : Page
-{
-    private readonly IAutoDiscoveryService _autoDiscoveryService = App.Current.Services.GetService<IAutoDiscoveryService>();
-
-    public WelcomeImapSetupPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        AutoDiscoveryPanel.Visibility = Visibility.Collapsed;
-        MainSetupPanel.Visibility = Visibility.Visible;
-
-        if (e.Parameter is MailAccount accountProperties)
-        {
-            DisplayNameBox.Text = accountProperties.Name;
-        }
-        else if (e.Parameter is AccountCreationDialogResult creationDialogResult)
-        {
-            WeakReferenceMessenger.Default.Send(new ImapSetupNavigationRequested(typeof(TestingImapConnectionPage), creationDialogResult));
-        }
-    }
-
-    private async void SignInClicked(object sender, RoutedEventArgs e)
-    {
-        MainSetupPanel.Visibility = Visibility.Collapsed;
-        AutoDiscoveryPanel.Visibility = Visibility.Visible;
-
-        // Let users see the discovery message for a while...
-
-        await Task.Delay(1000);
-
-        var minimalSettings = new AutoDiscoveryMinimalSettings()
-        {
-            Password = PasswordBox.Password,
-            DisplayName = DisplayNameBox.Text,
-            Email = AddressBox.Text,
-        };
-
-        var discoverySettings = await _autoDiscoveryService.GetAutoDiscoverySettings(minimalSettings);
-
-        if (discoverySettings == null)
-        {
-            // Couldn't find settings.
-
-            var failurePackage = new ImapConnectionFailedPackage(Translator.Exception_ImapAutoDiscoveryFailed, string.Empty, discoverySettings);
-
-            WeakReferenceMessenger.Default.Send(new ImapSetupBackNavigationRequested(typeof(ImapConnectionFailedPage), failurePackage));
-        }
-        else
-        {
-            // Settings are found. Test the connection with the given password.
-
-            discoverySettings.UserMinimalSettings = minimalSettings;
-
-            WeakReferenceMessenger.Default.Send(new ImapSetupNavigationRequested(typeof(TestingImapConnectionPage), discoverySettings));
-        }
-    }
-
-    private void CancelClicked(object sender, RoutedEventArgs e) => WeakReferenceMessenger.Default.Send(new ImapSetupDismissRequested());
-
-    private void AdvancedConfigurationClicked(object sender, RoutedEventArgs e)
-    {
-        var latestMinimalSettings = new AutoDiscoveryMinimalSettings()
-        {
-            DisplayName = DisplayNameBox.Text,
-            Password = PasswordBox.Password,
-            Email = AddressBox.Text
-        };
-
-
-        WeakReferenceMessenger.Default.Send(new ImapSetupNavigationRequested(typeof(AdvancedImapSetupPage), latestMinimalSettings));
-    }
-}
diff --git a/Wino.Mail/Views/MailListPage.xaml.cs b/Wino.Mail/Views/MailListPage.xaml.cs
deleted file mode 100644
index 6153a6ea..00000000
--- a/Wino.Mail/Views/MailListPage.xaml.cs
+++ /dev/null
@@ -1,501 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.UI.Xaml.Controls;
-using MoreLinq;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media.Animation;
-using Windows.UI.Xaml.Navigation;
-using Wino.Controls;
-using Wino.Controls.Advanced;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Core.Domain.Models.Menus;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Mail.ViewModels.Data;
-using Wino.Mail.ViewModels.Messages;
-using Wino.MenuFlyouts.Context;
-using Wino.Messaging.Client.Mails;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class MailListPage : MailListPageAbstract,
-    IRecipient<ClearMailSelectionsRequested>,
-    IRecipient<ActiveMailItemChangedEvent>,
-    IRecipient<SelectMailItemContainerEvent>,
-    IRecipient<DisposeRenderingFrameRequested>
-{
-    private const double RENDERING_COLUMN_MIN_WIDTH = 375;
-
-    private IStatePersistanceService StatePersistenceService { get; } = App.Current.Services.GetService<IStatePersistanceService>();
-    private IKeyPressService KeyPressService { get; } = App.Current.Services.GetService<IKeyPressService>();
-
-    public MailListPage()
-    {
-        InitializeComponent();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        // Bindings.Update();
-
-        // Delegate to ViewModel.
-        if (e.Parameter is NavigateMailFolderEventArgs folderNavigationArgs)
-        {
-            WeakReferenceMessenger.Default.Send(new ActiveMailFolderChangedEvent(folderNavigationArgs.BaseFolderMenuItem, folderNavigationArgs.FolderInitLoadAwaitTask));
-        }
-    }
-
-    protected override void OnNavigatedFrom(NavigationEventArgs e)
-    {
-        base.OnNavigatedFrom(e);
-
-        // Dispose all WinoListView items.
-
-        MailListView.Dispose();
-
-        this.Bindings.StopTracking();
-
-        RenderingFrame.Navigate(typeof(IdlePage));
-
-        GC.Collect();
-    }
-
-    private void UpdateSelectAllButtonStatus()
-    {
-        // Check all checkbox if all is selected.
-        // Unhook events to prevent selection overriding.
-
-        SelectAllCheckbox.Checked -= SelectAllCheckboxChecked;
-        SelectAllCheckbox.Unchecked -= SelectAllCheckboxUnchecked;
-
-        SelectAllCheckbox.IsChecked = MailListView.Items.Count > 0 && MailListView.SelectedItems.Count == MailListView.Items.Count;
-
-        SelectAllCheckbox.Checked += SelectAllCheckboxChecked;
-        SelectAllCheckbox.Unchecked += SelectAllCheckboxUnchecked;
-    }
-
-    private void SelectionModeToggleChecked(object sender, RoutedEventArgs e)
-    {
-        ChangeSelectionMode(ListViewSelectionMode.Multiple);
-    }
-
-    private void FolderPivotChanged(object sender, SelectionChangedEventArgs e)
-    {
-        foreach (var addedItem in e.AddedItems)
-        {
-            if (addedItem is FolderPivotViewModel pivotItem)
-            {
-                pivotItem.IsSelected = true;
-            }
-        }
-
-        foreach (var removedItem in e.RemovedItems)
-        {
-            if (removedItem is FolderPivotViewModel pivotItem)
-            {
-                pivotItem.IsSelected = false;
-            }
-        }
-
-        SelectAllCheckbox.IsChecked = false;
-        SelectionModeToggle.IsChecked = false;
-
-        MailListView.ClearSelections();
-
-        UpdateSelectAllButtonStatus();
-        ViewModel.SelectedPivotChangedCommand.Execute(null);
-    }
-
-    private void ChangeSelectionMode(ListViewSelectionMode mode)
-    {
-        MailListView.ChangeSelectionMode(mode);
-
-        if (ViewModel?.PivotFolders != null)
-        {
-            ViewModel.PivotFolders.ForEach(a => a.IsExtendedMode = mode == ListViewSelectionMode.Extended);
-        }
-    }
-
-    private void SelectionModeToggleUnchecked(object sender, RoutedEventArgs e)
-    {
-        ChangeSelectionMode(ListViewSelectionMode.Extended);
-    }
-
-    private void SelectAllCheckboxChecked(object sender, RoutedEventArgs e)
-    {
-        MailListView.SelectAllWino();
-    }
-
-    private void SelectAllCheckboxUnchecked(object sender, RoutedEventArgs e)
-    {
-        MailListView.ClearSelections();
-    }
-
-    private async void MailItemContextRequested(UIElement sender, ContextRequestedEventArgs args)
-    {
-        // Context is requested from a single mail point, but we might have multiple selected items.
-        // This menu should be calculated based on all selected items by providers.
-
-        if (sender is MailItemDisplayInformationControl control && args.TryGetPosition(sender, out Point p))
-        {
-            await FocusManager.TryFocusAsync(control, FocusState.Keyboard);
-
-            if (control.DataContext is IMailItem clickedMailItemContext)
-            {
-                var targetItems = ViewModel.GetTargetMailItemViewModels(clickedMailItemContext);
-                var availableActions = ViewModel.GetAvailableMailActions(targetItems);
-
-                if (!availableActions?.Any() ?? false) return;
-                var t = targetItems.ElementAt(0);
-
-                ViewModel.ChangeCustomFocusedState(targetItems, true);
-
-                var clickedOperation = await GetMailOperationFromFlyoutAsync(availableActions, control, p.X, p.Y);
-
-                ViewModel.ChangeCustomFocusedState(targetItems, false);
-
-                if (clickedOperation == null) return;
-
-                var prepRequest = new MailOperationPreperationRequest(clickedOperation.Operation, targetItems.Select(a => a.MailCopy));
-
-                await ViewModel.ExecuteMailOperationAsync(prepRequest);
-            }
-        }
-    }
-
-    private async Task<MailOperationMenuItem> GetMailOperationFromFlyoutAsync(IEnumerable<MailOperationMenuItem> availableActions,
-                                                                              UIElement showAtElement,
-                                                                              double x,
-                                                                              double y)
-    {
-        var source = new TaskCompletionSource<MailOperationMenuItem>();
-
-        var flyout = new MailOperationFlyout(availableActions, source);
-
-        flyout.ShowAt(showAtElement, new FlyoutShowOptions()
-        {
-            ShowMode = FlyoutShowMode.Standard,
-            Position = new Point(x + 30, y - 20)
-        });
-
-        return await source.Task;
-    }
-
-    void IRecipient<ClearMailSelectionsRequested>.Receive(ClearMailSelectionsRequested message)
-    {
-        MailListView.ClearSelections(null, preserveThreadExpanding: true);
-    }
-
-    void IRecipient<ActiveMailItemChangedEvent>.Receive(ActiveMailItemChangedEvent message)
-    {
-        // No active mail item. Go to empty page.
-        if (message.SelectedMailItemViewModel == null)
-        {
-            WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
-        }
-        else
-        {
-            // Navigate to composing page.
-            if (message.SelectedMailItemViewModel.IsDraft)
-            {
-                NavigationTransitionType composerPageTransition = NavigationTransitionType.None;
-
-                // Dispose active rendering if there is any and go to composer.
-                if (IsRenderingPageActive())
-                {
-                    // Prepare WebView2 animation from Rendering to Composing page.
-                    PrepareRenderingPageWebViewTransition();
-
-                    // Dispose existing HTML content from rendering page webview.
-                    WeakReferenceMessenger.Default.Send(new CancelRenderingContentRequested());
-                }
-                else if (IsComposingPageActive())
-                {
-                    // Composer is already active. Prepare composer WebView2 animation.
-                    PrepareComposePageWebViewTransition();
-                }
-                else
-                    composerPageTransition = NavigationTransitionType.DrillIn;
-
-                ViewModel.NavigationService.Navigate(WinoPage.ComposePage, message.SelectedMailItemViewModel, NavigationReferenceFrame.RenderingFrame, composerPageTransition);
-            }
-            else
-            {
-                // Find the MIME and go to rendering page.
-
-                if (message.SelectedMailItemViewModel == null) return;
-
-                if (IsComposingPageActive())
-                {
-                    PrepareComposePageWebViewTransition();
-                }
-
-                ViewModel.NavigationService.Navigate(WinoPage.MailRenderingPage, message.SelectedMailItemViewModel, NavigationReferenceFrame.RenderingFrame);
-            }
-        }
-
-        UpdateAdaptiveness();
-    }
-
-    private bool IsRenderingPageActive() => RenderingFrame.Content is MailRenderingPage;
-    private bool IsComposingPageActive() => RenderingFrame.Content is ComposePage;
-
-    private void PrepareComposePageWebViewTransition()
-    {
-        var webView = GetComposerPageWebView();
-
-        if (webView != null)
-        {
-            var animation = ConnectedAnimationService.GetForCurrentView().PrepareToAnimate("WebViewConnectedAnimation", webView);
-            animation.Configuration = new BasicConnectedAnimationConfiguration();
-        }
-    }
-
-    private void PrepareRenderingPageWebViewTransition()
-    {
-        var webView = GetRenderingPageWebView();
-
-        if (webView != null)
-        {
-            var animation = ConnectedAnimationService.GetForCurrentView().PrepareToAnimate("WebViewConnectedAnimation", webView);
-            animation.Configuration = new BasicConnectedAnimationConfiguration();
-        }
-    }
-
-    #region Connected Animation Helpers
-
-    private WebView2 GetRenderingPageWebView()
-    {
-        if (RenderingFrame.Content is MailRenderingPage renderingPage)
-            return renderingPage.GetWebView();
-
-        return null;
-    }
-
-    private WebView2 GetComposerPageWebView()
-    {
-        if (RenderingFrame.Content is ComposePage composePage)
-            return composePage.GetWebView();
-
-        return null;
-    }
-
-    #endregion
-
-    public async void Receive(SelectMailItemContainerEvent message)
-    {
-        if (message.SelectedMailViewModel == null) return;
-
-        await ViewModel.ExecuteUIThread(async () =>
-        {
-            MailListView.ClearSelections(message.SelectedMailViewModel, true);
-
-            int retriedSelectionCount = 0;
-        trySelection:
-
-            bool isSelected = MailListView.SelectMailItemContainer(message.SelectedMailViewModel);
-
-            if (!isSelected)
-            {
-                for (int i = retriedSelectionCount; i < 5;)
-                {
-                    // Retry with delay until the container is realized. Max 1 second.
-                    await Task.Delay(200);
-
-                    retriedSelectionCount++;
-
-                    goto trySelection;
-                }
-            }
-
-            // Automatically scroll to the selected item.
-            // This is useful when creating draft.
-            if (isSelected && message.ScrollToItem)
-            {
-                var collectionContainer = ViewModel.MailCollection.GetMailItemContainer(message.SelectedMailViewModel.UniqueId);
-
-                // Scroll to thread if available.
-                if (collectionContainer.ThreadViewModel != null)
-                {
-                    MailListView.ScrollIntoView(collectionContainer.ThreadViewModel, ScrollIntoViewAlignment.Default);
-                }
-                else if (collectionContainer.ItemViewModel != null)
-                {
-                    MailListView.ScrollIntoView(collectionContainer.ItemViewModel, ScrollIntoViewAlignment.Default);
-                }
-
-            }
-        });
-    }
-
-    private void SearchBoxFocused(object sender, RoutedEventArgs e)
-    {
-        SearchBar.PlaceholderText = string.Empty;
-    }
-
-    private void SearchBarUnfocused(object sender, RoutedEventArgs e)
-    {
-        SearchBar.PlaceholderText = Translator.SearchBarPlaceholder;
-    }
-
-    /// <summary>
-    /// Thread header is mail info display control and it can be dragged spearately out of ListView.
-    /// We need to prepare a drag package for it from the items inside.
-    /// </summary>
-    private void ThreadHeaderDragStart(UIElement sender, DragStartingEventArgs args)
-    {
-        if (sender is MailItemDisplayInformationControl control
-            && control.ConnectedExpander?.Content is WinoListView contentListView)
-        {
-            var allItems = contentListView.Items.Where(a => a is IMailItem);
-
-            // Highlight all items.
-            allItems.Cast<MailItemViewModel>().ForEach(a => a.IsCustomFocused = true);
-
-            // Set native drag arg properties.
-            args.AllowedOperations = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Move;
-
-            var dragPackage = new MailDragPackage(allItems.Cast<IMailItem>());
-
-            args.Data.Properties.Add(nameof(MailDragPackage), dragPackage);
-            args.DragUI.SetContentFromDataPackage();
-
-            control.ConnectedExpander.IsExpanded = true;
-        }
-    }
-
-    private void ThreadHeaderDragFinished(UIElement sender, DropCompletedEventArgs args)
-    {
-        if (sender is MailItemDisplayInformationControl control && control.ConnectedExpander != null && control.ConnectedExpander.Content is WinoListView contentListView)
-        {
-            contentListView.Items.Where(a => a is MailItemViewModel).Cast<MailItemViewModel>().ForEach(a => a.IsCustomFocused = false);
-        }
-    }
-
-    private async void LeftSwipeItemInvoked(Microsoft.UI.Xaml.Controls.SwipeItem sender, Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs args)
-    {
-        // Delete item for now.
-
-        var swipeControl = args.SwipeControl;
-
-        swipeControl.Close();
-
-        if (swipeControl.Tag is MailItemViewModel mailItemViewModel)
-        {
-            var package = new MailOperationPreperationRequest(MailOperation.SoftDelete, mailItemViewModel.MailCopy);
-            await ViewModel.ExecuteMailOperationAsync(package);
-        }
-        else if (swipeControl.Tag is ThreadMailItemViewModel threadMailItemViewModel)
-        {
-            var package = new MailOperationPreperationRequest(MailOperation.SoftDelete, threadMailItemViewModel.GetMailCopies());
-            await ViewModel.ExecuteMailOperationAsync(package);
-        }
-    }
-
-    private async void RightSwipeItemInvoked(Microsoft.UI.Xaml.Controls.SwipeItem sender, Microsoft.UI.Xaml.Controls.SwipeItemInvokedEventArgs args)
-    {
-        // Toggle status only for now.
-
-        var swipeControl = args.SwipeControl;
-
-        swipeControl.Close();
-
-        if (swipeControl.Tag is MailItemViewModel mailItemViewModel)
-        {
-            var operation = mailItemViewModel.IsRead ? MailOperation.MarkAsUnread : MailOperation.MarkAsRead;
-            var package = new MailOperationPreperationRequest(operation, mailItemViewModel.MailCopy);
-
-            await ViewModel.ExecuteMailOperationAsync(package);
-        }
-        else if (swipeControl.Tag is ThreadMailItemViewModel threadMailItemViewModel)
-        {
-            bool isAllRead = threadMailItemViewModel.ThreadItems.All(a => a.IsRead);
-
-            var operation = isAllRead ? MailOperation.MarkAsUnread : MailOperation.MarkAsRead;
-            var package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.GetMailCopies());
-
-            await ViewModel.ExecuteMailOperationAsync(package);
-        }
-    }
-
-    private void PullToRefreshRequested(Microsoft.UI.Xaml.Controls.RefreshContainer sender, Microsoft.UI.Xaml.Controls.RefreshRequestedEventArgs args)
-    {
-        ViewModel.SyncFolderCommand?.Execute(null);
-    }
-
-    private async void SearchBar_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
-    {
-        // User clicked 'x' button to clearout the search text.
-        if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput && string.IsNullOrWhiteSpace(sender.Text))
-        {
-            ViewModel.IsOnlineSearchButtonVisible = false;
-            await ViewModel.PerformSearchAsync();
-        }
-    }
-
-    public void Receive(DisposeRenderingFrameRequested message)
-    {
-        ViewModel.NavigationService.Navigate(WinoPage.IdlePage, null, NavigationReferenceFrame.RenderingFrame, NavigationTransitionType.DrillIn);
-    }
-
-    private void PageSizeChanged(object sender, SizeChangedEventArgs e)
-    {
-        ViewModel.MaxMailListLength = e.NewSize.Width - RENDERING_COLUMN_MIN_WIDTH;
-
-        StatePersistenceService.IsReaderNarrowed = e.NewSize.Width < StatePersistenceService.MailListPaneLength + RENDERING_COLUMN_MIN_WIDTH;
-
-        UpdateAdaptiveness();
-    }
-
-    private void MailListSizerManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
-    {
-        StatePersistenceService.MailListPaneLength = ViewModel.MailListLength;
-    }
-
-    private void UpdateAdaptiveness()
-    {
-        bool isMultiSelectionEnabled = ViewModel.IsMultiSelectionModeEnabled || KeyPressService.IsCtrlKeyPressed();
-
-        if (StatePersistenceService.IsReaderNarrowed)
-        {
-            if (ViewModel.HasSingleItemSelection && !isMultiSelectionEnabled)
-            {
-                VisualStateManager.GoToState(this, "NarrowRenderer", true);
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, "NarrowMailList", true);
-            }
-        }
-        else
-        {
-            if (ViewModel.HasSingleItemSelection && !isMultiSelectionEnabled)
-            {
-                VisualStateManager.GoToState(this, "BothPanelsMailSelected", true);
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, "BothPanelsNoMailSelected", true);
-            }
-        }
-    }
-
-    private void SelectAllInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
-        => MailListView.SelectAllWino();
-
-    private void DeleteAllInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
-        => ViewModel.ExecuteMailOperationCommand.Execute(MailOperation.SoftDelete);
-}
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml.cs b/Wino.Mail/Views/MailRenderingPage.xaml.cs
deleted file mode 100644
index 756e8b81..00000000
--- a/Wino.Mail/Views/MailRenderingPage.xaml.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.Web.WebView2.Core;
-using Windows.System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Windows.UI.Xaml.Navigation;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Extensions;
-using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.Client.Mails;
-using Wino.Messaging.Client.Shell;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class MailRenderingPage : MailRenderingPageAbstract,
-    IRecipient<HtmlRenderingRequested>,
-    IRecipient<CancelRenderingContentRequested>,
-    IRecipient<ApplicationThemeChanged>
-{
-    private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
-    private readonly IMailDialogService _dialogService = App.Current.Services.GetService<IMailDialogService>();
-
-    private bool isRenderingInProgress = false;
-    private TaskCompletionSource<bool> DOMLoadedTask = new TaskCompletionSource<bool>();
-
-    private bool isChromiumDisposed = false;
-
-    public WebView2 GetWebView() => Chromium;
-
-    public MailRenderingPage()
-    {
-        InitializeComponent();
-
-        Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
-        Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation,msWebView2CodeCache");
-
-        ViewModel.SaveHTMLasPDFFunc = new Func<string, Task<bool>>((path) =>
-        {
-            return Chromium.CoreWebView2.PrintToPdfAsync(path, null).AsTask();
-        });
-    }
-
-    public override async void OnEditorThemeChanged()
-    {
-        base.OnEditorThemeChanged();
-
-        await UpdateEditorThemeAsync();
-    }
-
-    private async Task<string> InvokeScriptSafeAsync(string function)
-    {
-        try
-        {
-            return await Chromium.ExecuteScriptAsync(function);
-        }
-        catch (Exception) { }
-
-        return string.Empty;
-    }
-
-    private async Task RenderInternalAsync(string htmlBody)
-    {
-        isRenderingInProgress = true;
-
-        await DOMLoadedTask.Task;
-
-        await UpdateEditorThemeAsync();
-        await UpdateReaderFontPropertiesAsync();
-
-        if (string.IsNullOrEmpty(htmlBody))
-        {
-            await Chromium.ExecuteScriptFunctionAsync("RenderHTML", isChromiumDisposed, JsonSerializer.Serialize(" ", BasicTypesJsonContext.Default.String));
-        }
-        else
-        {
-            var shouldLinkifyText = ViewModel.CurrentRenderModel?.MailRenderingOptions?.RenderPlaintextLinks ?? true;
-            await Chromium.ExecuteScriptFunctionAsync("RenderHTML", isChromiumDisposed,
-                JsonSerializer.Serialize(htmlBody, BasicTypesJsonContext.Default.String),
-                JsonSerializer.Serialize(shouldLinkifyText, BasicTypesJsonContext.Default.Boolean));
-        }
-
-        isRenderingInProgress = false;
-    }
-
-    private async void WindowRequested(CoreWebView2 sender, CoreWebView2NewWindowRequestedEventArgs args)
-    {
-        args.Handled = true;
-
-        try
-        {
-            await Launcher.LaunchUriAsync(new Uri(args.Uri));
-        }
-        catch (Exception) { }
-    }
-
-    private void DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => DOMLoadedTask.TrySetResult(true);
-
-    async void IRecipient<HtmlRenderingRequested>.Receive(HtmlRenderingRequested message)
-    {
-        if (message == null || string.IsNullOrEmpty(message.HtmlBody))
-        {
-            await RenderInternalAsync(string.Empty);
-            return;
-        }
-
-        await Chromium.EnsureCoreWebView2Async();
-
-        await RenderInternalAsync(message.HtmlBody);
-    }
-
-    protected override void OnNavigatedFrom(NavigationEventArgs e)
-    {
-        base.OnNavigatedFrom(e);
-
-        // Disposing the page.
-        // Make sure the WebView2 is disposed properly.
-
-        DisposeWebView2();
-    }
-
-    private void DisposeWebView2()
-    {
-        if (Chromium == null) return;
-
-        Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
-        Chromium.NavigationStarting -= WebViewNavigationStarting;
-
-        if (Chromium.CoreWebView2 != null)
-        {
-            Chromium.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
-            Chromium.CoreWebView2.NewWindowRequested -= WindowRequested;
-        }
-
-        isChromiumDisposed = true;
-
-        Chromium.Close();
-        GC.Collect();
-    }
-
-    protected override void OnNavigatedTo(NavigationEventArgs e)
-    {
-        base.OnNavigatedTo(e);
-
-        var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
-        anim?.TryStart(Chromium);
-
-        Chromium.CoreWebView2Initialized -= CoreWebViewInitialized;
-        Chromium.CoreWebView2Initialized += CoreWebViewInitialized;
-
-        _ = Chromium.EnsureCoreWebView2Async();
-
-        // We don't have shell initialized here. It's only standalone EML viewing.
-        // Shift command bar from top to adjust the design.
-
-        if (ViewModel.StatePersistenceService.ShouldShiftMailRenderingDesign)
-            RendererGridFrame.Margin = new Thickness(0, 24, 0, 0);
-        else
-            RendererGridFrame.Margin = new Thickness(0, 0, 0, 0);
-    }
-
-    private async void CoreWebViewInitialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
-    {
-        if (Chromium.CoreWebView2 == null) return;
-
-        var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
-
-        Chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.reader", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
-
-        Chromium.CoreWebView2.DOMContentLoaded -= DOMContentLoaded;
-        Chromium.CoreWebView2.DOMContentLoaded += DOMContentLoaded;
-
-        Chromium.CoreWebView2.NewWindowRequested -= WindowRequested;
-        Chromium.CoreWebView2.NewWindowRequested += WindowRequested;
-
-        Chromium.Source = new Uri("https://app.reader/reader.html");
-    }
-
-
-    async void IRecipient<CancelRenderingContentRequested>.Receive(CancelRenderingContentRequested message)
-    {
-        await Chromium.EnsureCoreWebView2Async();
-
-        if (!isRenderingInProgress)
-        {
-            await RenderInternalAsync(string.Empty);
-        }
-    }
-
-    private async void WebViewNavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
-    {
-        // This is our reader.
-        if (args.Uri == "https://app.reader/reader.html")
-            return;
-
-        // Cancel all external navigations since it's navigating to different address inside the WebView2.
-        args.Cancel = !args.Uri.StartsWith("data:text/html");
-
-        // TODO: Check external link navigation setting is enabled.
-        // Open all external urls in launcher.
-
-        if (args.Cancel && Uri.TryCreate(args.Uri, UriKind.Absolute, out Uri newUri))
-        {
-            await Launcher.LaunchUriAsync(newUri);
-        }
-    }
-
-    private void AttachmentClicked(object sender, ItemClickEventArgs e)
-    {
-        if (e.ClickedItem is MailAttachmentViewModel attachmentViewModel)
-        {
-            ViewModel.OpenAttachmentCommand.Execute(attachmentViewModel);
-        }
-    }
-
-    private void BarDynamicOverflowChanging(CommandBar sender, DynamicOverflowItemsChangingEventArgs args)
-    {
-        if (args.Action == CommandBarDynamicOverflowAction.AddingToOverflow || sender.SecondaryCommands.Any())
-            sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Visible;
-        else
-            sender.OverflowButtonVisibility = CommandBarOverflowButtonVisibility.Collapsed;
-    }
-
-    private async Task UpdateEditorThemeAsync()
-    {
-        await DOMLoadedTask.Task;
-
-        if (ViewModel.IsDarkWebviewRenderer)
-        {
-            Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
-
-            await InvokeScriptSafeAsync("SetDarkEditor();");
-        }
-        else
-        {
-            Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
-
-            await InvokeScriptSafeAsync("SetLightEditor();");
-        }
-    }
-
-    private async Task UpdateReaderFontPropertiesAsync()
-    {
-        await Chromium.ExecuteScriptFunctionAsync("ChangeFontSize", isChromiumDisposed, JsonSerializer.Serialize(_preferencesService.ReaderFontSize, BasicTypesJsonContext.Default.Int32));
-
-        // Prepare font family name with fallback to sans-serif by default.
-        var fontName = _preferencesService.ReaderFont;
-
-        // If font family name is not supported by the browser, fallback to sans-serif.
-        fontName += ", sans-serif";
-
-        await Chromium.ExecuteScriptFunctionAsync("ChangeFontFamily", isChromiumDisposed, JsonSerializer.Serialize(fontName, BasicTypesJsonContext.Default.String));
-    }
-
-    void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
-    {
-        ViewModel.IsDarkWebviewRenderer = message.IsUnderlyingThemeDark;
-    }
-
-    private void InternetAddressClicked(object sender, RoutedEventArgs e)
-    {
-        if (sender is HyperlinkButton hyperlinkButton)
-        {
-            hyperlinkButton.ContextFlyout.ShowAt(hyperlinkButton);
-        }
-    }
-}
diff --git a/Wino.Mail/Views/Settings/AliasManagementPage.xaml.cs b/Wino.Mail/Views/Settings/AliasManagementPage.xaml.cs
deleted file mode 100644
index 488a8959..00000000
--- a/Wino.Mail/Views/Settings/AliasManagementPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Views.Abstract;
-
-namespace Wino.Views.Settings;
-
-public sealed partial class AliasManagementPage : AliasManagementPageAbstract
-{
-    public AliasManagementPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
deleted file mode 100644
index 85a10665..00000000
--- a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<abstract:EditAccountDetailsPageAbstract
-    x:Class="Wino.Views.EditAccountDetailsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:converters="using:Wino.Core.UWP.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Core.ViewModels.Data"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:imapsetup="using:Wino.Views.ImapSetup"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    mc:Ignorable="d">
-
-    <ScrollViewer>
-        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-            <StackPanel.ChildrenTransitions>
-                <TransitionCollection>
-                    <RepositionThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </StackPanel.ChildrenTransitions>
-
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.AccountDetailsPage_Description}" Header="{x:Bind domain:Translator.AccountDetailsPage_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <SymbolIcon Symbol="Contact" />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard Header="{x:Bind domain:Translator.AccountEditDialog_Message}">
-                        <TextBox
-                            Width="200"
-                            PlaceholderText="{x:Bind domain:Translator.AccountSettingsDialog_AccountNamePlaceholder}"
-                            Text="{x:Bind ViewModel.AccountName, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                    <controls:SettingsCard HorizontalContentAlignment="Stretch" Header="{x:Bind domain:Translator.AccountSettingsDialog_AccountName}">
-                        <TextBox
-                            Width="200"
-                            HorizontalAlignment="Stretch"
-                            PlaceholderText="{x:Bind domain:Translator.AccountSettingsDialog_AccountNamePlaceholder}"
-                            Text="{x:Bind ViewModel.SenderName, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard HorizontalContentAlignment="Stretch" Header="{x:Bind domain:Translator.Buttons_Save}">
-                        <Button
-                            Command="{x:Bind ViewModel.SaveChangesCommand}"
-                            Content="{x:Bind domain:Translator.Buttons_Save}"
-                            Style="{ThemeResource AccentButtonStyle}" />
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-            <controls:SettingsCard
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch"
-                ContentAlignment="Vertical"
-                Description="{x:Bind domain:Translator.AccountDetailsPage_ColorPicker_Description}"
-                Header="{x:Bind domain:Translator.AccountDetailsPage_ColorPicker_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 6.328125 11.835938 C 6.035156 11.835938 5.768229 11.894531 5.527344 12.011719 C 5.286458 12.128906 5.050456 12.259115 4.819336 12.402344 C 4.588216 12.545573 4.348958 12.675781 4.101562 12.792969 C 3.854167 12.910156 3.580729 12.96875 3.28125 12.96875 C 2.877604 12.96875 2.49349 12.871094 2.128906 12.675781 C 1.764323 12.480469 1.435547 12.255859 1.142578 12.001953 C 0.745443 11.656901 0.455729 11.261394 0.273438 10.81543 C 0.091146 10.369467 0 9.886068 0 9.365234 C 0 8.844401 0.071615 8.325195 0.214844 7.807617 C 0.358073 7.290039 0.533854 6.796875 0.742188 6.328125 C 0.970052 5.820312 1.233724 5.328776 1.533203 4.853516 C 1.832682 4.378256 2.158203 3.925781 2.509766 3.496094 C 2.828776 3.105469 3.167318 2.736004 3.525391 2.387695 C 3.883463 2.039389 4.277344 1.728516 4.707031 1.455078 C 5.442708 0.986328 6.225586 0.628256 7.055664 0.380859 C 7.885742 0.133465 8.736979 0.009766 9.609375 0.009766 C 10.436197 0.009766 11.25 0.117188 12.050781 0.332031 C 12.851562 0.546875 13.616536 0.849609 14.345703 1.240234 C 15.23763 1.728516 16.033527 2.298178 16.733398 2.949219 C 17.433268 3.600262 18.025715 4.322917 18.510742 5.117188 C 18.995768 5.911459 19.365234 6.769206 19.619141 7.69043 C 19.873047 8.611654 20 9.583334 20 10.605469 C 20 11.230469 19.952799 11.850586 19.858398 12.46582 C 19.763996 13.081055 19.62565 13.688151 19.443359 14.287109 C 19.300129 14.74935 19.119465 15.213217 18.901367 15.678711 C 18.683268 16.144205 18.427734 16.59017 18.134766 17.016602 C 17.841797 17.443033 17.516275 17.843424 17.158203 18.217773 C 16.800129 18.592123 16.411133 18.916016 15.991211 19.189453 C 15.571289 19.462891 15.12207 19.677734 14.643555 19.833984 C 14.165039 19.990234 13.662109 20.068359 13.134766 20.068359 C 12.841797 20.068359 12.553711 20.042318 12.270508 19.990234 C 11.987305 19.93815 11.708984 19.863281 11.435547 19.765625 C 10.86263 19.563803 10.371094 19.31315 9.960938 19.013672 C 9.550781 18.714193 9.210611 18.365885 8.94043 17.96875 C 8.670247 17.571615 8.465169 17.12565 8.325195 16.630859 C 8.185221 16.136068 8.095703 15.592448 8.056641 15 C 8.030599 14.641928 8.012695 14.283854 8.00293 13.925781 C 7.993164 13.567709 7.945963 13.212891 7.861328 12.861328 C 7.835286 12.763672 7.805989 12.659506 7.773438 12.548828 C 7.740885 12.438151 7.688802 12.347006 7.617188 12.275391 C 7.545573 12.197266 7.457682 12.128906 7.353516 12.070312 C 7.249349 12.011719 7.138672 11.966146 7.021484 11.933594 C 6.904297 11.901042 6.785481 11.876628 6.665039 11.860352 C 6.544596 11.844076 6.432292 11.835938 6.328125 11.835938 Z M 13.134766 18.818359 C 13.623047 18.818359 14.088541 18.725586 14.53125 18.540039 C 14.973958 18.354492 15.384114 18.108725 15.761719 17.802734 C 16.276041 17.386068 16.722004 16.894531 17.099609 16.328125 C 17.477213 15.761719 17.789713 15.157878 18.037109 14.516602 C 18.284504 13.875326 18.466797 13.214519 18.583984 12.53418 C 18.701172 11.853842 18.759766 11.191406 18.759766 10.546875 C 18.759766 9.641928 18.647461 8.785808 18.422852 7.978516 C 18.198242 7.171225 17.871094 6.420898 17.441406 5.727539 C 17.011719 5.03418 16.487629 4.404297 15.869141 3.837891 C 15.25065 3.271484 14.547525 2.773438 13.759766 2.34375 C 13.128255 1.998699 12.460938 1.728516 11.757812 1.533203 C 11.054688 1.337891 10.338541 1.240234 9.609375 1.240234 C 8.710938 1.240234 7.869466 1.383465 7.084961 1.669922 C 6.300456 1.956381 5.582682 2.351889 4.931641 2.856445 C 4.280599 3.361004 3.697917 3.953451 3.183594 4.633789 C 2.669271 5.314128 2.236328 6.048178 1.884766 6.835938 C 1.702474 7.233074 1.551107 7.64323 1.430664 8.066406 C 1.310221 8.489584 1.25 8.922526 1.25 9.365234 C 1.25 9.703776 1.302083 10.011394 1.40625 10.288086 C 1.510417 10.564779 1.689453 10.817058 1.943359 11.044922 C 2.014974 11.110026 2.104492 11.181641 2.211914 11.259766 C 2.319336 11.337891 2.431641 11.411133 2.548828 11.479492 C 2.666016 11.547852 2.783203 11.606445 2.900391 11.655273 C 3.017578 11.704102 3.125 11.728516 3.222656 11.728516 C 3.404948 11.728516 3.60026 11.668295 3.808594 11.547852 C 4.016927 11.427409 4.246419 11.297201 4.49707 11.157227 C 4.747721 11.017253 5.022786 10.887045 5.322266 10.766602 C 5.621745 10.646159 5.957031 10.585938 6.328125 10.585938 C 6.529948 10.585938 6.731771 10.603842 6.933594 10.639648 C 7.135416 10.675456 7.330729 10.722656 7.519531 10.78125 C 7.942708 10.917969 8.268229 11.113281 8.496094 11.367188 C 8.723958 11.621094 8.891602 11.912436 8.999023 12.241211 C 9.106445 12.569987 9.173177 12.928061 9.199219 13.31543 C 9.22526 13.7028 9.249674 14.098308 9.272461 14.501953 C 9.295247 14.9056 9.337564 15.309245 9.399414 15.712891 C 9.461263 16.116537 9.580078 16.499023 9.755859 16.860352 C 9.931641 17.22168 10.185547 17.552084 10.517578 17.851562 C 10.849609 18.151041 11.295572 18.398438 11.855469 18.59375 C 12.272135 18.74349 12.698566 18.818359 13.134766 18.818359 Z M 8.75 4.6875 C 8.75 4.427084 8.841146 4.20573 9.023438 4.023438 C 9.205729 3.841146 9.427083 3.75 9.6875 3.75 C 9.947916 3.75 10.169271 3.841146 10.351562 4.023438 C 10.533854 4.20573 10.625 4.427084 10.625 4.6875 C 10.625 4.947917 10.533854 5.169271 10.351562 5.351562 C 10.169271 5.533854 9.947916 5.625 9.6875 5.625 C 9.427083 5.625 9.205729 5.533854 9.023438 5.351562 C 8.841146 5.169271 8.75 4.947917 8.75 4.6875 Z M 12.5 5.9375 C 12.5 5.677084 12.591146 5.455729 12.773438 5.273438 C 12.955729 5.091146 13.177083 5.000001 13.4375 5 C 13.697916 5.000001 13.91927 5.091146 14.101562 5.273438 C 14.283854 5.455729 14.375 5.677084 14.375 5.9375 C 14.375 6.197917 14.283854 6.419271 14.101562 6.601562 C 13.91927 6.783855 13.697916 6.875001 13.4375 6.875 C 13.177083 6.875001 12.955729 6.783855 12.773438 6.601562 C 12.591146 6.419271 12.5 6.197917 12.5 5.9375 Z M 14.6875 8.75 C 14.6875 8.489584 14.778646 8.268229 14.960938 8.085938 C 15.143229 7.903646 15.364582 7.812501 15.625 7.8125 C 15.885416 7.812501 16.10677 7.903646 16.289062 8.085938 C 16.471354 8.268229 16.5625 8.489584 16.5625 8.75 C 16.5625 9.010417 16.471354 9.231771 16.289062 9.414062 C 16.10677 9.596354 15.885416 9.6875 15.625 9.6875 C 15.364582 9.6875 15.143229 9.596354 14.960938 9.414062 C 14.778646 9.231771 14.6875 9.010417 14.6875 8.75 Z M 14.6875 12.5 C 14.6875 12.239584 14.778646 12.018229 14.960938 11.835938 C 15.143229 11.653646 15.364582 11.5625 15.625 11.5625 C 15.885416 11.5625 16.10677 11.653646 16.289062 11.835938 C 16.471354 12.018229 16.5625 12.239584 16.5625 12.5 C 16.5625 12.760417 16.471354 12.981771 16.289062 13.164062 C 16.10677 13.346354 15.885416 13.4375 15.625 13.4375 C 15.364582 13.4375 15.143229 13.346354 14.960938 13.164062 C 14.778646 12.981771 14.6875 12.760417 14.6875 12.5 Z M 12.1875 15 C 12.187499 14.739584 12.278645 14.518229 12.460938 14.335938 C 12.643229 14.153646 12.864583 14.0625 13.125 14.0625 C 13.385416 14.0625 13.606771 14.153646 13.789062 14.335938 C 13.971354 14.518229 14.062499 14.739584 14.0625 15 C 14.062499 15.260417 13.971354 15.481771 13.789062 15.664062 C 13.606771 15.846354 13.385416 15.9375 13.125 15.9375 C 12.864583 15.9375 12.643229 15.846354 12.460938 15.664062 C 12.278645 15.481771 12.187499 15.260417 12.1875 15 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <GridView
-                        ItemTemplate="{StaticResource AccountColorTemplate}"
-                        ItemsSource="{x:Bind ViewModel.AvailableColors}"
-                        SelectedItem="{x:Bind ViewModel.SelectedColor, Mode=TwoWay}" />
-
-                    <Button
-                        Grid.Row="1"
-                        HorizontalAlignment="Right"
-                        Command="{x:Bind ViewModel.ResetColorCommand}"
-                        Content="{x:Bind domain:Translator.Buttons_Reset}" />
-                </Grid>
-            </controls:SettingsCard>
-
-            <!--  IMAP Details  -->
-            <controls:SettingsExpander
-                Description="{x:Bind domain:Translator.SettingsEditAccountDetails_IMAPConfiguration_Title}"
-                Header="{x:Bind domain:Translator.SettingsEditAccountDetails_IMAPConfiguration_Description}"
-                Visibility="{x:Bind ViewModel.IsImapServer, Mode=OneWay}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 20 10 C 20 10.768229 19.913736 11.518555 19.741211 12.250977 C 19.568684 12.983398 19.322916 13.680014 19.003906 14.34082 C 18.684895 15.001628 18.295898 15.621745 17.836914 16.201172 C 17.37793 16.7806 16.863605 17.303061 16.293945 17.768555 C 15.724283 18.234049 15.102538 18.634439 14.428711 18.969727 C 13.754882 19.305014 13.043619 19.560547 12.294922 19.736328 C 12.431641 19.423828 12.5 19.095053 12.5 18.75 L 12.5 16.396484 C 12.695312 15.973308 12.864583 15.540365 13.007812 15.097656 C 13.151041 14.654948 13.271484 14.205729 13.369141 13.75 L 12.5 13.75 L 12.5 12.5 L 13.583984 12.5 C 13.636067 12.083334 13.676758 11.668295 13.706055 11.254883 C 13.735352 10.841472 13.75 10.423178 13.75 10 C 13.75 9.576823 13.735352 9.158529 13.706055 8.745117 C 13.676758 8.331706 13.636067 7.916667 13.583984 7.5 L 6.40625 7.5 C 6.354166 7.929688 6.315104 8.346354 6.289062 8.75 L 5.039062 8.75 C 5.052083 8.541667 5.066731 8.333334 5.083008 8.125 C 5.099284 7.916668 5.123698 7.708334 5.15625 7.5 L 1.611328 7.5 C 1.552734 7.708334 1.499023 7.916668 1.450195 8.125 C 1.401367 8.333334 1.363932 8.541667 1.337891 8.75 C 1.103516 8.75 0.882161 8.774414 0.673828 8.823242 C 0.465495 8.87207 0.257161 8.951823 0.048828 9.0625 C 0.126953 8.209637 0.307617 7.392579 0.59082 6.611328 C 0.874023 5.830079 1.241862 5.104168 1.694336 4.433594 C 2.14681 3.763021 2.672526 3.154297 3.271484 2.607422 C 3.870443 2.060547 4.524739 1.595053 5.234375 1.210938 C 5.94401 0.826824 6.700846 0.528973 7.504883 0.317383 C 8.308919 0.105795 9.140625 0 10 0 C 10.917969 0 11.803385 0.118816 12.65625 0.356445 C 13.509114 0.594076 14.305013 0.93099 15.043945 1.367188 C 15.782877 1.803387 16.456705 2.325848 17.06543 2.93457 C 17.674152 3.543295 18.196613 4.217123 18.632812 4.956055 C 19.06901 5.694987 19.405924 6.490886 19.643555 7.34375 C 19.881184 8.196615 20 9.082031 20 10 Z M 13.369141 6.25 C 13.317057 6.009115 13.242188 5.717773 13.144531 5.375977 C 13.046875 5.03418 12.926432 4.679362 12.783203 4.311523 C 12.639973 3.943686 12.473957 3.575848 12.285156 3.208008 C 12.096354 2.84017 11.884766 2.511395 11.650391 2.22168 C 11.416016 1.931967 11.162109 1.697592 10.888672 1.518555 C 10.615234 1.33952 10.31901 1.25 10 1.25 C 9.680989 1.25 9.384766 1.33952 9.111328 1.518555 C 8.837891 1.697592 8.583984 1.931967 8.349609 2.22168 C 8.115234 2.511395 7.903646 2.84017 7.714844 3.208008 C 7.526042 3.575848 7.360026 3.943686 7.216797 4.311523 C 7.073567 4.679362 6.953125 5.03418 6.855469 5.375977 C 6.757812 5.717773 6.682942 6.009115 6.630859 6.25 Z M 5.351562 6.25 C 5.429688 5.859375 5.522461 5.463867 5.629883 5.063477 C 5.737305 4.663086 5.864258 4.269206 6.010742 3.881836 C 6.157227 3.494467 6.326497 3.116863 6.518555 2.749023 C 6.710612 2.381186 6.923828 2.037762 7.158203 1.71875 C 6.598307 1.907553 6.067708 2.151693 5.566406 2.451172 C 5.065104 2.750652 4.597981 3.092449 4.165039 3.476562 C 3.732096 3.860678 3.341471 4.287109 2.993164 4.755859 C 2.644857 5.224609 2.34375 5.722656 2.089844 6.25 Z M 17.900391 6.25 C 17.652994 5.722656 17.353516 5.226237 17.001953 4.760742 C 16.650391 4.295248 16.258137 3.868816 15.825195 3.481445 C 15.392252 3.094076 14.925129 2.752279 14.423828 2.456055 C 13.922525 2.159832 13.395182 1.917318 12.841797 1.728516 C 13.082682 2.047527 13.297525 2.389324 13.486328 2.753906 C 13.675129 3.11849 13.842772 3.496094 13.989258 3.886719 C 14.135741 4.277345 14.262694 4.672853 14.370117 5.073242 C 14.477538 5.473634 14.570312 5.865887 14.648438 6.25 Z M 14.84375 7.5 C 14.902344 7.916667 14.943033 8.331706 14.96582 8.745117 C 14.988605 9.158529 14.999999 9.576823 15 10 C 14.999999 10.423178 14.988605 10.841472 14.96582 11.254883 C 14.943033 11.668295 14.902344 12.083334 14.84375 12.5 L 18.388672 12.5 C 18.629557 11.699219 18.75 10.865886 18.75 10 C 18.75 9.134115 18.629557 8.300781 18.388672 7.5 Z M 10 10 C 10.169271 10 10.330403 10.032553 10.483398 10.097656 C 10.636393 10.162761 10.769856 10.252279 10.883789 10.366211 C 10.997721 10.480144 11.087239 10.613607 11.152344 10.766602 C 11.217447 10.919597 11.25 11.080729 11.25 11.25 L 11.25 16.25 C 11.25 16.419271 11.217447 16.580404 11.152344 16.733398 C 11.087239 16.886393 10.997721 17.019857 10.883789 17.133789 C 10.769856 17.247721 10.636393 17.33724 10.483398 17.402344 C 10.330403 17.467447 10.169271 17.5 10 17.5 L 7.5 17.5 L 7.5 18.75 L 7.841797 18.75 C 7.952474 18.75 8.061523 18.75651 8.168945 18.769531 C 8.276367 18.782553 8.374023 18.810221 8.461914 18.852539 C 8.549805 18.894857 8.619791 18.956705 8.671875 19.038086 C 8.723958 19.119467 8.75 19.231771 8.75 19.375 C 8.75 19.544271 8.68815 19.690756 8.564453 19.814453 C 8.440755 19.93815 8.294271 20 8.125 20 L 3.125 20 C 2.955729 20 2.809245 19.93815 2.685547 19.814453 C 2.561849 19.690756 2.5 19.544271 2.5 19.375 C 2.5 19.231771 2.526042 19.119467 2.578125 19.038086 C 2.630208 18.956705 2.700195 18.894857 2.788086 18.852539 C 2.875977 18.810221 2.973633 18.782553 3.081055 18.769531 C 3.188477 18.75651 3.297526 18.75 3.408203 18.75 L 3.75 18.75 L 3.75 17.5 L 1.25 17.5 C 1.080729 17.5 0.919596 17.467447 0.766602 17.402344 C 0.613607 17.33724 0.480143 17.247721 0.366211 17.133789 C 0.252279 17.019857 0.16276 16.886393 0.097656 16.733398 C 0.032552 16.580404 0 16.419271 0 16.25 L 0 11.25 C 0 11.080729 0.032552 10.919597 0.097656 10.766602 C 0.16276 10.613607 0.252279 10.480144 0.366211 10.366211 C 0.480143 10.252279 0.613607 10.162761 0.766602 10.097656 C 0.919596 10.032553 1.080729 10 1.25 10 Z M 17.900391 13.75 L 14.648438 13.75 C 14.570312 14.140625 14.477538 14.536133 14.370117 14.936523 C 14.262694 15.336914 14.135741 15.730795 13.989258 16.118164 C 13.842772 16.505533 13.673502 16.883139 13.481445 17.250977 C 13.289388 17.618814 13.076172 17.96224 12.841797 18.28125 C 13.395182 18.092447 13.922525 17.848307 14.423828 17.548828 C 14.925129 17.24935 15.392252 16.907553 15.825195 16.523438 C 16.258137 16.139322 16.648762 15.712891 16.99707 15.244141 C 17.345377 14.775391 17.646484 14.277344 17.900391 13.75 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-
-                        <Grid ColumnSpacing="6" RowSpacing="4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{x:Bind domain:Translator.IMAPSetupDialog_IMAPSettings}" />
-
-                            <TextBox
-                                Grid.Row="1"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_IncomingMailServer}"
-                                Text="{x:Bind ViewModel.ServerInformation.IncomingServer, Mode=TwoWay}" />
-
-                            <muxc:NumberBox
-                                Grid.Row="2"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_IncomingMailServerPort}"
-                                Maximum="65535"
-                                Minimum="1"
-                                Value="{x:Bind ViewModel.ServerInformation.IncomingServerPort, Mode=TwoWay}" />
-
-                            <TextBox
-                                Grid.Row="3"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_Username}"
-                                Text="{x:Bind ViewModel.ServerInformation.IncomingServerUsername, Mode=TwoWay}" />
-
-                            <PasswordBox
-                                Grid.Row="4"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_Password}"
-                                Password="{x:Bind ViewModel.ServerInformation.IncomingServerPassword, Mode=TwoWay}" />
-
-                            <ComboBox
-                                Grid.Row="5"
-                                HorizontalAlignment="Stretch"
-                                DisplayMemberPath="DisplayName"
-                                Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
-                                ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
-                                SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerConnectionSecurityIndex, Mode=TwoWay}" />
-
-                            <ComboBox
-                                Grid.Row="6"
-                                HorizontalAlignment="Stretch"
-                                DisplayMemberPath="DisplayName"
-                                Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
-                                ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
-                                SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerAuthenticationMethodIndex, Mode=TwoWay}" />
-
-                            <Border
-                                Grid.RowSpan="6"
-                                Grid.Column="1"
-                                Width="0"
-                                VerticalAlignment="Stretch"
-                                Background="{ThemeResource SystemAccentColor}" />
-
-                            <TextBlock
-                                Grid.Column="2"
-                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                Text="{x:Bind domain:Translator.IMAPSetupDialog_SMTPSettings}" />
-
-                            <TextBox
-                                Grid.Row="1"
-                                Grid.Column="2"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServer}"
-                                Text="{x:Bind ViewModel.ServerInformation.OutgoingServer, Mode=TwoWay}" />
-
-                            <muxc:NumberBox
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerPort}"
-                                Maximum="65535"
-                                Minimum="1"
-                                Value="{x:Bind ViewModel.ServerInformation.OutgoingServerPort, Mode=TwoWay}" />
-
-                            <TextBox
-                                Grid.Row="3"
-                                Grid.Column="2"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerUsername}"
-                                Text="{x:Bind ViewModel.ServerInformation.OutgoingServerUsername, Mode=TwoWay}" />
-
-                            <PasswordBox
-                                Grid.Row="4"
-                                Grid.Column="2"
-                                Header="{x:Bind domain:Translator.IMAPSetupDialog_OutgoingMailServerPassword}"
-                                Password="{x:Bind ViewModel.ServerInformation.OutgoingServerPassword, Mode=TwoWay}" />
-
-                            <ComboBox
-                                Grid.Row="5"
-                                Grid.Column="2"
-                                HorizontalAlignment="Stretch"
-                                DisplayMemberPath="DisplayName"
-                                Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
-                                ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
-                                SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerConnectionSecurityIndex, Mode=TwoWay}" />
-
-                            <ComboBox
-                                Grid.Row="6"
-                                Grid.Column="2"
-                                HorizontalAlignment="Stretch"
-                                DisplayMemberPath="DisplayName"
-                                Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
-                                ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
-                                SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerAuthenticationMethodIndex, Mode=TwoWay}" />
-
-                            <StackPanel
-                                Grid.Row="7"
-                                Grid.Column="2"
-                                Margin="0,12"
-                                HorizontalAlignment="Right"
-                                Orientation="Horizontal"
-                                Spacing="12">
-
-                                <muxc:ProgressRing
-                                    Width="20"
-                                    Height="20"
-                                    IsActive="{x:Bind ViewModel.ValidateImapSettingsCommand.IsRunning, Mode=OneWay}" />
-                                <Button Command="{x:Bind ViewModel.ValidateImapSettingsCommand}" Content="Test" />
-                                <Button
-                                    Command="{x:Bind ViewModel.UpdateCustomServerInformationCommand}"
-                                    Content="{x:Bind domain:Translator.Buttons_Save}"
-                                    Style="{ThemeResource AccentButtonStyle}" />
-                            </StackPanel>
-                        </Grid>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-
-        </StackPanel>
-    </ScrollViewer>
-</abstract:EditAccountDetailsPageAbstract>
-
-
diff --git a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml.cs b/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml.cs
deleted file mode 100644
index 31058e9c..00000000
--- a/Wino.Mail/Views/Settings/EditAccountDetailsPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class EditAccountDetailsPage : EditAccountDetailsPageAbstract
-{
-    public EditAccountDetailsPage()
-    {
-        InitializeComponent();
-    }
-}
diff --git a/Wino.Mail/Views/Settings/LanguageTimePage.xaml b/Wino.Mail/Views/Settings/LanguageTimePage.xaml
deleted file mode 100644
index 5a501b07..00000000
--- a/Wino.Mail/Views/Settings/LanguageTimePage.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<abstract:LanguageTimePageAbstract
-    x:Class="Wino.Views.Settings.LanguageTimePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <ScrollViewer>
-        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-            <controls:SettingsCard
-                CommandParameter="Language"
-                Description="{x:Bind domain:Translator.SettingsLanguage_Description}"
-                Header="{x:Bind domain:Translator.SettingsLanguage_Title}">
-                <ComboBox
-                    DisplayMemberPath="DisplayName"
-                    ItemsSource="{x:Bind ViewModel.AvailableLanguages, Mode=OneWay}"
-                    SelectedItem="{x:Bind ViewModel.SelectedLanguage, Mode=TwoWay}" />
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 4.550781 12.265625 C 3.893229 12.089844 3.28776 11.808269 2.734375 11.420898 C 2.18099 11.033529 1.700846 10.576172 1.293945 10.048828 C 0.887044 9.521484 0.569661 8.938803 0.341797 8.300781 C 0.113932 7.662762 0 7.005209 0 6.328125 C 0 5.748698 0.073242 5.188803 0.219727 4.648438 C 0.366211 4.108073 0.572917 3.603516 0.839844 3.134766 C 1.106771 2.666016 1.429036 2.239584 1.806641 1.855469 C 2.184245 1.471355 2.604167 1.140951 3.066406 0.864258 C 3.528646 0.587566 4.02832 0.37435 4.56543 0.224609 C 5.102539 0.074871 5.664062 0 6.25 0 C 7.115885 0 7.92806 0.162762 8.686523 0.488281 C 9.444986 0.813803 10.107422 1.259766 10.673828 1.826172 C 11.240234 2.392578 11.686197 3.055014 12.011719 3.813477 C 12.337239 4.57194 12.5 5.384115 12.5 6.25 L 11.25 6.25 C 11.25 6.041668 11.236979 5.833334 11.210938 5.625 C 11.184896 5.416667 11.145833 5.208334 11.09375 5 L 8.701172 5 C 8.714192 5.208334 8.725586 5.416667 8.735352 5.625 C 8.745117 5.833334 8.75 6.041668 8.75 6.25 C 8.75 6.673178 8.732096 7.086589 8.696289 7.490234 C 8.660481 7.893881 8.616536 8.304037 8.564453 8.720703 L 8.564453 8.75 L 5.205078 8.75 C 5.23763 8.938803 5.275065 9.122722 5.317383 9.301758 C 5.3597 9.480795 5.406901 9.661459 5.458984 9.84375 L 5.449219 9.853516 C 5.299479 10.257162 5.149739 10.65918 5 11.05957 C 4.85026 11.459961 4.700521 11.861979 4.550781 12.265625 Z M 5.205078 3.75 L 7.294922 3.75 C 7.26888 3.613281 7.226562 3.416342 7.167969 3.15918 C 7.109375 2.90202 7.036133 2.641602 6.948242 2.37793 C 6.860352 2.114258 6.757812 1.875 6.640625 1.660156 C 6.523438 1.445312 6.396484 1.308594 6.259766 1.25 L 6.240234 1.25 C 6.103515 1.308594 5.976562 1.445312 5.859375 1.660156 C 5.742188 1.875 5.639648 2.114258 5.551758 2.37793 C 5.463867 2.641602 5.390625 2.90202 5.332031 3.15918 C 5.273438 3.416342 5.23112 3.613281 5.205078 3.75 Z M 1.914062 3.75 L 3.935547 3.75 C 4.052734 2.988281 4.251302 2.255859 4.53125 1.552734 C 3.977865 1.754559 3.476562 2.044271 3.027344 2.421875 C 2.578125 2.79948 2.207031 3.242188 1.914062 3.75 Z M 10.585938 3.75 C 10.292969 3.242188 9.921875 2.79948 9.472656 2.421875 C 9.023438 2.044271 8.522135 1.754559 7.96875 1.552734 C 8.248697 2.255859 8.447266 2.988281 8.564453 3.75 Z M 1.40625 5 C 1.354167 5.208334 1.315104 5.416667 1.289062 5.625 C 1.263021 5.833334 1.25 6.041668 1.25 6.25 C 1.25 6.458334 1.263021 6.666667 1.289062 6.875 C 1.315104 7.083334 1.354167 7.291667 1.40625 7.5 L 3.798828 7.5 C 3.785807 7.291667 3.774414 7.083334 3.764648 6.875 C 3.754883 6.666667 3.75 6.458334 3.75 6.25 C 3.75 6.041668 3.754883 5.833334 3.764648 5.625 C 3.774414 5.416667 3.785807 5.208334 3.798828 5 Z M 7.451172 5 L 5.048828 5 C 5.035807 5.208334 5.024414 5.416667 5.014648 5.625 C 5.004883 5.833334 5 6.041668 5 6.25 C 5 6.458334 5.004883 6.666667 5.014648 6.875 C 5.024414 7.083334 5.035807 7.291667 5.048828 7.5 L 7.451172 7.5 C 7.464192 7.291667 7.475585 7.083334 7.485352 6.875 C 7.495117 6.666667 7.5 6.458334 7.5 6.25 C 7.5 6.041668 7.495117 5.833334 7.485352 5.625 C 7.475585 5.416667 7.464192 5.208334 7.451172 5 Z M 20 8.125 L 20 10 C 20 10.169271 19.93815 10.315756 19.814453 10.439453 C 19.690754 10.563151 19.54427 10.625 19.375 10.625 C 19.205729 10.625 19.059244 10.563151 18.935547 10.439453 C 18.811848 10.315756 18.75 10.169271 18.75 10 L 18.75 8.75 L 11.25 8.75 L 11.25 10 C 11.25 10.169271 11.18815 10.315756 11.064453 10.439453 C 10.940755 10.563151 10.794271 10.625 10.625 10.625 C 10.455729 10.625 10.309244 10.563151 10.185547 10.439453 C 10.061849 10.315756 10 10.169271 10 10 L 10 8.125 C 10 7.95573 10.061849 7.809246 10.185547 7.685547 C 10.309244 7.56185 10.455729 7.5 10.625 7.5 L 14.375 7.5 C 14.375 7.447917 14.373372 7.394206 14.370117 7.338867 C 14.366861 7.283529 14.365234 7.226563 14.365234 7.167969 C 14.365234 7.057292 14.371744 6.948242 14.384766 6.84082 C 14.397786 6.733398 14.425455 6.635742 14.467773 6.547852 C 14.51009 6.459961 14.573566 6.388347 14.658203 6.333008 C 14.742838 6.27767 14.856771 6.25 15 6.25 C 15.143229 6.25 15.255533 6.27767 15.336914 6.333008 C 15.418294 6.388347 15.480143 6.459961 15.522461 6.547852 C 15.564777 6.635742 15.592447 6.733398 15.605469 6.84082 C 15.618489 6.948242 15.625 7.057292 15.625 7.167969 L 15.625 7.5 L 19.375 7.5 C 19.54427 7.5 19.690754 7.56185 19.814453 7.685547 C 19.93815 7.809246 20 7.95573 20 8.125 Z M 1.923828 8.75 C 2.216797 9.257812 2.587891 9.698894 3.037109 10.073242 C 3.486328 10.447592 3.984375 10.738933 4.53125 10.947266 C 4.251302 10.244141 4.052734 9.511719 3.935547 8.75 Z M 20 13.125 C 20 13.294271 19.93815 13.440756 19.814453 13.564453 C 19.690754 13.688151 19.54427 13.75 19.375 13.75 L 16.25 13.75 L 16.25 16.25 C 16.25 16.425781 16.217447 16.588543 16.152344 16.738281 C 16.087238 16.888021 15.997721 17.019857 15.883789 17.133789 C 15.769856 17.247721 15.638021 17.33724 15.488281 17.402344 C 15.338541 17.467447 15.17578 17.5 15 17.5 L 14.375 17.5 C 14.205729 17.5 14.059244 17.43815 13.935547 17.314453 C 13.811849 17.190756 13.75 17.044271 13.75 16.875 C 13.75 16.731771 13.777669 16.619467 13.833008 16.538086 C 13.888346 16.456705 13.95996 16.394857 14.047852 16.352539 C 14.135741 16.310221 14.233397 16.282553 14.34082 16.269531 C 14.448241 16.256512 14.557291 16.25 14.667969 16.25 L 15 16.25 L 15 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.688151 11.435547 13.564453 C 11.311849 13.440756 11.25 13.294271 11.25 13.125 C 11.25 12.955729 11.311849 12.809245 11.435547 12.685547 C 11.559244 12.56185 11.705729 12.5 11.875 12.5 L 15 12.5 C 14.999999 12.415365 15.027668 12.314453 15.083008 12.197266 C 15.138346 12.080078 15.205078 11.962891 15.283203 11.845703 C 15.361328 11.728516 15.439453 11.617839 15.517578 11.513672 C 15.595703 11.409506 15.657552 11.321615 15.703125 11.25 L 13.125 11.25 C 12.955729 11.25 12.809244 11.188151 12.685547 11.064453 C 12.561849 10.940756 12.5 10.794271 12.5 10.625 C 12.5 10.455729 12.561849 10.309245 12.685547 10.185547 C 12.809244 10.06185 12.955729 10 13.125 10 L 16.875 10 C 17.04427 10 17.190754 10.06185 17.314453 10.185547 C 17.43815 10.309245 17.5 10.455729 17.5 10.625 C 17.5 10.748698 17.464191 10.862631 17.392578 10.966797 L 16.376953 12.5 L 19.375 12.5 C 19.54427 12.5 19.690754 12.56185 19.814453 12.685547 C 19.93815 12.809245 20 12.955729 20 13.125 Z M 10.9375 18.125 C 10.9375 18.300781 10.877278 18.448893 10.756836 18.569336 C 10.636393 18.689779 10.488281 18.75 10.3125 18.75 C 10.182291 18.75 10.063477 18.712564 9.956055 18.637695 C 9.848633 18.562826 9.772135 18.463541 9.726562 18.339844 L 8.945312 16.25 L 6.054688 16.25 L 5.273438 18.339844 C 5.227864 18.463541 5.151367 18.562826 5.043945 18.637695 C 4.936523 18.712564 4.817708 18.75 4.6875 18.75 C 4.518229 18.75 4.371745 18.68815 4.248047 18.564453 C 4.124349 18.440756 4.0625 18.294271 4.0625 18.125 C 4.0625 18.033854 4.075521 17.958984 4.101562 17.900391 L 5.039062 15.419922 C 5.358073 14.580078 5.6722 13.74349 5.981445 12.910156 C 6.290689 12.076823 6.601562 11.240234 6.914062 10.400391 C 6.959635 10.276693 7.03776 10.185547 7.148438 10.126953 C 7.259114 10.068359 7.376302 10.039062 7.5 10.039062 C 7.630208 10.039062 7.747396 10.068359 7.851562 10.126953 C 7.955729 10.185547 8.033854 10.276693 8.085938 10.400391 C 8.398438 11.240234 8.707682 12.076823 9.013672 12.910156 C 9.319661 13.74349 9.635416 14.580078 9.960938 15.419922 L 10.898438 17.900391 C 10.924479 17.958984 10.9375 18.033854 10.9375 18.125 Z M 7.5 12.402344 L 6.523438 15 L 8.476562 15 Z " />
-                </controls:SettingsCard.HeaderIcon>
-            </controls:SettingsCard>
-
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsPrefer24HourClock_Description}" Header="{x:Bind domain:Translator.SettingsPrefer24HourClock_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 4.765625 12.324219 C 4.088542 12.167969 3.458659 11.899414 2.875977 11.518555 C 2.293294 11.137695 1.788737 10.680339 1.362305 10.146484 C 0.935872 9.612631 0.602214 9.020183 0.361328 8.369141 C 0.120443 7.7181 0 7.044271 0 6.347656 C 0 5.468751 0.159505 4.645184 0.478516 3.876953 C 0.797526 3.108725 1.236979 2.436523 1.796875 1.860352 C 2.356771 1.28418 3.017578 0.830078 3.779297 0.498047 C 4.541016 0.166016 5.364583 0 6.25 0 C 7.115885 0 7.92806 0.162762 8.686523 0.488281 C 9.444986 0.813803 10.107422 1.259766 10.673828 1.826172 C 11.240234 2.392578 11.686197 3.055014 12.011719 3.813477 C 12.337239 4.57194 12.5 5.384115 12.5 6.25 L 11.25 6.25 L 11.25 6.152344 C 11.25 5.475261 11.114908 4.838867 10.844727 4.243164 C 10.574544 3.647461 10.209961 3.128256 9.750977 2.685547 C 9.291992 2.24284 8.761393 1.892904 8.15918 1.635742 C 7.556966 1.378582 6.920573 1.25 6.25 1.25 C 5.579427 1.25 4.943034 1.378582 4.34082 1.635742 C 3.738607 1.892904 3.208008 2.24284 2.749023 2.685547 C 2.290039 3.128256 1.925456 3.647461 1.655273 4.243164 C 1.385091 4.838867 1.25 5.475261 1.25 6.152344 L 1.25 6.328125 C 1.25 6.901042 1.352539 7.454428 1.557617 7.988281 C 1.762695 8.522136 2.045898 9.005534 2.407227 9.438477 C 2.768555 9.87142 3.191732 10.239258 3.676758 10.541992 C 4.161784 10.844727 4.6875 11.048178 5.253906 11.152344 Z M 5.625 7.5 C 5.455729 7.5 5.309245 7.438151 5.185547 7.314453 C 5.061849 7.190756 5 7.044271 5 6.875 L 5 3.125 C 5 2.95573 5.061849 2.809246 5.185547 2.685547 C 5.309245 2.56185 5.455729 2.5 5.625 2.5 C 5.794271 2.5 5.940755 2.56185 6.064453 2.685547 C 6.188151 2.809246 6.25 2.95573 6.25 3.125 L 6.25 6.25 L 8.125 6.25 C 8.294271 6.25 8.440755 6.31185 8.564453 6.435547 C 8.68815 6.559245 8.75 6.705729 8.75 6.875 C 8.75 7.044271 8.68815 7.190756 8.564453 7.314453 C 8.440755 7.438151 8.294271 7.5 8.125 7.5 Z M 10 10 L 10 8.125 C 10 7.95573 10.061849 7.809246 10.185547 7.685547 C 10.309244 7.56185 10.455729 7.5 10.625 7.5 L 14.375 7.5 C 14.375 7.447917 14.373372 7.394206 14.370117 7.338867 C 14.366861 7.283529 14.365234 7.226563 14.365234 7.167969 C 14.365234 7.057292 14.371744 6.948242 14.384766 6.84082 C 14.397786 6.733398 14.425455 6.635742 14.467773 6.547852 C 14.51009 6.459961 14.573566 6.388347 14.658203 6.333008 C 14.742838 6.27767 14.856771 6.25 15 6.25 C 15.143229 6.25 15.255533 6.27767 15.336914 6.333008 C 15.418294 6.388347 15.480143 6.459961 15.522461 6.547852 C 15.564777 6.635742 15.592447 6.733398 15.605469 6.84082 C 15.618489 6.948242 15.625 7.057292 15.625 7.167969 L 15.625 7.5 L 19.375 7.5 C 19.54427 7.5 19.690754 7.56185 19.814453 7.685547 C 19.93815 7.809246 20 7.95573 20 8.125 L 20 10 C 20 10.169271 19.93815 10.315756 19.814453 10.439453 C 19.690754 10.563151 19.54427 10.625 19.375 10.625 C 19.205729 10.625 19.059244 10.563151 18.935547 10.439453 C 18.811848 10.315756 18.75 10.169271 18.75 10 L 18.75 8.75 L 11.25 8.75 L 11.25 10 C 11.25 10.169271 11.18815 10.315756 11.064453 10.439453 C 10.940755 10.563151 10.794271 10.625 10.625 10.625 C 10.455729 10.625 10.309244 10.563151 10.185547 10.439453 C 10.061849 10.315756 10 10.169271 10 10 Z M 14.375 17.5 C 14.205729 17.5 14.059244 17.43815 13.935547 17.314453 C 13.811849 17.190756 13.75 17.044271 13.75 16.875 C 13.75 16.731771 13.777669 16.619467 13.833008 16.538086 C 13.888346 16.456705 13.95996 16.394857 14.047852 16.352539 C 14.135741 16.310221 14.233397 16.282553 14.34082 16.269531 C 14.448241 16.256512 14.557291 16.25 14.667969 16.25 L 15 16.25 L 15 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.688151 11.435547 13.564453 C 11.311849 13.440756 11.25 13.294271 11.25 13.125 C 11.25 12.955729 11.311849 12.809245 11.435547 12.685547 C 11.559244 12.56185 11.705729 12.5 11.875 12.5 L 15 12.5 C 14.999999 12.376303 15.035807 12.259115 15.107422 12.148438 L 15.703125 11.25 L 13.125 11.25 C 12.955729 11.25 12.809244 11.188151 12.685547 11.064453 C 12.561849 10.940756 12.5 10.794271 12.5 10.625 C 12.5 10.455729 12.561849 10.309245 12.685547 10.185547 C 12.809244 10.06185 12.955729 10 13.125 10 L 16.875 10 C 17.04427 10 17.190754 10.06185 17.314453 10.185547 C 17.43815 10.309245 17.5 10.455729 17.5 10.625 C 17.5 10.748698 17.464191 10.862631 17.392578 10.966797 L 16.376953 12.5 L 19.375 12.5 C 19.54427 12.5 19.690754 12.56185 19.814453 12.685547 C 19.93815 12.809245 20 12.955729 20 13.125 C 20 13.294271 19.93815 13.440756 19.814453 13.564453 C 19.690754 13.688151 19.54427 13.75 19.375 13.75 L 16.25 13.75 L 16.25 16.25 C 16.25 16.425781 16.217447 16.588543 16.152344 16.738281 C 16.087238 16.888021 15.997721 17.019857 15.883789 17.133789 C 15.769856 17.247721 15.638021 17.33724 15.488281 17.402344 C 15.338541 17.467447 15.17578 17.5 15 17.5 Z M 4.0625 18.125 C 4.0625 18.046875 4.075521 17.972006 4.101562 17.900391 C 4.257812 17.477213 4.41569 17.05892 4.575195 16.645508 C 4.7347 16.232096 4.892578 15.813803 5.048828 15.390625 L 6.914062 10.400391 C 6.959635 10.276693 7.036133 10.185547 7.143555 10.126953 C 7.250977 10.068359 7.369792 10.039062 7.5 10.039062 C 7.630208 10.039062 7.749023 10.068359 7.856445 10.126953 C 7.963867 10.185547 8.040364 10.276693 8.085938 10.400391 L 9.951172 15.390625 C 10.107422 15.813803 10.265299 16.232096 10.424805 16.645508 C 10.58431 17.05892 10.742188 17.477213 10.898438 17.900391 C 10.924479 17.972006 10.9375 18.046875 10.9375 18.125 C 10.9375 18.300781 10.877278 18.448893 10.756836 18.569336 C 10.636393 18.689779 10.488281 18.75 10.3125 18.75 C 10.175781 18.75 10.056966 18.714193 9.956055 18.642578 C 9.855143 18.570963 9.778646 18.470053 9.726562 18.339844 L 8.945312 16.25 L 6.054688 16.25 L 5.273438 18.339844 C 5.227864 18.463541 5.151367 18.562826 5.043945 18.637695 C 4.936523 18.712564 4.817708 18.75 4.6875 18.75 C 4.511719 18.75 4.363606 18.689779 4.243164 18.569336 C 4.122721 18.448893 4.0625 18.300781 4.0625 18.125 Z M 7.5 12.402344 L 6.523438 15 L 8.476562 15 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <ToggleSwitch IsOn="{x:Bind ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=TwoWay}" />
-            </controls:SettingsCard>
-        </StackPanel>
-    </ScrollViewer>
-</abstract:LanguageTimePageAbstract>
diff --git a/Wino.Mail/Views/Settings/LanguageTimePage.xaml.cs b/Wino.Mail/Views/Settings/LanguageTimePage.xaml.cs
deleted file mode 100644
index 34815550..00000000
--- a/Wino.Mail/Views/Settings/LanguageTimePage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Wino.Views.Abstract;
-
-namespace Wino.Views.Settings;
-
-public sealed partial class LanguageTimePage : LanguageTimePageAbstract
-{
-    public LanguageTimePage()
-    {
-        this.InitializeComponent();
-    }
-
-    public override void OnLanguageChanged()
-    {
-        base.OnLanguageChanged();
-
-        Bindings.Update();
-    }
-}
diff --git a/Wino.Mail/Views/Settings/PersonalizationPage.xaml b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
deleted file mode 100644
index 9a12d15b..00000000
--- a/Wino.Mail/Views/Settings/PersonalizationPage.xaml
+++ /dev/null
@@ -1,183 +0,0 @@
-<abstract:PersonalizationPageAbstract
-    x:Class="Wino.Views.Settings.PersonalizationPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:controls1="using:Wino.Controls"
-    xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:data="using:Wino.Core.ViewModels.Data"
-    xmlns:domain="using:Wino.Core.Domain"
-    xmlns:enums="using:Wino.Core.Domain.Enums"
-    xmlns:helpers="using:Wino.Helpers"
-    xmlns:mailSelectors="using:Wino.Selectors"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:personalization="using:Wino.Core.UWP.Models.Personalization"
-    xmlns:selectors="using:Wino.Selectors"
-    xmlns:toolkitExt="using:CommunityToolkit.WinUI"
-    xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
-    x:Name="root"
-    Title="Personalization"
-    mc:Ignorable="d">
-
-    <Page.Resources>
-        <DataTemplate x:Key="CompactDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
-            <controls1:MailItemDisplayInformationControl
-                DisplayMode="Compact"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="False" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="MediumDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
-            <controls1:MailItemDisplayInformationControl
-                DisplayMode="Medium"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="True" />
-        </DataTemplate>
-
-        <DataTemplate x:Key="SpaciousDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
-            <controls1:MailItemDisplayInformationControl
-                DisplayMode="Spacious"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="True" />
-        </DataTemplate>
-
-        <mailSelectors:MailItemDisplayModePreviewTemplateSelector
-            x:Key="MailItemDisplayModePreviewTemplateSelector"
-            CompactTemplate="{StaticResource CompactDisplayModePreviewTemplate}"
-            MediumTemplate="{StaticResource MediumDisplayModePreviewTemplate}"
-            SpaciousTemplate="{StaticResource SpaciousDisplayModePreviewTemplate}" />
-    </Page.Resources>
-
-    <ScrollViewer>
-        <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-            <StackPanel.ChildrenTransitions>
-                <TransitionCollection>
-                    <RepositionThemeTransition IsStaggeringEnabled="False" />
-                </TransitionCollection>
-            </StackPanel.ChildrenTransitions>
-
-            <!--  Accent Color  -->
-            <controls:SettingsExpander
-                Description="{x:Bind domain:Translator.SettingsAccentColor_Description}"
-                Header="{x:Bind domain:Translator.SettingsAccentColor_Title}"
-                IsExpanded="True">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 6.328125 11.835938 C 6.035156 11.835938 5.768229 11.894531 5.527344 12.011719 C 5.286458 12.128906 5.050456 12.259115 4.819336 12.402344 C 4.588216 12.545573 4.348958 12.675781 4.101562 12.792969 C 3.854167 12.910156 3.580729 12.96875 3.28125 12.96875 C 2.877604 12.96875 2.49349 12.871094 2.128906 12.675781 C 1.764323 12.480469 1.435547 12.255859 1.142578 12.001953 C 0.745443 11.656901 0.455729 11.261394 0.273438 10.81543 C 0.091146 10.369467 0 9.886068 0 9.365234 C 0 8.844401 0.071615 8.325195 0.214844 7.807617 C 0.358073 7.290039 0.533854 6.796875 0.742188 6.328125 C 0.970052 5.820312 1.233724 5.328776 1.533203 4.853516 C 1.832682 4.378256 2.158203 3.925781 2.509766 3.496094 C 2.828776 3.105469 3.167318 2.736004 3.525391 2.387695 C 3.883463 2.039389 4.277344 1.728516 4.707031 1.455078 C 5.442708 0.986328 6.225586 0.628256 7.055664 0.380859 C 7.885742 0.133465 8.736979 0.009766 9.609375 0.009766 C 10.436197 0.009766 11.25 0.117188 12.050781 0.332031 C 12.851562 0.546875 13.616536 0.849609 14.345703 1.240234 C 15.23763 1.728516 16.033527 2.298178 16.733398 2.949219 C 17.433268 3.600262 18.025715 4.322917 18.510742 5.117188 C 18.995768 5.911459 19.365234 6.769206 19.619141 7.69043 C 19.873047 8.611654 20 9.583334 20 10.605469 C 20 11.230469 19.952799 11.850586 19.858398 12.46582 C 19.763996 13.081055 19.62565 13.688151 19.443359 14.287109 C 19.300129 14.74935 19.119465 15.213217 18.901367 15.678711 C 18.683268 16.144205 18.427734 16.59017 18.134766 17.016602 C 17.841797 17.443033 17.516275 17.843424 17.158203 18.217773 C 16.800129 18.592123 16.411133 18.916016 15.991211 19.189453 C 15.571289 19.462891 15.12207 19.677734 14.643555 19.833984 C 14.165039 19.990234 13.662109 20.068359 13.134766 20.068359 C 12.841797 20.068359 12.553711 20.042318 12.270508 19.990234 C 11.987305 19.93815 11.708984 19.863281 11.435547 19.765625 C 10.86263 19.563803 10.371094 19.31315 9.960938 19.013672 C 9.550781 18.714193 9.210611 18.365885 8.94043 17.96875 C 8.670247 17.571615 8.465169 17.12565 8.325195 16.630859 C 8.185221 16.136068 8.095703 15.592448 8.056641 15 C 8.030599 14.641928 8.012695 14.283854 8.00293 13.925781 C 7.993164 13.567709 7.945963 13.212891 7.861328 12.861328 C 7.835286 12.763672 7.805989 12.659506 7.773438 12.548828 C 7.740885 12.438151 7.688802 12.347006 7.617188 12.275391 C 7.545573 12.197266 7.457682 12.128906 7.353516 12.070312 C 7.249349 12.011719 7.138672 11.966146 7.021484 11.933594 C 6.904297 11.901042 6.785481 11.876628 6.665039 11.860352 C 6.544596 11.844076 6.432292 11.835938 6.328125 11.835938 Z M 13.134766 18.818359 C 13.623047 18.818359 14.088541 18.725586 14.53125 18.540039 C 14.973958 18.354492 15.384114 18.108725 15.761719 17.802734 C 16.276041 17.386068 16.722004 16.894531 17.099609 16.328125 C 17.477213 15.761719 17.789713 15.157878 18.037109 14.516602 C 18.284504 13.875326 18.466797 13.214519 18.583984 12.53418 C 18.701172 11.853842 18.759766 11.191406 18.759766 10.546875 C 18.759766 9.641928 18.647461 8.785808 18.422852 7.978516 C 18.198242 7.171225 17.871094 6.420898 17.441406 5.727539 C 17.011719 5.03418 16.487629 4.404297 15.869141 3.837891 C 15.25065 3.271484 14.547525 2.773438 13.759766 2.34375 C 13.128255 1.998699 12.460938 1.728516 11.757812 1.533203 C 11.054688 1.337891 10.338541 1.240234 9.609375 1.240234 C 8.710938 1.240234 7.869466 1.383465 7.084961 1.669922 C 6.300456 1.956381 5.582682 2.351889 4.931641 2.856445 C 4.280599 3.361004 3.697917 3.953451 3.183594 4.633789 C 2.669271 5.314128 2.236328 6.048178 1.884766 6.835938 C 1.702474 7.233074 1.551107 7.64323 1.430664 8.066406 C 1.310221 8.489584 1.25 8.922526 1.25 9.365234 C 1.25 9.703776 1.302083 10.011394 1.40625 10.288086 C 1.510417 10.564779 1.689453 10.817058 1.943359 11.044922 C 2.014974 11.110026 2.104492 11.181641 2.211914 11.259766 C 2.319336 11.337891 2.431641 11.411133 2.548828 11.479492 C 2.666016 11.547852 2.783203 11.606445 2.900391 11.655273 C 3.017578 11.704102 3.125 11.728516 3.222656 11.728516 C 3.404948 11.728516 3.60026 11.668295 3.808594 11.547852 C 4.016927 11.427409 4.246419 11.297201 4.49707 11.157227 C 4.747721 11.017253 5.022786 10.887045 5.322266 10.766602 C 5.621745 10.646159 5.957031 10.585938 6.328125 10.585938 C 6.529948 10.585938 6.731771 10.603842 6.933594 10.639648 C 7.135416 10.675456 7.330729 10.722656 7.519531 10.78125 C 7.942708 10.917969 8.268229 11.113281 8.496094 11.367188 C 8.723958 11.621094 8.891602 11.912436 8.999023 12.241211 C 9.106445 12.569987 9.173177 12.928061 9.199219 13.31543 C 9.22526 13.7028 9.249674 14.098308 9.272461 14.501953 C 9.295247 14.9056 9.337564 15.309245 9.399414 15.712891 C 9.461263 16.116537 9.580078 16.499023 9.755859 16.860352 C 9.931641 17.22168 10.185547 17.552084 10.517578 17.851562 C 10.849609 18.151041 11.295572 18.398438 11.855469 18.59375 C 12.272135 18.74349 12.698566 18.818359 13.134766 18.818359 Z M 8.75 4.6875 C 8.75 4.427084 8.841146 4.20573 9.023438 4.023438 C 9.205729 3.841146 9.427083 3.75 9.6875 3.75 C 9.947916 3.75 10.169271 3.841146 10.351562 4.023438 C 10.533854 4.20573 10.625 4.427084 10.625 4.6875 C 10.625 4.947917 10.533854 5.169271 10.351562 5.351562 C 10.169271 5.533854 9.947916 5.625 9.6875 5.625 C 9.427083 5.625 9.205729 5.533854 9.023438 5.351562 C 8.841146 5.169271 8.75 4.947917 8.75 4.6875 Z M 12.5 5.9375 C 12.5 5.677084 12.591146 5.455729 12.773438 5.273438 C 12.955729 5.091146 13.177083 5.000001 13.4375 5 C 13.697916 5.000001 13.91927 5.091146 14.101562 5.273438 C 14.283854 5.455729 14.375 5.677084 14.375 5.9375 C 14.375 6.197917 14.283854 6.419271 14.101562 6.601562 C 13.91927 6.783855 13.697916 6.875001 13.4375 6.875 C 13.177083 6.875001 12.955729 6.783855 12.773438 6.601562 C 12.591146 6.419271 12.5 6.197917 12.5 5.9375 Z M 14.6875 8.75 C 14.6875 8.489584 14.778646 8.268229 14.960938 8.085938 C 15.143229 7.903646 15.364582 7.812501 15.625 7.8125 C 15.885416 7.812501 16.10677 7.903646 16.289062 8.085938 C 16.471354 8.268229 16.5625 8.489584 16.5625 8.75 C 16.5625 9.010417 16.471354 9.231771 16.289062 9.414062 C 16.10677 9.596354 15.885416 9.6875 15.625 9.6875 C 15.364582 9.6875 15.143229 9.596354 14.960938 9.414062 C 14.778646 9.231771 14.6875 9.010417 14.6875 8.75 Z M 14.6875 12.5 C 14.6875 12.239584 14.778646 12.018229 14.960938 11.835938 C 15.143229 11.653646 15.364582 11.5625 15.625 11.5625 C 15.885416 11.5625 16.10677 11.653646 16.289062 11.835938 C 16.471354 12.018229 16.5625 12.239584 16.5625 12.5 C 16.5625 12.760417 16.471354 12.981771 16.289062 13.164062 C 16.10677 13.346354 15.885416 13.4375 15.625 13.4375 C 15.364582 13.4375 15.143229 13.346354 14.960938 13.164062 C 14.778646 12.981771 14.6875 12.760417 14.6875 12.5 Z M 12.1875 15 C 12.187499 14.739584 12.278645 14.518229 12.460938 14.335938 C 12.643229 14.153646 12.864583 14.0625 13.125 14.0625 C 13.385416 14.0625 13.606771 14.153646 13.789062 14.335938 C 13.971354 14.518229 14.062499 14.739584 14.0625 15 C 14.062499 15.260417 13.971354 15.481771 13.789062 15.664062 C 13.606771 15.846354 13.385416 15.9375 13.125 15.9375 C 12.864583 15.9375 12.643229 15.846354 12.460938 15.664062 C 12.278645 15.481771 12.187499 15.260417 12.1875 15 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <StackPanel>
-                            <GridView ItemsSource="{x:Bind ViewModel.Colors}" SelectedItem="{x:Bind ViewModel.SelectedAppColor, Mode=TwoWay}">
-                                <GridView.ItemTemplate>
-                                    <DataTemplate x:DataType="data:AppColorViewModel">
-                                        <Grid
-                                            Width="45"
-                                            Height="45"
-                                            Background="{x:Bind Hex, Mode=OneWay}"
-                                            CornerRadius="6" />
-                                    </DataTemplate>
-                                </GridView.ItemTemplate>
-                            </GridView>
-
-                            <CheckBox Content="{x:Bind domain:Translator.SettingsAccentColor_UseWindowsAccentColor}" IsChecked="{x:Bind ViewModel.UseAccentColor, Mode=TwoWay}" />
-                        </StackPanel>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-            <!--  Element Theme  -->
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsElementTheme_Description}" Header="{x:Bind domain:Translator.SettingsElementTheme_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 19.990234 1.796875 C 19.990234 2.011719 19.952799 2.231445 19.87793 2.456055 C 19.803059 2.680664 19.703775 2.880859 19.580078 3.056641 L 17.910156 5.488281 C 16.582031 7.428386 15.157877 9.272461 13.637695 11.020508 C 12.117513 12.768555 10.488281 14.43685 8.75 16.025391 C 8.743489 16.494141 8.662109 16.928711 8.505859 17.329102 C 8.349609 17.729492 8.095703 18.089193 7.744141 18.408203 C 7.444661 18.681641 7.109375 18.917643 6.738281 19.116211 C 6.367187 19.314779 5.979817 19.480795 5.576172 19.614258 C 5.172526 19.747721 4.760742 19.845377 4.34082 19.907227 C 3.920898 19.969076 3.51237 20 3.115234 20 C 2.945963 20 2.740885 19.991861 2.5 19.975586 C 2.259115 19.959311 2.011719 19.933268 1.757812 19.897461 C 1.503906 19.861654 1.259766 19.820963 1.025391 19.775391 C 0.791016 19.729818 0.595703 19.677734 0.439453 19.619141 C 0.302734 19.567057 0.195312 19.492188 0.117188 19.394531 C 0.039062 19.296875 0 19.173178 0 19.023438 C 0 18.834635 0.07487 18.675131 0.224609 18.544922 C 0.478516 18.336588 0.738932 18.126627 1.005859 17.915039 C 1.272786 17.703451 1.520182 17.477213 1.748047 17.236328 C 1.94987 17.027996 2.088216 16.795248 2.163086 16.538086 C 2.237956 16.280924 2.291667 16.012369 2.324219 15.732422 C 2.330729 15.680339 2.333984 15.638021 2.333984 15.605469 C 2.333984 15.572917 2.333984 15.550131 2.333984 15.537109 L 2.333984 15.517578 C 2.327474 15.517578 2.324219 15.514323 2.324219 15.507812 C 2.324219 15.494792 2.325846 15.473633 2.329102 15.444336 C 2.332357 15.415039 2.340495 15.364584 2.353516 15.292969 C 2.392578 14.947917 2.486979 14.617514 2.636719 14.301758 C 2.786458 13.986003 2.985026 13.704428 3.232422 13.457031 C 3.460286 13.229167 3.719075 13.045248 4.008789 12.905273 C 4.298502 12.7653 4.599609 12.659506 4.912109 12.587891 C 6.363932 10.634766 7.919921 8.789062 9.580078 7.050781 C 11.240233 5.312501 13.011066 3.668621 14.892578 2.119141 L 16.806641 0.546875 C 17.001953 0.384115 17.215168 0.255535 17.446289 0.161133 C 17.677408 0.066732 17.919922 0.019531 18.173828 0.019531 C 18.414713 0.019531 18.645832 0.066732 18.867188 0.161133 C 19.088541 0.255535 19.282227 0.382488 19.448242 0.541992 C 19.614258 0.701498 19.746094 0.890301 19.84375 1.108398 C 19.941406 1.326498 19.990234 1.55599 19.990234 1.796875 Z M 18.740234 1.806641 C 18.740234 1.656902 18.681641 1.529949 18.564453 1.425781 C 18.447266 1.321615 18.317057 1.269531 18.173828 1.269531 C 18.06315 1.269531 17.962238 1.292318 17.871094 1.337891 C 17.779947 1.383465 17.692057 1.442059 17.607422 1.513672 L 15.683594 3.085938 C 13.951822 4.498699 12.319336 5.99935 10.786133 7.587891 C 9.25293 9.176433 7.805989 10.85612 6.445312 12.626953 C 6.927083 12.770183 7.34375 13.00944 7.695312 13.344727 C 8.046875 13.680014 8.313802 14.082031 8.496094 14.550781 C 10.078125 13.079428 11.567383 11.531576 12.963867 9.907227 C 14.360351 8.282878 15.667316 6.575521 16.884766 4.785156 L 18.535156 2.363281 C 18.587238 2.285156 18.634439 2.197266 18.676758 2.099609 C 18.719074 2.001953 18.740234 1.904297 18.740234 1.806641 Z M 7.5 16.005859 C 7.5 15.797526 7.478841 15.587565 7.436523 15.375977 C 7.394206 15.164389 7.327474 14.96582 7.236328 14.780273 C 7.145182 14.594727 7.026367 14.427084 6.879883 14.277344 C 6.733398 14.127604 6.552734 14.010417 6.337891 13.925781 C 6.253255 13.893229 6.144205 13.855795 6.010742 13.813477 C 5.877278 13.771159 5.764974 13.75 5.673828 13.75 C 5.400391 13.75 5.118815 13.802084 4.829102 13.90625 C 4.539388 14.010417 4.296875 14.156901 4.101562 14.345703 C 3.886719 14.554037 3.75 14.780273 3.691406 15.024414 C 3.632812 15.268555 3.59375 15.5306 3.574219 15.810547 C 3.561198 16.018881 3.528646 16.233725 3.476562 16.455078 C 3.424479 16.676432 3.36263 16.884766 3.291016 17.080078 C 3.219401 17.262369 3.142904 17.425131 3.061523 17.568359 C 2.980143 17.711588 2.88737 17.843424 2.783203 17.963867 C 2.679036 18.084311 2.565104 18.201498 2.441406 18.31543 C 2.317708 18.429361 2.184245 18.544922 2.041016 18.662109 C 2.216797 18.68815 2.394206 18.709311 2.573242 18.725586 C 2.752279 18.741861 2.932943 18.75 3.115234 18.75 C 3.388672 18.75 3.686523 18.728842 4.008789 18.686523 C 4.331055 18.644205 4.654948 18.577475 4.980469 18.486328 C 5.305989 18.395182 5.620117 18.279623 5.922852 18.139648 C 6.225586 17.999674 6.494141 17.827148 6.728516 17.62207 C 6.962891 17.416992 7.150065 17.18099 7.290039 16.914062 C 7.430013 16.647137 7.5 16.344402 7.5 16.005859 Z " />
-                </controls:SettingsCard.HeaderIcon>
-                <controls:SettingsCard.Content>
-                    <ComboBox
-                        DisplayMemberPath="Title"
-                        IsEnabled="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay}"
-                        ItemsSource="{x:Bind ViewModel.ElementThemes}"
-                        SelectedItem="{x:Bind ViewModel.SelectedElementTheme, Mode=TwoWay}" />
-                </controls:SettingsCard.Content>
-            </controls:SettingsCard>
-
-            <TextBlock
-                x:Name="ElementThemeSelectionDisabledTextBlock"
-                x:Load="{x:Bind ViewModel.CanSelectElementTheme, Mode=OneWay, Converter={StaticResource ReverseBooleanConverter}}"
-                Foreground="{ThemeResource InfoBarWarningSeverityIconBackground}"
-                Text="{x:Bind domain:Translator.SettingsElementThemeSelectionDisabled}" />
-
-            <!--  App Themes  -->
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsApplicationTheme_Description}" Header="{x:Bind domain:Translator.SettingsApplicationTheme_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 5 3.75 C 5 3.554688 5.056966 3.372396 5.170898 3.203125 C 5.284831 3.033855 5.432942 2.913412 5.615234 2.841797 C 5.712891 2.802734 5.810547 2.765301 5.908203 2.729492 C 6.005859 2.693686 6.103516 2.659506 6.201172 2.626953 C 6.520182 2.509766 6.80664 2.320965 7.060547 2.060547 C 7.314453 1.800131 7.503255 1.513672 7.626953 1.201172 C 7.685547 1.057943 7.740885 0.914715 7.792969 0.771484 C 7.845052 0.628256 7.910156 0.499676 7.988281 0.385742 C 8.066406 0.271811 8.165689 0.179037 8.286133 0.107422 C 8.406575 0.035809 8.561197 0 8.75 0 C 8.971354 0 9.14388 0.047201 9.267578 0.141602 C 9.391275 0.236004 9.495442 0.361328 9.580078 0.517578 C 9.664713 0.673828 9.744466 0.847982 9.819336 1.040039 C 9.894205 1.232098 9.988606 1.424154 10.102539 1.616211 C 10.216471 1.80827 10.366211 1.993816 10.551758 2.172852 C 10.737305 2.351889 10.986328 2.5 11.298828 2.617188 L 11.884766 2.841797 C 12.067057 2.913412 12.215168 3.033855 12.329102 3.203125 C 12.443033 3.372396 12.5 3.554688 12.5 3.75 C 12.5 3.951824 12.444661 4.134115 12.333984 4.296875 C 12.223307 4.459636 12.073567 4.576823 11.884766 4.648438 L 11.298828 4.873047 C 10.986328 4.996746 10.737305 5.146485 10.551758 5.322266 C 10.366211 5.498048 10.216471 5.683595 10.102539 5.878906 C 9.988606 6.07422 9.895833 6.267904 9.824219 6.459961 C 9.752604 6.652019 9.674479 6.824545 9.589844 6.977539 C 9.505208 7.130534 9.399414 7.255859 9.272461 7.353516 C 9.145508 7.451172 8.971354 7.5 8.75 7.5 C 8.548177 7.5 8.365885 7.444662 8.203125 7.333984 C 8.040364 7.223309 7.923177 7.073568 7.851562 6.884766 L 7.626953 6.298828 C 7.503255 5.986328 7.353515 5.735678 7.177734 5.546875 C 7.001953 5.358074 6.816406 5.206707 6.621094 5.092773 C 6.425781 4.978842 6.232096 4.886068 6.040039 4.814453 C 5.847981 4.74284 5.673828 4.666342 5.517578 4.584961 C 5.361328 4.503581 5.236002 4.399414 5.141602 4.272461 C 5.0472 4.145508 5 3.971355 5 3.75 Z M 10.751953 3.75 C 10.302734 3.561199 9.903971 3.292645 9.555664 2.944336 C 9.207356 2.596029 8.938802 2.197266 8.75 1.748047 C 8.561197 2.197266 8.292643 2.596029 7.944336 2.944336 C 7.596028 3.292645 7.197266 3.561199 6.748047 3.75 C 7.197266 3.938803 7.596028 4.207357 7.944336 4.555664 C 8.292643 4.903972 8.561197 5.302734 8.75 5.751953 C 8.938802 5.302734 9.207356 4.903972 9.555664 4.555664 C 9.903971 4.207357 10.302734 3.938803 10.751953 3.75 Z M 10 10 C 10 9.772136 10.065104 9.563803 10.195312 9.375 C 10.325521 9.186198 10.494791 9.049479 10.703125 8.964844 L 12.03125 8.457031 C 12.389322 8.320312 12.672525 8.139648 12.880859 7.915039 C 13.089192 7.690431 13.256836 7.451173 13.383789 7.197266 C 13.510742 6.94336 13.613281 6.684571 13.691406 6.420898 C 13.769531 6.157228 13.859049 5.921225 13.959961 5.712891 C 14.060872 5.504558 14.189453 5.333659 14.345703 5.200195 C 14.501953 5.066732 14.720052 5.000001 15 5 C 15.214843 5.000001 15.419921 5.063478 15.615234 5.19043 C 15.810546 5.317384 15.947265 5.485027 16.025391 5.693359 C 16.116535 5.921225 16.202799 6.144206 16.28418 6.362305 C 16.365559 6.580404 16.451822 6.803386 16.542969 7.03125 C 16.679688 7.382812 16.860352 7.662761 17.084961 7.871094 C 17.30957 8.079428 17.548828 8.24707 17.802734 8.374023 C 18.056641 8.500977 18.31543 8.606771 18.579102 8.691406 C 18.842773 8.776042 19.078775 8.868815 19.287109 8.969727 C 19.495441 9.070639 19.66634 9.199219 19.799805 9.355469 C 19.933268 9.511719 20 9.726562 20 10 C 20 10.221354 19.934895 10.426433 19.804688 10.615234 C 19.674479 10.804037 19.505207 10.940756 19.296875 11.025391 L 17.958984 11.542969 C 17.60091 11.679688 17.317707 11.860352 17.109375 12.084961 C 16.901041 12.30957 16.733398 12.550456 16.606445 12.807617 C 16.479492 13.064779 16.375324 13.323568 16.293945 13.583984 C 16.212564 13.844401 16.123047 14.078776 16.025391 14.287109 C 15.927733 14.495443 15.80078 14.666342 15.644531 14.799805 C 15.48828 14.933269 15.273437 15 15 15 C 14.772135 15 14.563802 14.936523 14.375 14.80957 C 14.186197 14.682617 14.049479 14.511719 13.964844 14.296875 L 13.457031 12.96875 C 13.320312 12.617188 13.141275 12.33724 12.919922 12.128906 C 12.698567 11.920573 12.45931 11.751303 12.202148 11.621094 C 11.944986 11.490886 11.686197 11.385092 11.425781 11.303711 C 11.165364 11.222331 10.929361 11.129558 10.717773 11.025391 C 10.506185 10.921225 10.333658 10.792644 10.200195 10.639648 C 10.066731 10.486654 10 10.273438 10 10 Z M 18.486328 10 C 18.128254 9.863281 17.792969 9.726562 17.480469 9.589844 C 17.167969 9.453125 16.883137 9.29362 16.625977 9.111328 C 16.368814 8.929037 16.136066 8.709311 15.927734 8.452148 C 15.7194 8.194987 15.537108 7.87435 15.380859 7.490234 L 15 6.513672 L 14.628906 7.480469 C 14.479166 7.871094 14.30013 8.194987 14.091797 8.452148 C 13.883463 8.709311 13.647461 8.929037 13.383789 9.111328 C 13.120117 9.29362 12.832031 9.451498 12.519531 9.584961 C 12.207031 9.718425 11.871744 9.856771 11.513672 10 C 11.884765 10.136719 12.226562 10.271811 12.539062 10.405273 C 12.851562 10.538737 13.136393 10.696615 13.393555 10.878906 C 13.650716 11.061198 13.880208 11.282553 14.082031 11.542969 C 14.283854 11.803386 14.46289 12.128906 14.619141 12.519531 L 15 13.486328 C 15.136718 13.128256 15.271809 12.792969 15.405273 12.480469 C 15.538736 12.167969 15.696614 11.881511 15.878906 11.621094 C 16.061197 11.360678 16.280924 11.12793 16.538086 10.922852 C 16.795246 10.717773 17.119141 10.537109 17.509766 10.380859 Z M 1.25 14.365234 C 1.25 14.12435 1.318359 13.90625 1.455078 13.710938 C 1.591797 13.515625 1.770833 13.372396 1.992188 13.28125 L 3.691406 12.626953 C 4.0625 12.483725 4.357096 12.288412 4.575195 12.041016 C 4.793294 11.79362 4.970703 11.526693 5.107422 11.240234 C 5.244141 10.953776 5.356445 10.662436 5.444336 10.366211 C 5.532227 10.069987 5.633138 9.803061 5.74707 9.56543 C 5.861002 9.3278 6.002604 9.132487 6.171875 8.979492 C 6.341146 8.826498 6.575521 8.75 6.875 8.75 C 7.109375 8.75 7.325846 8.818359 7.524414 8.955078 C 7.722981 9.091797 7.867838 9.270834 7.958984 9.492188 C 8.069661 9.778646 8.180338 10.063477 8.291016 10.34668 C 8.401692 10.629883 8.512369 10.914714 8.623047 11.201172 C 8.727213 11.474609 8.863932 11.705729 9.033203 11.894531 C 9.202474 12.083334 9.388021 12.242839 9.589844 12.373047 C 9.791666 12.503256 10.003255 12.612305 10.224609 12.700195 C 10.445963 12.788086 10.665689 12.869467 10.883789 12.944336 C 11.101888 13.019206 11.308594 13.092448 11.503906 13.164062 C 11.699219 13.235678 11.870117 13.323568 12.016602 13.427734 C 12.163086 13.531901 12.280273 13.658854 12.368164 13.808594 C 12.456055 13.958334 12.5 14.143881 12.5 14.365234 C 12.5 14.60612 12.433268 14.825847 12.299805 15.024414 C 12.16634 15.222982 11.985676 15.367839 11.757812 15.458984 C 11.471354 15.569662 11.186523 15.680339 10.90332 15.791016 C 10.620117 15.901693 10.335286 16.012371 10.048828 16.123047 C 9.684244 16.266277 9.392903 16.459961 9.174805 16.704102 C 8.956705 16.948242 8.779297 17.21517 8.642578 17.504883 C 8.505859 17.794596 8.390299 18.087564 8.295898 18.383789 C 8.201497 18.680014 8.098958 18.946939 7.988281 19.18457 C 7.877604 19.422201 7.73763 19.617514 7.568359 19.770508 C 7.399088 19.923502 7.167969 20 6.875 20 C 6.627604 20 6.40625 19.933268 6.210938 19.799805 C 6.015625 19.666342 5.872396 19.482422 5.78125 19.248047 L 5.126953 17.548828 C 4.983724 17.177734 4.788411 16.883139 4.541016 16.665039 C 4.29362 16.446941 4.026692 16.27116 3.740234 16.137695 C 3.453776 16.004232 3.162435 15.891928 2.866211 15.800781 C 2.569987 15.709636 2.30306 15.608725 2.06543 15.498047 C 1.827799 15.38737 1.632487 15.245769 1.479492 15.073242 C 1.326497 14.900717 1.25 14.664714 1.25 14.365234 Z M 11.103516 14.365234 C 10.856119 14.267578 10.605469 14.17155 10.351562 14.077148 C 10.097656 13.982748 9.847005 13.886719 9.599609 13.789062 C 9.163411 13.619792 8.805338 13.411459 8.525391 13.164062 C 8.245442 12.916667 8.009439 12.636719 7.817383 12.324219 C 7.625325 12.011719 7.45931 11.67155 7.319336 11.303711 C 7.179362 10.935873 7.03125 10.550131 6.875 10.146484 C 6.71875 10.556641 6.570638 10.944011 6.430664 11.308594 C 6.29069 11.673178 6.124674 12.011719 5.932617 12.324219 C 5.74056 12.636719 5.50293 12.916667 5.219727 13.164062 C 4.936523 13.411459 4.576823 13.619792 4.140625 13.789062 L 2.646484 14.365234 C 3.05013 14.521484 3.434245 14.669597 3.798828 14.80957 C 4.163411 14.949545 4.501953 15.115561 4.814453 15.307617 C 5.126953 15.499675 5.406901 15.737305 5.654297 16.020508 C 5.901692 16.303711 6.113281 16.663412 6.289062 17.099609 L 6.875 18.603516 L 7.460938 17.089844 C 7.630208 16.653646 7.840169 16.295572 8.09082 16.015625 C 8.341471 15.735678 8.621419 15.499675 8.930664 15.307617 C 9.239908 15.115561 9.57845 14.949545 9.946289 14.80957 C 10.314127 14.669597 10.699869 14.521484 11.103516 14.365234 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsCustomTheme_Description}" Header="{x:Bind domain:Translator.SettingsCustomTheme_Title}">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 4.306641 17.5 C 3.896484 17.5 3.505859 17.416992 3.134766 17.250977 C 2.763672 17.084961 2.439779 16.863607 2.163086 16.586914 C 1.886393 16.310221 1.665039 15.986328 1.499023 15.615234 C 1.333008 15.244141 1.25 14.853516 1.25 14.443359 L 1.25 4.306641 C 1.25 3.896484 1.333008 3.505859 1.499023 3.134766 C 1.665039 2.763672 1.886393 2.439779 2.163086 2.163086 C 2.439779 1.886395 2.763672 1.665039 3.134766 1.499023 C 3.505859 1.333008 3.896484 1.25 4.306641 1.25 L 14.443359 1.25 C 14.853515 1.25 15.24414 1.333008 15.615234 1.499023 C 15.986327 1.665039 16.310221 1.886395 16.586914 2.163086 C 16.863605 2.439779 17.084961 2.763672 17.250977 3.134766 C 17.416992 3.505859 17.5 3.896484 17.5 4.306641 L 17.5 7.900391 C 17.102863 7.705079 16.686197 7.548829 16.25 7.431641 L 16.25 4.375 C 16.25 4.121094 16.201172 3.880209 16.103516 3.652344 C 16.005859 3.42448 15.870768 3.224285 15.698242 3.051758 C 15.525715 2.879232 15.32552 2.744141 15.097656 2.646484 C 14.869791 2.548828 14.628906 2.5 14.375 2.5 L 4.375 2.5 C 4.121094 2.5 3.880208 2.548828 3.652344 2.646484 C 3.424479 2.744141 3.224284 2.879232 3.051758 3.051758 C 2.879232 3.224285 2.744141 3.42448 2.646484 3.652344 C 2.548828 3.880209 2.5 4.121094 2.5 4.375 L 2.5 14.375 C 2.5 14.628906 2.548828 14.869792 2.646484 15.097656 C 2.744141 15.325521 2.879232 15.525717 3.051758 15.698242 C 3.224284 15.870769 3.424479 16.005859 3.652344 16.103516 C 3.880208 16.201172 4.121094 16.25 4.375 16.25 L 7.431641 16.25 C 7.548828 16.686197 7.705078 17.102865 7.900391 17.5 Z M 5.625 6.25 C 5.455729 6.25 5.309245 6.188151 5.185547 6.064453 C 5.061849 5.940756 5 5.794271 5 5.625 C 5 5.455729 5.061849 5.309245 5.185547 5.185547 C 5.309245 5.06185 5.455729 5.000001 5.625 5 L 13.125 5 C 13.294271 5.000001 13.440755 5.06185 13.564453 5.185547 C 13.68815 5.309245 13.75 5.455729 13.75 5.625 C 13.75 5.794271 13.68815 5.940756 13.564453 6.064453 C 13.440755 6.188151 13.294271 6.25 13.125 6.25 Z M 5.625 10 C 5.455729 10 5.309245 9.938151 5.185547 9.814453 C 5.061849 9.690756 5 9.544271 5 9.375 C 5 9.205729 5.061849 9.059245 5.185547 8.935547 C 5.309245 8.81185 5.455729 8.75 5.625 8.75 L 9.902344 8.75 C 9.674479 8.932292 9.45638 9.127604 9.248047 9.335938 C 9.039713 9.544271 8.847656 9.765625 8.671875 10 Z M 8.75 14.375 C 8.75 13.600261 8.898111 12.871094 9.194336 12.1875 C 9.49056 11.503906 9.892578 10.908203 10.400391 10.400391 C 10.908203 9.892578 11.503906 9.490561 12.1875 9.194336 C 12.871093 8.898112 13.60026 8.75 14.375 8.75 C 14.889322 8.75 15.385741 8.816732 15.864258 8.950195 C 16.342773 9.083659 16.790363 9.272461 17.207031 9.516602 C 17.623697 9.760742 18.004557 10.055339 18.349609 10.400391 C 18.69466 10.745443 18.989258 11.126303 19.233398 11.542969 C 19.477539 11.959636 19.66634 12.407227 19.799805 12.885742 C 19.933268 13.364258 20 13.860678 20 14.375 C 20 15.14974 19.851887 15.878906 19.555664 16.5625 C 19.259439 17.246094 18.857422 17.841797 18.349609 18.349609 C 17.841797 18.857422 17.246094 19.259439 16.5625 19.555664 C 15.878906 19.851889 15.149739 20 14.375 20 C 13.59375 20 12.861328 19.853516 12.177734 19.560547 C 11.494141 19.267578 10.898438 18.867188 10.390625 18.359375 C 9.882812 17.851562 9.482422 17.255859 9.189453 16.572266 C 8.896484 15.888672 8.75 15.15625 8.75 14.375 Z M 15 15 L 16.875 15 C 17.04427 15 17.190754 14.938151 17.314453 14.814453 C 17.43815 14.690756 17.5 14.544271 17.5 14.375 C 17.5 14.205729 17.43815 14.059245 17.314453 13.935547 C 17.190754 13.81185 17.04427 13.75 16.875 13.75 L 15 13.75 L 15 11.875 C 14.999999 11.705729 14.93815 11.559245 14.814453 11.435547 C 14.690755 11.31185 14.544271 11.25 14.375 11.25 C 14.205729 11.25 14.059244 11.31185 13.935547 11.435547 C 13.811849 11.559245 13.75 11.705729 13.75 11.875 L 13.75 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.81185 11.435547 13.935547 C 11.311849 14.059245 11.25 14.205729 11.25 14.375 C 11.25 14.544271 11.311849 14.690756 11.435547 14.814453 C 11.559244 14.938151 11.705729 15 11.875 15 L 13.75 15 L 13.75 16.875 C 13.75 17.044271 13.811849 17.190756 13.935547 17.314453 C 14.059244 17.43815 14.205729 17.5 14.375 17.5 C 14.544271 17.5 14.690755 17.43815 14.814453 17.314453 C 14.93815 17.190756 14.999999 17.044271 15 16.875 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-                        <controls:SettingsCard.Content>
-                            <Button Command="{x:Bind ViewModel.CreateCustomThemeCommand}" Content="{x:Bind domain:Translator.Buttons_Create}" />
-                        </controls:SettingsCard.Content>
-                    </controls:SettingsCard>
-
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical"
-                        Description="{x:Bind domain:Translator.SettingsAvailableThemes_Description}"
-                        Header="{x:Bind domain:Translator.SettingsAvailableThemes_Title}">
-                        <controls:SettingsCard.HeaderIcon>
-                            <PathIcon Data="F1 M 17.5 3.125 L 17.5 8.125 C 17.5 8.385417 17.451172 8.629558 17.353516 8.857422 C 17.255859 9.085287 17.122395 9.283854 16.953125 9.453125 C 16.783854 9.622396 16.585285 9.755859 16.357422 9.853516 C 16.129557 9.951172 15.885416 10 15.625 10 L 10 10 L 10 15.625 C 10 15.885417 9.951172 16.129559 9.853516 16.357422 C 9.755859 16.585287 9.622396 16.783854 9.453125 16.953125 C 9.283854 17.122396 9.085286 17.255859 8.857422 17.353516 C 8.629557 17.451172 8.385416 17.5 8.125 17.5 L 3.125 17.5 C 2.864583 17.5 2.620443 17.451172 2.392578 17.353516 C 2.164713 17.255859 1.966146 17.122396 1.796875 16.953125 C 1.627604 16.783854 1.494141 16.585287 1.396484 16.357422 C 1.298828 16.129559 1.25 15.885417 1.25 15.625 L 1.25 3.125 C 1.25 2.864584 1.298828 2.620443 1.396484 2.392578 C 1.494141 2.164715 1.627604 1.966146 1.796875 1.796875 C 1.966146 1.627605 2.164713 1.494141 2.392578 1.396484 C 2.620443 1.298828 2.864583 1.25 3.125 1.25 L 15.625 1.25 C 15.885416 1.25 16.129557 1.298828 16.357422 1.396484 C 16.585285 1.494141 16.783854 1.627605 16.953125 1.796875 C 17.122395 1.966146 17.255859 2.164715 17.353516 2.392578 C 17.451172 2.620443 17.5 2.864584 17.5 3.125 Z M 2.5 8.75 L 8.75 8.75 L 8.75 2.5 L 3.125 2.5 C 2.955729 2.5 2.809245 2.56185 2.685547 2.685547 C 2.561849 2.809246 2.5 2.95573 2.5 3.125 Z M 16.25 3.125 C 16.25 2.95573 16.18815 2.809246 16.064453 2.685547 C 15.940754 2.56185 15.79427 2.5 15.625 2.5 L 10 2.5 L 10 8.75 L 15.625 8.75 C 15.79427 8.75 15.940754 8.688151 16.064453 8.564453 C 16.18815 8.440756 16.25 8.294271 16.25 8.125 Z M 8.75 10 L 2.5 10 L 2.5 15.625 C 2.5 15.794271 2.561849 15.940756 2.685547 16.064453 C 2.809245 16.188152 2.955729 16.25 3.125 16.25 L 8.125 16.25 C 8.294271 16.25 8.440755 16.188152 8.564453 16.064453 C 8.68815 15.940756 8.75 15.794271 8.75 15.625 Z " />
-                        </controls:SettingsCard.HeaderIcon>
-
-                        <!--  TODO: Group by custom/wino  -->
-                        <GridView
-                            toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
-                            ItemTemplateSelector="{StaticResource AppThemePreviewTemplateSelector}"
-                            ItemsSource="{x:Bind ViewModel.AppThemes, Mode=OneWay}"
-                            SelectedItem="{x:Bind ViewModel.SelectedAppTheme, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-            <!--  Mail spacing.  -->
-            <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsMailSpacing_Description}" Header="{x:Bind domain:Translator.SettingsMailSpacing_Title}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <PathIcon Data="F1 M 17.5 9.375 C 17.832031 9.375 18.149414 9.440104 18.452148 9.570312 C 18.754883 9.700521 19.020182 9.876303 19.248047 10.097656 C 19.47591 10.319011 19.658203 10.579428 19.794922 10.878906 C 19.931641 11.178386 20 11.494141 20 11.826172 L 20 15.048828 C 20 15.37435 19.933268 15.685222 19.799805 15.981445 C 19.66634 16.27767 19.487305 16.538086 19.262695 16.762695 C 19.038086 16.987305 18.777668 17.166342 18.481445 17.299805 C 18.185221 17.433268 17.874348 17.5 17.548828 17.5 L 2.451172 17.5 C 2.125651 17.5 1.814779 17.433268 1.518555 17.299805 C 1.222331 17.166342 0.961914 16.987305 0.737305 16.762695 C 0.512695 16.538086 0.333659 16.27767 0.200195 15.981445 C 0.066732 15.685222 0 15.37435 0 15.048828 L 0 4.951172 C 0 4.625651 0.066732 4.314779 0.200195 4.018555 C 0.333659 3.722332 0.512695 3.461914 0.737305 3.237305 C 0.961914 3.012695 1.222331 2.83366 1.518555 2.700195 C 1.814779 2.566732 2.125651 2.5 2.451172 2.5 L 12.548828 2.5 C 12.887369 2.5 13.203125 2.565105 13.496094 2.695312 C 13.789062 2.825521 14.044596 3.00293 14.262695 3.227539 C 14.480793 3.452148 14.654947 3.712566 14.785156 4.008789 C 14.915364 4.305014 14.986979 4.619141 15 4.951172 C 15.00651 5.022787 15.009766 5.094402 15.009766 5.166016 C 15.009766 5.237631 15.009766 5.309245 15.009766 5.380859 C 15.009766 5.5306 15.008138 5.677084 15.004883 5.820312 C 15.001627 5.963542 14.999999 6.106771 15 6.25 C 15.33203 6.25 15.649413 6.315104 15.952148 6.445312 C 16.254883 6.575521 16.520182 6.751303 16.748047 6.972656 C 16.97591 7.194011 17.156574 7.4528 17.290039 7.749023 C 17.423502 8.045248 17.493488 8.362631 17.5 8.701172 Z M 1.25 15 C 1.25 15.175781 1.282552 15.34017 1.347656 15.493164 C 1.41276 15.646159 1.500651 15.777995 1.611328 15.888672 C 1.722005 15.99935 1.853841 16.08724 2.006836 16.152344 C 2.159831 16.217449 2.324219 16.25 2.5 16.25 L 6.582031 16.25 C 6.360677 15.859375 6.25 15.442709 6.25 15 L 6.25 8.701172 C 6.25 8.362631 6.318359 8.045248 6.455078 7.749023 C 6.591797 7.4528 6.774088 7.194011 7.001953 6.972656 C 7.229817 6.751303 7.495117 6.575521 7.797852 6.445312 C 8.100586 6.315104 8.417969 6.25 8.75 6.25 L 13.75 6.25 L 13.75 5 C 13.75 4.830729 13.717447 4.669597 13.652344 4.516602 C 13.587239 4.363607 13.497721 4.230144 13.383789 4.116211 C 13.269855 4.002279 13.136393 3.912762 12.983398 3.847656 C 12.830403 3.782553 12.669271 3.75 12.5 3.75 L 2.5 3.75 C 2.324219 3.75 2.161458 3.782553 2.011719 3.847656 C 1.861979 3.912762 1.730143 4.002279 1.616211 4.116211 C 1.502279 4.230144 1.41276 4.361979 1.347656 4.511719 C 1.282552 4.661459 1.25 4.82422 1.25 5 Z M 12.207031 16.25 C 11.985677 15.859375 11.875 15.442709 11.875 15 L 11.875 11.826172 C 11.875 11.487631 11.943359 11.170248 12.080078 10.874023 C 12.216797 10.5778 12.399088 10.319011 12.626953 10.097656 C 12.854817 9.876303 13.120117 9.700521 13.422852 9.570312 C 13.725586 9.440104 14.042969 9.375 14.375 9.375 L 16.25 9.375 L 16.25 8.75 C 16.25 8.580729 16.217447 8.419597 16.152344 8.266602 C 16.087238 8.113607 15.997721 7.980144 15.883789 7.866211 C 15.769856 7.752279 15.636393 7.662762 15.483398 7.597656 C 15.330403 7.532553 15.169271 7.5 15 7.5 L 8.75 7.5 C 8.574219 7.5 8.411458 7.532553 8.261719 7.597656 C 8.111979 7.662762 7.980143 7.752279 7.866211 7.866211 C 7.752278 7.980144 7.66276 8.111979 7.597656 8.261719 C 7.532552 8.411459 7.5 8.574219 7.5 8.75 L 7.5 15 C 7.5 15.175781 7.532552 15.34017 7.597656 15.493164 C 7.66276 15.646159 7.750651 15.777995 7.861328 15.888672 C 7.972005 15.99935 8.103841 16.08724 8.256836 16.152344 C 8.40983 16.217449 8.574219 16.25 8.75 16.25 Z M 18.75 11.875 C 18.75 11.705729 18.717447 11.544597 18.652344 11.391602 C 18.587238 11.238607 18.497721 11.105144 18.383789 10.991211 C 18.269855 10.877279 18.136393 10.787761 17.983398 10.722656 C 17.830402 10.657553 17.66927 10.625 17.5 10.625 L 14.375 10.625 C 14.199219 10.625 14.036458 10.657553 13.886719 10.722656 C 13.736979 10.787761 13.605143 10.877279 13.491211 10.991211 C 13.377278 11.105144 13.28776 11.236979 13.222656 11.386719 C 13.157551 11.536459 13.124999 11.699219 13.125 11.875 L 13.125 15 C 13.124999 15.175781 13.157551 15.34017 13.222656 15.493164 C 13.28776 15.646159 13.37565 15.777995 13.486328 15.888672 C 13.597004 15.99935 13.72884 16.08724 13.881836 16.152344 C 14.03483 16.217449 14.199219 16.25 14.375 16.25 L 17.5 16.25 C 17.675781 16.25 17.838541 16.217449 17.988281 16.152344 C 18.13802 16.08724 18.269855 15.997722 18.383789 15.883789 C 18.497721 15.769857 18.587238 15.638021 18.652344 15.488281 C 18.717447 15.338542 18.75 15.175781 18.75 15 Z " />
-                </controls:SettingsExpander.HeaderIcon>
-
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard
-                        HorizontalContentAlignment="Stretch"
-                        VerticalContentAlignment="Stretch"
-                        ContentAlignment="Vertical">
-                        <ListView
-                            Margin="-18,0"
-                            toolkitExt:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
-                            ItemTemplateSelector="{StaticResource MailItemDisplayModePreviewTemplateSelector}"
-                            ItemsSource="{x:Bind ViewModel.InformationDisplayModes}"
-                            SelectedItem="{x:Bind ViewModel.SelectedInfoDisplayMode, Mode=TwoWay}" />
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-
-            <!--  Pane Length Reset  -->
-            <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsPaneLengthReset_Description}" Header="{x:Bind domain:Translator.SettingsPaneLengthReset_Title}">
-                <controls:SettingsCard.HeaderIcon>
-                    <PathIcon Data="F1 M 3.056641 17.5 C 2.646484 17.5 2.255859 17.416992 1.884766 17.250977 C 1.513672 17.084961 1.189779 16.863607 0.913086 16.586914 C 0.636393 16.310221 0.415039 15.986328 0.249023 15.615234 C 0.083008 15.244141 0 14.853516 0 14.443359 L 0 5.556641 C 0 5.146485 0.083008 4.75586 0.249023 4.384766 C 0.415039 4.013673 0.636393 3.689779 0.913086 3.413086 C 1.189779 3.136395 1.513672 2.915039 1.884766 2.749023 C 2.255859 2.583008 2.646484 2.5 3.056641 2.5 L 16.943359 2.5 C 17.353516 2.5 17.744141 2.583008 18.115234 2.749023 C 18.486328 2.915039 18.810221 3.136395 19.086914 3.413086 C 19.363605 3.689779 19.584961 4.013673 19.750977 4.384766 C 19.916992 4.75586 20 5.146485 20 5.556641 L 20 14.443359 C 20 14.853516 19.916992 15.244141 19.750977 15.615234 C 19.584961 15.986328 19.363605 16.310221 19.086914 16.586914 C 18.810221 16.863607 18.486328 17.084961 18.115234 17.250977 C 17.744141 17.416992 17.353516 17.5 16.943359 17.5 Z M 12.5 16.25 L 12.5 3.75 L 3.125 3.75 C 2.871094 3.75 2.630208 3.798828 2.402344 3.896484 C 2.174479 3.994141 1.974284 4.129232 1.801758 4.301758 C 1.629232 4.474285 1.494141 4.67448 1.396484 4.902344 C 1.298828 5.130209 1.25 5.371094 1.25 5.625 L 1.25 14.375 C 1.25 14.628906 1.298828 14.869792 1.396484 15.097656 C 1.494141 15.325521 1.629232 15.525717 1.801758 15.698242 C 1.974284 15.870769 2.174479 16.005859 2.402344 16.103516 C 2.630208 16.201172 2.871094 16.25 3.125 16.25 Z M 16.875 16.25 C 17.128906 16.25 17.369791 16.201172 17.597656 16.103516 C 17.82552 16.005859 18.025715 15.870769 18.198242 15.698242 C 18.370768 15.525717 18.505859 15.325521 18.603516 15.097656 C 18.701172 14.869792 18.75 14.628906 18.75 14.375 L 18.75 5.625 C 18.75 5.371094 18.701172 5.130209 18.603516 4.902344 C 18.505859 4.67448 18.370768 4.474285 18.198242 4.301758 C 18.025715 4.129232 17.82552 3.994141 17.597656 3.896484 C 17.369791 3.798828 17.128906 3.75 16.875 3.75 L 13.75 3.75 L 13.75 16.25 Z M 7.5 11.875 C 7.5 11.705729 7.561849 11.559245 7.685547 11.435547 L 9.121094 10 L 3.125 10 C 2.955729 10 2.809245 9.938151 2.685547 9.814453 C 2.561849 9.690756 2.5 9.544271 2.5 9.375 C 2.5 9.205729 2.561849 9.059245 2.685547 8.935547 C 2.809245 8.81185 2.955729 8.75 3.125 8.75 L 9.121094 8.75 L 7.685547 7.314453 C 7.561849 7.190756 7.5 7.044271 7.5 6.875 C 7.5 6.705729 7.561849 6.559245 7.685547 6.435547 C 7.809245 6.31185 7.955729 6.25 8.125 6.25 C 8.294271 6.25 8.440755 6.31185 8.564453 6.435547 L 11.064453 8.935547 C 11.18815 9.059245 11.25 9.205729 11.25 9.375 C 11.25 9.544271 11.18815 9.690756 11.064453 9.814453 L 8.564453 12.314453 C 8.440755 12.438151 8.294271 12.5 8.125 12.5 C 7.955729 12.5 7.809245 12.438151 7.685547 12.314453 C 7.561849 12.190756 7.5 12.044271 7.5 11.875 Z " />
-                </controls:SettingsCard.HeaderIcon>
-
-                <controls:SettingsCard.Content>
-                    <Button Command="{x:Bind ViewModel.ResetMailListPaneLengthCommand}" Content="{x:Bind domain:Translator.Buttons_Reset}" />
-                </controls:SettingsCard.Content>
-            </controls:SettingsCard>
-        </StackPanel>
-    </ScrollViewer>
-</abstract:PersonalizationPageAbstract>
diff --git a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
deleted file mode 100644
index fdf94bae..00000000
--- a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Wino.Views.Abstract;
-
-namespace Wino.Views.Settings;
-
-public sealed partial class SignatureManagementPage : SignatureManagementPageAbstract
-{
-    public SignatureManagementPage()
-    {
-        this.InitializeComponent();
-    }
-}
diff --git a/Wino.Mail/Views/WelcomePage.xaml b/Wino.Mail/Views/WelcomePage.xaml
deleted file mode 100644
index e44920dd..00000000
--- a/Wino.Mail/Views/WelcomePage.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<abstract:WelcomePageAbstract
-    x:Class="Wino.Views.WelcomePage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abstract="using:Wino.Views.Abstract"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkitmd="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
-    mc:Ignorable="d">
-
-    <Border Style="{StaticResource PageRootBorderStyle}">
-        <Grid Padding="15">
-            <ScrollViewer>
-                <toolkitmd:MarkdownTextBlock
-                    Margin="0,0,16,0"
-                    CharacterSpacing="12"
-                    Config="{x:Bind _config, Mode=OneTime}"
-                    FontSize="16"
-                    Text="{x:Bind ViewModel.CurrentVersionNotes, Mode=OneWay}" />
-            </ScrollViewer>
-        </Grid>
-    </Border>
-
-</abstract:WelcomePageAbstract>
diff --git a/Wino.Mail/Views/WelcomePage.xaml.cs b/Wino.Mail/Views/WelcomePage.xaml.cs
deleted file mode 100644
index b70a1c8a..00000000
--- a/Wino.Mail/Views/WelcomePage.xaml.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
-using Wino.Views.Abstract;
-
-namespace Wino.Views;
-
-public sealed partial class WelcomePage : WelcomePageAbstract
-{
-    private readonly MarkdownConfig _config;
-
-    public WelcomePage()
-    {
-        InitializeComponent();
-
-        _config = new MarkdownConfig();
-    }
-}
diff --git a/Wino.Mail/Wino.Mail.csproj b/Wino.Mail/Wino.Mail.csproj
deleted file mode 100644
index 4f66bcb5..00000000
--- a/Wino.Mail/Wino.Mail.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-		<UseUwp>true</UseUwp>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<DefaultLanguage>en-US</DefaultLanguage>
-		<!--<PublishAot>true</PublishAot>-->
-		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
-		<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<GenerateAppInstallerFile>True</GenerateAppInstallerFile>
-		<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-	</PropertyGroup>
-	<ItemGroup>
-	  <Compile Remove="BundleArtifacts\**" />
-	  <EmbeddedResource Remove="BundleArtifacts\**" />
-	  <None Remove="BundleArtifacts\**" />
-	  <Page Remove="BundleArtifacts\**" />
-	</ItemGroup>
-	<ItemGroup>
-	  <PRIResource Remove="BundleArtifacts\**" />
-	</ItemGroup>
-	<ItemGroup>
-	  <None Remove="Assets\EML\eml.png" />
-	  <None Remove="Assets\NotificationIcons\archive.png" />
-	  <None Remove="Assets\NotificationIcons\delete.png" />
-	  <None Remove="Assets\NotificationIcons\dismiss.png" />
-	  <None Remove="Assets\NotificationIcons\markread.png" />
-	  <None Remove="Assets\NotificationIcons\profile-dark.png" />
-	  <None Remove="Assets\NotificationIcons\profile-light.png" />
-	  <None Remove="Assets\ReleaseNotes\1102.md" />
-	  <None Remove="JS\editor.html" />
-	  <None Remove="JS\editor.js" />
-	  <None Remove="JS\global.css" />
-	  <None Remove="JS\libs\darkreader.js" />
-	  <None Remove="JS\libs\jodit.min.css" />
-	  <None Remove="JS\libs\jodit.min.js" />
-	  <None Remove="JS\libs\linkify-element.min.js" />
-	  <None Remove="JS\libs\linkify.min.js" />
-	  <None Remove="JS\reader.html" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Content Include="Assets\EML\eml.png" />
-	  <Content Include="Assets\NotificationIcons\archive.png" />
-	  <Content Include="Assets\NotificationIcons\delete.png" />
-	  <Content Include="Assets\NotificationIcons\dismiss.png" />
-	  <Content Include="Assets\NotificationIcons\markread.png" />
-	  <Content Include="Assets\NotificationIcons\profile-dark.png" />
-	  <Content Include="Assets\NotificationIcons\profile-light.png" />
-	  <Content Include="Assets\ReleaseNotes\1102.md" />
-	  <Content Include="JS\editor.html" />
-	  <Content Include="JS\editor.js" />
-	  <Content Include="JS\global.css" />
-	  <Content Include="JS\libs\darkreader.js" />
-	  <Content Include="JS\libs\jodit.min.css" />
-	  <Content Include="JS\libs\jodit.min.js" />
-	  <Content Include="JS\libs\linkify-element.min.js" />
-	  <Content Include="JS\libs\linkify.min.js" />
-	  <Content Include="JS\reader.html" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="ColorHashSharp" />
-		<PackageReference Include="CommunityToolkit.Common" />
-		<PackageReference Include="CommunityToolkit.Diagnostics" />
-		<PackageReference Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" />
-		<PackageReference Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="CommunityToolkit.Uwp.Animations" />
-		<PackageReference Include="CommunityToolkit.Uwp.Behaviors" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.Segmented" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" />
-		<PackageReference Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" />
-		<PackageReference Include="CommunityToolkit.Uwp.Extensions" />
-		<PackageReference Include="EmailValidation" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-
-		<PackageReference Include="Microsoft.UI.Xaml" />
-		<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
-		<PackageReference Include="Nito.AsyncEx" />
-		<PackageReference Include="Sentry.Serilog" />
-
-		<PackageReference Include="sqlite-net-pcl" />
-		<PackageReference Include="Win2D.uwp" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-	  <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj" />
-	  <ProjectReference Include="..\Wino.Core.ViewModels\Wino.Core.ViewModels.csproj" />
-	  <ProjectReference Include="..\Wino.Mail.ViewModels\Wino.Mail.ViewModels.csproj" />
-	  <ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
-	</ItemGroup>
-</Project>
diff --git a/Wino.Messages/Client/Accounts/AccountMenuItemExtended.cs b/Wino.Messages/Client/Accounts/AccountMenuItemExtended.cs
index e4d3b5bb..6f518b7a 100644
--- a/Wino.Messages/Client/Accounts/AccountMenuItemExtended.cs
+++ b/Wino.Messages/Client/Accounts/AccountMenuItemExtended.cs
@@ -1,5 +1,5 @@
 using System;
-using Wino.Core.Domain.Models.MailItem;
+using Wino.Core.Domain.Entities.Mail;
 
 namespace Wino.Messaging.Client.Accounts;
 
@@ -10,4 +10,4 @@ namespace Wino.Messaging.Client.Accounts;
 /// <param name="AutoSelectAccount">Account to extend menu item for.</param>
 /// <param name="FolderId">Folder to select after expansion.</param>
 /// <param name="NavigateMailItem">Mail item to select if possible in the expanded folder.</param>
-public record AccountMenuItemExtended(Guid FolderId, IMailItem NavigateMailItem);
+public record AccountMenuItemExtended(Guid FolderId, MailCopy NavigateMailItem);
diff --git a/Wino.Messages/Client/Calendar/CalendarDescriptionRenderingRequested.cs b/Wino.Messages/Client/Calendar/CalendarDescriptionRenderingRequested.cs
new file mode 100644
index 00000000..41e25c82
--- /dev/null
+++ b/Wino.Messages/Client/Calendar/CalendarDescriptionRenderingRequested.cs
@@ -0,0 +1,6 @@
+namespace Wino.Messaging.Client.Calendar;
+
+/// <summary>
+/// Message to trigger rendering of calendar event description in WebView2.
+/// </summary>
+public record CalendarDescriptionRenderingRequested();
diff --git a/Wino.Messages/Client/Calendar/CalendarItemEventMessages.cs b/Wino.Messages/Client/Calendar/CalendarItemEventMessages.cs
index d83daf46..a741a609 100644
--- a/Wino.Messages/Client/Calendar/CalendarItemEventMessages.cs
+++ b/Wino.Messages/Client/Calendar/CalendarItemEventMessages.cs
@@ -1,7 +1,8 @@
-using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
 
 namespace Wino.Messaging.Client.Calendar;
 
 public record CalendarItemAdded(CalendarItem CalendarItem);
-public record CalendarItemUpdated(CalendarItem CalendarItem);
+public record CalendarItemUpdated(CalendarItem CalendarItem, CalendarItemUpdateSource Source);
 public record CalendarItemDeleted(CalendarItem CalendarItem);
diff --git a/Wino.Messages/Client/Calendar/DetailsPageStateChangedMessage.cs b/Wino.Messages/Client/Calendar/DetailsPageStateChangedMessage.cs
deleted file mode 100644
index a0f22743..00000000
--- a/Wino.Messages/Client/Calendar/DetailsPageStateChangedMessage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// When event details page is activated or deactivated.
-/// </summary>
-public record DetailsPageStateChangedMessage(bool IsActivated);
diff --git a/Wino.Messages/Client/Calendar/GoNextDayRequestedMessage.cs b/Wino.Messages/Client/Calendar/GoNextDayRequestedMessage.cs
deleted file mode 100644
index 8693429d..00000000
--- a/Wino.Messages/Client/Calendar/GoNextDayRequestedMessage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// Raised when user clicks '>' button from the shell.
-/// </summary>
-public record GoNextDateRequestedMessage;
diff --git a/Wino.Messages/Client/Calendar/GoPreviousDayRequestedMessage.cs b/Wino.Messages/Client/Calendar/GoPreviousDayRequestedMessage.cs
deleted file mode 100644
index 9cac0ae0..00000000
--- a/Wino.Messages/Client/Calendar/GoPreviousDayRequestedMessage.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// Raised when user clicks '<' button from the shell.
-/// </summary>
-public record GoPreviousDateRequestedMessage;
diff --git a/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs b/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
index 44c3dc83..851ba3ba 100644
--- a/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
+++ b/Wino.Messages/Client/Calendar/LoadCalendarMessage.cs
@@ -1,13 +1,10 @@
-using System;
-using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Models.Calendar;
 
 namespace Wino.Messaging.Client.Calendar;
 
 /// <summary>
-/// Raised when a new calendar range is requested for drawing.
+/// Raised when a new calendar display range is requested.
 /// </summary>
-/// <param name="DisplayType">Type of the calendar.</param>
-/// <param name="DisplayDate">Exact date to highlight.</param>
-/// <param name="DayDisplayCount">How many days to load with Day calendar display type.</param>
-/// <param name="ForceRedraw">Remove all days and force re-render of everything. Used when settings are updated.</param>
-public record LoadCalendarMessage(DateTime DisplayDate, CalendarInitInitiative CalendarInitInitiative, bool ForceRedraw = false);
+/// <param name="DisplayRequest">Display type and anchor date to resolve.</param>
+/// <param name="ForceReload">Force a reload even if the resolved range did not change.</param>
+public record LoadCalendarMessage(CalendarDisplayRequest DisplayRequest, bool ForceReload = false);
diff --git a/Wino.Messages/Client/Calendar/ScrollToDateMessage.cs b/Wino.Messages/Client/Calendar/ScrollToDateMessage.cs
deleted file mode 100644
index a6ead33f..00000000
--- a/Wino.Messages/Client/Calendar/ScrollToDateMessage.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// Raised when requested date is already loaded into calendar flip view to scroll to it.
-/// </summary>
-/// <param name="Date">Date to scroll.</param>
-public record ScrollToDateMessage(DateTime Date);
diff --git a/Wino.Messages/Client/Calendar/ScrollToHourMessage.cs b/Wino.Messages/Client/Calendar/ScrollToHourMessage.cs
deleted file mode 100644
index 18e6cbce..00000000
--- a/Wino.Messages/Client/Calendar/ScrollToHourMessage.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// Emitted when vertical scroll position is requested to be changed.
-/// </summary>
-/// <param name="TimeSpan">Hour to scroll vertically on flip view item.</param>
-public record ScrollToHourMessage(TimeSpan TimeSpan);
diff --git a/Wino.Messages/Client/Calendar/VisibleDateRangeChangedMessage.cs b/Wino.Messages/Client/Calendar/VisibleDateRangeChangedMessage.cs
deleted file mode 100644
index 5d0fe26d..00000000
--- a/Wino.Messages/Client/Calendar/VisibleDateRangeChangedMessage.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Messaging.Client.Calendar;
-
-/// <summary>
-/// Raised when calendar's visible date range is updated.
-/// Used to update the background of the visible date range in CalendarView.
-/// </summary>
-/// <param name="DateRange">New visible date range.</param>
-public record VisibleDateRangeChangedMessage(DateRange DateRange);
diff --git a/Wino.Messages/Client/Contacts/NewContactRequested.cs b/Wino.Messages/Client/Contacts/NewContactRequested.cs
new file mode 100644
index 00000000..2d451cf2
--- /dev/null
+++ b/Wino.Messages/Client/Contacts/NewContactRequested.cs
@@ -0,0 +1,3 @@
+namespace Wino.Messaging.Client.Contacts;
+
+public record NewContactRequested;
diff --git a/Wino.Messages/Client/Mails/ImapSetupBackNavigationRequested.cs b/Wino.Messages/Client/Mails/ImapSetupBackNavigationRequested.cs
deleted file mode 100644
index 41ed1a6f..00000000
--- a/Wino.Messages/Client/Mails/ImapSetupBackNavigationRequested.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Wino.Messaging.Client.Mails;
-
-/// <summary>
-/// When IMAP setup dialog requestes back breadcrumb navigation.
-/// Not providing PageType will go back to previous page by doing back navigation.
-/// </summary>
-/// <param name="PageType">Type to go back.</param>
-/// <param name="Parameter">Back parameters.</param>
-public record ImapSetupBackNavigationRequested(Type PageType = null, object Parameter = null);
diff --git a/Wino.Messages/Client/Mails/ImapSetupDismissRequested.cs b/Wino.Messages/Client/Mails/ImapSetupDismissRequested.cs
deleted file mode 100644
index 7a9315bb..00000000
--- a/Wino.Messages/Client/Mails/ImapSetupDismissRequested.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Wino.Core.Domain.Entities.Shared;
-
-namespace Wino.Messaging.Client.Mails;
-
-/// <summary>
-/// When user asked to dismiss IMAP setup dialog.
-/// </summary>
-/// <param name="CompletedServerInformation"> Validated server information that is ready to be saved to database. </param>
-public record ImapSetupDismissRequested(CustomServerInformation CompletedServerInformation = null);
diff --git a/Wino.Messages/Client/Mails/ImapSetupNavigationRequested.cs b/Wino.Messages/Client/Mails/ImapSetupNavigationRequested.cs
deleted file mode 100644
index 5c58df44..00000000
--- a/Wino.Messages/Client/Mails/ImapSetupNavigationRequested.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace Wino.Messaging.Client.Mails;
-
-/// <summary>
-/// When IMAP setup dialog breadcrumb navigation requested.
-/// </summary>
-/// <param name="PageType">Page type to navigate.</param>
-/// <param name="Parameter">Navigation parameters.</param>
-public record ImapSetupNavigationRequested(Type PageType, object Parameter);
diff --git a/Wino.Messages/Client/Mails/SelectedItemsChangedMessage.cs b/Wino.Messages/Client/Mails/SelectedItemsChangedMessage.cs
new file mode 100644
index 00000000..d42e78f0
--- /dev/null
+++ b/Wino.Messages/Client/Mails/SelectedItemsChangedMessage.cs
@@ -0,0 +1,7 @@
+namespace Wino.Messaging.Client.Mails;
+
+/// <summary>
+/// Selection of items are handled in the view model collection.
+/// This message notifies interested parties that the selection has changed.
+/// </summary>
+public record SelectedItemsChangedMessage;
diff --git a/Wino.Messages/Client/Navigation/ActiveSettingsPageChanged.cs b/Wino.Messages/Client/Navigation/ActiveSettingsPageChanged.cs
new file mode 100644
index 00000000..c4bf6072
--- /dev/null
+++ b/Wino.Messages/Client/Navigation/ActiveSettingsPageChanged.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Messaging.Client.Navigation;
+
+public sealed record ActiveSettingsPageChanged(WinoPage RootPage);
diff --git a/Wino.Messages/Client/Navigation/BackBreadcrumNavigationRequested.cs b/Wino.Messages/Client/Navigation/BackBreadcrumNavigationRequested.cs
index 76bf1dd3..65ec2499 100644
--- a/Wino.Messages/Client/Navigation/BackBreadcrumNavigationRequested.cs
+++ b/Wino.Messages/Client/Navigation/BackBreadcrumNavigationRequested.cs
@@ -1,6 +1,9 @@
-namespace Wino.Messaging.Client.Navigation;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Messaging.Client.Navigation;
 
 /// <summary>
 /// When back navigation is requested for breadcrumb pages.
 /// </summary>
-public record BackBreadcrumNavigationRequested { }
+/// <param name="SlideEffect">The slide animation effect to use during navigation.</param>
+public record BackBreadcrumNavigationRequested(NavigationTransitionEffect SlideEffect = NavigationTransitionEffect.FromRight);
diff --git a/Wino.Messages/Client/Navigation/GetStartedFromWelcomeRequested.cs b/Wino.Messages/Client/Navigation/GetStartedFromWelcomeRequested.cs
new file mode 100644
index 00000000..58b11c00
--- /dev/null
+++ b/Wino.Messages/Client/Navigation/GetStartedFromWelcomeRequested.cs
@@ -0,0 +1,7 @@
+namespace Wino.Messaging.Client.Navigation;
+
+/// <summary>
+/// User clicked "Get Started" on the welcome page.
+/// App should close the welcome window and open the shell window.
+/// </summary>
+public record GetStartedFromWelcomeRequested;
diff --git a/Wino.Messages/Client/Navigation/NavigateManageAccountsRequested.cs b/Wino.Messages/Client/Navigation/NavigateManageAccountsRequested.cs
deleted file mode 100644
index b3427483..00000000
--- a/Wino.Messages/Client/Navigation/NavigateManageAccountsRequested.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Wino.Messaging.Client.Navigation;
-
-/// <summary>
-/// Navigates to manage accounts page.
-/// </summary>
-public record NavigateManageAccountsRequested;
diff --git a/Wino.Messages/Client/Navigation/SettingsRootNavigationRequested.cs b/Wino.Messages/Client/Navigation/SettingsRootNavigationRequested.cs
new file mode 100644
index 00000000..c2eeabd1
--- /dev/null
+++ b/Wino.Messages/Client/Navigation/SettingsRootNavigationRequested.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Messaging.Client.Navigation;
+
+public sealed record SettingsRootNavigationRequested(WinoPage PageType);
diff --git a/Wino.Messages/Server/DownloadMissingMessageRequested.cs b/Wino.Messages/Server/DownloadMissingMessageRequested.cs
index 5cbe8eae..7c994480 100644
--- a/Wino.Messages/Server/DownloadMissingMessageRequested.cs
+++ b/Wino.Messages/Server/DownloadMissingMessageRequested.cs
@@ -1,6 +1,6 @@
 using System;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.MailItem;
 
 namespace Wino.Messaging.Server;
 
@@ -10,4 +10,4 @@ namespace Wino.Messaging.Server;
 /// </summary>
 /// <param name="AccountId">Account id for corresponding synchronizer.</param>
 /// <param name="MailCopyId">Mail copy id to download.</param>
-public record DownloadMissingMessageRequested(Guid AccountId, IMailItem MailItem) : IClientMessage;
+public record DownloadMissingMessageRequested(Guid AccountId, MailCopy MailItem) : IClientMessage;
diff --git a/Wino.Messages/Server/NewSynchronizationRequested.cs b/Wino.Messages/Server/NewSynchronizationRequested.cs
index 02f6d974..b6f5a6b2 100644
--- a/Wino.Messages/Server/NewSynchronizationRequested.cs
+++ b/Wino.Messages/Server/NewSynchronizationRequested.cs
@@ -1,5 +1,4 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Synchronization;
 
 namespace Wino.Messaging.Server;
@@ -8,10 +7,10 @@ namespace Wino.Messaging.Server;
 /// Triggers a new mail synchronization if possible.
 /// </summary>
 /// <param name="Options">Options for synchronization.</param>
-public record NewMailSynchronizationRequested(MailSynchronizationOptions Options, SynchronizationSource Source) : IClientMessage, IUIMessage;
+public record NewMailSynchronizationRequested(MailSynchronizationOptions Options) : IClientMessage, IUIMessage;
 
 /// <summary>
 /// Triggers a new calendar synchronization if possible.
 /// </summary>
 /// <param name="Options">Options for synchronization.</param>
-public record NewCalendarSynchronizationRequested(CalendarSynchronizationOptions Options, SynchronizationSource Source) : IClientMessage;
+public record NewCalendarSynchronizationRequested(CalendarSynchronizationOptions Options) : IClientMessage, IUIMessage;
diff --git a/Wino.Messages/Server/ServerTerminationModeChanged.cs b/Wino.Messages/Server/ServerTerminationModeChanged.cs
deleted file mode 100644
index 7d0ef5ed..00000000
--- a/Wino.Messages/Server/ServerTerminationModeChanged.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Messaging.Server;
-
-/// <summary>
-/// App close behavior for server is changed.
-/// </summary>
-/// <param name="ServerBackgroundMode">New server background mode.</param>
-public record ServerTerminationModeChanged(ServerBackgroundMode ServerBackgroundMode) : IClientMessage;
diff --git a/Wino.Messages/UI/AccountCalendarSynchronizationStateChanged.cs b/Wino.Messages/UI/AccountCalendarSynchronizationStateChanged.cs
new file mode 100644
index 00000000..85792d07
--- /dev/null
+++ b/Wino.Messages/UI/AccountCalendarSynchronizationStateChanged.cs
@@ -0,0 +1,13 @@
+using System;
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Messaging.UI;
+
+/// <summary>
+/// Emitted when calendar synchronization state for an account changes.
+/// </summary>
+public record AccountCalendarSynchronizationStateChanged(
+    Guid AccountId,
+    CalendarSynchronizationType SynchronizationType,
+    bool IsSynchronizationInProgress,
+    string SynchronizationStatus = "") : UIMessageBase<AccountCalendarSynchronizationStateChanged>;
diff --git a/Wino.Messages/UI/AccountSynchronizerStateChanged.cs b/Wino.Messages/UI/AccountSynchronizerStateChanged.cs
index 8aa1945b..3e215906 100644
--- a/Wino.Messages/UI/AccountSynchronizerStateChanged.cs
+++ b/Wino.Messages/UI/AccountSynchronizerStateChanged.cs
@@ -6,6 +6,14 @@ namespace Wino.Messaging.UI;
 /// <summary>
 /// Emitted when synchronizer state is updated.
 /// </summary>
-/// <param name="synchronizer">Account Synchronizer</param>
-/// <param name="newState">New state.</param>
-public record AccountSynchronizerStateChanged(Guid AccountId, AccountSynchronizerState NewState) : UIMessageBase<AccountSynchronizerStateChanged>;
+/// <param name="AccountId">Account id</param>
+/// <param name="NewState">New synchronizer state</param>
+/// <param name="TotalItemsToSync">Total items to sync (0 for indeterminate)</param>
+/// <param name="RemainingItemsToSync">Remaining items to sync</param>
+/// <param name="SynchronizationStatus">Current synchronization status message</param>
+public record AccountSynchronizerStateChanged(
+    Guid AccountId, 
+    AccountSynchronizerState NewState,
+    int TotalItemsToSync = 0,
+    int RemainingItemsToSync = 0,
+    string SynchronizationStatus = "") : UIMessageBase<AccountSynchronizerStateChanged>;
diff --git a/Wino.Messages/UI/FolderDeleted.cs b/Wino.Messages/UI/FolderDeleted.cs
new file mode 100644
index 00000000..94b7124e
--- /dev/null
+++ b/Wino.Messages/UI/FolderDeleted.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Entities.Mail;
+
+namespace Wino.Messaging.UI;
+
+public record FolderDeleted(MailItemFolder MailItemFolder) : UIMessageBase<FolderDeleted>;
diff --git a/Wino.Messages/UI/MailUpdatedMessage.cs b/Wino.Messages/UI/MailUpdatedMessage.cs
index b0c140e2..66c4161b 100644
--- a/Wino.Messages/UI/MailUpdatedMessage.cs
+++ b/Wino.Messages/UI/MailUpdatedMessage.cs
@@ -1,5 +1,6 @@
 using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Enums;
 
 namespace Wino.Messaging.UI;
 
-public record MailUpdatedMessage(MailCopy UpdatedMail) : UIMessageBase<MailUpdatedMessage>;
+public record MailUpdatedMessage(MailCopy UpdatedMail, MailUpdateSource Source, MailCopyChangeFlags ChangedProperties = MailCopyChangeFlags.None) : UIMessageBase<MailUpdatedMessage>;
diff --git a/Wino.Messages/UI/SynchronizationActionsAdded.cs b/Wino.Messages/UI/SynchronizationActionsAdded.cs
new file mode 100644
index 00000000..7655d884
--- /dev/null
+++ b/Wino.Messages/UI/SynchronizationActionsAdded.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using Wino.Core.Domain.Models.Synchronization;
+
+namespace Wino.Messaging.UI;
+
+/// <summary>
+/// Sent when synchronization requests are queued for an account.
+/// Contains grouped action descriptions for the UI to display.
+/// </summary>
+public record SynchronizationActionsAdded(
+    Guid AccountId,
+    string AccountName,
+    List<SynchronizationActionItem> Actions) : UIMessageBase<SynchronizationActionsAdded>;
diff --git a/Wino.Messages/UI/SynchronizationActionsCompleted.cs b/Wino.Messages/UI/SynchronizationActionsCompleted.cs
new file mode 100644
index 00000000..e5a04b39
--- /dev/null
+++ b/Wino.Messages/UI/SynchronizationActionsCompleted.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Wino.Messaging.UI;
+
+/// <summary>
+/// Sent when all queued synchronization requests for an account have been executed.
+/// </summary>
+public record SynchronizationActionsCompleted(
+    Guid AccountId) : UIMessageBase<SynchronizationActionsCompleted>;
diff --git a/Wino.Messages/UI/TitleBarShellContentUpdated.cs b/Wino.Messages/UI/TitleBarShellContentUpdated.cs
new file mode 100644
index 00000000..40ac2d80
--- /dev/null
+++ b/Wino.Messages/UI/TitleBarShellContentUpdated.cs
@@ -0,0 +1,3 @@
+namespace Wino.Messaging.UI;
+
+public record TitleBarShellContentUpdated;
diff --git a/Wino.Messages/UI/WelcomeImportCompletedMessage.cs b/Wino.Messages/UI/WelcomeImportCompletedMessage.cs
new file mode 100644
index 00000000..b35a34e0
--- /dev/null
+++ b/Wino.Messages/UI/WelcomeImportCompletedMessage.cs
@@ -0,0 +1,3 @@
+namespace Wino.Messaging.UI;
+
+public record WelcomeImportCompletedMessage(int ImportedMailboxCount) : UIMessageBase<WelcomeImportCompletedMessage>;
diff --git a/Wino.Messages/UI/WinoAccountAddOnPurchasedMessage.cs b/Wino.Messages/UI/WinoAccountAddOnPurchasedMessage.cs
new file mode 100644
index 00000000..14a7ecbd
--- /dev/null
+++ b/Wino.Messages/UI/WinoAccountAddOnPurchasedMessage.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Enums;
+
+namespace Wino.Messaging.UI;
+
+public record WinoAccountAddOnPurchasedMessage(WinoAddOnProductType ProductType) : UIMessageBase<WinoAccountAddOnPurchasedMessage>;
diff --git a/Wino.Messages/UI/WinoAccountProfileDeletedMessage.cs b/Wino.Messages/UI/WinoAccountProfileDeletedMessage.cs
new file mode 100644
index 00000000..5f22fc6f
--- /dev/null
+++ b/Wino.Messages/UI/WinoAccountProfileDeletedMessage.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Messaging.UI;
+
+public record WinoAccountProfileDeletedMessage(WinoAccount Account) : UIMessageBase<WinoAccountProfileDeletedMessage>;
diff --git a/Wino.Messages/UI/WinoAccountProfileUpdatedMessage.cs b/Wino.Messages/UI/WinoAccountProfileUpdatedMessage.cs
new file mode 100644
index 00000000..9ca5a683
--- /dev/null
+++ b/Wino.Messages/UI/WinoAccountProfileUpdatedMessage.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Messaging.UI;
+
+public record WinoAccountProfileUpdatedMessage(WinoAccount Account) : UIMessageBase<WinoAccountProfileUpdatedMessage>;
diff --git a/Wino.Messages/UI/WinoAccountSignedInMessage.cs b/Wino.Messages/UI/WinoAccountSignedInMessage.cs
new file mode 100644
index 00000000..dc18b6b9
--- /dev/null
+++ b/Wino.Messages/UI/WinoAccountSignedInMessage.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Messaging.UI;
+
+public record WinoAccountSignedInMessage(WinoAccount Account) : UIMessageBase<WinoAccountSignedInMessage>;
diff --git a/Wino.Messages/UI/WinoAccountSignedOutMessage.cs b/Wino.Messages/UI/WinoAccountSignedOutMessage.cs
new file mode 100644
index 00000000..9dff9343
--- /dev/null
+++ b/Wino.Messages/UI/WinoAccountSignedOutMessage.cs
@@ -0,0 +1,5 @@
+using Wino.Core.Domain.Entities.Shared;
+
+namespace Wino.Messaging.UI;
+
+public record WinoAccountSignedOutMessage(WinoAccount Account) : UIMessageBase<WinoAccountSignedOutMessage>;
diff --git a/Wino.Messages/Wino.Messaging.csproj b/Wino.Messages/Wino.Messaging.csproj
index 7cc4e76c..cbb884da 100644
--- a/Wino.Messages/Wino.Messaging.csproj
+++ b/Wino.Messages/Wino.Messaging.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Platforms>x86;x64;arm64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="System.Text.Json" />
-	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Client\Authorization\" />
 	</ItemGroup>
diff --git a/Wino.Packaging/Images/LargeTile.scale-100.png b/Wino.Packaging/Images/LargeTile.scale-100.png
deleted file mode 100644
index aca6e4e2..00000000
Binary files a/Wino.Packaging/Images/LargeTile.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/LargeTile.scale-125.png b/Wino.Packaging/Images/LargeTile.scale-125.png
deleted file mode 100644
index b80bf9d4..00000000
Binary files a/Wino.Packaging/Images/LargeTile.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/LargeTile.scale-150.png b/Wino.Packaging/Images/LargeTile.scale-150.png
deleted file mode 100644
index 1ed2a001..00000000
Binary files a/Wino.Packaging/Images/LargeTile.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/LargeTile.scale-200.png b/Wino.Packaging/Images/LargeTile.scale-200.png
deleted file mode 100644
index a8e471dd..00000000
Binary files a/Wino.Packaging/Images/LargeTile.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/LargeTile.scale-400.png b/Wino.Packaging/Images/LargeTile.scale-400.png
deleted file mode 100644
index 54cea310..00000000
Binary files a/Wino.Packaging/Images/LargeTile.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/LockScreenLogo.scale-200.png b/Wino.Packaging/Images/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57ad..00000000
Binary files a/Wino.Packaging/Images/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SmallTile.scale-100.png b/Wino.Packaging/Images/SmallTile.scale-100.png
deleted file mode 100644
index f0d52390..00000000
Binary files a/Wino.Packaging/Images/SmallTile.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SmallTile.scale-125.png b/Wino.Packaging/Images/SmallTile.scale-125.png
deleted file mode 100644
index 4a0404cf..00000000
Binary files a/Wino.Packaging/Images/SmallTile.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SmallTile.scale-150.png b/Wino.Packaging/Images/SmallTile.scale-150.png
deleted file mode 100644
index f801334e..00000000
Binary files a/Wino.Packaging/Images/SmallTile.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SmallTile.scale-200.png b/Wino.Packaging/Images/SmallTile.scale-200.png
deleted file mode 100644
index bb2c20c9..00000000
Binary files a/Wino.Packaging/Images/SmallTile.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SmallTile.scale-400.png b/Wino.Packaging/Images/SmallTile.scale-400.png
deleted file mode 100644
index c931a5dd..00000000
Binary files a/Wino.Packaging/Images/SmallTile.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SplashScreen.scale-100.png b/Wino.Packaging/Images/SplashScreen.scale-100.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/Wino.Packaging/Images/SplashScreen.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SplashScreen.scale-125.png b/Wino.Packaging/Images/SplashScreen.scale-125.png
deleted file mode 100644
index ceb2dff6..00000000
Binary files a/Wino.Packaging/Images/SplashScreen.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SplashScreen.scale-150.png b/Wino.Packaging/Images/SplashScreen.scale-150.png
deleted file mode 100644
index 885d9bc2..00000000
Binary files a/Wino.Packaging/Images/SplashScreen.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SplashScreen.scale-200.png b/Wino.Packaging/Images/SplashScreen.scale-200.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/Wino.Packaging/Images/SplashScreen.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/SplashScreen.scale-400.png b/Wino.Packaging/Images/SplashScreen.scale-400.png
deleted file mode 100644
index fa77f2b7..00000000
Binary files a/Wino.Packaging/Images/SplashScreen.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square150x150Logo.scale-100.png b/Wino.Packaging/Images/Square150x150Logo.scale-100.png
deleted file mode 100644
index a5f235b8..00000000
Binary files a/Wino.Packaging/Images/Square150x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square150x150Logo.scale-125.png b/Wino.Packaging/Images/Square150x150Logo.scale-125.png
deleted file mode 100644
index be92b5ae..00000000
Binary files a/Wino.Packaging/Images/Square150x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square150x150Logo.scale-150.png b/Wino.Packaging/Images/Square150x150Logo.scale-150.png
deleted file mode 100644
index d0039797..00000000
Binary files a/Wino.Packaging/Images/Square150x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square150x150Logo.scale-200.png b/Wino.Packaging/Images/Square150x150Logo.scale-200.png
deleted file mode 100644
index 430e6fa3..00000000
Binary files a/Wino.Packaging/Images/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square150x150Logo.scale-400.png b/Wino.Packaging/Images/Square150x150Logo.scale-400.png
deleted file mode 100644
index 9726829b..00000000
Binary files a/Wino.Packaging/Images/Square150x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.scale-100.png b/Wino.Packaging/Images/Square44x44Logo.scale-100.png
deleted file mode 100644
index 7432521d..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.scale-125.png b/Wino.Packaging/Images/Square44x44Logo.scale-125.png
deleted file mode 100644
index fe38dbdf..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.scale-150.png b/Wino.Packaging/Images/Square44x44Logo.scale-150.png
deleted file mode 100644
index 1ee950af..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.scale-200.png b/Wino.Packaging/Images/Square44x44Logo.scale-200.png
deleted file mode 100644
index 807e9ed4..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.scale-400.png b/Wino.Packaging/Images/Square44x44Logo.scale-400.png
deleted file mode 100644
index f4457476..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-16.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 9acb3cc8..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-16.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-24.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-24.png
deleted file mode 100644
index c1e08a4f..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-24.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-256.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index 37f8decd..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-256.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-32.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-32.png
deleted file mode 100644
index 93c856d9..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-32.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Square44x44Logo.targetsize-48.png b/Wino.Packaging/Images/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index a2ca3afc..00000000
Binary files a/Wino.Packaging/Images/Square44x44Logo.targetsize-48.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.backup.png b/Wino.Packaging/Images/StoreLogo.backup.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.backup.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.scale-100.png b/Wino.Packaging/Images/StoreLogo.scale-100.png
deleted file mode 100644
index 4c4b4b34..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.scale-125.png b/Wino.Packaging/Images/StoreLogo.scale-125.png
deleted file mode 100644
index 1c325127..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.scale-150.png b/Wino.Packaging/Images/StoreLogo.scale-150.png
deleted file mode 100644
index bb194ef7..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.scale-200.png b/Wino.Packaging/Images/StoreLogo.scale-200.png
deleted file mode 100644
index b77a5ddc..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/StoreLogo.scale-400.png b/Wino.Packaging/Images/StoreLogo.scale-400.png
deleted file mode 100644
index 8d0a133e..00000000
Binary files a/Wino.Packaging/Images/StoreLogo.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Wide310x150Logo.scale-100.png b/Wino.Packaging/Images/Wide310x150Logo.scale-100.png
deleted file mode 100644
index f330133d..00000000
Binary files a/Wino.Packaging/Images/Wide310x150Logo.scale-100.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Wide310x150Logo.scale-125.png b/Wino.Packaging/Images/Wide310x150Logo.scale-125.png
deleted file mode 100644
index e4656fa7..00000000
Binary files a/Wino.Packaging/Images/Wide310x150Logo.scale-125.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Wide310x150Logo.scale-150.png b/Wino.Packaging/Images/Wide310x150Logo.scale-150.png
deleted file mode 100644
index 884084b3..00000000
Binary files a/Wino.Packaging/Images/Wide310x150Logo.scale-150.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Wide310x150Logo.scale-200.png b/Wino.Packaging/Images/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/Wino.Packaging/Images/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/Wino.Packaging/Images/Wide310x150Logo.scale-400.png b/Wino.Packaging/Images/Wide310x150Logo.scale-400.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/Wino.Packaging/Images/Wide310x150Logo.scale-400.png and /dev/null differ
diff --git a/Wino.Packaging/Package.appxmanifest b/Wino.Packaging/Package.appxmanifest
deleted file mode 100644
index 28ba3f1a..00000000
--- a/Wino.Packaging/Package.appxmanifest
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap uap5 rescap">
-
-	<Identity
-	  Name="58272BurakKSE.WinoMailPreview"
-	  Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-	  Version="1.9.50.0" />
-	
-	<Extensions>
-		<!-- Publisher Cache Folders -->
-		<Extension Category="windows.publisherCacheFolders">
-			<PublisherCacheFolders>
-				<Folder Name="WinoShared" />
-			</PublisherCacheFolders>
-		</Extension>
-	</Extensions>
-
-	<Properties>
-		<DisplayName>Wino Mail</DisplayName>
-		<PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-		<Logo>Assets\StoreLogo.png</Logo>
-	</Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-		<uap:VisualElements
-        DisplayName="Wino Mail"
-        Description="Wino Mail"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  Square71x71Logo="Images\SmallTile.png" Square310x310Logo="Images\LargeTile.png"/>
-        <uap:SplashScreen Image="Images\SplashScreen.png" uap5:Optional="true" />
-      </uap:VisualElements>
-
-		<Extensions>
-			<!-- App updated task. Notifies about new version after each Store update. -->
-			<Extension Category="windows.updateTask" EntryPoint="Wino.BackgroundTasks.AppUpdatedTask" />
-
-			<!-- Protocol activation: mailto -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="mailto" />
-			</uap:Extension>
-
-			<!-- Protocol activation: Google OAuth -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="google.pw.oauth2">
-					<uap:DisplayName>Wino Google Authentication Protocol</uap:DisplayName>
-				</uap:Protocol>
-
-			</uap:Extension>
-
-			<!-- Protocol activation: Launch UWP app from Full Trust Process  -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="wino.mail.launch">
-					<uap:DisplayName>Wino Mail Launcher Protocol</uap:DisplayName>
-				</uap:Protocol>
-			</uap:Extension>
-			
-			
-			<!-- File Assosication: EML -->
-			<uap:Extension Category="windows.fileTypeAssociation">
-				<uap:FileTypeAssociation Name="eml">
-					<uap:Logo>EML\eml.png</uap:Logo>
-					<uap:SupportedFileTypes>
-						<uap:FileType>.eml</uap:FileType>
-					</uap:SupportedFileTypes>
-				</uap:FileTypeAssociation>
-			</uap:Extension>
-
-			<!-- Registration of full trust backend application. -->
-			<uap:Extension Category="windows.appService">
-				<uap:AppService Name="WinoInteropService" />
-			</uap:Extension>
-
-			<desktop:Extension Category="windows.fullTrustProcess" Executable="Wino.Server\Wino.Server.exe">
-				<desktop:FullTrustProcess>
-					<desktop:ParameterGroup GroupId="WinoServer" Parameters="Mail" />
-				</desktop:FullTrustProcess>
-			</desktop:Extension>
-
-			<!-- Startup Task -->
-			<uap5:Extension
-				Category="windows.startupTask"
-				Executable="Wino.Server\Wino.Server.exe"
-				EntryPoint="Windows.FullTrustApplication">
-				<uap5:StartupTask
-					  TaskId="WinoServer"
-					  Enabled="false"
-					  DisplayName="Wino Mail" />
-			</uap5:Extension>
-		</Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <rescap:Capability Name="runFullTrust" />
-	<rescap:Capability Name="confirmAppClose" />
-  </Capabilities>
-</Package>
diff --git a/Wino.Packaging/Wino.Packaging.wapproj b/Wino.Packaging/Wino.Packaging.wapproj
deleted file mode 100644
index 6dec0781..00000000
--- a/Wino.Packaging/Wino.Packaging.wapproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-	  
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-	  <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-	  <RemoteDebugEnabled>False</RemoteDebugEnabled>
-	  <DebuggerType>CoreClr</DebuggerType>
-	<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>760f5f31-8ee3-4b83-80f3-0e4ffbcc737c</ProjectGuid>
-    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <NoWarn>$(NoWarn);NU1702</NoWarn>
-    <EntryPointProjectUniqueName>..\Wino.Mail\Wino.Mail.csproj</EntryPointProjectUniqueName>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxPackageDir>$(USERPROFILE)\Desktop\Packages\</AppxPackageDir>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
-    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <AppxSymbolPackageEnabled>True</AppxSymbolPackageEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Images\LargeTile.scale-100.png" />
-    <Content Include="Images\LargeTile.scale-125.png" />
-    <Content Include="Images\LargeTile.scale-150.png" />
-    <Content Include="Images\LargeTile.scale-200.png" />
-    <Content Include="Images\LargeTile.scale-400.png" />
-    <Content Include="Images\SmallTile.scale-100.png" />
-    <Content Include="Images\SmallTile.scale-125.png" />
-    <Content Include="Images\SmallTile.scale-150.png" />
-    <Content Include="Images\SmallTile.scale-200.png" />
-    <Content Include="Images\SmallTile.scale-400.png" />
-    <Content Include="Images\SplashScreen.scale-100.png" />
-    <Content Include="Images\SplashScreen.scale-125.png" />
-    <Content Include="Images\SplashScreen.scale-150.png" />
-    <Content Include="Images\SplashScreen.scale-200.png" />
-    <Content Include="Images\LockScreenLogo.scale-200.png" />
-    <Content Include="Images\SplashScreen.scale-400.png" />
-    <Content Include="Images\Square150x150Logo.scale-100.png" />
-    <Content Include="Images\Square150x150Logo.scale-125.png" />
-    <Content Include="Images\Square150x150Logo.scale-150.png" />
-    <Content Include="Images\Square150x150Logo.scale-200.png" />
-    <Content Include="Images\Square150x150Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.scale-100.png" />
-    <Content Include="Images\Square44x44Logo.scale-125.png" />
-    <Content Include="Images\Square44x44Logo.scale-150.png" />
-    <Content Include="Images\Square44x44Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Images\StoreLogo.scale-100.png" />
-    <Content Include="Images\StoreLogo.scale-125.png" />
-    <Content Include="Images\StoreLogo.scale-150.png" />
-    <Content Include="Images\StoreLogo.scale-200.png" />
-    <Content Include="Images\StoreLogo.scale-400.png" />
-    <Content Include="Images\Wide310x150Logo.scale-100.png" />
-    <Content Include="Images\Wide310x150Logo.scale-125.png" />
-    <Content Include="Images\Wide310x150Logo.scale-150.png" />
-    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <None Include="Package.StoreAssociation.xml" />
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <ItemGroup>
-	  <ProjectReference Include="..\Wino.Mail\Wino.Mail.csproj">
-		  <UseLowTrustEntryPoint>True</UseLowTrustEntryPoint>
-		  <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-	  </ProjectReference>
-    <ProjectReference Include="..\Wino.Server\Wino.Server.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client"  />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Wino.Server/App.xaml b/Wino.Server/App.xaml
deleted file mode 100644
index f36b711a..00000000
--- a/Wino.Server/App.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<Application
-    x:Class="Wino.Server.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    ShutdownMode="OnExplicitShutdown"
-    xmlns:local="clr-namespace:Wino.Server">
-    <Application.Resources>
-        <ResourceDictionary Source="TrayIconResources.xaml" />
-    </Application.Resources>
-</Application>
diff --git a/Wino.Server/App.xaml.cs b/Wino.Server/App.xaml.cs
deleted file mode 100644
index cc095c29..00000000
--- a/Wino.Server/App.xaml.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using H.NotifyIcon;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-using Windows.Storage;
-using Wino.Calendar.Services;
-using Wino.Core;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.UWP.Services;
-using Wino.Server.Core;
-using Wino.Server.MessageHandlers;
-using Wino.Services;
-
-namespace Wino.Server;
-
-/// <summary>
-/// Single instance Wino Server.
-/// Instancing is done using Mutex.
-/// App will not start if another instance is already running.
-/// App will let running server know that server execution is triggered, which will
-/// led server to start new connection to requesting UWP app.
-/// </summary>
-public partial class App : Application
-{
-    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-    static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass, string lpszWindow);
-
-    [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-    static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
-
-    private const string FRAME_WINDOW = "ApplicationFrameWindow";
-
-    public const string WinoMailLaunchProtocol = "wino.mail.launch";
-    public const string WinoCalendarLaunchProtocol = "wino.calendar.launch";
-
-    private const string NotifyIconResourceKey = "NotifyIcon";
-
-
-    private const string WinoMailServerAppName = "Wino.Mail.Server";
-    private const string WinoMailServerActivatedName = "Wino.Mail.Server.Activated";
-
-    private const string WinoCalendarServerAppName = "Wino.Calendar.Server";
-    private const string WinoCalendarServerActivatedName = "Wino.Calendar.Server.Activated";
-    public new static App Current => (App)Application.Current;
-
-    public WinoAppType WinoServerType { get; private set; }
-
-    private TaskbarIcon? _notifyIcon;
-    private static Mutex _mutex = null;
-    private EventWaitHandle _eventWaitHandle;
-
-    public IServiceProvider Services { get; private set; }
-
-    private ServiceProvider ConfigureServices()
-    {
-        var services = new ServiceCollection();
-
-        services.AddTransient<ServerContext>();
-        services.AddTransient<ServerViewModel>();
-
-        services.RegisterCoreServices();
-        services.RegisterSharedServices();
-
-        // Below services belongs to UWP.Core package and some APIs are not available for WPF.
-        // We register them here to avoid compilation errors.
-
-        services.AddSingleton<IConfigurationService, ConfigurationService>();
-        services.AddSingleton<INativeAppService, NativeAppService>();
-        services.AddSingleton<IPreferencesService, PreferencesService>();
-        services.AddTransient<INotificationBuilder, NotificationBuilder>();
-        services.AddTransient<IUnderlyingThemeService, UnderlyingThemeService>();
-        services.AddSingleton<IApplicationConfiguration, ApplicationConfiguration>();
-        services.AddSingleton<IThumbnailService, ThumbnailService>();
-
-        // Register server message handler factory.
-        var serverMessageHandlerFactory = new ServerMessageHandlerFactory();
-        serverMessageHandlerFactory.Setup(services);
-
-        services.AddSingleton<IServerMessageHandlerFactory>(serverMessageHandlerFactory);
-
-        // Server type related services.
-        // TODO: Better abstraction.
-
-        if (WinoServerType == WinoAppType.Mail)
-        {
-            services.AddSingleton<IAuthenticatorConfig, MailAuthenticatorConfiguration>();
-        }
-        else
-        {
-            services.AddSingleton<IAuthenticatorConfig, CalendarAuthenticatorConfig>();
-        }
-
-        return services.BuildServiceProvider();
-    }
-
-    private async Task<ServerViewModel> InitializeNewServerAsync()
-    {
-        // Make sure app config is setup before anything else.
-        var applicationFolderConfiguration = Services.GetService<IApplicationConfiguration>();
-
-        applicationFolderConfiguration.ApplicationDataFolderPath = ApplicationData.Current.LocalFolder.Path;
-        applicationFolderConfiguration.PublisherSharedFolderPath = ApplicationData.Current.GetPublisherCacheFolder(ApplicationConfiguration.SharedFolderName).Path;
-        applicationFolderConfiguration.ApplicationTempFolderPath = ApplicationData.Current.TemporaryFolder.Path;
-
-        // Setup logger
-        var logInitializer = Services.GetService<IWinoLogger>();
-        var logFilePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.ServerLogFile);
-
-        logInitializer.SetupLogger(logFilePath);
-
-        // Make sure the database is ready.
-        var databaseService = Services.GetService<IDatabaseService>();
-        await databaseService.InitializeAsync();
-
-        // Setup core window handler for native app service.
-        // WPF app uses UWP app's window handle to display authentication dialog.
-        var nativeAppService = Services.GetService<INativeAppService>();
-        nativeAppService.GetCoreWindowHwnd = FindUWPClientWindowHandle;
-
-        // Initialize translations.
-        var translationService = Services.GetService<ITranslationService>();
-        await translationService.InitializeAsync();
-
-        // Make sure all accounts have synchronizers.
-        var synchronizerFactory = Services.GetService<ISynchronizerFactory>();
-        await synchronizerFactory.InitializeAsync();
-
-        // Load up the server view model.
-        var serverViewModel = Services.GetRequiredService<ServerViewModel>();
-        await serverViewModel.InitializeAsync();
-
-        return serverViewModel;
-    }
-
-    /// <summary>
-    /// OutlookAuthenticator for WAM requires window handle to display the dialog.
-    /// Since server app is windowless, we need to find the UWP app window handle.
-    /// </summary>
-    /// <param name="proc"></param>
-    /// <returns>Pointer to running UWP app's hwnd.</returns>
-    private IntPtr FindUWPClientWindowHandle()
-    {
-        string processName = WinoServerType == WinoAppType.Mail ? "Wino.Mail" : "Wino.Calendar";
-
-        var proc = Process.GetProcessesByName(processName).FirstOrDefault() ?? throw new Exception($"{processName} client is not running.");
-
-        for (IntPtr appWindow = FindWindowEx(IntPtr.Zero, IntPtr.Zero, FRAME_WINDOW, null); appWindow != IntPtr.Zero;
-            appWindow = FindWindowEx(IntPtr.Zero, appWindow, FRAME_WINDOW, null))
-        {
-            IntPtr coreWindow = FindWindowEx(appWindow, IntPtr.Zero, "Windows.UI.Core.CoreWindow", null);
-            if (coreWindow != IntPtr.Zero)
-            {
-                if (GetWindowThreadProcessId(coreWindow, out var corePid) == 0)
-                {
-                    throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
-                }
-                if (corePid == proc.Id)
-                {
-                    return appWindow;
-                }
-            }
-        }
-
-        return IntPtr.Zero;
-    }
-
-    protected override async void OnStartup(StartupEventArgs e)
-    {
-        // Same server code runs for both Mail and Calendar.
-
-        string winoAppTypeParameter = e.Args.Length > 0 ? e.Args[^1] : "Mail";
-
-        WinoServerType = winoAppTypeParameter == "Mail" ? WinoAppType.Mail : WinoAppType.Calendar;
-
-        // TODO: Better abstraction.
-
-        string serverName = WinoServerType == WinoAppType.Mail ? WinoMailServerAppName : WinoCalendarServerAppName;
-        string serverActivatedName = WinoServerType == WinoAppType.Mail ? WinoMailServerActivatedName : WinoCalendarServerActivatedName;
-
-        _mutex = new Mutex(true, serverName, out bool isCreatedNew);
-        _eventWaitHandle = new EventWaitHandle(false, EventResetMode.AutoReset, serverActivatedName);
-
-        if (isCreatedNew)
-        {
-            AppDomain.CurrentDomain.UnhandledException += ServerCrashed;
-            Application.Current.DispatcherUnhandledException += UIThreadCrash;
-            TaskScheduler.UnobservedTaskException += TaskCrashed;
-
-            // Ensure proper encodings are available for MimeKit
-            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-
-            // Spawn a thread which will be waiting for our event
-            var thread = new Thread(() =>
-            {
-                while (_eventWaitHandle.WaitOne())
-                {
-                    if (_notifyIcon == null) return;
-
-                    Current.Dispatcher.BeginInvoke(async () =>
-                    {
-                        if (_notifyIcon.DataContext is ServerViewModel trayIconViewModel)
-                        {
-                            await trayIconViewModel.ReconnectAsync();
-                        }
-                    });
-                }
-            })
-            {
-                // It is important mark it as background otherwise it will prevent app from exiting.
-                IsBackground = true
-            };
-            thread.Start();
-
-            Services = ConfigureServices();
-
-            base.OnStartup(e);
-
-            var serverViewModel = await InitializeNewServerAsync();
-
-            // Create taskbar icon for the new server.
-            _notifyIcon = (TaskbarIcon)FindResource(NotifyIconResourceKey);
-            _notifyIcon.DataContext = serverViewModel;
-            _notifyIcon.ForceCreate(enablesEfficiencyMode: true);
-
-            // Hide the icon if user has set it to invisible.
-            var preferencesService = Services.GetService<IPreferencesService>();
-            ChangeNotifyIconVisiblity(preferencesService.ServerTerminationBehavior != ServerBackgroundMode.Invisible);
-        }
-        else
-        {
-            // Notify other instance so it could reconnect to UWP app if needed.
-            _eventWaitHandle.Set();
-
-            // Terminate this instance.
-            Shutdown();
-        }
-    }
-
-    private void TaskCrashed(object sender, UnobservedTaskExceptionEventArgs e) => Log.Error(e.Exception, "Server task crashed.");
-
-    private void UIThreadCrash(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) => Log.Error(e.Exception, "Server UI thread crashed.");
-
-    private void ServerCrashed(object sender, UnhandledExceptionEventArgs e) => Log.Error((Exception)e.ExceptionObject, "Server crashed.");
-
-    protected override void OnExit(ExitEventArgs e)
-    {
-        _notifyIcon?.Dispose();
-        base.OnExit(e);
-    }
-
-    public void ChangeNotifyIconVisiblity(bool isVisible)
-    {
-        if (_notifyIcon == null) return;
-
-        Current.Dispatcher.BeginInvoke(() =>
-        {
-            _notifyIcon.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
-        });
-    }
-}
diff --git a/Wino.Server/AssemblyInfo.cs b/Wino.Server/AssemblyInfo.cs
deleted file mode 100644
index b0ec8275..00000000
--- a/Wino.Server/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
-                                                //(used if a resource is not found in the page,
-                                                // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
-                                                //(used if a resource is not found in the page,
-                                                // app, or any theme specific resource dictionaries)
-)]
diff --git a/Wino.Server/Core/ServerMessageHandlerBase.cs b/Wino.Server/Core/ServerMessageHandlerBase.cs
deleted file mode 100644
index a28cd6ca..00000000
--- a/Wino.Server/Core/ServerMessageHandlerBase.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.ApplicationModel.AppService;
-using Windows.Foundation.Collections;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging;
-
-namespace Wino.Server.Core;
-
-public abstract class ServerMessageHandlerBase
-{
-    public string HandlingRequestType { get; }
-
-    public abstract Task ExecuteAsync(IClientMessage message, AppServiceRequest request = null, CancellationToken cancellationToken = default);
-}
-
-public abstract class ServerMessageHandler<TClientMessage, TResponse> : ServerMessageHandlerBase where TClientMessage : IClientMessage
-{
-    /// <summary>
-    /// Response to return when server encounters and exception while executing code.
-    /// </summary>
-    /// <param name="ex">Exception that target threw.</param>
-    /// <returns>Default response on failure object.</returns>
-    public abstract WinoServerResponse<TResponse> FailureDefaultResponse(Exception ex);
-
-
-    /// <summary>
-    /// Safely executes the handler code and returns the response.
-    /// This call will never crash the server. Exceptions encountered will be handled and returned as response.
-    /// </summary>
-    /// <param name="message">IClientMessage that client asked the response for from the server.</param>
-    /// <param name="request">optional AppServiceRequest to return response for.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    /// <returns>Response object that server executes for the given method.</returns>
-    public override async Task ExecuteAsync(IClientMessage message, AppServiceRequest request = null, CancellationToken cancellationToken = default)
-    {
-        WinoServerResponse<TResponse> response = default;
-
-        try
-        {
-            response = await HandleAsync((TClientMessage)message, cancellationToken).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            response = FailureDefaultResponse(ex);
-        }
-        finally
-        {
-            // No need to send response if request is null.
-            // Handler might've been called directly from the server itself.
-            if (request != null)
-            {
-                var valueSet = new ValueSet()
-                {
-                    { MessageConstants.MessageDataKey, JsonSerializer.Serialize(response) }
-                };
-
-                await request.SendResponseAsync(valueSet);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Code that will be executed directly on the server.
-    /// All handlers must implement this method.
-    /// Response is wrapped with WinoServerResponse.
-    /// </summary>
-    /// <param name="message">IClientMessage that client asked the response for from the server.</param>
-    /// <param name="cancellationToken">Cancellation token.</param>
-    protected abstract Task<WinoServerResponse<TResponse>> HandleAsync(TClientMessage message, CancellationToken cancellationToken = default);
-}
diff --git a/Wino.Server/Core/ServerMessageHandlerFactory.cs b/Wino.Server/Core/ServerMessageHandlerFactory.cs
deleted file mode 100644
index abbb1e79..00000000
--- a/Wino.Server/Core/ServerMessageHandlerFactory.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Wino.Core.Domain.Models.Requests;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Messaging.Server;
-using Wino.Server.MessageHandlers;
-
-namespace Wino.Server.Core;
-
-public class ServerMessageHandlerFactory : IServerMessageHandlerFactory
-{
-    public ServerMessageHandlerBase GetHandler(string typeName)
-    {
-        return typeName switch
-        {
-            nameof(NewMailSynchronizationRequested) => App.Current.Services.GetService<MailSynchronizationRequestHandler>(),
-            nameof(NewCalendarSynchronizationRequested) => App.Current.Services.GetService<CalendarSynchronizationRequestHandler>(),
-            nameof(ServerRequestPackage) => App.Current.Services.GetService<UserActionRequestHandler>(),
-            nameof(DownloadMissingMessageRequested) => App.Current.Services.GetService<SingleMimeDownloadHandler>(),
-            nameof(AuthorizationRequested) => App.Current.Services.GetService<AuthenticationHandler>(),
-            nameof(SynchronizationExistenceCheckRequest) => App.Current.Services.GetService<SyncExistenceHandler>(),
-            nameof(ServerTerminationModeChanged) => App.Current.Services.GetService<ServerTerminationModeHandler>(),
-            nameof(TerminateServerRequested) => App.Current.Services.GetService<TerminateServerRequestHandler>(),
-            nameof(ImapConnectivityTestRequested) => App.Current.Services.GetService<ImapConnectivityTestHandler>(),
-            nameof(KillAccountSynchronizerRequested) => App.Current.Services.GetService<KillAccountSynchronizerHandler>(),
-            nameof(OnlineSearchRequested) => App.Current.Services.GetService<OnlineSearchRequestHandler>(),
-            _ => throw new Exception($"Server handler for {typeName} is not registered."),
-        };
-    }
-
-    public void Setup(IServiceCollection serviceCollection)
-    {
-        // Register all known handlers.
-
-        serviceCollection.AddTransient<MailSynchronizationRequestHandler>();
-        serviceCollection.AddTransient<CalendarSynchronizationRequestHandler>();
-        serviceCollection.AddTransient<UserActionRequestHandler>();
-        serviceCollection.AddTransient<SingleMimeDownloadHandler>();
-        serviceCollection.AddTransient<AuthenticationHandler>();
-        serviceCollection.AddTransient<SyncExistenceHandler>();
-        serviceCollection.AddTransient<ServerTerminationModeHandler>();
-        serviceCollection.AddTransient<TerminateServerRequestHandler>();
-        serviceCollection.AddTransient<ImapConnectivityTestHandler>();
-        serviceCollection.AddTransient<KillAccountSynchronizerHandler>();
-        serviceCollection.AddTransient<OnlineSearchRequestHandler>();
-    }
-}
diff --git a/Wino.Server/Images/Wino_Icon.ico b/Wino.Server/Images/Wino_Icon.ico
deleted file mode 100644
index be12c893..00000000
Binary files a/Wino.Server/Images/Wino_Icon.ico and /dev/null differ
diff --git a/Wino.Server/Interfaces/IServerMessageHandlerFactory.cs b/Wino.Server/Interfaces/IServerMessageHandlerFactory.cs
deleted file mode 100644
index 32e6d003..00000000
--- a/Wino.Server/Interfaces/IServerMessageHandlerFactory.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public interface IServerMessageHandlerFactory
-{
-    void Setup(IServiceCollection serviceCollection);
-
-    ServerMessageHandlerBase GetHandler(string typeName);
-}
diff --git a/Wino.Server/MessageHandlers/AuthenticationHandler.cs b/Wino.Server/MessageHandlers/AuthenticationHandler.cs
deleted file mode 100644
index bf53099c..00000000
--- a/Wino.Server/MessageHandlers/AuthenticationHandler.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Authentication;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class AuthenticationHandler : ServerMessageHandler<AuthorizationRequested, TokenInformationEx>
-{
-    private readonly IAuthenticationProvider _authenticationProvider;
-
-    public override WinoServerResponse<TokenInformationEx> FailureDefaultResponse(Exception ex)
-        => WinoServerResponse<TokenInformationEx>.CreateErrorResponse(ex.Message);
-
-    public AuthenticationHandler(IAuthenticationProvider authenticationProvider)
-    {
-        _authenticationProvider = authenticationProvider;
-    }
-
-    protected override async Task<WinoServerResponse<TokenInformationEx>> HandleAsync(AuthorizationRequested message,
-                                                                                    CancellationToken cancellationToken = default)
-    {
-        var authenticator = _authenticationProvider.GetAuthenticator(message.MailProviderType);
-
-        // Some users are having issues with Gmail authentication.
-        // Their browsers may never launch to complete authentication.
-        // Offer to copy auth url for them to complete it manually.
-        // Redirection will occur to the app and the token will be saved.
-
-        if (message.ProposeCopyAuthorizationURL && authenticator is IGmailAuthenticator gmailAuthenticator)
-        {
-            gmailAuthenticator.ProposeCopyAuthURL = true;
-        }
-
-        TokenInformationEx generatedToken = null;
-
-        if (message.CreatedAccount != null)
-        {
-            generatedToken = await authenticator.GetTokenInformationAsync(message.CreatedAccount);
-        }
-        else
-        {
-            // Initial authentication request.
-            // There is no account to get token for.
-
-            generatedToken = await authenticator.GenerateTokenInformationAsync(message.CreatedAccount);
-        }
-
-        return WinoServerResponse<TokenInformationEx>.CreateSuccessResponse(generatedToken);
-    }
-}
diff --git a/Wino.Server/MessageHandlers/CalendarSynchronizationRequestHandler.cs b/Wino.Server/MessageHandlers/CalendarSynchronizationRequestHandler.cs
deleted file mode 100644
index 4f60743a..00000000
--- a/Wino.Server/MessageHandlers/CalendarSynchronizationRequestHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class CalendarSynchronizationRequestHandler : ServerMessageHandler<NewCalendarSynchronizationRequested, CalendarSynchronizationResult>
-{
-    public override WinoServerResponse<CalendarSynchronizationResult> FailureDefaultResponse(Exception ex)
-       => WinoServerResponse<CalendarSynchronizationResult>.CreateErrorResponse(ex.Message);
-
-    private readonly ISynchronizerFactory _synchronizerFactory;
-
-    public CalendarSynchronizationRequestHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    protected override async Task<WinoServerResponse<CalendarSynchronizationResult>> HandleAsync(NewCalendarSynchronizationRequested message, CancellationToken cancellationToken = default)
-    {
-        var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(message.Options.AccountId);
-
-        try
-        {
-            var synchronizationResult = await synchronizer.SynchronizeCalendarEventsAsync(message.Options, cancellationToken);
-
-            return WinoServerResponse<CalendarSynchronizationResult>.CreateSuccessResponse(synchronizationResult);
-        }
-        catch (Exception ex)
-        {
-            throw;
-        }
-    }
-}
diff --git a/Wino.Server/MessageHandlers/ImapConnectivityTestHandler.cs b/Wino.Server/MessageHandlers/ImapConnectivityTestHandler.cs
deleted file mode 100644
index 5f69e9ac..00000000
--- a/Wino.Server/MessageHandlers/ImapConnectivityTestHandler.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Connectivity;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class ImapConnectivityTestHandler : ServerMessageHandler<ImapConnectivityTestRequested, ImapConnectivityTestResults>
-{
-    private readonly IImapTestService _imapTestService;
-
-    public override WinoServerResponse<ImapConnectivityTestResults> FailureDefaultResponse(Exception ex)
-        => WinoServerResponse<ImapConnectivityTestResults>.CreateErrorResponse(ex.Message);
-
-    public ImapConnectivityTestHandler(IImapTestService imapTestService)
-    {
-        _imapTestService = imapTestService;
-    }
-
-    protected override async Task<WinoServerResponse<ImapConnectivityTestResults>> HandleAsync(ImapConnectivityTestRequested message, CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            await _imapTestService.TestImapConnectionAsync(message.ServerInformation, message.IsSSLHandshakeAllowed);
-
-            return WinoServerResponse<ImapConnectivityTestResults>.CreateSuccessResponse(ImapConnectivityTestResults.Success());
-        }
-        catch (ImapTestSSLCertificateException sslTestException)
-        {
-            // User must confirm to continue ignoring the SSL certificate.
-            return WinoServerResponse<ImapConnectivityTestResults>.CreateSuccessResponse(ImapConnectivityTestResults.CertificateUIRequired(sslTestException.Issuer, sslTestException.ExpirationDateString, sslTestException.ValidFromDateString));
-        }
-        catch (ImapClientPoolException clientPoolException)
-        {
-            // Connectivity failed with protocol log.
-            return WinoServerResponse<ImapConnectivityTestResults>.CreateSuccessResponse(ImapConnectivityTestResults.Failure(clientPoolException, clientPoolException.ProtocolLog));
-        }
-        catch (Exception exception)
-        {
-            // Unknown error 
-            return WinoServerResponse<ImapConnectivityTestResults>.CreateSuccessResponse(ImapConnectivityTestResults.Failure(exception, string.Empty));
-        }
-    }
-}
diff --git a/Wino.Server/MessageHandlers/KillAccountSynchronizerHandler.cs b/Wino.Server/MessageHandlers/KillAccountSynchronizerHandler.cs
deleted file mode 100644
index 881bad27..00000000
--- a/Wino.Server/MessageHandlers/KillAccountSynchronizerHandler.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class KillAccountSynchronizerHandler : ServerMessageHandler<KillAccountSynchronizerRequested, bool>
-{
-    private readonly ISynchronizerFactory _synchronizerFactory;
-
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex)
-        => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    public KillAccountSynchronizerHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    protected override async Task<WinoServerResponse<bool>> HandleAsync(KillAccountSynchronizerRequested message, CancellationToken cancellationToken = default)
-    {
-        await _synchronizerFactory.DeleteSynchronizerAsync(message.AccountId);
-
-        return WinoServerResponse<bool>.CreateSuccessResponse(true);
-    }
-}
diff --git a/Wino.Server/MessageHandlers/MailSynchronizationRequestHandler.cs b/Wino.Server/MessageHandlers/MailSynchronizationRequestHandler.cs
deleted file mode 100644
index e888c3fe..00000000
--- a/Wino.Server/MessageHandlers/MailSynchronizationRequestHandler.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Messaging.Server;
-using Wino.Messaging.UI;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-/// <summary>
-/// Handler for NewMailSynchronizationRequested from the client.
-/// </summary>
-public class MailSynchronizationRequestHandler : ServerMessageHandler<NewMailSynchronizationRequested, MailSynchronizationResult>
-{
-    public override WinoServerResponse<MailSynchronizationResult> FailureDefaultResponse(Exception ex)
-        => WinoServerResponse<MailSynchronizationResult>.CreateErrorResponse(ex.Message);
-
-    private readonly ISynchronizerFactory _synchronizerFactory;
-    private readonly INotificationBuilder _notificationBuilder;
-    private readonly IAccountService _accountService;
-    private readonly IFolderService _folderService;
-
-    public MailSynchronizationRequestHandler(ISynchronizerFactory synchronizerFactory,
-                                         INotificationBuilder notificationBuilder,
-                                         IAccountService accountService,
-                                         IFolderService folderService)
-    {
-        _synchronizerFactory = synchronizerFactory;
-        _notificationBuilder = notificationBuilder;
-        _accountService = accountService;
-        _folderService = folderService;
-    }
-
-    protected override async Task<WinoServerResponse<MailSynchronizationResult>> HandleAsync(NewMailSynchronizationRequested message, CancellationToken cancellationToken = default)
-    {
-        var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(message.Options.AccountId);
-
-        // 1. Don't send message for sync completion when we execute requests.
-        // People are usually interested in seeing the notification after they trigger the synchronization.
-
-        // 2. Don't send message for sync completion when we are synchronizing from the server.
-        // It happens very common and there is no need to send a message for each synchronization.
-
-        bool shouldReportSynchronizationResult =
-            message.Options.Type != MailSynchronizationType.ExecuteRequests &&
-            message.Options.Type != MailSynchronizationType.IMAPIdle &&
-            message.Source == SynchronizationSource.Client;
-
-        try
-        {
-            var synchronizationResult = await synchronizer.SynchronizeMailsAsync(message.Options, cancellationToken).ConfigureAwait(false);
-
-            bool isNotificationsEnabled = await _accountService.IsNotificationsEnabled(synchronizer.Account.Id).ConfigureAwait(false);
-
-            if (isNotificationsEnabled && (synchronizationResult.DownloadedMessages?.Any() ?? false))
-            {
-                var accountInboxFolder = await _folderService.GetSpecialFolderByAccountIdAsync(message.Options.AccountId, SpecialFolderType.Inbox);
-
-                if (accountInboxFolder != null)
-                {
-                    await _notificationBuilder.CreateNotificationsAsync(accountInboxFolder.Id, synchronizationResult.DownloadedMessages);
-                }
-            }
-
-            var isSynchronizationSucceeded = synchronizationResult.CompletedState == SynchronizationCompletedState.Success;
-
-            // IDLE requests might be canceled successfully.
-            if (message.Options.Type == MailSynchronizationType.IMAPIdle && synchronizationResult.CompletedState == SynchronizationCompletedState.Canceled)
-            {
-                isSynchronizationSucceeded = true;
-            }
-
-            // Update badge count of the notification task.
-            if (isSynchronizationSucceeded)
-            {
-                await _notificationBuilder.UpdateTaskbarIconBadgeAsync();
-            }
-
-            if (shouldReportSynchronizationResult)
-            {
-                var completedMessage = new AccountSynchronizationCompleted(message.Options.AccountId,
-                                                                           isSynchronizationSucceeded ? SynchronizationCompletedState.Success : SynchronizationCompletedState.Failed,
-                                                                           message.Options.GroupedSynchronizationTrackingId);
-
-                WeakReferenceMessenger.Default.Send(completedMessage);
-            }
-
-            return WinoServerResponse<MailSynchronizationResult>.CreateSuccessResponse(synchronizationResult);
-        }
-        // TODO: Following cases might always be thrown from server. Handle them properly.
-
-        //catch (AuthenticationAttentionException)
-        //{
-        //    // TODO
-        //    // await SetAccountAttentionAsync(accountId, AccountAttentionReason.InvalidCredentials);
-        //}
-        //catch (SystemFolderConfigurationMissingException)
-        //{
-        //    // TODO
-        //    // await SetAccountAttentionAsync(accountId, AccountAttentionReason.MissingSystemFolderConfiguration);
-        //}
-        catch (Exception)
-        {
-            throw;
-        }
-    }
-}
diff --git a/Wino.Server/MessageHandlers/OnlineSearchRequestHandler.cs b/Wino.Server/MessageHandlers/OnlineSearchRequestHandler.cs
deleted file mode 100644
index 6ba4ca7b..00000000
--- a/Wino.Server/MessageHandlers/OnlineSearchRequestHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class OnlineSearchRequestHandler : ServerMessageHandler<OnlineSearchRequested, OnlineSearchResult>
-{
-    private readonly ISynchronizerFactory _synchronizerFactory;
-
-    public OnlineSearchRequestHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    public override WinoServerResponse<OnlineSearchResult> FailureDefaultResponse(Exception ex)
-            => WinoServerResponse<OnlineSearchResult>.CreateErrorResponse(ex.Message);
-
-    protected override async Task<WinoServerResponse<OnlineSearchResult>> HandleAsync(OnlineSearchRequested message, CancellationToken cancellationToken = default)
-    {
-        List<IWinoSynchronizerBase> synchronizers = new();
-
-        foreach (var accountId in message.AccountIds)
-        {
-            var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(accountId);
-            synchronizers.Add(synchronizer);
-        }
-
-        var tasks = synchronizers.Select(s => s.OnlineSearchAsync(message.QueryText, message.Folders, cancellationToken)).ToList();
-        var results = await Task.WhenAll(tasks);
-
-        // Flatten the results from all synchronizers into a single list
-        var allResults = results.SelectMany(x => x).ToList();
-
-        return WinoServerResponse<OnlineSearchResult>.CreateSuccessResponse(new OnlineSearchResult(allResults));
-    }
-}
diff --git a/Wino.Server/MessageHandlers/ServerTerminationModeHandler.cs b/Wino.Server/MessageHandlers/ServerTerminationModeHandler.cs
deleted file mode 100644
index 6c4af49f..00000000
--- a/Wino.Server/MessageHandlers/ServerTerminationModeHandler.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class ServerTerminationModeHandler : ServerMessageHandler<ServerTerminationModeChanged, bool>
-{
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex) => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    protected override Task<WinoServerResponse<bool>> HandleAsync(ServerTerminationModeChanged message, CancellationToken cancellationToken = default)
-    {
-        WeakReferenceMessenger.Default.Send(message);
-
-        return Task.FromResult(WinoServerResponse<bool>.CreateSuccessResponse(true));
-    }
-}
diff --git a/Wino.Server/MessageHandlers/SingleMimeDownloadHandler.cs b/Wino.Server/MessageHandlers/SingleMimeDownloadHandler.cs
deleted file mode 100644
index 1ad12981..00000000
--- a/Wino.Server/MessageHandlers/SingleMimeDownloadHandler.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class SingleMimeDownloadHandler : ServerMessageHandler<DownloadMissingMessageRequested, bool>
-{
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex) => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    private readonly ISynchronizerFactory _synchronizerFactory;
-    public SingleMimeDownloadHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    protected override async Task<WinoServerResponse<bool>> HandleAsync(DownloadMissingMessageRequested message, CancellationToken cancellationToken = default)
-    {
-        var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(message.AccountId);
-
-        // TODO: ITransferProgress support is lost.
-        await synchronizer.DownloadMissingMimeMessageAsync(message.MailItem, null, cancellationToken);
-
-        return WinoServerResponse<bool>.CreateSuccessResponse(true);
-    }
-}
diff --git a/Wino.Server/MessageHandlers/SyncExistenceHandler.cs b/Wino.Server/MessageHandlers/SyncExistenceHandler.cs
deleted file mode 100644
index 815e0c14..00000000
--- a/Wino.Server/MessageHandlers/SyncExistenceHandler.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Server;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class SyncExistenceHandler : ServerMessageHandler<SynchronizationExistenceCheckRequest, bool>
-{
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex)
-        => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    private readonly ISynchronizerFactory _synchronizerFactory;
-
-    public SyncExistenceHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    protected override async Task<WinoServerResponse<bool>> HandleAsync(SynchronizationExistenceCheckRequest message, CancellationToken cancellationToken = default)
-    {
-        var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(message.AccountId);
-
-        return WinoServerResponse<bool>.CreateSuccessResponse(synchronizer.State != Wino.Core.Domain.Enums.AccountSynchronizerState.Idle);
-    }
-}
diff --git a/Wino.Server/MessageHandlers/TerminateServerRequestHandler.cs b/Wino.Server/MessageHandlers/TerminateServerRequestHandler.cs
deleted file mode 100644
index 3b5b98cc..00000000
--- a/Wino.Server/MessageHandlers/TerminateServerRequestHandler.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Serilog;
-using Wino.Core.Domain.Models.Server;
-using Wino.Messaging.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class TerminateServerRequestHandler : ServerMessageHandler<TerminateServerRequested, bool>
-{
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex) => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    protected override Task<WinoServerResponse<bool>> HandleAsync(TerminateServerRequested message, CancellationToken cancellationToken = default)
-    {
-        // This handler is only doing the logging right now.
-        // Client will always expect success response.
-        // Server will be terminated in the server context once the client gets the response.
-
-        Log.Information("Terminate server is requested by client. Killing server.");
-
-        return Task.FromResult(WinoServerResponse<bool>.CreateSuccessResponse(true));
-    }
-}
diff --git a/Wino.Server/MessageHandlers/UserActionRequestHandler.cs b/Wino.Server/MessageHandlers/UserActionRequestHandler.cs
deleted file mode 100644
index efaf8bb6..00000000
--- a/Wino.Server/MessageHandlers/UserActionRequestHandler.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Requests;
-using Wino.Core.Domain.Models.Server;
-using Wino.Server.Core;
-
-namespace Wino.Server.MessageHandlers;
-
-public class UserActionRequestHandler : ServerMessageHandler<ServerRequestPackage, bool>
-{
-    private readonly ISynchronizerFactory _synchronizerFactory;
-
-    public override WinoServerResponse<bool> FailureDefaultResponse(Exception ex) => WinoServerResponse<bool>.CreateErrorResponse(ex.Message);
-
-    public UserActionRequestHandler(ISynchronizerFactory synchronizerFactory)
-    {
-        _synchronizerFactory = synchronizerFactory;
-    }
-
-    protected override async Task<WinoServerResponse<bool>> HandleAsync(ServerRequestPackage package, CancellationToken cancellationToken = default)
-    {
-        var synchronizer = await _synchronizerFactory.GetAccountSynchronizerAsync(package.AccountId);
-        synchronizer.QueueRequest(package.Request);
-
-        return WinoServerResponse<bool>.CreateSuccessResponse(true);
-    }
-}
diff --git a/Wino.Server/ServerContext.cs b/Wino.Server/ServerContext.cs
deleted file mode 100644
index 01d1cd32..00000000
--- a/Wino.Server/ServerContext.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Text.Json;
-using System.Threading.Tasks;
-using System.Windows;
-using CommunityToolkit.Mvvm.Messaging;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.AppService;
-using Windows.Foundation.Collections;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Requests;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.Integration.Json;
-using Wino.Messaging;
-using Wino.Messaging.Enums;
-using Wino.Messaging.Server;
-using Wino.Messaging.UI;
-using Wino.Server.MessageHandlers;
-using Wino.Services;
-
-namespace Wino.Server;
-
-public class ServerContext :
-    IRecipient<AccountCreatedMessage>,
-    IRecipient<AccountUpdatedMessage>,
-    IRecipient<AccountRemovedMessage>,
-    IRecipient<DraftCreated>,
-    IRecipient<DraftFailed>,
-    IRecipient<DraftMapped>,
-    IRecipient<FolderRenamed>,
-    IRecipient<FolderSynchronizationEnabled>,
-    IRecipient<MailAddedMessage>,
-    IRecipient<MailDownloadedMessage>,
-    IRecipient<MailRemovedMessage>,
-    IRecipient<MailUpdatedMessage>,
-    IRecipient<MergedInboxRenamed>,
-    IRecipient<AccountSynchronizationCompleted>,
-    IRecipient<AccountSynchronizerStateChanged>,
-    IRecipient<RefreshUnreadCountsMessage>,
-    IRecipient<ServerTerminationModeChanged>,
-    IRecipient<AccountSynchronizationProgressUpdatedMessage>,
-    IRecipient<AccountFolderConfigurationUpdated>,
-    IRecipient<CopyAuthURLRequested>,
-    IRecipient<NewMailSynchronizationRequested>,
-    IRecipient<OnlineSearchRequested>,
-    IRecipient<AccountCacheResetMessage>
-{
-    private const double MinimumSynchronizationIntervalMinutes = 1;
-
-    private readonly System.Timers.Timer _timer = new System.Timers.Timer();
-    private static object connectionLock = new object();
-
-    private AppServiceConnection connection = null;
-
-    private readonly IServerMessageHandlerFactory _serverMessageHandlerFactory;
-    private readonly IAccountService _accountService;
-    private readonly IPreferencesService _preferencesService;
-    private readonly JsonSerializerOptions _jsonSerializerOptions = new JsonSerializerOptions
-    {
-        TypeInfoResolver = new ServerRequestTypeInfoResolver()
-    };
-
-    public ServerContext(IDatabaseService databaseService,
-                         IApplicationConfiguration applicationFolderConfiguration,
-                         ISynchronizerFactory synchronizerFactory,
-                         IServerMessageHandlerFactory serverMessageHandlerFactory,
-                         IAccountService accountService,
-                         IPreferencesService preferencesService)
-    {
-        _preferencesService = preferencesService;
-
-        _timer.Elapsed += SynchronizationTimerTriggered;
-        _preferencesService.PropertyChanged += PreferencesUpdated;
-
-        _serverMessageHandlerFactory = serverMessageHandlerFactory;
-        _accountService = accountService;
-
-        WeakReferenceMessenger.Default.RegisterAll(this);
-
-        // Setup timer for synchronization.
-        RestartSynchronizationTimer();
-    }
-
-    private void PreferencesUpdated(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        if (e.PropertyName == nameof(IPreferencesService.EmailSyncIntervalMinutes))
-            RestartSynchronizationTimer();
-    }
-
-    private void RestartSynchronizationTimer()
-    {
-        _timer.Stop();
-
-        // Ensure that the interval is at least 1 minute.
-        _timer.Interval = 1000 * 60 * Math.Max(MinimumSynchronizationIntervalMinutes, _preferencesService.EmailSyncIntervalMinutes);
-        _timer.Start();
-    }
-
-    private async void SynchronizationTimerTriggered(object sender, System.Timers.ElapsedEventArgs e)
-    {
-        if (Debugger.IsAttached) return;
-
-        // Send sync request for all accounts.
-
-        var accounts = await _accountService.GetAccountsAsync();
-
-        foreach (var account in accounts)
-        {
-            var options = new MailSynchronizationOptions
-            {
-                AccountId = account.Id,
-                Type = MailSynchronizationType.InboxOnly,
-            };
-
-            var request = new NewMailSynchronizationRequested(options, SynchronizationSource.Server);
-
-            await ExecuteServerMessageSafeAsync(null, request);
-        }
-    }
-
-    #region Message Handlers
-
-    public async void Receive(MailAddedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountCreatedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountUpdatedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountRemovedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(DraftCreated message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(DraftFailed message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(DraftMapped message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(FolderRenamed message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(FolderSynchronizationEnabled message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(MailDownloadedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(MailRemovedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(MailUpdatedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(MergedInboxRenamed message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountSynchronizationCompleted message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(RefreshUnreadCountsMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountSynchronizerStateChanged message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountSynchronizationProgressUpdatedMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountFolderConfigurationUpdated message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(CopyAuthURLRequested message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(NewMailSynchronizationRequested message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(OnlineSearchRequested message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    public async void Receive(AccountCacheResetMessage message) => await SendMessageAsync(MessageType.UIMessage, message);
-
-    #endregion
-
-    private string GetAppPackagFamilyName()
-    {
-        // If running as a standalone app, Package will throw exception.
-        // Return hardcoded value for debugging purposes.
-        // Connection will not be available in this case.
-
-        try
-        {
-            return Package.Current.Id.FamilyName;
-        }
-        catch (Exception)
-        {
-            return "Debug.Wino.Server.FamilyName";
-        }
-    }
-
-    /// <summary>
-    /// Open connection to UWP app service
-    /// </summary>
-    public async Task InitializeAppServiceConnectionAsync()
-    {
-        if (connection != null) DisposeConnection();
-
-        connection = new AppServiceConnection
-        {
-            AppServiceName = "WinoInteropService",
-            PackageFamilyName = GetAppPackagFamilyName()
-        };
-
-        connection.RequestReceived += OnWinRTMessageReceived;
-        connection.ServiceClosed += OnConnectionClosed;
-
-        AppServiceConnectionStatus status = await connection.OpenAsync();
-
-        if (status != AppServiceConnectionStatus.Success)
-        {
-            Log.Error("Opening server connection failed. Status: {status}", status);
-
-            DisposeConnection();
-        }
-    }
-
-    /// <summary>
-    /// Disposes current connection to UWP app service.
-    /// </summary>
-    private void DisposeConnection()
-    {
-        lock (connectionLock)
-        {
-            if (connection == null) return;
-
-            connection.RequestReceived -= OnWinRTMessageReceived;
-            connection.ServiceClosed -= OnConnectionClosed;
-
-            connection.Dispose();
-            connection = null;
-        }
-    }
-
-    /// <summary>
-    /// Sends a serialized object to UWP application if connection exists with given type.
-    /// </summary>
-    /// <param name="messageType">Type of the message.</param>
-    /// <param name="message">IServerMessage object that will be serialized.</param>
-    /// <returns></returns>
-    /// <exception cref="ArgumentException">When the message is not IServerMessage.</exception>
-    private async Task SendMessageAsync(MessageType messageType, object message)
-    {
-        if (connection == null) return;
-
-        if (message is not IUIMessage serverMessage)
-            throw new ArgumentException("Server message must be a type of IUIMessage");
-
-        string json = JsonSerializer.Serialize(message);
-
-        var set = new ValueSet
-        {
-            { MessageConstants.MessageTypeKey, (int)messageType },
-            { MessageConstants.MessageDataKey, json },
-            { MessageConstants.MessageDataTypeKey, message.GetType().Name }
-        };
-
-        try
-        {
-            await connection.SendMessageAsync(set);
-        }
-        catch (InvalidOperationException)
-        {
-            // Connection might've been disposed during the SendMessageAsync call.
-            // This is a safe way to handle the exception.
-            // We don't lock the connection since this request may take sometime to complete.
-        }
-        catch (Exception exception)
-        {
-            Log.Error(exception, "SendMessageAsync threw an exception");
-        }
-    }
-
-    private void OnConnectionClosed(AppServiceConnection sender, AppServiceClosedEventArgs args)
-    {
-        // UWP app might've been terminated or suspended.
-        // At this point, we must keep active synchronizations going, but connection is lost.
-        // As long as this process is alive, database will be kept updated, but no messages will be sent.
-
-        DisposeConnection();
-    }
-
-    private async void OnWinRTMessageReceived(AppServiceConnection sender, AppServiceRequestReceivedEventArgs args)
-    {
-        if (args.Request.Message.TryGetValue(MessageConstants.MessageTypeKey, out object messageTypeObject) && messageTypeObject is int messageTypeInt)
-        {
-            var messageType = (MessageType)messageTypeInt;
-
-            if (args.Request.Message.TryGetValue(MessageConstants.MessageDataKey, out object messageDataObject) && messageDataObject is string messageJson)
-            {
-                if (!args.Request.Message.TryGetValue(MessageConstants.MessageDataTypeKey, out object dataTypeObject) || dataTypeObject is not string dataTypeName)
-                    throw new ArgumentException("Message data type is missing.");
-
-                if (messageType == MessageType.ServerMessage)
-                {
-                    // Client is awaiting a response from server.
-                    // ServerMessage calls are awaited on the server and response is returned back in the args.
-
-                    await HandleServerMessageAsync(messageJson, dataTypeName, args).ConfigureAwait(false);
-                }
-                else if (messageType == MessageType.UIMessage)
-                    throw new Exception("Received UIMessage from UWP. This is not expected.");
-            }
-        }
-    }
-
-    private async Task HandleServerMessageAsync(string messageJson, string typeName, AppServiceRequestReceivedEventArgs args)
-    {
-        switch (typeName)
-        {
-            case nameof(NewMailSynchronizationRequested):
-                Debug.WriteLine($"New mail synchronization requested.");
-
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<NewMailSynchronizationRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(NewCalendarSynchronizationRequested):
-                Debug.WriteLine($"New calendar synchronization requested.");
-
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<NewCalendarSynchronizationRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(DownloadMissingMessageRequested):
-                Debug.WriteLine($"Download missing message requested.");
-
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<DownloadMissingMessageRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(ServerRequestPackage):
-                var serverPackage = JsonSerializer.Deserialize<ServerRequestPackage>(messageJson, _jsonSerializerOptions);
-
-                Debug.WriteLine(serverPackage);
-
-                await ExecuteServerMessageSafeAsync(args, serverPackage);
-                break;
-            case nameof(AuthorizationRequested):
-                Debug.WriteLine($"Authorization requested.");
-
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<AuthorizationRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(SynchronizationExistenceCheckRequest):
-
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<SynchronizationExistenceCheckRequest>(messageJson, _jsonSerializerOptions));
-                break;
-
-            case nameof(ServerTerminationModeChanged):
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<ServerTerminationModeChanged>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(ImapConnectivityTestRequested):
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<ImapConnectivityTestRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(TerminateServerRequested):
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<TerminateServerRequested>(messageJson, _jsonSerializerOptions));
-
-                KillServer();
-                break;
-            case nameof(KillAccountSynchronizerRequested):
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<KillAccountSynchronizerRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            case nameof(OnlineSearchRequested):
-                await ExecuteServerMessageSafeAsync(args, JsonSerializer.Deserialize<OnlineSearchRequested>(messageJson, _jsonSerializerOptions));
-                break;
-            default:
-                Debug.WriteLine($"Missing handler for {typeName} in the server. Check ServerContext.cs - HandleServerMessageAsync.");
-                break;
-        }
-    }
-
-    private void KillServer()
-    {
-        DisposeConnection();
-
-        Application.Current.Dispatcher.Invoke(() =>
-        {
-            Application.Current.Shutdown();
-        });
-    }
-
-    /// <summary>
-    /// Executes ServerMessage coming from the UWP.
-    /// These requests are awaited and expected to return a response.
-    /// </summary>
-    /// <param name="args">App service request args.</param>
-    /// <param name="message">Message that client sent to server.</param>
-    private async Task ExecuteServerMessageSafeAsync(AppServiceRequestReceivedEventArgs args, IClientMessage message)
-    {
-        AppServiceDeferral deferral = args?.GetDeferral() ?? null;
-
-        try
-        {
-            var messageName = message.GetType().Name;
-
-            var handler = _serverMessageHandlerFactory.GetHandler(messageName);
-            await handler.ExecuteAsync(message, args?.Request ?? null).ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            Log.Error(ex, "ExecuteServerMessageSafeAsync crashed.");
-            Debugger.Break();
-        }
-        finally
-        {
-            deferral?.Complete();
-        }
-    }
-
-    public void Receive(ServerTerminationModeChanged message)
-    {
-        var backgroundMode = message.ServerBackgroundMode;
-
-        bool isServerTrayIconVisible = backgroundMode == ServerBackgroundMode.MinimizedTray || backgroundMode == ServerBackgroundMode.Terminate;
-
-        App.Current.ChangeNotifyIconVisiblity(isServerTrayIconVisible);
-    }
-}
diff --git a/Wino.Server/ServerViewModel.cs b/Wino.Server/ServerViewModel.cs
deleted file mode 100644
index 42efac2c..00000000
--- a/Wino.Server/ServerViewModel.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using Windows.ApplicationModel;
-using Windows.System;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Server;
-
-public partial class ServerViewModel : ObservableObject, IInitializeAsync
-{
-    private readonly INotificationBuilder _notificationBuilder;
-
-    public ServerContext Context { get; }
-
-    public ServerViewModel(ServerContext serverContext, INotificationBuilder notificationBuilder)
-    {
-        Context = serverContext;
-        _notificationBuilder = notificationBuilder;
-    }
-
-    [RelayCommand]
-    public Task LaunchWinoAsync()
-    {
-        return Launcher.LaunchUriAsync(new Uri($"{App.WinoMailLaunchProtocol}:")).AsTask();
-    }
-
-    /// <summary>
-    /// Shuts down the application.
-    /// </summary>
-    [RelayCommand]
-    public async Task ExitApplication()
-    {
-        // Find the running UWP app by AppDiagnosticInfo API and terminate it if possible.
-        var appDiagnosticInfos = await AppDiagnosticInfo.RequestInfoForPackageAsync(Package.Current.Id.FamilyName);
-
-        var clientDiagnosticInfo = appDiagnosticInfos.FirstOrDefault();
-
-        if (clientDiagnosticInfo == null)
-        {
-            Debug.WriteLine($"Wino Mail client is not running. Termination is skipped.");
-        }
-        else
-        {
-            var appResourceGroupInfo = clientDiagnosticInfo.GetResourceGroups().FirstOrDefault();
-
-            if (appResourceGroupInfo != null)
-            {
-                await appResourceGroupInfo.StartTerminateAsync();
-
-                Debug.WriteLine($"Wino Mail client is terminated succesfully.");
-            }
-        }
-
-        Application.Current.Shutdown();
-    }
-
-    public async Task ReconnectAsync() => await Context.InitializeAppServiceConnectionAsync();
-
-    public Task InitializeAsync() => Context.InitializeAppServiceConnectionAsync();
-}
diff --git a/Wino.Server/TrayIconResources.xaml b/Wino.Server/TrayIconResources.xaml
deleted file mode 100644
index 8d0225bf..00000000
--- a/Wino.Server/TrayIconResources.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:tb="http://www.hardcodet.net/taskbar"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:server="clr-namespace:Wino.Server">
-
-    <ContextMenu x:Shared="false" x:Key="SysTrayMenu">
-        <MenuItem Header="Launch Wino Mail" Command="{Binding LaunchWinoCommand}" />
-        <Separator />
-        <MenuItem Header="Exit" Command="{Binding ExitApplicationCommand}" />
-    </ContextMenu>
-
-    <tb:TaskbarIcon
-        x:Key="NotifyIcon"
-        IconSource="Images/Wino_Icon.ico"
-        ToolTipText="Wino Mail"
-        LeftClickCommand="{Binding LaunchWinoCommand}"
-        NoLeftClickDelay="True"
-        ContextMenu="{StaticResource SysTrayMenu}" />
-
-</ResourceDictionary>
diff --git a/Wino.Server/Wino.Server.csproj b/Wino.Server/Wino.Server.csproj
deleted file mode 100644
index 6adf9d21..00000000
--- a/Wino.Server/Wino.Server.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net9.0-windows10.0.19041.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <OutputType>WinExe</OutputType>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <CsWinRTComponent>true</CsWinRTComponent>
-    <CsWinRTWindowsMetadata>10.0.22621.0</CsWinRTWindowsMetadata>
-    <Platforms>x64;x86;ARM64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-	<IsAotCompatible>false</IsAotCompatible>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Wino.Server.App</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Images\Wino_Icon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Wino.Mail\Services\MailAuthenticatorConfiguration.cs" Link="Services\MailAuthenticatorConfiguration.cs" />
-    <Compile Include="..\Wino.Calendar\Services\CalendarAuthenticatorConfig.cs" Link="Services\CalendarAuthenticatorConfig.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\ConfigurationService.cs" Link="Services\ConfigurationService.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\NativeAppService.cs" Link="Services\NativeAppService.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\PreferencesService.cs" Link="Services\PreferencesService.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\NotificationBuilder.cs" Link="Services\NotificationBuilder.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\UnderlyingThemeService.cs" Link="Services\UnderlyingThemeService.cs" />
-    <Compile Include="..\Wino.Core.UWP\Services\ThumbnailService.cs" Link="Services\ThumbnailService.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\Wino_Icon.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Resource>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="gravatar-dotnet" />
-    <PackageReference Include="H.NotifyIcon.Wpf" />
-    <PackageReference Include="CommunityToolkit.WinUI.Notifications" />
-    <PackageReference Include="Microsoft.Identity.Client" />
-    <PackageReference Include="Sentry.Serilog" />
-    <PackageReference Include="System.Text.Encoding.CodePages" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Authentication\Wino.Authentication.csproj" />
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
-    <ProjectReference Include="..\Wino.Core\Wino.Core.csproj" />
-    <ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
-    <ProjectReference Include="..\Wino.Services\Wino.Services.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Wino.Services/AccountService.cs b/Wino.Services/AccountService.cs
index 3d852403..8ae13070 100644
--- a/Wino.Services/AccountService.cs
+++ b/Wino.Services/AccountService.cs
@@ -1,19 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using Serilog;
-using SqlKata;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
+using Wino.Core.Domain.Misc;
+using Wino.Messaging.Client.Calendar;
 using Wino.Messaging.Client.Accounts;
 using Wino.Messaging.UI;
-using Wino.Services.Extensions;
 
 namespace Wino.Services;
 
@@ -22,19 +25,25 @@ public class AccountService : BaseDatabaseService, IAccountService
     public IAuthenticator ExternalAuthenticationAuthenticator { get; set; }
 
     private readonly ISignatureService _signatureService;
+    private readonly IAuthenticationProvider _authenticationProvider;
     private readonly IMimeFileService _mimeFileService;
     private readonly IPreferencesService _preferencesService;
+    private readonly IContactPictureFileService _contactPictureFileService;
 
     private readonly ILogger _logger = Log.ForContext<AccountService>();
 
     public AccountService(IDatabaseService databaseService,
                           ISignatureService signatureService,
+                          IAuthenticationProvider authenticationProvider,
                           IMimeFileService mimeFileService,
-                          IPreferencesService preferencesService) : base(databaseService)
+                          IPreferencesService preferencesService,
+                          IContactPictureFileService contactPictureFileService) : base(databaseService)
     {
         _signatureService = signatureService;
+        _authenticationProvider = authenticationProvider;
         _mimeFileService = mimeFileService;
         _preferencesService = preferencesService;
+        _contactPictureFileService = contactPictureFileService;
     }
 
 
@@ -55,14 +64,13 @@ public class AccountService : BaseDatabaseService, IAccountService
         await Connection.ExecuteAsync("UPDATE MailAccount SET MergedInboxId = NULL WHERE MergedInboxId = ?", mergedInboxId);
 
         // Then, add new accounts to merged inbox.
-        var query = new Query("MailAccount")
-            .WhereIn("Id", linkedAccountIds)
-            .AsUpdate(new
-            {
-                MergedInboxId = mergedInboxId
-            });
+        var accountIdList = linkedAccountIds.ToList();
+        var placeholders = string.Join(",", accountIdList.Select(_ => "?"));
+        var sql = $"UPDATE MailAccount SET MergedInboxId = ? WHERE Id IN ({placeholders})";
+        var parameters = new List<object> { mergedInboxId };
+        parameters.AddRange(accountIdList.Cast<object>());
 
-        await Connection.ExecuteAsync(query.GetRawQuery());
+        await Connection.ExecuteAsync(sql, parameters.ToArray());
 
         WeakReferenceMessenger.Default.Send(new AccountsMenuRefreshRequested());
     }
@@ -84,15 +92,8 @@ public class AccountService : BaseDatabaseService, IAccountService
             return;
         }
 
-        var query = new Query("MailAccount")
-            .Where("MergedInboxId", mergedInboxId)
-            .AsUpdate(new
-            {
-                MergedInboxId = (Guid?)null
-            });
-
-        await Connection.ExecuteAsync(query.GetRawQuery()).ConfigureAwait(false);
-        await Connection.DeleteAsync(mergedInbox).ConfigureAwait(false);
+        await Connection.ExecuteAsync("UPDATE MailAccount SET MergedInboxId = NULL WHERE MergedInboxId = ?", mergedInboxId).ConfigureAwait(false);
+        await Connection.DeleteAsync<MergedInbox>(mergedInbox.Id).ConfigureAwait(false);
 
         // Change the startup entity id if it was the merged inbox.
         // Take the first account as startup account.
@@ -135,7 +136,7 @@ public class AccountService : BaseDatabaseService, IAccountService
                 accountFolderList.Add(folder);
                 folder.IsSticky = false;
 
-                await Connection.UpdateAsync(folder);
+                await Connection.UpdateAsync(folder, typeof(MailItemFolder));
             }
 
             accountFolderDictionary.Add(account, accountFolderList);
@@ -170,20 +171,20 @@ public class AccountService : BaseDatabaseService, IAccountService
                     {
                         folder.IsSticky = true;
 
-                        await Connection.UpdateAsync(folder);
+                        await Connection.UpdateAsync(folder, typeof(MailItemFolder));
                     }
                 }
             }
         }
 
         // 3. Insert merged inbox and assign accounts.
-        await Connection.InsertAsync(mergedInbox);
+        await Connection.InsertAsync(mergedInbox, typeof(MergedInbox));
 
         foreach (var account in accountsToMerge)
         {
             account.MergedInboxId = mergedInbox.Id;
 
-            await Connection.UpdateAsync(account);
+            await Connection.UpdateAsync(account, typeof(MailAccount));
         }
 
         WeakReferenceMessenger.Default.Send(new AccountsMenuRefreshRequested());
@@ -191,14 +192,7 @@ public class AccountService : BaseDatabaseService, IAccountService
 
     public async Task RenameMergedAccountAsync(Guid mergedInboxId, string newName)
     {
-        var query = new Query("MergedInbox")
-            .Where("Id", mergedInboxId)
-            .AsUpdate(new
-            {
-                Name = newName
-            });
-
-        await Connection.ExecuteAsync(query.GetRawQuery());
+        await Connection.ExecuteAsync("UPDATE MergedInbox SET Name = ? WHERE Id = ?", newName, mergedInboxId);
 
         ReportUIChange(new MergedInboxRenamed(mergedInboxId, newName));
     }
@@ -209,13 +203,18 @@ public class AccountService : BaseDatabaseService, IAccountService
 
         if (account == null) return;
 
-        //var authenticator = _authenticationProvider.GetAuthenticator(account.ProviderType);
+        var authenticator = _authenticationProvider.GetAuthenticator(account.ProviderType);
 
-        //// This will re-generate token.
-        //var token = await authenticator.GenerateTokenInformationAsync(account);
+        // This will re-generate token with interactive authentication
+        // New authentication will include calendar scopes
+        var token = await authenticator.GenerateTokenInformationAsync(account);
 
-        // TODO: Rest?
-        // Guard.IsNotNull(token);
+        Guard.IsNotNull(token);
+
+        // Enable calendar access since new token includes calendar scopes
+        account.IsCalendarAccessGranted = true;
+
+        await UpdateAccountAsync(account);
     }
 
     private Task<MailAccountPreferences> GetAccountPreferencesAsync(Guid accountId)
@@ -254,18 +253,16 @@ public class AccountService : BaseDatabaseService, IAccountService
             Id = Guid.NewGuid()
         };
 
-        await Connection.InsertAsync(rootAlias).ConfigureAwait(false);
+        await Connection.InsertAsync(rootAlias, typeof(MailAccountAlias)).ConfigureAwait(false);
 
         Log.Information("Created root alias for the account {AccountId}", accountId);
     }
 
     public async Task<List<MailAccountAlias>> GetAccountAliasesAsync(Guid accountId)
     {
-        var query = new Query(nameof(MailAccountAlias))
-            .Where(nameof(MailAccountAlias.AccountId), accountId)
-            .OrderByDesc(nameof(MailAccountAlias.IsRootAlias));
-
-        return await Connection.QueryAsync<MailAccountAlias>(query.GetRawQuery()).ConfigureAwait(false);
+        return await Connection.QueryAsync<MailAccountAlias>(
+            "SELECT * FROM MailAccountAlias WHERE AccountId = ? ORDER BY IsRootAlias DESC",
+            accountId).ConfigureAwait(false);
     }
 
     private Task<MergedInbox> GetMergedInboxInformationAsync(Guid mergedInboxId)
@@ -273,25 +270,49 @@ public class AccountService : BaseDatabaseService, IAccountService
 
     public async Task DeleteAccountMailCacheAsync(Guid accountId, AccountCacheResetReason accountCacheResetReason)
     {
-        var deleteQuery = new Query("MailCopy")
-                .WhereIn("Id", q => q
-                .From("MailCopy")
-                .Select("Id")
-                .WhereIn("FolderId", q2 => q2
-                    .From("MailItemFolder")
-                    .Select("Id")
-                    .Where("MailAccountId", accountId)
-                )).AsDelete();
-
-        await Connection.ExecuteAsync(deleteQuery.GetRawQuery());
+        await Connection.ExecuteAsync(
+            "DELETE FROM MailCopy WHERE Id IN (SELECT Id FROM MailCopy WHERE FolderId IN (SELECT Id FROM MailItemFolder WHERE MailAccountId = ?))",
+            accountId);
 
         WeakReferenceMessenger.Default.Send(new AccountCacheResetMessage(accountId, accountCacheResetReason));
     }
 
     public async Task DeleteAccountAsync(MailAccount account)
     {
+        // Collect calendar entities before deletion so we can notify UI subscribers.
+        var accountCalendars = await Connection.Table<AccountCalendar>()
+            .Where(a => a.AccountId == account.Id)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        var deletedCalendarItems = new List<CalendarItem>();
+        foreach (var accountCalendar in accountCalendars)
+        {
+            var calendarItems = await Connection.Table<CalendarItem>()
+                .Where(a => a.CalendarId == accountCalendar.Id)
+                .ToListAsync()
+                .ConfigureAwait(false);
+
+            deletedCalendarItems.AddRange(calendarItems);
+        }
+
         await DeleteAccountMailCacheAsync(account.Id, AccountCacheResetReason.AccountRemoval);
 
+        // Delete calendar metadata and related records for this account.
+        foreach (var calendarItem in deletedCalendarItems)
+        {
+            await Connection.Table<CalendarEventAttendee>().DeleteAsync(a => a.CalendarItemId == calendarItem.Id).ConfigureAwait(false);
+            await Connection.Table<Reminder>().DeleteAsync(a => a.CalendarItemId == calendarItem.Id).ConfigureAwait(false);
+            await Connection.Table<CalendarAttachment>().DeleteAsync(a => a.CalendarItemId == calendarItem.Id).ConfigureAwait(false);
+        }
+
+        foreach (var accountCalendar in accountCalendars)
+        {
+            await Connection.Table<CalendarItem>().DeleteAsync(a => a.CalendarId == accountCalendar.Id).ConfigureAwait(false);
+        }
+
+        await Connection.Table<AccountCalendar>().DeleteAsync(a => a.AccountId == account.Id).ConfigureAwait(false);
+
         await Connection.Table<MailItemFolder>().DeleteAsync(a => a.MailAccountId == account.Id);
         await Connection.Table<AccountSignature>().DeleteAsync(a => a.MailAccountId == account.Id);
         await Connection.Table<MailAccountAlias>().DeleteAsync(a => a.AccountId == account.Id);
@@ -306,14 +327,9 @@ public class AccountService : BaseDatabaseService, IAccountService
             // There will be only one account in the merged inbox. Remove the link for the other account as well.
             if (mergedInboxAccountCount == 2)
             {
-                var query = new Query("MailAccount")
-                .Where("MergedInboxId", account.MergedInboxId.Value)
-                .AsUpdate(new
-                {
-                    MergedInboxId = (Guid?)null
-                });
-
-                await Connection.ExecuteAsync(query.GetRawQuery()).ConfigureAwait(false);
+                await Connection.ExecuteAsync(
+                    "UPDATE MailAccount SET MergedInboxId = NULL WHERE MergedInboxId = ?",
+                    account.MergedInboxId.Value).ConfigureAwait(false);
             }
         }
 
@@ -321,9 +337,9 @@ public class AccountService : BaseDatabaseService, IAccountService
             await Connection.Table<CustomServerInformation>().DeleteAsync(a => a.AccountId == account.Id);
 
         if (account.Preferences != null)
-            await Connection.DeleteAsync(account.Preferences);
+            await Connection.DeleteAsync<MailAccountPreferences>(account.Preferences.Id);
 
-        await Connection.DeleteAsync(account);
+        await Connection.DeleteAsync<MailAccount>(account.Id);
 
         await _mimeFileService.DeleteUserMimeCacheAsync(account.Id).ConfigureAwait(false);
 
@@ -344,6 +360,16 @@ public class AccountService : BaseDatabaseService, IAccountService
             }
         }
 
+        foreach (var calendarItem in deletedCalendarItems)
+        {
+            WeakReferenceMessenger.Default.Send(new CalendarItemDeleted(calendarItem));
+        }
+
+        foreach (var accountCalendar in accountCalendars)
+        {
+            WeakReferenceMessenger.Default.Send(new CalendarListDeleted(accountCalendar));
+        }
+
         ReportUIChange(new AccountRemovedMessage(account));
     }
 
@@ -362,20 +388,57 @@ public class AccountService : BaseDatabaseService, IAccountService
             }
             // Forcefully add or update a contact data with the provided information.
 
+            var existingContact = await Connection.Table<AccountContact>()
+                .FirstOrDefaultAsync(a => a.Address == account.Address)
+                .ConfigureAwait(false);
+
+            var contactPictureFileId = await SaveProfilePictureAsync(
+                account.Base64ProfilePictureData,
+                existingContact?.ContactPictureFileId).ConfigureAwait(false);
+
             var accountContact = new AccountContact()
             {
                 Address = account.Address,
                 Name = account.SenderName,
-                Base64ContactPicture = account.Base64ProfilePictureData,
+                ContactPictureFileId = contactPictureFileId,
                 IsRootContact = true
             };
 
-            await Connection.InsertOrReplaceAsync(accountContact).ConfigureAwait(false);
+            await Connection.InsertOrReplaceAsync(accountContact, typeof(AccountContact)).ConfigureAwait(false);
 
             await UpdateAccountAsync(account).ConfigureAwait(false);
         }
     }
 
+    private async Task<Guid?> SaveProfilePictureAsync(string base64ProfilePictureData, Guid? existingFileId)
+    {
+        if (string.IsNullOrWhiteSpace(base64ProfilePictureData))
+        {
+            if (existingFileId.HasValue)
+                await _contactPictureFileService.DeleteContactPictureAsync(existingFileId.Value).ConfigureAwait(false);
+
+            return null;
+        }
+
+        byte[] bytes;
+        try
+        {
+            bytes = Convert.FromBase64String(base64ProfilePictureData);
+        }
+        catch (FormatException ex)
+        {
+            _logger.Warning(ex, "Failed to decode account profile picture for contact migration.");
+            return existingFileId;
+        }
+
+        var newFileId = await _contactPictureFileService.SaveContactPictureAsync(bytes).ConfigureAwait(false);
+
+        if (existingFileId.HasValue)
+            await _contactPictureFileService.DeleteContactPictureAsync(existingFileId.Value).ConfigureAwait(false);
+
+        return newFileId;
+    }
+
     public async Task<MailAccount> GetAccountAsync(Guid accountId)
     {
         var account = await Connection.Table<MailAccount>().FirstOrDefaultAsync(a => a.Id == accountId);
@@ -402,15 +465,15 @@ public class AccountService : BaseDatabaseService, IAccountService
 
     public async Task UpdateAccountAsync(MailAccount account)
     {
-        await Connection.UpdateAsync(account.Preferences).ConfigureAwait(false);
-        await Connection.UpdateAsync(account).ConfigureAwait(false);
+        await Connection.UpdateAsync(account.Preferences, typeof(MailAccountPreferences)).ConfigureAwait(false);
+        await Connection.UpdateAsync(account, typeof(MailAccount)).ConfigureAwait(false);
 
         ReportUIChange(new AccountUpdatedMessage(account));
     }
 
     public async Task UpdateAccountCustomServerInformationAsync(CustomServerInformation customServerInformation)
     {
-        await Connection.UpdateAsync(customServerInformation).ConfigureAwait(false);
+        await Connection.UpdateAsync(customServerInformation, typeof(CustomServerInformation)).ConfigureAwait(false);
     }
 
     public async Task UpdateAccountAliasesAsync(Guid accountId, List<MailAccountAlias> aliases)
@@ -421,7 +484,7 @@ public class AccountService : BaseDatabaseService, IAccountService
         // Insert new ones.
         foreach (var alias in aliases)
         {
-            await Connection.InsertAsync(alias).ConfigureAwait(false);
+            await Connection.InsertAsync(alias, typeof(MailAccountAlias)).ConfigureAwait(false);
         }
     }
 
@@ -449,7 +512,7 @@ public class AccountService : BaseDatabaseService, IAccountService
                     AliasSenderName = remoteAlias.AliasSenderName
                 };
 
-                await Connection.InsertAsync(newAlias);
+                await Connection.InsertAsync(newAlias, typeof(MailAccountAlias));
                 localAliases.Add(newAlias);
             }
             else
@@ -460,7 +523,7 @@ public class AccountService : BaseDatabaseService, IAccountService
                 existingAlias.ReplyToAddress = remoteAlias.ReplyToAddress;
                 existingAlias.AliasSenderName = remoteAlias.AliasSenderName;
 
-                await Connection.UpdateAsync(existingAlias);
+                await Connection.UpdateAsync(existingAlias, typeof(MailAccountAlias));
             }
         }
 
@@ -476,7 +539,7 @@ public class AccountService : BaseDatabaseService, IAccountService
             var idealPrimaryAlias = localAliases.Find(a => a.AliasAddress == account.Address) ?? localAliases.First();
 
             idealPrimaryAlias.IsPrimary = true;
-            await Connection.UpdateAsync(idealPrimaryAlias).ConfigureAwait(false);
+            await Connection.UpdateAsync(idealPrimaryAlias, typeof(MailAccountAlias)).ConfigureAwait(false);
         }
 
         if (shouldUpdateRoot)
@@ -486,7 +549,7 @@ public class AccountService : BaseDatabaseService, IAccountService
             var idealRootAlias = localAliases.Find(a => a.AliasAddress == account.Address) ?? localAliases.First();
 
             idealRootAlias.IsRootAlias = true;
-            await Connection.UpdateAsync(idealRootAlias).ConfigureAwait(false);
+            await Connection.UpdateAsync(idealRootAlias, typeof(MailAccountAlias)).ConfigureAwait(false);
         }
     }
 
@@ -494,11 +557,7 @@ public class AccountService : BaseDatabaseService, IAccountService
     {
         // Create query to delete alias.
 
-        var query = new Query("MailAccountAlias")
-            .Where("Id", aliasId)
-            .AsDelete();
-
-        await Connection.ExecuteAsync(query.GetRawQuery()).ConfigureAwait(false);
+        await Connection.ExecuteAsync("DELETE FROM MailAccountAlias WHERE Id = ?", aliasId).ConfigureAwait(false);
     }
 
     public async Task CreateAccountAsync(MailAccount account, CustomServerInformation customServerInformation)
@@ -519,7 +578,7 @@ public class AccountService : BaseDatabaseService, IAccountService
             account.Order = accountCount;
         }
 
-        await Connection.InsertAsync(account);
+        await Connection.InsertAsync(account, typeof(MailAccount));
 
         var preferences = new MailAccountPreferences()
         {
@@ -552,39 +611,64 @@ public class AccountService : BaseDatabaseService, IAccountService
         account.Preferences.SignatureIdForFollowingMessages = defaultSignature.Id;
         account.Preferences.IsSignatureEnabled = true;
 
-        await Connection.InsertAsync(preferences);
+        await Connection.InsertAsync(preferences, typeof(MailAccountPreferences));
 
         if (customServerInformation != null)
-            await Connection.InsertAsync(customServerInformation);
+            await Connection.InsertAsync(customServerInformation, typeof(CustomServerInformation));
+
+        if (account.ProviderType == MailProviderType.IMAP4 &&
+            customServerInformation?.CalendarSupportMode == ImapCalendarSupportMode.LocalOnly)
+        {
+            await EnsureDefaultLocalCalendarForImapAsync(account.Id).ConfigureAwait(false);
+        }
     }
 
-    //public async Task<string> UpdateSynchronizationIdentifierAsync(Guid accountId, string newIdentifier)
-    //{
-    //    var account = await GetAccountAsync(accountId);
+    private async Task EnsureDefaultLocalCalendarForImapAsync(Guid accountId)
+    {
+        var existingCalendarCount = await Connection.Table<AccountCalendar>()
+            .Where(a => a.AccountId == accountId)
+            .CountAsync()
+            .ConfigureAwait(false);
 
-    //    if (account == null)
-    //    {
-    //        _logger.Error("Could not find account with id {AccountId}", accountId);
-    //        return string.Empty;
-    //    }
+        if (existingCalendarCount > 0)
+            return;
 
-    //    var currentIdentifier = account.SynchronizationDeltaIdentifier;
+        var localCalendar = new AccountCalendar
+        {
+            Id = Guid.NewGuid(),
+            AccountId = accountId,
+            Name = Translator.AccountDetailsPage_TabCalendar,
+            IsPrimary = true,
+            IsSynchronizationEnabled = true,
+            IsExtended = true,
+            RemoteCalendarId = string.Empty,
+            TimeZone = string.Empty,
+            BackgroundColorHex = await GetNextDistinctCalendarColorAsync().ConfigureAwait(false)
+        };
 
-    //    bool shouldUpdateIdentifier = account.ProviderType == MailProviderType.Gmail ?
-    //            string.IsNullOrEmpty(currentIdentifier) ? true : !string.IsNullOrEmpty(currentIdentifier)
-    //            && ulong.TryParse(currentIdentifier, out ulong currentIdentifierValue)
-    //            && ulong.TryParse(newIdentifier, out ulong newIdentifierValue)
-    //            && newIdentifierValue > currentIdentifierValue : true;
+        localCalendar.TextColorHex = GetReadableTextColorHex(localCalendar.BackgroundColorHex);
 
-    //    if (shouldUpdateIdentifier)
-    //    {
-    //        account.SynchronizationDeltaIdentifier = newIdentifier;
+        await Connection.InsertAsync(localCalendar, typeof(AccountCalendar)).ConfigureAwait(false);
+    }
 
-    //        await UpdateAccountAsync(account);
-    //    }
+    private async Task<string> GetNextDistinctCalendarColorAsync()
+    {
+        var usedColors = await Connection.Table<AccountCalendar>()
+            .ToListAsync()
+            .ConfigureAwait(false);
 
-    //    return account.SynchronizationDeltaIdentifier;
-    //}
+        return CalendarColorPalette.GetDistinctColor(usedColors.Select(a => a.BackgroundColorHex));
+    }
+
+    private static string GetReadableTextColorHex(string backgroundColorHex)
+    {
+        if (string.IsNullOrWhiteSpace(backgroundColorHex))
+            return "#FFFFFF";
+
+        var color = ColorTranslator.FromHtml(backgroundColorHex);
+        var luminance = ((0.299 * color.R) + (0.587 * color.G) + (0.114 * color.B)) / 255d;
+        return luminance > 0.6 ? "#111111" : "#FFFFFF";
+    }
 
     public async Task UpdateAccountOrdersAsync(Dictionary<Guid, int> accountIdOrderPair)
     {
@@ -600,7 +684,7 @@ public class AccountService : BaseDatabaseService, IAccountService
 
             account.Order = pair.Value;
 
-            await Connection.UpdateAsync(account);
+            await Connection.UpdateAsync(account, typeof(MailAccount));
         }
 
         Messenger.Send(new AccountMenuItemsReordered(accountIdOrderPair));
@@ -627,4 +711,24 @@ public class AccountService : BaseDatabaseService, IAccountService
 
         return account?.Preferences?.IsNotificationsEnabled ?? false;
     }
+
+    public async Task UpdateLastFolderStructureSyncDateAsync(Guid accountId)
+    {
+        var account = await GetAccountAsync(accountId);
+        if (account == null) return;
+
+        account.LastFolderStructureSyncDate = DateTime.UtcNow;
+        await Connection.UpdateAsync(account, typeof(MailAccount)).ConfigureAwait(false);
+    }
+
+    public async Task<bool> ShouldSyncFolderStructureAsync(Guid accountId, TimeSpan syncInterval)
+    {
+        var account = await GetAccountAsync(accountId);
+        if (account == null) return true;
+
+        if (!account.LastFolderStructureSyncDate.HasValue)
+            return true;
+
+        return DateTime.UtcNow - account.LastFolderStructureSyncDate.Value > syncInterval;
+    }
 }
diff --git a/Wino.Services/CalDavClient.cs b/Wino.Services/CalDavClient.cs
new file mode 100644
index 00000000..5d110c8b
--- /dev/null
+++ b/Wino.Services/CalDavClient.cs
@@ -0,0 +1,830 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+using Ical.Net;
+using Ical.Net.CalendarComponents;
+using Ical.Net.DataTypes;
+using Serilog;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+
+namespace Wino.Services;
+
+public sealed class CalDavClient : ICalDavClient
+{
+    private static readonly HttpMethod PropFindMethod = new("PROPFIND");
+    private static readonly HttpMethod ReportMethod = new("REPORT");
+    private static readonly HttpMethod PutMethod = HttpMethod.Put;
+    private static readonly HttpMethod DeleteMethod = HttpMethod.Delete;
+    private static readonly ILogger Logger = Log.ForContext<CalDavClient>();
+
+    private readonly HttpClient _httpClient;
+
+    public CalDavClient(HttpClient httpClient = null)
+    {
+        _httpClient = httpClient ?? new HttpClient();
+    }
+
+    public async Task<IReadOnlyList<CalDavCalendar>> DiscoverCalendarsAsync(
+        CalDavConnectionSettings connectionSettings,
+        CancellationToken cancellationToken = default)
+    {
+        ValidateConnectionSettings(connectionSettings);
+
+        var principalUri = await DiscoverPrincipalUriAsync(connectionSettings, cancellationToken).ConfigureAwait(false);
+        var homeSetUri = await DiscoverCalendarHomeSetUriAsync(connectionSettings, principalUri, cancellationToken).ConfigureAwait(false);
+
+        var body = """
+            <D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/">
+              <D:prop>
+                <D:resourcetype />
+                <D:displayname />
+                <CS:getctag />
+                <D:sync-token />
+              </D:prop>
+            </D:propfind>
+            """;
+
+        var responseXml = await SendXmlAsync(
+            connectionSettings,
+            PropFindMethod,
+            homeSetUri,
+            depth: "1",
+            body,
+            cancellationToken).ConfigureAwait(false);
+
+        var calendars = ParseCalendarCollection(responseXml, homeSetUri)
+            .GroupBy(c => c.RemoteCalendarId, StringComparer.OrdinalIgnoreCase)
+            .Select(g => g.First())
+            .ToList();
+
+        return calendars;
+    }
+
+    public async Task<IReadOnlyList<CalDavCalendarEvent>> GetCalendarEventsAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        DateTimeOffset startUtc,
+        DateTimeOffset endUtc,
+        CancellationToken cancellationToken = default)
+    {
+        ValidateConnectionSettings(connectionSettings);
+
+        if (calendar == null || string.IsNullOrWhiteSpace(calendar.RemoteCalendarId))
+            return [];
+
+        var calendarUri = new Uri(calendar.RemoteCalendarId);
+        var startString = startUtc.UtcDateTime.ToString("yyyyMMdd'T'HHmmss'Z'");
+        var endString = endUtc.UtcDateTime.ToString("yyyyMMdd'T'HHmmss'Z'");
+
+        var body = $"""
+            <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+              <D:prop>
+                <D:getetag />
+                <C:calendar-data />
+              </D:prop>
+              <C:filter>
+                <C:comp-filter name="VCALENDAR">
+                  <C:comp-filter name="VEVENT">
+                    <C:time-range start="{startString}" end="{endString}" />
+                  </C:comp-filter>
+                </C:comp-filter>
+              </C:filter>
+            </C:calendar-query>
+            """;
+
+        var responseXml = await SendXmlAsync(
+            connectionSettings,
+            ReportMethod,
+            calendarUri,
+            depth: "1",
+            body,
+            cancellationToken).ConfigureAwait(false);
+
+        var eventResponses = ParseEventResponses(responseXml, calendarUri);
+        var result = new List<CalDavCalendarEvent>();
+
+        foreach (var eventResponse in eventResponses)
+        {
+            result.AddRange(ParseCalendarData(
+                eventResponse.CalendarData,
+                eventResponse.Href,
+                eventResponse.ETag,
+                startUtc,
+                endUtc));
+        }
+
+        // Ensure recurring parents are saved before child occurrences/exceptions.
+        return result
+            .OrderByDescending(e => e.IsSeriesMaster)
+            .ThenBy(e => e.Start)
+            .ToList();
+    }
+
+    public Task UpsertCalendarEventAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        string remoteEventId,
+        string icsContent,
+        CancellationToken cancellationToken = default)
+    {
+        ValidateConnectionSettings(connectionSettings);
+
+        if (calendar == null || string.IsNullOrWhiteSpace(calendar.RemoteCalendarId))
+            throw new ArgumentException("Calendar remote ID is required for CalDAV writes.");
+
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            throw new ArgumentException("Remote event ID is required for CalDAV writes.");
+
+        if (string.IsNullOrWhiteSpace(icsContent))
+            throw new ArgumentException("ICS content is required for CalDAV writes.");
+
+        var resourceUri = BuildEventResourceUri(calendar.RemoteCalendarId, remoteEventId);
+
+        return SendAsync(
+            connectionSettings,
+            PutMethod,
+            resourceUri,
+            new StringContent(icsContent, Encoding.UTF8, "text/calendar"),
+            cancellationToken);
+    }
+
+    public Task DeleteCalendarEventAsync(
+        CalDavConnectionSettings connectionSettings,
+        CalDavCalendar calendar,
+        string remoteEventId,
+        CancellationToken cancellationToken = default)
+    {
+        ValidateConnectionSettings(connectionSettings);
+
+        if (calendar == null || string.IsNullOrWhiteSpace(calendar.RemoteCalendarId))
+            throw new ArgumentException("Calendar remote ID is required for CalDAV deletes.");
+
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            throw new ArgumentException("Remote event ID is required for CalDAV deletes.");
+
+        var resourceUri = BuildEventResourceUri(calendar.RemoteCalendarId, remoteEventId);
+
+        return SendAsync(
+            connectionSettings,
+            DeleteMethod,
+            resourceUri,
+            null,
+            cancellationToken);
+    }
+
+    private static void ValidateConnectionSettings(CalDavConnectionSettings connectionSettings)
+    {
+        if (connectionSettings?.ServiceUri == null)
+            throw new ArgumentException("Service URI is required for CalDAV.");
+
+        if (string.IsNullOrWhiteSpace(connectionSettings.Username))
+            throw new ArgumentException("Username is required for CalDAV.");
+
+        if (string.IsNullOrWhiteSpace(connectionSettings.Password))
+            throw new ArgumentException("Password is required for CalDAV.");
+    }
+
+    private async Task<Uri> DiscoverPrincipalUriAsync(CalDavConnectionSettings connectionSettings, CancellationToken cancellationToken)
+    {
+        var body = """
+            <D:propfind xmlns:D="DAV:">
+              <D:prop>
+                <D:current-user-principal />
+              </D:prop>
+            </D:propfind>
+            """;
+
+        var responseXml = await SendXmlAsync(
+            connectionSettings,
+            PropFindMethod,
+            connectionSettings.ServiceUri,
+            depth: "0",
+            body,
+            cancellationToken).ConfigureAwait(false);
+
+        var principalHref = responseXml
+            .Descendants()
+            .FirstOrDefault(e => e.Name.LocalName == "current-user-principal")
+            ?.Descendants()
+            .FirstOrDefault(e => e.Name.LocalName == "href")
+            ?.Value;
+
+        return string.IsNullOrWhiteSpace(principalHref)
+            ? connectionSettings.ServiceUri
+            : CreateAbsoluteUri(connectionSettings.ServiceUri, principalHref);
+    }
+
+    private async Task<Uri> DiscoverCalendarHomeSetUriAsync(
+        CalDavConnectionSettings connectionSettings,
+        Uri principalUri,
+        CancellationToken cancellationToken)
+    {
+        var body = """
+            <D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+              <D:prop>
+                <C:calendar-home-set />
+              </D:prop>
+            </D:propfind>
+            """;
+
+        var responseXml = await SendXmlAsync(
+            connectionSettings,
+            PropFindMethod,
+            principalUri,
+            depth: "0",
+            body,
+            cancellationToken).ConfigureAwait(false);
+
+        var homeSetHref = responseXml
+            .Descendants()
+            .FirstOrDefault(e => e.Name.LocalName == "calendar-home-set")
+            ?.Descendants()
+            .FirstOrDefault(e => e.Name.LocalName == "href")
+            ?.Value;
+
+        return string.IsNullOrWhiteSpace(homeSetHref)
+            ? principalUri
+            : CreateAbsoluteUri(principalUri, homeSetHref);
+    }
+
+    private async Task<XDocument> SendXmlAsync(
+        CalDavConnectionSettings connectionSettings,
+        HttpMethod method,
+        Uri uri,
+        string depth,
+        string body,
+        CancellationToken cancellationToken)
+    {
+        using var request = new HttpRequestMessage(method, uri);
+
+        request.Headers.Authorization = new AuthenticationHeaderValue(
+            "Basic",
+            Convert.ToBase64String(Encoding.UTF8.GetBytes($"{connectionSettings.Username}:{connectionSettings.Password}")));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
+        request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/xml"));
+        request.Headers.Add("Depth", depth);
+        request.Content = new StringContent(body, Encoding.UTF8, "application/xml");
+
+        using var response = await _httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+        if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+        {
+            throw new UnauthorizedAccessException("CalDAV authorization failed.");
+        }
+
+        if (!response.IsSuccessStatusCode && response.StatusCode != HttpStatusCode.MultiStatus)
+        {
+            var failureBody = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            throw new HttpRequestException($"CalDAV request failed ({(int)response.StatusCode}): {failureBody}");
+        }
+
+        var xml = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+
+        if (string.IsNullOrWhiteSpace(xml))
+            return new XDocument(new XElement("empty"));
+
+        return XDocument.Parse(xml);
+    }
+
+    private async Task SendAsync(
+        CalDavConnectionSettings connectionSettings,
+        HttpMethod method,
+        Uri uri,
+        HttpContent content,
+        CancellationToken cancellationToken)
+    {
+        using var request = new HttpRequestMessage(method, uri);
+        request.Headers.Authorization = new AuthenticationHeaderValue(
+            "Basic",
+            Convert.ToBase64String(Encoding.UTF8.GetBytes($"{connectionSettings.Username}:{connectionSettings.Password}")));
+
+        if (content != null)
+            request.Content = content;
+
+        using var response = await _httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+        if (response.StatusCode is HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden)
+            throw new UnauthorizedAccessException("CalDAV authorization failed.");
+
+        if (!response.IsSuccessStatusCode)
+        {
+            var failureBody = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            throw new HttpRequestException($"CalDAV request failed ({(int)response.StatusCode}): {failureBody}");
+        }
+    }
+
+    private static List<CalDavCalendar> ParseCalendarCollection(XDocument xml, Uri baseUri)
+    {
+        var result = new List<CalDavCalendar>();
+
+        foreach (var response in xml.Descendants().Where(e => e.Name.LocalName == "response"))
+        {
+            var href = response.Descendants().FirstOrDefault(e => e.Name.LocalName == "href")?.Value;
+            if (string.IsNullOrWhiteSpace(href))
+                continue;
+
+            foreach (var prop in GetSuccessProps(response))
+            {
+                var resourceType = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "resourcetype");
+                if (resourceType == null)
+                    continue;
+
+                var isCalendar = resourceType.Descendants().Any(e => e.Name.LocalName == "calendar");
+                if (!isCalendar)
+                    continue;
+
+                var displayName = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "displayname")?.Value ?? string.Empty;
+                var ctag = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "getctag")?.Value ?? string.Empty;
+                var syncToken = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "sync-token")?.Value ?? string.Empty;
+                var remoteUri = CreateAbsoluteUri(baseUri, href).ToString().TrimEnd('/');
+
+                if (string.IsNullOrWhiteSpace(displayName))
+                {
+                    displayName = WebUtility.UrlDecode(remoteUri.Split('/').LastOrDefault() ?? "Calendar");
+                }
+
+                result.Add(new CalDavCalendar
+                {
+                    RemoteCalendarId = remoteUri,
+                    Name = displayName,
+                    CTag = ctag,
+                    SyncToken = syncToken
+                });
+            }
+        }
+
+        return result;
+    }
+
+    private static IEnumerable<CalDavEventResponse> ParseEventResponses(XDocument xml, Uri baseUri)
+    {
+        foreach (var response in xml.Descendants().Where(e => e.Name.LocalName == "response"))
+        {
+            var href = response.Descendants().FirstOrDefault(e => e.Name.LocalName == "href")?.Value;
+            if (string.IsNullOrWhiteSpace(href))
+                continue;
+
+            foreach (var prop in GetSuccessProps(response))
+            {
+                var calendarData = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "calendar-data")?.Value;
+                if (string.IsNullOrWhiteSpace(calendarData))
+                    continue;
+
+                var eTag = prop.Descendants().FirstOrDefault(e => e.Name.LocalName == "getetag")?.Value ?? string.Empty;
+
+                yield return new CalDavEventResponse(
+                    CreateAbsoluteUri(baseUri, href).ToString(),
+                    eTag,
+                    calendarData);
+            }
+        }
+    }
+
+    private static IEnumerable<XElement> GetSuccessProps(XElement response)
+    {
+        foreach (var propstat in response.Elements().Where(e => e.Name.LocalName == "propstat"))
+        {
+            var status = propstat.Elements().FirstOrDefault(e => e.Name.LocalName == "status")?.Value ?? string.Empty;
+            if (!status.Contains(" 200 ", StringComparison.Ordinal))
+                continue;
+
+            var prop = propstat.Elements().FirstOrDefault(e => e.Name.LocalName == "prop");
+            if (prop != null)
+                yield return prop;
+        }
+    }
+
+    private static List<CalDavCalendarEvent> ParseCalendarData(
+        string icsContent,
+        string resourceHref,
+        string eTag,
+        DateTimeOffset windowStartUtc,
+        DateTimeOffset windowEndUtc)
+    {
+        try
+        {
+            var calendar = Calendar.Load(icsContent);
+            if (calendar?.Events == null || calendar.Events.Count == 0)
+                return [];
+
+            var allEvents = calendar.Events.ToList();
+            var result = new List<CalDavCalendarEvent>();
+
+            var masters = allEvents
+                .Where(e => e != null && !string.IsNullOrWhiteSpace(e.Uid) && e.RecurrenceId == null)
+                .GroupBy(e => e.Uid, StringComparer.OrdinalIgnoreCase)
+                .Select(g => g.First())
+                .ToList();
+
+            var exceptionMap = allEvents
+                .Where(e => e != null && !string.IsNullOrWhiteSpace(e.Uid) && e.RecurrenceId != null)
+                .GroupBy(e => $"{e.Uid}|{GetOccurrenceKey(e.RecurrenceId)}", StringComparer.OrdinalIgnoreCase)
+                .ToDictionary(g => g.Key, g => g.First(), StringComparer.OrdinalIgnoreCase);
+
+            var consumedExceptions = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            foreach (var master in masters)
+            {
+                var masterRemoteId = BuildRemoteEventId(master.Uid, null);
+                var hasRecurrence = HasRecurrence(master);
+
+                if (hasRecurrence)
+                {
+                    result.Add(CreateCalendarEvent(
+                        sourceEvent: master,
+                        start: ToDateTimeOffset(master.Start),
+                        end: ToDateTimeOffset(master.End),
+                        remoteEventId: masterRemoteId,
+                        resourceHref: resourceHref,
+                        eTag: eTag,
+                        icsContent: icsContent,
+                        isSeriesMaster: true,
+                        isRecurringInstance: false,
+                        seriesMasterRemoteEventId: string.Empty,
+                        recurrence: BuildRecurrenceString(master)));
+
+                    var occurrences = master.GetOccurrences(windowStartUtc.UtcDateTime, windowEndUtc.UtcDateTime);
+
+                    foreach (var occurrence in occurrences)
+                    {
+                        var key = GetOccurrenceKey(occurrence.Period.StartTime);
+                        var mapKey = $"{master.Uid}|{key}";
+
+                        var sourceEvent = exceptionMap.TryGetValue(mapKey, out var exceptionEvent)
+                            ? exceptionEvent
+                            : master;
+
+                        if (exceptionEvent != null)
+                            consumedExceptions.Add(mapKey);
+
+                        var occurrenceStart = ToDateTimeOffset(occurrence.Period.StartTime);
+                        var occurrenceEnd = ToDateTimeOffset(occurrence.Period.EndTime);
+
+                        result.Add(CreateCalendarEvent(
+                            sourceEvent: sourceEvent,
+                            start: occurrenceStart,
+                            end: occurrenceEnd,
+                            remoteEventId: BuildRemoteEventId(master.Uid, key),
+                            resourceHref: resourceHref,
+                            eTag: eTag,
+                            icsContent: icsContent,
+                            isSeriesMaster: false,
+                            isRecurringInstance: true,
+                            seriesMasterRemoteEventId: masterRemoteId,
+                            recurrence: string.Empty));
+                    }
+                }
+                else
+                {
+                    var start = ToDateTimeOffset(master.Start);
+                    var end = ToDateTimeOffset(master.End);
+
+                    if (!Overlaps(start, end, windowStartUtc, windowEndUtc))
+                        continue;
+
+                    result.Add(CreateCalendarEvent(
+                        sourceEvent: master,
+                        start: start,
+                        end: end,
+                        remoteEventId: masterRemoteId,
+                        resourceHref: resourceHref,
+                        eTag: eTag,
+                        icsContent: icsContent,
+                        isSeriesMaster: false,
+                        isRecurringInstance: false,
+                        seriesMasterRemoteEventId: string.Empty,
+                        recurrence: string.Empty));
+                }
+            }
+
+            foreach (var exceptionEvent in allEvents.Where(e => e != null && e.RecurrenceId != null && !string.IsNullOrWhiteSpace(e.Uid)))
+            {
+                var key = $"{exceptionEvent.Uid}|{GetOccurrenceKey(exceptionEvent.RecurrenceId)}";
+                if (consumedExceptions.Contains(key))
+                    continue;
+
+                var start = ToDateTimeOffset(exceptionEvent.Start);
+                var end = ToDateTimeOffset(exceptionEvent.End);
+
+                if (!Overlaps(start, end, windowStartUtc, windowEndUtc))
+                    continue;
+
+                var masterRemoteId = BuildRemoteEventId(exceptionEvent.Uid, null);
+
+                result.Add(CreateCalendarEvent(
+                    sourceEvent: exceptionEvent,
+                    start: start,
+                    end: end,
+                    remoteEventId: BuildRemoteEventId(exceptionEvent.Uid, GetOccurrenceKey(exceptionEvent.RecurrenceId)),
+                    resourceHref: resourceHref,
+                    eTag: eTag,
+                    icsContent: icsContent,
+                    isSeriesMaster: false,
+                    isRecurringInstance: true,
+                    seriesMasterRemoteEventId: masterRemoteId,
+                    recurrence: string.Empty));
+            }
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            Logger.Warning(ex, "Failed to parse CalDAV ICS payload.");
+            return [];
+        }
+    }
+
+    private static bool HasRecurrence(CalendarEvent calendarEvent)
+        => (calendarEvent.RecurrenceRules?.Any() ?? false)
+           || (calendarEvent.RecurrenceDates?.Any() ?? false);
+
+    private static string BuildRemoteEventId(string uid, string occurrenceKey)
+        => string.IsNullOrWhiteSpace(occurrenceKey) ? uid : $"{uid}::{occurrenceKey}";
+
+    private static string GetOccurrenceKey(IDateTime dateTime)
+        => dateTime.AsUtc.ToString("yyyyMMdd'T'HHmmss'Z'");
+
+    private static DateTimeOffset ToDateTimeOffset(IDateTime dateTime)
+        => dateTime?.AsDateTimeOffset ?? default;
+
+    private static bool Overlaps(DateTimeOffset start, DateTimeOffset end, DateTimeOffset windowStart, DateTimeOffset windowEnd)
+    {
+        if (end <= start)
+            end = start.AddHours(1);
+
+        return start < windowEnd && end > windowStart;
+    }
+
+    private static CalDavCalendarEvent CreateCalendarEvent(
+        CalendarEvent sourceEvent,
+        DateTimeOffset start,
+        DateTimeOffset end,
+        string remoteEventId,
+        string resourceHref,
+        string eTag,
+        string icsContent,
+        bool isSeriesMaster,
+        bool isRecurringInstance,
+        string seriesMasterRemoteEventId,
+        string recurrence)
+    {
+        if (end <= start)
+            end = start.AddHours(1);
+
+        var status = MapStatus(sourceEvent.Status);
+        var organizerEmail = NormalizeCalendarEmail(sourceEvent.Organizer?.Value);
+        var organizerDisplayName = NormalizeOrganizerDisplayName(sourceEvent.Organizer?.CommonName, organizerEmail);
+        var attendees = sourceEvent.Attendees?
+            .Where(a => a != null && a.Value != null)
+            .Select(a => new CalDavEventAttendee
+            {
+                Email = NormalizeCalendarEmail(a.Value),
+                Name = NormalizeAttendeeName(a.CommonName, NormalizeCalendarEmail(a.Value)),
+                AttendenceStatus = MapAttendeeStatus(a.ParticipationStatus),
+                IsOrganizer = string.Equals(a.Role, "CHAIR", StringComparison.OrdinalIgnoreCase),
+                IsOptionalAttendee = string.Equals(a.Role, "OPT-PARTICIPANT", StringComparison.OrdinalIgnoreCase)
+            })
+            .Where(a => !string.IsNullOrWhiteSpace(a.Email))
+            .ToList() ?? [];
+
+        var reminders = sourceEvent.Alarms?
+            .Where(a => a?.Trigger != null && a.Trigger.IsRelative && a.Trigger.Duration.HasValue)
+            .Select(a => new CalDavEventReminder
+            {
+                DurationInSeconds = (int)Math.Abs(a.Trigger.Duration.Value.TotalSeconds),
+                ReminderType = string.Equals(a.Action, "EMAIL", StringComparison.OrdinalIgnoreCase)
+                    ? CalendarItemReminderType.Email
+                    : CalendarItemReminderType.Popup
+            })
+            .Where(r => r.DurationInSeconds > 0)
+            .ToList() ?? [];
+
+        return new CalDavCalendarEvent
+        {
+            RemoteEventId = remoteEventId,
+            RemoteResourceHref = resourceHref,
+            ETag = eTag,
+            IcsContent = icsContent,
+            Uid = sourceEvent.Uid ?? string.Empty,
+            SeriesMasterRemoteEventId = seriesMasterRemoteEventId,
+            IsSeriesMaster = isSeriesMaster,
+            IsRecurringInstance = isRecurringInstance,
+            Title = sourceEvent.Summary ?? string.Empty,
+            Description = sourceEvent.Description ?? string.Empty,
+            Location = sourceEvent.Location ?? string.Empty,
+            Start = start,
+            End = end,
+            StartTimeZone = ResolveTimeZoneId(sourceEvent.Start, start),
+            EndTimeZone = ResolveTimeZoneId(sourceEvent.End, end),
+            Recurrence = recurrence,
+            OrganizerDisplayName = organizerDisplayName,
+            OrganizerEmail = organizerEmail,
+            Status = status,
+            Visibility = MapVisibility(sourceEvent.Class),
+            ShowAs = MapShowAs(sourceEvent.Transparency),
+            IsHidden = status == CalendarItemStatus.Cancelled,
+            Attendees = attendees,
+            Reminders = reminders
+        };
+    }
+
+    private static string ResolveTimeZoneId(IDateTime sourceDateTime, DateTimeOffset parsedDateTime)
+    {
+        var explicitTimeZoneId = sourceDateTime?.TzId;
+        if (!string.IsNullOrWhiteSpace(explicitTimeZoneId))
+            return explicitTimeZoneId;
+
+        // Explicit UTC values usually don't carry TZID in CalDAV payloads.
+        // Preserve UTC so downstream local-time conversion stays correct.
+        if (parsedDateTime != default && parsedDateTime.Offset == TimeSpan.Zero)
+            return TimeZoneInfo.Utc.Id;
+
+        // Floating times without TZID should remain floating.
+        return string.Empty;
+    }
+
+    private static string BuildRecurrenceString(CalendarEvent sourceEvent)
+    {
+        var recurrenceLines = new List<string>();
+
+        if (sourceEvent.RecurrenceRules != null)
+        {
+            recurrenceLines.AddRange(sourceEvent.RecurrenceRules.Select(r => $"RRULE:{r}"));
+        }
+
+        if (sourceEvent.ExceptionDates != null)
+        {
+            foreach (var periodList in sourceEvent.ExceptionDates)
+            {
+                var dates = periodList
+                    .Where(p => p.StartTime != null)
+                    .Select(p => p.StartTime.AsUtc.ToString("yyyyMMdd'T'HHmmss'Z'"))
+                    .ToList();
+
+                if (dates.Count > 0)
+                {
+                    recurrenceLines.Add($"EXDATE:{string.Join(",", dates)}");
+                }
+            }
+        }
+
+        if (sourceEvent.RecurrenceDates != null)
+        {
+            foreach (var periodList in sourceEvent.RecurrenceDates)
+            {
+                var dates = periodList
+                    .Where(p => p.StartTime != null)
+                    .Select(p => p.StartTime.AsUtc.ToString("yyyyMMdd'T'HHmmss'Z'"))
+                    .ToList();
+
+                if (dates.Count > 0)
+                {
+                    recurrenceLines.Add($"RDATE:{string.Join(",", dates)}");
+                }
+            }
+        }
+
+        return recurrenceLines.Count == 0
+            ? string.Empty
+            : string.Join(Constants.CalendarEventRecurrenceRuleSeperator, recurrenceLines);
+    }
+
+    private static CalendarItemStatus MapStatus(string status)
+    {
+        if (string.IsNullOrWhiteSpace(status))
+            return CalendarItemStatus.Accepted;
+
+        if (string.Equals(status, "CANCELLED", StringComparison.OrdinalIgnoreCase))
+            return CalendarItemStatus.Cancelled;
+
+        if (string.Equals(status, "TENTATIVE", StringComparison.OrdinalIgnoreCase))
+            return CalendarItemStatus.Tentative;
+
+        return CalendarItemStatus.Accepted;
+    }
+
+    private static CalendarItemVisibility MapVisibility(string classValue)
+    {
+        if (string.IsNullOrWhiteSpace(classValue))
+            return CalendarItemVisibility.Default;
+
+        return classValue.ToUpperInvariant() switch
+        {
+            "PUBLIC" => CalendarItemVisibility.Public,
+            "PRIVATE" => CalendarItemVisibility.Private,
+            "CONFIDENTIAL" => CalendarItemVisibility.Confidential,
+            _ => CalendarItemVisibility.Default
+        };
+    }
+
+    private static CalendarItemShowAs MapShowAs(string transparency)
+    {
+        if (string.Equals(transparency, "TRANSPARENT", StringComparison.OrdinalIgnoreCase))
+            return CalendarItemShowAs.Free;
+
+        return CalendarItemShowAs.Busy;
+    }
+
+    private static AttendeeStatus MapAttendeeStatus(string participationStatus)
+    {
+        if (string.IsNullOrWhiteSpace(participationStatus))
+            return AttendeeStatus.NeedsAction;
+
+        return participationStatus.ToUpperInvariant() switch
+        {
+            "ACCEPTED" => AttendeeStatus.Accepted,
+            "DECLINED" => AttendeeStatus.Declined,
+            "TENTATIVE" => AttendeeStatus.Tentative,
+            _ => AttendeeStatus.NeedsAction
+        };
+    }
+
+    private static string NormalizeCalendarEmail(Uri emailUri)
+    {
+        if (emailUri == null)
+            return string.Empty;
+
+        var value = emailUri.OriginalString?.Trim();
+        if (string.IsNullOrWhiteSpace(value))
+            return string.Empty;
+
+        if (value.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase))
+            value = value[7..].Trim();
+
+        // CalDAV providers may use non-mail identifiers (urn:uuid, principal paths, etc.) here.
+        // Keep only valid email-like values.
+        if (!value.Contains('@'))
+            return string.Empty;
+
+        return value;
+    }
+
+    private static string NormalizeAttendeeName(string attendeeName, string attendeeEmail)
+    {
+        var normalizedName = NormalizeOrganizerDisplayName(attendeeName, attendeeEmail);
+        return string.IsNullOrWhiteSpace(normalizedName) ? attendeeEmail : normalizedName;
+    }
+
+    private static string NormalizeOrganizerDisplayName(string organizerDisplayName, string organizerEmail)
+    {
+        var normalizedName = organizerDisplayName?.Trim() ?? string.Empty;
+
+        if (string.IsNullOrWhiteSpace(normalizedName))
+            return organizerEmail ?? string.Empty;
+
+        if (LooksLikeOpaqueIdentifier(normalizedName))
+            return organizerEmail ?? normalizedName;
+
+        return normalizedName;
+    }
+
+    private static bool LooksLikeOpaqueIdentifier(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return false;
+
+        if (Guid.TryParse(value, out _))
+            return true;
+
+        if (value.StartsWith("urn:", StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        if (value.Contains("/", StringComparison.Ordinal) && !value.Contains('@'))
+            return true;
+
+        return false;
+    }
+
+    private static Uri CreateAbsoluteUri(Uri baseUri, string href)
+    {
+        if (Uri.TryCreate(href, UriKind.Absolute, out var absolute))
+            return absolute;
+
+        return new Uri(baseUri, href);
+    }
+
+    private static Uri BuildEventResourceUri(string remoteCalendarId, string remoteEventId)
+    {
+        var calendarUri = new Uri($"{remoteCalendarId.TrimEnd('/')}/");
+        var normalizedEventId = remoteEventId.Split(new[] { "::" }, StringSplitOptions.None)[0];
+        var safeEventId = Uri.EscapeDataString(normalizedEventId);
+        var fileName = safeEventId.EndsWith(".ics", StringComparison.OrdinalIgnoreCase)
+            ? safeEventId
+            : $"{safeEventId}.ics";
+
+        return new Uri(calendarUri, fileName);
+    }
+
+    private sealed record CalDavEventResponse(string Href, string ETag, string CalendarData);
+}
+
diff --git a/Wino.Services/CalendarIcsFileService.cs b/Wino.Services/CalendarIcsFileService.cs
new file mode 100644
index 00000000..1fe2ce38
--- /dev/null
+++ b/Wino.Services/CalendarIcsFileService.cs
@@ -0,0 +1,169 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Services;
+
+public class CalendarIcsFileService : ICalendarIcsFileService
+{
+    private readonly INativeAppService _nativeAppService;
+    private readonly ILogger _logger = Log.ForContext<CalendarIcsFileService>();
+
+    public CalendarIcsFileService(INativeAppService nativeAppService)
+    {
+        _nativeAppService = nativeAppService;
+    }
+
+    public async Task SaveCalendarItemIcsAsync(Guid accountId, Guid calendarId, Guid calendarItemId, string remoteEventId, string remoteResourceHref, string eTag, string icsContent)
+    {
+        if (accountId == Guid.Empty || calendarId == Guid.Empty || calendarItemId == Guid.Empty || string.IsNullOrWhiteSpace(icsContent))
+            return;
+
+        var folderPath = await GetCalendarItemFolderPathAsync(accountId, calendarId, calendarItemId).ConfigureAwait(false);
+        var icsPath = Path.Combine(folderPath, "event.ics");
+        var metaPath = Path.Combine(folderPath, "event.meta.json");
+
+        try
+        {
+            await File.WriteAllTextAsync(icsPath, icsContent).ConfigureAwait(false);
+
+            var metadataContent = string.Join(
+                Environment.NewLine,
+                $"CalendarItemId={calendarItemId:N}",
+                $"RemoteEventId={remoteEventId ?? string.Empty}",
+                $"RemoteResourceHref={remoteResourceHref ?? string.Empty}",
+                $"ETag={eTag ?? string.Empty}",
+                $"UpdatedAtUtc={DateTime.UtcNow:O}");
+
+            await File.WriteAllTextAsync(metaPath, metadataContent).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to save ICS file for account {AccountId} and calendar item {CalendarItemId}", accountId, calendarItemId);
+        }
+    }
+
+    public async Task<string> GetCalendarItemIcsETagAsync(Guid accountId, Guid calendarId, Guid calendarItemId)
+    {
+        if (accountId == Guid.Empty || calendarId == Guid.Empty || calendarItemId == Guid.Empty)
+            return string.Empty;
+
+        try
+        {
+            var itemPath = await GetCalendarItemPathAsync(accountId, calendarId, calendarItemId).ConfigureAwait(false);
+            var metaPath = Path.Combine(itemPath, "event.meta.json");
+
+            if (!File.Exists(metaPath))
+                return string.Empty;
+
+            var lines = await File.ReadAllLinesAsync(metaPath).ConfigureAwait(false);
+
+            foreach (var line in lines)
+            {
+                if (!line.StartsWith("ETag=", StringComparison.OrdinalIgnoreCase))
+                    continue;
+
+                return line["ETag=".Length..].Trim();
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Warning(ex, "Failed to load ICS metadata for account {AccountId}, calendar {CalendarId}, item {CalendarItemId}", accountId, calendarId, calendarItemId);
+        }
+
+        return string.Empty;
+    }
+
+    public async Task DeleteCalendarItemIcsAsync(Guid accountId, Guid calendarItemId)
+    {
+        if (accountId == Guid.Empty || calendarItemId == Guid.Empty)
+            return;
+
+        try
+        {
+            var accountRootPath = await GetAccountCalendarsRootPathAsync(accountId).ConfigureAwait(false);
+            if (!Directory.Exists(accountRootPath))
+                return;
+
+            var calendarDirectories = Directory.GetDirectories(accountRootPath);
+
+            foreach (var calendarDirectory in calendarDirectories)
+            {
+                var itemPath = Path.Combine(calendarDirectory, calendarItemId.ToString("N"));
+                if (Directory.Exists(itemPath))
+                {
+                    Directory.Delete(itemPath, recursive: true);
+                    break;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to delete ICS folder for account {AccountId} and calendar item {CalendarItemId}", accountId, calendarItemId);
+        }
+    }
+
+    public async Task DeleteCalendarIcsForCalendarAsync(Guid accountId, Guid calendarId)
+    {
+        if (accountId == Guid.Empty || calendarId == Guid.Empty)
+            return;
+
+        try
+        {
+            var calendarPath = await GetCalendarFolderPathAsync(accountId, calendarId).ConfigureAwait(false);
+            if (Directory.Exists(calendarPath))
+            {
+                Directory.Delete(calendarPath, recursive: true);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Failed to delete ICS folder for account {AccountId} and calendar {CalendarId}", accountId, calendarId);
+        }
+    }
+
+    private async Task<string> GetCalendarItemFolderPathAsync(Guid accountId, Guid calendarId, Guid calendarItemId)
+    {
+        var calendarPath = await GetCalendarFolderPathAsync(accountId, calendarId).ConfigureAwait(false);
+        var itemDirectory = Path.Combine(calendarPath, calendarItemId.ToString("N"));
+        Directory.CreateDirectory(itemDirectory);
+        return itemDirectory;
+    }
+
+    private async Task<string> GetCalendarItemPathAsync(Guid accountId, Guid calendarId, Guid calendarItemId)
+    {
+        var root = await GetIcsRootPathAsync().ConfigureAwait(false);
+        return Path.Combine(
+            root,
+            accountId.ToString("N"),
+            "calendars",
+            calendarId.ToString("N"),
+            calendarItemId.ToString("N"));
+    }
+
+    private async Task<string> GetCalendarFolderPathAsync(Guid accountId, Guid calendarId)
+    {
+        var accountRootPath = await GetAccountCalendarsRootPathAsync(accountId).ConfigureAwait(false);
+        var calendarDirectory = Path.Combine(accountRootPath, calendarId.ToString("N"));
+        Directory.CreateDirectory(calendarDirectory);
+        return calendarDirectory;
+    }
+
+    private async Task<string> GetAccountCalendarsRootPathAsync(Guid accountId)
+    {
+        var root = await GetIcsRootPathAsync().ConfigureAwait(false);
+        var accountPath = Path.Combine(root, accountId.ToString("N"), "calendars");
+        Directory.CreateDirectory(accountPath);
+        return accountPath;
+    }
+
+    private async Task<string> GetIcsRootPathAsync()
+    {
+        var mimeRootPath = await _nativeAppService.GetMimeMessageStoragePath().ConfigureAwait(false);
+        var icsRootPath = Path.Combine(mimeRootPath, "CalendarIcs");
+        Directory.CreateDirectory(icsRootPath);
+        return icsRootPath;
+    }
+}
diff --git a/Wino.Services/CalendarService.cs b/Wino.Services/CalendarService.cs
index 3f31175c..918eeb95 100644
--- a/Wino.Services/CalendarService.cs
+++ b/Wino.Services/CalendarService.cs
@@ -2,56 +2,99 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using Ical.Net.CalendarComponents;
-using Ical.Net.DataTypes;
-using SqlKata;
-using Wino.Core.Domain;
+using Itenso.TimePeriod;
+using Serilog;
 using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Messaging.Client.Calendar;
-using Wino.Services.Extensions;
 
 namespace Wino.Services;
 
 public class CalendarService : BaseDatabaseService, ICalendarService
 {
+    // Predefined reminder options in minutes
+    private static readonly int[] PredefinedReminderMinutes = [60, 30, 15, 5, 1];
+
     public CalendarService(IDatabaseService databaseService) : base(databaseService)
     {
     }
 
+    public int[] GetPredefinedReminderMinutes() => PredefinedReminderMinutes;
+
+    /// <summary>
+    /// Loads the AssignedCalendar (and its MailAccount) for a CalendarItem if not already loaded.
+    /// </summary>
+    private async Task LoadAssignedCalendarAsync(CalendarItem calendarItem)
+    {
+        if (calendarItem == null || calendarItem.AssignedCalendar != null) return;
+
+        calendarItem.AssignedCalendar = await Connection.GetAsync<AccountCalendar>(calendarItem.CalendarId);
+        if (calendarItem.AssignedCalendar != null)
+        {
+            calendarItem.AssignedCalendar.MailAccount = await Connection.GetAsync<MailAccount>(calendarItem.AssignedCalendar.AccountId);
+        }
+    }
+
     public Task<List<AccountCalendar>> GetAccountCalendarsAsync(Guid accountId)
         => Connection.Table<AccountCalendar>().Where(x => x.AccountId == accountId).OrderByDescending(a => a.IsPrimary).ToListAsync();
 
     public async Task InsertAccountCalendarAsync(AccountCalendar accountCalendar)
     {
-        await Connection.InsertAsync(accountCalendar);
+        await Connection.InsertAsync(accountCalendar, typeof(AccountCalendar));
 
         WeakReferenceMessenger.Default.Send(new CalendarListAdded(accountCalendar));
     }
 
     public async Task UpdateAccountCalendarAsync(AccountCalendar accountCalendar)
     {
-        await Connection.UpdateAsync(accountCalendar);
+        if (accountCalendar.IsPrimary)
+        {
+            await Connection.ExecuteAsync(
+                "UPDATE AccountCalendar SET IsPrimary = 0 WHERE AccountId = ? AND Id != ?",
+                accountCalendar.AccountId,
+                accountCalendar.Id);
+        }
+
+        await Connection.UpdateAsync(accountCalendar, typeof(AccountCalendar));
 
         WeakReferenceMessenger.Default.Send(new CalendarListUpdated(accountCalendar));
     }
 
+    public async Task SetPrimaryCalendarAsync(Guid accountId, Guid accountCalendarId)
+    {
+        await Connection.RunInTransactionAsync(connection =>
+        {
+            connection.Execute(
+                "UPDATE AccountCalendar SET IsPrimary = 0 WHERE AccountId = ?",
+                accountId);
+
+            connection.Execute(
+                "UPDATE AccountCalendar SET IsPrimary = 1 WHERE AccountId = ? AND Id = ?",
+                accountId,
+                accountCalendarId);
+        });
+
+        var calendars = await GetAccountCalendarsAsync(accountId).ConfigureAwait(false);
+
+        foreach (var calendar in calendars)
+        {
+            WeakReferenceMessenger.Default.Send(new CalendarListUpdated(calendar));
+        }
+    }
+
     public async Task DeleteAccountCalendarAsync(AccountCalendar accountCalendar)
     {
-        var deleteCalendarItemsQuery = new Query()
-            .From(nameof(CalendarItem))
-            .Where(nameof(CalendarItem.CalendarId), accountCalendar.Id)
-            .Where(nameof(AccountCalendar.AccountId), accountCalendar.AccountId);
-
-        var rawQuery = deleteCalendarItemsQuery.GetRawQuery();
-
-        await Connection.ExecuteAsync(rawQuery);
-        await Connection.DeleteAsync(accountCalendar);
+        await Connection.ExecuteAsync(
+            "DELETE FROM CalendarItem WHERE CalendarId = ? AND AccountId = ?",
+            accountCalendar.Id, accountCalendar.AccountId);
+        await Connection.DeleteAsync<AccountCalendar>(accountCalendar.Id);
 
         WeakReferenceMessenger.Default.Send(new CalendarListDeleted(accountCalendar));
     }
@@ -76,150 +119,178 @@ public class CalendarService : BaseDatabaseService, ICalendarService
         {
             await Connection.Table<CalendarItem>().DeleteAsync(x => x.Id == @event.Id).ConfigureAwait(false);
             await Connection.Table<CalendarEventAttendee>().DeleteAsync(a => a.CalendarItemId == @event.Id).ConfigureAwait(false);
+            await Connection.Table<Reminder>().DeleteAsync(r => r.CalendarItemId == @event.Id).ConfigureAwait(false);
+            await Connection.Table<CalendarAttachment>().DeleteAsync(a => a.CalendarItemId == @event.Id).ConfigureAwait(false);
 
             WeakReferenceMessenger.Default.Send(new CalendarItemDeleted(@event));
         }
     }
 
-    public async Task CreateNewCalendarItemAsync(CalendarItem calendarItem, List<CalendarEventAttendee> attendees)
+    public async Task DeleteCalendarItemAsync(string calendarRemoteEventId, Guid calendarId)
     {
-        await Connection.RunInTransactionAsync((conn) =>
-           {
-               conn.Insert(calendarItem);
+        var calendarItem = await FindCalendarItemByRemoteEventIdAsync(calendarId, calendarRemoteEventId).ConfigureAwait(false);
 
-               if (attendees != null)
-               {
-                   conn.InsertAll(attendees);
-               }
-           });
+        if (calendarItem == null) return;
 
-        WeakReferenceMessenger.Default.Send(new CalendarItemAdded(calendarItem));
+        await DeleteCalendarItemAsync(calendarItem.Id);
     }
 
-    public async Task<List<CalendarItem>> GetCalendarEventsAsync(IAccountCalendar calendar, DayRangeRenderModel dayRangeRenderModel)
+    public async Task CreateNewCalendarItemAsync(CalendarItem calendarItem, List<CalendarEventAttendee> attendees)
     {
-        // TODO: We might need to implement caching here.
-        // I don't know how much of the events we'll have in total, but this logic scans all events every time for given calendar.
+        try
+        {
+            await Connection.RunInTransactionAsync((conn) =>
+            {
+                conn.Insert(calendarItem, typeof(CalendarItem));
 
+                if (attendees != null)
+                {
+                    conn.InsertAll(attendees, typeof(CalendarEventAttendee));
+                }
+            });
+
+            WeakReferenceMessenger.Default.Send(new CalendarItemAdded(calendarItem));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error creating new calendar item");
+        }
+    }
+
+    public async Task UpdateCalendarItemAsync(CalendarItem calendarItem, List<CalendarEventAttendee> attendees)
+    {
+        try
+        {
+            await Connection.RunInTransactionAsync((conn) =>
+            {
+                conn.Update(calendarItem, typeof(CalendarItem));
+
+                // Clear existing attendees and add new ones
+                conn.Table<CalendarEventAttendee>().Delete(a => a.CalendarItemId == calendarItem.Id);
+
+                if (attendees != null)
+                {
+                    conn.InsertAll(attendees, typeof(CalendarEventAttendee));
+                }
+            });
+
+            WeakReferenceMessenger.Default.Send(new CalendarItemUpdated(calendarItem, CalendarItemUpdateSource.Server));
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error updating calendar item");
+        }
+    }
+
+    public async Task<List<CalendarItem>> SearchCalendarItemsAsync(string searchQuery, int limit, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (string.IsNullOrWhiteSpace(searchQuery) || limit <= 0)
+            return [];
+
+        var pattern = $"%{searchQuery.Trim()}%";
+        var results = await Connection.QueryAsync<CalendarItem>(
+            """
+            SELECT *
+            FROM CalendarItem
+            WHERE IsHidden = 0
+              AND (Recurrence IS NULL OR Recurrence = '' OR RecurringCalendarItemId IS NOT NULL)
+              AND (Title LIKE ? OR Description LIKE ? OR Location LIKE ?)
+            ORDER BY StartDate DESC
+            LIMIT ?
+            """,
+            pattern,
+            pattern,
+            pattern,
+            limit).ConfigureAwait(false);
+
+        foreach (var result in results)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            await LoadAssignedCalendarAsync(result).ConfigureAwait(false);
+        }
+
+        return results;
+    }
+
+    /// <summary>
+    /// Retrieves calendar events for a given calendar within the specified time period.
+    /// Returns all events (single instances and recurring event occurrences) that overlap with the period.
+    /// Note: Recurring events are expected to be synced as individual instances from the server.
+    /// Series master events (parents) are filtered out as they should not be displayed directly.
+    /// </summary>
+    /// <param name="calendar">The calendar to retrieve events from.</param>
+    /// <param name="period">The time period to query events for.</param>
+    /// <returns>List of calendar items that fall within the requested period.</returns>
+    public async Task<List<CalendarItem>> GetCalendarEventsAsync(IAccountCalendar calendar, ITimePeriod period)
+    {
+        // Fetch all non-hidden events for this calendar
         var accountEvents = await Connection.Table<CalendarItem>()
-            .Where(x => x.CalendarId == calendar.Id && !x.IsHidden).ToListAsync();
+            .Where(x => x.CalendarId == calendar.Id && !x.IsHidden)
+            .ToListAsync();
 
         var result = new List<CalendarItem>();
 
-        foreach (var ev in accountEvents)
+        foreach (var calendarItem in accountEvents)
         {
-            ev.AssignedCalendar = calendar;
+            // Skip series master events - they should not be displayed directly.
+            // Individual instances are synced from the server and displayed instead.
+            if (calendarItem.IsRecurringParent)
+                continue;
 
-            // Parse recurrence rules
-            var calendarEvent = new CalendarEvent
+            calendarItem.AssignedCalendar = calendar;
+
+            // Check if the event overlaps with the requested period
+            if (calendarItem.Period.OverlapsWith(period))
             {
-                Start = new CalDateTime(ev.StartDate),
-                End = new CalDateTime(ev.EndDate),
-            };
-
-            if (string.IsNullOrEmpty(ev.Recurrence))
-            {
-                // No recurrence, only check if we fall into the given period.
-
-                if (ev.Period.OverlapsWith(dayRangeRenderModel.Period))
-                {
-                    result.Add(ev);
-                }
-            }
-            else
-            {
-                // This event has recurrences.
-                // Wino stores exceptional recurrent events as a separate calendar item, without the recurrence rule.
-                // Because each instance of recurrent event can have different attendees, properties etc.
-                // Even though the event is recurrent, each updated instance is a separate calendar item.
-                // Calculate the all recurrences, and remove the exceptional instances like hidden ones.
-
-                var recurrenceLines = Regex.Split(ev.Recurrence, Constants.CalendarEventRecurrenceRuleSeperator);
-
-                foreach (var line in recurrenceLines)
-                {
-                    calendarEvent.RecurrenceRules.Add(new RecurrencePattern(line));
-                }
-
-                // Calculate occurrences in the range.
-                var occurrences = calendarEvent.GetOccurrences(dayRangeRenderModel.Period.Start, dayRangeRenderModel.Period.End);
-
-                // Get all recurrent exceptional calendar events.
-                var exceptionalRecurrences = await Connection.Table<CalendarItem>()
-                    .Where(a => a.RecurringCalendarItemId == ev.Id)
-                    .ToListAsync()
-                    .ConfigureAwait(false);
-
-                foreach (var occurrence in occurrences)
-                {
-                    var exactInstanceCheck = exceptionalRecurrences.FirstOrDefault(a =>
-                    a.Period.OverlapsWith(dayRangeRenderModel.Period));
-
-                    if (exactInstanceCheck == null)
-                    {
-                        // There is no exception for the period.
-                        // Change the instance StartDate and Duration.
-
-                        var recurrence = ev.CreateRecurrence(occurrence.Period.StartTime.Value, occurrence.Period.Duration.TotalSeconds);
-
-                        result.Add(recurrence);
-                    }
-                    else
-                    {
-                        // There is a single instance of this recurrent event.
-                        // It will be added as single item if it's not hidden.
-                        // We don't need to do anything here.
-                    }
-                }
+                result.Add(calendarItem);
             }
         }
 
         return result;
     }
 
-    public Task<AccountCalendar> GetAccountCalendarAsync(Guid accountCalendarId)
-        => Connection.GetAsync<AccountCalendar>(accountCalendarId);
-
-    public Task<CalendarItem> GetCalendarItemAsync(Guid id)
+    public async Task<AccountCalendar> GetAccountCalendarAsync(Guid accountCalendarId)
     {
-        var query = new Query()
-            .From(nameof(CalendarItem))
-            .Where(nameof(CalendarItem.Id), id);
+        var calendar = await Connection.GetAsync<AccountCalendar>(accountCalendarId);
+        if (calendar != null)
+        {
+            calendar.MailAccount = await Connection.GetAsync<MailAccount>(calendar.AccountId);
+        }
+        return calendar;
+    }
 
-        var rawQuery = query.GetRawQuery();
-        return Connection.FindWithQueryAsync<CalendarItem>(rawQuery);
+    public async Task<CalendarItem> GetCalendarItemAsync(Guid id)
+    {
+        var calendarItem = await Connection.FindWithQueryAsync<CalendarItem>(
+            "SELECT * FROM CalendarItem WHERE Id = ?",
+            id);
+
+        await LoadAssignedCalendarAsync(calendarItem);
+
+        return calendarItem;
     }
 
     public async Task<CalendarItem> GetCalendarItemAsync(Guid accountCalendarId, string remoteEventId)
     {
-        var query = new Query()
-            .From(nameof(CalendarItem))
-            .Where(nameof(CalendarItem.CalendarId), accountCalendarId)
-            .Where(nameof(CalendarItem.RemoteEventId), remoteEventId);
+        var calendarItem = await FindCalendarItemByRemoteEventIdAsync(accountCalendarId, remoteEventId).ConfigureAwait(false);
 
-        var rawQuery = query.GetRawQuery();
-
-        var calendarItem = await Connection.FindWithQueryAsync<CalendarItem>(rawQuery);
-
-        // Load assigned calendar.
-        if (calendarItem != null)
-        {
-            calendarItem.AssignedCalendar = await Connection.GetAsync<AccountCalendar>(calendarItem.CalendarId);
-        }
+        await LoadAssignedCalendarAsync(calendarItem);
 
         return calendarItem;
     }
 
     public Task UpdateCalendarDeltaSynchronizationToken(Guid calendarId, string deltaToken)
     {
-        var query = new Query()
-            .From(nameof(AccountCalendar))
-            .Where(nameof(AccountCalendar.Id), calendarId)
-            .AsUpdate(new { SynchronizationDeltaToken = deltaToken });
-
-        return Connection.ExecuteAsync(query.GetRawQuery());
+        return Connection.ExecuteAsync(
+            "UPDATE AccountCalendar SET SynchronizationDeltaToken = ? WHERE Id = ?",
+            deltaToken, calendarId);
     }
 
+    /// <summary>
+    /// Gets attendees for a calendar item.
+    /// </summary>
     public Task<List<CalendarEventAttendee>> GetAttendeesAsync(Guid calendarEventTrackingId)
         => Connection.Table<CalendarEventAttendee>().Where(x => x.CalendarItemId == calendarEventTrackingId).ToListAsync();
 
@@ -228,15 +299,12 @@ public class CalendarService : BaseDatabaseService, ICalendarService
         await Connection.RunInTransactionAsync((connection) =>
         {
             // Clear all attendees.
-            var query = new Query()
-                .From(nameof(CalendarEventAttendee))
-                .Where(nameof(CalendarEventAttendee.CalendarItemId), calendarItemId)
-                .AsDelete();
-
-            connection.Execute(query.GetRawQuery());
+            connection.Execute(
+                "DELETE FROM CalendarEventAttendee WHERE CalendarItemId = ?",
+                calendarItemId);
 
             // Insert new attendees.
-            connection.InsertAll(allAttendees);
+            connection.InsertAll(allAttendees, typeof(CalendarEventAttendee));
         });
 
         return await Connection.Table<CalendarEventAttendee>().Where(a => a.CalendarItemId == calendarItemId).ToListAsync();
@@ -246,7 +314,7 @@ public class CalendarService : BaseDatabaseService, ICalendarService
     {
         var eventId = targetDetails.Item.Id;
 
-        // Get the event by Id first.
+        // Get the event by Id first (this already loads AssignedCalendar).
         var item = await GetCalendarItemAsync(eventId).ConfigureAwait(false);
 
         bool isRecurringChild = targetDetails.Item.IsRecurringChild;
@@ -258,9 +326,9 @@ public class CalendarService : BaseDatabaseService, ICalendarService
             {
                 if (item == null)
                 {
-                    // This is an occurrence of a recurring event.
-                    // They don't exist in db.
-
+                    // This occurrence doesn't exist in db - return the passed item.
+                    // Ensure AssignedCalendar is loaded.
+                    await LoadAssignedCalendarAsync(targetDetails.Item);
                     return targetDetails.Item;
                 }
                 else
@@ -302,4 +370,165 @@ public class CalendarService : BaseDatabaseService, ICalendarService
             }
         }
     }
+
+    /// <summary>
+    /// Gets reminders for a calendar item.
+    /// </summary>
+    public Task<List<Reminder>> GetRemindersAsync(Guid calendarItemId)
+        => Connection.Table<Reminder>().Where(r => r.CalendarItemId == calendarItemId).ToListAsync();
+
+    public async Task SaveRemindersAsync(Guid calendarItemId, List<Reminder> reminders)
+    {
+        await Connection.RunInTransactionAsync((connection) =>
+        {
+            // Clear existing reminders for this calendar item
+            connection.Execute(
+                "DELETE FROM Reminder WHERE CalendarItemId = ?",
+                calendarItemId);
+
+            // Insert new reminders if any
+            if (reminders != null && reminders.Count > 0)
+            {
+                connection.InsertAll(reminders, typeof(Reminder));
+            }
+        });
+    }
+
+    public Task SnoozeCalendarItemAsync(Guid calendarItemId, DateTime snoozedUntilLocal)
+        => Connection.ExecuteAsync(
+            $"UPDATE {nameof(CalendarItem)} SET {nameof(CalendarItem.SnoozedUntil)} = ? WHERE {nameof(CalendarItem.Id)} = ?",
+            snoozedUntilLocal,
+            calendarItemId);
+
+    public async Task<List<CalendarReminderNotificationRequest>> CheckAndNotifyAsync(DateTime lastCheckLocal, DateTime nowLocal, ISet<string> sentReminderKeys, CancellationToken cancellationToken = default)
+    {
+        if (sentReminderKeys == null)
+            return [];
+
+        var candidates = await Connection.QueryAsync<CalendarReminderCandidate>(
+            @"
+            SELECT
+                c.Id AS CalendarItemId,
+                c.StartDate,
+                c.StartTimeZone,
+                r.DurationInSeconds AS ReminderDurationInSeconds,
+                c.SnoozedUntil
+            FROM CalendarItem c
+            INNER JOIN Reminder r ON r.CalendarItemId = c.Id
+            INNER JOIN AccountCalendar ac ON ac.Id = c.CalendarId
+            INNER JOIN MailAccount ma ON ma.Id = ac.AccountId
+            WHERE
+                c.IsHidden = 0
+                AND ma.IsCalendarAccessGranted = 1
+                AND r.ReminderType = 0
+                AND NOT (IFNULL(c.Recurrence, '') != '' AND c.RecurringCalendarItemId IS NULL)")
+            .ConfigureAwait(false);
+
+        var dueNotifications = new List<CalendarReminderNotificationRequest>();
+
+        foreach (var candidate in candidates)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var eventStartLocal = candidate.StartDate.ToLocalTimeFromTimeZone(candidate.StartTimeZone);
+            var triggerTimeLocal = eventStartLocal.AddSeconds(-candidate.ReminderDurationInSeconds);
+            var effectiveTriggerTimeLocal = candidate.SnoozedUntil.HasValue
+                ? MaxDateTime(triggerTimeLocal, candidate.SnoozedUntil.Value)
+                : triggerTimeLocal;
+
+            if (effectiveTriggerTimeLocal <= lastCheckLocal || effectiveTriggerTimeLocal > nowLocal)
+                continue;
+
+            var reminderKey = $"{candidate.CalendarItemId:N}:{candidate.ReminderDurationInSeconds}:{effectiveTriggerTimeLocal.Ticks}";
+            if (!sentReminderKeys.Add(reminderKey))
+                continue;
+
+            var calendarItem = await GetCalendarItemAsync(candidate.CalendarItemId).ConfigureAwait(false);
+            if (calendarItem == null)
+                continue;
+
+            dueNotifications.Add(new CalendarReminderNotificationRequest()
+            {
+                CalendarItem = calendarItem,
+                ReminderDurationInSeconds = candidate.ReminderDurationInSeconds,
+                ReminderKey = reminderKey
+            });
+        }
+
+        return dueNotifications;
+    }
+
+    #region Attachments
+
+    public Task<List<CalendarAttachment>> GetAttachmentsAsync(Guid calendarItemId)
+        => Connection.Table<CalendarAttachment>().Where(x => x.CalendarItemId == calendarItemId).ToListAsync();
+
+    public async Task InsertOrReplaceAttachmentsAsync(List<CalendarAttachment> attachments)
+    {
+        if (attachments == null || attachments.Count == 0) return;
+
+        foreach (var item in attachments)
+        {
+            // Check if an attachment with the same RemoteAttachmentId already exists for this calendar item
+            // to avoid re-downloading already existing attachments.
+            var existingAttachment = await Connection.Table<CalendarAttachment>()
+                .FirstOrDefaultAsync(x => x.CalendarItemId == item.CalendarItemId
+                                       && x.RemoteAttachmentId == item.RemoteAttachmentId);
+
+            if (existingAttachment != null)
+            {
+                // Preserve the existing Id, IsDownloaded status, and LocalFilePath
+                item.Id = existingAttachment.Id;
+                item.IsDownloaded = existingAttachment.IsDownloaded;
+                item.LocalFilePath = existingAttachment.LocalFilePath;
+            }
+
+            await Connection.InsertOrReplaceAsync(item, typeof(CalendarAttachment));
+        }
+    }
+
+    public async Task MarkAttachmentDownloadedAsync(Guid attachmentId, string localFilePath)
+    {
+        var attachment = await Connection.Table<CalendarAttachment>().FirstOrDefaultAsync(x => x.Id == attachmentId);
+
+        if (attachment == null) return;
+
+        attachment.IsDownloaded = true;
+        attachment.LocalFilePath = localFilePath;
+
+        await Connection.UpdateAsync(attachment, typeof(CalendarAttachment));
+    }
+
+    public async Task DeleteAttachmentsAsync(Guid calendarItemId)
+    {
+        await Connection.ExecuteAsync("DELETE FROM CalendarAttachment WHERE CalendarItemId = ?", calendarItemId);
+    }
+
+    #endregion
+
+    private static DateTime MaxDateTime(DateTime first, DateTime second)
+        => first >= second ? first : second;
+
+    private Task<CalendarItem> FindCalendarItemByRemoteEventIdAsync(Guid calendarId, string remoteEventId)
+    {
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            return Task.FromResult<CalendarItem>(null);
+
+        var providerRemoteEventId = remoteEventId.GetProviderRemoteEventId();
+
+        return Connection.FindWithQueryAsync<CalendarItem>(
+            "SELECT * FROM CalendarItem WHERE CalendarId = ? AND (RemoteEventId = ? OR RemoteEventId LIKE ?)",
+            calendarId,
+            providerRemoteEventId,
+            $"{providerRemoteEventId}::%");
+    }
+
+    private sealed class CalendarReminderCandidate
+    {
+        public Guid CalendarItemId { get; set; }
+        public DateTime StartDate { get; set; }
+        public string StartTimeZone { get; set; }
+        public long ReminderDurationInSeconds { get; set; }
+        public DateTime? SnoozedUntil { get; set; }
+    }
 }
diff --git a/Wino.Services/ContactPictureFileService.cs b/Wino.Services/ContactPictureFileService.cs
new file mode 100644
index 00000000..f0581ebe
--- /dev/null
+++ b/Wino.Services/ContactPictureFileService.cs
@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Services;
+
+/// <summary>
+/// Stores contact pictures as JPEG files under {ApplicationDataFolderPath}/contacts/{fileId}.jpg.
+/// This avoids base64 inline storage in SQLite that bloats all AccountContact queries.
+/// </summary>
+public class ContactPictureFileService : BaseDatabaseService, IContactPictureFileService
+{
+    private sealed class LegacyAccountContactPictureRow
+    {
+        public string Address { get; set; }
+        public string Base64ContactPicture { get; set; }
+    }
+
+    private const string ContactsSubFolder = "contacts";
+
+    private readonly string _contactPicturesFolder;
+    private readonly ILogger _logger = Log.ForContext<ContactPictureFileService>();
+
+    public ContactPictureFileService(IDatabaseService databaseService, IApplicationConfiguration applicationConfiguration)
+        : base(databaseService)
+    {
+        _contactPicturesFolder = Path.Combine(applicationConfiguration.ApplicationDataFolderPath, ContactsSubFolder);
+        Directory.CreateDirectory(_contactPicturesFolder);
+    }
+
+    public string GetContactPicturePath(Guid fileId)
+    {
+        var path = BuildFilePath(fileId);
+        return File.Exists(path) ? path : null;
+    }
+
+    public async Task<Guid> SaveContactPictureAsync(byte[] imageData)
+    {
+        var fileId = Guid.NewGuid();
+        var filePath = BuildFilePath(fileId);
+        await File.WriteAllBytesAsync(filePath, imageData).ConfigureAwait(false);
+        return fileId;
+    }
+
+    public Task DeleteContactPictureAsync(Guid fileId)
+    {
+        var filePath = BuildFilePath(fileId);
+        if (File.Exists(filePath))
+            File.Delete(filePath);
+        return Task.CompletedTask;
+    }
+    private string BuildFilePath(Guid fileId) => Path.Combine(_contactPicturesFolder, $"{fileId}.jpg");
+}
diff --git a/Wino.Services/ContactService.cs b/Wino.Services/ContactService.cs
index 65b7fcd7..3ab4e893 100644
--- a/Wino.Services/ContactService.cs
+++ b/Wino.Services/ContactService.cs
@@ -1,26 +1,36 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using MimeKit;
 using Serilog;
-using SqlKata;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Contacts;
 using Wino.Services.Extensions;
 
 namespace Wino.Services;
 
 public class ContactService : BaseDatabaseService, IContactService
 {
+    /// <summary>
+    /// In-memory contact cache keyed by e-mail address (case-insensitive).
+    /// Eliminates per-mail DB round-trips during bulk mail list loads.
+    /// Entries are added on fetch and invalidated on update/delete.
+    /// </summary>
+    private readonly ConcurrentDictionary<string, AccountContact> _cache
+        = new(StringComparer.OrdinalIgnoreCase);
+
     public ContactService(IDatabaseService databaseService) : base(databaseService) { }
 
     public async Task<AccountContact> CreateNewContactAsync(string address, string displayName)
     {
         var contact = new AccountContact() { Address = address, Name = displayName };
 
-        await Connection.InsertAsync(contact).ConfigureAwait(false);
+        await Connection.InsertAsync(contact, typeof(AccountContact)).ConfigureAwait(false);
 
+        _cache[address] = contact;
         return contact;
     }
 
@@ -29,45 +39,478 @@ public class ContactService : BaseDatabaseService, IContactService
         if (queryText == null || queryText.Length < 2)
             return Task.FromResult<List<AccountContact>>(null);
 
-        var query = new Query(nameof(AccountContact));
-        query.WhereContains("Address", queryText);
-        query.OrWhereContains("Name", queryText);
-
-        var rawLikeQuery = query.GetRawQuery();
-
-        return Connection.QueryAsync<AccountContact>(rawLikeQuery);
+        const string query = "SELECT * FROM AccountContact WHERE Address LIKE ? OR Name LIKE ?";
+        var pattern = $"%{queryText}%";
+        return Connection.QueryAsync<AccountContact>(query, pattern, pattern);
     }
 
-    public Task<AccountContact> GetAddressInformationByAddressAsync(string address)
-        => Connection.Table<AccountContact>().FirstOrDefaultAsync(a => a.Address == address);
+    public async Task<AccountContact> GetAddressInformationByAddressAsync(string address)
+    {
+        if (string.IsNullOrEmpty(address))
+            return null;
+
+        if (_cache.TryGetValue(address, out var cached))
+            return cached;
+
+        var contact = await Connection.Table<AccountContact>().FirstOrDefaultAsync(a => a.Address == address).ConfigureAwait(false);
+
+        if (contact != null)
+            _cache[contact.Address] = contact;
+
+        return contact;
+    }
+
+    public async Task<List<AccountContact>> GetContactsByAddressesAsync(IEnumerable<string> addresses)
+    {
+        var addressList = addresses?.Where(a => !string.IsNullOrEmpty(a)).Distinct(StringComparer.OrdinalIgnoreCase).ToList();
+        if (addressList == null || addressList.Count == 0)
+            return new List<AccountContact>();
+
+        var result = new List<AccountContact>(addressList.Count);
+        var missing = new List<string>();
+
+        foreach (var addr in addressList)
+        {
+            if (_cache.TryGetValue(addr, out var cached))
+                result.Add(cached);
+            else
+                missing.Add(addr);
+        }
+
+        if (missing.Count > 0)
+        {
+            var placeholders = string.Join(",", missing.Select(_ => "?"));
+            var fromDb = await Connection.QueryAsync<AccountContact>(
+                $"SELECT * FROM AccountContact WHERE Address IN ({placeholders})",
+                missing.Cast<object>().ToArray()).ConfigureAwait(false);
+
+            foreach (var contact in fromDb)
+            {
+                _cache[contact.Address] = contact;
+                result.Add(contact);
+            }
+        }
+
+        return result;
+    }
 
     public async Task SaveAddressInformationAsync(MimeMessage message)
     {
-        var recipients = message
-                    .GetRecipients(true)
-                    .Where(a => !string.IsNullOrEmpty(a.Name) && !string.IsNullOrEmpty(a.Address));
+        if (message == null) return;
 
-        var addressInformations = recipients.Select(a => new AccountContact() { Name = a.Name, Address = a.Address });
+        // Save all individual contacts (GetRecipients expands GroupAddress members automatically).
+        var contacts = message
+            .GetRecipients(true)
+            .Where(a => !string.IsNullOrWhiteSpace(a.Address))
+            .Select(a => new AccountContact
+            {
+                Name = string.IsNullOrWhiteSpace(a.Name) ? a.Address : a.Name,
+                Address = a.Address
+            });
 
-        foreach (var info in addressInformations)
+        await SaveAddressInformationInternalAsync(contacts).ConfigureAwait(false);
+
+        // Persist named RFC 2822 group structure (e.g. "Team Alpha: alice@x.com, bob@x.com;").
+        await SaveGroupsFromInternetAddressesAsync(message.To, message.Cc, message.Bcc).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Detects <see cref="GroupAddress"/> entries in the supplied address lists and upserts
+    /// corresponding <see cref="ContactGroup"/> and <see cref="ContactGroupMember"/> rows.
+    /// Individual member contacts are expected to already be saved by the caller.
+    /// </summary>
+    private async Task SaveGroupsFromInternetAddressesAsync(params InternetAddressList[] addressLists)
+    {
+        foreach (var list in addressLists)
         {
-            var currentContact = await GetAddressInformationByAddressAsync(info.Address).ConfigureAwait(false);
+            if (list == null) continue;
 
-            try
+            foreach (var address in list)
             {
-                if (currentContact == null)
+                if (address is not GroupAddress group) continue;
+                var groupName = group.Name?.Trim();
+                if (!ShouldPersistGroupName(groupName)) continue;
+
+                var memberAddresses = group.Members
+                    .OfType<MailboxAddress>()
+                    .Where(m => !string.IsNullOrWhiteSpace(m.Address))
+                    .Select(m => new { Address = m.Address.Trim(), m.Name })
+                    .Where(m => ShouldPersistAutoCollectedContact(m.Address, m.Name))
+                    .Select(m => m.Address)
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                if (memberAddresses.Count == 0) continue;
+
+                var contactGroup = await GetOrCreateGroupByNameAsync(groupName!).ConfigureAwait(false);
+
+                // Fetch current members once to avoid duplicate inserts.
+                var existingMembers = await Connection.QueryAsync<ContactGroupMember>(
+                    "SELECT * FROM ContactGroupMember WHERE GroupId = ?", contactGroup.Id
+                ).ConfigureAwait(false);
+
+                var existingAddresses = new HashSet<string>(
+                    existingMembers.Select(m => m.MemberAddress),
+                    StringComparer.OrdinalIgnoreCase
+                );
+
+                foreach (var memberAddress in memberAddresses)
                 {
-                    await Connection.InsertAsync(info).ConfigureAwait(false);
+                    if (!existingAddresses.Contains(memberAddress))
+                        await AddGroupMemberAsync(contactGroup.Id, memberAddress).ConfigureAwait(false);
                 }
-                else if (!currentContact.IsRootContact) // Don't update root contacts. They belong to accounts.
-                {
-                    await Connection.InsertOrReplaceAsync(info).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error("Failed to add contact information to the database.", ex);
             }
         }
     }
+
+    /// <summary>
+    /// Returns the <see cref="ContactGroup"/> with the given name, creating it if it does not exist.
+    /// </summary>
+    private async Task<ContactGroup> GetOrCreateGroupByNameAsync(string name)
+    {
+        var existing = await Connection.QueryAsync<ContactGroup>(
+            "SELECT * FROM ContactGroup WHERE Name = ? LIMIT 1", name
+        ).ConfigureAwait(false);
+
+        return existing.Count > 0
+            ? existing[0]
+            : await CreateGroupAsync(name).ConfigureAwait(false);
+    }
+
+    public async Task SaveAddressInformationAsync(IEnumerable<AccountContact> contacts)
+    {
+        if (contacts == null) return;
+
+        await SaveAddressInformationInternalAsync(contacts).ConfigureAwait(false);
+    }
+
+    private async Task SaveAddressInformationInternalAsync(IEnumerable<AccountContact> contacts)
+    {
+        var normalizedContacts = contacts
+            .Where(a => a != null && !string.IsNullOrWhiteSpace(a.Address))
+            .Select(a => new AccountContact
+            {
+                Address = a.Address.Trim(),
+                Name = string.IsNullOrWhiteSpace(a.Name) ? a.Address.Trim() : a.Name.Trim()
+            })
+            .GroupBy(a => a.Address, StringComparer.OrdinalIgnoreCase)
+            .Select(g => g.First())
+            .ToList();
+
+        if (normalizedContacts.Count == 0) return;
+
+        try
+        {
+            var noiseAddresses = normalizedContacts
+                .Where(a => !ShouldPersistAutoCollectedContact(a.Address, a.Name))
+                .Select(a => a.Address)
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            if (noiseAddresses.Count > 0)
+                await DeleteAutoCapturedContactsAsync(noiseAddresses).ConfigureAwait(false);
+
+            var addressInformations = normalizedContacts
+                .Where(a => ShouldPersistAutoCollectedContact(a.Address, a.Name))
+                .ToList();
+
+            if (addressInformations.Count == 0) return;
+
+            // Batch-fetch all existing contacts in one query.
+            var addresses = addressInformations.Select(a => a.Address).ToList();
+            var placeholders = string.Join(",", addresses.Select((_, i) => "?"));
+            var existingContacts = await Connection.QueryAsync<AccountContact>(
+                $"SELECT * FROM AccountContact WHERE Address IN ({placeholders})",
+                addresses.Cast<object>().ToArray()
+            ).ConfigureAwait(false);
+
+            var existingLookup = existingContacts.ToDictionary(c => c.Address, StringComparer.OrdinalIgnoreCase);
+
+            var toInsert = new List<AccountContact>();
+            var toUpdate = new List<AccountContact>();
+
+            foreach (var info in addressInformations)
+            {
+                if (!existingLookup.TryGetValue(info.Address, out var existing))
+                {
+                    toInsert.Add(info);
+                }
+                else if (!existing.IsRootContact && !existing.IsOverridden)
+                {
+                    // Only update if the new name is more informative (not just the email address)
+                    // and actually different from the current name.
+                    if (info.Name != info.Address && existing.Name != info.Name)
+                    {
+                        existing.Name = info.Name;
+                        toUpdate.Add(existing);
+                    }
+                }
+            }
+
+            if (toInsert.Count > 0 || toUpdate.Count > 0)
+            {
+                await Connection.RunInTransactionAsync(conn =>
+                {
+                    if (toInsert.Count > 0)
+                        conn.InsertAll(toInsert, typeof(AccountContact));
+
+                    foreach (var contact in toUpdate)
+                        conn.Update(contact, typeof(AccountContact));
+                }).ConfigureAwait(false);
+
+                // Update cache for inserted and updated contacts.
+                foreach (var c in toInsert)
+                    _cache[c.Address] = c;
+                foreach (var c in toUpdate)
+                    _cache[c.Address] = c;
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to batch save contact information to the database.");
+        }
+    }
+
+    private async Task DeleteAutoCapturedContactsAsync(IReadOnlyList<string> addresses)
+    {
+        if (addresses == null || addresses.Count == 0) return;
+
+        var placeholders = string.Join(",", addresses.Select(_ => "?"));
+        await Connection.ExecuteAsync(
+            $"DELETE FROM AccountContact WHERE Address IN ({placeholders}) AND IsRootContact = 0 AND IsOverridden = 0",
+            addresses.Cast<object>().ToArray()
+        ).ConfigureAwait(false);
+
+        foreach (var address in addresses)
+            _cache.TryRemove(address, out _);
+    }
+
+    private static bool ShouldPersistAutoCollectedContact(string address, string displayName)
+    {
+        if (!TryGetLocalPart(address, out var localPart))
+            return false;
+
+        var localPartLower = localPart.ToLowerInvariant();
+
+        // High confidence machine-generated senders/recipients that should not pollute the contact list.
+        if (localPartLower.StartsWith("reply+", StringComparison.Ordinal) ||
+            localPartLower.Contains("noreply", StringComparison.Ordinal) ||
+            localPartLower.Contains("no-reply", StringComparison.Ordinal) ||
+            localPartLower.Contains("donotreply", StringComparison.Ordinal) ||
+            localPartLower.Contains("do-not-reply", StringComparison.Ordinal) ||
+            localPartLower == "mailer-daemon" ||
+            localPartLower == "postmaster")
+        {
+            return false;
+        }
+
+        // Generic notification mailboxes are only persisted when they look human-assigned.
+        if (localPartLower is "notification" or "notifications" or "updates" or "digest")
+            return !IsLikelyMachineGeneratedDisplayName(displayName);
+
+        return true;
+    }
+
+    private static bool ShouldPersistGroupName(string groupName)
+    {
+        if (string.IsNullOrWhiteSpace(groupName)) return false;
+
+        var trimmed = groupName.Trim();
+        var lower = trimmed.ToLowerInvariant();
+
+        if (lower.Contains("issue #", StringComparison.Ordinal) ||
+            lower.Contains("pull request #", StringComparison.Ordinal) ||
+            lower.Contains("discussion #", StringComparison.Ordinal) ||
+            lower.Contains("notification", StringComparison.Ordinal))
+        {
+            return false;
+        }
+
+        // GitHub-like dynamic repository labels: [owner/repository]
+        if (trimmed.StartsWith("[", StringComparison.Ordinal) &&
+            trimmed.Contains('/') &&
+            trimmed.Contains("]"))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static bool IsLikelyMachineGeneratedDisplayName(string displayName)
+    {
+        if (string.IsNullOrWhiteSpace(displayName)) return false;
+
+        var trimmed = displayName.Trim();
+        var lower = trimmed.ToLowerInvariant();
+
+        if (lower.Contains("notification", StringComparison.Ordinal) ||
+            lower.Contains("issue #", StringComparison.Ordinal) ||
+            lower.Contains("pull request #", StringComparison.Ordinal) ||
+            lower.Contains("discussion #", StringComparison.Ordinal))
+        {
+            return true;
+        }
+
+        return trimmed.StartsWith("[", StringComparison.Ordinal) &&
+               trimmed.Contains('/') &&
+               trimmed.Contains("]");
+    }
+
+    private static bool TryGetLocalPart(string address, out string localPart)
+    {
+        localPart = string.Empty;
+
+        if (string.IsNullOrWhiteSpace(address))
+            return false;
+
+        var trimmed = address.Trim();
+        var atIndex = trimmed.LastIndexOf('@');
+        if (atIndex <= 0 || atIndex == trimmed.Length - 1)
+            return false;
+
+        localPart = trimmed[..atIndex];
+        return !string.IsNullOrWhiteSpace(localPart);
+    }
+
+    public Task<List<AccountContact>> GetAllContactsAsync()
+    {
+        return Connection.Table<AccountContact>().ToListAsync();
+    }
+
+    public Task<List<AccountContact>> SearchContactsAsync(string searchQuery)
+    {
+        if (string.IsNullOrWhiteSpace(searchQuery))
+            return GetAllContactsAsync();
+
+        const string query = "SELECT * FROM AccountContact WHERE Address LIKE ? OR Name LIKE ?";
+        var pattern = $"%{searchQuery.Trim()}%";
+        return Connection.QueryAsync<AccountContact>(query, pattern, pattern);
+    }
+
+    public async Task<PagedContactsResult> GetContactsPageAsync(int offset, int pageSize, string searchQuery = null, bool excludeRootContacts = false)
+    {
+        offset = Math.Max(0, offset);
+        pageSize = Math.Max(1, pageSize);
+
+        var whereClauses = new List<string>();
+        var parameters = new List<object>();
+
+        if (excludeRootContacts)
+        {
+            whereClauses.Add("IsRootContact = 0");
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchQuery))
+        {
+            var pattern = $"%{searchQuery.Trim()}%";
+            whereClauses.Add("(Address LIKE ? OR Name LIKE ?)");
+            parameters.Add(pattern);
+            parameters.Add(pattern);
+        }
+
+        var whereSql = whereClauses.Count > 0
+            ? $" WHERE {string.Join(" AND ", whereClauses)}"
+            : string.Empty;
+
+        var countQuery = $"SELECT COUNT(*) FROM AccountContact{whereSql}";
+        var totalCount = await Connection.ExecuteScalarAsync<int>(countQuery, parameters.ToArray()).ConfigureAwait(false);
+
+        var pageParameters = new List<object>(parameters)
+        {
+            pageSize,
+            offset
+        };
+
+        var pageQuery = $"SELECT * FROM AccountContact{whereSql} ORDER BY COALESCE(Name, Address) COLLATE NOCASE, Address COLLATE NOCASE LIMIT ? OFFSET ?";
+        var contacts = await Connection.QueryAsync<AccountContact>(pageQuery, pageParameters.ToArray()).ConfigureAwait(false);
+        var hasMore = offset + contacts.Count < totalCount;
+
+        return new PagedContactsResult(contacts, totalCount, hasMore, offset, pageSize);
+    }
+
+    public async Task<AccountContact> UpdateContactAsync(AccountContact contact)
+    {
+        // Mark the contact as overridden when manually updated
+        contact.IsOverridden = true;
+
+        await Connection.UpdateAsync(contact, typeof(AccountContact)).ConfigureAwait(false);
+
+        _cache[contact.Address] = contact;
+        return contact;
+    }
+
+    public async Task DeleteContactAsync(string address)
+    {
+        var contact = await GetAddressInformationByAddressAsync(address).ConfigureAwait(false);
+
+        if (contact != null && !contact.IsRootContact)
+        {
+            await Connection.DeleteAsync<AccountContact>(contact.Address).ConfigureAwait(false);
+            _cache.TryRemove(address, out _);
+        }
+    }
+
+    public async Task DeleteContactsAsync(IEnumerable<string> addresses)
+    {
+        var addressList = addresses.Where(a => !string.IsNullOrEmpty(a)).ToList();
+        if (addressList.Count == 0) return;
+
+        var placeholders = string.Join(",", addressList.Select((_, i) => "?"));
+        await Connection.ExecuteAsync(
+            $"DELETE FROM AccountContact WHERE Address IN ({placeholders}) AND IsRootContact = 0",
+            addressList.Cast<object>().ToArray()
+        ).ConfigureAwait(false);
+
+        foreach (var addr in addressList)
+            _cache.TryRemove(addr, out _);
+    }
+
+    #region Group / Distribution List
+
+    public Task<List<ContactGroup>> GetGroupsAsync()
+        => Connection.Table<ContactGroup>().OrderBy(g => g.Name).ToListAsync();
+
+    public async Task<ContactGroup> CreateGroupAsync(string name, string description = null)
+    {
+        var group = new ContactGroup { Id = Guid.NewGuid(), Name = name, Description = description };
+        await Connection.InsertAsync(group, typeof(ContactGroup)).ConfigureAwait(false);
+        return group;
+    }
+
+    public async Task DeleteGroupAsync(Guid groupId)
+    {
+        // Remove members first to avoid orphaned rows.
+        await Connection.ExecuteAsync(
+            "DELETE FROM ContactGroupMember WHERE GroupId = ?", groupId).ConfigureAwait(false);
+        await Connection.DeleteAsync<ContactGroup>(groupId).ConfigureAwait(false);
+    }
+
+    public async Task<List<AccountContact>> GetGroupMembersAsync(Guid groupId)
+    {
+        var members = await Connection.QueryAsync<ContactGroupMember>(
+            "SELECT * FROM ContactGroupMember WHERE GroupId = ?", groupId).ConfigureAwait(false);
+
+        var addresses = members.Select(m => m.MemberAddress).ToList();
+        return await GetContactsByAddressesAsync(addresses).ConfigureAwait(false);
+    }
+
+    public async Task AddGroupMemberAsync(Guid groupId, string memberAddress)
+    {
+        var member = new ContactGroupMember { GroupId = groupId, MemberAddress = memberAddress };
+        await Connection.InsertAsync(member, typeof(ContactGroupMember)).ConfigureAwait(false);
+    }
+
+    public async Task RemoveGroupMemberAsync(Guid groupId, string memberAddress)
+    {
+        await Connection.ExecuteAsync(
+            "DELETE FROM ContactGroupMember WHERE GroupId = ? AND MemberAddress = ?",
+            groupId, memberAddress).ConfigureAwait(false);
+    }
+
+    public Task<List<AccountContact>> ExpandGroupAsync(Guid groupId)
+        => GetGroupMembersAsync(groupId);
+
+    #endregion
 }
+
diff --git a/Wino.Services/ContextMenuItemService.cs b/Wino.Services/ContextMenuItemService.cs
index a0847fe9..c50c8716 100644
--- a/Wino.Services/ContextMenuItemService.cs
+++ b/Wino.Services/ContextMenuItemService.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
+using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
 using Wino.Core.Domain.Models.Menus;
 
 namespace Wino.Services;
@@ -35,7 +35,7 @@ public class ContextMenuItemService : IContextMenuItemService
 
         return list;
     }
-    public virtual IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IEnumerable<IMailItem> selectedMailItems)
+    public virtual IEnumerable<MailOperationMenuItem> GetMailItemContextMenuActions(IEnumerable<MailCopy> selectedMailItems)
     {
         if (selectedMailItems == null)
             return default;
@@ -50,7 +50,7 @@ public class ContextMenuItemService : IContextMenuItemService
 
         bool isSingleItem = selectedMailItems.Count() == 1;
 
-        IMailItem singleItem = selectedMailItems.FirstOrDefault();
+        MailCopy singleItem = selectedMailItems.FirstOrDefault();
 
         // Archive button.
 
@@ -125,7 +125,7 @@ public class ContextMenuItemService : IContextMenuItemService
 
         return operationList;
     }
-    public virtual IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(IMailItem mailItem, bool isDarkEditor)
+    public virtual IEnumerable<MailOperationMenuItem> GetMailItemRenderMenuActions(MailCopy mailItem, bool isDarkEditor)
     {
         var actionList = new List<MailOperationMenuItem>();
 
diff --git a/Wino.Services/DatabaseService.cs b/Wino.Services/DatabaseService.cs
index 2d316a26..18addf24 100644
--- a/Wino.Services/DatabaseService.cs
+++ b/Wino.Services/DatabaseService.cs
@@ -1,9 +1,11 @@
-using System.IO;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using SQLite;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Services;
@@ -15,7 +17,7 @@ public interface IDatabaseService : IInitializeAsync
 
 public class DatabaseService : IDatabaseService
 {
-    private const string DatabaseName = "Wino180.db";
+    private const string DatabaseName = "Wino200.db";
 
     private bool _isInitialized = false;
     private readonly IApplicationConfiguration _folderConfiguration;
@@ -36,6 +38,7 @@ public class DatabaseService : IDatabaseService
         var databaseFileName = Path.Combine(publisherCacheFolder, DatabaseName);
 
         Connection = new SQLiteAsyncConnection(databaseFileName);
+        await Connection.ExecuteAsync("PRAGMA foreign_keys = ON;").ConfigureAwait(false);
 
         await CreateTablesAsync();
 
@@ -44,21 +47,183 @@ public class DatabaseService : IDatabaseService
 
     private async Task CreateTablesAsync()
     {
-        await Connection.CreateTablesAsync(CreateFlags.None,
-            typeof(MailCopy),
-            typeof(MailItemFolder),
-            typeof(MailAccount),
-            typeof(AccountContact),
-            typeof(CustomServerInformation),
-            typeof(AccountSignature),
-            typeof(MergedInbox),
-            typeof(MailAccountPreferences),
-            typeof(MailAccountAlias),
-            typeof(AccountCalendar),
-            typeof(CalendarEventAttendee),
-            typeof(CalendarItem),
-            typeof(Reminder),
-            typeof(Thumbnail)
-            );
+        await Task.WhenAll(
+            Connection.CreateTableAsync<MailCopy>(),
+            Connection.CreateTableAsync<MailItemFolder>(),
+            Connection.CreateTableAsync<MailAccount>(),
+            Connection.CreateTableAsync<AccountContact>(),
+            Connection.CreateTableAsync<ContactGroup>(),
+            Connection.CreateTableAsync<ContactGroupMember>(),
+            Connection.CreateTableAsync<CustomServerInformation>(),
+            Connection.CreateTableAsync<AccountSignature>(),
+            Connection.CreateTableAsync<EmailTemplate>(),
+            Connection.CreateTableAsync<MergedInbox>(),
+            Connection.CreateTableAsync<MailAccountPreferences>(),
+            Connection.CreateTableAsync<MailAccountAlias>(),
+            Connection.CreateTableAsync<Thumbnail>(),
+            Connection.CreateTableAsync<KeyboardShortcut>(),
+            Connection.CreateTableAsync<AccountCalendar>(),
+            Connection.CreateTableAsync<CalendarEventAttendee>(),
+            Connection.CreateTableAsync<CalendarItem>(),
+            Connection.CreateTableAsync<CalendarAttachment>(),
+            Connection.CreateTableAsync<Reminder>(),
+            Connection.CreateTableAsync<MailInvitationCalendarMapping>(),
+            Connection.CreateTableAsync<WinoAccount>());
+
+        await EnsureSchemaUpgradesAsync().ConfigureAwait(false);
+        await EnsureIndexesAsync().ConfigureAwait(false);
+    }
+
+    private async Task EnsureSchemaUpgradesAsync()
+    {
+        await EnsureKeyboardShortcutSchemaAsync().ConfigureAwait(false);
+
+        var folderColumns = await Connection.GetTableInfoAsync(nameof(MailItemFolder)).ConfigureAwait(false);
+
+        if (!folderColumns.Any(c => c.Name == nameof(MailItemFolder.HighestKnownUid)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(MailItemFolder)} ADD COLUMN {nameof(MailItemFolder.HighestKnownUid)} INTEGER NOT NULL DEFAULT 0")
+                .ConfigureAwait(false);
+        }
+
+        if (!folderColumns.Any(c => c.Name == nameof(MailItemFolder.LastUidReconcileUtc)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(MailItemFolder)} ADD COLUMN {nameof(MailItemFolder.LastUidReconcileUtc)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        var customServerColumns = await Connection.GetTableInfoAsync(nameof(CustomServerInformation)).ConfigureAwait(false);
+
+        if (!customServerColumns.Any(c => c.Name == nameof(CustomServerInformation.CalDavServiceUrl)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(CustomServerInformation)} ADD COLUMN {nameof(CustomServerInformation.CalDavServiceUrl)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        if (!customServerColumns.Any(c => c.Name == nameof(CustomServerInformation.CalDavUsername)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(CustomServerInformation)} ADD COLUMN {nameof(CustomServerInformation.CalDavUsername)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        if (!customServerColumns.Any(c => c.Name == nameof(CustomServerInformation.CalDavPassword)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(CustomServerInformation)} ADD COLUMN {nameof(CustomServerInformation.CalDavPassword)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        if (!customServerColumns.Any(c => c.Name == nameof(CustomServerInformation.CalendarSupportMode)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(CustomServerInformation)} ADD COLUMN {nameof(CustomServerInformation.CalendarSupportMode)} INTEGER NOT NULL DEFAULT 0")
+                .ConfigureAwait(false);
+        }
+
+        var calendarItemColumns = await Connection.GetTableInfoAsync(nameof(CalendarItem)).ConfigureAwait(false);
+
+        if (!calendarItemColumns.Any(c => c.Name == nameof(CalendarItem.SnoozedUntil)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(CalendarItem)} ADD COLUMN {nameof(CalendarItem.SnoozedUntil)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        var contactColumns = await Connection.GetTableInfoAsync(nameof(AccountContact)).ConfigureAwait(false);
+
+        if (!contactColumns.Any(c => c.Name == nameof(AccountContact.ContactPictureFileId)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(AccountContact)} ADD COLUMN {nameof(AccountContact.ContactPictureFileId)} TEXT NULL")
+                .ConfigureAwait(false);
+        }
+
+        await Connection.ExecuteAsync("DROP TABLE IF EXISTS WinoAccountAddOnCache").ConfigureAwait(false);
+    }
+
+    private async Task EnsureKeyboardShortcutSchemaAsync()
+    {
+        var keyboardShortcutColumns = await Connection.GetTableInfoAsync(nameof(KeyboardShortcut)).ConfigureAwait(false);
+
+        if (!keyboardShortcutColumns.Any(c => c.Name == nameof(KeyboardShortcut.Mode)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(KeyboardShortcut)} ADD COLUMN {nameof(KeyboardShortcut.Mode)} INTEGER NOT NULL DEFAULT 0")
+                .ConfigureAwait(false);
+        }
+
+        if (!keyboardShortcutColumns.Any(c => c.Name == nameof(KeyboardShortcut.Action)))
+        {
+            await Connection
+                .ExecuteAsync($"ALTER TABLE {nameof(KeyboardShortcut)} ADD COLUMN {nameof(KeyboardShortcut.Action)} INTEGER NOT NULL DEFAULT 0")
+                .ConfigureAwait(false);
+
+            await Connection.ExecuteAsync($@"
+UPDATE {nameof(KeyboardShortcut)}
+SET {nameof(KeyboardShortcut.Action)} =
+    CASE
+        WHEN MailOperation = {(int)MailOperation.Archive} THEN {(int)KeyboardShortcutAction.ToggleArchive}
+        WHEN MailOperation = {(int)MailOperation.UnArchive} THEN {(int)KeyboardShortcutAction.ToggleArchive}
+        WHEN MailOperation = {(int)MailOperation.SoftDelete} THEN {(int)KeyboardShortcutAction.Delete}
+        WHEN MailOperation = {(int)MailOperation.HardDelete} THEN {(int)KeyboardShortcutAction.Delete}
+        WHEN MailOperation = {(int)MailOperation.Move} THEN {(int)KeyboardShortcutAction.Move}
+        WHEN MailOperation = {(int)MailOperation.SetFlag} THEN {(int)KeyboardShortcutAction.ToggleFlag}
+        WHEN MailOperation = {(int)MailOperation.ClearFlag} THEN {(int)KeyboardShortcutAction.ToggleFlag}
+        WHEN MailOperation = {(int)MailOperation.MarkAsRead} THEN {(int)KeyboardShortcutAction.ToggleReadUnread}
+        WHEN MailOperation = {(int)MailOperation.MarkAsUnread} THEN {(int)KeyboardShortcutAction.ToggleReadUnread}
+        WHEN MailOperation = {(int)MailOperation.Reply} THEN {(int)KeyboardShortcutAction.Reply}
+        WHEN MailOperation = {(int)MailOperation.ReplyAll} THEN {(int)KeyboardShortcutAction.ReplyAll}
+        WHEN MailOperation = {(int)MailOperation.Forward} THEN {(int)KeyboardShortcutAction.Reply}
+        ELSE {(int)KeyboardShortcutAction.None}
+    END").ConfigureAwait(false);
+        }
+    }
+
+    private async Task EnsureIndexesAsync()
+    {
+        // Mail indexes
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_Id ON MailCopy(Id)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_FolderId ON MailCopy(FolderId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_Id_FolderId ON MailCopy(Id, FolderId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_ThreadId ON MailCopy(ThreadId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_MessageId ON MailCopy(MessageId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_FolderId_IsRead ON MailCopy(FolderId, IsRead)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailCopy_CreationDate ON MailCopy(CreationDate)").ConfigureAwait(false);
+
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailItemFolder_MailAccountId ON MailItemFolder(MailAccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailItemFolder_MailAccountId_RemoteFolderId ON MailItemFolder(MailAccountId, RemoteFolderId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailItemFolder_MailAccountId_ParentRemoteFolderId ON MailItemFolder(MailAccountId, ParentRemoteFolderId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailItemFolder_MailAccountId_SpecialFolderType ON MailItemFolder(MailAccountId, SpecialFolderType)").ConfigureAwait(false);
+
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailAccount_MergedInboxId ON MailAccount(MergedInboxId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailAccount_Order ON MailAccount([Order])").ConfigureAwait(false);
+
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_AccountSignature_MailAccountId ON AccountSignature(MailAccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_EmailTemplate_Name ON EmailTemplate(Name)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailAccountAlias_AccountId ON MailAccountAlias(AccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailAccountAlias_AccountId_AliasAddress ON MailAccountAlias(AccountId, AliasAddress)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE UNIQUE INDEX IF NOT EXISTS IX_MailAccountPreferences_AccountId ON MailAccountPreferences(AccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE UNIQUE INDEX IF NOT EXISTS IX_CustomServerInformation_AccountId ON CustomServerInformation(AccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE UNIQUE INDEX IF NOT EXISTS IX_WinoAccount_Email ON WinoAccount(Email)").ConfigureAwait(false);
+
+        // Calendar indexes
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_AccountCalendar_AccountId ON AccountCalendar(AccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_CalendarItem_CalendarId ON CalendarItem(CalendarId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_CalendarItem_CalendarId_RemoteEventId ON CalendarItem(CalendarId, RemoteEventId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_CalendarItem_RecurringCalendarItemId ON CalendarItem(RecurringCalendarItemId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_CalendarEventAttendee_CalendarItemId ON CalendarEventAttendee(CalendarItemId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_Reminder_CalendarItemId ON Reminder(CalendarItemId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_CalendarAttachment_CalendarItemId ON CalendarAttachment(CalendarItemId)").ConfigureAwait(false);
+
+        // Invitation mapping indexes
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailInvitationCalendarMapping_AccountId ON MailInvitationCalendarMapping(AccountId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailInvitationCalendarMapping_MailCopyId ON MailInvitationCalendarMapping(MailCopyId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailInvitationCalendarMapping_InvitationUid ON MailInvitationCalendarMapping(InvitationUid)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailInvitationCalendarMapping_CalendarId ON MailInvitationCalendarMapping(CalendarId)").ConfigureAwait(false);
+        await Connection.ExecuteAsync("CREATE INDEX IF NOT EXISTS IX_MailInvitationCalendarMapping_CalendarItemId ON MailInvitationCalendarMapping(CalendarItemId)").ConfigureAwait(false);
     }
 }
diff --git a/Wino.Services/EmailTemplateService.cs b/Wino.Services/EmailTemplateService.cs
new file mode 100644
index 00000000..063517ee
--- /dev/null
+++ b/Wino.Services/EmailTemplateService.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Mail;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Services;
+
+public class EmailTemplateService(IDatabaseService databaseService) : BaseDatabaseService(databaseService), IEmailTemplateService
+{
+    public Task<List<EmailTemplate>> GetEmailTemplatesAsync()
+    {
+        return Connection.Table<EmailTemplate>()
+            .OrderBy(t => t.Name)
+            .ToListAsync();
+    }
+
+    public Task<EmailTemplate> GetEmailTemplateAsync(Guid templateId)
+    {
+        return Connection.Table<EmailTemplate>()
+            .FirstOrDefaultAsync(t => t.Id == templateId);
+    }
+
+    public async Task<EmailTemplate> CreateEmailTemplateAsync(EmailTemplate template)
+    {
+        await Connection.InsertAsync(template, typeof(EmailTemplate)).ConfigureAwait(false);
+        return template;
+    }
+
+    public async Task<EmailTemplate> UpdateEmailTemplateAsync(EmailTemplate template)
+    {
+        await Connection.UpdateAsync(template, typeof(EmailTemplate)).ConfigureAwait(false);
+        return template;
+    }
+
+    public async Task<EmailTemplate> DeleteEmailTemplateAsync(EmailTemplate template)
+    {
+        await Connection.DeleteAsync<EmailTemplate>(template.Id).ConfigureAwait(false);
+        return template;
+    }
+}
diff --git a/Wino.Services/Extensions/MailkitClientExtensions.cs b/Wino.Services/Extensions/MailkitClientExtensions.cs
index d1431880..2219f3ee 100644
--- a/Wino.Services/Extensions/MailkitClientExtensions.cs
+++ b/Wino.Services/Extensions/MailkitClientExtensions.cs
@@ -93,44 +93,156 @@ public static class MailkitClientExtensions
             return HtmlAgilityPackExtensions.GetPreviewText(message.HtmlBody);
     }
 
-    public static MailCopy GetMailDetails(this IMessageSummary messageSummary, MailItemFolder folder, MimeMessage mime)
+    public static MailCopy GetMailDetails(this IMessageSummary messageSummary, MailItemFolder folder, MimeMessage mime = null)
     {
-        // MessageSummary will only have UniqueId, Flags, ThreadId.
-        // Other properties are extracted directly from the MimeMessage.
+        // IMAP UIDs are unique only within a folder.
+        // MailCopy.Id maps to {FolderId}_{UID} for deterministic folder-local identity.
 
-        // IMAP doesn't have unique id for mails.
-        // All mails are mapped to specific folders with incremental Id.
-        // Uid 1 may belong to different messages in different folders, but can never be
-        // same for different messages in same folders.
-        // Here we create arbitrary Id that maps the Id of the message with Folder UniqueId.
-        // When folder becomes invalid, we'll clear out these MailCopies as well.
+        var envelope = messageSummary.Envelope;
 
         var messageUid = CreateUid(folder.Id, messageSummary.UniqueId.Id);
-        var previewText = mime.GetPreviewText();
+        var subject = mime?.Subject ?? envelope?.Subject ?? string.Empty;
+        var previewText = mime != null ? mime.GetPreviewText() : GetPreviewText(messageSummary, subject);
+
+        // Prefer InternalDate (server received time). Fall back to envelope date and finally UTC now.
+        var creationDate = messageSummary.InternalDate?.UtcDateTime
+                           ?? envelope?.Date?.UtcDateTime
+                           ?? DateTime.UtcNow;
+
+        var messageId = mime?.GetMessageId() ?? envelope?.MessageId ?? string.Empty;
+        var fromName = mime != null ? GetActualSenderName(mime) : GetEnvelopeSenderName(envelope);
+        var fromAddress = mime != null ? GetActualSenderAddress(mime) : GetEnvelopeSenderAddress(envelope);
+        var references = mime?.References?.GetReferences() ?? messageSummary.References?.GetReferences();
+        var inReplyTo = mime != null ? mime.GetInReplyTo() : envelope?.InReplyTo ?? string.Empty;
+        var threadId = ResolveThreadId(messageSummary, messageId, references, inReplyTo);
+        var hasAttachments = mime != null ? mime.Attachments.Any() : false;
+        var itemType = mime != null ? GetMailItemTypeFromMime(mime) : MailItemType.Mail;
 
         var copy = new MailCopy()
         {
             Id = messageUid,
-            CreationDate = mime.Date.UtcDateTime,
-            ThreadId = messageSummary.GetThreadId(),
-            MessageId = mime.GetMessageId(),
-            Subject = mime.Subject,
+            CreationDate = creationDate,
+            ThreadId = threadId,
+            MessageId = messageId,
+            Subject = subject,
             IsRead = messageSummary.Flags.GetIsRead(),
             IsFlagged = messageSummary.Flags.GetIsFlagged(),
             PreviewText = previewText,
-            FromAddress = GetActualSenderAddress(mime),
-            FromName = GetActualSenderName(mime),
+            FromAddress = fromAddress,
+            FromName = fromName,
             IsFocused = false,
-            Importance = mime.GetImportance(),
-            References = mime.References?.GetReferences(),
-            InReplyTo = mime.GetInReplyTo(),
-            HasAttachments = mime.Attachments.Any(),
-            FileId = Guid.NewGuid()
+            Importance = mime != null ? mime.GetImportance() : MailImportance.Normal,
+            References = references,
+            InReplyTo = inReplyTo,
+            HasAttachments = hasAttachments,
+            FileId = Guid.NewGuid(),
+            ItemType = itemType
         };
 
         return copy;
     }
 
+    private static string ResolveThreadId(IMessageSummary messageSummary, string messageId, string references, string inReplyTo)
+    {
+        var serverThreadId = messageSummary.GetThreadId();
+        if (!string.IsNullOrEmpty(serverThreadId))
+            return serverThreadId;
+
+        // Fallback threading for IMAP providers that do not expose a native ThreadId:
+        // - Prefer root of References chain
+        // - Then In-Reply-To
+        // - Finally own Message-Id (single-message thread root)
+        var rootReference = references?
+            .Split(new[] { ';', ',', ' ', '\t', '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(NormalizeThreadToken)
+            .FirstOrDefault();
+
+        if (!string.IsNullOrEmpty(rootReference))
+            return rootReference;
+
+        var normalizedInReplyTo = NormalizeThreadToken(inReplyTo);
+        if (!string.IsNullOrEmpty(normalizedInReplyTo))
+            return normalizedInReplyTo;
+
+        var normalizedMessageId = NormalizeThreadToken(messageId);
+        if (!string.IsNullOrEmpty(normalizedMessageId))
+            return normalizedMessageId;
+
+        return string.Empty;
+    }
+
+    private static string NormalizeThreadToken(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return string.Empty;
+
+        value = value.Trim();
+
+        if (value.StartsWith("<") && value.EndsWith(">") && value.Length > 2)
+            value = value.Substring(1, value.Length - 2);
+
+        return value;
+    }
+
+    private static string GetPreviewText(IMessageSummary messageSummary, string subjectFallback)
+    {
+        if (!string.IsNullOrWhiteSpace(messageSummary.PreviewText))
+            return messageSummary.PreviewText;
+
+        return subjectFallback ?? string.Empty;
+    }
+
+    private static string GetEnvelopeSenderName(Envelope envelope)
+    {
+        var mailbox = envelope?.From?.Mailboxes?.FirstOrDefault() ?? envelope?.Sender?.Mailboxes?.FirstOrDefault();
+        if (mailbox == null)
+            return Translator.UnknownSender;
+
+        return string.IsNullOrWhiteSpace(mailbox.Name) ? mailbox.Address : mailbox.Name;
+    }
+
+    private static string GetEnvelopeSenderAddress(Envelope envelope)
+    {
+        var mailbox = envelope?.From?.Mailboxes?.FirstOrDefault() ?? envelope?.Sender?.Mailboxes?.FirstOrDefault();
+        return mailbox?.Address ?? Translator.UnknownSender;
+    }
+
+    /// <summary>
+    /// Determines MailItemType based on MIME message content type.
+    /// Calendar invitations have text/calendar content type with METHOD parameter.
+    /// </summary>
+    private static MailItemType GetMailItemTypeFromMime(MimeMessage mime)
+    {
+        if (mime == null) return MailItemType.Mail;
+
+        // Check if the message contains text/calendar content
+        var calendarPart = mime.BodyParts.OfType<MimePart>()
+            .FirstOrDefault(p => p.ContentType?.MimeType?.Equals("text/calendar", StringComparison.OrdinalIgnoreCase) == true);
+
+        if (calendarPart != null)
+        {
+            // Check the METHOD parameter to determine invitation type
+            var method = calendarPart.ContentType.Parameters
+                .FirstOrDefault(p => p.Name.Equals("method", StringComparison.OrdinalIgnoreCase))?.Value?.ToUpperInvariant();
+
+            if (!string.IsNullOrEmpty(method))
+            {
+                return method switch
+                {
+                    "REQUEST" => MailItemType.CalendarInvitation,
+                    "CANCEL" => MailItemType.CalendarCancellation,
+                    "REPLY" => MailItemType.CalendarResponse,
+                    _ => MailItemType.Mail
+                };
+            }
+
+            // If no method specified, assume it's an invitation
+            return MailItemType.CalendarInvitation;
+        }
+
+        return MailItemType.Mail;
+    }
+
     // TODO: Name and Address parsing should be handled better.
     // At some point Wino needs better contact management.
 
diff --git a/Wino.Services/Extensions/SqlKataExtensions.cs b/Wino.Services/Extensions/SqlKataExtensions.cs
deleted file mode 100644
index b7d75e5f..00000000
--- a/Wino.Services/Extensions/SqlKataExtensions.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using SqlKata;
-using SqlKata.Compilers;
-
-namespace Wino.Services.Extensions;
-
-public static class SqlKataExtensions
-{
-    private static SqliteCompiler Compiler = new SqliteCompiler();
-
-    public static string GetRawQuery(this Query query)
-    {
-        return Compiler.Compile(query).ToString();
-    }
-}
diff --git a/Wino.Services/FolderService.cs b/Wino.Services/FolderService.cs
index e2d55101..2728377e 100644
--- a/Wino.Services/FolderService.cs
+++ b/Wino.Services/FolderService.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using Serilog;
-using SqlKata;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
@@ -53,23 +52,38 @@ public class FolderService : BaseDatabaseService, IFolderService
 
         if (account == null) return default;
 
-        var query = new Query("MailCopy")
-                    .Where("FolderId", folderId)
-                    .SelectRaw("count (DISTINCT Id)");
-
-        // If focused inbox is enabled, we need to check if this is the inbox folder.
+        // Convert to raw SQL
+        string sqlQuery;
+        object[] parameters;
+        
         if (account.Preferences.IsFocusedInboxEnabled.GetValueOrDefault() && folder.SpecialFolderType == SpecialFolderType.Inbox)
         {
-            query.Where("IsFocused", 1);
+            if (folder.SpecialFolderType != SpecialFolderType.Draft && folder.SpecialFolderType != SpecialFolderType.Junk)
+            {
+                sqlQuery = "SELECT COUNT(*) FROM MailCopy WHERE FolderId = ? AND IsFocused = ? AND IsRead = ?";
+                parameters = new object[] { folderId, 1, 0 };
+            }
+            else
+            {
+                sqlQuery = "SELECT COUNT(*) FROM MailCopy WHERE FolderId = ? AND IsFocused = ?";
+                parameters = new object[] { folderId, 1 };
+            }
         }
-
-        // Draft and Junk folders are not counted as unread. They must return the item count instead.
-        if (folder.SpecialFolderType != SpecialFolderType.Draft && folder.SpecialFolderType != SpecialFolderType.Junk)
+        else
         {
-            query.Where("IsRead", 0);
+            if (folder.SpecialFolderType != SpecialFolderType.Draft && folder.SpecialFolderType != SpecialFolderType.Junk)
+            {
+                sqlQuery = "SELECT COUNT(*) FROM MailCopy WHERE FolderId = ? AND IsRead = ?";
+                parameters = new object[] { folderId, 0 };
+            }
+            else
+            {
+                sqlQuery = "SELECT COUNT(*) FROM MailCopy WHERE FolderId = ?";
+                parameters = new object[] { folderId };
+            }
         }
 
-        return await Connection.ExecuteScalarAsync<int>(query.GetRawQuery());
+        return await Connection.ExecuteScalarAsync<int>(sqlQuery, parameters);
     }
 
     public async Task<AccountFolderTree> GetFolderStructureForAccountAsync(Guid accountId, bool includeHiddenFolders)
@@ -186,13 +200,10 @@ public class FolderService : BaseDatabaseService, IFolderService
         // Localize category folder name.
         if (parentFolder.SpecialFolderType == SpecialFolderType.Category) parentFolder.FolderName = Translator.CategoriesFolderNameOverride;
 
-        var query = new Query(nameof(MailItemFolder))
-                    .Where(nameof(MailItemFolder.ParentRemoteFolderId), parentFolder.RemoteFolderId)
-                    .Where(nameof(MailItemFolder.MailAccountId), parentFolder.MailAccountId);
-
+        const string query = "SELECT * FROM MailItemFolder WHERE ParentRemoteFolderId = ? AND MailAccountId = ?";
         var preparedFolder = new FolderMenuItem(parentFolder, account, parentMenuItem);
 
-        var childFolders = await Connection.QueryAsync<MailItemFolder>(query.GetRawQuery()).ConfigureAwait(false);
+        var childFolders = await Connection.QueryAsync<MailItemFolder>(query, parentFolder.RemoteFolderId, parentFolder.MailAccountId).ConfigureAwait(false);
 
         if (childFolders.Any())
         {
@@ -348,21 +359,14 @@ public class FolderService : BaseDatabaseService, IFolderService
 
     public Task<List<MailItemFolder>> GetFoldersAsync(Guid accountId)
     {
-        var query = new Query(nameof(MailItemFolder))
-                    .Where(nameof(MailItemFolder.MailAccountId), accountId)
-                    .OrderBy(nameof(MailItemFolder.SpecialFolderType));
-
-        return Connection.QueryAsync<MailItemFolder>(query.GetRawQuery());
+        const string query = "SELECT * FROM MailItemFolder WHERE MailAccountId = ? ORDER BY SpecialFolderType";
+        return Connection.QueryAsync<MailItemFolder>(query, accountId);
     }
 
     public Task<List<MailItemFolder>> GetVisibleFoldersAsync(Guid accountId)
     {
-        var query = new Query(nameof(MailItemFolder))
-                    .Where(nameof(MailItemFolder.MailAccountId), accountId)
-                    .Where(nameof(MailItemFolder.IsHidden), false)
-                    .OrderBy(nameof(MailItemFolder.SpecialFolderType));
-
-        return Connection.QueryAsync<MailItemFolder>(query.GetRawQuery());
+        const string query = "SELECT * FROM MailItemFolder WHERE MailAccountId = ? AND IsHidden = ? ORDER BY SpecialFolderType";
+        return Connection.QueryAsync<MailItemFolder>(query, accountId, 0);
     }
 
     public async Task<IList<uint>> GetKnownUidsForFolderAsync(Guid folderId)
@@ -452,7 +456,7 @@ public class FolderService : BaseDatabaseService, IFolderService
         {
             _logger.Debug("Inserting folder {Id} - {FolderName}", folder.Id, folder.FolderName, folder.MailAccountId);
 
-            await Connection.InsertAsync(folder).ConfigureAwait(false);
+            await Connection.InsertAsync(folder, typeof(MailItemFolder)).ConfigureAwait(false);
         }
         else
         {
@@ -483,9 +487,12 @@ public class FolderService : BaseDatabaseService, IFolderService
 
         _logger.Debug("Updating folder {FolderName}", folder.Id, folder.FolderName);
 
-        await Connection.UpdateAsync(folder).ConfigureAwait(false);
+        await Connection.UpdateAsync(folder, typeof(MailItemFolder)).ConfigureAwait(false);
     }
 
+    public Task UpdateFolderHighestModeSeqAsync(Guid folderId, long highestModeSeq)
+        => Connection.ExecuteAsync("UPDATE MailItemFolder SET HighestModeSeq = ? WHERE Id = ?", highestModeSeq, folderId);
+
     private async Task DeleteFolderAsync(MailItemFolder folder)
     {
         if (folder == null)
@@ -504,7 +511,7 @@ public class FolderService : BaseDatabaseService, IFolderService
 
         _logger.Debug("Deleting folder {FolderName}", folder.FolderName);
 
-        await Connection.DeleteAsync(folder).ConfigureAwait(false);
+        await Connection.DeleteAsync<MailItemFolder>(folder.Id).ConfigureAwait(false);
 
         // Delete all existing mails from this folder.
         await Connection.ExecuteAsync("DELETE FROM MailCopy WHERE FolderId = ?", folder.Id);
@@ -516,25 +523,18 @@ public class FolderService : BaseDatabaseService, IFolderService
 
     private Task<List<string>> GetMailCopyIdsByFolderIdAsync(Guid folderId)
     {
-        var query = new Query("MailCopy")
-                    .Where("FolderId", folderId)
-                    .Select("Id");
-
-        return Connection.QueryScalarsAsync<string>(query.GetRawQuery());
+        const string query = "SELECT Id FROM MailCopy WHERE FolderId = ?";
+        return Connection.QueryScalarsAsync<string>(query, folderId);
     }
 
     public async Task<List<MailFolderPairMetadata>> GetMailFolderPairMetadatasAsync(IEnumerable<string> mailCopyIds)
     {
-        // Get all assignments for all items.
-        var query = new Query(nameof(MailCopy))
-                    .Join(nameof(MailItemFolder), $"{nameof(MailCopy)}.FolderId", $"{nameof(MailItemFolder)}.Id")
-                    .WhereIn($"{nameof(MailCopy)}.Id", mailCopyIds)
-                    .SelectRaw($"{nameof(MailCopy)}.Id as MailCopyId, {nameof(MailItemFolder)}.Id as FolderId, {nameof(MailItemFolder)}.RemoteFolderId as RemoteFolderId")
-                    .Distinct();
-
-        var rowQuery = query.GetRawQuery();
-
-        return await Connection.QueryAsync<MailFolderPairMetadata>(rowQuery);
+        var mailCopyIdList = mailCopyIds.ToList();
+        var placeholders = string.Join(",", mailCopyIdList.Select(_ => "?"));
+        var query = $"SELECT DISTINCT MailCopy.Id as MailCopyId, MailItemFolder.Id as FolderId, MailItemFolder.RemoteFolderId as RemoteFolderId FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id WHERE MailCopy.Id IN ({placeholders})";
+        var parameters = mailCopyIdList.Cast<object>().ToArray();
+        
+        return await Connection.QueryAsync<MailFolderPairMetadata>(query, parameters);
     }
 
     public Task<List<MailFolderPairMetadata>> GetMailFolderPairMetadatasAsync(string mailCopyId)
@@ -687,14 +687,11 @@ public class FolderService : BaseDatabaseService, IFolderService
 
     public Task<List<UnreadItemCountResult>> GetUnreadItemCountResultsAsync(IEnumerable<Guid> accountIds)
     {
-        var query = new Query(nameof(MailCopy))
-                    .Join(nameof(MailItemFolder), $"{nameof(MailCopy)}.FolderId", $"{nameof(MailItemFolder)}.Id")
-                    .WhereIn($"{nameof(MailItemFolder)}.MailAccountId", accountIds)
-                    .Where($"{nameof(MailCopy)}.IsRead", 0)
-                    .Where($"{nameof(MailItemFolder)}.ShowUnreadCount", 1)
-                    .SelectRaw($"{nameof(MailItemFolder)}.Id as FolderId, {nameof(MailItemFolder)}.SpecialFolderType as SpecialFolderType, count (DISTINCT {nameof(MailCopy)}.Id) as UnreadItemCount, {nameof(MailItemFolder)}.MailAccountId as AccountId")
-                    .GroupBy($"{nameof(MailItemFolder)}.Id");
-
-        return Connection.QueryAsync<UnreadItemCountResult>(query.GetRawQuery());
+        var accountIdList = accountIds.ToList();
+        var placeholders = string.Join(",", accountIdList.Select(_ => "?"));
+        var query = $"SELECT MailItemFolder.Id as FolderId, MailItemFolder.SpecialFolderType as SpecialFolderType, count(DISTINCT MailCopy.Id) as UnreadItemCount, MailItemFolder.MailAccountId as AccountId FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id WHERE MailItemFolder.MailAccountId IN ({placeholders}) AND MailCopy.IsRead = ? AND MailItemFolder.ShowUnreadCount = ? GROUP BY MailItemFolder.Id";
+        var parameters = accountIdList.Cast<object>().Concat(new object[] { 0, 1 }).ToArray();
+        
+        return Connection.QueryAsync<UnreadItemCountResult>(query, parameters);
     }
 }
diff --git a/Wino.Services/KeyboardShortcutService.cs b/Wino.Services/KeyboardShortcutService.cs
new file mode 100644
index 00000000..1f5ce61b
--- /dev/null
+++ b/Wino.Services/KeyboardShortcutService.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Services.Extensions;
+
+namespace Wino.Services;
+
+/// <summary>
+/// Service for managing keyboard shortcuts for mail and calendar actions.
+/// </summary>
+public class KeyboardShortcutService : BaseDatabaseService, IKeyboardShortcutService
+{
+    public KeyboardShortcutService(IDatabaseService databaseService) : base(databaseService)
+    {
+    }
+
+    /// <summary>
+    /// Gets all available keyboard shortcuts.
+    /// </summary>
+    public async Task<IEnumerable<KeyboardShortcut>> GetKeyboardShortcutsAsync()
+    {
+        return await Connection.QueryAsync<KeyboardShortcut>(
+            "SELECT * FROM KeyboardShortcut ORDER BY Mode, Action");
+    }
+
+    /// <summary>
+    /// Gets enabled keyboard shortcuts only.
+    /// </summary>
+    public async Task<IEnumerable<KeyboardShortcut>> GetEnabledKeyboardShortcutsAsync()
+    {
+        return await Connection.QueryAsync<KeyboardShortcut>(
+            "SELECT * FROM KeyboardShortcut WHERE IsEnabled = ? ORDER BY Mode, Action",
+            true);
+    }
+
+    /// <summary>
+    /// Creates or updates a keyboard shortcut.
+    /// </summary>
+    public async Task<KeyboardShortcut> SaveKeyboardShortcutAsync(KeyboardShortcut shortcut)
+    {
+        if (shortcut.Id == Guid.Empty)
+        {
+            shortcut.Id = Guid.NewGuid();
+            shortcut.CreatedAt = DateTime.UtcNow;
+            await Connection.InsertAsync(shortcut, typeof(KeyboardShortcut));
+        }
+        else
+        {
+            await Connection.UpdateAsync(shortcut, typeof(KeyboardShortcut));
+        }
+
+        return shortcut;
+    }
+
+    /// <summary>
+    /// Deletes a keyboard shortcut.
+    /// </summary>
+    public async Task DeleteKeyboardShortcutAsync(Guid shortcutId)
+    {
+        await Connection.ExecuteAsync($"DELETE FROM {nameof(KeyboardShortcut)} WHERE {nameof(KeyboardShortcut.Id)} = ?", shortcutId);
+    }
+
+    /// <summary>
+    /// Gets the shortcut for the given key combination.
+    /// </summary>
+    public async Task<KeyboardShortcut> GetShortcutForKeyAsync(WinoApplicationMode mode, string key, ModifierKeys modifierKeys)
+    {
+        const string query = "SELECT * FROM KeyboardShortcut WHERE Mode = ? AND Key = ? AND ModifierKeys = ? AND IsEnabled = ? LIMIT 1";
+        return await Connection.FindWithQueryAsync<KeyboardShortcut>(query, (int)mode, key, (int)modifierKeys, 1);
+    }
+
+    /// <summary>
+    /// Checks if a key combination is already assigned to another shortcut.
+    /// </summary>
+    public async Task<bool> IsKeyCombinationInUseAsync(WinoApplicationMode mode, string key, ModifierKeys modifierKeys, Guid? excludeShortcutId = null)
+    {
+        string query;
+        KeyboardShortcut shortcut;
+
+        if (excludeShortcutId.HasValue)
+        {
+            query = "SELECT * FROM KeyboardShortcut WHERE Mode = ? AND Key = ? AND ModifierKeys = ? AND Id != ? LIMIT 1";
+            shortcut = await Connection.FindWithQueryAsync<KeyboardShortcut>(query, (int)mode, key, (int)modifierKeys, excludeShortcutId.Value);
+        }
+        else
+        {
+            query = "SELECT * FROM KeyboardShortcut WHERE Mode = ? AND Key = ? AND ModifierKeys = ? LIMIT 1";
+            shortcut = await Connection.FindWithQueryAsync<KeyboardShortcut>(query, (int)mode, key, (int)modifierKeys);
+        }
+
+        return shortcut != null;
+    }
+
+    /// <summary>
+    /// Creates default keyboard shortcuts for common mail operations.
+    /// </summary>
+    public async Task CreateDefaultShortcutsAsync()
+    {
+        var defaultShortcuts = GetDefaultShortcuts();
+
+        foreach (var shortcut in defaultShortcuts)
+        {
+            // Only create if it doesn't exist already
+            var exists = await IsKeyCombinationInUseAsync(shortcut.Mode, shortcut.Key, shortcut.ModifierKeys);
+            if (!exists)
+            {
+                await SaveKeyboardShortcutAsync(shortcut);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Resets all shortcuts to defaults.
+    /// </summary>
+    public async Task ResetToDefaultShortcutsAsync()
+    {
+        // Delete all existing shortcuts
+        await Connection.ExecuteAsync($"DELETE FROM {nameof(KeyboardShortcut)}");
+
+        // Create default shortcuts
+        await CreateDefaultShortcutsAsync();
+    }
+
+    /// <summary>
+    /// Gets the default keyboard shortcuts.
+    /// </summary>
+    private static List<KeyboardShortcut> GetDefaultShortcuts()
+    {
+        return new List<KeyboardShortcut>
+        {
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "Delete",
+                ModifierKeys = ModifierKeys.None,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.Delete,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "N",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.NewMail,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "A",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.ToggleArchive,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "R",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.ToggleReadUnread,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "F",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.ToggleFlag,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "M",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.Move,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "R",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.Reply,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "R",
+                ModifierKeys = ModifierKeys.Control | ModifierKeys.Shift,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.ReplyAll,
+                IsEnabled = true
+            },
+            new KeyboardShortcut
+            {
+                Id = Guid.NewGuid(),
+                Key = "Enter",
+                ModifierKeys = ModifierKeys.Control,
+                Mode = WinoApplicationMode.Mail,
+                Action = KeyboardShortcutAction.Send,
+                IsEnabled = true
+            }
+        };
+    }
+}
diff --git a/Wino.Services/LaunchProtocolService.cs b/Wino.Services/LaunchProtocolService.cs
index 8dda34e5..ca18b61e 100644
--- a/Wino.Services/LaunchProtocolService.cs
+++ b/Wino.Services/LaunchProtocolService.cs
@@ -1,4 +1,4 @@
-using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Launch;
 
 namespace Wino.Services;
diff --git a/Wino.Services/MailService.cs b/Wino.Services/MailService.cs
index c060d23e..d35d8fe1 100644
--- a/Wino.Services/MailService.cs
+++ b/Wino.Services/MailService.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
 using MimeKit;
 using Serilog;
-using SqlKata;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
@@ -14,7 +14,6 @@ using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Comparers;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Messaging.UI;
 using Wino.Services.Extensions;
@@ -29,7 +28,6 @@ public class MailService : BaseDatabaseService, IMailService
     private readonly IContactService _contactService;
     private readonly IAccountService _accountService;
     private readonly ISignatureService _signatureService;
-    private readonly IThreadingStrategyProvider _threadingStrategyProvider;
     private readonly IMimeFileService _mimeFileService;
     private readonly IPreferencesService _preferencesService;
 
@@ -40,7 +38,6 @@ public class MailService : BaseDatabaseService, IMailService
                        IContactService contactService,
                        IAccountService accountService,
                        ISignatureService signatureService,
-                       IThreadingStrategyProvider threadingStrategyProvider,
                        IMimeFileService mimeFileService,
                        IPreferencesService preferencesService) : base(databaseService)
     {
@@ -48,7 +45,6 @@ public class MailService : BaseDatabaseService, IMailService
         _contactService = contactService;
         _accountService = accountService;
         _signatureService = signatureService;
-        _threadingStrategyProvider = threadingStrategyProvider;
         _mimeFileService = mimeFileService;
         _preferencesService = preferencesService;
     }
@@ -89,20 +85,41 @@ public class MailService : BaseDatabaseService, IMailService
             FileId = Guid.NewGuid()
         };
 
-        // If replying, add In-Reply-To, ThreadId and References.
+        // If replying, add In-Reply-To, ThreadId and References per RFC 5322.
+        // References must include all previous References + the Message-ID of the message being replied to.
         if (draftCreationOptions.ReferencedMessage != null)
         {
-            if (draftCreationOptions.ReferencedMessage.MimeMessage.References != null)
-                copy.References = string.Join(",", draftCreationOptions.ReferencedMessage.MimeMessage.References);
+            var refMime = draftCreationOptions.ReferencedMessage.MimeMessage;
+            var referenceMailCopy = draftCreationOptions.ReferencedMessage.MailCopy;
 
-            if (!string.IsNullOrEmpty(draftCreationOptions.ReferencedMessage.MimeMessage.MessageId))
-                copy.InReplyTo = draftCreationOptions.ReferencedMessage.MimeMessage.MessageId;
+            string referenceMessageId = refMime?.MessageId;
+            string referenceInReplyTo = refMime?.InReplyTo;
+            IEnumerable<string> referenceChain = refMime?.References ?? [];
+
+            // Fallback to MailCopy metadata if MIME lacks threading headers.
+            if (string.IsNullOrWhiteSpace(referenceMessageId) && referenceMailCopy != null)
+            {
+                referenceMessageId = referenceMailCopy.MessageId;
+                referenceInReplyTo = referenceMailCopy.InReplyTo;
+                referenceChain = SplitStoredReferences(referenceMailCopy.References);
+            }
+
+            if (!string.IsNullOrWhiteSpace(referenceMessageId))
+                copy.InReplyTo = MailHeaderExtensions.StripAngleBrackets(referenceMessageId);
+
+            var refs = BuildReferencesChain(referenceChain, referenceInReplyTo, referenceMessageId);
+            if (refs.Count > 0)
+                copy.References = string.Join(";", refs);
 
             if (!string.IsNullOrEmpty(draftCreationOptions.ReferencedMessage.MailCopy?.ThreadId))
                 copy.ThreadId = draftCreationOptions.ReferencedMessage.MailCopy.ThreadId;
+
+            // Fallback local threading when provider/native thread id is unavailable.
+            if (string.IsNullOrWhiteSpace(copy.ThreadId))
+                copy.ThreadId = refs.FirstOrDefault() ?? copy.InReplyTo;
         }
 
-        await Connection.InsertAsync(copy);
+        await Connection.InsertAsync(copy, typeof(MailCopy));
 
         await _mimeFileService.SaveMimeMessageAsync(copy.FileId, createdDraftMimeMessage, composerAccount.Id);
 
@@ -147,204 +164,355 @@ public class MailService : BaseDatabaseService, IMailService
         return unreadMails;
     }
 
-    private static string BuildMailFetchQuery(MailListInitializationOptions options)
+    public async Task<MailCopy> GetMailCopyByMessageIdAsync(Guid accountId, string messageId)
     {
-        // If the search query is there, we should ignore some properties and trim it.
-        //if (!string.IsNullOrEmpty(options.SearchQuery))
-        //{
-        //    options.IsFocusedOnly = null;
-        //    filterType = FilterOptionType.All;
+        var normalizedMessageId = MailHeaderExtensions.StripAngleBrackets(messageId)?.Trim();
+        if (string.IsNullOrWhiteSpace(normalizedMessageId))
+            return null;
 
-        //    searchQuery = searchQuery.Trim();
-        //}
+        var mailCopy = await Connection.FindWithQueryAsync<MailCopy>(
+            "SELECT MailCopy.* FROM MailCopy " +
+            "INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id " +
+            "WHERE MailItemFolder.MailAccountId = ? AND MailCopy.MessageId = ? " +
+            "ORDER BY MailCopy.IsDraft ASC, MailCopy.CreationDate DESC LIMIT 1",
+            accountId,
+            normalizedMessageId).ConfigureAwait(false);
 
-        // SQLite PCL doesn't support joins.
-        // We make the query using SqlKata and execute it directly on SQLite-PCL.
+        if (mailCopy != null)
+            await LoadAssignedPropertiesAsync(mailCopy).ConfigureAwait(false);
 
-        var query = new Query("MailCopy")
-                    .Join("MailItemFolder", "MailCopy.FolderId", "MailItemFolder.Id")
-                    .WhereIn("MailCopy.FolderId", options.Folders.Select(a => a.Id))
-                    .Take(ItemLoadCount)
-                    .SelectRaw("MailCopy.*");
+        return mailCopy;
+    }
 
-        if (options.SortingOptionType == SortingOptionType.ReceiveDate)
-            query.OrderByDesc("CreationDate");
-        else if (options.SortingOptionType == SortingOptionType.Sender)
-            query.OrderBy("FromName");
+    private static (string Query, object[] Parameters) BuildMailFetchQuery(MailListInitializationOptions options)
+    {
+        var sql = new StringBuilder();
+        sql.Append("SELECT MailCopy.* FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id");
 
-        // Conditional where.
+        var whereClauses = new List<string>();
+        var parameters = new List<object>();
+
+        // Folder filter
+        var folderPlaceholders = string.Join(",", options.Folders.Select(_ => "?"));
+        whereClauses.Add($"MailCopy.FolderId IN ({folderPlaceholders})");
+        parameters.AddRange(options.Folders.Select(f => (object)f.Id));
+
+        // Filter type
         switch (options.FilterType)
         {
             case FilterOptionType.Unread:
-                query.Where("MailCopy.IsRead", false);
+                whereClauses.Add("MailCopy.IsRead = 0");
                 break;
             case FilterOptionType.Flagged:
-                query.Where("MailCopy.IsFlagged", true);
+                whereClauses.Add("MailCopy.IsFlagged = 1");
                 break;
             case FilterOptionType.Files:
-                query.Where("MailCopy.HasAttachments", true);
+                whereClauses.Add("MailCopy.HasAttachments = 1");
                 break;
         }
 
+        // Focused filter
         if (options.IsFocusedOnly != null)
-            query.Where("MailCopy.IsFocused", options.IsFocusedOnly.Value);
+        {
+            whereClauses.Add($"MailCopy.IsFocused = {(options.IsFocusedOnly.Value ? "1" : "0")}");
+        }
 
+        // Search query
         if (!string.IsNullOrEmpty(options.SearchQuery))
-            query.Where(a =>
-                        a.OrWhereContains("MailCopy.PreviewText", options.SearchQuery)
-                        .OrWhereContains("MailCopy.Subject", options.SearchQuery)
-                        .OrWhereContains("MailCopy.FromName", options.SearchQuery)
-                        .OrWhereContains("MailCopy.FromAddress", options.SearchQuery));
+        {
+            whereClauses.Add("(MailCopy.PreviewText LIKE ? OR MailCopy.Subject LIKE ? OR MailCopy.FromName LIKE ? OR MailCopy.FromAddress LIKE ?)");
+            var searchPattern = $"%{options.SearchQuery}%";
+            parameters.Add(searchPattern);
+            parameters.Add(searchPattern);
+            parameters.Add(searchPattern);
+            parameters.Add(searchPattern);
+        }
+
+        // Exclude existing items
+        if (options.ExistingUniqueIds?.Any() ?? false)
+        {
+            var excludePlaceholders = string.Join(",", options.ExistingUniqueIds.Select(_ => "?"));
+            whereClauses.Add($"MailCopy.UniqueId NOT IN ({excludePlaceholders})");
+            parameters.AddRange(options.ExistingUniqueIds.Keys.Select(id => (object)id));
+        }
+
+        if (whereClauses.Any())
+        {
+            sql.Append(" WHERE ");
+            sql.Append(string.Join(" AND ", whereClauses));
+        }
+
+        // Sorting
+        if (options.SortingOptionType == SortingOptionType.ReceiveDate)
+            sql.Append(" ORDER BY CreationDate DESC");
+        else if (options.SortingOptionType == SortingOptionType.Sender)
+            sql.Append(" ORDER BY FromName ASC");
+
+        // Pagination
+        var limit = options.Take > 0 ? options.Take : ItemLoadCount;
+        sql.Append($" LIMIT {limit}");
+
+        if (options.Skip > 0)
+        {
+            sql.Append($" OFFSET {options.Skip}");
+        }
+
+        return (sql.ToString(), parameters.ToArray());
+    }
+
+    private static List<MailCopy> ApplyOptionsToPreFetchedMails(MailListInitializationOptions options)
+    {
+        var allowedFolderIds = options.Folders.Select(f => f.Id).ToHashSet();
+
+        IEnumerable<MailCopy> query = options.PreFetchMailCopies
+            .Where(m => m != null && allowedFolderIds.Contains(m.FolderId))
+            .GroupBy(m => m.UniqueId)
+            .Select(g => g.First());
+
+        switch (options.FilterType)
+        {
+            case FilterOptionType.Unread:
+                query = query.Where(m => !m.IsRead);
+                break;
+            case FilterOptionType.Flagged:
+                query = query.Where(m => m.IsFlagged);
+                break;
+            case FilterOptionType.Files:
+                query = query.Where(m => m.HasAttachments);
+                break;
+        }
+
+        if (options.IsFocusedOnly is bool isFocused)
+        {
+            query = query.Where(m => m.IsFocused == isFocused);
+        }
+
+        if (!string.IsNullOrWhiteSpace(options.SearchQuery))
+        {
+            var search = options.SearchQuery.Trim();
+            query = query.Where(m =>
+                (!string.IsNullOrEmpty(m.PreviewText) && m.PreviewText.Contains(search, StringComparison.OrdinalIgnoreCase))
+                || (!string.IsNullOrEmpty(m.Subject) && m.Subject.Contains(search, StringComparison.OrdinalIgnoreCase))
+                || (!string.IsNullOrEmpty(m.FromName) && m.FromName.Contains(search, StringComparison.OrdinalIgnoreCase))
+                || (!string.IsNullOrEmpty(m.FromAddress) && m.FromAddress.Contains(search, StringComparison.OrdinalIgnoreCase)));
+        }
 
         if (options.ExistingUniqueIds?.Any() ?? false)
         {
-            query.WhereNotIn("MailCopy.UniqueId", options.ExistingUniqueIds);
+            query = query.Where(m => !options.ExistingUniqueIds.ContainsKey(m.UniqueId));
         }
 
-        //if (options.Skip > 0)
-        //{
-        //    query.Skip(options.Skip);
-        //}
+        query = options.SortingOptionType switch
+        {
+            SortingOptionType.Sender => query.OrderBy(m => m.FromName).ThenByDescending(m => m.CreationDate),
+            _ => query.OrderByDescending(m => m.CreationDate)
+        };
 
-        return query.GetRawQuery();
+        if (options.Skip > 0)
+        {
+            query = query.Skip(options.Skip);
+        }
+
+        if (options.Take > 0)
+        {
+            query = query.Take(options.Take);
+        }
+
+        return query.ToList();
     }
 
-    public async Task<List<IMailItem>> FetchMailsAsync(MailListInitializationOptions options, CancellationToken cancellationToken = default)
+    public async Task<List<MailCopy>> FetchMailsAsync(MailListInitializationOptions options, CancellationToken cancellationToken = default)
     {
-        List<MailCopy> mails = null;
+        List<MailCopy> mails;
 
-        // If user performs an online search, mail copies are passed to options.
         if (options.PreFetchMailCopies != null)
         {
-            mails = options.PreFetchMailCopies;
+            mails = ApplyOptionsToPreFetchedMails(options);
         }
         else
         {
-            // If not just do the query.
-            var query = BuildMailFetchQuery(options);
-
-            mails = await Connection.QueryAsync<MailCopy>(query);
+            var (query, parameters) = BuildMailFetchQuery(options);
+            mails = await Connection.QueryAsync<MailCopy>(query, parameters);
         }
 
-        Dictionary<Guid, MailItemFolder> folderCache = [];
-        Dictionary<Guid, MailAccount> accountCache = [];
-        Dictionary<string, AccountContact> contactCache = [];
+        if (mails.Count == 0)
+            return mails;
 
-        // Populate Folder Assignment for each single mail, to be able later group by "MailAccountId".
-        // This is needed to execute threading strategy by account type.
-        // Avoid DBs calls as possible, storing info in a dictionary.
-        foreach (var mail in mails)
-        {
-            await LoadAssignedPropertiesWithCacheAsync(mail, folderCache, accountCache, contactCache).ConfigureAwait(false);
-        }
-
-        // Remove items that has no assigned account or folder.
-        mails.RemoveAll(a => a.AssignedAccount == null || a.AssignedFolder == null);
-
-        if (!options.CreateThreads)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // Threading is disabled. Just return everything as it is.
-            mails.Sort(options.SortingOptionType == SortingOptionType.ReceiveDate ? new DateComparer() : new NameComparer());
-
-            return [.. mails];
-        }
-
-        // Populate threaded items.
-
-        List<IMailItem> threadedItems = [];
-
-        // Each account items must be threaded separately.
-        foreach (var group in mails.GroupBy(a => a.AssignedAccount.Id))
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var accountId = group.Key;
-            var groupAccount = mails.First(a => a.AssignedAccount.Id == accountId).AssignedAccount;
-
-            var threadingStrategy = _threadingStrategyProvider.GetStrategy(groupAccount.ProviderType);
-
-            // Only thread items from Draft and Sent folders must present here.
-            // Otherwise this strategy will fetch the items that are in Deleted folder as well.
-            var accountThreadedItems = await threadingStrategy.ThreadItemsAsync([.. group], options.Folders.First());
-
-            // Populate threaded items with folder and account assignments.
-            // Almost everything already should be in cache from initial population.
-            foreach (var mail in accountThreadedItems)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await LoadAssignedPropertiesWithCacheAsync(mail, folderCache, accountCache, contactCache).ConfigureAwait(false);
-            }
-
-            if (accountThreadedItems != null)
-            {
-                threadedItems.AddRange(accountThreadedItems);
-            }
-        }
-
-        threadedItems.Sort(options.SortingOptionType == SortingOptionType.ReceiveDate ? new DateComparer() : new NameComparer());
         cancellationToken.ThrowIfCancellationRequested();
 
-        return threadedItems;
+        // Pre-load all data needed for property assignment in as few DB round-trips as possible.
+        // 1. Seed the folder cache directly from the options folders - these cover the vast majority
+        //    of mails in a normal folder view and require zero extra DB calls.
+        var folderCache = options.Folders
+            .OfType<MailItemFolder>()
+            .ToDictionary(f => f.Id);
+
+        // 2. Load all accounts in one call (typically 1-5 accounts) instead of N per-mail lookups.
+        var allAccounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        var accountCache = allAccounts.ToDictionary(a => a.Id);
+
+        // 3. Fetch any folders not already in the cache (rare for normal views, common for merged inboxes
+        //    that include Sent/Draft copies belonging to different folder objects).
+        var uncachedFolderIds = mails
+            .Select(m => m.FolderId)
+            .Distinct()
+            .Where(id => !folderCache.ContainsKey(id))
+            .ToList();
+
+        if (uncachedFolderIds.Count > 0)
+        {
+            var folders = await Task.WhenAll(
+                uncachedFolderIds.Select(id => _folderService.GetFolderAsync(id))).ConfigureAwait(false);
+
+            foreach (var f in folders.Where(f => f != null))
+                folderCache[f.Id] = f;
+        }
+
+        // 4. Batch-fetch all sender contacts in a single SQL IN(...) query instead of one query per mail.
+        var uniqueAddresses = mails
+            .Where(m => !string.IsNullOrEmpty(m.FromAddress))
+            .Select(m => m.FromAddress)
+            .Distinct()
+            .ToList();
+
+        var contactList = await _contactService.GetContactsByAddressesAsync(uniqueAddresses).ConfigureAwait(false);
+        var contactCache = contactList.ToDictionary(c => c.Address);
+
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // 5. Assign all properties synchronously from the pre-loaded in-memory caches - no DB calls here.
+        AssignPropertiesFromCaches(mails, folderCache, accountCache, contactCache);
+        mails.RemoveAll(m => m.AssignedAccount == null || m.AssignedFolder == null);
+
+        if (!options.CreateThreads || mails.Count == 0)
+            return [.. mails];
+
+        // 6. Expand threads: one batch query for all sibling mails across all threads.
+        var uniqueThreadIds = mails
+            .Where(m => !string.IsNullOrEmpty(m.ThreadId))
+            .Select(m => m.ThreadId)
+            .Distinct()
+            .ToList();
+
+        if (uniqueThreadIds.Count == 0)
+            return [.. mails];
+
+        var existingMailIds = mails.Select(m => m.Id).ToHashSet();
+        var threadMails = await GetMailsByThreadIdsAsync(uniqueThreadIds, existingMailIds).ConfigureAwait(false);
+
+        if (threadMails?.Count > 0)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Load any folders that thread mails belong to but are not yet cached.
+            var newFolderIds = threadMails
+                .Select(m => m.FolderId)
+                .Distinct()
+                .Where(id => !folderCache.ContainsKey(id))
+                .ToList();
+
+            if (newFolderIds.Count > 0)
+            {
+                var newFolders = await Task.WhenAll(
+                    newFolderIds.Select(id => _folderService.GetFolderAsync(id))).ConfigureAwait(false);
+
+                foreach (var f in newFolders.Where(f => f != null))
+                    folderCache[f.Id] = f;
+            }
+
+            // Batch-fetch contacts for any new senders in thread mails.
+            var newAddresses = threadMails
+                .Where(m => !string.IsNullOrEmpty(m.FromAddress) && !contactCache.ContainsKey(m.FromAddress))
+                .Select(m => m.FromAddress)
+                .Distinct()
+                .ToList();
+
+            if (newAddresses.Count > 0)
+            {
+                var newContacts = await _contactService.GetContactsByAddressesAsync(newAddresses).ConfigureAwait(false);
+                foreach (var c in newContacts.Where(c => c != null))
+                    contactCache[c.Address] = c;
+            }
+
+            AssignPropertiesFromCaches(threadMails, folderCache, accountCache, contactCache);
+            mails.AddRange(threadMails.Where(m => m.AssignedAccount != null && m.AssignedFolder != null));
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+        return [.. mails];
     }
 
     /// <summary>
-    /// This method should used for operations with multiple mailItems. Don't use this for single mail items.
-    /// Called method should provide own instances for caches.
+    /// Assigns AssignedFolder, AssignedAccount, and SenderContact to each mail from pre-loaded
+    /// in-memory dictionaries. No DB calls are made here.
     /// </summary>
-    private async Task LoadAssignedPropertiesWithCacheAsync(IMailItem mail, Dictionary<Guid, MailItemFolder> folderCache, Dictionary<Guid, MailAccount> accountCache, Dictionary<string, AccountContact> contactCache)
+    private void AssignPropertiesFromCaches(
+        List<MailCopy> mails,
+        Dictionary<Guid, MailItemFolder> folderCache,
+        Dictionary<Guid, MailAccount> accountCache,
+        Dictionary<string, AccountContact> contactCache)
     {
-        if (mail is ThreadMailItem threadMailItem)
+        foreach (var mail in mails)
         {
-            foreach (var childMail in threadMailItem.ThreadItems)
-            {
-                await LoadAssignedPropertiesWithCacheAsync(childMail, folderCache, accountCache, contactCache).ConfigureAwait(false);
-            }
-        }
+            if (!folderCache.TryGetValue(mail.FolderId, out var folder))
+                continue;
 
-        if (mail is MailCopy mailCopy)
-        {
-            var isFolderCached = folderCache.TryGetValue(mailCopy.FolderId, out MailItemFolder folderAssignment);
-            MailAccount accountAssignment = null;
-            if (!isFolderCached)
-            {
-                folderAssignment = await _folderService.GetFolderAsync(mailCopy.FolderId).ConfigureAwait(false);
-                folderCache.TryAdd(mailCopy.FolderId, folderAssignment);
-            }
+            if (!accountCache.TryGetValue(folder.MailAccountId, out var account))
+                continue;
 
-            if (folderAssignment != null)
+            mail.AssignedFolder = folder;
+            mail.AssignedAccount = account;
+
+            // Self-sent mails (e.g. Sent folder): construct contact from account meta
+            // to get the up-to-date profile picture without a DB roundtrip.
+            if (!string.IsNullOrEmpty(mail.FromAddress) &&
+                string.Equals(mail.FromAddress, account.Address, StringComparison.OrdinalIgnoreCase))
             {
-                var isAccountCached = accountCache.TryGetValue(folderAssignment.MailAccountId, out accountAssignment);
-                if (!isAccountCached)
+                if (contactCache.TryGetValue(mail.FromAddress, out var ownContact))
                 {
-                    accountAssignment = await _accountService.GetAccountAsync(folderAssignment.MailAccountId).ConfigureAwait(false);
-
-                    accountCache.TryAdd(folderAssignment.MailAccountId, accountAssignment);
+                    mail.SenderContact = ownContact;
+                }
+                else
+                {
+                    mail.SenderContact = new AccountContact
+                    {
+                        Address = account.Address,
+                        Name = account.SenderName
+                    };
                 }
             }
-
-            AccountContact contactAssignment = null;
-
-            bool isContactCached = !string.IsNullOrEmpty(mailCopy.FromAddress) &&
-                contactCache.TryGetValue(mailCopy.FromAddress, out contactAssignment);
-
-            if (!isContactCached && accountAssignment != null)
+            else
             {
-                contactAssignment = await GetSenderContactForAccountAsync(accountAssignment, mailCopy.FromAddress).ConfigureAwait(false);
-
-                if (contactAssignment != null)
-                {
-                    contactCache.TryAdd(mailCopy.FromAddress, contactAssignment);
-                }
+                contactCache.TryGetValue(mail.FromAddress ?? string.Empty, out var contact);
+                mail.SenderContact = contact ?? CreateUnknownContact(mail.FromName, mail.FromAddress);
             }
-
-            mailCopy.AssignedFolder = folderAssignment;
-            mailCopy.AssignedAccount = accountAssignment;
-            mailCopy.SenderContact = contactAssignment ?? CreateUnknownContact(mailCopy.FromName, mailCopy.FromAddress);
         }
     }
 
+    private async Task<List<MailCopy>> GetMailsByThreadIdsAsync(List<string> threadIds, HashSet<string> excludeMailIds)
+    {
+        if (threadIds?.Count == 0)
+            return [];
+
+        var threadPlaceholders = string.Join(",", threadIds.Select(_ => "?"));
+        var parameters = new List<object>();
+        parameters.AddRange(threadIds.Cast<object>());
+
+        string sql;
+        if (excludeMailIds.Count > 0)
+        {
+            var excludePlaceholders = string.Join(",", excludeMailIds.Select(_ => "?"));
+            sql = $"SELECT MailCopy.* FROM MailCopy WHERE ThreadId IN ({threadPlaceholders}) AND Id NOT IN ({excludePlaceholders})";
+            parameters.AddRange(excludeMailIds.Cast<object>());
+        }
+        else
+        {
+            sql = $"SELECT MailCopy.* FROM MailCopy WHERE ThreadId IN ({threadPlaceholders})";
+        }
+
+        return await Connection.QueryAsync<MailCopy>(sql, parameters.ToArray()).ConfigureAwait(false);
+    }
+
     private static AccountContact CreateUnknownContact(string fromName, string fromAddress)
     {
         if (string.IsNullOrEmpty(fromName) && string.IsNullOrEmpty(fromAddress))
@@ -382,9 +550,9 @@ public class MailService : BaseDatabaseService, IMailService
     private Task<AccountContact> GetSenderContactForAccountAsync(MailAccount account, string fromAddress)
     {
         // Make sure to return the latest up to date contact information for the original account.
-        if (fromAddress == account.Address)
+        if (string.Equals(fromAddress, account.Address, StringComparison.OrdinalIgnoreCase))
         {
-            return Task.FromResult(new AccountContact() { Address = account.Address, Name = account.SenderName, Base64ContactPicture = account.Base64ProfilePictureData });
+            return GetOwnSenderContactAsync(account);
         }
         else
         {
@@ -392,6 +560,17 @@ public class MailService : BaseDatabaseService, IMailService
         }
     }
 
+    private async Task<AccountContact> GetOwnSenderContactAsync(MailAccount account)
+    {
+        var contact = await _contactService.GetAddressInformationByAddressAsync(account.Address).ConfigureAwait(false);
+
+        return contact ?? new AccountContact
+        {
+            Address = account.Address,
+            Name = account.SenderName
+        };
+    }
+
     private async Task LoadAssignedPropertiesAsync(MailCopy mailCopy)
     {
         if (mailCopy == null) return;
@@ -430,12 +609,9 @@ public class MailService : BaseDatabaseService, IMailService
     /// <param name="mailCopyId">Mail copy id.</param>
     public async Task<MailCopy> GetSingleMailItemAsync(string mailCopyId)
     {
-        var query = new Query("MailCopy")
-                       .Where("MailCopy.Id", mailCopyId)
-                       .SelectRaw("MailCopy.*")
-                       .GetRawQuery();
-
-        var mailCopy = await Connection.FindWithQueryAsync<MailCopy>(query);
+        var mailCopy = await Connection.FindWithQueryAsync<MailCopy>(
+            "SELECT MailCopy.* FROM MailCopy WHERE MailCopy.Id = ?",
+            mailCopyId);
         if (mailCopy == null) return null;
 
         await LoadAssignedPropertiesAsync(mailCopy).ConfigureAwait(false);
@@ -445,14 +621,9 @@ public class MailService : BaseDatabaseService, IMailService
 
     public async Task<MailCopy> GetSingleMailItemAsync(string mailCopyId, string remoteFolderId)
     {
-        var query = new Query("MailCopy")
-                        .Join("MailItemFolder", "MailCopy.FolderId", "MailItemFolder.Id")
-                        .Where("MailCopy.Id", mailCopyId)
-                        .Where("MailItemFolder.RemoteFolderId", remoteFolderId)
-                        .SelectRaw("MailCopy.*")
-                        .GetRawQuery();
-
-        var mailItem = await Connection.FindWithQueryAsync<MailCopy>(query);
+        var mailItem = await Connection.FindWithQueryAsync<MailCopy>(
+            "SELECT MailCopy.* FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id WHERE MailCopy.Id = ? AND MailItemFolder.RemoteFolderId = ?",
+            mailCopyId, remoteFolderId);
 
         if (mailItem == null) return null;
 
@@ -506,7 +677,7 @@ public class MailService : BaseDatabaseService, IMailService
 
         _logger.Debug("Inserting mail {MailCopyId} to {FolderName}", mailCopy.Id, mailCopy.AssignedFolder.FolderName);
 
-        await Connection.InsertAsync(mailCopy).ConfigureAwait(false);
+        await Connection.InsertAsync(mailCopy, typeof(MailCopy)).ConfigureAwait(false);
 
         ReportUIChange(new MailAddedMessage(mailCopy));
     }
@@ -522,9 +693,9 @@ public class MailService : BaseDatabaseService, IMailService
 
         _logger.Debug("Updating mail {MailCopyId} with Folder {FolderId}", mailCopy.Id, mailCopy.FolderId);
 
-        await Connection.UpdateAsync(mailCopy).ConfigureAwait(false);
+        await Connection.UpdateAsync(mailCopy, typeof(MailCopy)).ConfigureAwait(false);
 
-        ReportUIChange(new MailUpdatedMessage(mailCopy));
+        ReportUIChange(new MailUpdatedMessage(mailCopy, MailUpdateSource.Server));
     }
 
     private async Task DeleteMailInternalAsync(MailCopy mailCopy, bool preserveMimeFile)
@@ -538,7 +709,7 @@ public class MailService : BaseDatabaseService, IMailService
 
         _logger.Debug("Deleting mail {Id} from folder {FolderName}", mailCopy.Id, mailCopy.AssignedFolder.FolderName);
 
-        await Connection.DeleteAsync(mailCopy).ConfigureAwait(false);
+        await Connection.DeleteAsync<MailCopy>(mailCopy.UniqueId).ConfigureAwait(false);
 
         // If there are no more copies exists of the same mail, delete the MIME file as well.
         var isMailExists = await IsMailExistsAsync(mailCopy.Id).ConfigureAwait(false);
@@ -686,11 +857,17 @@ public class MailService : BaseDatabaseService, IMailService
         mailCopy.SenderContact = await GetSenderContactForAccountAsync(account, mailCopy.FromAddress).ConfigureAwait(false);
         mailCopy.FolderId = mailItemFolder.Id;
 
+        await SaveContactsForPackageAsync(package).ConfigureAwait(false);
+
         var mimeSaveTask = _mimeFileService.SaveMimeMessageAsync(mailCopy.FileId, mimeMessage, account.Id);
-        var contactSaveTask = _contactService.SaveAddressInformationAsync(mimeMessage);
         var insertMailTask = InsertMailAsync(mailCopy);
 
-        await Task.WhenAll(mimeSaveTask, contactSaveTask, insertMailTask).ConfigureAwait(false);
+        await Task.WhenAll(mimeSaveTask, insertMailTask).ConfigureAwait(false);
+    }
+
+    public async Task CreateMailAsyncEx(Guid accountId, NewMailItemPackage package)
+    {
+
     }
 
     public async Task<bool> CreateMailAsync(Guid accountId, NewMailItemPackage package)
@@ -730,21 +907,26 @@ public class MailService : BaseDatabaseService, IMailService
         // This is because 1 mail may have multiple copies in different folders.
         // but only single MIME to represent all.
 
-        // Save mime file to disk.
-        var isMimeExists = await _mimeFileService.IsMimeExistAsync(accountId, mailCopy.FileId).ConfigureAwait(false);
+        // Save mime file to disk if provided.
 
-        if (!isMimeExists)
+        if (mimeMessage != null)
         {
-            bool isMimeSaved = await _mimeFileService.SaveMimeMessageAsync(mailCopy.FileId, mimeMessage, accountId).ConfigureAwait(false);
+            var isMimeExists = await _mimeFileService.IsMimeExistAsync(accountId, mailCopy.FileId).ConfigureAwait(false);
 
-            if (!isMimeSaved)
+            if (!isMimeExists)
             {
-                _logger.Warning("Failed to save mime file for {MailCopyId}.", mailCopy.Id);
+                bool isMimeSaved = await _mimeFileService.SaveMimeMessageAsync(mailCopy.FileId, mimeMessage, accountId).ConfigureAwait(false);
+
+                if (!isMimeSaved)
+                {
+                    _logger.Warning("Failed to save mime file for {MailCopyId}.", mailCopy.Id);
+                }
             }
+
         }
 
-        // Save contact information.
-        await _contactService.SaveAddressInformationAsync(mimeMessage).ConfigureAwait(false);
+        // Save contact information extracted from provider API or MIME before insert/update.
+        await SaveContactsForPackageAsync(package).ConfigureAwait(false);
 
         // Create mail copy in the database.
         // Update if exists.
@@ -776,6 +958,35 @@ public class MailService : BaseDatabaseService, IMailService
         }
     }
 
+    private async Task SaveContactsForPackageAsync(NewMailItemPackage package)
+    {
+        if (package == null) return;
+
+        if (package.Mime != null)
+        {
+            await _contactService.SaveAddressInformationAsync(package.Mime).ConfigureAwait(false);
+            return;
+        }
+
+        var contacts = package.ExtractedContacts?
+            .Where(c => c != null && !string.IsNullOrWhiteSpace(c.Address))
+            .ToList() ?? new List<AccountContact>();
+
+        var senderAddress = package.Copy?.FromAddress;
+        if (!string.IsNullOrWhiteSpace(senderAddress))
+        {
+            contacts.Add(new AccountContact
+            {
+                Address = senderAddress,
+                Name = string.IsNullOrWhiteSpace(package.Copy?.FromName) ? senderAddress : package.Copy.FromName
+            });
+        }
+
+        if (contacts.Count == 0) return;
+
+        await _contactService.SaveAddressInformationAsync(contacts).ConfigureAwait(false);
+    }
+
     private async Task<MimeMessage> CreateDraftMimeAsync(MailAccount account, DraftCreationOptions draftCreationOptions)
     {
         // This unique id is stored in mime headers for Wino to identify remote message with local copy.
@@ -795,11 +1006,12 @@ public class MailService : BaseDatabaseService, IMailService
         var builder = new BodyBuilder();
 
         var signature = await GetSignature(account, draftCreationOptions.Reason);
+        var ownAddresses = await GetOwnAddressesAsync(account).ConfigureAwait(false);
 
         _ = draftCreationOptions.Reason switch
         {
             DraftCreationReason.Empty => CreateEmptyDraft(builder, message, draftCreationOptions, signature),
-            _ => CreateReferencedDraft(builder, message, draftCreationOptions, account, signature),
+            _ => CreateReferencedDraft(builder, message, draftCreationOptions, signature, ownAddresses),
         };
 
         // TODO: Migration
@@ -866,10 +1078,15 @@ public class MailService : BaseDatabaseService, IMailService
         return message;
     }
 
-    private MimeMessage CreateReferencedDraft(BodyBuilder builder, MimeMessage message, DraftCreationOptions draftCreationOptions, MailAccount account, string signature)
+    private MimeMessage CreateReferencedDraft(BodyBuilder builder,
+                                              MimeMessage message,
+                                              DraftCreationOptions draftCreationOptions,
+                                              string signature,
+                                              ISet<string> ownAddresses)
     {
         var reason = draftCreationOptions.Reason;
         var referenceMessage = draftCreationOptions.ReferencedMessage.MimeMessage;
+        ownAddresses ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         var gap = CreateHtmlGap();
         builder.HtmlBody = gap + CreateHtmlForReferencingMessage(referenceMessage);
@@ -882,47 +1099,120 @@ public class MailService : BaseDatabaseService, IMailService
         // Manage "To"
         if (reason == DraftCreationReason.Reply || reason == DraftCreationReason.ReplyAll)
         {
-            // Reply to the sender of the message
-            if (referenceMessage.ReplyTo.Count > 0)
-                message.To.AddRange(referenceMessage.ReplyTo);
-            else if (referenceMessage.From.Count > 0)
-                message.To.AddRange(referenceMessage.From);
-            else if (referenceMessage.Sender != null)
-                message.To.Add(referenceMessage.Sender);
+            var toRecipients = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            var ccRecipients = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+            void AddToRecipient(MailboxAddress mailbox, bool allowSelf)
+            {
+                var address = mailbox?.Address?.Trim();
+                if (string.IsNullOrWhiteSpace(address))
+                    return;
+                if (!allowSelf && ownAddresses.Contains(address))
+                    return;
+                if (!toRecipients.Add(address))
+                    return;
+
+                message.To.Add(new MailboxAddress(mailbox.Name, address));
+            }
+
+            void AddCcRecipient(MailboxAddress mailbox, bool allowSelf)
+            {
+                var address = mailbox?.Address?.Trim();
+                if (string.IsNullOrWhiteSpace(address))
+                    return;
+                if (!allowSelf && ownAddresses.Contains(address))
+                    return;
+                if (toRecipients.Contains(address) || !ccRecipients.Add(address))
+                    return;
+
+                message.Cc.Add(new MailboxAddress(mailbox.Name, address));
+            }
+
+            // Reply target follows Reply-To first, then From, then Sender.
+            if (referenceMessage.ReplyTo.Mailboxes.Any())
+            {
+                foreach (var mailbox in referenceMessage.ReplyTo.Mailboxes)
+                    AddToRecipient(mailbox, allowSelf: true);
+            }
+            else if (referenceMessage.From.Mailboxes.Any())
+            {
+                foreach (var mailbox in referenceMessage.From.Mailboxes)
+                    AddToRecipient(mailbox, allowSelf: true);
+            }
+            else if (referenceMessage.Sender is MailboxAddress senderMailbox)
+            {
+                AddToRecipient(senderMailbox, allowSelf: true);
+            }
 
             if (reason == DraftCreationReason.ReplyAll)
             {
                 // Include all of the other original recipients
-                message.To.AddRange(referenceMessage.To.Where(x => x is MailboxAddress mailboxAddress && !mailboxAddress.Address.Equals(account.Address, StringComparison.OrdinalIgnoreCase)));
-                message.Cc.AddRange(referenceMessage.Cc.Where(x => x is MailboxAddress mailboxAddress && !mailboxAddress.Address.Equals(account.Address, StringComparison.OrdinalIgnoreCase)));
+                foreach (var mailbox in referenceMessage.To.Mailboxes)
+                    AddToRecipient(mailbox, allowSelf: false);
+
+                foreach (var mailbox in referenceMessage.Cc.Mailboxes)
+                    AddCcRecipient(mailbox, allowSelf: false);
             }
 
             // Self email can be present at this step, when replying to own message. It should be removed only in case there no other recipients.
-            if (message.To.Count > 1)
+            if (message.To.Mailboxes.Count() > 1)
             {
-                var self = message.To.FirstOrDefault(x => x is MailboxAddress mailboxAddress && mailboxAddress.Address.Equals(account.Address, StringComparison.OrdinalIgnoreCase));
-                if (self != null)
+                var selfRecipients = message.To.Mailboxes
+                    .Where(m => ownAddresses.Contains(m.Address ?? string.Empty))
+                    .ToList();
+
+                foreach (var self in selfRecipients)
+                {
                     message.To.Remove(self);
+                }
             }
 
             // Manage "ThreadId-ConversationId"
+            // CRITICAL: In-Reply-To and References headers are essential for threading
+            // They must reference the original message's Message-ID from the MIME headers
             if (!string.IsNullOrEmpty(referenceMessage.MessageId))
             {
-                message.InReplyTo = referenceMessage.MessageId;
-                message.References.AddRange(referenceMessage.References);
-                message.References.Add(referenceMessage.MessageId);
+                message.InReplyTo = MailHeaderExtensions.StripAngleBrackets(referenceMessage.MessageId);
+
+                var refs = BuildReferencesChain(
+                    referenceMessage.References,
+                    referenceMessage.InReplyTo,
+                    referenceMessage.MessageId);
+
+                foreach (var referenceId in refs)
+                    message.References.Add(referenceId);
+            }
+            else
+            {
+                // WARNING: Reference message has no Message-ID!
+                // This will break threading. Try to use the MessageId from MailCopy if available.
+                var referenceMailCopy = draftCreationOptions.ReferencedMessage.MailCopy;
+                if (referenceMailCopy != null && !string.IsNullOrEmpty(referenceMailCopy.MessageId))
+                {
+                    message.InReplyTo = MailHeaderExtensions.StripAngleBrackets(referenceMailCopy.MessageId);
+
+                    var refs = BuildReferencesChain(
+                        SplitStoredReferences(referenceMailCopy.References),
+                        referenceMailCopy.InReplyTo,
+                        referenceMailCopy.MessageId);
+
+                    foreach (var referenceId in refs)
+                        message.References.Add(referenceId);
+                }
             }
 
-            message.Headers.Add("Thread-Topic", referenceMessage.Subject);
+            if (!string.IsNullOrEmpty(referenceMessage.Subject))
+                message.Headers.Add("Thread-Topic", referenceMessage.Subject);
         }
 
         // Manage Subject
-        if (reason == DraftCreationReason.Forward && !referenceMessage.Subject.StartsWith("FW: ", StringComparison.OrdinalIgnoreCase))
-            message.Subject = $"FW: {referenceMessage.Subject}";
-        else if ((reason == DraftCreationReason.Reply || reason == DraftCreationReason.ReplyAll) && !referenceMessage.Subject.StartsWith("RE: ", StringComparison.OrdinalIgnoreCase))
-            message.Subject = $"RE: {referenceMessage.Subject}";
-        else if (referenceMessage != null)
-            message.Subject = referenceMessage.Subject;
+        var referenceSubject = referenceMessage?.Subject ?? string.Empty;
+        if (reason == DraftCreationReason.Forward && !referenceSubject.StartsWith("FW: ", StringComparison.OrdinalIgnoreCase))
+            message.Subject = $"FW: {referenceSubject}";
+        else if ((reason == DraftCreationReason.Reply || reason == DraftCreationReason.ReplyAll) && !referenceSubject.StartsWith("RE: ", StringComparison.OrdinalIgnoreCase))
+            message.Subject = $"RE: {referenceSubject}";
+        else
+            message.Subject = referenceSubject;
 
         // Only include attachments if forwarding.
         if (reason == DraftCreationReason.Forward && (referenceMessage?.Attachments?.Any() ?? false))
@@ -969,14 +1259,9 @@ public class MailService : BaseDatabaseService, IMailService
 
     public async Task<bool> MapLocalDraftAsync(Guid accountId, Guid localDraftCopyUniqueId, string newMailCopyId, string newDraftId, string newThreadId)
     {
-        var query = new Query("MailCopy")
-                        .Join("MailItemFolder", "MailCopy.FolderId", "MailItemFolder.Id")
-                        .Where("MailCopy.UniqueId", localDraftCopyUniqueId)
-                        .Where("MailItemFolder.MailAccountId", accountId)
-                        .SelectRaw("MailCopy.*")
-                        .GetRawQuery();
-
-        var localDraftCopy = await Connection.FindWithQueryAsync<MailCopy>(query);
+        var localDraftCopy = await Connection.FindWithQueryAsync<MailCopy>(
+            "SELECT MailCopy.* FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id WHERE MailCopy.UniqueId = ? AND MailItemFolder.MailAccountId = ?",
+            localDraftCopyUniqueId, accountId);
 
         if (localDraftCopy == null)
         {
@@ -992,12 +1277,14 @@ public class MailService : BaseDatabaseService, IMailService
         bool isIdChanging = localDraftCopy.Id != newMailCopyId;
 
         localDraftCopy.Id = newMailCopyId;
-        localDraftCopy.DraftId = newDraftId;
-        localDraftCopy.ThreadId = newThreadId;
+        if (!string.IsNullOrEmpty(newDraftId))
+            localDraftCopy.DraftId = newDraftId;
+        if (!string.IsNullOrEmpty(newThreadId))
+            localDraftCopy.ThreadId = newThreadId;
 
         await UpdateMailAsync(localDraftCopy).ConfigureAwait(false);
 
-        ReportUIChange(new DraftMapped(oldLocalDraftId, newDraftId));
+        ReportUIChange(new DraftMapped(oldLocalDraftId, localDraftCopy.DraftId));
 
         return true;
     }
@@ -1006,14 +1293,20 @@ public class MailService : BaseDatabaseService, IMailService
     {
         return UpdateAllMailCopiesAsync(mailCopyId, (item) =>
         {
-            if (item.ThreadId != newThreadId || item.DraftId != newDraftId)
+            var shouldUpdateThreadId = !string.IsNullOrEmpty(newThreadId);
+            var shouldUpdateDraftId = !string.IsNullOrEmpty(newDraftId);
+
+            if ((shouldUpdateThreadId && item.ThreadId != newThreadId) ||
+                (shouldUpdateDraftId && item.DraftId != newDraftId))
             {
                 var oldDraftId = item.DraftId;
 
-                item.DraftId = newDraftId;
-                item.ThreadId = newThreadId;
+                if (shouldUpdateDraftId)
+                    item.DraftId = newDraftId;
+                if (shouldUpdateThreadId)
+                    item.ThreadId = newThreadId;
 
-                ReportUIChange(new DraftMapped(oldDraftId, newDraftId));
+                ReportUIChange(new DraftMapped(oldDraftId, item.DraftId));
 
                 return true;
             }
@@ -1024,28 +1317,22 @@ public class MailService : BaseDatabaseService, IMailService
 
     public Task<List<MailCopy>> GetDownloadedUnreadMailsAsync(Guid accountId, IEnumerable<string> downloadedMailCopyIds)
     {
-        var rawQuery = new Query("MailCopy")
-                        .Join("MailItemFolder", "MailCopy.FolderId", "MailItemFolder.Id")
-                        .WhereIn("MailCopy.Id", downloadedMailCopyIds)
-                        .Where("MailCopy.IsRead", false)
-                        .Where("MailItemFolder.MailAccountId", accountId)
-                        .Where("MailItemFolder.SpecialFolderType", SpecialFolderType.Inbox)
-                        .SelectRaw("MailCopy.*")
-                        .GetRawQuery();
+        var placeholders = string.Join(",", downloadedMailCopyIds.Select(_ => "?"));
+        var sql = $"SELECT MailCopy.* FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id WHERE MailCopy.Id IN ({placeholders}) AND MailCopy.IsRead = ? AND MailItemFolder.MailAccountId = ? AND MailItemFolder.SpecialFolderType = ?";
+        var parameters = new List<object>();
+        parameters.AddRange(downloadedMailCopyIds.Cast<object>());
+        parameters.Add(false);
+        parameters.Add(accountId);
+        parameters.Add((int)SpecialFolderType.Inbox);
 
-        return Connection.QueryAsync<MailCopy>(rawQuery);
+        return Connection.QueryAsync<MailCopy>(sql, parameters.ToArray());
     }
 
     public Task<MailAccount> GetMailAccountByUniqueIdAsync(Guid uniqueMailId)
     {
-        var query = new Query("MailCopy")
-                        .Join("MailItemFolder", "MailCopy.FolderId", "MailItemFolder.Id")
-                        .Join("MailAccount", "MailItemFolder.MailAccountId", "MailAccount.Id")
-                        .Where("MailCopy.UniqueId", uniqueMailId)
-                        .SelectRaw("MailAccount.*")
-                        .GetRawQuery();
-
-        return Connection.FindWithQueryAsync<MailAccount>(query);
+        return Connection.FindWithQueryAsync<MailAccount>(
+            "SELECT MailAccount.* FROM MailCopy INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id INNER JOIN MailAccount ON MailItemFolder.MailAccountId = MailAccount.Id WHERE MailCopy.UniqueId = ?",
+            uniqueMailId);
     }
 
     public Task<bool> IsMailExistsAsync(string mailCopyId)
@@ -1053,13 +1340,12 @@ public class MailService : BaseDatabaseService, IMailService
 
     public async Task<List<MailCopy>> GetExistingMailsAsync(Guid folderId, IEnumerable<MailKit.UniqueId> uniqueIds)
     {
-        var localMailIds = uniqueIds.Where(a => a != null).Select(a => MailkitClientExtensions.CreateUid(folderId, a.Id)).ToArray();
+        var localMailIds = uniqueIds.Select(a => MailkitClientExtensions.CreateUid(folderId, a.Id)).ToArray();
 
-        var query = new Query(nameof(MailCopy))
-                        .WhereIn("Id", localMailIds)
-                        .GetRawQuery();
+        var placeholders = string.Join(",", localMailIds.Select(_ => "?"));
+        var sql = $"SELECT * FROM MailCopy WHERE Id IN ({placeholders})";
 
-        return await Connection.QueryAsync<MailCopy>(query);
+        return await Connection.QueryAsync<MailCopy>(sql, localMailIds.Cast<object>().ToArray());
     }
 
     public Task<bool> IsMailExistsAsync(string mailCopyId, Guid folderId)
@@ -1067,47 +1353,145 @@ public class MailService : BaseDatabaseService, IMailService
 
     public async Task<GmailArchiveComparisonResult> GetGmailArchiveComparisonResultAsync(Guid archiveFolderId, List<string> onlineArchiveMailIds)
     {
+        onlineArchiveMailIds ??= [];
+
         var localArchiveMails = await Connection.Table<MailCopy>()
                                             .Where(a => a.FolderId == archiveFolderId)
                                             .ToListAsync().ConfigureAwait(false);
 
-        var removedMails = localArchiveMails.Where(a => !onlineArchiveMailIds.Contains(a.Id)).Select(a => a.Id).Distinct().ToArray();
-        var addedMails = onlineArchiveMailIds.Where(a => !localArchiveMails.Select(b => b.Id).Contains(a)).Distinct().ToArray();
+        var onlineArchiveIdSet = onlineArchiveMailIds
+            .Where(a => !string.IsNullOrWhiteSpace(a))
+            .ToHashSet(StringComparer.Ordinal);
+
+        var localArchiveIdSet = localArchiveMails
+            .Select(a => a.Id)
+            .Where(a => !string.IsNullOrWhiteSpace(a))
+            .ToHashSet(StringComparer.Ordinal);
+
+        var removedMails = localArchiveIdSet.Except(onlineArchiveIdSet).ToArray();
+        var addedMails = onlineArchiveIdSet.Except(localArchiveIdSet).ToArray();
 
         return new GmailArchiveComparisonResult(addedMails, removedMails);
     }
 
+    private async Task<HashSet<string>> GetOwnAddressesAsync(MailAccount account)
+    {
+        var ownAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        if (!string.IsNullOrWhiteSpace(account?.Address))
+            ownAddresses.Add(account.Address.Trim());
+
+        var aliases = await _accountService.GetAccountAliasesAsync(account.Id).ConfigureAwait(false);
+        if (aliases != null)
+        {
+            foreach (var alias in aliases)
+            {
+                if (!string.IsNullOrWhiteSpace(alias?.AliasAddress))
+                    ownAddresses.Add(alias.AliasAddress.Trim());
+            }
+        }
+
+        return ownAddresses;
+    }
+
+    private static IEnumerable<string> SplitStoredReferences(string references)
+    {
+        if (string.IsNullOrWhiteSpace(references))
+            return [];
+
+        return references
+            .Split(new[] { ';', ',', ' ', '\t', '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(r => r.Trim());
+    }
+
+    private static List<string> BuildReferencesChain(IEnumerable<string> existingReferences, string parentInReplyTo, string parentMessageId)
+    {
+        var results = new List<string>();
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        void AddReference(string value)
+        {
+            var normalized = MailHeaderExtensions.StripAngleBrackets(value)?.Trim();
+            if (string.IsNullOrWhiteSpace(normalized))
+                return;
+            if (!seen.Add(normalized))
+                return;
+
+            results.Add(normalized);
+        }
+
+        if (existingReferences != null)
+        {
+            foreach (var reference in existingReferences)
+                AddReference(reference);
+        }
+
+        // RFC 5322 fallback: if References is absent, include parent In-Reply-To first when available.
+        if (results.Count == 0)
+            AddReference(parentInReplyTo);
+
+        AddReference(parentMessageId);
+
+        return results;
+    }
+
+    public async Task<IEnumerable<string>> GetRecentMailIdsForFolderAsync(Guid folderId, int count)
+    {
+        var recentMails = await Connection.Table<MailCopy>()
+            .Where(a => a.FolderId == folderId)
+            .OrderByDescending(a => a.CreationDate)
+            .Take(count)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return recentMails.Select(m => m.Id);
+    }
+
     public async Task<List<MailCopy>> GetMailItemsAsync(IEnumerable<string> mailCopyIds)
     {
         if (!mailCopyIds.Any()) return [];
 
-        var query = new Query("MailCopy")
-                       .WhereIn("MailCopy.Id", mailCopyIds)
-                       .SelectRaw("MailCopy.*")
-                       .GetRawQuery();
+        var placeholders = string.Join(",", mailCopyIds.Select(_ => "?"));
+        var sql = $"SELECT MailCopy.* FROM MailCopy WHERE MailCopy.Id IN ({placeholders})";
 
-        var mailCopies = await Connection.QueryAsync<MailCopy>(query);
+        var mailCopies = await Connection.QueryAsync<MailCopy>(sql, mailCopyIds.Cast<object>().ToArray());
         if (mailCopies?.Count == 0) return [];
 
-        Dictionary<Guid, MailItemFolder> folderCache = [];
-        Dictionary<Guid, MailAccount> accountCache = [];
-        Dictionary<string, AccountContact> contactCache = [];
+        var folderIds = mailCopies.Select(m => m.FolderId).Distinct().ToList();
+        var folderTasks = folderIds.Select(id => _folderService.GetFolderAsync(id));
+        var folders = await Task.WhenAll(folderTasks).ConfigureAwait(false);
+        var folderCache = folders.Where(f => f != null).ToDictionary(f => f.Id);
 
-        foreach (var mail in mailCopies)
-        {
-            await LoadAssignedPropertiesWithCacheAsync(mail, folderCache, accountCache, contactCache).ConfigureAwait(false);
-        }
+        var allAccounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        var accountCache = allAccounts.ToDictionary(a => a.Id);
+
+        var addresses = mailCopies.Where(m => !string.IsNullOrEmpty(m.FromAddress)).Select(m => m.FromAddress).Distinct().ToList();
+        var contactList = await _contactService.GetContactsByAddressesAsync(addresses).ConfigureAwait(false);
+        var contactCache = contactList.ToDictionary(c => c.Address);
+
+        AssignPropertiesFromCaches(mailCopies, folderCache, accountCache, contactCache);
 
         return mailCopies;
     }
 
     public async Task<List<string>> AreMailsExistsAsync(IEnumerable<string> mailCopyIds)
     {
-        var query = new Query(nameof(MailCopy))
-                        .WhereIn("Id", mailCopyIds)
-                        .Select("Id")
-                        .GetRawQuery();
+        var placeholders = string.Join(",", mailCopyIds.Select(_ => "?"));
+        var sql = $"SELECT Id FROM MailCopy WHERE Id IN ({placeholders})";
 
-        return await Connection.QueryScalarsAsync<string>(query);
+        return await Connection.QueryScalarsAsync<string>(sql, mailCopyIds.Cast<object>().ToArray());
+    }
+
+    public Task<List<MailCopy>> GetMailCopiesBeforeDateAsync(Guid accountId, DateTime cutoffDateUtc)
+    {
+        const string query = """
+                             SELECT MailCopy.*
+                             FROM MailCopy
+                             INNER JOIN MailItemFolder ON MailCopy.FolderId = MailItemFolder.Id
+                             WHERE MailItemFolder.MailAccountId = ?
+                               AND MailCopy.CreationDate < ?
+                             """;
+
+        return Connection.QueryAsync<MailCopy>(query, accountId, cutoffDateUtc);
     }
 }
diff --git a/Wino.Services/MimeFileService.cs b/Wino.Services/MimeFileService.cs
index 1d33d95f..2a01fe04 100644
--- a/Wino.Services/MimeFileService.cs
+++ b/Wino.Services/MimeFileService.cs
@@ -3,7 +3,9 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using HtmlAgilityPack;
 using MimeKit;
+using MimeKit.Cryptography;
 using Serilog;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.MailItem;
@@ -119,6 +121,85 @@ public class MimeFileService : IMimeFileService
         return true;
     }
 
+    public async Task<string> GetTranslatedHtmlAsync(Guid accountId, Guid fileId, string targetLanguage, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrWhiteSpace(targetLanguage))
+        {
+            return null;
+        }
+
+        try
+        {
+            var translatedHtmlPath = await GetTranslatedHtmlPathAsync(accountId, fileId, targetLanguage).ConfigureAwait(false);
+            if (!File.Exists(translatedHtmlPath))
+            {
+                return null;
+            }
+
+            return await File.ReadAllTextAsync(translatedHtmlPath, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Could not read translated html cache for FileId: {FileId}, Language: {Language}", fileId, targetLanguage);
+            return null;
+        }
+    }
+
+    public async Task SaveTranslatedHtmlAsync(Guid accountId, Guid fileId, string targetLanguage, string html, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrWhiteSpace(targetLanguage) || string.IsNullOrWhiteSpace(html))
+        {
+            return;
+        }
+
+        try
+        {
+            var translatedHtmlPath = await GetTranslatedHtmlPathAsync(accountId, fileId, targetLanguage).ConfigureAwait(false);
+            await File.WriteAllTextAsync(translatedHtmlPath, html, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Could not save translated html cache for FileId: {FileId}, Language: {Language}", fileId, targetLanguage);
+        }
+    }
+
+    public async Task<string> GetSummaryTextAsync(Guid accountId, Guid fileId, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var summaryPath = await GetSummaryTextPathAsync(accountId, fileId).ConfigureAwait(false);
+            if (!File.Exists(summaryPath))
+            {
+                return null;
+            }
+
+            return await File.ReadAllTextAsync(summaryPath, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Could not read summary cache for FileId: {FileId}", fileId);
+            return null;
+        }
+    }
+
+    public async Task SaveSummaryTextAsync(Guid accountId, Guid fileId, string summary, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrWhiteSpace(summary))
+        {
+            return;
+        }
+
+        try
+        {
+            var summaryPath = await GetSummaryTextPathAsync(accountId, fileId).ConfigureAwait(false);
+            await File.WriteAllTextAsync(summaryPath, NormalizeSummaryText(summary), cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            _logger.Error(ex, "Could not save summary cache for FileId: {FileId}", fileId);
+        }
+    }
+
     public MailRenderModel GetMailRenderModel(MimeMessage message, string mimeLocalPath, MailRenderingOptions options = null)
     {
         var visitor = CreateHTMLPreviewVisitor(message, mimeLocalPath);
@@ -147,12 +228,26 @@ public class MimeFileService : IMimeFileService
 
         var renderingModel = new MailRenderModel(finalRenderHtml, options);
 
-        // Create attachments.
+        renderingModel.Signatures = visitor.Signatures;
 
+        // S/MIME encryption detection: if the body is ApplicationPkcs7Mime and SecureMimeType is EnvelopedData
+        renderingModel.IsSmimeEncrypted = message.Body is ApplicationPkcs7Mime encrypted &&
+            encrypted.SecureMimeType == SecureMimeType.EnvelopedData;
+
+        // Create attachments.
         foreach (var attachment in visitor.Attachments)
         {
             if (attachment.IsAttachment && attachment is MimePart attachmentPart)
             {
+                // Exclude S/MIME encryption/decryption certificates
+                var contentType = attachmentPart.ContentType?.MimeType?.ToLowerInvariant();
+                var fileName = attachmentPart.FileName?.ToLowerInvariant();
+                if ((contentType == "application/pkcs7-signature"
+                    || contentType == "application/x-pkcs7-signature"
+                    && fileName == "smime.p7s") || (contentType == "application/pkcs7-mime"
+                                                    || contentType == "application/x-pkcs7-mime"
+                                                    && fileName == "smime.p7m"))
+                    continue;
                 renderingModel.Attachments.Add(attachmentPart);
             }
         }
@@ -194,4 +289,67 @@ public class MimeFileService : IMimeFileService
             Log.Error(ex, "Failed to remove user's mime cache folder.");
         }
     }
+
+    private async Task<string> GetTranslatedHtmlPathAsync(Guid accountId, Guid fileId, string targetLanguage)
+    {
+        var resourcePath = await GetMimeResourcePathAsync(accountId, fileId).ConfigureAwait(false);
+        return Path.Combine(resourcePath, $"translated-{SanitizeFileNamePart(targetLanguage)}.html");
+    }
+
+    private async Task<string> GetSummaryTextPathAsync(Guid accountId, Guid fileId)
+    {
+        var resourcePath = await GetMimeResourcePathAsync(accountId, fileId).ConfigureAwait(false);
+        return Path.Combine(resourcePath, "summary.txt");
+    }
+
+    private static string SanitizeFileNamePart(string value)
+    {
+        var invalidCharacters = Path.GetInvalidFileNameChars();
+        var sanitizedChars = value
+            .Trim()
+            .Select(ch => invalidCharacters.Contains(ch) ? '_' : char.ToLowerInvariant(ch))
+            .ToArray();
+
+        return sanitizedChars.Length == 0 ? "default" : new string(sanitizedChars);
+    }
+
+    private static string NormalizeSummaryText(string summary)
+    {
+        if (string.IsNullOrWhiteSpace(summary))
+        {
+            return string.Empty;
+        }
+
+        if (!summary.Contains('<'))
+        {
+            return summary.Trim();
+        }
+
+        var document = new HtmlDocument();
+        document.LoadHtml(summary);
+
+        var lineBreakNodes = document.DocumentNode.SelectNodes("//br|//p|//div|//li");
+        if (lineBreakNodes != null)
+        {
+            foreach (var node in lineBreakNodes)
+            {
+                if (node.Name.Equals("li", StringComparison.OrdinalIgnoreCase))
+                {
+                    node.ParentNode?.InsertBefore(document.CreateTextNode(Environment.NewLine + "- "), node);
+                }
+                else
+                {
+                    node.ParentNode?.InsertBefore(document.CreateTextNode(Environment.NewLine), node);
+                }
+            }
+        }
+
+        var plainText = HtmlEntity.DeEntitize(document.DocumentNode.InnerText ?? string.Empty);
+        return string.Join(
+            Environment.NewLine,
+            plainText
+                .Split([Environment.NewLine], StringSplitOptions.None)
+                .Select(line => line.Trim())
+                .Where(line => !string.IsNullOrWhiteSpace(line)));
+    }
 }
diff --git a/Wino.Services/MimeStorageService.cs b/Wino.Services/MimeStorageService.cs
new file mode 100644
index 00000000..4423d555
--- /dev/null
+++ b/Wino.Services/MimeStorageService.cs
@@ -0,0 +1,111 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Interfaces;
+
+namespace Wino.Services;
+
+public class MimeStorageService : IMimeStorageService
+{
+    private readonly INativeAppService _nativeAppService;
+    private readonly IMailService _mailService;
+    private readonly ILogger _logger = Log.ForContext<MimeStorageService>();
+
+    public MimeStorageService(INativeAppService nativeAppService, IMailService mailService)
+    {
+        _nativeAppService = nativeAppService;
+        _mailService = mailService;
+    }
+
+    public Task<string> GetMimeRootPathAsync() => _nativeAppService.GetMimeMessageStoragePath();
+
+    public async Task<Dictionary<Guid, long>> GetAccountsMimeStorageSizesAsync(IEnumerable<Guid> accountIds)
+    {
+        var mimeRoot = await GetMimeRootPathAsync().ConfigureAwait(false);
+        var result = new Dictionary<Guid, long>();
+
+        foreach (var accountId in accountIds)
+        {
+            var accountPath = Path.Combine(mimeRoot, accountId.ToString());
+            result[accountId] = GetDirectorySizeSafe(accountPath);
+        }
+
+        return result;
+    }
+
+    public async Task DeleteAccountMimeStorageAsync(Guid accountId)
+    {
+        var mimeRoot = await GetMimeRootPathAsync().ConfigureAwait(false);
+        var accountPath = Path.Combine(mimeRoot, accountId.ToString());
+
+        if (Directory.Exists(accountPath))
+        {
+            Directory.Delete(accountPath, true);
+        }
+    }
+
+    public async Task<int> DeleteAccountMimeStorageOlderThanAsync(Guid accountId, DateTime cutoffDateUtc)
+    {
+        var mailCopies = await _mailService.GetMailCopiesBeforeDateAsync(accountId, cutoffDateUtc).ConfigureAwait(false);
+
+        if (mailCopies.Count == 0)
+            return 0;
+
+        var mimeRoot = await GetMimeRootPathAsync().ConfigureAwait(false);
+        var accountPath = Path.Combine(mimeRoot, accountId.ToString());
+        var fileIds = mailCopies.Select(a => a.FileId).Distinct().ToList();
+        int deletedFolderCount = 0;
+
+        foreach (var fileId in fileIds)
+        {
+            var mimeDirectory = Path.Combine(accountPath, fileId.ToString());
+
+            if (!Directory.Exists(mimeDirectory))
+                continue;
+
+            try
+            {
+                Directory.Delete(mimeDirectory, true);
+                deletedFolderCount++;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Failed to delete MIME directory {DirectoryPath}", mimeDirectory);
+            }
+        }
+
+        return deletedFolderCount;
+    }
+
+    private static long GetDirectorySizeSafe(string directoryPath)
+    {
+        if (!Directory.Exists(directoryPath))
+            return 0;
+
+        long total = 0;
+
+        try
+        {
+            foreach (var filePath in Directory.EnumerateFiles(directoryPath, "*", SearchOption.AllDirectories))
+            {
+                try
+                {
+                    total += new FileInfo(filePath).Length;
+                }
+                catch
+                {
+                    // Ignore unreadable files and continue calculating.
+                }
+            }
+        }
+        catch
+        {
+            return 0;
+        }
+
+        return total;
+    }
+}
diff --git a/Wino.Services/ServicesContainerSetup.cs b/Wino.Services/ServicesContainerSetup.cs
index 894edc60..5c2668b1 100644
--- a/Wino.Services/ServicesContainerSetup.cs
+++ b/Wino.Services/ServicesContainerSetup.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Wino.Core.Domain.Interfaces;
-using Wino.Services.Threading;
 
 namespace Wino.Services;
 
@@ -15,6 +14,8 @@ public static class ServicesContainerSetup
         services.AddSingleton<IWinoLogger, WinoLogger>();
         services.AddSingleton<ILaunchProtocolService, LaunchProtocolService>();
         services.AddSingleton<IMimeFileService, MimeFileService>();
+        services.AddSingleton<ICalendarIcsFileService, CalendarIcsFileService>();
+        services.AddTransient<IMimeStorageService, MimeStorageService>();
 
         services.AddTransient<ICalendarService, CalendarService>();
         services.AddTransient<IMailService, MailService>();
@@ -22,14 +23,16 @@ public static class ServicesContainerSetup
         services.AddTransient<IAccountService, AccountService>();
         services.AddTransient<IContactService, ContactService>();
         services.AddTransient<ISignatureService, SignatureService>();
+        services.AddTransient<IEmailTemplateService, EmailTemplateService>();
         services.AddTransient<IContextMenuItemService, ContextMenuItemService>();
         services.AddTransient<ISpecialImapProviderConfigResolver, SpecialImapProviderConfigResolver>();
+        services.AddTransient<IKeyboardShortcutService, KeyboardShortcutService>();
+        services.AddSingleton<IWinoAccountApiClient, WinoAccountApiClient>();
+        services.AddSingleton<IWinoAccountProfileService, WinoAccountProfileService>();
+        services.AddTransient<IWinoAccountDataSyncService, WinoAccountDataSyncService>();
+        services.AddSingleton<IContactPictureFileService, ContactPictureFileService>();
 
-        services.AddSingleton<IThreadingStrategyProvider, ThreadingStrategyProvider>();
-        services.AddTransient<IOutlookThreadingStrategy, OutlookThreadingStrategy>();
-        services.AddTransient<IGmailThreadingStrategy, GmailThreadingStrategy>();
-        services.AddTransient<IImapThreadingStrategy, ImapThreadingStrategy>();
-
-
+        services.AddTransient<ICalDavClient, CalDavClient>();
+        services.AddSingleton<IUpdateManager, UpdateManager>();
     }
 }
diff --git a/Wino.Services/SignatureService.cs b/Wino.Services/SignatureService.cs
index 1a7f08b9..ee17d190 100644
--- a/Wino.Services/SignatureService.cs
+++ b/Wino.Services/SignatureService.cs
@@ -20,7 +20,7 @@ public class SignatureService(IDatabaseService databaseService) : BaseDatabaseSe
 
     public async Task<AccountSignature> CreateSignatureAsync(AccountSignature signature)
     {
-        await Connection.InsertAsync(signature);
+        await Connection.InsertAsync(signature, typeof(AccountSignature));
 
         return signature;
     }
@@ -36,21 +36,21 @@ public class SignatureService(IDatabaseService databaseService) : BaseDatabaseSe
             HtmlBody = @"<p>Sent from <a href=""https://github.com/bkaankose/Wino-Mail/"">Wino Mail</a> for Windows</p>"
         };
 
-        await Connection.InsertAsync(defaultSignature);
+        await Connection.InsertAsync(defaultSignature, typeof(AccountSignature));
 
         return defaultSignature;
     }
 
     public async Task<AccountSignature> UpdateSignatureAsync(AccountSignature signature)
     {
-        await Connection.UpdateAsync(signature);
+        await Connection.UpdateAsync(signature, typeof(AccountSignature));
 
         return signature;
     }
 
     public async Task<AccountSignature> DeleteSignatureAsync(AccountSignature signature)
     {
-        await Connection.DeleteAsync(signature);
+        await Connection.DeleteAsync<AccountSignature>(signature.Id);
 
         return signature;
     }
diff --git a/Wino.Services/SpecialImapProviderConfigResolver.cs b/Wino.Services/SpecialImapProviderConfigResolver.cs
index 27054ef9..a76457e5 100644
--- a/Wino.Services/SpecialImapProviderConfigResolver.cs
+++ b/Wino.Services/SpecialImapProviderConfigResolver.cs
@@ -7,61 +7,70 @@ namespace Wino.Services;
 
 public class SpecialImapProviderConfigResolver : ISpecialImapProviderConfigResolver
 {
-    private readonly CustomServerInformation iCloudServerConfig = new CustomServerInformation()
-    {
-        IncomingServer = "imap.mail.me.com",
-        IncomingServerPort = "993",
-        IncomingServerType = CustomIncomingServerType.IMAP4,
-        IncomingServerSocketOption = ImapConnectionSecurity.Auto,
-        IncomingAuthenticationMethod = ImapAuthenticationMethod.Auto,
-        OutgoingServer = "smtp.mail.me.com",
-        OutgoingServerPort = "587",
-        OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
-        OutgoingAuthenticationMethod = ImapAuthenticationMethod.Auto,
-        MaxConcurrentClients = 5,
-    };
-
-    private readonly CustomServerInformation yahooServerConfig = new CustomServerInformation()
-    {
-        IncomingServer = "imap.mail.yahoo.com",
-        IncomingServerPort = "993",
-        IncomingServerType = CustomIncomingServerType.IMAP4,
-        IncomingServerSocketOption = ImapConnectionSecurity.Auto,
-        IncomingAuthenticationMethod = ImapAuthenticationMethod.Auto,
-        OutgoingServer = "smtp.mail.yahoo.com",
-        OutgoingServerPort = "587",
-        OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
-        OutgoingAuthenticationMethod = ImapAuthenticationMethod.Auto,
-        MaxConcurrentClients = 5,
-    };
-
-
     public CustomServerInformation GetServerInformation(MailAccount account, AccountCreationDialogResult dialogResult)
     {
         CustomServerInformation resolvedConfig = null;
+        var details = dialogResult.SpecialImapProviderDetails;
 
-        if (dialogResult.SpecialImapProviderDetails.SpecialImapProvider == SpecialImapProvider.iCloud)
+        if (details.SpecialImapProvider == SpecialImapProvider.iCloud)
         {
-            resolvedConfig = iCloudServerConfig;
+            resolvedConfig = new CustomServerInformation()
+            {
+                IncomingServer = "imap.mail.me.com",
+                IncomingServerPort = "993",
+                IncomingServerType = CustomIncomingServerType.IMAP4,
+                IncomingServerSocketOption = ImapConnectionSecurity.Auto,
+                IncomingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+                OutgoingServer = "smtp.mail.me.com",
+                OutgoingServerPort = "587",
+                OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
+                OutgoingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+                MaxConcurrentClients = 5,
+                CalDavServiceUrl = "https://caldav.icloud.com/"
+            };
 
             // iCloud takes username before the @icloud part for incoming, but full address as outgoing.
-            resolvedConfig.IncomingServerUsername = dialogResult.SpecialImapProviderDetails.Address.Split('@')[0];
-            resolvedConfig.OutgoingServerUsername = dialogResult.SpecialImapProviderDetails.Address;
+            resolvedConfig.IncomingServerUsername = details.Address.Split('@')[0];
+            resolvedConfig.OutgoingServerUsername = details.Address;
         }
-        else if (dialogResult.SpecialImapProviderDetails.SpecialImapProvider == SpecialImapProvider.Yahoo)
+        else if (details.SpecialImapProvider == SpecialImapProvider.Yahoo)
         {
-            resolvedConfig = yahooServerConfig;
+            resolvedConfig = new CustomServerInformation()
+            {
+                IncomingServer = "imap.mail.yahoo.com",
+                IncomingServerPort = "993",
+                IncomingServerType = CustomIncomingServerType.IMAP4,
+                IncomingServerSocketOption = ImapConnectionSecurity.Auto,
+                IncomingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+                OutgoingServer = "smtp.mail.yahoo.com",
+                OutgoingServerPort = "587",
+                OutgoingServerSocketOption = ImapConnectionSecurity.Auto,
+                OutgoingAuthenticationMethod = ImapAuthenticationMethod.Auto,
+                MaxConcurrentClients = 5,
+                CalDavServiceUrl = "https://caldav.calendar.yahoo.com/"
+            };
 
             // Yahoo uses full address for both incoming and outgoing.
-            resolvedConfig.IncomingServerUsername = dialogResult.SpecialImapProviderDetails.Address;
-            resolvedConfig.OutgoingServerUsername = dialogResult.SpecialImapProviderDetails.Address;
+            resolvedConfig.IncomingServerUsername = details.Address;
+            resolvedConfig.OutgoingServerUsername = details.Address;
         }
 
         // Fill in account details.
-        resolvedConfig.Address = dialogResult.SpecialImapProviderDetails.Address;
-        resolvedConfig.IncomingServerPassword = dialogResult.SpecialImapProviderDetails.Password;
-        resolvedConfig.OutgoingServerPassword = dialogResult.SpecialImapProviderDetails.Password;
-        resolvedConfig.DisplayName = dialogResult.SpecialImapProviderDetails.SenderName;
+        resolvedConfig.Address = details.Address;
+        resolvedConfig.IncomingServerPassword = details.Password;
+        resolvedConfig.OutgoingServerPassword = details.Password;
+        resolvedConfig.DisplayName = details.SenderName;
+        resolvedConfig.CalendarSupportMode = details.CalendarSupportMode;
+        resolvedConfig.CalDavUsername = details.Address;
+        resolvedConfig.CalDavPassword = details.Password;
+
+        if (details.CalendarSupportMode != ImapCalendarSupportMode.CalDav)
+        {
+            resolvedConfig.CalDavServiceUrl = string.Empty;
+            resolvedConfig.CalDavUsername = string.Empty;
+            resolvedConfig.CalDavPassword = string.Empty;
+        }
+
         return resolvedConfig;
     }
 }
diff --git a/Wino.Services/Threading/APIThreadingStrategy.cs b/Wino.Services/Threading/APIThreadingStrategy.cs
deleted file mode 100644
index 28a97544..00000000
--- a/Wino.Services/Threading/APIThreadingStrategy.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Services;
-
-namespace Wino.Services.Threading;
-
-public class APIThreadingStrategy : IThreadingStrategy
-{
-    private readonly IDatabaseService _databaseService;
-    private readonly IFolderService _folderService;
-
-    public APIThreadingStrategy(IDatabaseService databaseService, IFolderService folderService)
-    {
-        _databaseService = databaseService;
-        _folderService = folderService;
-    }
-
-    public virtual bool ShouldThreadWithItem(IMailItem originalItem, IMailItem targetItem)
-    {
-        return originalItem.ThreadId != null && originalItem.ThreadId == targetItem.ThreadId;
-    }
-
-    ///<inheritdoc/>
-    public async Task<List<IMailItem>> ThreadItemsAsync(List<MailCopy> items, IMailItemFolder threadingForFolder)
-    {
-        var assignedAccount = items[0].AssignedAccount;
-
-        var sentFolder = await _folderService.GetSpecialFolderByAccountIdAsync(assignedAccount.Id, SpecialFolderType.Sent);
-        var draftFolder = await _folderService.GetSpecialFolderByAccountIdAsync(assignedAccount.Id, SpecialFolderType.Draft);
-
-        if (sentFolder == null || draftFolder == null) return default;
-
-        // True: Non threaded items.
-        // False: Potentially threaded items.
-        var nonThreadedOrThreadedMails = items
-            .Distinct()
-            .GroupBy(x => string.IsNullOrEmpty(x.ThreadId))
-            .ToDictionary(x => x.Key, x => x);
-
-        _ = nonThreadedOrThreadedMails.TryGetValue(true, out var nonThreadedMails);
-        var isThreadedItems = nonThreadedOrThreadedMails.TryGetValue(false, out var potentiallyThreadedMails);
-
-        List<IMailItem> resultList = nonThreadedMails is null ? [] : [.. nonThreadedMails];
-
-        if (isThreadedItems)
-        {
-            var threadItems = (await GetThreadItemsAsync(potentiallyThreadedMails.Select(x => (x.ThreadId, x.AssignedFolder)).ToList(), assignedAccount.Id, sentFolder.Id, draftFolder.Id))
-            .GroupBy(x => x.ThreadId);
-
-            foreach (var threadItem in threadItems)
-            {
-                if (threadItem.Count() == 1)
-                {
-                    resultList.Add(threadItem.First());
-                    continue;
-                }
-
-                var thread = new ThreadMailItem();
-
-                foreach (var childThreadItem in threadItem)
-                {
-                    if (thread.ThreadItems.Any(a => a.Id == childThreadItem.Id))
-                    {
-                        // Mail already exist in the thread.
-                        // There should be only 1 instance of the mail in the thread.
-                        // Make sure we add the correct one.
-
-                        // Add the one with threading folder.
-                        var threadingFolderItem = threadItem.FirstOrDefault(a => a.Id == childThreadItem.Id && a.FolderId == threadingForFolder.Id);
-
-                        if (threadingFolderItem == null) continue;
-
-                        // Remove the existing one.
-                        thread.ThreadItems.Remove(thread.ThreadItems.First(a => a.Id == childThreadItem.Id));
-
-                        // Add the correct one for listing.
-                        thread.AddThreadItem(threadingFolderItem);
-                    }
-                    else
-                    {
-                        thread.AddThreadItem(childThreadItem);
-                    }
-                }
-
-                if (thread.ThreadItems.Count > 1)
-                {
-                    resultList.Add(thread);
-                }
-                else
-                {
-                    // Don't make threads if the thread has only one item.
-                    // Gmail has may have multiple assignments for the same item.
-
-                    resultList.Add(thread.ThreadItems.First());
-                }
-            }
-        }
-
-        return resultList;
-    }
-
-    private async Task<List<MailCopy>> GetThreadItemsAsync(List<(string threadId, MailItemFolder threadingFolder)> potentialThread,
-                                                           Guid accountId,
-                                                           Guid sentFolderId,
-                                                           Guid draftFolderId)
-    {
-        // Only items from the folder that we are threading for, sent and draft folder items must be included.
-        // This is important because deleted items or item assignments that belongs to different folder is 
-        // affecting the thread creation here.
-
-        // If the threading is done from Sent or Draft folder, include everything...
-
-        // TODO: Convert to SQLKata query.
-
-        var query = @$"SELECT DISTINCT MC.* FROM MailCopy MC
-                           INNER JOIN MailItemFolder MF on MF.Id = MC.FolderId
-                           WHERE MF.MailAccountId == '{accountId}' AND
-                           ({string.Join(" OR ", potentialThread.Select(x => ConditionForItem(x, sentFolderId, draftFolderId)))})";
-
-        return await _databaseService.Connection.QueryAsync<MailCopy>(query);
-
-        static string ConditionForItem((string threadId, MailItemFolder threadingFolder) potentialThread, Guid sentFolderId, Guid draftFolderId)
-        {
-            if (potentialThread.threadingFolder.SpecialFolderType == SpecialFolderType.Draft || potentialThread.threadingFolder.SpecialFolderType == SpecialFolderType.Sent)
-                return $"(MC.ThreadId = '{potentialThread.threadId}')";
-
-            return $"(MC.ThreadId = '{potentialThread.threadId}' AND MC.FolderId IN ('{potentialThread.threadingFolder.Id}','{sentFolderId}','{draftFolderId}'))";
-        }
-    }
-}
diff --git a/Wino.Services/Threading/GmailThreadingStrategy.cs b/Wino.Services/Threading/GmailThreadingStrategy.cs
deleted file mode 100644
index b0e41794..00000000
--- a/Wino.Services/Threading/GmailThreadingStrategy.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Services.Threading;
-
-public class GmailThreadingStrategy : APIThreadingStrategy, IGmailThreadingStrategy
-{
-    public GmailThreadingStrategy(IDatabaseService databaseService, IFolderService folderService) : base(databaseService, folderService) { }
-}
diff --git a/Wino.Services/Threading/ImapThreadingStrategy.cs b/Wino.Services/Threading/ImapThreadingStrategy.cs
deleted file mode 100644
index 8c5cacfb..00000000
--- a/Wino.Services/Threading/ImapThreadingStrategy.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using SqlKata;
-using Wino.Core.Domain.Entities.Mail;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Folders;
-using Wino.Core.Domain.Models.MailItem;
-using Wino.Services.Extensions;
-
-namespace Wino.Services.Threading;
-
-public class ImapThreadingStrategy : BaseDatabaseService, IImapThreadingStrategy
-{
-    private readonly IFolderService _folderService;
-
-    public ImapThreadingStrategy(IDatabaseService databaseService, IFolderService folderService) : base(databaseService)
-    {
-        _folderService = folderService;
-    }
-
-    private Task<MailCopy> GetReplyParentAsync(IMailItem replyItem, Guid accountId, Guid threadingFolderId, Guid sentFolderId, Guid draftFolderId)
-    {
-        if (string.IsNullOrEmpty(replyItem?.MessageId)) return Task.FromResult<MailCopy>(null);
-
-        var query = new Query("MailCopy")
-            .Distinct()
-            .Take(1)
-            .Join("MailItemFolder", "MailItemFolder.Id", "MailCopy.FolderId")
-            .Where("MailItemFolder.MailAccountId", accountId)
-            .WhereIn("MailItemFolder.Id", new List<Guid> { threadingFolderId, sentFolderId, draftFolderId })
-            .Where("MailCopy.MessageId", replyItem.InReplyTo)
-            .WhereNot("MailCopy.Id", replyItem.Id)
-            .Select("MailCopy.*");
-
-        return Connection.FindWithQueryAsync<MailCopy>(query.GetRawQuery());
-    }
-
-    private Task<MailCopy> GetInReplyToReplyAsync(IMailItem originalItem, Guid accountId, Guid threadingFolderId, Guid sentFolderId, Guid draftFolderId)
-    {
-        if (string.IsNullOrEmpty(originalItem?.MessageId)) return Task.FromResult<MailCopy>(null);
-
-        var query = new Query("MailCopy")
-            .Distinct()
-            .Take(1)
-            .Join("MailItemFolder", "MailItemFolder.Id", "MailCopy.FolderId")
-            .WhereNot("MailCopy.Id", originalItem.Id)
-            .Where("MailItemFolder.MailAccountId", accountId)
-            .Where("MailCopy.InReplyTo", originalItem.MessageId)
-            .WhereIn("MailItemFolder.Id", new List<Guid> { threadingFolderId, sentFolderId, draftFolderId })
-            .Select("MailCopy.*");
-
-        var raq = query.GetRawQuery();
-
-        return Connection.FindWithQueryAsync<MailCopy>(query.GetRawQuery());
-    }
-
-    public async Task<List<IMailItem>> ThreadItemsAsync(List<MailCopy> items, IMailItemFolder threadingForFolder)
-    {
-        var threads = new List<ThreadMailItem>();
-
-        var account = items.First().AssignedAccount;
-        var accountId = account.Id;
-
-        // Child -> Parent approach.
-
-        var mailLookupTable = new Dictionary<string, bool>();
-
-        // Fill up the mail lookup table to prevent double thread creation.
-        foreach (var mail in items)
-            if (!mailLookupTable.ContainsKey(mail.Id))
-                mailLookupTable.Add(mail.Id, false);
-
-        var sentFolder = await _folderService.GetSpecialFolderByAccountIdAsync(accountId, SpecialFolderType.Sent);
-        var draftFolder = await _folderService.GetSpecialFolderByAccountIdAsync(accountId, SpecialFolderType.Draft);
-
-        // Threading is not possible. Return items as it is.
-
-        if (sentFolder == null || draftFolder == null) return new List<IMailItem>(items);
-
-        foreach (var replyItem in items)
-        {
-            if (mailLookupTable[replyItem.Id])
-                continue;
-
-            mailLookupTable[replyItem.Id] = true;
-
-            var threadItem = new ThreadMailItem();
-
-            threadItem.AddThreadItem(replyItem);
-
-            var replyToChild = await GetReplyParentAsync(replyItem, accountId, replyItem.AssignedFolder.Id, sentFolder.Id, draftFolder.Id);
-
-            // Build up 
-            while (replyToChild != null)
-            {
-                replyToChild.AssignedAccount = account;
-
-                if (replyToChild.FolderId == draftFolder.Id)
-                    replyToChild.AssignedFolder = draftFolder;
-
-                if (replyToChild.FolderId == sentFolder.Id)
-                    replyToChild.AssignedFolder = sentFolder;
-
-                if (replyToChild.FolderId == replyItem.AssignedFolder.Id)
-                    replyToChild.AssignedFolder = replyItem.AssignedFolder;
-
-                threadItem.AddThreadItem(replyToChild);
-
-                if (mailLookupTable.ContainsKey(replyToChild.Id))
-                    mailLookupTable[replyToChild.Id] = true;
-
-                replyToChild = await GetReplyParentAsync(replyToChild, accountId, replyToChild.AssignedFolder.Id, sentFolder.Id, draftFolder.Id);
-            }
-
-            // Build down
-            var replyToParent = await GetInReplyToReplyAsync(replyItem, accountId, replyItem.AssignedFolder.Id, sentFolder.Id, draftFolder.Id);
-
-            while (replyToParent != null)
-            {
-                replyToParent.AssignedAccount = account;
-
-                if (replyToParent.FolderId == draftFolder.Id)
-                    replyToParent.AssignedFolder = draftFolder;
-
-                if (replyToParent.FolderId == sentFolder.Id)
-                    replyToParent.AssignedFolder = sentFolder;
-
-                if (replyToParent.FolderId == replyItem.AssignedFolder.Id)
-                    replyToParent.AssignedFolder = replyItem.AssignedFolder;
-
-                threadItem.AddThreadItem(replyToParent);
-
-                if (mailLookupTable.ContainsKey(replyToParent.Id))
-                    mailLookupTable[replyToParent.Id] = true;
-
-                replyToParent = await GetInReplyToReplyAsync(replyToParent, accountId, replyToParent.AssignedFolder.Id, sentFolder.Id, draftFolder.Id);
-            }
-
-            // It's a thread item.
-
-            if (threadItem.ThreadItems.Count > 1 && !threads.Exists(a => a.Id == threadItem.Id))
-            {
-                threads.Add(threadItem);
-            }
-            else
-            {
-                // False alert. This is not a thread item.
-                mailLookupTable[replyItem.Id] = false;
-
-                // TODO: Here potentially check other algorithms for threading like References.
-            }
-        }
-
-        // At this points all mails in the list belong to single items.
-        // Merge with threads.
-        // Last sorting will be done later on in MailService.
-
-        // Remove single mails that are included in thread.
-        items.RemoveAll(a => mailLookupTable.ContainsKey(a.Id) && mailLookupTable[a.Id]);
-
-        var finalList = new List<IMailItem>(items);
-
-        finalList.AddRange(threads);
-
-        return finalList;
-    }
-
-    public bool ShouldThreadWithItem(IMailItem originalItem, IMailItem targetItem)
-    {
-        bool isChild = originalItem.InReplyTo != null && originalItem.InReplyTo == targetItem.MessageId;
-        bool isParent = originalItem.MessageId != null && originalItem.MessageId == targetItem.InReplyTo;
-
-        return isChild || isParent;
-    }
-}
diff --git a/Wino.Services/Threading/OutlookThreadingStrategy.cs b/Wino.Services/Threading/OutlookThreadingStrategy.cs
deleted file mode 100644
index 81ed5ab6..00000000
--- a/Wino.Services/Threading/OutlookThreadingStrategy.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Services.Threading;
-
-// Outlook and Gmail is using the same threading strategy.
-// Outlook: ConversationId -> it's set as ThreadId
-// Gmail: ThreadId
-
-public class OutlookThreadingStrategy : APIThreadingStrategy, IOutlookThreadingStrategy
-{
-    public OutlookThreadingStrategy(IDatabaseService databaseService, IFolderService folderService) : base(databaseService, folderService) { }
-}
diff --git a/Wino.Services/ThreadingStrategyProvider.cs b/Wino.Services/ThreadingStrategyProvider.cs
deleted file mode 100644
index c9824742..00000000
--- a/Wino.Services/ThreadingStrategyProvider.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Interfaces;
-
-namespace Wino.Services;
-
-public class ThreadingStrategyProvider : IThreadingStrategyProvider
-{
-    private readonly IOutlookThreadingStrategy _outlookThreadingStrategy;
-    private readonly IGmailThreadingStrategy _gmailThreadingStrategy;
-    private readonly IImapThreadingStrategy _imapThreadStrategy;
-
-    public ThreadingStrategyProvider(IOutlookThreadingStrategy outlookThreadingStrategy,
-                                     IGmailThreadingStrategy gmailThreadingStrategy,
-                                     IImapThreadingStrategy imapThreadStrategy)
-    {
-        _outlookThreadingStrategy = outlookThreadingStrategy;
-        _gmailThreadingStrategy = gmailThreadingStrategy;
-        _imapThreadStrategy = imapThreadStrategy;
-    }
-
-    public IThreadingStrategy GetStrategy(MailProviderType mailProviderType)
-    {
-        return mailProviderType switch
-        {
-            MailProviderType.Outlook => _outlookThreadingStrategy,
-            MailProviderType.Gmail => _gmailThreadingStrategy,
-            _ => _imapThreadStrategy,
-        };
-    }
-}
diff --git a/Wino.Services/UpdateManager.cs b/Wino.Services/UpdateManager.cs
new file mode 100644
index 00000000..a195068f
--- /dev/null
+++ b/Wino.Services/UpdateManager.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Updates;
+
+namespace Wino.Services;
+
+public class UpdateManager : IUpdateManager
+{
+    private const string UpdateNotesResourcePath = "ms-appx:///Assets/UpdateNotes/vnext.json";
+    private const string FeaturesResourcePath = "ms-appx:///Assets/UpdateNotes/features.json";
+    private const string UpdateNotesSeenKeyFormat = "UpdateNotes_{0}_Shown";
+
+    private readonly IFileService _fileService;
+    private readonly IConfigurationService _configurationService;
+    private readonly INativeAppService _nativeAppService;
+
+    private string _versionSeenKey = string.Empty;
+    private UpdateNotes _latestUpdateNotes = new();
+
+    public UpdateManager(IFileService fileService,
+                         IConfigurationService configurationService,
+                         INativeAppService nativeAppService)
+    {
+        _fileService = fileService;
+        _configurationService = configurationService;
+        _nativeAppService = nativeAppService;
+    }
+
+    private string GetVersionSeenKey()
+    {
+        if (string.IsNullOrEmpty(_versionSeenKey))
+        {
+            var version = _nativeAppService.GetFullAppVersion();
+            var sanitized = version.Replace(".", "_");
+            _versionSeenKey = string.Format(UpdateNotesSeenKeyFormat, sanitized);
+        }
+
+        return _versionSeenKey;
+    }
+
+    public async Task<UpdateNotes> GetLatestUpdateNotesAsync()
+    {
+        try
+        {
+            var json = await _fileService.GetFileContentByApplicationUriAsync(UpdateNotesResourcePath);
+
+            if (string.IsNullOrEmpty(json))
+            {
+                _latestUpdateNotes = new UpdateNotes();
+                return _latestUpdateNotes;
+            }
+
+            _latestUpdateNotes = JsonSerializer.Deserialize(json, BasicTypesJsonContext.Default.UpdateNotes) ?? new UpdateNotes();
+            return _latestUpdateNotes;
+        }
+        catch (Exception)
+        {
+            _latestUpdateNotes = new UpdateNotes();
+            return _latestUpdateNotes;
+        }
+    }
+
+    public bool ShouldShowUpdateNotes()
+        => !_configurationService.Get(GetVersionSeenKey(), false);
+
+    public async Task<List<UpdateNoteSection>> GetFeaturesAsync()
+    {
+        try
+        {
+            var json = await _fileService.GetFileContentByApplicationUriAsync(FeaturesResourcePath);
+
+            if (string.IsNullOrEmpty(json))
+                return [];
+
+            return JsonSerializer.Deserialize(json, BasicTypesJsonContext.Default.ListUpdateNoteSection) ?? [];
+        }
+        catch (Exception)
+        {
+            return [];
+        }
+    }
+
+    public void MarkUpdateNotesAsSeen()
+        => _configurationService.Set(GetVersionSeenKey(), true);
+}
diff --git a/Wino.Services/Wino.Services.csproj b/Wino.Services/Wino.Services.csproj
index d0121c5e..025f3778 100644
--- a/Wino.Services/Wino.Services.csproj
+++ b/Wino.Services/Wino.Services.csproj
@@ -1,10 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Platforms>x86;x64;arm64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
+	<ItemGroup>
+	  <Compile Remove="Misc\**" />
+	  <EmbeddedResource Remove="Misc\**" />
+	  <None Remove="Misc\**" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="HtmlAgilityPack" />
 		<PackageReference Include="Ical.Net" />
@@ -14,13 +22,10 @@
 		<PackageReference Include="Serilog.Sinks.Debug" />
 		<PackageReference Include="Serilog.Sinks.File" />
 		<PackageReference Include="Serilog.Exceptions" />
-		<PackageReference Include="SqlKata" />
+		<PackageReference Include="Wino.Mail.Contracts" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />
 		<ProjectReference Include="..\Wino.Messages\Wino.Messaging.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Misc\" />
-	</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Wino.Services/WinoAccountApiClient.cs b/Wino.Services/WinoAccountApiClient.cs
new file mode 100644
index 00000000..63a8b757
--- /dev/null
+++ b/Wino.Services/WinoAccountApiClient.cs
@@ -0,0 +1,605 @@
+#nullable enable
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using System.Threading;
+using System.Threading.Tasks;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Mail.Api.Contracts.Users;
+
+namespace Wino.Services;
+
+public sealed class WinoAccountApiClient : IWinoAccountApiClient, IDisposable
+{
+    private readonly HttpClient _httpClient;
+    private readonly IDatabaseService _databaseService;
+    private readonly SemaphoreSlim _tokenRefreshLock = new(1, 1);
+    private readonly bool _ownsHttpClient;
+
+    private const string ApiUrl = "https://localhost:7204/";
+    // private const string ApiUrl = "https://api.winomail.app/";
+
+    public WinoAccountApiClient(IDatabaseService databaseService, HttpClient? httpClient = null)
+    {
+        _databaseService = databaseService;
+
+        if (httpClient != null)
+        {
+            _httpClient = httpClient;
+            return;
+        }
+
+        var handler = new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = ValidateCertificate
+        };
+
+        _httpClient = new HttpClient(handler)
+        {
+            BaseAddress = new Uri(ApiUrl)
+        };
+
+        _ownsHttpClient = true;
+    }
+
+    public Task<WinoAccountApiResult<AuthResultDto>> RegisterAsync(string email, string password, CancellationToken cancellationToken = default)
+        => SendAuthRequestAsync("api/v1/auth/register", new RegisterRequest(email, password), WinoAccountApiJsonContext.Default.RegisterRequest, cancellationToken);
+
+    public Task<WinoAccountApiResult<AuthResultDto>> LoginAsync(string email, string password, CancellationToken cancellationToken = default)
+        => SendAuthRequestAsync("api/v1/auth/login", new LoginRequest(email, password), WinoAccountApiJsonContext.Default.LoginRequest, cancellationToken);
+
+    public Task<WinoAccountApiResult<AuthResultDto>> RefreshAsync(string refreshToken, CancellationToken cancellationToken = default)
+        => SendAuthRequestAsync("api/v1/auth/refresh", new RefreshRequest(refreshToken), WinoAccountApiJsonContext.Default.RefreshRequest, cancellationToken);
+
+    public Task<ApiEnvelope<EmailConfirmationResendResultDto>> ResendEmailConfirmationAsync(string endpoint, string ticket, CancellationToken cancellationToken = default)
+        => SendAnonymousRequestAsync(
+            HttpMethod.Post,
+            endpoint,
+            new ResendEmailConfirmationRequest(ticket),
+            WinoAccountApiJsonContext.Default.ResendEmailConfirmationRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeEmailConfirmationResendResultDto,
+            cancellationToken);
+
+    public Task<ApiEnvelope<JsonElement>> ForgotPasswordAsync(string email, CancellationToken cancellationToken = default)
+        => SendAnonymousRequestAsync(
+            HttpMethod.Post,
+            "api/v1/auth/forgot-password",
+            new ForgotPasswordRequest(email),
+            WinoAccountApiJsonContext.Default.ForgotPasswordRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeJsonElement,
+            cancellationToken);
+
+    public async Task<ApiEnvelope<JsonElement>> LogoutAsync(string refreshToken, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            using var response = await _httpClient.PostAsJsonAsync(
+                "api/v1/auth/logout",
+                new LogoutRequest(refreshToken),
+                WinoAccountApiJsonContext.Default.LogoutRequest,
+                cancellationToken).ConfigureAwait(false);
+
+            var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var envelope = string.IsNullOrWhiteSpace(payload)
+                ? null
+                : JsonSerializer.Deserialize(payload, WinoAccountApiJsonContext.Default.ApiEnvelopeJsonElement);
+
+            return envelope ?? ApiEnvelope<JsonElement>.Failure($"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim());
+        }
+        catch (Exception ex)
+        {
+            return ApiEnvelope<JsonElement>.Failure(ex.Message);
+        }
+    }
+
+    public Task<ApiEnvelope<AuthUserDto>> GetCurrentUserAsync(CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync("api/v1/auth/me", WinoAccountApiJsonContext.Default.ApiEnvelopeAuthUserDto, cancellationToken);
+
+    public Task<ApiEnvelope<AiStatusResultDto>> GetAiStatusAsync(CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync("api/v1/ai/status", WinoAccountApiJsonContext.Default.ApiEnvelopeAiStatusResultDto, cancellationToken);
+
+    public Task<ApiEnvelope<AiTextResultDto>> SummarizeAsync(string html, string targetLanguage, CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/ai/summarize",
+            new SummarizeRequest(html, targetLanguage),
+            WinoAccountApiJsonContext.Default.SummarizeRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeAiTextResultDto,
+            cancellationToken);
+
+    public Task<ApiEnvelope<AiTextResultDto>> TranslateAsync(string html, string targetLanguage, CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/ai/translate",
+            new TranslateRequest(html, targetLanguage),
+            WinoAccountApiJsonContext.Default.TranslateRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeAiTextResultDto,
+            cancellationToken);
+
+    public Task<ApiEnvelope<AiTextResultDto>> RewriteAsync(string html, string mode, CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/ai/rewrite",
+            new RewriteRequest(html, mode),
+            WinoAccountApiJsonContext.Default.RewriteRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeAiTextResultDto,
+            cancellationToken);
+
+    public Task<ApiEnvelope<WinoStoreCollectionsIdTicketInfo>> CreateCollectionsIdTicketAsync(CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/store/collections-id-ticket",
+            WinoAccountApiJsonContext.Default.ApiEnvelopeWinoStoreCollectionsIdTicketInfo,
+            cancellationToken);
+
+    public Task<ApiEnvelope<WinoStoreCollectionsIdTicketInfo>> CreatePurchaseIdTicketAsync(CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/store/purchase-id-ticket",
+            WinoAccountApiJsonContext.Default.ApiEnvelopeWinoStoreCollectionsIdTicketInfo,
+            cancellationToken);
+
+    public Task<ApiEnvelope<JsonElement>> SyncStoreEntitlementsAsync(string? storeIdKey, string? purchaseIdKey, CancellationToken cancellationToken = default)
+        => SendAuthorizedRequestAsync(
+            HttpMethod.Post,
+            "api/v1/store/entitlements/sync",
+            new SyncStoreEntitlementsRequest(storeIdKey, purchaseIdKey),
+            WinoAccountApiJsonContext.Default.SyncStoreEntitlementsRequest,
+            WinoAccountApiJsonContext.Default.ApiEnvelopeJsonElement,
+            cancellationToken);
+
+    public async Task<string?> GetSettingsAsync(CancellationToken cancellationToken = default)
+    {
+        using var response = await SendAuthorizedAsync(
+            () => CreateAuthorizedRequestAsync(HttpMethod.Get, "api/v1/users/me/settings"),
+            cancellationToken).ConfigureAwait(false);
+
+        if (response == null)
+        {
+            throw new InvalidOperationException("MissingAccessToken");
+        }
+
+        if (response.StatusCode == System.Net.HttpStatusCode.NoContent)
+        {
+            return null;
+        }
+
+        await EnsureSuccessResponseAsync(response, cancellationToken).ConfigureAwait(false);
+
+        return await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task SaveSettingsAsync(string settingsJson, CancellationToken cancellationToken = default)
+    {
+        using var response = await SendAuthorizedAsync(
+            () => CreateAuthorizedRequestAsync(
+                HttpMethod.Put,
+                "api/v1/users/me/settings",
+                () => new StringContent(settingsJson, Encoding.UTF8, "application/json")),
+            cancellationToken).ConfigureAwait(false);
+
+        if (response == null)
+        {
+            throw new InvalidOperationException("MissingAccessToken");
+        }
+
+        await EnsureSuccessResponseAsync(response, cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task<UserMailboxSyncListDto> GetMailboxesAsync(CancellationToken cancellationToken = default)
+    {
+        using var response = await SendAuthorizedAsync(
+            () => CreateAuthorizedRequestAsync(HttpMethod.Get, "api/v1/users/me/mailboxes"),
+            cancellationToken).ConfigureAwait(false);
+
+        if (response == null)
+        {
+            throw new InvalidOperationException("MissingAccessToken");
+        }
+
+        await EnsureSuccessResponseAsync(response, cancellationToken).ConfigureAwait(false);
+
+        var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+        var envelope = string.IsNullOrWhiteSpace(payload)
+            ? null
+            : JsonSerializer.Deserialize(payload, WinoAccountApiJsonContext.Default.ApiEnvelopeUserMailboxSyncListDto);
+
+        if (envelope?.IsSuccess == true && envelope.Result != null)
+        {
+            return envelope.Result;
+        }
+
+        throw new InvalidOperationException(ExtractErrorMessage(payload) ?? envelope?.ErrorCode ?? "Mailbox synchronization request failed.");
+    }
+
+    public async Task ReplaceMailboxesAsync(ReplaceUserMailboxesRequestDto request, CancellationToken cancellationToken = default)
+    {
+        using var response = await SendAuthorizedAsync(
+            () => CreateAuthorizedRequestAsync(
+                HttpMethod.Put,
+                "api/v1/users/me/mailboxes",
+                () => JsonContent.Create(request, WinoAccountApiJsonContext.Default.ReplaceUserMailboxesRequestDto)),
+            cancellationToken).ConfigureAwait(false);
+
+        if (response == null)
+        {
+            throw new InvalidOperationException("MissingAccessToken");
+        }
+
+        await EnsureSuccessResponseAsync(response, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<WinoAccountApiResult<AuthResultDto>> SendAuthRequestAsync<TRequest>(string endpoint, TRequest request, JsonTypeInfo<TRequest> typeInfo, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var response = await _httpClient.PostAsJsonAsync(
+                endpoint,
+                request,
+                typeInfo,
+                cancellationToken).ConfigureAwait(false);
+
+            var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var envelope = string.IsNullOrWhiteSpace(payload)
+                ? null
+                : JsonSerializer.Deserialize(payload, WinoAccountApiJsonContext.Default.ApiEnvelopeAuthResultDto);
+
+            if (envelope?.IsSuccess == true && envelope.Result != null)
+            {
+                return WinoAccountApiResult<AuthResultDto>.Success(envelope.Result);
+            }
+
+            var errorCode = envelope?.ErrorCode ?? $"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim();
+            var errorMessage = ExtractErrorMessage(payload) ?? response.ReasonPhrase;
+            var errorDetails = ExtractDetails(payload);
+
+            return WinoAccountApiResult<AuthResultDto>.Failure(errorCode, errorMessage, errorDetails);
+        }
+        catch (Exception ex)
+        {
+            return WinoAccountApiResult<AuthResultDto>.Failure(ex.GetType().Name, ex.Message);
+        }
+    }
+
+    private static string? ExtractErrorMessage(string? payload)
+    {
+        if (string.IsNullOrWhiteSpace(payload))
+        {
+            return null;
+        }
+
+        try
+        {
+            using var document = JsonDocument.Parse(payload);
+            return TryGetErrorMessage(document.RootElement);
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+
+    private static JsonElement? ExtractDetails(string? payload)
+    {
+        if (string.IsNullOrWhiteSpace(payload))
+        {
+            return null;
+        }
+
+        try
+        {
+            using var document = JsonDocument.Parse(payload);
+            if (document.RootElement.ValueKind != JsonValueKind.Object || !document.RootElement.TryGetProperty("details", out var details))
+            {
+                return null;
+            }
+
+            return details.Clone();
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+
+    private static string? TryGetErrorMessage(JsonElement element)
+    {
+        if (TryGetStringProperty(element, "errorMessage", out var errorMessage))
+        {
+            return errorMessage;
+        }
+
+        if (TryGetStringProperty(element, "message", out var message))
+        {
+            return message;
+        }
+
+        if (TryGetStringProperty(element, "detail", out var detail))
+        {
+            return detail;
+        }
+
+        if (element.ValueKind == JsonValueKind.Object && element.TryGetProperty("error", out var errorElement))
+        {
+            return TryGetErrorMessage(errorElement);
+        }
+
+        return null;
+    }
+
+    private static bool TryGetStringProperty(JsonElement element, string propertyName, out string? value)
+    {
+        value = null;
+
+        if (element.ValueKind != JsonValueKind.Object || !element.TryGetProperty(propertyName, out var property))
+        {
+            return false;
+        }
+
+        if (property.ValueKind != JsonValueKind.String)
+        {
+            return false;
+        }
+
+        value = property.GetString();
+        return !string.IsNullOrWhiteSpace(value);
+    }
+
+    private static async Task EnsureSuccessResponseAsync(HttpResponseMessage response, CancellationToken cancellationToken)
+    {
+        if (response.IsSuccessStatusCode)
+        {
+            return;
+        }
+
+        var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+        throw new InvalidOperationException(
+            ExtractErrorMessage(payload)
+            ?? $"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim());
+    }
+
+    private Task<ApiEnvelope<TResponse>> SendAuthorizedRequestAsync<TResponse>(string endpoint, JsonTypeInfo<ApiEnvelope<TResponse>> typeInfo, CancellationToken cancellationToken)
+        => SendAuthorizedRequestAsync(HttpMethod.Get, endpoint, typeInfo, cancellationToken);
+
+    private async Task<ApiEnvelope<TResponse>> SendAnonymousRequestAsync<TRequest, TResponse>(HttpMethod method,
+                                                                                               string endpoint,
+                                                                                               TRequest requestBody,
+                                                                                               JsonTypeInfo<TRequest> requestTypeInfo,
+                                                                                               JsonTypeInfo<ApiEnvelope<TResponse>> responseTypeInfo,
+                                                                                               CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var request = new HttpRequestMessage(method, endpoint)
+            {
+                Content = JsonContent.Create(requestBody, requestTypeInfo)
+            };
+
+            using var response = await _httpClient.SendAsync(request, cancellationToken).ConfigureAwait(false);
+
+            var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var envelope = string.IsNullOrWhiteSpace(payload)
+                ? null
+                : JsonSerializer.Deserialize(payload, responseTypeInfo);
+
+            return envelope ?? ApiEnvelope<TResponse>.Failure($"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim());
+        }
+        catch (Exception ex)
+        {
+            return ApiEnvelope<TResponse>.Failure(ex.Message);
+        }
+    }
+
+    private async Task<ApiEnvelope<TResponse>> SendAuthorizedRequestAsync<TResponse>(HttpMethod method, string endpoint, JsonTypeInfo<ApiEnvelope<TResponse>> typeInfo, CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var response = await SendAuthorizedAsync(
+                () => CreateAuthorizedRequestAsync(method, endpoint),
+                cancellationToken).ConfigureAwait(false);
+
+            if (response == null)
+                return ApiEnvelope<TResponse>.Failure("MissingAccessToken");
+
+            var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var envelope = string.IsNullOrWhiteSpace(payload)
+                ? null
+                : JsonSerializer.Deserialize(payload, typeInfo);
+
+            return envelope ?? ApiEnvelope<TResponse>.Failure($"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim());
+        }
+        catch (Exception ex)
+        {
+            return ApiEnvelope<TResponse>.Failure(ex.Message);
+        }
+    }
+
+    private async Task<ApiEnvelope<TResponse>> SendAuthorizedRequestAsync<TRequest, TResponse>(HttpMethod method,
+                                                                                                string endpoint,
+                                                                                                TRequest requestBody,
+                                                                                                JsonTypeInfo<TRequest> requestTypeInfo,
+                                                                                                JsonTypeInfo<ApiEnvelope<TResponse>> responseTypeInfo,
+                                                                                                CancellationToken cancellationToken)
+    {
+        try
+        {
+            using var response = await SendAuthorizedAsync(
+                () => CreateAuthorizedRequestAsync(
+                    method,
+                    endpoint,
+                    () => JsonContent.Create(requestBody, requestTypeInfo)),
+                cancellationToken).ConfigureAwait(false);
+
+            if (response == null)
+            {
+                return ApiEnvelope<TResponse>.Failure("MissingAccessToken");
+            }
+
+            var payload = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var envelope = string.IsNullOrWhiteSpace(payload)
+                ? null
+                : JsonSerializer.Deserialize(payload, responseTypeInfo);
+
+            return envelope ?? ApiEnvelope<TResponse>.Failure($"HTTP {(int)response.StatusCode} {response.ReasonPhrase}".Trim());
+        }
+        catch (Exception ex)
+        {
+            return ApiEnvelope<TResponse>.Failure(ex.Message);
+        }
+    }
+
+    private async Task<HttpRequestMessage?> CreateAuthorizedRequestAsync(HttpMethod method, string endpoint, Func<HttpContent>? contentFactory = null)
+    {
+        var accessToken = await GetAccessTokenAsync().ConfigureAwait(false);
+        if (string.IsNullOrWhiteSpace(accessToken))
+            return null;
+
+        var request = new HttpRequestMessage(method, endpoint);
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
+        request.Content = contentFactory?.Invoke();
+        return request;
+    }
+
+    private async Task<HttpResponseMessage?> SendAuthorizedAsync(Func<Task<HttpRequestMessage?>> requestFactory, CancellationToken cancellationToken)
+    {
+        using var initialRequest = await requestFactory().ConfigureAwait(false);
+        if (initialRequest == null)
+        {
+            return null;
+        }
+
+        var response = await _httpClient.SendAsync(initialRequest, cancellationToken).ConfigureAwait(false);
+        if (response.StatusCode != System.Net.HttpStatusCode.Unauthorized)
+        {
+            return response;
+        }
+
+        if (!await TryRefreshAccessTokenAsync(cancellationToken).ConfigureAwait(false))
+        {
+            return response;
+        }
+
+        response.Dispose();
+
+        using var retryRequest = await requestFactory().ConfigureAwait(false);
+        if (retryRequest == null)
+        {
+            return null;
+        }
+
+        return await _httpClient.SendAsync(retryRequest, cancellationToken).ConfigureAwait(false);
+    }
+
+    private async Task<string?> GetAccessTokenAsync()
+    {
+        var account = await _databaseService.Connection.Table<WinoAccount>().FirstOrDefaultAsync().ConfigureAwait(false);
+        return string.IsNullOrWhiteSpace(account?.AccessToken) ? null : account.AccessToken;
+    }
+
+    private async Task<bool> TryRefreshAccessTokenAsync(CancellationToken cancellationToken)
+    {
+        await _tokenRefreshLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            var account = await _databaseService.Connection.Table<WinoAccount>().FirstOrDefaultAsync().ConfigureAwait(false);
+            if (account == null || string.IsNullOrWhiteSpace(account.RefreshToken))
+            {
+                return false;
+            }
+
+            if (!string.IsNullOrWhiteSpace(account.AccessToken) && account.AccessTokenExpiresAtUtc > DateTime.UtcNow)
+            {
+                return true;
+            }
+
+            var refreshResult = await RefreshAsync(account.RefreshToken, cancellationToken).ConfigureAwait(false);
+            if (!refreshResult.IsSuccess || refreshResult.Result == null)
+            {
+                return false;
+            }
+
+            var refreshedAccount = MapAccount(refreshResult.Result, account.LastAuthenticatedUtc);
+
+            await _databaseService.Connection.DeleteAllAsync<WinoAccount>().ConfigureAwait(false);
+            await _databaseService.Connection.InsertOrReplaceAsync(refreshedAccount, typeof(WinoAccount)).ConfigureAwait(false);
+
+            return true;
+        }
+        finally
+        {
+            _tokenRefreshLock.Release();
+        }
+    }
+
+    private static WinoAccount MapAccount(AuthResultDto result, DateTime lastAuthenticatedUtc)
+        => new()
+        {
+            Id = result.User.UserId,
+            Email = result.User.Email,
+            AccountStatus = result.User.AccountStatus,
+            HasPassword = result.User.HasPassword,
+            HasGoogleLogin = result.User.HasGoogleLogin,
+            HasFacebookLogin = result.User.HasFacebookLogin,
+            AccessToken = result.AccessToken,
+            AccessTokenExpiresAtUtc = result.AccessTokenExpiresAtUtc.UtcDateTime,
+            RefreshToken = result.RefreshToken,
+            RefreshTokenExpiresAtUtc = result.RefreshTokenExpiresAtUtc.UtcDateTime,
+            LastAuthenticatedUtc = lastAuthenticatedUtc == default ? DateTime.UtcNow : lastAuthenticatedUtc
+        };
+
+    private static bool ValidateCertificate(HttpRequestMessage requestMessage, X509Certificate2? certificate, X509Chain? chain, System.Net.Security.SslPolicyErrors sslPolicyErrors)
+    {
+        if (requestMessage.RequestUri?.Host.Equals("localhost", StringComparison.OrdinalIgnoreCase) == true)
+        {
+            return true;
+        }
+
+        return sslPolicyErrors == System.Net.Security.SslPolicyErrors.None;
+    }
+
+    public void Dispose()
+    {
+        if (_ownsHttpClient)
+        {
+            _httpClient.Dispose();
+        }
+
+        _tokenRefreshLock.Dispose();
+    }
+}
+
+[JsonSourceGenerationOptions(PropertyNameCaseInsensitive = true)]
+[JsonSerializable(typeof(RegisterRequest))]
+[JsonSerializable(typeof(LoginRequest))]
+[JsonSerializable(typeof(RefreshRequest))]
+[JsonSerializable(typeof(LogoutRequest))]
+[JsonSerializable(typeof(ResendEmailConfirmationRequest))]
+[JsonSerializable(typeof(ForgotPasswordRequest))]
+[JsonSerializable(typeof(SummarizeRequest))]
+[JsonSerializable(typeof(TranslateRequest))]
+[JsonSerializable(typeof(RewriteRequest))]
+[JsonSerializable(typeof(SyncStoreEntitlementsRequest))]
+[JsonSerializable(typeof(ApiEnvelope<AuthResultDto>))]
+[JsonSerializable(typeof(ApiEnvelope<EmailConfirmationResendResultDto>))]
+[JsonSerializable(typeof(ApiEnvelope<AuthUserDto>))]
+[JsonSerializable(typeof(ApiEnvelope<AiStatusResultDto>))]
+[JsonSerializable(typeof(ApiEnvelope<AiTextResultDto>))]
+[JsonSerializable(typeof(ApiEnvelope<WinoStoreCollectionsIdTicketInfo>))]
+[JsonSerializable(typeof(ApiEnvelope<UserMailboxSyncListDto>))]
+[JsonSerializable(typeof(ApiEnvelope<JsonElement>))]
+[JsonSerializable(typeof(ReplaceUserMailboxesRequestDto))]
+internal sealed partial class WinoAccountApiJsonContext : JsonSerializerContext;
+
+internal sealed record SyncStoreEntitlementsRequest(string? StoreIdKey, string? PurchaseIdKey);
diff --git a/Wino.Services/WinoAccountDataSyncService.cs b/Wino.Services/WinoAccountDataSyncService.cs
new file mode 100644
index 00000000..01f3e973
--- /dev/null
+++ b/Wino.Services/WinoAccountDataSyncService.cs
@@ -0,0 +1,289 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Users;
+using Wino.Messaging.Client.Accounts;
+
+namespace Wino.Services;
+
+public sealed class WinoAccountDataSyncService : IWinoAccountDataSyncService
+{
+    private const int DefaultMaxConcurrentClients = 5;
+
+    private readonly IWinoAccountProfileService _profileService;
+    private readonly IPreferencesService _preferencesService;
+    private readonly IAccountService _accountService;
+
+    public WinoAccountDataSyncService(
+        IWinoAccountProfileService profileService,
+        IPreferencesService preferencesService,
+        IAccountService accountService)
+    {
+        _profileService = profileService;
+        _preferencesService = preferencesService;
+        _accountService = accountService;
+    }
+
+    public async Task<WinoAccountSyncExportResult> ExportAsync(WinoAccountSyncSelection selection, CancellationToken cancellationToken = default)
+    {
+        var exportedMailboxCount = 0;
+
+        if (selection.IncludePreferences)
+        {
+            await _profileService.SaveSettingsAsync(_preferencesService.ExportPreferences(), cancellationToken).ConfigureAwait(false);
+        }
+
+        if (selection.IncludeAccounts)
+        {
+            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+            var request = new ReplaceUserMailboxesRequestDto
+            {
+                Mailboxes = accounts
+                    .OrderBy(a => a.Order)
+                    .Select(MapMailbox)
+                    .ToList()
+            };
+
+            await _profileService.ReplaceMailboxesAsync(request, cancellationToken).ConfigureAwait(false);
+            exportedMailboxCount = request.Mailboxes.Count;
+        }
+
+        return new WinoAccountSyncExportResult
+        {
+            IncludedPreferences = selection.IncludePreferences,
+            IncludedAccounts = selection.IncludeAccounts,
+            ExportedMailboxCount = exportedMailboxCount
+        };
+    }
+
+    public async Task<WinoAccountSyncImportResult> ImportAsync(WinoAccountSyncSelection selection, CancellationToken cancellationToken = default)
+    {
+        var result = new WinoAccountSyncImportResult
+        {
+            IncludedPreferences = selection.IncludePreferences,
+            IncludedAccounts = selection.IncludeAccounts
+        };
+
+        if (selection.IncludePreferences)
+        {
+            var settingsJson = await _profileService.GetSettingsAsync(cancellationToken).ConfigureAwait(false);
+            if (!string.IsNullOrWhiteSpace(settingsJson))
+            {
+                var (appliedCount, failedCount) = _preferencesService.ImportPreferences(settingsJson);
+                result = new WinoAccountSyncImportResult
+                {
+                    IncludedPreferences = result.IncludedPreferences,
+                    IncludedAccounts = result.IncludedAccounts,
+                    HadRemotePreferences = true,
+                    AppliedPreferenceCount = appliedCount,
+                    FailedPreferenceCount = failedCount,
+                    ImportedMailboxCount = result.ImportedMailboxCount,
+                    SkippedDuplicateMailboxCount = result.SkippedDuplicateMailboxCount,
+                    RemoteMailboxCount = result.RemoteMailboxCount
+                };
+            }
+        }
+
+        if (selection.IncludeAccounts)
+        {
+            var mailboxes = await _profileService.GetMailboxesAsync(cancellationToken).ConfigureAwait(false);
+            var orderedMailboxes = mailboxes.Mailboxes
+                .OrderBy(a => a.SortOrder)
+                .ThenBy(a => a.Address, StringComparer.OrdinalIgnoreCase)
+                .ToList();
+
+            var localAccounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+            var existingKeys = localAccounts
+                .Select(CreateMailboxKey)
+                .ToHashSet(StringComparer.Ordinal);
+
+            var importedMailboxCount = 0;
+            var skippedDuplicateMailboxCount = 0;
+
+            foreach (var mailbox in orderedMailboxes)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var mailboxKey = CreateMailboxKey(mailbox.Address, mailbox.ProviderType);
+                if (!existingKeys.Add(mailboxKey))
+                {
+                    skippedDuplicateMailboxCount++;
+                    continue;
+                }
+
+                var account = CreateImportedAccount(mailbox);
+                var serverInformation = CreateImportedServerInformation(mailbox, account.Id);
+
+                await _accountService.CreateAccountAsync(account, serverInformation).ConfigureAwait(false);
+                await _accountService.CreateRootAliasAsync(account.Id, account.Address).ConfigureAwait(false);
+
+                if (account.ProviderType == MailProviderType.IMAP4)
+                {
+                    var persistedAccount = await _accountService.GetAccountAsync(account.Id).ConfigureAwait(false);
+                    if (persistedAccount != null && persistedAccount.AttentionReason != AccountAttentionReason.InvalidCredentials)
+                    {
+                        persistedAccount.AttentionReason = AccountAttentionReason.InvalidCredentials;
+                        await _accountService.UpdateAccountAsync(persistedAccount).ConfigureAwait(false);
+                    }
+                }
+
+                importedMailboxCount++;
+            }
+
+            if (importedMailboxCount > 0)
+            {
+                WeakReferenceMessenger.Default.Send(new AccountsMenuRefreshRequested(false));
+            }
+
+            result = new WinoAccountSyncImportResult
+            {
+                IncludedPreferences = result.IncludedPreferences,
+                IncludedAccounts = result.IncludedAccounts,
+                HadRemotePreferences = result.HadRemotePreferences,
+                AppliedPreferenceCount = result.AppliedPreferenceCount,
+                FailedPreferenceCount = result.FailedPreferenceCount,
+                ImportedMailboxCount = importedMailboxCount,
+                SkippedDuplicateMailboxCount = skippedDuplicateMailboxCount,
+                RemoteMailboxCount = orderedMailboxes.Count
+            };
+        }
+
+        await RepairStartupEntityAsync().ConfigureAwait(false);
+
+        return result;
+    }
+
+    private static UserMailboxSyncItemDto MapMailbox(MailAccount account)
+    {
+        var serverInformation = account.ProviderType == MailProviderType.IMAP4
+            ? account.ServerInformation
+            : null;
+
+        return new UserMailboxSyncItemDto
+        {
+            Address = account.Address ?? string.Empty,
+            ProviderType = (int)account.ProviderType,
+            SpecialImapProvider = (int)account.SpecialImapProvider,
+            AccountName = account.Name,
+            SenderName = account.SenderName,
+            AccountColorHex = account.AccountColorHex,
+            SortOrder = account.Order,
+            IsCalendarAccessGranted = account.IsCalendarAccessGranted,
+            CalendarSupportMode = serverInformation != null ? (int)serverInformation.CalendarSupportMode : 0,
+            IncomingServer = serverInformation?.IncomingServer,
+            IncomingServerPort = serverInformation?.IncomingServerPort,
+            IncomingServerUsername = serverInformation?.IncomingServerUsername,
+            IncomingServerSocketOption = serverInformation != null ? (int?)serverInformation.IncomingServerSocketOption : null,
+            IncomingAuthenticationMethod = serverInformation != null ? (int?)serverInformation.IncomingAuthenticationMethod : null,
+            OutgoingServer = serverInformation?.OutgoingServer,
+            OutgoingServerPort = serverInformation?.OutgoingServerPort,
+            OutgoingServerUsername = serverInformation?.OutgoingServerUsername,
+            OutgoingServerSocketOption = serverInformation != null ? (int?)serverInformation.OutgoingServerSocketOption : null,
+            OutgoingAuthenticationMethod = serverInformation != null ? (int?)serverInformation.OutgoingAuthenticationMethod : null,
+            CalDavServiceUrl = serverInformation?.CalDavServiceUrl,
+            CalDavUsername = serverInformation?.CalDavUsername,
+            ProxyServer = serverInformation?.ProxyServer,
+            ProxyServerPort = serverInformation?.ProxyServerPort,
+            MaxConcurrentClients = serverInformation?.MaxConcurrentClients
+        };
+    }
+
+    private static MailAccount CreateImportedAccount(UserMailboxSyncItemDto mailbox)
+    {
+        var providerType = (MailProviderType)mailbox.ProviderType;
+
+        return new MailAccount
+        {
+            Id = Guid.NewGuid(),
+            Address = mailbox.Address.Trim(),
+            Name = string.IsNullOrWhiteSpace(mailbox.AccountName) ? mailbox.Address.Trim() : mailbox.AccountName.Trim(),
+            SenderName = string.IsNullOrWhiteSpace(mailbox.SenderName) ? mailbox.Address.Trim() : mailbox.SenderName.Trim(),
+            ProviderType = providerType,
+            SpecialImapProvider = (SpecialImapProvider)mailbox.SpecialImapProvider,
+            AccountColorHex = mailbox.AccountColorHex?.Trim(),
+            Base64ProfilePictureData = string.Empty,
+            IsCalendarAccessGranted = mailbox.IsCalendarAccessGranted,
+            SynchronizationDeltaIdentifier = string.Empty,
+            CalendarSynchronizationDeltaIdentifier = string.Empty,
+            AttentionReason = AccountAttentionReason.InvalidCredentials
+        };
+    }
+
+    private static CustomServerInformation? CreateImportedServerInformation(UserMailboxSyncItemDto mailbox, Guid accountId)
+    {
+        var providerType = (MailProviderType)mailbox.ProviderType;
+        if (providerType != MailProviderType.IMAP4)
+        {
+            return null;
+        }
+
+        return new CustomServerInformation
+        {
+            Id = Guid.NewGuid(),
+            AccountId = accountId,
+            Address = mailbox.Address.Trim(),
+            IncomingServer = mailbox.IncomingServer?.Trim(),
+            IncomingServerPort = mailbox.IncomingServerPort?.Trim(),
+            IncomingServerUsername = mailbox.IncomingServerUsername?.Trim(),
+            IncomingServerPassword = string.Empty,
+            IncomingServerSocketOption = mailbox.IncomingServerSocketOption is int incomingSocketOption
+                ? (ImapConnectionSecurity)incomingSocketOption
+                : ImapConnectionSecurity.Auto,
+            IncomingAuthenticationMethod = mailbox.IncomingAuthenticationMethod is int incomingAuthMethod
+                ? (ImapAuthenticationMethod)incomingAuthMethod
+                : ImapAuthenticationMethod.Auto,
+            OutgoingServer = mailbox.OutgoingServer?.Trim(),
+            OutgoingServerPort = mailbox.OutgoingServerPort?.Trim(),
+            OutgoingServerUsername = mailbox.OutgoingServerUsername?.Trim(),
+            OutgoingServerPassword = string.Empty,
+            OutgoingServerSocketOption = mailbox.OutgoingServerSocketOption is int outgoingSocketOption
+                ? (ImapConnectionSecurity)outgoingSocketOption
+                : ImapConnectionSecurity.Auto,
+            OutgoingAuthenticationMethod = mailbox.OutgoingAuthenticationMethod is int outgoingAuthMethod
+                ? (ImapAuthenticationMethod)outgoingAuthMethod
+                : ImapAuthenticationMethod.Auto,
+            CalDavServiceUrl = mailbox.CalDavServiceUrl?.Trim(),
+            CalDavUsername = mailbox.CalDavUsername?.Trim(),
+            CalDavPassword = string.Empty,
+            CalendarSupportMode = (ImapCalendarSupportMode)mailbox.CalendarSupportMode,
+            ProxyServer = mailbox.ProxyServer?.Trim(),
+            ProxyServerPort = mailbox.ProxyServerPort?.Trim(),
+            MaxConcurrentClients = mailbox.MaxConcurrentClients.GetValueOrDefault(DefaultMaxConcurrentClients)
+        };
+    }
+
+    private async Task RepairStartupEntityAsync()
+    {
+        if (!_preferencesService.StartupEntityId.HasValue)
+        {
+            return;
+        }
+
+        var startupEntityId = _preferencesService.StartupEntityId.Value;
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+        var accountIds = accounts.Select(a => a.Id);
+        var mergedInboxIds = accounts.Where(a => a.MergedInboxId.HasValue).Select(a => a.MergedInboxId!.Value);
+
+        if (accountIds.Concat(mergedInboxIds).Contains(startupEntityId))
+        {
+            return;
+        }
+
+        _preferencesService.StartupEntityId = accounts.FirstOrDefault()?.Id;
+    }
+
+    private static string CreateMailboxKey(MailAccount account)
+        => CreateMailboxKey(account.Address, (int)account.ProviderType);
+
+    private static string CreateMailboxKey(string? address, int providerType)
+        => $"{address?.Trim().ToLowerInvariant()}|{providerType}";
+}
diff --git a/Wino.Services/WinoAccountProfileService.cs b/Wino.Services/WinoAccountProfileService.cs
new file mode 100644
index 00000000..54a4fa98
--- /dev/null
+++ b/Wino.Services/WinoAccountProfileService.cs
@@ -0,0 +1,525 @@
+#nullable enable
+using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Accounts;
+using Wino.Mail.Api.Contracts.Ai;
+using Wino.Mail.Api.Contracts.Auth;
+using Wino.Mail.Api.Contracts.Common;
+using Wino.Mail.Api.Contracts.Users;
+using Wino.Messaging.UI;
+
+namespace Wino.Services;
+
+public sealed class WinoAccountProfileService : BaseDatabaseService, IWinoAccountProfileService
+{
+    private readonly IWinoAccountApiClient _apiClient;
+    private readonly IStoreManagementService _storeManagementService;
+    private readonly SemaphoreSlim _billingCallbackLock = new(1, 1);
+    private readonly SemaphoreSlim _tokenRefreshLock = new(1, 1);
+    private readonly ILogger _logger = Log.ForContext<WinoAccountProfileService>();
+
+    public WinoAccountProfileService(IDatabaseService databaseService,
+                                     IWinoAccountApiClient apiClient,
+                                     IStoreManagementService storeManagementService) : base(databaseService)
+    {
+        _apiClient = apiClient;
+        _storeManagementService = storeManagementService;
+    }
+
+    public async Task<WinoAccountOperationResult> RegisterAsync(string email, string password, CancellationToken cancellationToken = default)
+    {
+        var response = await _apiClient.RegisterAsync(email, password, cancellationToken).ConfigureAwait(false);
+        if (!response.IsSuccess || response.Result == null)
+        {
+            _logger.Warning("Wino account registration failed. Error code: {ErrorCode}. Error message: {ErrorMessage}", response.ErrorCode, response.ErrorMessage);
+            return WinoAccountOperationResult.Failure(response.ErrorCode, response.ErrorMessage, response.ErrorDetails);
+        }
+
+        // Registration no longer signs the user in locally until the email address is confirmed.
+        return WinoAccountOperationResult.Success(Map(response.Result));
+    }
+
+    public async Task<WinoAccountOperationResult> LoginAsync(string email, string password, CancellationToken cancellationToken = default)
+    {
+        var response = await _apiClient.LoginAsync(email, password, cancellationToken).ConfigureAwait(false);
+        var result = await PersistResponseAsync(response).ConfigureAwait(false);
+
+        if (result.IsSuccess && result.Account != null)
+        {
+            PublishProfileUpdated(result.Account);
+            ReportUIChange(new WinoAccountSignedInMessage(result.Account));
+        }
+
+        return result;
+    }
+
+    public Task<ApiEnvelope<EmailConfirmationResendResultDto>> ResendEmailConfirmationAsync(string endpoint, string ticket, CancellationToken cancellationToken = default)
+        => _apiClient.ResendEmailConfirmationAsync(endpoint, ticket, cancellationToken);
+
+    public Task<ApiEnvelope<JsonElement>> ForgotPasswordAsync(string email, CancellationToken cancellationToken = default)
+        => _apiClient.ForgotPasswordAsync(email, cancellationToken);
+
+    public async Task<WinoAccountOperationResult> RefreshAsync(CancellationToken cancellationToken = default)
+    {
+        await _tokenRefreshLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            var account = await GetActiveAccountAsync().ConfigureAwait(false);
+            if (account == null || string.IsNullOrWhiteSpace(account.RefreshToken))
+            {
+                _logger.Warning("Wino account token refresh skipped because there is no active account or refresh token.");
+                return WinoAccountOperationResult.Failure(ApiErrorCodes.RefreshTokenInvalid);
+            }
+
+            if (!string.IsNullOrWhiteSpace(account.AccessToken) && account.AccessTokenExpiresAtUtc > DateTime.UtcNow)
+            {
+                return WinoAccountOperationResult.Success(account);
+            }
+
+            _logger.Information("Refreshing Wino account token for {Email}", account.Email);
+            var response = await _apiClient.RefreshAsync(account.RefreshToken, cancellationToken).ConfigureAwait(false);
+            var result = await PersistResponseAsync(response).ConfigureAwait(false);
+
+            if (!result.IsSuccess)
+            {
+                _logger.Warning("Wino account token refresh failed for {Email}. Error code: {ErrorCode}", account.Email, result.ErrorCode);
+                return result;
+            }
+
+            if (result.Account != null && !AreEquivalentProfiles(account, result.Account))
+            {
+                PublishProfileUpdated(result.Account);
+            }
+
+            return result;
+        }
+        finally
+        {
+            _tokenRefreshLock.Release();
+        }
+    }
+
+    public async Task<WinoAccountOperationResult> RefreshProfileAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false);
+        if (account == null)
+        {
+            return WinoAccountOperationResult.Failure("MissingAccessToken");
+        }
+
+        var response = await _apiClient.GetCurrentUserAsync(cancellationToken).ConfigureAwait(false);
+        if (!response.IsSuccess || response.Result == null)
+        {
+            _logger.Warning("Failed to refresh Wino account profile for {Email}. Error code: {ErrorCode}", account.Email, response.ErrorCode);
+            return WinoAccountOperationResult.Failure(response.ErrorCode);
+        }
+
+        var refreshedAccount = MergeAccountProfile(account, response.Result);
+
+        if (AreEquivalentProfiles(account, refreshedAccount))
+        {
+            return WinoAccountOperationResult.Success(account);
+        }
+
+        await PersistAccountAsync(refreshedAccount).ConfigureAwait(false);
+        PublishProfileUpdated(refreshedAccount);
+
+        return WinoAccountOperationResult.Success(refreshedAccount);
+    }
+
+    public async Task<WinoAccount?> GetActiveAccountAsync()
+    {
+        var account = await Connection.Table<WinoAccount>().FirstOrDefaultAsync().ConfigureAwait(false);
+        return account;
+    }
+
+    public async Task<WinoAccount?> GetAuthenticatedAccountAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetActiveAccountAsync().ConfigureAwait(false);
+
+        if (account == null)
+        {
+            return null;
+        }
+
+        if (string.IsNullOrWhiteSpace(account.AccessToken))
+        {
+            _logger.Warning("Wino account {Email} is missing an access token.", account.Email);
+            return null;
+        }
+
+        if (account.AccessTokenExpiresAtUtc > DateTime.UtcNow)
+        {
+            return account;
+        }
+
+        var refreshResult = await RefreshAsync(cancellationToken).ConfigureAwait(false);
+        if (!refreshResult.IsSuccess)
+        {
+            return null;
+        }
+
+        return refreshResult.Account ?? await GetActiveAccountAsync().ConfigureAwait(false);
+    }
+
+    public async Task<bool> HasActiveAccountAsync()
+        => await Connection.Table<WinoAccount>().CountAsync().ConfigureAwait(false) > 0;
+
+    public async Task<ApiEnvelope<AuthUserDto>> GetCurrentUserAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false);
+        if (account == null)
+        {
+            return ApiEnvelope<AuthUserDto>.Failure("MissingAccessToken");
+        }
+
+        var response = await _apiClient.GetCurrentUserAsync(cancellationToken).ConfigureAwait(false);
+        if (!response.IsSuccess)
+        {
+            _logger.Warning("Failed to load Wino account profile for {Email}. Error code: {ErrorCode}", account.Email, response.ErrorCode);
+            return response;
+        }
+
+        if (response.Result != null)
+        {
+            var refreshedAccount = MergeAccountProfile(account, response.Result);
+            await PersistProfileDataAsync(account, refreshedAccount).ConfigureAwait(false);
+        }
+
+        return response;
+    }
+
+    public async Task<ApiEnvelope<AiStatusResultDto>> GetAiStatusAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false);
+        if (account == null)
+        {
+            return ApiEnvelope<AiStatusResultDto>.Failure("MissingAccessToken");
+        }
+
+        var response = await _apiClient.GetAiStatusAsync(cancellationToken).ConfigureAwait(false);
+        if (!response.IsSuccess)
+        {
+            _logger.Warning("Failed to load AI status for Wino account {Email}. Error code: {ErrorCode}", account.Email, response.ErrorCode);
+            return response;
+        }
+
+        return response;
+    }
+
+    public async Task<ApiEnvelope<AiTextResultDto>> SummarizeAsync(string html, string targetLanguage, CancellationToken cancellationToken = default)
+        => await ExecuteAiOperationAsync(account => _apiClient.SummarizeAsync(html, targetLanguage, cancellationToken), "summarize", cancellationToken).ConfigureAwait(false);
+
+    public async Task<ApiEnvelope<AiTextResultDto>> TranslateAsync(string html, string targetLanguage, CancellationToken cancellationToken = default)
+        => await ExecuteAiOperationAsync(account => _apiClient.TranslateAsync(html, targetLanguage, cancellationToken), "translate", cancellationToken).ConfigureAwait(false);
+
+    public async Task<ApiEnvelope<AiTextResultDto>> RewriteAsync(string html, string mode, CancellationToken cancellationToken = default)
+        => await ExecuteAiOperationAsync(account => _apiClient.RewriteAsync(html, mode, cancellationToken), "rewrite", cancellationToken).ConfigureAwait(false);
+
+    public async Task<ApiEnvelope<JsonElement>> SyncStoreEntitlementsAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetActiveAccountAsync().ConfigureAwait(false);
+        if (account == null || string.IsNullOrWhiteSpace(account.AccessToken))
+        {
+            return ApiEnvelope<JsonElement>.Failure("MissingAccessToken");
+        }
+
+        string? storeIdKey = null;
+        string? purchaseIdKey = null;
+
+        var collectionsTicketResponse = await _apiClient.CreateCollectionsIdTicketAsync(cancellationToken).ConfigureAwait(false);
+        if (collectionsTicketResponse.IsSuccess && collectionsTicketResponse.Result != null)
+        {
+            storeIdKey = await _storeManagementService.GetCustomerCollectionsIdAsync(
+                collectionsTicketResponse.Result.ServiceTicket,
+                collectionsTicketResponse.Result.PublisherUserId).ConfigureAwait(false);
+
+            if (string.IsNullOrWhiteSpace(storeIdKey))
+            {
+                _logger.Warning("Failed to obtain Microsoft Store collections ID key for Wino account {Email}.", account.Email);
+            }
+        }
+        else
+        {
+            _logger.Warning("Failed to create Microsoft Store collections ticket for Wino account {Email}. Error code: {ErrorCode}", account.Email, collectionsTicketResponse.ErrorCode);
+        }
+
+        var purchaseTicketResponse = await _apiClient.CreatePurchaseIdTicketAsync(cancellationToken).ConfigureAwait(false);
+        if (purchaseTicketResponse.IsSuccess && purchaseTicketResponse.Result != null)
+        {
+            purchaseIdKey = await _storeManagementService.GetCustomerPurchaseIdAsync(
+                purchaseTicketResponse.Result.ServiceTicket,
+                purchaseTicketResponse.Result.PublisherUserId).ConfigureAwait(false);
+
+            if (string.IsNullOrWhiteSpace(purchaseIdKey))
+            {
+                _logger.Warning("Failed to obtain Microsoft Store purchase ID key for Wino account {Email}.", account.Email);
+            }
+        }
+        else
+        {
+            _logger.Warning("Failed to create Microsoft Store purchase ticket for Wino account {Email}. Error code: {ErrorCode}", account.Email, purchaseTicketResponse.ErrorCode);
+        }
+
+        if (string.IsNullOrWhiteSpace(storeIdKey) && string.IsNullOrWhiteSpace(purchaseIdKey))
+        {
+            return ApiEnvelope<JsonElement>.Failure("StoreEntitlementKeysMissing");
+        }
+
+        var response = await _apiClient.SyncStoreEntitlementsAsync(storeIdKey, purchaseIdKey, cancellationToken).ConfigureAwait(false);
+        if (!response.IsSuccess)
+        {
+            _logger.Warning("Failed to sync Microsoft Store entitlements for Wino account {Email}. Error code: {ErrorCode}", account.Email, response.ErrorCode);
+            return response;
+        }
+
+        await RefreshProfileAsync(cancellationToken).ConfigureAwait(false);
+        await GetAiStatusAsync(cancellationToken).ConfigureAwait(false);
+
+        return response;
+    }
+
+    public async Task<string?> GetSettingsAsync(CancellationToken cancellationToken = default)
+    {
+        _ = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false)
+            ?? throw new InvalidOperationException("MissingAccessToken");
+
+        return await _apiClient.GetSettingsAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task SaveSettingsAsync(string settingsJson, CancellationToken cancellationToken = default)
+    {
+        _ = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false)
+            ?? throw new InvalidOperationException("MissingAccessToken");
+
+        await _apiClient.SaveSettingsAsync(settingsJson, cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task<UserMailboxSyncListDto> GetMailboxesAsync(CancellationToken cancellationToken = default)
+    {
+        _ = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false)
+            ?? throw new InvalidOperationException("MissingAccessToken");
+
+        return await _apiClient.GetMailboxesAsync(cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task ReplaceMailboxesAsync(ReplaceUserMailboxesRequestDto request, CancellationToken cancellationToken = default)
+    {
+        _ = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false)
+            ?? throw new InvalidOperationException("MissingAccessToken");
+
+        await _apiClient.ReplaceMailboxesAsync(request, cancellationToken).ConfigureAwait(false);
+    }
+
+    public async Task<bool> ProcessBillingCallbackAsync(Uri callbackUri, CancellationToken cancellationToken = default)
+    {
+        await _billingCallbackLock.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            var targetProductType = ResolveProductType(callbackUri);
+            if (targetProductType == null)
+            {
+                _logger.Warning("Billing callback was ignored because productCode is missing or unsupported. Uri: {Uri}", callbackUri);
+                return false;
+            }
+
+            if (await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false) == null)
+            {
+                _logger.Warning("Billing callback was ignored because there is no authenticated Wino account.");
+                return false;
+            }
+
+            const int maxAttempts = 15;
+
+            for (var attempt = 0; attempt < maxAttempts; attempt++)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var refreshResult = await RefreshProfileAsync(cancellationToken).ConfigureAwait(false);
+
+                if (refreshResult.IsSuccess && await _storeManagementService.HasProductAsync(targetProductType.Value).ConfigureAwait(false))
+                {
+                    ReportUIChange(new WinoAccountAddOnPurchasedMessage(targetProductType.Value));
+                    return true;
+                }
+
+                if (attempt < maxAttempts - 1)
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken).ConfigureAwait(false);
+                }
+            }
+
+            return false;
+        }
+        finally
+        {
+            _billingCallbackLock.Release();
+        }
+    }
+
+    public async Task SignOutAsync(CancellationToken cancellationToken = default)
+    {
+        var account = await GetActiveAccountAsync().ConfigureAwait(false);
+
+        if (account != null && !string.IsNullOrWhiteSpace(account.RefreshToken))
+        {
+            try
+            {
+                var result = await _apiClient.LogoutAsync(account.RefreshToken, cancellationToken).ConfigureAwait(false);
+                if (!result.IsSuccess && !string.IsNullOrWhiteSpace(result.ErrorCode))
+                {
+                    _logger.Warning("Wino account remote sign-out failed with error code {ErrorCode}", result.ErrorCode);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Wino account remote sign-out failed.");
+            }
+        }
+
+        await Connection.DeleteAllAsync<WinoAccount>().ConfigureAwait(false);
+        if (account != null)
+        {
+            ReportUIChange(new WinoAccountProfileDeletedMessage(account));
+            ReportUIChange(new WinoAccountSignedOutMessage(account));
+        }
+    }
+
+    private async Task<WinoAccountOperationResult> PersistResponseAsync(WinoAccountApiResult<AuthResultDto> response)
+    {
+        if (!response.IsSuccess || response.Result == null)
+        {
+            _logger.Warning("Wino account operation failed. Error code: {ErrorCode}. Error message: {ErrorMessage}", response.ErrorCode, response.ErrorMessage);
+            return WinoAccountOperationResult.Failure(response.ErrorCode, response.ErrorMessage, response.ErrorDetails);
+        }
+
+        var account = Map(response.Result);
+
+        await PersistAccountAsync(account).ConfigureAwait(false);
+
+        return WinoAccountOperationResult.Success(account);
+    }
+
+    private async Task PersistAccountAsync(WinoAccount account)
+    {
+        await Connection.DeleteAllAsync<WinoAccount>().ConfigureAwait(false);
+        await Connection.InsertOrReplaceAsync(account, typeof(WinoAccount)).ConfigureAwait(false);
+    }
+
+    private async Task PersistProfileDataAsync(WinoAccount originalAccount, WinoAccount refreshedAccount)
+    {
+        if (!AreEquivalentProfiles(originalAccount, refreshedAccount))
+        {
+            await PersistAccountAsync(refreshedAccount).ConfigureAwait(false);
+            PublishProfileUpdated(refreshedAccount);
+        }
+    }
+
+    private void PublishProfileUpdated(WinoAccount account)
+        => ReportUIChange(new WinoAccountProfileUpdatedMessage(account));
+
+    private async Task<ApiEnvelope<AiTextResultDto>> ExecuteAiOperationAsync(Func<WinoAccount, Task<ApiEnvelope<AiTextResultDto>>> executeAsync,
+                                                                             string operationName,
+                                                                             CancellationToken cancellationToken)
+    {
+        var account = await GetAuthenticatedAccountAsync(cancellationToken).ConfigureAwait(false);
+        if (account == null)
+        {
+            return ApiEnvelope<AiTextResultDto>.Failure("MissingAccessToken");
+        }
+
+        var response = await executeAsync(account).ConfigureAwait(false);
+        if (!response.IsSuccess)
+        {
+            _logger.Warning("Failed to {Operation} HTML with AI for Wino account {Email}. Error code: {ErrorCode}", operationName, account.Email, response.ErrorCode);
+        }
+
+        return response;
+    }
+
+    private static bool AreEquivalentProfiles(WinoAccount left, WinoAccount right)
+        => left.Id == right.Id &&
+           string.Equals(left.Email, right.Email, StringComparison.Ordinal) &&
+           string.Equals(left.AccountStatus, right.AccountStatus, StringComparison.Ordinal) &&
+           left.HasPassword == right.HasPassword &&
+           left.HasGoogleLogin == right.HasGoogleLogin &&
+           left.HasFacebookLogin == right.HasFacebookLogin;
+
+    private static WinoAccount MergeAccountProfile(WinoAccount existingAccount, AuthUserDto profile)
+        => new()
+        {
+            Id = profile.UserId,
+            Email = profile.Email,
+            AccountStatus = profile.AccountStatus,
+            HasPassword = profile.HasPassword,
+            HasGoogleLogin = profile.HasGoogleLogin,
+            HasFacebookLogin = profile.HasFacebookLogin,
+            AccessToken = existingAccount.AccessToken,
+            AccessTokenExpiresAtUtc = existingAccount.AccessTokenExpiresAtUtc,
+            RefreshToken = existingAccount.RefreshToken,
+            RefreshTokenExpiresAtUtc = existingAccount.RefreshTokenExpiresAtUtc,
+            LastAuthenticatedUtc = existingAccount.LastAuthenticatedUtc
+        };
+
+    private static WinoAddOnProductType? ResolveProductType(Uri callbackUri)
+    {
+        var productCode = GetQueryParameter(callbackUri, "productCode");
+        if (string.IsNullOrWhiteSpace(productCode))
+        {
+            return null;
+        }
+
+        return productCode.Trim().ToUpperInvariant() switch
+        {
+            "AI_PACK" => WinoAddOnProductType.AI_PACK,
+            "UNLIMITED_ACCOUNTS" => WinoAddOnProductType.UNLIMITED_ACCOUNTS,
+            _ => null
+        };
+    }
+
+    private static string GetQueryParameter(Uri uri, string key)
+    {
+        var query = uri.Query;
+        if (string.IsNullOrWhiteSpace(query))
+        {
+            return string.Empty;
+        }
+
+        foreach (var part in query.TrimStart('?').Split('&', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var pieces = part.Split('=', 2);
+            if (pieces.Length == 0 || !string.Equals(pieces[0], key, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            return pieces.Length > 1 ? Uri.UnescapeDataString(pieces[1]) : string.Empty;
+        }
+
+        return string.Empty;
+    }
+
+    private static WinoAccount Map(AuthResultDto result)
+        => new()
+        {
+            Id = result.User.UserId,
+            Email = result.User.Email,
+            AccountStatus = result.User.AccountStatus,
+            HasPassword = result.User.HasPassword,
+            HasGoogleLogin = result.User.HasGoogleLogin,
+            HasFacebookLogin = result.User.HasFacebookLogin,
+            AccessToken = result.AccessToken,
+            AccessTokenExpiresAtUtc = result.AccessTokenExpiresAtUtc.UtcDateTime,
+            RefreshToken = result.RefreshToken,
+            RefreshTokenExpiresAtUtc = result.RefreshTokenExpiresAtUtc.UtcDateTime,
+            LastAuthenticatedUtc = DateTime.UtcNow
+        };
+}
diff --git a/Wino.Services/WinoLogger.cs b/Wino.Services/WinoLogger.cs
index 719f4fc7..d87edeff 100644
--- a/Wino.Services/WinoLogger.cs
+++ b/Wino.Services/WinoLogger.cs
@@ -3,6 +3,7 @@ using Sentry;
 using Serilog;
 using Serilog.Core;
 using Serilog.Exceptions;
+using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 
 namespace Wino.Services;
@@ -47,9 +48,13 @@ public class WinoLogger : IWinoLogger
 #endif
             options.AutoSessionTracking = true;
 
-            // Set user context
+            // Set user context and filter out known exceptions.
             options.SetBeforeSend((sentryEvent, hint) =>
             {
+                // Don't send synchronization failure exceptions to Sentry.
+                if (sentryEvent.Exception is SynchronizerException)
+                    return null;
+
                 sentryEvent.User = new SentryUser
                 {
                     Id = _preferencesService.DiagnosticId
diff --git a/Wino.SourceGenerators/Translator/TranslatorGenerator.cs b/Wino.SourceGenerators/Translator/TranslatorGenerator.cs
index 2d42194f..2d70ad41 100644
--- a/Wino.SourceGenerators/Translator/TranslatorGenerator.cs
+++ b/Wino.SourceGenerators/Translator/TranslatorGenerator.cs
@@ -43,7 +43,7 @@ namespace Wino.Core.SourceGeneration.Translator
 
         // Get the JSON schema and track changes
         var jsonSchema = context.AdditionalTextsProvider
-            .Where(static file => file.Path.EndsWith("en_US\\resources.json"))
+            .Where(static file => file.Path.Replace("\\", "/").EndsWith("en_US/resources.json", StringComparison.OrdinalIgnoreCase))
             .Select((text, _) => (text, text.GetText()))
             .Collect()
             .WithTrackingName("JsonSchema");
diff --git a/Wino.SourceGenerators/Wino.SourceGenerators.csproj b/Wino.SourceGenerators/Wino.SourceGenerators.csproj
index 39f0885b..0a66288e 100644
--- a/Wino.SourceGenerators/Wino.SourceGenerators.csproj
+++ b/Wino.SourceGenerators/Wino.SourceGenerators.csproj
@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<Nullable>enable</Nullable>
+		<LangVersion>latest</LangVersion>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
diff --git a/WinoCalendar.Packaging/Images/LargeTile.scale-100.png b/WinoCalendar.Packaging/Images/LargeTile.scale-100.png
deleted file mode 100644
index 74092a4c..00000000
Binary files a/WinoCalendar.Packaging/Images/LargeTile.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/LargeTile.scale-125.png b/WinoCalendar.Packaging/Images/LargeTile.scale-125.png
deleted file mode 100644
index 4223410d..00000000
Binary files a/WinoCalendar.Packaging/Images/LargeTile.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/LargeTile.scale-150.png b/WinoCalendar.Packaging/Images/LargeTile.scale-150.png
deleted file mode 100644
index 0a25ce33..00000000
Binary files a/WinoCalendar.Packaging/Images/LargeTile.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/LargeTile.scale-200.png b/WinoCalendar.Packaging/Images/LargeTile.scale-200.png
deleted file mode 100644
index eebe3fe0..00000000
Binary files a/WinoCalendar.Packaging/Images/LargeTile.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/LargeTile.scale-400.png b/WinoCalendar.Packaging/Images/LargeTile.scale-400.png
deleted file mode 100644
index 1784c97f..00000000
Binary files a/WinoCalendar.Packaging/Images/LargeTile.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SmallTile.scale-100.png b/WinoCalendar.Packaging/Images/SmallTile.scale-100.png
deleted file mode 100644
index 9fb6e0bb..00000000
Binary files a/WinoCalendar.Packaging/Images/SmallTile.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SmallTile.scale-125.png b/WinoCalendar.Packaging/Images/SmallTile.scale-125.png
deleted file mode 100644
index 02f2306f..00000000
Binary files a/WinoCalendar.Packaging/Images/SmallTile.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SmallTile.scale-150.png b/WinoCalendar.Packaging/Images/SmallTile.scale-150.png
deleted file mode 100644
index 712c7b54..00000000
Binary files a/WinoCalendar.Packaging/Images/SmallTile.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SmallTile.scale-200.png b/WinoCalendar.Packaging/Images/SmallTile.scale-200.png
deleted file mode 100644
index 1b1d60d0..00000000
Binary files a/WinoCalendar.Packaging/Images/SmallTile.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SmallTile.scale-400.png b/WinoCalendar.Packaging/Images/SmallTile.scale-400.png
deleted file mode 100644
index 654e0e69..00000000
Binary files a/WinoCalendar.Packaging/Images/SmallTile.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SplashScreen.scale-100.png b/WinoCalendar.Packaging/Images/SplashScreen.scale-100.png
deleted file mode 100644
index 64b90277..00000000
Binary files a/WinoCalendar.Packaging/Images/SplashScreen.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SplashScreen.scale-125.png b/WinoCalendar.Packaging/Images/SplashScreen.scale-125.png
deleted file mode 100644
index 6035970a..00000000
Binary files a/WinoCalendar.Packaging/Images/SplashScreen.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SplashScreen.scale-150.png b/WinoCalendar.Packaging/Images/SplashScreen.scale-150.png
deleted file mode 100644
index 67b3e9b3..00000000
Binary files a/WinoCalendar.Packaging/Images/SplashScreen.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SplashScreen.scale-200.png b/WinoCalendar.Packaging/Images/SplashScreen.scale-200.png
deleted file mode 100644
index 62d7c654..00000000
Binary files a/WinoCalendar.Packaging/Images/SplashScreen.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/SplashScreen.scale-400.png b/WinoCalendar.Packaging/Images/SplashScreen.scale-400.png
deleted file mode 100644
index 914ad53c..00000000
Binary files a/WinoCalendar.Packaging/Images/SplashScreen.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-100.png b/WinoCalendar.Packaging/Images/Square150x150Logo.scale-100.png
deleted file mode 100644
index a0ee76fd..00000000
Binary files a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-125.png b/WinoCalendar.Packaging/Images/Square150x150Logo.scale-125.png
deleted file mode 100644
index a9937d63..00000000
Binary files a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-150.png b/WinoCalendar.Packaging/Images/Square150x150Logo.scale-150.png
deleted file mode 100644
index 0811b6f3..00000000
Binary files a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-200.png b/WinoCalendar.Packaging/Images/Square150x150Logo.scale-200.png
deleted file mode 100644
index e731031c..00000000
Binary files a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-400.png b/WinoCalendar.Packaging/Images/Square150x150Logo.scale-400.png
deleted file mode 100644
index 7a99db0d..00000000
Binary files a/WinoCalendar.Packaging/Images/Square150x150Logo.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
deleted file mode 100644
index d469abfc..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
deleted file mode 100644
index 1fce2a5d..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png
deleted file mode 100644
index 35be4579..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png
deleted file mode 100644
index 34f0de43..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png
deleted file mode 100644
index 445dce04..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index d469abfc..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-24.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-24.png
deleted file mode 100644
index 1fce2a5d..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-24.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index 35be4579..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png
deleted file mode 100644
index 34f0de43..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index 445dce04..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-100.png b/WinoCalendar.Packaging/Images/Square44x44Logo.scale-100.png
deleted file mode 100644
index 67389fcd..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-125.png b/WinoCalendar.Packaging/Images/Square44x44Logo.scale-125.png
deleted file mode 100644
index 6d67883d..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-150.png b/WinoCalendar.Packaging/Images/Square44x44Logo.scale-150.png
deleted file mode 100644
index 9f608bf8..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-200.png b/WinoCalendar.Packaging/Images/Square44x44Logo.scale-200.png
deleted file mode 100644
index cbdf8653..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-400.png b/WinoCalendar.Packaging/Images/Square44x44Logo.scale-400.png
deleted file mode 100644
index c2e70a20..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-16.png b/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 64d343db..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-16.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-24.png b/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-24.png
deleted file mode 100644
index 4bfd7760..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-24.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-256.png b/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index de8a5e6b..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-256.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-32.png b/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-32.png
deleted file mode 100644
index 3736a2f7..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-32.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-48.png b/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index 536e4018..00000000
Binary files a/WinoCalendar.Packaging/Images/Square44x44Logo.targetsize-48.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/StoreLogo.scale-100.png b/WinoCalendar.Packaging/Images/StoreLogo.scale-100.png
deleted file mode 100644
index c8f21747..00000000
Binary files a/WinoCalendar.Packaging/Images/StoreLogo.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/StoreLogo.scale-125.png b/WinoCalendar.Packaging/Images/StoreLogo.scale-125.png
deleted file mode 100644
index 046acfc0..00000000
Binary files a/WinoCalendar.Packaging/Images/StoreLogo.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/StoreLogo.scale-150.png b/WinoCalendar.Packaging/Images/StoreLogo.scale-150.png
deleted file mode 100644
index 4f5f779a..00000000
Binary files a/WinoCalendar.Packaging/Images/StoreLogo.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/StoreLogo.scale-200.png b/WinoCalendar.Packaging/Images/StoreLogo.scale-200.png
deleted file mode 100644
index e666c775..00000000
Binary files a/WinoCalendar.Packaging/Images/StoreLogo.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/StoreLogo.scale-400.png b/WinoCalendar.Packaging/Images/StoreLogo.scale-400.png
deleted file mode 100644
index d7bd1f3e..00000000
Binary files a/WinoCalendar.Packaging/Images/StoreLogo.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-100.png b/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-100.png
deleted file mode 100644
index 7ee19f83..00000000
Binary files a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-100.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-125.png b/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-125.png
deleted file mode 100644
index d7ae8df7..00000000
Binary files a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-125.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-150.png b/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-150.png
deleted file mode 100644
index e39268f4..00000000
Binary files a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-150.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-200.png b/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 64b90277..00000000
Binary files a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-400.png b/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-400.png
deleted file mode 100644
index 62d7c654..00000000
Binary files a/WinoCalendar.Packaging/Images/Wide310x150Logo.scale-400.png and /dev/null differ
diff --git a/WinoCalendar.Packaging/Package.appxmanifest b/WinoCalendar.Packaging/Package.appxmanifest
deleted file mode 100644
index bf4c629e..00000000
--- a/WinoCalendar.Packaging/Package.appxmanifest
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="58272BurakKSE.WinoCalendar"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="912d061d-2a5a-4afa-abc8-0e9f6aae783d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>Wino Calendar</DisplayName>
-    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-	<!-- Publisher cache folder -->
-    <Extensions>
-	    <Extension Category="windows.publisherCacheFolders">
-		    <PublisherCacheFolders>
-			    <Folder Name="WinoShared" />
-		    </PublisherCacheFolders>
-	    </Extension>
-    </Extensions>
-	
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Wino Calendar"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="Calendar client for Windows."
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-
-		<Extensions>
-			<!-- App Service-->
-			<uap:Extension Category="windows.appService">
-				<uap:AppService Name="WinoInteropService"/>
-			</uap:Extension>
-
-			<!-- Full trust process -->
-			<desktop:Extension Category="windows.fullTrustProcess" Executable="Wino.Server\Wino.Server.exe">
-				<desktop:FullTrustProcess>
-					<desktop:ParameterGroup GroupId="WinoServer" Parameters="Calendar" />
-				</desktop:FullTrustProcess>
-			</desktop:Extension>
-		</Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-	<rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-</Package>
diff --git a/WinoCalendar.Packaging/WinoCalendar.Packaging.wapproj b/WinoCalendar.Packaging/WinoCalendar.Packaging.wapproj
deleted file mode 100644
index 4e16d39e..00000000
--- a/WinoCalendar.Packaging/WinoCalendar.Packaging.wapproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <DebuggerType>CoreClr</DebuggerType>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>52c4d001-f64b-43d5-8b78-3be45aea63e9</ProjectGuid>
-    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <NoWarn>$(NoWarn);NU1702</NoWarn>
-    <EntryPointProjectUniqueName>..\Wino.Calendar\Wino.Calendar.csproj</EntryPointProjectUniqueName>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <Link>Package.appxmanifest</Link>
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" VersionOverride="10.0.22621.3233" PrivateAssets="all" />
-	<SDKReference Include="Microsoft.VCLibs, Version=14.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Calendar\Wino.Calendar.csproj">
-      <UseLowTrustEntryPoint>True</UseLowTrustEntryPoint>
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Server\Wino.Server.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Images\LargeTile.scale-100.png" />
-    <Content Include="Images\LargeTile.scale-125.png" />
-    <Content Include="Images\LargeTile.scale-150.png" />
-    <Content Include="Images\LargeTile.scale-200.png" />
-    <Content Include="Images\LargeTile.scale-400.png" />
-    <Content Include="Images\SmallTile.scale-100.png" />
-    <Content Include="Images\SmallTile.scale-125.png" />
-    <Content Include="Images\SmallTile.scale-150.png" />
-    <Content Include="Images\SmallTile.scale-200.png" />
-    <Content Include="Images\SmallTile.scale-400.png" />
-    <Content Include="Images\SplashScreen.scale-100.png" />
-    <Content Include="Images\SplashScreen.scale-125.png" />
-    <Content Include="Images\SplashScreen.scale-150.png" />
-    <Content Include="Images\SplashScreen.scale-200.png" />
-    <Content Include="Images\SplashScreen.scale-400.png" />
-    <Content Include="Images\Square150x150Logo.scale-100.png" />
-    <Content Include="Images\Square150x150Logo.scale-125.png" />
-    <Content Include="Images\Square150x150Logo.scale-150.png" />
-    <Content Include="Images\Square150x150Logo.scale-200.png" />
-    <Content Include="Images\Square150x150Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.scale-100.png" />
-    <Content Include="Images\Square44x44Logo.scale-125.png" />
-    <Content Include="Images\Square44x44Logo.scale-150.png" />
-    <Content Include="Images\Square44x44Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Images\StoreLogo.scale-100.png" />
-    <Content Include="Images\StoreLogo.scale-125.png" />
-    <Content Include="Images\StoreLogo.scale-150.png" />
-    <Content Include="Images\StoreLogo.scale-200.png" />
-    <Content Include="Images\StoreLogo.scale-400.png" />
-    <Content Include="Images\Wide310x150Logo.scale-100.png" />
-    <Content Include="Images\Wide310x150Logo.scale-125.png" />
-    <Content Include="Images\Wide310x150Logo.scale-150.png" />
-    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <Content Include="Package.StoreAssociation.xml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WinoCalendar.slnx b/WinoCalendar.slnx
deleted file mode 100644
index e0c9e851..00000000
--- a/WinoCalendar.slnx
+++ /dev/null
@@ -1,86 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="Any CPU" />
-    <Platform Name="arm64" />
-    <Platform Name="x64" />
-    <Platform Name="x86" />
-  </Configurations>
-  <Folder Name="/Solution Items/" Id="8ec462fd-d22e-90a8-e5ce-7e832ba40c5d">
-    <File Path=".editorconfig" />
-    <File Path="Directory.Build.Props" />
-    <File Path="Directory.Packages.props" />
-    <File Path="nuget.config" />
-    <File Path="Settings.XamlStyler" />
-  </Folder>
-  <Folder Name="/lib/">
-    <Project Path="Wino.Authentication/Wino.Authentication.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj">
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Core.Domain/Wino.Core.Domain.csproj">
-      <BuildDependency Project="Wino.SourceGenerators/Wino.SourceGenerators.csproj" />
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Core.UWP/Wino.Core.UWP.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Core.ViewModels/Wino.Core.ViewModels.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Core/Wino.Core.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Messages/Wino.Messaging.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.Services/Wino.Services.csproj">
-      <Platform Solution="*|Any CPU" Project="x64" />
-      <Platform Solution="*|arm64" Project="arm64" />
-      <Platform Solution="*|x64" Project="x64" />
-      <Platform Solution="*|x86" Project="x86" />
-    </Project>
-    <Project Path="Wino.SourceGenerators/Wino.SourceGenerators.csproj" />
-  </Folder>
-  <Project Path="Wino.Calendar/Wino.Calendar.csproj">
-    <Platform Solution="*|Any CPU" Project="x64" />
-    <Platform Solution="*|arm64" Project="arm64" />
-    <Platform Solution="*|x64" Project="x64" />
-    <Platform Solution="*|x86" Project="x86" />
-    <Deploy Solution="*|arm64" />
-    <Deploy Solution="*|x64" />
-    <Deploy Solution="*|x86" />
-  </Project>
-  <Project Path="Wino.Server/Wino.Server.csproj">
-    <Platform Solution="*|Any CPU" Project="x64" />
-    <Platform Solution="*|arm64" Project="ARM64" />
-    <Platform Solution="*|x64" Project="x64" />
-    <Platform Solution="*|x86" Project="x86" />
-  </Project>
-  <Project Path="WinoCalendar.Packaging/WinoCalendar.Packaging.wapproj" Type="c7167f0d-bc9f-4e6e-afe1-012c56b48db5" Id="52c4d001-f64b-43d5-8b78-3be45aea63e9">
-    <Platform Solution="*|Any CPU" Project="x64" />
-    <Platform Solution="*|arm64" Project="ARM64" />
-    <Deploy />
-  </Project>
-</Solution>
diff --git a/WinoFontIcomoon.json b/WinoFontIcomoon.json
index 1aa1a648..38376ec5 100644
--- a/WinoFontIcomoon.json
+++ b/WinoFontIcomoon.json
@@ -1 +1 @@
-{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M579.728 166.24c33.396-43.11 58.712-104.043 49.555-166.24-54.583 3.793-118.383 38.715-155.609 84.234-33.935 41.244-61.825 102.598-50.932 162.146 59.67 1.867 121.255-33.898 156.986-80.14v0zM874.667 751.301c-23.88 53.226-35.371 77.009-66.134 124.153-42.912 65.81-103.42 147.755-178.472 148.358-66.613 0.723-83.789-43.652-174.222-43.11-90.433 0.482-109.285 43.953-176.018 43.291-74.992-0.662-132.328-74.6-175.24-140.41-120.058-183.882-132.687-399.735-58.653-514.555 52.668-81.524 135.739-129.211 213.783-129.211 79.42 0 129.395 43.833 195.17 43.833 63.8 0 102.642-43.953 194.511-43.953 69.545 0 143.22 38.113 195.648 103.862-171.888 94.771-144.058 341.692 29.626 407.743v0z"],"attrs":[{}],"width":875,"isMulticolor":false,"isMulticolor2":false,"grid":64,"tags":["apple"]},"attrs":[{}],"properties":{"order":341,"id":515,"name":"apple","prevSize":64,"code":59691},"setIdx":0,"setId":1,"iconIdx":0},{"icon":{"paths":["M1017.6 236.8c-6.4-6.4-16-12.8-25.6-12.8h-352c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h3.2l-70.4 96-137.6-224h76.8c19.2 0 32-12.8 32-32v-96c0-19.2-12.8-32-32-32h-448c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h73.6l246.4 361.6v214.4h-96c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h448c19.2 0 32-12.8 32-32v-96c0-19.2-12.8-32-32-32h-96v-156.8l208-291.2h112c12.8 0 25.6-9.6 28.8-22.4l32-96c6.4-9.6 3.2-19.2-3.2-28.8z"],"attrs":[{"fill":"rgb(96, 1, 209)"}],"isMulticolor":false,"isMulticolor2":false,"grid":64,"tags":["yahoo"]},"attrs":[{"fill":"rgb(96, 1, 209)"}],"properties":{"order":340,"id":514,"name":"yahoo","prevSize":64,"code":59692},"setIdx":0,"setId":1,"iconIdx":1},{"icon":{"paths":["M383.104 817.159h257.792c-10.809 62.218-64.398 108.929-128.896 108.929s-118.087-46.709-128.784-108.147l-0.112-0.781zM512 76.377c180.495 0 326.815 146.32 326.815 326.815v0 174.302l61.79 137.698c2.268 4.959 3.591 10.757 3.591 16.864 0 22.838-18.494 41.356-41.323 41.396h-701.567c-22.86-0.004-41.39-18.537-41.39-41.396 0-6.124 1.33-11.937 3.715-17.166l-0.106 0.259 61.659-137.698v-174.825l0.218-10.894c6.374-175.471 150.154-315.303 326.597-315.311h0.001zM991.329 348.592c18.045 0.006 32.671 14.635 32.671 32.682 0 16.479-12.195 30.108-28.053 32.357l-0.174 0.020-4.445 0.305h-87.15c-18.045-0.006-32.671-14.635-32.671-32.682 0-16.479 12.195-30.108 28.053-32.357l0.174-0.020 4.445-0.305h87.15zM119.822 348.592c18.045 0.006 32.671 14.635 32.671 32.682 0 16.479-12.195 30.108-28.053 32.357l-0.174 0.020-4.445 0.305h-87.15c-18.045-0.006-32.671-14.635-32.671-32.682 0-16.479 12.195-30.108 28.053-32.357l0.174-0.020 4.445-0.305h87.15zM973.899 100.213c4.085 5.396 6.543 12.22 6.543 19.618 0 8.949-3.596 17.057-9.422 22.959l0.003-0.003-3.66 3.181-87.15 65.363c-5.406 4.109-12.249 6.582-19.67 6.582-18.049 0-32.682-14.632-32.682-32.682 0-8.975 3.618-17.106 9.476-23.013l-0.002 0.002 3.66-3.181 87.15-65.363c5.393-4.081 12.215-6.536 19.609-6.536 10.655 0 20.12 5.099 26.086 12.991l0.059 0.082zM95.855 93.676l87.15 65.363c7.973 6.026 13.073 15.49 13.073 26.145 0 18.049-14.632 32.682-32.682 32.682-7.394 0-14.215-2.455-19.691-6.596l0.082 0.059-87.15-65.363c-7.973-6.026-13.073-15.49-13.073-26.145 0-18.049 14.632-32.682 32.682-32.682 7.394 0 14.215 2.455 19.691 6.596l-0.082-0.059z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["AlertOn"],"grid":64},"attrs":[{}],"properties":{"order":295,"id":0,"name":"AlertOn","prevSize":64,"code":59683},"setIdx":0,"setId":1,"iconIdx":2},{"icon":{"paths":["M381.385 756.278c10.288 10.296 16.652 24.514 16.652 40.219 0 31.425-25.474 56.899-56.899 56.899-15.72 0-29.95-6.375-40.247-16.68l-284.271-284.668c-10.275-10.292-16.628-24.5-16.628-40.191s6.353-29.9 16.628-40.193l284.325-284.325c10.299-10.305 24.529-16.68 40.249-16.68 31.425 0 56.899 25.474 56.899 56.899 0 15.705-6.363 29.925-16.652 40.221v0l-187.447 187.332h374.892c246.345 0.003 446.972 195.732 454.859 440.159l0.019 0.723 0.228 14.222c0 31.418-25.47 56.889-56.889 56.889s-56.889-25.47-56.889-56.889v0c0-0.004 0-0.008 0-0.012 0-184.009-145.607-334.010-327.887-341.068l-0.641-0.020-12.8-0.228h-374.665l187.161 187.389z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["ArrowReply"],"grid":64},"attrs":[{}],"properties":{"order":294,"id":1,"name":"ArrowReply","prevSize":64,"code":59684},"setIdx":0,"setId":1,"iconIdx":3},{"icon":{"paths":["M306.912 780.724l-222.258-222.258c-10.527-10.177-24.885-16.449-40.708-16.449-32.362 0-58.597 26.235-58.597 58.597 0 15.822 6.272 30.181 16.465 40.724l263.669 263.669c10.604 10.6 25.251 17.156 41.427 17.156s30.825-6.556 41.427-17.156l644.563-644.563c10.177-10.527 16.449-24.885 16.449-40.708 0-32.362-26.235-58.597-58.597-58.597-15.822 0-30.181 6.272-40.724 16.465l-603.119 603.119z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["Checkmark"],"grid":64},"attrs":[{}],"properties":{"order":293,"id":2,"name":"Checkmark","prevSize":64,"code":59685},"setIdx":0,"setId":1,"iconIdx":4},{"icon":{"paths":["M662.947 731.4c-3.51 18.673-7.46 36.567-11.798 53.729-25.576 22.407-41.637 55.132-41.637 91.608 0 0.053 0 0.105 0 0.157v-0.008c0 8.483 0.439 16.772 1.316 24.865-29.107 61.481-64.065 97.803-98.827 97.803-58.36 0-117.013-102.094-148.119-253.723l-2.828-14.334h301.894zM671.235 943.681c-8.206-19.281-12.975-41.709-12.975-65.251 0-0.543 0.002-1.086 0.008-1.627l-0.001 0.083c0-40.39 32.743-73.133 73.133-73.133v0h243.777c40.39 0 73.133 32.743 73.133 73.133v0c0 54.411-22.379 97.999-59.092 127.447-36.128 29.010-84.591 43.198-135.931 43.198s-99.803-14.139-135.931-43.198c-12.774-10.256-23.68-22.139-32.6-35.463l-0.358-0.568c-4.723-7.052-9.128-15.142-12.785-23.631l-0.379-0.99zM999.652 512c0 32.325-3.169 63.968-9.166 94.585-21.277-56.194-74.647-95.421-137.178-95.421-37.718 0-72.102 14.272-98.048 37.71l0.128-0.113c0.298-10.824 0.467-23.565 0.467-36.345 0-23.195-0.559-46.258-1.665-69.178l0.125 3.234-1.852-31.983h237.44c6.339 31.496 9.751 64.114 9.751 97.511zM755.777 658.266v-0.828c0-53.853 43.657-97.511 97.511-97.511s97.511 43.657 97.511 97.511v0 0.828c-0.331 53.467-43.752 96.682-97.265 96.682-0.087 0-0.173 0-0.259 0h0.014c-24.28 0-46.464-8.873-63.529-23.549-20.677-17.79-33.756-43.912-33.982-73.093v-0.040zM744.271 754.949c-2.966-3.306-5.892-6.895-8.642-10.621l-0.28-0.398-1.414 7.557-0.682 3.413h11.019zM76.419 731.4h209.941c17.747 101.509 47.926 187.903 87.37 248.311-125.917-38.179-228.001-122.208-288.918-232.201l-1.274-2.508-7.118-13.603zM34.148 414.489h237.44c-2.204 29.179-3.461 63.199-3.461 97.513 0 41.535 1.841 82.641 5.446 123.239l-0.376-5.252 2.779 28.279h-229.297c-14.188-43.749-22.368-94.087-22.368-146.335 0-34.49 3.564-68.149 10.346-100.626l-0.555 3.184zM678.987 414.489c2.401 29.154 3.77 63.106 3.77 97.377 0 41.679-2.024 82.884-5.979 123.524l0.406-5.158-3.022 28.034h-324.322c-5.44-44.095-8.545-95.136-8.545-146.903 0-25.71 0.766-51.24 2.275-76.57l-0.166 3.489 1.658-23.792h333.926zM655.584 52.528l-5.315-8.288c147.859 44.866 263.922 153.857 317.538 293.766l1.128 3.349h-223.788c-15.407-117.794-46.659-219.010-89.612-288.779zM367.781 46.044l5.948-1.804c-42.953 65.869-74.888 162.356-91.855 275.663l-3.022 21.452h-223.69c54.001-141.32 167.597-249.225 309.207-294.359l3.461-0.953zM512 24.543c64.308 0 129.007 123.937 156.7 301.455l2.291 15.358h-317.983c26.377-185.709 92.879-316.813 158.992-316.813z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["GlobePerson"],"grid":64},"attrs":[{}],"properties":{"order":291,"id":3,"name":"JoinOnline","prevSize":64,"code":59686},"setIdx":0,"setId":1,"iconIdx":5},{"icon":{"paths":["M224.171 597.333h468.821c4.437 7.339 9.856 14.165 16.213 20.224l30.72 29.099c-4.388 16.237-10.53 30.451-18.388 43.515l0.425-0.763c-8.432 14.527-18.147 27.055-29.302 38.134l-0.010 0.010-33.877-11.307c-8.718-2.968-18.761-4.681-29.204-4.681-32.297 0-60.767 16.386-77.55 41.297l-0.211 0.333-30.805 45.227c-10.828 15.816-17.291 35.363-17.291 56.42 0 27.465 10.996 52.362 28.826 70.529l-0.015-0.016 9.685 9.728c-23.083 2.432-47.36 3.627-72.875 3.627-123.307 0-218.795-28.032-285.483-85.333-34.179-29.513-55.68-72.903-55.68-121.315 0-0.010 0-0.020 0-0.031l-0 0.002v-38.699c0-53.019 42.981-96 96-96h0zM725.803 522.453l21.461-50.645c10.069-23.765 34.176-36.693 57.856-31.744l5.035 1.323 26.88 8.619c26.709 8.533 47.104 31.36 53.717 60.032 15.659 68.181-3.157 151.168-56.405 248.96-53.205 97.707-111.531 156.416-174.933 176.213-6.636 2.127-14.27 3.353-22.19 3.353-18.661 0-35.732-6.807-48.866-18.073l0.101 0.084-5.291-4.821-20.395-20.48c-10.137-10.436-16.386-24.694-16.386-40.412 0-10.061 2.561-19.524 7.066-27.773l-0.152 0.303 2.987-4.949 30.805-45.227c12.117-17.792 32.853-26.24 52.779-21.973l5.419 1.493 56.832 18.944c22.956-17.637 41.925-39.192 56.19-63.812l0.557-1.041c11.81-19.519 20.664-42.288 25.231-66.569l0.199-1.271 1.621-11.477-47.317-44.928c-10.773-10.504-17.456-25.161-17.456-41.378 0-6.126 0.954-12.029 2.72-17.57l-0.113 0.409 2.048-5.589v0zM469.333 85.547c117.821-0 213.333 95.513 213.333 213.333s-95.513 213.333-213.333 213.333v0c-117.821 0-213.333-95.513-213.333-213.333s95.513-213.333 213.333-213.333v0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["PersonCall"],"grid":64},"attrs":[{}],"properties":{"order":288,"id":4,"name":"PersonCall","prevSize":64,"code":59687},"setIdx":0,"setId":1,"iconIdx":6},{"icon":{"paths":["M512 37.103c-163.958 0-296.811 132.853-296.811 296.811 0 32.785 26.578 59.363 59.363 59.363s59.363-26.578 59.363-59.363v0c0-98.422 79.665-178.087 178.087-178.087s178.087 79.665 178.087 178.087c0 48.44-11.814 76.815-26.001 96.701-15.553 21.667-37.102 37.873-66.961 58.472l-6.886 4.63c-26.535 18.165-60.728 41.494-87.203 74.024-31.283 38.467-50.399 87.084-50.399 152.026v29.681c0 32.785 26.578 59.363 59.363 59.363s59.363-26.578 59.363-59.363v0-29.681c0-38.941 10.567-60.787 23.745-77.112 15.256-18.639 35.795-32.768 66.13-53.604l3.146-2.197c29.444-20.184 67.257-46.659 96.167-87.144 30.453-42.266 48.262-95.573 48.262-165.799 0-163.958-132.853-296.811-296.811-296.811zM512 1061.101c40.981 0 74.202-33.222 74.202-74.202s-33.222-74.202-74.202-74.202v0c-40.981 0-74.202 33.222-74.202 74.202s33.222 74.202 74.202 74.202v0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["Question"],"grid":64},"attrs":[{}],"properties":{"order":287,"id":5,"name":"Question","prevSize":64,"code":59688},"setIdx":0,"setId":1,"iconIdx":7},{"icon":{"paths":["M652.765 665.562c49.447 0 89.578 40.131 89.578 89.578l-0.052 49.242c5.989 112.1-77.344 168.765-226.863 168.765-148.955 0-233.773-55.795-233.773-166.82v-51.188c0-49.447 40.131-89.578 89.578-89.578h281.531zM89.704 409.626h223.996c-4.099 15.32-6.454 32.909-6.454 51.049 0 57.132 23.359 108.81 61.049 146.001l0.023 0.022 8.292 7.73-5.375-0.052c-0.016 0-0.034 0-0.050 0-64.221 0-118.398 43.007-135.3 101.791l-0.245 0.993-1.741 0.052c-148.955 0-233.773-55.795-233.773-166.82v-51.188c0-49.447 40.131-89.578 89.578-89.578zM934.296 409.626c49.447 0 89.578 40.131 89.578 89.578l-0.052 49.242c5.989 112.1-77.344 168.765-226.863 168.765l-8.651-0.102c-16.31-56.459-65.498-97.85-124.987-102.346l-0.474-0.029-10.084-0.359-5.375 0.052c42.676-37.618 69.457-92.407 69.457-153.451 0-18.232-2.389-35.906-6.871-52.726l0.323 1.426 223.996-0.052zM512 307.25c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0zM230.469 51.313c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0zM793.531 51.313c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["PeopleCommunity"],"grid":64},"attrs":[{}],"properties":{"order":286,"id":6,"name":"Attendees","prevSize":64,"code":59689},"setIdx":0,"setId":1,"iconIdx":8},{"icon":{"paths":["M902.026 158.393c0-74.045-60.026-134.071-134.071-134.071v0h-609.416c-74.045 0-134.071 60.026-134.071 134.071v0 609.416c0 74.045 60.026 134.071 134.071 134.071v0h324.989l5.119-20.476c7.898-31.592 24.23-60.454 47.291-83.465l105.21-105.258c-4.519-5.798-7.25-13.183-7.264-21.204v-416.454c0.273-19.715 16.319-35.594 36.074-35.594 0.173 0 0.345 0.001 0.516 0.003h-0.026c0.146-0.002 0.318-0.003 0.491-0.003 19.754 0 35.802 15.877 36.074 35.567v371.819l116.666-116.666c20.86-20.887 47.482-36.014 77.278-42.796l1.070-0.205v-308.755zM219.48 353.405c0-20.135 16.381-36.419 36.565-36.419s36.565 16.284 36.565 36.419v317.189c-0.027 20.12-16.345 36.419-36.468 36.419-0.034 0-0.069 0-0.103 0h0.006c-0.029 0-0.063 0-0.097 0-20.123 0-36.439-16.299-36.468-36.416v-317.191zM426.681 498.837c0-0.043 0-0.095 0-0.147 0-19.57 15.796-35.451 35.333-35.589h0.013c0.146-0.002 0.319-0.003 0.491-0.003 19.469 0 35.286 15.632 35.586 35.029v0.029l1.706 172.928c0 0.058 0 0.127 0 0.195 0 19.57-15.796 35.451-35.333 35.589h-0.013c-0.146 0.002-0.319 0.003-0.491 0.003-19.486 0-35.314-15.659-35.587-35.081v-0.025l-1.706-172.928zM858.148 544.665l-287.79 287.742c-16.291 16.298-28.307 36.869-34.221 59.888l-0.198 0.908-22.329 89.268c-1.006 3.859-1.583 8.289-1.583 12.855 0 29.268 23.726 52.995 52.995 52.995 4.58 0 9.022-0.58 13.261-1.673l-0.368 0.080 89.219-22.281c23.949-6.119 44.538-18.152 60.843-34.468l287.742-287.742c19.448-20.039 31.437-47.411 31.437-77.583 0-61.553-49.897-111.45-111.45-111.45-30.159 0-57.521 11.98-77.586 31.44l0.029-0.027z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["DataUsageEdit"],"grid":64},"attrs":[{}],"properties":{"order":285,"id":7,"name":"EditSeries","prevSize":64,"code":59690},"setIdx":0,"setId":1,"iconIdx":9},{"icon":{"paths":["M768 746.667v53.333c0 53.019-42.981 96-96 96v0h-320c-53.019 0-96-42.981-96-96v0-53.376l-74.667 0.043c-53.019 0-96-42.981-96-96v0-255.829c0-76.583 62.083-138.667 138.667-138.667v0l31.957-0.043 0.043-32.128c0-53.019 42.981-96 96-96v0h320.085c53.019 0 96 42.981 96 96v0 32.128h32c76.581 0.049 138.655 62.092 138.752 138.657l0 0.009 0.128 255.872c0 0.013 0 0.028 0 0.043 0 52.981-42.937 95.933-95.912 95.957l-75.053 0zM672 576h-320c-17.673 0-32 14.327-32 32v0 192c0 17.664 14.336 32 32 32h320c17.673 0 32-14.327 32-32v0-192c0-17.673-14.327-32-32-32v0zM672.085 192h-320.085c-17.673 0-32 14.327-32 32v0l-0.043 32.128h384.128v-32.128c0-17.673-14.327-32-32-32v0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["Print"],"grid":64},"attrs":[{}],"properties":{"order":281,"id":8,"name":"Print","prevSize":64,"code":59682},"setIdx":0,"setId":1,"iconIdx":10},{"icon":{"paths":["M896 512.939v-150.272h-768v394.667c0 76.583 62.083 138.667 138.667 138.667v0h246.272c-27.404-42.265-43.697-93.942-43.697-149.425 0-153.167 124.166-277.333 277.333-277.333 55.483 0 107.161 16.293 150.51 44.355l-1.085-0.658zM896 266.667c0-76.583-62.083-138.667-138.667-138.667v0h-490.667c-76.583 0-138.667 62.083-138.667 138.667v0 32h768v-32zM981.333 746.667c0-129.603-105.064-234.667-234.667-234.667s-234.667 105.064-234.667 234.667v0c0 129.603 105.064 234.667 234.667 234.667s234.667-105.064 234.667-234.667v0zM725.333 618.667c0-11.782 9.551-21.333 21.333-21.333s21.333 9.551 21.333 21.333v0 170.667c0 11.782-9.551 21.333-21.333 21.333s-21.333-9.551-21.333-21.333v0-170.667zM773.333 874.667c0 14.728-11.939 26.667-26.667 26.667s-26.667-11.939-26.667-26.667v0c0-14.728 11.939-26.667 26.667-26.667s26.667 11.939 26.667 26.667v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarError"],"grid":64},"attrs":[],"properties":{"order":280,"id":9,"name":"CalendarError","prevSize":64,"code":59670},"setIdx":0,"setId":1,"iconIdx":11},{"icon":{"paths":["M839.11 0.001c102.111 0 184.889 82.777 184.889 184.889v0 654.222c0 102.111-82.777 184.889-184.889 184.889v0h-654.222c-102.111 0-184.889-82.777-184.889-184.889v0-654.222c0-102.111 82.777-184.889 184.889-184.889v0h654.222zM270.223 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0zM753.777 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0zM512 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarYear"],"grid":64},"attrs":[],"properties":{"order":279,"id":10,"name":"CalendarYear","prevSize":64,"code":59671},"setIdx":0,"setId":1,"iconIdx":12},{"icon":{"paths":["M512 144.41c246.517 0 446.359 199.841 446.359 446.359s-199.841 446.359-446.359 446.359v0c-246.517 0-446.359-199.841-446.359-446.359s199.841-446.359 446.359-446.359v0zM512 301.948c-19.862 0.001-36.289 14.704-38.993 33.819l-0.025 0.209-0.368 5.356v236.308l0.368 5.356c2.734 19.319 19.159 34.016 39.017 34.016s36.283-14.697 38.993-33.807l0.025-0.209 0.368-5.356v-236.308l-0.368-5.356c-2.727-19.324-19.156-34.027-39.017-34.028v0zM888.517 150.869l4.306 3.204 60.337 52.513c8.354 7.262 13.605 17.905 13.605 29.776 0 21.751-17.633 39.385-39.385 39.385-8.078 0-15.586-2.432-21.836-6.603l0.144 0.090-4.254-3.204-60.337-52.513c-8.26-7.257-13.445-17.841-13.445-29.636 0-21.751 17.633-39.385 39.385-39.385 7.988 0 15.42 2.378 21.628 6.465l-0.148-0.091zM630.154 13.129c21.746 0.007 39.372 17.637 39.372 39.385 0 19.858-14.697 36.283-33.807 38.993l-0.209 0.025-5.356 0.368h-236.308c-21.746-0.007-39.372-17.637-39.372-39.385 0-19.858 14.697-36.283 33.807-38.993l0.209-0.025 5.356-0.368h236.308z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["Reminder"],"grid":64},"attrs":[],"properties":{"order":278,"id":11,"name":"Reminder","prevSize":64,"code":59672},"setIdx":0,"setId":1,"iconIdx":13},{"icon":{"paths":["M1023.999 839.11c0 102.111-82.777 184.889-184.889 184.889v0h-654.222c-102.111 0-184.889-82.777-184.889-184.889v0-654.222c0-102.111 82.777-184.889 184.889-184.889v0h654.222c102.111 0 184.889 82.777 184.889 184.889v0 654.222zM796.444 270.223c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0zM796.444 753.777c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0zM796.444 512c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarAgenda"],"grid":64},"attrs":[],"properties":{"order":277,"id":12,"name":"CalendarAgenda","prevSize":64,"code":59673},"setIdx":0,"setId":1,"iconIdx":14},{"icon":{"paths":["M922.4 352.401v114c-31.531-41.682-81.025-68.33-136.749-68.33-94.44 0-171 76.56-171 171 0 49.456 21 94.015 54.566 125.236l0.104 0.094h-43.32c-62.957 0-114 51.042-114 114v0 22.8c0 31.92 7.752 62.883 22.255 91.2h-284.456c-81.848 0-148.2-66.352-148.2-148.2v0-421.8h820.799zM774.199 101.6c81.848 0 148.2 66.352 148.2 148.2v0 34.2h-820.799v-34.2c0-81.848 66.352-148.2 148.2-148.2v0h524.4z","M1013.599 808.399c0-37.774-30.626-68.4-68.4-68.4v0h-319.2c-37.774 0-68.4 30.626-68.4 68.4v0 22.8c0 89.876 84.816 182.4 227.999 182.4s227.999-92.524 227.999-182.4v-22.8zM910.999 569c0-69.256-56.143-125.399-125.399-125.399s-125.399 56.143-125.399 125.399v0c0 69.256 56.143 125.399 125.399 125.399s125.399-56.143 125.399-125.399v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarAttendee"],"grid":64},"attrs":[],"properties":{"order":276,"id":13,"name":"CalendarAttendee","prevSize":64,"code":59674},"setIdx":0,"setId":1,"iconIdx":15},{"icon":{"paths":["M931.787 144.778l0.21 6.354 0.105 6.406v582.892c0 105.857-85.814 191.671-191.671 191.671v0h-582.892c-4.498-0.004-8.956-0.138-13.381-0.396l0.62 0.030c30.721 47.871 83.675 79.137 143.931 79.137 0.039 0 0.079 0 0.118 0h451.603c149.36 0 270.44-121.080 270.44-270.44v0-451.609c0-60.548-31.508-113.743-79.084-144.043zM-13.128 275.693v433.23c0 94.256 76.41 170.667 170.667 170.667v0h551.384c94.256 0 170.667-76.41 170.667-170.667v0-433.23h-892.716zM157.539-13.128c-94.256 0-170.667 76.41-170.667 170.667v0 39.385h892.716v-39.385c0-94.256-76.41-170.667-170.667-170.667v0h-551.384z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarItemMultiDay"],"grid":64},"attrs":[],"properties":{"order":275,"id":14,"name":"CalendarItemMultiDay","prevSize":64,"code":59675},"setIdx":0,"setId":1,"iconIdx":16},{"icon":{"paths":["M839.109 0.001c102.107 0 184.89 82.774 184.89 184.89v0 654.22c0 102.107-82.774 184.89-184.89 184.89v0h-654.22c-102.107 0-184.89-82.774-184.89-184.89v0-654.22c0-102.107 82.774-184.89 184.89-184.89v0h654.22zM270.221 597.331c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM512 597.331c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM270.221 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM512 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM753.779 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarMonth"],"grid":64},"attrs":[],"properties":{"order":274,"id":15,"name":"CalendarMonth","prevSize":64,"code":59676},"setIdx":0,"setId":1,"iconIdx":17},{"icon":{"paths":["M972.8 332.801v180.326c-50.718-32.885-112.73-52.436-179.31-52.436-183.8 0-332.799 148.999-332.799 332.799 0 66.58 19.552 128.593 53.226 180.612l-0.79-1.302h-295.526c-91.9 0-166.4-74.5-166.4-166.4v0-473.6h921.599zM806.399 51.2c91.9 0 166.4 74.5 166.4 166.4v0 38.4h-921.599v-38.4c0-91.9 74.5-166.4 166.4-166.4v0h588.8zM512 793.6c0 155.523 126.077 281.6 281.6 281.6s281.6-126.077 281.6-281.6v0c0-155.523-126.077-281.6-281.6-281.6s-281.6 126.077-281.6 281.6v0zM947.2 614.4c14.138 0 25.6 11.461 25.6 25.6v0 102.4c0 14.138-11.461 25.6-25.6 25.6v0h-102.4c-14.138 0-25.6-11.461-25.6-25.6s11.461-25.6 25.6-25.6v0h51.2c-23.56-31.226-60.596-51.2-102.298-51.2-0.036 0-0.072 0-0.108 0h0.006c-42.649 0-80.486 20.838-103.782 53.044-4.723 6.184-12.1 10.133-20.399 10.133-14.138 0-25.6-11.461-25.6-25.6 0-5.435 1.693-10.475 4.583-14.62l-0.055 0.084c32.9-45.197 85.628-74.24 145.14-74.24 0.041 0 0.080 0 0.12 0h-0.006c50.176 0 95.488 20.634 128 53.76v-28.16c0-14.138 11.461-25.6 25.6-25.6v0zM665.6 919.040v28.16c0 14.138-11.461 25.6-25.6 25.6s-25.6-11.461-25.6-25.6v0-102.4c0-14.138 11.461-25.6 25.6-25.6v0h102.4c14.138 0 25.6 11.461 25.6 25.6s-11.461 25.6-25.6 25.6v0h-51.2c23.347 31.129 60.57 51.2 102.4 51.2 39.22 0 74.342-17.612 97.843-45.466 4.717-5.382 11.605-8.761 19.283-8.761 14.138 0 25.6 11.461 25.6 25.6 0 6.161-2.176 11.813-5.802 16.23l0.036-0.044c-33.022 39.029-82.034 63.642-136.796 63.642-0.058 0-0.115 0-0.173 0h0.010c-0.072 0-0.156 0-0.241 0-50.047 0-95.29-20.575-127.728-53.728l-0.031-0.032z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarSync"],"grid":64},"attrs":[],"properties":{"order":273,"id":16,"name":"CalendarSync","prevSize":64,"code":59677},"setIdx":0,"setId":1,"iconIdx":18},{"icon":{"paths":["M312.89 455.111v-142.222h398.222v142.222h-398.222z","M839.11 1023.999c102.111 0 184.889-82.777 184.889-184.889v0-654.222c0-102.111-82.777-184.889-184.889-184.889v0h-654.222c-102.111 0-184.889 82.777-184.889 184.889v0 654.222c0 102.111 82.777 184.889 184.889 184.889v0h654.222zM270.223 227.556h483.555c23.564 0 42.667 19.103 42.667 42.667v0 227.556c0 23.564-19.103 42.667-42.667 42.667v0h-483.555c-23.564 0-42.667-19.103-42.667-42.667v0-227.556c0-23.564 19.103-42.667 42.667-42.667v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarWorkWeek"],"grid":64},"attrs":[],"properties":{"order":272,"id":17,"name":"CalendarWorkWeek","prevSize":64,"code":59678},"setIdx":0,"setId":1,"iconIdx":19},{"icon":{"paths":["M563.299 307.828c162.19 0 254.242 107.41 267.604 237.040h4.095c0.076 0 0.166 0 0.256 0 104.178 0 188.645 84.395 188.761 188.545v0.011c-0.116 104.162-84.583 188.556-188.761 188.556-0.090 0-0.18 0-0.27 0h-543.436c-0.076 0-0.166 0-0.256 0-104.178 0-188.645-84.395-188.761-188.545v-0.011c0.116-104.162 84.583-188.556 188.761-188.556 0.090 0 0.18 0 0.27 0h4.081c13.464-130.499 105.464-237.040 267.654-237.040zM234.977 102.685c42.977 2.367 82.579 14.862 117.075 35.116l-1.218-0.661c51.613 30.084 91.164 76.037 112.441 131.086l0.601 1.769c-101.574 28.823-174.272 102.496-204.479 202.072l-3.533 12.594-2.97 12.185-10.546 1.945c-59.289 12.849-109.22 46.25-143.092 92.212l-0.463 0.658c-37.349-20.048-68.215-47.674-91.442-81.017l-0.558-0.846c-4.242-6.087-6.777-13.639-6.777-21.783 0-16.588 10.517-30.718 25.247-36.086l0.266-0.085c84.115-30.103 129.374-63.995 155.33-113.4 28.26-54.012 33.482-111.301 14.693-188.3-0.698-2.738-1.099-5.883-1.099-9.121 0-21.206 17.191-38.397 38.397-38.397 0.746 0 1.489 0.022 2.225 0.064l-0.102-0.005z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherCloudyNight"],"grid":64},"attrs":[],"properties":{"order":271,"id":18,"name":"WeatherCloudyNight","prevSize":64,"code":59679},"setIdx":0,"setId":1,"iconIdx":20},{"icon":{"paths":["M563.298 256.482c162.189 0 254.239 107.358 267.601 237.037h4.095c0.076 0 0.166 0 0.256 0 104.177 0 188.643 84.394 188.759 188.543v0.011c-0.145 104.138-84.6 188.504-188.759 188.504-0.090 0-0.18 0-0.27 0h-543.43c-0.076 0-0.166 0-0.256 0-104.159 0-188.613-84.364-188.759-188.489v-0.014c0.116-104.161 84.582-188.554 188.759-188.554 0.090 0 0.18 0 0.27 0h4.081c13.464-130.549 105.463-237.037 267.652-237.037zM409.609 102.433c82.784 0 156.147 41.724 199.664 105.566-13.676-1.728-29.501-2.714-45.557-2.714-0.146 0-0.294 0-0.44 0h0.023c-153.28 0-264.733 85.855-303.95 215.689l-3.481 12.287-2.97 12.185-10.546 1.997c-82.829 18.057-148.657 77.037-176.056 154.215l-0.518 1.676c-40.157-31.018-65.768-79.18-65.768-133.326 0-89.459 69.912-162.589 158.081-167.736l0.455-0.022 13.157-0.307c20.752-114.106 119.356-199.492 237.906-199.51h0.001z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherCloudy"],"grid":64},"attrs":[],"properties":{"order":270,"id":19,"name":"WeatherCloudy","prevSize":64,"code":59680},"setIdx":0,"setId":1,"iconIdx":21},{"icon":{"paths":["M563.296 307.583c162.234 0 254.23 107.354 267.642 237.028h4.095c0.076 0 0.166 0 0.256 0 104.173 0 188.636 84.391 188.752 188.536v0.011c-0.145 104.135-84.597 188.497-188.752 188.497-0.090 0-0.18 0-0.27 0h-543.46c-0.076 0-0.166 0-0.256 0-104.155 0-188.606-84.361-188.752-188.482v-0.014c0.116-104.157 84.579-188.547 188.752-188.547 0.090 0 0.18 0 0.27 0h4.081c13.464-130.545 105.409-237.028 267.591-237.028zM121.288 520.293c1.85 4.343 2.925 9.396 2.925 14.699 0 14.078-7.576 26.385-18.873 33.069l-0.179 0.097-4.659 2.304-47.405 19.658c-4.333 1.839-9.372 2.91-14.661 2.91-21.205 0-38.395-17.19-38.395-38.395 0-14.041 7.536-26.321 18.785-33.017l0.176-0.097 4.709-2.355 47.405-19.607c4.347-1.854 9.404-2.931 14.713-2.931 15.89 0 29.525 9.652 35.362 23.413l0.095 0.252zM453.383 272.873l-8.806 2.97c-91.33 32.252-156.755 102.644-185.066 195.715l-3.584 12.799-2.97 12.185-10.546 1.997c-32.469 6.959-61.138 19.65-86.282 37.068l0.787-0.516c-17.207-29.085-27.375-64.098-27.375-101.485 0-111.455 90.352-201.807 201.807-201.807 46.077 0 88.547 15.442 122.518 41.434l-0.486-0.356zM48.183 274.46l5.427 1.791 47.405 19.658c13.952 5.958 23.552 19.564 23.552 35.41 0 21.205-17.19 38.395-38.395 38.395-3.254 0-6.414-0.404-9.432-1.167l0.265 0.056-5.273-1.689-47.405-19.658c-13.914-5.975-23.481-19.561-23.481-35.38 0-21.205 17.19-38.395 38.395-38.395 3.21 0 6.328 0.394 9.309 1.136l-0.264-0.055zM243.487 121.595l2.355 4.659 19.607 47.457c1.796 4.286 2.84 9.268 2.84 14.492 0 21.205-17.19 38.395-38.395 38.395-13.993 0-26.237-7.485-32.948-18.67l-0.097-0.174-2.355-4.659-19.607-47.457c-1.796-4.286-2.84-9.268-2.84-14.492 0-21.205 17.19-38.395 38.395-38.395 13.993 0 26.237 7.485 32.948 18.67l0.097 0.174zM466.386 105.264c14.019 5.93 23.677 19.568 23.677 35.462 0 3.314-0.42 6.531-1.209 9.599l0.058-0.266-1.791 5.375-19.607 47.457c-5.958 13.952-19.564 23.552-35.41 23.552-21.205 0-38.395-17.19-38.395-38.395 0-3.254 0.404-6.414 1.167-9.432l-0.056 0.265 1.741-5.427 19.658-47.405c5.923-14.036 19.568-23.708 35.475-23.708 5.302 0 10.352 1.075 14.947 3.018l-0.252-0.095z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherPartlyCloudy"],"grid":64},"attrs":[],"properties":{"order":269,"id":20,"name":"WeatherPartlyCloudy","prevSize":64,"code":59681},"setIdx":0,"setId":1,"iconIdx":22},{"icon":{"paths":["M201.348 953.716c0-6.336 0.667-12.006 2.001-17.008l76.537-296.645h-80.539c-9.338 0-18.176-1.834-26.513-5.503s-15.591-8.587-21.761-14.757c-6.17-6.17-11.088-13.424-14.757-21.761s-5.503-17.175-5.503-26.513c0-6.003 0.833-12.006 2.501-18.009l140.569-506.747c3.669-14.007 11.339-25.345 23.011-34.017s24.679-13.006 39.019-13.006h346.669c9.004 0 17.341 1.751 25.012 5.253s14.424 8.171 20.26 14.007c5.836 5.836 10.422 12.673 13.757 20.51s5.002 16.091 5.002 24.762c0 7.337-1.168 14.34-3.502 21.010l-82.54 234.615h162.579c9.338 0 18.092 1.834 26.263 5.503s15.425 8.671 21.761 15.007c6.336 6.336 11.339 13.59 15.007 21.761s5.503 16.925 5.503 26.263c0 19.009-6.336 35.017-19.009 48.023l-551.269 566.277c-6.67 6.673-14.257 11.836-22.761 15.508s-17.592 5.503-27.263 5.503c-9.672 0-18.676-1.831-27.013-5.503s-15.758-8.754-22.261-15.257c-6.503-6.503-11.589-13.924-15.257-22.261s-5.503-17.341-5.503-27.013zM828.154 388.44c0-1.334-0.583-2.418-1.751-3.252s-2.251-1.251-3.252-1.251h-207.601c-8.671 0-16.175-3.085-22.511-9.255s-9.505-13.59-9.505-22.261c0-1.668 0.167-3.502 0.5-5.503s0.833-3.835 1.501-5.503l97.047-277.636h-346.669c-1.334 4.669-4.335 15.34-9.004 32.016s-10.422 37.268-17.258 61.78c-6.836 24.512-14.424 51.692-22.761 81.54s-16.758 59.946-25.262 90.294c-8.504 30.348-16.758 59.946-24.762 88.793s-15.090 54.527-21.26 77.038c-6.17 22.511-11.172 40.687-15.007 54.527s-5.753 21.093-5.753 21.761c0 3.001 1.501 4.502 4.502 4.502h121.559c9.004 0 16.591 3.085 22.761 9.255s9.255 13.757 9.255 22.761c0 2.001-0.333 4.669-1 8.004l-86.542 336.664v1.501c0 3.669 2.168 5.503 6.503 5.503 1.334 0 2.501-0.5 3.502-1.501l551.269-566.277c1-1 1.501-2.168 1.501-3.502z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherThunder"],"grid":64},"attrs":[],"properties":{"order":268,"id":21,"name":"WeatherThunder","prevSize":64,"code":59654},"setIdx":0,"setId":1,"iconIdx":23},{"icon":{"paths":["M858.233 383.471c91.229 1.168 164.735 75.396 164.735 166.793 0 88.074-68.259 160.205-154.76 166.377l-0.534 0.030-10.261 0.256-5.951 0.36h-40.38c5.644 15.906 8.722 33.094 8.722 50.95 0 85.429-64.751 154.234-150.13 154.234-66.702 0-114.675-32.222-137.918-83.428-2.921-6.25-4.625-13.571-4.625-21.289 0-28.337 22.972-51.309 51.309-51.309 18.576 0 34.846 9.872 43.851 24.655l0.129 0.226 5.028 9.646c7.183 12.416 19.139 18.881 42.228 18.881 27.193 0 47.461-21.55 47.461-51.617 0-26.168-20.164-48.025-46.384-50.95h-620.53c-28.313-0.032-51.252-22.992-51.252-51.309 0-26.201 19.64-47.816 45.001-50.924l0.248-0.025 6.003-0.36 614.475-0.308c3.232 0 6.465 0.102 9.697 0.256l177.631 0.102 3.079-0.308 9.697-0.41c32.411-3.514 57.417-30.729 57.417-63.783 0-35.421-28.715-64.136-64.136-64.136-25.171 0-46.954 14.499-57.454 35.602l-0.168 0.373-4.977 11.596c-8.715 16.628-25.852 27.778-45.595 27.778-28.337 0-51.309-22.972-51.309-51.309 0-6.208 1.103-12.159 3.123-17.667l-0.114 0.356c24.138-64.356 85.138-109.33 156.644-109.34h0.001zM396.555 794.199c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0zM499.172 75.874c0.176 0 0.382-0.001 0.59-0.001 120.433 0 218.063 97.63 218.063 218.063 0 120.226-97.295 217.727-217.442 218.062h-450.165c-28.313-0.032-51.252-22.992-51.252-51.309 0-26.201 19.64-47.816 45.001-50.924l0.248-0.025 6.003-0.36 456.854-0.256c60.243-4.286 107.492-54.211 107.492-115.171 0-63.758-51.687-115.445-115.445-115.445-63.752 0-115.435 51.676-115.445 115.426v0.001c0 28.337-22.972 51.309-51.309 51.309s-51.309-22.972-51.309-51.309v0c0-120.433 97.63-218.062 218.062-218.062v0zM883.989 229.801c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0zM191.319 152.838c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherBlowingSnow"],"grid":64},"attrs":[],"properties":{"order":267,"id":22,"name":"WeatherBlowingSnow","prevSize":64,"code":59655},"setIdx":0,"setId":1,"iconIdx":24},{"icon":{"paths":["M512 56.889c180.282 0 282.511 119.353 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.781 0 209.652 93.811 209.75 209.57v0.009c-0.129 115.744-93.988 209.523-209.75 209.523-0.12 0-0.24 0-0.36 0h-33.091l-90.055 149.959c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-107.349h-121.515l-90.055 150.016c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-107.349h-121.572l-89.999 150.016c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.365-107.349h-32.028c-0.101 0-0.221 0-0.341 0-115.741 0-209.588-93.747-209.75-209.45v-0.016c0.161-115.719 94.008-209.466 209.75-209.466 0.1 0 0.2 0 0.3 0h4.535c15.019-145.18 117.191-263.51 297.415-263.51z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherRain"],"grid":64},"attrs":[],"properties":{"order":266,"id":23,"name":"WeatherRain","prevSize":64,"code":59656},"setIdx":0,"setId":1,"iconIdx":25},{"icon":{"paths":["M656.156 827.904c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 56.889c180.282 0 282.511 119.353 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.781 0 209.652 93.811 209.75 209.57v0.009c-0.129 115.744-93.988 209.523-209.75 209.523-0.12 0-0.24 0-0.36 0h-74.335c-5.583 17.508-21.703 29.965-40.732 29.965s-35.149-12.459-40.649-29.664l-0.084-0.303h-317.44l-90.055 149.504c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-106.837h-32.028c-0.101 0-0.221 0-0.341 0-115.781 0-209.652-93.811-209.75-209.57v-0.009c0.161-115.719 94.008-209.466 209.75-209.466 0.1 0 0.2 0 0.3 0h4.535c15.019-145.124 117.191-263.452 297.415-263.452zM487.993 779.606c12.86 7.511 21.363 21.247 21.363 36.968 0 5.808-1.16 11.345-3.263 16.392l0.104-0.283-2.617 5.233-31.631 50.972c-7.499 12.908-21.26 21.448-37.016 21.448-23.564 0-42.667-19.103-42.667-42.667 0-5.869 1.185-11.463 3.329-16.552l-0.105 0.28 2.56-5.177 31.631-50.972c7.511-12.861 21.247-21.365 36.969-21.365 7.859 0 15.22 2.124 21.543 5.831l-0.201-0.109zM798.322 785.238c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherRainSnow"],"grid":64},"attrs":[],"properties":{"order":265,"id":24,"name":"WeatherRainSnow","prevSize":64,"code":59657},"setIdx":0,"setId":1,"iconIdx":26},{"icon":{"paths":["M384 861.924c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM640 861.924c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM256 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM768 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 56.945c180.281 0 282.511 119.296 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.741 0 209.588 93.747 209.749 209.449v0.016c-0.129 115.744-93.988 209.523-209.749 209.523-0.12 0-0.24 0-0.36 0h-603.8c-0.101 0-0.221 0-0.341 0-115.761 0-209.62-93.779-209.749-209.509v-0.012c0.161-115.719 94.008-209.465 209.749-209.465 0.1 0 0.2 0 0.3 0h4.535c15.019-145.124 117.191-263.452 297.415-263.452z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSnow"],"grid":64},"attrs":[],"properties":{"order":264,"id":25,"name":"WeatherSnow","prevSize":64,"code":59658},"setIdx":0,"setId":1,"iconIdx":27},{"icon":{"paths":["M230.86 720.997c-9.408 10.393-22.949 16.895-38.007 16.895-28.277 0-51.2-22.924-51.2-51.2 0-12.69 4.616-24.301 12.262-33.247l-0.059 0.071 79.052-90.316h-181.708c-26.164-0.004-47.741-19.631-50.817-44.964l-0.024-0.246-0.359-5.99c0.004-26.164 19.631-47.741 44.964-50.817l0.246-0.024 5.99-0.359h142.592l-79.104-89.6c-7.958-8.984-12.82-20.872-12.82-33.894 0-28.288 22.932-51.219 51.219-51.219 15.265 0 28.969 6.678 38.353 17.27l0.047 0.054 138.802 157.388h130.458v-130.56l-157.286-138.802c-10.652-9.427-17.334-23.134-17.334-38.4 0-10.765 3.323-20.755 8.998-28.999l-0.113 0.173 3.942-5.069c9.426-10.639 23.124-17.312 38.381-17.312 10.752 0 20.73 3.314 28.968 8.976l-0.173-0.113 5.12 3.942 89.497 79.052 0.052-142.489c0-0.012 0-0.026 0-0.042 0-24.1 16.65-44.31 39.074-49.755l0.35-0.072 5.785-1.024 5.99-0.307c26.164 0.004 47.741 19.631 50.817 44.964l0.024 0.246 0.359 5.99-0.052 143.257 90.624-79.052c8.923-7.748 20.654-12.472 33.489-12.472 28.277 0 51.2 22.924 51.2 51.2 0 15.256-6.672 28.952-17.256 38.331l-0.054 0.047-158.002 137.932v130.354h130.458l138.342-157.491c9.432-10.715 23.177-17.441 38.493-17.441 10.704 0 20.64 3.284 28.858 8.9l-0.176-0.114 5.069 3.942c10.696 9.431 17.408 23.164 17.408 38.465 0 10.716-3.292 20.663-8.92 28.885l0.113-0.175-3.942 5.12-79.002 89.907h142.95c26.164 0.004 47.741 19.631 50.817 44.964l0.024 0.246 0.359 5.99c-0.004 26.164-19.631 47.741-44.964 50.817l-0.246 0.024-5.99 0.359h-143.001l79.104 90.316c7.873 8.958 12.678 20.782 12.678 33.727 0 13.055-4.885 24.967-12.929 34.011l0.046-0.052-4.556 4.556c-8.958 7.873-20.782 12.678-33.727 12.678-13.055 0-24.967-4.885-34.011-12.929l0.052 0.046-4.556-4.556-138.342-157.798h-130.406v130.458l158.054 137.881c10.79 9.437 17.569 23.23 17.569 38.605 0 10.656-3.256 20.552-8.826 28.747l0.114-0.179-3.942 5.12c-9.434 10.759-23.208 17.515-38.558 17.515-10.655 0-20.549-3.254-28.744-8.824l0.179 0.114-5.12-3.892-90.675-79.257v143.308c-0.004 26.164-19.631 47.741-44.964 50.817l-0.246 0.024-5.99 0.359c-26.164-0.004-47.741-19.631-50.817-44.964l-0.024-0.246-0.359-5.99-0.052-142.489-88.883 78.489c-8.978 7.949-20.857 12.802-33.869 12.802-28.278 0-51.201-22.924-51.201-51.201 0-15.266 6.682-28.972 17.279-38.353l0.054-0.047 156.62-138.24v-130.56h-91.597l-138.291 157.798z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSnowflake"],"grid":64},"attrs":[],"properties":{"order":263,"id":26,"name":"WeatherSnowflake","prevSize":64,"code":59659},"setIdx":0,"setId":1,"iconIdx":28},{"icon":{"paths":["M448.11 921.551c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM678.483 921.551c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM332.924 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM563.296 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM793.669 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM563.296 205.349c162.234 0 254.23 107.405 267.642 237.028h4.095c0.076 0 0.166 0 0.256 0 104.173 0 188.636 84.391 188.752 188.536v0.011c-0.116 104.157-84.579 188.547-188.752 188.547-0.090 0-0.18 0-0.27 0h-543.46c-0.076 0-0.166 0-0.256 0-104.173 0-188.636-84.391-188.752-188.536v-0.011c0.116-104.157 84.579-188.547 188.752-188.547 0.090 0 0.18 0 0.27 0h4.081c13.464-130.493 105.409-237.028 267.591-237.028zM121.288 418.11c1.839 4.331 2.908 9.371 2.908 14.659 0 14.071-7.569 26.373-18.857 33.058l-0.178 0.097-4.659 2.355-47.405 19.607c-4.333 1.839-9.372 2.91-14.661 2.91-21.205 0-38.395-17.19-38.395-38.395 0-14.041 7.536-26.321 18.785-33.017l0.176-0.097 4.709-2.304 47.405-19.658c4.342-1.849 9.392-2.923 14.695-2.923 15.907 0 29.554 9.672 35.38 23.456l0.095 0.252zM453.383 170.69l-8.806 2.918c-91.279 32.252-156.755 102.695-185.066 195.715l-3.584 12.799-2.97 12.235-10.546 1.945c-32.473 6.974-61.141 19.681-86.278 37.119l0.785-0.515c-17.207-29.085-27.375-64.098-27.375-101.485 0-111.455 90.352-201.807 201.807-201.807 46.077 0 88.547 15.442 122.518 41.434l-0.486-0.356zM48.234 172.225l5.427 1.843 47.405 19.607c14.12 5.884 23.865 19.574 23.865 35.54 0 21.205-17.19 38.395-38.395 38.395-3.368 0-6.634-0.433-9.746-1.248l0.268 0.059-5.324-1.791-47.405-19.658c-13.914-5.975-23.481-19.561-23.481-35.38 0-21.205 17.19-38.395 38.395-38.395 3.21 0 6.328 0.394 9.309 1.136l-0.264-0.055zM243.539 19.361l2.355 4.709 19.607 47.405c1.796 4.286 2.84 9.268 2.84 14.492 0 21.205-17.19 38.395-38.395 38.395-13.993 0-26.237-7.485-32.948-18.67l-0.097-0.174-2.355-4.659-19.607-47.405c-1.839-4.333-2.91-9.372-2.91-14.661 0-21.205 17.19-38.395 38.395-38.395 14.041 0 26.321 7.536 33.017 18.785l0.097 0.176zM466.438 3.081c14.013 5.932 23.665 19.567 23.665 35.457 0 3.297-0.415 6.498-1.197 9.552l0.058-0.266-1.791 5.427-19.607 47.405c-5.958 13.952-19.564 23.552-35.41 23.552-21.205 0-38.395-17.19-38.395-38.395 0-3.254 0.404-6.414 1.167-9.432l-0.056 0.265 1.741-5.375 19.658-47.405c5.923-14.036 19.568-23.708 35.475-23.708 5.302 0 10.352 1.075 14.947 3.018l-0.252-0.095z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSnowShowerDay"],"grid":64},"attrs":[],"properties":{"order":262,"id":27,"name":"WeatherSnowShowerDay","prevSize":64,"code":59660},"setIdx":0,"setId":1,"iconIdx":29},{"icon":{"paths":["M448.002 921.589c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM678.396 921.589c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM332.805 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM563.199 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM793.593 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM563.249 205.729c162.249 0 254.253 107.364 267.666 237.050h4.095c0.061 0 0.133 0 0.205 0 104.165 0 188.623 84.369 188.77 188.5v0.014c-0.116 104.167-84.587 188.564-188.77 188.564-0.090 0-0.18 0-0.27 0h-543.409c-0.076 0-0.166 0-0.256 0-104.183 0-188.653-84.399-188.77-188.554v-0.011c0.145-104.144 84.605-188.514 188.77-188.514 0.090 0 0.18 0 0.27 0h4.081c13.465-130.557 105.419-237.050 267.616-237.050zM234.913 0.525c42.984 2.384 82.585 14.896 117.079 35.169l-1.216-0.661c51.638 30.074 91.21 76.032 112.497 131.093l0.601 1.768c-101.629 28.722-174.332 102.449-204.488 202.030l-3.584 12.595-2.918 12.186-10.547 1.945c-59.299 12.862-109.232 46.283-143.098 92.266l-0.463 0.66-7.935-4.352c-33.875-19.736-61.976-45.745-83.509-76.667l-0.558-0.847c-4.248-6.091-6.787-13.648-6.787-21.799 0-16.573 10.499-30.693 25.208-36.073l0.266-0.085c84.119-30.105 129.43-63.998 155.337-113.456 28.313-54.014 33.536-111.306 14.745-188.257-0.707-2.754-1.111-5.916-1.111-9.173 0-21.207 17.192-38.399 38.399-38.399 0.751 0 1.498 0.022 2.238 0.064l-0.102-0.005z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSnowShowerNight"],"grid":64},"attrs":[],"properties":{"order":261,"id":28,"name":"WeatherSnowShowerNight","prevSize":64,"code":59661},"setIdx":0,"setId":1,"iconIdx":30},{"icon":{"paths":["M511.795 846.892c26.199 0.004 47.806 19.657 50.886 45.025l0.024 0.246 0.359 5.999v74.649c-0.061 28.269-22.992 51.162-51.27 51.162-26.181 0-47.779-19.625-50.885-44.967l-0.025-0.248-0.359-5.947v-74.649c0-28.315 22.955-51.27 51.27-51.27v0zM821.308 747.84l52.808 52.808c8.89 9.207 14.368 21.76 14.368 35.592 0 28.315-22.955 51.27-51.27 51.27-13.857 0-26.431-5.497-35.658-14.43l-52.795-52.743c-9.272-9.279-15.007-22.093-15.007-36.247 0-28.321 22.958-51.279 51.279-51.279 14.167 0 26.992 5.745 36.272 15.032v0zM274.776 747.84c9.274 9.278 15.011 22.093 15.011 36.247s-5.737 26.971-15.011 36.247l-52.756 52.808c-9.279 9.272-22.093 15.007-36.247 15.007-28.321 0-51.279-22.958-51.279-51.279 0-14.167 5.745-26.992 15.032-36.272l52.808-52.808c9.275-9.26 22.080-14.985 36.222-14.985s26.946 5.726 36.223 14.985l-0.001-0.001zM512.513 228.583c156.442 0 283.263 126.821 283.263 283.263s-126.821 283.263-283.263 283.263v0c-156.442 0-283.263-126.821-283.263-283.263s126.821-283.263 283.263-283.263v0zM972.296 461.653c28.291 0.032 51.212 22.974 51.212 51.27 0 26.181-19.625 47.779-44.966 50.885l-0.248 0.025-5.999 0.359h-74.649c-28.269-0.061-51.162-22.992-51.162-51.27 0-26.181 19.625-47.779 44.967-50.885l0.248-0.025 5.947-0.359h74.649zM126.403 460.218c28.269 0.061 51.162 22.992 51.162 51.27 0 26.181-19.625 47.779-44.967 50.885l-0.248 0.025-5.947 0.359h-74.649c-28.291-0.032-51.212-22.974-51.212-51.27 0-26.181 19.625-47.779 44.966-50.885l0.248-0.025 5.999-0.359h74.649zM217.15 146.654l4.87 4.255 52.808 52.808c9.242 9.272 14.955 22.064 14.955 36.192 0 28.315-22.955 51.27-51.27 51.27-11.865 0-22.788-4.030-31.475-10.797l0.114 0.087-4.922-4.307-52.705-52.756c-9.242-9.272-14.955-22.064-14.955-36.192 0-28.315 22.955-51.27 51.27-51.27 11.865 0 22.788 4.030 31.475 10.797l-0.114-0.087zM874.065 150.91c9.277 9.278 15.014 22.094 15.014 36.251 0 11.893-4.049 22.841-10.845 31.538l0.085-0.113-4.255 4.82-52.808 52.808c-9.272 9.242-22.064 14.955-36.192 14.955-28.315 0-51.27-22.955-51.27-51.27 0-11.865 4.030-22.788 10.797-31.475l-0.087 0.114 4.307-4.87 52.756-52.808c9.278-9.274 22.093-15.011 36.247-15.011s26.971 5.737 36.247 15.011v0zM512-0.028c26.199 0.004 47.806 19.657 50.886 45.025l0.024 0.246 0.359 5.999v74.597c-0.032 28.291-22.974 51.212-51.27 51.212-26.181 0-47.779-19.625-50.885-44.966l-0.025-0.248-0.359-5.999v-74.597c0-28.315 22.955-51.27 51.27-51.27v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSunny"],"grid":64},"attrs":[],"properties":{"order":260,"id":29,"name":"WeatherSunny","prevSize":64,"code":59662},"setIdx":0,"setId":1,"iconIdx":31},{"icon":{"paths":["M512 0.008c21.207 0 38.399 17.192 38.399 38.399v0 25.599c0 21.207-17.192 38.399-38.399 38.399s-38.399-17.192-38.399-38.399v0-25.599c0-21.207 17.192-38.399 38.399-38.399v0zM307.203 358.402c0-113.107 91.691-204.797 204.797-204.797s204.797 91.691 204.797 204.797v0c0 113.107-91.691 204.797-204.797 204.797s-204.797-91.691-204.797-204.797v0zM550.399 652.797c0-21.207-17.192-38.399-38.399-38.399s-38.399 17.192-38.399 38.399v0 25.599c0 21.207 17.192 38.399 38.399 38.399s38.399-17.192 38.399-38.399v0-25.599zM192.005 307.203c-21.207 0-38.399 17.192-38.399 38.399s17.192 38.399 38.399 38.399v0h25.599c21.207 0 38.399-17.192 38.399-38.399s-17.192-38.399-38.399-38.399v0h-25.599zM767.995 345.602c0-21.207 17.192-38.399 38.399-38.399v0h25.599c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0h-25.599c-21.207 0-38.399-17.192-38.399-38.399v0zM241.668 193.541c6.839 6.385 16.051 10.305 26.178 10.305 21.207 0 38.399-17.192 38.399-38.399 0-10.128-3.92-19.339-10.327-26.2l0.020 0.023-25.599-25.599c-6.839-6.385-16.051-10.305-26.178-10.305-21.207 0-38.399 17.192-38.399 38.399 0 10.128 3.92 19.339 10.327 26.2l-0.020-0.023 25.599 25.599zM295.94 523.264c-6.947-6.938-16.541-11.231-27.135-11.231s-20.188 4.291-27.136 11.231v0l-25.599 25.599c-7.529 7.029-12.222 17.013-12.222 28.094 0 21.207 17.192 38.399 38.399 38.399 11.081 0 21.064-4.693 28.072-12.199l0.020-0.023 25.599-25.599c6.938-6.947 11.231-16.541 11.231-27.135s-4.291-20.188-11.231-27.136v0zM782.332 193.541c-7.029 7.529-17.013 12.222-28.094 12.222-21.207 0-38.399-17.192-38.399-38.399 0-11.081 4.693-21.064 12.199-28.072l0.023-0.020 25.599-25.599c7.029-7.529 17.013-12.222 28.094-12.222 21.207 0 38.399 17.192 38.399 38.399 0 11.081-4.693 21.064-12.199 28.072l-0.023 0.020-25.599 25.599zM728.060 523.264c6.947-6.938 16.541-11.231 27.135-11.231s20.188 4.291 27.136 11.231v0l25.599 25.599c7.529 7.029 12.222 17.013 12.222 28.094 0 21.207-17.192 38.399-38.399 38.399-11.081 0-21.064-4.693-28.072-12.199l-0.020-0.023-25.599-25.599c-6.938-6.947-11.231-16.541-11.231-27.135s4.291-20.188 11.231-27.136v0zM62.368 1015.595c-6.509 5.242-14.877 8.413-23.985 8.413-12.093 0-22.882-5.591-29.92-14.329l-0.058-0.074c-20.889-26.112 6.092-54.015 6.092-54.015v-0.102l0.82-0.563c2.63-2.129 5.682-4.433 8.807-6.637l0.563-0.377c6.349-4.608 15.513-11.007 27.34-18.637 23.706-15.206 58.060-35.327 101.476-55.347 86.783-40.037 210.736-80.332 358.497-80.332s271.714 40.294 358.497 80.332c39.705 18.337 72.977 36.794 104.772 57.341l-3.295-1.994c14.603 9.417 26.568 17.846 38.201 26.686l-1.492-1.087 0.614 0.512 0.154 0.154 0.154 0.052c8.826 7.099 14.426 17.897 14.426 30.003 0 21.214-17.198 38.413-38.413 38.413-9.109 0-17.477-3.17-24.061-8.468l0.074 0.058-1.536-1.229c-8.059-6.072-17.738-12.816-27.646-19.236l-2.050-1.244c-25.867-16.836-56.068-33.585-87.432-48.261l-4.675-1.966c-79.615-36.761-192.458-73.266-326.293-73.266s-246.678 36.505-326.293 73.266c-39.73 18.33-71.014 36.658-92.159 50.226-11.934 7.664-21.596 14.408-31.014 21.46l1.369-0.98-1.536 1.229z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSunnyHigh"],"grid":64},"attrs":[],"properties":{"order":259,"id":30,"name":"WeatherSunnyHigh","prevSize":64,"code":59663},"setIdx":0,"setId":1,"iconIdx":32},{"icon":{"paths":["M550.4 38.399c0-21.208-17.192-38.4-38.4-38.4s-38.4 17.192-38.4 38.4v0 76.8c0 21.208 17.192 38.4 38.4 38.4s38.4-17.192 38.4-38.4v0-76.8zM871.937 152.063c6.938 6.947 11.231 16.541 11.231 27.136s-4.291 20.189-11.231 27.137l-54.271 54.323c-6.9 6.677-16.314 10.792-26.69 10.792-21.208 0-38.4-17.192-38.4-38.4 0-10.363 4.105-19.768 10.777-26.675l54.262-54.312c6.95-6.954 16.553-11.256 27.162-11.256s20.212 4.302 27.161 11.256v0zM235.007 563.2c-2.947-15.296-4.633-32.888-4.633-50.874 0-155.524 126.077-281.601 281.601-281.601s281.601 126.077 281.601 281.601c0 17.986-1.686 35.578-4.909 52.626l0.276-1.752h196.66c21.208 0 38.4 17.192 38.4 38.4s-17.192 38.4-38.4 38.4v0h-947.2c-21.208 0-38.4-17.192-38.4-38.4s17.192-38.4 38.4-38.4v0h196.608zM243.2 716.8c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4v0h537.6c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4v0h-537.6zM448 870.401c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4v0h128c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4v0h-128zM152.063 152.063c6.947-6.938 16.541-11.231 27.136-11.231s20.189 4.291 27.137 11.231l54.323 54.271c7.241 6.994 11.736 16.788 11.736 27.634 0 21.208-17.192 38.4-38.4 38.4-10.832 0-20.616-4.486-27.598-11.699l-0.010-0.011-54.323-54.272c-6.954-6.95-11.256-16.553-11.256-27.162s4.302-20.212 11.256-27.161v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["WeatherSunnyLow"],"grid":64},"attrs":[],"properties":{"order":258,"id":31,"name":"WeatherSunnyLow","prevSize":64,"code":59664},"setIdx":0,"setId":1,"iconIdx":33},{"icon":{"paths":["M166.933 955.733c-22.4 0-43.733-4.533-64-13.6s-37.955-21.155-53.067-36.267c-15.111-15.111-27.2-32.8-36.267-53.067s-13.6-41.6-13.6-64v-621.867c0-22.4 4.533-43.733 13.6-64s21.156-37.955 36.267-53.067c15.111-15.111 32.8-27.2 53.067-36.267s41.6-13.6 64-13.6h621.867c22.4 0 43.733 4.533 64 13.6s37.955 21.156 53.067 36.267c15.111 15.111 27.2 32.8 36.267 53.067s13.6 41.6 13.6 64v621.867c0 22.4-4.533 43.733-13.6 64s-21.155 37.955-36.267 53.067c-15.111 15.111-32.8 27.2-53.067 36.267s-41.6 13.6-64 13.6h-208.533v-68.267h204.8c13.867 0 27.022-2.667 39.467-8s23.378-12.711 32.8-22.133c9.422-9.422 16.8-20.355 22.133-32.8s8-25.6 8-39.467v-512h-819.2v512c0 13.867 2.667 27.022 8 39.467s12.711 23.378 22.133 32.8c9.422 9.422 20.355 16.8 32.8 22.133s25.6 8 39.467 8h204.8v68.267zM68.267 204.8h819.2v-34.133c0-13.867-2.667-27.022-8-39.467s-12.711-23.378-22.133-32.8c-9.422-9.422-20.355-16.8-32.8-22.133s-25.6-8-39.467-8h-614.4c-13.867 0-27.022 2.667-39.467 8s-23.378 12.711-32.8 22.133c-9.422 9.422-16.8 20.355-22.133 32.8s-8 25.6-8 39.467zM409.6 409.6c0-9.6 1.778-18.489 5.333-26.667s8.445-15.378 14.667-21.6c6.222-6.222 13.422-11.111 21.6-14.667s17.067-5.333 26.667-5.333c9.245 0 18.045 1.778 26.4 5.333s15.645 8.445 21.867 14.667c6.222 6.222 11.111 13.511 14.667 21.867s5.333 17.155 5.333 26.4c0 9.6-1.778 18.489-5.333 26.667s-8.445 15.378-14.667 21.6c-6.222 6.222-13.422 11.111-21.6 14.667s-17.067 5.333-26.667 5.333c-9.6 0-18.578-1.778-26.933-5.333s-15.555-8.355-21.6-14.4c-6.045-6.045-10.845-13.245-14.4-21.6s-5.333-17.333-5.333-26.933zM443.733 721.6l-46.4 38.4c-6.4 5.333-13.689 8-21.867 8-9.245 0-17.245-3.378-24-10.133s-10.133-14.755-10.133-24c0-11.022 4.089-19.733 12.267-26.133l102.4-85.333c6.4-5.333 13.689-8 21.867-8s15.467 2.667 21.867 8l102.4 85.333c8.178 6.4 12.267 15.111 12.267 26.133 0 9.245-3.378 17.245-10.133 24s-14.755 10.133-24 10.133c-8.178 0-15.467-2.667-21.867-8l-46.4-38.4v268.267c0 9.248-3.378 17.248-10.133 24s-14.755 10.133-24 10.133c-9.245 0-17.245-3.381-24-10.133s-10.133-14.752-10.133-24z"],"width":956,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarToday"],"grid":64},"attrs":[],"properties":{"order":257,"id":32,"name":"CalendarToday","prevSize":64,"code":59665},"setIdx":0,"setId":1,"iconIdx":34},{"icon":{"paths":["M809.143 0c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429h-594.286c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429zM216.571 73.143c-19.429 0-37.905 4-55.429 12s-32.762 18.666-45.714 32c-12.952 13.334-23.238 28.857-30.857 46.571s-11.429 36.286-11.429 55.714h877.714v-2.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-514.857h-877.714v514.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM219.429 512c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857zM438.857 512c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857zM804.571 511.429c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571zM365.714 731.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.477 11.905-23.429 15.714s-18.571 5.714-28.857 5.714c-10.286 0-19.809-1.905-28.571-5.714s-16.381-8.952-22.857-15.429c-6.477-6.477-11.619-14.095-15.429-22.857s-5.714-18.286-5.714-28.571c0-10.286 1.905-19.905 5.714-28.857s9.048-16.762 15.714-23.429c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714c10.286 0 19.905 1.905 28.857 5.714s16.666 8.952 23.143 15.429c6.477 6.477 11.619 14.191 15.429 23.143s5.714 18.571 5.714 28.857zM585.143 731.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.477 11.905-23.429 15.714s-18.571 5.714-28.857 5.714c-10.286 0-19.809-1.905-28.571-5.714s-16.381-8.952-22.857-15.429c-6.477-6.477-11.619-14.095-15.429-22.857s-5.714-18.286-5.714-28.571c0-10.286 1.905-19.905 5.714-28.857s9.048-16.762 15.714-23.429c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714c10.286 0 19.905 1.905 28.857 5.714s16.666 8.952 23.143 15.429c6.477 6.477 11.619 14.191 15.429 23.143s5.714 18.571 5.714 28.857z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["Calendar"],"grid":64},"attrs":[],"properties":{"order":256,"id":33,"name":"Calendar","prevSize":64,"code":59666},"setIdx":0,"setId":1,"iconIdx":35},{"icon":{"paths":["M214.857 1024c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429h594.286c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-590.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714h-590.857c-19.048 0-37.238 3.905-54.571 11.714s-32.571 18.286-45.714 31.429c-13.143 13.143-23.619 28.381-31.429 45.714s-11.714 35.523-11.714 54.571v590.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM256 292.571c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857h512c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857zM292.571 804.571c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857v-219.429c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714h438.857c9.905 0 19.334 1.905 28.286 5.714s16.762 9.048 23.429 15.714c6.666 6.666 11.905 14.477 15.714 23.429s5.714 18.381 5.714 28.286v219.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714zM292.571 512v219.429h438.857v-219.429z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarDay"],"grid":64},"attrs":[],"properties":{"order":255,"id":34,"name":"CalendarDay","prevSize":64,"code":59667},"setIdx":0,"setId":1,"iconIdx":36},{"icon":{"paths":["M214.857 1024c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429h594.286c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-590.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714h-590.857c-19.048 0-37.238 3.905-54.571 11.714s-32.571 18.286-45.714 31.429c-13.143 13.143-23.619 28.381-31.429 45.714s-11.714 35.523-11.714 54.571v590.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM219.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714zM475.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714zM731.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["CalendarWeek"],"grid":64},"attrs":[],"properties":{"order":254,"id":35,"name":"CalendarWeek","prevSize":64,"code":59668},"setIdx":0,"setId":1,"iconIdx":37},{"icon":{"paths":["M384 192c-44.333 0-85.917 8.333-124.75 25s-72.75 39.5-101.75 68.5c-29 29-51.833 62.917-68.5 101.75s-25 80.417-25 124.75c0 27 3.5 54.083 10.5 81.25s17.333 52.583 31 76.25c2 3.667 4.583 7.667 7.75 12s6.25 8.833 9.25 13.5c3 4.667 5.583 9.333 7.75 14s3.25 9 3.25 13c0 8.667-3.167 16.167-9.5 22.5s-13.833 9.5-22.5 9.5c-5.667 0-10.417-1.167-14.25-3.5s-7.583-5.5-11.25-9.5c-12.333-14.333-23.25-30.833-32.75-49.5s-17.417-38.167-23.75-58.5c-6.333-20.333-11.167-40.917-14.5-61.75s-5-40.583-5-59.25c0-35 4.583-68.833 13.75-101.5s22.083-63.25 38.75-91.75c16.667-28.5 36.667-54.417 60-77.75s49.167-43.417 77.5-60.25c28.333-16.833 58.917-29.833 91.75-39s66.917-13.75 102.25-13.75h339l-73.5-73.5c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5c6.333-6.333 13.833-9.5 22.5-9.5s16.167 3.167 22.5 9.5l128 128c6.333 6.333 9.5 13.833 9.5 22.5s-3.167 16.167-9.5 22.5l-128 128c-6.333 6.333-13.833 9.5-22.5 9.5s-16.167-3.167-22.5-9.5c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5l73.5-73.5zM1024 512c0 35.333-4.58 69.25-13.75 101.75s-22.083 63-38.75 91.5c-16.667 28.5-36.667 54.417-60 77.75s-49.167 43.417-77.5 60.25c-28.333 16.833-58.917 29.833-91.75 39s-66.917 13.75-102.25 13.75h-338.5l73 73.5c6.333 6.333 9.5 13.833 9.5 22.5 0 8.67-3.167 16.17-9.5 22.5s-13.833 9.5-22.5 9.5c-8.667 0-16.167-3.17-22.5-9.5l-128-128c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5l128-128c6.333-6.333 13.833-9.5 22.5-9.5s16.167 3.167 22.5 9.5c6.333 6.333 9.5 13.833 9.5 22.5s-3.167 16.167-9.5 22.5l-73 73.5h338.5c44.333 0 85.917-8.333 124.75-25s72.75-39.5 101.75-68.5c29-29 51.833-62.917 68.5-101.75s25-80.417 25-124.75c0-19-1.333-36.667-4-53s-6.667-32.167-12-47.5c-5.333-15.333-11.917-30.333-19.75-45s-16.917-29.833-27.25-45.5c-2.333-3.667-4-6.667-5-9s-1.5-5.667-1.5-10c0-8.667 3.083-16.25 9.25-22.75s13.75-9.75 22.75-9.75c5.667 0 10.417 1.167 14.25 3.5s7.583 5.5 11.25 9.5c12.333 14.333 23.25 30.833 32.75 49.5s17.417 38.25 23.75 58.75c6.33 20.5 11.17 41.167 14.5 62s5 40.583 5 59.25z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["repeat"],"grid":64},"attrs":[],"properties":{"order":253,"id":36,"name":"repeat","prevSize":64,"code":59669},"setIdx":0,"setId":1,"iconIdx":38},{"icon":{"paths":["M0 1024v0 0 0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["space"],"defaultCode":32,"grid":64},"attrs":[],"properties":{"id":37,"order":159,"prevSize":64,"code":32,"name":"space"},"setIdx":0,"setId":1,"iconIdx":39},{"icon":{"paths":["M416 449q-13 0-23 9t-9 22q1 14 10 23t22 9h192q13 0 23-9t10-23q0-13-10-22t-23-9h-192zM96 193q0-41 28-69t69-28h638q41 0 69 28t28 69v63q0 43-31 72v424q0 73-52 125-52 51-124 51h-418q-72 0-124-51-52-52-52-125v-424q-31-29-31-72v-63zM193 352v400q0 47 32 79 33 33 78 33h418q45 0 78-33 32-32 32-79v-400h-638zM193 160q-15 0-24 9t-9 24v63q0 12 9 23 9 10 24 10h638q15 0 24-10 9-11 9-23v-63q0-15-9-24t-24-9h-638z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE066"],"defaultCode":57446,"grid":64},"attrs":[],"properties":{"id":38,"order":160,"ligatures":"","prevSize":64,"code":57446,"name":"uniE066"},"setIdx":0,"setId":1,"iconIdx":40},{"icon":{"paths":["M438 475q-12 0-19 7t-7 19q0 11 7 19t19 8h137q19-14 37-24 2-12-6-21-8-8-20-8h-148zM330 838h155q9 28 25 53h-180q-64 0-109-45t-45-111v-366q-20-11-32-29-11-18-11-41v-86q0-33 24-56 23-24 56-24h598q33 0 56 24 24 23 24 56v86q0 23-11 41-12 18-32 29v118q-27-8-53-14v-94h-566v356q0 43 30 73t71 30zM213 186q-10 0-18 9-9 8-9 18v86q0 10 9 18 8 9 18 9h598q10 0 18-9 9-8 9-18v-86q0-10-9-18-8-9-18-9h-598zM981 748q0 63-32 116-31 54-85 85-53 32-118 32-64 0-117-32-54-31-85-85-32-53-32-118 0-64 32-117 31-54 85-85 53-32 117-32 65 0 118 32 54 31 85 85 32 53 32 119zM676 676q6-6 6-14 0-9-6-15t-14-6q-9 0-15 6l-65 64q-7 6-7 14t7 16l65 64q6 6 15 6 8 0 14-6t6-15q0-10-6-16l-27-26h119q35 0 60 24 26 25 26 59 0 13 10 19t22 0q11-6 11-19-2-53-39-90-37-36-90-36h-119z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE06C"],"defaultCode":57452,"grid":64},"attrs":[],"properties":{"id":39,"order":161,"ligatures":"","prevSize":64,"code":57452,"name":"uniE06C"},"setIdx":0,"setId":1,"iconIdx":41},{"icon":{"paths":["M512 63q12 0 23 10 10 9 10 23v64q0 14-10 23-11 10-23 10t-23-10q-10-9-10-23v-64q0-14 10-23 11-10 23-10zM512 705q80 0 136-57 57-56 57-136t-57-136q-56-57-136-57t-136 57q-57 56-57 136t57 136q56 57 136 57zM512 639q-53 2-90-36t-37-91 37-91 90-38 90 38 38 91-37 90-91 37zM928 545q14 0 23-10 10-11 10-23t-10-23q-9-10-23-10h-64q-14 0-23 10-10 11-10 23t10 23q9 10 23 10h64zM512 831q12 0 23 10 10 9 10 23v64q0 14-10 23-11 10-23 10t-23-10q-10-9-10-23v-64q0-14 10-23 11-10 23-10zM160 545q14 0 23-10 10-11 10-23t-10-23q-9-10-23-10h-64q-14 0-23 10-10 11-10 23t10 23q9 10 23 10h64zM201 201q10-8 23-8 14 0 22 8l65 65q13 13 7 30-5 17-22 22-17 6-30-7l-65-65q-8-8-8-22 0-13 8-23v0zM246 823q-8 8-22 8-13 0-22-9t-9-22q0-14 8-22l65-65q13-13 30-7 17 5 22 22 6 17-7 30zM823 201q-10-8-23-8-14 0-22 8l-65 65q-8 8-8 22 0 13 9 22t22 9q14 0 22-8l65-65q8-8 8-22 0-13-8-23v0zM778 823q8 8 22 8 13 0 22-9t9-22q0-14-8-22l-65-65q-8-8-22-8-13 0-22 9t-9 22q0 14 8 22z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE1F6"],"defaultCode":57846,"grid":64},"attrs":[],"properties":{"id":40,"order":162,"ligatures":"","prevSize":64,"code":57846,"name":"uniE1F6"},"setIdx":0,"setId":1,"iconIdx":42},{"icon":{"paths":["M735 127q68 0 115 47t47 115v117q-27-37-66-60v-57q0-41-27-69-28-27-69-27h-446q-41 0-69 27-27 28-27 69v30h512v5q-68 10-111 61h-401v350q0 41 27 69 28 27 69 27h162q6 35 20 66h-182q-68-2-115-48t-47-114v-446q2-68 48-115t114-47h446zM864 512q0 53-38 90t-91 37-90-37-37-90 37-90 90-38 91 37 38 91zM961 801q0 65-54 108-59 52-171 52-111 0-173-52-51-43-51-108 0-41 28-69 27-27 68-27h256q39 0 68 27 29 28 29 69z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE25A"],"defaultCode":57946,"grid":64},"attrs":[],"properties":{"id":41,"order":163,"ligatures":"","prevSize":64,"code":57946,"name":"uniE25A"},"setIdx":0,"setId":1,"iconIdx":43},{"icon":{"paths":["M512 102q127 0 231 72 105 72 151 191 46 118 16 242-29 124-124 209-94 85-220 102-126 16-238-41l-6-3-187 48q-12 2-21-6-10-7-12-17v-4l48-193-3-6q-36-69-43-147l-2-37q0-111 56-205 55-94 149-149 94-56 205-56zM512 154q-96 0-178 47t-131 130-49 178 45 179q4 6 4 12l-39 160 153-39h11l8 4q98 56 211 44 112-11 197-85 85-73 114-182 29-108-10-214-39-105-131-170-92-64-205-64v0zM512 281q10 0 18 8 9 8 9 18v281q0 12-9 19-8 7-18 7t-18-7q-9-7-9-17v-283q2-10 10-18 7-8 17-8zM512 741q16 0 28-10 11-10 11-26 0-17-11-28-12-11-28-11t-28 11q-11 11-11 28 0 16 11 27 12 11 28 9z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE2F4"],"defaultCode":58100,"grid":64},"attrs":[],"properties":{"id":42,"order":165,"ligatures":"","prevSize":64,"code":58100,"name":"uniE2F4"},"setIdx":0,"setId":1,"iconIdx":44},{"icon":{"paths":["M590 205q0-33-23-55-22-23-55-22t-54 23q-22 21-22 54h154zM385 205q0-53 37-90t90-38 90 37 37 91h258q10 0 17 7 8 7 8 18 0 12-8 19-7 7-17 7h-55l-25 215q-24-6-51-8l25-207h-558l62 524q4 39 33 65 28 25 67 25h97q14 27 32 52h-129q-57 0-101-39t-50-97l-62-530h-53q-12 0-19-7-8-7-8-19 0-11 8-18 7-7 19-7h256zM973 741q0 64-31 117t-84 84-116 31q-62 0-115-31-54-31-84-84-31-53-31-116 0-62 31-115 30-54 84-84 53-31 115-31 63 0 116 31 53 30 84 84 31 53 31 114zM838 684q8-8 8-18 0-11-8-19-9-8-19-8t-18 8l-58 60-59-60q-8-8-18-8-11 0-19 8t-8 19q0 10 8 18l60 57-60 60q-8 8-8 18t8 19q8 8 19 8 10 0 18-8l59-60 58 60q8 8 18 8t19-8q8-9 8-19t-8-18l-60-60z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE47E"],"defaultCode":58494,"grid":64},"attrs":[],"properties":{"id":43,"order":166,"ligatures":"","prevSize":64,"code":58494,"name":"uniE47E"},"setIdx":0,"setId":1,"iconIdx":45},{"icon":{"paths":["M449 705q0-27 18-46 18-18 45-19t45 18q18 20 18 47 0 26-18 45-18 18-45 18t-45-18q-18-19-18-45zM471 291q2-15 13-25 12-10 28-10t28 10q11 10 13 25l2 8v221q-4 15-15 25-12 10-28 10t-28-10q-11-10-13-25l-2-8v-213zM938 512q0 115-56 214-57 99-156 156-99 56-214 56t-214-56q-99-57-156-156-56-99-56-215t57-213q58-97 155-155 97-57 214-57t214 57q97 58 155 155 57 97 57 214zM854 512q0-92-46-171t-125-125-171-46-171 46-125 125-46 171 46 171 125 125 171 46 171-46 125-125 46-171z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE5ED"],"defaultCode":58861,"grid":64},"attrs":[],"properties":{"id":44,"order":167,"ligatures":"","prevSize":64,"code":58861,"name":"uniE5ED"},"setIdx":0,"setId":1,"iconIdx":46},{"icon":{"paths":["M129 319v386q-2 53 36 90 38 36 91 36h512q53 0 91-36 38-37 36-90v-322q2-51-36-89t-91-38h-309l-72-57q-8-6-18-6h-113q-53 0-90 36-37 37-37 90v0zM193 319q0-26 18-45 18-18 45-18h100l56 45-56 51h-163v-33zM485 319h283q27 0 45 20 18 19 18 46v320q0 26-18 45-18 18-45 18h-512q-27 0-45-18-18-19-18-45v-289h176q12 0 20-8z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE643"],"defaultCode":58947,"grid":64},"attrs":[],"properties":{"id":45,"order":168,"ligatures":"","prevSize":64,"code":58947,"name":"uniE643"},"setIdx":0,"setId":1,"iconIdx":47},{"icon":{"paths":["M129 256v383q-2 53 36 91t91 38h78q-10-31-12-63h-66q-27 0-45-20-18-19-18-44v-289h176q12 0 20-8l96-88h283q27 0 45 18 18 19 18 45v39q35 19 66 43v-82q0-53-38-90-38-36-91-36h-309l-72-58q-8-6-18-8h-113q-53 2-90 39t-37 90v0zM193 256q0-27 18-45t45-18h100l56 43-56 53h-163v-33zM672 961q78 0 144-39 67-39 106-106 39-66 39-144t-39-145q-39-66-106-105-66-39-144-38t-145 39q-66 38-105 104-39 67-39 145t39 144q39 67 105 106 67 39 145 39zM672 512q14 0 23 9 10 9 10 24v94h96q12 0 21 10t9 24q0 13-9 22-9 10-21 10h-96v96q0 12-10 21-9 9-22 9-14 0-24-9t-10-21v-96h-94q-15 0-24-10-9-9-9-22 0-14 9-24t24-10h96v-94q0-15 9-24t22-9z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE645"],"defaultCode":58949,"grid":64},"attrs":[],"properties":{"id":46,"order":169,"ligatures":"","prevSize":64,"code":58949,"name":"uniE645"},"setIdx":0,"setId":1,"iconIdx":48},{"icon":{"paths":["M867 128q32 0 60 13 29 12 50 34 21 21 34 49 13 29 13 60v519q0 32-13 60-12 29-34 50-21 21-49 34-29 13-60 13h-711q-32 0-60-13-29-12-50-34-21-21-34-49-13-29-13-60v-519q0-32 13-60 12-29 34-50 21-21 49-34 29-13 60-13h711zM160 192q-19 0-37 7-17 8-31 21-13 13-20 31-8 17-8 37v14l448 268 448-268v-14q0-19-7-37-8-17-21-31-13-13-31-20-17-8-37-8h-704zM864 896q19 0 37-7 17-8 31-21 13-13 20-31 8-17 8-37v-423l-431 258q-8 5-17 5t-16-4l-432-259v423q0 19 7 37 8 17 21 31 13 13 31 20 17 8 37 8h704z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE715"],"defaultCode":59157,"grid":64},"attrs":[],"properties":{"id":47,"order":170,"ligatures":"","prevSize":64,"code":59157,"name":"uniE715"},"setIdx":0,"setId":1,"iconIdx":49},{"icon":{"paths":["M352 704h320q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-320q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11zM224 448h576q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-576q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11zM96 192h832q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-832q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE71C"],"defaultCode":59164,"grid":64},"attrs":[],"properties":{"id":48,"order":171,"ligatures":"","prevSize":64,"code":59164,"name":"uniE71C"},"setIdx":0,"setId":1,"iconIdx":50},{"icon":{"paths":["M128 800q0-32 12-61t35-52l350-350q9-9 22-9t23 9q9 9 9 22t-9 23l-350 350q-13 13-20 31-8 17-8 36 0 20 7 38 8 17 21 30t30 21q18 7 38 7 19 0 36-6 18-7 31-21l420-411q27-27 42-63 15-35 15-73t-15-73q-14-35-40-62-25-26-60-42-34-16-73-16-40 0-76 14-35 13-64 42l-384 384q-9 9-22 9t-23-9q-9-9-9-22t9-23l384-384q20-20 40-34t43-23q22-9 46-14 24-4 52-4 53 0 100 20 46 21 81 56t55 82q20 46 20 99 0 25-5 50t-15 48q-10 24-24 45t-32 38l-419 412q-23 22-53 34-29 11-61 11-33 0-62-12-29-13-50-35-21-21-34-50-12-29-13-62z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE723"],"defaultCode":59171,"grid":64},"attrs":[],"properties":{"id":49,"order":172,"ligatures":"","prevSize":64,"code":59171,"name":"uniE723"},"setIdx":0,"setId":1,"iconIdx":51},{"icon":{"paths":["M454.5 57.5q8.5-17 24.5-26.5 15.5-9 33.25-9t32.75 9q16 9.5 24.5 26.5l123.5 250.5 276.5 40q19 3 33 15 13 11.5 18.5 28.5t1.5 34q-4 18.5-18 31.5l-199.5 195 47 275q3.5 19-4 36.5-7 16-21.5 26.5t-32 12q-18.5 1.5-35.5-7.5l-247-129.5-247 129.5q-17 9-35.5 7.5-17.5-1.5-32-12t-21.5-26.5q-7-17.5-4-36.5l47.5-275-200-195q-14-13-18-31.5-4-17 1.5-34t19-28.5q14-12 33-15l276-40zM512 86l-123.5 250q-7 14.5-19.75 23.75t-28.25 11.25l-276.5 40.5 200 194.5q11.5 11.5 16.25 26.5t2.25 30.5l-47.5 275 247.5-130q14-7 29.75-7t29.75 7l247 130-47-275q-3-15.5 2-30.5t16-26.5l200-194.5-276-40.5q-16-2-28.75-11.25t-19.75-23.75z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_star_regular"],"defaultCode":59188,"grid":64},"attrs":[],"properties":{"id":50,"order":173,"ligatures":"","prevSize":64,"code":59188,"name":"ic_fluent_star_regular"},"setIdx":0,"setId":1,"iconIdx":52},{"icon":{"paths":["M870 741v-209q27-14 52-32v241q0 54-38 92-38 37-91 37h-562q-53 0-91-37-38-38-38-90v-411q0-51 38-89t89-38h242q-6 24-8 51h-232q-32 0-55 23-22 22-22 53v16l358 211 74-43q24 16 53 27l-115 67q-10 6-20 2l-350-204v333q0 33 22 56 23 22 55 22h564q30 0 53-22 22-23 22-56v0zM512 281q0 63 31 116 30 54 84 84 53 31 115 31 63 0 116-31 53-30 84-84 31-53 31-115 0-63-31-116t-84-84-116-31q-62 0-115 31-54 31-84 84-31 53-31 115zM788 147q9-6 19-6t18 6l88 91q9 8 9 18t-9 18l-88 91q-8 6-18 6t-19-7q-8-8-8-18t8-18l46-47h-78q-37 0-64 26-26 27-26 64v12q0 12-8 19-7 8-18 8t-18-8q-8-7-8-17v-14q0-58 41-100t101-42h78l-46-45q-8-8-8-18t8-19z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE7AA"],"defaultCode":59306,"grid":64},"attrs":[],"properties":{"id":51,"order":174,"ligatures":"","prevSize":64,"code":59306,"name":"uniE7AA"},"setIdx":0,"setId":1,"iconIdx":53},{"icon":{"paths":["M412 256h-105q-43 0-73 30-29 29-29 72v205h180q10 0 17 7 8 8 8 18v4q2 26 13 49t30 35q22 14 59 15t59-15q19-12 31-35 4-10 8-24 4-13 4-27v-2q0-10 8-18 7-7 19-7h178v-31q27-14 51-32v268q0 63-45 109-45 45-108 45h-410q-63 0-108-45-45-46-45-109v-410q0-63 45-108t108-45h113q-6 24-8 51v0zM360 614h-155v154q0 43 29 73 30 29 73 29h410q43 0 73-29 29-30 29-73v-154h-155q-5 27-17 50-16 34-47 55-37 22-88 23t-88-23q-31-21-47-55-12-23-17-50v0zM692 512q62 0 115-31 53-30 84-84 31-53 31-115 0-63-31-116t-84-84-116-31q-62 0-116 31-53 31-83 84-31 53-31 116 0 62 31 115 30 54 83 84 54 31 115 31h2zM571 299q-8-6-8-17 0-12 7-19 8-7 19-7t17 8l60 58v-144q0-10 7-17t18-7 19 7q7 7 7 17v144l59-58q6-8 18-8 11 0 18 7t7 19q0 11-8 17l-102 102q-7 9-17 9h-2q-10 0-16-9z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE7B8"],"defaultCode":59320,"grid":64},"attrs":[],"properties":{"id":52,"order":175,"ligatures":"","prevSize":64,"code":59320,"name":"uniE7B8"},"setIdx":0,"setId":1,"iconIdx":54},{"icon":{"paths":["M750 512q65 0 119-32 55-31 86-87 32-55 32-120 0-64-32-118-31-55-86-86-54-32-118-32-65 0-120 32-56 31-87 86-32 54-32 118 0 65 32 120 31 56 87 87 55 32 119 32zM750 457q-60 0-109-35l256-256q31 41 35 93t-20 98q-23 46-67 73t-95 27zM858 127l-256 256q-39-55-35-123 4-67 53-116 48-48 115-53 68-5 123 36zM860 526v201q-2 25-20 42-19 17-45 17h-572q-24-2-42-20-17-18-17-43v-324l340 176q10 3 20-2l103-53q-29-14-54-35l-61 33-348-180v-41q2-25 20-42 19-17 45-17h248q4-29 15-56h-271q-47 4-79 38-31 34-31 81v428q2 47 36 80 35 33 82 33h574q47-4 79-38 31-34 31-81v-229q-24 18-53 32v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE7D0"],"defaultCode":59344,"grid":64},"attrs":[],"properties":{"id":53,"order":176,"ligatures":"","prevSize":64,"code":59344,"name":"uniE7D0"},"setIdx":0,"setId":1,"iconIdx":55},{"icon":{"paths":["M319 512q0 27-18 45t-45 18-45-18-18-45 18-45 45-18 45 18 18 45zM575 512q0 27-18 45t-45 18-45-18-18-45 18-45 45-18 45 18 18 45zM768 575q27 0 45-18t18-45-18-45-45-18-45 18-18 45 18 45 45 18z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE824"],"defaultCode":59428,"grid":64},"attrs":[],"properties":{"id":54,"order":177,"ligatures":"","prevSize":64,"code":59428,"name":"uniE824"},"setIdx":0,"setId":1,"iconIdx":56},{"icon":{"paths":["M289 205q10-10 9-24-1-13-10-22t-22-9q-12 0-22 8l-84 86-21-21q-8-10-21-9-14 1-23 10t-9 22q0 12 8 22l43 43q10 8 24 8 13 0 21-8zM416 768h491q13 0 22 9t10 22q1 12-7 21t-21 11h-495q-13 0-22-8t-10-20 7-23q8-10 21-12h4zM416 492h491q13 0 22 8t10 20-7 23q-8 10-21 12h-495q-13 0-22-9t-10-22q-1-12 7-21t21-11h4zM416 213h491q13 0 22 9t10 22q1 12-7 21t-21 11h-495q-13 0-22-8t-10-20 7-23q8-10 21-12h4zM289 713q10 10 10 23 0 14-10 22l-107 106q-8 10-21 10-14 0-24-10l-43-41q-14-14-9-32 5-19 24-23 18-4 30 10l21 19 84-84q10-8 23-8 14 0 22 8v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE84D"],"defaultCode":59469,"grid":64},"attrs":[],"properties":{"id":55,"order":178,"ligatures":"","prevSize":64,"code":59469,"name":"uniE84D"},"setIdx":0,"setId":1,"iconIdx":57},{"icon":{"paths":["M1024 96v256q0 13-9 22-10 10-23 10h-256q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h180q-27-60-70-107-42-48-96-81-53-33-115-50-62-18-127-18-56 0-110 14-53 15-101 41-48 27-89 64-41 38-72 84-19 29-33 62-4 8-7 17-2 8-6 16-6 10-12 16t-18 6q-13 0-23-9-9-10-9-23 0-6 1-10 26-75 74-138 48-62 111-108 63-45 138-71 75-25 154-25 71 0 138 18t126 52q58 33 107 83 49 49 83 111v-168q0-13 9-22 10-10 23-10t22 9q10 10 10 23zM990 672q0 8-7 25-6 17-15 35t-19 34q-9 17-14 25-36 53-83 96-46 43-101 73-54 31-115 47-61 17-125 17-69 0-135-17-65-16-123-49-57-32-106-79-48-47-83-107v156q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-256q0-13 9-22 10-10 23-10h256q13 0 22 9 10 10 10 23t-9 22q-10 10-23 10h-187q27 60 70 107 43 48 96 81t115 50q62 18 127 18 56 0 109-14 54-14 102-41 48-26 89-64 41-37 72-84 19-29 33-62 4-8 7-17 2-8 6-16 6-10 12-16t18-6q14 0 23 9 10 9 10 23z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE895"],"defaultCode":59541,"grid":64},"attrs":[],"properties":{"id":56,"order":179,"ligatures":"","prevSize":64,"code":59541,"name":"uniE895"},"setIdx":0,"setId":1,"iconIdx":58},{"icon":{"paths":["M192 251q0-52 21-98 20-45 56-79 35-34 81-54t98-20q51 0 98 20 46 19 81 53t56 80 21 98q0 33-6 63-7 30-22 59-68 11-127 46 44-28 67-71 24-44 24-96 0-39-15-73-16-34-42-60-26-25-61-40t-74-15q-40 0-75 15t-61 41-41 61-15 75q0 38 15 73 14 35 40 62 25 26 60 41 34 16 73 16 27 0 52-6 24-6 48-20-58 35-99 90h-1q-50 0-96-20-45-20-80-55-35-34-55-80-21-45-21-96v-10zM448 736q0-59 23-112 22-52 61-91t92-62q52-23 112-23 39 0 76 10t69 29 58 45q27 27 46 59 18 32 29 69 10 36 10 76 0 59-23 112-22 52-61 91t-92 62q-52 23-112 23t-112-22q-53-23-92-62t-61-91q-23-53-23-113zM0 702q0-25 10-48t28-40q17-17 40-28 22-10 47-10h279q-6 15-13 31-6 16-10 33h-253q-13 0-25 5-11 5-20 14-9 8-14 20-5 11-5 25 0 50 17 89 16 38 45 67 29 28 67 48 37 19 80 30 42 12 86 17t85 5q13 17 28 33 15 15 33 29-14 1-28 1-14 1-29 1-65 0-131-9t-126-36q-44-20-79-48-35-27-60-61-25-35-38-77-14-42-14-91zM768 768h96q13 0 22-9 10-10 10-23t-9-22q-10-10-23-10h-96v-96q0-13-9-22-10-10-23-10t-22 9q-10 10-10 23v96h-96q-13 0-22 9-10 10-10 23t9 22q10 10 23 10h96v96q0 13 9 22 10 10 23 10t22-9q10-10 10-23v-96z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE8FA"],"defaultCode":59642,"grid":64},"attrs":[],"properties":{"id":57,"order":180,"ligatures":"","prevSize":64,"code":59642,"name":"uniE8FA"},"setIdx":0,"setId":1,"iconIdx":59},{"icon":{"paths":["M0 1024v0 0 0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uni0000"],"defaultCode":59648,"grid":64},"attrs":[],"properties":{"id":58,"order":181,"prevSize":64,"code":59648,"name":"uni0000"},"setIdx":0,"setId":1,"iconIdx":60},{"icon":{"paths":["M0 1024v0 0 0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uni0001"],"defaultCode":59649,"grid":64},"attrs":[],"properties":{"id":59,"order":182,"prevSize":64,"code":59649,"name":"uni0001"},"setIdx":0,"setId":1,"iconIdx":61},{"icon":{"paths":["M0 1024v0 0 0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE900"],"defaultCode":59650,"grid":64},"attrs":[],"properties":{"id":60,"order":183,"prevSize":64,"code":59650,"name":"uniE900"},"setIdx":0,"setId":1,"iconIdx":62},{"icon":{"paths":["M0 1024v0 0 0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE901"],"defaultCode":59651,"grid":64},"attrs":[],"properties":{"id":61,"order":184,"ligatures":"","prevSize":64,"code":59651,"name":"uniE901"},"setIdx":0,"setId":1,"iconIdx":63},{"icon":{"paths":["M486 1024h-486v-486h486v486zM1024 1024h-486v-486h486v486zM486 486h-486v-486h486v486zM1024 486h-486v-486h486v486z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE902"],"defaultCode":59652,"grid":64},"attrs":[],"properties":{"id":62,"order":185,"ligatures":"","prevSize":64,"code":59652,"name":"uniE902"},"setIdx":0,"setId":1,"iconIdx":64},{"icon":{"paths":["M522 439v175h291q-5 29-22 67-18 38-52 72t-88 58q-53 24-129 24-65 0-123-25-58-26-101-69-43-44-68-103t-25-126 25-126 68-102q43-44 101-70 58-25 123-25 75 0 125 25 51 26 79 54l139-134q-33-31-72-56-38-25-81-42-43-18-90-27-48-9-100-9-106 0-199 40t-162 109q-70 70-111 164-40 93-40 199t40 199q41 94 110 163 70 70 163 110t199 40q111 0 202-37 90-37 154-103 65-67 101-159 35-92 35-201 0-25-2-45-3-21-6-40h-484z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE903"],"defaultCode":59653,"grid":64},"attrs":[],"properties":{"id":63,"order":186,"ligatures":"","prevSize":64,"code":59653,"name":"uniE903"},"setIdx":0,"setId":1,"iconIdx":65},{"icon":{"paths":["M342.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-233 233.5h434.5q97.5 0 187 37.5 86 36.5 152.5 103t103 152.5q37.5 89.5 37.5 187 0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75q0-84.5-32.5-162-32-74.5-89.5-132t-132-89.5q-77.5-32.5-162-32.5h-434.5l233 233.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_arrow_reply_regular"],"defaultCode":59770,"grid":64},"attrs":[],"properties":{"id":64,"order":188,"ligatures":"","prevSize":64,"code":59770,"name":"ic_fluent_arrow_reply_regular"},"setIdx":0,"setId":1,"iconIdx":66},{"icon":{"paths":["M612 657l293 293q10 11 24 11 13 0 22-10 10-9 10-22 0-14-11-24l-831-831q-10-11-24-11-13 0-22 10-10 9-10 22 0 14 11 24l293 293-5 10-180 59q-16 6-20 24-4 17 8 30l137 137-170 170-8 53 53-8 170-170 137 137q13 12 30 8 18-4 24-20l59-180zM565 610l-4 2q-12 6-16 19l-47 141-246-246 141-47q13-4 19-16l2-4zM813 477l-131 70 47 47 115-62q43-22 50-70t-28-81l-223-225q-14-15-37-23-22-8-45-4-22 4-41 17-18 14-28 32l-62 117 47 47 70-133q8-14 24-16 17-3 27 8l223 225q13 10 9 27-3 16-17 24v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE985"],"defaultCode":59781,"grid":64},"attrs":[],"properties":{"id":65,"order":189,"ligatures":"","prevSize":64,"code":59781,"name":"uniE985"},"setIdx":0,"setId":1,"iconIdx":67},{"icon":{"paths":["M256 193q-27 0-45 18t-18 45v512q0 27 18 45t45 18v-223q0-41 28-68 27-28 68-28h320q41 0 68 28 28 27 28 68v223q27 0 45-18t18-45v-408q0-26-18-45l-104-104q-19-18-45-18h-23v96q0 39-29 66-28 28-67 28h-129q-39 0-68-28-29-27-29-66v-96h-63zM385 193v96q0 12 9 21t22 9h129q12 0 21-9t9-21v-96h-190zM705 831v-223q0-14-10-23-9-10-23-10h-320q-14 0-23 10-10 9-10 23v223h386zM129 256q0-53 37-90t90-37h408q53 0 92 37l102 102q37 39 37 92v408q0 53-37 90t-90 37h-512q-53 2-90-36t-37-91v-512z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEA43"],"defaultCode":59971,"grid":64},"attrs":[],"properties":{"id":66,"order":190,"ligatures":"","prevSize":64,"code":59971,"name":"uniEA43"},"setIdx":0,"setId":1,"iconIdx":68},{"icon":{"paths":["M432 96q-92 0-169 45t-122 122-45 169 45 169 122 122 169 45q121 0 213-78l227 230q11 8 24 8t23-9q9-10 9-23t-8-24l-230-227q39-45 59-99 19-54 19-114 0-92-45-169t-122-122-169-45v0zM160 432q0-74 37-136 36-63 99-99 62-37 136-37t136 37q63 36 100 99 37 62 37 136t-37 136q-37 63-100 100-62 37-136 37t-136-37q-63-37-99-100-37-62-37-136v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEA7D"],"defaultCode":60029,"grid":64},"attrs":[],"properties":{"id":67,"order":191,"ligatures":"","prevSize":64,"code":60029,"name":"uniEA7D"},"setIdx":0,"setId":1,"iconIdx":69},{"icon":{"paths":["M76 72q16-15 35-4l831 415q19 9 19 29t-19 29l-831 415q-19 11-35-4-17-14-10-32l124-408-124-408q-7-18 10-32v0zM248 545l-98 321 706-354-706-354 98 321h360q13 0 23 10 10 11 10 23t-10 23q-10 10-23 10h-360z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEA8E"],"defaultCode":60046,"grid":64},"attrs":[],"properties":{"id":68,"order":192,"ligatures":"","prevSize":64,"code":60046,"name":"uniEA8E"},"setIdx":0,"setId":1,"iconIdx":70},{"icon":{"paths":["M288 576q-13 0-22.5 9.25t-9.5 22.75v128q0 13.5 9.5 22.75t22.75 9.25 22.5-9.25 9.25-22.75v-10.5h21.5q20 0 37.25-10t27.25-27.25 10-37.5-10-37.5-27.25-27.25-37.25-10h-53.5zM341.5 661.5h-21.5v-21.5h21.5q4.5 0 7.5 3.25t3 7.5-3 7.5-7.5 3.25zM640 608q0-13.5 9.5-22.75t22.5-9.25h64q13 0 22.5 9.25t9.5 22.75-9.5 22.75-22.5 9.25h-32v21.5h32q13 0 22.5 9.25t9.5 22.5-9.5 22.75-22.5 9.5h-32v10.5q0 13-9.25 22.5t-22.5 9.5-22.75-9.25-9.5-22.75v-128zM480 576q-13.5 0-22.75 9.25t-9.25 22.75v128q0 13.5 9.25 22.75t22.75 9.25h32q26 0 48-13t35-35 13-48-13-48-35-35-48-13h-32zM512 704v-64q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25zM128 128q0-35 17.25-64.25t46.75-46.5 64-17.25h293.5q19 0 36.75 7.25t31.25 20.75l250.5 250.5q13.5 13.5 20.75 31.25t7.25 36.75v106.5q28.5 10.5 46.25 35.25t17.75 55.25v256.5q0 31-17.75 55.75t-46.25 34.75v5.5q0 35-17.25 64.25t-46.5 46.5-64.25 17.25h-512q-34.5 0-64-17.25t-46.75-46.5-17.25-64.25v-5.5q-28.5-10-46.25-34.75t-17.75-55.75v-256.5q0-30.5 17.75-55.25t46.25-35.25v-325zM832 384h-224q-26 0-48-13t-35-35-13-48v-224h-256q-17.5 0-32 8.5t-23.25 23.25-8.75 32.25v319.5h640v-63.5zM192 896q0 17.5 8.75 32.25t23.25 23.25 32 8.5h512q17.5 0 32.25-8.5t23.25-23.25 8.5-32.25h-640zM576 77.5v210.5q0 13.5 9.5 22.75t22.5 9.25h211zM160 511.5q-13 0-22.5 9.5t-9.5 22.5v256.5q0 13 9.5 22.5t22.5 9.5h704q13 0 22.5-9.5t9.5-22.5v-256.5q0-13-9.5-22.5t-22.5-9.5h-704z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_document_pdf_regular"],"defaultCode":60048,"grid":64},"attrs":[],"properties":{"id":69,"order":193,"ligatures":"","prevSize":64,"code":60048,"name":"ic_fluent_document_pdf_regular"},"setIdx":0,"setId":1,"iconIdx":71},{"icon":{"paths":["M128 192v-4q0-39 15-73 16-34 42-60 27-25 62-40 34-15 73-15 40 0 75 15t61 41 41 61 15 75-15 75-41 61-61 41-75 15-75-15-61-41-41-61-15-75zM448 192v-2q0-26-10-49-11-23-28-40-18-17-41-27t-49-10-50 10q-23 10-40 28-17 17-28 40-10 24-10 50t10 50q10 23 28 40 17 17 40 28 23 10 50 10 26 0 49-10 24-10 41-28 17-17 28-40 10-23 10-50zM640 317q0-25 10-48 11-23 28-40 18-17 41-27t49-10 49 10q24 10 41 28 17 17 28 40 10 24 10 50 0 25-10 49-10 23-27 40-17 18-40 28-22 11-48 11-28 0-52-10t-41-27q-18-18-28-42-10-23-10-52zM832 320q0-13-5-25-5-11-14-20-8-9-20-14t-25-5-25 5q-11 5-20 14-9 8-14 20-5 11-5 25 0 13 5 25t13 20q9 9 21 14 11 5 25 5 13 0 25-5 11-5 20-14 9-8 14-20 5-11 5-25zM515 384q25 0 48 10 23 11 40 28 17 18 27 41t10 49-10 50q-10 23-27 41-17 17-41 27-23 10-50 10-25 0-49-10-23-10-40-27-18-17-28-40-11-22-11-48 0-28 10-52t27-41q18-18 42-28 23-10 52-10zM96 448h235q-11 30-11 64h-224q-11 0-17 4-7 4-10 11t-4 15-1 17v17q0 30 11 57 12 26 31 48t44 39q24 17 51 27-5 16-7 32t-2 33q-37-12-72-34-35-23-61-53-27-30-43-67t-16-79v-35q0-19 7-37 8-17 21-31 13-13 31-20 17-8 37-8zM517 576q12 0 23-6 11-5 19-14t12-21q5-11 5-23 0-13-5-25-5-11-14-20-8-9-20-14t-25-5-25 5q-11 5-20 14-9 8-14 20-5 11-5 25 0 15 5 27 6 12 15 20t22 13q13 4 27 4zM832 800q0-19-4-38 29-6 53-20 25-13 42-32 18-20 27-45 10-26 10-57 0-13-9-22-10-10-23-10h-235q11-30 11-64h224q19 0 37 7 17 8 31 21 13 13 20 31 8 17 8 37 0 45-14 81-14 37-40 65-25 27-61 46-35 18-78 26 0-6 1-13v-13zM256 800q0-20 7-37 8-18 21-31t30-20q18-8 38-8h320q20 0 37 7 18 8 31 21t20 30q8 18 8 38 0 55-21 97-21 41-56 70-35 28-82 42-46 15-97 15t-97-14q-47-14-82-43-35-28-56-70t-21-97zM704 800q0-13-9-22-10-10-23-10h-320q-13 0-22 9-10 10-10 23 0 41 16 72 16 30 43 49 26 20 61 29 34 10 72 10 37 0 72-9 34-10 61-29 27-20 43-50t16-72z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEBDA"],"defaultCode":60378,"grid":64},"attrs":[],"properties":{"id":70,"order":194,"ligatures":"","prevSize":64,"code":60378,"name":"uniEBDA"},"setIdx":0,"setId":1,"iconIdx":72},{"icon":{"paths":["M502 193q112 10 194 87 82 76 98 188 15 112-42 208-58 96-163 136-106 40-212 4-107-36-168-130 84-22 147-68 82-61 119-159 45-123 27-266v0zM862 512q-2-78-32-150-29-71-86-125-56-55-129-83-72-29-152-25-14 0-24 11-9 12-5 26 27 147-18 270-35 92-119 146-61 36-143 51-15 4-22 17-7 14-1 28 39 80 108 134 68 54 153 74 85 19 171 0 86-20 154-74 67-54 106-133t37-167h2z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEE44"],"defaultCode":60996,"grid":64},"attrs":[],"properties":{"id":71,"order":195,"ligatures":"","prevSize":64,"code":60996,"name":"uniEE44"},"setIdx":0,"setId":1,"iconIdx":73},{"icon":{"paths":["M449 289q0-15-10-24-9-9-22-9-14 0-24 9t-10 24v94h-94q-15 0-24 10t-9 24q0 13 9 22 9 10 24 10h96v96q0 12 9 21t23 9q13 0 22-9 10-9 10-21v-96h96q12 0 21-10 9-9 9-22 0-14-9-24t-21-10h-96v-94zM416 705q100 0 180-64l246 246q8 10 21 10 14 0 24-10t10-24q0-13-10-21l-246-246q64-80 64-180 0-101-63-179-62-79-161-102-98-22-189 22t-135 134-22 188q23 99 102 162 78 64 179 64v0zM416 193q61 0 112 29 52 30 81 81 30 51 31 113 1 61-30 112-30 52-82 81-51 30-112 30-62 0-113-30-51-29-81-81-29-51-29-112 0-62 29-113 30-51 81-81 51-29 113-29v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEE8E"],"defaultCode":61070,"grid":64},"attrs":[],"properties":{"id":72,"order":196,"ligatures":"","prevSize":64,"code":61070,"name":"uniEE8E"},"setIdx":0,"setId":1,"iconIdx":74},{"icon":{"paths":["M432 209v14h160v-14q0-35-24-58-23-24-56-24t-56 24q-24 23-24 58v0zM369 223v-14q0-62 42-104t101-42 101 42 42 104v14h242q12 0 22 10 9 11 9 23t-9 23q-10 10-22 10h-49l-62 528q-6 62-51 103t-106 41h-234q-61 0-106-41t-51-103l-62-528h-47q-14 0-24-10-9-11-9-23t9-23q10-10 22-10h242zM301 811q4 37 31 60 26 24 63 24h234q37 0 63-24 27-23 31-60l61-522h-542zM416 399q14 0 23 10 10 9 10 23v320q0 14-10 23-9 9-22 9-14 0-24-9t-10-23v-320q2-14 11-23 9-10 22-10v0zM641 432q0-14-10-23-10-10-24-10-13 0-22 10-10 9-10 23v320q0 14 10 23 9 9 22 9 14 0 24-9t10-23v-320z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEEA6"],"defaultCode":61094,"grid":64},"attrs":[],"properties":{"id":73,"order":197,"ligatures":"","prevSize":64,"code":61094,"name":"uniEEA6"},"setIdx":0,"setId":1,"iconIdx":75},{"icon":{"paths":["M258 303q-43 25-90 15-47-9-77-48t-26-87q3-48 36-82 34-33 82-36 48-4 87 26t48 77q10 47-15 88l143 145q31-18 66-18t66 18l143-145q-25-41-15-88 9-47 48-77t87-26q48 3 82 36 33 34 36 82 4 48-26 87t-77 48q-47 10-90-15l-143 143q18 31 18 66t-18 66l145 143q41-25 88-15 47 9 77 48t26 87q-3 48-36 82-34 33-82 36-48 4-87-26t-48-77q-10-47 15-90l-143-143q-31 18-66 18t-66-18l-143 143q25 43 15 90-9 47-48 77t-87 26q-48-3-82-36-33-34-36-82-4-48 26-87t77-48q47-10 90 15l143-143q-18-31-17-66t17-66zM256 193q0-27-18-47-19-19-45-19-27 0-46 19-18 20-18 47 0 26 18 45 19 18 46 18 26 0 45-18 18-19 18-45v0zM256 831q0-26-18-45-19-18-45-18-27 0-46 18-18 19-19 45-1 27 18 46 20 18 47 18 26 0 45-18 18-19 18-46v0zM831 256q27 0 47-18 19-19 19-45 0-27-19-47-20-19-47-19-26 0-45 19-18 20-18 47 0 26 18 45 19 18 45 18zM897 831q0-26-19-45-20-18-47-18-26 0-45 18-18 19-18 45 0 27 18 46 19 18 45 18 27 0 47-18 19-19 19-46zM575 512q0-27-18-45t-45-18-45 18-18 45 18 45 45 18 45-18 18-45z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniEEEB"],"defaultCode":61163,"grid":64},"attrs":[],"properties":{"id":74,"order":198,"ligatures":"","prevSize":64,"code":61163,"name":"uniEEEB"},"setIdx":0,"setId":1,"iconIdx":76},{"icon":{"paths":["M139 512q0-102 50-187 51-85 136-136 85-50 187-50t187 50q85 51 136 136 50 85 50 187t-50 187q-51 85-136 136-85 50-187 50t-187-50q-85-51-136-136-50-85-50-187zM512 86q-117 0-214 57-97 58-155 155-57 97-57 214t57 214q58 97 155 155 97 57 214 57t214-57q97-58 155-155 57-97 57-214t-57-214q-58-97-155-155-97-57-214-57v0zM512 575q27 0 45-18t18-45-18-45-45-18-45 18-18 45 18 45 45 18zM385 512q0 27-19 45-20 18-47 18-26 0-45-18-18-18-18-45t18-45q19-18 45-18 27 0 46 18 18 18 18 45h2zM705 575q26 0 45-18 18-18 18-45t-18-45q-19-18-45-18-27 0-46 18-18 18-18 45t18 45q19 18 46 18z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF0F4"],"defaultCode":61684,"grid":64},"attrs":[],"properties":{"id":75,"order":199,"ligatures":"","prevSize":64,"code":61684,"name":"uniF0F4"},"setIdx":0,"setId":1,"iconIdx":77},{"icon":{"paths":["M512 127q0-16-12-29-13-12-30-12t-31 12q-13 13-13 29v299h-297q-18 0-31 13-12 14-12 31t12 30q13 12 29 12h299v299q0 16 13 30 14 13 31 13t30-13q12-14 12-30v-299h299q16 0 30-12 13-13 13-30t-13-31q-14-13-30-13h-299v-299z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF107"],"defaultCode":61703,"grid":64},"attrs":[],"properties":{"id":76,"order":200,"ligatures":"","prevSize":64,"code":61703,"name":"uniF107"},"setIdx":0,"setId":1,"iconIdx":78},{"icon":{"paths":["M512 150q-68 0-126 32-58 33-93 92-37 64-37 142v178l-55 131h624l-57-131v-92q0-15 9-24t23-9q13 0 22 9t9 24v78l60 135q12 26-4 50-17 23-45 23h-201q-2 54-39 91-37 36-90 36t-90-36q-37-37-39-91h-199q-28 0-45-23-16-24-4-50l58-135v-164q0-97 45-174 43-74 116-115 74-41 158-41 55 0 106 18 13 5 18 16t1 23q-4 13-15 19-12 6-24 2-43-14-86-14v0zM512 854q27 0 45-19 18-20 18-47h-126q0 27 18 47 18 19 45 19v0zM651 299h-110q-15 2-22 11t-7 23q0 13 9 21t24 8h43l-72 103q-8 16 1 32 9 15 28 15h110q13-2 21-12 8-11 7-23t-10-20-22-8h-45l74-103q8-16-1-32-9-15-28-15v0zM907 86h-153q-13 2-21 11t-7 22q1 12 10 21 9 10 22 10h90l-119 188q-8 16 1 32 9 15 28 15l153-2q13 0 21-10 8-11 7-23t-10-21q-9-10-22-10h-92l121-188q8-16-2-31-10-14-27-14z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF11D"],"defaultCode":61725,"grid":64},"attrs":[],"properties":{"id":77,"order":201,"ligatures":"","prevSize":64,"code":61725,"name":"uniF11D"},"setIdx":0,"setId":1,"iconIdx":79},{"icon":{"paths":["M238 512l172 172q8 8 9 21 1 12-7 22-9 10-21 11t-22-5l-234-233-4-8-2-13v6-8l2-10 6-8 228-228q8-8 20-9t22 7q9 9 11 21t-6 22l-174 177h274q111 0 197 38 86 39 135 109t51 160l2 12q0 12-10 23-10 10-24 10-13 0-22-10-10-11-10-23 0-111-81-181-82-71-222-75h-290l172 172z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF176"],"defaultCode":61814,"grid":64},"attrs":[],"properties":{"id":78,"order":202,"ligatures":"","prevSize":64,"code":61814,"name":"uniF176"},"setIdx":0,"setId":1,"iconIdx":80},{"icon":{"paths":["M600 231q8 9 9 20t-5 21l-174 177h82q111 0 197 38 86 39 135 109t51 160l2 12q0 12-10 23-10 10-24 10-13 0-22-10-10-11-10-23 0-111-81-181-82-71-222-75h-98l170 172q10 8 10 21 0 12-8 22t-20 11q-13 1-23-5l-235-237-2-9-3-10 3-10 6-8 227-228q10-10 24-10 13 0 21 10v0zM137 457l223-224q11-8 23-9t21 7q10 9 12 21t-6 22l-205 205 203 203q8 8 8 20 0 13-7 22-8 9-20 11t-22-4l-230-229q-8-8-9-20-1-11 5-19l227-230z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF17A"],"defaultCode":61818,"grid":64},"attrs":[],"properties":{"id":79,"order":203,"ligatures":"","prevSize":64,"code":61818,"name":"uniF17A"},"setIdx":0,"setId":1,"iconIdx":81},{"icon":{"paths":["M772 64q37 0 72 15 34 15 60 41 25 26 41 60 15 34 15 72v520q0 37-15 72-15 34-41 60-26 25-60 41-34 15-72 15h-520q-37 0-72-15-34-15-60-41-25-26-41-60-15-34-15-72v-520q0-37 15-72 15-34 41-60 26-25 60-41 34-15 72-15h520zM253 128q-24 0-47 10t-40 28q-17 17-28 40-10 22-10 47v3h768v-2q0-25-10-48t-28-40q-17-17-40-28-22-10-47-10h-518zM771 896q24 0 47-10t40-28q17-17 28-40 10-22 10-47v-451h-768v450q0 25 10 48t28 40q17 17 40 28 22 10 47 10h518zM651 458q0 19 6 38 6 18 17 34t26 28 34 19q1 7 1 15 1 8 1 16v16q-1 7-2 15-19 7-34 19t-26 28q-11 15-17 34-5 18-5 38v12t1 11q-22 19-49 31-19-18-42-28t-50-10q-26 0-50 10-23 9-41 28-28-11-50-30 0-6 1-12v-11q0-20-5-39-6-18-17-34t-26-28-34-19q-1-7-1-15-1-8-1-16v-16q1-7 2-15 18-7 34-19 15-12 26-28 11-15 17-34 5-18 5-38v-12t-1-11q22-19 49-31 18 18 42 28t50 10q25 0 50-10 24-10 41-28 28 11 50 30 0 6-1 12 0 6-1 12zM560 608q0-20-14-34t-34-14-34 14-14 34 14 34 34 14 34-14 14-34z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF259"],"defaultCode":62041,"grid":64},"attrs":[],"properties":{"id":80,"order":204,"ligatures":"","prevSize":64,"code":62041,"name":"uniF259"},"setIdx":0,"setId":1,"iconIdx":82},{"icon":{"paths":["M233 628q-50-13-93-43-42-30-74-70-31-41-48-90-18-49-18-101 0-44 11-86 11-41 32-77 20-36 49-66 29-29 65-51 35-21 77-32 41-12 86-12 66 0 125 25 58 25 101 68 44 44 69 102t25 125h-64q0-16-2-32t-6-32h-122q0 16 1 32t1 32q0 32-3 63-2 31-6 63v2h-172q2 14 5 28t7 28v0q-11 31-23 62-11 31-23 62zM266 192h107q-1-10-6-30-4-20-11-40t-16-37q-9-16-19-21h-1q-11 4-20 21-9 16-16 37-6 20-11 40-4 19-7 30zM98 192h103q9-58 31-112-42 15-77 44-34 29-57 68zM542 192q-22-39-57-68-34-29-77-44 21 53 30 112h104zM72 256q-4 16-6 32t-2 32 2 32 6 32h122q0-16-1-32t-1-32 1-32q0-16 1-32h-122zM381 256h-122l-2 32t-1 32 1 32q0 16 1 32h123l2-32t1-32-1-32q0-16-2-32zM1024 416v96q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-64h-384v64q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-96q0-13 9-22 10-10 23-10h192v-34q1-8 5-15 3-6 9-11 7-4 18-4t17 4 10 11q3 7 4 15t1 17v17h192q13 0 22 9 10 10 10 23zM99 448q22 39 56 68 35 28 77 44-21-53-30-112h-103zM1024 672q0 13-9 22-10 10-23 10h-160v128q0 13-5 25-5 11-14 20-8 9-20 14-11 5-25 5h-32q-13 0-22-9-10-10-10-23 0-11 4-17t11-10q7-3 15-4t17-1h17v-128h-160q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h160q0-6 4-15t10-18 12-17 10-14h-132q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h192q13 0 22 9 10 10 10 23 0 9-5 17l-52 79h153q13 0 22 9 10 10 10 23zM560 928q0 13-9 23-9 9-23 9-10 0-18-6-8-5-12-15l-40-107h-148l-40 107q-3 9-12 15-8 6-18 6-13 0-22-9-10-10-10-23 0-7 2-11l48-127q24-65 48-129l48-128q3-10 12-14 8-5 18-5t18 4q8 5 12 14 24 65 47 129 24 64 49 128l48 127q2 5 2 12zM384 635l-50 133h100z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF2B7"],"defaultCode":62135,"grid":64},"attrs":[],"properties":{"id":81,"order":205,"ligatures":"","prevSize":64,"code":62135,"name":"uniF2B7"},"setIdx":0,"setId":1,"iconIdx":83},{"icon":{"paths":["M657 129q50-49 119-50 70-1 119 48t49 119q0 69-49 119l-477 479q-17 16-37 22l-254 92q-12 5-27 1-14-3-23-13t-12-23q-4-14 1-26l92-254q6-20 22-35zM850 174q-31-31-74-31t-74 31l-49 49 146 148 51-52q31-30 31-73t-31-72v0zM754 416l-146-148-383 385q-6 4-8 11l-80 223 223-80q7-2 11-8zM567 127h-471q-14 0-23 10-10 10-10 24 0 13 10 22 9 10 23 10h408zM438 256h-342q-14 0-23 9-10 9-10 23 0 13 10 22 9 9 23 9h279zM311 383h-215q-14 0-23 10-10 10-10 24 0 13 10 22 9 10 23 10h152z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF3BE"],"defaultCode":62398,"grid":64},"attrs":[],"properties":{"id":82,"order":206,"ligatures":"","prevSize":64,"code":62398,"name":"uniF3BE"},"setIdx":0,"setId":1,"iconIdx":84},{"icon":{"paths":["M860 164q-37-37-87-37t-87 37l-473 473q-16 18-25 41l-59 176q-6 18 8 33 15 14 33 8l176-59q23-9 41-25l473-473q37-37 37-87t-37-87v0zM733 209q17-16 41-16 25 0 41 16t16 41q0 24-16 43l-47 45-82-82zM641 301l82 84-381 381q-8 6-16 8l-115 39 39-115q2-8 8-16z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF3DC"],"defaultCode":62428,"grid":64},"attrs":[],"properties":{"id":83,"order":207,"ligatures":"","prevSize":64,"code":62428,"name":"uniF3DC"},"setIdx":0,"setId":1,"iconIdx":85},{"icon":{"paths":["M129 160q0-13 9-23t22-10h704q21 0 29 18 8 19-4 33l-176 238 176 237q12 15 4 33-8 19-29 19h-671v202q0 13-9 21-8 8-20 10h-4q-13 0-22-7t-9-20v-751zM801 193h-608v446h608l-154-205q-6-8-6-18t6-19z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF40C"],"defaultCode":62476,"grid":64},"attrs":[],"properties":{"id":84,"order":208,"ligatures":"","prevSize":64,"code":62476,"name":"uniF40C"},"setIdx":0,"setId":1,"iconIdx":86},{"icon":{"paths":["M106 106l768 768q11 11 11 24t-9 23q-10 9-23 9t-24-10l-215-215h-421v202q0 13-9 21-8 8-20 10h-4q-13 0-22-7t-9-20v-692l-68-67q-12-13-8-31 4-19 23-23 18-4 30 8v0zM219 127h645q21 0 29 18 8 19-4 33l-176 238 176 237q12 15 4 33-8 19-29 19h-69l-64-66h70l-154-205q-6-8-6-18t6-19l154-204h-518zM193 283v358l356-2z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF40F"],"defaultCode":62479,"grid":64},"attrs":[],"properties":{"id":85,"order":209,"ligatures":"","prevSize":64,"code":62479,"name":"uniF40F"},"setIdx":0,"setId":1,"iconIdx":87},{"icon":{"paths":["M805 193q47 0 80 32 33 33 33 78v418q0 45-33 78-33 32-80 32h-586q-47 0-80-32-33-33-33-78v-418q0-45 33-78 33-32 80-32h586zM864 391l-340 187q-10 6-22 2l-342-189v330q0 22 17 40 18 17 42 17h586q24 0 42-17 17-18 17-40v-330zM805 246h-586q-24 0-42 17-17 18-17 40v27l352 194 352-194v-27q0-22-17-40-18-17-42-17v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF509"],"defaultCode":62729,"grid":64},"attrs":[],"properties":{"id":86,"order":210,"ligatures":"","prevSize":64,"code":62729,"name":"uniF509"},"setIdx":0,"setId":1,"iconIdx":88},{"icon":{"paths":["M795 111q49 0 84 34 34 35 34 84v566q0 49-34 84-35 34-84 34h-566q-49 0-84-34-34-35-34-84v-566q0-49 34-84 35-34 84-34h566zM164 795q0 26 19 46 20 19 46 19h566q26 0 46-19 19-20 19-46v-191h-194q-11 53-52 89t-94 38h-8q-55 0-97-34-42-33-55-87l-2-6h-194v191zM795 164h-566q-26 0-46 19-19 20-19 46v320h221q10 0 17 6 8 6 10 16v4q0 27 13 51 13 23 37 37 23 13 50 13t50-13q24-14 37-37 13-24 13-51 0-10 8-17 7-7 17-9h223v-320q0-26-19-46-20-19-46-19z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF516"],"defaultCode":62742,"grid":64},"attrs":[],"properties":{"id":87,"order":211,"ligatures":"","prevSize":64,"code":62742,"name":"uniF516"},"setIdx":0,"setId":1,"iconIdx":89},{"icon":{"paths":["M133 348l363-215q14-8 28-2l367 217q20 12 33 33 12 20 14 43v334q0 55-38 95t-93 42h-584q-55 2-95-36t-42-93v-336q0-22 10-43 10-20 31-35l369-219zM874 465l-348 182q-12 6-24 2l-352-184v293q0 28 19 50 19 21 48 23h584q28 0 50-19 21-19 23-48v-299zM512 197l-346 206 346 179 346-181z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF522"],"defaultCode":62754,"grid":64},"attrs":[],"properties":{"id":88,"order":212,"ligatures":"","prevSize":64,"code":62754,"name":"uniF522"},"setIdx":0,"setId":1,"iconIdx":90},{"icon":{"paths":["M918 332q32-15 50-45 17-31 12-67t-31-61q-25-26-61-30t-67 13q-30 18-45 51-10 26-7 52 3 25 16 47 14 21 36 35 23 13 47 14 25 1 50-9v0zM219 193h502q-8 26-6 53h-496q-24 0-42 17-17 18-17 40v27l352 194 279-153q32 20 69 22l-336 185q-10 6-22 2l-342-189v330q0 22 17 40 18 17 42 17h586q24 0 42-17 17-18 17-40v-326q27 0 54-6v332q0 45-33 78-33 32-80 32h-586q-47 0-80-32-33-33-33-78v-418q0-45 33-78 33-32 80-32v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF529"],"defaultCode":62761,"grid":64},"attrs":[],"properties":{"id":89,"order":213,"ligatures":"","prevSize":64,"code":62761,"name":"uniF529"},"setIdx":0,"setId":1,"iconIdx":91},{"icon":{"paths":["M256 332q0-10 7-18 7-7 20-7h358q10 0 17 7 8 8 8 19t-8 18q-7 7-17 7h-358q-13 0-20-7t-7-17v-2zM539 461q-13 0-20 7t-7 18q0 12 7 19t18 7h104q10 0 17-7 8-7 8-19 0-11-8-18-7-7-17-7h-102zM512 639q0-10 7-17 7-8 18-8h104q10 0 17 8 8 7 8 18t-8 18q-7 8-17 8h-102q-13 0-20-8-7-7-7-17v-2zM283 461q-13 0-20 7t-7 17v154q0 12 7 19 7 8 20 8h153q10 0 18-8 7-7 7-17v-156q0-10-7-17-8-7-18-7h-153zM307 614v-102h103v102h-103zM102 256q0-43 30-73 30-29 73-29h512q43 0 73 29 29 30 29 73v51q43 0 73 30t30 73v280q0 53-38 91t-91 38h-562q-53 0-91-38t-38-89v-436zM768 256q0-20-15-36-16-15-36-15h-512q-21 0-36 15-15 16-15 36v434q0 33 22 55 23 23 55 23h564q30 0 53-23 22-22 22-55v-280q0-21-15-36-15-16-36-16v332q0 12-7 20-7 7-18 7-12 0-19-7-7-8-7-18v-436z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF565"],"defaultCode":62821,"grid":64},"attrs":[],"properties":{"id":90,"order":214,"ligatures":"","prevSize":64,"code":62821,"name":"uniF565"},"setIdx":0,"setId":1,"iconIdx":92},{"icon":{"paths":["M506 117q12 0 19 8t7 18v336h336q13 0 20 8 7 9 8 20t-7 18-21 7h-336v336q0 13-7 20t-18 7-20-7q-8-7-8-20v-336h-336q-10 0-18-7t-8-18 8-20q8-8 18-8h336v-336q0-10 8-18 9-8 19-8z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF598"],"defaultCode":62872,"grid":64},"attrs":[],"properties":{"id":91,"order":215,"ligatures":"","prevSize":64,"code":62872,"name":"uniF598"},"setIdx":0,"setId":1,"iconIdx":93},{"icon":{"paths":["M682 150l-137 139q-13 10-13 25 0 16 13 28l137 137q12 10 27 13h2q14-3 24-13l139-137q11-12 11-28 0-15-11-25l-139-139q-10-11-25-11-16 0-28 11zM618 492l-86-86v86h86zM532 223l113-110q27-27 65-27t64 27l137 137q27 26 27 64t-27 65l-110 113h4q39 0 65 26 27 27 25 64v223q2 39-25 65-26 27-65 25h-586q-39 0-65-26-27-25-27-64v-586q2-39 28-65 25-27 64-25h223q37-2 64 25 26 26 26 65v4zM709 545h-177v297h273q16 0 26-11 11-10 11-26v-223q0-17-11-27-10-10-26-10h-96zM182 219v273h297v-273q0-16-10-26-10-11-27-11h-223q-16 0-26 11-11 10-11 26v0zM182 545v260q0 16 11 26 10 11 26 11h260v-297h-297z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF599"],"defaultCode":62873,"grid":64},"attrs":[],"properties":{"id":92,"order":216,"ligatures":"","prevSize":64,"code":62873,"name":"uniF599"},"setIdx":0,"setId":1,"iconIdx":94},{"icon":{"paths":["M512 154q-33 0-54 22-22 23-22 54 0 32 22 55 21 22 54 22t55-22q23-23 23-55 0-31-23-54-22-22-55-22zM385 229q0-51 37-89t90-38 90 38 38 90q1 53-37 91-38 37-91 37t-90-37q-37-38-37-92v0zM795 205q-23 0-38 15-16 16-15 36t16 36q14 15 36 15 21 0 36-15 16-16 15-36t-16-36q-14-15-34-15zM692 256q0-43 30-73 30-29 72-29t71 29q30 30 30 73t-30 73q-29 29-71 29t-72-29q-30-30-30-73zM180 256q0-20 15-36 14-15 35-15 22 0 37 15 16 16 15 36t-16 36q-14 15-36 15-21 0-35-15-15-16-15-36zM231 154q-43 0-73 29-31 30-30 73t31 73q29 29 71 29t73-29q31-30 31-73t-31-73q-31-29-72-29v0zM262 768q-45 2-77-29-31-30-31-73v-193q0-4 4-8t8-4h90q4-29 18-51h-108q-27 0-45 18-19 18-19 45v193q0 32 14 63 13 31 39 52 25 22 57 32t64 4q-10-22-14-49zM748 817q32 6 64-4t57-32q26-21 39-52 14-31 14-63v-193q0-27-19-45-18-18-45-18h-108q14 22 18 51h90q4 0 8 4t4 8v193q0 43-31 73-32 31-75 29-6 27-16 49v0zM371 410q-27 0-45 18-19 18-19 45v244q0 55 28 102 27 47 75 75 47 28 102 28t102-28q48-28 75-75 28-47 28-102v-244q0-27-19-45-18-18-45-18h-282zM358 473q0-4 4-8 5-4 9-4h282q4 0 9 4 4 4 4 8v244q0 63-45 108-46 45-109 45t-109-45q-45-45-45-108v-244z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF5B8"],"defaultCode":62904,"grid":64},"attrs":[],"properties":{"id":93,"order":217,"ligatures":"","prevSize":64,"code":62904,"name":"uniF5B8"},"setIdx":0,"setId":1,"iconIdx":95},{"icon":{"paths":["M608 575q39 0 68 29t29 68v33q0 63-39 122-39 60-109 95-76 39-173 39t-173-39q-70-35-109-95-39-59-39-122v-33q0-39 29-68t68-29h448zM608 639h-448q-13 0-22 10t-9 23v33q0 47 30 91 29 44 85 70 61 29 140 29t140-29q56-26 86-70 31-44 31-91v-33q0-13-10-23t-23-10v0zM385 160q72 0 123 51t51 125-51 125-124 51-124-51-51-125 51-125 125-51v0zM385 223q-47 0-80 33t-33 80 33 80 79 33 79-33 33-80-33-80-80-33h2zM690 70l4 4 107 104 104-104q10-11 24-11 13 0 22 10 10 9 10 22 0 14-11 24l-104 104 104 107q8 8 9 19 2 11-5 22l-4 4q-8 8-19 9t-22-5l-108-111-107 107q-12 12-30 8-19-4-23-23-4-18 8-30l107-107-107-104q-8-8-9-20-1-11 5-21l4-4q8-8 18-9 9-2 19 3z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF5D0"],"defaultCode":62928,"grid":64},"attrs":[],"properties":{"id":94,"order":218,"ligatures":"","prevSize":64,"code":62928,"name":"uniF5D0"},"setIdx":0,"setId":1,"iconIdx":96},{"icon":{"paths":["M688 123q-22-23-51-32t-58-5q-30 4-56 22-25 17-40 44l-129 241-198 80q-23 8-27 31-4 22 12 39l140 139-183 184-12 72 72-12 184-183 139 140q17 16 39 12 23-4 31-27l80-198 241-129q27-15 44-40 18-26 22-56 4-29-5-58t-32-49zM559 193q10-19 32-22 21-3 36 11l215 215q14 15 11 36-3 22-22 32l-253 137q-15 8-21 23l-61 153-250-250 153-61q15-6 23-21z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF5FF"],"defaultCode":62975,"grid":64},"attrs":[],"properties":{"id":95,"order":219,"ligatures":"","prevSize":64,"code":62975,"name":"uniF5FF"},"setIdx":0,"setId":1,"iconIdx":97},{"icon":{"paths":["M416 127q-13 0-22 10t-9 24q0 13 9 22 9 10 22 10h63v638h-63q-13 0-23 10-10 9-9 22 1 14 10 23t22 9h192q13 0 23-9t10-23q0-13-10-22-10-10-23-10h-63v-638h63q13 0 23-10 10-9 10-22 0-14-10-24t-23-10h-192zM256 256h160v63h-160q-27 0-45 20-18 19-18 46v254q0 27 18 46 18 20 45 20h160v63h-160q-53 0-90-38t-37-91v-256q0-51 37-89t90-38zM768 705h-160v63h160q53 0 90-38t37-91v-256q2-51-36-89t-91-38h-160v63h160q27 0 45 20 18 19 18 46v254q0 27-18 46-18 20-45 20v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF668"],"defaultCode":63080,"grid":64},"attrs":[],"properties":{"id":96,"order":220,"ligatures":"","prevSize":64,"code":63080,"name":"uniF668"},"setIdx":0,"setId":1,"iconIdx":98},{"icon":{"paths":["M451 131q8-16 25-27 18-10 37-10t36 10q16 11 24 27l95 193 213 30q18 4 33 17 16 12 22 30 6 19 1 38-5 20-19 32l-154 150 37 210q4 21-4 38-9 18-24 30t-35 13q-19 1-36-7l-190-100-190 100q-17 8-36 7-20-1-35-13t-24-30q-8-17-4-38l37-210-154-150q-14-12-19-32-5-19 1-38 6-18 22-30 15-13 33-17l213-30zM512 201l-84 170q-16 30-51 37l-187 26 136 131q26 27 20 62l-33 186 168-88q31-16 64 0l166 88-31-186q-6-35 18-62l136-131-187-26q-35-7-51-37z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF70D"],"defaultCode":63245,"grid":64},"attrs":[],"properties":{"id":97,"order":221,"ligatures":"","prevSize":64,"code":63245,"name":"uniF70D"},"setIdx":0,"setId":1,"iconIdx":99},{"icon":{"paths":["M727 299q-14 14-35 14-20 0-35-14-14-14-14-35 0-20 14-35 15-14 35-14 21 0 35 14 14 15 14 35 0 21-14 35zM162 586q-37-37-37-90 0-54 37-90l305-304q37-36 90-36l209-3q53 0 91 38t38 92v217q-2 51-39 88l-299 299q-39 37-92 37t-90-37zM207 451q-19 18-19 45 0 26 19 45l213 211q18 18 45 18t45-18l301-299q18-19 18-45l2-215q0-27-19-47-19-19-46-19l-209 2q-27 0-45 18l-303 304h-2zM127 625q-12 34-4 71t35 64l125 125q36 37 84 56 47 20 97 20t97-20q47-19 84-56l223-223q27-27 27-68v-49l-295 295q-57 57-136 57t-136-57l-170-170q-21-21-31-45v0z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF7B6"],"defaultCode":63414,"grid":64},"attrs":[],"properties":{"id":98,"order":222,"ligatures":"","prevSize":64,"code":63414,"name":"uniF7B6"},"setIdx":0,"setId":1,"iconIdx":100},{"icon":{"paths":["M256 512q0-13 9-23 9-9 23-9h192v-192q0-13 9-23 9-9 23-9 13 0 23 9 9 9 9 23v192h192q13 0 23 9 9 9 9 23 0 13-9 23-9 9-23 9h-192v192q0 13-9 23-9 9-23 9-13 0-23-9-9-9-9-23v-192h-192q-13 0-23-9-9-9-9-23zM512 1024q104 0 199-40 92-39 163-110t110-162q40-96 40-200t-40-199q-39-92-110-163t-162-110q-96-40-200-40t-199 40q-92 39-163 110t-110 162q-40 96-40 200t40 199q39 92 110 163t162 110q96 40 200 40zM512 960q-91 0-174-35-81-34-143-96t-96-142q-35-84-35-175t35-174q34-81 96-143t142-96q84-35 175-35t174 35q81 34 143 96t96 142q35 84 35 175t-35 174q-34 81-96 143t-142 96q-84 35-175 35z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uF002A"],"defaultCode":983082,"grid":64},"attrs":[],"properties":{"id":99,"order":223,"ligatures":"","prevSize":64,"code":983082,"name":"uF002A"},"setIdx":0,"setId":1,"iconIdx":101},{"icon":{"paths":["M342.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-265 265.5 265 265.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5zM534.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-233 233.5h242.5q97.5 0 187 37.5 86 36.5 152.5 103t103 152.5q37.5 89.5 37.5 187 0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75q0-84.5-32.5-162-32-74.5-89.5-132t-132-89.5q-77.5-32.5-162-32.5h-242.5l233 233.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_arrow_reply_all_regular"],"defaultCode":983874,"grid":64},"attrs":[],"properties":{"id":100,"order":224,"ligatures":"","prevSize":64,"code":983874,"name":"ic_fluent_arrow_reply_all_regular"},"setIdx":0,"setId":1,"iconIdx":102},{"icon":{"paths":["M832 32q0-13.5-9.25-22.75t-22.75-9.25-22.75 9.25-9.25 22.75v882.5l-137.5-137q-9-9.5-22.5-9.5t-22.75 9.25-9.25 22.75 9.5 22.5l192 192q9 9.5 22.5 9.5t22.5-9.5l192-192q9.5-9 9.5-22.5t-9.25-22.75-22.75-9.25-22.5 9.5l-137.5 137v-882.5zM32 128q-13.5 0-22.75 9.25t-9.25 22.75 9.25 22.75 22.75 9.25h576q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-576zM192 352q0-13.5 9.25-22.75t22.75-9.25h384q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-384q-13.5 0-22.75-9.25t-9.25-22.75zM416 512q-13.5 0-22.75 9.25t-9.25 22.75 9.25 22.75 22.75 9.25h192q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-192z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_arrow_sort_down_lines_regular"],"defaultCode":983946,"grid":64},"attrs":[],"properties":{"id":101,"order":225,"ligatures":"","prevSize":64,"code":983946,"name":"ic_fluent_arrow_sort_down_lines_regular"},"setIdx":0,"setId":1,"iconIdx":103},{"icon":{"paths":["M286 20.5q-4-9.5-12-15t-18-5.5-18 5.5-12 15l-176 448q-4.5 12 0.75 24.25t17.5 17 24.5-0.5 17.25-17.75l42-107.5h208l42 107.5q5 12.5 17.25 17.75t24.5 0.5 17.5-17 0.75-24.25zM256 119.5l79 200.5h-158zM128 576q-13 0-22.5 9.25t-9.5 22.75 9.5 22.75 22.5 9.25h196l-222.5 334.5q-5 7-5.5 16t3.75 16.75 11.75 12.25 16.5 4.5h256q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-196l222.5-334q5-7.5 5.5-16.5t-3.75-16.75-11.75-12.25-16.5-4.5h-256zM800 0q13.5 0 22.75 9.25t9.25 22.75v882.5l137.5-137q9-9.5 22.5-9.5t22.75 9.25 9.25 22.75-9.5 22.5l-192 192q-9 9.5-22.5 9.5t-22.5-9.5l-192-192q-9.5-9-9.5-22.5t9.25-22.75 22.75-9.25 22.5 9.5l137.5 137v-882.5q0-13.5 9.25-22.75t22.75-9.25z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_text_sort_ascending_regular"],"defaultCode":996870,"grid":64},"attrs":[],"properties":{"id":102,"order":226,"ligatures":"","prevSize":64,"code":996870,"name":"ic_fluent_text_sort_ascending_regular"},"setIdx":0,"setId":1,"iconIdx":104},{"icon":{"paths":["M64 544q0-57.5 15-110.5t42-99.25 65-84.25 84.25-65 99.25-42 110.5-15 110.5 15 99.25 42 84.25 65 65 84.25 42 99.25 15 110.5-15 110.5-42 99.25-65 84.25-84.25 65-99.25 42-110.5 15-110.5-15-99.25-42-84.25-65-65-84.25-42-99.25-15-110.5zM705 273.5q-47.5-40-105.25-60.75t-119.75-20.75q-48.5 0-93.5 12.5t-84 35.5-71.25 55.25-55.25 71.25-35.5 84-12.5 93.5q0 62 20.75 119.75t60.75 105.25zM832 544q0-62-20.75-119.75t-60.75-105.25l-495.5 495.5q47.5 40 105.25 60.75t119.75 20.75q48.5 0 93.5-12.5t84-35.5 71.25-55.25 55.25-71.25 35.5-84 12.5-93.5z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniF140"],"defaultCode":61760,"grid":64},"attrs":[],"properties":{"id":103,"order":157,"ligatures":"","prevSize":64,"code":61760,"name":"uniF140"},"setIdx":0,"setId":1,"iconIdx":105},{"icon":{"paths":["M0 992q0-13 4.25-27t7.25-26.5q11.5-47.5 24-94t24-94q-29.5-55-44.5-115t-15-122.5q0-70.5 18.25-136.25t51.5-122.75 80-103.75 103.75-80.25 122.5-51.75 136-18.25 135.75 18.25 122.25 51.75 103.75 80 80.25 103.5 51.75 122.25 18.25 135.75q0 70-18.25 135.25t-51.25 122.25-79.5 104-103.25 80.5-121.75 52-135.5 18.5q-62 0-122-14.25t-115-42.75l-238 56q-5 1-7.5 1-13.5 0-22.75-9.25t-9.25-22.75zM510 960q62 0 119.5-16t107.5-45 91.25-69.75 70.5-90.75 45.25-107.5 16-119.5-16-119.25-45.25-106.75-70.25-90.5-91-70-107.25-45-118.75-16-118.75 16-107 45-90.5 69.75-70 90.25-45.25 106.75-16 118.75q0 32.5 4 60t11.5 53.75 18 52.25 24 54.5q4 8 4 15.5 0 5.5-3 20.5t-8 34.5-10.75 42-11.25 43-10 37.25-6.5 24.75q34-8 67.25-16t67.25-16.5q17-4 35.5-9.5t36-5.5q4 0 7.5 1.25t7.5 2.75q27 12.5 52.25 22.75t50.75 17.25 52.5 11 57.5 4zM352 448q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5h320q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5h-320zM352 640q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5h192q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5h-192z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE15F"],"defaultCode":59581,"grid":64},"attrs":[],"properties":{"id":104,"order":155,"ligatures":"","prevSize":64,"code":59581,"name":"uniE15F"},"setIdx":0,"setId":1,"iconIdx":106},{"icon":{"paths":["M0 395v-203q0-35 17.25-64.25t46.5-46.5 64.25-17.25h768q35 0 64.25 17.25t46.5 46.5 17.25 64.25v512q0 35-17.25 64.25t-46.5 46.5-64.25 17.25h-448v-64h448q17.5 0 32.25-8.5t23.25-23.25 8.5-32.25v-512q0-17.5-8.5-32.25t-23.25-23.25-32.25-8.5h-768q-17.5 0-32.25 8.5t-23.25 23.25-8.5 32.25v144.5q-36.5 24.5-64 58.5zM192 290v-2q0-13.5 9.25-22.75t22.75-9.25h576q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-444q-62-32-132-32-16 0-32 2zM544 512h256q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-256q-13.5 0-22.75-9.25t-9.25-22.75 9.25-22.75 22.75-9.25zM224 800q-61 0-113-30.5-50.5-30-80.5-80.5-30.5-52-30.5-113t30.5-113q30-50.5 80.5-80.5 52-30.5 113-30.5t113 30.5q50.5 30 80.5 80.5 30.5 52 30.5 113t-30.5 113q-30 50.5-80.5 80.5-52 30.5-113 30.5zM64 815.5q35 23.5 75 35.5 41.5 13 85 13t85-13q40-12 75-35.5v176.5q0 12.5-8.25 21.5t-20.5 10.25-22.25-6.25l-90-67q-8.5-6.5-19-6.5t-19 6.5l-90 67q-10 7.5-22.25 6.25t-20.5-10.25-8.25-21.5v-176.5z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_certificate_regular"],"defaultCode":60309,"grid":64},"attrs":[],"properties":{"id":105,"order":156,"ligatures":"","prevSize":64,"code":60309,"name":"ic_fluent_certificate_regular"},"setIdx":0,"setId":1,"iconIdx":107},{"icon":{"paths":["M256 128q-35 0-64.25 17.25t-46.5 46.5-17.25 64.25v512q0 35 17.25 64.25t46.5 46.5 64.25 17.25h512q35 0 64.25-17.25t46.5-46.5 17.25-64.25v-160q0-13.5 9.25-22.75t22.75-9.25 22.75 9.25 9.25 22.75v160q0 52-26 97-25.5 43.5-69 69-45 26-97 26h-512q-52 0-97-26-43.5-25.5-69-69-26-45-26-97v-512q0-52 26-97 25.5-43.5 69-69 45-26 97-26h160q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-160zM576 96q0-13.5 9.25-22.75t22.75-9.25h320q13.5 0 22.75 9.25t9.25 22.75v320q0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75v-242.5l-265.5 265q-9 9.5-22.5 9.5t-22.75-9.25-9.25-22.75 9.5-22.5l265-265.5h-242.5q-13.5 0-22.75-9.25t-9.25-22.75z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["ic_fluent_open_regular"],"defaultCode":59559,"grid":64},"attrs":[],"properties":{"id":106,"order":158,"ligatures":"","prevSize":64,"code":59559,"name":"ic_fluent_open_regular"},"setIdx":0,"setId":1,"iconIdx":108},{"icon":{"paths":["M192 864v-224q0-19.5-7.5-37t-20.75-30.75-30.75-20.75-37-7.5q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5q19.5 0 37-7.5t30.75-20.75 20.75-30.75 7.5-37v-227.5q0-31.5 12.75-60t34-49.75 49.75-34 60-12.75q14.5 0 25 8.25t10.5 23.75q0 13-9.5 22.5t-22.5 9.5q-19.5 0-37 7.5t-30.75 20.75-20.75 30.75-7.5 37v224q0 38-16.75 71.75t-47.25 56.25q30.5 22.5 47.25 56.25t16.75 71.75v224q0 19.5 7.5 37t20.75 30.75 30.75 20.75 37 7.5q13 0 22.5 9.5t9.5 22.5q0 15.5-10.5 23.75t-25 8.25q-32.5 0-61-13t-49.75-35-33.5-51-12.25-61zM640 992q0-13 9.5-22.5t22.5-9.5q19.5 0 37-7.5t30.75-20.75 20.75-30.75 7.5-37v-224q0-38 16.75-71.75t47.25-56.25q-30.5-22.5-47.25-56.25t-16.75-71.75v-224q0-19.5-7.5-37t-20.75-30.75-30.75-20.75-37-7.5q-13 0-22.5-9.5t-9.5-22.5q0-15.5 10.5-23.75t25-8.25q32.5 0 61 13t49.75 35 33.5 51 12.25 61v224q0 19.5 7.5 37t20.75 30.75 30.75 20.75 37 7.5q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5q-19.5 0-37 7.5t-30.75 20.75-20.75 30.75-7.5 37v227.5q0 31.5-12.75 60t-34 49.75-49.75 34-60 12.75q-14.5 0-25-8.25t-10.5-23.75z"],"isMulticolor":false,"isMulticolor2":false,"tags":["uniE943"],"defaultCode":59715,"grid":64,"attrs":[]},"attrs":[],"properties":{"id":513,"order":339,"ligatures":"","prevSize":64,"code":59715,"name":"uniE943"},"setIdx":0,"setId":1,"iconIdx":109}],"height":1024,"metadata":{"name":"WinoIcons"},"preferences":{"showGlyphs":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"WinoIcons","majorVersion":1,"minorVersion":2},"metrics":{"emSize":1024,"baseline":0,"whitespace":0},"embed":false,"noie8":true,"ie7":false,"showMetrics":true,"showMetadata":false,"showVersion":true,"includeMetadata":false,"showSelector":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon","name":"icomoon","height":64,"columns":16,"margin":16,"autoHost":false,"overrideSize":"true"},"historySize":50,"showCodes":true,"gridSize":16,"showLiga":false,"quickUsageToken":{"WinoFont":"NGM2MDA2ZDBhZCMxNzM1ODE4MDQ1I0l0MmFPYTVxUDg4MHlPbU1VNDBOclhDQnF3eWY0K2NkdDNzT1BNTEw2bWEw"},"showGrid":false}}
\ No newline at end of file
+{"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]},"formats":[{"order":0,"mOpen":false,"item":{"tag":"ItemFont","args":[{"fontFamily":{"value":"WinoIcons"}}]}}],"glyphs":[{"extras":{"name":"Dismiss","tags":["Dismiss"],"codePoint":61448},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[179.62666666666667,699.1786666666667],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[183.168,695.1679999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[239.488,691.6266666666666]}]},{"tag":"LineTo","args":[{"point":[243.49866666666668,695.1679999999999]}]},{"tag":"LineTo","args":[{"point":[512,963.6266666666667]}]},{"tag":"LineTo","args":[{"point":[780.5013333333333,695.168]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":true,"fS":true,"end":[840.832,755.4986666666666]}]},{"tag":"LineTo","args":[{"point":[572.3733333333332,1024]}]},{"tag":"LineTo","args":[{"point":[840.832,1292.5013333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[844.3733333333332,1348.8213333333333]}]},{"tag":"LineTo","args":[{"point":[840.832,1352.8319999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[784.512,1356.3733333333332]}]},{"tag":"LineTo","args":[{"point":[780.5013333333333,1352.8319999999999]}]},{"tag":"LineTo","args":[{"point":[512,1084.3733333333332]}]},{"tag":"LineTo","args":[{"point":[243.49866666666665,1352.8319999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[183.168,1292.5013333333332]}]},{"tag":"LineTo","args":[{"point":[451.62666666666667,1024]}]},{"tag":"LineTo","args":[{"point":[183.168,755.4986666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[179.62666666666667,699.1786666666667]}]},{"tag":"LineTo","args":[{"point":[183.168,695.1679999999999]}]},{"tag":"LineTo","args":[{"point":[179.62666666666667,699.1786666666667]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"PeopleNew","tags":["PeopleNew"],"codePoint":61447},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[629.5039999999999,938.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[670.7199999999999,938.6666666666666],"c2":[704.1706666666665,972.1173333333334],"end":[704.1706666666665,1013.3333333333333]}]}]},{"tag":"LineTo","args":[{"point":[704.1706666666665,1215.9573333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":192.04266666666666,"ry":192.04266666666666,"phi":0,"fA":false,"fS":true,"end":[320.0853333333332,1215.9573333333333]}]},{"tag":"LineTo","args":[{"point":[320.0853333333332,1013.3333333333333]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[320.0853333333332,972.1173333333334],"c2":[353.49333333333317,938.6666666666666],"end":[394.75199999999984,938.6666666666666]}]}]},{"tag":"LineTo","args":[{"point":[629.5039999999999,938.6666666666666]}]}]},{"start":[304.256,938.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[289.32266666666663,956.672],"c2":[279.7226666666666,979.1999999999999],"end":[277.8026666666666,1003.9466666666666]}]}]},{"tag":"LineTo","args":[{"point":[277.376,1013.3333333333333]}]},{"tag":"LineTo","args":[{"point":[277.376,1215.9573333333333]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[277.376,1252.096],"c2":[285.568,1286.3146666666667],"end":[300.15999999999997,1316.8639999999998]}]}]},{"tag":"EllipticArcTo","args":[{"rx":170.70933333333335,"ry":170.70933333333335,"phi":0,"fA":false,"fS":true,"end":[85.33333333333333,1151.9573333333333]}]},{"tag":"LineTo","args":[{"point":[85.33333333333333,1013.3333333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":74.66666666666666,"ry":74.66666666666666,"phi":0,"fA":false,"fS":true,"end":[153.856,938.9226666666666]}]},{"tag":"LineTo","args":[{"point":[160,938.6666666666666]}]},{"tag":"LineTo","args":[{"point":[304.256,938.6666666666666]}]}]},{"start":[720,938.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[864,938.6666666666666]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[905.216,938.6666666666666],"c2":[938.6666666666666,972.1173333333334],"end":[938.6666666666666,1013.3333333333333]}]}]},{"tag":"LineTo","args":[{"point":[938.6666666666666,1152]}]},{"tag":"EllipticArcTo","args":[{"rx":170.66666666666666,"ry":170.66666666666666,"phi":0,"fA":false,"fS":true,"end":[724.0533333333333,1316.9493333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[736.8533333333332,1290.1546666666666],"c2":[744.704,1260.6293333333333],"end":[746.4533333333331,1229.3973333333333]}]}]},{"tag":"LineTo","args":[{"point":[746.8373333333332,1215.9573333333333]}]},{"tag":"LineTo","args":[{"point":[746.8373333333332,1013.3333333333333]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[746.8373333333332,984.96],"c2":[736.7679999999998,958.9333333333333],"end":[720,938.6666666666666]}]}]}]},{"start":[512,640],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":128,"ry":128,"phi":0,"fA":true,"fS":true,"end":[512,896]}]},{"tag":"EllipticArcTo","args":[{"rx":128,"ry":128,"phi":0,"fA":false,"fS":true,"end":[512,640]}]}]},{"start":[789.3333333333333,682.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":106.66666666666666,"ry":106.66666666666666,"phi":0,"fA":true,"fS":true,"end":[789.3333333333333,896]}]},{"tag":"EllipticArcTo","args":[{"rx":106.66666666666666,"ry":106.66666666666666,"phi":0,"fA":false,"fS":true,"end":[789.3333333333333,682.6666666666666]}]}]},{"start":[234.66666666666666,682.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":106.66666666666666,"ry":106.66666666666666,"phi":0,"fA":true,"fS":true,"end":[234.66666666666666,896]}]},{"tag":"EllipticArcTo","args":[{"rx":106.66666666666666,"ry":106.66666666666666,"phi":0,"fA":false,"fS":true,"end":[234.66666666666666,682.6666666666666]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"AttachmentNew","tags":["AttachmentNew"],"codePoint":61446},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[682.6666666666666,597.3333333333334],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":256,"ry":256,"phi":0,"fA":false,"fS":true,"end":[870.2293333333333,1027.5839999999998]}]},{"tag":"LineTo","args":[{"point":[862.1226666666666,1035.8613333333333]}]},{"tag":"LineTo","args":[{"point":[489.7706666666666,1408.2133333333334]}]},{"tag":"LineTo","args":[{"point":[487.50933333333325,1410.3466666666668]}]},{"tag":"LineTo","args":[{"point":[485.11999999999995,1412.2666666666669]}]},{"tag":"EllipticArcTo","args":[{"rx":158.76266666666666,"ry":158.76266666666666,"phi":0,"fA":false,"fS":true,"end":[260.99199999999996,1188.6080000000002]}]},{"tag":"LineTo","args":[{"point":[267.3493333333333,1181.610666666667]}]},{"tag":"LineTo","args":[{"point":[267.98933333333326,1181.1413333333335]}]},{"tag":"LineTo","args":[{"point":[579.0293333333332,869.5040000000001]}]},{"tag":"EllipticArcTo","args":[{"rx":42.675332453303774,"ry":42.675332453303774,"phi":0,"fA":false,"fS":true,"end":[639.4453333333332,929.7920000000001]}]},{"tag":"LineTo","args":[{"point":[328.40533333333326,1241.4293333333335]}]},{"tag":"LineTo","args":[{"point":[327.89333333333326,1241.7706666666668]}]},{"tag":"EllipticArcTo","args":[{"rx":73.42933333333333,"ry":73.42933333333333,"phi":0,"fA":false,"fS":false,"end":[425.55733333333325,1350.6986666666667]}]},{"tag":"LineTo","args":[{"point":[430.7626666666666,1346.432]}]},{"tag":"LineTo","args":[{"point":[430.80533333333324,1346.4746666666667]}]},{"tag":"LineTo","args":[{"point":[802.0906666666666,975.2746666666668]}]},{"tag":"LineTo","args":[{"point":[808.8746666666666,968.2346666666668]}]},{"tag":"EllipticArcTo","args":[{"rx":170.66666666666666,"ry":170.66666666666666,"phi":0,"fA":false,"fS":false,"end":[563.4133333333332,731.2640000000001]}]},{"tag":"LineTo","args":[{"point":[556.8,738.0906666666668]}]},{"tag":"LineTo","args":[{"point":[556.0319999999999,738.6026666666669]}]},{"tag":"LineTo","args":[{"point":[158.12266666666656,1136.6826666666668]}]},{"tag":"EllipticArcTo","args":[{"rx":42.67531112429708,"ry":42.67531112429708,"phi":0,"fA":false,"fS":true,"end":[97.79199999999992,1076.3093333333336]}]},{"tag":"LineTo","args":[{"point":[494.9333333333333,678.9546666666666]}]},{"tag":"LineTo","args":[{"point":[496.89599999999996,677.12]}]},{"tag":"EllipticArcTo","args":[{"rx":255.36,"ry":255.36,"phi":0,"fA":false,"fS":true,"end":[682.6666666666666,597.3333333333334]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"CalendarSettings","tags":["CalendarSettings"],"codePoint":61445},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[765.184,640.2133333333334],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[757.3333333333333,640]}]},{"tag":"LineTo","args":[{"point":[266.66666666666663,640]}]},{"tag":"LineTo","args":[{"point":[258.816,640.2133333333334]}]},{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":false,"end":[128,778.6666666666666]}]},{"tag":"LineTo","args":[{"point":[128,1269.3333333333333]}]},{"tag":"LineTo","args":[{"point":[128.2133333333333,1277.184]}]},{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":false,"end":[266.66666666666663,1408]}]},{"tag":"LineTo","args":[{"point":[512.9386666666667,1408]}]},{"tag":"EllipticArcTo","args":[{"rx":275.75466666666665,"ry":275.75466666666665,"phi":0,"fA":false,"fS":true,"end":[476.7573333333333,1322.6666666666665]}]},{"tag":"LineTo","args":[{"point":[266.66666666666663,1322.6666666666665]}]},{"tag":"LineTo","args":[{"point":[261.20533333333333,1322.4106666666667]}]},{"tag":"EllipticArcTo","args":[{"rx":53.33333333333333,"ry":53.33333333333333,"phi":0,"fA":false,"fS":true,"end":[213.33333333333331,1269.3333333333333]}]},{"tag":"LineTo","args":[{"point":[213.376,853.3333333333333]}]},{"tag":"LineTo","args":[{"point":[810.6666666666666,853.3333333333333]}]},{"tag":"LineTo","args":[{"point":[810.6666666666666,988.7573333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[841.4293333333333,996.0106666666666],"c2":[870.1866666666666,1008.384],"end":[896.0426666666667,1024.9386666666667]}]}]},{"tag":"LineTo","args":[{"point":[896.0426666666667,778.6666666666666]}]},{"tag":"LineTo","args":[{"point":[895.8293333333334,770.816]}]},{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":false,"end":[765.184,640.2133333333334]}]}]},{"start":[469.0773333333333,944.9813333333333],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[437.3333333333333,917.3333333333333]}]},{"tag":"LineTo","args":[{"point":[288,917.3333333333333]}]},{"tag":"LineTo","args":[{"point":[283.64799999999997,917.632]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[256,949.3333333333333]}]},{"tag":"LineTo","args":[{"point":[256,1248]}]},{"tag":"LineTo","args":[{"point":[256.29866666666663,1252.3519999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[288,1280]}]},{"tag":"LineTo","args":[{"point":[437.3333333333333,1280]}]},{"tag":"LineTo","args":[{"point":[441.68533333333335,1279.7013333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[469.3333333333333,1248]}]},{"tag":"LineTo","args":[{"point":[469.3333333333333,949.3333333333333]}]},{"tag":"LineTo","args":[{"point":[469.0773333333333,944.9813333333333]}]}]},{"start":[320,981.3333333333333],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[405.3333333333333,981.3333333333333]}]},{"tag":"LineTo","args":[{"point":[405.3333333333333,1216]}]},{"tag":"LineTo","args":[{"point":[320,1216]}]},{"tag":"LineTo","args":[{"point":[320,981.3333333333333]}]}]},{"start":[768,949.3333333333333],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[736,917.3333333333333]}]},{"tag":"LineTo","args":[{"point":[544.1706666666666,917.3333333333333]}]},{"tag":"LineTo","args":[{"point":[539.8613333333333,917.632]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[544.1706666666666,981.3333333333333]}]},{"tag":"LineTo","args":[{"point":[736,981.3333333333333]}]},{"tag":"LineTo","args":[{"point":[740.352,981.0346666666667]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[768,949.3333333333333]}]}]},{"start":[609.2373333333333,1108.2666666666667],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[547.7546666666666,1214.8053333333332]}]},{"tag":"LineTo","args":[{"point":[522.7946666666667,1220.9493333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":244.43733333333333,"ry":244.43733333333333,"phi":0,"fA":false,"fS":false,"end":[523.0933333333332,1298.0479999999998]}]},{"tag":"LineTo","args":[{"point":[546.1333333333333,1303.5946666666664]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[608,1410.6879999999996]}]},{"tag":"LineTo","args":[{"point":[600.0213333333334,1437.6533333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[618.752,1454.1226666666664],"c2":[640.1279999999999,1467.4773333333333],"end":[663.3386666666667,1476.949333333333]}]}]},{"tag":"LineTo","args":[{"point":[684.3733333333332,1454.8479999999997]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[808.1066666666666,1454.8479999999997]}]},{"tag":"LineTo","args":[{"point":[829.3546666666666,1477.2479999999996]}]},{"tag":"EllipticArcTo","args":[{"rx":225.28,"ry":225.28,"phi":0,"fA":false,"fS":false,"end":[892.6293333333333,1438.293333333333]}]},{"tag":"LineTo","args":[{"point":[884.1813333333332,1409.0239999999997]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[945.6639999999999,1302.5279999999998]}]},{"tag":"LineTo","args":[{"point":[970.5813333333332,1296.3839999999998]}]},{"tag":"EllipticArcTo","args":[{"rx":244.43733333333333,"ry":244.43733333333333,"phi":0,"fA":false,"fS":false,"end":[970.2826666666665,1219.2426666666665]}]},{"tag":"LineTo","args":[{"point":[947.285333333333,1213.696]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[885.4186666666665,1106.6026666666667]}]},{"tag":"LineTo","args":[{"point":[893.3973333333331,1079.7226666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":225.19466666666665,"ry":225.19466666666665,"phi":0,"fA":false,"fS":false,"end":[830.0373333333332,1040.3413333333333]}]},{"tag":"LineTo","args":[{"point":[809.0026666666665,1062.485333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[685.3119999999999,1062.485333333333]}]},{"tag":"LineTo","args":[{"point":[664.0213333333331,1040.0853333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[640.8533333333332,1049.4719999999998],"c2":[619.5199999999999,1062.6986666666664],"end":[600.7893333333332,1078.9973333333332]}]}]},{"tag":"LineTo","args":[{"point":[609.2373333333333,1108.2666666666667]}]}]},{"start":[746.6666666666666,1322.6666666666665],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[712.5333333333333,1322.6666666666665],"c2":[684.8,1293.9946666666665],"end":[684.8,1258.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[684.8,1223.2959999999998],"c2":[712.5333333333333,1194.6666666666665],"end":[746.6666666666666,1194.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[780.8426666666666,1194.6666666666665],"c2":[808.5333333333333,1223.2959999999998],"end":[808.5333333333333,1258.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[808.5333333333333,1293.9946666666665],"c2":[780.8426666666666,1322.6666666666665],"end":[746.6666666666666,1322.6666666666665]}]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"SettingsNew","tags":["SettingsNew"],"codePoint":61444},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[512.512,608],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[543.8293333333334,608.3413333333333],"c2":[575.0186666666666,611.968],"end":[605.6106666666667,618.7946666666667]}]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[630.4426666666667,646.4853333333333]}]},{"tag":"LineTo","args":[{"point":[637.696,711.6373333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":59.05066666666666,"ry":59.05066666666666,"phi":0,"fA":false,"fS":false,"end":[719.9146666666667,759.2533333333333]}]},{"tag":"LineTo","args":[{"point":[779.6906666666666,733.0133333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[815.9573333333334,740.4373333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":417.792,"ry":417.792,"phi":0,"fA":false,"fS":true,"end":[909.9946666666667,902.2293333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[898.432,937.4293333333333]}]},{"tag":"LineTo","args":[{"point":[845.44,976.512]}]},{"tag":"EllipticArcTo","args":[{"rx":58.922666666666665,"ry":58.922666666666665,"phi":0,"fA":false,"fS":false,"end":[845.44,1071.4879999999998]}]},{"tag":"LineTo","args":[{"point":[898.4746666666666,1110.5279999999998]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[910.0799999999999,1145.7706666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":418.00533333333334,"ry":418.00533333333334,"phi":0,"fA":false,"fS":true,"end":[816.0426666666665,1307.5626666666667]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[779.8613333333333,1315.0293333333334]}]},{"tag":"LineTo","args":[{"point":[719.8293333333332,1288.704]}]},{"tag":"EllipticArcTo","args":[{"rx":58.879999999999995,"ry":58.879999999999995,"phi":0,"fA":false,"fS":false,"end":[637.6533333333332,1336.2346666666667]}]},{"tag":"LineTo","args":[{"point":[630.4426666666666,1401.344]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[606.0373333333332,1428.9493333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":406.10133333333334,"ry":406.10133333333334,"phi":0,"fA":false,"fS":true,"end":[418.0479999999999,1428.9493333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[393.6426666666666,1401.344]}]},{"tag":"LineTo","args":[{"point":[386.4746666666666,1336.32]}]},{"tag":"EllipticArcTo","args":[{"rx":58.96533333333333,"ry":58.96533333333333,"phi":0,"fA":false,"fS":false,"end":[304.29866666666663,1288.96]}]},{"tag":"LineTo","args":[{"point":[244.3093333333333,1315.2426666666665]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[208.08533333333332,1307.7759999999998]}]},{"tag":"EllipticArcTo","args":[{"rx":418.048,"ry":418.048,"phi":0,"fA":false,"fS":true,"end":[114.04799999999997,1145.8133333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[125.65333333333331,1110.5706666666665]}]},{"tag":"LineTo","args":[{"point":[178.688,1071.4879999999998]}]},{"tag":"EllipticArcTo","args":[{"rx":58.879999999999995,"ry":58.879999999999995,"phi":0,"fA":false,"fS":false,"end":[178.688,976.512]}]},{"tag":"LineTo","args":[{"point":[125.65333333333331,937.5146666666667]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[114.09066666666664,902.2719999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":417.83466666666664,"ry":417.83466666666664,"phi":0,"fA":false,"fS":true,"end":[208.128,740.48]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[244.39466666666664,733.056]}]},{"tag":"LineTo","args":[{"point":[304.128,759.296]}]},{"tag":"EllipticArcTo","args":[{"rx":59.178666666666665,"ry":59.178666666666665,"phi":0,"fA":false,"fS":false,"end":[386.4746666666666,711.5946666666666]}]},{"tag":"LineTo","args":[{"point":[393.72799999999995,646.4853333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":true,"end":[418.60266666666666,618.752]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[449.19466666666665,611.9680000000001],"c2":[480.4693333333333,608.384],"end":[512.512,608]}]}]}]},{"start":[512,896],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":128,"ry":128,"phi":0,"fA":true,"fS":false,"end":[512,1152]}]},{"tag":"EllipticArcTo","args":[{"rx":128,"ry":128,"phi":0,"fA":false,"fS":false,"end":[512,896]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"ManageAccountsNew","tags":["ManageAccountsNew"],"codePoint":61443},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[149.33333333333331,1066.6666666666665],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[546.5173333333332,1066.6666666666665]}]},{"tag":"EllipticArcTo","args":[{"rx":276.39466666666664,"ry":276.39466666666664,"phi":0,"fA":false,"fS":false,"end":[469.3333333333333,1258.6666666666665]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[469.3333333333333,1305.0453333333332],"c2":[480.7253333333333,1348.7786666666666],"end":[500.86400000000003,1387.2213333333332]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[456.06399999999996,1402.1546666666666],"c2":[406.656,1407.9999999999998],"end":[362.66666666666663,1407.9999999999998]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[246.52800000000002,1407.9999999999998],"c2":[92.37333333333333,1367.2106666666664],"end":[85.54666666666665,1225.813333333333]}]}]},{"tag":"LineTo","args":[{"point":[85.33333333333333,1216]}]},{"tag":"LineTo","args":[{"point":[85.33333333333333,1130.6666666666665]}]},{"tag":"EllipticArcTo","args":[{"rx":64,"ry":64,"phi":0,"fA":false,"fS":true,"end":[143.1893333333333,1066.9653333333333]}]},{"tag":"LineTo","args":[{"point":[149.33333333333331,1066.6666666666665]}]}]},{"start":[896,832],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":149.33333333333337,"ry":149.33333333333337,"phi":0,"fA":true,"fS":true,"end":[597.3333333333333,832]}]},{"tag":"EllipticArcTo","args":[{"rx":149.33333333333337,"ry":149.33333333333337,"phi":0,"fA":false,"fS":true,"end":[896,832]}]}]},{"start":[362.66666666666663,597.3333333333334],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":192,"ry":192,"phi":0,"fA":true,"fS":true,"end":[362.66666666666663,981.3333333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":192,"ry":192,"phi":0,"fA":false,"fS":true,"end":[362.66666666666663,597.3333333333334]}]}]},{"start":[609.152,1108.2666666666667],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[547.6693333333333,1214.8053333333332]}]},{"tag":"LineTo","args":[{"point":[522.752,1220.9493333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":244.43733333333333,"ry":244.43733333333333,"phi":0,"fA":false,"fS":false,"end":[523.008,1298.0479999999998]}]},{"tag":"LineTo","args":[{"point":[546.048,1303.5946666666664]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[607.9146666666667,1410.6879999999996]}]},{"tag":"LineTo","args":[{"point":[599.936,1437.6533333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[618.7093333333333,1454.1226666666664],"c2":[640.0426666666667,1467.4773333333333],"end":[663.296,1476.949333333333]}]}]},{"tag":"LineTo","args":[{"point":[684.3306666666667,1454.8479999999997]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[808.0213333333334,1454.8479999999997]}]},{"tag":"LineTo","args":[{"point":[829.312,1477.2479999999996]}]},{"tag":"EllipticArcTo","args":[{"rx":225.36533333333333,"ry":225.36533333333333,"phi":0,"fA":false,"fS":false,"end":[892.544,1438.293333333333]}]},{"tag":"LineTo","args":[{"point":[884.096,1409.0239999999997]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[945.6213333333333,1302.5279999999998]}]},{"tag":"LineTo","args":[{"point":[970.4959999999999,1296.3839999999998]}]},{"tag":"EllipticArcTo","args":[{"rx":244.43733333333333,"ry":244.43733333333333,"phi":0,"fA":false,"fS":false,"end":[970.2399999999999,1219.2426666666665]}]},{"tag":"LineTo","args":[{"point":[947.1999999999999,1213.696]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[885.3759999999999,1106.6026666666667]}]},{"tag":"LineTo","args":[{"point":[893.3119999999999,1079.7226666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":225.19466666666665,"ry":225.19466666666665,"phi":0,"fA":false,"fS":false,"end":[829.9946666666665,1040.3413333333333]}]},{"tag":"LineTo","args":[{"point":[808.9599999999998,1062.485333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":85.33333333333333,"ry":85.33333333333333,"phi":0,"fA":false,"fS":true,"end":[685.2266666666666,1062.485333333333]}]},{"tag":"LineTo","args":[{"point":[663.9786666666666,1040.0853333333332]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[640.7679999999999,1049.4719999999998],"c2":[619.4346666666665,1062.6986666666664],"end":[600.704,1078.9973333333332]}]}]},{"tag":"LineTo","args":[{"point":[609.152,1108.2666666666667]}]}]},{"start":[746.6666666666666,1322.6666666666665],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[712.5333333333333,1322.6666666666665],"c2":[684.8,1293.9946666666665],"end":[684.8,1258.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[684.8,1223.2959999999998],"c2":[712.5333333333333,1194.6666666666665],"end":[746.6666666666666,1194.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[780.8,1194.6666666666665],"c2":[808.5333333333333,1223.2959999999998],"end":[808.5333333333333,1258.6666666666665]}]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[808.5333333333333,1293.9946666666665],"c2":[780.8,1322.6666666666665],"end":[746.6666666666666,1322.6666666666665]}]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"glyph0","codePoint":61442},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[546.7733333333333,1032.4053333333331],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[225.40799999999996,1085.9946666666665]}]},{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":false,"fS":false,"end":[208.93866666666662,1099.5626666666667]}]},{"tag":"LineTo","args":[{"point":[98.13333333333333,1396.3946666666666]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[87.55199999999998,1423.7013333333334],"c2":[116.09599999999998,1449.728],"end":[142.29333333333332,1436.6293333333333]}]}]},{"tag":"LineTo","args":[{"point":[910.2933333333333,1052.6293333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":32,"ry":32,"phi":0,"fA":false,"fS":false,"end":[910.2933333333333,995.3706666666667]}]},{"tag":"LineTo","args":[{"point":[142.29333333333335,611.3706666666668]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[116.09600000000003,598.2720000000002],"c2":[87.55200000000004,624.3413333333334],"end":[98.13333333333335,651.6053333333334]}]}]},{"tag":"LineTo","args":[{"point":[208.98133333333334,948.4373333333334]}]},{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":false,"fS":false,"end":[225.45066666666668,962.0480000000001]}]},{"tag":"LineTo","args":[{"point":[546.816,1015.5946666666669]}]},{"tag":"EllipticArcTo","args":[{"rx":8.533333333333333,"ry":8.533333333333333,"phi":0,"fA":false,"fS":true,"end":[546.7733333333333,1032.4053333333331]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"ShowAs","tags":["ShowAs"],"codePoint":61441},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[512,640],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[565.2479999999999,640],"c2":[615.9359999999999,650.8373333333334],"end":[662.016,670.4213333333333]}]}]},{"tag":"LineTo","args":[{"point":[612.736,720.1706666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":320,"ry":320,"phi":0,"fA":true,"fS":false,"end":[816.7253333333333,926.0799999999999]}]},{"tag":"LineTo","args":[{"point":[866.4319999999999,875.9893333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":384,"ry":384,"phi":0,"fA":true,"fS":true,"end":[512,640]}]}]},{"start":[902.9546666666666,621.7813333333334],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[908.8426666666667,627.2426666666667]}]},{"tag":"BezierCurveTo","args":[{"tag":"CParams","args":[{"c1":[948.864,667.264],"c2":[948.992,732.0319999999999],"end":[909.184,772.2239999999999]}]}]},{"tag":"LineTo","args":[{"point":[620.9706666666667,1063.04]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[603.4773333333334,1073.7066666666665]}]},{"tag":"LineTo","args":[{"point":[417.9626666666668,1132.1599999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":8.533333333333333,"ry":8.533333333333333,"phi":0,"fA":false,"fS":true,"end":[407.2960000000001,1121.4506666666666]}]},{"tag":"LineTo","args":[{"point":[465.79200000000014,935.7226666666667]}]},{"tag":"EllipticArcTo","args":[{"rx":42.666666666666664,"ry":42.666666666666664,"phi":0,"fA":false,"fS":true,"end":[476.2026666666668,918.528]}]},{"tag":"LineTo","args":[{"point":[764.5440000000001,627.5840000000001]}]},{"tag":"EllipticArcTo","args":[{"rx":101.84533333333333,"ry":101.84533333333333,"phi":0,"fA":false,"fS":true,"end":[902.9546666666666,621.7813333333334]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"EventDecline","tags":["EventDecline"],"codePoint":61440},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"NoPaint","args":[]}]}]},"height":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":512,"width":1024,"height":1024}]}]},"width":{"tag":"Value","args":[{"tag":"Length","args":[{"tag":"Px","args":[1024]}]}]},"xmlns":{"tag":"StringValue","args":["http://www.w3.org/2000/svg"]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"Value","args":[{"tag":"Paths","args":[[{"start":[746.6666666666666,1024],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":234.66666666666666,"ry":234.66666666666666,"phi":0,"fA":true,"fS":true,"end":[746.6666666666666,1493.3333333333333]}]},{"tag":"EllipticArcTo","args":[{"rx":234.66666666666666,"ry":234.66666666666666,"phi":0,"fA":false,"fS":true,"end":[746.6666666666666,1024]}]}]},{"start":[641.024,1153.024],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":false,"fS":false,"end":[641.024,1183.1893333333333]}]},{"tag":"LineTo","args":[{"point":[716.5013333333333,1258.7093333333332]}]},{"tag":"LineTo","args":[{"point":[641.1093333333333,1334.0586666666668]}]},{"tag":"EllipticArcTo","args":[{"rx":21.345202031786375,"ry":21.345202031786375,"phi":0,"fA":true,"fS":false,"end":[671.2746666666667,1364.2666666666667]}]},{"tag":"LineTo","args":[{"point":[746.6666666666666,1288.8746666666666]}]},{"tag":"LineTo","args":[{"point":[822.1866666666666,1364.3519999999999]}]},{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":true,"fS":false,"end":[852.352,1334.1866666666665]}]},{"tag":"LineTo","args":[{"point":[776.8746666666666,1258.6666666666665]}]},{"tag":"LineTo","args":[{"point":[852.4373333333333,1183.1466666666665]}]},{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":false,"fS":false,"end":[822.2719999999999,1152.9813333333332]}]},{"tag":"LineTo","args":[{"point":[746.7093333333332,1228.5013333333332]}]},{"tag":"LineTo","args":[{"point":[671.1893333333333,1152.9813333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":21.333333333333332,"ry":21.333333333333332,"phi":0,"fA":false,"fS":false,"end":[641.024,1153.024]}]}]},{"start":[896,874.6666666666666],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"LineTo","args":[{"point":[896.0426666666667,1024.9813333333332]}]},{"tag":"EllipticArcTo","args":[{"rx":277.3333333333333,"ry":277.3333333333333,"phi":0,"fA":false,"fS":false,"end":[512.9386666666667,1408.0853333333332]}]},{"tag":"LineTo","args":[{"point":[266.66666666666663,1408]}]},{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":true,"end":[128,1269.3333333333333]}]},{"tag":"LineTo","args":[{"point":[128,874.6666666666666]}]},{"tag":"LineTo","args":[{"point":[896,874.6666666666666]}]}]},{"start":[757.3333333333333,640],"endings":{"tag":"Connected","args":[]},"cmds":[{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":true,"end":[896,778.6666666666666]}]},{"tag":"LineTo","args":[{"point":[896,810.6666666666666]}]},{"tag":"LineTo","args":[{"point":[128,810.6666666666666]}]},{"tag":"LineTo","args":[{"point":[128,778.6666666666666]}]},{"tag":"EllipticArcTo","args":[{"rx":138.66666666666666,"ry":138.66666666666666,"phi":0,"fA":false,"fS":true,"end":[266.66666666666663,640]}]},{"tag":"LineTo","args":[{"point":[757.3333333333333,640]}]}]}]]}]},"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"CurrentColor","args":[]}]]]}},{"extras":{"name":"apple","tags":["apple"],"codePoint":59691},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":875,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M579.728 166.24c33.396-43.11 58.712-104.043 49.555-166.24-54.583 3.793-118.383 38.715-155.609 84.234-33.935 41.244-61.825 102.598-50.932 162.146 59.67 1.867 121.255-33.898 156.986-80.14v0zM874.667 751.301c-23.88 53.226-35.371 77.009-66.134 124.153-42.912 65.81-103.42 147.755-178.472 148.358-66.613 0.723-83.789-43.652-174.222-43.11-90.433 0.482-109.285 43.953-176.018 43.291-74.992-0.662-132.328-74.6-175.24-140.41-120.058-183.882-132.687-399.735-58.653-514.555 52.668-81.524 135.739-129.211 213.783-129.211 79.42 0 129.395 43.833 195.17 43.833 63.8 0 102.642-43.953 194.511-43.953 69.545 0 143.22 38.113 195.648 103.862-171.888 94.771-144.058 341.692 29.626 407.743v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"yahoo","tags":["yahoo"],"codePoint":59692},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M1017.6 236.8c-6.4-6.4-16-12.8-25.6-12.8h-352c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h3.2l-70.4 96-137.6-224h76.8c19.2 0 32-12.8 32-32v-96c0-19.2-12.8-32-32-32h-448c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h73.6l246.4 361.6v214.4h-96c-19.2 0-32 12.8-32 32v96c0 19.2 12.8 32 32 32h448c19.2 0 32-12.8 32-32v-96c0-19.2-12.8-32-32-32h-96v-156.8l208-291.2h112c12.8 0 25.6-9.6 28.8-22.4l32-96c6.4-9.6 3.2-19.2-3.2-28.8z"]},"fill":{"tag":"Value","args":[{"tag":"ColorReference","args":[0]}]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[{"tag":"Color","args":[{"r":0.3764705882352941,"g":0.00392156862745098,"b":0.8196078431372549,"a":1}]}]]]}},{"extras":{"name":"AlertOn","tags":["AlertOn"],"codePoint":59683},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M383.104 817.159h257.792c-10.809 62.218-64.398 108.929-128.896 108.929s-118.087-46.709-128.784-108.147l-0.112-0.781zM512 76.377c180.495 0 326.815 146.32 326.815 326.815v0 174.302l61.79 137.698c2.268 4.959 3.591 10.757 3.591 16.864 0 22.838-18.494 41.356-41.323 41.396h-701.567c-22.86-0.004-41.39-18.537-41.39-41.396 0-6.124 1.33-11.937 3.715-17.166l-0.106 0.259 61.659-137.698v-174.825l0.218-10.894c6.374-175.471 150.154-315.303 326.597-315.311h0.001zM991.329 348.592c18.045 0.006 32.671 14.635 32.671 32.682 0 16.479-12.195 30.108-28.053 32.357l-0.174 0.020-4.445 0.305h-87.15c-18.045-0.006-32.671-14.635-32.671-32.682 0-16.479 12.195-30.108 28.053-32.357l0.174-0.020 4.445-0.305h87.15zM119.822 348.592c18.045 0.006 32.671 14.635 32.671 32.682 0 16.479-12.195 30.108-28.053 32.357l-0.174 0.020-4.445 0.305h-87.15c-18.045-0.006-32.671-14.635-32.671-32.682 0-16.479 12.195-30.108 28.053-32.357l0.174-0.020 4.445-0.305h87.15zM973.899 100.213c4.085 5.396 6.543 12.22 6.543 19.618 0 8.949-3.596 17.057-9.422 22.959l0.003-0.003-3.66 3.181-87.15 65.363c-5.406 4.109-12.249 6.582-19.67 6.582-18.049 0-32.682-14.632-32.682-32.682 0-8.975 3.618-17.106 9.476-23.013l-0.002 0.002 3.66-3.181 87.15-65.363c5.393-4.081 12.215-6.536 19.609-6.536 10.655 0 20.12 5.099 26.086 12.991l0.059 0.082zM95.855 93.676l87.15 65.363c7.973 6.026 13.073 15.49 13.073 26.145 0 18.049-14.632 32.682-32.682 32.682-7.394 0-14.215-2.455-19.691-6.596l0.082 0.059-87.15-65.363c-7.973-6.026-13.073-15.49-13.073-26.145 0-18.049 14.632-32.682 32.682-32.682 7.394 0 14.215 2.455 19.691 6.596l-0.082-0.059z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ArrowReply","tags":["ArrowReply"],"codePoint":59684},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M381.385 756.278c10.288 10.296 16.652 24.514 16.652 40.219 0 31.425-25.474 56.899-56.899 56.899-15.72 0-29.95-6.375-40.247-16.68l-284.271-284.668c-10.275-10.292-16.628-24.5-16.628-40.191s6.353-29.9 16.628-40.193l284.325-284.325c10.299-10.305 24.529-16.68 40.249-16.68 31.425 0 56.899 25.474 56.899 56.899 0 15.705-6.363 29.925-16.652 40.221v0l-187.447 187.332h374.892c246.345 0.003 446.972 195.732 454.859 440.159l0.019 0.723 0.228 14.222c0 31.418-25.47 56.889-56.889 56.889s-56.889-25.47-56.889-56.889v0c0-0.004 0-0.008 0-0.012 0-184.009-145.607-334.010-327.887-341.068l-0.641-0.020-12.8-0.228h-374.665l187.161 187.389z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Checkmark","tags":["Checkmark"],"codePoint":59685},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M306.912 780.724l-222.258-222.258c-10.527-10.177-24.885-16.449-40.708-16.449-32.362 0-58.597 26.235-58.597 58.597 0 15.822 6.272 30.181 16.465 40.724l263.669 263.669c10.604 10.6 25.251 17.156 41.427 17.156s30.825-6.556 41.427-17.156l644.563-644.563c10.177-10.527 16.449-24.885 16.449-40.708 0-32.362-26.235-58.597-58.597-58.597-15.822 0-30.181 6.272-40.724 16.465l-603.119 603.119z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"JoinOnline","tags":["GlobePerson"],"codePoint":59686},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M662.947 731.4c-3.51 18.673-7.46 36.567-11.798 53.729-25.576 22.407-41.637 55.132-41.637 91.608 0 0.053 0 0.105 0 0.157v-0.008c0 8.483 0.439 16.772 1.316 24.865-29.107 61.481-64.065 97.803-98.827 97.803-58.36 0-117.013-102.094-148.119-253.723l-2.828-14.334h301.894zM671.235 943.681c-8.206-19.281-12.975-41.709-12.975-65.251 0-0.543 0.002-1.086 0.008-1.627l-0.001 0.083c0-40.39 32.743-73.133 73.133-73.133v0h243.777c40.39 0 73.133 32.743 73.133 73.133v0c0 54.411-22.379 97.999-59.092 127.447-36.128 29.010-84.591 43.198-135.931 43.198s-99.803-14.139-135.931-43.198c-12.774-10.256-23.68-22.139-32.6-35.463l-0.358-0.568c-4.723-7.052-9.128-15.142-12.785-23.631l-0.379-0.99zM999.652 512c0 32.325-3.169 63.968-9.166 94.585-21.277-56.194-74.647-95.421-137.178-95.421-37.718 0-72.102 14.272-98.048 37.71l0.128-0.113c0.298-10.824 0.467-23.565 0.467-36.345 0-23.195-0.559-46.258-1.665-69.178l0.125 3.234-1.852-31.983h237.44c6.339 31.496 9.751 64.114 9.751 97.511zM755.777 658.266v-0.828c0-53.853 43.657-97.511 97.511-97.511s97.511 43.657 97.511 97.511v0 0.828c-0.331 53.467-43.752 96.682-97.265 96.682-0.087 0-0.173 0-0.259 0h0.014c-24.28 0-46.464-8.873-63.529-23.549-20.677-17.79-33.756-43.912-33.982-73.093v-0.040zM744.271 754.949c-2.966-3.306-5.892-6.895-8.642-10.621l-0.28-0.398-1.414 7.557-0.682 3.413h11.019zM76.419 731.4h209.941c17.747 101.509 47.926 187.903 87.37 248.311-125.917-38.179-228.001-122.208-288.918-232.201l-1.274-2.508-7.118-13.603zM34.148 414.489h237.44c-2.204 29.179-3.461 63.199-3.461 97.513 0 41.535 1.841 82.641 5.446 123.239l-0.376-5.252 2.779 28.279h-229.297c-14.188-43.749-22.368-94.087-22.368-146.335 0-34.49 3.564-68.149 10.346-100.626l-0.555 3.184zM678.987 414.489c2.401 29.154 3.77 63.106 3.77 97.377 0 41.679-2.024 82.884-5.979 123.524l0.406-5.158-3.022 28.034h-324.322c-5.44-44.095-8.545-95.136-8.545-146.903 0-25.71 0.766-51.24 2.275-76.57l-0.166 3.489 1.658-23.792h333.926zM655.584 52.528l-5.315-8.288c147.859 44.866 263.922 153.857 317.538 293.766l1.128 3.349h-223.788c-15.407-117.794-46.659-219.010-89.612-288.779zM367.781 46.044l5.948-1.804c-42.953 65.869-74.888 162.356-91.855 275.663l-3.022 21.452h-223.69c54.001-141.32 167.597-249.225 309.207-294.359l3.461-0.953zM512 24.543c64.308 0 129.007 123.937 156.7 301.455l2.291 15.358h-317.983c26.377-185.709 92.879-316.813 158.992-316.813z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"PersonCall","tags":["PersonCall"],"codePoint":59687},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M224.171 597.333h468.821c4.437 7.339 9.856 14.165 16.213 20.224l30.72 29.099c-4.388 16.237-10.53 30.451-18.388 43.515l0.425-0.763c-8.432 14.527-18.147 27.055-29.302 38.134l-0.010 0.010-33.877-11.307c-8.718-2.968-18.761-4.681-29.204-4.681-32.297 0-60.767 16.386-77.55 41.297l-0.211 0.333-30.805 45.227c-10.828 15.816-17.291 35.363-17.291 56.42 0 27.465 10.996 52.362 28.826 70.529l-0.015-0.016 9.685 9.728c-23.083 2.432-47.36 3.627-72.875 3.627-123.307 0-218.795-28.032-285.483-85.333-34.179-29.513-55.68-72.903-55.68-121.315 0-0.010 0-0.020 0-0.031l-0 0.002v-38.699c0-53.019 42.981-96 96-96h0zM725.803 522.453l21.461-50.645c10.069-23.765 34.176-36.693 57.856-31.744l5.035 1.323 26.88 8.619c26.709 8.533 47.104 31.36 53.717 60.032 15.659 68.181-3.157 151.168-56.405 248.96-53.205 97.707-111.531 156.416-174.933 176.213-6.636 2.127-14.27 3.353-22.19 3.353-18.661 0-35.732-6.807-48.866-18.073l0.101 0.084-5.291-4.821-20.395-20.48c-10.137-10.436-16.386-24.694-16.386-40.412 0-10.061 2.561-19.524 7.066-27.773l-0.152 0.303 2.987-4.949 30.805-45.227c12.117-17.792 32.853-26.24 52.779-21.973l5.419 1.493 56.832 18.944c22.956-17.637 41.925-39.192 56.19-63.812l0.557-1.041c11.81-19.519 20.664-42.288 25.231-66.569l0.199-1.271 1.621-11.477-47.317-44.928c-10.773-10.504-17.456-25.161-17.456-41.378 0-6.126 0.954-12.029 2.72-17.57l-0.113 0.409 2.048-5.589v0zM469.333 85.547c117.821-0 213.333 95.513 213.333 213.333s-95.513 213.333-213.333 213.333v0c-117.821 0-213.333-95.513-213.333-213.333s95.513-213.333 213.333-213.333v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Question","tags":["Question"],"codePoint":59688},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 37.103c-163.958 0-296.811 132.853-296.811 296.811 0 32.785 26.578 59.363 59.363 59.363s59.363-26.578 59.363-59.363v0c0-98.422 79.665-178.087 178.087-178.087s178.087 79.665 178.087 178.087c0 48.44-11.814 76.815-26.001 96.701-15.553 21.667-37.102 37.873-66.961 58.472l-6.886 4.63c-26.535 18.165-60.728 41.494-87.203 74.024-31.283 38.467-50.399 87.084-50.399 152.026v29.681c0 32.785 26.578 59.363 59.363 59.363s59.363-26.578 59.363-59.363v0-29.681c0-38.941 10.567-60.787 23.745-77.112 15.256-18.639 35.795-32.768 66.13-53.604l3.146-2.197c29.444-20.184 67.257-46.659 96.167-87.144 30.453-42.266 48.262-95.573 48.262-165.799 0-163.958-132.853-296.811-296.811-296.811zM512 1061.101c40.981 0 74.202-33.222 74.202-74.202s-33.222-74.202-74.202-74.202v0c-40.981 0-74.202 33.222-74.202 74.202s33.222 74.202 74.202 74.202v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Attendees","tags":["PeopleCommunity"],"codePoint":59689},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M652.765 665.562c49.447 0 89.578 40.131 89.578 89.578l-0.052 49.242c5.989 112.1-77.344 168.765-226.863 168.765-148.955 0-233.773-55.795-233.773-166.82v-51.188c0-49.447 40.131-89.578 89.578-89.578h281.531zM89.704 409.626h223.996c-4.099 15.32-6.454 32.909-6.454 51.049 0 57.132 23.359 108.81 61.049 146.001l0.023 0.022 8.292 7.73-5.375-0.052c-0.016 0-0.034 0-0.050 0-64.221 0-118.398 43.007-135.3 101.791l-0.245 0.993-1.741 0.052c-148.955 0-233.773-55.795-233.773-166.82v-51.188c0-49.447 40.131-89.578 89.578-89.578zM934.296 409.626c49.447 0 89.578 40.131 89.578 89.578l-0.052 49.242c5.989 112.1-77.344 168.765-226.863 168.765l-8.651-0.102c-16.31-56.459-65.498-97.85-124.987-102.346l-0.474-0.029-10.084-0.359-5.375 0.052c42.676-37.618 69.457-92.407 69.457-153.451 0-18.232-2.389-35.906-6.871-52.726l0.323 1.426 223.996-0.052zM512 307.25c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0zM230.469 51.313c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0zM793.531 51.313c84.81 0 153.562 68.753 153.562 153.562s-68.753 153.562-153.562 153.562v0c-84.81 0-153.562-68.753-153.562-153.562s68.753-153.562 153.562-153.562v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"EditSeries","tags":["DataUsageEdit"],"codePoint":59690},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M902.026 158.393c0-74.045-60.026-134.071-134.071-134.071v0h-609.416c-74.045 0-134.071 60.026-134.071 134.071v0 609.416c0 74.045 60.026 134.071 134.071 134.071v0h324.989l5.119-20.476c7.898-31.592 24.23-60.454 47.291-83.465l105.21-105.258c-4.519-5.798-7.25-13.183-7.264-21.204v-416.454c0.273-19.715 16.319-35.594 36.074-35.594 0.173 0 0.345 0.001 0.516 0.003h-0.026c0.146-0.002 0.318-0.003 0.491-0.003 19.754 0 35.802 15.877 36.074 35.567v371.819l116.666-116.666c20.86-20.887 47.482-36.014 77.278-42.796l1.070-0.205v-308.755zM219.48 353.405c0-20.135 16.381-36.419 36.565-36.419s36.565 16.284 36.565 36.419v317.189c-0.027 20.12-16.345 36.419-36.468 36.419-0.034 0-0.069 0-0.103 0h0.006c-0.029 0-0.063 0-0.097 0-20.123 0-36.439-16.299-36.468-36.416v-317.191zM426.681 498.837c0-0.043 0-0.095 0-0.147 0-19.57 15.796-35.451 35.333-35.589h0.013c0.146-0.002 0.319-0.003 0.491-0.003 19.469 0 35.286 15.632 35.586 35.029v0.029l1.706 172.928c0 0.058 0 0.127 0 0.195 0 19.57-15.796 35.451-35.333 35.589h-0.013c-0.146 0.002-0.319 0.003-0.491 0.003-19.486 0-35.314-15.659-35.587-35.081v-0.025l-1.706-172.928zM858.148 544.665l-287.79 287.742c-16.291 16.298-28.307 36.869-34.221 59.888l-0.198 0.908-22.329 89.268c-1.006 3.859-1.583 8.289-1.583 12.855 0 29.268 23.726 52.995 52.995 52.995 4.58 0 9.022-0.58 13.261-1.673l-0.368 0.080 89.219-22.281c23.949-6.119 44.538-18.152 60.843-34.468l287.742-287.742c19.448-20.039 31.437-47.411 31.437-77.583 0-61.553-49.897-111.45-111.45-111.45-30.159 0-57.521 11.98-77.586 31.44l0.029-0.027z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Print","tags":["Print"],"codePoint":59682},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M768 746.667v53.333c0 53.019-42.981 96-96 96v0h-320c-53.019 0-96-42.981-96-96v0-53.376l-74.667 0.043c-53.019 0-96-42.981-96-96v0-255.829c0-76.583 62.083-138.667 138.667-138.667v0l31.957-0.043 0.043-32.128c0-53.019 42.981-96 96-96v0h320.085c53.019 0 96 42.981 96 96v0 32.128h32c76.581 0.049 138.655 62.092 138.752 138.657l0 0.009 0.128 255.872c0 0.013 0 0.028 0 0.043 0 52.981-42.937 95.933-95.912 95.957l-75.053 0zM672 576h-320c-17.673 0-32 14.327-32 32v0 192c0 17.664 14.336 32 32 32h320c17.673 0 32-14.327 32-32v0-192c0-17.673-14.327-32-32-32v0zM672.085 192h-320.085c-17.673 0-32 14.327-32 32v0l-0.043 32.128h384.128v-32.128c0-17.673-14.327-32-32-32v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarError","tags":["CalendarError"],"codePoint":59670},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M896 512.939v-150.272h-768v394.667c0 76.583 62.083 138.667 138.667 138.667v0h246.272c-27.404-42.265-43.697-93.942-43.697-149.425 0-153.167 124.166-277.333 277.333-277.333 55.483 0 107.161 16.293 150.51 44.355l-1.085-0.658zM896 266.667c0-76.583-62.083-138.667-138.667-138.667v0h-490.667c-76.583 0-138.667 62.083-138.667 138.667v0 32h768v-32zM981.333 746.667c0-129.603-105.064-234.667-234.667-234.667s-234.667 105.064-234.667 234.667v0c0 129.603 105.064 234.667 234.667 234.667s234.667-105.064 234.667-234.667v0zM725.333 618.667c0-11.782 9.551-21.333 21.333-21.333s21.333 9.551 21.333 21.333v0 170.667c0 11.782-9.551 21.333-21.333 21.333s-21.333-9.551-21.333-21.333v0-170.667zM773.333 874.667c0 14.728-11.939 26.667-26.667 26.667s-26.667-11.939-26.667-26.667v0c0-14.728 11.939-26.667 26.667-26.667s26.667 11.939 26.667 26.667v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarYear","tags":["CalendarYear"],"codePoint":59671},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M839.11 0.001c102.111 0 184.889 82.777 184.889 184.889v0 654.222c0 102.111-82.777 184.889-184.889 184.889v0h-654.222c-102.111 0-184.889-82.777-184.889-184.889v0-654.222c0-102.111 82.777-184.889 184.889-184.889v0h654.222zM270.223 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0zM753.777 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0zM512 227.556c-21.517 0.001-39.313 15.929-42.243 36.637l-0.027 0.227-0.399 5.803v483.555l0.399 5.803c2.961 20.929 20.756 36.851 42.268 36.851s39.307-15.921 42.243-36.624l0.027-0.227 0.399-5.803v-483.555l-0.399-5.803c-2.955-20.935-20.752-36.863-42.268-36.864v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Reminder","tags":["Reminder"],"codePoint":59672},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 144.41c246.517 0 446.359 199.841 446.359 446.359s-199.841 446.359-446.359 446.359v0c-246.517 0-446.359-199.841-446.359-446.359s199.841-446.359 446.359-446.359v0zM512 301.948c-19.862 0.001-36.289 14.704-38.993 33.819l-0.025 0.209-0.368 5.356v236.308l0.368 5.356c2.734 19.319 19.159 34.016 39.017 34.016s36.283-14.697 38.993-33.807l0.025-0.209 0.368-5.356v-236.308l-0.368-5.356c-2.727-19.324-19.156-34.027-39.017-34.028v0zM888.517 150.869l4.306 3.204 60.337 52.513c8.354 7.262 13.605 17.905 13.605 29.776 0 21.751-17.633 39.385-39.385 39.385-8.078 0-15.586-2.432-21.836-6.603l0.144 0.090-4.254-3.204-60.337-52.513c-8.26-7.257-13.445-17.841-13.445-29.636 0-21.751 17.633-39.385 39.385-39.385 7.988 0 15.42 2.378 21.628 6.465l-0.148-0.091zM630.154 13.129c21.746 0.007 39.372 17.637 39.372 39.385 0 19.858-14.697 36.283-33.807 38.993l-0.209 0.025-5.356 0.368h-236.308c-21.746-0.007-39.372-17.637-39.372-39.385 0-19.858 14.697-36.283 33.807-38.993l0.209-0.025 5.356-0.368h236.308z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarAgenda","tags":["CalendarAgenda"],"codePoint":59673},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M1023.999 839.11c0 102.111-82.777 184.889-184.889 184.889v0h-654.222c-102.111 0-184.889-82.777-184.889-184.889v0-654.222c0-102.111 82.777-184.889 184.889-184.889v0h654.222c102.111 0 184.889 82.777 184.889 184.889v0 654.222zM796.444 270.223c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0zM796.444 753.777c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0zM796.444 512c-0.001-21.517-15.929-39.313-36.637-42.243l-0.227-0.027-5.803-0.399-489.358 0.399c-20.929 2.961-36.851 20.756-36.851 42.268s15.921 39.307 36.624 42.243l0.227 0.027 5.803 0.399 489.358-0.399c20.935-2.955 36.863-20.752 36.864-42.268v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarAttendee","tags":["CalendarAttendee"],"codePoint":59674},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M922.4 352.401v114c-31.531-41.682-81.025-68.33-136.749-68.33-94.44 0-171 76.56-171 171 0 49.456 21 94.015 54.566 125.236l0.104 0.094h-43.32c-62.957 0-114 51.042-114 114v0 22.8c0 31.92 7.752 62.883 22.255 91.2h-284.456c-81.848 0-148.2-66.352-148.2-148.2v0-421.8h820.799zM774.199 101.6c81.848 0 148.2 66.352 148.2 148.2v0 34.2h-820.799v-34.2c0-81.848 66.352-148.2 148.2-148.2v0h524.4z"]}},"children":[]}]},{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M1013.599 808.399c0-37.774-30.626-68.4-68.4-68.4v0h-319.2c-37.774 0-68.4 30.626-68.4 68.4v0 22.8c0 89.876 84.816 182.4 227.999 182.4s227.999-92.524 227.999-182.4v-22.8zM910.999 569c0-69.256-56.143-125.399-125.399-125.399s-125.399 56.143-125.399 125.399v0c0 69.256 56.143 125.399 125.399 125.399s125.399-56.143 125.399-125.399v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarItemMultiDay","tags":["CalendarItemMultiDay"],"codePoint":59675},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M931.787 144.778l0.21 6.354 0.105 6.406v582.892c0 105.857-85.814 191.671-191.671 191.671v0h-582.892c-4.498-0.004-8.956-0.138-13.381-0.396l0.62 0.030c30.721 47.871 83.675 79.137 143.931 79.137 0.039 0 0.079 0 0.118 0h451.603c149.36 0 270.44-121.080 270.44-270.44v0-451.609c0-60.548-31.508-113.743-79.084-144.043zM-13.128 275.693v433.23c0 94.256 76.41 170.667 170.667 170.667v0h551.384c94.256 0 170.667-76.41 170.667-170.667v0-433.23h-892.716zM157.539-13.128c-94.256 0-170.667 76.41-170.667 170.667v0 39.385h892.716v-39.385c0-94.256-76.41-170.667-170.667-170.667v0h-551.384z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarMonth","tags":["CalendarMonth"],"codePoint":59676},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M839.109 0.001c102.107 0 184.89 82.774 184.89 184.89v0 654.22c0 102.107-82.774 184.89-184.89 184.89v0h-654.22c-102.107 0-184.89-82.774-184.89-184.89v0-654.22c0-102.107 82.774-184.89 184.89-184.89v0h654.22zM270.221 597.331c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM512 597.331c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM270.221 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM512 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0zM753.779 312.89c-39.276 0-71.11 31.834-71.11 71.11s31.834 71.11 71.11 71.11v0c39.276 0 71.11-31.834 71.11-71.11s-31.834-71.11-71.11-71.11v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarSync","tags":["CalendarSync"],"codePoint":59677},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M972.8 332.801v180.326c-50.718-32.885-112.73-52.436-179.31-52.436-183.8 0-332.799 148.999-332.799 332.799 0 66.58 19.552 128.593 53.226 180.612l-0.79-1.302h-295.526c-91.9 0-166.4-74.5-166.4-166.4v0-473.6h921.599zM806.399 51.2c91.9 0 166.4 74.5 166.4 166.4v0 38.4h-921.599v-38.4c0-91.9 74.5-166.4 166.4-166.4v0h588.8zM512 793.6c0 155.523 126.077 281.6 281.6 281.6s281.6-126.077 281.6-281.6v0c0-155.523-126.077-281.6-281.6-281.6s-281.6 126.077-281.6 281.6v0zM947.2 614.4c14.138 0 25.6 11.461 25.6 25.6v0 102.4c0 14.138-11.461 25.6-25.6 25.6v0h-102.4c-14.138 0-25.6-11.461-25.6-25.6s11.461-25.6 25.6-25.6v0h51.2c-23.56-31.226-60.596-51.2-102.298-51.2-0.036 0-0.072 0-0.108 0h0.006c-42.649 0-80.486 20.838-103.782 53.044-4.723 6.184-12.1 10.133-20.399 10.133-14.138 0-25.6-11.461-25.6-25.6 0-5.435 1.693-10.475 4.583-14.62l-0.055 0.084c32.9-45.197 85.628-74.24 145.14-74.24 0.041 0 0.080 0 0.12 0h-0.006c50.176 0 95.488 20.634 128 53.76v-28.16c0-14.138 11.461-25.6 25.6-25.6v0zM665.6 919.040v28.16c0 14.138-11.461 25.6-25.6 25.6s-25.6-11.461-25.6-25.6v0-102.4c0-14.138 11.461-25.6 25.6-25.6v0h102.4c14.138 0 25.6 11.461 25.6 25.6s-11.461 25.6-25.6 25.6v0h-51.2c23.347 31.129 60.57 51.2 102.4 51.2 39.22 0 74.342-17.612 97.843-45.466 4.717-5.382 11.605-8.761 19.283-8.761 14.138 0 25.6 11.461 25.6 25.6 0 6.161-2.176 11.813-5.802 16.23l0.036-0.044c-33.022 39.029-82.034 63.642-136.796 63.642-0.058 0-0.115 0-0.173 0h0.010c-0.072 0-0.156 0-0.241 0-50.047 0-95.29-20.575-127.728-53.728l-0.031-0.032z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarWorkWeek","tags":["CalendarWorkWeek"],"codePoint":59678},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M312.89 455.111v-142.222h398.222v142.222h-398.222z"]}},"children":[]}]},{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M839.11 1023.999c102.111 0 184.889-82.777 184.889-184.889v0-654.222c0-102.111-82.777-184.889-184.889-184.889v0h-654.222c-102.111 0-184.889 82.777-184.889 184.889v0 654.222c0 102.111 82.777 184.889 184.889 184.889v0h654.222zM270.223 227.556h483.555c23.564 0 42.667 19.103 42.667 42.667v0 227.556c0 23.564-19.103 42.667-42.667 42.667v0h-483.555c-23.564 0-42.667-19.103-42.667-42.667v0-227.556c0-23.564 19.103-42.667 42.667-42.667v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherCloudyNight","tags":["WeatherCloudyNight"],"codePoint":59679},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M563.299 307.828c162.19 0 254.242 107.41 267.604 237.040h4.095c0.076 0 0.166 0 0.256 0 104.178 0 188.645 84.395 188.761 188.545v0.011c-0.116 104.162-84.583 188.556-188.761 188.556-0.090 0-0.18 0-0.27 0h-543.436c-0.076 0-0.166 0-0.256 0-104.178 0-188.645-84.395-188.761-188.545v-0.011c0.116-104.162 84.583-188.556 188.761-188.556 0.090 0 0.18 0 0.27 0h4.081c13.464-130.499 105.464-237.040 267.654-237.040zM234.977 102.685c42.977 2.367 82.579 14.862 117.075 35.116l-1.218-0.661c51.613 30.084 91.164 76.037 112.441 131.086l0.601 1.769c-101.574 28.823-174.272 102.496-204.479 202.072l-3.533 12.594-2.97 12.185-10.546 1.945c-59.289 12.849-109.22 46.25-143.092 92.212l-0.463 0.658c-37.349-20.048-68.215-47.674-91.442-81.017l-0.558-0.846c-4.242-6.087-6.777-13.639-6.777-21.783 0-16.588 10.517-30.718 25.247-36.086l0.266-0.085c84.115-30.103 129.374-63.995 155.33-113.4 28.26-54.012 33.482-111.301 14.693-188.3-0.698-2.738-1.099-5.883-1.099-9.121 0-21.206 17.191-38.397 38.397-38.397 0.746 0 1.489 0.022 2.225 0.064l-0.102-0.005z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherCloudy","tags":["WeatherCloudy"],"codePoint":59680},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M563.298 256.482c162.189 0 254.239 107.358 267.601 237.037h4.095c0.076 0 0.166 0 0.256 0 104.177 0 188.643 84.394 188.759 188.543v0.011c-0.145 104.138-84.6 188.504-188.759 188.504-0.090 0-0.18 0-0.27 0h-543.43c-0.076 0-0.166 0-0.256 0-104.159 0-188.613-84.364-188.759-188.489v-0.014c0.116-104.161 84.582-188.554 188.759-188.554 0.090 0 0.18 0 0.27 0h4.081c13.464-130.549 105.463-237.037 267.652-237.037zM409.609 102.433c82.784 0 156.147 41.724 199.664 105.566-13.676-1.728-29.501-2.714-45.557-2.714-0.146 0-0.294 0-0.44 0h0.023c-153.28 0-264.733 85.855-303.95 215.689l-3.481 12.287-2.97 12.185-10.546 1.997c-82.829 18.057-148.657 77.037-176.056 154.215l-0.518 1.676c-40.157-31.018-65.768-79.18-65.768-133.326 0-89.459 69.912-162.589 158.081-167.736l0.455-0.022 13.157-0.307c20.752-114.106 119.356-199.492 237.906-199.51h0.001z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherPartlyCloudy","tags":["WeatherPartlyCloudy"],"codePoint":59681},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M563.296 307.583c162.234 0 254.23 107.354 267.642 237.028h4.095c0.076 0 0.166 0 0.256 0 104.173 0 188.636 84.391 188.752 188.536v0.011c-0.145 104.135-84.597 188.497-188.752 188.497-0.090 0-0.18 0-0.27 0h-543.46c-0.076 0-0.166 0-0.256 0-104.155 0-188.606-84.361-188.752-188.482v-0.014c0.116-104.157 84.579-188.547 188.752-188.547 0.090 0 0.18 0 0.27 0h4.081c13.464-130.545 105.409-237.028 267.591-237.028zM121.288 520.293c1.85 4.343 2.925 9.396 2.925 14.699 0 14.078-7.576 26.385-18.873 33.069l-0.179 0.097-4.659 2.304-47.405 19.658c-4.333 1.839-9.372 2.91-14.661 2.91-21.205 0-38.395-17.19-38.395-38.395 0-14.041 7.536-26.321 18.785-33.017l0.176-0.097 4.709-2.355 47.405-19.607c4.347-1.854 9.404-2.931 14.713-2.931 15.89 0 29.525 9.652 35.362 23.413l0.095 0.252zM453.383 272.873l-8.806 2.97c-91.33 32.252-156.755 102.644-185.066 195.715l-3.584 12.799-2.97 12.185-10.546 1.997c-32.469 6.959-61.138 19.65-86.282 37.068l0.787-0.516c-17.207-29.085-27.375-64.098-27.375-101.485 0-111.455 90.352-201.807 201.807-201.807 46.077 0 88.547 15.442 122.518 41.434l-0.486-0.356zM48.183 274.46l5.427 1.791 47.405 19.658c13.952 5.958 23.552 19.564 23.552 35.41 0 21.205-17.19 38.395-38.395 38.395-3.254 0-6.414-0.404-9.432-1.167l0.265 0.056-5.273-1.689-47.405-19.658c-13.914-5.975-23.481-19.561-23.481-35.38 0-21.205 17.19-38.395 38.395-38.395 3.21 0 6.328 0.394 9.309 1.136l-0.264-0.055zM243.487 121.595l2.355 4.659 19.607 47.457c1.796 4.286 2.84 9.268 2.84 14.492 0 21.205-17.19 38.395-38.395 38.395-13.993 0-26.237-7.485-32.948-18.67l-0.097-0.174-2.355-4.659-19.607-47.457c-1.796-4.286-2.84-9.268-2.84-14.492 0-21.205 17.19-38.395 38.395-38.395 13.993 0 26.237 7.485 32.948 18.67l0.097 0.174zM466.386 105.264c14.019 5.93 23.677 19.568 23.677 35.462 0 3.314-0.42 6.531-1.209 9.599l0.058-0.266-1.791 5.375-19.607 47.457c-5.958 13.952-19.564 23.552-35.41 23.552-21.205 0-38.395-17.19-38.395-38.395 0-3.254 0.404-6.414 1.167-9.432l-0.056 0.265 1.741-5.427 19.658-47.405c5.923-14.036 19.568-23.708 35.475-23.708 5.302 0 10.352 1.075 14.947 3.018l-0.252-0.095z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherThunder","tags":["WeatherThunder"],"codePoint":59654},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M201.348 953.716c0-6.336 0.667-12.006 2.001-17.008l76.537-296.645h-80.539c-9.338 0-18.176-1.834-26.513-5.503s-15.591-8.587-21.761-14.757c-6.17-6.17-11.088-13.424-14.757-21.761s-5.503-17.175-5.503-26.513c0-6.003 0.833-12.006 2.501-18.009l140.569-506.747c3.669-14.007 11.339-25.345 23.011-34.017s24.679-13.006 39.019-13.006h346.669c9.004 0 17.341 1.751 25.012 5.253s14.424 8.171 20.26 14.007c5.836 5.836 10.422 12.673 13.757 20.51s5.002 16.091 5.002 24.762c0 7.337-1.168 14.34-3.502 21.010l-82.54 234.615h162.579c9.338 0 18.092 1.834 26.263 5.503s15.425 8.671 21.761 15.007c6.336 6.336 11.339 13.59 15.007 21.761s5.503 16.925 5.503 26.263c0 19.009-6.336 35.017-19.009 48.023l-551.269 566.277c-6.67 6.673-14.257 11.836-22.761 15.508s-17.592 5.503-27.263 5.503c-9.672 0-18.676-1.831-27.013-5.503s-15.758-8.754-22.261-15.257c-6.503-6.503-11.589-13.924-15.257-22.261s-5.503-17.341-5.503-27.013zM828.154 388.44c0-1.334-0.583-2.418-1.751-3.252s-2.251-1.251-3.252-1.251h-207.601c-8.671 0-16.175-3.085-22.511-9.255s-9.505-13.59-9.505-22.261c0-1.668 0.167-3.502 0.5-5.503s0.833-3.835 1.501-5.503l97.047-277.636h-346.669c-1.334 4.669-4.335 15.34-9.004 32.016s-10.422 37.268-17.258 61.78c-6.836 24.512-14.424 51.692-22.761 81.54s-16.758 59.946-25.262 90.294c-8.504 30.348-16.758 59.946-24.762 88.793s-15.090 54.527-21.26 77.038c-6.17 22.511-11.172 40.687-15.007 54.527s-5.753 21.093-5.753 21.761c0 3.001 1.501 4.502 4.502 4.502h121.559c9.004 0 16.591 3.085 22.761 9.255s9.255 13.757 9.255 22.761c0 2.001-0.333 4.669-1 8.004l-86.542 336.664v1.501c0 3.669 2.168 5.503 6.503 5.503 1.334 0 2.501-0.5 3.502-1.501l551.269-566.277c1-1 1.501-2.168 1.501-3.502z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherBlowingSnow","tags":["WeatherBlowingSnow"],"codePoint":59655},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M858.233 383.471c91.229 1.168 164.735 75.396 164.735 166.793 0 88.074-68.259 160.205-154.76 166.377l-0.534 0.030-10.261 0.256-5.951 0.36h-40.38c5.644 15.906 8.722 33.094 8.722 50.95 0 85.429-64.751 154.234-150.13 154.234-66.702 0-114.675-32.222-137.918-83.428-2.921-6.25-4.625-13.571-4.625-21.289 0-28.337 22.972-51.309 51.309-51.309 18.576 0 34.846 9.872 43.851 24.655l0.129 0.226 5.028 9.646c7.183 12.416 19.139 18.881 42.228 18.881 27.193 0 47.461-21.55 47.461-51.617 0-26.168-20.164-48.025-46.384-50.95h-620.53c-28.313-0.032-51.252-22.992-51.252-51.309 0-26.201 19.64-47.816 45.001-50.924l0.248-0.025 6.003-0.36 614.475-0.308c3.232 0 6.465 0.102 9.697 0.256l177.631 0.102 3.079-0.308 9.697-0.41c32.411-3.514 57.417-30.729 57.417-63.783 0-35.421-28.715-64.136-64.136-64.136-25.171 0-46.954 14.499-57.454 35.602l-0.168 0.373-4.977 11.596c-8.715 16.628-25.852 27.778-45.595 27.778-28.337 0-51.309-22.972-51.309-51.309 0-6.208 1.103-12.159 3.123-17.667l-0.114 0.356c24.138-64.356 85.138-109.33 156.644-109.34h0.001zM396.555 794.199c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0zM499.172 75.874c0.176 0 0.382-0.001 0.59-0.001 120.433 0 218.063 97.63 218.063 218.063 0 120.226-97.295 217.727-217.442 218.062h-450.165c-28.313-0.032-51.252-22.992-51.252-51.309 0-26.201 19.64-47.816 45.001-50.924l0.248-0.025 6.003-0.36 456.854-0.256c60.243-4.286 107.492-54.211 107.492-115.171 0-63.758-51.687-115.445-115.445-115.445-63.752 0-115.435 51.676-115.445 115.426v0.001c0 28.337-22.972 51.309-51.309 51.309s-51.309-22.972-51.309-51.309v0c0-120.433 97.63-218.062 218.062-218.062v0zM883.989 229.801c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0zM191.319 152.838c21.253 0 38.482 17.229 38.482 38.482s-17.229 38.482-38.482 38.482v0c-21.253 0-38.482-17.229-38.482-38.482s17.229-38.482 38.482-38.482v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherRain","tags":["WeatherRain"],"codePoint":59656},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 56.889c180.282 0 282.511 119.353 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.781 0 209.652 93.811 209.75 209.57v0.009c-0.129 115.744-93.988 209.523-209.75 209.523-0.12 0-0.24 0-0.36 0h-33.091l-90.055 149.959c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-107.349h-121.515l-90.055 150.016c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-107.349h-121.572l-89.999 150.016c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.365-107.349h-32.028c-0.101 0-0.221 0-0.341 0-115.741 0-209.588-93.747-209.75-209.45v-0.016c0.161-115.719 94.008-209.466 209.75-209.466 0.1 0 0.2 0 0.3 0h4.535c15.019-145.18 117.191-263.51 297.415-263.51z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherRainSnow","tags":["WeatherRainSnow"],"codePoint":59657},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M656.156 827.904c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 56.889c180.282 0 282.511 119.353 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.781 0 209.652 93.811 209.75 209.57v0.009c-0.129 115.744-93.988 209.523-209.75 209.523-0.12 0-0.24 0-0.36 0h-74.335c-5.583 17.508-21.703 29.965-40.732 29.965s-35.149-12.459-40.649-29.664l-0.084-0.303h-317.44l-90.055 149.504c-7.517 12.829-21.236 21.308-36.936 21.308-23.564 0-42.667-19.103-42.667-42.667 0-5.795 1.155-11.319 3.248-16.356l-0.104 0.283 2.56-5.233 65.423-106.837h-32.028c-0.101 0-0.221 0-0.341 0-115.781 0-209.652-93.811-209.75-209.57v-0.009c0.161-115.719 94.008-209.466 209.75-209.466 0.1 0 0.2 0 0.3 0h4.535c15.019-145.124 117.191-263.452 297.415-263.452zM487.993 779.606c12.86 7.511 21.363 21.247 21.363 36.968 0 5.808-1.16 11.345-3.263 16.392l0.104-0.283-2.617 5.233-31.631 50.972c-7.499 12.908-21.26 21.448-37.016 21.448-23.564 0-42.667-19.103-42.667-42.667 0-5.869 1.185-11.463 3.329-16.552l-0.105 0.28 2.56-5.177 31.631-50.972c7.511-12.861 21.247-21.365 36.969-21.365 7.859 0 15.22 2.124 21.543 5.831l-0.201-0.109zM798.322 785.238c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSnow","tags":["WeatherSnow"],"codePoint":59658},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M384 861.924c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM640 861.924c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM256 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM768 805.035c23.564 0 42.667 19.103 42.667 42.667s-19.103 42.667-42.667 42.667v0c-23.564 0-42.667-19.103-42.667-42.667s19.103-42.667 42.667-42.667v0zM512 56.945c180.281 0 282.511 119.296 297.359 263.396h4.551c0.101 0 0.221 0 0.341 0 115.741 0 209.588 93.747 209.749 209.449v0.016c-0.129 115.744-93.988 209.523-209.749 209.523-0.12 0-0.24 0-0.36 0h-603.8c-0.101 0-0.221 0-0.341 0-115.761 0-209.62-93.779-209.749-209.509v-0.012c0.161-115.719 94.008-209.465 209.749-209.465 0.1 0 0.2 0 0.3 0h4.535c15.019-145.124 117.191-263.452 297.415-263.452z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSnowflake","tags":["WeatherSnowflake"],"codePoint":59659},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M230.86 720.997c-9.408 10.393-22.949 16.895-38.007 16.895-28.277 0-51.2-22.924-51.2-51.2 0-12.69 4.616-24.301 12.262-33.247l-0.059 0.071 79.052-90.316h-181.708c-26.164-0.004-47.741-19.631-50.817-44.964l-0.024-0.246-0.359-5.99c0.004-26.164 19.631-47.741 44.964-50.817l0.246-0.024 5.99-0.359h142.592l-79.104-89.6c-7.958-8.984-12.82-20.872-12.82-33.894 0-28.288 22.932-51.219 51.219-51.219 15.265 0 28.969 6.678 38.353 17.27l0.047 0.054 138.802 157.388h130.458v-130.56l-157.286-138.802c-10.652-9.427-17.334-23.134-17.334-38.4 0-10.765 3.323-20.755 8.998-28.999l-0.113 0.173 3.942-5.069c9.426-10.639 23.124-17.312 38.381-17.312 10.752 0 20.73 3.314 28.968 8.976l-0.173-0.113 5.12 3.942 89.497 79.052 0.052-142.489c0-0.012 0-0.026 0-0.042 0-24.1 16.65-44.31 39.074-49.755l0.35-0.072 5.785-1.024 5.99-0.307c26.164 0.004 47.741 19.631 50.817 44.964l0.024 0.246 0.359 5.99-0.052 143.257 90.624-79.052c8.923-7.748 20.654-12.472 33.489-12.472 28.277 0 51.2 22.924 51.2 51.2 0 15.256-6.672 28.952-17.256 38.331l-0.054 0.047-158.002 137.932v130.354h130.458l138.342-157.491c9.432-10.715 23.177-17.441 38.493-17.441 10.704 0 20.64 3.284 28.858 8.9l-0.176-0.114 5.069 3.942c10.696 9.431 17.408 23.164 17.408 38.465 0 10.716-3.292 20.663-8.92 28.885l0.113-0.175-3.942 5.12-79.002 89.907h142.95c26.164 0.004 47.741 19.631 50.817 44.964l0.024 0.246 0.359 5.99c-0.004 26.164-19.631 47.741-44.964 50.817l-0.246 0.024-5.99 0.359h-143.001l79.104 90.316c7.873 8.958 12.678 20.782 12.678 33.727 0 13.055-4.885 24.967-12.929 34.011l0.046-0.052-4.556 4.556c-8.958 7.873-20.782 12.678-33.727 12.678-13.055 0-24.967-4.885-34.011-12.929l0.052 0.046-4.556-4.556-138.342-157.798h-130.406v130.458l158.054 137.881c10.79 9.437 17.569 23.23 17.569 38.605 0 10.656-3.256 20.552-8.826 28.747l0.114-0.179-3.942 5.12c-9.434 10.759-23.208 17.515-38.558 17.515-10.655 0-20.549-3.254-28.744-8.824l0.179 0.114-5.12-3.892-90.675-79.257v143.308c-0.004 26.164-19.631 47.741-44.964 50.817l-0.246 0.024-5.99 0.359c-26.164-0.004-47.741-19.631-50.817-44.964l-0.024-0.246-0.359-5.99-0.052-142.489-88.883 78.489c-8.978 7.949-20.857 12.802-33.869 12.802-28.278 0-51.201-22.924-51.201-51.201 0-15.266 6.682-28.972 17.279-38.353l0.054-0.047 156.62-138.24v-130.56h-91.597l-138.291 157.798z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSnowShowerDay","tags":["WeatherSnowShowerDay"],"codePoint":59660},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M448.11 921.551c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM678.483 921.551c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM332.924 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM563.296 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM793.669 870.358c21.205 0 38.395 17.19 38.395 38.395s-17.19 38.395-38.395 38.395v0c-21.205 0-38.395-17.19-38.395-38.395s17.19-38.395 38.395-38.395v0zM563.296 205.349c162.234 0 254.23 107.405 267.642 237.028h4.095c0.076 0 0.166 0 0.256 0 104.173 0 188.636 84.391 188.752 188.536v0.011c-0.116 104.157-84.579 188.547-188.752 188.547-0.090 0-0.18 0-0.27 0h-543.46c-0.076 0-0.166 0-0.256 0-104.173 0-188.636-84.391-188.752-188.536v-0.011c0.116-104.157 84.579-188.547 188.752-188.547 0.090 0 0.18 0 0.27 0h4.081c13.464-130.493 105.409-237.028 267.591-237.028zM121.288 418.11c1.839 4.331 2.908 9.371 2.908 14.659 0 14.071-7.569 26.373-18.857 33.058l-0.178 0.097-4.659 2.355-47.405 19.607c-4.333 1.839-9.372 2.91-14.661 2.91-21.205 0-38.395-17.19-38.395-38.395 0-14.041 7.536-26.321 18.785-33.017l0.176-0.097 4.709-2.304 47.405-19.658c4.342-1.849 9.392-2.923 14.695-2.923 15.907 0 29.554 9.672 35.38 23.456l0.095 0.252zM453.383 170.69l-8.806 2.918c-91.279 32.252-156.755 102.695-185.066 195.715l-3.584 12.799-2.97 12.235-10.546 1.945c-32.473 6.974-61.141 19.681-86.278 37.119l0.785-0.515c-17.207-29.085-27.375-64.098-27.375-101.485 0-111.455 90.352-201.807 201.807-201.807 46.077 0 88.547 15.442 122.518 41.434l-0.486-0.356zM48.234 172.225l5.427 1.843 47.405 19.607c14.12 5.884 23.865 19.574 23.865 35.54 0 21.205-17.19 38.395-38.395 38.395-3.368 0-6.634-0.433-9.746-1.248l0.268 0.059-5.324-1.791-47.405-19.658c-13.914-5.975-23.481-19.561-23.481-35.38 0-21.205 17.19-38.395 38.395-38.395 3.21 0 6.328 0.394 9.309 1.136l-0.264-0.055zM243.539 19.361l2.355 4.709 19.607 47.405c1.796 4.286 2.84 9.268 2.84 14.492 0 21.205-17.19 38.395-38.395 38.395-13.993 0-26.237-7.485-32.948-18.67l-0.097-0.174-2.355-4.659-19.607-47.405c-1.839-4.333-2.91-9.372-2.91-14.661 0-21.205 17.19-38.395 38.395-38.395 14.041 0 26.321 7.536 33.017 18.785l0.097 0.176zM466.438 3.081c14.013 5.932 23.665 19.567 23.665 35.457 0 3.297-0.415 6.498-1.197 9.552l0.058-0.266-1.791 5.427-19.607 47.405c-5.958 13.952-19.564 23.552-35.41 23.552-21.205 0-38.395-17.19-38.395-38.395 0-3.254 0.404-6.414 1.167-9.432l-0.056 0.265 1.741-5.375 19.658-47.405c5.923-14.036 19.568-23.708 35.475-23.708 5.302 0 10.352 1.075 14.947 3.018l-0.252-0.095z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSnowShowerNight","tags":["WeatherSnowShowerNight"],"codePoint":59661},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M448.002 921.589c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM678.396 921.589c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM332.805 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM563.199 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM793.593 870.391c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0c-21.207 0-38.399-17.192-38.399-38.399s17.192-38.399 38.399-38.399v0zM563.249 205.729c162.249 0 254.253 107.364 267.666 237.050h4.095c0.061 0 0.133 0 0.205 0 104.165 0 188.623 84.369 188.77 188.5v0.014c-0.116 104.167-84.587 188.564-188.77 188.564-0.090 0-0.18 0-0.27 0h-543.409c-0.076 0-0.166 0-0.256 0-104.183 0-188.653-84.399-188.77-188.554v-0.011c0.145-104.144 84.605-188.514 188.77-188.514 0.090 0 0.18 0 0.27 0h4.081c13.465-130.557 105.419-237.050 267.616-237.050zM234.913 0.525c42.984 2.384 82.585 14.896 117.079 35.169l-1.216-0.661c51.638 30.074 91.21 76.032 112.497 131.093l0.601 1.768c-101.629 28.722-174.332 102.449-204.488 202.030l-3.584 12.595-2.918 12.186-10.547 1.945c-59.299 12.862-109.232 46.283-143.098 92.266l-0.463 0.66-7.935-4.352c-33.875-19.736-61.976-45.745-83.509-76.667l-0.558-0.847c-4.248-6.091-6.787-13.648-6.787-21.799 0-16.573 10.499-30.693 25.208-36.073l0.266-0.085c84.119-30.105 129.43-63.998 155.337-113.456 28.313-54.014 33.536-111.306 14.745-188.257-0.707-2.754-1.111-5.916-1.111-9.173 0-21.207 17.192-38.399 38.399-38.399 0.751 0 1.498 0.022 2.238 0.064l-0.102-0.005z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSunny","tags":["WeatherSunny"],"codePoint":59662},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M511.795 846.892c26.199 0.004 47.806 19.657 50.886 45.025l0.024 0.246 0.359 5.999v74.649c-0.061 28.269-22.992 51.162-51.27 51.162-26.181 0-47.779-19.625-50.885-44.967l-0.025-0.248-0.359-5.947v-74.649c0-28.315 22.955-51.27 51.27-51.27v0zM821.308 747.84l52.808 52.808c8.89 9.207 14.368 21.76 14.368 35.592 0 28.315-22.955 51.27-51.27 51.27-13.857 0-26.431-5.497-35.658-14.43l-52.795-52.743c-9.272-9.279-15.007-22.093-15.007-36.247 0-28.321 22.958-51.279 51.279-51.279 14.167 0 26.992 5.745 36.272 15.032v0zM274.776 747.84c9.274 9.278 15.011 22.093 15.011 36.247s-5.737 26.971-15.011 36.247l-52.756 52.808c-9.279 9.272-22.093 15.007-36.247 15.007-28.321 0-51.279-22.958-51.279-51.279 0-14.167 5.745-26.992 15.032-36.272l52.808-52.808c9.275-9.26 22.080-14.985 36.222-14.985s26.946 5.726 36.223 14.985l-0.001-0.001zM512.513 228.583c156.442 0 283.263 126.821 283.263 283.263s-126.821 283.263-283.263 283.263v0c-156.442 0-283.263-126.821-283.263-283.263s126.821-283.263 283.263-283.263v0zM972.296 461.653c28.291 0.032 51.212 22.974 51.212 51.27 0 26.181-19.625 47.779-44.966 50.885l-0.248 0.025-5.999 0.359h-74.649c-28.269-0.061-51.162-22.992-51.162-51.27 0-26.181 19.625-47.779 44.967-50.885l0.248-0.025 5.947-0.359h74.649zM126.403 460.218c28.269 0.061 51.162 22.992 51.162 51.27 0 26.181-19.625 47.779-44.967 50.885l-0.248 0.025-5.947 0.359h-74.649c-28.291-0.032-51.212-22.974-51.212-51.27 0-26.181 19.625-47.779 44.966-50.885l0.248-0.025 5.999-0.359h74.649zM217.15 146.654l4.87 4.255 52.808 52.808c9.242 9.272 14.955 22.064 14.955 36.192 0 28.315-22.955 51.27-51.27 51.27-11.865 0-22.788-4.030-31.475-10.797l0.114 0.087-4.922-4.307-52.705-52.756c-9.242-9.272-14.955-22.064-14.955-36.192 0-28.315 22.955-51.27 51.27-51.27 11.865 0 22.788 4.030 31.475 10.797l-0.114-0.087zM874.065 150.91c9.277 9.278 15.014 22.094 15.014 36.251 0 11.893-4.049 22.841-10.845 31.538l0.085-0.113-4.255 4.82-52.808 52.808c-9.272 9.242-22.064 14.955-36.192 14.955-28.315 0-51.27-22.955-51.27-51.27 0-11.865 4.030-22.788 10.797-31.475l-0.087 0.114 4.307-4.87 52.756-52.808c9.278-9.274 22.093-15.011 36.247-15.011s26.971 5.737 36.247 15.011v0zM512-0.028c26.199 0.004 47.806 19.657 50.886 45.025l0.024 0.246 0.359 5.999v74.597c-0.032 28.291-22.974 51.212-51.27 51.212-26.181 0-47.779-19.625-50.885-44.966l-0.025-0.248-0.359-5.999v-74.597c0-28.315 22.955-51.27 51.27-51.27v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSunnyHigh","tags":["WeatherSunnyHigh"],"codePoint":59663},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 0.008c21.207 0 38.399 17.192 38.399 38.399v0 25.599c0 21.207-17.192 38.399-38.399 38.399s-38.399-17.192-38.399-38.399v0-25.599c0-21.207 17.192-38.399 38.399-38.399v0zM307.203 358.402c0-113.107 91.691-204.797 204.797-204.797s204.797 91.691 204.797 204.797v0c0 113.107-91.691 204.797-204.797 204.797s-204.797-91.691-204.797-204.797v0zM550.399 652.797c0-21.207-17.192-38.399-38.399-38.399s-38.399 17.192-38.399 38.399v0 25.599c0 21.207 17.192 38.399 38.399 38.399s38.399-17.192 38.399-38.399v0-25.599zM192.005 307.203c-21.207 0-38.399 17.192-38.399 38.399s17.192 38.399 38.399 38.399v0h25.599c21.207 0 38.399-17.192 38.399-38.399s-17.192-38.399-38.399-38.399v0h-25.599zM767.995 345.602c0-21.207 17.192-38.399 38.399-38.399v0h25.599c21.207 0 38.399 17.192 38.399 38.399s-17.192 38.399-38.399 38.399v0h-25.599c-21.207 0-38.399-17.192-38.399-38.399v0zM241.668 193.541c6.839 6.385 16.051 10.305 26.178 10.305 21.207 0 38.399-17.192 38.399-38.399 0-10.128-3.92-19.339-10.327-26.2l0.020 0.023-25.599-25.599c-6.839-6.385-16.051-10.305-26.178-10.305-21.207 0-38.399 17.192-38.399 38.399 0 10.128 3.92 19.339 10.327 26.2l-0.020-0.023 25.599 25.599zM295.94 523.264c-6.947-6.938-16.541-11.231-27.135-11.231s-20.188 4.291-27.136 11.231v0l-25.599 25.599c-7.529 7.029-12.222 17.013-12.222 28.094 0 21.207 17.192 38.399 38.399 38.399 11.081 0 21.064-4.693 28.072-12.199l0.020-0.023 25.599-25.599c6.938-6.947 11.231-16.541 11.231-27.135s-4.291-20.188-11.231-27.136v0zM782.332 193.541c-7.029 7.529-17.013 12.222-28.094 12.222-21.207 0-38.399-17.192-38.399-38.399 0-11.081 4.693-21.064 12.199-28.072l0.023-0.020 25.599-25.599c7.029-7.529 17.013-12.222 28.094-12.222 21.207 0 38.399 17.192 38.399 38.399 0 11.081-4.693 21.064-12.199 28.072l-0.023 0.020-25.599 25.599zM728.060 523.264c6.947-6.938 16.541-11.231 27.135-11.231s20.188 4.291 27.136 11.231v0l25.599 25.599c7.529 7.029 12.222 17.013 12.222 28.094 0 21.207-17.192 38.399-38.399 38.399-11.081 0-21.064-4.693-28.072-12.199l-0.020-0.023-25.599-25.599c-6.938-6.947-11.231-16.541-11.231-27.135s4.291-20.188 11.231-27.136v0zM62.368 1015.595c-6.509 5.242-14.877 8.413-23.985 8.413-12.093 0-22.882-5.591-29.92-14.329l-0.058-0.074c-20.889-26.112 6.092-54.015 6.092-54.015v-0.102l0.82-0.563c2.63-2.129 5.682-4.433 8.807-6.637l0.563-0.377c6.349-4.608 15.513-11.007 27.34-18.637 23.706-15.206 58.060-35.327 101.476-55.347 86.783-40.037 210.736-80.332 358.497-80.332s271.714 40.294 358.497 80.332c39.705 18.337 72.977 36.794 104.772 57.341l-3.295-1.994c14.603 9.417 26.568 17.846 38.201 26.686l-1.492-1.087 0.614 0.512 0.154 0.154 0.154 0.052c8.826 7.099 14.426 17.897 14.426 30.003 0 21.214-17.198 38.413-38.413 38.413-9.109 0-17.477-3.17-24.061-8.468l0.074 0.058-1.536-1.229c-8.059-6.072-17.738-12.816-27.646-19.236l-2.050-1.244c-25.867-16.836-56.068-33.585-87.432-48.261l-4.675-1.966c-79.615-36.761-192.458-73.266-326.293-73.266s-246.678 36.505-326.293 73.266c-39.73 18.33-71.014 36.658-92.159 50.226-11.934 7.664-21.596 14.408-31.014 21.46l1.369-0.98-1.536 1.229z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"WeatherSunnyLow","tags":["WeatherSunnyLow"],"codePoint":59664},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M550.4 38.399c0-21.208-17.192-38.4-38.4-38.4s-38.4 17.192-38.4 38.4v0 76.8c0 21.208 17.192 38.4 38.4 38.4s38.4-17.192 38.4-38.4v0-76.8zM871.937 152.063c6.938 6.947 11.231 16.541 11.231 27.136s-4.291 20.189-11.231 27.137l-54.271 54.323c-6.9 6.677-16.314 10.792-26.69 10.792-21.208 0-38.4-17.192-38.4-38.4 0-10.363 4.105-19.768 10.777-26.675l54.262-54.312c6.95-6.954 16.553-11.256 27.162-11.256s20.212 4.302 27.161 11.256v0zM235.007 563.2c-2.947-15.296-4.633-32.888-4.633-50.874 0-155.524 126.077-281.601 281.601-281.601s281.601 126.077 281.601 281.601c0 17.986-1.686 35.578-4.909 52.626l0.276-1.752h196.66c21.208 0 38.4 17.192 38.4 38.4s-17.192 38.4-38.4 38.4v0h-947.2c-21.208 0-38.4-17.192-38.4-38.4s17.192-38.4 38.4-38.4v0h196.608zM243.2 716.8c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4v0h537.6c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4v0h-537.6zM448 870.401c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4v0h128c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4v0h-128zM152.063 152.063c6.947-6.938 16.541-11.231 27.136-11.231s20.189 4.291 27.137 11.231l54.323 54.271c7.241 6.994 11.736 16.788 11.736 27.634 0 21.208-17.192 38.4-38.4 38.4-10.832 0-20.616-4.486-27.598-11.699l-0.010-0.011-54.323-54.272c-6.954-6.95-11.256-16.553-11.256-27.162s4.302-20.212 11.256-27.161v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarToday","tags":["CalendarToday"],"codePoint":59665},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":956,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M166.933 955.733c-22.4 0-43.733-4.533-64-13.6s-37.955-21.155-53.067-36.267c-15.111-15.111-27.2-32.8-36.267-53.067s-13.6-41.6-13.6-64v-621.867c0-22.4 4.533-43.733 13.6-64s21.156-37.955 36.267-53.067c15.111-15.111 32.8-27.2 53.067-36.267s41.6-13.6 64-13.6h621.867c22.4 0 43.733 4.533 64 13.6s37.955 21.156 53.067 36.267c15.111 15.111 27.2 32.8 36.267 53.067s13.6 41.6 13.6 64v621.867c0 22.4-4.533 43.733-13.6 64s-21.155 37.955-36.267 53.067c-15.111 15.111-32.8 27.2-53.067 36.267s-41.6 13.6-64 13.6h-208.533v-68.267h204.8c13.867 0 27.022-2.667 39.467-8s23.378-12.711 32.8-22.133c9.422-9.422 16.8-20.355 22.133-32.8s8-25.6 8-39.467v-512h-819.2v512c0 13.867 2.667 27.022 8 39.467s12.711 23.378 22.133 32.8c9.422 9.422 20.355 16.8 32.8 22.133s25.6 8 39.467 8h204.8v68.267zM68.267 204.8h819.2v-34.133c0-13.867-2.667-27.022-8-39.467s-12.711-23.378-22.133-32.8c-9.422-9.422-20.355-16.8-32.8-22.133s-25.6-8-39.467-8h-614.4c-13.867 0-27.022 2.667-39.467 8s-23.378 12.711-32.8 22.133c-9.422 9.422-16.8 20.355-22.133 32.8s-8 25.6-8 39.467zM409.6 409.6c0-9.6 1.778-18.489 5.333-26.667s8.445-15.378 14.667-21.6c6.222-6.222 13.422-11.111 21.6-14.667s17.067-5.333 26.667-5.333c9.245 0 18.045 1.778 26.4 5.333s15.645 8.445 21.867 14.667c6.222 6.222 11.111 13.511 14.667 21.867s5.333 17.155 5.333 26.4c0 9.6-1.778 18.489-5.333 26.667s-8.445 15.378-14.667 21.6c-6.222 6.222-13.422 11.111-21.6 14.667s-17.067 5.333-26.667 5.333c-9.6 0-18.578-1.778-26.933-5.333s-15.555-8.355-21.6-14.4c-6.045-6.045-10.845-13.245-14.4-21.6s-5.333-17.333-5.333-26.933zM443.733 721.6l-46.4 38.4c-6.4 5.333-13.689 8-21.867 8-9.245 0-17.245-3.378-24-10.133s-10.133-14.755-10.133-24c0-11.022 4.089-19.733 12.267-26.133l102.4-85.333c6.4-5.333 13.689-8 21.867-8s15.467 2.667 21.867 8l102.4 85.333c8.178 6.4 12.267 15.111 12.267 26.133 0 9.245-3.378 17.245-10.133 24s-14.755 10.133-24 10.133c-8.178 0-15.467-2.667-21.867-8l-46.4-38.4v268.267c0 9.248-3.378 17.248-10.133 24s-14.755 10.133-24 10.133c-9.245 0-17.245-3.381-24-10.133s-10.133-14.752-10.133-24z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"Calendar","tags":["Calendar"],"codePoint":59666},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M809.143 0c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429h-594.286c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429zM216.571 73.143c-19.429 0-37.905 4-55.429 12s-32.762 18.666-45.714 32c-12.952 13.334-23.238 28.857-30.857 46.571s-11.429 36.286-11.429 55.714h877.714v-2.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-514.857h-877.714v514.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM219.429 512c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857zM438.857 512c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857zM804.571 511.429c0 10.286-1.905 19.905-5.714 28.857s-9.048 16.762-15.714 23.429c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.477-11.905 23.429-15.714s18.571-5.714 28.857-5.714c10.286 0 19.809 1.905 28.571 5.714s16.381 8.952 22.857 15.429c6.477 6.477 11.619 14.095 15.429 22.857s5.714 18.286 5.714 28.571zM365.714 731.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.477 11.905-23.429 15.714s-18.571 5.714-28.857 5.714c-10.286 0-19.809-1.905-28.571-5.714s-16.381-8.952-22.857-15.429c-6.477-6.477-11.619-14.095-15.429-22.857s-5.714-18.286-5.714-28.571c0-10.286 1.905-19.905 5.714-28.857s9.048-16.762 15.714-23.429c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714c10.286 0 19.905 1.905 28.857 5.714s16.666 8.952 23.143 15.429c6.477 6.477 11.619 14.191 15.429 23.143s5.714 18.571 5.714 28.857zM585.143 731.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.477 11.905-23.429 15.714s-18.571 5.714-28.857 5.714c-10.286 0-19.809-1.905-28.571-5.714s-16.381-8.952-22.857-15.429c-6.477-6.477-11.619-14.095-15.429-22.857s-5.714-18.286-5.714-28.571c0-10.286 1.905-19.905 5.714-28.857s9.048-16.762 15.714-23.429c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714c10.286 0 19.905 1.905 28.857 5.714s16.666 8.952 23.143 15.429c6.477 6.477 11.619 14.191 15.429 23.143s5.714 18.571 5.714 28.857z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarDay","tags":["CalendarDay"],"codePoint":59667},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M214.857 1024c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429h594.286c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-590.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714h-590.857c-19.048 0-37.238 3.905-54.571 11.714s-32.571 18.286-45.714 31.429c-13.143 13.143-23.619 28.381-31.429 45.714s-11.714 35.523-11.714 54.571v590.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM256 292.571c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857h512c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857zM292.571 804.571c-10.286 0-19.905-1.905-28.857-5.714s-16.666-8.952-23.143-15.429c-6.477-6.477-11.619-14.191-15.429-23.143s-5.714-18.571-5.714-28.857v-219.429c0-10.286 1.905-19.809 5.714-28.571s9.048-16.477 15.714-23.143c6.666-6.666 14.381-11.905 23.143-15.714s18.286-5.714 28.571-5.714h438.857c9.905 0 19.334 1.905 28.286 5.714s16.762 9.048 23.429 15.714c6.666 6.666 11.905 14.477 15.714 23.429s5.714 18.381 5.714 28.286v219.429c0 10.286-1.905 19.809-5.714 28.571s-9.048 16.477-15.714 23.143c-6.666 6.666-14.381 11.905-23.143 15.714s-18.286 5.714-28.571 5.714zM292.571 512v219.429h438.857v-219.429z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"CalendarWeek","tags":["CalendarWeek"],"codePoint":59668},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M214.857 1024c-28.571 0-55.905-5.809-82-17.429s-48.952-27.238-68.571-46.857c-19.619-19.619-35.238-42.477-46.857-68.571s-17.429-53.429-17.429-82v-594.286c0-28.571 5.809-55.905 17.429-82s27.238-48.952 46.857-68.571c19.619-19.619 42.477-35.238 68.571-46.857s53.429-17.428 82-17.429h594.286c28.571 0 55.905 5.81 82 17.429s48.952 27.238 68.571 46.857c19.619 19.619 35.238 42.477 46.857 68.571s17.429 53.429 17.429 82v594.286c0 28.571-5.809 55.905-17.429 82s-27.238 48.952-46.857 68.571c-19.619 19.619-42.477 35.238-68.571 46.857s-53.429 17.429-82 17.429zM807.429 950.857c19.048 0 37.238-3.905 54.571-11.714s32.571-18.286 45.714-31.429c13.143-13.143 23.619-28.381 31.429-45.714s11.714-35.523 11.714-54.571v-590.857c0-19.048-3.905-37.238-11.714-54.571s-18.286-32.571-31.429-45.714c-13.143-13.143-28.381-23.619-45.714-31.429s-35.523-11.714-54.571-11.714h-590.857c-19.048 0-37.238 3.905-54.571 11.714s-32.571 18.286-45.714 31.429c-13.143 13.143-23.619 28.381-31.429 45.714s-11.714 35.523-11.714 54.571v590.857c0 19.048 3.905 37.238 11.714 54.571s18.286 32.571 31.429 45.714c13.143 13.143 28.381 23.619 45.714 31.429s35.523 11.714 54.571 11.714zM219.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714zM475.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714zM731.429 768v-512c0-9.905 3.619-18.477 10.857-25.714s15.809-10.857 25.714-10.857c9.905 0 18.477 3.619 25.714 10.857s10.857 15.809 10.857 25.714v512c0 9.905-3.619 18.477-10.857 25.714s-15.809 10.857-25.714 10.857c-9.905 0-18.477-3.619-25.714-10.857s-10.857-15.809-10.857-25.714z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"repeat","tags":["repeat"],"codePoint":59669},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M384 192c-44.333 0-85.917 8.333-124.75 25s-72.75 39.5-101.75 68.5c-29 29-51.833 62.917-68.5 101.75s-25 80.417-25 124.75c0 27 3.5 54.083 10.5 81.25s17.333 52.583 31 76.25c2 3.667 4.583 7.667 7.75 12s6.25 8.833 9.25 13.5c3 4.667 5.583 9.333 7.75 14s3.25 9 3.25 13c0 8.667-3.167 16.167-9.5 22.5s-13.833 9.5-22.5 9.5c-5.667 0-10.417-1.167-14.25-3.5s-7.583-5.5-11.25-9.5c-12.333-14.333-23.25-30.833-32.75-49.5s-17.417-38.167-23.75-58.5c-6.333-20.333-11.167-40.917-14.5-61.75s-5-40.583-5-59.25c0-35 4.583-68.833 13.75-101.5s22.083-63.25 38.75-91.75c16.667-28.5 36.667-54.417 60-77.75s49.167-43.417 77.5-60.25c28.333-16.833 58.917-29.833 91.75-39s66.917-13.75 102.25-13.75h339l-73.5-73.5c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5c6.333-6.333 13.833-9.5 22.5-9.5s16.167 3.167 22.5 9.5l128 128c6.333 6.333 9.5 13.833 9.5 22.5s-3.167 16.167-9.5 22.5l-128 128c-6.333 6.333-13.833 9.5-22.5 9.5s-16.167-3.167-22.5-9.5c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5l73.5-73.5zM1024 512c0 35.333-4.58 69.25-13.75 101.75s-22.083 63-38.75 91.5c-16.667 28.5-36.667 54.417-60 77.75s-49.167 43.417-77.5 60.25c-28.333 16.833-58.917 29.833-91.75 39s-66.917 13.75-102.25 13.75h-338.5l73 73.5c6.333 6.333 9.5 13.833 9.5 22.5 0 8.67-3.167 16.17-9.5 22.5s-13.833 9.5-22.5 9.5c-8.667 0-16.167-3.17-22.5-9.5l-128-128c-6.333-6.333-9.5-13.833-9.5-22.5s3.167-16.167 9.5-22.5l128-128c6.333-6.333 13.833-9.5 22.5-9.5s16.167 3.167 22.5 9.5c6.333 6.333 9.5 13.833 9.5 22.5s-3.167 16.167-9.5 22.5l-73 73.5h338.5c44.333 0 85.917-8.333 124.75-25s72.75-39.5 101.75-68.5c29-29 51.833-62.917 68.5-101.75s25-80.417 25-124.75c0-19-1.333-36.667-4-53s-6.667-32.167-12-47.5c-5.333-15.333-11.917-30.333-19.75-45s-16.917-29.833-27.25-45.5c-2.333-3.667-4-6.667-5-9s-1.5-5.667-1.5-10c0-8.667 3.083-16.25 9.25-22.75s13.75-9.75 22.75-9.75c5.667 0 10.417 1.167 14.25 3.5s7.583 5.5 11.25 9.5c12.333 14.333 23.25 30.833 32.75 49.5s17.417 38.25 23.75 58.75c6.33 20.5 11.17 41.167 14.5 62s5 40.583 5 59.25z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"space","tags":["space"],"codePoint":32},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 1024v0 0 0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE066","tags":["uniE066"],"codePoint":57446},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M416 449q-13 0-23 9t-9 22q1 14 10 23t22 9h192q13 0 23-9t10-23q0-13-10-22t-23-9h-192zM96 193q0-41 28-69t69-28h638q41 0 69 28t28 69v63q0 43-31 72v424q0 73-52 125-52 51-124 51h-418q-72 0-124-51-52-52-52-125v-424q-31-29-31-72v-63zM193 352v400q0 47 32 79 33 33 78 33h418q45 0 78-33 32-32 32-79v-400h-638zM193 160q-15 0-24 9t-9 24v63q0 12 9 23 9 10 24 10h638q15 0 24-10 9-11 9-23v-63q0-15-9-24t-24-9h-638z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE06C","tags":["uniE06C"],"codePoint":57452},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M438 475q-12 0-19 7t-7 19q0 11 7 19t19 8h137q19-14 37-24 2-12-6-21-8-8-20-8h-148zM330 838h155q9 28 25 53h-180q-64 0-109-45t-45-111v-366q-20-11-32-29-11-18-11-41v-86q0-33 24-56 23-24 56-24h598q33 0 56 24 24 23 24 56v86q0 23-11 41-12 18-32 29v118q-27-8-53-14v-94h-566v356q0 43 30 73t71 30zM213 186q-10 0-18 9-9 8-9 18v86q0 10 9 18 8 9 18 9h598q10 0 18-9 9-8 9-18v-86q0-10-9-18-8-9-18-9h-598zM981 748q0 63-32 116-31 54-85 85-53 32-118 32-64 0-117-32-54-31-85-85-32-53-32-118 0-64 32-117 31-54 85-85 53-32 117-32 65 0 118 32 54 31 85 85 32 53 32 119zM676 676q6-6 6-14 0-9-6-15t-14-6q-9 0-15 6l-65 64q-7 6-7 14t7 16l65 64q6 6 15 6 8 0 14-6t6-15q0-10-6-16l-27-26h119q35 0 60 24 26 25 26 59 0 13 10 19t22 0q11-6 11-19-2-53-39-90-37-36-90-36h-119z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE1F6","tags":["uniE1F6"],"codePoint":57846},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 63q12 0 23 10 10 9 10 23v64q0 14-10 23-11 10-23 10t-23-10q-10-9-10-23v-64q0-14 10-23 11-10 23-10zM512 705q80 0 136-57 57-56 57-136t-57-136q-56-57-136-57t-136 57q-57 56-57 136t57 136q56 57 136 57zM512 639q-53 2-90-36t-37-91 37-91 90-38 90 38 38 91-37 90-91 37zM928 545q14 0 23-10 10-11 10-23t-10-23q-9-10-23-10h-64q-14 0-23 10-10 11-10 23t10 23q9 10 23 10h64zM512 831q12 0 23 10 10 9 10 23v64q0 14-10 23-11 10-23 10t-23-10q-10-9-10-23v-64q0-14 10-23 11-10 23-10zM160 545q14 0 23-10 10-11 10-23t-10-23q-9-10-23-10h-64q-14 0-23 10-10 11-10 23t10 23q9 10 23 10h64zM201 201q10-8 23-8 14 0 22 8l65 65q13 13 7 30-5 17-22 22-17 6-30-7l-65-65q-8-8-8-22 0-13 8-23v0zM246 823q-8 8-22 8-13 0-22-9t-9-22q0-14 8-22l65-65q13-13 30-7 17 5 22 22 6 17-7 30zM823 201q-10-8-23-8-14 0-22 8l-65 65q-8 8-8 22 0 13 9 22t22 9q14 0 22-8l65-65q8-8 8-22 0-13-8-23v0zM778 823q8 8 22 8 13 0 22-9t9-22q0-14-8-22l-65-65q-8-8-22-8-13 0-22 9t-9 22q0 14 8 22z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE25A","tags":["uniE25A"],"codePoint":57946},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M735 127q68 0 115 47t47 115v117q-27-37-66-60v-57q0-41-27-69-28-27-69-27h-446q-41 0-69 27-27 28-27 69v30h512v5q-68 10-111 61h-401v350q0 41 27 69 28 27 69 27h162q6 35 20 66h-182q-68-2-115-48t-47-114v-446q2-68 48-115t114-47h446zM864 512q0 53-38 90t-91 37-90-37-37-90 37-90 90-38 91 37 38 91zM961 801q0 65-54 108-59 52-171 52-111 0-173-52-51-43-51-108 0-41 28-69 27-27 68-27h256q39 0 68 27 29 28 29 69z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE2F4","tags":["uniE2F4"],"codePoint":58100},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 102q127 0 231 72 105 72 151 191 46 118 16 242-29 124-124 209-94 85-220 102-126 16-238-41l-6-3-187 48q-12 2-21-6-10-7-12-17v-4l48-193-3-6q-36-69-43-147l-2-37q0-111 56-205 55-94 149-149 94-56 205-56zM512 154q-96 0-178 47t-131 130-49 178 45 179q4 6 4 12l-39 160 153-39h11l8 4q98 56 211 44 112-11 197-85 85-73 114-182 29-108-10-214-39-105-131-170-92-64-205-64v0zM512 281q10 0 18 8 9 8 9 18v281q0 12-9 19-8 7-18 7t-18-7q-9-7-9-17v-283q2-10 10-18 7-8 17-8zM512 741q16 0 28-10 11-10 11-26 0-17-11-28-12-11-28-11t-28 11q-11 11-11 28 0 16 11 27 12 11 28 9z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE47E","tags":["uniE47E"],"codePoint":58494},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M590 205q0-33-23-55-22-23-55-22t-54 23q-22 21-22 54h154zM385 205q0-53 37-90t90-38 90 37 37 91h258q10 0 17 7 8 7 8 18 0 12-8 19-7 7-17 7h-55l-25 215q-24-6-51-8l25-207h-558l62 524q4 39 33 65 28 25 67 25h97q14 27 32 52h-129q-57 0-101-39t-50-97l-62-530h-53q-12 0-19-7-8-7-8-19 0-11 8-18 7-7 19-7h256zM973 741q0 64-31 117t-84 84-116 31q-62 0-115-31-54-31-84-84-31-53-31-116 0-62 31-115 30-54 84-84 53-31 115-31 63 0 116 31 53 30 84 84 31 53 31 114zM838 684q8-8 8-18 0-11-8-19-9-8-19-8t-18 8l-58 60-59-60q-8-8-18-8-11 0-19 8t-8 19q0 10 8 18l60 57-60 60q-8 8-8 18t8 19q8 8 19 8 10 0 18-8l59-60 58 60q8 8 18 8t19-8q8-9 8-19t-8-18l-60-60z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE5ED","tags":["uniE5ED"],"codePoint":58861},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M449 705q0-27 18-46 18-18 45-19t45 18q18 20 18 47 0 26-18 45-18 18-45 18t-45-18q-18-19-18-45zM471 291q2-15 13-25 12-10 28-10t28 10q11 10 13 25l2 8v221q-4 15-15 25-12 10-28 10t-28-10q-11-10-13-25l-2-8v-213zM938 512q0 115-56 214-57 99-156 156-99 56-214 56t-214-56q-99-57-156-156-56-99-56-215t57-213q58-97 155-155 97-57 214-57t214 57q97 58 155 155 57 97 57 214zM854 512q0-92-46-171t-125-125-171-46-171 46-125 125-46 171 46 171 125 125 171 46 171-46 125-125 46-171z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE643","tags":["uniE643"],"codePoint":58947},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M129 319v386q-2 53 36 90 38 36 91 36h512q53 0 91-36 38-37 36-90v-322q2-51-36-89t-91-38h-309l-72-57q-8-6-18-6h-113q-53 0-90 36-37 37-37 90v0zM193 319q0-26 18-45 18-18 45-18h100l56 45-56 51h-163v-33zM485 319h283q27 0 45 20 18 19 18 46v320q0 26-18 45-18 18-45 18h-512q-27 0-45-18-18-19-18-45v-289h176q12 0 20-8z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE645","tags":["uniE645"],"codePoint":58949},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M129 256v383q-2 53 36 91t91 38h78q-10-31-12-63h-66q-27 0-45-20-18-19-18-44v-289h176q12 0 20-8l96-88h283q27 0 45 18 18 19 18 45v39q35 19 66 43v-82q0-53-38-90-38-36-91-36h-309l-72-58q-8-6-18-8h-113q-53 2-90 39t-37 90v0zM193 256q0-27 18-45t45-18h100l56 43-56 53h-163v-33zM672 961q78 0 144-39 67-39 106-106 39-66 39-144t-39-145q-39-66-106-105-66-39-144-38t-145 39q-66 38-105 104-39 67-39 145t39 144q39 67 105 106 67 39 145 39zM672 512q14 0 23 9 10 9 10 24v94h96q12 0 21 10t9 24q0 13-9 22-9 10-21 10h-96v96q0 12-10 21-9 9-22 9-14 0-24-9t-10-21v-96h-94q-15 0-24-10-9-9-9-22 0-14 9-24t24-10h96v-94q0-15 9-24t22-9z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE715","tags":["uniE715"],"codePoint":59157},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M867 128q32 0 60 13 29 12 50 34 21 21 34 49 13 29 13 60v519q0 32-13 60-12 29-34 50-21 21-49 34-29 13-60 13h-711q-32 0-60-13-29-12-50-34-21-21-34-49-13-29-13-60v-519q0-32 13-60 12-29 34-50 21-21 49-34 29-13 60-13h711zM160 192q-19 0-37 7-17 8-31 21-13 13-20 31-8 17-8 37v14l448 268 448-268v-14q0-19-7-37-8-17-21-31-13-13-31-20-17-8-37-8h-704zM864 896q19 0 37-7 17-8 31-21 13-13 20-31 8-17 8-37v-423l-431 258q-8 5-17 5t-16-4l-432-259v423q0 19 7 37 8 17 21 31 13 13 31 20 17 8 37 8h704z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE71C","tags":["uniE71C"],"codePoint":59164},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M352 704h320q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-320q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11zM224 448h576q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-576q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11zM96 192h832q13 0 23 9 9 9 9 23 0 11-7 20-8 9-19 11l-6 1h-832q-13 0-23-9-9-9-9-23 0-11 7-20 8-9 19-11z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE723","tags":["uniE723"],"codePoint":59171},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M128 800q0-32 12-61t35-52l350-350q9-9 22-9t23 9q9 9 9 22t-9 23l-350 350q-13 13-20 31-8 17-8 36 0 20 7 38 8 17 21 30t30 21q18 7 38 7 19 0 36-6 18-7 31-21l420-411q27-27 42-63 15-35 15-73t-15-73q-14-35-40-62-25-26-60-42-34-16-73-16-40 0-76 14-35 13-64 42l-384 384q-9 9-22 9t-23-9q-9-9-9-22t9-23l384-384q20-20 40-34t43-23q22-9 46-14 24-4 52-4 53 0 100 20 46 21 81 56t55 82q20 46 20 99 0 25-5 50t-15 48q-10 24-24 45t-32 38l-419 412q-23 22-53 34-29 11-61 11-33 0-62-12-29-13-50-35-21-21-34-50-12-29-13-62z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_star_regular","tags":["ic_fluent_star_regular"],"codePoint":59188},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M454.5 57.5q8.5-17 24.5-26.5 15.5-9 33.25-9t32.75 9q16 9.5 24.5 26.5l123.5 250.5 276.5 40q19 3 33 15 13 11.5 18.5 28.5t1.5 34q-4 18.5-18 31.5l-199.5 195 47 275q3.5 19-4 36.5-7 16-21.5 26.5t-32 12q-18.5 1.5-35.5-7.5l-247-129.5-247 129.5q-17 9-35.5 7.5-17.5-1.5-32-12t-21.5-26.5q-7-17.5-4-36.5l47.5-275-200-195q-14-13-18-31.5-4-17 1.5-34t19-28.5q14-12 33-15l276-40zM512 86l-123.5 250q-7 14.5-19.75 23.75t-28.25 11.25l-276.5 40.5 200 194.5q11.5 11.5 16.25 26.5t2.25 30.5l-47.5 275 247.5-130q14-7 29.75-7t29.75 7l247 130-47-275q-3-15.5 2-30.5t16-26.5l200-194.5-276-40.5q-16-2-28.75-11.25t-19.75-23.75z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE7AA","tags":["uniE7AA"],"codePoint":59306},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M870 741v-209q27-14 52-32v241q0 54-38 92-38 37-91 37h-562q-53 0-91-37-38-38-38-90v-411q0-51 38-89t89-38h242q-6 24-8 51h-232q-32 0-55 23-22 22-22 53v16l358 211 74-43q24 16 53 27l-115 67q-10 6-20 2l-350-204v333q0 33 22 56 23 22 55 22h564q30 0 53-22 22-23 22-56v0zM512 281q0 63 31 116 30 54 84 84 53 31 115 31 63 0 116-31 53-30 84-84 31-53 31-115 0-63-31-116t-84-84-116-31q-62 0-115 31-54 31-84 84-31 53-31 115zM788 147q9-6 19-6t18 6l88 91q9 8 9 18t-9 18l-88 91q-8 6-18 6t-19-7q-8-8-8-18t8-18l46-47h-78q-37 0-64 26-26 27-26 64v12q0 12-8 19-7 8-18 8t-18-8q-8-7-8-17v-14q0-58 41-100t101-42h78l-46-45q-8-8-8-18t8-19z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE7B8","tags":["uniE7B8"],"codePoint":59320},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M412 256h-105q-43 0-73 30-29 29-29 72v205h180q10 0 17 7 8 8 8 18v4q2 26 13 49t30 35q22 14 59 15t59-15q19-12 31-35 4-10 8-24 4-13 4-27v-2q0-10 8-18 7-7 19-7h178v-31q27-14 51-32v268q0 63-45 109-45 45-108 45h-410q-63 0-108-45-45-46-45-109v-410q0-63 45-108t108-45h113q-6 24-8 51v0zM360 614h-155v154q0 43 29 73 30 29 73 29h410q43 0 73-29 29-30 29-73v-154h-155q-5 27-17 50-16 34-47 55-37 22-88 23t-88-23q-31-21-47-55-12-23-17-50v0zM692 512q62 0 115-31 53-30 84-84 31-53 31-115 0-63-31-116t-84-84-116-31q-62 0-116 31-53 31-83 84-31 53-31 116 0 62 31 115 30 54 83 84 54 31 115 31h2zM571 299q-8-6-8-17 0-12 7-19 8-7 19-7t17 8l60 58v-144q0-10 7-17t18-7 19 7q7 7 7 17v144l59-58q6-8 18-8 11 0 18 7t7 19q0 11-8 17l-102 102q-7 9-17 9h-2q-10 0-16-9z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE7D0","tags":["uniE7D0"],"codePoint":59344},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M750 512q65 0 119-32 55-31 86-87 32-55 32-120 0-64-32-118-31-55-86-86-54-32-118-32-65 0-120 32-56 31-87 86-32 54-32 118 0 65 32 120 31 56 87 87 55 32 119 32zM750 457q-60 0-109-35l256-256q31 41 35 93t-20 98q-23 46-67 73t-95 27zM858 127l-256 256q-39-55-35-123 4-67 53-116 48-48 115-53 68-5 123 36zM860 526v201q-2 25-20 42-19 17-45 17h-572q-24-2-42-20-17-18-17-43v-324l340 176q10 3 20-2l103-53q-29-14-54-35l-61 33-348-180v-41q2-25 20-42 19-17 45-17h248q4-29 15-56h-271q-47 4-79 38-31 34-31 81v428q2 47 36 80 35 33 82 33h574q47-4 79-38 31-34 31-81v-229q-24 18-53 32v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE824","tags":["uniE824"],"codePoint":59428},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M319 512q0 27-18 45t-45 18-45-18-18-45 18-45 45-18 45 18 18 45zM575 512q0 27-18 45t-45 18-45-18-18-45 18-45 45-18 45 18 18 45zM768 575q27 0 45-18t18-45-18-45-45-18-45 18-18 45 18 45 45 18z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE84D","tags":["uniE84D"],"codePoint":59469},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M289 205q10-10 9-24-1-13-10-22t-22-9q-12 0-22 8l-84 86-21-21q-8-10-21-9-14 1-23 10t-9 22q0 12 8 22l43 43q10 8 24 8 13 0 21-8zM416 768h491q13 0 22 9t10 22q1 12-7 21t-21 11h-495q-13 0-22-8t-10-20 7-23q8-10 21-12h4zM416 492h491q13 0 22 8t10 20-7 23q-8 10-21 12h-495q-13 0-22-9t-10-22q-1-12 7-21t21-11h4zM416 213h491q13 0 22 9t10 22q1 12-7 21t-21 11h-495q-13 0-22-8t-10-20 7-23q8-10 21-12h4zM289 713q10 10 10 23 0 14-10 22l-107 106q-8 10-21 10-14 0-24-10l-43-41q-14-14-9-32 5-19 24-23 18-4 30 10l21 19 84-84q10-8 23-8 14 0 22 8v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE895","tags":["uniE895"],"codePoint":59541},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M1024 96v256q0 13-9 22-10 10-23 10h-256q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h180q-27-60-70-107-42-48-96-81-53-33-115-50-62-18-127-18-56 0-110 14-53 15-101 41-48 27-89 64-41 38-72 84-19 29-33 62-4 8-7 17-2 8-6 16-6 10-12 16t-18 6q-13 0-23-9-9-10-9-23 0-6 1-10 26-75 74-138 48-62 111-108 63-45 138-71 75-25 154-25 71 0 138 18t126 52q58 33 107 83 49 49 83 111v-168q0-13 9-22 10-10 23-10t22 9q10 10 10 23zM990 672q0 8-7 25-6 17-15 35t-19 34q-9 17-14 25-36 53-83 96-46 43-101 73-54 31-115 47-61 17-125 17-69 0-135-17-65-16-123-49-57-32-106-79-48-47-83-107v156q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-256q0-13 9-22 10-10 23-10h256q13 0 22 9 10 10 10 23t-9 22q-10 10-23 10h-187q27 60 70 107 43 48 96 81t115 50q62 18 127 18 56 0 109-14 54-14 102-41 48-26 89-64 41-37 72-84 19-29 33-62 4-8 7-17 2-8 6-16 6-10 12-16t18-6q14 0 23 9 10 9 10 23z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE8FA","tags":["uniE8FA"],"codePoint":59642},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M192 251q0-52 21-98 20-45 56-79 35-34 81-54t98-20q51 0 98 20 46 19 81 53t56 80 21 98q0 33-6 63-7 30-22 59-68 11-127 46 44-28 67-71 24-44 24-96 0-39-15-73-16-34-42-60-26-25-61-40t-74-15q-40 0-75 15t-61 41-41 61-15 75q0 38 15 73 14 35 40 62 25 26 60 41 34 16 73 16 27 0 52-6 24-6 48-20-58 35-99 90h-1q-50 0-96-20-45-20-80-55-35-34-55-80-21-45-21-96v-10zM448 736q0-59 23-112 22-52 61-91t92-62q52-23 112-23 39 0 76 10t69 29 58 45q27 27 46 59 18 32 29 69 10 36 10 76 0 59-23 112-22 52-61 91t-92 62q-52 23-112 23t-112-22q-53-23-92-62t-61-91q-23-53-23-113zM0 702q0-25 10-48t28-40q17-17 40-28 22-10 47-10h279q-6 15-13 31-6 16-10 33h-253q-13 0-25 5-11 5-20 14-9 8-14 20-5 11-5 25 0 50 17 89 16 38 45 67 29 28 67 48 37 19 80 30 42 12 86 17t85 5q13 17 28 33 15 15 33 29-14 1-28 1-14 1-29 1-65 0-131-9t-126-36q-44-20-79-48-35-27-60-61-25-35-38-77-14-42-14-91zM768 768h96q13 0 22-9 10-10 10-23t-9-22q-10-10-23-10h-96v-96q0-13-9-22-10-10-23-10t-22 9q-10 10-10 23v96h-96q-13 0-22 9-10 10-10 23t9 22q10 10 23 10h96v96q0 13 9 22 10 10 23 10t22-9q10-10 10-23v-96z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uni0000","tags":["uni0000"],"codePoint":59648},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 1024v0 0 0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uni0001","tags":["uni0001"],"codePoint":59649},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 1024v0 0 0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE900","tags":["uniE900"],"codePoint":59650},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 1024v0 0 0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE901","tags":["uniE901"],"codePoint":59651},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 1024v0 0 0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE902","tags":["uniE902"],"codePoint":59652},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M486 1024h-486v-486h486v486zM1024 1024h-486v-486h486v486zM486 486h-486v-486h486v486zM1024 486h-486v-486h486v486z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE903","tags":["uniE903"],"codePoint":59653},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M522 439v175h291q-5 29-22 67-18 38-52 72t-88 58q-53 24-129 24-65 0-123-25-58-26-101-69-43-44-68-103t-25-126 25-126 68-102q43-44 101-70 58-25 123-25 75 0 125 25 51 26 79 54l139-134q-33-31-72-56-38-25-81-42-43-18-90-27-48-9-100-9-106 0-199 40t-162 109q-70 70-111 164-40 93-40 199t40 199q41 94 110 163 70 70 163 110t199 40q111 0 202-37 90-37 154-103 65-67 101-159 35-92 35-201 0-25-2-45-3-21-6-40h-484z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_arrow_reply_regular","tags":["ic_fluent_arrow_reply_regular"],"codePoint":59770},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M342.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-233 233.5h434.5q97.5 0 187 37.5 86 36.5 152.5 103t103 152.5q37.5 89.5 37.5 187 0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75q0-84.5-32.5-162-32-74.5-89.5-132t-132-89.5q-77.5-32.5-162-32.5h-434.5l233 233.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE985","tags":["uniE985"],"codePoint":59781},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M612 657l293 293q10 11 24 11 13 0 22-10 10-9 10-22 0-14-11-24l-831-831q-10-11-24-11-13 0-22 10-10 9-10 22 0 14 11 24l293 293-5 10-180 59q-16 6-20 24-4 17 8 30l137 137-170 170-8 53 53-8 170-170 137 137q13 12 30 8 18-4 24-20l59-180zM565 610l-4 2q-12 6-16 19l-47 141-246-246 141-47q13-4 19-16l2-4zM813 477l-131 70 47 47 115-62q43-22 50-70t-28-81l-223-225q-14-15-37-23-22-8-45-4-22 4-41 17-18 14-28 32l-62 117 47 47 70-133q8-14 24-16 17-3 27 8l223 225q13 10 9 27-3 16-17 24v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEA43","tags":["uniEA43"],"codePoint":59971},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M256 193q-27 0-45 18t-18 45v512q0 27 18 45t45 18v-223q0-41 28-68 27-28 68-28h320q41 0 68 28 28 27 28 68v223q27 0 45-18t18-45v-408q0-26-18-45l-104-104q-19-18-45-18h-23v96q0 39-29 66-28 28-67 28h-129q-39 0-68-28-29-27-29-66v-96h-63zM385 193v96q0 12 9 21t22 9h129q12 0 21-9t9-21v-96h-190zM705 831v-223q0-14-10-23-9-10-23-10h-320q-14 0-23 10-10 9-10 23v223h386zM129 256q0-53 37-90t90-37h408q53 0 92 37l102 102q37 39 37 92v408q0 53-37 90t-90 37h-512q-53 2-90-36t-37-91v-512z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEA7D","tags":["uniEA7D"],"codePoint":60029},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M432 96q-92 0-169 45t-122 122-45 169 45 169 122 122 169 45q121 0 213-78l227 230q11 8 24 8t23-9q9-10 9-23t-8-24l-230-227q39-45 59-99 19-54 19-114 0-92-45-169t-122-122-169-45v0zM160 432q0-74 37-136 36-63 99-99 62-37 136-37t136 37q63 36 100 99 37 62 37 136t-37 136q-37 63-100 100-62 37-136 37t-136-37q-63-37-99-100-37-62-37-136v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEA8E","tags":["uniEA8E"],"codePoint":60046},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M76 72q16-15 35-4l831 415q19 9 19 29t-19 29l-831 415q-19 11-35-4-17-14-10-32l124-408-124-408q-7-18 10-32v0zM248 545l-98 321 706-354-706-354 98 321h360q13 0 23 10 10 11 10 23t-10 23q-10 10-23 10h-360z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_document_pdf_regular","tags":["ic_fluent_document_pdf_regular"],"codePoint":60048},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M288 576q-13 0-22.5 9.25t-9.5 22.75v128q0 13.5 9.5 22.75t22.75 9.25 22.5-9.25 9.25-22.75v-10.5h21.5q20 0 37.25-10t27.25-27.25 10-37.5-10-37.5-27.25-27.25-37.25-10h-53.5zM341.5 661.5h-21.5v-21.5h21.5q4.5 0 7.5 3.25t3 7.5-3 7.5-7.5 3.25zM640 608q0-13.5 9.5-22.75t22.5-9.25h64q13 0 22.5 9.25t9.5 22.75-9.5 22.75-22.5 9.25h-32v21.5h32q13 0 22.5 9.25t9.5 22.5-9.5 22.75-22.5 9.5h-32v10.5q0 13-9.25 22.5t-22.5 9.5-22.75-9.25-9.5-22.75v-128zM480 576q-13.5 0-22.75 9.25t-9.25 22.75v128q0 13.5 9.25 22.75t22.75 9.25h32q26 0 48-13t35-35 13-48-13-48-35-35-48-13h-32zM512 704v-64q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25zM128 128q0-35 17.25-64.25t46.75-46.5 64-17.25h293.5q19 0 36.75 7.25t31.25 20.75l250.5 250.5q13.5 13.5 20.75 31.25t7.25 36.75v106.5q28.5 10.5 46.25 35.25t17.75 55.25v256.5q0 31-17.75 55.75t-46.25 34.75v5.5q0 35-17.25 64.25t-46.5 46.5-64.25 17.25h-512q-34.5 0-64-17.25t-46.75-46.5-17.25-64.25v-5.5q-28.5-10-46.25-34.75t-17.75-55.75v-256.5q0-30.5 17.75-55.25t46.25-35.25v-325zM832 384h-224q-26 0-48-13t-35-35-13-48v-224h-256q-17.5 0-32 8.5t-23.25 23.25-8.75 32.25v319.5h640v-63.5zM192 896q0 17.5 8.75 32.25t23.25 23.25 32 8.5h512q17.5 0 32.25-8.5t23.25-23.25 8.5-32.25h-640zM576 77.5v210.5q0 13.5 9.5 22.75t22.5 9.25h211zM160 511.5q-13 0-22.5 9.5t-9.5 22.5v256.5q0 13 9.5 22.5t22.5 9.5h704q13 0 22.5-9.5t9.5-22.5v-256.5q0-13-9.5-22.5t-22.5-9.5h-704z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEBDA","tags":["uniEBDA"],"codePoint":60378},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M128 192v-4q0-39 15-73 16-34 42-60 27-25 62-40 34-15 73-15 40 0 75 15t61 41 41 61 15 75-15 75-41 61-61 41-75 15-75-15-61-41-41-61-15-75zM448 192v-2q0-26-10-49-11-23-28-40-18-17-41-27t-49-10-50 10q-23 10-40 28-17 17-28 40-10 24-10 50t10 50q10 23 28 40 17 17 40 28 23 10 50 10 26 0 49-10 24-10 41-28 17-17 28-40 10-23 10-50zM640 317q0-25 10-48 11-23 28-40 18-17 41-27t49-10 49 10q24 10 41 28 17 17 28 40 10 24 10 50 0 25-10 49-10 23-27 40-17 18-40 28-22 11-48 11-28 0-52-10t-41-27q-18-18-28-42-10-23-10-52zM832 320q0-13-5-25-5-11-14-20-8-9-20-14t-25-5-25 5q-11 5-20 14-9 8-14 20-5 11-5 25 0 13 5 25t13 20q9 9 21 14 11 5 25 5 13 0 25-5 11-5 20-14 9-8 14-20 5-11 5-25zM515 384q25 0 48 10 23 11 40 28 17 18 27 41t10 49-10 50q-10 23-27 41-17 17-41 27-23 10-50 10-25 0-49-10-23-10-40-27-18-17-28-40-11-22-11-48 0-28 10-52t27-41q18-18 42-28 23-10 52-10zM96 448h235q-11 30-11 64h-224q-11 0-17 4-7 4-10 11t-4 15-1 17v17q0 30 11 57 12 26 31 48t44 39q24 17 51 27-5 16-7 32t-2 33q-37-12-72-34-35-23-61-53-27-30-43-67t-16-79v-35q0-19 7-37 8-17 21-31 13-13 31-20 17-8 37-8zM517 576q12 0 23-6 11-5 19-14t12-21q5-11 5-23 0-13-5-25-5-11-14-20-8-9-20-14t-25-5-25 5q-11 5-20 14-9 8-14 20-5 11-5 25 0 15 5 27 6 12 15 20t22 13q13 4 27 4zM832 800q0-19-4-38 29-6 53-20 25-13 42-32 18-20 27-45 10-26 10-57 0-13-9-22-10-10-23-10h-235q11-30 11-64h224q19 0 37 7 17 8 31 21 13 13 20 31 8 17 8 37 0 45-14 81-14 37-40 65-25 27-61 46-35 18-78 26 0-6 1-13v-13zM256 800q0-20 7-37 8-18 21-31t30-20q18-8 38-8h320q20 0 37 7 18 8 31 21t20 30q8 18 8 38 0 55-21 97-21 41-56 70-35 28-82 42-46 15-97 15t-97-14q-47-14-82-43-35-28-56-70t-21-97zM704 800q0-13-9-22-10-10-23-10h-320q-13 0-22 9-10 10-10 23 0 41 16 72 16 30 43 49 26 20 61 29 34 10 72 10 37 0 72-9 34-10 61-29 27-20 43-50t16-72z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEE44","tags":["uniEE44"],"codePoint":60996},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M502 193q112 10 194 87 82 76 98 188 15 112-42 208-58 96-163 136-106 40-212 4-107-36-168-130 84-22 147-68 82-61 119-159 45-123 27-266v0zM862 512q-2-78-32-150-29-71-86-125-56-55-129-83-72-29-152-25-14 0-24 11-9 12-5 26 27 147-18 270-35 92-119 146-61 36-143 51-15 4-22 17-7 14-1 28 39 80 108 134 68 54 153 74 85 19 171 0 86-20 154-74 67-54 106-133t37-167h2z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEE8E","tags":["uniEE8E"],"codePoint":61070},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M449 289q0-15-10-24-9-9-22-9-14 0-24 9t-10 24v94h-94q-15 0-24 10t-9 24q0 13 9 22 9 10 24 10h96v96q0 12 9 21t23 9q13 0 22-9 10-9 10-21v-96h96q12 0 21-10 9-9 9-22 0-14-9-24t-21-10h-96v-94zM416 705q100 0 180-64l246 246q8 10 21 10 14 0 24-10t10-24q0-13-10-21l-246-246q64-80 64-180 0-101-63-179-62-79-161-102-98-22-189 22t-135 134-22 188q23 99 102 162 78 64 179 64v0zM416 193q61 0 112 29 52 30 81 81 30 51 31 113 1 61-30 112-30 52-82 81-51 30-112 30-62 0-113-30-51-29-81-81-29-51-29-112 0-62 29-113 30-51 81-81 51-29 113-29v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEEA6","tags":["uniEEA6"],"codePoint":61094},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M432 209v14h160v-14q0-35-24-58-23-24-56-24t-56 24q-24 23-24 58v0zM369 223v-14q0-62 42-104t101-42 101 42 42 104v14h242q12 0 22 10 9 11 9 23t-9 23q-10 10-22 10h-49l-62 528q-6 62-51 103t-106 41h-234q-61 0-106-41t-51-103l-62-528h-47q-14 0-24-10-9-11-9-23t9-23q10-10 22-10h242zM301 811q4 37 31 60 26 24 63 24h234q37 0 63-24 27-23 31-60l61-522h-542zM416 399q14 0 23 10 10 9 10 23v320q0 14-10 23-9 9-22 9-14 0-24-9t-10-23v-320q2-14 11-23 9-10 22-10v0zM641 432q0-14-10-23-10-10-24-10-13 0-22 10-10 9-10 23v320q0 14 10 23 9 9 22 9 14 0 24-9t10-23v-320z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniEEEB","tags":["uniEEEB"],"codePoint":61163},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M258 303q-43 25-90 15-47-9-77-48t-26-87q3-48 36-82 34-33 82-36 48-4 87 26t48 77q10 47-15 88l143 145q31-18 66-18t66 18l143-145q-25-41-15-88 9-47 48-77t87-26q48 3 82 36 33 34 36 82 4 48-26 87t-77 48q-47 10-90-15l-143 143q18 31 18 66t-18 66l145 143q41-25 88-15 47 9 77 48t26 87q-3 48-36 82-34 33-82 36-48 4-87-26t-48-77q-10-47 15-90l-143-143q-31 18-66 18t-66-18l-143 143q25 43 15 90-9 47-48 77t-87 26q-48-3-82-36-33-34-36-82-4-48 26-87t77-48q47-10 90 15l143-143q-18-31-17-66t17-66zM256 193q0-27-18-47-19-19-45-19-27 0-46 19-18 20-18 47 0 26 18 45 19 18 46 18 26 0 45-18 18-19 18-45v0zM256 831q0-26-18-45-19-18-45-18-27 0-46 18-18 19-19 45-1 27 18 46 20 18 47 18 26 0 45-18 18-19 18-46v0zM831 256q27 0 47-18 19-19 19-45 0-27-19-47-20-19-47-19-26 0-45 19-18 20-18 47 0 26 18 45 19 18 45 18zM897 831q0-26-19-45-20-18-47-18-26 0-45 18-18 19-18 45 0 27 18 46 19 18 45 18 27 0 47-18 19-19 19-46zM575 512q0-27-18-45t-45-18-45 18-18 45 18 45 45 18 45-18 18-45z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF0F4","tags":["uniF0F4"],"codePoint":61684},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M139 512q0-102 50-187 51-85 136-136 85-50 187-50t187 50q85 51 136 136 50 85 50 187t-50 187q-51 85-136 136-85 50-187 50t-187-50q-85-51-136-136-50-85-50-187zM512 86q-117 0-214 57-97 58-155 155-57 97-57 214t57 214q58 97 155 155 97 57 214 57t214-57q97-58 155-155 57-97 57-214t-57-214q-58-97-155-155-97-57-214-57v0zM512 575q27 0 45-18t18-45-18-45-45-18-45 18-18 45 18 45 45 18zM385 512q0 27-19 45-20 18-47 18-26 0-45-18-18-18-18-45t18-45q19-18 45-18 27 0 46 18 18 18 18 45h2zM705 575q26 0 45-18 18-18 18-45t-18-45q-19-18-45-18-27 0-46 18-18 18-18 45t18 45q19 18 46 18z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF107","tags":["uniF107"],"codePoint":61703},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 127q0-16-12-29-13-12-30-12t-31 12q-13 13-13 29v299h-297q-18 0-31 13-12 14-12 31t12 30q13 12 29 12h299v299q0 16 13 30 14 13 31 13t30-13q12-14 12-30v-299h299q16 0 30-12 13-13 13-30t-13-31q-14-13-30-13h-299v-299z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF11D","tags":["uniF11D"],"codePoint":61725},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 150q-68 0-126 32-58 33-93 92-37 64-37 142v178l-55 131h624l-57-131v-92q0-15 9-24t23-9q13 0 22 9t9 24v78l60 135q12 26-4 50-17 23-45 23h-201q-2 54-39 91-37 36-90 36t-90-36q-37-37-39-91h-199q-28 0-45-23-16-24-4-50l58-135v-164q0-97 45-174 43-74 116-115 74-41 158-41 55 0 106 18 13 5 18 16t1 23q-4 13-15 19-12 6-24 2-43-14-86-14v0zM512 854q27 0 45-19 18-20 18-47h-126q0 27 18 47 18 19 45 19v0zM651 299h-110q-15 2-22 11t-7 23q0 13 9 21t24 8h43l-72 103q-8 16 1 32 9 15 28 15h110q13-2 21-12 8-11 7-23t-10-20-22-8h-45l74-103q8-16-1-32-9-15-28-15v0zM907 86h-153q-13 2-21 11t-7 22q1 12 10 21 9 10 22 10h90l-119 188q-8 16 1 32 9 15 28 15l153-2q13 0 21-10 8-11 7-23t-10-21q-9-10-22-10h-92l121-188q8-16-2-31-10-14-27-14z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF176","tags":["uniF176"],"codePoint":61814},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M238 512l172 172q8 8 9 21 1 12-7 22-9 10-21 11t-22-5l-234-233-4-8-2-13v6-8l2-10 6-8 228-228q8-8 20-9t22 7q9 9 11 21t-6 22l-174 177h274q111 0 197 38 86 39 135 109t51 160l2 12q0 12-10 23-10 10-24 10-13 0-22-10-10-11-10-23 0-111-81-181-82-71-222-75h-290l172 172z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF17A","tags":["uniF17A"],"codePoint":61818},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M600 231q8 9 9 20t-5 21l-174 177h82q111 0 197 38 86 39 135 109t51 160l2 12q0 12-10 23-10 10-24 10-13 0-22-10-10-11-10-23 0-111-81-181-82-71-222-75h-98l170 172q10 8 10 21 0 12-8 22t-20 11q-13 1-23-5l-235-237-2-9-3-10 3-10 6-8 227-228q10-10 24-10 13 0 21 10v0zM137 457l223-224q11-8 23-9t21 7q10 9 12 21t-6 22l-205 205 203 203q8 8 8 20 0 13-7 22-8 9-20 11t-22-4l-230-229q-8-8-9-20-1-11 5-19l227-230z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF259","tags":["uniF259"],"codePoint":62041},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M772 64q37 0 72 15 34 15 60 41 25 26 41 60 15 34 15 72v520q0 37-15 72-15 34-41 60-26 25-60 41-34 15-72 15h-520q-37 0-72-15-34-15-60-41-25-26-41-60-15-34-15-72v-520q0-37 15-72 15-34 41-60 26-25 60-41 34-15 72-15h520zM253 128q-24 0-47 10t-40 28q-17 17-28 40-10 22-10 47v3h768v-2q0-25-10-48t-28-40q-17-17-40-28-22-10-47-10h-518zM771 896q24 0 47-10t40-28q17-17 28-40 10-22 10-47v-451h-768v450q0 25 10 48t28 40q17 17 40 28 22 10 47 10h518zM651 458q0 19 6 38 6 18 17 34t26 28 34 19q1 7 1 15 1 8 1 16v16q-1 7-2 15-19 7-34 19t-26 28q-11 15-17 34-5 18-5 38v12t1 11q-22 19-49 31-19-18-42-28t-50-10q-26 0-50 10-23 9-41 28-28-11-50-30 0-6 1-12v-11q0-20-5-39-6-18-17-34t-26-28-34-19q-1-7-1-15-1-8-1-16v-16q1-7 2-15 18-7 34-19 15-12 26-28 11-15 17-34 5-18 5-38v-12t-1-11q22-19 49-31 18 18 42 28t50 10q25 0 50-10 24-10 41-28 28 11 50 30 0 6-1 12 0 6-1 12zM560 608q0-20-14-34t-34-14-34 14-14 34 14 34 34 14 34-14 14-34z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF2B7","tags":["uniF2B7"],"codePoint":62135},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M233 628q-50-13-93-43-42-30-74-70-31-41-48-90-18-49-18-101 0-44 11-86 11-41 32-77 20-36 49-66 29-29 65-51 35-21 77-32 41-12 86-12 66 0 125 25 58 25 101 68 44 44 69 102t25 125h-64q0-16-2-32t-6-32h-122q0 16 1 32t1 32q0 32-3 63-2 31-6 63v2h-172q2 14 5 28t7 28v0q-11 31-23 62-11 31-23 62zM266 192h107q-1-10-6-30-4-20-11-40t-16-37q-9-16-19-21h-1q-11 4-20 21-9 16-16 37-6 20-11 40-4 19-7 30zM98 192h103q9-58 31-112-42 15-77 44-34 29-57 68zM542 192q-22-39-57-68-34-29-77-44 21 53 30 112h104zM72 256q-4 16-6 32t-2 32 2 32 6 32h122q0-16-1-32t-1-32 1-32q0-16 1-32h-122zM381 256h-122l-2 32t-1 32 1 32q0 16 1 32h123l2-32t1-32-1-32q0-16-2-32zM1024 416v96q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-64h-384v64q0 13-9 22-10 10-23 10t-22-9q-10-10-10-23v-96q0-13 9-22 10-10 23-10h192v-34q1-8 5-15 3-6 9-11 7-4 18-4t17 4 10 11q3 7 4 15t1 17v17h192q13 0 22 9 10 10 10 23zM99 448q22 39 56 68 35 28 77 44-21-53-30-112h-103zM1024 672q0 13-9 22-10 10-23 10h-160v128q0 13-5 25-5 11-14 20-8 9-20 14-11 5-25 5h-32q-13 0-22-9-10-10-10-23 0-11 4-17t11-10q7-3 15-4t17-1h17v-128h-160q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h160q0-6 4-15t10-18 12-17 10-14h-132q-13 0-22-9-10-10-10-23t9-22q10-10 23-10h192q13 0 22 9 10 10 10 23 0 9-5 17l-52 79h153q13 0 22 9 10 10 10 23zM560 928q0 13-9 23-9 9-23 9-10 0-18-6-8-5-12-15l-40-107h-148l-40 107q-3 9-12 15-8 6-18 6-13 0-22-9-10-10-10-23 0-7 2-11l48-127q24-65 48-129l48-128q3-10 12-14 8-5 18-5t18 4q8 5 12 14 24 65 47 129 24 64 49 128l48 127q2 5 2 12zM384 635l-50 133h100z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF3BE","tags":["uniF3BE"],"codePoint":62398},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M657 129q50-49 119-50 70-1 119 48t49 119q0 69-49 119l-477 479q-17 16-37 22l-254 92q-12 5-27 1-14-3-23-13t-12-23q-4-14 1-26l92-254q6-20 22-35zM850 174q-31-31-74-31t-74 31l-49 49 146 148 51-52q31-30 31-73t-31-72v0zM754 416l-146-148-383 385q-6 4-8 11l-80 223 223-80q7-2 11-8zM567 127h-471q-14 0-23 10-10 10-10 24 0 13 10 22 9 10 23 10h408zM438 256h-342q-14 0-23 9-10 9-10 23 0 13 10 22 9 9 23 9h279zM311 383h-215q-14 0-23 10-10 10-10 24 0 13 10 22 9 10 23 10h152z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF3DC","tags":["uniF3DC"],"codePoint":62428},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M860 164q-37-37-87-37t-87 37l-473 473q-16 18-25 41l-59 176q-6 18 8 33 15 14 33 8l176-59q23-9 41-25l473-473q37-37 37-87t-37-87v0zM733 209q17-16 41-16 25 0 41 16t16 41q0 24-16 43l-47 45-82-82zM641 301l82 84-381 381q-8 6-16 8l-115 39 39-115q2-8 8-16z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF40C","tags":["uniF40C"],"codePoint":62476},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M129 160q0-13 9-23t22-10h704q21 0 29 18 8 19-4 33l-176 238 176 237q12 15 4 33-8 19-29 19h-671v202q0 13-9 21-8 8-20 10h-4q-13 0-22-7t-9-20v-751zM801 193h-608v446h608l-154-205q-6-8-6-18t6-19z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF40F","tags":["uniF40F"],"codePoint":62479},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M106 106l768 768q11 11 11 24t-9 23q-10 9-23 9t-24-10l-215-215h-421v202q0 13-9 21-8 8-20 10h-4q-13 0-22-7t-9-20v-692l-68-67q-12-13-8-31 4-19 23-23 18-4 30 8v0zM219 127h645q21 0 29 18 8 19-4 33l-176 238 176 237q12 15 4 33-8 19-29 19h-69l-64-66h70l-154-205q-6-8-6-18t6-19l154-204h-518zM193 283v358l356-2z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF509","tags":["uniF509"],"codePoint":62729},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M805 193q47 0 80 32 33 33 33 78v418q0 45-33 78-33 32-80 32h-586q-47 0-80-32-33-33-33-78v-418q0-45 33-78 33-32 80-32h586zM864 391l-340 187q-10 6-22 2l-342-189v330q0 22 17 40 18 17 42 17h586q24 0 42-17 17-18 17-40v-330zM805 246h-586q-24 0-42 17-17 18-17 40v27l352 194 352-194v-27q0-22-17-40-18-17-42-17v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF516","tags":["uniF516"],"codePoint":62742},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M795 111q49 0 84 34 34 35 34 84v566q0 49-34 84-35 34-84 34h-566q-49 0-84-34-34-35-34-84v-566q0-49 34-84 35-34 84-34h566zM164 795q0 26 19 46 20 19 46 19h566q26 0 46-19 19-20 19-46v-191h-194q-11 53-52 89t-94 38h-8q-55 0-97-34-42-33-55-87l-2-6h-194v191zM795 164h-566q-26 0-46 19-19 20-19 46v320h221q10 0 17 6 8 6 10 16v4q0 27 13 51 13 23 37 37 23 13 50 13t50-13q24-14 37-37 13-24 13-51 0-10 8-17 7-7 17-9h223v-320q0-26-19-46-20-19-46-19z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF522","tags":["uniF522"],"codePoint":62754},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M133 348l363-215q14-8 28-2l367 217q20 12 33 33 12 20 14 43v334q0 55-38 95t-93 42h-584q-55 2-95-36t-42-93v-336q0-22 10-43 10-20 31-35l369-219zM874 465l-348 182q-12 6-24 2l-352-184v293q0 28 19 50 19 21 48 23h584q28 0 50-19 21-19 23-48v-299zM512 197l-346 206 346 179 346-181z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF529","tags":["uniF529"],"codePoint":62761},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M918 332q32-15 50-45 17-31 12-67t-31-61q-25-26-61-30t-67 13q-30 18-45 51-10 26-7 52 3 25 16 47 14 21 36 35 23 13 47 14 25 1 50-9v0zM219 193h502q-8 26-6 53h-496q-24 0-42 17-17 18-17 40v27l352 194 279-153q32 20 69 22l-336 185q-10 6-22 2l-342-189v330q0 22 17 40 18 17 42 17h586q24 0 42-17 17-18 17-40v-326q27 0 54-6v332q0 45-33 78-33 32-80 32h-586q-47 0-80-32-33-33-33-78v-418q0-45 33-78 33-32 80-32v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF565","tags":["uniF565"],"codePoint":62821},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M256 332q0-10 7-18 7-7 20-7h358q10 0 17 7 8 8 8 19t-8 18q-7 7-17 7h-358q-13 0-20-7t-7-17v-2zM539 461q-13 0-20 7t-7 18q0 12 7 19t18 7h104q10 0 17-7 8-7 8-19 0-11-8-18-7-7-17-7h-102zM512 639q0-10 7-17 7-8 18-8h104q10 0 17 8 8 7 8 18t-8 18q-7 8-17 8h-102q-13 0-20-8-7-7-7-17v-2zM283 461q-13 0-20 7t-7 17v154q0 12 7 19 7 8 20 8h153q10 0 18-8 7-7 7-17v-156q0-10-7-17-8-7-18-7h-153zM307 614v-102h103v102h-103zM102 256q0-43 30-73 30-29 73-29h512q43 0 73 29 29 30 29 73v51q43 0 73 30t30 73v280q0 53-38 91t-91 38h-562q-53 0-91-38t-38-89v-436zM768 256q0-20-15-36-16-15-36-15h-512q-21 0-36 15-15 16-15 36v434q0 33 22 55 23 23 55 23h564q30 0 53-23 22-22 22-55v-280q0-21-15-36-15-16-36-16v332q0 12-7 20-7 7-18 7-12 0-19-7-7-8-7-18v-436z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF598","tags":["uniF598"],"codePoint":62872},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M506 117q12 0 19 8t7 18v336h336q13 0 20 8 7 9 8 20t-7 18-21 7h-336v336q0 13-7 20t-18 7-20-7q-8-7-8-20v-336h-336q-10 0-18-7t-8-18 8-20q8-8 18-8h336v-336q0-10 8-18 9-8 19-8z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF599","tags":["uniF599"],"codePoint":62873},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M682 150l-137 139q-13 10-13 25 0 16 13 28l137 137q12 10 27 13h2q14-3 24-13l139-137q11-12 11-28 0-15-11-25l-139-139q-10-11-25-11-16 0-28 11zM618 492l-86-86v86h86zM532 223l113-110q27-27 65-27t64 27l137 137q27 26 27 64t-27 65l-110 113h4q39 0 65 26 27 27 25 64v223q2 39-25 65-26 27-65 25h-586q-39 0-65-26-27-25-27-64v-586q2-39 28-65 25-27 64-25h223q37-2 64 25 26 26 26 65v4zM709 545h-177v297h273q16 0 26-11 11-10 11-26v-223q0-17-11-27-10-10-26-10h-96zM182 219v273h297v-273q0-16-10-26-10-11-27-11h-223q-16 0-26 11-11 10-11 26v0zM182 545v260q0 16 11 26 10 11 26 11h260v-297h-297z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF5B8","tags":["uniF5B8"],"codePoint":62904},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M512 154q-33 0-54 22-22 23-22 54 0 32 22 55 21 22 54 22t55-22q23-23 23-55 0-31-23-54-22-22-55-22zM385 229q0-51 37-89t90-38 90 38 38 90q1 53-37 91-38 37-91 37t-90-37q-37-38-37-92v0zM795 205q-23 0-38 15-16 16-15 36t16 36q14 15 36 15 21 0 36-15 16-16 15-36t-16-36q-14-15-34-15zM692 256q0-43 30-73 30-29 72-29t71 29q30 30 30 73t-30 73q-29 29-71 29t-72-29q-30-30-30-73zM180 256q0-20 15-36 14-15 35-15 22 0 37 15 16 16 15 36t-16 36q-14 15-36 15-21 0-35-15-15-16-15-36zM231 154q-43 0-73 29-31 30-30 73t31 73q29 29 71 29t73-29q31-30 31-73t-31-73q-31-29-72-29v0zM262 768q-45 2-77-29-31-30-31-73v-193q0-4 4-8t8-4h90q4-29 18-51h-108q-27 0-45 18-19 18-19 45v193q0 32 14 63 13 31 39 52 25 22 57 32t64 4q-10-22-14-49zM748 817q32 6 64-4t57-32q26-21 39-52 14-31 14-63v-193q0-27-19-45-18-18-45-18h-108q14 22 18 51h90q4 0 8 4t4 8v193q0 43-31 73-32 31-75 29-6 27-16 49v0zM371 410q-27 0-45 18-19 18-19 45v244q0 55 28 102 27 47 75 75 47 28 102 28t102-28q48-28 75-75 28-47 28-102v-244q0-27-19-45-18-18-45-18h-282zM358 473q0-4 4-8 5-4 9-4h282q4 0 9 4 4 4 4 8v244q0 63-45 108-46 45-109 45t-109-45q-45-45-45-108v-244z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF5D0","tags":["uniF5D0"],"codePoint":62928},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M608 575q39 0 68 29t29 68v33q0 63-39 122-39 60-109 95-76 39-173 39t-173-39q-70-35-109-95-39-59-39-122v-33q0-39 29-68t68-29h448zM608 639h-448q-13 0-22 10t-9 23v33q0 47 30 91 29 44 85 70 61 29 140 29t140-29q56-26 86-70 31-44 31-91v-33q0-13-10-23t-23-10v0zM385 160q72 0 123 51t51 125-51 125-124 51-124-51-51-125 51-125 125-51v0zM385 223q-47 0-80 33t-33 80 33 80 79 33 79-33 33-80-33-80-80-33h2zM690 70l4 4 107 104 104-104q10-11 24-11 13 0 22 10 10 9 10 22 0 14-11 24l-104 104 104 107q8 8 9 19 2 11-5 22l-4 4q-8 8-19 9t-22-5l-108-111-107 107q-12 12-30 8-19-4-23-23-4-18 8-30l107-107-107-104q-8-8-9-20-1-11 5-21l4-4q8-8 18-9 9-2 19 3z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF5FF","tags":["uniF5FF"],"codePoint":62975},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M688 123q-22-23-51-32t-58-5q-30 4-56 22-25 17-40 44l-129 241-198 80q-23 8-27 31-4 22 12 39l140 139-183 184-12 72 72-12 184-183 139 140q17 16 39 12 23-4 31-27l80-198 241-129q27-15 44-40 18-26 22-56 4-29-5-58t-32-49zM559 193q10-19 32-22 21-3 36 11l215 215q14 15 11 36-3 22-22 32l-253 137q-15 8-21 23l-61 153-250-250 153-61q15-6 23-21z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF668","tags":["uniF668"],"codePoint":63080},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M416 127q-13 0-22 10t-9 24q0 13 9 22 9 10 22 10h63v638h-63q-13 0-23 10-10 9-9 22 1 14 10 23t22 9h192q13 0 23-9t10-23q0-13-10-22-10-10-23-10h-63v-638h63q13 0 23-10 10-9 10-22 0-14-10-24t-23-10h-192zM256 256h160v63h-160q-27 0-45 20-18 19-18 46v254q0 27 18 46 18 20 45 20h160v63h-160q-53 0-90-38t-37-91v-256q0-51 37-89t90-38zM768 705h-160v63h160q53 0 90-38t37-91v-256q2-51-36-89t-91-38h-160v63h160q27 0 45 20 18 19 18 46v254q0 27-18 46-18 20-45 20v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF70D","tags":["uniF70D"],"codePoint":63245},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M451 131q8-16 25-27 18-10 37-10t36 10q16 11 24 27l95 193 213 30q18 4 33 17 16 12 22 30 6 19 1 38-5 20-19 32l-154 150 37 210q4 21-4 38-9 18-24 30t-35 13q-19 1-36-7l-190-100-190 100q-17 8-36 7-20-1-35-13t-24-30q-8-17-4-38l37-210-154-150q-14-12-19-32-5-19 1-38 6-18 22-30 15-13 33-17l213-30zM512 201l-84 170q-16 30-51 37l-187 26 136 131q26 27 20 62l-33 186 168-88q31-16 64 0l166 88-31-186q-6-35 18-62l136-131-187-26q-35-7-51-37z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF7B6","tags":["uniF7B6"],"codePoint":63414},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M727 299q-14 14-35 14-20 0-35-14-14-14-14-35 0-20 14-35 15-14 35-14 21 0 35 14 14 15 14 35 0 21-14 35zM162 586q-37-37-37-90 0-54 37-90l305-304q37-36 90-36l209-3q53 0 91 38t38 92v217q-2 51-39 88l-299 299q-39 37-92 37t-90-37zM207 451q-19 18-19 45 0 26 19 45l213 211q18 18 45 18t45-18l301-299q18-19 18-45l2-215q0-27-19-47-19-19-46-19l-209 2q-27 0-45 18l-303 304h-2zM127 625q-12 34-4 71t35 64l125 125q36 37 84 56 47 20 97 20t97-20q47-19 84-56l223-223q27-27 27-68v-49l-295 295q-57 57-136 57t-136-57l-170-170q-21-21-31-45v0z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uF002A","tags":["uF002A"],"codePoint":983082},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M256 512q0-13 9-23 9-9 23-9h192v-192q0-13 9-23 9-9 23-9 13 0 23 9 9 9 9 23v192h192q13 0 23 9 9 9 9 23 0 13-9 23-9 9-23 9h-192v192q0 13-9 23-9 9-23 9-13 0-23-9-9-9-9-23v-192h-192q-13 0-23-9-9-9-9-23zM512 1024q104 0 199-40 92-39 163-110t110-162q40-96 40-200t-40-199q-39-92-110-163t-162-110q-96-40-200-40t-199 40q-92 39-163 110t-110 162q-40 96-40 200t40 199q39 92 110 163t162 110q96 40 200 40zM512 960q-91 0-174-35-81-34-143-96t-96-142q-35-84-35-175t35-174q34-81 96-143t142-96q84-35 175-35t174 35q81 34 143 96t96 142q35 84 35 175t-35 174q-34 81-96 143t-142 96q-84 35-175 35z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_arrow_reply_all_regular","tags":["ic_fluent_arrow_reply_all_regular"],"codePoint":983874},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M342.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-265 265.5 265 265.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5zM534.5 105.5q9.5 9 9.5 22.5t-9.5 22.5l-233 233.5h242.5q97.5 0 187 37.5 86 36.5 152.5 103t103 152.5q37.5 89.5 37.5 187 0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75q0-84.5-32.5-162-32-74.5-89.5-132t-132-89.5q-77.5-32.5-162-32.5h-242.5l233 233.5q9.5 9 9.5 22.5t-9.25 22.75-22.75 9.25-22.5-9.5l-288-288q-9.5-9-9.5-22.5t9.5-22.5l288-288q9-9.5 22.5-9.5t22.5 9.5z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_arrow_sort_down_lines_regular","tags":["ic_fluent_arrow_sort_down_lines_regular"],"codePoint":983946},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M832 32q0-13.5-9.25-22.75t-22.75-9.25-22.75 9.25-9.25 22.75v882.5l-137.5-137q-9-9.5-22.5-9.5t-22.75 9.25-9.25 22.75 9.5 22.5l192 192q9 9.5 22.5 9.5t22.5-9.5l192-192q9.5-9 9.5-22.5t-9.25-22.75-22.75-9.25-22.5 9.5l-137.5 137v-882.5zM32 128q-13.5 0-22.75 9.25t-9.25 22.75 9.25 22.75 22.75 9.25h576q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-576zM192 352q0-13.5 9.25-22.75t22.75-9.25h384q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-384q-13.5 0-22.75-9.25t-9.25-22.75zM416 512q-13.5 0-22.75 9.25t-9.25 22.75 9.25 22.75 22.75 9.25h192q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-192z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_text_sort_ascending_regular","tags":["ic_fluent_text_sort_ascending_regular"],"codePoint":996870},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M286 20.5q-4-9.5-12-15t-18-5.5-18 5.5-12 15l-176 448q-4.5 12 0.75 24.25t17.5 17 24.5-0.5 17.25-17.75l42-107.5h208l42 107.5q5 12.5 17.25 17.75t24.5 0.5 17.5-17 0.75-24.25zM256 119.5l79 200.5h-158zM128 576q-13 0-22.5 9.25t-9.5 22.75 9.5 22.75 22.5 9.25h196l-222.5 334.5q-5 7-5.5 16t3.75 16.75 11.75 12.25 16.5 4.5h256q13.5 0 22.75-9.25t9.25-22.75-9.25-22.75-22.75-9.25h-196l222.5-334q5-7.5 5.5-16.5t-3.75-16.75-11.75-12.25-16.5-4.5h-256zM800 0q13.5 0 22.75 9.25t9.25 22.75v882.5l137.5-137q9-9.5 22.5-9.5t22.75 9.25 9.25 22.75-9.5 22.5l-192 192q-9 9.5-22.5 9.5t-22.5-9.5l-192-192q-9.5-9-9.5-22.5t9.25-22.75 22.75-9.25 22.5 9.5l137.5 137v-882.5q0-13.5 9.25-22.75t22.75-9.25z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniF140","tags":["uniF140"],"codePoint":61760},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M64 544q0-57.5 15-110.5t42-99.25 65-84.25 84.25-65 99.25-42 110.5-15 110.5 15 99.25 42 84.25 65 65 84.25 42 99.25 15 110.5-15 110.5-42 99.25-65 84.25-84.25 65-99.25 42-110.5 15-110.5-15-99.25-42-84.25-65-65-84.25-42-99.25-15-110.5zM705 273.5q-47.5-40-105.25-60.75t-119.75-20.75q-48.5 0-93.5 12.5t-84 35.5-71.25 55.25-55.25 71.25-35.5 84-12.5 93.5q0 62 20.75 119.75t60.75 105.25zM832 544q0-62-20.75-119.75t-60.75-105.25l-495.5 495.5q47.5 40 105.25 60.75t119.75 20.75q48.5 0 93.5-12.5t84-35.5 71.25-55.25 55.25-71.25 35.5-84 12.5-93.5z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE15F","tags":["uniE15F"],"codePoint":59581},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 992q0-13 4.25-27t7.25-26.5q11.5-47.5 24-94t24-94q-29.5-55-44.5-115t-15-122.5q0-70.5 18.25-136.25t51.5-122.75 80-103.75 103.75-80.25 122.5-51.75 136-18.25 135.75 18.25 122.25 51.75 103.75 80 80.25 103.5 51.75 122.25 18.25 135.75q0 70-18.25 135.25t-51.25 122.25-79.5 104-103.25 80.5-121.75 52-135.5 18.5q-62 0-122-14.25t-115-42.75l-238 56q-5 1-7.5 1-13.5 0-22.75-9.25t-9.25-22.75zM510 960q62 0 119.5-16t107.5-45 91.25-69.75 70.5-90.75 45.25-107.5 16-119.5-16-119.25-45.25-106.75-70.25-90.5-91-70-107.25-45-118.75-16-118.75 16-107 45-90.5 69.75-70 90.25-45.25 106.75-16 118.75q0 32.5 4 60t11.5 53.75 18 52.25 24 54.5q4 8 4 15.5 0 5.5-3 20.5t-8 34.5-10.75 42-11.25 43-10 37.25-6.5 24.75q34-8 67.25-16t67.25-16.5q17-4 35.5-9.5t36-5.5q4 0 7.5 1.25t7.5 2.75q27 12.5 52.25 22.75t50.75 17.25 52.5 11 57.5 4zM352 448q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5h320q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5h-320zM352 640q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5h192q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5h-192z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_certificate_regular","tags":["ic_fluent_certificate_regular"],"codePoint":60309},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M0 395v-203q0-35 17.25-64.25t46.5-46.5 64.25-17.25h768q35 0 64.25 17.25t46.5 46.5 17.25 64.25v512q0 35-17.25 64.25t-46.5 46.5-64.25 17.25h-448v-64h448q17.5 0 32.25-8.5t23.25-23.25 8.5-32.25v-512q0-17.5-8.5-32.25t-23.25-23.25-32.25-8.5h-768q-17.5 0-32.25 8.5t-23.25 23.25-8.5 32.25v144.5q-36.5 24.5-64 58.5zM192 290v-2q0-13.5 9.25-22.75t22.75-9.25h576q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-444q-62-32-132-32-16 0-32 2zM544 512h256q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-256q-13.5 0-22.75-9.25t-9.25-22.75 9.25-22.75 22.75-9.25zM224 800q-61 0-113-30.5-50.5-30-80.5-80.5-30.5-52-30.5-113t30.5-113q30-50.5 80.5-80.5 52-30.5 113-30.5t113 30.5q50.5 30 80.5 80.5 30.5 52 30.5 113t-30.5 113q-30 50.5-80.5 80.5-52 30.5-113 30.5zM64 815.5q35 23.5 75 35.5 41.5 13 85 13t85-13q40-12 75-35.5v176.5q0 12.5-8.25 21.5t-20.5 10.25-22.25-6.25l-90-67q-8.5-6.5-19-6.5t-19 6.5l-90 67q-10 7.5-22.25 6.25t-20.5-10.25-8.25-21.5v-176.5z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"ic_fluent_open_regular","tags":["ic_fluent_open_regular"],"codePoint":59559},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M256 128q-35 0-64.25 17.25t-46.5 46.5-17.25 64.25v512q0 35 17.25 64.25t46.5 46.5 64.25 17.25h512q35 0 64.25-17.25t46.5-46.5 17.25-64.25v-160q0-13.5 9.25-22.75t22.75-9.25 22.75 9.25 9.25 22.75v160q0 52-26 97-25.5 43.5-69 69-45 26-97 26h-512q-52 0-97-26-43.5-25.5-69-69-26-45-26-97v-512q0-52 26-97 25.5-43.5 69-69 45-26 97-26h160q13.5 0 22.75 9.25t9.25 22.75-9.25 22.75-22.75 9.25h-160zM576 96q0-13.5 9.25-22.75t22.75-9.25h320q13.5 0 22.75 9.25t9.25 22.75v320q0 13.5-9.25 22.75t-22.75 9.25-22.75-9.25-9.25-22.75v-242.5l-265.5 265q-9 9.5-22.5 9.5t-22.75-9.25-9.25-22.75 9.5-22.5l265-265.5h-242.5q-13.5 0-22.75-9.25t-9.25-22.75z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}},{"extras":{"name":"uniE943","tags":["uniE943"],"codePoint":59715},"node":{"tag":"Element","args":[{"tagName":"svg","attributes":{"fill":{"tag":"Value","args":[{"tag":"Paint","args":[{"tag":"CurrentColor","args":[]}]}]},"viewBox":{"tag":"Value","args":[{"tag":"ViewBox","args":[{"minX":0,"minY":0,"width":1024,"height":1024}]}]}},"children":[{"tag":"Element","args":[{"tagName":"path","attributes":{"d":{"tag":"StringValue","args":["M192 864v-224q0-19.5-7.5-37t-20.75-30.75-30.75-20.75-37-7.5q-13 0-22.5-9.5t-9.5-22.5 9.5-22.5 22.5-9.5q19.5 0 37-7.5t30.75-20.75 20.75-30.75 7.5-37v-227.5q0-31.5 12.75-60t34-49.75 49.75-34 60-12.75q14.5 0 25 8.25t10.5 23.75q0 13-9.5 22.5t-22.5 9.5q-19.5 0-37 7.5t-30.75 20.75-20.75 30.75-7.5 37v224q0 38-16.75 71.75t-47.25 56.25q30.5 22.5 47.25 56.25t16.75 71.75v224q0 19.5 7.5 37t20.75 30.75 30.75 20.75 37 7.5q13 0 22.5 9.5t9.5 22.5q0 15.5-10.5 23.75t-25 8.25q-32.5 0-61-13t-49.75-35-33.5-51-12.25-61zM640 992q0-13 9.5-22.5t22.5-9.5q19.5 0 37-7.5t30.75-20.75 20.75-30.75 7.5-37v-224q0-38 16.75-71.75t47.25-56.25q-30.5-22.5-47.25-56.25t-16.75-71.75v-224q0-19.5-7.5-37t-20.75-30.75-30.75-20.75-37-7.5q-13 0-22.5-9.5t-9.5-22.5q0-15.5 10.5-23.75t25-8.25q32.5 0 61 13t49.75 35 33.5 51 12.25 61v224q0 19.5 7.5 37t20.75 30.75 30.75 20.75 37 7.5q13 0 22.5 9.5t9.5 22.5-9.5 22.5-22.5 9.5q-19.5 0-37 7.5t-30.75 20.75-20.75 30.75-7.5 37v227.5q0 31.5-12.75 60t-34 49.75-49.75 34-60 12.75q-14.5 0-25-8.25t-10.5-23.75z"]}},"children":[]}]}]}]},"palettes":{"index":0,"table":[[{"background":{"tag":"AutomaticColor","args":[]},"foreground":{"tag":"AutomaticColor","args":[]}},[]]]}}]}
\ No newline at end of file
diff --git a/WinoMail.Packaging/Images/LargeTile.scale-100.png b/WinoMail.Packaging/Images/LargeTile.scale-100.png
deleted file mode 100644
index aca6e4e2..00000000
Binary files a/WinoMail.Packaging/Images/LargeTile.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/LargeTile.scale-125.png b/WinoMail.Packaging/Images/LargeTile.scale-125.png
deleted file mode 100644
index b80bf9d4..00000000
Binary files a/WinoMail.Packaging/Images/LargeTile.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/LargeTile.scale-150.png b/WinoMail.Packaging/Images/LargeTile.scale-150.png
deleted file mode 100644
index 1ed2a001..00000000
Binary files a/WinoMail.Packaging/Images/LargeTile.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/LargeTile.scale-200.png b/WinoMail.Packaging/Images/LargeTile.scale-200.png
deleted file mode 100644
index a8e471dd..00000000
Binary files a/WinoMail.Packaging/Images/LargeTile.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/LargeTile.scale-400.png b/WinoMail.Packaging/Images/LargeTile.scale-400.png
deleted file mode 100644
index 54cea310..00000000
Binary files a/WinoMail.Packaging/Images/LargeTile.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/LockScreenLogo.scale-200.png b/WinoMail.Packaging/Images/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57ad..00000000
Binary files a/WinoMail.Packaging/Images/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SmallTile.scale-100.png b/WinoMail.Packaging/Images/SmallTile.scale-100.png
deleted file mode 100644
index f0d52390..00000000
Binary files a/WinoMail.Packaging/Images/SmallTile.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SmallTile.scale-125.png b/WinoMail.Packaging/Images/SmallTile.scale-125.png
deleted file mode 100644
index 4a0404cf..00000000
Binary files a/WinoMail.Packaging/Images/SmallTile.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SmallTile.scale-150.png b/WinoMail.Packaging/Images/SmallTile.scale-150.png
deleted file mode 100644
index f801334e..00000000
Binary files a/WinoMail.Packaging/Images/SmallTile.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SmallTile.scale-200.png b/WinoMail.Packaging/Images/SmallTile.scale-200.png
deleted file mode 100644
index bb2c20c9..00000000
Binary files a/WinoMail.Packaging/Images/SmallTile.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SmallTile.scale-400.png b/WinoMail.Packaging/Images/SmallTile.scale-400.png
deleted file mode 100644
index c931a5dd..00000000
Binary files a/WinoMail.Packaging/Images/SmallTile.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SplashScreen.scale-100.png b/WinoMail.Packaging/Images/SplashScreen.scale-100.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/WinoMail.Packaging/Images/SplashScreen.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SplashScreen.scale-125.png b/WinoMail.Packaging/Images/SplashScreen.scale-125.png
deleted file mode 100644
index ceb2dff6..00000000
Binary files a/WinoMail.Packaging/Images/SplashScreen.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SplashScreen.scale-150.png b/WinoMail.Packaging/Images/SplashScreen.scale-150.png
deleted file mode 100644
index 885d9bc2..00000000
Binary files a/WinoMail.Packaging/Images/SplashScreen.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SplashScreen.scale-200.png b/WinoMail.Packaging/Images/SplashScreen.scale-200.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/WinoMail.Packaging/Images/SplashScreen.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/SplashScreen.scale-400.png b/WinoMail.Packaging/Images/SplashScreen.scale-400.png
deleted file mode 100644
index fa77f2b7..00000000
Binary files a/WinoMail.Packaging/Images/SplashScreen.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square150x150Logo.scale-100.png b/WinoMail.Packaging/Images/Square150x150Logo.scale-100.png
deleted file mode 100644
index a5f235b8..00000000
Binary files a/WinoMail.Packaging/Images/Square150x150Logo.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square150x150Logo.scale-125.png b/WinoMail.Packaging/Images/Square150x150Logo.scale-125.png
deleted file mode 100644
index be92b5ae..00000000
Binary files a/WinoMail.Packaging/Images/Square150x150Logo.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square150x150Logo.scale-150.png b/WinoMail.Packaging/Images/Square150x150Logo.scale-150.png
deleted file mode 100644
index d0039797..00000000
Binary files a/WinoMail.Packaging/Images/Square150x150Logo.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square150x150Logo.scale-200.png b/WinoMail.Packaging/Images/Square150x150Logo.scale-200.png
deleted file mode 100644
index 430e6fa3..00000000
Binary files a/WinoMail.Packaging/Images/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square150x150Logo.scale-400.png b/WinoMail.Packaging/Images/Square150x150Logo.scale-400.png
deleted file mode 100644
index 9726829b..00000000
Binary files a/WinoMail.Packaging/Images/Square150x150Logo.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png
deleted file mode 100644
index 4d6b9dfe..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png
deleted file mode 100644
index 7be00300..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png
deleted file mode 100644
index a6e4b0a2..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png
deleted file mode 100644
index 07514cc2..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.scale-100.png b/WinoMail.Packaging/Images/Square44x44Logo.scale-100.png
deleted file mode 100644
index 7432521d..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.scale-125.png b/WinoMail.Packaging/Images/Square44x44Logo.scale-125.png
deleted file mode 100644
index fe38dbdf..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.scale-150.png b/WinoMail.Packaging/Images/Square44x44Logo.scale-150.png
deleted file mode 100644
index 1ee950af..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.scale-200.png b/WinoMail.Packaging/Images/Square44x44Logo.scale-200.png
deleted file mode 100644
index 807e9ed4..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.scale-400.png b/WinoMail.Packaging/Images/Square44x44Logo.scale-400.png
deleted file mode 100644
index f4457476..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-16.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-16.png
deleted file mode 100644
index 9acb3cc8..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-16.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24.png
deleted file mode 100644
index c1e08a4f..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index c0aa2ba3..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-256.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-256.png
deleted file mode 100644
index 37f8decd..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-256.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-32.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-32.png
deleted file mode 100644
index 93c856d9..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-32.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-48.png b/WinoMail.Packaging/Images/Square44x44Logo.targetsize-48.png
deleted file mode 100644
index a2ca3afc..00000000
Binary files a/WinoMail.Packaging/Images/Square44x44Logo.targetsize-48.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.backup.png b/WinoMail.Packaging/Images/StoreLogo.backup.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.backup.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.scale-100.png b/WinoMail.Packaging/Images/StoreLogo.scale-100.png
deleted file mode 100644
index 4c4b4b34..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.scale-125.png b/WinoMail.Packaging/Images/StoreLogo.scale-125.png
deleted file mode 100644
index 1c325127..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.scale-150.png b/WinoMail.Packaging/Images/StoreLogo.scale-150.png
deleted file mode 100644
index bb194ef7..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.scale-200.png b/WinoMail.Packaging/Images/StoreLogo.scale-200.png
deleted file mode 100644
index b77a5ddc..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/StoreLogo.scale-400.png b/WinoMail.Packaging/Images/StoreLogo.scale-400.png
deleted file mode 100644
index 8d0a133e..00000000
Binary files a/WinoMail.Packaging/Images/StoreLogo.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Wide310x150Logo.scale-100.png b/WinoMail.Packaging/Images/Wide310x150Logo.scale-100.png
deleted file mode 100644
index f330133d..00000000
Binary files a/WinoMail.Packaging/Images/Wide310x150Logo.scale-100.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Wide310x150Logo.scale-125.png b/WinoMail.Packaging/Images/Wide310x150Logo.scale-125.png
deleted file mode 100644
index e4656fa7..00000000
Binary files a/WinoMail.Packaging/Images/Wide310x150Logo.scale-125.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Wide310x150Logo.scale-150.png b/WinoMail.Packaging/Images/Wide310x150Logo.scale-150.png
deleted file mode 100644
index 884084b3..00000000
Binary files a/WinoMail.Packaging/Images/Wide310x150Logo.scale-150.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Wide310x150Logo.scale-200.png b/WinoMail.Packaging/Images/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 23c8f147..00000000
Binary files a/WinoMail.Packaging/Images/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/WinoMail.Packaging/Images/Wide310x150Logo.scale-400.png b/WinoMail.Packaging/Images/Wide310x150Logo.scale-400.png
deleted file mode 100644
index 58c8ca7c..00000000
Binary files a/WinoMail.Packaging/Images/Wide310x150Logo.scale-400.png and /dev/null differ
diff --git a/WinoMail.Packaging/Package.appxmanifest b/WinoMail.Packaging/Package.appxmanifest
deleted file mode 100644
index 5644a43b..00000000
--- a/WinoMail.Packaging/Package.appxmanifest
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-    xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="58272BurakKSE.WinoMailPreview"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-    Version="1.10.5.0" />
-
-	<Extensions>
-		<!-- Publisher Cache Folders -->
-		<Extension Category="windows.publisherCacheFolders">
-			<PublisherCacheFolders>
-				<Folder Name="WinoShared" />
-			</PublisherCacheFolders>
-		</Extension>
-	</Extensions>
-
-  <mp:PhoneIdentity PhoneProductId="bd1fe9a8-9ba1-4e34-871a-d3cdee9a3547" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>Wino Mail</DisplayName>
-    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-	  <!--<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />-->
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Wino Mail"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png"
-        Description="Native mail client for Windows."
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" ShortName="Wino Mail">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile >
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
-      </uap:VisualElements>
-      <Extensions>
-		  <!-- Protocol activation: mailto -->
-		  <uap:Extension Category="windows.protocol">
-			  <uap:Protocol Name="mailto" />
-		  </uap:Extension>
-
-		  <!-- Protocol activation: Google OAuth -->
-		  <uap:Extension Category="windows.protocol">
-			  <uap:Protocol Name="google.pw.oauth2">
-				  <uap:DisplayName>Wino Google Authentication Protocol</uap:DisplayName>
-			  </uap:Protocol>
-
-		  </uap:Extension>
-
-		  <!-- Protocol activation: Launch UWP app from Full Trust Process  -->
-		  <uap:Extension Category="windows.protocol">
-			  <uap:Protocol Name="wino.mail.launch">
-				  <uap:DisplayName>Wino Mail Launcher Protocol</uap:DisplayName>
-			  </uap:Protocol>
-		  </uap:Extension>
-
-		  <!-- File Assosication: EML -->
-		  <uap:Extension Category="windows.fileTypeAssociation">
-			  <uap:FileTypeAssociation Name="eml">
-				  <uap:Logo>EML\eml.png</uap:Logo>
-				  <uap:SupportedFileTypes>
-					  <uap:FileType>.eml</uap:FileType>
-				  </uap:SupportedFileTypes>
-			  </uap:FileTypeAssociation>
-		  </uap:Extension>
-
-		  <!-- App Service-->
-		  <uap:Extension Category="windows.appService">
-			  <uap:AppService Name="WinoInteropService"/>
-		  </uap:Extension>
-
-		  <!-- Full trust process -->
-		  <desktop:Extension Category="windows.fullTrustProcess" Executable="Wino.Server\Wino.Server.exe">
-			<desktop:FullTrustProcess>
-				<desktop:ParameterGroup GroupId="WinoServer" Parameters="Mail" />
-			</desktop:FullTrustProcess>
-		  </desktop:Extension>
-
-		<!--Startup Task--> 
-		<uap5:Extension
-			  Category="windows.startupTask"
-			  Executable="Wino.Server\Wino.Server.exe"
-			  EntryPoint="Windows.FullTrustApplication">
-			  <uap5:StartupTask
-					TaskId="WinoServer"
-					Enabled="false"
-					DisplayName="Wino Mail" />
-		  </uap5:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-	<rescap:Capability Name="runFullTrust" />
-	<rescap:Capability Name="confirmAppClose" />
-  </Capabilities>
-</Package>
diff --git a/WinoMail.Packaging/WinoMail.Packaging.wapproj b/WinoMail.Packaging/WinoMail.Packaging.wapproj
deleted file mode 100644
index 84ec0286..00000000
--- a/WinoMail.Packaging/WinoMail.Packaging.wapproj
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DebuggerFlavor>AppHostLocalDebugger</DebuggerFlavor>
-    <RemoteDebugEnabled>False</RemoteDebugEnabled>
-    <DebuggerType>CoreClr</DebuggerType>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>ee28910b-6418-4ec2-8f4b-8e85a2e75af7</ProjectGuid>
-    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
-    <NoWarn>$(NoWarn);NU1702</NoWarn>
-    <EntryPointProjectUniqueName>..\Wino.Mail\Wino.Mail.csproj</EntryPointProjectUniqueName>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <EnableMsixTooling>true</EnableMsixTooling>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <Link>Package.appxmanifest</Link>
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Images\LargeTile.scale-100.png" />
-    <Content Include="Images\LargeTile.scale-125.png" />
-    <Content Include="Images\LargeTile.scale-150.png" />
-    <Content Include="Images\LargeTile.scale-200.png" />
-    <Content Include="Images\LargeTile.scale-400.png" />
-    <Content Include="Images\SmallTile.scale-100.png" />
-    <Content Include="Images\SmallTile.scale-125.png" />
-    <Content Include="Images\SmallTile.scale-150.png" />
-    <Content Include="Images\SmallTile.scale-200.png" />
-    <Content Include="Images\SmallTile.scale-400.png" />
-    <Content Include="Images\SplashScreen.scale-100.png" />
-    <Content Include="Images\SplashScreen.scale-125.png" />
-    <Content Include="Images\SplashScreen.scale-150.png" />
-    <Content Include="Images\SplashScreen.scale-200.png" />
-    <Content Include="Images\LockScreenLogo.scale-200.png" />
-    <Content Include="Images\SplashScreen.scale-400.png" />
-    <Content Include="Images\Square150x150Logo.scale-100.png" />
-    <Content Include="Images\Square150x150Logo.scale-125.png" />
-    <Content Include="Images\Square150x150Logo.scale-150.png" />
-    <Content Include="Images\Square150x150Logo.scale-200.png" />
-    <Content Include="Images\Square150x150Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
-    <Content Include="Images\Square44x44Logo.scale-100.png" />
-    <Content Include="Images\Square44x44Logo.scale-125.png" />
-    <Content Include="Images\Square44x44Logo.scale-150.png" />
-    <Content Include="Images\Square44x44Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.scale-400.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Images\StoreLogo.scale-100.png" />
-    <Content Include="Images\StoreLogo.scale-125.png" />
-    <Content Include="Images\StoreLogo.scale-150.png" />
-    <Content Include="Images\StoreLogo.scale-200.png" />
-    <Content Include="Images\StoreLogo.scale-400.png" />
-    <Content Include="Images\Wide310x150Logo.scale-100.png" />
-    <Content Include="Images\Wide310x150Logo.scale-125.png" />
-    <Content Include="Images\Wide310x150Logo.scale-150.png" />
-    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <Content Include="Package.StoreAssociation.xml" />
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <ItemGroup>
-    <SDKReference Include="Microsoft.VCLibs, Version=14.0" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" VersionOverride="10.0.22621.3233" PrivateAssets="all" />
-    <PackageReference Include="System.Private.Uri" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Mail\Wino.Mail.csproj">
-      <UseLowTrustEntryPoint>True</UseLowTrustEntryPoint>
-      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
-      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Server\Wino.Server.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/WinoMail.slnx b/WinoMail.slnx
index b0096dc3..9a2893e3 100644
--- a/WinoMail.slnx
+++ b/WinoMail.slnx
@@ -10,6 +10,7 @@
     <File Path="Directory.Packages.props" />
     <File Path="nuget.config" />
     <File Path="Settings.XamlStyler" />
+    <File Path="WinoFontIcomoon.json" />
   </Folder>
   <Folder Name="/lib/">
     <Project Path="Wino.Authentication/Wino.Authentication.csproj">
@@ -17,13 +18,13 @@
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
-    <Project Path="Wino.Core.Domain/Wino.Core.Domain.csproj">
-      <BuildDependency Project="Wino.SourceGenerators/Wino.SourceGenerators.csproj" />
+    <Project Path="Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj">
       <Platform Solution="*|arm64" Project="arm64" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
     </Project>
-    <Project Path="Wino.Core.UWP/Wino.Core.UWP.csproj">
+    <Project Path="Wino.Core.Domain/Wino.Core.Domain.csproj">
+      <BuildDependency Project="Wino.SourceGenerators/Wino.SourceGenerators.csproj" />
       <Platform Solution="*|arm64" Project="arm64" />
       <Platform Solution="*|x64" Project="x64" />
       <Platform Solution="*|x86" Project="x86" />
@@ -55,18 +56,17 @@
     </Project>
     <Project Path="Wino.SourceGenerators/Wino.SourceGenerators.csproj" />
   </Folder>
-  <Project Path="Wino.Mail/Wino.Mail.csproj">
+  <Project Path="Wino.Core.Tests/Wino.Core.Tests.csproj">
     <Platform Solution="*|arm64" Project="arm64" />
     <Platform Solution="*|x64" Project="x64" />
     <Platform Solution="*|x86" Project="x86" />
-    <Deploy />
   </Project>
-  <Project Path="Wino.Server/Wino.Server.csproj">
-    <Platform Solution="*|arm64" Project="ARM64" />
+  <Project Path="Wino.Mail.ViewModels.Tests/Wino.Mail.ViewModels.Tests.csproj">
+    <Platform Solution="*|arm64" Project="arm64" />
     <Platform Solution="*|x64" Project="x64" />
     <Platform Solution="*|x86" Project="x86" />
   </Project>
-  <Project Path="WinoMail.Packaging/WinoMail.Packaging.wapproj" Type="c7167f0d-bc9f-4e6e-afe1-012c56b48db5" Id="ee28910b-6418-4ec2-8f4b-8e85a2e75af7">
+  <Project Path="Wino.Mail.WinUI/Wino.Mail.WinUI.csproj" Id="bf340564-2cc8-486d-924d-8474cb5f3316">
     <Platform Solution="*|arm64" Project="ARM64" />
     <Platform Solution="*|x64" Project="x64" />
     <Platform Solution="*|x86" Project="x86" />
diff --git a/nuget.config b/nuget.config
index c4a1123e..189af110 100644
--- a/nuget.config
+++ b/nuget.config
@@ -14,9 +14,13 @@
 		<!-- key value for <packageSource> should match key values from <packageSources> element -->
 		<packageSource key="nuget">
 			<package pattern="*" />
+			<!-- <package pattern="CommunityToolkit.Common" />
+			<package pattern="Microsoft.*" />
+			<package pattern="Newtonsoft.Json" /> -->
 		</packageSource>
 		<packageSource key="labsFeed">
 			<package pattern="CommunityToolkit.Labs.*" />
+			<package pattern="CommunityToolkit.WinUI.Extensions" />
 		</packageSource>
 	</packageSourceMapping>
 </configuration>
diff --git a/scripts/translate_resources.py b/scripts/translate_resources.py
new file mode 100644
index 00000000..aba1d8d7
--- /dev/null
+++ b/scripts/translate_resources.py
@@ -0,0 +1,420 @@
+#!/usr/bin/env python3
+"""
+One-off maintenance script for syncing translated Wino `resources.json` files
+with `en_US/resources.json` and bulk-translating missing keys via the OpenAI API.
+
+By default this script runs in dry-run mode and only reports the planned changes.
+Use `--apply` to write updates.
+
+Examples:
+  python scripts/translate_resources.py --dry-run
+  python scripts/translate_resources.py --apply --model gpt-5-nano
+  python scripts/translate_resources.py --apply --locales pl_PL de_DE --chunk-size 120
+
+
+Usage:
+    $env:OPENAI_API_KEY="{open ai key here}"
+    python .\scripts\translate_resources.py --dry-run
+    python .\scripts\translate_resources.py --apply --model gpt-5-nano --workers 4
+"""
+
+from __future__ import annotations
+
+import argparse
+import concurrent.futures
+import json
+import os
+import sys
+import time
+import urllib.error
+import urllib.request
+from collections import OrderedDict
+from pathlib import Path
+from typing import Dict, Iterable, List, Sequence, Tuple
+
+
+LOCALE_LABELS = {
+    "bg_BG": "Bulgarian (Bulgaria)",
+    "ca_ES": "Catalan (Spain)",
+    "cs_CZ": "Czech (Czech Republic)",
+    "da_DK": "Danish (Denmark)",
+    "de_DE": "German (Germany)",
+    "el_GR": "Greek (Greece)",
+    "es_ES": "Spanish (Spain)",
+    "fi_FI": "Finnish (Finland)",
+    "fr_FR": "French (France)",
+    "gl_ES": "Galician (Spain)",
+    "id_ID": "Indonesian (Indonesia)",
+    "it_IT": "Italian (Italy)",
+    "ja_JP": "Japanese (Japan)",
+    "lt_LT": "Lithuanian (Lithuania)",
+    "nl_NL": "Dutch (Netherlands)",
+    "pl_PL": "Polish (Poland)",
+    "pt_BR": "Portuguese (Brazil)",
+    "ro_RO": "Romanian (Romania)",
+    "ru_RU": "Russian (Russia)",
+    "sk_SK": "Slovak (Slovakia)",
+    "tr_TR": "Turkish (Turkey)",
+    "uk_UA": "Ukrainian (Ukraine)",
+    "zh_CN": "Chinese, Simplified (China)",
+}
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description="Bulk-sync and translate Wino resources.json files.")
+    parser.add_argument(
+        "--translations-root",
+        default=str(Path("Wino.Core.Domain") / "Translations"),
+        help="Path to the translations root directory.",
+    )
+    parser.add_argument(
+        "--source-locale",
+        default="en_US",
+        help="Source locale directory name.",
+    )
+    parser.add_argument(
+        "--locales",
+        nargs="*",
+        help="Specific locale directory names to process. Defaults to all non-source locales.",
+    )
+    parser.add_argument(
+        "--model",
+        default="gpt-5-nano",
+        help="OpenAI model name to use for translation.",
+    )
+    parser.add_argument(
+        "--chunk-size",
+        type=int,
+        default=100,
+        help="How many keys to translate per API request.",
+    )
+    parser.add_argument(
+        "--workers",
+        type=int,
+        default=4,
+        help="How many locales to process in parallel.",
+    )
+    parser.add_argument(
+        "--max-retries",
+        type=int,
+        default=4,
+        help="Maximum retries per translation chunk.",
+    )
+    parser.add_argument(
+        "--api-key-env",
+        default="OPENAI_API_KEY",
+        help="Environment variable that stores the OpenAI API key.",
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Report planned changes without writing files.",
+    )
+    parser.add_argument(
+        "--apply",
+        action="store_true",
+        help="Write the translated files back to disk.",
+    )
+    args = parser.parse_args()
+    if args.apply == args.dry_run:
+        parser.error("Choose exactly one of --apply or --dry-run.")
+    if args.chunk_size < 1:
+        parser.error("--chunk-size must be greater than 0.")
+    if args.workers < 1:
+        parser.error("--workers must be greater than 0.")
+    if args.max_retries < 1:
+        parser.error("--max-retries must be greater than 0.")
+    return args
+
+
+def read_json(path: Path) -> OrderedDict[str, str]:
+    with path.open("r", encoding="utf-8-sig", newline="") as handle:
+        return json.load(handle, object_pairs_hook=OrderedDict)
+
+
+def has_utf8_bom(path: Path) -> bool:
+    return path.read_bytes().startswith(b"\xef\xbb\xbf")
+
+
+def write_json(path: Path, data: OrderedDict[str, str], include_bom: bool) -> None:
+    encoding = "utf-8-sig" if include_bom else "utf-8"
+    text = json.dumps(data, ensure_ascii=False, indent=4) + "\n"
+    with path.open("w", encoding=encoding, newline="\r\n") as handle:
+        handle.write(text)
+
+
+def chunk_items(items: Sequence[Tuple[str, str]], chunk_size: int) -> Iterable[List[Tuple[str, str]]]:
+    for index in range(0, len(items), chunk_size):
+        yield list(items[index : index + chunk_size])
+
+
+def build_schema(keys: Sequence[str]) -> Dict[str, object]:
+    properties = {key: {"type": "string"} for key in keys}
+    return {
+        "name": "resource_translation_batch",
+        "strict": True,
+        "schema": {
+            "type": "object",
+            "additionalProperties": False,
+            "properties": properties,
+            "required": list(keys),
+        },
+    }
+
+
+def extract_message_content(payload: Dict[str, object]) -> str:
+    try:
+        return payload["choices"][0]["message"]["content"]
+    except (KeyError, IndexError, TypeError) as exc:
+        raise RuntimeError(f"Unexpected OpenAI response shape: {payload}") from exc
+
+
+def call_openai_chat(
+    *,
+    api_key: str,
+    model: str,
+    locale: str,
+    language_label: str,
+    entries: Sequence[Tuple[str, str]],
+) -> Dict[str, str]:
+    keys = [key for key, _ in entries]
+    prompt_lines = [
+        f"Translate the following UI localization values from English to {language_label}.",
+        "Return only translated string values for the provided keys.",
+        "Keep the keys exactly the same.",
+        "Preserve placeholders and formatting exactly, including but not limited to:",
+        "- {0}, {1}, {Name}, {{escaped braces}}",
+        "- %s, %1$s and similar printf-style tokens",
+        "- Ellipses, punctuation, capitalization, line breaks, tabs, HTML, Markdown, and URLs",
+        "- Product and protocol names such as Wino, Gmail, Outlook, IMAP, SMTP, OAuth, CalDav, Edge, Chrome, Firefox, Jodit, WebView2, SQLite",
+        "Prefer natural UI phrasing for the target locale.",
+        f"Locale code: {locale}",
+        "",
+        "Strings to translate:",
+    ]
+    for key, value in entries:
+        prompt_lines.append(f"{key}: {value}")
+
+    body = {
+        "model": model,
+        "messages": [
+            {
+                "role": "system",
+                "content": (
+                    "You are a software localization engine. "
+                    "Translate accurately and conservatively. "
+                    "Never omit keys. Never add commentary."
+                ),
+            },
+            {"role": "user", "content": "\n".join(prompt_lines)},
+        ],
+        "response_format": {
+            "type": "json_schema",
+            "json_schema": build_schema(keys),
+        },
+    }
+
+    request = urllib.request.Request(
+        url="https://api.openai.com/v1/chat/completions",
+        data=json.dumps(body).encode("utf-8"),
+        headers={
+            "Authorization": f"Bearer {api_key}",
+            "Content-Type": "application/json",
+        },
+        method="POST",
+    )
+
+    try:
+        with urllib.request.urlopen(request, timeout=180) as response:
+            payload = json.loads(response.read().decode("utf-8"))
+    except urllib.error.HTTPError as exc:
+        details = exc.read().decode("utf-8", errors="replace")
+        raise RuntimeError(f"OpenAI API HTTP {exc.code}: {details}") from exc
+    except urllib.error.URLError as exc:
+        raise RuntimeError(f"OpenAI API request failed: {exc}") from exc
+
+    content = extract_message_content(payload)
+    result = json.loads(content)
+    if sorted(result.keys()) != sorted(keys):
+        raise RuntimeError(
+            "Translated batch returned the wrong key set. "
+            f"Expected {len(keys)} keys, got {len(result)} keys."
+        )
+    return {key: result[key] for key in keys}
+
+
+def translate_missing_entries(
+    *,
+    api_key: str,
+    model: str,
+    locale: str,
+    entries: Sequence[Tuple[str, str]],
+    chunk_size: int,
+    max_retries: int,
+) -> Dict[str, str]:
+    if not entries:
+        return {}
+
+    translated: Dict[str, str] = {}
+    language_label = LOCALE_LABELS.get(locale, locale)
+
+    for chunk_index, chunk in enumerate(chunk_items(entries, chunk_size), start=1):
+        last_error: Exception | None = None
+        for attempt in range(1, max_retries + 1):
+            try:
+                result = call_openai_chat(
+                    api_key=api_key,
+                    model=model,
+                    locale=locale,
+                    language_label=language_label,
+                    entries=chunk,
+                )
+                translated.update(result)
+                print(
+                    f"[{locale}] translated chunk {chunk_index} "
+                    f"({len(chunk)} keys) on attempt {attempt}",
+                    flush=True,
+                )
+                break
+            except Exception as exc:  # noqa: BLE001
+                last_error = exc
+                if attempt == max_retries:
+                    raise RuntimeError(
+                        f"Failed translating chunk {chunk_index} for {locale}: {exc}"
+                    ) from exc
+                wait_seconds = attempt * 2
+                print(
+                    f"[{locale}] retrying chunk {chunk_index} after error: {exc}",
+                    flush=True,
+                )
+                time.sleep(wait_seconds)
+
+    return translated
+
+
+def process_locale(
+    locale: str,
+    source_data: OrderedDict[str, str],
+    translations_root: Path,
+    args: argparse.Namespace,
+    api_key: str | None,
+) -> Dict[str, object]:
+    path = translations_root / locale / "resources.json"
+    if not path.exists():
+        raise FileNotFoundError(f"Locale file not found: {path}")
+
+    target_data = read_json(path)
+    include_bom = has_utf8_bom(path)
+
+    source_keys = list(source_data.keys())
+    source_key_set = set(source_keys)
+    target_key_set = set(target_data.keys())
+
+    missing_keys = [key for key in source_keys if key not in target_key_set]
+    extra_keys = [key for key in target_data.keys() if key not in source_key_set]
+
+    translated_missing: Dict[str, str] = {}
+    if missing_keys and args.apply:
+        if not api_key:
+            raise RuntimeError(
+                f"Missing API key. Set the {args.api_key_env} environment variable before using --apply."
+            )
+        missing_entries = [(key, source_data[key]) for key in missing_keys]
+        translated_missing = translate_missing_entries(
+            api_key=api_key,
+            model=args.model,
+            locale=locale,
+            entries=missing_entries,
+            chunk_size=args.chunk_size,
+            max_retries=args.max_retries,
+        )
+
+    merged = OrderedDict()
+    for key in source_keys:
+        if key in target_data:
+            merged[key] = target_data[key]
+        elif key in translated_missing:
+            merged[key] = translated_missing[key]
+        else:
+            merged[key] = source_data[key]
+
+    if args.apply:
+        write_json(path, merged, include_bom=include_bom)
+
+    return {
+        "locale": locale,
+        "path": str(path),
+        "existing": len(source_keys) - len(missing_keys),
+        "missing": len(missing_keys),
+        "extra": len(extra_keys),
+        "translated": len(translated_missing),
+        "wrote": args.apply,
+    }
+
+
+def discover_locales(translations_root: Path, source_locale: str, requested: Sequence[str] | None) -> List[str]:
+    if requested:
+        return list(requested)
+    locales = []
+    for entry in sorted(translations_root.iterdir()):
+        if entry.is_dir() and entry.name != source_locale and (entry / "resources.json").exists():
+            locales.append(entry.name)
+    return locales
+
+
+def main() -> int:
+    args = parse_args()
+    translations_root = Path(args.translations_root)
+    source_path = translations_root / args.source_locale / "resources.json"
+    if not source_path.exists():
+        print(f"Source file not found: {source_path}", file=sys.stderr)
+        return 1
+
+    source_data = read_json(source_path)
+    locales = discover_locales(translations_root, args.source_locale, args.locales)
+    if not locales:
+        print("No target locales found.", file=sys.stderr)
+        return 1
+
+    api_key = os.environ.get(args.api_key_env)
+    print(
+        f"Processing {len(locales)} locale(s) from {source_path} "
+        f"using model {args.model} in {'apply' if args.apply else 'dry-run'} mode.",
+        flush=True,
+    )
+
+    results: List[Dict[str, object]] = []
+    with concurrent.futures.ThreadPoolExecutor(max_workers=min(args.workers, len(locales))) as executor:
+        future_map = {
+            executor.submit(process_locale, locale, source_data, translations_root, args, api_key): locale
+            for locale in locales
+        }
+        for future in concurrent.futures.as_completed(future_map):
+            locale = future_map[future]
+            try:
+                result = future.result()
+            except Exception as exc:  # noqa: BLE001
+                print(f"[{locale}] failed: {exc}", file=sys.stderr, flush=True)
+                return 1
+            results.append(result)
+            print(
+                f"[{result['locale']}] missing={result['missing']} "
+                f"extra={result['extra']} translated={result['translated']} "
+                f"mode={'write' if result['wrote'] else 'preview'}",
+                flush=True,
+            )
+
+    results.sort(key=lambda item: item["locale"])
+    total_missing = sum(int(item["missing"]) for item in results)
+    total_extra = sum(int(item["extra"]) for item in results)
+    total_translated = sum(int(item["translated"]) for item in results)
+    print(
+        f"Done. locales={len(results)} missing={total_missing} "
+        f"extra={total_extra} translated={total_translated}",
+        flush=True,
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())