From dd29eb569aa6a7f349c3b1b047277afe285e3b0d Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Mon, 19 Sep 2022 16:43:55 +0300
Subject: [PATCH] MailKit: Add MessageId header

---
 .../Volo/Abp/MailKit/MailKitSmtpEmailSender.cs                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
index 6ea9dc6092..eab940e697 100644
--- a/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
+++ b/framework/src/Volo.Abp.MailKit/Volo/Abp/MailKit/MailKitSmtpEmailSender.cs
@@ -8,6 +8,7 @@ using MailKit.Security;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using MimeKit;
+using MimeKit.Utils;
 using SmtpClient = MailKit.Net.Smtp.SmtpClient;
 
 namespace Volo.Abp.MailKit;
@@ -33,6 +34,8 @@ public class MailKitSmtpEmailSender : EmailSenderBase, IMailKitSmtpEmailSender
         using (var client = await BuildClientAsync())
         {
             var message = MimeMessage.CreateFromMailMessage(mail);
+            message.MessageId = MimeUtils.GenerateMessageId();
+            message.Headers.Add(HeaderId.MessageId, message.MessageId);
             await client.SendAsync(message);
             await client.DisconnectAsync(true);
         }