From 50a896a6ccc98b04f39ef905f5eee4a541ea7d78 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 11 Jul 2017 15:06:18 +1000
Subject: [PATCH] Doesn't send async if not using a network based SMTP server

---
 src/Umbraco.Core/Security/EmailService.cs | 32 +++++++++++++++++------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Security/EmailService.cs b/src/Umbraco.Core/Security/EmailService.cs
index d609534797..f8f9af10ae 100644
--- a/src/Umbraco.Core/Security/EmailService.cs
+++ b/src/Umbraco.Core/Security/EmailService.cs
@@ -9,17 +9,33 @@ namespace Umbraco.Core.Security
     {
         public async Task SendAsync(IdentityMessage message)
         {
-            using (var client = new SmtpClient())
-            using (var mailMessage = new MailMessage(
-                UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress, 
+            var mailMessage = new MailMessage(
+                UmbracoConfig.For.UmbracoSettings().Content.NotificationEmailAddress,
                 message.Destination,
                 message.Subject,
-                message.Body))
-            {                
-                mailMessage.IsBodyHtml = message.Body.IsNullOrWhiteSpace() == false 
-                    && message.Body.Contains("<") && message.Body.Contains("</");
+                message.Body)
+            {
+                IsBodyHtml = message.Body.IsNullOrWhiteSpace() == false
+                             && message.Body.Contains("<") && message.Body.Contains("</")
+            };
 
-                await client.SendMailAsync(mailMessage);
+            try
+            {
+                using (var client = new SmtpClient())
+                {
+                    if (client.DeliveryMethod == SmtpDeliveryMethod.Network)
+                    {
+                        await client.SendMailAsync(mailMessage);
+                    }
+                    else
+                    {
+                        client.Send(mailMessage);
+                    }
+                }
+            }
+            finally
+            {
+                mailMessage.Dispose();
             }
         }
     }