diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
index 49d121e..5dee74e 100644
--- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
+++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj
@@ -400,6 +400,9 @@
   <ItemGroup>
     <Content Include="DD_Icons_ICO_CBWATCHER_48px.ico" />
     <Content Include="KeyOutput_8167.ico" />
+    <Content Include="MailLicense.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="search.ico" />
     <None Include="Resources\search1.png" />
     <None Include="Resources\searchFlow_icon.png" />
diff --git a/app/DD_Clipboard_Searcher/MailLicense.xml b/app/DD_Clipboard_Searcher/MailLicense.xml
new file mode 100644
index 0000000..0510526
--- /dev/null
+++ b/app/DD_Clipboard_Searcher/MailLicense.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<License>
+  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
+  <ProductName>Mail.dll</ProductName>
+  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
+  <RegisteredTo>Digital Data GmbH</RegisteredTo>
+  <LicenseType>single developer</LicenseType>
+  <BuyerName>Digital Data GmbH</BuyerName>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
+  </Signature>
+</License>
\ No newline at end of file
diff --git a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb
index 3fd4803..2bfb1cc 100644
--- a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb	
+++ b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb	
@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("Search Flow")>
-<Assembly: AssemblyCopyright("Copyright © 2021")>
-<Assembly: AssemblyTrademark("2501")>
+<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyTrademark("2525")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.3.1")>
+<Assembly: AssemblyVersion("2.5.2.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs
index 8424668..b67b1b3 100644
--- a/app/SetupVS19/Product.wxs
+++ b/app/SetupVS19/Product.wxs
@@ -1,249 +1,274 @@
 <?include Config.wxi?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
-    <Package
-      Id="*"
-      Keywords="Installer"
-      Description="$(var.Description)"
-      Comments="$(var.Comments)"
-      Manufacturer="$(var.Manufacturer)"
-      InstallerVersion="100"
-      Languages="1031"
-      Compressed="yes"
-      SummaryCodepage="1252"
-      InstallScope="perMachine"
+	<Product Id="*" Name="$(var.ProductName)" Language="1031" Codepage="1252" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+		<Package
+		  Id="*"
+		  Keywords="Installer"
+		  Description="$(var.Description)"
+		  Comments="$(var.Comments)"
+		  Manufacturer="$(var.Manufacturer)"
+		  InstallerVersion="100"
+		  Languages="1031"
+		  Compressed="yes"
+		  SummaryCodepage="1252"
+		  InstallScope="perMachine"
     />
 
-    <Property Id="APPLICATIONFOLDER">
-      <RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
-    </Property>
+		<!-- Liest den Installationsort über die Registry aus -->
+		<Property Id="INSTALLIDIR">
+			<RegistrySearch Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="raw" Id="APPLICATIONFOLDER_REGSEARCH" Name="Path" />
+		</Property>
 
-    <Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
-    <Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
+		<Media Id='1' Cabinet='$(var.ProgramName).cab' EmbedCab='yes' DiskPrompt='$(var.ProgramName)'  />
+		<Property Id='DiskPrompt' Value="$(var.ProgramName) Install" />
 
-    <MajorUpgrade
-      AllowDowngrades="no"
-      AllowSameVersionUpgrades="no"
-      DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
+		<MajorUpgrade
+		  AllowDowngrades="no"
+		  AllowSameVersionUpgrades="no"
+		  DowngradeErrorMessage="Eine neuere Version von [ProductName] ist bereits installiert. Das Setup wird beendet."
     />
 
-    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
-    <Upgrade Id="$(var.UpgradeCode)">
-      <UpgradeVersion
-        Minimum="1.0.0.0" Maximum="99.0.0.0"
-        Property="PREVIOUSVERSIONSINSTALLED"
-        IncludeMinimum="yes" IncludeMaximum="no" />
-    </Upgrade>
+		<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+		<Upgrade Id="$(var.UpgradeCode)">
+			<UpgradeVersion
+			  Minimum="1.0.0.0" Maximum="99.0.0.0"
+			  Property="PREVIOUSVERSIONSINSTALLED"
+			  IncludeMinimum="yes" IncludeMaximum="no" />
+		</Upgrade>
 
-    <!-- Legt das Icon fest -->
-    <Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />
-    <!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
-    <Property Id="ARPPRODUCTICON" Value="AppIcon" />
+		<!-- Legt das Icon fest -->
+		<Icon Id="AppIcon.exe" SourceFile="$(var.ProgramName).exe" />
+		<!-- Zeige Icon in Systemsteuerung > Programme entfernen -->
+		<Property Id="ARPPRODUCTICON" Value="AppIcon" />
 
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="DD" Name="$(var.Manufacturer)">
-          <Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
-        </Directory>
-      </Directory>
 
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
-      </Directory>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="DD" Name="$(var.Manufacturer)">
+					<Directory Id="INSTALLDIR" Name="$(var.ProductName)"/>
+				</Directory>
+			</Directory>
 
-      <Directory Id="DesktopFolder" />
-    </Directory>
+			<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
+			</Directory>
 
-    <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="ApplicationShortcut_StartMenu" Guid="459eecd2-6db7-4b30-97f5-63719879e4a9">
-        <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
-             Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
-             WorkingDirectory="INSTALLDIR"/>
-        <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    </DirectoryRef>
+			<Directory Id="DesktopFolder" />
+		</Directory>
 
-    <DirectoryRef Id="DesktopFolder">
-      <Component Id="ApplicationShortcut_Desktop" Guid="1717d19a-4510-423f-93b1-671f280dcca3">
-        <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
-             Name="$(var.ProductName)"
-             Target="[INSTALLDIR]$(var.ProgramName).exe"
-             WorkingDirectory="INSTALLDIR"/>
-        <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
-        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    </DirectoryRef>
+		<DirectoryRef Id="ApplicationProgramsFolder">
+			<Component Id="ApplicationShortcut_StartMenu" Guid="459eecd2-6db7-4b30-97f5-63719879e4a9">
+				<Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}">
-        <File Id="MainApplicationExe" Source="..\DD_Clipboard_Searcher\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
-      </Component>
+		<DirectoryRef Id="DesktopFolder">
+			<Component Id="ApplicationShortcut_Desktop" Guid="1717d19a-4510-423f-93b1-671f280dcca3">
+				<Shortcut Id="ApplicationStartMenuShortcut_Desktop"
+					 Name="$(var.ProductName)"
+					 Target="[INSTALLDIR]$(var.ProgramName).exe"
+					 WorkingDirectory="INSTALLDIR"/>
+				<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
 
