diff --git a/entity/Activity_entity/entityfields/newmail/onActionProcess.js b/entity/Activity_entity/entityfields/newmail/onActionProcess.js
index d1dda2c1816758ec3d2da559142a9a3f78a52cae..7cb92215131675b593322198cd6fdb3c50481cee 100644
--- a/entity/Activity_entity/entityfields/newmail/onActionProcess.js
+++ b/entity/Activity_entity/entityfields/newmail/onActionProcess.js
@@ -2,11 +2,14 @@ import("system.logging");
 import("system.db");
 import("system.vars");
 import("system.neon");
+import("KeywordRegistry_basic");
 
-var params = {};
-//var doctempIds = db.table("select DOCUMENTTEMPLATEID from DOCUMENTTEMPLATE");
-//logging.log(vars.getString(doctempIds));
-//params["XY_param"] = "Mail";
 
-neon.openContext("DocumentTemplate_context", "DocumentTemplateFilter_view", null, neon.OPERATINGSTATE_VIEW, null);
+var params = {
+    "DocumentTemplateType_param" : $KeywordRegistry.documentTemplateType$mail()
+}
+
+//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, neon.OPERATINGSTATE_SEARCH, params);
+//neon.openContext("DocumentTemplate", "DocumentTemplateFilterSmall_view", null, null, null, params);
+neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_SEARCH, params);
 
diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
index 6b91f9a2afb53b502307fd209976d444ee32a0f1..ca1705e355c1a2199a9f6ef5ffe027958db1a83f 100644
--- a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -4,9 +4,17 @@ import("system.neon");
 import("Entity_lib");
 import("Document_lib");
 
-var uploadValue = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.BINDATA"));
+var uploadValue = DocumentUtil.getFilenameFromUpload(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.BINDATA")));
+
+logging.log(uploadValue.length)
 
 if(!(vars.get("$field.NAME") != null && vars.get("$field.NAME") != ""))
 {
-    neon.setFieldValue("$field.NAME", DocumentUtil.getFilenameFromUpload(uploadValue));
+    if(uploadValue.length <= 40)
+    {
+        neon.setFieldValue("$field.NAME", uploadValue);
+    }else{
+        var limit = uploadValue.length - 40;
+        neon.setFieldValue("$field.NAME", uploadValue.substr(0, uploadValue.length - limit));
+    }
 }
\ No newline at end of file
diff --git a/neonContext/DocumentTemplate/DocumentTemplate.aod b/neonContext/DocumentTemplate/DocumentTemplate.aod
index 76dce7e98eeb983f9196fcb0ea09b9fa7a83e103..7d1f11e305160657b6ecacb03bbea81bdba47b90 100644
--- a/neonContext/DocumentTemplate/DocumentTemplate.aod
+++ b/neonContext/DocumentTemplate/DocumentTemplate.aod
@@ -7,6 +7,7 @@
   <filterview>DocumentTemplateFilter_view</filterview>
   <editview>DocumentTemplateEdit_view</editview>
   <preview>DocumentTemplatePreview_view</preview>
+  <lookupview>DocumentTemplateFilterSmall_view</lookupview>
   <entity>DocumentTemplate_entity</entity>
   <references>
     <neonViewReference>
@@ -21,5 +22,9 @@
       <name>c67fc6df-2511-4ddf-8638-cec8591fc9dc</name>
       <view>DocumentTemplatePreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>df9dab28-502c-41c2-8a8f-1c0745ca14dd</name>
+      <view>DocumentTemplateFilterSmall_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod b/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3626b2055112bb805d70d6f31deccdaf1ef7507a
--- /dev/null
+++ b/neonView/DocumentTemplateFilterSmall_view/DocumentTemplateFilterSmall_view.aod
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+  <name>DocumentTemplateFilterSmall_view</name>
+  <title>Document Template</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <filterable v="true" />
+  <isSmall v="true" />
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Search</name>
+      <entityField>#ENTITY</entityField>
+      <title>Document Template</title>
+      <columns>
+        <neonTableColumn>
+          <name>4d73c680-ebf6-4225-a6b3-d30ad0082ef4</name>
+          <entityField>NAME</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>cd4067b5-befe-459a-8a41-043eb884caff</name>
+          <entityField>LANGUAGE</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>
diff --git a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
index b1c08fa3d53364386d9138fe1e49537c347176f8..b6941e3e8c501b561dedf964d433853998f9054b 100644
--- a/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
+++ b/neonView/DocumentTemplateFilter_view/DocumentTemplateFilter_view.aod
@@ -5,6 +5,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <icon>VAADIN:FILE_FONT</icon>
   <filterable v="true" />
+  <isSmall v="false" />
   <layout>
     <boxLayout>
       <name>layout</name>