diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb
index 333056fd..7c129a12 100644
--- a/EnvelopeGenerator.Common/Entities/EmailData.vb
+++ b/EnvelopeGenerator.Common/Entities/EmailData.vb
@@ -12,6 +12,7 @@ Public Class EmailData
     Public Property SenderAdress As String
     Public Property SignatureLink As String
     Public Property Message As String
+    Public Property EnvelopeTitle As String
 
     Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver)
         EmailAdress = pReceiver.Email
@@ -22,6 +23,7 @@ Public Class EmailData
         ReceiverName = pReceiver.Name
         SenderAdress = pEnvelope.User.Email
         SenderName = pEnvelope.User.FullName
+        EnvelopeTitle = pEnvelope.Title
     End Sub
 
     Public Sub New()
diff --git a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
index b0eabe8e..c1c7668c 100644
--- a/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
+++ b/EnvelopeGenerator.Common/Entities/EmailTemplate.vb
@@ -23,9 +23,9 @@ Public Class EmailTemplate
     End Sub
 
     Private Sub InitSubjectTemplates()
-        _DocumentReceivedSubjectTemplate = "Dokument zur Unterschrift erhalten: '<DOCUMENT_TITLE>'"
+        _DocumentReceivedSubjectTemplate = "Dokument erhalten: '<DOCUMENT_TITLE>'"
         _DocumentSignedSubjectTemplate = "Dokument unterschrieben: '<DOCUMENT_TITLE>'"
-        _DocumentDeletedSubjectTemplate = "Dokument zurueckgezogen: '<DOCUMENT_TITLE>'"
+        _DocumentDeletedSubjectTemplate = "Dokument zurückgezogen: '<DOCUMENT_TITLE>'"
         _DocumentCompletedSubjectTemplate = "Dokument abgeschlossen: '<DOCUMENT_TITLE>'"
     End Sub
 
@@ -64,9 +64,10 @@ Public Class EmailTemplate
         _DocumentCompletedBodyTemplate = New List(Of String) From {
             "Guten Tag, <NAME_RECEIVER>",
             "",
-            "Das Dokument <DOCUMENT_TITLE> wurde von allen Beteiligten unterschrieben.",
+            "Der Signaturvorgang <DOCUMENT_TITLE> wurde erfolgreich abgeschlossen.",
+            "Sie erhalten das Dokument mit einem detaillierten Ergebnisbericht als Anhang zu dieser Email.",
             "",
-            "Mit freundlichen Grüßen",
+            "Vielen Dank für die Nutzung von",
             "<NAME_PORTAL>"
         }
     End Sub
@@ -79,7 +80,7 @@ Public Class EmailTemplate
             {"<SIGNATURE_TYPE>", "signieren"},
             {"<LINK_TO_DOCUMENT>", pEmailData.SignatureLink},
             {"<LINK_TO_DOCUMENT_TEXT>", $"{pEmailData.SignatureLink.Truncate(40)}.."},
-            {"<DOCUMENT_TITLE>", pEmailData.EmailSubject},
+            {"<DOCUMENT_TITLE>", pEmailData.EnvelopeTitle},
             {"<MESSAGE>", pEmailData.Message}
         }
     End Sub
@@ -90,36 +91,38 @@ Public Class EmailTemplate
 
     Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData)
         FillEmailBody(pEmailData, _DocumentDeletedBodyTemplate)
+        FillEmailSubject(pEmailData, _DocumentDeletedSubjectTemplate)
     End Sub
 
     Public Sub FillDocumentSignedEmailBody(pEmailData As EmailData)
         FillEmailBody(pEmailData, _DocumentSignedBodyTemplate)
+        FillEmailSubject(pEmailData, _DocumentSignedSubjectTemplate)
     End Sub
 
     Public Sub FillDocumentCompletedEmailBody(pEmailData As EmailData)
         FillEmailBody(pEmailData, _DocumentCompletedBodyTemplate)
+        FillEmailSubject(pEmailData, _DocumentCompletedSubjectTemplate)
     End Sub
 
     Public Sub FillEmailSubject(pEmailData As EmailData, pTemplate As String)
         InitDictionary(pEmailData)
 
-        Dim resultSubject As String = pTemplate
+        Dim oSubject As String = pTemplate
 
         For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
-            If resultSubject.Contains(dictItem.Key) Then
-                resultSubject = resultSubject.Replace(dictItem.Key, dictItem.Value)
+            If oSubject.Contains(dictItem.Key) Then
+                oSubject = oSubject.Replace(dictItem.Key, dictItem.Value)
 
             End If
         Next
 
-
+        pEmailData.EmailSubject = oSubject
     End Sub
 
     Public Sub FillEmailBody(pEmailData As EmailData, pTemplate As List(Of String))
-
         InitDictionary(pEmailData)
 
-        Dim resultBody As String = ""
+        Dim oBody As String = ""
 
         For Each lineItem As String In pTemplate
             Dim oLineValue As String = lineItem
@@ -129,10 +132,9 @@ Public Class EmailTemplate
 
                 End If
             Next
-            resultBody += oLineValue + "<br/>"
+            oBody += oLineValue + "<br/>"
         Next
 
-        pEmailData.EmailBody = resultBody
-
+        pEmailData.EmailBody = oBody
     End Sub
 End Class