diff --git a/.gitignore b/.gitignore
index b6350ffeac..31d0a2de5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ bin
 *.tree
 *.zip
 .idea
+.DS_Store
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln b/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
index ffed0bb755..0f29f2ed59 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
@@ -1,26 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29926.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.Android", "ImapClientDemo.Android\ImapClientDemo.Android.csproj", "{E24B6562-C9B2-4190-A43C-116FA52AACE5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.Android", "ImapClientDemo.Android\ImapClientDemo.Android.csproj", "{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{E24B6562-C9B2-4190-A43C-116FA52AACE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E24B6562-C9B2-4190-A43C-116FA52AACE5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AD43C050-ACBB-4A31-A155-C71AFC1D5AE2}
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml
new file mode 100644
index 0000000000..3fead98ca0
--- /dev/null
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application android:allowBackup="true" android:icon="@mipmap/appicon" android:label="@string/app_name" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true">
+  </application>
+  <uses-permission android:name="android.permission.INTERNET" />
+</manifest>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt
deleted file mode 100644
index a9b0638eb1..0000000000
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
index 6fbad67c74..88c8c37aa5 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
@@ -49,9 +49,9 @@ protected async override void OnCreate (Bundle bundle)
 
 			Console.WriteLine ("FoldersCreated!");
 
-			SetContentView (Resource.Layout.FoldersLayout);
+			SetContentView (ImapClientDemo.Android.Resource.Layout.FoldersLayout);
 
-			listView = FindViewById<ListView> (Resource.Id.listView);
+			listView = FindViewById<ListView> (ImapClientDemo.Android.Resource.Id.listView);
 
 			adapter = new FoldersAdapter (this);
 
@@ -120,11 +120,11 @@ public override IMailFolder this [int index] {
 
 			public override View GetView (int position, View convertView, ViewGroup parent)
 			{
-				var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (Android.Resource.Layout.SimpleListItem1, parent, false);
+				var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (global::Android.Resource.Layout.SimpleListItem1, parent, false);
 
 				var folder = Folders[position];
 
-				view.FindViewById<TextView> (Android.Resource.Id.Text1).Text = folder.FullName;
+				view.FindViewById<TextView> (global::Android.Resource.Id.Text1).Text = folder.FullName;
 
 				return view;
 			}
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
index 7037a4302b..9edf18aca2 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
@@ -1,85 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{E24B6562-C9B2-4190-A43C-116FA52AACE5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ImapClientDemo</RootNamespace>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidApplication>True</AndroidApplication>
-    <AssemblyName>ImapClientDemo.Android</AssemblyName>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <ConsolePause>false</ConsolePause>
-    <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <DebugSymbols>true</DebugSymbols>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <ConsolePause>false</ConsolePause>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64</AndroidSupportedAbis>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Mono.Android" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.7.1.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="LoginActivity.cs" />
-    <Compile Include="Mail.cs" />
-    <Compile Include="FoldersActivity.cs" />
-    <Compile Include="MessageListActivity.cs" />
-    <Compile Include="MessageViewActivity.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
-    <AndroidResource Include="Resources\drawable-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\drawable-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\drawable-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\drawable-xxxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\layout\FoldersLayout.axml" />
-    <AndroidResource Include="Resources\layout\LoginLayout.axml" />
-    <AndroidResource Include="Resources\layout\MessagesLayout.axml" />
-    <AndroidResource Include="Resources\layout\ViewMessageLayout.axml" />
-    <AndroidResource Include="Resources\layout\MessageListItemLayout.axml" />
-    <AndroidResource Include="Resources\values\themes.xml" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0-android</TargetFramework>
+        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+        <OutputType>Exe</OutputType>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <ApplicationId>com.companyname.ImapClientDemo.Android</ApplicationId>
+        <ApplicationVersion>1</ApplicationVersion>
+        <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="MailKit" Version="4.7.1.1"/>
+    </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
index 313e0561f6..f676f8851c 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
@@ -46,14 +46,14 @@ protected override void OnCreate (Bundle bundle)
 		{
 			base.OnCreate (bundle);
 
-			SetContentView (Resource.Layout.LoginLayout);
+			SetContentView (ImapClientDemo.Android.Resource.Layout.LoginLayout);
 
-			textServer = FindViewById<TextView> (Resource.Id.textServer);
-			textPort = FindViewById<TextView> (Resource.Id.textPort);
-			textLogin = FindViewById<TextView> (Resource.Id.textLogin);
-			textPassword = FindViewById<TextView> (Resource.Id.textPassword);
-			checkSsl = FindViewById<CheckBox> (Resource.Id.checkSsl);
-			buttonLogin = FindViewById<Button> (Resource.Id.buttonLogin);
+			textServer = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textServer);
+			textPort = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textPort);
+			textLogin = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textLogin);
+			textPassword = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textPassword);
+			checkSsl = FindViewById<CheckBox> (ImapClientDemo.Android.Resource.Id.checkSsl);
+			buttonLogin = FindViewById<Button> (ImapClientDemo.Android.Resource.Id.buttonLogin);
 
 			buttonLogin.Click += buttonLogin_Click;
 		}
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MainActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MainActivity.cs
index c061c5ff88..7430059c3a 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MainActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MainActivity.cs
@@ -29,7 +29,7 @@
 
 namespace ImapClientDemo
 {
-	[Activity (Label = "ImapClientDemo.Android", MainLauncher = true, Icon = "@drawable/icon")]
+	[Activity (Label = "ImapClientDemo.Android", MainLauncher = true)]
 	public class MainActivity : Activity
 	{
 		protected override void OnCreate (Bundle bundle)
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageListActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageListActivity.cs
index 763db5cc16..fedb4b1a03 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageListActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageListActivity.cs
@@ -33,7 +33,6 @@
 using Android.OS;
 using Android.Views;
 using Android.Widget;
-
 using MailKit;
 
 namespace ImapClientDemo
@@ -51,9 +50,9 @@ protected async override void OnCreate (Bundle bundle)
 
 			Title = Mail.CurrentFolder.FullName;
 
-			SetContentView (Resource.Layout.MessagesLayout);
+			SetContentView (ImapClientDemo.Android.Resource.Layout.MessagesLayout);
 
-			listView = FindViewById<ListView> (Resource.Id.listView);
+			listView = FindViewById<ListView> (ImapClientDemo.Android.Resource.Id.listView);
 
 			adapter = new MessageListAdapter (this);
 			listView.Adapter = adapter;
@@ -110,12 +109,12 @@ public override IMessageSummary this [int index] {
 
 			public override View GetView (int position, View convertView, ViewGroup parent)
 			{
-				var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (Resource.Layout.MessageListItemLayout, parent, false);
+				var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (ImapClientDemo.Android.Resource.Layout.MessageListItemLayout, parent, false);
 				var msg = Messages [position];
 
-				view.FindViewById<TextView> (Resource.Id.textSubject).Text = msg.Envelope.Subject;
-				view.FindViewById<TextView> (Resource.Id.textFrom).Text = msg.Envelope.From.ToString ();
-				view.FindViewById<TextView> (Resource.Id.textDate).Text = msg.Envelope.Date.Value.LocalDateTime.ToString ();
+				view.FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textSubject).Text = msg.Envelope.Subject;
+				view.FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textFrom).Text = msg.Envelope.From.ToString ();
+				view.FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textDate).Text = msg.Envelope.Date.Value.LocalDateTime.ToString ();
 
 				return view;
 			}
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageViewActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageViewActivity.cs
index 79b7a1a7b3..6e536f081b 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageViewActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/MessageViewActivity.cs
@@ -42,12 +42,12 @@ protected override void OnCreate (Bundle bundle)
 		{
 			base.OnCreate (bundle);
 
-			SetContentView (Resource.Layout.ViewMessageLayout);
+			SetContentView (ImapClientDemo.Android.Resource.Layout.ViewMessageLayout);
 
-			textSubject = FindViewById<TextView> (Resource.Id.textSubject);
-			textFrom = FindViewById<TextView> (Resource.Id.textFrom);
-			textDate = FindViewById<TextView> (Resource.Id.textDate);
-			textBody = FindViewById<TextView> (Resource.Id.textBody);
+			textSubject = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textSubject);
+			textFrom = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textFrom);
+			textDate = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textDate);
+			textBody = FindViewById<TextView> (ImapClientDemo.Android.Resource.Id.textBody);
 
 			var msg = Mail.CurrentMessage;
 
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AndroidManifest.xml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AndroidManifest.xml
deleted file mode 100644
index 11d176f9ec..0000000000
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="ImapClientDemo.Android">
-	<uses-sdk android:targetSdkVersion="32" />
-	<application android:theme="@style/AppTheme" android:label="Imap Demo" android:icon="@drawable/icon"></application>
-</manifest>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AssemblyInfo.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AssemblyInfo.cs
deleted file mode 100644
index 062c413816..0000000000
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Android.App;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("ImapClientDemo.Android")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("redth")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-hdpi/Icon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-hdpi/Icon.png
deleted file mode 100644
index f4c804644c..0000000000
Binary files a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-hdpi/Icon.png and /dev/null differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-mdpi/Icon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-mdpi/Icon.png
deleted file mode 100644
index ef1e1ee7dc..0000000000
Binary files a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-mdpi/Icon.png and /dev/null differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xhdpi/Icon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xhdpi/Icon.png
deleted file mode 100644
index b7e2e57aa9..0000000000
Binary files a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xhdpi/Icon.png and /dev/null differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxhdpi/Icon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxhdpi/Icon.png
deleted file mode 100644
index 8d20a38d17..0000000000
Binary files a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxhdpi/Icon.png and /dev/null differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxxhdpi/Icon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxxhdpi/Icon.png
deleted file mode 100644
index 6d9919c41a..0000000000
Binary files a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/drawable-xxxhdpi/Icon.png and /dev/null differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/FoldersLayout.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/FoldersLayout.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/FoldersLayout.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/FoldersLayout.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/LoginLayout.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/LoginLayout.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/LoginLayout.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/LoginLayout.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/Main.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/Main.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/Main.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/Main.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessageListItemLayout.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessageListItemLayout.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessageListItemLayout.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessageListItemLayout.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessagesLayout.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessagesLayout.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessagesLayout.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/MessagesLayout.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/ViewMessageLayout.axml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/ViewMessageLayout.xml
similarity index 100%
rename from samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/ViewMessageLayout.axml
rename to samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/layout/ViewMessageLayout.xml
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon.xml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon.xml
new file mode 100644
index 0000000000..7751f69514
--- /dev/null
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon.xml
@@ -0,0 +1,4 @@
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/appicon_background" />
+  <foreground android:drawable="@mipmap/appicon_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon_round.xml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon_round.xml
new file mode 100644
index 0000000000..7751f69514
--- /dev/null
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-anydpi-v26/appicon_round.xml
@@ -0,0 +1,4 @@
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/appicon_background" />
+  <foreground android:drawable="@mipmap/appicon_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon.png
new file mode 100644
index 0000000000..0abfc1b581
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_background.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_background.png
new file mode 100644
index 0000000000..513e69d841
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_background.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_foreground.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_foreground.png
new file mode 100644
index 0000000000..99d3a291bc
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-hdpi/appicon_foreground.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon.png
new file mode 100644
index 0000000000..7b5a2e2bf8
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_background.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_background.png
new file mode 100644
index 0000000000..9e2d1e4d8d
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_background.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_foreground.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_foreground.png
new file mode 100644
index 0000000000..a28d342c1c
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-mdpi/appicon_foreground.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon.png
new file mode 100644
index 0000000000..b28b73c654
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_background.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_background.png
new file mode 100644
index 0000000000..658be3fb6a
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_background.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_foreground.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_foreground.png
new file mode 100644
index 0000000000..70a542ac03
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xhdpi/appicon_foreground.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon.png
new file mode 100644
index 0000000000..f9af1173ea
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_background.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_background.png
new file mode 100644
index 0000000000..9171c3e404
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_background.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_foreground.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_foreground.png
new file mode 100644
index 0000000000..cb63bfb9f8
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxhdpi/appicon_foreground.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon.png
new file mode 100644
index 0000000000..1d948d6b5d
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_background.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_background.png
new file mode 100644
index 0000000000..1232d8c8d2
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_background.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png
new file mode 100644
index 0000000000..9f9c9e6d93
Binary files /dev/null and b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Resources/mipmap-xxxhdpi/appicon_foreground.png differ
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/app.config b/samples/ImapClientDemo.Android/ImapClientDemo.Android/app.config
deleted file mode 100644
index 279bfc3fef..0000000000
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/app.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" />
-  </runtime>
-</configuration>
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS.sln b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS.sln
index 2013c42ea8..d8abb77dcc 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS.sln
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS.sln
@@ -1,31 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29926.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.iOS", "ImapClientDemo.iOS\ImapClientDemo.iOS.csproj", "{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.iOS", "ImapClientDemo.iOS\ImapClientDemo.iOS.csproj", "{764BD6BF-F53D-43E6-9D25-AD0B506BAFC7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Debug|iPhone.Build.0 = Debug|iPhone
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Release|iPhone.ActiveCfg = Release|iPhone
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Release|iPhone.Build.0 = Release|iPhone
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {74F4CE45-3292-4B06-817F-9DEC2ADDE4E2}
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{764BD6BF-F53D-43E6-9D25-AD0B506BAFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{764BD6BF-F53D-43E6-9D25-AD0B506BAFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{764BD6BF-F53D-43E6-9D25-AD0B506BAFC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{764BD6BF-F53D-43E6-9D25-AD0B506BAFC7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000000..98f4d035c8
--- /dev/null
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,117 @@
+{
+  "images": [
+    {
+      "scale": "2x",
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "3x",
+      "size": "20x20",
+      "idiom": "iphone",
+      "filename": "Icon60.png"
+    },
+    {
+      "scale": "2x",
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon58.png"
+    },
+    {
+      "scale": "3x",
+      "size": "29x29",
+      "idiom": "iphone",
+      "filename": "Icon87.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "Icon80.png"
+    },
+    {
+      "scale": "3x",
+      "size": "40x40",
+      "idiom": "iphone",
+      "filename": "Icon120.png"
+    },
+    {
+      "scale": "2x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon120.png"
+    },
+    {
+      "scale": "3x",
+      "size": "60x60",
+      "idiom": "iphone",
+      "filename": "Icon180.png"
+    },
+    {
+      "scale": "1x",
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "Icon20.png"
+    },
+    {
+      "scale": "2x",
+      "size": "20x20",
+      "idiom": "ipad",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "1x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon29.png"
+    },
+    {
+      "scale": "2x",
+      "size": "29x29",
+      "idiom": "ipad",
+      "filename": "Icon58.png"
+    },
+    {
+      "scale": "1x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon40.png"
+    },
+    {
+      "scale": "2x",
+      "size": "40x40",
+      "idiom": "ipad",
+      "filename": "Icon80.png"
+    },
+    {
+      "scale": "1x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon76.png"
+    },
+    {
+      "scale": "2x",
+      "size": "76x76",
+      "idiom": "ipad",
+      "filename": "Icon152.png"
+    },
+    {
+      "scale": "2x",
+      "size": "83.5x83.5",
+      "idiom": "ipad",
+      "filename": "Icon167.png"
+    },
+    {
+      "scale": "1x",
+      "size": "1024x1024",
+      "idiom": "ios-marketing",
+      "filename": "Icon1024.png"
+    }
+  ],
+  "properties": {},
+  "info": {
+    "version": 1,
+    "author": "xcode"
+  }
+}
\ No newline at end of file
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
new file mode 100644
index 0000000000..b573205418
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
new file mode 100644
index 0000000000..0b74155a21
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
new file mode 100644
index 0000000000..1c1931312b
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
new file mode 100644
index 0000000000..4e3e8bd8ef
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
new file mode 100644
index 0000000000..40a7371251
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
new file mode 100644
index 0000000000..8bb138325d
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
new file mode 100644
index 0000000000..bdd130c353
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
new file mode 100644
index 0000000000..75d27899e3
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
new file mode 100644
index 0000000000..06afa60917
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
new file mode 100644
index 0000000000..2e0db2a612
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
new file mode 100644
index 0000000000..755bc880a9
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
new file mode 100644
index 0000000000..6559bb4da5
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
new file mode 100644
index 0000000000..ca28c8d7a9
Binary files /dev/null and b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png differ
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Entitlements.plist b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Entitlements.plist
index 9ae599370b..36a8706706 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Entitlements.plist
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Entitlements.plist
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-</dict>
+    <dict>
+    </dict>
 </plist>
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
index f58b122b77..a0eb7a0c6f 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
@@ -1,102 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{8C3CBC94-4386-4B01-A626-2014CFB8FFB8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ImapClientDemo.iOS</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>ImapClientDemoiOS</AssemblyName>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386</MtouchArch>
-    <MtouchLink>None</MtouchLink>
-    <MtouchDebug>true</MtouchDebug>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchProfiling>true</MtouchProfiling>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386</MtouchArch>
-    <MtouchLink>None</MtouchLink>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchProfiling>true</MtouchProfiling>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
-    <Reference Include="MonoTouch.Dialog-1" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.7.1.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="Resources\LaunchScreen.xib" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="Info.plist" />
-    <None Include="Entitlements.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <Compile Include="Mail.cs" />
-    <Compile Include="LoginViewController.cs" />
-    <Compile Include="FoldersViewController.cs" />
-    <Compile Include="MessageListViewController.cs" />
-    <Compile Include="MessageViewController.cs" />
-    <Compile Include="MultipartRelatedUrlCache.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0-ios</TargetFramework>
+        <OutputType>Exe</OutputType>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>true</ImplicitUsings>
+        <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="MailKit" Version="4.7.1.1"/>
+        <PackageReference Include="Drastic.MonoTouch.Dialog" Version="1.0.0"/>
+    </ItemGroup>
 </Project>
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Info.plist b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Info.plist
index 77d6826a2a..32099ea3d0 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Info.plist
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Info.plist
@@ -1,36 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleIdentifier</key>
-	<string>com.your-company.ImapClientDemo.iOS</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>MinimumOSVersion</key>
-	<string>8.0</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>XSAppIconAssets</key>
-	<string>Resources/Images.xcassets/AppIcons.appiconset</string>
-	<key>CFBundleDisplayName</key>
-	<string>Imap Demo</string>
+    <key>CFBundleDisplayName</key>
+    <string>ImapClientDemo.iOS</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.companyname.ImapClientDemo.iOS</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    <key>LSRequiresIPhoneOS</key>
+    <true/>
+    <key>UIDeviceFamily</key>
+    <array>
+        <integer>1</integer>
+        <integer>2</integer>
+    </array>
+    <key>UILaunchStoryboardName</key>
+    <string>LaunchScreen</string>
+    <key>UIRequiredDeviceCapabilities</key>
+    <array>
+        <string>armv7</string>
+    </array>
+    <key>UISupportedInterfaceOrientations</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>UISupportedInterfaceOrientations~ipad</key>
+    <array>
+        <string>UIInterfaceOrientationPortrait</string>
+        <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        <string>UIInterfaceOrientationLandscapeLeft</string>
+        <string>UIInterfaceOrientationLandscapeRight</string>
+    </array>
+    <key>XSAppIconAssets</key>
+    <string>Assets.xcassets/AppIcon.appiconset</string>
 </dict>
 </plist>
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/LaunchScreen.storyboard b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/LaunchScreen.storyboard
new file mode 100644
index 0000000000..2296c6b7fd
--- /dev/null
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/LaunchScreen.storyboard
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="222" launchScreen="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <scene sceneID="221">
+            <objects>
+                <viewController id="222" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="219"/>
+                        <viewControllerLayoutGuide type="bottom" id="220"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="223">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="224" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-200" y="-388"/>
+        </scene>
+    </scenes>
+</document>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
deleted file mode 100644
index 24f9974585..0000000000
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "images": [
-    {
-      "size": "29x29",
-      "scale": "1x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "29x29",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "40x40",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "57x57",
-      "scale": "1x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "57x57",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "60x60",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "60x60",
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "size": "29x29",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "40x40",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "50x50",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "50x50",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "72x72",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "72x72",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "76x76",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "76x76",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "size": "120x120",
-      "scale": "1x",
-      "idiom": "car"
-    }
-  ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
\ No newline at end of file
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/LaunchScreen.xib b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/LaunchScreen.xib
index 58d7d86670..8190201742 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/LaunchScreen.xib
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/Resources/LaunchScreen.xib
@@ -1,32 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IMAP Demo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                    <nil key="highlightedColor"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
+                    minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21" />
+                    <fontDescription key="fontDescription" type="system" pointSize="17" />
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+                    <nil key="highlightedColor" />
+                </label>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="NewApp" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
+                    minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43" />
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
+                    <nil key="highlightedColor" />
                 </label>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
             <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
             </constraints>
-            <nil key="simulatedStatusBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="548" y="455"/>
+            <nil key="simulatedStatusBarMetrics" />
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
+            <point key="canvasLocation" x="548" y="455" />
         </view>
     </objects>
 </document>
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/SceneDelegate.cs b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/SceneDelegate.cs
new file mode 100644
index 0000000000..0c7d76273e
--- /dev/null
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/SceneDelegate.cs
@@ -0,0 +1,54 @@
+namespace ImapClientDemo.iOS;
+
+[Register ("SceneDelegate")]
+public class SceneDelegate : UIResponder, IUIWindowSceneDelegate {
+
+	[Export ("window")]
+	public UIWindow? Window { get; set; }
+
+	[Export ("scene:willConnectToSession:options:")]
+	public void WillConnect (UIScene scene, UISceneSession session, UISceneConnectionOptions connectionOptions)
+	{
+		// Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
+		// If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
+		// This delegate does not imply the connecting scene or session are new (see UIApplicationDelegate `GetConfiguration` instead).
+	}
+
+	[Export ("sceneDidDisconnect:")]
+	public void DidDisconnect (UIScene scene)
+	{
+		// Called as the scene is being released by the system.
+		// This occurs shortly after the scene enters the background, or when its session is discarded.
+		// Release any resources associated with this scene that can be re-created the next time the scene connects.
+		// The scene may re-connect later, as its session was not neccessarily discarded (see UIApplicationDelegate `DidDiscardSceneSessions` instead).
+	}
+
+	[Export ("sceneDidBecomeActive:")]
+	public void DidBecomeActive (UIScene scene)
+	{
+		// Called when the scene has moved from an inactive state to an active state.
+		// Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+	}
+
+	[Export ("sceneWillResignActive:")]
+	public void WillResignActive (UIScene scene)
+	{
+		// Called when the scene will move from an active state to an inactive state.
+		// This may occur due to temporary interruptions (ex. an incoming phone call).
+	}
+
+	[Export ("sceneWillEnterForeground:")]
+	public void WillEnterForeground (UIScene scene)
+	{
+		// Called as the scene transitions from the background to the foreground.
+		// Use this method to undo the changes made on entering the background.
+	}
+
+	[Export ("sceneDidEnterBackground:")]
+	public void DidEnterBackground (UIScene scene)
+	{
+		// Called as the scene transitions from the foreground to the background.
+		// Use this method to save data, release shared resources, and store enough scene-specific state information
+		// to restore the scene back to its current state.
+	}
+}
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/app.config b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/app.config
deleted file mode 100644
index 279bfc3fef..0000000000
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/app.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" />
-  </runtime>
-</configuration>