diff --git a/Wino.Mail/Dialogs/MoveMailDialog.xaml b/Wino.Mail/Dialogs/MoveMailDialog.xaml
index 970b300d..dff1bd8c 100644
--- a/Wino.Mail/Dialogs/MoveMailDialog.xaml
+++ b/Wino.Mail/Dialogs/MoveMailDialog.xaml
@@ -51,6 +51,7 @@
             x:Name="FolderTreeView"
             Grid.Row="1"
             CanDragItems="False"
+            CanReorderItems="False"
             SelectedItem="{x:Bind SelectedFolder, Mode=TwoWay}"
             ItemTemplate="{StaticResource FolderStructureMenuFlyoutItemTemplate}"
             ItemsSource="{x:Bind FolderList, Mode=OneWay}"
diff --git a/Wino.Mail/Views/Account/AccountDetailsPage.xaml b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
index 565271a8..5903d054 100644
--- a/Wino.Mail/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
@@ -7,16 +7,16 @@
     xmlns:controls1="using:Wino.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
+    xmlns:entites="using:Wino.Core.Domain.Entities"
     xmlns:folders="using:Wino.Core.Domain.Models.Folders"
     xmlns:helpers="using:Wino.Helpers"
-    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
-    xmlns:entites="using:Wino.Core.Domain.Entities"
     xmlns:interactionsCore="using:Microsoft.Xaml.Interactions.Core"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
     xmlns:local="using:Wino.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
     x:Name="root"
     mc:Ignorable="d">
 
@@ -80,10 +80,10 @@
             </controls:SettingsCard>
 
             <controls:SettingsCard
-                IsClickEnabled="True"
                 Command="{x:Bind ViewModel.EditAliasesCommand}"
                 Description="{x:Bind domain:Translator.SettingsManageAliases_Description}"
