diff --git a/App/EmailProfiler.Form/frmMain.Designer.vb b/App/EmailProfiler.Form/frmMain.Designer.vb
index 61935bc..ae42b49 100644
--- a/App/EmailProfiler.Form/frmMain.Designer.vb
+++ b/App/EmailProfiler.Form/frmMain.Designer.vb
@@ -300,6 +300,7 @@ Partial Class frmMain
         Me.txtRegex1 = New System.Windows.Forms.TextBox()
         Me.Label8 = New System.Windows.Forms.Label()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.Button2 = New System.Windows.Forms.Button()
         Me.CHANGED_WHENTextBox4 = New System.Windows.Forms.TextBox()
         Me.TBEMLP_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
@@ -331,6 +332,10 @@ Partial Class frmMain
         Me.TBEMLP_CONFIGTableAdapter = New EmailProfiler.Form.MyDatasetTableAdapters.TBEMLP_CONFIGTableAdapter()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.GroupBox6 = New System.Windows.Forms.GroupBox()
+        Me.CheckBoxEnableTls1_1 = New System.Windows.Forms.CheckBox()
+        Me.CheckBoxEnableTls1_2 = New System.Windows.Forms.CheckBox()
+        Me.Label15 = New System.Windows.Forms.Label()
         GUIDLabel = New System.Windows.Forms.Label()
         PROFILE_NAMELabel = New System.Windows.Forms.Label()
         POLL_TYPELabel = New System.Windows.Forms.Label()
@@ -435,12 +440,13 @@ Partial Class frmMain
         CType(Me.CHECK_INTERVALL_MINUTESNumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox1.SuspendLayout()
         CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox6.SuspendLayout()
         Me.SuspendLayout()
         '
         'GUIDLabel
         '
         GUIDLabel.AutoSize = True
-        GUIDLabel.Location = New System.Drawing.Point(251, 28)
+        GUIDLabel.Location = New System.Drawing.Point(255, 44)
         GUIDLabel.Name = "GUIDLabel"
         GUIDLabel.Size = New System.Drawing.Size(22, 13)
         GUIDLabel.TabIndex = 4
@@ -449,7 +455,7 @@ Partial Class frmMain
         'PROFILE_NAMELabel
         '
         PROFILE_NAMELabel.AutoSize = True
-        PROFILE_NAMELabel.Location = New System.Drawing.Point(318, 28)
+        PROFILE_NAMELabel.Location = New System.Drawing.Point(322, 44)
         PROFILE_NAMELabel.Name = "PROFILE_NAMELabel"
         PROFILE_NAMELabel.Size = New System.Drawing.Size(71, 13)
         PROFILE_NAMELabel.TabIndex = 6
@@ -458,7 +464,7 @@ Partial Class frmMain
         'POLL_TYPELabel
         '
         POLL_TYPELabel.AutoSize = True
-        POLL_TYPELabel.Location = New System.Drawing.Point(567, 28)
+        POLL_TYPELabel.Location = New System.Drawing.Point(571, 44)
         POLL_TYPELabel.Name = "POLL_TYPELabel"
         POLL_TYPELabel.Size = New System.Drawing.Size(55, 13)
         POLL_TYPELabel.TabIndex = 8
@@ -467,7 +473,7 @@ Partial Class frmMain
         'EMAIL_CONF_IDLabel
         '
         EMAIL_CONF_IDLabel.AutoSize = True
-        EMAIL_CONF_IDLabel.Location = New System.Drawing.Point(697, 28)
+        EMAIL_CONF_IDLabel.Location = New System.Drawing.Point(701, 44)
         EMAIL_CONF_IDLabel.Name = "EMAIL_CONF_IDLabel"
         EMAIL_CONF_IDLabel.Size = New System.Drawing.Size(66, 13)
         EMAIL_CONF_IDLabel.TabIndex = 10
@@ -476,7 +482,7 @@ Partial Class frmMain
         'COMMENTLabel
         '
         COMMENTLabel.AutoSize = True
-        COMMENTLabel.Location = New System.Drawing.Point(318, 68)
+        COMMENTLabel.Location = New System.Drawing.Point(322, 84)
         COMMENTLabel.Name = "COMMENTLabel"
         COMMENTLabel.Size = New System.Drawing.Size(64, 13)
         COMMENTLabel.TabIndex = 12
@@ -485,7 +491,7 @@ Partial Class frmMain
         'ADDED_WHOLabel
         '
         ADDED_WHOLabel.AutoSize = True
-        ADDED_WHOLabel.Location = New System.Drawing.Point(697, 68)
+        ADDED_WHOLabel.Location = New System.Drawing.Point(701, 84)
         ADDED_WHOLabel.Name = "ADDED_WHOLabel"
         ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13)
         ADDED_WHOLabel.TabIndex = 20
@@ -494,7 +500,7 @@ Partial Class frmMain
         'ADDED_WHENLabel
         '
         ADDED_WHENLabel.AutoSize = True
-        ADDED_WHENLabel.Location = New System.Drawing.Point(827, 68)
+        ADDED_WHENLabel.Location = New System.Drawing.Point(831, 84)
         ADDED_WHENLabel.Name = "ADDED_WHENLabel"
         ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13)
         ADDED_WHENLabel.TabIndex = 22
@@ -503,7 +509,7 @@ Partial Class frmMain
         'CHANGED_WHOLabel
         '
         CHANGED_WHOLabel.AutoSize = True
-        CHANGED_WHOLabel.Location = New System.Drawing.Point(955, 68)
+        CHANGED_WHOLabel.Location = New System.Drawing.Point(959, 84)
         CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
         CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13)
         CHANGED_WHOLabel.TabIndex = 24
@@ -512,7 +518,7 @@ Partial Class frmMain
         'CHANGED_WHENLabel
         '
         CHANGED_WHENLabel.AutoSize = True
-        CHANGED_WHENLabel.Location = New System.Drawing.Point(1082, 68)
+        CHANGED_WHENLabel.Location = New System.Drawing.Point(1086, 84)
         CHANGED_WHENLabel.Name = "CHANGED_WHENLabel"
         CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13)
         CHANGED_WHENLabel.TabIndex = 26
@@ -926,7 +932,7 @@ Partial Class frmMain
         'Label11
         '
         Label11.AutoSize = True
-        Label11.Location = New System.Drawing.Point(318, 108)
+        Label11.Location = New System.Drawing.Point(322, 124)
         Label11.Name = "Label11"
         Label11.Size = New System.Drawing.Size(90, 13)
         Label11.TabIndex = 12
@@ -970,6 +976,7 @@ Partial Class frmMain
         '
         'StatusStrip1
         '
+        Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblstatus, Me.tslblRefresh, Me.ToolStripStatusLabel1})
         Me.StatusStrip1.Location = New System.Drawing.Point(0, 593)
         Me.StatusStrip1.Name = "StatusStrip1"
@@ -1043,7 +1050,7 @@ Partial Class frmMain
         'txtSQLValidation
         '
         Me.txtSQLValidation.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBEMLP_POLL_PROFILESBindingSource, "VALIDATION_SQL", True))
-        Me.txtSQLValidation.Location = New System.Drawing.Point(321, 124)
+        Me.txtSQLValidation.Location = New System.Drawing.Point(325, 140)
         Me.txtSQLValidation.Name = "txtSQLValidation"
         Me.txtSQLValidation.Size = New System.Drawing.Size(328, 20)
         Me.txtSQLValidation.TabIndex = 35
@@ -1060,7 +1067,7 @@ Partial Class frmMain
         '
         'btnValidationSQL
         '
-        Me.btnValidationSQL.Location = New System.Drawing.Point(655, 122)
+        Me.btnValidationSQL.Location = New System.Drawing.Point(659, 138)
         Me.btnValidationSQL.Name = "btnValidationSQL"
         Me.btnValidationSQL.Size = New System.Drawing.Size(36, 23)
         Me.btnValidationSQL.TabIndex = 34
@@ -1118,7 +1125,7 @@ Partial Class frmMain
         Me.ComboBox1.DataSource = Me.TBDD_EMAIL_ACCOUNTBindingSource
         Me.ComboBox1.DisplayMember = "NAME"
         Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Location = New System.Drawing.Point(700, 44)
+        Me.ComboBox1.Location = New System.Drawing.Point(704, 60)
         Me.ComboBox1.Name = "ComboBox1"
         Me.ComboBox1.Size = New System.Drawing.Size(252, 21)
         Me.ComboBox1.TabIndex = 32
@@ -1144,7 +1151,7 @@ Partial Class frmMain
         Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem
         Me.BindingNavigator1.Name = "BindingNavigator1"
         Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem
-        Me.BindingNavigator1.Size = New System.Drawing.Size(1221, 25)
+        Me.BindingNavigator1.Size = New System.Drawing.Size(1221, 31)
         Me.BindingNavigator1.TabIndex = 31
         Me.BindingNavigator1.Text = "BindingNavigator1"
         '
