diff --git a/frappe/core/doctype/bulk_email/bulk_email.json b/frappe/core/doctype/bulk_email/bulk_email.json
deleted file mode 100644
index 7622229816..0000000000
--- a/frappe/core/doctype/bulk_email/bulk_email.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "autoname": "hash", 
- "creation": "2012-08-02 15:17:28", 
- "description": "Bulk Email records.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "System", 
- "fields": [
-  {
-   "fieldname": "sender", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Sender", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "recipient", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Recipient", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "message", 
-   "fieldtype": "Long Text", 
-   "in_list_view": 1, 
-   "label": "Message", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "status", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Status", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "error", 
-   "fieldtype": "Text", 
-   "in_list_view": 1, 
-   "label": "Error", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "ref_doctype", 
-   "fieldtype": "Link", 
-   "label": "Reference DocType", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "reqd": 0
-  }, 
-  {
-   "fieldname": "ref_docname", 
-   "fieldtype": "Data", 
-   "label": "Reference DocName", 
-   "permlevel": 0, 
-   "read_only": 1, 
-   "reqd": 0
-  }
- ], 
- "icon": "icon-envelope", 
- "idx": 1, 
- "in_create": 1, 
- "modified": "2014-06-03 02:22:18.860832", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Bulk Email", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager"
-  }
- ], 
- "read_only": 0
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/email_alert/email_alert.json b/frappe/core/doctype/email_alert/email_alert.json
deleted file mode 100644
index 9d06dd4ced..0000000000
--- a/frappe/core/doctype/email_alert/email_alert.json
+++ /dev/null
@@ -1,152 +0,0 @@
-{
- "autoname": "hash", 
- "creation": "2014-07-11 17:18:09.923399", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "System", 
- "fields": [
-  {
-   "default": "1", 
-   "fieldname": "enabled", 
-   "fieldtype": "Check", 
-   "label": "Enabled", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "filters", 
-   "fieldtype": "Section Break", 
-   "label": "Filters", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "subject", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Subject", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "document_type", 
-   "fieldtype": "Link", 
-   "in_list_view": 1, 
-   "label": "Document Type", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "reqd": 1, 
-   "search_index": 1
-  }, 
-  {
-   "fieldname": "event", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "Send Alert On", 
-   "options": "\nNew\nSave\nSubmit\nCancel\nDate Change\nValue Change", 
-   "permlevel": 0, 
-   "reqd": 1, 
-   "search_index": 1
-  }, 
-  {
-   "depends_on": "eval:doc.event==\"Date Change\"", 
-   "description": "Send alert if date matches this field's value", 
-   "fieldname": "date_changed", 
-   "fieldtype": "Select", 
-   "label": "Date Changed", 
-   "permlevel": 0
-  }, 
-  {
-   "default": "0", 
-   "depends_on": "eval:doc.event==\"Date Change\"", 
-   "description": "[Optional] Send the email X days in advance of the specified date. 0 equals same day.", 
-   "fieldname": "days_in_advance", 
-   "fieldtype": "Int", 
-   "label": "Days in Advance", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "eval:doc.event==\"Value Change\"", 
-   "description": "Send alert if this field's value changes", 
-   "fieldname": "value_changed", 
-   "fieldtype": "Select", 
-   "label": "Value Changed", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "", 
-   "description": "Optional: The alert will be sent if this expression is true", 
-   "fieldname": "condition", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Condition", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "html_7", 
-   "fieldtype": "HTML", 
-   "options": "<p><strong>Condition Examples:</strong></p>\n<pre>doc.status==\"Open\"\ndoc.due_date==nowdate()\ndoc.total > 40000\n</pre>\n<p><strong>Hints:</strong></p>\n<ol>\n<li>To check for an event every day, select \"Date Change\" in Event</li>\n<li>To send an alert if a particular value changes, select \"Value Change\"</li>\n</ol>", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "column_break_5", 
-   "fieldtype": "Section Break", 
-   "label": "Recipients", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "email_alert_recipients", 
-   "fieldtype": "Table", 
-   "label": "Email Alert Recipients", 
-   "options": "Email Alert Recipient", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "message_sb", 
-   "fieldtype": "Section Break", 
-   "label": "Message", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "message", 
-   "fieldtype": "Text", 
-   "label": "Message", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "message_examples", 
-   "fieldtype": "HTML", 
-   "label": "Message Examples", 
-   "options": "<h5>Message Example (Markdown)</h5>\n<pre>Transaction {{ doc.name }} has exceeded Due Date. Please take relevant action\n\n#### Details\n\nCustomer: {{ doc.customer }}\nAmount: {{ doc.total_amount }}</pre>", 
-   "permlevel": 0
-  }
- ], 
- "icon": "icon-envelope", 
- "modified": "2014-07-15 05:07:14.002351", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Email Alert", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "create": 1, 
-   "delete": 1, 
-   "export": 1, 
-   "import": 0, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "write": 1
-  }
- ], 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "subject"
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/email_alert_recipient/email_alert_recipient.json b/frappe/core/doctype/email_alert_recipient/email_alert_recipient.json
deleted file mode 100644
index e2434b1eb8..0000000000
--- a/frappe/core/doctype/email_alert_recipient/email_alert_recipient.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "creation": "2014-07-11 17:19:37.037109", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "fields": [
-  {
-   "description": "Optional: Alert will only be sent if value is a valid email id.", 
-   "fieldname": "email_by_document_field", 
-   "fieldtype": "Select", 
-   "in_list_view": 1, 
-   "label": "Email By Document Field", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "Optional: Always send to these ids. Each email id on a new row", 
-   "fieldname": "cc", 
-   "fieldtype": "Text", 
-   "in_list_view": 1, 
-   "label": "CC", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "Expression, Optional", 
-   "fieldname": "condition", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Condition", 
-   "permlevel": 0
-  }
- ], 
- "istable": 1, 
- "modified": "2014-07-11 17:54:53.298526", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Email Alert Recipient", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "sort_field": "modified", 
- "sort_order": "DESC"
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.json b/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.json
deleted file mode 100644
index 7ae14e6256..0000000000
--- a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
- "allow_copy": 1, 
- "creation": "2014-03-03 19:48:01", 
- "description": "Email Settings for Outgoing and Incoming Emails.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [
-  {
-   "fieldname": "enabled", 
-   "fieldtype": "Check", 
-   "label": "Enabled", 
-   "permlevel": 0
-  }, 
-  {
-   "depends_on": "eval:doc.enabled", 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "label": "Server & Credentials", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "SMTP Server (e.g. smtp.gmail.com)", 
-   "fieldname": "mail_server", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Outgoing Mail Server", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "<a href=\"https://en.wikipedia.org/wiki/Transport_Layer_Security\" target=\"_blank\">[?]</a>", 
-   "fieldname": "use_ssl", 
-   "fieldtype": "Check", 
-   "in_list_view": 1, 
-   "label": "Use TLS", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "If non standard port (e.g. 587)", 
-   "fieldname": "mail_port", 
-   "fieldtype": "Int", 
-   "in_list_view": 1, 
-   "label": "Port", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "cb0", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "Set Login and Password if authentication is required.", 
-   "fieldname": "mail_login", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Login Id", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "Check this if you want to send emails as this id only (in case of restriction by your email provider).", 
-   "fieldname": "always_use_login_id_as_sender", 
-   "fieldtype": "Check", 
-   "label": "Always use above Login Id as sender", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "mail_password", 
-   "fieldtype": "Password", 
-   "label": "Mail Password", 
-   "permlevel": 0
-  }, 
-  {
-   "description": "System generated mails will be sent from this email id.", 
-   "fieldname": "auto_email_id", 
-   "fieldtype": "Data", 
-   "label": "Auto Email Id", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "section_break_15", 
-   "fieldtype": "Section Break", 
-   "label": "Email Footer", 
-   "permlevel": 0
-  }, 
-  {
-   "default": "<div style=\"padding: 7px; text-align: right; color: #888\"><small>Sent via \n\t<a style=\"color: #888\" href=\"http://frappe.io\">Frappe</a></div>", 
-   "fieldname": "footer", 
-   "fieldtype": "Text Editor", 
-   "label": "", 
-   "permlevel": 0, 
-   "reqd": 0
-  }
- ], 
- "icon": "icon-cog", 
- "idx": 1, 
- "in_create": 1, 
- "issingle": 1, 
- "modified": "2014-07-17 08:08:00.483391", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Outgoing Email Settings", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "create": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "role": "System Manager", 
-   "write": 1
-  }
- ]
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/standard_reply/standard_reply.json b/frappe/core/doctype/standard_reply/standard_reply.json
deleted file mode 100644
index bbb7c45546..0000000000
--- a/frappe/core/doctype/standard_reply/standard_reply.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "allow_import": 1, 
- "autoname": "field:subject", 
- "creation": "2014-06-19 05:20:26.331041", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Transaction", 
- "fields": [
-  {
-   "fieldname": "subject", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Subject", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "fieldname": "response", 
-   "fieldtype": "Text Editor", 
-   "in_list_view": 1, 
-   "label": "Response", 
-   "permlevel": 0, 
-   "reqd": 1
-  }, 
-  {
-   "default": "user", 
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "label": "Owner", 
-   "options": "User", 
-   "permlevel": 0
-  }
- ], 
- "icon": "icon-comment", 
- "modified": "2014-06-19 05:45:09.855045", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Standard Reply", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "permlevel": 0, 
-   "read": 1, 
-   "role": "All"
-  }, 
-  {
-   "apply_user_permissions": 1, 
-   "create": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "role": "All", 
-   "write": 1
-  }, 
-  {
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "import": 1, 
-   "permlevel": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "write": 1
-  }
- ], 
- "sort_field": "modified", 
- "sort_order": "DESC"
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/email_alert/__init__.py b/frappe/email/__init__.py
similarity index 100%
rename from frappe/core/doctype/email_alert/__init__.py
rename to frappe/email/__init__.py
diff --git a/frappe/core/doctype/email_alert_recipient/__init__.py b/frappe/email/doctype/__init__.py
similarity index 100%
rename from frappe/core/doctype/email_alert_recipient/__init__.py
rename to frappe/email/doctype/__init__.py
diff --git a/frappe/core/doctype/bulk_email/README.md b/frappe/email/doctype/bulk_email/README.md
similarity index 100%
rename from frappe/core/doctype/bulk_email/README.md
rename to frappe/email/doctype/bulk_email/README.md
diff --git a/frappe/core/doctype/bulk_email/__init__.py b/frappe/email/doctype/bulk_email/__init__.py
similarity index 100%
rename from frappe/core/doctype/bulk_email/__init__.py
rename to frappe/email/doctype/bulk_email/__init__.py
diff --git a/frappe/email/doctype/bulk_email/bulk_email.json b/frappe/email/doctype/bulk_email/bulk_email.json
new file mode 100644
index 0000000000..4e9a3754f2
--- /dev/null
+++ b/frappe/email/doctype/bulk_email/bulk_email.json
@@ -0,0 +1,81 @@
+{
+ "autoname": "hash",
+ "creation": "2012-08-02 15:17:28",
+ "description": "Bulk Email records.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "System",
+ "fields": [
+  {
+   "fieldname": "sender",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Sender",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "recipient",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Recipient",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "message",
+   "fieldtype": "Long Text",
+   "in_list_view": 1,
+   "label": "Message",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Status",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "error",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Error",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "ref_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType",
+   "permlevel": 0,
+   "read_only": 1,
+   "reqd": 0
+  },
+  {
+   "fieldname": "ref_docname",
+   "fieldtype": "Data",
+   "label": "Reference DocName",
+   "permlevel": 0,
+   "read_only": 1,
+   "reqd": 0
+  }
+ ],
+ "icon": "icon-envelope",
+ "idx": 1,
+ "in_create": 1,
+ "modified": "2014-06-03 02:22:18.860834",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Bulk Email",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager"
+  }
+ ],
+ "read_only": 0
+}
diff --git a/frappe/core/doctype/bulk_email/bulk_email.py b/frappe/email/doctype/bulk_email/bulk_email.py
similarity index 100%
rename from frappe/core/doctype/bulk_email/bulk_email.py
rename to frappe/email/doctype/bulk_email/bulk_email.py
diff --git a/frappe/core/doctype/outgoing_email_settings/__init__.py b/frappe/email/doctype/email_alert/__init__.py
similarity index 100%
rename from frappe/core/doctype/outgoing_email_settings/__init__.py
rename to frappe/email/doctype/email_alert/__init__.py
diff --git a/frappe/core/doctype/email_alert/email_alert.js b/frappe/email/doctype/email_alert/email_alert.js
similarity index 100%
rename from frappe/core/doctype/email_alert/email_alert.js
rename to frappe/email/doctype/email_alert/email_alert.js
diff --git a/frappe/email/doctype/email_alert/email_alert.json b/frappe/email/doctype/email_alert/email_alert.json
new file mode 100644
index 0000000000..06bca3b8c3
--- /dev/null
+++ b/frappe/email/doctype/email_alert/email_alert.json
@@ -0,0 +1,152 @@
+{
+ "autoname": "hash",
+ "creation": "2014-07-11 17:18:09.923399",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "System",
+ "fields": [
+  {
+   "default": "1",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "filters",
+   "fieldtype": "Section Break",
+   "label": "Filters",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "subject",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Subject",
+   "permlevel": 0,
+   "reqd": 1
+  },
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "permlevel": 0,
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "fieldname": "event",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Send Alert On",
+   "options": "\nNew\nSave\nSubmit\nCancel\nDate Change\nValue Change",
+   "permlevel": 0,
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "depends_on": "eval:doc.event==\"Date Change\"",
+   "description": "Send alert if date matches this field's value",
+   "fieldname": "date_changed",
+   "fieldtype": "Select",
+   "label": "Date Changed",
+   "permlevel": 0
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.event==\"Date Change\"",
+   "description": "[Optional] Send the email X days in advance of the specified date. 0 equals same day.",
+   "fieldname": "days_in_advance",
+   "fieldtype": "Int",
+   "label": "Days in Advance",
+   "permlevel": 0
+  },
+  {
+   "depends_on": "eval:doc.event==\"Value Change\"",
+   "description": "Send alert if this field's value changes",
+   "fieldname": "value_changed",
+   "fieldtype": "Select",
+   "label": "Value Changed",
+   "permlevel": 0
+  },
+  {
+   "depends_on": "",
+   "description": "Optional: The alert will be sent if this expression is true",
+   "fieldname": "condition",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Condition",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "html_7",
+   "fieldtype": "HTML",
+   "options": "<p><strong>Condition Examples:</strong></p>\n<pre>doc.status==\"Open\"\ndoc.due_date==nowdate()\ndoc.total > 40000\n</pre>\n<p><strong>Hints:</strong></p>\n<ol>\n<li>To check for an event every day, select \"Date Change\" in Event</li>\n<li>To send an alert if a particular value changes, select \"Value Change\"</li>\n</ol>",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "column_break_5",
+   "fieldtype": "Section Break",
+   "label": "Recipients",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "email_alert_recipients",
+   "fieldtype": "Table",
+   "label": "Email Alert Recipients",
+   "options": "Email Alert Recipient",
+   "permlevel": 0,
+   "reqd": 1
+  },
+  {
+   "fieldname": "message_sb",
+   "fieldtype": "Section Break",
+   "label": "Message",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "message",
+   "fieldtype": "Text",
+   "label": "Message",
+   "permlevel": 0,
+   "reqd": 1
+  },
+  {
+   "fieldname": "message_examples",
+   "fieldtype": "HTML",
+   "label": "Message Examples",
+   "options": "<h5>Message Example (Markdown)</h5>\n<pre>Transaction {{ doc.name }} has exceeded Due Date. Please take relevant action\n\n#### Details\n\nCustomer: {{ doc.customer }}\nAmount: {{ doc.total_amount }}</pre>",
+   "permlevel": 0
+  }
+ ],
+ "icon": "icon-envelope",
+ "modified": "2014-07-15 05:07:14.002361",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Email Alert",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "export": 1,
+   "import": 0,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "subject"
+}
diff --git a/frappe/core/doctype/email_alert/email_alert.py b/frappe/email/doctype/email_alert/email_alert.py
similarity index 100%
rename from frappe/core/doctype/email_alert/email_alert.py
rename to frappe/email/doctype/email_alert/email_alert.py
diff --git a/frappe/core/doctype/email_alert/test_email_alert.py b/frappe/email/doctype/email_alert/test_email_alert.py
similarity index 100%
rename from frappe/core/doctype/email_alert/test_email_alert.py
rename to frappe/email/doctype/email_alert/test_email_alert.py
diff --git a/frappe/core/doctype/email_alert/test_records.json b/frappe/email/doctype/email_alert/test_records.json
similarity index 100%
rename from frappe/core/doctype/email_alert/test_records.json
rename to frappe/email/doctype/email_alert/test_records.json
diff --git a/frappe/core/doctype/standard_reply/__init__.py b/frappe/email/doctype/email_alert_recipient/__init__.py
similarity index 100%
rename from frappe/core/doctype/standard_reply/__init__.py
rename to frappe/email/doctype/email_alert_recipient/__init__.py
diff --git a/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json
new file mode 100644
index 0000000000..519228e97e
--- /dev/null
+++ b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.json
@@ -0,0 +1,42 @@
+{
+ "creation": "2014-07-11 17:19:37.037109",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "fields": [
+  {
+   "description": "Optional: Alert will only be sent if value is a valid email id.",
+   "fieldname": "email_by_document_field",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Email By Document Field",
+   "permlevel": 0
+  },
+  {
+   "description": "Optional: Always send to these ids. Each email id on a new row",
+   "fieldname": "cc",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "CC",
+   "permlevel": 0
+  },
+  {
+   "description": "Expression, Optional",
+   "fieldname": "condition",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Condition",
+   "permlevel": 0
+  }
+ ],
+ "istable": 1,
+ "modified": "2014-07-11 17:54:53.298536",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Email Alert Recipient",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
diff --git a/frappe/core/doctype/email_alert_recipient/email_alert_recipient.py b/frappe/email/doctype/email_alert_recipient/email_alert_recipient.py
similarity index 100%
rename from frappe/core/doctype/email_alert_recipient/email_alert_recipient.py
rename to frappe/email/doctype/email_alert_recipient/email_alert_recipient.py
diff --git a/frappe/email/doctype/outgoing_email_settings/__init__.py b/frappe/email/doctype/outgoing_email_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/email/doctype/outgoing_email_settings/outgoing_email_settings.json b/frappe/email/doctype/outgoing_email_settings/outgoing_email_settings.json
new file mode 100644
index 0000000000..717367a977
--- /dev/null
+++ b/frappe/email/doctype/outgoing_email_settings/outgoing_email_settings.json
@@ -0,0 +1,111 @@
+{
+ "allow_copy": 1,
+ "creation": "2014-03-03 19:48:01",
+ "description": "Email Settings for Outgoing and Incoming Emails.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "fields": [
+  {
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled",
+   "permlevel": 0
+  },
+  {
+   "depends_on": "eval:doc.enabled",
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break",
+   "label": "Server & Credentials",
+   "permlevel": 0
+  },
+  {
+   "description": "SMTP Server (e.g. smtp.gmail.com)",
+   "fieldname": "mail_server",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Outgoing Mail Server",
+   "permlevel": 0
+  },
+  {
+   "description": "<a href=\"https://en.wikipedia.org/wiki/Transport_Layer_Security\" target=\"_blank\">[?]</a>",
+   "fieldname": "use_ssl",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Use TLS",
+   "permlevel": 0
+  },
+  {
+   "description": "If non standard port (e.g. 587)",
+   "fieldname": "mail_port",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Port",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "cb0",
+   "fieldtype": "Column Break",
+   "permlevel": 0
+  },
+  {
+   "description": "Set Login and Password if authentication is required.",
+   "fieldname": "mail_login",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Login Id",
+   "permlevel": 0
+  },
+  {
+   "description": "Check this if you want to send emails as this id only (in case of restriction by your email provider).",
+   "fieldname": "always_use_login_id_as_sender",
+   "fieldtype": "Check",
+   "label": "Always use above Login Id as sender",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "mail_password",
+   "fieldtype": "Password",
+   "label": "Mail Password",
+   "permlevel": 0
+  },
+  {
+   "description": "System generated mails will be sent from this email id.",
+   "fieldname": "auto_email_id",
+   "fieldtype": "Data",
+   "label": "Auto Email Id",
+   "permlevel": 0
+  },
+  {
+   "fieldname": "section_break_15",
+   "fieldtype": "Section Break",
+   "label": "Email Footer",
+   "permlevel": 0
+  },
+  {
+   "default": "<div style=\"padding: 7px; text-align: right; color: #888\"><small>Sent via \n\t<a style=\"color: #888\" href=\"http://frappe.io\">Frappe</a></div>",
+   "fieldname": "footer",
+   "fieldtype": "Text Editor",
+   "label": "",
+   "permlevel": 0,
+   "reqd": 0
+  }
+ ],
+ "icon": "icon-cog",
+ "idx": 1,
+ "in_create": 1,
+ "issingle": 1,
+ "modified": "2014-07-17 08:08:00.483392",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Outgoing Email Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "permlevel": 0,
+   "read": 1,
+   "role": "System Manager",
+   "write": 1
+  }
+ ]
+}
diff --git a/frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py b/frappe/email/doctype/outgoing_email_settings/outgoing_email_settings.py
similarity index 100%
rename from frappe/core/doctype/outgoing_email_settings/outgoing_email_settings.py
rename to frappe/email/doctype/outgoing_email_settings/outgoing_email_settings.py
diff --git a/frappe/email/doctype/standard_reply/__init__.py b/frappe/email/doctype/standard_reply/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/email/doctype/standard_reply/standard_reply.json b/frappe/email/doctype/standard_reply/standard_reply.json
new file mode 100644
index 0000000000..75dd11a25f
--- /dev/null
+++ b/frappe/email/doctype/standard_reply/standard_reply.json
@@ -0,0 +1,71 @@
+{
+ "allow_import": 1,
+ "autoname": "field:subject",
+ "creation": "2014-06-19 05:20:26.331041",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
+ "fields": [
+  {
+   "fieldname": "subject",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Subject",
+   "permlevel": 0,
+   "reqd": 1
+  },
+  {
+   "fieldname": "response",
+   "fieldtype": "Text Editor",
+   "in_list_view": 1,
+   "label": "Response",
+   "permlevel": 0,
+   "reqd": 1
+  },
+  {
+   "default": "user",
+   "fieldname": "owner",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Owner",
+   "options": "User",
+   "permlevel": 0
+  }
+ ],
+ "icon": "icon-comment",
+ "modified": "2014-06-19 05:45:09.855046",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Standard Reply",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "permlevel": 0,
+   "read": 1,
+   "role": "All"
+  },
+  {
+   "apply_user_permissions": 1,
+   "create": 1,
+   "permlevel": 0,
+   "read": 1,
+   "role": "All",
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "permlevel": 0,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
diff --git a/frappe/core/doctype/standard_reply/standard_reply.py b/frappe/email/doctype/standard_reply/standard_reply.py
similarity index 100%
rename from frappe/core/doctype/standard_reply/standard_reply.py
rename to frappe/email/doctype/standard_reply/standard_reply.py
diff --git a/frappe/modules.txt b/frappe/modules.txt
index 10dcba3619..910b808a09 100644
--- a/frappe/modules.txt
+++ b/frappe/modules.txt
@@ -1,3 +1,4 @@
 Core
 Website
-Workflow
\ No newline at end of file
+Workflow
+Email
\ No newline at end of file