diff --git a/src/NzbDrone.Core/Notifications/Email/EmailService.cs b/src/NzbDrone.Core/Notifications/Email/EmailService.cs
index 2599e5de4..9435cb825 100644
--- a/src/NzbDrone.Core/Notifications/Email/EmailService.cs
+++ b/src/NzbDrone.Core/Notifications/Email/EmailService.cs
@@ -1,7 +1,8 @@
-using System;
-using System.Net;
-using System.Net.Mail;
+using System;
+using System.Linq;
 using FluentValidation.Results;
+using MailKit.Net.Smtp;
+using MimeKit;
 using NLog;
 
 namespace NzbDrone.Core.Notifications.Email
@@ -23,23 +24,20 @@ namespace NzbDrone.Core.Notifications.Email
 
         public void SendEmail(EmailSettings settings, string subject, string body, bool htmlBody = false)
         {
-            var email = new MailMessage();
-            email.From = new MailAddress(settings.From);
+            var email = new MimeMessage();
+            email.From.Add(MailboxAddress.Parse(settings.From));
+
+            email.To.Add(MailboxAddress.Parse(settings.To));
             
-            email.To.Add(settings.To);
-
             email.Subject = subject;
-            email.Body = body;
-            email.IsBodyHtml = htmlBody;
-
-            NetworkCredential credentials = null;
-
-            if (!string.IsNullOrWhiteSpace(settings.Username))
-                credentials = new NetworkCredential(settings.Username, settings.Password);
-
+            email.Body = new TextPart(htmlBody ? "html" : "plain")
+            {
+                Text = body
+            };
+            
             try
             {
-                Send(email, settings.Server, settings.Port, settings.Ssl, credentials);
+                Send(email, settings);
             }
             catch(Exception ex)
             {
@@ -49,13 +47,20 @@ namespace NzbDrone.Core.Notifications.Email
             }
         }
 
-        private void Send(MailMessage email, string server, int port, bool ssl, NetworkCredential credentials)
+        private void Send(MimeMessage email, EmailSettings settings)
         {
-            var smtp = new SmtpClient(server, port);
-            smtp.EnableSsl = ssl;
-            smtp.Credentials = credentials;
+            using (var client = new SmtpClient())
+            {
+                client.Connect(settings.Server, settings.Port);
 
-            smtp.Send(email);
+                if (!string.IsNullOrWhiteSpace(settings.Username))
+                {
+                    client.Authenticate(settings.Username, settings.Password);
+                }
+
+                client.Send(email);
+                client.Disconnect(true);
+            }
         }
 
         public ValidationFailure Test(EmailSettings settings)
diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
index 23ee56f41..5ec3e008c 100644
--- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
+++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs
@@ -31,9 +31,6 @@ namespace NzbDrone.Core.Notifications.Email
         [FieldDefinition(1, Label = "Port")]
         public int Port { get; set; }
 
-        [FieldDefinition(2, Label = "SSL", Type = FieldType.Checkbox)]
-        public bool Ssl { get; set; }
-
         [FieldDefinition(3, Label = "Username", Privacy = PrivacyLevel.UserName)]
         public string Username { get; set; }
 
diff --git a/src/NzbDrone.Core/Sonarr.Core.csproj b/src/NzbDrone.Core/Sonarr.Core.csproj
index b4eab9496..bfe710d36 100644
--- a/src/NzbDrone.Core/Sonarr.Core.csproj
+++ b/src/NzbDrone.Core/Sonarr.Core.csproj
@@ -8,6 +8,7 @@
     <PackageReference Include="FluentValidation" Version="8.4.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0007" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Include="MailKit" Version="2.10.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="NLog" Version="4.6.6" />
     <PackageReference Include="OAuth" Version="1.0.3" />