diff --git a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
index 1e634077..31991894 100644
--- a/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
+++ b/Wino.Mail/Dialogs/SystemFolderConfigurationDialog.xaml
@@ -23,7 +23,7 @@
             <Setter Property="Width" Value="100" />
         </Style>
     </ContentDialog.Resources>
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <Grid RowSpacing="12">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
diff --git a/Wino.Mail/Views/Account/AccountDetailsPage.xaml b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
index 3deac2d1..50c60b3b 100644
--- a/Wino.Mail/Views/Account/AccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Account/AccountDetailsPage.xaml
@@ -68,7 +68,7 @@
         </DataTemplate>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel Spacing="4">
             <controls:SettingsCard Header="{x:Bind domain:Translator.SettingsAccountName_Title}" Description="{x:Bind domain:Translator.SettingsAccountName_Description}">
                 <controls:SettingsCard.HeaderIcon>
@@ -95,7 +95,7 @@
                         HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
                         ContentAlignment="Vertical">
-                        <ScrollViewer>
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
diff --git a/Wino.Mail/Views/Account/AccountManagementPage.xaml b/Wino.Mail/Views/Account/AccountManagementPage.xaml
index 266d2c04..95fdeff2 100644
--- a/Wino.Mail/Views/Account/AccountManagementPage.xaml
+++ b/Wino.Mail/Views/Account/AccountManagementPage.xaml
@@ -73,7 +73,7 @@
             RootAccountTemplate="{StaticResource RootAccountTemplate}" />
     </Page.Resources>
 
-    <ScrollViewer Margin="-12,0">
+    <ScrollViewer Margin="-12,0" VerticalScrollBarVisibility="Auto">
         <Grid
             MaxWidth="900"
             Padding="20"
diff --git a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml b/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
index 405205e7..d1ba424b 100644
--- a/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
+++ b/Wino.Mail/Views/Account/MergedAccountDetailsPage.xaml
@@ -57,7 +57,7 @@
         </DataTemplate>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
             <controls:SettingsCard
                 Header="{x:Bind domain:Translator.SettingsRenameMergeAccount_Title}"
diff --git a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
index 5fb44e21..71f5686e 100644
--- a/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
+++ b/Wino.Mail/Views/ImapSetup/AdvancedImapSetupPage.xaml
@@ -17,7 +17,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <ScrollViewer x:Name="MainScrollviewer" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
+        <ScrollViewer x:Name="MainScrollviewer" VerticalScrollBarVisibility="Auto" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
             <StackPanel Spacing="12" Padding="0,0,16,0">
                 <TextBlock
                     d:Text="Advanced IMAP / SMTP Configuration"
diff --git a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
index 6beab59a..c5a91b2b 100644
--- a/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
+++ b/Wino.Mail/Views/ImapSetup/WelcomeImapSetupPage.xaml
@@ -14,7 +14,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <ScrollViewer x:Name="MainScrollviewer" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
+        <ScrollViewer x:Name="MainScrollviewer" VerticalScrollBarVisibility="Auto" Padding="{StaticResource ImapSetupDialogSubPagePadding}">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
diff --git a/Wino.Mail/Views/Settings/AboutPage.xaml b/Wino.Mail/Views/Settings/AboutPage.xaml
index 7e599b1d..61a8ef4d 100644
--- a/Wino.Mail/Views/Settings/AboutPage.xaml
+++ b/Wino.Mail/Views/Settings/AboutPage.xaml
@@ -9,7 +9,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel Spacing="3">
             <Image
                 Source="ms-appx:///Assets/StoreLogo.png"
