diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index a967c20f616cda692961673640b24527c3eefe9c..b4956b36573f48cecee456967cba0759a03538e5 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -113,6 +113,7 @@
     </entityConsumer>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/onValueChange.js</onValueChange>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 1c0cd341fd59b80470893b5820243eb195a50997..78e2c87c878736774a82461cb78f50f04c1412fb 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -65,6 +65,7 @@
     </entityParameter>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
     </entityField>
     <entityActionField>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index d4a202aae2cb46f690bbdb8b56f857d56c92005d..97fe0b3fe0f8b3941814784df8d37edfe24a932c 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -38,6 +38,7 @@
     </entityParameter>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
     </entityField>
     <entityActionField>
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index c5508c8d60e7373f2ef0230f50d3aba3221defac..ea1946f6742ef1667bab4bb32df0a0024cae77c3 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -95,6 +95,7 @@
     </entityConsumer>
     <entityField>
       <name>bindata</name>
+      <title>Custom template</title>
       <contentType>FILE</contentType>
     </entityField>
     <entityField>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d6cdf3c96e51fcc05e67a251fd33e7daf89462ac..fe5a2b04ac5ca103c83313e02187862056887b33 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -77,6 +77,10 @@
       <key>Long string value</key>
       <value>Langer String-Wert</value>
     </entry>
+    <entry>
+      <key>Custom template</key>
+      <value>Benutzerdefinierte Vorlage</value>
+    </entry>
     <entry>
       <key>Attribute groups can't be selected</key>
       <value>Eigenschafsgruppen können nicht verwendet werden</value>
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 64ac00725286dd7d5d051590a44b5c06d0ff4ad2..4354a818371839035a9a6140cb0362c8d119b1c6 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -107,13 +107,8 @@ Email.fromRFC = function (pBase64RFC)
 Email.fromTemplate = function (pTemplateId, pContactId, pBindata)
 {
     var template;
-    if (pBindata && pBindata.isFilled())
-    {
-        if (BulkMailUtils.isValidMimeType(pBindata.mimeType))
-        {
-            template = new DocumentTemplate(pBindata.bindata, DocumentTemplate.types.fromMimeType(pBindata.mimeType), pBindata.filename, true);
-        }
-    }
+    if (pBindata && pBindata.isFilled() && BulkMailUtils.isValidMimeType(pBindata.mimeType))
+        template = new DocumentTemplate(pBindata.bindata, DocumentTemplate.types.fromMimeType(pBindata.mimeType), pBindata.filename, true);
     else
         template = DocumentTemplate.loadTemplate(pTemplateId);
         
@@ -210,6 +205,9 @@ Email.prototype._newMailObject = function()
         mail.clearRecipients(mailId, mail.RECIPIENT_BCC);
     }
     
+    if (this.sender)
+        mail.setSender(mailId, this.sender);
+        
     if (this.toRecipients.length)
         mail.addRecipients(mailId, mail.RECIPIENT_TO, this.toRecipients);