Merge branch 'master' of https://vcs.digitaldata.works/AppStd/EmailProfiler

Commit wegen frmMain Controls
Refactor grid column logic, lock designer controls
2026-01-23 13:48:15 +01:00 · 2026-01-23 13:47:47 +01:00 · 2026-01-22 11:38:18 +01:00 · 2026-01-22 11:24:41 +01:00 · 2026-01-22 10:06:46 +01:00 · 2025-12-09 16:34:04 +01:00
95 changed files with 7424 additions and 4368 deletions
--- a/App/CONFIG_APP/App.config
+++ b/App/CONFIG_APP/App.config
@@ -1,66 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
            <section name="CONFIG_APP.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
        </sectionGroup>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
            <section name="CONFIG_APP.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <connectionStrings>
        <add name="CONFIG_APP.My.MySettings.MyDatasetConnString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient"/>
    </connectionStrings>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
    </startup>
    <userSettings>
        <CONFIG_APP.My.MySettings>
            <setting name="MyConnectionString" serializeAs="String">
                <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</value>
            </setting>
            <setting name="MyServer" serializeAs="String">
                <value/>
            </setting>
            <setting name="EmailTest_Receipiant" serializeAs="String">
                <value/>
            </setting>
            <setting name="MyTestHTML" serializeAs="String">
                <value/>
            </setting>
            <setting name="DEBUG" serializeAs="String">
                <value>False</value>
            </setting>
        </CONFIG_APP.My.MySettings>
    </userSettings>
    <applicationSettings>
        <CONFIG_APP.My.MySettings>
            <setting name="FB_DATABASE" serializeAs="String">
                <value/>
            </setting>
            <setting name="FB_DATASOURCE" serializeAs="String">
                <value/>
            </setting>
            <setting name="FB_USER" serializeAs="String">
                <value>sysdba</value>
            </setting>
            <setting name="FB_PW" serializeAs="String">
                <value>dd</value>
            </setting>
            <setting name="USE_WM" serializeAs="String">
                <value>False</value>
            </setting>
            <setting name="EML_LIMITATION_SENDER" serializeAs="String">
                <value>NONE</value>
            </setting>
        </CONFIG_APP.My.MySettings>
    </applicationSettings>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/App/CONFIG_APP/ModuleSettings.vb
+++ b/App/CONFIG_APP/ModuleSettings.vb
@@ -1,4 +0,0 @@
 Module ModuleSettings
    Public LOGERRRORS_ONLY As Boolean = True
    Public MyConnectionString As String
 End Module
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@@ -1 +0,0 @@
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/App/CONFIG_APP/email_download_handdrawn.ico
+++ b/App/CONFIG_APP/email_download_handdrawn.ico
--- a/App/CONFIG_APP/packages.config
+++ b/App/CONFIG_APP/packages.config
@@ -1,4 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>
--- a/App/DigitalData.EMLProfiler/DigitalData.EMLProfiler.vbproj
+++ b/App/DigitalData.EMLProfiler/DigitalData.EMLProfiler.vbproj
@@ -1,159 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{9F748DCD-952E-40A0-9DAD-65BF8A39B231}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.EMLProfiler</RootNamespace>
    <AssemblyName>DigitalData.EMLProfiler</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>DigitalData.EMLProfiler.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>DigitalData.EMLProfiler.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <OptionExplicit>On</OptionExplicit>
  </PropertyGroup>
  <PropertyGroup>
    <OptionCompare>Binary</OptionCompare>
  </PropertyGroup>
  <PropertyGroup>
    <OptionStrict>Off</OptionStrict>
  </PropertyGroup>
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AE.Net.Mail, Version=1.7.10.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\AE.Net.Mail.1.7.10.0\lib\net45\AE.Net.Mail.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Base">
      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database">
      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Language">
      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Messaging">
      <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="Interop.WINDREAMLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
      <EmbedInteropTypes>False</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.WMOBRWSLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.WMOSRCHLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Mail">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Transactions" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
    <Import Include="System.Collections" />
    <Import Include="System.Collections.Generic" />
    <Import Include="System.Data" />
    <Import Include="System.Diagnostics" />
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ClassConfig.vb" />
    <Compile Include="ClassCurrent.vb" />
    <Compile Include="clsDatabase.vb" />
    <Compile Include="clsEmail.IMAP.vb" />
    <Compile Include="EmailStrings.vb" />
    <Compile Include="clsEncryption.vb" />
    <Compile Include="clsWindream_allgemein.vb" />
    <Compile Include="clsWindream_Index.vb" />
    <Compile Include="clsWorkEmail.vb" />
    <Compile Include="clsWorker.vb" />
    <Compile Include="MailContainer.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/App/DigitalData.EMLProfiler/EmailStrings.vb
+++ b/App/DigitalData.EMLProfiler/EmailStrings.vb
@@ -1,38 +0,0 @@
 Public Class EmailStrings
    Public Const EMAIL_WRAPPING_TEXT = "<html><body style=''font-family:""Arial"";font-size:10.0pt''>Sehr geehrte Damen und Herren,<br/><br/> 
        das Portal konnte die von Ihnen gesandte Email leider nicht verarbeiten! <br><br> Grund: {0}<p>Bitte prüfen Sie die Email und nehmen Sie bei Bedarf mit uns Kontakt auf.<p>    
        Vielen Dank für Ihr Verständnis.<br>Mit freundlichen Grüßen<br>Ihre IT-Abteilung</body></html>"
    Public Const EMAIL_SUBJECT_TEXT = "<p>Der Betreff der Original-Email war: <em>{0}</em></p>"
    Public Const EMAIL_SUBJECT_REJECTED = "Beleg abgelehnt"
    Public Const EMAIL_SUBJECT_EXCEPTION = "Unbehandelte Ausnahme"
    Public Const EMAIL_UNHANDLED_EXCEPTION = """
        <p>Beim Verarbeiten der Datei mit der Message ID '{0}' ist ein schwerer Fehler aufgetreten.</p>
        <p>Fehlerbeschreibung: {1}</p>
        <pre>{2}</pre>
    """
    Public Const EMAIL_MISSINGPROPERTIES_1 = "<p>Die angehängte Datei entspricht nicht dem ZUGFeRD-Format: {0}</p>"
    Public Const EMAIL_MISSINGPROPERTIES_2 = "<p>Die folgenden Eigenschaften wurden als ERFORDERLICH eingestuft, wurden aber nicht gefunden:<p/>"
    Public Const EMAIL_MD5_ERROR = "<p>Die von Ihnen gesendete Rechnung wurde bereits von unserem System verarbeitet.</p>"
    Public Const EMAIL_TOO_MUCH_FERDS = "<p>Ihre Email enthielt mehr als ein ZUGFeRD-Dokument.</p>"
    Public Const EMAIL_NO_FERDS = "<p>Ihre Email enthielt keine Dokumente.</p>"
    Public Const EMAIL_FILE_SIZE_REACHED = "
        <p>Die von Ihnen gesendete Rechnung oder einer der Rechnungs-Anhänge überschreitet die erlaubte Größe von <strong>{0} MB</strong>.</p>
        <p>Die folgende Datei hat die erlaubte Größe überschritten:<ul>
            <li>{1}</li>
        </ul></p>
    "
    Public Const EMAIL_INVALID_DOCUMENT = "
        <p>Ihre Email enthielt ein ZUGFeRD Dokument, welches aber inkorrekt formatiert wurde.</p>
        <p>Mögliche Gründe für ein inkorrektes Format:<ul>
            <li>Betrags-Werte weisen ungültiges Format auf (25,01 anstatt 25.01)</li>
        </ul></p>
    "
 End Class
--- a/App/DigitalData.EMLProfiler/app.config
+++ b/App/DigitalData.EMLProfiler/app.config
@@ -1,33 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
    </configSections>
    <system.diagnostics>
        <sources>
            <!-- Dieser Abschnitt definiert die Protokollierungskonfiguration für My.Application.Log -->
            <source name="DefaultSource" switchName="DefaultSwitch">
                <listeners>
                    <add name="FileLog"/>
                    <!-- Auskommentierung des nachfolgenden Abschnitts aufheben, um in das Anwendungsereignisprotokoll zu schreiben -->
                    <!--<add name="EventLog"/>-->
                </listeners>
            </source>
        </sources>
        <switches>
            <add name="DefaultSwitch" value="Information"/>
        </switches>
        <sharedListeners>
            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
            <!-- Auskommentierung des nachfolgenden Abschnitts aufheben und APPLICATION_NAME durch den Namen der Anwendung ersetzen, um in das Anwendungsereignisprotokoll zu schreiben -->
            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
        </sharedListeners>
    </system.diagnostics>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
--- a/App/DigitalData.EMLProfiler/clsDatabase.vb
+++ b/App/DigitalData.EMLProfiler/clsDatabase.vb
@@ -1,135 +0,0 @@
 Imports DigitalData.EMLProfiler.ClassCurrent
 Imports DigitalData.Modules.Logging
 Public Class clsDatabase
    Public connectionString As String
    Private Logger As Logger
    Private MyLogger As LogConfig
    Sub New(LogConf As LogConfig, ConStr As String)
        Logger = LogConf.GetLogger
        MyLogger = LogConf
        Init(ConStr)
    End Sub
    Public Function Init(ConString As String) As Boolean
        Try
            Dim SQLconnect As New SqlClient.SqlConnection
            SQLconnect.ConnectionString = ConString
            SQLconnect.Open()
            SQLconnect.Close()
            connectionString = ConString
            DTCONFIG = Return_Datatable("select * from TBEMLP_CONFIG")
            If Not IsNothing(DTCONFIG) Then
                If DTCONFIG.Rows.Count = 1 Then
                    'PATH_EXTRACT_ATTACHMENTS = DTCONFIG.Rows(0).Item("PATH_EMAIL_TEMP")
                    'PATH_ERROR = DTCONFIG.Rows(0).Item("PATH_EMAIL_ERRORS")
                    'MAIL_BODY_FONT = DTCONFIG.Rows(0).Item("FONT_BODY")
                    'WM_CON_STRING = DTCONFIG.Rows(0).Item("WM_CON_STRING")
                    'TIMER_INTERVALL = DTCONFIG.Rows(0).Item("CHECK_INTERVALL_MINUTES")
                End If
            End If
            DT_ECM_BASE_CONFIG = Return_Datatable("select * from TBDD_BASECONFIG")
            Try
                WM_DRIVE = DT_ECM_BASE_CONFIG.Rows(0).Item("WM_DRIVE")
            Catch ex As Exception
                Logger.Error("WM_DRIVE not part of DT_ECM_BASE_CONFIG: " & ex.Message)
                WM_DRIVE = "W"
            End Try
            Logger.Debug("Database initialized")
            Return True
        Catch ex As Exception
            Logger.Error(ex)
            Logger.Warn("Unexpected Error  in DatabaseInit: " & ex.Message)
            Return False
        End Try
    End Function
    Public Function Return_Datatable(Select_anweisung As String)
        Try
            Dim SQLconnect As New SqlClient.SqlConnection
            Dim SQLcommand As SqlClient.SqlCommand
            SQLconnect.ConnectionString = connectionString
            SQLconnect.Open()
            SQLcommand = SQLconnect.CreateCommand
            SQLcommand.CommandText = Select_anweisung
            SQLcommand.CommandTimeout = 240
            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
            Dim dt As DataTable = New DataTable()
            Logger.Debug("ReturnDatatable Command: " & Select_anweisung)
            adapter1.Fill(dt)
            SQLconnect.Close()
            Return dt
        Catch ex As Exception
            Logger.Error(ex)
            Logger.Warn("Unexpected Error  in Return_Datatable: " & ex.Message)
            Logger.Warn("SQL: " & Select_anweisung)
            Return Nothing
        End Try
    End Function
    Public Function Return_DatatableCS(Select_anweisung As String, CS As String)
        Try
            Dim SQLconnect As New SqlClient.SqlConnection
            Dim SQLcommand As SqlClient.SqlCommand
            SQLconnect.ConnectionString = CS
            SQLconnect.Open()
            SQLcommand = SQLconnect.CreateCommand
            SQLcommand.CommandText = Select_anweisung
            SQLcommand.CommandTimeout = 240
            Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
            Dim dt As DataTable = New DataTable()
            adapter1.Fill(dt)
            SQLconnect.Close()
            Return dt
        Catch ex As Exception
            Logger.Error(ex)
            Logger.Warn("Unexpected Error  in Return_DatatableCS: " & ex.Message)
            Logger.Warn("SQL: " & Select_anweisung)
            Return Nothing
        End Try
    End Function
    Public Function Execute_non_Query(ExecuteCMD As String, Optional Userinput As Boolean = False)
        Try
            Dim SQLconnect As New SqlClient.SqlConnection
            Dim SQLcommand As SqlClient.SqlCommand
            SQLconnect.ConnectionString = connectionString
            SQLconnect.Open()
            SQLcommand = SQLconnect.CreateCommand
            'Update Last Created Record in Foo
            SQLcommand.CommandText = ExecuteCMD
            SQLcommand.ExecuteNonQuery()
            SQLcommand.Dispose()
            SQLconnect.Close()
            Return True
        Catch ex As Exception
            Logger.Error(ex)
            Logger.Warn("Unexpected Error  in Execute_non_Query: " & ex.Message)
            Logger.Warn("SQL: " & ExecuteCMD)
            Return False
        End Try
    End Function
    Public Function Execute_Scalar(cmdscalar As String)
        Dim result
        Try
            Dim SQLconnect As New SqlClient.SqlConnection
            Dim SQLcommand As SqlClient.SqlCommand
            SQLconnect.ConnectionString = connectionString
            SQLconnect.Open()
            SQLcommand = SQLconnect.CreateCommand
            'Update Last Created Record in Foo
            SQLcommand.CommandText = cmdscalar
            result = SQLcommand.ExecuteScalar()
            SQLcommand.Dispose()
            SQLconnect.Close()
            Return result
        Catch ex As Exception
            Logger.Error(ex)
            Logger.Warn("Unexpected Error  in Execute_Scalar: " & ex.Message)
            Logger.Warn("SQL: " & cmdscalar)
            Return Nothing
        End Try
    End Function
 End Class
--- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb
+++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb
@@ -1,70 +0,0 @@
 Imports DigitalData.EMLProfiler.ClassCurrent
 Imports DigitalData.Modules.Logging
 Imports AE
 Imports System.Net
 Imports System.Reflection
 Imports System.IO
 Imports DigitalData.Modules.Messaging
 Public Class clsEmailIMAP
    Private Shared Logger As Logger
    Private Shared LogConfig As LogConfig
    Private _limilab As Limilab
    Sub New(LogConf As LogConfig)
        LogConfig = LogConf
        Logger = LogConf.GetLogger
        _limilab = New Limilab(LogConf)
    End Sub
    Public Function FetchIMAPMessagesLimilab(Server As String, Port As Integer, Username As String, Password As String, AuthType As String) As Boolean
        Try
            Logger.Debug("FetchIMAPMessagesLimilab - Fetching messages...")
            _limilab.InitIMAP(True, Server, Port, Username, Password, AuthType)
            Dim oListuids As New List(Of Long)
            oListuids = _limilab.IMAPGetMessageIDs_AllMails()
            If IsNothing(oListuids) Then
                Logger.Warn("List of UIDs was Nothing. Returning False.")
                Return False
            Else
                If oListuids.Count > 0 Then
                    CURRENT_WORKMAIL_UID_LIST = oListuids
                    Logger.Info("FetchIMAPMessagesLimilab - Found [{0}] messages", oListuids.Count)
                    CURRENT_ImapObject = _limilab.CurrentImapObject
                Else
                    Logger.Debug("FetchIMAPMessagesLimilab - No Emails found!")
                End If
                Return True
            End If
        Catch ex As Exception
            Logger.Error(ex)
            Return False
        End Try
    End Function
    ''' <summary>
    ''' Uses a private API from MailWriter to write a MailMessage to disk.
    ''' May break in future versions of .NET
    ''' </summary>
    Public Function WriteMessageToFile(Message As Mail.MailMessage, Filename As String) As Boolean
        Dim oAssembly As Assembly = GetType(Mail.SmtpClient).Assembly
        Dim oMailWriterType As Type = oAssembly.[GetType]("System.Net.Mail.MailWriter")
        Try
            Using oStream As New FileStream(Filename, FileMode.Create)
                Dim oMailWriterConstructor As ConstructorInfo = oMailWriterType.GetConstructor(
                    BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, New Type() {GetType(Stream)}, Nothing
                )
                Dim oMailWriter As Object = oMailWriterConstructor.Invoke(New Object() {oStream})
                Dim sendMethod As MethodInfo = GetType(Mail.MailMessage).GetMethod("Send", BindingFlags.Instance Or BindingFlags.NonPublic)
                sendMethod.Invoke(Message, BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, {oMailWriter, True, True}, Nothing)
            End Using
            Return True
        Catch ex As Exception
            Return Nothing
        End Try
    End Function
 End Class
--- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb
+++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
--- a/App/DigitalData.EMLProfiler/clsWorker.vb
+++ b/App/DigitalData.EMLProfiler/clsWorker.vb
@@ -1,268 +0,0 @@
 Imports DigitalData.EMLProfiler.ClassCurrent
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
 Imports Limilabs.Mail
 Imports Limilabs.Mail.MIME
 Imports Limilabs.Mail.Headers
 Imports DigitalData.Modules.Database
 Public Class clsWorker
    Private Shared Logger As Logger
    'Private _email As clsEmail
    Private ReadOnly _emailIMAP As clsEmailIMAP
    'Private _Database As clsDatabase
    Private ReadOnly _Database As MSSQLServer
    Private ReadOnly _USE_WM As Boolean = False
    Private ReadOnly _windream As clsWindream_allgemein
    Private ReadOnly _windream_index As clsWindream_Index
    Private ReadOnly _workmail As clsWorkEmail
    Private ReadOnly _wrapper As clsEncryption
    Private ReadOnly _POLL_PROFILEID As Integer = 0
    Private ReadOnly Eml_Limitation_Sender As String = ""
    Sub New(EML_LIMITATION As String, pLogConfig As LogConfig, ConStr As String, WMConStr As String, POLL_PROFILEID As Integer, FB_DATASOURCE As String, FB_DATABASE As String, FB_USER As String, FB_PW As String, USE_WM As Boolean, EmailAccountID As Integer, EmlProfPraefix As String, Optional plocaleml As String = "")
        Logger = pLogConfig.GetLogger
        _emailIMAP = New clsEmailIMAP(pLogConfig)
        _Database = New MSSQLServer(pLogConfig, ConStr)
        _USE_WM = USE_WM
        Eml_Limitation_Sender = EML_LIMITATION
        If _USE_WM Then
            _windream = New clsWindream_allgemein(pLogConfig)
            _windream_index = New clsWindream_Index(pLogConfig)
        End If
        _workmail = New clsWorkEmail(pLogConfig, ConStr, WMConStr, FB_DATASOURCE, FB_DATABASE, FB_USER, FB_PW, USE_WM, EmailAccountID, EmlProfPraefix)
        _wrapper = New clsEncryption("!35452didalog=", pLogConfig)
        _POLL_PROFILEID = POLL_PROFILEID
        CURRENT_DEBUG_LOCAL_EMAIL = plocaleml
    End Sub
    Public Sub Start_WorkingProfiles(Optional LocalEmail As Boolean = False)
        Try
            For Each _file In TEMP_FILES
                Logger.Debug("Trying to delete temp file: [{0}]", _file)
                If System.IO.File.Exists(_file) Then
                    Try
                        System.IO.File.Delete(_file)
                    Catch ex As Exception
                        Logger.Error(ex)
                        Logger.Warn($"TempFileDelete - Could not delete the tempfile from TEMP_FILES: {ex.Message}")
                    End Try
                End If
            Next
            TEMP_FILES.Clear()
            If _Database.DBInitialized = True Then
                Logger.Debug("now windream_init... ")
                If _USE_WM Then
                    If _windream.Init = False Then
                        Logger.Info("windream could not be initialized!!")
                        Exit Sub
                    Else
                        Logger.Debug("windream_initialized!")
                    End If
                End If
                Dim osql As String = "SELECT * FROM TBEMLP_POLL_PROFILES"
                If _POLL_PROFILEID = 0 Then
                    osql &= " WHERE ACTIVE = 1 order by SEQUENCE"
                Else
                    osql &= " WHERE GUID = " & _POLL_PROFILEID
                End If
                Dim DT_TBDD_EMAIL As DataTable = _Database.GetDatatable("SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1")
                Dim DT_PROFILES = _Database.GetDatatable(osql)
                If Not IsNothing(DT_PROFILES) Then
                    If DT_PROFILES.Rows.Count > 0 Then
                        Logger.Debug("count of active profiles: " & DT_PROFILES.Rows.Count.ToString)
                        For Each oDR_Profile As DataRow In DT_PROFILES.Rows
                            CURRENT_PROFILE_GUID = oDR_Profile.Item("GUID")
                            DT_POLL_PROCESS = Nothing
                            Dim sql = String.Format("SELECT * FROM TBEMLP_POLL_PROCESS WHERE PROFILE_ID = {0} AND ACTIVE = 1", CURRENT_PROFILE_GUID)
                            DT_POLL_PROCESS = _Database.GetDatatable(sql)
                            If Not IsNothing(DT_POLL_PROCESS) Then
                                If DT_POLL_PROCESS.Rows.Count = 0 Then
                                    Logger.Info("No processes configured for this Email-Profile - " & sql)
                                    Continue For
                                Else
                                    DT_STEPS = Nothing
                                    DT_STEPS = _Database.GetDatatable(String.Format("SELECT T.* FROM TBEMLP_POLL_STEPS T,TBEMLP_POLL_PROCESS T1  WHERE T.PROCESS_ID = T1.GUID AND T1.PROFILE_ID = {0} AND T1.ACTIVE = 1", CURRENT_PROFILE_GUID))
                                End If
                            Else
                                Logger.Warn("DT_POLL_PROCESS is nothing")
                                Continue For
                            End If
                            CURRENT_EMAIL_GUID = 0
                            MAIL_FROM = ""
                            MAIL_SERVER = ""
                            MAIL_USER = ""
                            MAIL_USER_PW = ""
                            CURRENT_POLL_TYPE = oDR_Profile.Item("POLL_TYPE")
                            Logger.Debug(String.Format("Working on profile: ({0}-{1}-{2}) ", oDR_Profile.Item("GUID"), oDR_Profile.Item("PROFILE_NAME"), CURRENT_POLL_TYPE))
                            CURRENT_EMAIL_GUID = oDR_Profile.Item("EMAIL_CONF_ID")
                            Dim EMAIL_PROF_TABLE As DataTable = DT_TBDD_EMAIL
                            'Presuming the DataTable has a column named Date.
                            Dim expression As String
                            expression = "GUID = " & CURRENT_EMAIL_GUID
                            Logger.Debug("Expression Filter email: " & expression)
                            Logger.Debug("DT_TBDD_EMAIL.rowCount: " & DT_TBDD_EMAIL.Rows.Count)
                            'Filter the rows using Select() method of DataTable
                            Dim FilteredRows As DataRow() = EMAIL_PROF_TABLE.Select(expression)
                            If FilteredRows.Length = 1 Then
                                For Each row As DataRow In FilteredRows
                                    MAIL_FROM = row("EMAIL_FROM")
                                    MAIL_SERVER = row("EMAIL_SMTP")
                                    MAIL_USER = row("EMAIL_USER")
                                    MAIL_USER_PW = row("EMAIL_PW")
                                    MAIL_PORT = row("PORT_IN")
                                    MAIL_INBOX_NAME = "Inbox"
                                    MAIL_ARCHIVE_FOLDER = row("ARCHIVE_FOLDER")
                                    MAIL_AUTHTYPE = row("AUTH_TYPE")
                                    Logger.Debug(String.Format("{0}-{1}", MAIL_FROM, MAIL_SERVER))
                                    Dim PWPlain = _wrapper.DecryptData(MAIL_USER_PW)
                                    If Not IsNothing(PWPlain) Then
                                        If PWPlain <> "" Then
                                            MAIL_USER_PW = PWPlain
                                        Else
                                            Logger.Warn("PWPlain is string.empty - Could not decrypt passwort")
                                        End If
                                    Else
                                        Logger.Warn("PWPlain is nothing - Could not decrypt passwort")
                                    End If
                                Next
                                CURRENT_WORKMAIL_UID_LIST.Clear()
                                If MAIL_SERVER <> "" Then
                                    Dim pollresult As Boolean = False
                                    If LocalEmail = True Then
                                        pollresult = True
                                    Else
                                        Select Case CURRENT_POLL_TYPE
                                            Case "POP"
                                                'pollresult = _email.POP3_COLLECT()
                                            Case "IMAP"
                                                pollresult = _emailIMAP.FetchIMAPMessagesLimilab(MAIL_SERVER, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTHTYPE)
                                        End Select
                                    End If
                                    If CURRENT_WORKMAIL_UID_LIST.Count() > 0 Or LocalEmail = True Then
                                        If LocalEmail Then
                                            Logger.Info("Working with local Mail")
                                            Dim oEmail As IMail = New MailBuilder().CreateFromEmlFile(CURRENT_DEBUG_LOCAL_EMAIL)
                                            _workmail.WorkEmailMessage(oEmail, 123456789)
                                            CURRENT_MAIL_MESSAGE = Nothing
                                        Else
                                            Try
                                                Logger.Info(String.Format("Pulled: [{0}] E-Mails", CURRENT_WORKMAIL_UID_LIST.Count()))
                                                Dim LIMIT_EMAIL_FROM As Boolean = False
                                                If Eml_Limitation_Sender.Contains("@") Then
                                                    LIMIT_EMAIL_FROM = True
                                                    Logger.Info("####################################")
                                                    Logger.Info($"LIMIT_EMAIL_FROM is ACTIVE - EMAIL_FROM = [{Eml_Limitation_Sender}]")
                                                    Logger.Info("####################################")
                                                    Logger.Debug("####################################")
                                                    Logger.Debug($"LIMIT_EMAIL_FROM is ACTIVE - EMAIL_FROM = [{Eml_Limitation_Sender}]")
                                                    Logger.Debug("####################################")
                                                End If
                                                For Each oUID In CURRENT_WORKMAIL_UID_LIST
                                                    Dim oEml = CURRENT_ImapObject.GetMessageByUID(oUID)
                                                    Dim oEmail As IMail = New MailBuilder().CreateFromEml(oEml)
                                                    If Not IsNothing(oEmail) Then
                                                        If LIMIT_EMAIL_FROM Then
                                                            Dim oEmailFrom As String = ""
                                                            For Each m As MailBox In oEmail.From
                                                                oEmailFrom = m.Address
                                                            Next
                                                            If oEmailFrom <> Eml_Limitation_Sender Then
                                                                Logger.Debug($"Skipping email {oEmailFrom} ...Subject [{oEmail.Subject}]")
                                                                Continue For
                                                            End If
                                                        End If
                                                        If _workmail.WorkEmailMessage(oEmail, oUID) = True Then
                                                            If CURRENT_DEBUG_LOCAL_EMAIL = "" Then
                                                                EMAIL_DELETE()
                                                            End If
                                                        End If
                                                    Else
                                                        Logger.Info("### oEmail was nothing ###")
                                                    End If
                                                    CURRENT_MAIL_MESSAGE = Nothing
                                                Next
                                                If CURRENT_POLL_TYPE = "IMAP" And CURRENT_WORKMAIL_UID_LIST.Count > 0 Then
                                                    If Not IsNothing(CURRENT_ImapObject) Then
                                                        CURRENT_ImapObject.Close()
                                                    End If
                                                End If
                                            Catch ex As Exception
                                                Logger.Error(ex)
                                                Logger.Warn($"Unexpected Error working CURRENT_WORKMAIL_UID_LIST: {ex.Message} ")
                                            End Try
                                        End If
                                    Else
                                        Logger.Debug(String.Format("No emails for profile!"))
                                    End If
                                Else
                                    Logger.Warn("For the Email-Profile ID " & CURRENT_EMAIL_GUID & " no record could be found!")
                                End If
                                _Database.ExecuteNonQuery("UPDATE TBEMLP_POLL_PROFILES SET LAST_TICK = GETDATE() WHERE GUID = " & oDR_Profile.Item("GUID").ToString)
                            Else
                                Logger.Warn("For the Email-Profile ID " & CURRENT_EMAIL_GUID & " no record could be found! Check wether Email-Profile is active!")
                            End If
                        Next
                        Try
                            'Delete all Tempfiles
                            For Each _file In TEMP_FILES
                                Logger.Debug("Trying to delete temp file: [{0}]", _file)
                                If System.IO.File.Exists(_file) Then
                                    Try
                                        System.IO.File.Delete(_file)
                                    Catch ex As Exception
                                        Logger.Error(ex)
                                        Logger.Warn($"TempFileDelete - Could not delete the tempfile from TEMP_FILES: {ex.Message}")
                                    End Try
                                End If
                            Next
                        Catch ex As Exception
                            Logger.Warn($"TempFileDelete(X) - Could not delete the tempfile from TEMP_FILES: {ex.Message}")
                        End Try
                    Else
                        Logger.Info("No active profiles")
                    End If
                End If
                _Database.ExecuteNonQuery("UPDATE TBEMLP_CONFIG SET LAST_TICK = GETDATE() WHERE GUID = 1")
            End If
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
    Private Function EMAIL_DELETE()
        If DeleteMail = True And MessageError = False Then
            If Not IsNothing(CURRENT_ImapObject) Then
                CURRENT_ImapObject.DeleteMessageByUID(CURRENT_MAIL_UID)
            Else
                Logger.Warn("EMAIL_DELETE - CURRENT_ImapObject is nothing")
            End If
        Else
            If MessageError = True Then
                Logger.Warn($"Did not delete Message with UID [{CURRENT_MAIL_UID}] as there was an MessageError!")
            End If
        End If
    End Function
 End Class