-      <Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}">
-        <File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="yes" Checksum="yes"/>
-      </Component>
+		<DirectoryRef Id="INSTALLDIR">
+			<Component Id="MainApplicationExe" Guid="{BA4DC59A-6FCD-4672-9D58-456F255E5AAB}">
+				<File Id="MainApplicationExe" Source="..\DD_Clipboard_Searcher\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
+			</Component>
 
-      <Component Id="DDLibs" Guid="{13F5F24D-9D99-4783-B17B-5FFC9C42E261}">
-        <File Id="DDLibStandarts" Name="DD_LIB_Standards.dll" KeyPath="yes" Checksum="yes"/>
-        <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDRegexEditor" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDprotobuf" Name="protobuf-net.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDCommon" Name="DigitalData.GUIs.Common.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDWindows" Name="DigitalData.Modules.Windows.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDClipboardWatcher" Name="DigitalData.GUIs.ClipboardWatcher.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDZooFlow" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes"/>
-        <File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" KeyPath="no" Checksum="yes"/>
-      </Component>
+			<Component Id="MainApplicationExeConfig" Guid="{F40EA733-5734-4BF5-9668-63AC0D150DA7}">
+				<File Id="MainApplicationExeConfig" Name="$(var.ProgramName).exe.config" KeyPath="yes" Checksum="yes"/>
+			</Component>
 