@@ -1154,13 +1161,13 @@ Partial Class frmMain
         Me.BindingNavigatorAddNewItem.Image = CType(resources.GetObject("BindingNavigatorAddNewItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
         Me.BindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorAddNewItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorAddNewItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorAddNewItem.Text = "Neu hinzufügen"
         '
         'BindingNavigatorCountItem
         '
         Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
-        Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(122, 22)
+        Me.BindingNavigatorCountItem.Size = New System.Drawing.Size(122, 28)
         Me.BindingNavigatorCountItem.Text = "von {0} Email-Profilen"
         Me.BindingNavigatorCountItem.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -1170,7 +1177,7 @@ Partial Class frmMain
         Me.BindingNavigatorDeleteItem.Image = CType(resources.GetObject("BindingNavigatorDeleteItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
         Me.BindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorDeleteItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorDeleteItem.Text = "Löschen"
         '
         'BindingNavigatorMoveFirstItem
@@ -1179,7 +1186,7 @@ Partial Class frmMain
         Me.BindingNavigatorMoveFirstItem.Image = CType(resources.GetObject("BindingNavigatorMoveFirstItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
         Me.BindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorMoveFirstItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorMoveFirstItem.Text = "Erste verschieben"
         '
         'BindingNavigatorMovePreviousItem
@@ -1188,13 +1195,13 @@ Partial Class frmMain
         Me.BindingNavigatorMovePreviousItem.Image = CType(resources.GetObject("BindingNavigatorMovePreviousItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
         Me.BindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorMovePreviousItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorMovePreviousItem.Text = "Vorherige verschieben"
         '
         'BindingNavigatorSeparator
         '
         Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator"
-        Me.BindingNavigatorSeparator.Size = New System.Drawing.Size(6, 25)
+        Me.BindingNavigatorSeparator.Size = New System.Drawing.Size(6, 31)
         '
         'BindingNavigatorPositionItem
         '
@@ -1209,7 +1216,7 @@ Partial Class frmMain
         'BindingNavigatorSeparator1
         '
         Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1"
-        Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 25)
+        Me.BindingNavigatorSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'BindingNavigatorMoveNextItem
         '
@@ -1217,7 +1224,7 @@ Partial Class frmMain
         Me.BindingNavigatorMoveNextItem.Image = CType(resources.GetObject("BindingNavigatorMoveNextItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
         Me.BindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorMoveNextItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorMoveNextItem.Text = "Nächste verschieben"
         '
         'BindingNavigatorMoveLastItem
@@ -1226,13 +1233,13 @@ Partial Class frmMain
         Me.BindingNavigatorMoveLastItem.Image = CType(resources.GetObject("BindingNavigatorMoveLastItem.Image"), System.Drawing.Image)
         Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
         Me.BindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = True
-        Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 22)
+        Me.BindingNavigatorMoveLastItem.Size = New System.Drawing.Size(23, 28)
         Me.BindingNavigatorMoveLastItem.Text = "Letzte verschieben"
         '
         'BindingNavigatorSeparator2
         '
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
-        Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 25)
+        Me.BindingNavigatorSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -1240,7 +1247,7 @@ Partial Class frmMain
         Me.ToolStripButton1.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 28)
         Me.ToolStripButton1.Text = "Save"
         '
         'ToolStripButton9
@@ -1249,7 +1256,7 @@ Partial Class frmMain
         Me.ToolStripButton9.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton9.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton9.Name = "ToolStripButton9"
-        Me.ToolStripButton9.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton9.Size = New System.Drawing.Size(23, 28)
         Me.ToolStripButton9.Text = "Refresh"
         '
         'tsbtnRunLocalMail2
@@ -1258,7 +1265,7 @@ Partial Class frmMain
         Me.tsbtnRunLocalMail2.Image = Global.EmailProfiler.Form.My.Resources.Resources.folder_Closed_16xLG
         Me.tsbtnRunLocalMail2.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnRunLocalMail2.Name = "tsbtnRunLocalMail2"
-        Me.tsbtnRunLocalMail2.Size = New System.Drawing.Size(133, 22)
+        Me.tsbtnRunLocalMail2.Size = New System.Drawing.Size(133, 28)
         Me.tsbtnRunLocalMail2.Text = "Test with local email"
         Me.tsbtnRunLocalMail2.TextAlign = System.Drawing.ContentAlignment.TopLeft
         '
@@ -1268,33 +1275,33 @@ Partial Class frmMain
         Me.tsbtnRunProfiles2.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go
         Me.tsbtnRunProfiles2.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.tsbtnRunProfiles2.Name = "tsbtnRunProfiles2"
-        Me.tsbtnRunProfiles2.Size = New System.Drawing.Size(137, 22)
+        Me.tsbtnRunProfiles2.Size = New System.Drawing.Size(137, 28)
         Me.tsbtnRunProfiles2.Text = "Run profile manually"
         '
         'ToolStripProgressBar2
         '
         Me.ToolStripProgressBar2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripProgressBar2.Name = "ToolStripProgressBar2"
-        Me.ToolStripProgressBar2.Size = New System.Drawing.Size(100, 22)
+        Me.ToolStripProgressBar2.Size = New System.Drawing.Size(100, 28)
         '
         'ToolStripEmailAccountID2
         '
         Me.ToolStripEmailAccountID2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripEmailAccountID2.Font = New System.Drawing.Font("Segoe UI", 9.0!)
         Me.ToolStripEmailAccountID2.Name = "ToolStripEmailAccountID2"
-        Me.ToolStripEmailAccountID2.Size = New System.Drawing.Size(100, 25)
+        Me.ToolStripEmailAccountID2.Size = New System.Drawing.Size(100, 31)
         '
         'ToolStripLabel6
         '
         Me.ToolStripLabel6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripLabel6.Name = "ToolStripLabel6"
-        Me.ToolStripLabel6.Size = New System.Drawing.Size(0, 22)
+        Me.ToolStripLabel6.Size = New System.Drawing.Size(0, 28)
         '
         'ToolStripLabel7
         '
         Me.ToolStripLabel7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
         Me.ToolStripLabel7.Name = "ToolStripLabel7"
-        Me.ToolStripLabel7.Size = New System.Drawing.Size(95, 22)
+        Me.ToolStripLabel7.Size = New System.Drawing.Size(95, 28)
         Me.ToolStripLabel7.Text = "EmailAccountID:"
         '
         'POLL_TYPEComboBox
@@ -1302,7 +1309,7 @@ Partial Class frmMain
         Me.POLL_TYPEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "POLL_TYPE", True))
         Me.POLL_TYPEComboBox.FormattingEnabled = True
         Me.POLL_TYPEComboBox.Items.AddRange(New Object() {"POP", "IMAP"})
-        Me.POLL_TYPEComboBox.Location = New System.Drawing.Point(570, 44)
+        Me.POLL_TYPEComboBox.Location = New System.Drawing.Point(574, 60)
         Me.POLL_TYPEComboBox.Name = "POLL_TYPEComboBox"
         Me.POLL_TYPEComboBox.Size = New System.Drawing.Size(121, 21)
         Me.POLL_TYPEComboBox.TabIndex = 9
@@ -1369,9 +1376,9 @@ Partial Class frmMain
         'cbAllowXMLReceipt
         '
         Me.cbAllowXMLReceipt.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "ALLOW_XML_RECEIPTS", True))
-        Me.cbAllowXMLReceipt.Location = New System.Drawing.Point(717, 698)
+        Me.cbAllowXMLReceipt.Location = New System.Drawing.Point(1075, 1047)
         Me.cbAllowXMLReceipt.Name = "cbAllowXMLReceipt"
-        Me.cbAllowXMLReceipt.Size = New System.Drawing.Size(410, 54)
+        Me.cbAllowXMLReceipt.Size = New System.Drawing.Size(615, 81)
         Me.cbAllowXMLReceipt.TabIndex = 93
         Me.cbAllowXMLReceipt.Text = "Erlaube XML Belege (1. Anhang)"
         Me.cbAllowXMLReceipt.UseVisualStyleBackColor = True
@@ -1388,41 +1395,41 @@ Partial Class frmMain
         Me.lblDownloadPath.AutoSize = True
         Me.lblDownloadPath.Location = New System.Drawing.Point(316, 188)
         Me.lblDownloadPath.Name = "lblDownloadPath"
-        Me.lblDownloadPath.Size = New System.Drawing.Size(44, 14)
+        Me.lblDownloadPath.Size = New System.Drawing.Size(44, 13)
         Me.lblDownloadPath.TabIndex = 92
         Me.lblDownloadPath.Text = "Label15"
         '
         'PATH_ORIGINALTextBox
         '
         Me.PATH_ORIGINALTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "PATH_ORIGINAL", True))
-        Me.PATH_ORIGINALTextBox.Location = New System.Drawing.Point(717, 369)
+        Me.PATH_ORIGINALTextBox.Location = New System.Drawing.Point(1075, 554)
         Me.PATH_ORIGINALTextBox.Name = "PATH_ORIGINALTextBox"
-        Me.PATH_ORIGINALTextBox.Size = New System.Drawing.Size(1040, 32)
+        Me.PATH_ORIGINALTextBox.Size = New System.Drawing.Size(1560, 21)
         Me.PATH_ORIGINALTextBox.TabIndex = 91
         '
         'btnFBD_ErrorPath
         '
-        Me.btnFBD_ErrorPath.Location = New System.Drawing.Point(1770, 548)
+        Me.btnFBD_ErrorPath.Location = New System.Drawing.Point(2655, 822)
         Me.btnFBD_ErrorPath.Name = "btnFBD_ErrorPath"
-        Me.btnFBD_ErrorPath.Size = New System.Drawing.Size(62, 48)
+        Me.btnFBD_ErrorPath.Size = New System.Drawing.Size(93, 72)
         Me.btnFBD_ErrorPath.TabIndex = 90
         Me.btnFBD_ErrorPath.Text = "..."
         Me.btnFBD_ErrorPath.UseVisualStyleBackColor = True
         '
         'Button1
         '
-        Me.Button1.Location = New System.Drawing.Point(1770, 369)
+        Me.Button1.Location = New System.Drawing.Point(2655, 554)
         Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(62, 48)
+        Me.Button1.Size = New System.Drawing.Size(93, 72)
         Me.Button1.TabIndex = 89
         Me.Button1.Text = "..."
         Me.Button1.UseVisualStyleBackColor = True
         '
         'btnFBD_DonwloadPath
         '
-        Me.btnFBD_DonwloadPath.Location = New System.Drawing.Point(1770, 459)
+        Me.btnFBD_DonwloadPath.Location = New System.Drawing.Point(2655, 689)
         Me.btnFBD_DonwloadPath.Name = "btnFBD_DonwloadPath"
-        Me.btnFBD_DonwloadPath.Size = New System.Drawing.Size(62, 48)
+        Me.btnFBD_DonwloadPath.Size = New System.Drawing.Size(93, 72)
         Me.btnFBD_DonwloadPath.TabIndex = 89
         Me.btnFBD_DonwloadPath.Text = "..."
         Me.btnFBD_DonwloadPath.UseVisualStyleBackColor = True
@@ -1432,10 +1439,10 @@ Partial Class frmMain
         Me.txtSubjectExample.BackColor = System.Drawing.SystemColors.Window
         Me.txtSubjectExample.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.txtSubjectExample.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.txtSubjectExample.Location = New System.Drawing.Point(717, 273)
+        Me.txtSubjectExample.Location = New System.Drawing.Point(1075, 410)
         Me.txtSubjectExample.Name = "txtSubjectExample"
         Me.txtSubjectExample.ReadOnly = True
-        Me.txtSubjectExample.Size = New System.Drawing.Size(1040, 32)
+        Me.txtSubjectExample.Size = New System.Drawing.Size(1560, 21)
         Me.txtSubjectExample.TabIndex = 88
         '
         'Label9
@@ -1443,17 +1450,17 @@ Partial Class frmMain
         Me.Label9.AutoSize = True
         Me.Label9.Location = New System.Drawing.Point(316, 107)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(74, 14)
+        Me.Label9.Size = New System.Drawing.Size(74, 13)
         Me.Label9.TabIndex = 87
         Me.Label9.Text = "Subject Email:"
         '
         'NumericUpDown2
         '
         Me.NumericUpDown2.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBEMLP_POLL_PROCESSBindingSource, "SEQUENCE", True))