--- a/App/DigitalData.EMLProfiler/packages.config
+++ b/App/DigitalData.EMLProfiler/packages.config
@@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AE.Net.Mail" version="1.7.10.0" targetFramework="net461" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>
--- a/App/DigitalData.EMLProfiler/ClassCurrent.vb
+++ b/App/DigitalData.EMLProfiler/ClassCurrent.vb
@@ -1,26 +1,12 @@
-Imports WINDREAMLib
+Imports Limilabs.Client.IMAP
-Imports Limilabs.Mail
+Imports WINDREAMLib
 Imports Limilabs.Mail.MIME
 Imports Limilabs.Mail.Headers
 Imports MailBox = Limilabs.Mail.Headers.MailBox
 Imports Limilabs.Client.IMAP
 Public Class ClassCurrent
    Public Shared Property WM_DRIVE As String
    Public Shared Property CURRENT_EMAIL_GUID As Integer
    Public Shared Property CURRENT_PROFILE_GUID As Integer
    Public Shared Property DTCONFIG As DataTable
    Public Shared Property DT_ECM_BASE_CONFIG As DataTable
    Public Shared Property MAIL_FROM As String = ""
    Public Shared Property MAIL_SERVER As String = ""
    Public Shared Property MAIL_USER As String = ""
    Public Shared Property MAIL_USER_PW As String = ""
    Public Shared Property MAIL_PORT As Integer = 995
    Public Shared Property MAIL_INBOX_NAME As String = "Inbox"
    Public Shared Property MAIL_ARCHIVE_FOLDER As String = ""
    Public Shared Property MAIL_AUTHTYPE As String
    Public Shared Property DT_POLL_PROCESS As DataTable
    Public Shared Property DT_STEPS As DataTable
    Public Shared Property DT_INDEXING_STEPS As DataTable
@@ -33,11 +19,8 @@ Public Class ClassCurrent
    Public Shared Property CURRENT_DRIVE_CHECK As String = ""
    Public Shared Property CURRENT_DRIVE_ISFULL As Boolean = False
    ' Public Shared Property oCURRENT_WORKMAIL_LIST As New ArrayList()
    Public Shared Property CURRENT_WORKMAIL_UID_LIST As New List(Of Long)
    Public Shared Property CURRENT_MAIL_MESSAGE As IMail
    Public Shared Property CURRENT_ImapObject As Imap
    Public Shared Property CURRENT_MAIL_UID As Long
@@ -45,7 +28,6 @@ Public Class ClassCurrent
    Public Shared Property CURRENT_POLL_TYPE As String
    Public Shared Property POLL_STEP_GUID As Integer
    Public Shared Property POLL_STEP_PROCESS_ID As Integer
    Public Shared Property POLL_KEYWORDS As String
    Public Shared Property KEYWORDS_SPLIT As String()
@@ -58,12 +40,13 @@ Public Class ClassCurrent
    Public Shared Property CURRENT_WM_DOC As WMObject
    Public Shared Property CURRENT_DOC_ID As Integer
    Public Shared Property CURRENT_DOC_PATH As String
-    Public Shared Property MessageError As Boolean = False
+    Public Shared Property MESSAGE_ERROR As Boolean = False
    Public Shared Property IS_LOCAL_TEST As Boolean = False
    Public Shared Property TEMP_FILES As List(Of String) = New List(Of String)
    Public Shared Property TEMP_HTML_RESULTS As List(Of String) = New List(Of String)
    Public Shared Property CURRENT_DEBUG_LOCAL_EMAIL As String
    Public Shared Property TEMP_WORK_FILES As List(Of String) = New List(Of String)
    Public Shared Property GDPictureLicense As String = ""
    Public Shared Property EmailAttachments As List(Of EmailAttachment) = New List(Of EmailAttachment)
 End Class
--- a/App/DigitalData.EMLProfiler/ClassConfig.vb
+++ b/App/DigitalData.EMLProfiler/ClassConfig.vb
@@ -2,7 +2,7 @@
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Base
-Public Class ClassConfig
+Public Class ClassDBConfig
    Public Class Config
        Public Property PathError As String
        Public Property PathAttachments As String
--- a/App/EmailProfiler.Common/Data/Config.vb
+++ b/App/EmailProfiler.Common/Data/Config.vb
@@ -0,0 +1,44 @@
 Imports DigitalData.Modules.Config.ConfigAttributes
 Public Class Config
    <ConnectionString>
    Public Property ConnectionString As String = ""
    Public Property Debug As Boolean = False
    Public Property EmailAccountId As Integer = 0
    Public Property EmailTitlePrefix As String = "EmailProfiler"
    Public Property EmailSenderLimitation As String = ""
    Public Property UseWindream As Boolean = False
    ''' <summary>
    ''' GUID des EMail Templates das bei Ablehnungsmails verwendet wird.
    ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
    ''' </summary>
    Public Property RejectionTemplateId As Integer = 0
    ''' <summary>
    ''' GUID des EMail Templates das bei Info-Mails verwendet wird.
    ''' Siehe Tabelle DD_ECM.dbo.TBDD_EMAIL_TEMPLATE
    ''' </summary>
    Public Property InfoTemplateId As Integer = 0
    Public Property EmailTestReceiver As String = ""
    Public Property EmailTestHTML As String = ""
    ''' <summary>
    ''' Enthält die Version des GDPicture Modules,
    ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
    ''' gelesen werden soll.
    ''' </summary>
    Public Property GDPictureVersion As String = ""
    ''' <summary>
    ''' Enthält die Lizenznummer des GDPicture Modules.
    ''' Nur wenn nicht über die Datenbank zu holen!!.
    ''' </summary>
    Public Property GDPictureLicenseAsString As String = ""
 End Class
--- a/App/EmailProfiler.Common/Data/EmailAttachment.vb
+++ b/App/EmailProfiler.Common/Data/EmailAttachment.vb
@@ -0,0 +1,29 @@
 Imports System.IO
 Imports GdPicture14
 Public Class EmailAttachment
    Public OrgFileName As String = ""
    Public DestFileName As String = ""
    Public DestFilePath As String = ""
    Public FileStatus As GdPictureStatus = GdPictureStatus.OK
    Public IsAttachmentValid As Boolean = True
    Public ErrorCodeValue As ErrorCode = ErrorCode.Unknown
    Public ErrorCodeComment As String = ""
    Public AttachmentPosition As Integer = 0
    Public EmbeddedFiles As List(Of EmailAttachment) = New List(Of EmailAttachment)
    Public ReadOnly Property Extension As String
        Get
            If String.IsNullOrEmpty(OrgFileName) = False Then
                Return Path.GetExtension(OrgFileName)
            Else
                Return String.Empty
            End If
        End Get
    End Property
 End Class
--- a/App/EmailProfiler.Common/Data/MailContainer.vb
+++ b/App/EmailProfiler.Common/Data/MailContainer.vb
@@ -8,57 +8,55 @@ Public Class MailContainer
    ''' The Mail object created by Limilabs
    ''' </summary>
    Public ReadOnly Property Mail As IMail
    ''' <summary>
    ''' The IMAP Id coming from the IMAP folder. Used to reference the mail.
    ''' </summary>
    Public ReadOnly Property ImapId As Integer
    ''' <summary>
    ''' The original MessageID from the eml file
    ''' </summary>
    Public ReadOnly Property MessageIdOriginal As String
    ''' <summary>
    ''' The new MessageID, which is generated by hashing the original MessageID
    ''' </summary>
    Public ReadOnly Property MessageId As String
    ''' <summary>
    ''' The subject, truncated to SUBJECT_MAX_LENGTH characters
    ''' </summary>
    Public ReadOnly Property Subject As String
-    Public ReadOnly Property SenderDomain As String
+    Public ReadOnly Property SubjectOriginal As String
    Public ReadOnly Property SenderAddress As String
    Public ReadOnly Property SenderDomain As String
    Public ReadOnly Property SenderAddress As String
    Public Sub New(pMail As IMail, pImapId As Integer)
        Mail = pMail
        ImapId = pImapId
        MessageIdOriginal = pMail.MessageID
-        MessageId = StringEx.GetHash(pMail.MessageID)
+        MessageId = StringEx.GetShortHash(pMail.MessageID)
        Subject = ObjectEx.NotNull(pMail.Subject.Truncate(SUBJECT_MAX_LENGTH), String.Empty)
        SubjectOriginal = ObjectEx.NotNull(pMail.Subject, String.Empty)
        SenderAddress = GetSenderAddress(pMail)
        SenderDomain = GetSenderDomain(pMail)
    End Sub
    Private Function GetSenderAddress(pMail As IMail)
        Dim oMailBox = pMail.From.FirstOrDefault()
-        If oMailBox Is Nothing Then
+        Return oMailBox?.Address
            Return "InvalidSenderAddress"
        Else
            Return oMailBox.Address
        End If
    End Function
    Private Function GetSenderDomain(pMail As IMail)
        Dim oMailBox = pMail.From.FirstOrDefault()
        If oMailBox Is Nothing Then
            Return "InvalidSenderAddress"
        Else
        Return oMailBox.DomainPart
        End If
    End Function
 End Class
--- a/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
+++ b/App/EmailProfiler.Common/EmailProfiler.Common.vbproj
@@ -0,0 +1,322 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{9F748DCD-952E-40A0-9DAD-65BF8A39B231}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>EmailProfiler.Common</RootNamespace>
    <AssemblyName>EmailProfiler.Common</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Windows</MyType>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
    <DocumentationFile>EmailProfiler.Common.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>EmailProfiler.Common.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
    <OptionExplicit>On</OptionExplicit>
  </PropertyGroup>
  <PropertyGroup>
    <OptionCompare>Binary</OptionCompare>
  </PropertyGroup>
  <PropertyGroup>
    <OptionStrict>Off</OptionStrict>
  </PropertyGroup>
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="AE.Net.Mail, Version=1.7.10.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\AE.Net.Mail.1.7.10.0\lib\net45\AE.Net.Mail.dll</HintPath>
    </Reference>
    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Base">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Messaging">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Patterns">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Common, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Document, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Email, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.Markdown, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.Markdown.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.WINDREAMLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
      <EmbedInteropTypes>False</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.WMOBRWSLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Interop.WMOSRCHLib">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
    <Reference Include="Mail">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NativeSDK.Exceptions, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Exceptions.dll</HintPath>
    </Reference>
    <Reference Include="NativeSDK.Settings, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.dll</HintPath>
    </Reference>
    <Reference Include="NativeSDK.Settings.Edition, Version=14.3.21.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.3.21\lib\net462\NativeSDK.Settings.Edition.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
    </Reference>
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
    </Reference>
    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
    </Reference>
    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
    </Reference>
    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.Configuration" />
    <Reference Include="System.Data" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.IO.Packaging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
    </Reference>
    <Reference Include="System.Management" />
    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.Security" />
    <Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
    </Reference>
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
    </Reference>
    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Transactions" />
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Net.Http" />
    <Reference Include="WindowsBase" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
    <Import Include="System" />
    <Import Include="System.Collections" />
    <Import Include="System.Collections.Generic" />
    <Import Include="System.Data" />
    <Import Include="System.Diagnostics" />
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="ClassDBConfig.vb" />
    <Compile Include="ClassCurrent.vb" />
    <Compile Include="clsEmail.IMAP.vb" />
    <Compile Include="Data\Config.vb" />
    <Compile Include="Data\EmailAttachment.vb" />
    <Compile Include="Enum\EmailStrings.vb" />
    <Compile Include="clsEncryption.vb" />
    <Compile Include="clsWindream_allgemein.vb" />
    <Compile Include="clsWindream_Index.vb" />
    <Compile Include="clsWorkEmail.vb" />
    <Compile Include="clsWorker.vb" />
    <Compile Include="Enum\ErrorCode.vb" />
    <Compile Include="Data\MailContainer.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="My Project\Settings.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.21\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
 </Project>
--- a/App/EmailProfiler.Common/Enum/EmailStrings.vb
+++ b/App/EmailProfiler.Common/Enum/EmailStrings.vb
@@ -0,0 +1,16 @@
 Public Class EmailStrings
    Public Const EMAIL_WRAPPING_TEXT = "<html><body style=''font-family:""Arial"";font-size:10.0pt''>Sehr geehrte Damen und Herren,<br/><br/> 
        das Portal konnte die von Ihnen gesandte Email leider nicht verarbeiten! <br><br> Grund: {0}<p>Bitte prüfen Sie die Email und nehmen Sie bei Bedarf mit uns Kontakt auf.<p>    
        Vielen Dank für Ihr Verständnis.<br>Mit freundlichen Grüßen<br>Ihre WISAG</body></html>"
    Public Const EMAIL_SUBJECT_TEXT = "<p>Der Betreff der Original-Email war: <em>{0}</em></p>"
    Public Const EMAIL_SUBJECT_REJECTED = "Beleg abgelehnt"
    Public Const EMAIL_NO_FERDS = "<p>Ihre Email enthielt keine Dokumente.</p>"
    ''' <summary>
    ''' Präfix für den verwendeten ErrorCode
    ''' Beispiel: EMLP_Rejection_10001 
    ''' </summary>
    Public Const ErrorCodePraefix = "EMLP_Rejection_"
 End Class
--- a/App/EmailProfiler.Common/Enum/ErrorCode.vb
+++ b/App/EmailProfiler.Common/Enum/ErrorCode.vb
@@ -0,0 +1,7 @@
 Public Enum ErrorCode
    Unknown = 0
    NoAttachments = 10001
    SenderValidationFailed = 10002
    EmbeddedFileAttachmentCorrupt = 10003
    NormalFileAttachmentCorrupt = 10004     ' Info Mail
 End Enum
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("DigitalData.EMLProfiler")>
-<Assembly: AssemblyCopyright("Copyright ©  2022")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("3.7.5.1")>
+<Assembly: AssemblyTrademark("3.0.10.0")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("3.6.6.0")>
+<Assembly: AssemblyVersion("3.5.0.0")>
-<Assembly: AssemblyFileVersion("3.6.6.0")>
+<Assembly: AssemblyFileVersion("3.5.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/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("SERV_EMAIL.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
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
@@ -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
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
--- a/App/EmailProfiler.Common/UserConfig.xml
+++ b/App/EmailProfiler.Common/UserConfig.xml
@@ -0,0 +1,9 @@
 <?xml version="1.0"?>
 <Config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <Debug>true</Debug>
  <EmailAccountId>2</EmailAccountId>
  <EmailTitlePrefix>EmailProfiler</EmailTitlePrefix>
  <EmailSenderLimitation />
  <UseWindream>false</UseWindream>
  <RejectionTemplateId>1</RejectionTemplateId>
 </Config>
--- a/App/EmailProfiler.Common/app.config
+++ b/App/EmailProfiler.Common/app.config
@@ -0,0 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
    </configSections>
    <system.diagnostics>
        <sources>
            <!-- Dieser Abschnitt definiert die Protokollierungskonfiguration für My.Application.Log -->
            <source name="DefaultSource" switchName="DefaultSwitch">
                <listeners>
                    <add name="FileLog" />
                    <!-- Auskommentierung des nachfolgenden Abschnitts aufheben, um in das Anwendungsereignisprotokoll zu schreiben -->
                    <!--<add name="EventLog"/>-->
                </listeners>
            </source>
        </sources>
        <switches>
            <add name="DefaultSwitch" value="Information" />
        </switches>
        <sharedListeners>
            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
            <!-- Auskommentierung des nachfolgenden Abschnitts aufheben und APPLICATION_NAME durch den Namen der Anwendung ersetzen, um in das Anwendungsereignisprotokoll zu schreiben -->
            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
        </sharedListeners>
    </system.diagnostics>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
--- a/App/EmailProfiler.Common/clsEmail.IMAP.vb
+++ b/App/EmailProfiler.Common/clsEmail.IMAP.vb
@@ -0,0 +1,108 @@
 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
    Private ReadOnly _limilab As Limilab
    Private Fetcher As MailFetcher
    Public ReadOnly Property Client As Imap
        Get
            Return Fetcher.Client
        End Get
    End Property
    Sub New(pLogConfig As LogConfig)
        Logger = pLogConfig.GetLogger
        _limilab = New Limilab(pLogConfig)
        Fetcher = New MailFetcher(pLogConfig)
    End Sub
    Public Function FetchIMAPMessagesLimilab(Server As String, Port As Integer, Username As String, Password As String, AuthType As String) As Boolean
        Try
            Dim oSession = Fetcher.Connect(Server, Port, Username, Password, AuthType)
            If oSession.Connected = False AndAlso oSession.Error IsNot Nothing Then
                Logger.Warn("Connection to Mail Server failed!")
                Logger.Error(oSession.Error)
                Return False
            ElseIf oSession.Connected = False Then
                Logger.Warn("Connection to Mail Server failed!")
                Return False
            End If
            Dim oMailIds As List(Of Long) = Fetcher.ListAllMails()
            If oMailIds Is Nothing Then
                Logger.Warn("List of UIDs was Nothing. Exiting.")
                Return False
            End If
            If oMailIds.Count = 0 Then
                Logger.Debug("No Emails found.")
                Return True
            End If
            CURRENT_WORKMAIL_UID_LIST = oMailIds
            Return True
            'Logger.Debug("FetchIMAPMessagesLimilab - Fetching messages...")
            '_limilab.InitIMAP(True, Server, Port, Username, Password, AuthType)
            'Dim oListuids As New List(Of Long)
            'oListuids = _limilab.IMAPGetMessageIDs_AllMails()
            'If IsNothing(oListuids) Then
            '    Logger.Warn("List of UIDs was Nothing. Returning False.")
            '    Return False
            'Else
            '    If oListuids.Count > 0 Then
            '        CURRENT_WORKMAIL_UID_LIST = oListuids
            '        Logger.Info("FetchIMAPMessagesLimilab - Found [{0}] messages", oListuids.Count)
            '        CURRENT_ImapObject = _limilab.CurrentImapObject
            '    Else
            '        Logger.Debug("FetchIMAPMessagesLimilab - No Emails found!")
            '    End If
            '    Return True
            'End If
        Catch ex As Exception
            Logger.Error(ex)
            Return False
        End Try
    End Function
    ''' <summary>
    ''' Uses a private API from MailWriter to write a MailMessage to disk.
    ''' May break in future versions of .NET
    ''' </summary>
    Public Function WriteMessageToFile(Message As Mail.MailMessage, Filename As String) As Boolean
        Dim oAssembly As Assembly = GetType(Mail.SmtpClient).Assembly
        Dim oMailWriterType As Type = oAssembly.[GetType]("System.Net.Mail.MailWriter")
        Try
            Using oStream As New FileStream(Filename, FileMode.Create)
                Dim oMailWriterConstructor As ConstructorInfo = oMailWriterType.GetConstructor(
                    BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, New Type() {GetType(Stream)}, Nothing
                )
                Dim oMailWriter As Object = oMailWriterConstructor.Invoke(New Object() {oStream})
                Dim sendMethod As MethodInfo = GetType(Mail.MailMessage).GetMethod("Send", BindingFlags.Instance Or BindingFlags.NonPublic)
                sendMethod.Invoke(Message, BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, {oMailWriter, True, True}, Nothing)
            End Using
            Return True
        Catch ex As Exception
            Return Nothing
        End Try
    End Function
 End Class
--- a/App/DigitalData.EMLProfiler/clsEncryption.vb
+++ b/App/DigitalData.EMLProfiler/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.
--- a/App/DigitalData.EMLProfiler/clsWindream_Index.vb
+++ b/App/DigitalData.EMLProfiler/clsWindream_Index.vb
@@ -115,6 +115,8 @@ Public Class clsWindream_Index
        Catch ex As Exception
        End Try
        Return "String"
    End Function
    Public Function RunIndexing_Vektor(ByVal oDocument As WMObject, ByVal Indizes As String(), ByVal aValues As String())
        Try
@@ -244,9 +246,9 @@ Public Class clsWindream_Index
            'clsLogger.AddError("## Fehler in RunIndexing_Vektor - Fehler: " & ex.Message, "RunIndexingVektor")
            oDocument.Save()
            oDocument.unlock()
            Return False
        End Try
        End Try
        Return False
    End Function
    Public Function RunIndexing(ByVal oDocument As WMObject, ByVal Indizes() As String, ByVal aValues() As Object, Objekttyp As String)
@@ -630,8 +632,9 @@ Public Class clsWindream_Index
            'clsLogger.AddError(ex.Message, "ClassSearchResult.RunIndexing")
            oDocument.Save()
            oDocument.unlock()
            Return False
        End Try
        Return False
    End Function
 #End Region
    Public Function GetVektorArray(ByVal oDocument As WMObject, oIndexName As String, NIIndexe As Object, CheckDuplikat As Boolean)
@@ -737,7 +740,7 @@ Public Class clsWindream_Index
            Return ValueArray
        Catch ex As Exception
            Logger.Error(ex)
-            ClassCurrent.MessageError = True
+            ClassCurrent.MESSAGE_ERROR = True
            'clsLogger.AddError(ex.Message, "Return_VektorArray")
            Return Nothing
        End Try
@@ -834,7 +837,7 @@ Public Class clsWindream_Index
    ''' _indexname = Name des zu überprüfenden Indexfeldes
    Public Function GetValueforIndex_WMFile(ByVal _dok As WMObject, _indexname As String)
        Try
-            Const WMEntityDocument = 1
+            'Const WMEntityDocument = 1
            Dim IndexwertAusWindream As Object = Nothing
            IndexwertAusWindream = _dok.GetVariableValue(_indexname)
            Return IndexwertAusWindream.ToString