-                Header="{x:Bind domain:Translator.SettingsManageAliases_Title}">
+                Header="{x:Bind domain:Translator.SettingsManageAliases_Title}"
+                IsClickEnabled="True">
                 <controls:SettingsCard.HeaderIcon>
                     <PathIcon Data="F1 M 3.75 5 L 3.75 4.902344 C 3.75 4.225262 3.885091 3.588867 4.155273 2.993164 C 4.425456 2.397461 4.790039 1.878256 5.249023 1.435547 C 5.708008 0.99284 6.238606 0.642904 6.84082 0.385742 C 7.443034 0.128582 8.079427 0 8.75 0 C 9.440104 0 10.089518 0.130209 10.698242 0.390625 C 11.306966 0.651043 11.837564 1.007488 12.290039 1.459961 C 12.742513 1.912436 13.098958 2.443035 13.359375 3.051758 C 13.619791 3.660482 13.75 4.309896 13.75 5 C 13.75 5.690104 13.619791 6.339519 13.359375 6.948242 C 13.098958 7.556967 12.742513 8.087565 12.290039 8.540039 C 11.837564 8.992514 11.306966 9.348959 10.698242 9.609375 C 10.089518 9.869792 9.440104 10 8.75 10 C 8.059896 10 7.410481 9.869792 6.801758 9.609375 C 6.193034 9.348959 5.662435 8.992514 5.209961 8.540039 C 4.757487 8.087565 4.401042 7.556967 4.140625 6.948242 C 3.880208 6.339519 3.75 5.690104 3.75 5 Z M 12.5 5 L 12.5 4.921875 C 12.5 4.414062 12.399088 3.937176 12.197266 3.491211 C 11.995442 3.045248 11.722005 2.65625 11.376953 2.324219 C 11.0319 1.992188 10.633138 1.730145 10.180664 1.538086 C 9.728189 1.346029 9.251302 1.25 8.75 1.25 C 8.229166 1.25 7.740885 1.347656 7.285156 1.542969 C 6.829427 1.738281 6.432292 2.005209 6.09375 2.34375 C 5.755208 2.682293 5.488281 3.079428 5.292969 3.535156 C 5.097656 3.990887 5 4.479167 5 5 C 5 5.520834 5.097656 6.009115 5.292969 6.464844 C 5.488281 6.920573 5.755208 7.317709 6.09375 7.65625 C 6.432292 7.994792 6.829427 8.261719 7.285156 8.457031 C 7.740885 8.652344 8.229166 8.75 8.75 8.75 C 9.270833 8.75 9.759114 8.652344 10.214844 8.457031 C 10.670572 8.261719 11.067708 7.994792 11.40625 7.65625 C 11.744791 7.317709 12.011719 6.920573 12.207031 6.464844 C 12.402344 6.009115 12.5 5.520834 12.5 5 Z M 0 13.681641 C 0 13.349609 0.068359 13.035482 0.205078 12.739258 C 0.341797 12.443034 0.525716 12.184245 0.756836 11.962891 C 0.987956 11.741537 1.254883 11.567383 1.557617 11.44043 C 1.860352 11.313477 2.177734 11.25 2.509766 11.25 L 15 11.25 C 15.455729 11.25 15.87565 11.363933 16.259766 11.591797 C 16.643879 11.819662 16.949869 12.132162 17.177734 12.529297 C 17.067057 12.509766 16.962891 12.5 16.865234 12.5 C 16.676432 12.5 16.495768 12.52767 16.323242 12.583008 C 16.150715 12.638347 15.986328 12.714844 15.830078 12.8125 C 15.7194 12.708334 15.59082 12.630209 15.444336 12.578125 C 15.297852 12.526042 15.149739 12.5 15 12.5 L 2.509766 12.5 C 2.333984 12.5 2.169596 12.532553 2.016602 12.597656 C 1.863607 12.662761 1.730143 12.750651 1.616211 12.861328 C 1.502279 12.972006 1.41276 13.103842 1.347656 13.256836 C 1.282552 13.409831 1.25 13.574219 1.25 13.75 C 1.25 14.394531 1.359049 14.964193 1.577148 15.458984 C 1.795247 15.953776 2.089844 16.385092 2.460938 16.75293 C 2.832031 17.120768 3.261719 17.430014 3.75 17.680664 C 4.238281 17.931314 4.754231 18.134766 5.297852 18.291016 C 5.841471 18.447266 6.396484 18.561197 6.962891 18.632812 C 7.529297 18.704428 8.072916 18.74349 8.59375 18.75 L 9.814453 19.960938 C 9.638672 19.973959 9.461263 19.983725 9.282227 19.990234 C 9.103189 19.996744 8.925781 20 8.75 20 C 8.085938 20 7.408854 19.954428 6.71875 19.863281 C 6.028646 19.772135 5.3597 19.624023 4.711914 19.418945 C 4.064127 19.213867 3.453776 18.948568 2.880859 18.623047 C 2.307943 18.297525 1.808268 17.900391 1.381836 17.431641 C 0.955404 16.962891 0.61849 16.419271 0.371094 15.800781 C 0.123698 15.182292 0 14.475912 0 13.681641 Z M 8.75 16.875 C 8.75 16.705729 8.811849 16.559244 8.935547 16.435547 L 11.435547 13.935547 C 11.559244 13.81185 11.705729 13.75 11.875 13.75 C 12.04427 13.75 12.190754 13.81185 12.314453 13.935547 C 12.43815 14.059245 12.5 14.205729 12.5 14.375 C 12.5 14.544271 12.43815 14.690756 12.314453 14.814453 L 10.888672 16.25 L 17.861328 16.25 L 16.435547 14.814453 C 16.311848 14.690756 16.25 14.544271 16.25 14.375 C 16.25 14.205729 16.311848 14.059245 16.435547 13.935547 C 16.559244 13.81185 16.705729 13.75 16.875 13.75 C 17.04427 13.75 17.190754 13.81185 17.314453 13.935547 L 19.814453 16.435547 C 19.93815 16.559244 20 16.705729 20 16.875 C 20 17.044271 19.93815 17.190756 19.814453 17.314453 L 17.314453 19.814453 C 17.190754 19.93815 17.04427 20 16.875 20 C 16.705729 20 16.559244 19.93815 16.435547 19.814453 C 16.311848 19.690756 16.25 19.544271 16.25 19.375 C 16.25 19.205729 16.311848 19.059244 16.435547 18.935547 L 17.861328 17.5 L 10.888672 17.5 L 12.314453 18.935547 C 12.43815 19.059244 12.5 19.205729 12.5 19.375 C 12.5 19.544271 12.43815 19.690756 12.314453 19.814453 C 12.190754 19.93815 12.04427 20 11.875 20 C 11.705729 20 11.559244 19.93815 11.435547 19.814453 L 8.935547 17.314453 C 8.811849 17.190756 8.75 17.044271 8.75 16.875 Z " />
                 </controls:SettingsCard.HeaderIcon>
@@ -143,6 +143,7 @@
                                     Grid.Row="1"
                                     Grid.ColumnSpan="2"
                                     CanDragItems="False"
+                                    CanReorderItems="False"
                                     ItemTemplate="{StaticResource FolderStructureMenuFlyoutItemTemplate}"
                                     ItemsSource="{x:Bind ViewModel.CurrentFolders, Mode=OneWay}"
                                     SelectionMode="None" />