diff --git a/EnvelopeGenerator.Application/Configurations/DispatcherParams.cs b/EnvelopeGenerator.Application/Configurations/DispatcherParams.cs
index 7570601c..2310151c 100644
--- a/EnvelopeGenerator.Application/Configurations/DispatcherParams.cs
+++ b/EnvelopeGenerator.Application/Configurations/DispatcherParams.cs
@@ -23,5 +23,5 @@ public class DispatcherParams
     /// <summary>
     /// Default value is string.Empty
     /// </summary>
-    public string EmailAttmt1 { get; init; } = string.Empty;
+    public string? EmailAttmt1 { get; init; } = null;
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Notifications/SendMailHandler.cs b/EnvelopeGenerator.Application/Notifications/SendMailHandler.cs
index 03237f3c..331fcdbd 100644
--- a/EnvelopeGenerator.Application/Notifications/SendMailHandler.cs
+++ b/EnvelopeGenerator.Application/Notifications/SendMailHandler.cs
@@ -1,8 +1,11 @@
 using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Notifications;
@@ -16,6 +19,11 @@ public interface ISendMailNotification : INotification
     /// 
     /// </summary>
     public EmailTemplateType TemplateType { get; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string EmailAddress { get; }
 }
 
 /// <summary>
@@ -29,23 +37,51 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
     /// </summary>
     protected readonly IRepository<EmailTemplate> TempRepo;
 
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly IRepository<EmailOut> EmailOutRepo;
+
     /// <summary>
     /// 
     /// </summary>
     protected virtual Dictionary<string, string> BodyPlaceHolders { get; } = new();
 
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly MailParams MailParams;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    protected readonly DispatcherParams DispatcherParams;
+
     /// <summary>
     /// 
     /// </summary>
     protected virtual Dictionary<string, string> SubjectPlaceHolders { get; } = new();
 
+    /// <summary>
+    /// ReferenceString = Envelope.Uuid
+    /// </summary>
+    /// <param name="emailOut"></param>
+    /// <returns></returns>
+    protected abstract void ConfigEmailOut(EmailOut emailOut);
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="tempRepo"></param>
-    protected SendMailHandler(IRepository<EmailTemplate> tempRepo)
+    /// <param name="emailOutRepo"></param>
+    /// <param name="mailParamsOptions"></param>
+    /// <param name="dispatcherParamsOptions"></param>
+    protected SendMailHandler(IRepository<EmailTemplate> tempRepo, IRepository<EmailOut> emailOutRepo, IOptions<MailParams> mailParamsOptions, IOptions<DispatcherParams> dispatcherParamsOptions)
     {
         TempRepo = tempRepo;
+        EmailOutRepo = emailOutRepo;
+        MailParams = mailParamsOptions.Value;
+        DispatcherParams = dispatcherParamsOptions.Value;
     }
 
     /// <summary>
@@ -63,15 +99,50 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
                 ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
                 $"{typeof(TNotification)}:\n {JsonConvert.SerializeObject(notification, Format.Json.ForDiagnostics)}");
 
-        temp.Subject = ReplacePlaceHolders(temp.Subject, SubjectPlaceHolders);
+        temp.Subject = ReplacePlaceHolders(temp.Subject, SubjectPlaceHolders, MailParams.Placeholders);
 
-        temp.Body = ReplacePlaceHolders(temp.Body, BodyPlaceHolders);
+        temp.Body = ReplacePlaceHolders(temp.Body, BodyPlaceHolders, MailParams.Placeholders);
+
+        var emailOut = new EmailOut
+        {
+            EmailAddress = notification.EmailAddress,
+            EmailBody = temp.Body,
+            EmailSubj = temp.Subject,
+            AddedWhen = DateTime.UtcNow,
+            AddedWho = DispatcherParams.AddedWho,
+            SendingProfile = DispatcherParams.SendingProfile,
+            ReminderTypeId = DispatcherParams.ReminderTypeId,
+            EmailAttmt1 = DispatcherParams.EmailAttmt1,
+            WfId = (int)EnvelopeStatus.MessageConfirmationSent,
+            
+        };
+        ConfigEmailOut(emailOut);
+        await EmailOutRepo.CreateAsync(emailOut, cancel);
     }
 