-      <Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
-        <File Id="NLog" Name="NLog.dll" KeyPath="yes" Checksum="yes"/>
-      </Component>
+			<Component Id="DDLibs" Guid="{13F5F24D-9D99-4783-B17B-5FFC9C42E261}">
+				<File Id="DDLibStandarts" Name="DD_LIB_Standards.dll" KeyPath="yes" Checksum="yes"/>
+				<File Id="DDBase" Name="DigitalData.Modules.Base.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDConfig" Name="DigitalData.Modules.Config.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDRegexEditor" Name="DigitalData.Controls.RegexEditor.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDprotobuf" Name="protobuf-net.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDCommon" Name="DigitalData.GUIs.Common.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDWindows" Name="DigitalData.Modules.Windows.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDMessaging" Name="DigitalData.Modules.Messaging.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDClipboardWatcher" Name="DigitalData.GUIs.ClipboardWatcher.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDZooFlow" Name="DigitalData.Modules.ZooFlow.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDLookup" Name="DigitalData.Controls.LookupGrid.dll" KeyPath="no" Checksum="yes"/>
+				<File Id="DDMessagebox" Name="DigitalData.Controls.MessageBoxEx.dll" KeyPath="no" Checksum="yes"/>
+			</Component>
 
-      <!-- DEVEXPRESS Bibliotheken -->
-      <Component Id="DevExpressLibs" Guid="665D0AC8-93FC-4499-BA89-F660CAC6C577">
-        <File Id="DevExpress.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" />
-        <File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" KeyPath="yes" />
-        <File Id="DevExpress.DataAccess.v21.2.UI" Name="DevExpress.DataAccess.v21.2.UI.dll" />
-        <File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" />
-        <File Id="DevExpress.Dialogs.v21.2.Core" Name="DevExpress.Dialogs.v21.2.Core.dll" />
-        <File Id="DevExpress.Images.v21.2" Name="DevExpress.Images.v21.2.dll" />
-        <File Id="DevExpress.Office.v21.2.Core" Name="DevExpress.Office.v21.2.Core.dll" />
-        <File Id="DevExpress.Pdf.v21.2.Core" Name="DevExpress.Pdf.v21.2.Core.dll" />
-        <File Id="DevExpress.Printing.v21.2.Core" Name="DevExpress.Printing.v21.2.Core.dll" />
-        <File Id="DevExpress.RichEdit.v21.2.Core" Name="DevExpress.RichEdit.v21.2.Core.dll" />    
-        <File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" />
-        <File Id="DevExpress.Spreadsheet.v21.2.Core" Name="DevExpress.Spreadsheet.v21.2.Core.dll" />    
-        <File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" />
-        <File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" />
-        <File Id="DevExpress.XtraDialogs.v21.2" Name="DevExpress.XtraDialogs.v21.2.dll" />
-        <File Id="DevExpress.XtraEditors.v21.2" Name="DevExpress.XtraEditors.v21.2.dll" />
-        <File Id="DevExpress.XtraGauges.v21.2.Core" Name="DevExpress.XtraGauges.v21.2.Core.dll" />
-        <File Id="DevExpress.XtraGauges.v21.2.Win" Name="DevExpress.XtraGauges.v21.2.Win.dll" />
-        <File Id="DevExpress.XtraGrid.v21.2" Name="DevExpress.XtraGrid.v21.2.dll" />
-        <File Id="DevExpress.XtraLayout.v21.2" Name="DevExpress.XtraLayout.v21.2.dll" />
-        <File Id="DevExpress.XtraPrinting.v21.2" Name="DevExpress.XtraPrinting.v21.2.dll" />
-        <File Id="DevExpress.XtraRichEdit.v21.2" Name="DevExpress.XtraRichEdit.v21.2.dll" />
-        <File Id="DevExpress.XtraSpreadsheet.v21.2" Name="DevExpress.XtraSpreadsheet.v21.2.dll" />
-        <File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll" />
-      </Component>
+			<Component Id="NLog" Guid="{08903680-6b02-4ff0-b700-93209381fe1a}">
+				<File Id="NLog" Name="NLog.dll" KeyPath="yes" Checksum="yes"/>
+			</Component>
 
