diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index cf17e781..f43a9acc 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -898,7 +898,7 @@
     "FolderCustomization_Hide": "Hide from navigation",
     "FolderCustomization_Reset": "Reset to defaults",
     "FolderCustomization_ResetConfirmTitle": "Reset folder layout",
-    "FolderCustomization_ResetConfirmMessage": "This will clear any custom folder order and restore the default alphabetic layout for this account. Hidden folders will become visible again. Continue?",
+    "FolderCustomization_ResetConfirmMessage": "This will clear any custom folder order and restore the default special-folder layout for this account. Hidden folders will become visible again. Continue?",
     "FolderCustomization_EmptySection": "Drag folders here to add them to this section.",
     "SettingsEditAccountDetails_Title": "Edit Account Details",
     "SettingsEditAccountDetails_Description": "Change account name, sender name and assign a new color if you like.",
diff --git a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
index 21e865a1..2d8bfac5 100644
--- a/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountDetailsPageViewModel.cs
@@ -292,10 +292,15 @@ public partial class AccountDetailsPageViewModel : MailBaseViewModel
 
             var folderStructures = (await _folderService.GetFolderStructureForAccountAsync(Account.Id, true)).Folders;
 
-            foreach (var folder in folderStructures)
+            await ExecuteUIThread(() =>
             {
-                CurrentFolders.Add(folder);
-            }
+                CurrentFolders.Clear();
+
+                foreach (var folder in folderStructures)
+                {
+                    CurrentFolders.Add(folder);
+                }
+            });
 
             // Load calendar list
             await LoadAccountCalendarsAsync();
diff --git a/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs b/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
index b036d94b..6af8b2ca 100644
--- a/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
+++ b/Wino.Mail.ViewModels/AccountSetupProgressPageViewModel.cs
@@ -8,10 +8,10 @@ using Serilog;
 using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Shared;
 using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Accounts;
 using Wino.Core.Domain.Models.Calendar;
-using Wino.Core.Domain.Exceptions;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.Domain.Models.Synchronization;
 using Wino.Core.Services;
