diff --git a/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs b/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs
index cfca96d14..2f80d34b7 100644
--- a/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs
+++ b/src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs
@@ -78,8 +78,8 @@ namespace Elsa.Activities.Email
             var cancellationToken = context.CancellationToken;
             var message = new MimeMessage();
             var from = string.IsNullOrWhiteSpace(From) ? _options.DefaultSender : From;
-
-            message.From.Add(MailboxAddress.Parse(from));
+            
+            message.Sender = MailboxAddress.Parse(from);
             message.Subject = Subject;
 
             var bodyBuilder = new BodyBuilder { HtmlBody = Body };
@@ -91,7 +91,7 @@ namespace Elsa.Activities.Email
             SetRecipientsEmailAddresses(message.Cc, Cc);
             SetRecipientsEmailAddresses(message.Bcc, Bcc);
 
-            await _smtpService.SendAsync(message, context.CancellationToken);
+            await _smtpService.SendAsync(context, message, context.CancellationToken);
 
             return Done();
         }
diff --git a/src/activities/Elsa.Activities.Email/Services/ISmtpService.cs b/src/activities/Elsa.Activities.Email/Services/ISmtpService.cs
index 647a3ba0a..3f931c773 100644
--- a/src/activities/Elsa.Activities.Email/Services/ISmtpService.cs
+++ b/src/activities/Elsa.Activities.Email/Services/ISmtpService.cs
@@ -1,11 +1,12 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Elsa.Services.Models;
 using MimeKit;
 
 namespace Elsa.Activities.Email.Services
 {
     public interface ISmtpService
     {
-        Task SendAsync(MimeMessage message, CancellationToken cancellationToken);
+        Task SendAsync(ActivityExecutionContext context, MimeMessage message, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/activities/Elsa.Activities.Email/Services/MailKitSmtpService.cs b/src/activities/Elsa.Activities.Email/Services/MailKitSmtpService.cs
index 4a645bd2a..63287d1f6 100644
--- a/src/activities/Elsa.Activities.Email/Services/MailKitSmtpService.cs
+++ b/src/activities/Elsa.Activities.Email/Services/MailKitSmtpService.cs
@@ -5,6 +5,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using Elsa.Activities.Email.Options;
+using Elsa.Services.Models;
 using MailKit.Net.Smtp;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -27,7 +28,7 @@ namespace Elsa.Activities.Email.Services
             _logger = logger;
         }
 
-        public async Task SendAsync(MimeMessage message, CancellationToken cancellationToken)
+        public async Task SendAsync(ActivityExecutionContext context, MimeMessage message, CancellationToken cancellationToken)
         {
             switch (_options.DeliveryMethod)
             {