Added separated zones

Wino.Mail/AppShell.xaml

@@ -2,26 +2,29 @@
     x:Class="Wino.Views.AppShell"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    x:Name="Root"
     xmlns:abstract="using:Wino.Views.Abstract"
     xmlns:advanced="using:Wino.Controls.Advanced"
     xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
+    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
-    xmlns:domain="using:Wino.Core.Domain"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
+    xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:menu="using:Wino.Core.MenuItems"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:animations="using:CommunityToolkit.WinUI.Animations"
     xmlns:selectors="using:Wino.Selectors"
+    x:Name="Root"
     muxc:BackdropMaterial.ApplyToRootOrPageBackground="{ThemeResource UseMica}"
     mc:Ignorable="d">
 
     <Page.Resources>
 
+        <!--  Removes default styles for content of navigation view  -->
+        <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
 
         <DataTemplate x:Key="SeperatorTemplate">
             <muxc:NavigationViewItemSeparator Margin="-20,0" />
@@ -110,15 +113,15 @@
         <!--  Clickable New Style Account Template  -->
         <DataTemplate x:Key="ClickableAccountMenuTemplate" x:DataType="menu:AccountMenuItem">
             <controls:AccountNavigationItem
-                Style="{StaticResource SingleAccountNavigationViewItemTemplate}"
                 x:Name="AccountItem"
-                IsActiveAccount="{x:Bind IsSelected, Mode=OneWay}"
                 HorizontalContentAlignment="Stretch"
                 VerticalContentAlignment="Stretch"
+                DataContext="{x:Bind}"
+                IsActiveAccount="{x:Bind IsSelected, Mode=OneWay}"
                 IsChildSelected="{x:Bind IsChildSelected, Mode=TwoWay}"
                 IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                DataContext="{x:Bind}"
+                SelectsOnInvoked="False"
-                SelectsOnInvoked="False">
+                Style="{StaticResource SingleAccountNavigationViewItemTemplate}">
                 <controls:WinoNavigationViewItem.ContentTransitions>
                     <TransitionCollection>
                         <EdgeUIThemeTransition Edge="Top" />
@@ -159,8 +162,8 @@
 
                         <TextBlock
                             FontSize="13"
-                            MaxLines="1"
                             FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
+                            MaxLines="1"
                             Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Parameter.Address, Mode=OneWay}"
                             TextTrimming="CharacterEllipsis" />
@@ -239,8 +242,8 @@
         <DataTemplate x:Key="CreateNewMailTemplate" x:DataType="menu:NewMailMenuItem">
             <controls:WinoNavigationViewItem
                 Height="50"
-                SelectsOnInvoked="False"
+                DataContext="{x:Bind}"
-                DataContext="{x:Bind}">
+                SelectsOnInvoked="False">
                 <muxc:NavigationViewItem.Icon>
                     <controls:WinoFontIcon Icon="NewMail" />
                 </muxc:NavigationViewItem.Icon>
@@ -258,16 +261,16 @@
                 MinHeight="30"
                 AllowDrop="True"
                 ContextRequested="MenuItemContextRequested"
+                DataContext="{x:Bind}"
                 DragEnter="ItemDragEnterOnFolder"
                 DragLeave="ItemDragLeaveFromFolder"
                 Drop="ItemDroppedOnFolder"
-                DataContext="{x:Bind}"
                 FontSize="50"
                 FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
                 IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
                 IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-                SelectsOnInvoked="{x:Bind IsMoveTarget, Mode=OneWay}"
+                MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
-                MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}">
+                SelectsOnInvoked="{x:Bind IsMoveTarget, Mode=OneWay}">
                 <animations:Implicit.Animations>
                     <animations:ScaleAnimation Duration="0:0:0.5" />
                 </animations:Implicit.Animations>
@@ -329,8 +332,8 @@
                 IsActiveAccount="{x:Bind IsSelected, Mode=OneWay}"
                 IsChildSelected="{x:Bind IsChildSelected, Mode=TwoWay}"
                 IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
-                Style="{StaticResource SingleAccountNavigationViewItemTemplate}"
+                SelectsOnInvoked="False"
-                SelectsOnInvoked="False">
+                Style="{StaticResource SingleAccountNavigationViewItemTemplate}">
                 <muxc:NavigationViewItem.InfoBadge>
                     <muxc:InfoBadge
                         x:Name="FolderInfoBadge"
@@ -376,9 +379,9 @@
                 MinHeight="30"
                 AllowDrop="True"
                 ContextRequested="MenuItemContextRequested"
+                DataContext="{x:Bind}"
                 DragEnter="ItemDragEnterOnFolder"
                 DragLeave="ItemDragLeaveFromFolder"
-                DataContext="{x:Bind}"
                 Drop="ItemDroppedOnFolder"
                 FontSize="50"
                 FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
@@ -421,10 +424,10 @@
         <DataTemplate x:Key="MergedAccountMoreFolderItemTemplate" x:DataType="menu:MergedAccountMoreFolderMenuItem">
             <controls:WinoNavigationViewItem
                 MinHeight="30"
+                Content="{x:Bind domain:Translator.More}"
                 FontWeight="{x:Bind helpers:XamlHelpers.GetFontWeightByChildSelectedState(IsSelected), Mode=OneWay}"
                 IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}"
                 IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-                Content="{x:Bind domain:Translator.More}"
                 MenuItemsSource="{x:Bind SubMenuItems, Mode=OneWay}"
                 SelectsOnInvoked="True">
                 <animations:Implicit.Animations>
@@ -469,15 +472,15 @@
 
         <selectors:NavigationMenuTemplateSelector
             x:Key="NavigationMenuTemplateSelector"
-            MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
-            ClickableAccountMenuTemplate="{StaticResource ClickableAccountMenuTemplate}"
             AccountManagementTemplate="{StaticResource ManageAccountsTemplate}"
-            NestedAccountMenuTemplate="{StaticResource NestedAccountMenuTemplate}"
+            ClickableAccountMenuTemplate="{StaticResource ClickableAccountMenuTemplate}"
             FixAuthenticationIssueTemplate="{StaticResource FixAuthenticationIssueTemplate}"
             FixMissingFolderConfigTemplate="{StaticResource FixMissingFolderConfig}"
             FolderMenuTemplate="{StaticResource FolderMenuTemplate}"
             MergedAccountFolderTemplate="{StaticResource MergedAccountFolderMenuItemTemplate}"
