diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index ea3b4e898599c3ed856f256d7d9d629d78b7bafc..c7e6b94645dc0d668cc1fadfa90a9a20140afdf3 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -352,6 +352,7 @@
     </entityConsumer>
     <entityConsumer>
       <name>BulkMailTestRecipients</name>
+      <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js</stateProcess>
       <dependency>
         <name>dependency</name>
         <entityName>BulkMailTestRecipient_entity</entityName>
diff --git a/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js b/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e2b38fa2ad190ab5224e7a614c678073f0f5093
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/bulkmailtestrecipients/stateProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Bulkmail_lib");
+import("system.result");
+import("system.neon");
+
+if (BulkMailUtils.isStatusSendingOrSent(vars.get("$field.STATUS")))
+    result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js b/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
index 72e22f0a52f1d6439b67df5abc59a66280df8fd4..a4bf6a669269a2e2309090f21ac1975f35021774 100644
--- a/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/createactivities/valueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.result");
 
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string("1");
\ No newline at end of file
+    result.string("0");
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/url/stateProcess.js b/entity/Weblink_entity/entityfields/url/stateProcess.js
index bf56cc956c9ee7f08f53f30d9f1991838154bffc..d20b8d2ca5be994c533a30296e168cc01a62a9e2 100644
--- a/entity/Weblink_entity/entityfields/url/stateProcess.js
+++ b/entity/Weblink_entity/entityfields/url/stateProcess.js
@@ -1,8 +1,9 @@
 import("system.neon");
 import("system.result");
 import("system.vars");
+import("KeywordRegistry_basic");
 
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$field.LINKTYPE") == $KeywordRegistry.weblinkType$EMail())
     result.string(neon.COMPONENTSTATE_EDITABLE)
 else
     result.string(neon.COMPONENTSTATE_READONLY)
\ No newline at end of file
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index 82edef3461108d64ecf2d010d1fc81e8b11ed35f..dfe012e30433e54ef325cdb8f1c4f5df0b2f7286 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -9,15 +9,20 @@
     </masterSlaveLayout>
   </layout>
   <children>
+    <neonViewReference>
+      <name>3222ace8-c6d6-4dab-ada1-1f50b983e7e7</name>
+      <entityField>#ENTITY</entityField>
+      <view>BulkMailContent_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>8be4ed02-1c54-41d0-9bba-3b785346a550</name>
       <entityField>Recipients</entityField>
       <view>BulkMailRecipientFilter_view</view>
     </neonViewReference>
     <neonViewReference>
-      <name>3222ace8-c6d6-4dab-ada1-1f50b983e7e7</name>
-      <entityField>#ENTITY</entityField>
-      <view>BulkMailContent_view</view>
+      <name>f78d044a-6246-49c0-a72c-03f54fc90fd2</name>
+      <entityField>BulkMailTestRecipients</entityField>
+      <view>BulkMailTestRecipientFilter_view</view>
     </neonViewReference>
     <neonViewReference>
       <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
@@ -29,11 +34,6 @@
       <entityField>MailLogs</entityField>
       <view>MailLogFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>f78d044a-6246-49c0-a72c-03f54fc90fd2</name>
-      <entityField>BulkMailTestRecipients</entityField>
-      <view>BulkMailTestRecipientFilter_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>bd3876a9-492e-4e2e-bcca-e86455475dca</name>
       <entityField>Clicks</entityField>