diff --git a/application/Espo/Controllers/EmailAddress.php b/application/Espo/Controllers/EmailAddress.php
new file mode 100644
index 0000000000..01a51386cb
--- /dev/null
+++ b/application/Espo/Controllers/EmailAddress.php
@@ -0,0 +1,28 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ ************************************************************************/ 
+
+namespace Espo\Controllers;
+
+class EmailAddress extends \Espo\Core\Controllers\Record
+{
+
+}
diff --git a/application/Espo/Core/Acl.php b/application/Espo/Core/Acl.php
index ffe405597a..8f7589a548 100644
--- a/application/Espo/Core/Acl.php
+++ b/application/Espo/Core/Acl.php
@@ -212,6 +212,11 @@ class Acl
 			'edit' => 'own',
 			'delete' => 'own',					
 		);
+		$this->data['EmailAddress'] = array(
+			'read' => 'all',
+			'edit' => 'no',
+			'delete' => 'no',					
+		);
 	}
 
 	private function merge($tables)
diff --git a/application/Espo/Core/defaults/layout/filters.json b/application/Espo/Core/defaults/layout/filters.json
index bd826d24c2..fe51488c70 100644
--- a/application/Espo/Core/defaults/layout/filters.json
+++ b/application/Espo/Core/defaults/layout/filters.json
@@ -1 +1 @@
-["name"]
+[]
diff --git a/application/Espo/Core/defaults/layout/filtersAdvanced.json b/application/Espo/Core/defaults/layout/filtersAdvanced.json
deleted file mode 100644
index bd826d24c2..0000000000
--- a/application/Espo/Core/defaults/layout/filtersAdvanced.json
+++ /dev/null
@@ -1 +0,0 @@
-["name"]
diff --git a/application/Espo/Resources/i18n/en_US/Email.json b/application/Espo/Resources/i18n/en_US/Email.json
index 0b7843d048..61ca9691cc 100644
--- a/application/Espo/Resources/i18n/en_US/Email.json
+++ b/application/Espo/Resources/i18n/en_US/Email.json
@@ -12,7 +12,9 @@
 		"body": "Body",
 		"subject": "Subject",
 		"attachments": "Attachments",
-		"selectTemplate": "Select Template"
+		"selectTemplate": "Select Template",
+		"fromEmailAddress": "Email From",
+		"toEmailAddresses": "Email To"
 	},
 	"links": {
 	},
diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json
index 1b45f2d7ae..54e6997706 100644
--- a/application/Espo/Resources/i18n/en_US/Global.json
+++ b/application/Espo/Resources/i18n/en_US/Global.json
@@ -6,6 +6,7 @@
 		"Role": "Role",
 		"EmailTemplate": "Email Template",
 		"OutboundEmail": "Outbound Email",
+		"EmailAddress": "Email Address",
 		"ScheduledJob": "Scheduled Job"
 	},
 	"scopeNamesPlural": {
@@ -15,7 +16,8 @@
 		"Role": "Roles",
 		"EmailTemplate": "Email Templates",
 		"OutboundEmail": "Outbound Emails",
-		"ScheduledJob": "Scheduled Jobs"
+		"ScheduledJob": "Scheduled Jobs",
+		"EmailAddress": "Email Addresses"
 	},
 	"labels": {
 		"Merge": "Merge",
diff --git a/application/Espo/Resources/layouts/Email/filters.json b/application/Espo/Resources/layouts/Email/filters.json
index 3eeea3ff19..38ff90849e 100644
--- a/application/Espo/Resources/layouts/Email/filters.json
+++ b/application/Espo/Resources/layouts/Email/filters.json
@@ -2,5 +2,6 @@
 	"dateSent",
 	"parent",
 	"body",
-	"from"
+	"fromEmailAddress",
+	"toEmailAddresses"
 ]
diff --git a/application/Espo/Resources/metadata/clientDefs/EmailAddress.json b/application/Espo/Resources/metadata/clientDefs/EmailAddress.json
new file mode 100644
index 0000000000..1bd5d759c5
--- /dev/null
+++ b/application/Espo/Resources/metadata/clientDefs/EmailAddress.json
@@ -0,0 +1,3 @@
+{
+	"controller": "Controllers.Record"
+}
diff --git a/application/Espo/Resources/metadata/entityDefs/Email.json b/application/Espo/Resources/metadata/entityDefs/Email.json
index a3cea09e75..02d0ce7217 100644
--- a/application/Espo/Resources/metadata/entityDefs/Email.json
+++ b/application/Espo/Resources/metadata/entityDefs/Email.json
@@ -16,7 +16,13 @@
             "type": "varchar",
             "db": false,
             "required": true
-        },        
+        }, 
+        "fromEmailAddress": {
+            "type": "link"
+        },
+        "toEmailAddresses": {
+            "type": "linkMultiple"
+        }, 
         "to": {
             "type": "varchar",
             "db": false,