+            MergedAccountMoreExpansionItemTemplate="{StaticResource MergedAccountMoreFolderItemTemplate}"
             MergedAccountTemplate="{StaticResource MergedAccountTemplate}"
+            NestedAccountMenuTemplate="{StaticResource NestedAccountMenuTemplate}"
             NewMailTemplate="{StaticResource CreateNewMailTemplate}"
             RatingItemTemplate="{StaticResource RatingItemTemplate}"
             SeperatorTemplate="{StaticResource SeperatorTemplate}"
@@ -507,7 +510,6 @@
             IsHitTestVisible="False" />
 
         <muxc:NavigationView
-            IsTabStop="True"
             x:Name="navigationView"
             Grid.Row="1"
             Grid.ColumnSpan="3"
@@ -519,6 +521,7 @@
             IsPaneOpen="{x:Bind ViewModel.PreferencesService.IsNavigationPaneOpened, Mode=TwoWay}"
             IsPaneToggleButtonVisible="False"
             IsSettingsVisible="False"
+            IsTabStop="True"
             IsTitleBarAutoPaddingEnabled="False"
             ItemInvoked="NavigationViewItemInvoked"
             MenuItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
@@ -579,19 +582,19 @@
                     x:Name="ShellInfoBar"
                     Grid.Column="1"
                     MaxWidth="700"
-                    IsOpen="False"
                     Margin="0,60,25,0"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Top"
-                    IsClosable="False" />
+                    IsClosable="False"
+                    IsOpen="False" />
 
                 <!--  Teaching Tip  -->
                 <muxc:TeachingTip
                     x:Name="ShellTip"
-                    Target="{x:Bind ShellInfoBar}"
                     Grid.Column="1"
                     IsOpen="False"
-                    PreferredPlacement="Bottom" />
+                    PreferredPlacement="Bottom"
+                    Target="{x:Bind ShellInfoBar}" />
             </Grid>
         </muxc:NavigationView>
 

Wino.Mail/Styles/Colors.xaml

@@ -1,4 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.UI.Xaml.Media">
 
     <SolidColorBrush x:Key="FlaggedBrush">#e74c3c</SolidColorBrush>
     <SolidColorBrush x:Key="DeleteBrush">#e74c3c</SolidColorBrush>
@@ -10,10 +13,17 @@
         <ResourceDictionary x:Name="Light">
             <SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush>
             <SolidColorBrush x:Key="SettingsPaneBorderBrush">#636e72</SolidColorBrush>
+            <SolidColorBrush x:Key="WorkZoneBackground" Color="White" />
         </ResourceDictionary>
         <ResourceDictionary x:Name="Dark">
             <SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush>
             <SolidColorBrush x:Key="SettingsPaneBorderBrush">#2d3436</SolidColorBrush>
+            <local:AcrylicBrush
+                x:Key="WorkZoneBackground"
+                BackgroundSource="Backdrop"
+                FallbackColor="#2C2C2C"
+                TintColor="#2C2C2C"
+                TintOpacity="0.30" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

Wino.Mail/Views/MailListPage.xaml

@@ -7,6 +7,7 @@
     xmlns:controls="using:Wino.Controls"
     xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:domain="using:Wino.Core.Domain"
     xmlns:enums="using:Wino.Core.Domain.Enums"
     xmlns:helpers="using:Wino.Helpers"
     xmlns:i="using:Microsoft.Xaml.Interactivity"
@@ -16,10 +17,9 @@
     xmlns:menuflyouts="using:Wino.MenuFlyouts"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:selectors="using:Wino.Selectors"
-    xmlns:domain="using:Wino.Core.Domain"
     xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
-    xmlns:wino="using:Wino"
     xmlns:viewModelData="using:Wino.Mail.ViewModels.Data"
+    xmlns:wino="using:Wino"
     x:Name="root"
     Loaded="MailListPageLoaded"
     mc:Ignorable="d">
@@ -66,8 +66,8 @@
                 CornerRadius="6">
                 <TextBlock
                     Padding="12"
-                    AllowFocusOnInteraction="False"
                     VerticalAlignment="Center"
+                    AllowFocusOnInteraction="False"
                     FontSize="13"
                     FontWeight="SemiBold"
                     Text="{x:Bind helpers:XamlHelpers.GetMailGroupDateString(Key)}" />
@@ -224,8 +224,6 @@
                 Tag="{x:Bind}">
                 <controls:MailItemDisplayInformationControl
                     x:DefaultBindMode="OneWay"
-                    MailItem="{Binding}"
-                    HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                     CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
                     ContextRequested="MailItemContextRequested"
                     DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
@@ -237,15 +235,17 @@
                     FromAddress="{x:Bind FromAddress}"
                     FromName="{x:Bind FromName}"
                     HasAttachments="{x:Bind HasAttachments}"
+                    HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                     IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
                     IsCustomFocused="{x:Bind IsCustomFocused, Mode=OneWay}"
                     IsDraft="{x:Bind IsDraft, Mode=OneWay}"
                     IsFlagged="{x:Bind IsFlagged, Mode=OneWay}"
+                    IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
                     IsRead="{x:Bind IsRead, Mode=OneWay}"
                     LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
+                    MailItem="{Binding}"
                     Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
                     ReceivedDate="{x:Bind CreationDate}"
-                    IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
                     RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
                     ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}"
                     Snippet="{x:Bind PreviewText}"
@@ -261,13 +261,10 @@
                 Tag="{x:Bind}">
                 <controls:MailItemDisplayInformationControl
                     x:DefaultBindMode="OneWay"
-                    MailItem="{Binding}"
-                    HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                     CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
                     ContextRequested="MailItemContextRequested"
                     DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
                     FocusVisualMargin="8"
-                    IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
                     FocusVisualPrimaryBrush="{StaticResource SystemControlRevealFocusVisualBrush}"
                     FocusVisualPrimaryThickness="2"
                     FocusVisualSecondaryBrush="{StaticResource SystemControlFocusVisualSecondaryBrush}"
@@ -275,13 +272,16 @@
                     FromAddress="{x:Bind FromAddress}"
                     FromName="{x:Bind FromName}"
                     HasAttachments="{x:Bind HasAttachments}"