-      <Component Id="IndependentsoftLibs" Guid="136fd96d-3cae-4e50-b82b-423b5d695e7a">
-        <File Id="Msg.Net" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll" KeyPath="yes" />
-      </Component>
+			<!-- DEVEXPRESS Bibliotheken -->
+			<Component Id="DevExpressLibs" Guid="665D0AC8-93FC-4499-BA89-F660CAC6C577">
+				<File Id="DevExpress.Charts.v21.2.Core" Name="DevExpress.Charts.v21.2.Core.dll" />
+				<File Id="DevExpress.CodeParser.v21.2" Name="DevExpress.CodeParser.v21.2.dll" KeyPath="yes" />
+				<File Id="DevExpress.Data.Desktop.v21.2" Name="DevExpress.Data.Desktop.v21.2.dll" />
+				<File Id="DevExpress.Data.v21.2" Name="DevExpress.Data.v21.2.dll" />
+				<File Id="DevExpress.DataAccess.v21.2" Name="DevExpress.DataAccess.v21.2.dll" />
+				<File Id="DevExpress.DataAccess.v21.2.UI" Name="DevExpress.DataAccess.v21.2.UI.dll" />
+				<File Id="DevExpress.DataVisualization.v21.2.Core" Name="DevExpress.DataVisualization.v21.2.Core.dll" />
+				<File Id="DevExpress.Diagram.v21.2.Core" Name="DevExpress.Diagram.v21.2.Core.dll" />
+				<File Id="DevExpress.Dialogs.v21.2.Core" Name="DevExpress.Dialogs.v21.2.Core.dll" />
+				<File Id="DevExpress.Images.v21.2" Name="DevExpress.Images.v21.2.dll" />
+				<File Id="DevExpress.Office.v21.2.Core" Name="DevExpress.Office.v21.2.Core.dll" />
+				<File Id="DevExpress.Pdf.v21.2.Core" Name="DevExpress.Pdf.v21.2.Core.dll" />
+				<File Id="DevExpress.Pdf.v21.2.Drawing" Name="DevExpress.Pdf.v21.2.Drawing.dll" />
+				<File Id="DevExpress.Printing.v21.2.Core" Name="DevExpress.Printing.v21.2.Core.dll" />
+				<File Id="DevExpress.RichEdit.v21.2.Core" Name="DevExpress.RichEdit.v21.2.Core.dll" />
+				<File Id="DevExpress.Sparkline.v21.2.Core" Name="DevExpress.Sparkline.v21.2.Core.dll" />
+				<File Id="DevExpress.Spreadsheet.v21.2.Core" Name="DevExpress.Spreadsheet.v21.2.Core.dll" />
+				<File Id="DevExpress.TreeMap.v21.2.Core" Name="DevExpress.TreeMap.v21.2.Core.dll" />
+				<File Id="DevExpress.Utils.v21.2" Name="DevExpress.Utils.v21.2.dll" />
+				<File Id="DevExpress.Utils.v21.2.UI" Name="DevExpress.Utils.v21.2.UI.dll" />
+				<File Id="DevExpress.Xpo.v21.2" Name="DevExpress.Xpo.v21.2.dll" />
+				<File Id="DevExpress.XtraBars.v21.2" Name="DevExpress.XtraBars.v21.2.dll" />
+				<File Id="DevExpress.XtraCharts.v21.2" Name="DevExpress.XtraCharts.v21.2.dll" />
+				<File Id="DevExpress.XtraDiagram.v21.2" Name="DevExpress.XtraDiagram.v21.2.dll" />
+				<File Id="DevExpress.XtraDialogs.v21.2" Name="DevExpress.XtraDialogs.v21.2.dll" />
+				<File Id="DevExpress.XtraEditors.v21.2" Name="DevExpress.XtraEditors.v21.2.dll" />
+				<File Id="DevExpress.XtraGauges.v21.2.Core" Name="DevExpress.XtraGauges.v21.2.Core.dll" />
+				<File Id="DevExpress.XtraGauges.v21.2.Win" Name="DevExpress.XtraGauges.v21.2.Win.dll" />
+				<File Id="DevExpress.XtraGrid.v21.2" Name="DevExpress.XtraGrid.v21.2.dll" />
+				<File Id="DevExpress.XtraLayout.v21.2" Name="DevExpress.XtraLayout.v21.2.dll" />
+				<File Id="DevExpress.XtraNavBar.v21.2" Name="DevExpress.XtraNavBar.v21.2.dll" />
+				<File Id="DevExpress.XtraPrinting.v21.2" Name="DevExpress.XtraPrinting.v21.2.dll" />
+				<File Id="DevExpress.XtraRichEdit.v21.2" Name="DevExpress.XtraRichEdit.v21.2.dll" />
+				<File Id="DevExpress.XtraSpreadsheet.v21.2" Name="DevExpress.XtraSpreadsheet.v21.2.dll" />
+				<File Id="DevExpress.XtraTreeList.v21.2" Name="DevExpress.XtraTreeList.v21.2.dll" />
+				<File Id="DevExpress.XtraTreeMap.v21.2" Name="DevExpress.XtraTreeMap.v21.2.dll" />
+				<File Id="DevExpress.XtraVerticalGrid.v21.2" Name="DevExpress.XtraVerticalGrid.v21.2.dll" />
+			</Component>
 
