diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 78ee23cd08f0faa7a9fdd211c2d710d5f3d2bd10..6df0d2818bc5bec9eb2be54aba96e0f00746f54a 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -135,6 +135,7 @@
     <entityFieldGroup>
       <name>subjectPreview</name>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/subjectpreview/valueProcess.js</valueProcess>
+      <documentation>%aditoprj%/entity/BulkMail_entity/entityfields/subjectpreview/documentation.adoc</documentation>
       <fields>
         <element>SUBJECT</element>
       </fields>
@@ -148,7 +149,6 @@
       <title>Content</title>
       <contentType>HTML</contentType>
       <contentTypeProcess>%aditoprj%/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js</contentTypeProcess>
-      <state>EDITABLE</state>
       <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/content/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/content/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/content/displayValueProcess.js</displayValueProcess>
@@ -258,19 +258,12 @@
       <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
     </entityActionField>
     <entityField>
-      <name>preview</name>
+      <name>contentPreview</name>
       <title>Preview</title>
       <contentType>HTML</contentType>
       <state>INVISIBLE</state>
-      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/preview/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/preview/valueProcess.js</valueProcess>
-    </entityField>
-    <entityField>
-      <name>viewmode_preview</name>
-      <description></description>
-      <contentType>HTML</contentType>
-      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/viewmode_preview/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/viewmode_preview/valueProcess.js</valueProcess>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/contentpreview/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/contentpreview/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>USE_TEMPLATE_ATTACHMENTS</name>
@@ -318,6 +311,9 @@
       <name>BulkMailStatus_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>templateType</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/BulkMail_entity/entityfields/bindata/onValueChange.js b/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
