diff --git a/user_manual/groupware/images/mail-composer-indicator.png b/user_manual/groupware/images/mail-composer-indicator.png
new file mode 100644
index 000000000..50326c7f5
Binary files /dev/null and b/user_manual/groupware/images/mail-composer-indicator.png differ
diff --git a/user_manual/groupware/images/mail-minimize-composer.png b/user_manual/groupware/images/mail-minimize-composer.png
new file mode 100644
index 000000000..c1d9fa4c1
Binary files /dev/null and b/user_manual/groupware/images/mail-minimize-composer.png differ
diff --git a/user_manual/groupware/mail.rst b/user_manual/groupware/mail.rst
index ffa49de56..e62f0daa4 100644
--- a/user_manual/groupware/mail.rst
+++ b/user_manual/groupware/mail.rst
@@ -19,13 +19,6 @@ Add a new mail account
 
 .. figure:: images/new-mail-account.png
 
-
-Create/Write a new message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1. Click new message on the top left of your screen
-2. Start writing your message
-
 Scheduled messages
 ~~~~~~~~~~~~~~~~~~~
 1. Click new message button on top left of your screen
@@ -57,6 +50,29 @@ Your account settings such as:
 
 Can be found in the action menu of a mail account. There you can edit, add or remove settings depending on your need.
 
+
+Compose messages
+----------------
+
+1. Click new message on the top left of your screen
+2. Start writing your message
+
+Minimize the composer modal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+   .. versionadded:: 3.2
+
+The composer modal can be minimized while writing a new message, editing an existing draft or editing a message from the outbox. Simply click the minimize button on the top right of the modal or click anywhere outside the modal.
+
+   .. figure:: images/mail-minimize-composer.png
+
+You can resume your minimized message by clicking anywhere on the indicator on the bottom right of your screen.
+
+   .. figure:: images/mail-composer-indicator.png
+
+Press the close button on the modal or the indicator in the bottom right corner to stop editing a message. A draft will be saved automatically into your draft mailbox.
+
+
 Mailbox actions
 ---------------