-        Me.NumericUpDown2.Location = New System.Drawing.Point(250, 124)
+        Me.NumericUpDown2.Location = New System.Drawing.Point(375, 186)
         Me.NumericUpDown2.Maximum = New Decimal(New Integer() {20, 0, 0, 0})
         Me.NumericUpDown2.Name = "NumericUpDown2"
-        Me.NumericUpDown2.Size = New System.Drawing.Size(26972, 21)
+        Me.NumericUpDown2.Size = New System.Drawing.Size(65535, 21)
         Me.NumericUpDown2.TabIndex = 3
         '
         'CHANGED_WHENTextBox1
@@ -1461,9 +1468,9 @@ Partial Class frmMain
         Me.CHANGED_WHENTextBox1.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "CHANGED_WHEN", True))
         Me.CHANGED_WHENTextBox1.Enabled = False
-        Me.CHANGED_WHENTextBox1.Location = New System.Drawing.Point(1585, 639)
+        Me.CHANGED_WHENTextBox1.Location = New System.Drawing.Point(2377, 959)
         Me.CHANGED_WHENTextBox1.Name = "CHANGED_WHENTextBox1"
-        Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(251, 32)
+        Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(377, 21)
         Me.CHANGED_WHENTextBox1.TabIndex = 84
         Me.CHANGED_WHENTextBox1.TabStop = False
         '
@@ -1472,9 +1479,9 @@ Partial Class frmMain
         Me.CHANGED_WHOProcessTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHOProcessTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "CHANGED_WHO", True))
         Me.CHANGED_WHOProcessTextBox.Enabled = False
-        Me.CHANGED_WHOProcessTextBox.Location = New System.Drawing.Point(1296, 639)
+        Me.CHANGED_WHOProcessTextBox.Location = New System.Drawing.Point(1944, 959)
         Me.CHANGED_WHOProcessTextBox.Name = "CHANGED_WHOProcessTextBox"
-        Me.CHANGED_WHOProcessTextBox.Size = New System.Drawing.Size(279, 32)
+        Me.CHANGED_WHOProcessTextBox.Size = New System.Drawing.Size(419, 21)
         Me.CHANGED_WHOProcessTextBox.TabIndex = 83
         Me.CHANGED_WHOProcessTextBox.TabStop = False
         '
@@ -1483,9 +1490,9 @@ Partial Class frmMain
         Me.ADDED_WHENTextBox1.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "ADDED_WHEN", True))
         Me.ADDED_WHENTextBox1.Enabled = False
-        Me.ADDED_WHENTextBox1.Location = New System.Drawing.Point(996, 639)
+        Me.ADDED_WHENTextBox1.Location = New System.Drawing.Point(1494, 959)
         Me.ADDED_WHENTextBox1.Name = "ADDED_WHENTextBox1"
-        Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(279, 32)
+        Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(419, 21)
         Me.ADDED_WHENTextBox1.TabIndex = 82
         Me.ADDED_WHENTextBox1.TabStop = False
         '
@@ -1494,9 +1501,9 @@ Partial Class frmMain
         Me.ADDED_WHOTextBox1.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "ADDED_WHO", True))
         Me.ADDED_WHOTextBox1.Enabled = False
-        Me.ADDED_WHOTextBox1.Location = New System.Drawing.Point(717, 639)
+        Me.ADDED_WHOTextBox1.Location = New System.Drawing.Point(1075, 959)
         Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1"
-        Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(270, 32)
+        Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(405, 21)
         Me.ADDED_WHOTextBox1.TabIndex = 81
         Me.ADDED_WHOTextBox1.TabStop = False
         '
@@ -1505,7 +1512,7 @@ Partial Class frmMain
         Me.Label5.AutoSize = True
         Me.Label5.Location = New System.Drawing.Point(820, 245)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(65, 14)
+        Me.Label5.Size = New System.Drawing.Size(65, 13)
         Me.Label5.TabIndex = 80
         Me.Label5.Text = "Kommentar:"
         '
@@ -1524,9 +1531,9 @@ Partial Class frmMain
         Me.GroupBox2.Controls.Add(Me.WM_IDX_BODY_TEXTComboBox)
         Me.GroupBox2.Controls.Add(Me.WM_IDX_BODY_SUBSTR_LENGTHTextBox)
         Me.GroupBox2.Controls.Add(WM_IDX_BODY_SUBSTR_LENGTHLabel)
-        Me.GroupBox2.Location = New System.Drawing.Point(1845, 89)
+        Me.GroupBox2.Location = New System.Drawing.Point(2767, 134)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(741, 455)
+        Me.GroupBox2.Size = New System.Drawing.Size(1112, 683)
         Me.GroupBox2.TabIndex = 79
         Me.GroupBox2.TabStop = False
         '
@@ -1597,9 +1604,9 @@ Partial Class frmMain
         Me.STEP_NAMEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "STEP_NAME", True))
         Me.STEP_NAMEComboBox.FormattingEnabled = True
         Me.STEP_NAMEComboBox.Items.AddRange(New Object() {"Easy Approval", "Download Mail", "Other"})
-        Me.STEP_NAMEComboBox.Location = New System.Drawing.Point(1144, 93)
+        Me.STEP_NAMEComboBox.Location = New System.Drawing.Point(1716, 140)
         Me.STEP_NAMEComboBox.Name = "STEP_NAMEComboBox"
-        Me.STEP_NAMEComboBox.Size = New System.Drawing.Size(273, 32)
+        Me.STEP_NAMEComboBox.Size = New System.Drawing.Size(410, 21)
         Me.STEP_NAMEComboBox.TabIndex = 1
         '
         'PROCESS_NAMEComboBox
@@ -1607,9 +1614,9 @@ Partial Class frmMain
         Me.PROCESS_NAMEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "PROCESS_NAME", True))
         Me.PROCESS_NAMEComboBox.FormattingEnabled = True
         Me.PROCESS_NAMEComboBox.Items.AddRange(New Object() {"ProcessManager", "ADDI", "Globix", "Attachment Sniffer", "ZugFeRD-Parser", "Not defined"})
-        Me.PROCESS_NAMEComboBox.Location = New System.Drawing.Point(717, 93)
+        Me.PROCESS_NAMEComboBox.Location = New System.Drawing.Point(1075, 140)
         Me.PROCESS_NAMEComboBox.Name = "PROCESS_NAMEComboBox"
-        Me.PROCESS_NAMEComboBox.Size = New System.Drawing.Size(417, 32)
+        Me.PROCESS_NAMEComboBox.Size = New System.Drawing.Size(626, 21)
         Me.PROCESS_NAMEComboBox.TabIndex = 0
         '
         'GUIDProcessTextBox
@@ -1617,18 +1624,18 @@ Partial Class frmMain
         Me.GUIDProcessTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.GUIDProcessTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "GUID", True))
         Me.GUIDProcessTextBox.Enabled = False
-        Me.GUIDProcessTextBox.Location = New System.Drawing.Point(564, 95)
+        Me.GUIDProcessTextBox.Location = New System.Drawing.Point(846, 143)
         Me.GUIDProcessTextBox.Name = "GUIDProcessTextBox"
-        Me.GUIDProcessTextBox.Size = New System.Drawing.Size(116, 32)
+        Me.GUIDProcessTextBox.Size = New System.Drawing.Size(174, 21)
         Me.GUIDProcessTextBox.TabIndex = 33
         Me.GUIDProcessTextBox.TabStop = False
         '
         'COPY_2_HDDCheckBox
         '
         Me.COPY_2_HDDCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "COPY_2_HDD", True))
-        Me.COPY_2_HDDCheckBox.Location = New System.Drawing.Point(717, 333)
+        Me.COPY_2_HDDCheckBox.Location = New System.Drawing.Point(1075, 500)
         Me.COPY_2_HDDCheckBox.Name = "COPY_2_HDDCheckBox"
-        Me.COPY_2_HDDCheckBox.Size = New System.Drawing.Size(620, 39)
+        Me.COPY_2_HDDCheckBox.Size = New System.Drawing.Size(930, 59)
         Me.COPY_2_HDDCheckBox.TabIndex = 6
         Me.COPY_2_HDDCheckBox.Text = "Copy email to HDD"
         Me.COPY_2_HDDCheckBox.UseVisualStyleBackColor = True
@@ -1636,25 +1643,25 @@ Partial Class frmMain
         'PATH_EMAIL_TEMPTextBox
         '
         Me.PATH_EMAIL_TEMPTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "PATH_EMAIL_TEMP", True))
-        Me.PATH_EMAIL_TEMPTextBox.Location = New System.Drawing.Point(717, 459)
+        Me.PATH_EMAIL_TEMPTextBox.Location = New System.Drawing.Point(1075, 689)
         Me.PATH_EMAIL_TEMPTextBox.Name = "PATH_EMAIL_TEMPTextBox"
-        Me.PATH_EMAIL_TEMPTextBox.Size = New System.Drawing.Size(1040, 32)
+        Me.PATH_EMAIL_TEMPTextBox.Size = New System.Drawing.Size(1560, 21)
         Me.PATH_EMAIL_TEMPTextBox.TabIndex = 9
         '
         'PATH_EMAIL_ERRORSTextBox
         '
         Me.PATH_EMAIL_ERRORSTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "PATH_EMAIL_ERRORS", True))
-        Me.PATH_EMAIL_ERRORSTextBox.Location = New System.Drawing.Point(717, 549)
+        Me.PATH_EMAIL_ERRORSTextBox.Location = New System.Drawing.Point(1075, 824)
         Me.PATH_EMAIL_ERRORSTextBox.Name = "PATH_EMAIL_ERRORSTextBox"
-        Me.PATH_EMAIL_ERRORSTextBox.Size = New System.Drawing.Size(1040, 32)
+        Me.PATH_EMAIL_ERRORSTextBox.Size = New System.Drawing.Size(1560, 21)
         Me.PATH_EMAIL_ERRORSTextBox.TabIndex = 11
         '
         'DELETE_MAILCheckBox
         '
         Me.DELETE_MAILCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "DELETE_MAIL", True))
-        Me.DELETE_MAILCheckBox.Location = New System.Drawing.Point(717, 170)
+        Me.DELETE_MAILCheckBox.Location = New System.Drawing.Point(1075, 255)
         Me.DELETE_MAILCheckBox.Name = "DELETE_MAILCheckBox"