+                    HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                     IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
-                    Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
                     IsCustomFocused="{x:Bind IsCustomFocused, Mode=OneWay}"
                     IsDraft="{x:Bind IsDraft, Mode=OneWay}"
                     IsFlagged="{x:Bind IsFlagged, Mode=OneWay}"
+                    IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
                     IsRead="{x:Bind IsRead, Mode=OneWay}"
                     LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
+                    MailItem="{Binding}"
+                    Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
                     ReceivedDate="{x:Bind CreationDate}"
                     RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
                     ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}"
@@ -306,14 +306,8 @@
                                 x:DefaultBindMode="OneWay"
                                 Background="Transparent"
                                 BorderThickness="0"
-                                MailItem="{Binding}"
-                                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
                                 CanDrag="True"
-                                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
-                                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
-                                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
                                 CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
-                                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
                                 ConnectedExpander="{Binding ElementName=ThreadExpander}"
                                 ContextRequested="MailItemContextRequested"
                                 DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
@@ -321,13 +315,19 @@
                                 DropCompleted="ThreadHeaderDragFinished"
                                 FromAddress="{x:Bind FromAddress}"
                                 FromName="{x:Bind FromName}"
-                                IsHitTestVisible="True"
                                 HasAttachments="{x:Bind HasAttachments}"
+                                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                                 IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
                                 IsDraft="{x:Bind IsDraft}"
                                 IsFlagged="{x:Bind IsFlagged}"
+                                IsHitTestVisible="True"
+                                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
                                 IsRead="{x:Bind IsRead}"
+                                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
+                                MailItem="{Binding}"
+                                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
                                 ReceivedDate="{x:Bind CreationDate}"
+                                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
                                 ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}"
                                 Snippet="{x:Bind PreviewText}"
                                 Subject="{x:Bind Subject}" />
@@ -357,8 +357,8 @@
 
         <Style
             x:Key="TopCommandBarButtonStyle"
-            TargetType="Button"
+            BasedOn="{StaticResource DefaultButtonStyle}"
-            BasedOn="{StaticResource DefaultButtonStyle}">
+            TargetType="Button">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -368,8 +368,8 @@
 
         <Style
             x:Key="TopCommandBarToggleButtonStyle"
-            TargetType="ToggleButton"
+            BasedOn="{StaticResource DefaultToggleButtonStyle}"
-            BasedOn="{StaticResource DefaultToggleButtonStyle}">
+            TargetType="ToggleButton">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="VerticalAlignment" Value="Center" />
@@ -381,7 +381,6 @@
     <wino:BasePage.ShellContent>
         <AutoSuggestBox
             x:Name="SearchBar"
-            Margin="0,0,8,0"
             VerticalAlignment="Center"
             BorderBrush="Transparent"
             GotFocus="SearchBoxFocused"
@@ -391,8 +390,8 @@
             PlaceholderText="{x:Bind domain:Translator.SearchBarPlaceholder}"
             QueryIcon="Find"
             TabIndex="1000"
-            TextChanged="SearchBar_TextChanged"
+            Text="{x:Bind ViewModel.SearchQuery, Mode=TwoWay}"
-            Text="{x:Bind ViewModel.SearchQuery, Mode=TwoWay}">
+            TextChanged="SearchBar_TextChanged">
             <i:Interaction.Behaviors>
                 <ic:EventTriggerBehavior EventName="QuerySubmitted">
                     <ic:InvokeCommandAction Command="{x:Bind ViewModel.PerformSearchCommand}" />
@@ -411,379 +410,383 @@
         </Grid.ColumnDefinitions>
 
         <!--  Mail Items  -->
-        <Grid
+        <Border
-            x:Name="ReaderGrid"
+            x:Name="ReaderGridContainer"
-            Margin="-1,0,0,0"
+            Grid.Column="0"
-            Padding="4,0,0,0"
+            Margin="0,0,0,7"
-            HorizontalAlignment="Stretch"
+            Padding="5,0,0,0"
-            Background="{ThemeResource ReadingPaneBackgroundColorBrush}"
+            Background="{ThemeResource WorkZoneBackground}"
-            CornerRadius="{ThemeResource MailListGridCornerRadius}">
+            BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
-            <Grid.RowDefinitions>
+            BorderThickness="1"
-                <RowDefinition Height="Auto" />
+            CornerRadius="7">
-                <RowDefinition Height="Auto" />
+            <Grid x:Name="ReaderGrid">
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-
-            <!--  Top Area  -->
-            <Grid
-                Padding="6"
-                CornerRadius="8"
-                RowSpacing="4">
                 <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
 
-                <!--  Top Commands  -->
+                <!--  Top Area  -->
                 <Grid
-                    Grid.Row="0"
+                    Padding="6"
-                    Padding="4"
+                    CornerRadius="8"
-                    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+                    RowSpacing="4">
-                    CornerRadius="8">
-                    <!--  Commands  -->
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-
-                    <Button
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.SyncFolderCommand}"
-                        IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}">
-                        <Button.Content>
-                            <controls:WinoFontIcon Icon="Sync" FontSize="16" />
-                        </Button.Content>
-                    </Button>
-
-                    <ToggleButton
-                        x:Name="SelectionModeToggle"
-                        Grid.Column="1"
-                        Style="{StaticResource TopCommandBarToggleButtonStyle}"
-                        Checked="SelectionModeToggleChecked"
-                        Unchecked="SelectionModeToggleUnchecked">
-                        <ToggleButton.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="MultiSelect" />
-                        </ToggleButton.Content>
-                    </ToggleButton>
-
-                    <AppBarSeparator Grid.Column="2" Margin="2,0" />
-
-                    <Button
-                        x:Name="ArchiveAppBarButton"
-                        Grid.Column="3"
-                        x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Archive" />
-                        </Button.Content>
-                        <Button.CommandParameter>
-                            <enums:MailOperation>Archive</enums:MailOperation>
-                        </Button.CommandParameter>
-                    </Button>
-
-                    <Button
-                        x:Name="UnarchiveAppBarButton"
-                        Grid.Column="3"
-                        x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="UnArchive" />
-                        </Button.Content>
-                        <Button.CommandParameter>
-                            <enums:MailOperation>UnArchive</enums:MailOperation>
-                        </Button.CommandParameter>
-                    </Button>
-
-                    <Button
-                        Grid.Column="4"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}">
-                        <Button.CommandParameter>
-                            <enums:MailOperation>SoftDelete</enums:MailOperation>
-                        </Button.CommandParameter>
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Delete" />
-                        </Button.Content>
-                    </Button>
-
-                    <Button
-                        x:Name="MoveButtonAppBarButton"
-                        Grid.Column="5"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}">
-                        <Button.CommandParameter>
-                            <enums:MailOperation>Move</enums:MailOperation>
-                        </Button.CommandParameter>
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Move" />
-                        </Button.Content>
-                    </Button>
-
-                    <Button
-                        Grid.Column="6"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="20" Icon="More" />
-                        </Button.Content>
-                        <Button.Flyout>
-                            <MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft">
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>SetFlag</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="Flag" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>ClearFlag</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="ClearFlag" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>MarkAsRead</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="MarkRead" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>MarkAsUnread</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="MarkUnread" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                            </MenuFlyout>
-                        </Button.Flyout>
-                    </Button>
-                </Grid>
-
-                <!--  Pivot + Sync + Multi Select  -->
-                <Grid
-                    Grid.Row="1"
-                    Margin="0,0,0,5"
-                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsInSearchMode), Mode=OneWay}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
 
