From 7b369201b0cf4a154fdf3236a78728530c20c5b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Kaan=20K=C3=B6se?= <bkaankose@outlook.com>
Date: Wed, 1 Apr 2026 01:41:17 +0200
Subject: [PATCH] General account details settings and some marking mail issues

---
 .claude/instructions/winui3.instructions.md   | 160 -----
 .codex/environments/environment.toml          |   6 -
 AGENTS.md                                     |   1 +
 .../Services/MailRequestStateTests.cs         |  85 +++
 .../OutlookSynchronizerRequestSuccessTests.cs | 102 ++++
 Wino.Core/Requests/Mail/ChangeFlagRequest.cs  |   6 +-
 Wino.Core/Requests/Mail/MarkReadRequest.cs    |   6 +-
 .../Synchronizers/OutlookSynchronizer.cs      |  12 +
 .../AccountDetailsPageViewModel.cs            |  30 +-
 .../Views/Account/AccountDetailsPage.xaml     | 554 +++++++++---------
 .../Views/Account/AccountDetailsPage.xaml.cs  |   9 +
 11 files changed, 536 insertions(+), 435 deletions(-)
 delete mode 100644 .claude/instructions/winui3.instructions.md
 delete mode 100644 .codex/environments/environment.toml
 create mode 100644 Wino.Core.Tests/Services/MailRequestStateTests.cs
 create mode 100644 Wino.Core.Tests/Synchronizers/OutlookSynchronizerRequestSuccessTests.cs

