diff --git a/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems b/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
index a06a888c..c9acaa33 100644
--- a/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
+++ b/source/Eppie.App/Eppie.App.Shared/Eppie.App.Shared.projitems
@@ -14,8 +14,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\AuthConfig.UWP.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Authorization\WindowsAuthenticationBroker.UWP.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Common\UITools.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseUserControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\RichTextEditor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\BitmapTools.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IncrementalLoading\IncrementalLoadingCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Models\BrandLoader.cs" />
@@ -42,48 +40,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml.cs">
-      <DependentUpon>AccountSettingsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml.cs">
-      <DependentUpon>AttachmentListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml.cs">
-      <DependentUpon>ContactsListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml.cs">
-      <DependentUpon>DecentralizedAccountSettingsControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml.cs">
-      <DependentUpon>EmailProvidersListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml.cs">
-      <DependentUpon>EmailsInputControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml.cs">
-      <DependentUpon>ErrorControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml.cs">
-      <DependentUpon>LanguageSelectionControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml.cs">
-      <DependentUpon>MailBoxesListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml.cs">
-      <DependentUpon>MessageListControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml.cs">
-      <DependentUpon>NavPanelTabControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml.cs">
-      <DependentUpon>PasswordControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml.cs">
-      <DependentUpon>PromptTextInputControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml.cs">
-      <DependentUpon>ProtonAccountSettingsControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Views\AboutPage.xaml.cs">
       <DependentUpon>AboutPage.xaml</DependentUpon>
     </Compile>
@@ -147,62 +103,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </ApplicationDefinition>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)StaticResources\StaticStringResources.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/AccountSettingsControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AccountSettingsControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/AccountSettingsControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AccountSettingsControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/AccountSettingsControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AccountSettingsControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/AccountSettingsControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AccountSettingsControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/AttachmentListControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AttachmentListControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/AttachmentListControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AttachmentListControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/AttachmentListControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AttachmentListControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/AttachmentListControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/AttachmentListControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/BaseUserControl.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/BaseUserControl.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/BaseUserControl.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/BaseUserControl.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ContactsListControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ContactsListControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ContactsListControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ContactsListControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ContactsListControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/DecentralizedAccountSettingsControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/DecentralizedAccountSettingsControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/DecentralizedAccountSettingsControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/DecentralizedAccountSettingsControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/DecentralizedAccountSettingsControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/DecentralizedAccountSettingsControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/DecentralizedAccountSettingsControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/DecentralizedAccountSettingsControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/EmailProvidersListControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailProvidersListControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/EmailProvidersListControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailProvidersListControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/EmailProvidersListControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailProvidersListControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/EmailProvidersListControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailProvidersListControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/EmailsInputControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/EmailsInputControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/EmailsInputControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/EmailsInputControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ErrorControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ErrorControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ErrorControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ErrorControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ErrorControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ErrorControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ErrorControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ErrorControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/LanguageSelectionControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/LanguageSelectionControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/LanguageSelectionControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/LanguageSelectionControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/LanguageSelectionControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/LanguageSelectionControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/LanguageSelectionControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/LanguageSelectionControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/MailBoxesListControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/MailBoxesListControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/MailBoxesListControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/MailBoxesListControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MailBoxesListControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/MessageListControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/MessageListControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/MessageListControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/MessageListControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/MessageListControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/NavPanelTabControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/NavPanelTabControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/NavPanelTabControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/NavPanelTabControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/NavPanelTabControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/NavPanelTabControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/NavPanelTabControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/NavPanelTabControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/PasswordControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PasswordControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/PasswordControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PasswordControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/PasswordControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PasswordControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/PasswordControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PasswordControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/PromptTextInputControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PromptTextInputControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/PromptTextInputControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PromptTextInputControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/PromptTextInputControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PromptTextInputControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/PromptTextInputControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/PromptTextInputControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ProtonAccountSettingsControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ProtonAccountSettingsControl.xaml
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ProtonAccountSettingsControl.xaml
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ProtonAccountSettingsControl.xaml
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/ProtonAccountSettingsControl.xaml.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ProtonAccountSettingsControl.xaml.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/ProtonAccountSettingsControl.xaml.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/ProtonAccountSettingsControl.xaml.cs
diff --git a/source/Eppie.App/Eppie.App.Shared/Controls/RichTextEditor.cs b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/RichTextEditor.cs
similarity index 100%
rename from source/Eppie.App/Eppie.App.Shared/Controls/RichTextEditor.cs
rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/RichTextEditor.cs
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
index 9c2aa2f2..9cda5736 100644
--- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
+++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems
@@ -18,6 +18,50 @@
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\ObjectToFileBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\PasteFromClipboardBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Behaviors\TreeViewItemInvokeBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml.cs">
+      <DependentUpon>AccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml.cs">
+      <DependentUpon>AttachmentListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseUserControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml.cs">
+      <DependentUpon>ContactsListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml.cs">
+      <DependentUpon>DecentralizedAccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml.cs">
+      <DependentUpon>EmailProvidersListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml.cs">
+      <DependentUpon>EmailsInputControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml.cs">
+      <DependentUpon>ErrorControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml.cs">
+      <DependentUpon>LanguageSelectionControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml.cs">
+      <DependentUpon>MailBoxesListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml.cs">
+      <DependentUpon>MessageListControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml.cs">
+      <DependentUpon>NavPanelTabControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml.cs">
+      <DependentUpon>PasswordControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml.cs">
+      <DependentUpon>PromptTextInputControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml.cs">
+      <DependentUpon>ProtonAccountSettingsControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\RichTextEditor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BitmapSourceConverters.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\BoolToValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\ConverterChain.cs" />
@@ -31,6 +75,62 @@
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\WebViewExtension.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\AccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\AttachmentListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ContactsListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\DecentralizedAccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailProvidersListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\EmailsInputControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ErrorControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\LanguageSelectionControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\MailBoxesListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\MessageListControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\NavPanelTabControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\PasswordControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\PromptTextInputControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\ProtonAccountSettingsControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Converters\ConvertersDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
index c37c0bdb..f799532a 100644
--- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
+++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj
@@ -106,6 +106,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" />
     <PackageReference Include="Microsoft.UI.Xaml" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" />
   </ItemGroup>