diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index 1ae8c96c..81d80ccd 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -762,7 +762,7 @@ namespace ENI2
             {
                 SEC sec = secMessage.Elements[0] as SEC;
                 NOA_NOD noanod = noanodMessage.Elements[0] as NOA_NOD;
-                if(sec.LastTenPortFacilitesCalled.Count > 0)
+                if((sec.LastTenPortFacilitesCalled.Count > 0) && (!sec.SECSimplification ?? false))
                 {
                     if((sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode == null) || !sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode.Equals(noanod.LastPort))
                     {
@@ -770,7 +770,10 @@ namespace ENI2
                         mv.MessageGroupName = Properties.Resources.textOverview;
                         vViolations.Add(mv);
                     }
-                    if(sec.LastTenPortFacilitesCalled[0].PortFacilityDateOfDeparture != (noanod.ETDFromLastPort ?? DateTime.Now).Date)
+                    DateTime comparison;
+                    if (noanod.ETDFromLastPort.HasValue) comparison = noanod.ETDFromLastPort.Value.ToLocalTime().Date;
+                    else comparison = DateTime.Now.Date;
+                    if(sec.LastTenPortFacilitesCalled[0].PortFacilityDateOfDeparture != comparison)
                     {
                         MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "SEC last port departure doesn't match NOANOD ETDFromLastPort", null, "Last port departure mismatch", null, "SEC");
                         mv.MessageGroupName = Properties.Resources.textOverview;
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index ba147625..e4bf4cd6 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -34,7 +34,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>6.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -69,7 +69,7 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>ENI2_3_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\logo_schwarz.ico</ApplicationIcon>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 2f16bb41..261ceef7 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/ATA.cs b/nsw/Source/bsmd.database/ATA.cs
index 0303ea71..651a59c0 100644
--- a/nsw/Source/bsmd.database/ATA.cs
+++ b/nsw/Source/bsmd.database/ATA.cs
@@ -103,7 +103,7 @@ namespace bsmd.database
             if (this.ATAPortOfCall.HasValue)
             {
                 if ((this.ATAPortOfCall.Value > DateTime.Now.AddDays(14)) || (this.ATAPortOfCall.Value < DateTime.Now.AddDays(-14)))
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "ATA implausible", this.ATAPortOfCall.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "ATA implausible", this.ATAPortOfCall.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
             }
         }
 
diff --git a/nsw/Source/bsmd.database/ATD.cs b/nsw/Source/bsmd.database/ATD.cs
index b0dca8e3..6494942a 100644
--- a/nsw/Source/bsmd.database/ATD.cs
+++ b/nsw/Source/bsmd.database/ATD.cs
@@ -103,7 +103,7 @@ namespace bsmd.database
             if(this.ATDPortOfCall.HasValue)
             {
                 if((this.ATDPortOfCall.Value > DateTime.Now.AddDays(14)) || (this.ATDPortOfCall.Value < DateTime.Now.AddDays(-14)))
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "ATD implausible", this.ATDPortOfCall.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "ATD implausible", this.ATDPortOfCall.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
             }
         }
 
diff --git a/nsw/Source/bsmd.database/NOA_NOD.cs b/nsw/Source/bsmd.database/NOA_NOD.cs
index ba362fb7..edf4d08a 100644
--- a/nsw/Source/bsmd.database/NOA_NOD.cs
+++ b/nsw/Source/bsmd.database/NOA_NOD.cs
@@ -258,24 +258,24 @@ namespace bsmd.database
             {
                 if(this.ETDFromPortOfCall.HasValue && this.ETAToPortOfCall.HasValue &&
                     (this.ETDFromPortOfCall < this.ETAToPortOfCall))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.E121, "ETDFromPortOfCall implausible", this.ETDFromPortOfCall.ToString(), this.Title, null, this.Tablename));
+                    errors.Add(RuleEngine.CreateError(ValidationCode.E121, "ETDFromPortOfCall implausible", this.ETDFromPortOfCall?.ToLocalTime().ToString(), this.Title, null, this.Tablename));
 
                 // 8.11.20 Validierung gegen ETA /ETD in der Vergangenheit
                 if(this.ETAToPortOfCall < DateTime.Now)
                 {
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETAToPortOfCall: might be implausible", this.ETAToPortOfCall.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETAToPortOfCall: might be implausible", this.ETAToPortOfCall.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
                 }
                 if(this.ETDFromLastPort < DateTime.Now.AddDays(-14))
                 {
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETDFromLastPort: might be implausible", this.ETDFromLastPort.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETDFromLastPort: might be implausible", this.ETDFromLastPort.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
                 }
                 if ((this.ETDFromPortOfCall < DateTime.Now.AddDays(-14)) || (this.ETDFromPortOfCall > DateTime.Now.AddDays(14)))
                 {
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETDFromPortOfCall: might be implausible", this.ETDFromPortOfCall.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETDFromPortOfCall: might be implausible", this.ETDFromPortOfCall.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
                 }
                 if ((this.ETAToNextPort < DateTime.Now) || (this.ETAToNextPort > DateTime.Now.AddDays(14)))
                 {
-                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETAToNextPort: might be implausible", this.ETAToNextPort.Value.ToString(), this.Title, null, this.Tablename));
+                    violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check ETAToNextPort: might be implausible", this.ETAToNextPort.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
                 }
 
                 if (this.CallPurposes.IsNullOrEmpty())
@@ -297,7 +297,7 @@ namespace bsmd.database
             {
                 if (this.ETDFromKielCanal.HasValue && this.ETAToKielCanal.HasValue &&
                     (this.ETDFromKielCanal < this.ETAToKielCanal))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.E121, "ETDFromKielCanal implausible", this.ETDFromKielCanal.ToString(), this.Title, null, this.Tablename));
+                    errors.Add(RuleEngine.CreateError(ValidationCode.E121, "ETDFromKielCanal implausible", this.ETDFromKielCanal.Value.ToLocalTime().ToString(), this.Title, null, this.Tablename));
             }
 
             if((this.LastPort?.Equals("ZZUKN") == false) && !this.ETDFromLastPort.HasValue)
diff --git a/nsw/Source/bsmd.email/BSMDPopClient.cs b/nsw/Source/bsmd.email/BSMDPopClient.cs
index c1bcf634..b95fb90a 100644
--- a/nsw/Source/bsmd.email/BSMDPopClient.cs
+++ b/nsw/Source/bsmd.email/BSMDPopClient.cs
@@ -36,9 +36,9 @@ namespace bsmd.email
             {
                 this.pop3Client = new Pop3Client();
 
-                bool useSSL = false; // abhängig vom PORT setzen!!!
-                if (Properties.Settings.Default.POP3Port != 110)
-                    useSSL = true;
+                //bool useSSL = false; // abhängig vom PORT setzen!!!
+                //if (Properties.Settings.Default.POP3Port != 110)
+                  bool  useSSL = true;
 
                 this.pop3Client.Connect(Properties.Settings.Default.POP3Server, Properties.Settings.Default.POP3Port, useSSL,
                     60000, 60000, new System.Net.Security.RemoteCertificateValidationCallback(ValidateServerCertificate));