-        Me.DELETE_MAILCheckBox.Size = New System.Drawing.Size(1053, 54)
+        Me.DELETE_MAILCheckBox.Size = New System.Drawing.Size(1580, 81)
         Me.DELETE_MAILCheckBox.TabIndex = 2
         Me.DELETE_MAILCheckBox.Text = "Email nach Verarbeitung löschen (Andernfalls muss ein IMAP Ordner 'Verarbeitet' e" &
     "xistieren)"
@@ -1663,18 +1670,18 @@ Partial Class frmMain
         'COMMENT_PROFILESTextBox
         '
         Me.COMMENT_PROFILESTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROCESSBindingSource, "COMMENT", True))
-        Me.COMMENT_PROFILESTextBox.Location = New System.Drawing.Point(1849, 585)
+        Me.COMMENT_PROFILESTextBox.Location = New System.Drawing.Point(2773, 878)
         Me.COMMENT_PROFILESTextBox.Multiline = True
         Me.COMMENT_PROFILESTextBox.Name = "COMMENT_PROFILESTextBox"
-        Me.COMMENT_PROFILESTextBox.Size = New System.Drawing.Size(737, 102)
+        Me.COMMENT_PROFILESTextBox.Size = New System.Drawing.Size(1106, 153)
         Me.COMMENT_PROFILESTextBox.TabIndex = 10
         '
         'ACTIVECheckBox1
         '
         Me.ACTIVECheckBox1.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROCESSBindingSource, "ACTIVE", True))
-        Me.ACTIVECheckBox1.Location = New System.Drawing.Point(564, 176)
+        Me.ACTIVECheckBox1.Location = New System.Drawing.Point(846, 264)
         Me.ACTIVECheckBox1.Name = "ACTIVECheckBox1"
-        Me.ACTIVECheckBox1.Size = New System.Drawing.Size(135, 54)
+        Me.ACTIVECheckBox1.Size = New System.Drawing.Size(203, 81)
         Me.ACTIVECheckBox1.TabIndex = 3
         Me.ACTIVECheckBox1.Text = "Active"
         Me.ACTIVECheckBox1.UseVisualStyleBackColor = True
@@ -1686,15 +1693,16 @@ Partial Class frmMain
         Me.BindingNavigator2.CountItem = Me.ToolStripLabel1
         Me.BindingNavigator2.CountItemFormat = "von {0} Prozessen"
         Me.BindingNavigator2.DeleteItem = Me.ToolStripButton3
+        Me.BindingNavigator2.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton4, Me.ToolStripButton5, Me.ToolStripSeparator1, Me.ToolStripTextBox1, Me.ToolStripLabel1, Me.ToolStripSeparator2, Me.ToolStripButton6, Me.ToolStripButton7, Me.ToolStripSeparator3, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripButton8, Me.ToolStripButton10})
-        Me.BindingNavigator2.Location = New System.Drawing.Point(244, 0)
+        Me.BindingNavigator2.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton4
         Me.BindingNavigator2.MoveLastItem = Me.ToolStripButton7
         Me.BindingNavigator2.MoveNextItem = Me.ToolStripButton6
         Me.BindingNavigator2.MovePreviousItem = Me.ToolStripButton5
         Me.BindingNavigator2.Name = "BindingNavigator2"
         Me.BindingNavigator2.PositionItem = Me.ToolStripTextBox1
-        Me.BindingNavigator2.Size = New System.Drawing.Size(974, 26)
+        Me.BindingNavigator2.Size = New System.Drawing.Size(974, 31)
         Me.BindingNavigator2.TabIndex = 32
         Me.BindingNavigator2.Text = "BindingNavigator2"
         '
@@ -1704,13 +1712,13 @@ Partial Class frmMain
         Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image)
         Me.ToolStripButton2.Name = "ToolStripButton2"
         Me.ToolStripButton2.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton2.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton2.Text = "Neu hinzufügen"
         '
         'ToolStripLabel1
         '
         Me.ToolStripLabel1.Name = "ToolStripLabel1"
-        Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 22)
+        Me.ToolStripLabel1.Size = New System.Drawing.Size(99, 28)
         Me.ToolStripLabel1.Text = "von {0} Prozessen"
         Me.ToolStripLabel1.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -1720,7 +1728,7 @@ Partial Class frmMain
         Me.ToolStripButton3.Image = CType(resources.GetObject("ToolStripButton3.Image"), System.Drawing.Image)
         Me.ToolStripButton3.Name = "ToolStripButton3"
         Me.ToolStripButton3.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton3.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton3.Text = "Löschen"
         '
         'ToolStripButton4
@@ -1729,7 +1737,7 @@ Partial Class frmMain
         Me.ToolStripButton4.Image = CType(resources.GetObject("ToolStripButton4.Image"), System.Drawing.Image)
         Me.ToolStripButton4.Name = "ToolStripButton4"
         Me.ToolStripButton4.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton4.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton4.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton4.Text = "Erste verschieben"
         '
         'ToolStripButton5
@@ -1738,13 +1746,13 @@ Partial Class frmMain
         Me.ToolStripButton5.Image = CType(resources.GetObject("ToolStripButton5.Image"), System.Drawing.Image)
         Me.ToolStripButton5.Name = "ToolStripButton5"
         Me.ToolStripButton5.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton5.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton5.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton5.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripTextBox1
         '
@@ -1759,7 +1767,7 @@ Partial Class frmMain
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton6
         '
@@ -1767,7 +1775,7 @@ Partial Class frmMain
         Me.ToolStripButton6.Image = CType(resources.GetObject("ToolStripButton6.Image"), System.Drawing.Image)
         Me.ToolStripButton6.Name = "ToolStripButton6"
         Me.ToolStripButton6.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton6.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton6.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton6.Text = "Nächste verschieben"
         '
         'ToolStripButton7
@@ -1776,13 +1784,13 @@ Partial Class frmMain
         Me.ToolStripButton7.Image = CType(resources.GetObject("ToolStripButton7.Image"), System.Drawing.Image)
         Me.ToolStripButton7.Name = "ToolStripButton7"
         Me.ToolStripButton7.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton7.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton7.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton7.Text = "Letzte verschieben"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton8
         '
@@ -1790,7 +1798,7 @@ Partial Class frmMain
         Me.ToolStripButton8.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton8.Name = "ToolStripButton8"
-        Me.ToolStripButton8.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton8.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton8.Text = "ToolStripButton1"
         '
         'ToolStripButton10
@@ -1799,7 +1807,7 @@ Partial Class frmMain
         Me.ToolStripButton10.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton10.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton10.Name = "ToolStripButton10"
-        Me.ToolStripButton10.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton10.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton10.Text = "Refresh"
         '
         'GridControl1
@@ -1809,7 +1817,7 @@ Partial Class frmMain
         Me.GridControl1.Location = New System.Drawing.Point(0, 0)
         Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(245, 338)
+        Me.GridControl1.Size = New System.Drawing.Size(245, 337)
         Me.GridControl1.TabIndex = 0
         Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
@@ -1890,7 +1898,7 @@ Partial Class frmMain
         Me.NumericUpDown1.Location = New System.Drawing.Point(914, 81)
         Me.NumericUpDown1.Maximum = New Decimal(New Integer() {20, 0, 0, 0})
         Me.NumericUpDown1.Name = "NumericUpDown1"
-        Me.NumericUpDown1.Size = New System.Drawing.Size(1, 14)
+        Me.NumericUpDown1.Size = New System.Drawing.Size(1, 21)
         Me.NumericUpDown1.TabIndex = 59
         '
         'TBEMLP_POLL_STEPSBindingSource
@@ -1904,36 +1912,36 @@ Partial Class frmMain
         '
         Me.CHANGED_WHENTextBox2.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "CHANGED_WHEN", True))
-        Me.CHANGED_WHENTextBox2.Location = New System.Drawing.Point(1540, 273)
+        Me.CHANGED_WHENTextBox2.Location = New System.Drawing.Point(2310, 410)
         Me.CHANGED_WHENTextBox2.Name = "CHANGED_WHENTextBox2"
-        Me.CHANGED_WHENTextBox2.Size = New System.Drawing.Size(270, 32)
+        Me.CHANGED_WHENTextBox2.Size = New System.Drawing.Size(405, 21)
         Me.CHANGED_WHENTextBox2.TabIndex = 37
         '
         'CHANGED_WHOStepsTextBox
         '
         Me.CHANGED_WHOStepsTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHOStepsTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOStepsTextBox.Location = New System.Drawing.Point(1288, 273)
+        Me.CHANGED_WHOStepsTextBox.Location = New System.Drawing.Point(1932, 410)
         Me.CHANGED_WHOStepsTextBox.Name = "CHANGED_WHOStepsTextBox"
-        Me.CHANGED_WHOStepsTextBox.Size = New System.Drawing.Size(225, 32)
+        Me.CHANGED_WHOStepsTextBox.Size = New System.Drawing.Size(338, 21)
         Me.CHANGED_WHOStepsTextBox.TabIndex = 36
         '
         'ADDED_WHENTextBox2
         '
         Me.ADDED_WHENTextBox2.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "ADDED_WHEN", True))
-        Me.ADDED_WHENTextBox2.Location = New System.Drawing.Point(996, 273)
+        Me.ADDED_WHENTextBox2.Location = New System.Drawing.Point(1494, 410)
         Me.ADDED_WHENTextBox2.Name = "ADDED_WHENTextBox2"
-        Me.ADDED_WHENTextBox2.Size = New System.Drawing.Size(279, 32)
+        Me.ADDED_WHENTextBox2.Size = New System.Drawing.Size(419, 21)
         Me.ADDED_WHENTextBox2.TabIndex = 35
         '
         'ADDED_WHOTextBox2
         '
         Me.ADDED_WHOTextBox2.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "ADDED_WHO", True))
-        Me.ADDED_WHOTextBox2.Location = New System.Drawing.Point(712, 273)
+        Me.ADDED_WHOTextBox2.Location = New System.Drawing.Point(1068, 410)
         Me.ADDED_WHOTextBox2.Name = "ADDED_WHOTextBox2"
-        Me.ADDED_WHOTextBox2.Size = New System.Drawing.Size(270, 32)
+        Me.ADDED_WHOTextBox2.Size = New System.Drawing.Size(405, 21)
         Me.ADDED_WHOTextBox2.TabIndex = 34
         '
         'BindingNavigator3
@@ -1943,6 +1951,7 @@ Partial Class frmMain
         Me.BindingNavigator3.CountItem = Me.ToolStripLabel2
         Me.BindingNavigator3.CountItemFormat = "von {0} möglichen Verarbeitungsschritten"
         Me.BindingNavigator3.DeleteItem = Me.ToolStripButton12