-                    <!--  Select All Checkbox  -->
+                    <!--  Top Commands  -->
-                    <CheckBox
+                    <Grid
-                        x:Name="SelectAllCheckbox"
-                        Grid.Row="1"
-                        MinWidth="0"
-                        Margin="8,0,0,0"
-                        VerticalAlignment="Center"
-                        Canvas.ZIndex="100"
-                        Checked="SelectAllCheckboxChecked"
-                        Unchecked="SelectAllCheckboxUnchecked"
-                        Visibility="{x:Bind helpers:XamlHelpers.IsSelectionModeMultiple(MailListView.SelectionMode), Mode=OneWay}" />
-
-                    <!--  Folders  -->
-                    <controls:WinoPivotControl
-                        x:Name="WinoPivot"
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        DataTemplate="{StaticResource FolderPivotTemplate}"
-                        ItemsSource="{x:Bind ViewModel.PivotFolders, Mode=OneWay}"
-                        SelectedItem="{x:Bind ViewModel.SelectedFolderPivot, Mode=TwoWay}"
-                        SelectionChanged="FolderPivotChanged"
-                        SelectorPipeColor="{ThemeResource NavigationViewSelectionIndicatorForeground}" />
-
-                    <!--  Filtering  -->
-                    <muxc:DropDownButton
-                        Grid.Row="1"
-                        Grid.Column="2"
-                        Content="{x:Bind ViewModel.SelectedFilterOption.Title, Mode=OneWay}"
-                        ToolTipService.ToolTip="Filter">
-                        <muxc:DropDownButton.Flyout>
-                            <menuflyouts:FilterMenuFlyout
-                                x:Name="FilterMenuFlyout"
-                                AreOpenCloseAnimationsEnabled="True"
-                                FilterOptions="{x:Bind ViewModel.FilterOptions, Mode=OneTime}"
-                                Placement="Bottom"
-                                SelectedFilterChangedCommand="{x:Bind ViewModel.SelectedFilterChangedCommand}"
-                                SelectedFilterOption="{x:Bind ViewModel.SelectedFilterOption, Mode=TwoWay}"
-                                SelectedSortingOption="{x:Bind ViewModel.SelectedSortingOption, Mode=TwoWay}"
-                                SelectedSortingOptionChangedCommand="{x:Bind ViewModel.SelectedSortingChangedCommand}"
-                                SortingOptions="{x:Bind ViewModel.SortingOptions, Mode=OneTime}" />
-                        </muxc:DropDownButton.Flyout>
-                    </muxc:DropDownButton>
-
-                    <muxc:InfoBar
-                        Title="{x:Bind domain:Translator.InfoBarTitle_SynchronizationDisabledFolder}"
                         Grid.Row="0"
