diff --git a/HISTORY.rst b/HISTORY.rst
index 01a6085c52..3e887b73be 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,7 +1,7 @@
 2.5 (2017-07-XX)
 ===============
 - Add view to download a document's OCR text. GitLab #215
-
+- Add user configurable mailer. GitLab #286.
 
 2.4 (2017-06-23)
 ================
diff --git a/docs/releases/2.5.rst b/docs/releases/2.5.rst
index 3ae51f6364..06f7d01956 100644
--- a/docs/releases/2.5.rst
+++ b/docs/releases/2.5.rst
@@ -23,7 +23,7 @@ Other Changes
 - Rename the mayan_task_manager app to task_manager.
 - Make the task manager translatable.
 - Add Turkish to the list of processes languages.
-
+- Add user configurable mailer support. GitLab issue #286.
 
 Removals
 --------
@@ -79,6 +79,7 @@ Bugs fixed or issues closed
 ===========================
 
 * `GitLab issue #215 <https://gitlab.com/mayan-edms/mayan-edms/issues/215>`_ Download text contents
+* `GitLab issue #286 <https://gitlab.com/mayan-edms/mayan-edms/issues/286>`_ User configurable mailer
 
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/