+        Me.BindingNavigator3.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton13, Me.ToolStripButton14, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton15, Me.ToolStripButton16, Me.ToolStripSeparator6, Me.ToolStripButton11, Me.ToolStripButton12, Me.ToolStripButton17, Me.ToolStripButton18})
         Me.BindingNavigator3.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator3.MoveFirstItem = Me.ToolStripButton13
@@ -1951,7 +1960,7 @@ Partial Class frmMain
         Me.BindingNavigator3.MovePreviousItem = Me.ToolStripButton14
         Me.BindingNavigator3.Name = "BindingNavigator3"
         Me.BindingNavigator3.PositionItem = Me.ToolStripTextBox2
-        Me.BindingNavigator3.Size = New System.Drawing.Size(974, 25)
+        Me.BindingNavigator3.Size = New System.Drawing.Size(974, 31)
         Me.BindingNavigator3.TabIndex = 33
         Me.BindingNavigator3.Text = "BindingNavigator3"
         '
@@ -1961,13 +1970,13 @@ Partial Class frmMain
         Me.ToolStripButton11.Image = CType(resources.GetObject("ToolStripButton11.Image"), System.Drawing.Image)
         Me.ToolStripButton11.Name = "ToolStripButton11"
         Me.ToolStripButton11.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton11.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton11.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton11.Text = "Neu hinzufügen"
         '
         'ToolStripLabel2
         '
         Me.ToolStripLabel2.Name = "ToolStripLabel2"
-        Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 22)
+        Me.ToolStripLabel2.Size = New System.Drawing.Size(225, 28)
         Me.ToolStripLabel2.Text = "von {0} möglichen Verarbeitungsschritten"
         Me.ToolStripLabel2.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -1977,7 +1986,7 @@ Partial Class frmMain
         Me.ToolStripButton12.Image = CType(resources.GetObject("ToolStripButton12.Image"), System.Drawing.Image)
         Me.ToolStripButton12.Name = "ToolStripButton12"
         Me.ToolStripButton12.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton12.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton12.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton12.Text = "Löschen"
         '
         'ToolStripButton13
@@ -1986,7 +1995,7 @@ Partial Class frmMain
         Me.ToolStripButton13.Image = CType(resources.GetObject("ToolStripButton13.Image"), System.Drawing.Image)
         Me.ToolStripButton13.Name = "ToolStripButton13"
         Me.ToolStripButton13.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton13.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton13.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton13.Text = "Erste verschieben"
         '
         'ToolStripButton14
@@ -1995,13 +2004,13 @@ Partial Class frmMain
         Me.ToolStripButton14.Image = CType(resources.GetObject("ToolStripButton14.Image"), System.Drawing.Image)
         Me.ToolStripButton14.Name = "ToolStripButton14"
         Me.ToolStripButton14.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton14.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton14.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton14.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
-        Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator4.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripTextBox2
         '
@@ -2016,7 +2025,7 @@ Partial Class frmMain
         'ToolStripSeparator5
         '
         Me.ToolStripSeparator5.Name = "ToolStripSeparator5"
-        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator5.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton15
         '
@@ -2024,7 +2033,7 @@ Partial Class frmMain
         Me.ToolStripButton15.Image = CType(resources.GetObject("ToolStripButton15.Image"), System.Drawing.Image)
         Me.ToolStripButton15.Name = "ToolStripButton15"
         Me.ToolStripButton15.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton15.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton15.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton15.Text = "Nächste verschieben"
         '
         'ToolStripButton16
@@ -2033,13 +2042,13 @@ Partial Class frmMain
         Me.ToolStripButton16.Image = CType(resources.GetObject("ToolStripButton16.Image"), System.Drawing.Image)
         Me.ToolStripButton16.Name = "ToolStripButton16"
         Me.ToolStripButton16.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton16.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton16.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton16.Text = "Letzte verschieben"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton17
         '
@@ -2047,7 +2056,7 @@ Partial Class frmMain
         Me.ToolStripButton17.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton17.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton17.Name = "ToolStripButton17"
-        Me.ToolStripButton17.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton17.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton17.Text = "ToolStripButton1"
         '
         'ToolStripButton18
@@ -2056,48 +2065,48 @@ Partial Class frmMain
         Me.ToolStripButton18.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton18.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton18.Name = "ToolStripButton18"
-        Me.ToolStripButton18.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton18.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton18.Text = "Refresh"
         '
         'GUIDPollStepsTextBox
         '
         Me.GUIDPollStepsTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.GUIDPollStepsTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "GUID", True))
-        Me.GUIDPollStepsTextBox.Location = New System.Drawing.Point(571, 93)
+        Me.GUIDPollStepsTextBox.Location = New System.Drawing.Point(856, 140)
         Me.GUIDPollStepsTextBox.Name = "GUIDPollStepsTextBox"
-        Me.GUIDPollStepsTextBox.Size = New System.Drawing.Size(129, 32)
+        Me.GUIDPollStepsTextBox.Size = New System.Drawing.Size(194, 21)
         Me.GUIDPollStepsTextBox.TabIndex = 2
         '
         'STEP_NAMETextBox
         '
         Me.STEP_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "STEP_NAME", True))
-        Me.STEP_NAMETextBox.Location = New System.Drawing.Point(712, 93)
+        Me.STEP_NAMETextBox.Location = New System.Drawing.Point(1068, 140)
         Me.STEP_NAMETextBox.Name = "STEP_NAMETextBox"
-        Me.STEP_NAMETextBox.Size = New System.Drawing.Size(498, 32)
+        Me.STEP_NAMETextBox.Size = New System.Drawing.Size(747, 21)
         Me.STEP_NAMETextBox.TabIndex = 6
         '
         'KEYWORDS_BODYTextBox
         '
         Me.KEYWORDS_BODYTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "KEYWORDS_BODY", True))
-        Me.KEYWORDS_BODYTextBox.Location = New System.Drawing.Point(1224, 93)
+        Me.KEYWORDS_BODYTextBox.Location = New System.Drawing.Point(1836, 140)
         Me.KEYWORDS_BODYTextBox.Name = "KEYWORDS_BODYTextBox"
-        Me.KEYWORDS_BODYTextBox.Size = New System.Drawing.Size(819, 32)
+        Me.KEYWORDS_BODYTextBox.Size = New System.Drawing.Size(1229, 21)
         Me.KEYWORDS_BODYTextBox.TabIndex = 8
         '
         'COMMENTTextBox1
         '
         Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_STEPSBindingSource, "COMMENT", True))
-        Me.COMMENTTextBox1.Location = New System.Drawing.Point(712, 183)
+        Me.COMMENTTextBox1.Location = New System.Drawing.Point(1068, 275)
         Me.COMMENTTextBox1.Name = "COMMENTTextBox1"
-        Me.COMMENTTextBox1.Size = New System.Drawing.Size(1331, 32)
+        Me.COMMENTTextBox1.Size = New System.Drawing.Size(1997, 21)
         Me.COMMENTTextBox1.TabIndex = 10
         '
         'ACTIVECheckBox2
         '
         Me.ACTIVECheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_STEPSBindingSource, "ACTIVE", True))
-        Me.ACTIVECheckBox2.Location = New System.Drawing.Point(571, 176)
+        Me.ACTIVECheckBox2.Location = New System.Drawing.Point(856, 264)
         Me.ACTIVECheckBox2.Name = "ACTIVECheckBox2"
-        Me.ACTIVECheckBox2.Size = New System.Drawing.Size(129, 54)
+        Me.ACTIVECheckBox2.Size = New System.Drawing.Size(194, 81)
         Me.ACTIVECheckBox2.TabIndex = 12
         Me.ACTIVECheckBox2.Text = "Active"
         Me.ACTIVECheckBox2.UseVisualStyleBackColor = True
@@ -2109,7 +2118,7 @@ Partial Class frmMain
         Me.GridControl2.Location = New System.Drawing.Point(0, 0)
         Me.GridControl2.MainView = Me.GridView2
         Me.GridControl2.Name = "GridControl2"
-        Me.GridControl2.Size = New System.Drawing.Size(245, 225)
+        Me.GridControl2.Size = New System.Drawing.Size(245, 337)
         Me.GridControl2.TabIndex = 1
         Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
         '
@@ -2179,7 +2188,7 @@ Partial Class frmMain
         'SEQUENCENumericUpDown
         '
         Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "SEQUENCE", True))
-        Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(1143, 185)
+        Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(1714, 278)
         Me.SEQUENCENumericUpDown.Maximum = New Decimal(New Integer() {20, 0, 0, 0})
         Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown"
         Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(2, 21)
@@ -2196,34 +2205,34 @@ Partial Class frmMain
         '
         Me.GUIDTextBox1.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "GUID", True))
-        Me.GUIDTextBox1.Location = New System.Drawing.Point(571, 95)
+        Me.GUIDTextBox1.Location = New System.Drawing.Point(856, 143)
         Me.GUIDTextBox1.Name = "GUIDTextBox1"
-        Me.GUIDTextBox1.Size = New System.Drawing.Size(149, 32)
+        Me.GUIDTextBox1.Size = New System.Drawing.Size(224, 21)
         Me.GUIDTextBox1.TabIndex = 36
         '
         'INDEXNAMEIndexStepsComboBox
         '
         Me.INDEXNAMEIndexStepsComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "INDEXNAME", True))
         Me.INDEXNAMEIndexStepsComboBox.FormattingEnabled = True
-        Me.INDEXNAMEIndexStepsComboBox.Location = New System.Drawing.Point(733, 95)
+        Me.INDEXNAMEIndexStepsComboBox.Location = New System.Drawing.Point(1099, 143)
         Me.INDEXNAMEIndexStepsComboBox.Name = "INDEXNAMEIndexStepsComboBox"
-        Me.INDEXNAMEIndexStepsComboBox.Size = New System.Drawing.Size(390, 32)
+        Me.INDEXNAMEIndexStepsComboBox.Size = New System.Drawing.Size(585, 21)
         Me.INDEXNAMEIndexStepsComboBox.TabIndex = 40
         '
         'INDEXVALUETextBox
         '
         Me.INDEXVALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "INDEXVALUE", True))
-        Me.INDEXVALUETextBox.Location = New System.Drawing.Point(1143, 95)
+        Me.INDEXVALUETextBox.Location = New System.Drawing.Point(1714, 143)
         Me.INDEXVALUETextBox.Name = "INDEXVALUETextBox"
-        Me.INDEXVALUETextBox.Size = New System.Drawing.Size(450, 32)
+        Me.INDEXVALUETextBox.Size = New System.Drawing.Size(675, 21)
         Me.INDEXVALUETextBox.TabIndex = 42
         '
         'ACTIVECheckBox3
         '
         Me.ACTIVECheckBox3.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "ACTIVE", True))
-        Me.ACTIVECheckBox3.Location = New System.Drawing.Point(571, 156)
+        Me.ACTIVECheckBox3.Location = New System.Drawing.Point(856, 234)
         Me.ACTIVECheckBox3.Name = "ACTIVECheckBox3"
-        Me.ACTIVECheckBox3.Size = New System.Drawing.Size(149, 54)
+        Me.ACTIVECheckBox3.Size = New System.Drawing.Size(224, 81)
         Me.ACTIVECheckBox3.TabIndex = 44
         Me.ACTIVECheckBox3.Text = "Active"
         Me.ACTIVECheckBox3.UseVisualStyleBackColor = True
@@ -2231,9 +2240,9 @@ Partial Class frmMain
         'USE_FOR_DIRECT_ANSWERCheckBox
         '
         Me.USE_FOR_DIRECT_ANSWERCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "USE_FOR_DIRECT_ANSWER", True))
-        Me.USE_FOR_DIRECT_ANSWERCheckBox.Location = New System.Drawing.Point(733, 162)
+        Me.USE_FOR_DIRECT_ANSWERCheckBox.Location = New System.Drawing.Point(1099, 243)
         Me.USE_FOR_DIRECT_ANSWERCheckBox.Name = "USE_FOR_DIRECT_ANSWERCheckBox"
-        Me.USE_FOR_DIRECT_ANSWERCheckBox.Size = New System.Drawing.Size(404, 54)
+        Me.USE_FOR_DIRECT_ANSWERCheckBox.Size = New System.Drawing.Size(606, 81)
         Me.USE_FOR_DIRECT_ANSWERCheckBox.TabIndex = 46
         Me.USE_FOR_DIRECT_ANSWERCheckBox.Text = "Index in case of direct answer"
         Me.USE_FOR_DIRECT_ANSWERCheckBox.UseVisualStyleBackColor = True
@@ -2242,36 +2251,36 @@ Partial Class frmMain
         '
         Me.ADDED_WHOTextBox3.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHOTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "ADDED_WHO", True))
-        Me.ADDED_WHOTextBox3.Location = New System.Drawing.Point(729, 282)
+        Me.ADDED_WHOTextBox3.Location = New System.Drawing.Point(1093, 423)
         Me.ADDED_WHOTextBox3.Name = "ADDED_WHOTextBox3"
-        Me.ADDED_WHOTextBox3.Size = New System.Drawing.Size(273, 32)
+        Me.ADDED_WHOTextBox3.Size = New System.Drawing.Size(410, 21)
         Me.ADDED_WHOTextBox3.TabIndex = 50
         '
         'ADDED_WHENTextBox3
         '
         Me.ADDED_WHENTextBox3.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHENTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "ADDED_WHEN", True))
-        Me.ADDED_WHENTextBox3.Location = New System.Drawing.Point(1021, 282)
+        Me.ADDED_WHENTextBox3.Location = New System.Drawing.Point(1531, 423)
         Me.ADDED_WHENTextBox3.Name = "ADDED_WHENTextBox3"
-        Me.ADDED_WHENTextBox3.Size = New System.Drawing.Size(273, 32)
+        Me.ADDED_WHENTextBox3.Size = New System.Drawing.Size(410, 21)
         Me.ADDED_WHENTextBox3.TabIndex = 52
         '
         'CHANGED_WHOIndexingStepsTextBox
         '
         Me.CHANGED_WHOIndexingStepsTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHOIndexingStepsTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOIndexingStepsTextBox.Location = New System.Drawing.Point(1314, 282)
+        Me.CHANGED_WHOIndexingStepsTextBox.Location = New System.Drawing.Point(1971, 423)
         Me.CHANGED_WHOIndexingStepsTextBox.Name = "CHANGED_WHOIndexingStepsTextBox"
-        Me.CHANGED_WHOIndexingStepsTextBox.Size = New System.Drawing.Size(275, 32)
+        Me.CHANGED_WHOIndexingStepsTextBox.Size = New System.Drawing.Size(413, 21)
         Me.CHANGED_WHOIndexingStepsTextBox.TabIndex = 54
         '
         'CHANGED_WHENTextBox3
         '
         Me.CHANGED_WHENTextBox3.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHENTextBox3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_INDEXING_STEPSBindingSource, "CHANGED_WHEN", True))
-        Me.CHANGED_WHENTextBox3.Location = New System.Drawing.Point(1606, 282)
+        Me.CHANGED_WHENTextBox3.Location = New System.Drawing.Point(2409, 423)
         Me.CHANGED_WHENTextBox3.Name = "CHANGED_WHENTextBox3"
-        Me.CHANGED_WHENTextBox3.Size = New System.Drawing.Size(273, 32)
+        Me.CHANGED_WHENTextBox3.Size = New System.Drawing.Size(410, 21)
         Me.CHANGED_WHENTextBox3.TabIndex = 56
         '
         'BindingNavigator4
@@ -2281,6 +2290,7 @@ Partial Class frmMain
         Me.BindingNavigator4.CountItem = Me.ToolStripLabel3
         Me.BindingNavigator4.CountItemFormat = "von {0} Indexierungsschritten"
         Me.BindingNavigator4.DeleteItem = Me.ToolStripButton20
+        Me.BindingNavigator4.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.BindingNavigator4.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton21, Me.ToolStripButton22, Me.ToolStripSeparator7, Me.ToolStripTextBox3, Me.ToolStripLabel3, Me.ToolStripSeparator8, Me.ToolStripButton23, Me.ToolStripButton24, Me.ToolStripSeparator9, Me.ToolStripButton19, Me.ToolStripButton20, Me.ToolStripButton25, Me.ToolStripButton26})
         Me.BindingNavigator4.Location = New System.Drawing.Point(245, 0)
         Me.BindingNavigator4.MoveFirstItem = Me.ToolStripButton21
@@ -2289,7 +2299,7 @@ Partial Class frmMain
         Me.BindingNavigator4.MovePreviousItem = Me.ToolStripButton22
         Me.BindingNavigator4.Name = "BindingNavigator4"
         Me.BindingNavigator4.PositionItem = Me.ToolStripTextBox3
-        Me.BindingNavigator4.Size = New System.Drawing.Size(974, 25)
+        Me.BindingNavigator4.Size = New System.Drawing.Size(974, 31)
         Me.BindingNavigator4.TabIndex = 35
         Me.BindingNavigator4.Text = "BindingNavigator4"
         '
@@ -2299,13 +2309,13 @@ Partial Class frmMain
         Me.ToolStripButton19.Image = CType(resources.GetObject("ToolStripButton19.Image"), System.Drawing.Image)
         Me.ToolStripButton19.Name = "ToolStripButton19"
         Me.ToolStripButton19.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton19.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton19.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton19.Text = "Neu hinzufügen"
         '
         'ToolStripLabel3
         '
         Me.ToolStripLabel3.Name = "ToolStripLabel3"
-        Me.ToolStripLabel3.Size = New System.Drawing.Size(161, 22)
+        Me.ToolStripLabel3.Size = New System.Drawing.Size(161, 28)
         Me.ToolStripLabel3.Text = "von {0} Indexierungsschritten"
         Me.ToolStripLabel3.ToolTipText = "Die Gesamtanzahl der Elemente."
         '
@@ -2315,7 +2325,7 @@ Partial Class frmMain
         Me.ToolStripButton20.Image = CType(resources.GetObject("ToolStripButton20.Image"), System.Drawing.Image)
         Me.ToolStripButton20.Name = "ToolStripButton20"
         Me.ToolStripButton20.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton20.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton20.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton20.Text = "Löschen"
         '
         'ToolStripButton21
@@ -2324,7 +2334,7 @@ Partial Class frmMain
         Me.ToolStripButton21.Image = CType(resources.GetObject("ToolStripButton21.Image"), System.Drawing.Image)
         Me.ToolStripButton21.Name = "ToolStripButton21"
         Me.ToolStripButton21.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton21.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton21.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton21.Text = "Erste verschieben"
         '
         'ToolStripButton22
@@ -2333,13 +2343,13 @@ Partial Class frmMain
         Me.ToolStripButton22.Image = CType(resources.GetObject("ToolStripButton22.Image"), System.Drawing.Image)
         Me.ToolStripButton22.Name = "ToolStripButton22"
         Me.ToolStripButton22.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton22.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton22.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton22.Text = "Vorherige verschieben"
         '
         'ToolStripSeparator7
         '
         Me.ToolStripSeparator7.Name = "ToolStripSeparator7"
-        Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator7.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripTextBox3
         '
@@ -2354,7 +2364,7 @@ Partial Class frmMain
         'ToolStripSeparator8
         '
         Me.ToolStripSeparator8.Name = "ToolStripSeparator8"
-        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator8.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton23
         '
@@ -2362,7 +2372,7 @@ Partial Class frmMain
         Me.ToolStripButton23.Image = CType(resources.GetObject("ToolStripButton23.Image"), System.Drawing.Image)
         Me.ToolStripButton23.Name = "ToolStripButton23"
         Me.ToolStripButton23.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton23.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton23.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton23.Text = "Nächste verschieben"
         '
         'ToolStripButton24
@@ -2371,13 +2381,13 @@ Partial Class frmMain
         Me.ToolStripButton24.Image = CType(resources.GetObject("ToolStripButton24.Image"), System.Drawing.Image)
         Me.ToolStripButton24.Name = "ToolStripButton24"
         Me.ToolStripButton24.RightToLeftAutoMirrorImage = True
-        Me.ToolStripButton24.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton24.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton24.Text = "Letzte verschieben"
         '
         'ToolStripSeparator9
         '
         Me.ToolStripSeparator9.Name = "ToolStripSeparator9"
-        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator9.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton25
         '
@@ -2385,7 +2395,7 @@ Partial Class frmMain
         Me.ToolStripButton25.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
         Me.ToolStripButton25.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton25.Name = "ToolStripButton25"
-        Me.ToolStripButton25.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton25.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton25.Text = "ToolStripButton1"
         '
         'ToolStripButton26
@@ -2394,7 +2404,7 @@ Partial Class frmMain
         Me.ToolStripButton26.Image = Global.EmailProfiler.Form.My.Resources.Resources.refresh_16xLG
         Me.ToolStripButton26.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton26.Name = "ToolStripButton26"