-      <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
-        <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
-        <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
-        <File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" />
-        <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
-        <File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" />
-        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
-        <File Id="GdPicture.NET.14.Imaging64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
-      </Component>
+			<Component Id="IndependentsoftLibs" Guid="136fd96d-3cae-4e50-b82b-423b5d695e7a">
+				<File Id="Msg.Net" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll" KeyPath="yes" />				
+			</Component>
 
-      <Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
-        <RegistryKey Root="HKLM" Key="Software">
-          <RegistryKey Key="[Manufacturer]">
-            <RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no" Id="REGKEYINSTALLDIR">
-              <RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
-            </RegistryKey>
-          </RegistryKey>
-        </RegistryKey>
+			<Component Id="Limilabs" Guid="b3c2193c-522a-4c5f-a031-9b80150a154a">
+				<File Id="Mail" Name="Mail.dll" KeyPath="yes" />
+				<File Id="MailLicense" Name="MailLicense.xml" />
+			</Component>
 
-        <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
-      </Component>
+			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
+				<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll" KeyPath="yes" />
+				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.dll" />
+				<File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.filters.64.dll" />
+				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.dll" />
+				<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.image.gdimgplug.64.dll" />
+				<File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+				<File Id="GdPicture.NET.14.Imaging64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" Source="D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+			</Component>
 