@@ -39,6 +39,9 @@
                         VerticalAlignment="Center"
                         Data="m 12.2135 0 c -6.7538 0 -12.2135 5.5 -12.2135 12.3042 c 0 5.439 3.4983 10.043 8.3513 11.6725 c 0.6067 0.1225 0.829 -0.2647 0.829 -0.5905 c 0 -0.2853 -0.02 -1.263 -0.02 -2.2817 c -3.3975 0.7335 -4.105 -1.4668 -4.105 -1.4668 c -0.546 -1.426 -1.355 -1.7925 -1.355 -1.7925 c -1.112 -0.7538 0.081 -0.7538 0.081 -0.7538 c 1.2335 0.0815 1.8807 1.263 1.8807 1.263 c 1.0918 1.874 2.851 1.3445 3.5587 1.0185 c 0.101 -0.7945 0.4247 -1.3445 0.7685 -1.65 c -2.7097 -0.2853 -5.5607 -1.3445 -5.5607 -6.0708 c 0 -1.3445 0.485 -2.4445 1.2535 -3.3 c -0.1212 -0.3055 -0.546 -1.5687 0.1215 -3.2595 c 0 0 1.0313 -0.326 3.3565 1.263 a 11.7425 11.7425 90 0 1 3.0535 -0.4075 c 1.0313 0 2.0825 0.1428 3.0533 0.4075 c 2.3255 -1.589 3.3567 -1.263 3.3567 -1.263 c 0.6675 1.6908 0.2425 2.954 0.1212 3.2595 c 0.7888 0.8555 1.2538 1.9555 1.2538 3.3 c 0 4.7263 -2.851 5.765 -5.581 6.0708 c 0.445 0.387 0.829 1.1202 0.829 2.2815 c 0 1.65 -0.02 2.9743 -0.02 3.3815 c 0 0.326 0.2225 0.7132 0.829 0.591 c 4.853 -1.63 8.3513 -6.2338 8.3513 -11.6728 c 0.02 -6.8043 -5.4598 -12.3043 -12.1933 -12.3043 z" />
                 </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE8A7;"/>
+                </controls:SettingsCard.ActionIcon>
             </controls:SettingsCard>
 
             <controls:SettingsCard
@@ -53,6 +56,9 @@
                         VerticalAlignment="Center"
                         Data="M 16.9509 0 L 2.2491 0 C 1.0094 0 0 1.0094 0 2.2601 L 0 17.0935 C 0 18.3442 1.0094 19.3536 2.2491 19.3536 L 14.6907 19.3536 L 14.1093 17.3239 L 15.5136 18.6295 L 16.8411 19.8583 L 19.2 21.9429 L 19.2 2.2601 C 19.2 1.0094 18.1906 0 16.9509 0 Z M 12.7159 14.3287 C 12.7159 14.3287 12.3209 13.8569 11.9918 13.44 C 13.429 13.0341 13.9776 12.1344 13.9776 12.1344 C 13.5278 12.4306 13.0999 12.6391 12.7159 12.7817 C 12.1673 13.0121 11.6407 13.1657 11.125 13.2535 C 10.0718 13.451 9.1063 13.3961 8.2834 13.2425 C 7.6581 13.1218 7.1205 12.9463 6.6706 12.7707 C 6.4183 12.672 6.144 12.5513 5.8697 12.3977 C 5.8368 12.3758 5.8039 12.3648 5.771 12.3429 C 5.749 12.3319 5.7381 12.3209 5.7271 12.3099 C 5.5296 12.2002 5.4199 12.1234 5.4199 12.1234 C 5.4199 12.1234 5.9465 13.0011 7.3399 13.4181 C 7.0107 13.835 6.6048 14.3287 6.6048 14.3287 C 4.1801 14.2519 3.2585 12.661 3.2585 12.661 C 3.2585 9.1282 4.8384 6.2647 4.8384 6.2647 C 6.4183 5.0798 7.9214 5.1127 7.9214 5.1127 L 8.0311 5.2443 C 6.0562 5.8149 5.1456 6.6816 5.1456 6.6816 C 5.1456 6.6816 5.387 6.5499 5.7929 6.3634 C 6.9669 5.8478 7.8994 5.7051 8.2834 5.6722 C 8.3493 5.6613 8.4041 5.6503 8.4699 5.6503 C 9.1392 5.5625 9.8962 5.5406 10.6862 5.6283 C 11.7285 5.749 12.8475 6.0562 13.9886 6.6816 C 13.9886 6.6816 13.1218 5.8587 11.2567 5.2882 L 11.4103 5.1127 C 11.4103 5.1127 12.9134 5.0798 14.4933 6.2647 C 14.4933 6.2647 16.0731 9.1282 16.0731 12.661 C 16.0731 12.661 15.1406 14.2519 12.7159 14.3287 Z M 7.6142 9.205 C 6.9888 9.205 6.4951 9.7536 6.4951 10.4229 C 6.4951 11.0921 6.9998 11.6407 7.6142 11.6407 C 8.2395 11.6407 8.7333 11.0921 8.7333 10.4229 C 8.7442 9.7536 8.2395 9.205 7.6142 9.205 M 11.6187 9.205 C 10.9934 9.205 10.4997 9.7536 10.4997 10.4229 C 10.4997 11.0921 11.0043 11.6407 11.6187 11.6407 C 12.2441 11.6407 12.7378 11.0921 12.7378 10.4229 C 12.7378 9.7536 12.2441 9.205 11.6187 9.205" />
                 </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE8A7;"/>