-        Me.ToolStripButton26.Size = New System.Drawing.Size(23, 22)
+        Me.ToolStripButton26.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton26.Text = "Refresh"
         '
         'GridControl3
@@ -2404,7 +2414,7 @@ Partial Class frmMain
         Me.GridControl3.Location = New System.Drawing.Point(0, 0)
         Me.GridControl3.MainView = Me.GridView3
         Me.GridControl3.Name = "GridControl3"
-        Me.GridControl3.Size = New System.Drawing.Size(245, 338)
+        Me.GridControl3.Size = New System.Drawing.Size(245, 337)
         Me.GridControl3.TabIndex = 34
         Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
         '
@@ -2447,7 +2457,7 @@ Partial Class frmMain
         Me.CHANGED_WHOProfilesTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHOProfilesTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "CHANGED_WHO", True))
         Me.CHANGED_WHOProfilesTextBox.Enabled = False
-        Me.CHANGED_WHOProfilesTextBox.Location = New System.Drawing.Point(958, 84)
+        Me.CHANGED_WHOProfilesTextBox.Location = New System.Drawing.Point(962, 100)
         Me.CHANGED_WHOProfilesTextBox.Name = "CHANGED_WHOProfilesTextBox"
         Me.CHANGED_WHOProfilesTextBox.Size = New System.Drawing.Size(121, 21)
         Me.CHANGED_WHOProfilesTextBox.TabIndex = 25
@@ -2457,7 +2467,7 @@ Partial Class frmMain
         Me.GUIDTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "GUID", True))
         Me.GUIDTextBox.Enabled = False
-        Me.GUIDTextBox.Location = New System.Drawing.Point(254, 44)
+        Me.GUIDTextBox.Location = New System.Drawing.Point(258, 60)
         Me.GUIDTextBox.Name = "GUIDTextBox"
         Me.GUIDTextBox.Size = New System.Drawing.Size(58, 21)
         Me.GUIDTextBox.TabIndex = 5
@@ -2465,7 +2475,7 @@ Partial Class frmMain
         'PROFILE_NAMETextBox
         '
         Me.PROFILE_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "PROFILE_NAME", True))
-        Me.PROFILE_NAMETextBox.Location = New System.Drawing.Point(321, 44)
+        Me.PROFILE_NAMETextBox.Location = New System.Drawing.Point(325, 60)
         Me.PROFILE_NAMETextBox.Name = "PROFILE_NAMETextBox"
         Me.PROFILE_NAMETextBox.Size = New System.Drawing.Size(240, 21)
         Me.PROFILE_NAMETextBox.TabIndex = 7
@@ -2475,7 +2485,7 @@ Partial Class frmMain
         Me.CHANGED_WHENTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "CHANGED_WHEN", True))
         Me.CHANGED_WHENTextBox.Enabled = False
-        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(1085, 84)
+        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(1089, 100)
         Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
         Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(121, 21)
         Me.CHANGED_WHENTextBox.TabIndex = 27
@@ -2483,7 +2493,7 @@ Partial Class frmMain
         'COMMENTTextBox
         '
         Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "COMMENT", True))
-        Me.COMMENTTextBox.Location = New System.Drawing.Point(321, 84)
+        Me.COMMENTTextBox.Location = New System.Drawing.Point(325, 100)
         Me.COMMENTTextBox.Name = "COMMENTTextBox"
         Me.COMMENTTextBox.Size = New System.Drawing.Size(370, 21)
         Me.COMMENTTextBox.TabIndex = 13
@@ -2491,7 +2501,7 @@ Partial Class frmMain
         'ACTIVECheckBox
         '
         Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBEMLP_POLL_PROFILESBindingSource, "ACTIVE", True))
-        Me.ACTIVECheckBox.Location = New System.Drawing.Point(254, 81)
+        Me.ACTIVECheckBox.Location = New System.Drawing.Point(258, 97)
         Me.ACTIVECheckBox.Name = "ACTIVECheckBox"
         Me.ACTIVECheckBox.Size = New System.Drawing.Size(58, 24)
         Me.ACTIVECheckBox.TabIndex = 17
@@ -2503,7 +2513,7 @@ Partial Class frmMain
         Me.ADDED_WHENTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "ADDED_WHEN", True))
         Me.ADDED_WHENTextBox.Enabled = False
-        Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(830, 84)
+        Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(834, 100)
         Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
         Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(122, 21)
         Me.ADDED_WHENTextBox.TabIndex = 23
@@ -2513,7 +2523,7 @@ Partial Class frmMain
         Me.ADDED_WHOTextBox.BackColor = System.Drawing.SystemColors.InactiveBorder
         Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_POLL_PROFILESBindingSource, "ADDED_WHO", True))
         Me.ADDED_WHOTextBox.Enabled = False
-        Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(700, 84)
+        Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(704, 100)
         Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
         Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(121, 21)
         Me.ADDED_WHOTextBox.TabIndex = 21
@@ -2521,6 +2531,7 @@ Partial Class frmMain
         'tabEmail
         '
         Me.tabEmail.AutoScroll = True
+        Me.tabEmail.Controls.Add(Me.GroupBox6)
         Me.tabEmail.Controls.Add(Me.btnCheckIMAPObjects)
         Me.tabEmail.Controls.Add(AUTH_TYPELabel)
         Me.tabEmail.Controls.Add(Me.AUTH_TYPEComboBox)
@@ -2571,7 +2582,7 @@ Partial Class frmMain
         '
         Me.btnCheckIMAPObjects.Image = Global.EmailProfiler.Form.My.Resources.Resources.arrow_right
         Me.btnCheckIMAPObjects.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnCheckIMAPObjects.Location = New System.Drawing.Point(831, 203)
+        Me.btnCheckIMAPObjects.Location = New System.Drawing.Point(738, 291)
         Me.btnCheckIMAPObjects.Name = "btnCheckIMAPObjects"
         Me.btnCheckIMAPObjects.Size = New System.Drawing.Size(189, 35)
         Me.btnCheckIMAPObjects.TabIndex = 80
@@ -2595,7 +2606,7 @@ Partial Class frmMain
         '
         Me.btntestImap.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go
         Me.btntestImap.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btntestImap.Location = New System.Drawing.Point(701, 203)
+        Me.btntestImap.Location = New System.Drawing.Point(859, 250)
         Me.btntestImap.Name = "btntestImap"
         Me.btntestImap.Size = New System.Drawing.Size(117, 35)
         Me.btntestImap.TabIndex = 68
@@ -2626,7 +2637,7 @@ Partial Class frmMain
         Me.txtTestmail.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.EmailProfiler.Form.My.MySettings.Default, "EmailTest_Receipiant", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
         Me.txtTestmail.Location = New System.Drawing.Point(373, 258)
         Me.txtTestmail.Name = "txtTestmail"
-        Me.txtTestmail.Size = New System.Drawing.Size(311, 21)
+        Me.txtTestmail.Size = New System.Drawing.Size(359, 21)
         Me.txtTestmail.TabIndex = 10
         Me.txtTestmail.Text = Global.EmailProfiler.Form.My.MySettings.Default.EmailTest_Receipiant
         '
@@ -2643,7 +2654,7 @@ Partial Class frmMain
         '
         Me.btnsendtestmail.Image = Global.EmailProfiler.Form.My.Resources.Resources.email_go
         Me.btnsendtestmail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnsendtestmail.Location = New System.Drawing.Point(701, 244)
+        Me.btnsendtestmail.Location = New System.Drawing.Point(738, 250)
         Me.btnsendtestmail.Name = "btnsendtestmail"
         Me.btnsendtestmail.Size = New System.Drawing.Size(117, 35)
         Me.btnsendtestmail.TabIndex = 65
@@ -2663,6 +2674,7 @@ Partial Class frmMain
         '
         'ContextMenuStrip2
         '
+        Me.ContextMenuStrip2.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PasswortAnzeigenToolStripMenuItem})
         Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(172, 26)
@@ -3126,6 +3138,7 @@ Partial Class frmMain
         '
         'GroupBox3
         '
+        Me.GroupBox3.Controls.Add(Me.Button2)
         Me.GroupBox3.Controls.Add(CHANGED_WHENLabel4)
         Me.GroupBox3.Controls.Add(Me.CHANGED_WHENTextBox4)
         Me.GroupBox3.Controls.Add(CHANGED_WHOLabel4)
@@ -3143,6 +3156,18 @@ Partial Class frmMain
         Me.GroupBox3.TabStop = False
         Me.GroupBox3.Text = "Weiteres"
         '
+        'Button2
+        '
+        Me.Button2.Image = Global.EmailProfiler.Form.My.Resources.Resources.save_16xMD
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button2.Location = New System.Drawing.Point(9, 49)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(159, 23)
+        Me.Button2.TabIndex = 78
+        Me.Button2.Text = "Konfiguration speichern"
+        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button2.UseVisualStyleBackColor = True
+        '
         'CHANGED_WHENTextBox4
         '
         Me.CHANGED_WHENTextBox4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBEMLP_CONFIGBindingSource, "CHANGED_WHEN", True))
@@ -3386,9 +3411,51 @@ Partial Class frmMain
         '
         'ContextMenuStrip1
         '
+        Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
         '
+        'GroupBox6
+        '
+        Me.GroupBox6.Controls.Add(Me.Label15)
+        Me.GroupBox6.Controls.Add(Me.CheckBoxEnableTls1_2)
+        Me.GroupBox6.Controls.Add(Me.CheckBoxEnableTls1_1)
+        Me.GroupBox6.Location = New System.Drawing.Point(374, 191)
+        Me.GroupBox6.Name = "GroupBox6"
+        Me.GroupBox6.Size = New System.Drawing.Size(358, 50)
+        Me.GroupBox6.TabIndex = 82
+        Me.GroupBox6.TabStop = False
+        Me.GroupBox6.Text = "Tls-Konfigs (nur zur Laufzeit)"
+        '
+        'CheckBoxEnableTls1_1
+        '
+        Me.CheckBoxEnableTls1_1.AutoSize = True
+        Me.CheckBoxEnableTls1_1.Location = New System.Drawing.Point(6, 23)
+        Me.CheckBoxEnableTls1_1.Name = "CheckBoxEnableTls1_1"
+        Me.CheckBoxEnableTls1_1.Size = New System.Drawing.Size(89, 17)
+        Me.CheckBoxEnableTls1_1.TabIndex = 81
+        Me.CheckBoxEnableTls1_1.Text = "EnableTls1_1"
+        Me.CheckBoxEnableTls1_1.UseVisualStyleBackColor = True
+        '
+        'CheckBoxEnableTls1_2
+        '
+        Me.CheckBoxEnableTls1_2.AutoSize = True
+        Me.CheckBoxEnableTls1_2.Location = New System.Drawing.Point(101, 23)
+        Me.CheckBoxEnableTls1_2.Name = "CheckBoxEnableTls1_2"
+        Me.CheckBoxEnableTls1_2.Size = New System.Drawing.Size(89, 17)
+        Me.CheckBoxEnableTls1_2.TabIndex = 82
+        Me.CheckBoxEnableTls1_2.Text = "EnableTls1_2"
+        Me.CheckBoxEnableTls1_2.UseVisualStyleBackColor = True
+        '
+        'Label15
+        '
+        Me.Label15.AutoSize = True
+        Me.Label15.Location = New System.Drawing.Point(208, 14)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(134, 26)
+        Me.Label15.TabIndex = 83
+        Me.Label15.Text = "Die Konfiguration erfolgt " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "im Dienst (UserConfig.xml)"
+        '
         'frmMain
         '
         Me.Appearance.Options.UseFont = True