--- a/App/DigitalData.EMLProfiler/clsWindream_allgemein.vb
+++ b/App/DigitalData.EMLProfiler/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
@@ -285,8 +279,9 @@ Public Class clsWindream_allgemein
        Catch ex As Exception
            Logger.Error(ex)
            Return False
        End Try
        Return False
    End Function
 #End Region
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
--- a/App/EmailProfiler.Common/clsWorker.vb
+++ b/App/EmailProfiler.Common/clsWorker.vb
@@ -0,0 +1,354 @@
 Imports System.IO
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging.Mail
 Imports EmailProfiler.Common.ClassCurrent
 Imports Limilabs.Mail
 Imports Limilabs.Mail.Headers
 Public Class clsWorker
    Private ReadOnly _Logger As Logger
    Private ReadOnly _Fetcher As MailFetcher
    Private ReadOnly _Database As MSSQLServer
    Private ReadOnly _UseWindream As Boolean = False
    Private ReadOnly ClassWindreamAllgemein As clsWindream_allgemein
    Private ReadOnly ClassWindreamIndex As clsWindream_Index
    Private ReadOnly _ClassWorkMail As clsWorkEmail
    Private ReadOnly Encryption As clsEncryption
    Private ReadOnly _ProfileId As Integer = 0D
    Private ReadOnly EmailLimitationSender As String = ""
    Private ReadOnly EmailLimitationEnabled As Boolean = False
    Private Const SUCCESS_IMAP_FOLDER = "Verarbeitet"
    Private ReadOnly LocalEmlFile As String = ""
    Sub New(pLogConfig As LogConfig, pConnectionString As String, pWindreamConnectionString As String, pPollProfileId As Integer, pConfigData As Config, Optional pLocalEML As String = "")
        _Logger = pLogConfig.GetLogger
        'ClassEmailImap = New clsEmailIMAP(pLogConfig)
        _Fetcher = New MailFetcher(pLogConfig)
        _Database = New MSSQLServer(pLogConfig, pConnectionString)
        _UseWindream = pConfigData.UseWindream
        EmailLimitationSender = pConfigData.EmailSenderLimitation
        If EmailLimitationSender.Contains("@") Then
            _Logger.Info("Email Sender Limitation active for address: [{0}]", EmailLimitationSender)
            EmailLimitationEnabled = True
        End If
        If _UseWindream Then
            ClassWindreamAllgemein = New clsWindream_allgemein(pLogConfig)
            ClassWindreamIndex = New clsWindream_Index(pLogConfig)
        End If
        _ClassWorkMail = New clsWorkEmail(pLogConfig, pConnectionString, pWindreamConnectionString, pConfigData)
        Encryption = New clsEncryption("!35452didalog=", pLogConfig)
        _ProfileId = pPollProfileId
        LocalEmlFile = pLocalEML
    End Sub
    Private Sub DeleteTempFiles()
        For Each _file In TEMP_FILES
            _Logger.Debug("Trying to delete temp file: [{0}]", _file)
            If File.Exists(_file) Then
                Try
                    File.Delete(_file)
                Catch ex As Exception
                    _Logger.Error(ex)
                    _Logger.Warn("Could not delete the tempfile from TEMP_FILES: [{0}]", _file)
                End Try
            End If
        Next
        TEMP_FILES.Clear()
    End Sub
    Private Function LoadEmailAccounts() As DataTable
        Return _Database.GetDatatable("SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE ACTIVE = 1")
    End Function
    Private Function LoadPollingProfiles(pProfileId As Integer) As DataTable
        Dim oSQL = "SELECT * FROM TBEMLP_POLL_PROFILES WHERE ACTIVE = 1"
        If _ProfileId = 0 Then
            oSQL &= " ORDER BY SEQUENCE"
        Else
            oSQL &= $" AND GUID = {pProfileId}"
        End If
        Return _Database.GetDatatable(oSQL)
    End Function
    Public Sub Start_WorkingProfiles(Optional LocalEmail As Boolean = False)
        Try
            DeleteTempFiles()
            IS_LOCAL_TEST = LocalEmail
            If _Database.DBInitialized = False Then
                _Logger.Warn("Database is not initialized. Exiting.")
                Exit Sub
            End If
            _Logger.Debug("now windream_init... ")
            If _UseWindream Then
                If ClassWindreamAllgemein.Init = False Then
                    _Logger.Info("windream could not be initialized!!")
                    Exit Sub
                Else
                    _Logger.Debug("windream_initialized!")
                End If
            End If
            Dim EmailAccountTable As DataTable = LoadEmailAccounts()
            Dim PollingProfileTable = LoadPollingProfiles(_ProfileId)
            If IsNothing(PollingProfileTable) Then
                _Logger.Warn("Error while fetching Polling Profiles. Exiting.")
                Exit Sub
            End If
            If PollingProfileTable.Rows.Count = 0 Then
                _Logger.Warn("No active Polling Profiles found. Exiting.")
                Exit Sub
            End If
            _Logger.Debug("Count of active profiles: " & PollingProfileTable.Rows.Count.ToString)
            For Each oProfile As DataRow In PollingProfileTable.Rows
                Dim oValidationSql = oProfile.ItemEx("VALIDATION_SQL", "")
                CURRENT_PROFILE_GUID = oProfile.Item("GUID")
                DT_POLL_PROCESS = Nothing
                Dim sql = String.Format("SELECT * FROM TBEMLP_POLL_PROCESS WHERE PROFILE_ID = {0} AND ACTIVE = 1", CURRENT_PROFILE_GUID)
                DT_POLL_PROCESS = _Database.GetDatatable(sql)
                If Not IsNothing(DT_POLL_PROCESS) Then
                    If DT_POLL_PROCESS.Rows.Count = 0 Then
                        _Logger.Info("No processes configured for this Email-Profile - " & sql)
                        Continue For
                    Else
                        DT_STEPS = Nothing
                        DT_STEPS = _Database.GetDatatable($"SELECT T.* FROM TBEMLP_POLL_STEPS T,TBEMLP_POLL_PROCESS T1  WHERE T.PROCESS_ID = T1.GUID AND T1.PROFILE_ID = {CURRENT_PROFILE_GUID} AND T1.ACTIVE = 1")
                    End If
                Else
                    _Logger.Warn("DT_POLL_PROCESS is nothing")
                    Continue For
                End If
                CURRENT_EMAIL_GUID = 0
                CURRENT_POLL_TYPE = oProfile.Item("POLL_TYPE")
                _Logger.Debug(String.Format("Working on profile: ({0}-{1}-{2}) ", oProfile.Item("GUID"), oProfile.Item("PROFILE_NAME"), CURRENT_POLL_TYPE))
                CURRENT_EMAIL_GUID = oProfile.Item("EMAIL_CONF_ID")
                Dim FilteredRows As List(Of DataRow) = EmailAccountTable.
                    Select($"GUID = {CURRENT_EMAIL_GUID}").
                    ToList()
                _Logger.Debug("FilteredRows: " & FilteredRows.Count)
                If FilteredRows.Count = 1 Then
                    Dim oRow = FilteredRows(0)
                    Dim oMailFrom = oRow("EMAIL_FROM")
                    Dim oMailServer = oRow("EMAIL_SMTP")
                    Dim oMailUser = oRow("EMAIL_USER")
                    Dim oMailPassword = oRow("EMAIL_PW")
                    Dim oMailPortIn = oRow("PORT_IN")
                    Dim oMailboxName = "Inbox"
                    Dim oMailArchiveFolder = oRow("ARCHIVE_FOLDER")
                    Dim oMailAuthType = oRow("AUTH_TYPE")
                    _Logger.Debug("Mail Server: {0}", oMailServer)
                    _Logger.Debug("Mail From: {0}", oMailFrom)
                    Dim PWPlain = Encryption.DecryptData(oMailPassword)
                    If Not IsNothing(PWPlain) Then
                        If PWPlain <> "" Then
                            oMailPassword = PWPlain
                        Else
                            _Logger.Warn("PWPlain is string.empty - Could not decrypt passwort")
                        End If
                    Else
                        _Logger.Warn("PWPlain is nothing - Could not decrypt passwort")
                    End If
                    CURRENT_WORKMAIL_UID_LIST.Clear()
                    If oMailServer <> "" Then
                        Dim oPollResult As Boolean = False
                        If LocalEmail = True Then
                            oPollResult = True
                        Else
                            Select Case CURRENT_POLL_TYPE
                                Case "IMAP"
                                    ' We are using 'Archive Folder' as an additional field to save the Tenant-ID for O365-OAuth2
                                    oPollResult = FetchMessages(oMailServer, oMailPortIn, oMailUser, oMailPassword, oMailAuthType, oMailArchiveFolder)
                                Case Else
                                    _Logger.Error("Poll Type [{0}] is not supported!", CURRENT_POLL_TYPE)
                                    oPollResult = False
                            End Select
                        End If
                        If CURRENT_WORKMAIL_UID_LIST.Count() > 0 Or LocalEmail = True Then
                            If LocalEmail Then
                                _Logger.Info("Working with local Mail")
                                Dim oEmail As IMail = New MailBuilder().CreateFromEmlFile(LocalEmlFile)
                                Dim oUID = String.Concat(Now.Month.ToString, Now.Day, Now.Hour, Now.Minute, Now.Second)
                                _ClassWorkMail.WorkEmailMessage(oEmail, oUID, oValidationSql)
                            Else
                                Try
                                    _Logger.Info(String.Format("Pulled: [{0}] E-Mails", CURRENT_WORKMAIL_UID_LIST.Count()))
                                    For Each oMailId In CURRENT_WORKMAIL_UID_LIST
                                        Dim oEmail As IMail = _Fetcher.FetchMail(oMailId)
                                        If Not IsNothing(oEmail) Then
                                            If EmailLimitationEnabled Then
                                                Dim oEmailFrom As String = ""
                                                For Each m As MailBox In oEmail.From
                                                    oEmailFrom = m.Address
                                                Next
                                                If oEmailFrom <> EmailLimitationSender Then
                                                    _Logger.Debug($"Skipping email {oEmailFrom} ...Subject [{oEmail.Subject}]")
                                                    Continue For
                                                End If
                                            End If
                                            ' Hier wird die einzelne EMail jetzt verarbeitet
                                            If _ClassWorkMail.WorkEmailMessage(oEmail, oMailId, oValidationSql) = True Then
                                                If LocalEmlFile = "" Then
                                                    DeleteOrMoveEmailFile(oMailId)
                                                End If
                                            End If
                                        Else
                                            _Logger.Info("### oEmail was nothing ###")
                                        End If
                                    Next
                                    If CURRENT_POLL_TYPE = "IMAP" And CURRENT_WORKMAIL_UID_LIST.Count > 0 Then
                                        _Fetcher.Disconnect()
                                    End If
                                Catch ex As Exception
                                    _Logger.Error(ex)
                                    _Logger.Warn($"Unexpected Error working CURRENT_WORKMAIL_UID_LIST: {ex.Message} ")
                                End Try
                            End If
                        Else
                            _Logger.Debug(String.Format("No emails for profile!"))
                        End If
                    Else
                        _Logger.Warn("For the Email-Profile ID " & CURRENT_EMAIL_GUID & " no record could be found!")
                    End If
                    _Database.ExecuteNonQuery("UPDATE TBEMLP_POLL_PROFILES SET LAST_TICK = GETDATE() WHERE GUID = " & oProfile.Item("GUID").ToString)
                Else
                    _Logger.Warn("For the Email-Profile ID " & CURRENT_EMAIL_GUID & " no record could be found! Check wether Email-Profile is active!")
                End If
            Next
            DeleteTempFiles()
            _Database.ExecuteNonQuery("UPDATE TBEMLP_CONFIG SET LAST_TICK = GETDATE() WHERE GUID = 1")
        Catch ex As Exception
            _Logger.Error(ex)
        End Try
    End Sub
    Public Function FetchMessages(pServer As String, pPort As Integer, pUsername As String, pPassword As String, pAuthType As String, pArchiveFolder As String) As Boolean
        Try
            Dim oSession As MailSession.SessionInfo
            If pAuthType = MailSession.AUTH_OAUTH2 Then
                Dim oClientId As String = pServer
                Dim oClientSecret As String = pPassword
                Dim oTenantId As String = pArchiveFolder
                oSession = _Fetcher.ConnectToO365(pUsername, oClientId, oTenantId, oClientSecret)
            Else
                oSession = _Fetcher.Connect(pServer, pPort, pUsername, pPassword, pAuthType, New MailSession.MailSessionOptions() With {
                    .EnableTls1_1 = True,
                    .EnableTls1_2 = True
                })
            End If
            If oSession.Connected = False AndAlso oSession.Error IsNot Nothing Then
                _Logger.Warn("Connection to Mail Server failed!")
                _Logger.Error(oSession.Error)
                Return False
            ElseIf oSession.Connected = False Then
                _Logger.Warn("Connection to Mail Server failed!")
                Return False
            End If
            CURRENT_ImapObject = _Fetcher.Client
            Dim oMailIds As List(Of Long) = _Fetcher.ListAllMails()
            If oMailIds Is Nothing Then
                _Logger.Warn("List of UIDs was Nothing. Exiting.")
                Return False
            End If
            If oMailIds.Count = 0 Then
                _Logger.Debug("No Emails found.")
                Return True
            End If
            CURRENT_WORKMAIL_UID_LIST = oMailIds
            Return True
        Catch ex As Exception
            _Logger.Error(ex)
            Return False
        End Try
    End Function
    Private Sub DeleteOrMoveEmailFile(pMailId As Integer)
        Try
            If MESSAGE_ERROR = True Then
                _Logger.Warn("Did not delete or move Message with UID [{0}] as there was an MessageError!", pMailId)
                Return
            End If
            If IsNothing(_Fetcher.Client) Then
                _Logger.Warn("Did not delete or move Message with UID [{0}] as ImapClient is null", pMailId)
                Return
            End If
            If DeleteMail = True Then
                _Fetcher.Client.DeleteMessageByUID(pMailId)
                _Logger.Info("Email with Id [{0}] was deleted.", pMailId)
            Else
                If TestImapFolderExists(SUCCESS_IMAP_FOLDER) Then
                    If _Fetcher.Client.MoveByUID(pMailId, SUCCESS_IMAP_FOLDER) IsNot Nothing Then
                        _Logger.Info("Email with UID [{0}] was moved", pMailId)
                    End If
                Else
                    _Logger.Warn("IMAP Folder [{0}] does not exist. Emails could not be moved!", SUCCESS_IMAP_FOLDER)
                End If
            End If
        Catch ex As Exception
            _Logger.Error(ex)
        End Try
    End Sub
    Private Function TestImapFolderExists(pFolderName As String) As Boolean
        Try
            Return _Fetcher.Client.
                GetFolders().
                Where(Function(f) f.Name = pFolderName).
                Any()
        Catch ex As Exception
            _Logger.Warn("Could not get IMAP folders. Returning False.")
            _Logger.Error(ex)
            Return False
        End Try
    End Function
 End Class
--- a/App/EmailProfiler.Common/packages.config
+++ b/App/EmailProfiler.Common/packages.config
@@ -0,0 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="AE.Net.Mail" version="1.7.10.0" targetFramework="net461" />
  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
  <package id="GdPicture" version="14.3.21" targetFramework="net462" />
  <package id="GdPicture.runtimes.windows" version="14.3.21" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
  <package id="System.Management" version="8.0.0" targetFramework="net462" />
  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>
--- a/App/EmailProfiler.Form/App.config
+++ b/App/EmailProfiler.Form/App.config
@@ -0,0 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
            <section name="EmailProfiler.Form.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
        </sectionGroup>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
            <section name="EmailProfiler.Form.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
        </sectionGroup>
    </configSections>
    <connectionStrings>
        <add name="EmailProfiler.Form.My.MySettings.MyDatasetConnString"
            connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True"
            providerName="System.Data.SqlClient" />
    </connectionStrings>
    <startup>
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
    </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <userSettings>
    <EmailProfiler.Form.My.MySettings>
      <setting name="EmailTest_Receipiant" serializeAs="String">
        <value />
      </setting>
      <setting name="MyTestHTML" serializeAs="String">
        <value />
      </setting>
      <setting name="DEBUG" serializeAs="String">
        <value>False</value>
      </setting>
    </EmailProfiler.Form.My.MySettings>
  </userSettings>
  <applicationSettings>
    <EmailProfiler.Form.My.MySettings>
      <setting name="MyConnectionString" serializeAs="String">
        <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</value>
      </setting>
      <setting name="FB_DATABASE" serializeAs="String">
        <value />
      </setting>
      <setting name="FB_DATASOURCE" serializeAs="String">
        <value />
      </setting>
      <setting name="FB_USER" serializeAs="String">
        <value>sysdba</value>
      </setting>
      <setting name="FB_PW" serializeAs="String">
        <value>dd</value>
      </setting>
      <setting name="USE_WM" serializeAs="String">
        <value>False</value>
      </setting>
      <setting name="EML_LIMITATION_SENDER" serializeAs="String">
        <value>NONE</value>
      </setting>
    </EmailProfiler.Form.My.MySettings>
  </applicationSettings>
 </configuration>
--- a/App/EmailProfiler.Form/CONFIG_APP.vbproj.bak
+++ b/App/EmailProfiler.Form/CONFIG_APP.vbproj.bak
--- a/App/EmailProfiler.Form/EmailProfiler.Form.vbproj
+++ b/App/EmailProfiler.Form/EmailProfiler.Form.vbproj
@@ -6,9 +6,9 @@
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}</ProjectGuid>
    <OutputType>WinExe</OutputType>
-    <StartupObject>CONFIG_APP.My.MyApplication</StartupObject>
+    <StartupObject>EmailProfiler.Form.My.MyApplication</StartupObject>
-    <RootNamespace>CONFIG_APP</RootNamespace>
+    <RootNamespace>EmailProfiler.Form</RootNamespace>
-    <AssemblyName>CONFIG_APP</AssemblyName>
+    <AssemblyName>EmailProfiler.Form</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>CONFIG_APP.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Form.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>CONFIG_APP.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Form.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -48,27 +48,47 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>email_download_handdrawn.ico</ApplicationIcon>
+    <ApplicationIcon>envelope.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DigitalData.GUIs.Common">
      <HintPath>..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Base">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Messaging">
-      <HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
    <Reference Include="EmailProfiler.Common, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
    </Reference>
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
    </Reference>
@@ -77,6 +97,7 @@
    <Reference Include="System.Data" />
    <Reference Include="System.Deployment" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.IdentityModel" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
@@ -110,7 +131,6 @@
      <DependentUpon>frmMain.vb</DependentUpon>
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="ModuleSettings.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -132,6 +152,10 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>MyDataset.xsd</DependentUpon>
    </Compile>
    <Compile Include="MyDataset.vb">
      <DependentUpon>MyDataset.xsd</DependentUpon>
    </Compile>
    <Compile Include="Settings.vb" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="frmMain.resx">
@@ -186,17 +210,11 @@
    <None Include="Resources\arrow_Down_16xMD.png" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="email_download_handdrawn.ico" />
+    <Content Include="envelope.ico" />
    <None Include="Resources\email_go.png" />
    <None Include="Resources\key_16xLG.png" />
    <None Include="Resources\Encrypt.png" />
    <None Include="Resources\folder_Closed_16xLG.png" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj">
      <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
      <Name>DigitalData.EMLProfiler</Name>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -32,7 +32,7 @@ Namespace My
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.CONFIG_APP.frmMain
+            Me.MainForm = Global.EmailProfiler.Form.frmMain
        End Sub
    End Class
 End Namespace
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
--- a/App/EmailProfiler.Form/My
+++ b/App/EmailProfiler.Form/My
@@ -10,10 +10,10 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyTitle("Email-Profiler - Config")>
 <Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("Email-Profiler - Config")>
+<Assembly: AssemblyProduct("EmailProfiler Config")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyTrademark("3.1.0")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("2.8.1.0")>
+<Assembly: AssemblyVersion("3.1.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/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("CONFIG_APP.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EmailProfiler.Form.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
--- a/App/EmailProfiler.Form/My
+++ b/App/EmailProfiler.Form/My
--- a/Project/Settings.Designer.vb
+++ b/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.14.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -54,29 +54,14 @@ Namespace My
            End Get
        End Property
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
+            "Info=True;User ID=sa;Password=dd")>  _
-        Public Property MyConnectionString() As String
+        Public ReadOnly Property MyConnectionString() As String
            Get
                Return CType(Me("MyConnectionString"),String)
            End Get
            Set
                Me("MyConnectionString") = value
            End Set
        End Property
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
        Public Property MyServer() As String
            Get
                Return CType(Me("MyServer"),String)
            End Get
            Set
                Me("MyServer") = value
            End Set
        End Property
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
@@ -172,8 +157,8 @@ Namespace My
        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Passwo"& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
+            "rd=dd;Encrypt=True;TrustServerCertificate=True")>  _
        Public ReadOnly Property MyDatasetConnString() As String
            Get
                Return CType(Me("MyDatasetConnString"),String)
@@ -190,9 +175,9 @@ Namespace My
    Friend Module MySettingsProperty
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.CONFIG_APP.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EmailProfiler.Form.My.MySettings
            Get
-                Return Global.CONFIG_APP.My.MySettings.Default
+                Return Global.EmailProfiler.Form.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -2,11 +2,8 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
  <Profiles />
  <Settings>
-    <Setting Name="MyConnectionString" Type="System.String" Scope="User">
+    <Setting Name="MyConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
    </Setting>
    <Setting Name="MyServer" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
    </Setting>
    <Setting Name="EmailTest_Receipiant" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
@@ -38,10 +35,10 @@
    <Setting Name="MyDatasetConnString" Type="(Connection string)" Scope="Application">
      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
-  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
+  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True&lt;/ConnectionString&gt;
  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
+      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True</Value>
    </Setting>
  </Settings>
 </SettingsFile>
--- a/App/EmailProfiler.Form/My
+++ b/App/EmailProfiler.Form/My
@@ -0,0 +1,4 @@
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/Project/licenses.licx.bak
+++ b/Project/licenses.licx.bak
--- a/App/EmailProfiler.Form/MyDataset.Designer.vb
+++ b/App/EmailProfiler.Form/MyDataset.Designer.vb
--- a/App/EmailProfiler.Form/MyDataset.vb
+++ b/App/EmailProfiler.Form/MyDataset.vb
@@ -0,0 +1,4 @@
 Partial Class MyDataset
    Partial Public Class TBEMLP_POLL_PROFILESDataTable
    End Class
 End Class
--- a/App/EmailProfiler.Form/MyDataset.xsc
+++ b/App/EmailProfiler.Form/MyDataset.xsc
@@ -9,11 +9,9 @@
    <TableUISetting Name="TBDD_EMAIL_ACCOUNT">
      <ColumnUISettings>
        <ColumnUISetting Name="AUTH_TYPE">
-          <ControlSettings>
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
              <BindableControlInfo Name="ComboBox" Type="System.Windows.Forms.ComboBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
+            </ControlSetting></ControlSettings>
          </ControlSettings>
        </ColumnUISetting>
      </ColumnUISettings>
    </TableUISetting>
--- a/App/EmailProfiler.Form/MyDataset.xsd
+++ b/App/EmailProfiler.Form/MyDataset.xsd
@@ -4,7 +4,7 @@
    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
        <Connections>
-          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="MyDatasetConnString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MyDatasetConnString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.CONFIG_APP.My.MySettings.GlobalReference.Default.MyDatasetConnString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="MyDatasetConnString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="MyDatasetConnString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.EmailProfiler.Form.My.MySettings.GlobalReference.Default.MyDatasetConnString" Provider="System.Data.SqlClient" />
        </Connections>
        <Tables>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEMLP_POLL_PROFILESTableAdapter" GeneratorDataComponentClassName="TBEMLP_POLL_PROFILESTableAdapter" Name="TBEMLP_POLL_PROFILES" UserDataComponentName="TBEMLP_POLL_PROFILESTableAdapter">
@@ -39,8 +39,8 @@
                <InsertCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO TBEMLP_POLL_PROFILES
-                         (PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE, SEQUENCE, ADDED_WHO)
+                         (PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE, SEQUENCE, ADDED_WHO, VALIDATION_SQL)
-VALUES        (@PROFILE_NAME,@POLL_TYPE,@EMAIL_CONF_ID,@COMMENT,@LAST_TICK,@ACTIVE,@SEQUENCE,@ADDED_WHO); 
+VALUES        (@PROFILE_NAME,@POLL_TYPE,@EMAIL_CONF_ID,@COMMENT,@LAST_TICK,@ACTIVE,@SEQUENCE,@ADDED_WHO,@VALIDATION_SQL);  
 SELECT GUID, PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEMLP_POLL_PROFILES WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -51,6 +51,7 @@ SELECT GUID, PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE,
                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION_SQL" ColumnName="VALIDATION_SQL" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@VALIDATION_SQL" Precision="0" ProviderType="VarChar" Scale="0" Size="1024" SourceColumn="VALIDATION_SQL" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@@ -65,7 +66,7 @@ FROM            TBEMLP_POLL_PROFILES</CommandText>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>UPDATE       TBEMLP_POLL_PROFILES
 SET                PROFILE_NAME = @PROFILE_NAME, POLL_TYPE = @POLL_TYPE, EMAIL_CONF_ID = @EMAIL_CONF_ID, COMMENT = @COMMENT, LAST_TICK = @LAST_TICK, ACTIVE = @ACTIVE, SEQUENCE = @SEQUENCE, 
-                         CHANGED_WHO = @CHANGED_WHO
+                         CHANGED_WHO = @CHANGED_WHO, VALIDATION_SQL = @VALIDATION_SQL
 WHERE        (GUID = @Original_GUID);   
 SELECT GUID, PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBEMLP_POLL_PROFILES WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
@@ -77,6 +78,7 @@ SELECT GUID, PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE,
                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="VALIDATION_SQL" ColumnName="VALIDATION_SQL" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@VALIDATION_SQL" Precision="0" ProviderType="NVarChar" Scale="0" Size="1024" SourceColumn="VALIDATION_SQL" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROFILES" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
@@ -97,92 +99,166 @@ SELECT GUID, PROFILE_NAME, POLL_TYPE, EMAIL_CONF_ID, COMMENT, LAST_TICK, ACTIVE,
              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
              <Mapping SourceColumn="VALIDATION_SQL" DataSetColumn="VALIDATION_SQL" />
            </Mappings>
            <Sources />
          </TableAdapter>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBEMLP_POLL_PROCESSTableAdapter" GeneratorDataComponentClassName="TBEMLP_POLL_PROCESSTableAdapter" Name="TBEMLP_POLL_PROCESS" UserDataComponentName="TBEMLP_POLL_PROCESSTableAdapter">
            <MainSource>