+                </controls:SettingsCard.ActionIcon>
             </controls:SettingsCard>
 
             <controls:SettingsCard
@@ -67,6 +73,9 @@
                         VerticalAlignment="Center"
                         Data="F1 M 19.003906 3.251953 L 19.003906 15.947266 C 19.003906 16.357422 18.920898 16.748047 18.754883 17.119141 C 18.588867 17.490234 18.367512 17.814127 18.09082 18.09082 C 17.814127 18.367514 17.490234 18.588867 17.119141 18.754883 C 16.748047 18.920898 16.357422 19.003906 15.947266 19.003906 L 3.056641 19.003906 C 2.646484 19.003906 2.255859 18.920898 1.884766 18.754883 C 1.513672 18.588867 1.189779 18.367514 0.913086 18.09082 C 0.636393 17.814127 0.415039 17.490234 0.249023 17.119141 C 0.083008 16.748047 0 16.357422 0 15.947266 L 0 3.251953 C 0 3.076172 0.032552 2.913412 0.097656 2.763672 C 0.16276 2.613934 0.252279 2.482098 0.366211 2.368164 C 0.480143 2.254232 0.611979 2.164715 0.761719 2.099609 C 0.911458 2.034506 1.074219 2.001953 1.25 2.001953 L 4.003906 2.001953 L 4.003906 0.996094 C 4.003906 0.859375 4.029948 0.730795 4.082031 0.610352 C 4.134114 0.48991 4.205729 0.384115 4.296875 0.292969 C 4.388021 0.201824 4.493815 0.130209 4.614258 0.078125 C 4.7347 0.026043 4.863281 0 5 0 L 14.003906 0 C 14.140624 0 14.269205 0.026043 14.389648 0.078125 C 14.510091 0.130209 14.615885 0.201824 14.707031 0.292969 C 14.798177 0.384115 14.869791 0.48991 14.921875 0.610352 C 14.973957 0.730795 14.999999 0.859375 15 0.996094 L 15 2.001953 L 17.753906 2.001953 C 17.923176 2.001953 18.084309 2.034506 18.237305 2.099609 C 18.390299 2.164715 18.523762 2.254232 18.637695 2.368164 C 18.751627 2.482098 18.841145 2.615561 18.90625 2.768555 C 18.971354 2.921551 19.003906 3.082684 19.003906 3.251953 Z M 14.003906 0.996094 L 5 0.996094 L 5 2.001953 L 14.003906 2.001953 Z M 5 10 L 9.003906 10 L 9.003906 5.996094 L 5 5.996094 Z M 10 10 L 14.003906 10 L 14.003906 5.996094 L 10 5.996094 Z M 5 15 L 9.003906 15 L 9.003906 10.996094 L 5 10.996094 Z M 10 15 L 14.003906 15 L 14.003906 10.996094 L 10 10.996094 Z " />
                 </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE8A7;"/>
+                </controls:SettingsCard.ActionIcon>
             </controls:SettingsCard>
 
             <controls:SettingsCard
@@ -78,6 +87,9 @@
                 <controls:SettingsCard.HeaderIcon>
                     <PathIcon Data="M385.52,51.09C363.84,26.52,324.71,16,274.63,16H129.25a20.75,20.75,0,0,0-20.54,17.48l-60.55,382a12.43,12.43,0,0,0,10.39,14.22,12.58,12.58,0,0,0,1.94.15h89.76l22.54-142.29-.7,4.46a20.67,20.67,0,0,1,20.47-17.46h42.65c83.77,0,149.36-33.86,168.54-131.8.57-2.9,1.05-5.72,1.49-8.48h0C410.94,98.06,405.19,73.41,385.52,51.09Z" />
                 </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE8A7;"/>
+                </controls:SettingsCard.ActionIcon>
             </controls:SettingsCard>
 
             <controls:SettingsCard