@@ -221,7 +221,7 @@ public partial class AccountSetupProgressPageViewModel : MailBaseViewModel
 
                     if (!string.IsNullOrEmpty(profileResult.ProfileInformation.AccountAddress))
                     {
-                        if (await _accountService.AccountAddressExistsAsync(profileResult.ProfileInformation.AccountAddress, _createdAccount.Id).ConfigureAwait(false))
+                        if (await _accountService.AccountAddressExistsAsync(profileResult.ProfileInformation.AccountAddress, _createdAccount.Id))
                             throw new InvalidOperationException(Translator.DialogMessage_AccountAddressExistsMessage);
 
                         _createdAccount.Address = profileResult.ProfileInformation.AccountAddress;
diff --git a/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs b/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
index ed5c2b4f..8d1dd0a9 100644
--- a/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
+++ b/Wino.Mail.ViewModels/ProviderSelectionPageViewModel.cs
@@ -118,7 +118,7 @@ public partial class ProviderSelectionPageViewModel : MailBaseViewModel
     {
         if (!CanProceed) return;
 
-        if (await _accountService.AccountNameExistsAsync(AccountName).ConfigureAwait(false))
+        if (await _accountService.AccountNameExistsAsync(AccountName))
         {
             await _dialogService.ShowMessageAsync(
                 Translator.DialogMessage_AccountNameExistsMessage,
diff --git a/Wino.Mail.WinUI/Helpers/XamlHelpers.cs b/Wino.Mail.WinUI/Helpers/XamlHelpers.cs
index 695cea3a..88cc1c9e 100644
--- a/Wino.Mail.WinUI/Helpers/XamlHelpers.cs
+++ b/Wino.Mail.WinUI/Helpers/XamlHelpers.cs
@@ -52,6 +52,7 @@ public static class XamlHelpers
     public static Visibility CountToVisibilityConverterWithThreshold(int value, int threshold) => value > threshold ? Visibility.Visible : Visibility.Collapsed;
     public static ListViewSelectionMode BoolToSelectionMode(bool isSelectionMode) => isSelectionMode ? ListViewSelectionMode.Multiple : ListViewSelectionMode.None;
     public static string BoolToSelectionModeText(bool isSelectionMode) => isSelectionMode ? Translator.Buttons_Cancel : Translator.Buttons_Multiselect;
+    public static string ConditionalString(bool condition, string trueValue, string falseValue) => condition ? trueValue : falseValue;
 
     public static Microsoft.UI.Xaml.Media.Imaging.BitmapImage? Base64ToBitmapImage(string base64String)
     {
diff --git a/Wino.Mail.WinUI/Package.appxmanifest b/Wino.Mail.WinUI/Package.appxmanifest
index 446fc305..4d468418 100644
--- a/Wino.Mail.WinUI/Package.appxmanifest
+++ b/Wino.Mail.WinUI/Package.appxmanifest
@@ -22,7 +22,7 @@
 	
   <Identity
     Name="58272BurakKSE.WinoMailPreview"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
+    Publisher="CN=bkaan"
     Version="2.0.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="3879fcfb-a561-4599-9103-e0c9b35a271f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
diff --git a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
index e3119aa3..74a66ff2 100644
--- a/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml
@@ -221,11 +221,11 @@
                     </StackPanel.ChildrenTransitions>
 
                     <muxc:InfoBar
-                        IsOpen="True"
+                        Title="{x:Bind domain:Translator.AccountDetailsPage_InitialSynchronization_Title}"
                         Margin="0,0,0,8"
+                        IsOpen="True"
                         Message="{x:Bind ViewModel.InitialSynchronizationSummary, Mode=OneWay}"
                         Severity="Informational"
-                        Title="{x:Bind domain:Translator.AccountDetailsPage_InitialSynchronization_Title}"
                         Visibility="{x:Bind ViewModel.IsInitialSynchronizationSummaryVisible, Mode=OneWay}" />
 
                     <controls:SettingsCard
@@ -248,15 +248,7 @@
                         </controls:SettingsCard.HeaderIcon>
                     </controls:SettingsCard>
 
-                    <controls:SettingsCard
-                        Command="{x:Bind ViewModel.CustomizeFolderListCommand}"
-                        Description="{x:Bind domain:Translator.FolderCustomization_EntryCardDescription}"
-                        Header="{x:Bind domain:Translator.FolderCustomization_EntryCardTitle}"
-                        IsClickEnabled="True">
-                        <controls:SettingsCard.HeaderIcon>
-                            <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE8FD;" />
-                        </controls:SettingsCard.HeaderIcon>
-                    </controls:SettingsCard>
+
 
                     <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsFolderOptions_Description}" Header="{x:Bind domain:Translator.SettingsFolderOptions_Title}">
                         <controls:SettingsExpander.HeaderIcon>
@@ -264,13 +256,22 @@
                         </controls:SettingsExpander.HeaderIcon>
                         <controls:SettingsExpander.Items>
                             <controls:SettingsCard
-                                ActionIcon="Add"
+                                Command="{x:Bind ViewModel.CustomizeFolderListCommand}"
+                                Description="{x:Bind domain:Translator.FolderCustomization_EntryCardDescription}"
+                                Header="{x:Bind domain:Translator.FolderCustomization_EntryCardTitle}"
+                                IsClickEnabled="True">
+                                <controls:SettingsCard.HeaderIcon>
+                                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE8FD;" />
+                                </controls:SettingsCard.HeaderIcon>
+                            </controls:SettingsCard>
+                            <controls:SettingsCard
+                                Command="{x:Bind ViewModel.SetupSpecialFoldersCommand}"
                                 Description="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Description}"
                                 Header="{x:Bind domain:Translator.SettingsConfigureSpecialFolders_Title}"
-                                IsActionIconVisible="True">
-                                <controls:SettingsCard.Content>
-                                    <Button Command="{x:Bind ViewModel.SetupSpecialFoldersCommand}" Content="{x:Bind domain:Translator.SettingConfigureSpecialFolders_Button}" />
-                                </controls:SettingsCard.Content>
+                                IsClickEnabled="True">
+                                <controls:SettingsCard.HeaderIcon>
+                                    <PathIcon Data="F1 M 10.019531 1.875 C 10.31901 1.875 10.618489 1.894531 10.917969 1.933594 C 11.230469 1.972656 11.536458 2.02474 11.835938 2.089844 C 11.966146 2.115887 12.070312 2.18099 12.148438 2.285156 C 12.239583 2.376303 12.291666 2.48698 12.304688 2.617188 L 12.460938 3.90625 C 12.473957 4.088542 12.532551 4.251303 12.636719 4.394531 C 12.740885 4.550782 12.871094 4.67448 13.027344 4.765625 C 13.183594 4.856771 13.352864 4.908854 13.535156 4.921875 C 13.717447 4.934896 13.893229 4.902344 14.0625 4.824219 L 15.234375 4.316406 C 15.351562 4.264323 15.47526 4.251303 15.605469 4.277344 C 15.735677 4.303386 15.846354 4.361979 15.9375 4.453125 C 16.354166 4.908854 16.71875 5.403646 17.03125 5.9375 C 17.34375 6.471355 17.591145 7.031251 17.773438 7.617188 C 17.786457 7.65625 17.792969 7.688803 17.792969 7.714844 C 17.792969 7.740886 17.792969 7.773438 17.792969 7.8125 C 17.792969 7.903646 17.773438 7.994792 17.734375 8.085938 C 17.695312 8.177084 17.630207 8.248698 17.539062 8.300781 L 16.503906 9.082031 C 16.360676 9.186198 16.25 9.316406 16.171875 9.472656 C 16.080729 9.641928 16.035156 9.817709 16.035156 10 C 16.035156 10.182292 16.080729 10.358073 16.171875 10.527344 C 16.25 10.683594 16.360676 10.813803 16.503906 10.917969 L 17.539062 11.699219 C 17.630207 11.751303 17.695312 11.822917 17.734375 11.914062 C 17.786457 12.005209 17.8125 12.096354 17.8125 12.1875 C 17.8125 12.226562 17.805988 12.259115 17.792969 12.285156 C 17.792969 12.311198 17.786457 12.34375 17.773438 12.382812 C 17.591145 12.96875 17.34375 13.528646 17.03125 14.0625 C 16.71875 14.596354 16.354166 15.091146 15.9375 15.546875 C 15.846354 15.638021 15.735677 15.696615 15.605469 15.722656 C 15.47526 15.748698 15.351562 15.735678 15.234375 15.683594 L 14.0625 15.175781 C 13.893229 15.097656 13.717447 15.065104 13.535156 15.078125 C 13.352864 15.091146 13.183594 15.143229 13.027344 15.234375 C 12.871094 15.325521 12.740885 15.442709 12.636719 15.585938 C 12.532551 15.742188 12.473957 15.911459 12.460938 16.09375 L 12.304688 17.363281 C 12.291666 17.49349 12.246094 17.610678 12.167969 17.714844 C 12.076822 17.81901 11.966146 17.884115 11.835938 17.910156 C 11.536458 17.97526 11.230469 18.027344 10.917969 18.066406 C 10.618489 18.105469 10.3125 18.125 10 18.125 C 9.6875 18.125 9.38151 18.105469 9.082031 18.066406 C 8.769531 18.027344 8.463541 17.97526 8.164062 17.910156 C 8.033854 17.884115 7.923177 17.81901 7.832031 17.714844 C 7.753906 17.610678 7.708333 17.49349 7.695312 17.363281 L 7.539062 16.09375 C 7.526042 15.911459 7.467448 15.748698 7.363281 15.605469 C 7.259114 15.449219 7.128906 15.325521 6.972656 15.234375 C 6.816406 15.143229 6.647135 15.091146 6.464844 15.078125 C 6.282552 15.065104 6.106771 15.097656 5.9375 15.175781 L 4.765625 15.683594 C 4.648438 15.735678 4.524739 15.748698 4.394531 15.722656 C 4.264323 15.696615 4.153646 15.638021 4.0625 15.546875 C 3.645833 15.091146 3.28125 14.596354 2.96875 14.0625 C 2.65625 13.528646 2.408854 12.96875 2.226562 12.382812 C 2.213542 12.34375 2.207031 12.311198 2.207031 12.285156 C 2.207031 12.259115 2.207031 12.226562 2.207031 12.1875 C 2.207031 12.096354 2.226562 12.005209 2.265625 11.914062 C 2.304688 11.822917 2.369792 11.751303 2.460938 11.699219 L 3.496094 10.917969 C 3.639323 10.813803 3.75 10.683594 3.828125 10.527344 C 3.919271 10.358073 3.964844 10.182292 3.964844 10 C 3.964844 9.817709 3.919271 9.641928 3.828125 9.472656 C 3.75 9.316406 3.639323 9.186198 3.496094 9.082031 L 2.460938 8.320312 C 2.369792 8.255209 2.304688 8.177084 2.265625 8.085938 C 2.226562 7.994792 2.207031 7.903646 2.207031 7.8125 C 2.207031 7.773438 2.207031 7.740886 2.207031 7.714844 C 2.207031 7.688803 2.213542 7.65625 2.226562 7.617188 C 2.408854 7.031251 2.65625 6.471355 2.96875 5.9375 C 3.28125 5.403646 3.645833 4.908854 4.0625 4.453125 C 4.153646 4.361979 4.264323 4.303386 4.394531 4.277344 C 4.524739 4.251303 4.648438 4.264323 4.765625 4.316406 L 5.9375 4.824219 C 6.106771 4.902344 6.282552 4.934896 6.464844 4.921875 C 6.647135 4.908854 6.816406 4.856771 6.972656 4.765625 C 7.141927 4.67448 7.272135 4.550782 7.363281 4.394531 C 7.467448 4.251303 7.526042 4.088542 7.539062 3.90625 L 7.695312 2.617188 C 7.708333 2.48698 7.760417 2.376303 7.851562 2.285156 C 7.942708 2.18099 8.053385 2.115887 8.183594 2.089844 C 8.483072 2.02474 8.782552 1.972656 9.082031 1.933594 C 9.38151 1.894531 9.69401 1.875 10.019531 1.875 Z M 10 7.5 C 9.544271 7.5 9.121094 7.610678 8.730469 7.832031 C 8.352864 8.053386 8.053385 8.352865 7.832031 8.730469 C 7.610677 9.121094 7.5 9.544271 7.5 10 C 7.5 10.455729 7.610677 10.878906 7.832031 11.269531 C 8.053385 11.647136 8.352864 11.946615 8.730469 12.167969 C 9.121094 12.389323 9.544271 12.5 10 12.5 C 10.455729 12.5 10.878906 12.389323 11.269531 12.167969 C 11.647135 11.946615 11.946614 11.647136 12.167969 11.269531 C 12.389322 10.878906 12.5 10.455729 12.5 10 C 12.5 9.544271 12.389322 9.121094 12.167969 8.730469 C 11.946614 8.352865 11.647135 8.053386 11.269531 7.832031 C 10.878906 7.610678 10.455729 7.5 10 7.5 Z " />
+                                </controls:SettingsCard.HeaderIcon>
                             </controls:SettingsCard>
                             <controls:SettingsCard
                                 HorizontalContentAlignment="Stretch"
diff --git a/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml b/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml
index e8816726..26bf93b1 100644
--- a/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml
+++ b/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml
@@ -19,8 +19,8 @@
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                 BorderThickness="1"
-                CornerRadius="6"
-                ColumnSpacing="12">
+                ColumnSpacing="12"
+                CornerRadius="6">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
@@ -48,13 +48,16 @@
                     Text="{x:Bind FolderName}"
                     TextTrimming="CharacterEllipsis" />
 
-                <Button
+                <ToggleButton
                     Grid.Column="3"
                     Click="HideToggle_Click"
-                    Style="{StaticResource SubtleButtonStyle}"
-                    ToolTipService.ToolTip="{x:Bind domain:Translator.FolderCustomization_Hide}">
-                    <FontIcon FontSize="16" Glyph="{x:Bind helpers:XamlHelpers.GetHideGlyph(IsHidden), Mode=OneWay}" />
-                </Button>
+                    IsChecked="{x:Bind IsHidden, Mode=OneWay}"
+                    ToolTipService.ToolTip="{x:Bind helpers:XamlHelpers.ConditionalString(IsHidden, domain:Translator.FolderCustomization_Show, domain:Translator.FolderCustomization_Hide), Mode=OneWay}">
+                    <PathIcon
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Data="F1 M 0.625 0 C 0.794271 0 0.940755 0.06185 1.064453 0.185547 L 19.814453 18.935547 C 19.93815 19.059244 20 19.205729 20 19.375 C 20 19.544271 19.93815 19.690756 19.814453 19.814453 C 19.690754 19.93815 19.54427 20 19.375 20 C 19.205729 20 19.059244 19.93815 18.935547 19.814453 L 13.544922 14.433594 C 13.336588 14.720053 13.100586 14.975586 12.836914 15.200195 C 12.573242 15.424805 12.290039 15.615234 11.987305 15.771484 C 11.68457 15.927734 11.363932 16.046549 11.025391 16.12793 C 10.686849 16.209311 10.341797 16.25 9.990234 16.25 C 9.384766 16.25 8.816731 16.134441 8.286133 15.90332 C 7.755534 15.672201 7.293294 15.359701 6.899414 14.96582 C 6.505534 14.57194 6.193034 14.109701 5.961914 13.579102 C 5.730794 13.048503 5.615234 12.480469 5.615234 11.875 C 5.615234 11.165365 5.776367 10.499675 6.098633 9.87793 C 6.420898 9.256186 6.868489 8.736979 7.441406 8.320312 L 5.46875 6.347656 C 4.635417 6.888021 3.914388 7.548828 3.305664 8.330078 C 2.69694 9.111328 2.216797 9.967448 1.865234 10.898438 C 1.79362 11.08724 1.730143 11.276042 1.674805 11.464844 C 1.619466 11.653646 1.565755 11.842448 1.513672 12.03125 C 1.468099 12.174479 1.394857 12.291667 1.293945 12.382812 C 1.193034 12.473959 1.064453 12.519531 0.908203 12.519531 C 0.738932 12.519531 0.592448 12.457683 0.46875 12.333984 C 0.345052 12.210287 0.283203 12.063803 0.283203 11.894531 C 0.283203 11.861979 0.289714 11.813151 0.302734 11.748047 C 0.615234 10.472006 1.131185 9.290365 1.850586 8.203125 C 2.569987 7.115886 3.476562 6.197917 4.570312 5.449219 L 0.185547 1.064453 C 0.061849 0.940756 0 0.794271 0 0.625 C 0 0.45573 0.061849 0.309246 0.185547 0.185547 C 0.309245 0.06185 0.455729 0 0.625 0 Z M 7.119141 4.189453 C 8.043619 3.896484 9.00065 3.75 9.990234 3.75 C 11.18815 3.75 12.312825 3.953451 13.364258 4.360352 C 14.415689 4.767254 15.361327 5.328777 16.201172 6.044922 C 17.041016 6.761068 17.75716 7.604167 18.349609 8.574219 C 18.942057 9.544271 19.384766 10.595703 19.677734 11.728516 C 19.690754 11.79362 19.697266 11.845703 19.697266 11.884766 C 19.697266 12.054037 19.633789 12.198894 19.506836 12.319336 C 19.379883 12.439779 19.23177 12.5 19.0625 12.5 C 18.90625 12.5 18.780924 12.456055 18.686523 12.368164 C 18.592121 12.280273 18.518879 12.164714 18.466797 12.021484 C 18.434244 11.923828 18.404947 11.826172 18.378906 11.728516 L 18.330078 11.542969 C 18.304035 11.445312 18.274738 11.347656 18.242188 11.25 C 18.072916 10.748698 17.871094 10.266928 17.636719 9.804688 C 17.259113 9.088542 16.801758 8.434245 16.264648 7.841797 C 15.727539 7.24935 15.130208 6.743164 14.472656 6.323242 C 13.815104 5.90332 13.108724 5.5778 12.353516 5.34668 C 11.598307 5.115561 10.810547 5.000001 9.990234 5 C 9.677734 5.000001 9.366861 5.017904 9.057617 5.053711 C 8.748372 5.089519 8.440755 5.143229 8.134766 5.214844 Z M 10.449219 7.519531 C 10.963541 7.571615 11.445312 7.708334 11.894531 7.929688 C 12.343749 8.151042 12.740885 8.434245 13.085938 8.779297 C 13.430989 9.12435 13.714192 9.521484 13.935547 9.970703 C 14.1569 10.419922 14.293619 10.901693 14.345703 11.416016 Z M 8.339844 9.228516 C 7.877604 9.514975 7.516275 9.890951 7.255859 10.356445 C 6.995442 10.82194 6.865234 11.328125 6.865234 11.875 C 6.865234 12.304688 6.946614 12.709961 7.109375 13.09082 C 7.272135 13.47168 7.495117 13.803711 7.77832 14.086914 C 8.061523 14.370117 8.393555 14.5931 8.774414 14.755859 C 9.155273 14.91862 9.560547 15 9.990234 15 C 10.537109 15 11.043294 14.869792 11.508789 14.609375 C 11.974283 14.348959 12.353516 13.987631 12.646484 13.525391 Z " />
+                </ToggleButton>
 
                 <Button
                     Grid.Column="4"
diff --git a/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml.cs b/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml.cs
index 9cc9db23..03281d9d 100644
--- a/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml.cs
+++ b/Wino.Mail.WinUI/Views/Account/FolderCustomizationPage.xaml.cs
@@ -1,6 +1,4 @@
-using System.Collections.ObjectModel;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Wino.Mail.ViewModels.Data;
 using Wino.Views.Abstract;
 
@@ -13,7 +11,7 @@ public sealed partial class FolderCustomizationPage : FolderCustomizationPageAbs
         InitializeComponent();
     }
 
-    private async void ListView_DropCompleted(UIElement sender, Microsoft.UI.Xaml.Controls.Primitives.DropCompletedEventArgs args)
+    private async void ListView_DropCompleted(UIElement sender, DropCompletedEventArgs args)
     {
         // ListView.CanReorderItems automatically mutates the backing
         // ObservableCollection; persist the new order here.
diff --git a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
index a2fa7446..385c75e4 100644
--- a/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
+++ b/Wino.Mail.WinUI/Wino.Mail.WinUI.csproj
@@ -378,6 +378,7 @@
     <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-    <PackageCertificateThumbprint>2661584A2F31D3419FFF8AA09A2C16B1991B8290</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>58CE57FA3E5BF2393C86FC3B3161A925679FB3D4</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Wino.Mail.WinUI_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
 </Project>
diff --git a/Wino.Services/FolderService.cs b/Wino.Services/FolderService.cs
index 0056143d..4776ba6f 100644
--- a/Wino.Services/FolderService.cs
+++ b/Wino.Services/FolderService.cs
@@ -87,15 +87,21 @@ public class FolderService : BaseDatabaseService, IFolderService
         Messenger.Send(new AccountFolderConfigurationUpdated(accountId));
     }
 
+    private static int GetDefaultFolderOrder(MailItemFolder folder)
+        => folder.SpecialFolderType == SpecialFolderType.Other
+            ? int.MaxValue
+            : (int)folder.SpecialFolderType;
+
     /// <summary>
     /// Orders folders by user-set Order first (customized entries ahead of uncustomized ones),
-    /// then falls back to alphabetic folder name (culture-aware), then to SpecialFolderType
-    /// as a final canonical tiebreak.
+    /// then falls back to SpecialFolderType enum order for known special folders so defaults
+    /// like Inbox stay at the top, and finally to alphabetic folder name (culture-aware).
     /// </summary>
     private static IOrderedEnumerable<MailItemFolder> ApplyFolderSort(IEnumerable<MailItemFolder> folders)
         => folders
             .OrderBy(a => a.Order == 0 ? 1 : 0)
             .ThenBy(a => a.Order)
+            .ThenBy(GetDefaultFolderOrder)
             .ThenBy(a => a.FolderName, StringComparer.CurrentCultureIgnoreCase)
             .ThenBy(a => a.SpecialFolderType);