-              <DbSource ConnectionRef="MyDatasetConnString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="MyDatasetConnString (MySettings)" DbObjectName="DD_ECM.dbo.TBEMLP_POLL_PROCESS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM TBEMLP_POLL_PROCESS
+                    <CommandText>DELETE FROM [TBEMLP_POLL_PROCESS] WHERE (([GUID] = @Original_GUID) AND ([PROCESS_NAME] = @Original_PROCESS_NAME) AND ([STEP_NAME] = @Original_STEP_NAME) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([COPY_2_HDD] = @Original_COPY_2_HDD) AND ([WM_IMPORT] = @Original_WM_IMPORT) AND ((@IsNull_WM_OBJEKTTYPE = 1 AND [WM_OBJEKTTYPE] IS NULL) OR ([WM_OBJEKTTYPE] = @Original_WM_OBJEKTTYPE)) AND ((@IsNull_WM_VECTOR_LOG = 1 AND [WM_VECTOR_LOG] IS NULL) OR ([WM_VECTOR_LOG] = @Original_WM_VECTOR_LOG)) AND ((@IsNull_WM_PATH = 1 AND [WM_PATH] IS NULL) OR ([WM_PATH] = @Original_WM_PATH)) AND ((@IsNull_WM_FILE_NAME = 1 AND [WM_FILE_NAME] IS NULL) OR ([WM_FILE_NAME] = @Original_WM_FILE_NAME)) AND ((@IsNull_WM_REFERENCE_INDEX = 1 AND [WM_REFERENCE_INDEX] IS NULL) OR ([WM_REFERENCE_INDEX] = @Original_WM_REFERENCE_INDEX)) AND ([PATH_EMAIL_TEMP] = @Original_PATH_EMAIL_TEMP) AND ([PATH_EMAIL_ERRORS] = @Original_PATH_EMAIL_ERRORS) AND ([DELETE_MAIL] = @Original_DELETE_MAIL) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_SEQUENCE = 1 AND [SEQUENCE] IS NULL) OR ([SEQUENCE] = @Original_SEQUENCE)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([WM_IDX_BODY_TEXT] = @Original_WM_IDX_BODY_TEXT) AND ([WM_IDX_BODY_SUBSTR_LENGTH] = @Original_WM_IDX_BODY_SUBSTR_LENGTH) AND ((@IsNull_PATH_ORIGINAL = 1 AND [PATH_ORIGINAL] IS NULL) OR ([PATH_ORIGINAL] = @Original_PATH_ORIGINAL)) AND ((@IsNull_ALLOW_XML_RECEIPTS = 1 AND [ALLOW_XML_RECEIPTS] IS NULL) OR ([ALLOW_XML_RECEIPTS] = @Original_ALLOW_XML_RECEIPTS)))</CommandText>
 WHERE        (GUID = @Original_GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_OBJEKTTYPE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_VECTOR_LOG" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_PATH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_FILE_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_REFERENCE_INDEX" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PATH_ORIGINAL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO TBEMLP_POLL_PROCESS
+                    <CommandText>INSERT INTO [TBEMLP_POLL_PROCESS] ([PROCESS_NAME], [STEP_NAME], [PROFILE_ID], [COPY_2_HDD], [WM_IMPORT], [WM_OBJEKTTYPE], [WM_VECTOR_LOG], [WM_PATH], [WM_FILE_NAME], [WM_REFERENCE_INDEX], [PATH_EMAIL_TEMP], [PATH_EMAIL_ERRORS], [DELETE_MAIL], [COMMENT], [ACTIVE], [SEQUENCE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [WM_IDX_BODY_TEXT], [WM_IDX_BODY_SUBSTR_LENGTH], [PATH_ORIGINAL], [ALLOW_XML_RECEIPTS]) VALUES (@PROCESS_NAME, @STEP_NAME, @PROFILE_ID, @COPY_2_HDD, @WM_IMPORT, @WM_OBJEKTTYPE, @WM_VECTOR_LOG, @WM_PATH, @WM_FILE_NAME, @WM_REFERENCE_INDEX, @PATH_EMAIL_TEMP, @PATH_EMAIL_ERRORS, @DELETE_MAIL, @COMMENT, @ACTIVE, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @WM_IDX_BODY_TEXT, @WM_IDX_BODY_SUBSTR_LENGTH, @PATH_ORIGINAL, @ALLOW_XML_RECEIPTS);
-                         (PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, 
+SELECT GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL, ALLOW_XML_RECEIPTS FROM TBEMLP_POLL_PROCESS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                         DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL)
 VALUES        (@PROCESS_NAME,@STEP_NAME,@PROFILE_ID,@COPY_2_HDD,@WM_IMPORT,@WM_OBJEKTTYPE,@WM_VECTOR_LOG,@WM_PATH,@WM_FILE_NAME,@WM_REFERENCE_INDEX,@PATH_EMAIL_TEMP,@PATH_EMAIL_ERRORS,@DELETE_MAIL,@COMMENT,@ACTIVE,@SEQUENCE,@ADDED_WHO,@WM_IDX_BODY_TEXT,@WM_IDX_BODY_SUBSTR_LENGTH,@PATH_ORIGINAL);  
 SELECT GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH FROM TBEMLP_POLL_PROCESS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_NAME" ColumnName="PROCESS_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="STEP_NAME" ColumnName="STEP_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_ID" ColumnName="PROFILE_ID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COPY_2_HDD" ColumnName="COPY_2_HDD" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IMPORT" ColumnName="WM_IMPORT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_OBJEKTTYPE" ColumnName="WM_OBJEKTTYPE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_VECTOR_LOG" ColumnName="WM_VECTOR_LOG" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_PATH" ColumnName="WM_PATH" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_FILE_NAME" ColumnName="WM_FILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_REFERENCE_INDEX" ColumnName="WM_REFERENCE_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PATH_EMAIL_TEMP" ColumnName="PATH_EMAIL_TEMP" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PATH_EMAIL_ERRORS" ColumnName="PATH_EMAIL_ERRORS" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="DELETE_MAIL" ColumnName="DELETE_MAIL" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IDX_BODY_TEXT" ColumnName="WM_IDX_BODY_TEXT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IDX_BODY_SUBSTR_LENGTH" ColumnName="WM_IDX_BODY_SUBSTR_LENGTH" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="PATH_ORIGINAL" ColumnName="PATH_ORIGINAL" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>SELECT        GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, 
-                         DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL
+                         DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL, ALLOW_XML_RECEIPTS
 FROM            TBEMLP_POLL_PROCESS</CommandText>
                    <Parameters />
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE       TBEMLP_POLL_PROCESS
+                    <CommandText>UPDATE [TBEMLP_POLL_PROCESS] SET [PROCESS_NAME] = @PROCESS_NAME, [STEP_NAME] = @STEP_NAME, [PROFILE_ID] = @PROFILE_ID, [COPY_2_HDD] = @COPY_2_HDD, [WM_IMPORT] = @WM_IMPORT, [WM_OBJEKTTYPE] = @WM_OBJEKTTYPE, [WM_VECTOR_LOG] = @WM_VECTOR_LOG, [WM_PATH] = @WM_PATH, [WM_FILE_NAME] = @WM_FILE_NAME, [WM_REFERENCE_INDEX] = @WM_REFERENCE_INDEX, [PATH_EMAIL_TEMP] = @PATH_EMAIL_TEMP, [PATH_EMAIL_ERRORS] = @PATH_EMAIL_ERRORS, [DELETE_MAIL] = @DELETE_MAIL, [COMMENT] = @COMMENT, [ACTIVE] = @ACTIVE, [SEQUENCE] = @SEQUENCE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [WM_IDX_BODY_TEXT] = @WM_IDX_BODY_TEXT, [WM_IDX_BODY_SUBSTR_LENGTH] = @WM_IDX_BODY_SUBSTR_LENGTH, [PATH_ORIGINAL] = @PATH_ORIGINAL, [ALLOW_XML_RECEIPTS] = @ALLOW_XML_RECEIPTS WHERE (([GUID] = @Original_GUID) AND ([PROCESS_NAME] = @Original_PROCESS_NAME) AND ([STEP_NAME] = @Original_STEP_NAME) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([COPY_2_HDD] = @Original_COPY_2_HDD) AND ([WM_IMPORT] = @Original_WM_IMPORT) AND ((@IsNull_WM_OBJEKTTYPE = 1 AND [WM_OBJEKTTYPE] IS NULL) OR ([WM_OBJEKTTYPE] = @Original_WM_OBJEKTTYPE)) AND ((@IsNull_WM_VECTOR_LOG = 1 AND [WM_VECTOR_LOG] IS NULL) OR ([WM_VECTOR_LOG] = @Original_WM_VECTOR_LOG)) AND ((@IsNull_WM_PATH = 1 AND [WM_PATH] IS NULL) OR ([WM_PATH] = @Original_WM_PATH)) AND ((@IsNull_WM_FILE_NAME = 1 AND [WM_FILE_NAME] IS NULL) OR ([WM_FILE_NAME] = @Original_WM_FILE_NAME)) AND ((@IsNull_WM_REFERENCE_INDEX = 1 AND [WM_REFERENCE_INDEX] IS NULL) OR ([WM_REFERENCE_INDEX] = @Original_WM_REFERENCE_INDEX)) AND ([PATH_EMAIL_TEMP] = @Original_PATH_EMAIL_TEMP) AND ([PATH_EMAIL_ERRORS] = @Original_PATH_EMAIL_ERRORS) AND ([DELETE_MAIL] = @Original_DELETE_MAIL) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_SEQUENCE = 1 AND [SEQUENCE] IS NULL) OR ([SEQUENCE] = @Original_SEQUENCE)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([WM_IDX_BODY_TEXT] = @Original_WM_IDX_BODY_TEXT) AND ([WM_IDX_BODY_SUBSTR_LENGTH] = @Original_WM_IDX_BODY_SUBSTR_LENGTH) AND ((@IsNull_PATH_ORIGINAL = 1 AND [PATH_ORIGINAL] IS NULL) OR ([PATH_ORIGINAL] = @Original_PATH_ORIGINAL)) AND ((@IsNull_ALLOW_XML_RECEIPTS = 1 AND [ALLOW_XML_RECEIPTS] IS NULL) OR ([ALLOW_XML_RECEIPTS] = @Original_ALLOW_XML_RECEIPTS)));
-SET                PROCESS_NAME = @PROCESS_NAME, STEP_NAME = @STEP_NAME, PROFILE_ID = @PROFILE_ID, COPY_2_HDD = @COPY_2_HDD, WM_IMPORT = @WM_IMPORT, WM_OBJEKTTYPE = @WM_OBJEKTTYPE, 
+SELECT GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL, ALLOW_XML_RECEIPTS FROM TBEMLP_POLL_PROCESS WHERE (GUID = @GUID)</CommandText>
                         WM_VECTOR_LOG = @WM_VECTOR_LOG, WM_PATH = @WM_PATH, WM_FILE_NAME = @WM_FILE_NAME, WM_REFERENCE_INDEX = @WM_REFERENCE_INDEX, PATH_EMAIL_TEMP = @PATH_EMAIL_TEMP, 
                         PATH_EMAIL_ERRORS = @PATH_EMAIL_ERRORS, DELETE_MAIL = @DELETE_MAIL, COMMENT = @COMMENT, ACTIVE = @ACTIVE, SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, 
                         WM_IDX_BODY_TEXT = @WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH = @WM_IDX_BODY_SUBSTR_LENGTH, PATH_ORIGINAL = @PATH_ORIGINAL
 WHERE        (GUID = @Original_GUID);  
 SELECT GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJEKTTYPE, WM_VECTOR_LOG, WM_PATH, WM_FILE_NAME, WM_REFERENCE_INDEX, PATH_EMAIL_TEMP, PATH_EMAIL_ERRORS, DELETE_MAIL, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, WM_IDX_BODY_TEXT, WM_IDX_BODY_SUBSTR_LENGTH FROM TBEMLP_POLL_PROCESS WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROCESS_NAME" ColumnName="PROCESS_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="STEP_NAME" ColumnName="STEP_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_ID" ColumnName="PROFILE_ID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="COPY_2_HDD" ColumnName="COPY_2_HDD" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IMPORT" ColumnName="WM_IMPORT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_OBJEKTTYPE" ColumnName="WM_OBJEKTTYPE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_VECTOR_LOG" ColumnName="WM_VECTOR_LOG" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_PATH" ColumnName="WM_PATH" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_FILE_NAME" ColumnName="WM_FILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WM_REFERENCE_INDEX" ColumnName="WM_REFERENCE_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PATH_EMAIL_TEMP" ColumnName="PATH_EMAIL_TEMP" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PATH_EMAIL_ERRORS" ColumnName="PATH_EMAIL_ERRORS" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="DELETE_MAIL" ColumnName="DELETE_MAIL" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IDX_BODY_TEXT" ColumnName="WM_IDX_BODY_TEXT" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WM_IDX_BODY_SUBSTR_LENGTH" ColumnName="WM_IDX_BODY_SUBSTR_LENGTH" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="PATH_ORIGINAL" ColumnName="PATH_ORIGINAL" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PROCESS_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROCESS_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_STEP_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="STEP_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_PROFILE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PROFILE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_COPY_2_HDD" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="COPY_2_HDD" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_WM_IMPORT" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="WM_IMPORT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_OBJEKTTYPE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_OBJEKTTYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_OBJEKTTYPE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_VECTOR_LOG" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_VECTOR_LOG" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_VECTOR_LOG" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_PATH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_PATH" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_PATH" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_FILE_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_WM_REFERENCE_INDEX" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_REFERENCE_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_REFERENCE_INDEX" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_EMAIL_TEMP" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_TEMP" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_EMAIL_ERRORS" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_EMAIL_ERRORS" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_DELETE_MAIL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="DELETE_MAIL" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_WM_IDX_BODY_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_TEXT" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_WM_IDX_BODY_SUBSTR_LENGTH" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PATH_ORIGINAL" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PATH_ORIGINAL" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PATH_ORIGINAL" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="true" SourceVersion="Original" />
                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ALLOW_XML_RECEIPTS" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ALLOW_XML_RECEIPTS" SourceColumnNullMapping="false" SourceVersion="Original" />
                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBEMLP_POLL_PROCESS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </UpdateCommand>
@@ -213,6 +289,7 @@ SELECT GUID, PROCESS_NAME, STEP_NAME, PROFILE_ID, COPY_2_HDD, WM_IMPORT, WM_OBJE
              <Mapping SourceColumn="WM_IDX_BODY_TEXT" DataSetColumn="WM_IDX_BODY_TEXT" />
              <Mapping SourceColumn="WM_IDX_BODY_SUBSTR_LENGTH" DataSetColumn="WM_IDX_BODY_SUBSTR_LENGTH" />
              <Mapping SourceColumn="PATH_ORIGINAL" DataSetColumn="PATH_ORIGINAL" />
              <Mapping SourceColumn="ALLOW_XML_RECEIPTS" DataSetColumn="ALLOW_XML_RECEIPTS" />
            </Mappings>
            <Sources />
          </TableAdapter>
@@ -602,431 +679,433 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A
      </DataSource>
    </xs:appinfo>
  </xs:annotation>
-  <xs:element name="MyDataset" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="MyDataset" msprop:Generator_UserDSName="MyDataset">
+  <xs:element name="MyDataset" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="MyDataset" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="MyDataset">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBEMLP_POLL_PROFILES" msprop:Generator_TableClassName="TBEMLP_POLL_PROFILESDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROFILES" msprop:Generator_RowChangedName="TBEMLP_POLL_PROFILESRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_PROFILES" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROFILESRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_PROFILESRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROFILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROFILESRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_PROFILESRow" msprop:Generator_UserTableName="TBEMLP_POLL_PROFILES" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROFILESRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_PROFILES" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROFILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROFILESRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROFILESRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROFILESRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_PROFILES" msprop:Generator_RowChangedName="TBEMLP_POLL_PROFILESRowChanged" msprop:Generator_UserTableName="TBEMLP_POLL_PROFILES" msprop:Generator_RowChangingName="TBEMLP_POLL_PROFILESRowChanging" msprop:Generator_RowClassName="TBEMLP_POLL_PROFILESRow" msprop:Generator_TableClassName="TBEMLP_POLL_PROFILESDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROFILES">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:int" />
-              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_UserColumnName="PROFILE_NAME">
+              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_UserColumnName="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="POLL_TYPE" msprop:Generator_ColumnVarNameInTable="columnPOLL_TYPE" msprop:Generator_ColumnPropNameInRow="POLL_TYPE" msprop:Generator_ColumnPropNameInTable="POLL_TYPEColumn" msprop:Generator_UserColumnName="POLL_TYPE">
+              <xs:element name="POLL_TYPE" msprop:Generator_ColumnPropNameInTable="POLL_TYPEColumn" msprop:Generator_ColumnPropNameInRow="POLL_TYPE" msprop:Generator_UserColumnName="POLL_TYPE" msprop:Generator_ColumnVarNameInTable="columnPOLL_TYPE" default="IMAP">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_CONF_ID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_CONF_ID" msprop:Generator_ColumnPropNameInRow="EMAIL_CONF_ID" msprop:Generator_ColumnPropNameInTable="EMAIL_CONF_IDColumn" msprop:Generator_UserColumnName="EMAIL_CONF_ID" type="xs:int" />
+              <xs:element name="EMAIL_CONF_ID" msprop:Generator_ColumnPropNameInTable="EMAIL_CONF_IDColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_CONF_ID" msprop:Generator_UserColumnName="EMAIL_CONF_ID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_CONF_ID" type="xs:int" />
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_UserColumnName="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="500" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_UserColumnName="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_UserColumnName="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" type="xs:boolean" default="false" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
              <xs:element name="VALIDATION_SQL" msprop:Generator_ColumnPropNameInTable="VALIDATION_SQLColumn" msprop:Generator_ColumnPropNameInRow="VALIDATION_SQL" msprop:Generator_UserColumnName="VALIDATION_SQL" msprop:Generator_ColumnVarNameInTable="columnVALIDATION_SQL" type="xs:string" default="" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBEMLP_POLL_PROCESS" msprop:Generator_TableClassName="TBEMLP_POLL_PROCESSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROCESS" msprop:Generator_RowChangedName="TBEMLP_POLL_PROCESSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_PROCESS" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROCESSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_PROCESSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROCESSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROCESSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_PROCESSRow" msprop:Generator_UserTableName="TBEMLP_POLL_PROCESS" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROCESSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_PROCESS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_PROCESSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_PROCESSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_PROCESSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_PROCESSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_PROCESS" msprop:Generator_RowChangedName="TBEMLP_POLL_PROCESSRowChanged" msprop:Generator_UserTableName="TBEMLP_POLL_PROCESS" msprop:Generator_RowChangingName="TBEMLP_POLL_PROCESSRowChanging" msprop:Generator_RowClassName="TBEMLP_POLL_PROCESSRow" msprop:Generator_TableClassName="TBEMLP_POLL_PROCESSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_PROCESS">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:int" />
-              <xs:element name="PROCESS_NAME" msprop:Generator_ColumnVarNameInTable="columnPROCESS_NAME" msprop:Generator_ColumnPropNameInRow="PROCESS_NAME" msprop:Generator_ColumnPropNameInTable="PROCESS_NAMEColumn" msprop:Generator_UserColumnName="PROCESS_NAME">
+              <xs:element name="PROCESS_NAME" msprop:Generator_ColumnPropNameInTable="PROCESS_NAMEColumn" msprop:Generator_ColumnPropNameInRow="PROCESS_NAME" msprop:Generator_UserColumnName="PROCESS_NAME" msprop:Generator_ColumnVarNameInTable="columnPROCESS_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_UserColumnName="STEP_NAME">
+              <xs:element name="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_UserColumnName="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PROFILE_ID" msprop:Generator_ColumnVarNameInTable="columnPROFILE_ID" msprop:Generator_ColumnPropNameInRow="PROFILE_ID" msprop:Generator_ColumnPropNameInTable="PROFILE_IDColumn" msprop:Generator_UserColumnName="PROFILE_ID" type="xs:int" />
+              <xs:element name="PROFILE_ID" msprop:Generator_ColumnPropNameInTable="PROFILE_IDColumn" msprop:Generator_ColumnPropNameInRow="PROFILE_ID" msprop:Generator_UserColumnName="PROFILE_ID" msprop:Generator_ColumnVarNameInTable="columnPROFILE_ID" type="xs:int" />
-              <xs:element name="COPY_2_HDD" msprop:Generator_ColumnVarNameInTable="columnCOPY_2_HDD" msprop:Generator_ColumnPropNameInRow="COPY_2_HDD" msprop:Generator_ColumnPropNameInTable="COPY_2_HDDColumn" msprop:Generator_UserColumnName="COPY_2_HDD" type="xs:boolean" default="false" />
+              <xs:element name="COPY_2_HDD" msprop:Generator_ColumnPropNameInTable="COPY_2_HDDColumn" msprop:Generator_ColumnPropNameInRow="COPY_2_HDD" msprop:Generator_UserColumnName="COPY_2_HDD" msprop:Generator_ColumnVarNameInTable="columnCOPY_2_HDD" type="xs:boolean" default="false" />
-              <xs:element name="WM_IMPORT" msprop:Generator_ColumnVarNameInTable="columnWM_IMPORT" msprop:Generator_ColumnPropNameInRow="WM_IMPORT" msprop:Generator_ColumnPropNameInTable="WM_IMPORTColumn" msprop:Generator_UserColumnName="WM_IMPORT" type="xs:boolean" default="false" />
+              <xs:element name="WM_IMPORT" msprop:Generator_ColumnPropNameInTable="WM_IMPORTColumn" msprop:Generator_ColumnPropNameInRow="WM_IMPORT" msprop:Generator_UserColumnName="WM_IMPORT" msprop:Generator_ColumnVarNameInTable="columnWM_IMPORT" type="xs:boolean" default="false" />
-              <xs:element name="WM_OBJEKTTYPE" msprop:Generator_ColumnVarNameInTable="columnWM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInRow="WM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInTable="WM_OBJEKTTYPEColumn" msprop:Generator_UserColumnName="WM_OBJEKTTYPE" minOccurs="0">
+              <xs:element name="WM_OBJEKTTYPE" msprop:Generator_ColumnPropNameInTable="WM_OBJEKTTYPEColumn" msprop:Generator_ColumnPropNameInRow="WM_OBJEKTTYPE" msprop:Generator_UserColumnName="WM_OBJEKTTYPE" msprop:Generator_ColumnVarNameInTable="columnWM_OBJEKTTYPE" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_VECTOR_LOG" msprop:Generator_ColumnVarNameInTable="columnWM_VECTOR_LOG" msprop:Generator_ColumnPropNameInRow="WM_VECTOR_LOG" msprop:Generator_ColumnPropNameInTable="WM_VECTOR_LOGColumn" msprop:Generator_UserColumnName="WM_VECTOR_LOG" minOccurs="0">
+              <xs:element name="WM_VECTOR_LOG" msprop:Generator_ColumnPropNameInTable="WM_VECTOR_LOGColumn" msprop:Generator_ColumnPropNameInRow="WM_VECTOR_LOG" msprop:Generator_UserColumnName="WM_VECTOR_LOG" msprop:Generator_ColumnVarNameInTable="columnWM_VECTOR_LOG" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_PATH" msprop:Generator_ColumnVarNameInTable="columnWM_PATH" msprop:Generator_ColumnPropNameInRow="WM_PATH" msprop:Generator_ColumnPropNameInTable="WM_PATHColumn" msprop:Generator_UserColumnName="WM_PATH" minOccurs="0">
+              <xs:element name="WM_PATH" msprop:Generator_ColumnPropNameInTable="WM_PATHColumn" msprop:Generator_ColumnPropNameInRow="WM_PATH" msprop:Generator_UserColumnName="WM_PATH" msprop:Generator_ColumnVarNameInTable="columnWM_PATH" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_FILE_NAME" msprop:Generator_ColumnVarNameInTable="columnWM_FILE_NAME" msprop:Generator_ColumnPropNameInRow="WM_FILE_NAME" msprop:Generator_ColumnPropNameInTable="WM_FILE_NAMEColumn" msprop:Generator_UserColumnName="WM_FILE_NAME" minOccurs="0">
+              <xs:element name="WM_FILE_NAME" msprop:Generator_ColumnPropNameInTable="WM_FILE_NAMEColumn" msprop:Generator_ColumnPropNameInRow="WM_FILE_NAME" msprop:Generator_UserColumnName="WM_FILE_NAME" msprop:Generator_ColumnVarNameInTable="columnWM_FILE_NAME" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_REFERENCE_INDEX" msprop:Generator_ColumnVarNameInTable="columnWM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInRow="WM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInTable="WM_REFERENCE_INDEXColumn" msprop:Generator_UserColumnName="WM_REFERENCE_INDEX" minOccurs="0">
+              <xs:element name="WM_REFERENCE_INDEX" msprop:Generator_ColumnPropNameInTable="WM_REFERENCE_INDEXColumn" msprop:Generator_ColumnPropNameInRow="WM_REFERENCE_INDEX" msprop:Generator_UserColumnName="WM_REFERENCE_INDEX" msprop:Generator_ColumnVarNameInTable="columnWM_REFERENCE_INDEX" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
+              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
+              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="DELETE_MAIL" msprop:Generator_ColumnVarNameInTable="columnDELETE_MAIL" msprop:Generator_ColumnPropNameInRow="DELETE_MAIL" msprop:Generator_ColumnPropNameInTable="DELETE_MAILColumn" msprop:Generator_UserColumnName="DELETE_MAIL" type="xs:boolean" default="false" />
+              <xs:element name="DELETE_MAIL" msprop:Generator_ColumnPropNameInTable="DELETE_MAILColumn" msprop:Generator_ColumnPropNameInRow="DELETE_MAIL" msprop:Generator_UserColumnName="DELETE_MAIL" msprop:Generator_ColumnVarNameInTable="columnDELETE_MAIL" type="xs:boolean" default="false" />
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_UserColumnName="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="500" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_UserColumnName="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="WM_IDX_BODY_TEXT" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_TEXTColumn" msprop:Generator_UserColumnName="WM_IDX_BODY_TEXT" default="">
+              <xs:element name="WM_IDX_BODY_TEXT" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_TEXTColumn" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_TEXT" msprop:Generator_UserColumnName="WM_IDX_BODY_TEXT" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_TEXT" default="">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_SUBSTR_LENGTHColumn" msprop:Generator_UserColumnName="WM_IDX_BODY_SUBSTR_LENGTH" type="xs:int" default="0" />
+              <xs:element name="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnPropNameInTable="WM_IDX_BODY_SUBSTR_LENGTHColumn" msprop:Generator_ColumnPropNameInRow="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_UserColumnName="WM_IDX_BODY_SUBSTR_LENGTH" msprop:Generator_ColumnVarNameInTable="columnWM_IDX_BODY_SUBSTR_LENGTH" type="xs:int" default="0" />
-              <xs:element name="PATH_ORIGINAL" msprop:Generator_ColumnVarNameInTable="columnPATH_ORIGINAL" msprop:Generator_ColumnPropNameInRow="PATH_ORIGINAL" msprop:Generator_ColumnPropNameInTable="PATH_ORIGINALColumn" msprop:Generator_UserColumnName="PATH_ORIGINAL" minOccurs="0">
+              <xs:element name="PATH_ORIGINAL" msprop:Generator_ColumnPropNameInTable="PATH_ORIGINALColumn" msprop:Generator_ColumnPropNameInRow="PATH_ORIGINAL" msprop:Generator_UserColumnName="PATH_ORIGINAL" msprop:Generator_ColumnVarNameInTable="columnPATH_ORIGINAL" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
              <xs:element name="ALLOW_XML_RECEIPTS" msprop:Generator_ColumnPropNameInRow="ALLOW_XML_RECEIPTS" msprop:Generator_ColumnPropNameInTable="ALLOW_XML_RECEIPTSColumn" msprop:Generator_ColumnVarNameInTable="columnALLOW_XML_RECEIPTS" msprop:Generator_UserColumnName="ALLOW_XML_RECEIPTS" type="xs:boolean" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBEMLP_POLL_STEPS" msprop:Generator_TableClassName="TBEMLP_POLL_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_STEPSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_STEPS" msprop:Generator_RowDeletingName="TBEMLP_POLL_STEPSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_STEPSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_STEPSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_STEPSRow" msprop:Generator_UserTableName="TBEMLP_POLL_STEPS" msprop:Generator_RowEvArgName="TBEMLP_POLL_STEPSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_STEPS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_STEPSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_STEPSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_STEPSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_STEPSRowChanged" msprop:Generator_UserTableName="TBEMLP_POLL_STEPS" msprop:Generator_RowChangingName="TBEMLP_POLL_STEPSRowChanging" msprop:Generator_RowClassName="TBEMLP_POLL_STEPSRow" msprop:Generator_TableClassName="TBEMLP_POLL_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_STEPS">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:int" />
-              <xs:element name="PROCESS_ID" msprop:Generator_ColumnVarNameInTable="columnPROCESS_ID" msprop:Generator_ColumnPropNameInRow="PROCESS_ID" msprop:Generator_ColumnPropNameInTable="PROCESS_IDColumn" msprop:Generator_UserColumnName="PROCESS_ID" type="xs:int" />
+              <xs:element name="PROCESS_ID" msprop:Generator_ColumnPropNameInTable="PROCESS_IDColumn" msprop:Generator_ColumnPropNameInRow="PROCESS_ID" msprop:Generator_UserColumnName="PROCESS_ID" msprop:Generator_ColumnVarNameInTable="columnPROCESS_ID" type="xs:int" />
-              <xs:element name="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_UserColumnName="STEP_NAME">
+              <xs:element name="STEP_NAME" msprop:Generator_ColumnPropNameInTable="STEP_NAMEColumn" msprop:Generator_ColumnPropNameInRow="STEP_NAME" msprop:Generator_UserColumnName="STEP_NAME" msprop:Generator_ColumnVarNameInTable="columnSTEP_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="KEYWORDS_BODY" msprop:Generator_ColumnVarNameInTable="columnKEYWORDS_BODY" msprop:Generator_ColumnPropNameInRow="KEYWORDS_BODY" msprop:Generator_ColumnPropNameInTable="KEYWORDS_BODYColumn" msprop:Generator_UserColumnName="KEYWORDS_BODY" minOccurs="0">
+              <xs:element name="KEYWORDS_BODY" msprop:Generator_ColumnPropNameInTable="KEYWORDS_BODYColumn" msprop:Generator_ColumnPropNameInRow="KEYWORDS_BODY" msprop:Generator_UserColumnName="KEYWORDS_BODY" msprop:Generator_ColumnVarNameInTable="columnKEYWORDS_BODY" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_UserColumnName="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="500" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_UserColumnName="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" minOccurs="0" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_TableClassName="TBEMLP_POLL_INDEXING_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_INDEXING_STEPSRowChanged" msprop:Generator_TablePropName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowDeletingName="TBEMLP_POLL_INDEXING_STEPSRowDeleting" msprop:Generator_RowChangingName="TBEMLP_POLL_INDEXING_STEPSRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_INDEXING_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_INDEXING_STEPSRowDeleted" msprop:Generator_RowClassName="TBEMLP_POLL_INDEXING_STEPSRow" msprop:Generator_UserTableName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowEvArgName="TBEMLP_POLL_INDEXING_STEPSRowChangeEvent">
+        <xs:element name="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowEvHandlerName="TBEMLP_POLL_INDEXING_STEPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_POLL_INDEXING_STEPSRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_POLL_INDEXING_STEPSRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_POLL_INDEXING_STEPSRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowChangedName="TBEMLP_POLL_INDEXING_STEPSRowChanged" msprop:Generator_UserTableName="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RowChangingName="TBEMLP_POLL_INDEXING_STEPSRowChanging" msprop:Generator_RowClassName="TBEMLP_POLL_INDEXING_STEPSRow" msprop:Generator_TableClassName="TBEMLP_POLL_INDEXING_STEPSDataTable" msprop:Generator_TableVarName="tableTBEMLP_POLL_INDEXING_STEPS">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:short" />
-              <xs:element name="STEP_ID" msprop:Generator_ColumnVarNameInTable="columnSTEP_ID" msprop:Generator_ColumnPropNameInRow="STEP_ID" msprop:Generator_ColumnPropNameInTable="STEP_IDColumn" msprop:Generator_UserColumnName="STEP_ID" type="xs:int" />
+              <xs:element name="STEP_ID" msprop:Generator_ColumnPropNameInTable="STEP_IDColumn" msprop:Generator_ColumnPropNameInRow="STEP_ID" msprop:Generator_UserColumnName="STEP_ID" msprop:Generator_ColumnVarNameInTable="columnSTEP_ID" type="xs:int" />
-              <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
+              <xs:element name="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_UserColumnName="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="INDEXVALUE" msprop:Generator_ColumnVarNameInTable="columnINDEXVALUE" msprop:Generator_ColumnPropNameInRow="INDEXVALUE" msprop:Generator_ColumnPropNameInTable="INDEXVALUEColumn" msprop:Generator_UserColumnName="INDEXVALUE">
+              <xs:element name="INDEXVALUE" msprop:Generator_ColumnPropNameInTable="INDEXVALUEColumn" msprop:Generator_ColumnPropNameInRow="INDEXVALUE" msprop:Generator_UserColumnName="INDEXVALUE" msprop:Generator_ColumnVarNameInTable="columnINDEXVALUE">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_UserColumnName="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnVarNameInTable="columnUSE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInRow="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInTable="USE_FOR_DIRECT_ANSWERColumn" msprop:Generator_UserColumnName="USE_FOR_DIRECT_ANSWER" type="xs:boolean" default="false" />
+              <xs:element name="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnPropNameInTable="USE_FOR_DIRECT_ANSWERColumn" msprop:Generator_ColumnPropNameInRow="USE_FOR_DIRECT_ANSWER" msprop:Generator_UserColumnName="USE_FOR_DIRECT_ANSWER" msprop:Generator_ColumnVarNameInTable="columnUSE_FOR_DIRECT_ANSWER" type="xs:boolean" default="false" />
-              <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" default="0" minOccurs="0" />
+              <xs:element name="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_UserColumnName="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" type="xs:int" default="0" minOccurs="0" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBEMLP_HISTORY" msprop:Generator_TableClassName="TBEMLP_HISTORYDataTable" msprop:Generator_TableVarName="tableTBEMLP_HISTORY" msprop:Generator_TablePropName="TBEMLP_HISTORY" msprop:Generator_RowDeletingName="TBEMLP_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBEMLP_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_HISTORYRowDeleted" msprop:Generator_UserTableName="TBEMLP_HISTORY" msprop:Generator_RowChangedName="TBEMLP_HISTORYRowChanged" msprop:Generator_RowEvArgName="TBEMLP_HISTORYRowChangeEvent" msprop:Generator_RowClassName="TBEMLP_HISTORYRow">
+        <xs:element name="TBEMLP_HISTORY" msprop:Generator_RowEvHandlerName="TBEMLP_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_HISTORYRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_HISTORYRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_HISTORYRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_HISTORY" msprop:Generator_RowChangedName="TBEMLP_HISTORYRowChanged" msprop:Generator_UserTableName="TBEMLP_HISTORY" msprop:Generator_RowChangingName="TBEMLP_HISTORYRowChanging" msprop:Generator_RowClassName="TBEMLP_HISTORYRow" msprop:Generator_TableClassName="TBEMLP_HISTORYDataTable" msprop:Generator_TableVarName="tableTBEMLP_HISTORY">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:int" />
-              <xs:element name="WORK_PROCESS" msprop:Generator_ColumnVarNameInTable="columnWORK_PROCESS" msprop:Generator_ColumnPropNameInRow="WORK_PROCESS" msprop:Generator_ColumnPropNameInTable="WORK_PROCESSColumn" msprop:Generator_UserColumnName="WORK_PROCESS" minOccurs="0">
+              <xs:element name="WORK_PROCESS" msprop:Generator_ColumnPropNameInTable="WORK_PROCESSColumn" msprop:Generator_ColumnPropNameInRow="WORK_PROCESS" msprop:Generator_UserColumnName="WORK_PROCESS" msprop:Generator_ColumnVarNameInTable="columnWORK_PROCESS" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_MSGID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_MSGID" msprop:Generator_ColumnPropNameInRow="EMAIL_MSGID" msprop:Generator_ColumnPropNameInTable="EMAIL_MSGIDColumn" msprop:Generator_UserColumnName="EMAIL_MSGID">
+              <xs:element name="EMAIL_MSGID" msprop:Generator_ColumnPropNameInTable="EMAIL_MSGIDColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_MSGID" msprop:Generator_UserColumnName="EMAIL_MSGID" msprop:Generator_ColumnVarNameInTable="columnEMAIL_MSGID">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="500" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_SUBJECT" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBJECT" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBJECT" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBJECTColumn" msprop:Generator_UserColumnName="EMAIL_SUBJECT" minOccurs="0">
+              <xs:element name="EMAIL_SUBJECT" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBJECTColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBJECT" msprop:Generator_UserColumnName="EMAIL_SUBJECT" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBJECT" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="2147483647" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_DATE" msprop:Generator_ColumnVarNameInTable="columnEMAIL_DATE" msprop:Generator_ColumnPropNameInRow="EMAIL_DATE" msprop:Generator_ColumnPropNameInTable="EMAIL_DATEColumn" msprop:Generator_UserColumnName="EMAIL_DATE" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="EMAIL_DATE" msprop:Generator_ColumnPropNameInTable="EMAIL_DATEColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_DATE" msprop:Generator_UserColumnName="EMAIL_DATE" msprop:Generator_ColumnVarNameInTable="columnEMAIL_DATE" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="EMAIL_BODY" msprop:Generator_ColumnVarNameInTable="columnEMAIL_BODY" msprop:Generator_ColumnPropNameInRow="EMAIL_BODY" msprop:Generator_ColumnPropNameInTable="EMAIL_BODYColumn" msprop:Generator_UserColumnName="EMAIL_BODY" minOccurs="0">
+              <xs:element name="EMAIL_BODY" msprop:Generator_ColumnPropNameInTable="EMAIL_BODYColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_BODY" msprop:Generator_UserColumnName="EMAIL_BODY" msprop:Generator_ColumnVarNameInTable="columnEMAIL_BODY" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="2147483647" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_SUBSTRING1" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING1Column" msprop:Generator_UserColumnName="EMAIL_SUBSTRING1" minOccurs="0">
+              <xs:element name="EMAIL_SUBSTRING1" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING1Column" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING1" msprop:Generator_UserColumnName="EMAIL_SUBSTRING1" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING1" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="2000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_SUBSTRING2" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING2Column" msprop:Generator_UserColumnName="EMAIL_SUBSTRING2" minOccurs="0">
+              <xs:element name="EMAIL_SUBSTRING2" msprop:Generator_ColumnPropNameInTable="EMAIL_SUBSTRING2Column" msprop:Generator_ColumnPropNameInRow="EMAIL_SUBSTRING2" msprop:Generator_UserColumnName="EMAIL_SUBSTRING2" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SUBSTRING2" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="2000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+              <xs:element name="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_UserColumnName="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="500" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBEMLP_CONFIG" msprop:Generator_TableClassName="TBEMLP_CONFIGDataTable" msprop:Generator_TableVarName="tableTBEMLP_CONFIG" msprop:Generator_TablePropName="TBEMLP_CONFIG" msprop:Generator_RowDeletingName="TBEMLP_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBEMLP_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBEMLP_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_CONFIGRowDeleted" msprop:Generator_UserTableName="TBEMLP_CONFIG" msprop:Generator_RowChangedName="TBEMLP_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBEMLP_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBEMLP_CONFIGRow">
+        <xs:element name="TBEMLP_CONFIG" msprop:Generator_RowEvHandlerName="TBEMLP_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEMLP_CONFIGRowDeleted" msprop:Generator_RowDeletingName="TBEMLP_CONFIGRowDeleting" msprop:Generator_RowEvArgName="TBEMLP_CONFIGRowChangeEvent" msprop:Generator_TablePropName="TBEMLP_CONFIG" msprop:Generator_RowChangedName="TBEMLP_CONFIGRowChanged" msprop:Generator_UserTableName="TBEMLP_CONFIG" msprop:Generator_RowChangingName="TBEMLP_CONFIGRowChanging" msprop:Generator_RowClassName="TBEMLP_CONFIGRow" msprop:Generator_TableClassName="TBEMLP_CONFIGDataTable" msprop:Generator_TableVarName="tableTBEMLP_CONFIG">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
+              <xs:element name="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:unsignedByte" />
-              <xs:element name="FONT_BODY" msprop:Generator_ColumnVarNameInTable="columnFONT_BODY" msprop:Generator_ColumnPropNameInRow="FONT_BODY" msprop:Generator_ColumnPropNameInTable="FONT_BODYColumn" msprop:Generator_UserColumnName="FONT_BODY">
+              <xs:element name="FONT_BODY" msprop:Generator_ColumnPropNameInTable="FONT_BODYColumn" msprop:Generator_ColumnPropNameInRow="FONT_BODY" msprop:Generator_UserColumnName="FONT_BODY" msprop:Generator_ColumnVarNameInTable="columnFONT_BODY">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="LOG_ERRORS_ONLY" msprop:Generator_ColumnVarNameInTable="columnLOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInRow="LOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInTable="LOG_ERRORS_ONLYColumn" msprop:Generator_UserColumnName="LOG_ERRORS_ONLY" type="xs:boolean" />
+              <xs:element name="LOG_ERRORS_ONLY" msprop:Generator_ColumnPropNameInTable="LOG_ERRORS_ONLYColumn" msprop:Generator_ColumnPropNameInRow="LOG_ERRORS_ONLY" msprop:Generator_UserColumnName="LOG_ERRORS_ONLY" msprop:Generator_ColumnVarNameInTable="columnLOG_ERRORS_ONLY" type="xs:boolean" />
-              <xs:element name="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnVarNameInTable="columnCHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInRow="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInTable="CHECK_INTERVALL_MINUTESColumn" msprop:Generator_UserColumnName="CHECK_INTERVALL_MINUTES" type="xs:int" />
+              <xs:element name="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnPropNameInTable="CHECK_INTERVALL_MINUTESColumn" msprop:Generator_ColumnPropNameInRow="CHECK_INTERVALL_MINUTES" msprop:Generator_UserColumnName="CHECK_INTERVALL_MINUTES" msprop:Generator_ColumnVarNameInTable="columnCHECK_INTERVALL_MINUTES" type="xs:int" />
-              <xs:element name="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_UserColumnName="LAST_TICK" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="LAST_TICK" msprop:Generator_ColumnPropNameInTable="LAST_TICKColumn" msprop:Generator_ColumnPropNameInRow="LAST_TICK" msprop:Generator_UserColumnName="LAST_TICK" msprop:Generator_ColumnVarNameInTable="columnLAST_TICK" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP">
+              <xs:element name="PATH_EMAIL_TEMP" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_TEMPColumn" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_TEMP" msprop:Generator_UserColumnName="PATH_EMAIL_TEMP" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_TEMP">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS">
+              <xs:element name="PATH_EMAIL_ERRORS" msprop:Generator_ColumnPropNameInTable="PATH_EMAIL_ERRORSColumn" msprop:Generator_ColumnPropNameInRow="PATH_EMAIL_ERRORS" msprop:Generator_UserColumnName="PATH_EMAIL_ERRORS" msprop:Generator_ColumnVarNameInTable="columnPATH_EMAIL_ERRORS">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="WM_CON_STRING" msprop:Generator_ColumnVarNameInTable="columnWM_CON_STRING" msprop:Generator_ColumnPropNameInRow="WM_CON_STRING" msprop:Generator_ColumnPropNameInTable="WM_CON_STRINGColumn" msprop:Generator_UserColumnName="WM_CON_STRING">
+              <xs:element name="WM_CON_STRING" msprop:Generator_ColumnPropNameInTable="WM_CON_STRINGColumn" msprop:Generator_ColumnPropNameInRow="WM_CON_STRING" msprop:Generator_UserColumnName="WM_CON_STRING" msprop:Generator_ColumnVarNameInTable="columnWM_CON_STRING">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow">
+        <xs:element name="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowEvHandlerName="TBDD_EMAIL_ACCOUNTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EMAIL_ACCOUNTRowDeleted" msprop:Generator_RowDeletingName="TBDD_EMAIL_ACCOUNTRowDeleting" msprop:Generator_RowEvArgName="TBDD_EMAIL_ACCOUNTRowChangeEvent" msprop:Generator_TablePropName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangedName="TBDD_EMAIL_ACCOUNTRowChanged" msprop:Generator_UserTableName="TBDD_EMAIL_ACCOUNT" msprop:Generator_RowChangingName="TBDD_EMAIL_ACCOUNTRowChanging" msprop:Generator_RowClassName="TBDD_EMAIL_ACCOUNTRow" msprop:Generator_TableClassName="TBDD_EMAIL_ACCOUNTDataTable" msprop:Generator_TableVarName="tableTBDD_EMAIL_ACCOUNT">
          <xs:complexType>
            <xs:sequence>
-              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
+              <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_UserColumnName="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" type="xs:int" />
-              <xs:element name="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_UserColumnName="NAME" minOccurs="0">
+              <xs:element name="NAME" msprop:Generator_ColumnPropNameInTable="NAMEColumn" msprop:Generator_ColumnPropNameInRow="NAME" msprop:Generator_UserColumnName="NAME" msprop:Generator_ColumnVarNameInTable="columnNAME" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_FROM" msprop:Generator_ColumnVarNameInTable="columnEMAIL_FROM" msprop:Generator_ColumnPropNameInRow="EMAIL_FROM" msprop:Generator_ColumnPropNameInTable="EMAIL_FROMColumn" msprop:Generator_UserColumnName="EMAIL_FROM">
+              <xs:element name="EMAIL_FROM" msprop:Generator_ColumnPropNameInTable="EMAIL_FROMColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_FROM" msprop:Generator_UserColumnName="EMAIL_FROM" msprop:Generator_ColumnVarNameInTable="columnEMAIL_FROM">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_SMTP" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SMTP" msprop:Generator_ColumnPropNameInRow="EMAIL_SMTP" msprop:Generator_ColumnPropNameInTable="EMAIL_SMTPColumn" msprop:Generator_UserColumnName="EMAIL_SMTP">
+              <xs:element name="EMAIL_SMTP" msprop:Generator_ColumnPropNameInTable="EMAIL_SMTPColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_SMTP" msprop:Generator_UserColumnName="EMAIL_SMTP" msprop:Generator_ColumnVarNameInTable="columnEMAIL_SMTP">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_USER" msprop:Generator_ColumnVarNameInTable="columnEMAIL_USER" msprop:Generator_ColumnPropNameInRow="EMAIL_USER" msprop:Generator_ColumnPropNameInTable="EMAIL_USERColumn" msprop:Generator_UserColumnName="EMAIL_USER">
+              <xs:element name="EMAIL_USER" msprop:Generator_ColumnPropNameInTable="EMAIL_USERColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_USER" msprop:Generator_UserColumnName="EMAIL_USER" msprop:Generator_ColumnVarNameInTable="columnEMAIL_USER">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="EMAIL_PW" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_UserColumnName="EMAIL_PW" default="">
+              <xs:element name="EMAIL_PW" msprop:Generator_ColumnPropNameInTable="EMAIL_PWColumn" msprop:Generator_ColumnPropNameInRow="EMAIL_PW" msprop:Generator_UserColumnName="EMAIL_PW" msprop:Generator_ColumnVarNameInTable="columnEMAIL_PW" default="">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PORT" msprop:Generator_ColumnVarNameInTable="columnPORT" msprop:Generator_ColumnPropNameInRow="PORT" msprop:Generator_ColumnPropNameInTable="PORTColumn" msprop:Generator_UserColumnName="PORT" type="xs:int" default="25" />
+              <xs:element name="PORT" msprop:Generator_ColumnPropNameInTable="PORTColumn" msprop:Generator_ColumnPropNameInRow="PORT" msprop:Generator_UserColumnName="PORT" msprop:Generator_ColumnVarNameInTable="columnPORT" type="xs:int" default="25" />
-              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="false" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_UserColumnName="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" type="xs:boolean" default="false" />
-              <xs:element name="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_UserColumnName="ADDED_WHO" minOccurs="0">
+              <xs:element name="ADDED_WHO" msprop:Generator_ColumnPropNameInTable="ADDED_WHOColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHO" msprop:Generator_UserColumnName="ADDED_WHO" msprop:Generator_ColumnVarNameInTable="columnADDED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_UserColumnName="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_UserColumnName="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" default="1900-01-01T00:00:00+01:00" minOccurs="0" />
+              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_UserColumnName="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" type="xs:dateTime" default="1900-01-01T00:00:00+01:00" minOccurs="0" />
-              <xs:element name="SSL_AUTH" msprop:Generator_ColumnVarNameInTable="columnSSL_AUTH" msprop:Generator_ColumnPropNameInRow="SSL_AUTH" msprop:Generator_ColumnPropNameInTable="SSL_AUTHColumn" msprop:Generator_UserColumnName="SSL_AUTH" type="xs:boolean" default="true" />
+              <xs:element name="SSL_AUTH" msprop:Generator_ColumnPropNameInTable="SSL_AUTHColumn" msprop:Generator_ColumnPropNameInRow="SSL_AUTH" msprop:Generator_UserColumnName="SSL_AUTH" msprop:Generator_ColumnVarNameInTable="columnSSL_AUTH" type="xs:boolean" default="true" />
-              <xs:element name="AUTH_TYPE" msprop:Generator_ColumnVarNameInTable="columnAUTH_TYPE" msprop:Generator_ColumnPropNameInRow="AUTH_TYPE" msprop:Generator_ColumnPropNameInTable="AUTH_TYPEColumn" msprop:Generator_UserColumnName="AUTH_TYPE" default="SSL" minOccurs="0">
+              <xs:element name="AUTH_TYPE" msprop:Generator_ColumnPropNameInTable="AUTH_TYPEColumn" msprop:Generator_ColumnPropNameInRow="AUTH_TYPE" msprop:Generator_UserColumnName="AUTH_TYPE" msprop:Generator_ColumnVarNameInTable="columnAUTH_TYPE" default="SSL" minOccurs="0">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="PORT_IN" msprop:Generator_ColumnVarNameInTable="columnPORT_IN" msprop:Generator_ColumnPropNameInRow="PORT_IN" msprop:Generator_ColumnPropNameInTable="PORT_INColumn" msprop:Generator_UserColumnName="PORT_IN" type="xs:int" default="25" />
+              <xs:element name="PORT_IN" msprop:Generator_ColumnPropNameInTable="PORT_INColumn" msprop:Generator_ColumnPropNameInRow="PORT_IN" msprop:Generator_UserColumnName="PORT_IN" msprop:Generator_ColumnVarNameInTable="columnPORT_IN" type="xs:int" default="25" />
-              <xs:element name="ARCHIVE_FOLDER" msprop:Generator_ColumnVarNameInTable="columnARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInRow="ARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInTable="ARCHIVE_FOLDERColumn" msprop:Generator_UserColumnName="ARCHIVE_FOLDER" default="">
+              <xs:element name="ARCHIVE_FOLDER" msprop:Generator_ColumnPropNameInTable="ARCHIVE_FOLDERColumn" msprop:Generator_ColumnPropNameInRow="ARCHIVE_FOLDER" msprop:Generator_UserColumnName="ARCHIVE_FOLDER" msprop:Generator_ColumnVarNameInTable="columnARCHIVE_FOLDER" default="">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="100" />
@@ -1069,9 +1148,9 @@ SELECT GUID, NAME, EMAIL_FROM, EMAIL_SMTP, EMAIL_USER, EMAIL_PW, PORT, ACTIVE, A
  </xs:element>
  <xs:annotation>
    <xs:appinfo>
-      <msdata:Relationship name="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msdata:parent="TBEMLP_POLL_PROFILES" msdata:child="TBEMLP_POLL_PROCESS" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_PROCESS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_PROCESSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROFILES" msprop:Generator_ParentPropName="TBEMLP_POLL_PROFILESRow" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" msdata:parent="TBEMLP_POLL_PROFILES" msdata:child="TBEMLP_POLL_PROCESS" msdata:parentkey="GUID" msdata:childkey="PROFILE_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROFILES" msprop:Generator_UserChildTable="TBEMLP_POLL_PROCESS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_PROCESS_PROFILE_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_PROCESSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_PROFILESRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_PROCESS_PROFILE_ID" />
-      <msdata:Relationship name="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msdata:parent="TBEMLP_POLL_PROCESS" msdata:child="TBEMLP_POLL_STEPS" msdata:parentkey="GUID" msdata:childkey="PROCESS_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_STEPS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_STEPSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROCESS" msprop:Generator_ParentPropName="TBEMLP_POLL_PROCESSRow" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_STEPS_PROCESS_ID" msdata:parent="TBEMLP_POLL_PROCESS" msdata:child="TBEMLP_POLL_STEPS" msdata:parentkey="GUID" msdata:childkey="PROCESS_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_PROCESS" msprop:Generator_UserChildTable="TBEMLP_POLL_STEPS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_STEPS_PROCESS_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_STEPSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_PROCESSRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_STEPS_PROCESS_ID" />
-      <msdata:Relationship name="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msdata:parent="TBEMLP_POLL_STEPS" msdata:child="TBEMLP_POLL_INDEXING_STEPS" msdata:parentkey="GUID" msdata:childkey="STEP_ID" msprop:Generator_UserChildTable="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_ChildPropName="GetTBEMLP_POLL_INDEXING_STEPSRows" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_STEPS" msprop:Generator_ParentPropName="TBEMLP_POLL_STEPSRow" />
+      <msdata:Relationship name="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msdata:parent="TBEMLP_POLL_STEPS" msdata:child="TBEMLP_POLL_INDEXING_STEPS" msdata:parentkey="GUID" msdata:childkey="STEP_ID" msprop:Generator_UserParentTable="TBEMLP_POLL_STEPS" msprop:Generator_UserChildTable="TBEMLP_POLL_INDEXING_STEPS" msprop:Generator_RelationVarName="relationFK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" msprop:Generator_ChildPropName="GetTBEMLP_POLL_INDEXING_STEPSRows" msprop:Generator_ParentPropName="TBEMLP_POLL_STEPSRow" msprop:Generator_UserRelationName="FK_TBEMLP_POLL_INDEXING_STEPS_STEP_ID" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
--- a/App/EmailProfiler.Form/MyDataset.xss
+++ b/App/EmailProfiler.Form/MyDataset.xss
@@ -4,15 +4,15 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="13" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="13" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
    <Shape ID="DesignTable:TBEMLP_POLL_PROFILES" ZOrder="10" X="21" Y="23" Height="305" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBEMLP_POLL_PROCESS" ZOrder="9" X="354" Y="46" Height="305" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
    <Shape ID="DesignTable:TBEMLP_POLL_STEPS" ZOrder="7" X="690" Y="111" Height="286" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
    <Shape ID="DesignTable:TBEMLP_POLL_INDEXING_STEPS" ZOrder="5" X="993" Y="271" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBEMLP_HISTORY" ZOrder="3" X="242" Y="387" Height="267" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBEMLP_HISTORY" ZOrder="1" X="33" Y="398" Height="267" Width="249" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBEMLP_CONFIG" ZOrder="2" X="757" Y="447" Height="286" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBEMLP_CONFIG" ZOrder="3" X="698" Y="456" Height="286" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBDD_EMAIL_ACCOUNT" ZOrder="1" X="457" Y="458" Height="305" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_EMAIL_ACCOUNT" ZOrder="2" X="347" Y="418" Height="343" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
  </Shapes>
  <Connectors>
    <Connector ID="DesignRelation:FK_TBEMLP_POLL_PROCESS_PROFILE_ID" ZOrder="8" LineWidth="11">
--- a/App/EmailProfiler.Form/Resources/Encrypt.png
+++ b/App/EmailProfiler.Form/Resources/Encrypt.png
--- a/App/EmailProfiler.Form/Resources/arrow_Down_16xMD.png
+++ b/App/EmailProfiler.Form/Resources/arrow_Down_16xMD.png
--- a/App/EmailProfiler.Form/Resources/arrow_right.png
+++ b/App/EmailProfiler.Form/Resources/arrow_right.png
--- a/App/EmailProfiler.Form/Resources/email_go.png
+++ b/App/EmailProfiler.Form/Resources/email_go.png
--- a/App/EmailProfiler.Form/Resources/folder_Closed_16xLG.png
+++ b/App/EmailProfiler.Form/Resources/folder_Closed_16xLG.png
--- a/App/EmailProfiler.Form/Resources/handdrawn_arrow_down.png
+++ b/App/EmailProfiler.Form/Resources/handdrawn_arrow_down.png
--- a/App/EmailProfiler.Form/Resources/key_16xLG.png
+++ b/App/EmailProfiler.Form/Resources/key_16xLG.png
--- a/App/EmailProfiler.Form/Resources/refresh_16xLG.png
+++ b/App/EmailProfiler.Form/Resources/refresh_16xLG.png
--- a/App/EmailProfiler.Form/Resources/save_16xMD.png
+++ b/App/EmailProfiler.Form/Resources/save_16xMD.png
--- a/App/EmailProfiler.Form/Settings.vb
+++ b/App/EmailProfiler.Form/Settings.vb
@@ -0,0 +1,11 @@
 Namespace My
    'Diese Klasse ermöglicht die Behandlung bestimmter Ereignisse der Einstellungsklasse:
    ' Das SettingChanging-Ereignis wird ausgelöst, bevor der Wert einer Einstellung geändert wird.
    ' Das PropertyChanged-Ereignis wird ausgelöst, nachdem der Wert einer Einstellung geändert wurde.
    ' Das SettingsLoaded-Ereignis wird ausgelöst, nachdem die Einstellungswerte geladen wurden.
    ' Das SettingsSaving-Ereignis wird ausgelöst, bevor die Einstellungswerte gespeichert werden.
    Partial Friend NotInheritable Class MySettings
    End Class
 End Namespace
--- a/App/EmailProfiler.Form/envelope.ico
+++ b/App/EmailProfiler.Form/envelope.ico
--- a/App/EmailProfiler.Form/frmMain.Designer.vb
+++ b/App/EmailProfiler.Form/frmMain.Designer.vb
--- a/App/EmailProfiler.Form/frmMain.resx
+++ b/App/EmailProfiler.Form/frmMain.resx
--- a/App/EmailProfiler.Form/frmMain.vb
+++ b/App/EmailProfiler.Form/frmMain.vb
@@ -1,74 +1,107 @@
 Imports System.ComponentModel
 Imports System.Configuration
 Imports System.IO
 Imports System.Net.Mail
 Imports System.Text.RegularExpressions
-Imports DigitalData.EMLProfiler
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Tab
 Imports DevExpress.XtraPrinting.Export
 Imports DigitalData.GUIs.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Messaging
-Imports NLog.Config
+Imports DigitalData.Modules.Messaging.Mail
 Imports EmailProfiler.Common
 Public Class frmMain
-    Private Logger As DigitalData.Modules.Logging.Logger
+    Private Logger As Logger
-    Private Shared LogConfig As LogConfig
+    Private LogConfig As LogConfig
-    'Private _database As clsDatabase
+    Private ConfigManager As ConfigManager(Of Config)
    Private _database As MSSQLServer
    Private _Encryption As clsEncryption
    Private _windream As clsWindream_allgemein
    ' Private _email As clsEmail
    Private _emailIMAP As clsEmailIMAP
    Private _LoadInProgress As Boolean = True
    Private _RunwithLocalemail As Boolean = False
    Private _SQLServerConString As String
    Private _Worklist As List(Of String)
-    Private _limilab As DigitalData.Modules.Messaging.Limilab
+    Private _limilab As Limilab
-    Private _ConfigManager As ClassConfig
+    Private _DBConfig As ClassDBConfig.Config
-    Private _Config As ClassConfig.Config
+    Private MyConnectionString As String
-    Public Sub New()
+    Private _MailSender As Mail.MailSender
        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
    End Sub
    Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
            LogConfig = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
            _limilab = New Limilab(LogConfig)
            Logger = LogConfig.GetLogger()
-            If My.Settings.DEBUG = True Then
+
-                Logger.Info("!! DEBUG is ACTIVE !!")
+            _limilab = New Limilab(LogConfig)
-            End If
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
-            LogConfig.Debug = My.Settings.DEBUG
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
-            InitDatabase()
+            Dim oStartupPath = Application.StartupPath
-            ToolStripProgressBar1.Visible = False
+
-            Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
+            Dim oAppconfig As String = "AppConfig.xml"
-            If My.Settings.USE_WM Then
+            Dim oAppConfigFilePath As String = Path.Combine(oStartupPath, oAppconfig)
-                _windream = New clsWindream_allgemein(LogConfig)
+            If File.Exists(oAppConfigFilePath) Then
                Logger.Info("Die Datei AppConfig.xml ist im StartUp-Path vorhanden.")
                ' UserAppDataPath = StartupPath
                oCommonAppDataPath = oStartupPath
            Else
                Logger.Info("Keine AppConfig.xml-Konfiguration!")
            End If
-            '_email = New clsEmail(MyLogger)
+
-            _emailIMAP = New clsEmailIMAP(LogConfig)
+            ConfigManager = New ConfigManager(Of Config)(LogConfig, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
            ConfigManager.Save()
            LogConfig.Debug = ConfigManager.Config.Debug
            If ConfigManager.Config.Debug = True Then
                Logger.Info("!! DEBUG is ACTIVE !!")
            End If
            InitDatabase()
            ToolStripProgressBar2.Visible = False
            Logger.Debug($"AppConfig is located at: [{AppDomain.CurrentDomain.SetupInformation.ConfigurationFile}]")
            Try
                If ConfigManager.Config.UseWindream Then
                    _windream = New clsWindream_allgemein(LogConfig)
                End If
            Catch ex As Exception
                Logger.Error(ex)
                ConfigManager.Save()
            End Try
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in FormLoad")
        End Try
        If Set_ConnectionStrings() Then
            Load_AllData()
            LoadMonitoringIntoGrid()
            Check_Steps()
-            Active_Color()
+            Active_Color(ACTIVECheckBox)
            Active_Color(ACTIVECheckBox1)
            Active_Color(ACTIVECheckBox2)
            Active_Color(ACTIVECheckBox3)
            Active_Color(ACTIVECheckBox4)
        End If
-        If My.Settings.USE_WM Then
+        Try
            If ConfigManager.Config.UseWindream Then
                ObjektTypenEintragen()
            End If
        Catch ex As Exception
            Logger.Error(ex)
            ConfigManager.Save()
        End Try
        _Encryption = New clsEncryption("!35452didalog=", LogConfig)
    End Sub
    Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        If ConfigManager.Config.UseWindream Then
            Load_Indexdata()
        End If
    End Sub
    Private Function Set_ConnectionStrings()
        Try
@@ -95,6 +128,7 @@ Public Class frmMain
            Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(Me.MyDataset.TBEMLP_POLL_INDEXING_STEPS)
        Catch ex As Exception
            MsgBox("Unexpected Error in Load_AllData: " & ex.Message, MsgBoxStyle.Critical)
            ConfigManager.Save()
        End Try
    End Sub
    Sub Load_Profiles()
@@ -120,14 +154,14 @@ Public Class frmMain
    End Sub
    Sub Load_History()
        Try
-            Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY)
+            TBEMLP_HISTORYTableAdapter.Fill(MyDataset.TBEMLP_HISTORY)
        Catch ex As Exception
            MsgBox("Error in Load History: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
    Sub Load_indexingSteps()
        Try
-            Me.TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(Me.MyDataset.TBEMLP_POLL_INDEXING_STEPS)
+            TBEMLP_POLL_INDEXING_STEPSTableAdapter.Fill(MyDataset.TBEMLP_POLL_INDEXING_STEPS)
        Catch ex As Exception
            MsgBox("Unexpected Error in Load_indexingSteps: " & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -135,12 +169,46 @@ Public Class frmMain
    Sub Load_Config()
        Try
            _LoadInProgress = True
-            Me.TBEMLP_CONFIGTableAdapter.Fill(Me.MyDataset.TBEMLP_CONFIG)
+            TBEMLP_CONFIGTableAdapter.Fill(MyDataset.TBEMLP_CONFIG)
            txtConnectionString.Text = _database.MaskedConnectionString
        Catch ex As Exception
            MsgBox("Unexpected Error in Load_Config: " & ex.Message, MsgBoxStyle.Critical)
        End Try
        Try
            Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))"
            Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql)
            If oDTFunctionRegex?.Rows.Count > 0 Then
                txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX")
                txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX")
                txthtmlEmail.BackColor = Color.Wheat
            End If
        Catch ex As Exception
            MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
        _LoadInProgress = False
    End Sub
    Private Sub Load_Email()
        SetEmailTextboxLabels()
    End Sub
    Private Sub SetEmailTextboxLabels()
        Select Case AUTH_TYPEComboBox.Text
            Case "OAUTH2"
                EMAIL_SMTPLabel.Text = "Anwendungs-ID (Client):"
                EMAIL_PWLabel.Text = "Geheimnis ID Value"
                ARCHIVE_FOLDERLabel.Text = "Verzeichnis-ID (Mandant):"
            Case Else
                EMAIL_SMTPLabel.Text = "Server:"
                EMAIL_PWLabel.Text = "Passwort:"
                ARCHIVE_FOLDERLabel.Text = "Archive Ordner:"
        End Select
    End Sub
    Private Sub ObjektTypenEintragen()
        Try
            If IsNothing(_windream) Then
