diff --git a/Jobs/ZUGFeRD/EmailFunctions.vb b/Jobs/ZUGFeRD/EmailFunctions.vb
index bbf6e7de..c140b192 100644
--- a/Jobs/ZUGFeRD/EmailFunctions.vb
+++ b/Jobs/ZUGFeRD/EmailFunctions.vb
@@ -1,11 +1,12 @@
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Base
+Imports System.Collections.Generic
 Imports System.Data
 Imports System.IO
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Jobs.ImportZUGFeRDFiles
 Imports System.Data.SqlClient
-Imports System.Collections.Generic
-Imports System.Text.RegularExpressions
+Imports FirebirdSql.Data
 
 Namespace ZUGFeRD
     Public Class EmailFunctions
@@ -26,6 +27,7 @@ Namespace ZUGFeRD
         ''' TODO we have no information about the language of the receiver at the moment
         ''' </summary>
         ''' <param name="pMessageId">E-Mail Message ID</param>
+        ''' <param name="pTransaction">DB Transaction</param>
         ''' <param name="pBodyText">Body Text</param>
         ''' <param name="pEmailData">Email Data object</param>
         ''' <param name="pSourceProcedure">Exception Title</param>
@@ -35,7 +37,7 @@ Namespace ZUGFeRD
         ''' <param name="pErrorCode">Error Code</param>
         ''' <param name="pParameter1">Zusätzlicher Parameter 1</param>
         ''' <param name="pParameter2">Zusätzlicher Parameter 2</param>
-        Public Sub AddToEmailQueueMSSQL(pMessageId As String, pBodyText As String, pEmailData As EmailData, pSourceProcedure As String,
+        Public Sub AddToEmailQueueMSSQL(pMessageId As String, pTransaction As SqlTransaction, pBodyText As String, pEmailData As EmailData, pSourceProcedure As String,
                                         pEmailAccountId As Integer, pNamePortal As String, pTemplateId As Integer, pErrorCode As ErrorCode,
                                         pParameter1 As String, pParameter2 As String)
 
@@ -92,7 +94,7 @@ Namespace ZUGFeRD
                 AddToEmailQueueMSSQL(pMessageId, pBodyText, pEmailData, pSourceProcedure, pEmailAccountId, pNamePortal)
             Else
                 _logger.Debug("New rejection mail logic is configured!")
-                AddToEmailQueueMSSQL(pMessageId, pTemplateId, oErrorCode, pEmailAccountId, pParameter1, pParameter2)
+                AddToEmailQueueMSSQL(pMessageId, pTransaction, pTemplateId, oErrorCode, pEmailAccountId, pParameter1, pParameter2)
             End If
 
         End Sub
@@ -103,12 +105,13 @@ Namespace ZUGFeRD
         ''' for sending rejection mail.
         ''' </summary>
         ''' <param name="pMessageId">E-Mail Message ID</param>
+        ''' <param name="pTransaction">DB Transaction</param>
         ''' <param name="pTemplateId">GUID for TBDD_EMAIL_TEMPLATE from config</param>
         ''' <param name="pErrorCode">ErrorID (TBDD_GUI_LANGUAGE_PHRASE)</param>
         ''' <param name="pEmailAccountId">Sending profile from config</param>
         ''' <param name="pParameter1">Zusätzlicher Parameter 1</param>
         ''' <param name="pParameter2">Zusätzlicher Parameter 2</param>
-        Private Sub AddToEmailQueueMSSQL(pMessageId As String, pTemplateId As Integer, pErrorCode As String, pEmailAccountId As Integer,
+        Private Sub AddToEmailQueueMSSQL(pMessageId As String, pTransaction As SqlTransaction, pTemplateId As Integer, pErrorCode As String, pEmailAccountId As Integer,
                                          pParameter1 As String, pParameter2 As String)
 
             If pParameter1.IsNullOrEmpty Then
@@ -133,11 +136,10 @@ Namespace ZUGFeRD
                                     , '{pErrorCode}'
                                     , '{pParameter1}'
                                     , '{pParameter2}'
-                                    , 77 
-                                "
-                If _mssql.ExecuteNonQuery(oExecute) = False Then
-                    _logger.Warn("Could not execute PRDD_SEND_REJECTION_MAIL. See error log!")
-                End If
+                                    , 77"
+
+                _mssql.ExecuteNonQuery(oExecute, pTransaction)
+
             Catch ex As Exception
                 _logger.Error(ex)
             End Try
diff --git a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
index f1650f3b..251bac2f 100644
--- a/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -230,7 +230,7 @@ Public Class ImportZUGFeRDFiles
 
                     Dim oBody = String.Format(EmailStrings.EMAIL_VALIDATION_ERROR, oErrorList)
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "ValidationException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.ValidationException, oErrorListDE, oErrorList)
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "ValidationException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.ValidationException, oErrorListDE, oErrorList)
                     AddRejectedState(oMessageId, "ValidationException", "Die Rechnungsvalidierung ist fehlgeschlagen!", "", oSQLTransaction)
 
                 Catch ex As MD5HashException
@@ -243,7 +243,7 @@ Public Class ImportZUGFeRDFiles
 
                     Dim oBody = String.Format(EmailStrings.EMAIL_MD5_ERROR, ex.FileName)
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MD5HashException, ex.FileName, "")
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "MD5HashException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MD5HashException, ex.FileName, "")
                     AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "", oSQLTransaction)
 
                 Catch ex As UnsupportedFerdException
@@ -256,7 +256,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
                     Dim oBody As String = String.Format(EmailStrings.EMAIL_UNSUPPORTED_DOCUMENT, oEmailData.Subject, ex.XmlFile)
 
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "UnsupportedFerdException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnsupportedFerdException, ex.XmlFile, "")
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnsupportedFerdException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnsupportedFerdException, ex.XmlFile, "")
                     AddRejectedState(oMessageId, "UnsupportedFerdException", "Nicht unterstütztes Datenformat", "", oSQLTransaction)
 
                 Catch ex As InvalidFerdException
@@ -269,7 +269,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
                     Dim oBody = String.Format(EmailStrings.EMAIL_INVALID_DOCUMENT, oEmailData.Subject)
 
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.InvalidFerdException, "", "")
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.InvalidFerdException, "", "")
                     AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "", oSQLTransaction)
 
                 Catch ex As TooMuchFerdsException
@@ -280,7 +280,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
                     Dim oBody = String.Format(EmailStrings.EMAIL_TOO_MUCH_FERDS, oEmailData.Subject)
 
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.TooMuchFerdsException, "", "")
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.TooMuchFerdsException, "", "")
                     AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "", oSQLTransaction)
 
                 Catch ex As NoFerdsException
@@ -291,7 +291,7 @@ Public Class ImportZUGFeRDFiles
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
                     Dim oBody = String.Format(EmailStrings.EMAIL_NO_FERDS, oEmailData.Subject)
 
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.NoFerdsException, "", "")
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.NoFerdsException, "", "")
                     AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "", oSQLTransaction)
 
                 Catch ex As MissingValueException
@@ -311,7 +311,7 @@ Public Class ImportZUGFeRDFiles
 
                     Dim oBody = _email.CreateBodyForMissingProperties(ex.File.Name, ex.MissingProperties)
                     Dim oEmailData = _file.MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MissingValueException, ex.File.Name, oMissingFieldList)
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "MissingValueException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.MissingValueException, ex.File.Name, oMissingFieldList)
                     AddRejectedState(oMessageId, "MissingValueException", "Es fehlten ZugferdSpezifikationen", oMessage, oSQLTransaction)
 
                 Catch ex As FileSizeLimitReachedException
@@ -329,7 +329,7 @@ Public Class ImportZUGFeRDFiles
 
                     Dim oBody = String.Format(EmailStrings.EMAIL_FILE_SIZE_REACHED, oArgs.MaxAttachmentSizeInMegaBytes, oFileWithoutMessageId)
 
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "FileSizeLimitReachedException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.FileSizeLimitReachedException, oArgs.MaxAttachmentSizeInMegaBytes, oFileWithoutMessageId)
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "FileSizeLimitReachedException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.FileSizeLimitReachedException, oArgs.MaxAttachmentSizeInMegaBytes, oFileWithoutMessageId)
                     AddRejectedState(oMessageId, "FileSizeLimitReachedException", "Erlaubte Dateigröße überschritten", "", oSQLTransaction)
 
 
@@ -348,7 +348,7 @@ Public Class ImportZUGFeRDFiles
                         .From = oArgs.ExceptionEmailAddress,
                         .Subject = $"OutOfMemoryException im ZUGFeRD-Parser @ {oMessageId}"
                     }
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "OutOfMemoryException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "OutOfMemoryException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
                     ' Rollback Transaction
                     oSQLTransaction.Rollback()
@@ -367,7 +367,7 @@ Public Class ImportZUGFeRDFiles
                         .From = oArgs.ExceptionEmailAddress,
                         .Subject = $"UnhandledException im ZUGFeRD-Parser @ {oMessageId}"
                     }
-                    _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
+                    _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "UnhandledException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
                     ' Rollback Transaction
                     oSQLTransaction.Rollback()
@@ -393,7 +393,7 @@ Public Class ImportZUGFeRDFiles
                             .From = oArgs.ExceptionEmailAddress,
                             .Subject = $"FileMoveException im ZUGFeRD-Parser @ {oMessageId}"
                         }
-                        _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "FileMoveException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
+                        _email.AddToEmailQueueMSSQL(oMessageId, oSQLTransaction, oBody, oEmailData, "FileMoveException", _EmailOutAccountId, oArgs.NamePortal, oArgs.RejectionTemplateId, ErrorCode.UnhandledException, ex.Message, ex.StackTrace)
 
                         _logger.Warn("Could not move files!")
                         _logger.Error(ex)