diff --git a/Wino.Server/App.xaml.cs b/Wino.Server/App.xaml.cs
index 61f3a77f..da967320 100644
--- a/Wino.Server/App.xaml.cs
+++ b/Wino.Server/App.xaml.cs
@@ -151,6 +151,9 @@ namespace Wino.Server
 
             if (isCreatedNew)
             {
+                // Ensure proper encodings are available for MimeKit
+                System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+
                 // Spawn a thread which will be waiting for our event
                 var thread = new Thread(() =>
                 {
diff --git a/Wino.Server/Wino.Server.csproj b/Wino.Server/Wino.Server.csproj
index 424b0153..7f9edb8b 100644
--- a/Wino.Server/Wino.Server.csproj
+++ b/Wino.Server/Wino.Server.csproj
@@ -33,6 +33,7 @@
 	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 	  <PackageReference Include="H.NotifyIcon.Wpf" Version="2.1.4" />
 	  <PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
+	  <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />