diff --git a/application/Espo/Modules/Crm/Controllers/Email.php b/application/Espo/Controllers/Email.php
similarity index 61%
rename from application/Espo/Modules/Crm/Controllers/Email.php
rename to application/Espo/Controllers/Email.php
index 4d0ef13a4b..29ed750481 100644
--- a/application/Espo/Modules/Crm/Controllers/Email.php
+++ b/application/Espo/Controllers/Email.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Espo\Modules\Crm\Controllers;
+namespace Espo\Controllers;
 
 class Email extends \Espo\Core\Controllers\Record
 {
diff --git a/application/Espo/Modules/Crm/Entities/Email.php b/application/Espo/Entities/Email.php
similarity index 59%
rename from application/Espo/Modules/Crm/Entities/Email.php
rename to application/Espo/Entities/Email.php
index 235c78cb05..0a834b51d5 100644
--- a/application/Espo/Modules/Crm/Entities/Email.php
+++ b/application/Espo/Entities/Email.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Espo\Modules\Crm\Entities;
+namespace Espo\Entities;
 
 class Email extends \Espo\Core\ORM\Entity
 {
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
index c0d7b1ef3d..627af3519e 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Account.json
@@ -85,8 +85,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
index 473db56c7b..7006cff69d 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Call.json
@@ -66,8 +66,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
index 1745742aba..677097df11 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Case.json
@@ -50,8 +50,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
index 69d1f815ef..6ecf62e8c5 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json
@@ -85,8 +85,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
index f9796e7b87..a3d99a4932 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json
@@ -96,8 +96,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
index a3f14a03e4..470097e404 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Meeting.json
@@ -61,8 +61,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
index c70310ca19..432128747f 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Opportunity.json
@@ -55,8 +55,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
index 08f50a84ff..8cbfa88b40 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Prospect.json
@@ -84,8 +84,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
index f9a9098407..b7fdab172d 100644
--- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
@@ -50,8 +50,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Resources/layouts/Email/composeSmall.json b/application/Espo/Resources/layouts/Email/composeSmall.json
new file mode 100644
index 0000000000..fbe031063e
--- /dev/null
+++ b/application/Espo/Resources/layouts/Email/composeSmall.json
@@ -0,0 +1,14 @@
+[
+	{
+		"label":"",
+		"rows":[
+			[{"name":"from"}],
+			[{"name":"to"}],
+			[{"name":"cc"}],
+			[{"name":"bcc"}],
+			[{"name":"name"}],
+			[{"name":"body"}],
+			[{"name":"attachments","type":"attachmentMultiple"}]
+		]
+	}
+]
diff --git a/application/Espo/Resources/layouts/Email/detail.json b/application/Espo/Resources/layouts/Email/detail.json
index 92ad83da4e..ed1b5ed040 100644
--- a/application/Espo/Resources/layouts/Email/detail.json
+++ b/application/Espo/Resources/layouts/Email/detail.json
@@ -2,12 +2,13 @@
 	{
 		"label":"",
 		"rows":[
-			[{"name":"dateSent"},{"name":"parent"}],
+			[{"name":"status"},{"name":"parent"}],
+			[{"name":"dateSent"}, false],
 			[{"name":"from"},{"name":"cc"}],
 			[{"name":"to"},{"name":"bcc"}],
 			[{"name":"name"}],
 			[{"name":"body"}],
-			[{"name":"attachments"}]
+			[{"name":"attachments","type":"attachmentMultiple"}]
 		]
 	}
 ]
diff --git a/application/Espo/Resources/layouts/Email/detailSmall.json b/application/Espo/Resources/layouts/Email/detailSmall.json
index a227161c04..4d715cb306 100644
--- a/application/Espo/Resources/layouts/Email/detailSmall.json
+++ b/application/Espo/Resources/layouts/Email/detailSmall.json
@@ -5,7 +5,8 @@
 			[{"name":"from"}],
 			[{"name":"to"}],
 			[{"name":"name"}],
-			[{"name":"body"}]
+			[{"name":"body"}],
+			[{"name":"attachments","type":"attachmentMultiple"}]
 		]
 	}
 ]
diff --git a/application/Espo/Resources/metadata/entityDefs/Email.json b/application/Espo/Resources/metadata/entityDefs/Email.json
index e3873d8568..20f5bf9a64 100644
--- a/application/Espo/Resources/metadata/entityDefs/Email.json
+++ b/application/Espo/Resources/metadata/entityDefs/Email.json
@@ -36,7 +36,9 @@
             "type": "text"
         },
         "status": {
-            "type": "varchar"
+            "type": "enum",
+            "options": ["Draft", "Sending", "Sent", "Archived"],
+            "readOnly": true
         },
         "attachments": {
             "type": "linkMultiple"
@@ -66,8 +68,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"
diff --git a/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json b/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
index 04ea889860..46c4871770 100644
--- a/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
+++ b/application/Espo/Resources/metadata/entityDefs/EmailTemplate.json
@@ -20,8 +20,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "required": true,
-            "default": "javascript: return {assignedUserId: this.getUser().id, assignedUserName: this.getUser().get(\"name\")};"
+            "required": true
         },
         "teams": {
             "type": "linkMultiple"