diff --git a/erpnext/docs/assets/img/setup/email/email-actions.png b/erpnext/docs/assets/img/setup/email/email-actions.png
new file mode 100644
index 00000000000..eab88c646ad
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-actions.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-domain.png b/erpnext/docs/assets/img/setup/email/email-domain.png
new file mode 100644
index 00000000000..cae8fb2cea8
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-domain.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-folders.png b/erpnext/docs/assets/img/setup/email/email-folders.png
new file mode 100644
index 00000000000..68c823b0260
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-folders.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-inbox.png b/erpnext/docs/assets/img/setup/email/email-inbox.png
new file mode 100644
index 00000000000..486f76afc10
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-inbox.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-password.png b/erpnext/docs/assets/img/setup/email/email-password.png
new file mode 100644
index 00000000000..7c1edf7a10b
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-password.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-service.png b/erpnext/docs/assets/img/setup/email/email-service.png
new file mode 100644
index 00000000000..b63ff4e0ece
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-service.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-user-link.png b/erpnext/docs/assets/img/setup/email/email-user-link.png
new file mode 100644
index 00000000000..64f88d48fce
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-user-link.png differ
diff --git a/erpnext/docs/assets/img/setup/email/email-user.png b/erpnext/docs/assets/img/setup/email/email-user.png
new file mode 100644
index 00000000000..54b85a67c70
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/email-user.png differ
diff --git a/erpnext/docs/assets/img/setup/email/make-from-email.png b/erpnext/docs/assets/img/setup/email/make-from-email.png
new file mode 100644
index 00000000000..c7c35fb238f
Binary files /dev/null and b/erpnext/docs/assets/img/setup/email/make-from-email.png differ
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
new file mode 100644
index 00000000000..d098d0c2243
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
@@ -0,0 +1,86 @@
+# Email Inbox
+
+Business involves many transactional emails exchanges with parties like Customers and Suppliers, and within a company. Email Inbox feature allows you pull all your business emails into your ERPNext account. Accessing all the business emails with other transactions details makes ERPNext a single platform for accessing complete business information in one place.
+
+In ERPNext, you can configure Email Inbox for each System User. Following are the detailed steps to configure Email Inbox for a User.
+
+#### Step 1: Create User
+
+As mentioned above, you can configure Email Inbox for a System User only. Hence ensure that you have added yourself and your colleagues as a User and assigned them required permissions.
+
+To add new User, go to:
+
+`Setup > User > New User`
+
+
+
+#### Step 2: Create Email Domain
+
+To be able to send and receive emails into your ERPNext from other email service (like WebMail or Gmail), you should setup an Email Domain master. In this master, email gateway details like SMTP Address, Port No., IMAP/POP3 address details are captured. If you have ever configured a local email client (like Outlook), Email Domain master requires details to be fed in the similar way.
+
+To add new Email Domain, go to:
+
+`Setup > Emails > Email Domain > New`
+
+
+
+Once you have configured an Email Domain for your Email Service, it will be used for creating Email Accounts for all the Users in your ERPNext account.
+
+
+
+In the Email Account, select Email Domain only if you are using Email Service other than Email Services listed above. Else, you can just select Email Service, leave Email Domain blank and proceed forward.
+
+
+
+>If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank.
+
+For more details on how to setup Email Account, [click here]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html").
+
+#### Step 4: Linking Email Account in User master
+
+Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account.
+
+
+
+## Email Inbox
+
+If you have correctly configured Email Inbox as instructed above, then on the login of a User, Email Inbox icon will be visible. This will navigate user to Email Inbox view within the ERPNext account. All the Emails received on that email will be fetch and listed in the Email Inbox view. User will be able to open emails and take various actions against it.
+
+
+
+#### Folders
+
+In ERPNext, you can link multiple Email Accounts with the single User. To switch to Inbox of different email account and access other folders like Sent Emails, Spam, Trash, check Email Inbox option in the left bar.
+
+
+
+#### Actions
+
+On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash.
+
+
+
+#### Make Options
+
+The Email Inbox within ERPNext also allow you to quickly create ERPNext transaction based on email received. From an Email itself, you can a Issue, Lead or Opportunity based on the context of the email.
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
index 7ca1b942242..778fc812e37 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt
@@ -1,4 +1,5 @@
email-account
+email-inbox
email-alerts
email-digest
email-reports