diff --git a/source/fusiondirectory/configuration/configuration.rst b/source/fusiondirectory/configuration/configuration.rst
index e807fd0c2f35ba594c9fd17932cd990a49fc8f6e..40de82b7bd8a29155f8afe7919c41f1f66be5f0a 100644
--- a/source/fusiondirectory/configuration/configuration.rst
+++ b/source/fusiondirectory/configuration/configuration.rst
@@ -217,3 +217,28 @@ Dashboard expired users
:alt: Image of Dashboard expired users menu in FusionDirectory
* **Number of days**: Number of days before expiration needed for an account to show in the dashboard not expired accounts list.
+
+Mail Template
+^^^^^^^^^^^^^
+
+.. image:: images/configuration-mail-template.png
+ :alt: Image of Mail Template OU configuration within FusionDirectory
+
+* **Mail Template RDN**: Allows the configuration of the proper OU for mail template.
+
+Tasks
+^^^^^
+Click on Tasks tab.
+
+.. image:: images/configuration-tasks-tab.png
+ :alt: TAB menu to be clicked to access Tasks configuration.
+
+.. image:: images/configuration-tasks-rdn.png
+ :alt: Image of Tasks configuration RDN within FusionDirectory
+
+* **Tasks RDN**: Allows the configuration of the proper OU for tasks.
+
+.. image:: images/configuration-tasks-anti-spam.png
+ :alt: Images of Tasks configuration for anti-spam within FusionDirectory
+
+* **Mail Anti-Spam Configuration**: Allows to setup the interval and maximum emails to be sent per process.
diff --git a/source/fusiondirectory/configuration/images/configuration-mail-template.png b/source/fusiondirectory/configuration/images/configuration-mail-template.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c11f74c0c5f5e1dceb0fdbb33c604614bc3c520
Binary files /dev/null and b/source/fusiondirectory/configuration/images/configuration-mail-template.png differ
diff --git a/source/fusiondirectory/configuration/images/configuration-tasks-anti-spam.png b/source/fusiondirectory/configuration/images/configuration-tasks-anti-spam.png
new file mode 100644
index 0000000000000000000000000000000000000000..3015c99130930084b0fc06b66211132466a27624
Binary files /dev/null and b/source/fusiondirectory/configuration/images/configuration-tasks-anti-spam.png differ
diff --git a/source/fusiondirectory/configuration/images/configuration-tasks-rdn.png b/source/fusiondirectory/configuration/images/configuration-tasks-rdn.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aa6e12838a38d6434f31e206d82c32a72bd1455
Binary files /dev/null and b/source/fusiondirectory/configuration/images/configuration-tasks-rdn.png differ
diff --git a/source/fusiondirectory/configuration/images/configuration-tasks-tab.png b/source/fusiondirectory/configuration/images/configuration-tasks-tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ed943872afea9b5a0540e7b244bbfb28734afa
Binary files /dev/null and b/source/fusiondirectory/configuration/images/configuration-tasks-tab.png differ
diff --git a/source/fusiondirectory/core/images/core-mail-template-creation.png b/source/fusiondirectory/core/images/core-mail-template-creation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0e32caa924e0f8c2ad556bf29573c2c6f54bd86
Binary files /dev/null and b/source/fusiondirectory/core/images/core-mail-template-creation.png differ
diff --git a/source/fusiondirectory/core/images/core-mail-template.png b/source/fusiondirectory/core/images/core-mail-template.png
new file mode 100644
index 0000000000000000000000000000000000000000..c448ea0ff3329961d9ae4346f2b50f9e5babd5e6
Binary files /dev/null and b/source/fusiondirectory/core/images/core-mail-template.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-creation-subtasks.png b/source/fusiondirectory/core/images/core-tasks-creation-subtasks.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b92093bdedd20efa41cd20da274d1894ca43538
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-creation-subtasks.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-creation.png b/source/fusiondirectory/core/images/core-tasks-creation.png
new file mode 100644
index 0000000000000000000000000000000000000000..42290c13a91af9ed8621509eb1f582be117b0d33
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-creation.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-dashboard-actions.png b/source/fusiondirectory/core/images/core-tasks-dashboard-actions.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4a8a4d467c5b8e1477719fb89a3ac95f92d40c4
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-dashboard-actions.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-dashboard-filter.png b/source/fusiondirectory/core/images/core-tasks-dashboard-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb32fe0f560ac59d07245d5d10a536e5dc554512
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-dashboard-filter.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-dashboard.png b/source/fusiondirectory/core/images/core-tasks-dashboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dcf7d588269767e94f038b51480ef0baf6005ad
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-dashboard.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-mail-creation-details.png b/source/fusiondirectory/core/images/core-tasks-mail-creation-details.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d7052544288cbb1a27beade568c1f3d31a53e29
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-mail-creation-details.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks-mail-creation.png b/source/fusiondirectory/core/images/core-tasks-mail-creation.png
new file mode 100644
index 0000000000000000000000000000000000000000..792b3da4810bc0e7fc2d7a7a9e9f8d746095f12f
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks-mail-creation.png differ
diff --git a/source/fusiondirectory/core/images/core-tasks.png b/source/fusiondirectory/core/images/core-tasks.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5e905d339763df3b0d8b5a93646a58dd8466db7
Binary files /dev/null and b/source/fusiondirectory/core/images/core-tasks.png differ
diff --git a/source/fusiondirectory/core/index.rst b/source/fusiondirectory/core/index.rst
index 5166464506860371fb3292cbd4628547ab9212c4..2f71c673d299dbb70ea9f86001252616f1d08a1c 100644
--- a/source/fusiondirectory/core/index.rst
+++ b/source/fusiondirectory/core/index.rst
@@ -14,3 +14,6 @@ FusionDirectory Core
aclroles
acls
dashboard
+ mailTemplate
+ tasks
+ tasksDashboard
diff --git a/source/fusiondirectory/core/mailTemplate.rst b/source/fusiondirectory/core/mailTemplate.rst
new file mode 100644
index 0000000000000000000000000000000000000000..a70cd54928e5ac3675921b0885e2ee548d7e556d
--- /dev/null
+++ b/source/fusiondirectory/core/mailTemplate.rst
@@ -0,0 +1,14 @@
+Mail Template
+-------------
+
+This page allows to manage Mail Template objects
+
+.. image:: images/core-mail-template.png
+ :alt: Picture of mail template within FusionDirectory
+
+You can create new e-mail template easily.
+
+.. image:: images/core-mail-template-creation.png
+ :alt: Picture of mail template creation within FusionDirectory
+
+
diff --git a/source/fusiondirectory/core/tasks.rst b/source/fusiondirectory/core/tasks.rst
new file mode 100644
index 0000000000000000000000000000000000000000..903a091e7b67a3abc4172160e53c076f539670e7
--- /dev/null
+++ b/source/fusiondirectory/core/tasks.rst
@@ -0,0 +1,41 @@
+Tasks
+-----
+
+This page allows to manage Tasks objects
+
+.. image:: images/core-tasks.png
+ :alt: Picture of mail template within FusionDirectory
+
+You can create new Tasks easily.
+
+.. image:: images/core-tasks-creation.png
+ :alt: Picture of tasks creation within FusionDirectory
+
+* **Time**: Allows the schedule of the tasks to be timed in Hours:Minutes:Seconds format.
+
+Select the type of tasks available.
+
+.. image:: images/core-tasks-creation-subtasks.png
+ :alt: Picture of tasks - subtasks creation within FusionDirectory
+
+* **Acticate Subtasks**: Allows the creation of subtasks which will be processed by FusionDirectory Orchestrator.
+
+Choose the options for the mail tasks
+
+.. image:: images/core-tasks-mail-creation.png
+ :alt: Picture of tasks mail creation within FusionDirectory
+
+* **Mail Template**: Allows the selection of previsously created mail template.
+* **Members**: Allows the selection of users and groups as well as LDAP filtering options.
+
+.. image:: images/core-tasks-mail-creation-details.png
+ :alt: Picture of tasks mail creation details within FusionDirectory
+
+* **Sender**: Allows to setup the source e-mail address.
+* **Mail Type**: Multiple e-mails attributes exists, it allows the selection of one in particular for selected members.
+
+.. note::
+ * The default "Primary Address" from Mail plugin is being used by default.
+ * If selected members have no e-mails configured for the attribute type selected, e-mails won't be received.
+
+
diff --git a/source/fusiondirectory/core/tasksDashboard.rst b/source/fusiondirectory/core/tasksDashboard.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9d82c6c497f2402d273485511ba519c4338f2c05
--- /dev/null
+++ b/source/fusiondirectory/core/tasksDashboard.rst
@@ -0,0 +1,20 @@
+Tasks Dashboard
+---------------
+
+This page allows a reporting on the status created tasks.
+
+.. image:: images/core-tasks-dashboard.png
+ :alt: Picture of tasks dashboard within FusionDirectory
+
+.. image:: images/core-tasks-dashboard-actions.png
+ :alt: Picture of tasks dashboard within FusionDirectory
+
+* **Actions**: Allows to renew the tasks and reset of its status upon click.
+
+The status of each tasks can be filtered.
+
+.. image:: images/core-tasks-dashboard-filter.png
+ :alt: Picture of tasks dashboard filter within FusionDirectory
+
+
+