@@ -162,10 +230,9 @@ Public Class frmMain
    Public Function InitDatabase()
        Try
            Dim dbResult As Boolean
            tslblstatus.BackColor = Color.Transparent
-            If My.Settings.MyConnectionString <> String.Empty Then
+            If ConfigManager.Config.ConnectionString <> String.Empty Then
-                _SQLServerConString = My.Settings.MyConnectionString
+                _SQLServerConString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
                If _SQLServerConString.Contains("LOGIT_DMS") Then
                    _SQLServerConString.Replace("LOGIT_DMS", "DD_ECM")
                    Logger.Debug($"Replaced wrong Database in ConString ... ")
@@ -175,15 +242,13 @@ Public Class frmMain
                _database = New MSSQLServer(LogConfig, _SQLServerConString)
                Logger.Debug("Inititalizing Configuration")
-                _ConfigManager = New ClassConfig(LogConfig, _database)
+                Dim oConfigManager As ClassDBConfig = New ClassDBConfig(LogConfig, _database)
-                _Config = _ConfigManager.GetConfig()
+                _DBConfig = oConfigManager.GetConfig()
-                If _Config Is Nothing Then
+                If _DBConfig Is Nothing Then
                    MsgBox("Configuration could not be loaded. Please check the Logfile.", MsgBoxStyle.Critical, Text)
                End If
                '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
                'dbResult = _database.Init(My.Settings.MyConnectionString)
            Else
                MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