diff --git a/.claude/instructions/winui3.instructions.md b/.claude/instructions/winui3.instructions.md
deleted file mode 100644
index 811306c6..00000000
--- a/.claude/instructions/winui3.instructions.md
+++ /dev/null
@@ -1,160 +0,0 @@
----
-description: 'WinUI 3 and Windows App SDK coding guidelines. Prevents common UWP API misuse, enforces correct XAML namespaces, threading, windowing, and MVVM patterns for desktop Windows apps.'
-applyTo: '**/*.xaml, **/*.cs, **/*.csproj'
----
-
-# WinUI 3 / Windows App SDK
-
-## Critical Rules — NEVER Use Legacy UWP APIs
-
-These UWP patterns are **wrong** for WinUI 3 desktop apps. Always use the Windows App SDK equivalent.
-
-- **NEVER** use `Windows.UI.Popups.MessageDialog`. Use `ContentDialog` with `XamlRoot` set.
-- **NEVER** show a `ContentDialog` without setting `dialog.XamlRoot = this.Content.XamlRoot` first.
-- **NEVER** use `CoreDispatcher.RunAsync` or `Dispatcher.RunAsync`. Use `DispatcherQueue.TryEnqueue`.
-- **NEVER** use `Window.Current`. Track the main window via a static `App.MainWindow` property.
-- **NEVER** use `Windows.UI.Xaml.*` namespaces. Use `Microsoft.UI.Xaml.*`.
-- **NEVER** use `Windows.UI.Composition`. Use `Microsoft.UI.Composition`.
-- **NEVER** use `Windows.UI.Colors`. Use `Microsoft.UI.Colors`.
-- **NEVER** use `ApplicationView` or `CoreWindow` for window management. Use `Microsoft.UI.Windowing.AppWindow`.
-- **NEVER** use `CoreApplicationViewTitleBar`. Use `AppWindowTitleBar`.
-- **NEVER** use `GetForCurrentView()` patterns (e.g., `UIViewSettings.GetForCurrentView()`). These do not exist in desktop WinUI 3. Use `AppWindow` APIs instead.
-- **NEVER** use UWP `PrintManager` directly. Use `IPrintManagerInterop` with a window handle.
-- **NEVER** use `DataTransferManager` directly for sharing. Use `IDataTransferManagerInterop` with a window handle.
-- **NEVER** use UWP `IBackgroundTask`. Use `Microsoft.Windows.AppLifecycle` activation.
-- **NEVER** use `WebAuthenticationBroker`. Use `OAuth2Manager` (Windows App SDK 1.7+).
-
-## XAML Patterns
-
-- The default XAML namespace maps to `Microsoft.UI.Xaml`, not `Windows.UI.Xaml`.
-- Prefer `{x:Bind}` over `{Binding}` for compiled, type-safe, higher-performance bindings.
-- Set `x:DataType` on `DataTemplate` elements when using `{x:Bind}` — this is required for compiled bindings in templates. On Page/UserControl, `x:DataType` enables compile-time binding validation but is not strictly required if the DataContext does not change.
-- Use `Mode=OneWay` for dynamic values, `Mode=OneTime` for static, `Mode=TwoWay` only for editable inputs.
-- Do not bind static constants — set them directly in XAML.
-
-## Threading
-
-- Use `DispatcherQueue.TryEnqueue(() => { ... })` to update UI from background threads.
-- `TryEnqueue` returns `bool`, not a `Task` — it is fire-and-forget.
-- Check thread access with `DispatcherQueue.HasThreadAccess` before dispatching.
-- WinUI 3 uses standard STA (not ASTA). No built-in reentrancy protection — be cautious with async code that pumps messages.
-
-## Windowing
-
-- Get the `AppWindow` from a WinUI 3 `Window` via `WindowNative.GetWindowHandle` → `Win32Interop.GetWindowIdFromWindow` → `AppWindow.GetFromWindowId`.
-- Use `AppWindow` for resize, move, title, and presenter operations.
-- Custom title bar: use `AppWindow.TitleBar` properties, not `CoreApplicationViewTitleBar`.
-- Track the main window as `App.MainWindow` (a static property set in `OnLaunched`).
-
-## Dialogs and Pickers
-
-- **ContentDialog**: Always set `dialog.XamlRoot = this.Content.XamlRoot` before calling `ShowAsync()`.
-- **File/Folder Pickers**: Initialize with `WinRT.Interop.InitializeWithWindow.Initialize(picker, hwnd)` where `hwnd` comes from `WindowNative.GetWindowHandle(App.MainWindow)`.
-- **Share/Print**: Use COM interop interfaces (`IDataTransferManagerInterop`, `IPrintManagerInterop`) with window handles.
-
-## MVVM and Data Binding
-
-- Prefer `CommunityToolkit.Mvvm` (`[ObservableProperty]`, `[RelayCommand]`) for MVVM infrastructure.
-- Use `Microsoft.Extensions.DependencyInjection` for service registration and injection.
-- Keep UI (Views) focused on layout and bindings; keep logic in ViewModels and services.
-- Use `async`/`await` for I/O and long-running work to keep the UI responsive.
-
-## Project Setup
-
-- Target `net10.0-windows10.0.22621.0` (or appropriate TFM for the project's target SDK).
-- Set `<UseWinUI>true</UseWinUI>` in the project file.
-- Reference the latest stable `Microsoft.WindowsAppSDK` NuGet package.
-- Use `System.Text.Json` with source generators for JSON serialization.
-
-## C# Code Style
-
-- Use file-scoped namespaces.
-- Enable nullable reference types. Use `is null` / `is not null` instead of `== null`.
-- Prefer pattern matching over `as`/`is` with null checks.
-- PascalCase for types, methods, properties. camelCase for private fields.
-- Allman brace style (opening brace on its own line).
-- Prefer explicit types for built-in types; use `var` only when the type is obvious.
-
-## Accessibility
-
-- Set `AutomationProperties.Name` on all interactive controls.
-- Use `AutomationProperties.HeadingLevel` on section headers.
-- Hide decorative elements with `AutomationProperties.AccessibilityView="Raw"`.
-- Ensure full keyboard navigation (Tab, Enter, Space, arrow keys).
-- Meet WCAG color contrast requirements.
-
-## Performance
-
-- Prefer `{x:Bind}` (compiled) over `{Binding}` (reflection-based).
-- **NativeAOT:** Under Native AOT compilation, `{Binding}` (reflection-based) does not work at all. Only `{x:Bind}` (compiled bindings) is supported. If the project uses NativeAOT, use `{x:Bind}` exclusively.
-- Use `x:Load` or `x:DeferLoadStrategy` for UI elements that are not immediately needed.
-- Use `ItemsRepeater` with virtualization for large lists.
-- Avoid deep layout nesting — prefer `Grid` over nested `StackPanel` chains.
-- Use `async`/`await` for all I/O; never block the UI thread.
-
-## App Settings (Packaged vs Unpackaged)
-
-- **Packaged apps**: `ApplicationData.Current.LocalSettings` works as expected.
-- **Unpackaged apps**: Use a custom settings file (e.g., JSON in `Environment.GetFolderPath(SpecialFolder.LocalApplicationData)`).
-- Do not assume `ApplicationData` is always available — check packaging status first.
-
-## Typography
-
-- **Always** use built-in TextBlock styles (`CaptionTextBlockStyle`, `BodyTextBlockStyle`, `BodyStrongTextBlockStyle`, `SubtitleTextBlockStyle`, `TitleTextBlockStyle`, `TitleLargeTextBlockStyle`, `DisplayTextBlockStyle`).
-- Prefer using the built-in TextBlock styles over hardcoding `FontSize`, `FontWeight`, or `FontFamily`.
-- Font: Segoe UI Variable is the default — do not change it.
-- Use sentence casing for all UI text.
-
-
-## Theming & Colors
-
-- **Always** use `{ThemeResource}` for brushes and colors to support Light, Dark, and High Contrast themes automatically.
-- **Never** hardcode color values (`#FFFFFF`, `Colors.White`, etc.) for UI elements. Use theme resources like `TextFillColorPrimaryBrush`, `CardBackgroundFillColorDefaultBrush`, `CardStrokeColorDefaultBrush`.
-- Use `SystemAccentColor` (and `Light1`–`Light3`, `Dark1`–`Dark3` variants) for the user's accent color palette.
-- For borders: use `CardStrokeColorDefaultBrush` or `ControlStrokeColorDefaultBrush`.
-
-## Spacing & Layout
-
-- Use a **4px grid system**: all margins, padding, and spacing values must be multiples of 4px.
-- Standard spacing: 4 (compact), 8 (controls), 12 (small gutters), 16 (content padding), 24 (large gutters).
-- Prefer `Grid` over deeply nested `StackPanel` chains for performance.
-- Use `Auto` for content-sized rows/columns, `*` for proportional sizing. Avoid fixed pixel sizes.
-- Use `VisualStateManager` with `AdaptiveTrigger` for responsive layouts at breakpoints (640px, 1008px).
-- Use `ControlCornerRadius` (4px) for small controls and `OverlayCornerRadius` (8px) for cards, dialogs, flyouts.
-
-## Materials & Elevation
-
-- Use **Mica** (`MicaBackdrop`) for the app window backdrop. Requires transparent layers above to show through.
-- Use **Acrylic** for transient surfaces only (flyouts, menus, navigation panes).
-- Use `LayerFillColorDefaultBrush` for content layers above Mica.
-- Use `ThemeShadow` with Z-axis `Translation` for elevation. Cards: 4–8 px, Flyouts: 32 px, Dialogs: 128 px.
-
-## Motion & Transitions
-
-- Use built-in theme transitions (`EntranceThemeTransition`, `RepositionThemeTransition`, `ContentThemeTransition`, `AddDeleteThemeTransition`).
-- Avoid custom storyboard animations when a built-in transition exists.
-
-## Control Selection
-
-- Use `NavigationView` for primary app navigation (not custom sidebars).
-- Use `InfoBar` for persistent in-app notifications (not custom banners).
-- Use `TeachingTip` for contextual guidance (not custom popups).
-- Use `NumberBox` for numeric input (not TextBox with manual validation).
-- Use `ToggleSwitch` for on/off settings (not CheckBox).
-- Use `ItemsView` as the modern collection control for displaying data with built-in selection, virtualization, and layout flexibility.
-- Use `ListView`/`GridView` for standard virtualized lists and grids, especially when built-in selection support is needed.
-- Use `ItemsRepeater` only for fully custom virtualizing layouts where you need complete control over rendering and do not need built-in selection or interaction handling.
-- Use `Expander` for collapsible sections (not custom visibility toggling).
-
-## Error Handling
-
-- Always wrap `async void` event handlers in try/catch to prevent unhandled crashes.
-- Use `InfoBar` (with `Severity = Error`) for user-facing error messages, not `ContentDialog` for routine errors.
-- Handle `App.UnhandledException` for logging and graceful recovery.
-
-## Testing
-
-- **NEVER** use a plain MSTest or xUnit project for tests that instantiate WinUI 3 XAML types. Use a **Unit Test App (WinUI in Desktop)** project, which provides the Xaml runtime and UI thread.
-- Use `[TestMethod]` for pure logic tests. Use `[UITestMethod]` for any test that creates or interacts with `Microsoft.UI.Xaml` types (controls, pages, user controls).
-- Place testable business logic in a **Class Library (WinUI in Desktop)** project, separate from the main app.
-- Build the solution before running tests to enable Visual Studio test discovery.
diff --git a/.codex/environments/environment.toml b/.codex/environments/environment.toml
deleted file mode 100644
index ff363268..00000000
--- a/.codex/environments/environment.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-# THIS IS AUTOGENERATED. DO NOT EDIT MANUALLY
-version = 1
-name = "Wino-Mail"
-
-[setup]
-script = ""
diff --git a/AGENTS.md b/AGENTS.md
index 5d2615c0..08771976 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -152,6 +152,7 @@ private string searchQuery = string.Empty;
 - 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/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/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/Requests/Mail/ChangeFlagRequest.cs b/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
index 54f33a19..231435f4 100644
--- a/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
+++ b/Wino.Core/Requests/Mail/ChangeFlagRequest.cs
@@ -12,6 +12,8 @@ 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;
@@ -22,7 +24,7 @@ public record ChangeFlagRequest(MailCopy Item, bool IsFlagged) : MailRequestBase
     /// 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 => Item.IsFlagged == IsFlagged;
+    public bool IsNoOp { get; } = Item.IsFlagged == IsFlagged;
 
     public override void ApplyUIChanges()
     {
@@ -39,7 +41,7 @@ public record ChangeFlagRequest(MailCopy Item, bool IsFlagged) : MailRequestBase
         // Skip UI revert if this was a no-op request
         if (IsNoOp) return;
 
-        Item.IsFlagged = !IsFlagged;
+        Item.IsFlagged = _originalIsFlagged;
 
         WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientReverted, MailCopyChangeFlags.IsFlagged));
     }