-    private static string ReplacePlaceHolders(string text, Dictionary<string, string> placeHolders)
+    private static string ReplacePlaceHolders(string text, params Dictionary<string, string>[] placeHoldersList)
     {
-        foreach (var ph in placeHolders)
-            text = text.Replace(ph.Key, ph.Value);
+        foreach (var placeHolders in placeHoldersList)
+            foreach (var ph in placeHolders)
+                text = text.Replace(ph.Key, ph.Value);
         return text;
     }
+
+    private static string TextToHtml(string input)
+    {
+        if (string.IsNullOrEmpty(input)) return "";
+
+        // HTML encoding special characters
+        string encoded = System.Net.WebUtility.HtmlEncode(input);
+
+        // Convert tabs to &nbsp; (4 non-breaking spaces)
+        encoded = encoded.Replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
+
+        // Convert line breaks to <br />
+        encoded = encoded.Replace("\r\n", "<br />"); // Windows
+        encoded = encoded.Replace("\r", "<br />");   // Mac old
+        encoded = encoded.Replace("\n", "<br />");   // Unix/Linux
+
+        return encoded;
+    }
 }
diff --git a/EnvelopeGenerator.Domain/Entities/EmailOut.cs b/EnvelopeGenerator.Domain/Entities/EmailOut.cs
index ecaff793..2e8b8770 100644
--- a/EnvelopeGenerator.Domain/Entities/EmailOut.cs
+++ b/EnvelopeGenerator.Domain/Entities/EmailOut.cs
@@ -2,17 +2,14 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 #if NETFRAMEWORK
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
 {
+    [Obsolete("Use EmailDispatcher.EmailOut")]
     [Table("TBEMLP_EMAIL_OUT")]
-    public class EmailOut
+    internal class EmailOut
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
diff --git a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
index ffaa1be9..c1f35007 100644
--- a/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
+++ b/EnvelopeGenerator.Infrastructure/DependencyExtensions.cs
@@ -13,6 +13,7 @@ using Dapper;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Reflection;
 using DigitalData.UserManager.Domain.Entities;
+using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 
 namespace EnvelopeGenerator.Infrastructure;
 
@@ -60,6 +61,7 @@ public static class DIExtensions
         services.AddDbRepository<EGDbContext, EnvelopeDocument>(context => context.EnvelopeDocument).UseAutoMapper();
         services.AddDbRepository<EGDbContext, DocumentStatus>(context => context.DocumentStatus).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EmailTemplate>(context => context.EmailTemplate).UseAutoMapper();
+        services.AddDbRepository<EGDbContext, EmailOut>(context => context.EMailOuts).UseAutoMapper();
         services.AddDbRepository<EGDbContext, Envelope>(context => context.Envelopes).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeHistory>(context => context.EnvelopeHistories).UseAutoMapper();
         services.AddDbRepository<EGDbContext, EnvelopeReceiver>(context => context.EnvelopeReceivers).UseAutoMapper();
diff --git a/EnvelopeGenerator.Web/appsettings.json b/EnvelopeGenerator.Web/appsettings.json
index 6c26db74..ec350f00 100644
--- a/EnvelopeGenerator.Web/appsettings.json
+++ b/EnvelopeGenerator.Web/appsettings.json
@@ -132,7 +132,7 @@
     "SendingProfile": 1,
     "AddedWho": "DDEnvelopGenerator",
     "ReminderTypeId": 202377,
-    "EmailAttmt1": ""
+    "EmailAttmt1": null
   },
   "MailParams": {
     "Placeholders": {