diff --git a/addons/email_template/doc/changelog.rst b/addons/email_template/doc/changelog.rst
index 2581175fe0b..77e342c920a 100644
--- a/addons/email_template/doc/changelog.rst
+++ b/addons/email_template/doc/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 `trunk (saas-2)`
 ----------------
 
+ - ``mail.compose.message``: added support of ``mail_server_id`` from template
  - Server action update
 
   - added `email` server action type, now entirely based on email templates.
\ No newline at end of file
diff --git a/addons/mail/doc/changelog.rst b/addons/mail/doc/changelog.rst
index f6674bb42ad..a7a2cfcf2b5 100644
--- a/addons/mail/doc/changelog.rst
+++ b/addons/mail/doc/changelog.rst
@@ -6,6 +6,12 @@ Changelog
 `trunk (saas-2)`
 ----------------
 
+ - added support of ``active_domain`` form context, coming from the list view.
+   When checking the header hook, the mass mailing will be done on all records
+   matching the ``active_domain``.
+ - added ``mail_server_id`` to mail_message, removing it from mail_mail. This allows
+   to set the preferred mail server to use for notifications emails, when using
+   templates.
  - added ``_mail_post_access`` attribute that specifies the access right that
    should have the user in order to post a new message on a given model. Values
-   are ``read`` (portal documents), ``write`` (default value), ``unlink`` or ``create``.
\ No newline at end of file
+   are ``read`` (portal documents), ``write`` (default value), ``unlink`` or ``create``.