-                        Grid.ColumnSpan="3"
+                        Padding="4"
-                        IsClosable="True"
+                        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-                        IsOpen="{x:Bind ViewModel.IsFolderSynchronizationEnabled, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}"
+                        CornerRadius="8">
-                        Message="{x:Bind domain:Translator.InfoBarMessage_SynchronizationDisabledFolder}"
+                        <!--  Commands  -->
-                        Severity="Informational">
+                        <Grid.ColumnDefinitions>
-                        <muxc:InfoBar.ActionButton>
+                            <ColumnDefinition Width="*" />
-                            <Button Command="{x:Bind ViewModel.EnableFolderSynchronizationCommand}" Content="Enable" />
+                            <ColumnDefinition Width="*" />
-                        </muxc:InfoBar.ActionButton>
+                            <ColumnDefinition Width="Auto" />
-                    </muxc:InfoBar>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+
+                        <Button
+                            Command="{x:Bind ViewModel.SyncFolderCommand}"
+                            IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="16" Icon="Sync" />
+                            </Button.Content>
+                        </Button>
+
+                        <ToggleButton
+                            x:Name="SelectionModeToggle"
+                            Grid.Column="1"
+                            Checked="SelectionModeToggleChecked"
+                            Style="{StaticResource TopCommandBarToggleButtonStyle}"
+                            Unchecked="SelectionModeToggleUnchecked">
+                            <ToggleButton.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="MultiSelect" />
+                            </ToggleButton.Content>
+                        </ToggleButton>
+
+                        <AppBarSeparator Grid.Column="2" Margin="2,0" />
+
+                        <Button
+                            x:Name="ArchiveAppBarButton"
+                            Grid.Column="3"
+                            x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Archive" />
+                            </Button.Content>
+                            <Button.CommandParameter>
+                                <enums:MailOperation>Archive</enums:MailOperation>
+                            </Button.CommandParameter>
+                        </Button>
+
+                        <Button
+                            x:Name="UnarchiveAppBarButton"
+                            Grid.Column="3"
+                            x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="UnArchive" />
+                            </Button.Content>
+                            <Button.CommandParameter>
+                                <enums:MailOperation>UnArchive</enums:MailOperation>
+                            </Button.CommandParameter>
+                        </Button>
+
+                        <Button
+                            Grid.Column="4"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}">
+                            <Button.CommandParameter>
+                                <enums:MailOperation>SoftDelete</enums:MailOperation>
+                            </Button.CommandParameter>
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Delete" />
+                            </Button.Content>
+                        </Button>
+
+                        <Button
+                            x:Name="MoveButtonAppBarButton"
+                            Grid.Column="5"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}">
+                            <Button.CommandParameter>
+                                <enums:MailOperation>Move</enums:MailOperation>
+                            </Button.CommandParameter>
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Move" />
+                            </Button.Content>
+                        </Button>
+
+                        <Button
+                            Grid.Column="6"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="20" Icon="More" />
+                            </Button.Content>
+                            <Button.Flyout>
+                                <MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft">
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>SetFlag</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="Flag" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>ClearFlag</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="ClearFlag" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>MarkAsRead</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="MarkRead" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>MarkAsUnread</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="MarkUnread" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+                    </Grid>
+
+                    <!--  Pivot + Sync + Multi Select  -->
+                    <Grid
+                        Grid.Row="1"
+                        Margin="0,0,0,5"
+                        Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(ViewModel.IsInSearchMode), Mode=OneWay}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <!--  Select All Checkbox  -->
+                        <CheckBox
+                            x:Name="SelectAllCheckbox"
+                            Grid.Row="1"
+                            MinWidth="0"
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            Canvas.ZIndex="100"
+                            Checked="SelectAllCheckboxChecked"
+                            Unchecked="SelectAllCheckboxUnchecked"
+                            Visibility="{x:Bind helpers:XamlHelpers.IsSelectionModeMultiple(MailListView.SelectionMode), Mode=OneWay}" />
+
+                        <!--  Folders  -->
+                        <controls:WinoPivotControl
+                            x:Name="WinoPivot"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            DataTemplate="{StaticResource FolderPivotTemplate}"
+                            ItemsSource="{x:Bind ViewModel.PivotFolders, Mode=OneWay}"
+                            SelectedItem="{x:Bind ViewModel.SelectedFolderPivot, Mode=TwoWay}"
+                            SelectionChanged="FolderPivotChanged"
+                            SelectorPipeColor="{ThemeResource NavigationViewSelectionIndicatorForeground}" />
+
+                        <!--  Filtering  -->
+                        <muxc:DropDownButton
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Content="{x:Bind ViewModel.SelectedFilterOption.Title, Mode=OneWay}"
+                            ToolTipService.ToolTip="Filter">
+                            <muxc:DropDownButton.Flyout>
+                                <menuflyouts:FilterMenuFlyout
+                                    x:Name="FilterMenuFlyout"
+                                    AreOpenCloseAnimationsEnabled="True"
+                                    FilterOptions="{x:Bind ViewModel.FilterOptions, Mode=OneTime}"
+                                    Placement="Bottom"
+                                    SelectedFilterChangedCommand="{x:Bind ViewModel.SelectedFilterChangedCommand}"
+                                    SelectedFilterOption="{x:Bind ViewModel.SelectedFilterOption, Mode=TwoWay}"
+                                    SelectedSortingOption="{x:Bind ViewModel.SelectedSortingOption, Mode=TwoWay}"
+                                    SelectedSortingOptionChangedCommand="{x:Bind ViewModel.SelectedSortingChangedCommand}"
+                                    SortingOptions="{x:Bind ViewModel.SortingOptions, Mode=OneTime}" />
+                            </muxc:DropDownButton.Flyout>
+                        </muxc:DropDownButton>
+
+                        <muxc:InfoBar
+                            Title="{x:Bind domain:Translator.InfoBarTitle_SynchronizationDisabledFolder}"
+                            Grid.Row="0"
+                            Grid.ColumnSpan="3"
+                            IsClosable="True"
+                            IsOpen="{x:Bind ViewModel.IsFolderSynchronizationEnabled, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}"
+                            Message="{x:Bind domain:Translator.InfoBarMessage_SynchronizationDisabledFolder}"
+                            Severity="Informational">
+                            <muxc:InfoBar.ActionButton>
+                                <Button Command="{x:Bind ViewModel.EnableFolderSynchronizationCommand}" Content="Enable" />
+                            </muxc:InfoBar.ActionButton>
+                        </muxc:InfoBar>
+                    </Grid>
                 </Grid>
-            </Grid>
 
