diff --git a/ConfectionaryBusinessLogic/MailWorker/AbstractMailWorker.cs b/ConfectionaryBusinessLogic/MailWorker/AbstractMailWorker.cs
index 390315e..55e56d2 100644
--- a/ConfectionaryBusinessLogic/MailWorker/AbstractMailWorker.cs
+++ b/ConfectionaryBusinessLogic/MailWorker/AbstractMailWorker.cs
@@ -24,13 +24,15 @@ namespace ConfectioneryBusinessLogic.MailWorker
 		protected int _popPort;
 
 		private readonly IMessageInfoLogic _messageInfoLogic;
+		private readonly IClientLogic _clientLogic;
 
 		private readonly ILogger _logger;
 
-		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic)
+		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
 		{
 			_logger = logger;
 			_messageInfoLogic = messageInfoLogic;
+			_clientLogic = clientLogic;
 		}
 
 		public void MailConfig(MailConfigBindingModel config)
@@ -86,6 +88,7 @@ namespace ConfectioneryBusinessLogic.MailWorker
 			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
 			foreach (var mail in list)
 			{
+				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
 				_messageInfoLogic.Create(mail);
 			}
 		}
diff --git a/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs b/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs
index 5acecf2..52fbcf2 100644
--- a/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs
+++ b/ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs
@@ -15,7 +15,7 @@ namespace ConfectioneryBusinessLogic.MailWorker
 {
 	public class MailKitWorker : AbstractMailWorker
 	{
-		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
+		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
 
 		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
 		{