@@ -191,7 +256,7 @@ Public Class frmMain
                tslblstatus.Text = "Please add a connection!"
                tslblstatus.BackColor = Color.Red
            End If
-            If _database.DBInitialized = False Then
+            If _database?.DBInitialized = False Then
                MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical, Text)
                Return False
            Else
@@ -218,13 +283,12 @@ Public Class frmMain
            If chkbxUserAut.Checked Then
                con = "Data Source=" & Me.txtServer.Text & ";Trusted_Connection=True;"
            Else
                'con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";"
                con = "Server=" & Me.txtServer.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";"
            End If
            Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString)
            connection.Open()
            MyConnectionString = con
-            My.Settings.Save()
+            ConfigManager.Save()
            Dim cmd As New SqlClient.SqlCommand("sp_databases", connection)
            cmd.CommandType = CommandType.StoredProcedure
            ' Ausführen und Ergebnis in einer ListBox anzeigen
@@ -266,22 +330,19 @@ Public Class frmMain
            'DialogResult = Windows.Forms.DialogResult.OK
            Dim result As MsgBoxResult
            Dim msg = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?"
            'If USER_LANGUAGE <> "de-DE" Then
            '    msg = "Connection was successfully opened!" & vbNewLine & "Would You like to save it?"
            'End If
            result = MessageBox.Show(msg, "Database-Connection", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
            If result = MsgBoxResult.Yes Then
                'Set the construction string
                MyConnectionString = con
-                My.Settings.MyConnectionString = MyConnectionString
+                ConfigManager.Config.ConnectionString = MyConnectionString
                _database = New MSSQLServer(LogConfig, MyConnectionString)
-                _ConfigManager = New ClassConfig(LogConfig, _database)
+                Dim oConfigManager As ClassDBConfig = New ClassDBConfig(LogConfig, _database)
                'csb.ConnectionString
                '_database.Init(MyConnectionString)
-                My.Settings.Save()
+                ConfigManager.Save()
                If chkbxUserAut.Checked = False Then
                    Dim cipherText As String = _Encryption.EncryptData(Me.txtPasswort.Text)
@@ -302,18 +363,22 @@ Public Class frmMain
        End Try
    End Sub
-    Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
+    Private Sub BackgroundWorker1_DoWork(sender As Object, e As DoWorkEventArgs) Handles BackgroundWorker1.DoWork
        ConfigManager.Config.EmailTitlePrefix = "EmailProfilerTestClient"
        ConfigManager.Config.EmailAccountId = ToolStripEmailAccountID2.Text
        ConfigManager.Config.GDPictureVersion = "11.2024"
        If _RunwithLocalemail = False Then
            LogConfig.Debug = True
-            Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW,
+            Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config)
                                       My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient")
            _work.Start_WorkingProfiles()
        Else
            For Each ofile As String In _Worklist
                Logger.Info($"## Manual working on file {ofile} ... ")
-                Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, _SQLServerConString, _Config.WindreamConnectionString, GUIDTextBox.Text, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, ToolStripEmailAccountID.Text, "EmailProfilerTestClient", ofile)
+                Dim _work As New clsWorker(LogConfig, _SQLServerConString, _DBConfig.WindreamConnectionString, GUIDTextBox.Text, ConfigManager.Config, ofile.ToString)
                _work.Start_WorkingProfiles(True)
            Next
@@ -321,11 +386,11 @@ Public Class frmMain
        Try
            'Delete all Tempfiles
            For Each _file In ClassCurrent.TEMP_FILES
-                System.IO.File.Delete(_file)
+                File.Delete(_file)
            Next
            Try
-                Dim oDiTempPath As New IO.DirectoryInfo(System.IO.Path.GetTempPath)
+                Dim oDiTempPath As New DirectoryInfo(Path.GetTempPath)
-                Dim oaryFi As IO.FileInfo() = oDiTempPath.GetFiles()
+                Dim oaryFi As FileInfo() = oDiTempPath.GetFiles()
                For Each fi In oaryFi
                    fi.Delete()
@@ -342,72 +407,60 @@ Public Class frmMain
    Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
        If e.Error IsNot Nothing Then
-            '' if BackgroundWorker terminated due to error
+            MessageBox.Show(e.Error.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error)
            MessageBox.Show(e.Error.Message)
            'Label1.Text = "Error occurred!"
        ElseIf e.Cancelled Then
-            '' otherwise if it was cancelled
+            MessageBox.Show("Task cancelled!", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
            MessageBox.Show("Task cancelled!")
            '  Label1.Text = "Task Cancelled!"
        Else
-            '' otherwise it completed normally
+            MessageBox.Show("Manual Run completed!", Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
            MessageBox.Show("Manual Run completed!")
            'Label1.Text = "Error completed!"
        End If
-        tsbtnRunProfiles.Enabled = True
+
-        tsbtnRunLocalMail.Enabled = True
+        tsbtnRunProfiles2.Enabled = True
-        ToolStripProgressBar1.Visible = False
+        tsbtnRunLocalMail2.Enabled = True
        ToolStripProgressBar2.Visible = False
    End Sub
-    Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles.Click
+    Private Sub tsbtnRunProfiles_Click(sender As Object, e As EventArgs) Handles tsbtnRunProfiles2.Click
-        If IsNumeric(ToolStripEmailAccountID.Text) = False Then
+        If IsNumeric(ToolStripEmailAccountID2.Text) = False Then
-            MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation)
+            MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation, Text)
            Exit Sub
        End If
        _RunwithLocalemail = False
        If Not BackgroundWorker1.IsBusy Then
-            tsbtnRunProfiles.Enabled = False
+            tsbtnRunProfiles2.Enabled = False
-            tsbtnRunLocalMail.Enabled = False
+            tsbtnRunLocalMail2.Enabled = False
-            ToolStripProgressBar1.Visible = True
+            ToolStripProgressBar2.Visible = True
            BackgroundWorker1.RunWorkerAsync()
        End If
    End Sub
-    Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail.Click
+    Private Sub ToolStripButton28_Click(sender As Object, e As EventArgs) Handles tsbtnRunLocalMail2.Click
-        If IsNumeric(ToolStripEmailAccountID.Text) = False Then
+        If IsNumeric(ToolStripEmailAccountID2.Text) = False Then
            MsgBox("Choose an email-Profile before running processes!", MsgBoxStyle.Exclamation)
            Exit Sub
        End If
        If Not BackgroundWorker1.IsBusy Then
            Dim openFileDialog1 As New OpenFileDialog()
-            ' openFileDialog1.InitialDirectory = "c:\"
+        If Not BackgroundWorker1.IsBusy Then
-            openFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*"
+            Dim openFileDialog1 As New OpenFileDialog With {
-            openFileDialog1.FilterIndex = 2
+                .Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*",
-            openFileDialog1.RestoreDirectory = True
+                .FilterIndex = 2,
-            openFileDialog1.Multiselect = True
+                .RestoreDirectory = True,
                .Multiselect = True
            }
            If openFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
                For Each oFile As String In openFileDialog1.FileNames
-                    Dim oList As New List(Of String)
+                    Dim oList As New List(Of String) From {oFile}
                    oList.Add(oFile)
                    _Worklist = oList
                Next
                _RunwithLocalemail = True
-                tsbtnRunLocalMail.Enabled = False
+                tsbtnRunLocalMail2.Enabled = False
-                tsbtnRunProfiles.Enabled = False
+                tsbtnRunProfiles2.Enabled = False
-                ToolStripProgressBar1.Visible = True
+                ToolStripProgressBar2.Visible = True
                BackgroundWorker1.RunWorkerAsync()
            End If
        End If
    End Sub
-    Private Sub mWorker_ProgressChanged(ByVal sender As Object, ByVal e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
+    Private Sub mWorker_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
-        Me.ToolStripProgressBar1.Value = e.ProgressPercentage
+        ToolStripProgressBar2.Value = e.ProgressPercentage
    End Sub
    Private Sub btnShowLogpath_Click(sender As Object, e As EventArgs) Handles btnShowLogpath.Click
@@ -415,9 +468,9 @@ Public Class frmMain
    End Sub
    Private Sub TBEMLP_POLL_PROFILESBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs)
-        Me.Validate()
+        Validate()
-        Me.TBEMLP_POLL_PROFILESBindingSource.EndEdit()
+        TBEMLP_POLL_PROFILESBindingSource.EndEdit()
-        Me.TableAdapterManager.UpdateAll(Me.MyDataset)
+        TableAdapterManager.UpdateAll(MyDataset)
    End Sub
@@ -428,7 +481,6 @@ Public Class frmMain
    Private Sub ToolStripButton10_Click(sender As Object, e As EventArgs) Handles ToolStripButton10.Click
        Load_Processes()
    End Sub
    Private Sub ToolStripButton8_Click(sender As Object, e As EventArgs) Handles ToolStripButton8.Click
        Try
            TBEMLP_POLL_PROCESSBindingSource.EndEdit()
@@ -444,7 +496,7 @@ Public Class frmMain
    End Sub
    Private Sub WM_OBJEKTTYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WM_OBJEKTTYPEComboBox.SelectedIndexChanged
-        If My.Settings.USE_WM Then
+        If ConfigManager.Config.UseWindream Then
            Load_Indexdata()
        End If
@@ -455,22 +507,20 @@ Public Class frmMain
                If WM_OBJEKTTYPEComboBox.Text = String.Empty Then
                    Exit Sub
                End If
-                Me.WM_VECTOR_LOGComboBox.Items.Clear()
+                WM_VECTOR_LOGComboBox.Items.Clear()
-                Me.WM_IDX_BODY_TEXTComboBox.Items.Clear()
+                WM_IDX_BODY_TEXTComboBox.Items.Clear()
                INDEXNAMEIndexStepsComboBox.Items.Clear()
-                Me.WM_VECTOR_LOGComboBox.Items.Add("")
+                WM_VECTOR_LOGComboBox.Items.Add("")
-                Me.WM_IDX_BODY_TEXTComboBox.Items.Add("")
+                WM_IDX_BODY_TEXTComboBox.Items.Add("")
                INDEXNAMEIndexStepsComboBox.Items.Add("")
-                'Me.WM_REFERENCE_INDEXComboBox.Items.Clear()
+
                'Me.WM_REFERENCE_INDEXComboBox.Items.Add("")
                Dim indexe = _windream.GetIndicesByObjecttype(WM_OBJEKTTYPEComboBox.Text)
                If indexe IsNot Nothing Then
                    For Each index As String In indexe
                        Me.WM_VECTOR_LOGComboBox.Items.Add(index)
                        WM_IDX_BODY_TEXTComboBox.Items.Add(index)
                        INDEXNAMEIndexStepsComboBox.Items.Add(index)
                        ' WM_REFERENCE_INDEXComboBox.Items.Add(index)
                    Next
                End If
            End If
@@ -569,15 +619,11 @@ Public Class frmMain
        Load_indexingSteps()
    End Sub
    Private Sub XtraTabControl1_TabIndexChanged(sender As Object, e As EventArgs) Handles XtraTabControl1.TabIndexChanged
    End Sub
    Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged
        Select Case XtraTabControl1.SelectedTabPageIndex
            Case 0
                Check_Steps()
-                If My.Settings.USE_WM Then
+                If ConfigManager.Config.UseWindream Then
                    Load_Indexdata()
                End If
@@ -588,48 +634,25 @@ Public Class frmMain
        End Select
    End Sub
    Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        If My.Settings.USE_WM Then
            Load_Indexdata()
        End If
    End Sub
    Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
        tsbtnRunProfiles.Visible = False
        tslblRefresh.BackColor = Color.Transparent
        tslblRefresh.Text = ""
-        Select Case TabControl1.SelectedIndex
+        If TabControl1.SelectedTab.Equals(tabConfig) Then
            Case 0
                tsbtnRunProfiles.Visible = True
            Case 1
            Load_Config()
-            Case 2
+        End If
-               ' Load_History()
+        If TabControl1.SelectedTab.Equals(tabEmail) Then
-            Case 4
+            Load_Email()
-                Try
+        End If
                    Dim osql = "SELECT * FROM TBDD_FUNCTION_REGEX WHERE UPPER(FUNCTION_NAME) IN (UPPER('EMAIL_PROFILER - RemoveHTMLText'),UPPER('EMAIL_PROFILER - RemoveHTMLText1'))"
                    Dim oDTFunctionRegex As DataTable = _database.GetDatatable(osql)
                    txtRegex1.Text = oDTFunctionRegex.Rows(0).Item("REGEX")
                    txtRegex2.Text = oDTFunctionRegex.Rows(1).Item("REGEX")
                    txthtmlEmail.BackColor = Color.Wheat
                Catch ex As Exception
                    MsgBox("Error in Load Regex: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                End Try
        End Select
    End Sub
-    Private Sub ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged
+    Sub Active_Color(pCheckBox As CheckBox)
-        Active_Color()
+        If pCheckBox.Checked Then
-    End Sub
+            pCheckBox.BackColor = Color.LimeGreen
    Sub Active_Color()
        If ACTIVECheckBox.Checked Then
            ACTIVECheckBox.BackColor = Color.LimeGreen
        Else
-            ACTIVECheckBox.BackColor = Color.IndianRed
+            pCheckBox.BackColor = Color.IndianRed
        End If
    End Sub
@@ -638,30 +661,38 @@ Public Class frmMain
            Select Case PROCESS_NAMEComboBox.Text
                Case "ProcessManager"
                    txtSubjectExample.Text = "[ProcessManager][EA][DID#[%Dokument-ID]]"
                    cbAllowXMLReceipt.Enabled = False
                    cbAllowXMLReceipt.Checked = False
                Case "Attachment Sniffer"
                    lblDownloadPath.Text = "Download-Path Attachments:"
                    cbAllowXMLReceipt.Enabled = True
                Case "ZugFeRD-Parser"
                    lblDownloadPath.Text = "Download-Path Attachments:"
                    cbAllowXMLReceipt.Enabled = False
                    cbAllowXMLReceipt.Checked = False
                Case Else
                    txtSubjectExample.Text = ""
                    lblDownloadPath.Text = "Download-Path:"
                    cbAllowXMLReceipt.Enabled = False
                    cbAllowXMLReceipt.Checked = False
            End Select
        End If
    End Sub
-    Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs) Handles ToolStripButton34.Click
+    Private Sub ToolStripButton34_Click(sender As Object, e As EventArgs)
        Load_History()
    End Sub
    Private Sub LOG_ERRORS_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOG_ERRORS_ONLYCheckBox.CheckedChanged
        If _LoadInProgress = True Then Exit Sub
        LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked
-        My.Settings.Save()
+        ConfigManager.Save()
-        Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
+        Dim upr = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
-        _database.ExecuteNonQuery(upd)
+        _database.ExecuteNonQuery(upr)
        Load_Config()
    End Sub
    Sub Save_Config()
        Try
            TBEMLP_CONFIGBindingSource.EndEdit()
@@ -675,6 +706,7 @@ Public Class frmMain
            MsgBox("Error in Save_Config: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
    Sub Save_email_Profile()
        Try
            TBDD_EMAIL_ACCOUNTBindingSource.EndEdit()
@@ -695,18 +727,6 @@ Public Class frmMain
        _database.ExecuteNonQuery(upd)
        Load_Config()
    End Sub
    'Private Function GetChildren(ByVal bodyParts As BodyPartCollection) As BodyPartCollection
    '    Dim children As New BodyPartCollection()
    '    For i As Integer = 0 To bodyParts.Count - 1
    '        children.Add(GetChildren(bodyParts(i).BodyParts))
    '        children.Add(bodyParts(i))
    '    Next
    '    Return children
    'End Function
    Private Sub STEP_NAMEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles STEP_NAMEComboBox.SelectedIndexChanged
        Label9.Visible = False
        txtSubjectExample.Visible = False
@@ -742,58 +762,128 @@ Public Class frmMain
    Private Sub btnsendtestmail_Click(sender As Object, e As EventArgs) Handles btnsendtestmail.Click
        If txtTestmail.Text <> String.Empty Then
            ConfigManager.Save()
            My.Settings.Save()
            Cursor = Cursors.WaitCursor
            Dim PWPlain = _Encryption.DecryptData(EMAIL_PWTextBox.Text)
            'NEW
            _MailSender = New Mail.MailSender(LogConfig)
            Dim oDefault As Boolean = True
            If CheckBoxEnableTls1_1.Checked Or CheckBoxEnableTls1_2.Checked Then
                oDefault = False
            End If
            Dim oOptions As New Mail.MailSession.MailSessionOptions() With {
                        .EnableTls1_1 = CheckBoxEnableTls1_1.Checked,
                        .EnableTls1_2 = CheckBoxEnableTls1_2.Checked,
                        .EnableDefault = oDefault
                    }
            Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(EMAIL_SMTPTextBox.Text, PORTTextBox.Text, EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, oOptions)
-            If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text,
+            If oResult.Connected = False Then
-                                 EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "frmMain-Test", "", "", True) = True Then
+                Cursor = Cursors.Default
-
+                MsgBox("Could not create a MailSession / connect to server. Please check the log.", MsgBoxStyle.Exclamation)
-
+                Exit Sub
            End If
            Dim oAddresses As List(Of String) = txtTestmail.Text.Split(";").ToList()
            Dim oAddedWhen = Now
            Dim oAttachments As New List(Of String)
            Dim oBody As String = $"This is just a template body (text will be replaced within the run) - ProfileID: {EMAILIDTextBox.Text}"
            Dim oMessageSent = _MailSender.SendMail(oAddresses, EMAIL_FROMTextBox.Text, "Testmail from EmailProfilerConfig", oBody, oAddedWhen, oAttachments, False)
            Cursor = Cursors.Default
            If oMessageSent = True Then
                MsgBox("Email has been send successfully.", MsgBoxStyle.Information)
            Else
                MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
            End If
            'NEW END
            'If _limilab.NewSMTPEmail(txtTestmail.Text, "Testmail", "This is the body (text will be replaced within profile)", EMAIL_FROMTextBox.Text, EMAIL_SMTPTextBox.Text, PORTTextBox.Text,
            '                     EMAIL_USERTextBox.Text, PWPlain, AUTH_TYPEComboBox.Text, "frmMain-Test", "", "", True) = True Then
            '    MsgBox("Email has been send successfully.", MsgBoxStyle.Information)
            'Else
            '    MsgBox("Could not send the testmail. Please check the log.", MsgBoxStyle.Exclamation)
            'End If
        End If
    End Sub
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btntestImap.Click
-        My.Settings.Save()
+        ConfigManager.Save()
        Dim oSQL = $"SELECT * FROM TBDD_EMAIL_ACCOUNT WHERE GUID = {EMAILIDTextBox.Text}"
        Dim oDT As DataTable = _database.GetDatatable(oSQL)
        If Not IsNothing(oDT) Then
            If oDT.Rows.Count = 1 Then
-                Dim PWPlain = _Encryption.DecryptData(oDT.Rows(0).Item("EMAIL_PW"))
+                Dim oRow As DataRow = oDT.Rows.Item(0)
                'Logger.Debug($"PWis !{PWPlain}35452dd=")
                _limilab.InitIMAP(True, oDT.Rows(0).Item("EMAIL_SMTP"), oDT.Rows(0).Item("PORT_IN"), oDT.Rows(0).Item("EMAIL_USER"), PWPlain, oDT.Rows(0).Item("AUTH_TYPE"))
                Dim oResult = _limilab.IMAPTestLogin()
-                If oResult = False Then
+                Dim PWPlain = _Encryption.DecryptData(oRow.Item("EMAIL_PW"))
-                    MsgBox("Access Imap NOT successfull", MsgBoxStyle.Critical)
+                Dim oServer = oRow.Item("EMAIL_SMTP")
                Dim oPortIn = oRow.Item("PORT_IN")
                Dim oUser = oRow.Item("EMAIL_USER")
                Dim oAuthType = oRow.Item("AUTH_TYPE")
                Dim oArchiveFolder = oRow.Item("ARCHIVE_FOLDER")
                Dim oFetcher As New MailFetcher(LogConfig)
                Dim oSession As MailSession.SessionInfo
                If oAuthType = MailSession.AUTH_OAUTH2 Then
                    ' These Variables from the DB are reused for the OAuth credentials
                    Dim oClientId = oServer
                    Dim oClientSecret = PWPlain
                    Dim oTenantId = oArchiveFolder
                    oSession = oFetcher.ConnectToO365(oUser, oClientId, oTenantId, oClientSecret)
                Else
-                    MsgBox("IMAP-Test Successful!", MsgBoxStyle.Information)
+                    oSession = oFetcher.Connect(oServer, oPortIn, oUser, PWPlain, oAuthType, New MailSession.MailSessionOptions() With {
-                    btnCheckIMAPObjects.Visible = True
+                        .EnableTls1_1 = True,
                        .EnableTls1_2 = True
                    })
                End If
                If oSession.Connected = True Then
                    ' Unseen check will be done automatically
                    'btnCheckIMAPObjects.Visible = True
                    Dim oMailIds = oFetcher.ListUnseenMails()
                    If oMailIds Is Nothing Then
                        MsgBox("Could not get unseen Objects from IMAP-Folder!", MsgBoxStyle.Critical, Text)
                    Else
                        MsgBox($"IMAP-Folder contained [{oMailIds.Count}] unseen Objects!", MsgBoxStyle.Information, Text)
                    End If
                    oFetcher.Disconnect()
                Else
                    MsgBox($"Imap Login NOT successful: {vbNewLine}{oSession.Error?.Message}", MsgBoxStyle.Critical, Text)
                End If
                '_limilab.InitIMAP(True, oDT.Rows(0).Item("EMAIL_SMTP"), oDT.Rows(0).Item("PORT_IN"), oDT.Rows(0).Item("EMAIL_USER"), PWPlain, oDT.Rows(0).Item("AUTH_TYPE"))
                'Dim oResult = _limilab.IMAPTestLogin()
                'If oResult = False Then
                '    MsgBox("Access Imap NOT successfull", MsgBoxStyle.Critical)
                'Else
                '    MsgBox("IMAP-Test Successful!", MsgBoxStyle.Information)
                '    btnCheckIMAPObjects.Visible = True
                'End If
            End If
        End If
    End Sub
    Private Sub btnCheckIMAPObjects_Click(sender As Object, e As EventArgs) Handles btnCheckIMAPObjects.Click
-        Dim oListuids As New List(Of Long)
+        Dim oListuids As List(Of Long) = _limilab.IMAPGetUnseenMessageIDs()
        oListuids = _limilab.IMAPGetUnseenMessageIDs()
        If IsNothing(oListuids) Then
            MsgBox("Something went wrong! - Check Your log.", MsgBoxStyle.Critical)
        Else
            _limilab.CloseImap()
            MsgBox($"IMAP-Folder contained [{oListuids.Count}] unseen Objects!", MsgBoxStyle.Information)
        End If
    End Sub
-    Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs) Handles btnTestRegEx.Click
+
    Private Sub btnTestRegEx_Click(sender As Object, e As EventArgs)
        txtResultRegEx.Text = ""
        Try
-            My.Settings.Save()
+            ConfigManager.Save()
            txtResultRegEx.BackColor = Color.WhiteSmoke
            ' Instantiate the regular expression object.
            Dim oReg As Regex = New Regex(txtRegex1.Text, RegexOptions.IgnoreCase)
@@ -830,7 +920,7 @@ Public Class frmMain
    End Sub
-    Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs) Handles btnsaveRegex.Click
+    Private Sub btnsaveRegex_Click_1(sender As Object, e As EventArgs)
        tslblRefresh.BackColor = Color.Transparent
        Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex1.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText')"
        If _database.ExecuteNonQuery(upd) = True Then
@@ -842,61 +932,7 @@ Public Class frmMain
        End If
    End Sub
-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+    Private Sub Button5_Click(sender As Object, e As EventArgs)
        'Try
        '    txthtmlEmail.Text = ""
        '    txthtmlEmail.BackColor = Color.Wheat
        '    Dim oOpenFileDialog1 As New OpenFileDialog()
        '    ' openFileDialog1.InitialDirectory = "c:\"
        '    oOpenFileDialog1.Filter = "Emails (*.eml)|*.eml|All files (*.*)|*.*"
        '    oOpenFileDialog1.FilterIndex = 2
        '    oOpenFileDialog1.RestoreDirectory = True
        '    If oOpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
        '        Dim oMsg_email As New Independentsoft.Email.Mime.Message(oOpenFileDialog1.FileName)
        '        Dim oBodyText As String = ""
        '        If IsNothing(oMsg_email.Body) Then
        '            Dim oAllBodyParts As New BodyPartCollection()
        '            oAllBodyParts.Add(oMsg_email.BodyParts)
        '            oAllBodyParts.Add(GetChildren(oMsg_email.BodyParts))
        '            For Each bodyPart As BodyPart In oAllBodyParts
        '                If bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "plain" Then
        '                    If oBodyText = String.Empty Then
        '                        Logger.Debug(String.Format("BODY1-Text is....#{0}", bodyPart.Body))
        '                        oBodyText = bodyPart.Body
        '                    Else
        '                        Continue For
        '                    End If
        '                ElseIf bodyPart.ContentType IsNot Nothing AndAlso bodyPart.ContentType.Type = "text" AndAlso bodyPart.ContentType.SubType = "html" Then
        '                    If oBodyText = String.Empty Then
        '                        oBodyText = bodyPart.Body
        '                        Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body))
        '                    Else
        '                        Continue For
        '                    End If
        '                    Logger.Debug(String.Format("bodyhtml....#{0}", bodyPart.Body))
        '                End If
        '            Next
        '            If oBodyText = "" Then
        '                MsgBox("No html-body extractable?!")
        '            Else
        '                txthtmlEmail.Text = oBodyText
        '                txthtmlEmail.BackColor = Color.Yellow
        '            End If
        '        Else
        '            txthtmlEmail.Text = oMsg_email.Body
        '            txthtmlEmail.BackColor = Color.Yellow
        '        End If
        '    End If
        'Catch ex As Exception
        '    MsgBox(ex.Message, MsgBoxStyle.Critical)
        'End Try
    End Sub
    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
        tslblRefresh.BackColor = Color.Transparent
        Dim upd = $"UPDATE TBDD_FUNCTION_REGEX SET REGEX = '{txtRegex2.Text}' WHERE UPPER(FUNCTION_NAME) = UPPER('EMAIL_PROFILER - RemoveHTMLText1')"
        If _database.ExecuteNonQuery(upd) = True Then
@@ -916,27 +952,11 @@ Public Class frmMain
        End If
    End Sub
    Private Sub frmMain_ImeModeChanged(sender As Object, e As EventArgs) Handles Me.ImeModeChanged
    End Sub
    Private Sub COMMENTTextBox_Leave(sender As Object, e As EventArgs) Handles COMMENTTextBox.Leave
        Try
            Dim separatorIndex = COMMENTTextBox.Text.IndexOf(".")
            TextBox1.Text = COMMENTTextBox.Text.Substring(separatorIndex, COMMENTTextBox.Text.Length - 1)
        Catch ex As Exception
        End Try
    End Sub
    Private Sub EMAILIDTextBox_TextChanged(sender As Object, e As EventArgs) Handles EMAILIDTextBox.TextChanged
-        If IsNumeric(EMAILIDTextBox) Then
+        If IsNumeric(EMAILIDTextBox.Text) Then
-            ToolStripEmailAccountID.Text = EMAILIDTextBox.Text
+            ToolStripEmailAccountID2.Text = EMAILIDTextBox.Text
        Else
-            ToolStripEmailAccountID.Text = "Choose Email-Config"
+            ToolStripEmailAccountID2.Text = "Choose Email-Config"
        End If
        btnCheckIMAPObjects.Visible = False
    End Sub
