diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 6df0d2818bc5bec9eb2be54aba96e0f00746f54a..7a97ceae09bb5587ba82799ac0c0478eefbdc86e 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -313,6 +313,10 @@
     </entityParameter>
     <entityField>
       <name>templateType</name>
+      <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templatetype/valueProcess.js</valueProcess>
+    </entityField>
+    <entityField>
+      <name>templateData</name>
     </entityField>
   </entityFields>
   <recordContainers>
diff --git a/entity/BulkMail_entity/entityfields/bindata/onValidation.js b/entity/BulkMail_entity/entityfields/bindata/onValidation.js
index 3bcd60e91c840a9fdf2052bbb73bf19a60523040..cd3a3b03df75022cd69d139263d38c4d27fa5006 100644
--- a/entity/BulkMail_entity/entityfields/bindata/onValidation.js
+++ b/entity/BulkMail_entity/entityfields/bindata/onValidation.js
@@ -1,15 +1,13 @@
-//import("system.translate");
-//import("Bulkmail_lib");
-//import("system.result");
-//import("system.vars");
-//import("Document_lib");
-//
-//var bindata = vars.get("$local.value");
-//if (bindata)
-//{
-//    let mimeType = DocumentUtil.getMimeTypeFromUpload(bindata);
-//    if (!BulkMailUtils.isValidMimeType(mimeType))
-//        result.string(translate.text("Invalid file type"));
-//}
+import("system.translate");
+import("Bulkmail_lib");
+import("system.result");
+import("system.vars");
+import("Document_lib");
 
-//TODO: this should be validated with the code above, waiting for ticket #1042587
\ No newline at end of file
+var bindata = vars.get("$local.value");
+if (bindata)
+{
+    let mimeType = DocumentUtil.getMimeTypeFromUpload(bindata);
+    if (!BulkMailUtils.isValidMimeType(mimeType))
+        result.string(translate.text("Invalid file type; only .html, .eml and .txt are allowed"));
+}