-      <Directory Id="Resources.DE" Name="de">
-        <Component Id="Resources.DE.Devexpress" Guid="93cbf511-9a82-49e9-8283-678e508ac3b6">
-          <File Id="DevExpress.DataAccess.v21.2.UI.resources" Name="DevExpress.DataAccess.v21.2.UI.resources.dll" />
-          <File Id="DevExpress.DataAccess.v21.2.resources" Name="DevExpress.DataAccess.v21.2.resources.dll" />
-          <File Id="DevExpress.Dialogs.v21.2.Core.resources" Name="DevExpress.Dialogs.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Office.v21.2.Core.resources" Name="DevExpress.Office.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Pdf.v21.2.Core.resources" Name="DevExpress.Pdf.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Printing.v21.2.Core.resources" Name="DevExpress.Printing.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.RichEdit.v21.2.Core.resources" Name="DevExpress.RichEdit.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Sparkline.v21.2.Core.resources" Name="DevExpress.Sparkline.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Spreadsheet.v21.2.Core.resources" Name="DevExpress.Spreadsheet.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.Utils.v21.2.resources" Name="DevExpress.Utils.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraBars.v21.2.resources" Name="DevExpress.XtraBars.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraEditors.v21.2.resources" Name="DevExpress.XtraEditors.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraGauges.v21.2.Core.resources" Name="DevExpress.XtraGauges.v21.2.Core.resources.dll" />
-          <File Id="DevExpress.XtraGrid.v21.2.resources" Name="DevExpress.XtraGrid.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraLayout.v21.2.resources" Name="DevExpress.XtraLayout.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraPrinting.v21.2.resources" Name="DevExpress.XtraPrinting.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraRichEdit.v21.2.resources" Name="DevExpress.XtraRichEdit.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraSpreadsheet.v21.2.resources" Name="DevExpress.XtraSpreadsheet.v21.2.resources.dll" />
-          <File Id="DevExpress.XtraTreeList.v21.2.resources" Name="DevExpress.XtraTreeList.v21.2.resources.dll" />
-        </Component>
-      </Directory>
-    </DirectoryRef>
+			<Component Id="RegistryKeys" Guid="{72D6927F-8297-4D51-BF4A-813064089A4A}">
+				<RegistryKey Root="HKLM" Key="Software">
+					<RegistryKey Key="[Manufacturer]">
+						<RegistryKey Key="[ProductName]" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no" Id="REGKEYINSTALLDIR">
+							<RegistryValue Type="string" Value="[INSTALLDIR]" Name="Path" />
+						</RegistryKey>
+					</RegistryKey>
+				</RegistryKey>
 
-    <Feature Id="MainApplication" Title="Main Application" Level="1">
-      <ComponentRef Id="MainApplicationExe" />
-      <ComponentRef Id="MainApplicationExeConfig"/>
-      <ComponentRef Id="DDLibs"/>
-      <ComponentRef Id="NLog"/>
-      <ComponentRef Id="DevExpressLibs"/>
-      <ComponentRef Id="IndependentsoftLibs"/>
-      <ComponentRef Id="GDPictureLibs"/>
-      <ComponentRef Id="RegistryKeys" />
-      <ComponentRef Id="Resources.DE.Devexpress" />
-    </Feature>
+				<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
+			</Component>
 
-    <Feature Id="DesktopShortcut" Title="Desktop Shortcut">
-      <Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
-      <ComponentRef Id="ApplicationShortcut_Desktop"/>
-    </Feature>
+			<Directory Id="Resources.DE" Name="de">
+				<Component Id="Resources.DE.Devexpress" Guid="93cbf511-9a82-49e9-8283-678e508ac3b6">
+					<File Id="DevExpress.DataAccess.v21.2.UI.resources" Name="DevExpress.DataAccess.v21.2.UI.resources.dll" />
+					<File Id="DevExpress.DataAccess.v21.2.resources" Name="DevExpress.DataAccess.v21.2.resources.dll" />
+					<File Id="DevExpress.Dialogs.v21.2.Core.resources" Name="DevExpress.Dialogs.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Office.v21.2.Core.resources" Name="DevExpress.Office.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Pdf.v21.2.Core.resources" Name="DevExpress.Pdf.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Printing.v21.2.Core.resources" Name="DevExpress.Printing.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.RichEdit.v21.2.Core.resources" Name="DevExpress.RichEdit.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Sparkline.v21.2.Core.resources" Name="DevExpress.Sparkline.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Spreadsheet.v21.2.Core.resources" Name="DevExpress.Spreadsheet.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.Utils.v21.2.resources" Name="DevExpress.Utils.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraBars.v21.2.resources" Name="DevExpress.XtraBars.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraEditors.v21.2.resources" Name="DevExpress.XtraEditors.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraGauges.v21.2.Core.resources" Name="DevExpress.XtraGauges.v21.2.Core.resources.dll" />
+					<File Id="DevExpress.XtraGrid.v21.2.resources" Name="DevExpress.XtraGrid.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraLayout.v21.2.resources" Name="DevExpress.XtraLayout.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraPrinting.v21.2.resources" Name="DevExpress.XtraPrinting.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraRichEdit.v21.2.resources" Name="DevExpress.XtraRichEdit.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraSpreadsheet.v21.2.resources" Name="DevExpress.XtraSpreadsheet.v21.2.resources.dll" />
+					<File Id="DevExpress.XtraTreeList.v21.2.resources" Name="DevExpress.XtraTreeList.v21.2.resources.dll" />
+				</Component>
+			</Directory>
+		</DirectoryRef>
 