@@ -950,17 +970,17 @@ Public Class frmMain
                    PORT_INTextBox.Enabled = True
            End Select
        End If
        SetEmailTextboxLabels()
    End Sub
    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
        Try
            If ComboBox1.SelectedIndex <> -1 Then
-                ToolStripEmailAccountID.Text = ComboBox1.SelectedValue
+                ToolStripEmailAccountID2.Text = ComboBox1.SelectedValue
            End If
        Catch ex As Exception
-
+            Logger.Error(ex)
        End Try
    End Sub
    Private Sub PasswortAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PasswortAnzeigenToolStripMenuItem.Click
@@ -972,4 +992,98 @@ Public Class frmMain
            MsgBox(ex.Message, MsgBoxStyle.Critical, "")
        End Try
    End Sub
    Private Sub btnAktualisieren_Click(sender As Object, e As EventArgs) Handles btnAktualisieren.Click
        Me.TBDD_EMAIL_ACCOUNTTableAdapter.Fill(Me.MyDataset.TBDD_EMAIL_ACCOUNT)
    End Sub
    Private Sub ACTIVECheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged, ACTIVECheckBox1.CheckedChanged, ACTIVECheckBox2.CheckedChanged, ACTIVECheckBox3.CheckedChanged, ACTIVECheckBox4.CheckedChanged
        Dim oCheckBox As CheckBox = sender
        Active_Color(oCheckBox)
    End Sub
    Private Sub GridView6_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridView6.FocusedRowChanged
        SetEmailTextboxLabels()
    End Sub
    Private Sub btnValidationSQL_Click(sender As Object, e As EventArgs) Handles btnValidationSQL.Click
        Dim oForm As New frmSQLEditor(LogConfig, _database) With {
            .SQLConnection = 1,
            .SQLCommand = txtSQLValidation.EditValue,
            .PlaceholdersManual = New Dictionary(Of String, String) From {
                {"EMAIL", "EMAIL"},
                {"DOMAIN", "DOMAIN"}
            },
            .PlaceholdersManualPrefix = "CUST"
        }
        If oForm.ShowDialog() = DialogResult.OK Then
            txtSQLValidation.EditValue = oForm.SQLCommand
        End If
    End Sub
    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
        If FolderBrowserDialog1.ShowDialog() = DialogResult.OK Then
            PATH_ORIGINALTextBox.Text = FolderBrowserDialog1.SelectedPath
        End If
    End Sub
    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
        ConfigManager.Save()
    End Sub
    Private Sub PATH_EMAIL_ERRORSTextBox_TextChanged(sender As Object, e As EventArgs) Handles PATH_EMAIL_ERRORSTextBox.TextChanged
    End Sub
    Private Sub PATH_ORIGINALTextBox_TextChanged(sender As Object, e As EventArgs) Handles PATH_ORIGINALTextBox.TextChanged
    End Sub
    Private Sub COMMENT_PROFILESTextBox_TextChanged(sender As Object, e As EventArgs) Handles COMMENT_PROFILESTextBox.TextChanged
    End Sub
    ' Loads the TBEMLP_HISTORY table into the monitoring grid and formats columns
    Private Sub LoadMonitoringIntoGrid()
        Try
            ' Fill dataset table (adapter exists in designer)
            Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY)
            ' Bind the grid to the binding source defined in the designer
            Me.gridMonitoring.DataSource = Me.TBEMLP_HISTORYBindingSource
            ' Format columns on the view
            Dim gv = TryCast(Me.GridView5, DevExpress.XtraGrid.Views.Grid.GridView)
            If gv IsNot Nothing Then
                gv.PopulateColumns()
                ' Hide all columns first
                For Each column As DevExpress.XtraGrid.Columns.GridColumn In gv.Columns
                    column.Visible = False
                Next
                ' Show only the desired columns
                Dim visibleColumns = New String() {"GUID", "EMAIL_MSGID", "EMAIL_FROM", "EMAIL_SUBJECT", "EMAIL_DATE", "ADDED_WHEN", "STATUS", "PROFILE_ID"}
                For Each columnName In visibleColumns
                    Dim column = gv.Columns.ColumnByFieldName(columnName)
                    If column IsNot Nothing Then
                        column.Visible = True
                    End If
                Next
                ' Optionally format specific columns
                If gv.Columns.ColumnByFieldName("EMAIL_DATE") IsNot Nothing Then
                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"
                End If
                gv.OptionsView.ColumnAutoWidth = False
                gv.BestFitColumns()
            End If
        Catch ex As Exception
            If Logger IsNot Nothing Then Logger.Error(ex) Else Debug.WriteLine(ex.ToString())
        End Try
    End Sub
 End Class
--- a/App/EmailProfiler.Form/packages.config
+++ b/App/EmailProfiler.Form/packages.config
@@ -0,0 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
  <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
 </packages>
--- a/App/EmailProfiler.Service/App.config
+++ b/App/EmailProfiler.Service/App.config
@@ -0,0 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
            <section name="EmailProfiler.Service.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
        </sectionGroup>
    </configSections>
    <connectionStrings />
    <startup> 
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
    </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
  <applicationSettings>
    <EmailProfiler.Service.My.MySettings>
      <setting name="FB_DATASOURCE" serializeAs="String">
        <value>172.24.12.41</value>
      </setting>
      <setting name="FB_DATABASE" serializeAs="String">
        <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
      </setting>
      <setting name="FB_USER" serializeAs="String">
        <value>sysdba</value>
      </setting>
      <setting name="FB_PW" serializeAs="String">
        <value>dd</value>
      </setting>
      <setting name="DEBUG" serializeAs="String">
        <value>False</value>
      </setting>
      <setting name="USE_WM" serializeAs="String">
        <value>False</value>
      </setting>
      <setting name="EmailAccountID" serializeAs="String">
        <value>2</value>
      </setting>
      <setting name="EmailProfilerPraefix" serializeAs="String">
        <value>EmailProfiler</value>
      </setting>
      <setting name="EML_LIMITATION_SENDER" serializeAs="String">
        <value>NONE</value>
      </setting>
      <setting name="MyConnectionString" serializeAs="String">
        <value>Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=;</value>
      </setting>
    </EmailProfiler.Service.My.MySettings>
  </applicationSettings>
 </configuration>
--- a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
+++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
@@ -6,9 +6,9 @@
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{1F3C569B-91DA-427F-8D81-BBCC556B11A4}</ProjectGuid>
    <OutputType>WinExe</OutputType>
-    <StartupObject>SERV_EMAIL.MyService</StartupObject>
+    <StartupObject>EmailProfiler.Service.MyService</StartupObject>
-    <RootNamespace>SERV_EMAIL</RootNamespace>
+    <RootNamespace>EmailProfiler.Service</RootNamespace>
-    <AssemblyName>SERV_EMAIL</AssemblyName>
+    <AssemblyName>EmailProfiler.Service</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
@@ -22,7 +22,7 @@
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>SERV_EMAIL.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Service.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>SERV_EMAIL.xml</DocumentationFile>
+    <DocumentationFile>EmailProfiler.Service.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -48,18 +48,27 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DigitalData.Modules.Base">
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
+    <Reference Include="DigitalData.Modules.Config, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="EmailProfiler.Common">
      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
    </Reference>
    <Reference Include="EmailProfiler.Common">
      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
@@ -149,12 +158,6 @@
    <None Include="App.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj">
      <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
      <Name>DigitalData.EMLProfiler</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <Content Include="MailLicense.xml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/App/EmailProfiler.Service/MailLicense.xml
+++ b/App/EmailProfiler.Service/MailLicense.xml
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/App/EmailProfiler.Service/My
+++ b/App/EmailProfiler.Service/My
--- a/App/EmailProfiler.Service/My
+++ b/App/EmailProfiler.Service/My
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("SERV_EMAIL")>
-<Assembly: AssemblyCopyright("Copyright © 2023")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
-<Assembly: AssemblyTrademark("2.6.0.0")>
+<Assembly: AssemblyTrademark("3.3.0")>
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("2.6.0.0")>
+<Assembly: AssemblyVersion("3.3.0.0")>
-<Assembly: AssemblyFileVersion("2.6.0.0")>
+<Assembly: AssemblyFileVersion("3.3.0.0")>
--- a/App/DigitalData.EMLProfiler/My
+++ b/App/DigitalData.EMLProfiler/My
@@ -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.Service.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
--- a/App/EmailProfiler.Service/My
+++ b/App/EmailProfiler.Service/My
--- a/Project/Settings.Designer.vb
+++ b/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
@@ -156,9 +156,9 @@ Namespace My
    Friend Module MySettingsProperty
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.SERV_EMAIL.My.MySettings
+        Friend ReadOnly Property Settings() As Global.EmailProfiler.Service.My.MySettings
            Get
-                Return Global.SERV_EMAIL.My.MySettings.Default
+                Return Global.EmailProfiler.Service.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/App/EmailProfiler.Service/My
+++ b/App/EmailProfiler.Service/My
--- a/App/EmailProfiler.Service/MyService.Designer.vb
+++ b/App/EmailProfiler.Service/MyService.Designer.vb
--- a/App/EmailProfiler.Service/MyService.resx
+++ b/App/EmailProfiler.Service/MyService.resx
--- a/App/EmailProfiler.Service/MyService.vb
+++ b/App/EmailProfiler.Service/MyService.vb
@@ -0,0 +1,128 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports EmailProfiler.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Public Class MyService
 #Region "+++++ variables +++++"
    Private Worker As BackgroundWorker
    Private WithEvents Timer As New Timers.Timer
    Private LogConfig As LogConfig
    Private Logger As Logger
    'Private EmailWorker As clsWorkEmail
    Private _DBConfig As ClassDBConfig.Config
    Private ConfigManager As ConfigManager(Of Config)
    Private _ConfigData As Config
    Private Database As MSSQLServer
 #End Region
    Protected Overrides Sub OnStart(args() As String)
        Try
            Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
            LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30)
            Logger = LogConfig.GetLogger
            Logger.Info("Service started.")
            ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
            _ConfigData = ConfigManager.Config
            If _ConfigData.ConnectionString = String.Empty Then
                Logger.Warn("No ConnectionString configured. Exiting.")
            Else
                If _ConfigData.Debug = True Then
                    LogConfig.Debug = True
                Else
                    LogConfig.Debug = False
                End If
                Database = New MSSQLServer(LogConfig, _ConfigData.ConnectionString)
                Logger.Debug("Database initialized!")
                Dim oDBConfigManager As ClassDBConfig = New ClassDBConfig(LogConfig, Database)
                _DBConfig = oDBConfigManager.GetConfig()
                If _DBConfig IsNot Nothing Then
                    Logger.Debug("DBConfig initialized!")
                Else
                    Logger.Warn("Error while initializing DBConfig")
                End If
                ' MP 10.01.25 - Das Objekt wird hier gar nicht weiter verwendet. erstmal raus damit
                'EmailWorker = New clsWorkEmail(LogConfig, _ConfigData.ConnectionString, _DBConfig.WindreamConnectionString, _ConfigData)
                'Logger.Debug("Module Workmail initialized")
                If Database.DBInitialized = False Then
                    Logger.Warn("No Connection was established! Exiting.")
                Else
                    '### Thread für das nachträgliche Setzen von Rechten generieren
                    Logger.Debug("Setting up Background Worker")
                    Worker = New BackgroundWorker With {
                        .WorkerReportsProgress = True,
                        .WorkerSupportsCancellation = True
                    }
                    AddHandler Worker.DoWork, AddressOf DoWork
                    AddHandler Worker.RunWorkerCompleted, AddressOf Worker_Completed
                    ' Set the Interval
                    Timer.Interval = _DBConfig.TimerInterval * 60000
                    Timer.Enabled = True
                    Logger.Debug("Timer started.")
                    ' Und den Durchlauf das erste Mal starten
                    Worker.RunWorkerAsync()
                End If
            End If
        Catch ex As Exception
            Logger.Warn("Unexpected error while starting.")
            Logger.Error(ex)
        End Try
    End Sub
    Public Sub Thread_Run() Handles Timer.Elapsed
        Logger.Debug("Starting Worker..")
        If Not Worker.IsBusy Then
            Logger.Debug("Running Worker..")
            Worker.RunWorkerAsync()
        End If
    End Sub
    Public Sub DoWork(sender As Object, e As DoWorkEventArgs)
        Try
            Dim oProfileIdForPolling = 0
            Dim oWorker As New clsWorker(LogConfig,
                                         _ConfigData.ConnectionString,
                                         _DBConfig.WindreamConnectionString,
                                         oProfileIdForPolling,
                                         _ConfigData)
            oWorker.Start_WorkingProfiles(False)
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
    Protected Overrides Sub OnStop()
        Logger.Info("## Service was stopped manually. ##")
    End Sub
    Private Sub Worker_Completed(sender As Object, e As RunWorkerCompletedEventArgs)
        'This event fires when the DoWork event completes
        Try
            Dim result As String = ""
            If e.Cancelled Then
                EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error)
                Logger.Warn("## The thread was cancelled.")
            ElseIf e.Error IsNot Nothing Then
                EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error)
                Logger.Warn("Unexpected error in thread: " & e.Error.Message)
            End If
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
 End Class
--- a/App/EmailProfiler.Service/ProjectInstaller.Designer.vb
+++ b/App/EmailProfiler.Service/ProjectInstaller.Designer.vb
@@ -19,7 +19,7 @@
    'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich.
    'Das Bearbeiten ist mit dem Komponenten-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.ServiceProcessInstaller1 = New System.ServiceProcess.ServiceProcessInstaller()
        Me.ServiceInstaller1 = New System.ServiceProcess.ServiceInstaller()
@@ -33,6 +33,7 @@
        'ServiceInstaller1
        '
        Me.ServiceInstaller1.Description = "Checks and works emails from configured profiles"
        Me.ServiceInstaller1.DisplayName = "Digital Data Email Profiler"
        Me.ServiceInstaller1.ServiceName = "DD EmailProfiler"
        Me.ServiceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic
        '
--- a/App/EmailProfiler.Service/ProjectInstaller.resx
+++ b/App/EmailProfiler.Service/ProjectInstaller.resx
@@ -121,7 +121,7 @@
    <value>17, 56</value>
  </metadata>
  <metadata name="ServiceInstaller1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>197, 17</value>
+    <value>211, 52</value>
  </metadata>
  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
--- a/App/EmailProfiler.Service/ProjectInstaller.vb
+++ b/App/EmailProfiler.Service/ProjectInstaller.vb
--- a/App/EmailProfiler.Service/packages.config
+++ b/App/EmailProfiler.Service/packages.config
--- a/App/EMAIL_PROFILER.sln
+++ b/App/EMAIL_PROFILER.sln
@@ -1,15 +1,18 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.31005.135
+VisualStudioVersion = 17.5.33516.290
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SERV_EMAIL", "SERV_EMAIL\SERV_EMAIL.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Service", "EmailProfiler.Service\EmailProfiler.Service.vbproj", "{1F3C569B-91DA-427F-8D81-BBCC556B11A4}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CONFIG_APP", "CONFIG_APP\CONFIG_APP.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Form", "EmailProfiler.Form\EmailProfiler.Form.vbproj", "{CADEB4EE-C7EF-446D-8F18-69A89E65EBBD}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DigitalData.EMLProfiler", "DigitalData.EMLProfiler\DigitalData.EMLProfiler.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EmailProfiler.Common", "EmailProfiler.Common\EmailProfiler.Common.vbproj", "{9F748DCD-952E-40A0-9DAD-65BF8A39B231}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "wisag_check_Att", "wisag_check_Att\wisag_check_Att.vbproj", "{CD67B0B9-A7DE-447D-9982-E7AC43481DDC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9F748DCD-952E-40A0-9DAD-65BF8A39B231} = {9F748DCD-952E-40A0-9DAD-65BF8A39B231}
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/App/SERV_EMAIL/App.config
+++ b/App/SERV_EMAIL/App.config
@@ -1,54 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <configSections>
        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
            <section name="SERV_EMAIL.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
        </sectionGroup>
    </configSections>
    <connectionStrings />
    <startup> 
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
    </startup>
    <applicationSettings>
        <SERV_EMAIL.My.MySettings>
            <setting name="FB_DATASOURCE" serializeAs="String">
                <value>172.24.12.41</value>
            </setting>
            <setting name="FB_DATABASE" serializeAs="String">
                <value>172.24.12.41:E:\DB\Firebird\Databases\EDMI_TEMPLATE\EDMI_MASTER.FDB</value>
            </setting>
            <setting name="FB_USER" serializeAs="String">
                <value>sysdba</value>
            </setting>
            <setting name="FB_PW" serializeAs="String">
                <value>dd</value>
            </setting>
            <setting name="DEBUG" serializeAs="String">
                <value>False</value>
            </setting>
            <setting name="USE_WM" serializeAs="String">
                <value>False</value>
            </setting>
            <setting name="EmailAccountID" serializeAs="String">
                <value>2</value>
            </setting>
            <setting name="EmailProfilerPraefix" serializeAs="String">
                <value>EmailProfiler</value>
            </setting>
            <setting name="EML_LIMITATION_SENDER" serializeAs="String">
                <value>NONE</value>
            </setting>
            <setting name="MyConnectionString" serializeAs="String">
                <value>Server=SDB01\DIGITALDATA;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnVyz+pQgGwwFrC6HCYzpmU3D2IL51z3wZ5odRZQbqYbM=;</value>
            </setting>
        </SERV_EMAIL.My.MySettings>
    </applicationSettings>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral"/>
        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/App/SERV_EMAIL/MyService.vb
+++ b/App/SERV_EMAIL/MyService.vb
@@ -1,112 +0,0 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports DigitalData.EMLProfiler
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Public Class MyService
 #Region "+++++ variables +++++"
    Private _threadRunner As BackgroundWorker
    Private LogConfig As LogConfig
    Private Logger As Logger
    'Private _database As clsDatabase
    Private _workmail As clsWorkEmail
    Private _ConfigManager As ClassConfig
    Private _Config As ClassConfig.Config
    Private Database As MSSQLServer
 #End Region
    Public Sub New()
        MyBase.New()
        InitializeComponent()
    End Sub
    Protected Overrides Sub OnStart(ByVal args() As String)
        ' Code zum Starten des Dienstes hier einfügen. Diese Methode sollte Vorgänge
        ' ausführen, damit der Dienst gestartet werden kann.
        Try
            Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
            LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler", 30)
            Logger = LogConfig.GetLogger
            Logger.Info("## Service started  ## ")
            If My.Settings.MyConnectionString = String.Empty Then
                Logger.Warn("NO CONNECTIONSTRING CONFIGURED.")
            Else
                If My.Settings.DEBUG = True Then
                    Logger.Info("DEBUG ACTIVATED")
                    LogConfig.Debug = True
                Else
                    LogConfig.Debug = False
                End If
                Database = New MSSQLServer(LogConfig, My.Settings.MyConnectionString)
                _ConfigManager = New ClassConfig(LogConfig, Database)
                _Config = _ConfigManager.GetConfig()
                '_database = New clsDatabase(MyLogger, My.Settings.MyConnectionString)
                Logger.Debug("_database and _email initialized")
                _workmail = New clsWorkEmail(LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW,
                                             My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix)
                Logger.Debug("_workmail initialized")
                If Database.DBInitialized = False Then
                    Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!")
                Else
                    '### Thread für das nachträgliche Setzen von Rechten generieren
                    _threadRunner = New BackgroundWorker With {
                        .WorkerReportsProgress = True,
                        .WorkerSupportsCancellation = True
                    }
                    AddHandler _threadRunner.DoWork, AddressOf RUN_THREAD
                    AddHandler _threadRunner.RunWorkerCompleted, AddressOf Thread1_Completed
                    '### Den Timer generieren
                    Dim Timer_Durchlauf As New System.Timers.Timer()
                    'Das Event hinterlegen welches bei "Tick" ausgelöst wird
                    AddHandler Timer_Durchlauf.Elapsed, AddressOf Thread_Run
                    ' Set the Interval
                    Timer_Durchlauf.Interval = (_Config.TimerInterval * 60000)
                    Timer_Durchlauf.Enabled = True
                    Logger.Debug("...Timer started.")
                    ' Und den Durchlauf das erste Mal starten
                    _threadRunner.RunWorkerAsync()
                End If
            End If
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
    Public Sub Thread_Run()
        If Not _threadRunner.IsBusy Then
            _threadRunner.RunWorkerAsync()
        End If
    End Sub
    Public Sub RUN_THREAD(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
        Try
            Dim notcompleted As Boolean = False
            Dim _work As New clsWorker(My.Settings.EML_LIMITATION_SENDER, LogConfig, My.Settings.MyConnectionString, _Config.WindreamConnectionString, 0, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW, My.Settings.USE_WM, My.Settings.EmailAccountID, My.Settings.EmailProfilerPraefix)
            _work.Start_WorkingProfiles()
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
    Protected Overrides Sub OnStop()
        ' Hier Code zum Ausführen erforderlicher Löschvorgänge zum Beenden des Dienstes einfügen.
        Logger.Info("## Service was stopped manually. ##")
    End Sub
    Private Sub Thread1_Completed(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) 'Handles threadDateiimport.RunWorkerCompleted
        'This event fires when the DoWork event completes
        Try
            Dim result As String = ""
            If e.Cancelled Then
                EventLog.WriteEntry("DD EmailProfiler", "The thread was cancelled!", EventLogEntryType.Error)
                Logger.Warn("## The thread was cancelled.")
            ElseIf e.Error IsNot Nothing Then
                EventLog.WriteEntry("DD EmailProfiler", "Unexpected error in thread!", EventLogEntryType.Error)
                Logger.Warn("Unexpected error in thread: " & e.Error.Message)
            End If
        Catch ex As Exception
            Logger.Error(ex)
        End Try
    End Sub
 End Class
--- a/App/wisag_check_Att/Form1.Designer.vb
+++ b/App/wisag_check_Att/Form1.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
 Partial Class Form1
-    Inherits System.Windows.Forms.Form
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()> _
@@ -22,55 +22,43 @@ Partial Class Form1
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
        Me.bsifolderbrowser = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btRunEmailCheck = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
        Me.bsitemppath = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
        Me.btExtractMailAttachments = New DevExpress.XtraBars.BarButtonItem()
        Me.rpPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
        Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog()
        Me.OpenFileDialog3 = New System.Windows.Forms.OpenFileDialog()
        Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.SearchEditItem, Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItem1, Me.bsifolderbrowser, Me.BarButtonItem2, Me.BarButtonItem3, Me.bsitemppath})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.bsifolderbrowser, Me.btRunEmailCheck, Me.BarButtonItem3, Me.bsitemppath, Me.BarButtonItem4, Me.btExtractMailAttachments})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 6
+        Me.RibbonControl1.MaxItemId = 8
        Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.rpPage1})
-        Me.RibbonControl1.Size = New System.Drawing.Size(800, 150)
+        Me.RibbonControl1.Size = New System.Drawing.Size(800, 158)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "RibbonPage1"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
        Me.RibbonPageGroup1.Text = "Konfig"
        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsifolderbrowser)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitemppath)
        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 423)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
        Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 27)
        '
        'BarButtonItem1
        '
        Me.BarButtonItem1.Caption = "choose directory"
@@ -86,12 +74,12 @@ Partial Class Form1
        Me.bsifolderbrowser.Name = "bsifolderbrowser"
        Me.bsifolderbrowser.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        '
-        'BarButtonItem2
+        'btRunEmailCheck
        '
-        Me.BarButtonItem2.Caption = "Run Email_Check"
+        Me.btRunEmailCheck.Caption = "Run Email_Check"
-        Me.BarButtonItem2.Id = 3
+        Me.btRunEmailCheck.Id = 3
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btRunEmailCheck.ImageOptions.SvgImage = CType(resources.GetObject("btRunEmailCheck.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.btRunEmailCheck.Name = "btRunEmailCheck"
        '
        'BarButtonItem3
        '
@@ -100,28 +88,91 @@ Partial Class Form1
        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonItem3.Name = "BarButtonItem3"
        '
        'bsitemppath
        '
        Me.bsitemppath.Caption = "BarStaticItem1"
        Me.bsitemppath.Id = 5
        Me.bsitemppath.ImageOptions.SvgImage = CType(resources.GetObject("bsitemppath.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.bsitemppath.Name = "bsitemppath"
        Me.bsitemppath.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        '
        'BarButtonItem4
        '
        Me.BarButtonItem4.Caption = "Extract Attachments from PDF-File"
        Me.BarButtonItem4.Id = 6
        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonItem4.Name = "BarButtonItem4"
        '
        'btExtractMailAttachments
        '
        Me.btExtractMailAttachments.Caption = "Extract Attachments from EML-File"
        Me.btExtractMailAttachments.Id = 7
        Me.btExtractMailAttachments.ImageOptions.SvgImage = CType(resources.GetObject("btExtractMailAttachments.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btExtractMailAttachments.Name = "btExtractMailAttachments"
        '
        'rpPage1
        '
        Me.rpPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4})
        Me.rpPage1.Name = "rpPage1"
        Me.rpPage1.Text = "Funktionen"
        '
        'RibbonPageGroup1
        '
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
        Me.RibbonPageGroup1.Text = "Konfig"
        '
        'RibbonPageGroup2
        '
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.btRunEmailCheck)
        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
        Me.RibbonPageGroup2.Text = "Run"
        '
        'RibbonPageGroup3
        '
        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem4)
        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
        Me.RibbonPageGroup3.Text = "PDF Handling"
        '
        'RibbonPageGroup4
        '
        Me.RibbonPageGroup4.ItemLinks.Add(Me.btExtractMailAttachments)
        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
        Me.RibbonPageGroup4.Text = "EML Handling"
        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsifolderbrowser)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitemppath)
        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
        Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24)
        '
        'ListBox1
        '
        Me.ListBox1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.ListBox1.FormattingEnabled = True
-        Me.ListBox1.Location = New System.Drawing.Point(0, 150)
+        Me.ListBox1.Location = New System.Drawing.Point(0, 158)
        Me.ListBox1.Name = "ListBox1"
-        Me.ListBox1.Size = New System.Drawing.Size(800, 273)
+        Me.ListBox1.Size = New System.Drawing.Size(800, 268)
        Me.ListBox1.TabIndex = 2
        '
-        'bsitemppath
+        'OpenFileDialog1
        '
-        Me.bsitemppath.Caption = "BarStaticItem1"
+        Me.OpenFileDialog1.Filter = "PDF Files|*.pdf"
-        Me.bsitemppath.Id = 5
+        Me.OpenFileDialog1.InitialDirectory = "e:\"
-        Me.bsitemppath.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        '
-        Me.bsitemppath.Name = "bsitemppath"
+        'OpenFileDialog2
-        Me.bsitemppath.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        '
        Me.OpenFileDialog2.Filter = "EML Files|*.eml"
        Me.OpenFileDialog2.InitialDirectory = "e:\temp"
        Me.OpenFileDialog2.Title = "Wähle EML-Datei"
        '
        'OpenFileDialog3
        '
        Me.OpenFileDialog3.FileName = "OpenFileDialog3"
        '
        'Form1
        '
@@ -132,23 +183,34 @@ Partial Class Form1
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
        Me.Name = "Form1"
-        Me.Text = "Form1"
+        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "EMail Profiler - Test Tool"
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
    End Sub
    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
-    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents rpPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
    Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
    Friend WithEvents bsifolderbrowser As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btRunEmailCheck As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents ListBox1 As ListBox
    Friend WithEvents bsitemppath As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents OpenFileDialog1 As OpenFileDialog
    Friend WithEvents btExtractMailAttachments As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents OpenFileDialog2 As OpenFileDialog
    Friend WithEvents OpenFileDialog3 As OpenFileDialog
    Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager
 End Class
--- a/App/wisag_check_Att/Form1.resx
+++ b/App/wisag_check_Att/Form1.resx
@@ -120,7 +120,7 @@
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -138,7 +138,7 @@
  </data>
  <data name="bsifolderbrowser.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -154,9 +154,9 @@
        NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
 </value>
  </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btRunEmailCheck.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -176,7 +176,7 @@
  </data>
  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -192,9 +192,9 @@
        NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
 </value>
  </data>