diff --git a/Wino.Core/Requests/Mail/MarkReadRequest.cs b/Wino.Core/Requests/Mail/MarkReadRequest.cs
index 656df721..28c4fd3b 100644
--- a/Wino.Core/Requests/Mail/MarkReadRequest.cs
+++ b/Wino.Core/Requests/Mail/MarkReadRequest.cs
@@ -11,6 +11,8 @@ 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;
@@ -21,7 +23,7 @@ public record MarkReadRequest(MailCopy Item, bool IsRead) : MailRequestBase(Item
     /// 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 => Item.IsRead == IsRead;
+    public bool IsNoOp { get; } = Item.IsRead == IsRead;
 
     public override void ApplyUIChanges()
     {
@@ -38,7 +40,7 @@ public record MarkReadRequest(MailCopy Item, bool IsRead) : MailRequestBase(Item
         // Skip UI revert if this was a no-op request
         if (IsNoOp) return;
 
-        Item.IsRead = !IsRead;
+        Item.IsRead = _originalIsRead;
 
         WeakReferenceMessenger.Default.Send(new MailUpdatedMessage(Item, MailUpdateSource.ClientReverted, MailCopyChangeFlags.IsRead));
     }
diff --git a/Wino.Core/Synchronizers/OutlookSynchronizer.cs b/Wino.Core/Synchronizers/OutlookSynchronizer.cs
index dba0b298..621953ec 100644
--- a/Wino.Core/Synchronizers/OutlookSynchronizer.cs
+++ b/Wino.Core/Synchronizers/OutlookSynchronizer.cs
@@ -1884,6 +1884,18 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
     {
         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;
diff --git a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
index e9eb768a..6205441f 100644
--- a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
@@ -7,6 +7,7 @@ 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;
@@ -263,7 +264,7 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
                 SelectedOutgoingServerConnectionSecurityIndex = AvailableConnectionSecurities.FindIndex(a => a.ImapConnectionSecurity == ServerInformation.OutgoingServerSocketOption);
             }
 
-            SelectedTabIndex = _statePersistanceService.ApplicationMode == WinoApplicationMode.Calendar ? 1 : 0;
+            SelectedTabIndex = _statePersistanceService.ApplicationMode == WinoApplicationMode.Calendar ? 2 : 1;
 
             var folderStructures = (await _folderService.GetFolderStructureForAccountAsync(Account.Id, true)).Folders;
 
@@ -300,7 +301,7 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
             foreach (var calendar in calendars)
             {
                 AccountCalendars.Add(calendar);
-                AccountCalendarSettingsItems.Add(new AccountCalendarSettingsItemViewModel(calendar, ShowAsOptions));
+                AccountCalendarSettingsItems.Add(new AccountCalendarSettingsItemViewModel(calendar, ShowAsOptions, AvailableColors));
             }
         });
 
