diff --git a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
index 5fbcd16..11410d7 100644
--- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
+++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{9F748DCD-952E-40A0-9DAD-65BF8A39B231}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>DigitalData.EMLProfiler</RootNamespace>
-    <AssemblyName>DigitalData.EMLProfiler</AssemblyName>
+    <RootNamespace>EmailProfiler.Common</RootNamespace>
+    <AssemblyName>EmailProfiler.Common</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -19,7 +19,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>DigitalData.EMLProfiler.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Common.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -28,7 +28,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>DigitalData.EMLProfiler.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Common.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb
index 8ec9e83..00368d0 100644
--- a/App/EmailProfiler.Common/My Project/AssemblyInfo.vb	
+++ b/App/EmailProfiler.Common/My Project/AssemblyInfo.vb	
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("DigitalData.EMLProfiler")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright ©  2022")>
 <Assembly: AssemblyTrademark("2.10.0.0")>
 
 <Assembly: ComVisible(False)>
diff --git a/App/EmailProfiler.Common/My Project/Resources.Designer.vb b/App/EmailProfiler.Common/My Project/Resources.Designer.vb
index 08c8da6..f1eef27 100644
--- a/App/EmailProfiler.Common/My Project/Resources.Designer.vb	
+++ b/App/EmailProfiler.Common/My Project/Resources.Designer.vb	
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.EMLProfiler.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Common.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/App/EmailProfiler.Common/My Project/Settings.Designer.vb b/App/EmailProfiler.Common/My Project/Settings.Designer.vb
index 1f8450c..4790d5e 100644
--- a/App/EmailProfiler.Common/My Project/Settings.Designer.vb	
+++ b/App/EmailProfiler.Common/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DigitalData.EMLProfiler.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EmailProfiler.Common.My.MySettings
             Get
-                Return Global.DigitalData.EMLProfiler.My.MySettings.Default
+                Return Global.EmailProfiler.Common.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/App/EmailProfiler.Common/clsEmail.IMAP.vb b/App/EmailProfiler.Common/clsEmail.IMAP.vb
index abc4d9b..348b5c6 100644
--- a/App/EmailProfiler.Common/clsEmail.IMAP.vb
+++ b/App/EmailProfiler.Common/clsEmail.IMAP.vb
@@ -1,13 +1,11 @@
-Imports DigitalData.EMLProfiler.ClassCurrent
-Imports DigitalData.Modules.Logging
-Imports AE
-Imports System.Net
+Imports System.Net
 Imports System.Reflection
 Imports System.IO
-
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
 Imports DigitalData.Modules.Messaging.Mail
 Imports Limilabs.Client.IMAP
+Imports EmailProfiler.Common.ClassCurrent
 
 Public Class clsEmailIMAP
     Private ReadOnly Logger As Logger
diff --git a/App/EmailProfiler.Common/clsEncryption.vb b/App/EmailProfiler.Common/clsEncryption.vb
index a7fc90b..a9933f6 100644
--- a/App/EmailProfiler.Common/clsEncryption.vb
+++ b/App/EmailProfiler.Common/clsEncryption.vb
@@ -1,9 +1,9 @@
 Imports System.Security.Cryptography
-Imports NLog
 Imports DigitalData.Modules.Logging
+
 Public Class clsEncryption
     Private TripleDes As New TripleDESCryptoServiceProvider
-    Private Logger As Modules.Logging.Logger
+    Private Logger As Logger
     Sub New(ByVal key As String, LogConf As LogConfig)
         Logger = LogConf.GetLogger
         ' Initialize the crypto provider.
diff --git a/App/EmailProfiler.Common/clsWindream_allgemein.vb b/App/EmailProfiler.Common/clsWindream_allgemein.vb
index 9f66b87..82e06dc 100644
--- a/App/EmailProfiler.Common/clsWindream_allgemein.vb
+++ b/App/EmailProfiler.Common/clsWindream_allgemein.vb
@@ -1,15 +1,9 @@
-
-Imports WINDREAMLib
+Imports WINDREAMLib
 Imports WINDREAMLib.WMCOMEvent
 Imports WINDREAMLib.WMEntity
-Imports WINDREAMLib.WMObjectEditMode
-Imports WINDREAMLib.WMSearchOperator
-Imports WINDREAMLib.WMSearchRelation
-Imports WMOBRWSLib
 Imports WMOSRCHLib
-Imports System.IO
 Imports DigitalData.Modules.Logging
-Imports DigitalData.EMLProfiler.ClassCurrent
+Imports EmailProfiler.Common.ClassCurrent
 
 Public Class clsWindream_allgemein
 
diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index 26debed..51c0f43 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -1,6 +1,6 @@
 Imports System.Text.RegularExpressions
 Imports WINDREAMLib
-Imports DigitalData.EMLProfiler.ClassCurrent
+Imports EmailProfiler.Common.ClassCurrent
 Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
@@ -159,7 +159,7 @@ Public Class clsWorkEmail
 
                 If oResult <> "" Then
                     'insert history und exit
-                    InsertHistoryEntryWithStatus(pMailMessage, "REJECTED", oResult)
+                    InsertHistoryEntryWithStatus(CurrentMail, "REJECTED", oResult)
 
                     AddToEmailQueueMSSQL(CurrentMail.MessageId, oResult, "Email validation failed", _EmailAccountID)
 
diff --git a/App/EmailProfiler.Common/clsWorker.vb b/App/EmailProfiler.Common/clsWorker.vb
index 9ca23bf..b3c23d4 100644
--- a/App/EmailProfiler.Common/clsWorker.vb
+++ b/App/EmailProfiler.Common/clsWorker.vb
@@ -1,4 +1,4 @@
-Imports DigitalData.EMLProfiler.ClassCurrent
+Imports EmailProfiler.Common.ClassCurrent
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Base
diff --git a/App/EmailProfiler.Form/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb
index ced5b77..9cc162c 100644
--- a/App/EmailProfiler.Form/frmMain.vb
+++ b/App/EmailProfiler.Form/frmMain.vb
@@ -1,13 +1,13 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports System.Text.RegularExpressions
-Imports DigitalData.EMLProfiler
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Messaging.Mail
 Imports DigitalData.GUIs.Common
+Imports EmailProfiler.Common
 
 Public Class frmMain
     Private Logger As Logger
diff --git a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
index 33522c5..ab31512 100644
--- a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
+++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
@@ -153,16 +153,16 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MailLicense.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
       <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
       <Name>EmailProfiler.Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="MailLicense.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file
diff --git a/App/EmailProfiler.Service/MyService.vb b/App/EmailProfiler.Service/MyService.vb
index 3501a9e..71c5fca 100644
--- a/App/EmailProfiler.Service/MyService.vb
+++ b/App/EmailProfiler.Service/MyService.vb
@@ -1,6 +1,6 @@
 Imports System.ComponentModel
 Imports System.IO
-Imports DigitalData.EMLProfiler
+Imports EmailProfiler.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging