diff --git a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb
index 79c2ab5c..8e9a062c 100644
--- a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb
+++ b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb
@@ -75,7 +75,9 @@ Public Class EmailFunctions
             Dim oEmailTo = ""
             Dim oSubject = EmailStrings.EMAIL_SUBJECT_REJECTED
             Dim oCreatedWho = "ZUGFeRD Service"
-            Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT, BodyText)
+
+            Dim oMaskedBodyText = BodyText.Replace("'", "''")
+            Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT, oMaskedBodyText)
 
             Dim oEmailAddress = pEmailData.From
             Dim oAttachment = pEmailData.Attachment
diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
index 21f85828..328090ac 100644
--- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -644,6 +644,9 @@ Public Class ImportZUGFeRDFiles
             ' entry needs to be accessed by MoveAndRenameEmailToRejected shortly after
             _firebird.ExecuteNonQueryWithConnection(oSQL, oConnection, Firebird.TransactionMode.WithTransaction)
 
+            ' Close the connection
+            oConnection.Close()
+
             Return True
         Catch ex As Exception
             _logger.Warn("History Entry count not be created for message id [{0}] and md5 [{1}]", MessageId, MD5Checksum)