@@ -92,6 +104,9 @@
                         VerticalAlignment="Center"
                         Data="F1 M 0.292969 11.894531 C 0.292969 11.855469 0.299479 11.803386 0.3125 11.738281 C 0.514323 10.983073 0.779622 10.260417 1.108398 9.570312 C 1.437174 8.880209 1.826172 8.238933 2.275391 7.646484 C 2.724609 7.054037 3.227539 6.518556 3.78418 6.040039 C 4.34082 5.561524 4.944661 5.151368 5.595703 4.80957 C 6.246745 4.467774 6.941731 4.20573 7.680664 4.023438 C 8.419596 3.841146 9.192708 3.75 10 3.75 C 10.9375 3.75 11.84082 3.883465 12.709961 4.150391 C 13.579102 4.417318 14.391275 4.791667 15.146484 5.273438 C 15.901692 5.755209 16.588541 6.333009 17.207031 7.006836 C 17.82552 7.680664 18.349609 8.427734 18.779297 9.248047 C 18.8444 9.371745 18.929035 9.554037 19.033203 9.794922 C 19.137369 10.035808 19.239908 10.289714 19.34082 10.556641 C 19.44173 10.823568 19.527994 11.079102 19.599609 11.323242 C 19.671223 11.567383 19.707031 11.751303 19.707031 11.875 C 19.707031 12.044271 19.645182 12.190756 19.521484 12.314453 C 19.397785 12.438151 19.251301 12.5 19.082031 12.5 C 18.91276 12.5 18.785807 12.456055 18.701172 12.368164 C 18.616535 12.280273 18.541666 12.164714 18.476562 12.021484 C 18.404947 11.871745 18.352863 11.715495 18.320312 11.552734 C 18.28776 11.389975 18.245441 11.230469 18.193359 11.074219 C 18.043619 10.598959 17.840168 10.130209 17.583008 9.667969 C 17.325846 9.205729 17.041016 8.779297 16.728516 8.388672 C 16.311848 7.854818 15.849609 7.37793 15.341797 6.958008 C 14.833984 6.538086 14.290364 6.183269 13.710938 5.893555 C 13.13151 5.603842 12.522786 5.382487 11.884766 5.229492 C 11.246744 5.076498 10.585938 5.000001 9.902344 5 C 9.095052 5.000001 8.317057 5.120443 7.568359 5.361328 C 6.819661 5.602214 6.119791 5.935873 5.46875 6.362305 C 4.817708 6.788737 4.22526 7.29655 3.691406 7.885742 C 3.157552 8.474936 2.705078 9.117839 2.333984 9.814453 C 2.288411 9.899089 2.226562 10.026042 2.148438 10.195312 C 2.070312 10.364584 1.992188 10.54362 1.914062 10.732422 C 1.835938 10.921225 1.769206 11.100261 1.713867 11.269531 C 1.658529 11.438803 1.630859 11.565756 1.630859 11.650391 C 1.630859 11.748047 1.612956 11.847331 1.577148 11.948242 C 1.541341 12.049154 1.492513 12.1403 1.430664 12.22168 C 1.368815 12.303061 1.293945 12.37142 1.206055 12.426758 C 1.118164 12.482097 1.022135 12.509766 0.917969 12.509766 C 0.748698 12.509766 0.602214 12.451172 0.478516 12.333984 C 0.354818 12.216797 0.292969 12.070312 0.292969 11.894531 Z M 5.625 11.796875 C 5.625 11.210938 5.743815 10.657553 5.981445 10.136719 C 6.219075 9.615886 6.538086 9.160156 6.938477 8.769531 C 7.338867 8.378906 7.802734 8.069662 8.330078 7.841797 C 8.857422 7.613933 9.414062 7.5 10 7.5 C 10.598958 7.5 11.163736 7.615561 11.694336 7.84668 C 12.224935 8.0778 12.688802 8.391928 13.085938 8.789062 C 13.483072 9.186198 13.797199 9.650065 14.02832 10.180664 C 14.259439 10.711264 14.375 11.276042 14.375 11.875 C 14.375 12.473959 14.259439 13.038737 14.02832 13.569336 C 13.797199 14.099936 13.483072 14.563803 13.085938 14.960938 C 12.688802 15.358073 12.224935 15.672201 11.694336 15.90332 C 11.163736 16.134441 10.598958 16.25 10 16.25 C 9.38151 16.25 8.805338 16.132812 8.271484 15.898438 C 7.73763 15.664062 7.27539 15.345053 6.884766 14.941406 C 6.49414 14.537761 6.186523 14.065756 5.961914 13.525391 C 5.737305 12.985026 5.625 12.408854 5.625 11.796875 Z M 13.125 11.806641 C 13.124999 11.383464 13.040363 10.986328 12.871094 10.615234 C 12.701822 10.244141 12.473958 9.920248 12.1875 9.643555 C 11.901041 9.366862 11.56901 9.148764 11.191406 8.989258 C 10.813802 8.829753 10.416666 8.75 10 8.75 C 9.563802 8.75 9.1569 8.831381 8.779297 8.994141 C 8.401692 9.156901 8.071289 9.379883 7.788086 9.663086 C 7.504883 9.946289 7.281901 10.276693 7.119141 10.654297 C 6.95638 11.031901 6.875 11.438803 6.875 11.875 C 6.875 12.311198 6.95638 12.7181 7.119141 13.095703 C 7.281901 13.473308 7.504883 13.803711 7.788086 14.086914 C 8.071289 14.370117 8.401692 14.5931 8.779297 14.755859 C 9.1569 14.91862 9.563802 15 10 15 C 10.449219 15 10.864258 14.916992 11.245117 14.750977 C 11.625977 14.584961 11.954752 14.357097 12.231445 14.067383 C 12.508138 13.77767 12.726236 13.439128 12.885742 13.051758 C 13.045246 12.664389 13.124999 12.24935 13.125 11.806641 Z " />
                 </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.ActionIcon>