-            <!--  No items createria  -->
+                <!--  No items createria  -->
-            <StackPanel
+                <StackPanel
-                x:Name="NoItemsPanel"
+                    x:Name="NoItemsPanel"
-                Grid.Row="2"
-                Grid.RowSpan="3"
-                VerticalAlignment="Center"
-                HorizontalAlignment="Stretch"
-                Spacing="10">
-
-                <Viewbox
-                    Width="48"
-                    Visibility="{x:Bind ViewModel.IsEmpty, Mode=OneWay}"
-                    Opacity="0.4">
-                    <Path Data="M252,960C227,960 203.083,954.917 180.25,944.75C157.417,934.583 137.417,920.917 120.25,903.75C103.083,886.583 89.4167,866.583 79.25,843.75C69.0833,820.917 64,797 64,772L64,252C64,227 69.0833,203.083 79.25,180.25C89.4167,157.417 103.083,137.417 120.25,120.25C137.417,103.083 157.417,89.4167 180.25,79.25C203.083,69.0834 227,64.0001 252,64L772,64C797,64.0001 820.917,69.0834 843.75,79.25C866.583,89.4167 886.583,103.083 903.75,120.25C920.917,137.417 934.583,157.417 944.75,180.25C954.917,203.083 960,227 960,252L960,772C960,797 954.917,820.917 944.75,843.75C934.583,866.583 920.917,886.583 903.75,903.75C886.583,920.917 866.583,934.583 843.75,944.75C820.917,954.917 797,960 772,960ZM770.5,896C787.167,896 803.083,892.583 818.25,885.75C833.417,878.917 846.75,869.75 858.25,858.25C869.75,846.75 878.917,833.417 885.75,818.25C892.583,803.083 896,787.167 896,770.5L896,253.5C896,236.833 892.583,220.917 885.75,205.75C878.917,190.583 869.75,177.25 858.25,165.75C846.75,154.25 833.417,145.083 818.25,138.25C803.083,131.417 787.167,128 770.5,128L253.5,128C236.833,128 220.917,131.417 205.75,138.25C190.583,145.083 177.25,154.25 165.75,165.75C154.25,177.25 145.083,190.583 138.25,205.75C131.417,220.917 128,236.833 128,253.5L128,770.5C128,787.167 131.417,803.083 138.25,818.25C145.083,833.417 154.25,846.75 165.75,858.25C177.25,869.75 190.583,878.917 205.75,885.75C220.917,892.583 236.833,896 253.5,896ZM559,604.5C541.667,616.833 523.417,625.833 504.25,631.5C485.083,637.167 465,640 444,640C418,640 393.583,634.833 370.75,624.5C347.917,614.167 328,600.167 311,582.5C294,564.833 280.583,544.417 270.75,521.25C260.917,498.083 256,473.667 256,448C256,421.333 261,396.333 271,373C281,349.667 294.667,329.333 312,312C329.333,294.667 349.667,281 373,271C396.333,261 421.333,256 448,256C473.667,256 498.083,260.917 521.25,270.75C544.417,280.583 564.833,294 582.5,311C600.167,328 614.167,347.917 624.5,370.75C634.833,393.583 640,418 640,444C640,465 637.167,485.083 631.5,504.25C625.833,523.417 616.833,541.667 604.5,559L758.5,713.5C764.833,719.833 768,727.333 768,736C768,744.667 764.833,752.167 758.5,758.5C752.167,764.833 744.667,768 736,768C727.333,768 719.833,764.833 713.5,758.5ZM576,448L576,445.5C576,428.167 572.5,411.917 565.5,396.75C558.5,381.583 549.167,368.333 537.5,357C525.833,345.667 512.25,336.667 496.75,330C481.25,323.333 465,320 448,320C430.333,320 413.75,323.417 398.25,330.25C382.75,337.083 369.25,346.25 357.75,357.75C346.25,369.25 337.083,382.833 330.25,398.5C323.417,414.167 320,430.667 320,448C320,465.667 323.417,482.25 330.25,497.75C337.083,513.25 346.25,526.75 357.75,538.25C369.25,549.75 382.75,558.917 398.25,565.75C413.75,572.583 430.333,576 448,576C465.333,576 481.833,572.583 497.5,565.75C513.167,558.917 526.75,549.75 538.25,538.25C549.75,526.75 558.917,513.25 565.75,497.75C572.583,482.25 576,465.667 576,448Z" Fill="{ThemeResource InformationBrush}" />
-                </Viewbox>
-
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Opacity="0.4"
-                    FontSize="20"
-                    FontWeight="ExtraLight"
-                    Foreground="{ThemeResource InformationBrush}"
-                    Text="{x:Bind domain:Translator.NoMessageCrieteria}"
-                    Visibility="{x:Bind ViewModel.IsCriteriaFailed, Mode=OneWay}" />
-
-                <TextBlock
-                    HorizontalAlignment="Center"
-                    Opacity="0.4"
-                    FontSize="20"
-                    FontWeight="ExtraLight"
-                    Foreground="{ThemeResource InformationBrush}"
-                    Text="{x:Bind domain:Translator.NoMessageEmptyFolder}"
-                    Visibility="{x:Bind ViewModel.IsFolderEmpty, Mode=OneWay}" />
-
-                <muxc:ProgressRing
                     Grid.Row="2"
-                    x:Name="LoadingProgressIndicator"
+                    Grid.RowSpan="3"
-                    HorizontalAlignment="Center"
+                    HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
-                    x:Load="{x:Bind ViewModel.IsProgressRing, Mode=OneWay}"
+                    Spacing="10">
-                    Canvas.ZIndex="999" />
-            </StackPanel>
 