index 524732a96e95b73e360cde2bad90b6170c90dc27..3110c01b0a3433bc3d30fee67f6dab4464a441ba 100644
--- a/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
+++ b/entity/BulkMail_entity/entityfields/bindata/onValueChange.js
@@ -7,8 +7,8 @@ import("Document_lib");
 // --> only set in $field.content.valueProcess if $field.content is null and set it from here only if MASK triggered change
 if(vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
 {
-    [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATE_ID"), new FileUpload(vars.get("$local.value")));
+    var [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$field.DOCUMENTTEMPLATE_ID"), new FileUpload(vars.get("$local.value")));
 
     vars.set("$field.content", content);
-    vars.set("$context.currentTemplateType", type);
+    vars.set("$field.templateType", type);
 }
diff --git a/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js b/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
index 8f43fce9661f887d40adc8465b2cc2dedfe7209d..05b67f21cb66dbeeb47037fc727c4ec9634e72ae 100644
--- a/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/contentTypeProcess.js
@@ -5,6 +5,6 @@ import("Document_lib");
 import("system.vars");
 import("DocumentTemplate_lib");
 
-result.string(vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT
+result.string(vars.get("$field.templateType") == DocumentTemplate.types.TXT
     ? "LONG_TEXT" 
     : "HTML");
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/content/displayValueProcess.js b/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
index 577d092a84b9b39993e248f77556bfce72e91c6d..6c8a26aa3663c80f800d332adce616d7ef728576 100644
--- a/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/displayValueProcess.js
@@ -10,12 +10,12 @@ import("DocumentTemplate_lib");
 // if this was done for every row, like in a lookup, the performance would be very bad
 if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$field.content")) 
 {
-    var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.content")), vars.get("$context.currentTemplateType"), undefined, true)
+    var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.content")), vars.get("$field.templateType"), undefined, true)
     
     var contactId = EmployeeUtils.getCurrentContactId();
     var preview = template.getReplacedContentByContactId(contactId, false, true);
     
-    if (vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT)
+    if (vars.get("$field.templateType") == DocumentTemplate.types.TXT)
         result.string(text.text2html(preview, false));
     else
         result.string(preview);
diff --git a/entity/BulkMail_entity/entityfields/content/stateProcess.js b/entity/BulkMail_entity/entityfields/content/stateProcess.js
index 1debaa69264cc6c3811a17bee2e16a40f1fe368c..24b49f027ede29dea1a30a25c28aee4b839c0a7f 100644
--- a/entity/BulkMail_entity/entityfields/content/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/stateProcess.js
@@ -4,20 +4,9 @@ import("system.neon");
 import("DocumentTemplate_lib");
 
 // in edit mode
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && vars.exists("$context.currentTemplateType") &&
-    (vars.get("$context.currentTemplateType") == DocumentTemplate.types.EML
-      || vars.get("$context.currentTemplateType") == DocumentTemplate.types.HTML)) // TODO: invisible for html as there are problems with images which are removed by the html-editor
-{
-
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
-// in view mode disable, show preview instead: directly after save (in edit view) the state is changed to OPERATINGSTATE_VIEW and this triggers the initionalisation of the html editor (if it is visible)
-// For EML-files or other large files this is very bad, as the editor needs a very long time to initialize
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && vars.get("$field.templateType") == DocumentTemplate.types.EML) // TODO: invisible for html as there are problems with images which are removed by the html-editor
     result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
+else if (vars.get("$field.templateType") == DocumentTemplate.types.EML)
+    result.string(neon.COMPONENTSTATE_READONLY);
 else
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
\ No newline at end of file
+    result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/content/valueProcess.js b/entity/BulkMail_entity/entityfields/content/valueProcess.js
index 6795b3dc6ec622b6b0ae165e6b260d5585ef9ee1..074df4370f872f7db1f6338a65d4f1ae9a2c48f8 100644
--- a/entity/BulkMail_entity/entityfields/content/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/valueProcess.js
@@ -14,12 +14,12 @@ if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$this.
     {
         var content = util.decodeBase64String(template.content);
         var type = template.type;
-        vars.set("$context.currentTemplateType", type);
+        vars.set("$field.templateType", type);
         result.string(content);
     }
 } 
-else if (!vars.get("$field.DOCUMENTTEMPLATE_ID"))
+else if (!vars.get("$field.DOCUMENTTEMPLATE_ID") && vars.get("$this.value") == null)
 {
     result.string("");
-    vars.set("$context.currentTemplateType", "");
+    vars.set("$field.templateType", "");
 }
diff --git a/entity/BulkMail_entity/entityfields/preview/stateProcess.js b/entity/BulkMail_entity/entityfields/contentpreview/stateProcess.js
similarity index 100%
rename from entity/BulkMail_entity/entityfields/preview/stateProcess.js
rename to entity/BulkMail_entity/entityfields/contentpreview/stateProcess.js
diff --git a/entity/BulkMail_entity/entityfields/preview/valueProcess.js b/entity/BulkMail_entity/entityfields/contentpreview/valueProcess.js
similarity index 100%
rename from entity/BulkMail_entity/entityfields/preview/valueProcess.js
rename to entity/BulkMail_entity/entityfields/contentpreview/valueProcess.js
diff --git a/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js b/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js
index 6673df6b950ad89ff126d3665d655f06da0b38d8..5f100fbe60a4fef3b5f793b411562889452f16c1 100644
--- a/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js
+++ b/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js
@@ -10,7 +10,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.re
     // note: could not use only the valueProcess from $field.content because then it refreshed $field.content just before save.
     // --> only set in $field.content.valueProcess if $field.content is null and set it from here only if MASK triggered change
     [content, type] = DocumentTemplateUtils.getTemplateContent(vars.get("$local.value"), new FileUpload(vars.get("$field.bindata")));
-    vars.set("$context.currentTemplateType", type);
+    vars.set("$field.templateType", type);
     vars.set("$field.content", content);
     
     // TODO: load subject without loadTemplate again... maybe return with getTemplateContent() above?
diff --git a/entity/BulkMail_entity/entityfields/subject/valueProcess.js b/entity/BulkMail_entity/entityfields/subject/valueProcess.js
index 757195e1284583889268991bc23255d75d6d21ea..6972d86ddb32164d5a21b2adfd81ccd7d56928d8 100644
--- a/entity/BulkMail_entity/entityfields/subject/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/subject/valueProcess.js
@@ -5,6 +5,10 @@ import("DocumentTemplate_lib");
 import("system.neon");
 import("system.vars");
 
+/* external field changes can be done by:
+ *  - DOCUMENTTEMPLATE_ID.onValueChange
+ */
+
 if (vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var upload = new FileUpload(vars.get("$field.bindata"));
diff --git a/entity/BulkMail_entity/entityfields/subjectpreview/documentation.adoc b/entity/BulkMail_entity/entityfields/subjectpreview/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a845e1eba258a69d45608bfce8d32f705646537d
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/subjectpreview/documentation.adoc
@@ -0,0 +1,5 @@
+= subjectPreview
+
+This FieldGroup uses the field "SUBJECT" and replaces its placeholders with the data of the current user so that the user can see what the result
+will look like in the end. The reason for using a FieldGroup instead of the displayValueProcess of the field itself is to maintain the possibility
+to display the subject without replaced placeholders by putting the field itself on the ViewTemplate.
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/viewmode_preview/stateProcess.js b/entity/BulkMail_entity/entityfields/viewmode_preview/stateProcess.js
deleted file mode 100644
index 7bd814b3e19067118cc2c861ea05b8795a9b6271..0000000000000000000000000000000000000000
--- a/entity/BulkMail_entity/entityfields/viewmode_preview/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
-    result.string(neon.COMPONENTSTATE_EDITABLE);
-}
-else
-{
-    result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/viewmode_preview/valueProcess.js b/entity/BulkMail_entity/entityfields/viewmode_preview/valueProcess.js
deleted file mode 100644
index 03c92562f2268f628be6f866b95376c0ff732191..0000000000000000000000000000000000000000
--- a/entity/BulkMail_entity/entityfields/viewmode_preview/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.content.displayValue"));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
index e8fcb2f9e54fb381889575657f6a15b92d834051..37e06209f5ced2e6afc571ba974360308d52c5dc 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
@@ -9,7 +9,7 @@ import("system.util");
 import("Document_lib");
 import("Bulkmail_lib");
 
-if (vars.get("$context.currentTemplateType") != DocumentTemplate.types.EML)
+if (vars.get("$field.templateType") != DocumentTemplate.types.EML)
     var content = vars.get("$field.content");
 
 var bindata = vars.get("$field.bindata");
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js b/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
index 258fff593db6fdfa4ccdb6698685066edeef7424..99d5ba31c25cd541060d283fd24137f5fae53e18 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js
@@ -9,7 +9,7 @@ import("Document_lib");
 import("Bulkmail_lib");
 
 // eml is not editable
-if (vars.get("$context.currentTemplateType") != DocumentTemplate.types.EML)
+if (vars.get("$field.templateType") != DocumentTemplate.types.EML)
     var content = vars.get("$field.content");
 
 var bindata = vars.get("$field.bindata");
diff --git a/neonView/BulkMailContent_view/BulkMailContent_view.aod b/neonView/BulkMailContent_view/BulkMailContent_view.aod
index dbca131c4af47920c2d315f323b2021346bb2b92..ba5614086a9060c864343e558d20284f0d70387e 100644
--- a/neonView/BulkMailContent_view/BulkMailContent_view.aod
+++ b/neonView/BulkMailContent_view/BulkMailContent_view.aod
@@ -32,13 +32,9 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>af0d45a2-a96f-4031-a93d-62ac177efb43</name>
+          <name>30f0e67c-3965-4506-b924-9d0e2693c2af</name>
           <entityField>content</entityField>
         </entityFieldLink>
-        <entityFieldLink>
-          <name>3843d183-f2ed-4cc3-9202-e2414e0fb594</name>
-          <entityField>viewmode_preview</entityField>
-        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
index 6a053917c6eeafb278cfc55984591831927a20a8..48c0705557962ee3317b30ee2f5ff18bb7c52438 100644
--- a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
+++ b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
@@ -83,8 +83,8 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>cd6a398f-de68-433d-aa67-4f1084ab4971</name>
-          <entityField>preview</entityField>
+          <name>1c1edba7-ad81-4e91-97cc-9017cfda3d31</name>
+          <entityField>contentPreview</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index be29041942077e9bf77bdab7d9937cf4b100d4e1..ee3eb81dd4ededed66d07c1a7c921444e18add54 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -222,7 +222,7 @@ BulkMailUtils.addRecipients = function (pBulkMailId, pContactIds)
  */
 BulkMailUtils.getBulkMailTemplate = function (pBulkMailId, pDocumentTemplateId, pResolveSubtemplates, pUseTemplateAttachments, pUpload)
 {
-    if (pUpload.isFilled() && BulkMailUtils.isValidMimeType(pUpload.mimeType))
+    if (pUpload && pUpload.isFilled() && BulkMailUtils.isValidMimeType(pUpload.mimeType))
         return DocumentTemplate.fromUpload(pUpload);
         
     var bulkTemplate = DocumentTemplate.loadTemplate(pBulkMailId, "BULKMAIL", pResolveSubtemplates);