@@ -328,6 +329,15 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
         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;
@@ -403,6 +413,7 @@ 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;
@@ -414,11 +425,24 @@ public partial class AccountCalendarSettingsItemViewModel : ObservableObject
     [ObservableProperty]
     public partial AccountCalendarShowAsOption SelectedShowAsOption { get; set; }
 
-    public AccountCalendarSettingsItemViewModel(AccountCalendar calendar, ObservableCollection<AccountCalendarShowAsOption> showAsOptions)
+    [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.WinUI/Views/Account/AccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
index ddf3895b..a68b0c80 100644
--- a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
@@ -76,268 +76,20 @@
     <ScrollViewer>
         <Grid RowSpacing="12">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <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: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}" />
-
-                                <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"
-                                    Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
-                                    ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
-                                    SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerConnectionSecurityIndex, Mode=TwoWay}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate x:DataType="accounts:ImapConnectionSecurityModel">
-                                            <TextBlock Text="{x:Bind DisplayName}" />
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <ComboBox
-                                    Grid.Row="6"
-                                    HorizontalAlignment="Stretch"
-                                    Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
-                                    ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
-                                    SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerAuthenticationMethodIndex, Mode=TwoWay}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate x:DataType="accounts:ImapAuthenticationMethodModel">
-                                            <TextBlock Text="{x:Bind DisplayName}" />
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <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}" />
-
-                                <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"
-                                    Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
-                                    ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
-                                    SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerConnectionSecurityIndex, Mode=TwoWay}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate x:DataType="accounts:ImapConnectionSecurityModel">
-                                            <TextBlock Text="{x:Bind DisplayName}" />
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <ComboBox
-                                    Grid.Row="6"
-                                    Grid.Column="2"
-                                    HorizontalAlignment="Stretch"
-                                    Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
-                                    ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
-                                    SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerAuthenticationMethodIndex, Mode=TwoWay}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate x:DataType="accounts:ImapAuthenticationMethodModel">
-                                            <TextBlock Text="{x:Bind DisplayName}" />
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </ComboBox>
-
-                                <StackPanel
-                                    Grid.Row="7"
-                                    Grid.Column="2"
-                                    Margin="0,12"
-                                    HorizontalAlignment="Right"
-                                    Orientation="Horizontal"
-                                    Spacing="12">
-                                    <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>
-
-                <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>
-
-            <!--<controls:SettingsExpander
-                Description="{x:Bind ViewModel.Address, Mode=OneWay}"
-                Header="{x:Bind ViewModel.AccountName, Mode=OneWay}"
-                IsExpanded="True">
-                <controls:SettingsExpander.HeaderIcon>
-                    <BitmapIcon ShowAsMonochrome="False" UriSource="{x:Bind ViewModel.ProviderIconPath, Mode=OneWay}" />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>-->
             <controls:Segmented
                 x:Name="TabSelector"