+                    <FontIcon FontFamily="Segoe Fluent Icons" Glyph="&#xE8A7;"/>
+                </controls:SettingsCard.ActionIcon>
             </controls:SettingsCard>
 
             <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsDiagnostics_Description}" Header="{x:Bind domain:Translator.SettingsDiagnostics_Title}">
diff --git a/Wino.Mail/Views/Settings/MessageListPage.xaml b/Wino.Mail/Views/Settings/MessageListPage.xaml
index 8b6957ad..62c15b27 100644
--- a/Wino.Mail/Views/Settings/MessageListPage.xaml
+++ b/Wino.Mail/Views/Settings/MessageListPage.xaml
@@ -9,7 +9,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
             <controls:SettingsExpander Description="{x:Bind domain:Translator.SettingsHoverActions_Description}" Header="{x:Bind domain:Translator.SettingsHoverActions_Title}">
                 <controls:SettingsExpander.HeaderIcon>
diff --git a/Wino.Mail/Views/Settings/PersonalizationPage.xaml b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
index 4beab950..2b9bfd3d 100644
--- a/Wino.Mail/Views/Settings/PersonalizationPage.xaml
+++ b/Wino.Mail/Views/Settings/PersonalizationPage.xaml
@@ -177,7 +177,7 @@
         </Style>
     </Page.Resources>
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel Spacing="3">
             <!--  Accent Color  -->
             <controls:SettingsExpander
diff --git a/Wino.Mail/Views/Settings/ReadingPanePage.xaml b/Wino.Mail/Views/Settings/ReadingPanePage.xaml
index 9f6c0ff3..d6b4185e 100644
--- a/Wino.Mail/Views/Settings/ReadingPanePage.xaml
+++ b/Wino.Mail/Views/Settings/ReadingPanePage.xaml
@@ -12,7 +12,7 @@
     xmlns:reader="using:Wino.Core.Domain.Models.Reader"
     mc:Ignorable="d">
 
-    <ScrollViewer>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel>
             <controls:SettingsExpander
                 Header="{x:Bind domain:Translator.SettingsReaderFont_Title}"
diff --git a/Wino.Mail/Views/Settings/SettingOptionsPage.xaml b/Wino.Mail/Views/Settings/SettingOptionsPage.xaml
index 7a79c41c..b94472c3 100644
--- a/Wino.Mail/Views/Settings/SettingOptionsPage.xaml
+++ b/Wino.Mail/Views/Settings/SettingOptionsPage.xaml
@@ -12,7 +12,7 @@
     mc:Ignorable="d">
 
 
-    <ScrollViewer Grid.Row="1">
+    <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
         <StackPanel Spacing="3">
             <controls:SettingsCard
                 IsClickEnabled="True"
diff --git a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
index 5c9c0f7f..6319194f 100644
--- a/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
+++ b/Wino.Mail/Views/Settings/SignatureManagementPage.xaml
@@ -51,7 +51,7 @@
         </Grid>
 
         <!--  Editor Options  -->
-        <ScrollViewer
+        <ScrollViewer VerticalScrollBarVisibility="Auto"
             Grid.Row="1"
             VerticalAlignment="Top"
             IsEnabled="{x:Bind ViewModel.IsSignatureEnabled, Mode=OneWay}"
diff --git a/Wino.Mail/Views/WelcomePage.xaml b/Wino.Mail/Views/WelcomePage.xaml
index 25f28769..a975becd 100644
--- a/Wino.Mail/Views/WelcomePage.xaml
+++ b/Wino.Mail/Views/WelcomePage.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <Grid Padding="24">
-        <ScrollViewer>
+        <ScrollViewer VerticalScrollBarVisibility="Auto">
             <controls:MarkdownTextBlock
                 x:Name="MarkdownControl"
                 LinkClicked="HyperlinkClicked"