@@ -3467,6 +3534,8 @@ Partial Class frmMain
         Me.GroupBox1.ResumeLayout(False)
         Me.GroupBox1.PerformLayout()
         CType(Me.TBEMLP_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox6.ResumeLayout(False)
+        Me.GroupBox6.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -3724,4 +3793,9 @@ Partial Class frmMain
     Friend WithEvents txtSQLValidation As DevExpress.XtraEditors.TextEdit
     Friend WithEvents Button1 As Button
     Friend WithEvents cbAllowXMLReceipt As CheckBox
+    Friend WithEvents Button2 As Button
+    Friend WithEvents GroupBox6 As GroupBox
+    Friend WithEvents CheckBoxEnableTls1_2 As CheckBox
+    Friend WithEvents CheckBoxEnableTls1_1 As CheckBox
+    Friend WithEvents Label15 As Label
 End Class
diff --git a/App/EmailProfiler.Form/frmMain.resx b/App/EmailProfiler.Form/frmMain.resx
index 50b40b5..46e6a8a 100644
--- a/App/EmailProfiler.Form/frmMain.resx
+++ b/App/EmailProfiler.Form/frmMain.resx
@@ -285,19 +285,98 @@
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1271, 17</value>
   </metadata>
+  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>985, 56</value>
+  </metadata>
+  <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1162, 173</value>
+  </metadata>
+  <metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>623, 134</value>
+  </metadata>
+  <metadata name="BindingNavigator6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>851, 173</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BindingNavigatorAddNewItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+        rkJggg==
+</value>
+  </data>
+  <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="BindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="TBEMLP_POLL_PROFILESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>290, 56</value>
   </metadata>
   <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>180, 56</value>
   </metadata>
+  <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>180, 56</value>
+  </metadata>
   <metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>623, 134</value>
   </metadata>
   <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>985, 56</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -362,6 +441,89 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="BindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1139, 56</value>
+  </metadata>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="XtraTabPage1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w
+        LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu
+        NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3
+        LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww
+        LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww
+        LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz
+        LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x
+        NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y
+        LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="BindingNavigator3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1021, 95</value>
+  </metadata>
+  <data name="XtraTabPage2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLlll
+        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMzU7fQoJLnN0M3tv
+        cGFjaXR5OjAuNjU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRnVubmVsIj4NCiAgICA8cmVjdCB4PSIxMiIg
+        eT0iMjIiIHdpZHRoPSI2IiBoZWlnaHQ9IjgiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+DQog
+        ICAgPHBvbHlnb24gcG9pbnRzPSIxMiwyMCA0LDEyIDI2LDEyIDE4LDIwICAiIGNsYXNzPSJZZWxsb3ci
+        IC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSI0LDEwIDAsMiAzMCwyIDI2LDEwICAiIGNsYXNzPSJSZWQi
+        IC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="BindingNavigator4.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1175, 95</value>
+  </metadata>
+  <data name="XtraTabPage3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGYEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJEb2N1bWVudF8xXyI+
+        DQogICAgPHBhdGggZD0iTTE1LDIwbDktOWw1LDVsLTksOUwxNSwyMHogTTMxLjcsMTEuOWwtMy42LTMu
+        NmMtMC40LTAuNC0xLTAuNC0xLjQsMEwyNSwxMGw1LDVsMS43LTEuNyAgIEMzMi4xLDEyLjksMzIuMSwx
+        Mi4zLDMxLjcsMTEuOXogTTE0LDI2aDVsLTUtNVYyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRo
+        IGQ9Ik0yNCwyMy44VjI4aC00LjJIMTJINlY0aDE4djQuMmwyLTJWM2MwLTAuNS0wLjUtMS0xLTFINUM0
+        LjQsMiw0LDIuNSw0LDN2MjZjMCwwLjUsMC41LDEsMSwxaDIwICAgYzAuNSwwLDEtMC41LDEtMXYtNy4y
+        TDI0LDIzLjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
+  </metadata>
   <metadata name="TBEMLP_POLL_PROCESSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 95</value>
   </metadata>
@@ -430,31 +592,6 @@
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
         WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="XtraTabPage1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w
-        LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu
-        NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3
-        LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww
-        LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww
-        LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz
-        LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x
-        NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y
-        LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
   <metadata name="TBEMLP_POLL_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -530,26 +667,9 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="XtraTabPage2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLlll
-        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMzU7fQoJLnN0M3tv
-        cGFjaXR5OjAuNjU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRnVubmVsIj4NCiAgICA8cmVjdCB4PSIxMiIg
-        eT0iMjIiIHdpZHRoPSI2IiBoZWlnaHQ9IjgiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+DQog
-        ICAgPHBvbHlnb24gcG9pbnRzPSIxMiwyMCA0LDEyIDI2LDEyIDE4LDIwICAiIGNsYXNzPSJZZWxsb3ci
-        IC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSI0LDEwIDAsMiAzMCwyIDI2LDEwICAiIGNsYXNzPSJSZWQi
-        IC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
+  <metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 134</value>
+  </metadata>
   <metadata name="TBEMLP_POLL_INDEXING_STEPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 134</value>
   </metadata>
@@ -618,111 +738,6 @@
         kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
         WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="XtraTabPage3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGYEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
-        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
-        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
-        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
-        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
-        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJEb2N1bWVudF8xXyI+
-        DQogICAgPHBhdGggZD0iTTE1LDIwbDktOWw1LDVsLTksOUwxNSwyMHogTTMxLjcsMTEuOWwtMy42LTMu
-        NmMtMC40LTAuNC0xLTAuNC0xLjQsMEwyNSwxMGw1LDVsMS43LTEuNyAgIEMzMi4xLDEyLjksMzIuMSwx
-        Mi4zLDMxLjcsMTEuOXogTTE0LDI2aDVsLTUtNVYyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDxwYXRo
-        IGQ9Ik0yNCwyMy44VjI4aC00LjJIMTJINlY0aDE4djQuMmwyLTJWM2MwLTAuNS0wLjUtMS0xLTFINUM0
-        LjQsMiw0LDIuNSw0LDN2MjZjMCwwLjUsMC41LDEsMSwxaDIwICAgYzAuNSwwLDEtMC41LDEtMXYtNy4y
-        TDI0LDIzLjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <metadata name="BindingNavigator6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>851, 173</value>
-  </metadata>
-  <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>180, 56</value>
-  </metadata>
-  <metadata name="TBDD_EMAIL_ACCOUNTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>623, 134</value>
-  </metadata>
-  <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1162, 173</value>
-  </metadata>
-  <metadata name="BindingNavigator6.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>851, 173</value>
-  </metadata>
-  <data name="BindingNavigatorAddNewItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
-        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
-        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
-        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
-        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
-        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="BindingNavigatorDeleteItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
-        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
-        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
-        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
-        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
-        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
-        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
-        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
-        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
-        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
-        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
-        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMovePreviousItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
-        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
-        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
-        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="BindingNavigatorMoveNextItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
-        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
-        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
-        oAc0QjgAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="BindingNavigatorMoveLastItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vAAADrwBlbxySQAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
-        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
-        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
-        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
-        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
-        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="TBEMLP_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/App/EmailProfiler.Form/frmMain.vb b/App/EmailProfiler.Form/frmMain.vb
index 280942e..e7a6bfd 100644
--- a/App/EmailProfiler.Form/frmMain.vb
+++ b/App/EmailProfiler.Form/frmMain.vb
@@ -32,21 +32,43 @@ Public Class frmMain
     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)
-            ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
-
             Logger = LogConfig.GetLogger()
+
+            _limilab = New Limilab(LogConfig)
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
+            Dim oStartupPath = Application.StartupPath
+
+            Dim oAppconfig As String = "AppConfig.xml"
+            Dim oAppConfigFilePath As String = Path.Combine(oStartupPath, oAppconfig)
+            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
+
+
+            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
-            LogConfig.Debug = ConfigManager.Config.Debug
+
             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
 
-            If ConfigManager.Config.UseWindream Then
-                _windream = New clsWindream_allgemein(LogConfig)
-            End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in FormLoad")
         End Try
@@ -60,9 +82,15 @@ Public Class frmMain
             Active_Color(ACTIVECheckBox3)
             Active_Color(ACTIVECheckBox4)
         End If
-        If ConfigManager.Config.UseWindream Then
-            ObjektTypenEintragen()
-        End If
+        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
@@ -99,6 +127,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()
@@ -738,10 +767,14 @@ Public Class frmMain
             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 = False,
-                        .EnableTls1_2 = False,
-                        .EnableDefault = True
+                        .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)
 
@@ -994,4 +1027,8 @@ Public Class frmMain
             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
 End Class
diff --git a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
index 430d669..40af7d1 100644
--- a/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
+++ b/App/EmailProfiler.Service/EmailProfiler.Service.vbproj
@@ -156,11 +156,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
-      <Project>{9f748dcd-952e-40a0-9dad-65bf8a39b231}</Project>
-      <Name>EmailProfiler.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file
diff --git a/App/wisag_check_Att/wisag_check_Att.vbproj b/App/wisag_check_Att/wisag_check_Att.vbproj
index f69805d..6aaff29 100644
--- a/App/wisag_check_Att/wisag_check_Att.vbproj
+++ b/App/wisag_check_Att/wisag_check_Att.vbproj
@@ -158,12 +158,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EmailProfiler.Common\EmailProfiler.Common.vbproj">
-      <Project>{9F748DCD-952E-40A0-9DAD-65BF8A39B231}</Project>
-      <Name>EmailProfiler.Common</Name>
-    </ProjectReference>
-  </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">