-            <!--  Mail Items  -->
+                    <Viewbox
-            <muxc:RefreshContainer
+                        Width="48"
-                Grid.Row="2"
+                        Opacity="0.4"
-                RefreshRequested="PullToRefreshRequested"
+                        Visibility="{x:Bind ViewModel.IsEmpty, Mode=OneWay}">
-                Visibility="{x:Bind ViewModel.IsEmpty, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}">
+                        <Path Data="M252,960C227,960 203.083,954.917 180.25,944.75C157.417,934.583 137.417,920.917 120.25,903.75C103.083,886.583 89.4167,866.583 79.25,843.75C69.0833,820.917 64,797 64,772L64,252C64,227 69.0833,203.083 79.25,180.25C89.4167,157.417 103.083,137.417 120.25,120.25C137.417,103.083 157.417,89.4167 180.25,79.25C203.083,69.0834 227,64.0001 252,64L772,64C797,64.0001 820.917,69.0834 843.75,79.25C866.583,89.4167 886.583,103.083 903.75,120.25C920.917,137.417 934.583,157.417 944.75,180.25C954.917,203.083 960,227 960,252L960,772C960,797 954.917,820.917 944.75,843.75C934.583,866.583 920.917,886.583 903.75,903.75C886.583,920.917 866.583,934.583 843.75,944.75C820.917,954.917 797,960 772,960ZM770.5,896C787.167,896 803.083,892.583 818.25,885.75C833.417,878.917 846.75,869.75 858.25,858.25C869.75,846.75 878.917,833.417 885.75,818.25C892.583,803.083 896,787.167 896,770.5L896,253.5C896,236.833 892.583,220.917 885.75,205.75C878.917,190.583 869.75,177.25 858.25,165.75C846.75,154.25 833.417,145.083 818.25,138.25C803.083,131.417 787.167,128 770.5,128L253.5,128C236.833,128 220.917,131.417 205.75,138.25C190.583,145.083 177.25,154.25 165.75,165.75C154.25,177.25 145.083,190.583 138.25,205.75C131.417,220.917 128,236.833 128,253.5L128,770.5C128,787.167 131.417,803.083 138.25,818.25C145.083,833.417 154.25,846.75 165.75,858.25C177.25,869.75 190.583,878.917 205.75,885.75C220.917,892.583 236.833,896 253.5,896ZM559,604.5C541.667,616.833 523.417,625.833 504.25,631.5C485.083,637.167 465,640 444,640C418,640 393.583,634.833 370.75,624.5C347.917,614.167 328,600.167 311,582.5C294,564.833 280.583,544.417 270.75,521.25C260.917,498.083 256,473.667 256,448C256,421.333 261,396.333 271,373C281,349.667 294.667,329.333 312,312C329.333,294.667 349.667,281 373,271C396.333,261 421.333,256 448,256C473.667,256 498.083,260.917 521.25,270.75C544.417,280.583 564.833,294 582.5,311C600.167,328 614.167,347.917 624.5,370.75C634.833,393.583 640,418 640,444C640,465 637.167,485.083 631.5,504.25C625.833,523.417 616.833,541.667 604.5,559L758.5,713.5C764.833,719.833 768,727.333 768,736C768,744.667 764.833,752.167 758.5,758.5C752.167,764.833 744.667,768 736,768C727.333,768 719.833,764.833 713.5,758.5ZM576,448L576,445.5C576,428.167 572.5,411.917 565.5,396.75C558.5,381.583 549.167,368.333 537.5,357C525.833,345.667 512.25,336.667 496.75,330C481.25,323.333 465,320 448,320C430.333,320 413.75,323.417 398.25,330.25C382.75,337.083 369.25,346.25 357.75,357.75C346.25,369.25 337.083,382.833 330.25,398.5C323.417,414.167 320,430.667 320,448C320,465.667 323.417,482.25 330.25,497.75C337.083,513.25 346.25,526.75 357.75,538.25C369.25,549.75 382.75,558.917 398.25,565.75C413.75,572.583 430.333,576 448,576C465.333,576 481.833,572.583 497.5,565.75C513.167,558.917 526.75,549.75 538.25,538.25C549.75,526.75 558.917,513.25 565.75,497.75C572.583,482.25 576,465.667 576,448Z" Fill="{ThemeResource InformationBrush}" />
-                <SemanticZoom x:Name="SemanticZoomContainer" CanChangeViews="{x:Bind ViewModel.PreferencesService.IsSemanticZoomEnabled, Mode=OneWay}">
+                    </Viewbox>
-                    <SemanticZoom.ZoomedInView>
+
-                        <listview:WinoListView
+                    <TextBlock
-                            x:Name="MailListView"
+                        HorizontalAlignment="Center"
-                            HorizontalContentAlignment="Stretch"
+                        FontSize="20"
-                            ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
+                        FontWeight="ExtraLight"
-                            LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}"
+                        Foreground="{ThemeResource InformationBrush}"
-                            ItemContainerStyleSelector="{StaticResource WinoContainerSelector}"
+                        Opacity="0.4"
-                            ItemTemplateSelector="{StaticResource MailItemDisplaySelector}"
+                        Text="{x:Bind domain:Translator.NoMessageCrieteria}"
-                            ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}"
+                        Visibility="{x:Bind ViewModel.IsCriteriaFailed, Mode=OneWay}" />
-                            ItemDeletedCommand="{x:Bind ViewModel.MailOperationCommand}"
+
-                            ProcessKeyboardAccelerators="ProcessMailItemKeyboardAccelerator"
+                    <TextBlock
-                            ScrollViewer.VerticalScrollBarVisibility="Auto">
+                        HorizontalAlignment="Center"
-                            <ListView.ItemContainerTransitions>
+                        FontSize="20"
-                                <TransitionCollection>
+                        FontWeight="ExtraLight"
-                                    <AddDeleteThemeTransition />
+                        Foreground="{ThemeResource InformationBrush}"
-                                </TransitionCollection>
+                        Opacity="0.4"
-                            </ListView.ItemContainerTransitions>
+                        Text="{x:Bind domain:Translator.NoMessageEmptyFolder}"
-                            <ListView.ItemsPanel>
+                        Visibility="{x:Bind ViewModel.IsFolderEmpty, Mode=OneWay}" />
-                                <ItemsPanelTemplate>
+
-                                    <ItemsStackPanel AreStickyGroupHeadersEnabled="True" />
+                    <muxc:ProgressRing
-                                </ItemsPanelTemplate>
+                        x:Name="LoadingProgressIndicator"
-                            </ListView.ItemsPanel>
+                        Grid.Row="2"
-                            <ListView.Resources>
+                        HorizontalAlignment="Center"
-                                <ResourceDictionary>
+                        VerticalAlignment="Center"
-                                    <Style BasedOn="{StaticResource MailListHeaderStyle}" TargetType="ListViewHeaderItem" />
+                        x:Load="{x:Bind ViewModel.IsProgressRing, Mode=OneWay}"
-                                </ResourceDictionary>
+                        Canvas.ZIndex="999" />
-                            </ListView.Resources>
+                </StackPanel>
-                            <ListView.GroupStyle>
+
-                                <GroupStyle HeaderTemplate="{StaticResource MailGroupHeaderDefaultTemplate}" HidesIfEmpty="True" />
+                <!--  Mail Items  -->
-                            </ListView.GroupStyle>
+                <muxc:RefreshContainer
-                        </listview:WinoListView>
+                    Grid.Row="2"
-                    </SemanticZoom.ZoomedInView>
+                    RefreshRequested="PullToRefreshRequested"
-                    <SemanticZoom.ZoomedOutView>
+                    Visibility="{x:Bind ViewModel.IsEmpty, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}">
-                        <ListView
+                    <SemanticZoom x:Name="SemanticZoomContainer" CanChangeViews="{x:Bind ViewModel.PreferencesService.IsSemanticZoomEnabled, Mode=OneWay}">
-                            x:Name="ZoomOutList"
+                        <SemanticZoom.ZoomedInView>
-                            x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(SemanticZoomContainer.IsZoomedInViewActive), Mode=OneWay}"
+                            <listview:WinoListView
-                            ItemsSource="{x:Bind MailCollectionViewSource.View.CollectionGroups}">
+                                x:Name="MailListView"
-                            <ListView.Resources>
+                                HorizontalContentAlignment="Stretch"
-                                <Style TargetType="ListViewItem">
+                                ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
-                                    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                ItemContainerStyleSelector="{StaticResource WinoContainerSelector}"
-                                    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                                ItemDeletedCommand="{x:Bind ViewModel.MailOperationCommand}"
-                                    <Setter Property="Margin" Value="0,12" />
+                                ItemTemplateSelector="{StaticResource MailItemDisplaySelector}"
-                                    <Setter Property="Padding" Value="0" />
+                                ItemsSource="{x:Bind MailCollectionViewSource.View, Mode=OneWay}"
-                                </Style>
+                                LoadMoreCommand="{x:Bind ViewModel.LoadMoreItemsCommand}"
-                            </ListView.Resources>
+                                ProcessKeyboardAccelerators="ProcessMailItemKeyboardAccelerator"
-                            <ListView.ItemTemplate>
+                                ScrollViewer.VerticalScrollBarVisibility="Auto">
-                                <DataTemplate x:DataType="ICollectionViewGroup">
+                                <ListView.ItemContainerTransitions>
-                                    <Grid
+                                    <TransitionCollection>
-                                        Margin="4,0"
+                                        <AddDeleteThemeTransition />
-                                        Background="{ThemeResource MailListHeaderBackgroundColor}"
+                                    </TransitionCollection>
-                                        CornerRadius="4">
+                                </ListView.ItemContainerTransitions>
-                                        <TextBlock
+                                <ListView.ItemsPanel>
-                                            Margin="12,0"
+                                    <ItemsPanelTemplate>
-                                            HorizontalAlignment="Center"
+                                        <ItemsStackPanel AreStickyGroupHeadersEnabled="True" />
-                                            VerticalAlignment="Center"
+                                    </ItemsPanelTemplate>
-                                            FontWeight="SemiBold"
+                                </ListView.ItemsPanel>
-                                            Text="{x:Bind helpers:XamlHelpers.GetMailGroupDateString(Group)}" />
+                                <ListView.Resources>
-                                    </Grid>
+                                    <ResourceDictionary>
-                                </DataTemplate>
+                                        <Style BasedOn="{StaticResource MailListHeaderStyle}" TargetType="ListViewHeaderItem" />
-                            </ListView.ItemTemplate>
+                                    </ResourceDictionary>
-                        </ListView>
+                                </ListView.Resources>
-                    </SemanticZoom.ZoomedOutView>
+                                <ListView.GroupStyle>
-                </SemanticZoom>
+                                    <GroupStyle HeaderTemplate="{StaticResource MailGroupHeaderDefaultTemplate}" HidesIfEmpty="True" />
-            </muxc:RefreshContainer>
+                                </ListView.GroupStyle>
+                            </listview:WinoListView>
+                        </SemanticZoom.ZoomedInView>
+                        <SemanticZoom.ZoomedOutView>
+                            <ListView
+                                x:Name="ZoomOutList"
+                                x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(SemanticZoomContainer.IsZoomedInViewActive), Mode=OneWay}"
+                                ItemsSource="{x:Bind MailCollectionViewSource.View.CollectionGroups}">
+                                <ListView.Resources>
+                                    <Style TargetType="ListViewItem">
+                                        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                                        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                                        <Setter Property="Margin" Value="0,12" />
+                                        <Setter Property="Padding" Value="0" />
+                                    </Style>
+                                </ListView.Resources>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate x:DataType="ICollectionViewGroup">
+                                        <Grid
+                                            Margin="4,0"
+                                            Background="{ThemeResource MailListHeaderBackgroundColor}"
+                                            CornerRadius="4">
+                                            <TextBlock
+                                                Margin="12,0"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                FontWeight="SemiBold"
+                                                Text="{x:Bind helpers:XamlHelpers.GetMailGroupDateString(Group)}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </SemanticZoom.ZoomedOutView>
+                    </SemanticZoom>
+                </muxc:RefreshContainer>
 
 
-            <!--  Update Info Bar  -->
+                <!--  Update Info Bar  -->
-            <controls:WinoInfoBar
+                <controls:WinoInfoBar
-                Title="{x:Bind ViewModel.BarTitle, Mode=OneWay}"
+                    Title="{x:Bind ViewModel.BarTitle, Mode=OneWay}"
-                Grid.Row="2"
+                    Grid.Row="2"
-                Margin="6,0,6,6"
+                    Margin="6,0,6,6"
-                VerticalAlignment="Bottom"
+                    VerticalAlignment="Bottom"
-                AnimationType="SlideFromBottomToTop"
+                    AnimationType="SlideFromBottomToTop"
-                DismissInterval="2"
+                    DismissInterval="2"
-                IsClosable="False"
+                    IsClosable="False"
-                IsOpen="{x:Bind ViewModel.IsBarOpen, Mode=TwoWay}"
+                    IsOpen="{x:Bind ViewModel.IsBarOpen, Mode=TwoWay}"
-                Message="{x:Bind ViewModel.BarMessage, Mode=OneWay}"
+                    Message="{x:Bind ViewModel.BarMessage, Mode=OneWay}"
-                Severity="{x:Bind helpers:XamlHelpers.InfoBarSeverityConverter(ViewModel.BarSeverity), Mode=OneWay}" />
+                    Severity="{x:Bind helpers:XamlHelpers.InfoBarSeverityConverter(ViewModel.BarSeverity), Mode=OneWay}" />
 