-  <data name="BarStaticItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bsitemppath.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -208,9 +208,59 @@
        MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
        ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
        NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
 </value>
  </data>
  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMkCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkF0dGFjaG1lbnRzIj4NCiAgICA8cGF0aCBkPSJN
        MjIsMTB2MTNjMCwyLjgtMi4yLDUtNSw1cy01LTIuMi01LTVWN2MwLTEuNywxLjMtMywzLTNzMywxLjMs
        MywzdjE2YzAsMC42LTAuNCwxLTEsMXMtMS0wLjQtMS0xVjEwaC0ydjEzICAgYzAsMS43LDEuMywzLDMs
        M3MzLTEuMywzLTNWN2MwLTIuOC0yLjItNS01LTVzLTUsMi4yLTUsNXYxNmMwLDMuOSwzLjEsNyw3LDdz
        Ny0zLjEsNy03VjEwSDIyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
  </data>
  <data name="btExtractMailAttachments.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKQCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iTWFpbCI+DQogICAgPHBhdGggZD0iTTE2LDE4LjNsMTQtOFYyNWMwLDAuNS0wLjUs
        MS0xLDFIM2MtMC41LDAtMS0wLjUtMS0xVjEwLjNMMTYsMTguM3ogTTI5LDZIM0MyLjUsNiwyLDYuNSwy
        LDd2MWwxNCw4bDE0LThWNyAgIEMzMCw2LjUsMjkuNSw2LDI5LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQog
        IDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
  <metadata name="FolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>186, 17</value>
  </metadata>
  <metadata name="OpenFileDialog2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>327, 17</value>
  </metadata>
  <metadata name="OpenFileDialog3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>468, 17</value>
  </metadata>
  <metadata name="BehaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>609, 17</value>
  </metadata>
 </root>
--- a/App/wisag_check_Att/Form1.vb
+++ b/App/wisag_check_Att/Form1.vb
@@ -1,18 +1,26 @@
 Imports System.IO
 Imports System.Text.RegularExpressions
 Imports DevExpress.Data.Helpers.ExpressiveSortInfo
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports EmailProfiler.Common
 Imports GdPicture14
 Imports Independentsoft.Email.Mime
 Imports Attachment = Independentsoft.Email.Mime.Attachment
 Imports LicenseManager = GdPicture14.LicenseManager
 Public Class Form1
-    Private Logger As DigitalData.Modules.Logging.Logger
+    Private _logger As Logger
-    Private Shared MyLogger As LogConfig
+    Private Shared _MyLogger As LogConfig
    Private _Worklist As List(Of String)
    Private MyDatabase As MSSQLServer
    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
-            MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
+            _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
-            Logger = MyLogger.GetLogger()
+            _logger = _MyLogger.GetLogger()
-            MyLogger.Debug = True
+            _MyLogger.Debug = True
            Dim dbResult As Boolean
@@ -21,7 +29,7 @@ Public Class Form1
                Exit Sub
            End If
-            MyDatabase = New MSSQLServer(MyLogger, My.Settings.DD_ECM_CONSTRING)
+            MyDatabase = New MSSQLServer(_MyLogger, My.Settings.DD_ECM_CONSTRING)
            If MyDatabase.DBInitialized = True Then
                dbResult = True
@@ -59,8 +67,15 @@ Public Class Form1
        End If
    End Sub
-    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Sub btRunEmailCheck_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btRunEmailCheck.ItemClick
        ' Check Email
        ListBox1.Items.Clear()
        If bsifolderbrowser Is Nothing Or String.IsNullOrEmpty(bsifolderbrowser.Caption) Then
            MsgBox("Es wurde kein input-Verzeichnis konfiguriert. Abbruch!", MsgBoxStyle.Information)
            Return
        End If
        Dim di As New DirectoryInfo(bsifolderbrowser.Caption)
        ' Get a reference to each file in that directory.
        Dim fiArr As FileInfo() = di.GetFiles()
@@ -106,68 +121,68 @@ Public Class Form1
                    If oCount = 1 Then
                        Continue For
                    End If
-                    Dim oAttachmentFileString
+                    Dim oAttachmentFileString As String = ""
                    oString = String.Format("  Working on Attachment [{0}]", oAttachment.GetFileName)
-                    Logger.Info(oString)
+                    _logger.Info(oString)
                    ListBox1.Items.Add(oString)
                    Try
                        Dim oFilename = oAttachment.GetFileName
                        oFilename = CleanInput(oFilename)
-                        Logger.Debug($"oFilename [{oFilename}]")
+                        _logger.Debug($"oFilename [{oFilename}]")
                        If oFilename = String.Empty Then
                            oFilename = oAttachment.GetFileName
                        End If
                        Dim oAttFilenameonly = $"{oMSGID}~{oFilename}"
                        oAttachmentFileString = Path.Combine(bsitemppath.Caption, oAttFilenameonly)
-                        Logger.Debug($"oAttachmentFileString [{oAttachmentFileString}]")
+                        _logger.Debug($"oAttachmentFileString [{oAttachmentFileString}]")
                        Dim oSQL = $"SELECT * FROM IDB.DBO.TBIDB_DOC_INFO WHERE FILENAME_EXT = '{oAttFilenameonly}'"
                        Dim oDT As DataTable = MyDatabase.GetDatatable(oSQL)
                        If Not IsNothing(oDT) Then
                            If oDT.Rows.Count = 0 Then
                                oString = "  ## Attachment NOT EXISTING ##"
-                                Logger.Info(oString)
+                                _logger.Info(oString)
                                ListBox1.Items.Add(oString)
-                                If System.IO.File.Exists(oAttachmentFileString) = False Then
+                                If File.Exists(oAttachmentFileString) = False Then
-                                    Logger.Debug(String.Format("Trying to save attachment [{0}]", oAttachmentFileString))
+                                    _logger.Debug(String.Format("Trying to save attachment [{0}]", oAttachmentFileString))
                                    Try
                                        oAttachment.Save(oAttachmentFileString)
                                        Dim oFileInfo As New FileInfo(oAttachmentFileString)
                                        Dim oFileLenth As Long = oFileInfo.Length
                                        If oFileLenth > 0 Then
-                                            Logger.Info(String.Format("  Attachment saved to [{0}]", oAttachmentFileString))
+                                            _logger.Info(String.Format("  Attachment saved to [{0}]", oAttachmentFileString))
                                        Else
-                                            Logger.Warn($"##!! oFileLenth for AttachmentObjects is 0 !!##")
+                                            _logger.Warn($"##!! oFileLenth for AttachmentObjects is 0 !!##")
                                            Try
                                                File.Delete(oAttachmentFileString)
                                            Catch ex As Exception
-                                                Logger.Error(ex)
+                                                _logger.Error(ex)
                                            End Try
                                        End If
                                    Catch ex As Exception
-                                        Logger.Warn($"Error while saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}")
+                                        _logger.Warn($"Error while saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}")
                                    End Try
                                Else
                                    ListBox1.Items.Add("EXATTMNT - Attachment (" & oAttachmentFileString & ") already existing!")
-                                    Logger.Info("EXATTMNT - Attachment (" & oAttachmentFileString & ") already existing!", False, "EXTRACT_ATTACHMENTS")
+                                    _logger.Info("EXATTMNT - Attachment (" & oAttachmentFileString & ") already existing!", False, "EXTRACT_ATTACHMENTS")
                                End If
                            Else
                                oString = "  ALL OK! EXISTING"
-                                Logger.Info(oString)
+                                _logger.Info(oString)
                                ListBox1.Items.Add(oString)
                            End If
                        End If
                    Catch ex As Exception
-                        Logger.Warn($"Error while creating and saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}")
+                        _logger.Warn($"Error while creating and saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}")
                    End Try
                    oMessage = Nothing
                Next
            Catch ex As Exception
-                Logger.Error(ex)
+                _logger.Error(ex)
            End Try
@@ -180,10 +195,116 @@ Public Class Form1
            ' If we timeout when replacing invalid characters, 
            ' we should return String.Empty.
        Catch ex As Exception
-            Logger.Error(ex)
+            _logger.Error(ex)
            Return String.Empty
        End Try
    End Function
    Private Sub btExtractPdfAttachments_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
        ' FileOpen Dialog
        Dim fileOpenDlg = OpenFileDialog1
        If fileOpenDlg.ShowDialog() = DialogResult.OK Then
            Dim oFilename = fileOpenDlg.FileName
            ' Call Extract Method
            ExtractEmbeddedPDFAttachments(oFilename)
        End If
    End Sub
    Private Sub ExtractEmbeddedPDFAttachments(pFilename As String)
        Try
            Dim GDPictureLicense As String = ConfigDbFunct.GetProductLicense("GDPICTURE", "11.2024", _MyLogger, My.Settings.DD_ECM_CONSTRING)
            Dim oValidExtensions = New List(Of String) From {"pdf", "xls", "xlsx", "doc", "docx", "ppt", "pptx"}
            Dim oGraphicExtensions = New List(Of String) From {"jpg", "bmp", "jpeg", "gif", "png", "xml"}
            Dim oFileInfo As New FileInfo(pFilename)
            If oFileInfo.Extension.ToLower = ".pdf" Then
                Dim oPDFConsistent As Boolean = True
                Dim oLicenseManager As New LicenseManager
                oLicenseManager.RegisterKEY(GDPictureLicense)
                Dim oGdPicturePDF As New GdPicturePDF()
                ' Lic
                Dim oStatus As GdPictureStatus = oGdPicturePDF.LoadFromFile(pFilename, True)
                If oStatus <> GdPictureStatus.OK Then
                    oPDFConsistent = False
                    Dim oResult = $"PDF-Consistency of attached file {pFilename} is not ok. ({oStatus.ToString})"
                Else
                    Dim embeddedFileCount As Integer = oGdPicturePDF.GetEmbeddedFileCount()
                    If embeddedFileCount > 0 Then
                        For i As Integer = 0 To embeddedFileCount - 1
                            Dim oEmbAttName As String = oGdPicturePDF.GetEmbeddedFileName(i)
                            Dim fileDetail As IO.FileInfo
                            fileDetail = My.Computer.FileSystem.GetFileInfo(oEmbAttName)
                            If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
                                Dim FileSize As Integer = oGdPicturePDF.GetEmbeddedFileSize(i)
                                Dim oValidExt = oValidExtensions.Any(Function(ext) oEmbAttName.EndsWith(ext))
                                If oValidExt = False Then
                                    _logger.Info("Invalid FileExtension of embedded file [{0}]", oEmbAttName)
                                    Dim GraphicExt = oGraphicExtensions.Any(Function(ext) oEmbAttName.EndsWith(ext))
                                    If GraphicExt = False Then
                                        Dim oInfo = $"Consistency or extension of attached file [{oEmbAttName}] is not ok."
                                    End If
                                    Continue For
                                End If
                                If oGdPicturePDF.GetStat() = GdPictureStatus.OK Then
                                    Dim FileData As Byte() = New Byte(FileSize) {}
                                    Dim status As GdPictureStatus = oGdPicturePDF.ExtractEmbeddedFile(0, FileData)
                                    If status <> GdPictureStatus.OK Or FileSize = 0 Then
                                        oPDFConsistent = False
                                        Dim oResult = $"Consistency or PDF-State of embedded file [{oEmbAttName}] is not ok."
                                        Continue For
                                    End If
                                End If
                            End If
                        Next
                    End If
                End If
            End If
        Catch ex As Exception
            _logger.Error(ex)
        End Try
    End Sub
    Private Sub btExtractMailAttachments_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btExtractMailAttachments.ItemClick
        ' Hier verarbeiten wir eine ausgewählte EML-Datei
        ' und speichern alle Anhänge auf die Platte.
        ' Der Einstieg und der Ablauf entspricht dem des Services.
        ' Unterschied ist die lokale Datei
        Dim connectionString As String = "Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd"
        Dim oConfigData As Config = New Config() With {
            .Debug = False,
            .GDPictureVersion = "11.2024",
            .UseWindream = False,
            .ConnectionString = connectionString
        }
        Dim Worker As ExtractAttachmentsFromEMLFile = New ExtractAttachmentsFromEMLFile()
        ' FileOpen Dialog
        Dim fileOpenDlg = OpenFileDialog2
        If fileOpenDlg.ShowDialog() = DialogResult.OK Then
            Dim oFilename = fileOpenDlg.FileName
            ' Call Extract Method
            Worker.CallWorkerProcess(oFilename, oConfigData)
        End If
    End Sub
 End Class
--- a/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb
+++ b/App/wisag_check_Att/TestClasses/ExtractAttachmentsFromEMLFile.vb
@@ -0,0 +1,30 @@
 Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports EmailProfiler.Common
 Public Class ExtractAttachmentsFromEMLFile
    Private ReadOnly _LogConfig As LogConfig
    Sub New()
        Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
        _LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "DD EmailProfiler TEST", 30)
    End Sub
    Public Sub CallWorkerProcess(pEMLFilename As String, pConfigData As Config)
        Dim oProfileIdForPolling = 1
        Dim oWorker As New clsWorker(_LogConfig,
                                pConfigData.ConnectionString,
                                "",
                                oProfileIdForPolling,
                                pConfigData,
                                pEMLFilename)
        oWorker.Start_WorkingProfiles(True)
    End Sub
 End Class
--- a/App/wisag_check_Att/packages.config
+++ b/App/wisag_check_Att/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="GdPicture" version="14.2.90" targetFramework="net48" />
  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net48" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
 </packages>
--- a/App/wisag_check_Att/wisag_check_Att.vbproj
+++ b/App/wisag_check_Att/wisag_check_Att.vbproj
@@ -15,6 +15,8 @@
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -54,15 +56,27 @@
    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DigitalData.Modules.Config">
      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="EmailProfiler.Common">
      <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>
    </Reference>
    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="Independentsoft.Email">
      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Email .NET\Bin\Independentsoft.Email.dll</HintPath>
    </Reference>
    <Reference Include="Mail">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@@ -97,6 +111,7 @@
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="TestClasses\ExtractAttachmentsFromEMLFile.vb" />
    <Compile Include="Form1.vb">
      <SubType>Form</SubType>
    </Compile>
@@ -147,4 +162,11 @@
    <None Include="packages.config" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
 </Project>
Author	SHA1	Message	Date
Developer01	af916cc5d2	Merge branch 'master' of https://vcs.digitaldata.works/AppStd/EmailProfiler	2026-01-23 13:48:15 +01:00
Developer01	5980d907b2	Commit wegen frmMain Controls	2026-01-23 13:47:47 +01:00
OlgunR	7f95c28b5e	Refactor grid column logic, lock designer controls Refactored GridView5 column formatting to only show relevant columns and improve maintainability. Added .Locked metadata to many controls in frmMain.resx to enforce read-only state in the designer. Restored SVG images for XtraTabPages and updated TrayLocation metadata for components.	2026-01-22 11:38:18 +01:00
OlgunR	6b291e82a7	Improve Monitoring tab UI: add email limit panel Added a top panel to the Monitoring tab for specifying the number of emails to fetch, with a label and input field. Refactored grid layout by placing gridMonitoring inside a docked panel for better separation and flexibility. Updated designer code and .resx metadata to support new controls and lock them in the designer. No changes to business logic.	2026-01-22 11:24:41 +01:00
OlgunR	35bdee53e3	Add Monitoring tab with grid for TBEMLP_HISTORY data Added a new Monitoring tab to frmMain with a DevExpress grid displaying TBEMLP_HISTORY records. Updated designer and resource files to support the new tab and controls. Introduced LoadMonitoringIntoGrid method to populate and format the grid. Resized various UI controls for improved readability and updated label texts. Updated licenses.licx and project DLL HintPaths for compatibility.	2026-01-22 10:06:46 +01:00
Developer01	38e682dcef	Update GDPicture Variablenname LicenseString	2025-12-09 16:34:04 +01:00
Developer01	543db62095	GDPicture Local	2025-12-08 15:23:29 +01:00
Developer01	44267288ef	GDPictureLicense via config	2025-12-08 14:47:11 +01:00
Developer01	904c4a7f2e	GD Picture 14.3.18	2025-12-08 10:09:18 +01:00
Developer01	12e9538968	clsWorkEmail	2025-12-03 13:07:09 +01:00
Developer01	f150041a33	Stage Commit clsWorkemail	2025-12-03 13:01:50 +01:00
Developer01	109d497e37	MS AssemblyInfo	2025-12-03 12:49:37 +01:00
Developer01	8fb7992c22	Oauth 2 integriert	2025-11-27 17:55:35 +01:00
pitzm	7d04f4c3b5	Ungekürztes Subject verwenden	2025-10-01 10:21:31 +02:00
pitzm	d397c9ec95	EMailProfiler.Common: Version 3.1.2.0	2025-10-01 09:43:54 +02:00
pitzm	d7c2c86a00	Ein leeres Subject führt offensichtlich zu unverarbeiteten E-Mails. Variable und deren Logging geprüft und abgesichert	2025-10-01 09:43:01 +02:00
pitzm	db06af6a37	EMailprofile.Common: Version 3.1.1.0	2025-09-10 08:47:44 +02:00
pitzm	1bcf91f7c8	EMailprofile.Common: Korrektur Fall ein normaler Anhang ist defekt.	2025-09-10 08:46:36 +02:00
pitzm	d0e93841fe	Test-Tool Aktualisierungen	2025-09-10 08:45:13 +02:00
pitzm	6c47b9ddec	EMailProfile.Common: Version 3.1.0.0	2025-09-05 11:49:41 +02:00
pitzm	ec5c3999ab	EmailProfile.Common: Korrektur, damit Email mit PDF-Datei und kaputten eingebetteten Anhängen abgelehnt und temp. Dateien gelöscht werden.	2025-09-05 11:47:53 +02:00
pitzm	06cfc97ebd	Verweis-Pfade zu unseren DLLS an die neue Struktur angepasst.	2025-09-04 09:46:56 +02:00
Developer01	c5715e7c89	TLS Anpassungen und Logging	2025-06-26 16:42:22 +02:00
Developer01	2ea8178aaa	Merge	2025-06-24 14:50:50 +02:00
Developer01	f0d1520286	Form logging und methode wie im Service benutzen	2025-06-24 14:49:07 +02:00
pitzm	86a11a0670	lokale Referenzen korrigiert	2025-05-30 10:44:06 +02:00
pitzm	b68f94f35f	EmailProfiler.Common: Liste der Anhänge einschränken, so dass nur erlaubte Dateitypen enthalten sind.	2025-02-13 11:20:23 +01:00
pitzm	a73b8f5a16	EMailProfiler.Common: Die Config-Klasse MUSS Config heißen	2025-01-17 14:25:20 +01:00
pitzm	c42440968f	EMail Profiler Service: Version 3.0.5.0	2025-01-17 13:19:46 +01:00
pitzm	73475a585e	Email Profiler APP: Version 3.0.2.0	2025-01-17 13:18:31 +01:00
pitzm	187c869560	EmailProfiler.Common: Version 3.0.10.0	2025-01-17 11:38:07 +01:00
pitzm	acdbf643fb	EmailProfiler.Common: Auswertung der neuen DB Spalte ALLOW_XML_RECEIPTS	2025-01-17 11:36:51 +01:00
pitzm	5fd352dd1a	EmailProfiler.Form: Version 3.0.1.0	2025-01-17 11:09:49 +01:00
pitzm	c6ac431d7f	EmailProfiler.Form: Neues DB-Feld ALLOW_XML_RECEIPTS und dazugehörige Checkbox eingebaut. ConnectionString in Mysettings angepasst.	2025-01-17 11:08:49 +01:00
pitzm	169f8c0ec8	EmailProfiler.Common: Version 3.0.9.0	2025-01-16 09:46:26 +01:00
pitzm	c3d20191b5	EMail Profiler: Test-Projekt kann jetzt EML-Dateien einlesen. / Der erste E-Mail-Anhang darf eine XML-Datei sein	2025-01-16 09:45:28 +01:00
pitzm	371cace3ef	EmailProfiler Form: Version 3.0.0.0	2025-01-09 10:21:04 +01:00
pitzm	9dc6f7b43f	EmailProfiler.Common: Version 3.0.8.0	2025-01-09 10:18:26 +01:00
pitzm	33e2da02cb	EMailProfiler APP: Version 3.0.4.0	2025-01-09 10:16:51 +01:00
pitzm	ba999fa1d9	EMailProfiler: Config-Daten in zentraler Klasse. abfrage der GDPicture Lizenz über Config-Modul	2025-01-09 10:13:07 +01:00
pitzm	6193019051	EMailProfiler.Common: Version 3.0.7.0	2024-11-15 13:17:13 +01:00
pitzm	c170bf7cc4	EmailProfiler.Common: Flag setzen, wenn normales attachment defekt ist. alte Logik entfernt bzw. auskommentiert	2024-11-15 13:16:27 +01:00
pitzm	3be1605d93	Email profiler Service: Version 3.0.3.0	2024-11-13 13:25:34 +01:00
pitzm	1cb9a7ac95	EmailProfiler.Common: Version 3.0.6.0	2024-11-13 13:25:01 +01:00
pitzm	167b7e1210	temp. GDPicture Lizenz-Abfrage ExtractAttachment-Logik	2024-11-13 10:58:48 +01:00
pitzm	a4ac1b1b25	EmailProfiler Service: Version 3.0.2.0	2024-10-28 10:10:31 +01:00
pitzm	522de443bb	Emailprofile.Common: Version 3.0.5.0	2024-10-28 10:09:41 +01:00
pitzm	6b0d247c8e	EMailprofiler.Common: Auswertung ob Attachments valide sind, oder nicht. Defekte Embedded Attachments führen zu einer Ablehnung, sonst Info an Absender	2024-10-28 10:09:05 +01:00
pitzm	01eaf9922b	Merge branch 'master' of http://git.dd:3000/AppStd/EmailProfiler	2024-10-25 09:13:58 +02:00
Developer01	c6776b408b	MS Stage	2024-10-24 15:09:44 +02:00
Developer01	ce06cffd08	MS GD Picture	2024-10-24 15:07:16 +02:00
pitzm	c91a7b82c7	EMailProfiler.Common: Neue Extract Attachments-Logik & InfoMail Logik	2024-09-25 16:08:51 +02:00
pitzm	b18a6a3045	EMailProfile.Common: Version 3.0.4.0	2024-07-03 08:46:22 +02:00
pitzm	1d2b49667e	PNG als verbotene Dateiendung ergänzt	2024-07-03 08:45:33 +02:00
pitzm	8a1a0eff99	EmailProfile.Common: Version 3.0.3.0	2024-06-28 08:37:21 +02:00
pitzm	72e66df02b	Ablehnungscode nach EMLP_HISTORY usw. schreiben	2024-06-21 13:10:08 +02:00
SchreiberM	ce52218a5e	V 3.0.3.0 graphic extension behavior (png, jpeg)	2024-05-17 14:25:29 +02:00
SchreiberM	be743445e5	MS Common: Version 3.0.2 - GDPicture Licensing	2024-05-13 10:36:11 +02:00
pitzm	51003c6461	EMail Profiler Service: Version 3.0.1.0 wg. GDPicture	2024-05-13 09:36:10 +02:00
pitzm	15d21ca913	EMail Profiler Common: Version 3.0.1.0	2024-05-13 09:33:45 +02:00
pitzm	8999c1beeb	E-MailProfiler Common: Temp. Verzeichnis anlegen	2024-05-13 09:33:26 +02:00
pitzm	861f012593	EMail Profiler: Version 2.15.0.0	2024-05-10 10:59:05 +02:00
pitzm	cd8761c3fe	EMailProfiler Service: Neuer Config Schalter InfoTemplateId	2024-05-10 10:58:22 +02:00
SchreiberM	92b5a72537	MS attachmentsHandling	2024-05-08 15:21:30 +02:00
SchreiberM	e0bb1d84e2	MS Common VS 3.0	2024-04-30 16:58:29 +02:00
SchreiberM	f3a61bd7f5	MS	2024-04-29 13:27:14 +02:00
pitzm	f6b8e78915	Common: Version 2.15.0.0	2024-04-24 14:49:49 +02:00
pitzm	a97fa3dab4	Email Profiler Common: Reihenfolge der SQL Aufrufe korrigiert	2024-04-24 14:49:10 +02:00
pitzm	7443e850f9	EMail Profiler Config: Version 2.14.0.0	2024-04-24 11:22:41 +02:00
pitzm	a7bca36d58	EMail Profiler Service: Version 2.14.0.0	2024-04-24 11:21:38 +02:00
pitzm	200630e0e8	EMail Profiler Common: Version 2.14.0.0	2024-04-24 11:20:45 +02:00
pitzm	2898da380d	EMailProfiler Common: Neue Ablehnungsmail-Logik	2024-04-24 11:19:41 +02:00
pitzm	01da88aa54	Referenzen	2024-04-24 11:19:14 +02:00
pitzm	79edfe385a	EMail Profiler: Konfiguration erweitert (RejectionTemplateId)	2024-04-24 11:18:48 +02:00
pitzm	0db24f53e9	Common: E-Mail Strings	2024-02-02 12:28:41 +01:00
pitzm	bb11ff18e5	Common: Version 2.13	2024-02-02 11:07:29 +01:00
pitzm	84b3177e29	Common: oHistoryID is not always numeric, but we need the Rejection Mail	2024-02-02 11:06:22 +01:00
Jonathan Jenne	c8145c9d9d	Version 2.12.0.0	2023-11-21 16:34:52 +01:00
Jonathan Jenne	1c07b9b507	Move processed emails to imap folder Verarbeitet, if they are not deleted	2023-11-21 16:28:25 +01:00
Jonathan Jenne	b4cf442c89	Version 2.11.4.0	2023-11-10 14:23:47 +01:00
Jonathan Jenne	3ab200b5b2	fix history entry when no attachments are found	2023-11-10 14:23:21 +01:00
Jonathan Jenne	d3249e91ac	Version 2.11.3.0	2023-11-03 12:55:53 +01:00
Jonathan Jenne	02cc79916a	Fix single quote in email subject	2023-11-03 12:55:44 +01:00
Jonathan Jenne	412b3de5ec	Version 2.11.2.0	2023-10-27 09:55:49 +02:00
Jonathan Jenne	1b546b88ed	Escape Subject when adding to history table	2023-10-27 09:53:33 +02:00
Jonathan Jenne	33586522dd	Version 2.11.1.0	2023-10-11 14:02:56 +02:00
Jonathan Jenne	52d75c64cc	Fix missing null check for wm fields	2023-10-11 14:01:56 +02:00
Jonathan Jenne	0c8aeb6e5a	add PollType default value, fix insert command	2023-10-11 13:10:09 +02:00
Jonathan Jenne	ea366519c1	Fix Config	2023-10-11 13:08:26 +02:00
Jonathan Jenne	71577e4579	fix loadpollingprofiles	2023-10-10 11:29:54 +02:00
Jonathan Jenne	e3860795d0	Version 2.11.0.0	2023-10-09 14:55:30 +02:00
Jonathan Jenne	def648aa53	add EMAIL_ATTMT_INDEX column	2023-10-09 14:54:48 +02:00
Jonathan Jenne	d493cf1b5f	Version 2.10.0.3	2023-10-05 15:12:40 +02:00
Jonathan Jenne	3801714e0a	Enable Tls1.1 and Tls1.2	2023-10-05 15:12:00 +02:00
Jonathan Jenne	78581e382b	Version 2.10.0.2	2023-09-22 09:53:20 +02:00
Jonathan Jenne	ac45956b8c	Load config also from appdata	2023-09-22 09:52:49 +02:00
Jonathan Jenne	7cf738c946	Version 2.10.0.1	2023-09-22 09:43:49 +02:00
Jonathan Jenne	06f0179270	Fix SQL Designer, support encrypted db passwords	2023-09-22 09:42:56 +02:00
Jonathan Jenne	06a3d735c3	truncate error message from validation sql	2023-09-19 14:23:31 +02:00
Jonathan Jenne	1ca7a009d9	Fix Namespace	2023-09-19 13:15:42 +02:00
Jonathan Jenne	e811cd9c2a	Version 2.10.0.0	2023-09-19 11:42:25 +02:00
Jonathan Jenne	8b5f6f0635	WIP Email Validation	2023-09-19 11:39:27 +02:00
Jonathan Jenne	e457b8586b	Logout after profile done lol	2023-09-14 15:58:11 +02:00
Jonathan Jenne	513e0ced64	Version 2.7.0.0	2023-09-14 14:27:31 +02:00
Jonathan Jenne	900b0c9f26	Version 2.9.0.0	2023-09-14 14:23:10 +02:00
Jonathan Jenne	13c7816c16	Clean up	2023-09-14 14:21:36 +02:00
Jonathan Jenne	c43903154c	Add Initial Support for OAuth2 / O365	2023-09-06 12:55:10 +02:00
Jonathan Jenne	5f04d6a7a6	smol changes	2023-09-05 11:59:20 +02:00
Jonathan Jenne	660921b50b	Clean up UI, add Security NONE	2023-08-16 16:12:05 +02:00
Jonathan Jenne	c8dbbd6381	Rename Projects, clean up interfaces	2023-07-31 16:30:26 +02:00
Jonathan Jenne	94d1aeeaa4	Version 2.6.1.0	2023-07-28 13:15:52 +02:00
Jonathan Jenne	33a363fdea	convert attachment filename to slug version	2023-07-28 13:15:17 +02:00
		`@@ -1 +0,0 @@`
			`DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a`