diff --git a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
index 9a27af1..8a4b89e 100644
--- a/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
+++ b/DAKOSY_Worker/cImporter_TelotecToVERAG.vb
@@ -165,8 +165,9 @@ Public Class cImporter_TelotecToVERAG
                 ' DOKUMENTE
                 ' ------------------------------------------------------------
 
+                If p.DOC_CERTS IsNot Nothing Then
 
-                For Each doc In p.DOC_CERTS
+                    For Each doc In p.DOC_CERTS
                     Try
 
                         Dim dd As New cVERAG_CustomsDeclarations_Document With {
@@ -181,6 +182,7 @@ Public Class cImporter_TelotecToVERAG
                     End Try
                 Next
 
+                End If
 
                 ZA.Items.Add(it)
             Next
diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb
index c7f8762..6dab8f0 100644
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -7,6 +7,7 @@ Imports System.Text
 Imports System.Threading
 Imports System.Xml
 Imports DAKOSY_Worker
+Imports DocumentFormat.OpenXml.Wordprocessing
 Imports MDM_Worker
 Imports Renci.SshNet
 Imports VERAG_PROG_ALLGEMEIN
@@ -47,6 +48,7 @@ Public Class frmStartOptions
     Private Sub frmStartOptions_Load(sender As Object, e As EventArgs) Handles Me.Load
         timer.Interval = 2500
 
+
         VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "ROUTINE_MANAGER"
         VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 17
 
@@ -1120,10 +1122,10 @@ Public Class frmStartOptions
                 Dim list As New List(Of Integer)
 
                 sendMailZollbeleg(pfad, SND.tblSnd_EmpfaengerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("EMPFAENGER"), "EMPFAENGER")
-                sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "", "ABSENDER")
                 sendMailZollbeleg(pfad, SND.tblSnd_FrachtfuehrerKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("FRAECHTER"), "FRAECHTER")
                 sendMailZollbeleg(pfad, SND.tblSnd_AvisiererKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AVISIERER"), "AVISIERER")
                 sendMailZollbeleg(pfad, SND.tblSnd_AuftraggeberKdNr, art, list, BezugsNr, SND, SND.getKdAtrNr("AUFTRAGGEBER"), "AUFTRAGGEBER")
+                sendMailZollbeleg(pfad, SND.tblSnd_AbsenderKdNr, art, list, BezugsNr, SND, "", "ABSENDER")
                 sendMailZollbelegGESTELLUNGSADRESSE(pfad, SND.NCTS_ngaId, art, list, BezugsNr, SND)
             End If
 
@@ -1244,6 +1246,12 @@ Public Class frmStartOptions
                             'Wenn ein fixer BEtreff verwendet werden sollte:
                             If KD_ERW.EmailFreigabeBeleg_Betreff Then
                                 betreff = If(KD_ERW.EmailFreigabeBeleg_BetreffText, "")
+                                betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr, ""))
+
+                            Else
+
+                                betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, ""))
+
                             End If
 
                             betreff = betreff.Replace("%LKW%", AVISO.LKW_Nr)
@@ -1321,7 +1329,7 @@ Public Class frmStartOptions
                             ''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
                             '!!!!!!!!!!!!!!!!!!!!!!!!!!
-                            'EMails = "luxbauer@gmail.com"
+                            'EMails = "al@verag.ag"
                             'EMails_CC = ""
                             'EMails_BCC = ""
                             '!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -7226,9 +7234,18 @@ repeatRequest:
     End Sub
 
     Private Sub Button29_Click_1(sender As Object, e As EventArgs) Handles Button29.Click
-        'Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True)
-        Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7701ACA0024DR0", True)
-        ZA.checkfreshCBAMWarning()
+
+        ' doMailZollbeleg("", "STB", 725002)
+
+        'Dim SND As New VERAG_PROG_ALLGEMEIN.cSendungen(1956266)
+        'Dim list As New List(Of Integer)
+
+        'sendMailZollbeleg("", SND.tblSnd_AuftraggeberKdNr, "STB", list, "4803/26002277A", SND, SND.getKdAtrNr("AUFTRAGGEBER"), "AUFTRAGGEBER")
+
+
+        ''Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7458ACA000YYR2", True)
+        'Dim ZA = VERAG_PROG_ALLGEMEIN.cVERAG_CustomsDeclarations.loadByMRN("26DE7701ACA0024DR0", True)
+        'ZA.checkfreshCBAMWarning()
 
     End Sub
 End Class
\ No newline at end of file