diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb
index 259b75f..db1c45d 100644
--- a/Global_Indexer/My Project/AssemblyInfo.vb	
+++ b/Global_Indexer/My Project/AssemblyInfo.vb	
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.9.9.2")>
+<Assembly: AssemblyVersion("1.9.9.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 
\ No newline at end of file
diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb
index 8776ac7..ab0ed05 100644
--- a/Global_Indexer/frmIndex.designer.vb
+++ b/Global_Indexer/frmIndex.designer.vb
@@ -127,7 +127,6 @@ Partial Class frmIndex
         Me.SplitContainer1.Panel2.Controls.Add(Me.grpbxMailBody)
         Me.SplitContainer1.Panel2.Controls.Add(Me.grpBetreff)
         Me.SplitContainer1.Panel2.Controls.Add(Me.pnlPDF)
-        Me.SplitContainer1.Panel2Collapsed = True
         '
         'pnlIndex
         '
diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx
index 2f61cd3..7e710d1 100644
--- a/Global_Indexer/frmIndex.resx
+++ b/Global_Indexer/frmIndex.resx
@@ -125,14 +125,11 @@
   <data name="SplitContainer1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="pnlIndex.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
   <data name="pnlIndex.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 110</value>
   </data>
   <data name="pnlIndex.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 263</value>
+    <value>715, 263</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="pnlIndex.TabIndex" type="System.Int32, mscorlib">
@@ -154,7 +151,7 @@
     <value>0</value>
   </data>
   <data name="CheckBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Right</value>
+    <value>Bottom, Right</value>
   </data>
   <data name="CheckBox1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -163,7 +160,7 @@
     <value>MiddleRight</value>
   </data>
   <data name="CheckBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>670, 76</value>
+    <value>447, 76</value>
   </data>
   <data name="CheckBox1.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
     <value>No</value>
@@ -199,7 +196,7 @@
     <value>MiddleLeft</value>
   </data>
   <data name="Button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>665, 40</value>
+    <value>442, 40</value>
   </data>
   <data name="Button1.Size" type="System.Drawing.Size, System.Drawing">
     <value>133, 30</value>
@@ -241,7 +238,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 25</value>
+    <value>578, 25</value>
   </data>
   <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -304,7 +301,7 @@
     <value>5, 44</value>
   </data>
   <data name="cmbDokumentart.Size" type="System.Drawing.Size, System.Drawing">
-    <value>657, 25</value>
+    <value>434, 25</value>
   </data>
   <data name="cmbDokumentart.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -358,7 +355,7 @@
     <value>2, 3, 2, 3</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 110</value>
+    <value>578, 110</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -487,7 +484,7 @@
     <value>True</value>
   </data>
   <data name="txtIndexfilepath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>797, 34</value>
+    <value>574, 34</value>
   </data>
   <data name="txtIndexfilepath.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -514,7 +511,7 @@
     <value>MiddleLeft</value>
   </data>
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>631, 7</value>
+    <value>408, 7</value>
   </data>
   <data name="btnOK.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 4, 3, 4</value>
@@ -547,13 +544,13 @@
     <value>Bottom</value>
   </data>
   <data name="Panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 373</value>
+    <value>0, 382</value>
   </data>
   <data name="Panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 3, 2, 3</value>
   </data>
   <data name="Panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 137</value>
+    <value>578, 137</value>
   </data>
   <data name="Panel2.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -844,10 +841,10 @@
     <value>1</value>
   </data>
   <data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 510</value>
+    <value>974, 519</value>
   </data>
   <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>425</value>
+    <value>578</value>
   </data>
   <data name="SplitContainer1.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -886,13 +883,13 @@
     <value>False</value>
   </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 510</value>
+    <value>0, 519</value>
   </data>
   <data name="StatusStrip1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>1, 0, 10, 0</value>
   </data>
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>801, 22</value>
+    <value>974, 22</value>
   </data>
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -946,7 +943,7 @@
     <value>7, 17</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>801, 532</value>
+    <value>974, 541</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index 7403244..0f50534 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -2217,8 +2217,12 @@ Public Class frmIndex
                 Try
                     Me.grpBetreff.Dock = DockStyle.Top
                     Me.grpbxMailBody.Dock = DockStyle.Fill
-                    Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
-                    'msg_email.Encoding = Encoding.Unicode
+
+                    'Dim msg_email As New Msg.Message(CURRENT_WORKFILE)
+                    'Dim foo As New Email.Mime.Message(CURRENT_WORKFILE)
+                    Dim msg_email As New Msg.Message()
+                    msg_email.Encoding = Encoding.UTF8
+                    msg_email.Open(CURRENT_WORKFILE)
 
                     Dim headers As String = ClassEmailHeaderExtractor.getMessageHeaders(msg_email)
                     If LogErrorsOnly = False Then ClassLogger.Add(" EMAIL-HEADER: " & headers, False)
diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index ca049f3..cd703ef 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -266,6 +266,7 @@ Public Class frmStart
                 DTACTUAL_FILES = Nothing
                 DTACTUAL_FILES = ClassDatabase.Return_Datatable(sql, True)
             End If
+
             For Each Filerow As DataRow In DTACTUAL_FILES.Rows
                 Dim filestring As String = Filerow.Item("FILENAME2WORK")
                 CURRENT_FILENAME = Filerow.Item("FILENAME2WORK")
diff --git a/SetupWix/Product.wxs b/SetupWix/Product.wxs
index 3f44f4f..7a273c0 100644
--- a/SetupWix/Product.wxs
+++ b/SetupWix/Product.wxs
@@ -134,6 +134,12 @@
                 <File Id="Global_Indexer.resource.en_us" Name="Global_Indexer.resources.dll" Source="en-US\Global_Indexer.resources.dll"></File>
               </Component>
             </Directory>
+
+            <Directory Id="LOCALE_EN" Name="en">
+              <Component Id="GlobalIndexer.Locales.en" Guid="3bba6463-aa8d-4cff-b4e0-7941491260db">
+                <File Id="Global_Indexer.resource.en" Name="Global_Indexer.resources.dll" Source="en\Global_Indexer.resources.dll"></File>
+              </Component>
+            </Directory>
             
             <Directory Id="LOCALE_DE" Name="de-DE">
               <Component Id="GlobalIndexer.Locales.de" Guid="9E7F8C29-44DF-4D38-AD7B-D64B74990CDB">
@@ -214,6 +220,7 @@
       <ComponentRef Id="RegistryEntries"/>
       <ComponentRef Id="ApplicationIco"/>
       <ComponentRef Id="GlobalIndexer.Locales.de" />
+      <ComponentRef Id="GlobalIndexer.Locales.en"/>
       <ComponentRef Id="GlobalIndexer.Locales.en_us" />
       <ComponentRef Id="Scheduler.Locales" />
       
diff --git a/SetupWix/SetupWix.wixproj b/SetupWix/SetupWix.wixproj
index 07445e1..ab4e401 100644
--- a/SetupWix/SetupWix.wixproj
+++ b/SetupWix/SetupWix.wixproj
@@ -48,16 +48,6 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-  <Target Name="BeforeBuild">
-    <!-- Get the programs assembly version from the .exe file -->
-    <GetAssemblyIdentity AssemblyFiles="..\Global_Indexer\bin\$(Configuration)\Global_Indexer.exe">
-      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
-    </GetAssemblyIdentity>
-    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
-    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
-      <Output TaskParameter="Value" PropertyName="DefineConstants" />
-    </CreateProperty>
-  </Target>
   <Target Name="BeforeBuild">
     <!-- Get the programs assembly version from the .exe file -->
     <GetAssemblyIdentity AssemblyFiles="..\Global_Indexer\bin\$(Configuration)\Global_Indexer.exe">