-    <Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
-      <Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
-      <ComponentRef Id="ApplicationShortcut_StartMenu" />
-    </Feature>
+		<Feature Id="MainApplication" Title="Main Application" Level="1">
+			<ComponentRef Id="MainApplicationExe" />
+			<ComponentRef Id="MainApplicationExeConfig"/>
+			<ComponentRef Id="DDLibs"/>
+			<ComponentRef Id="NLog"/>
+			<ComponentRef Id="Limilabs"/>
+			<ComponentRef Id="DevExpressLibs"/>
+			<ComponentRef Id="IndependentsoftLibs"/>
+			<ComponentRef Id="GDPictureLibs"/>
+			<ComponentRef Id="RegistryKeys" />
+			<ComponentRef Id="Resources.DE.Devexpress" />
+		</Feature>
 
-    <!-- Legt das Standard-Installationsverzeichnis fest-->
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-    <Property Id="_BrowseProperty" Value="INSTALLDIR" />
+		<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
+			<Condition Level="0">DISABLE_DESKTOP_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_Desktop"/>
+		</Feature>
 
-    <UI>
-      <!--<UIRef Id="WixUI_InstallDir" />-->
-      <UIRef Id="WixUI_FeatureTree"/>
-      <UIRef Id="WixUI_ErrorProgressText" />
-      <Publish Dialog="WelcomeDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="InstallDirDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Back"
-            Event="NewDialog"
-            Value="WelcomeDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="Next"
-            Event="NewDialog"
-            Value="FeaturesDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-            Control="ChangeFolder"
-            Event="NewDialog"
-            Value="BrowseDlg"
-            Order="2">1</Publish>
-      <Publish Dialog="FeaturesDlg"
-              Control="Back"
-              Event="NewDialog"
-              Value="InstallDirDlg"
-              Order="2">1</Publish>
-    </UI>
+		<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
+			<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
+			<ComponentRef Id="ApplicationShortcut_StartMenu" />
+		</Feature>
 
-  </Product>
+		<!-- Legt das Standard-Installationsverzeichnis fest-->
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+		<Property Id="_BrowseProperty" Value="INSTALLDIR" />
+
+		<UI>
+			<!--<UIRef Id="WixUI_InstallDir" />-->
+			<UIRef Id="WixUI_FeatureTree"/>
+			<UIRef Id="WixUI_ErrorProgressText" />
+			<Publish Dialog="WelcomeDlg"
+				  Control="Next"
+				  Event="NewDialog"
+				  Value="InstallDirDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="Back"
+				  Event="NewDialog"
+				  Value="WelcomeDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="Next"
+				  Event="NewDialog"
+				  Value="FeaturesDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="InstallDirDlg"
+				  Control="ChangeFolder"
+				  Event="NewDialog"
+				  Value="BrowseDlg"
+				  Order="2">1</Publish>
+			<Publish Dialog="FeaturesDlg"
+					Control="Back"
+					Event="NewDialog"
+					Value="InstallDirDlg"
+					Order="2">1</Publish>
+		</UI>
+
+	</Product>
 </Wix>
\ No newline at end of file