-                Grid.Row="1"
+                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" />
@@ -350,6 +102,254 @@
                 </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: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}" />
+
+                                    <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"
+                                        Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
+                                        ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
+                                        SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerConnectionSecurityIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate x:DataType="accounts:ImapConnectionSecurityModel">
+                                                <TextBlock Text="{x:Bind DisplayName}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <ComboBox
+                                        Grid.Row="6"
+                                        HorizontalAlignment="Stretch"
+                                        Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
+                                        ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
+                                        SelectedIndex="{x:Bind ViewModel.SelectedIncomingServerAuthenticationMethodIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate x:DataType="accounts:ImapAuthenticationMethodModel">
+                                                <TextBlock Text="{x:Bind DisplayName}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <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}" />
+
+                                    <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"
+                                        Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_ConnectionSecurity}"
+                                        ItemsSource="{x:Bind ViewModel.AvailableConnectionSecurities}"
+                                        SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerConnectionSecurityIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate x:DataType="accounts:ImapConnectionSecurityModel">
+                                                <TextBlock Text="{x:Bind DisplayName}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <ComboBox
+                                        Grid.Row="6"
+                                        Grid.Column="2"
+                                        HorizontalAlignment="Stretch"
+                                        Header="{x:Bind domain:Translator.ImapAdvancedSetupDialog_AuthenticationMethod}"
+                                        ItemsSource="{x:Bind ViewModel.AvailableAuthenticationMethods}"
+                                        SelectedIndex="{x:Bind ViewModel.SelectedOutgoingServerAuthenticationMethodIndex, Mode=TwoWay}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate x:DataType="accounts:ImapAuthenticationMethodModel">
+                                                <TextBlock Text="{x:Bind DisplayName}" />
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </ComboBox>
+
+                                    <StackPanel
+                                        Grid.Row="7"
+                                        Grid.Column="2"
+                                        Margin="0,12"
+                                        HorizontalAlignment="Right"
+                                        Orientation="Horizontal"
+                                        Spacing="12">
+                                        <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>
+
+                    <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"
@@ -551,11 +551,30 @@
                                             <controls:SettingsCard.HeaderIcon>
                                                 <FontIcon Glyph="&#xE790;" />
                                             </controls:SettingsCard.HeaderIcon>
-                                            <Border
-                                                Width="32"
-                                                Height="32"
-                                                Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
-                                                CornerRadius="4" />
+                                            <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}">
@@ -592,25 +611,36 @@
 
                 </StackPanel>
             </Grid>
-
         </Grid>
 
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="TabStates">
-                <VisualState x:Name="MailTab">
+                <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, 1), Mode=OneWay}" />
+                        <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>
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
index 0047c825..76f64bfd 100644
--- a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs
@@ -1,6 +1,7 @@
 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;
@@ -56,6 +57,14 @@ public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
         }
     }
 
+    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);