-        </Grid>
+            </Grid>
+        </Border>
 
         <!--  Mail Rendering Frame  -->
         <Frame

Wino.Mail/Views/MailListPage.xaml.cs

@@ -153,6 +153,7 @@ namespace Wino.Views
 
         private void UpdateAdaptiveness()
         {
+            ReaderGridContainer.Visibility = !(StatePersistanceService.IsReadingMail && StatePersistanceService.IsReaderNarrowed) ? Visibility.Visible : Visibility.Collapsed;
             ReaderGrid.Visibility = !(StatePersistanceService.IsReadingMail && StatePersistanceService.IsReaderNarrowed) ? Visibility.Visible : Visibility.Collapsed;
             RenderingFrame.Visibility = StatePersistanceService.IsReadingMail ? Visibility.Visible : (StatePersistanceService.IsReaderNarrowed ? Visibility.Collapsed : Visibility.Visible);
 
@@ -536,7 +537,7 @@ namespace Wino.Views
 
         private async void SearchBar_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
         {
-            if(args.Reason == AutoSuggestionBoxTextChangeReason.UserInput && string.IsNullOrWhiteSpace(sender.Text))
+            if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput && string.IsNullOrWhiteSpace(sender.Text))
             {
                 await ViewModel.PerformSearchAsync();
             }