From a2d63a99543f62077f95c68344ff2c7b3519f153 Mon Sep 17 00:00:00 2001
From: Ruth Cheesley <ruth@ruthcheesley.co.uk>
Date: Tue, 16 Apr 2024 09:59:29 +0100
Subject: [PATCH 1/2] Fix incorrect headings

---
 docs/channels/emails.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/channels/emails.rst b/docs/channels/emails.rst
index fd9cc8c8..b3c58025 100644
--- a/docs/channels/emails.rst
+++ b/docs/channels/emails.rst
@@ -86,7 +86,7 @@ Mautic allows the use of tokens in Emails which gives the marketer the possibili
 Check the :doc:`/configuration/variables` documentation for a list of all the available default fields.
 
 Default value
-~~~~~~~~~~~~~
+-------------
 
 A token can have a default value for cases when the Contact doesn't have the value known. You must specify the default value after a ``|`` character, for example:
 
@@ -97,7 +97,7 @@ A token can have a default value for cases when the Contact doesn't have the val
 The ``|friend`` tells Mautic to use 'friend' if there is no first name present in the Contact field.
 
 Encoded value
-~~~~~~~~~~~~~
+-------------
 
 It's possible to encode values used in a token using the following syntax:
 
@@ -108,7 +108,7 @@ It's possible to encode values used in a token using the following syntax:
 The ``|true`` tells Mautic to encode the value used, for example in URLs.
 
 Date formats
-~~~~~~~~~~~~
+------------
 
 To use custom date fields in tokens, use the following format:
 
@@ -144,7 +144,7 @@ To make use of monitoring replies from Contacts, you must have access to an IMAP
 ``php path/to/mautic/bin/console mautic:email:fetch``
 
 Usage
-~~~~~
+-----
 Contact replies within Campaigns function as decision after an Email Send action, to take further action based on whether the Contact has replied to the Email. Mautic tries to read the inbox, parse messages, and find replies from the specified Contact. The Contact, when matched with an incoming reply, proceeds down the positive path immediately after the reply detection.
 
 
@@ -271,7 +271,7 @@ For example:
     <a href="{webview_url}" target="_blank">View in your browser</a>
 
 Bounce management
-#################
+*****************
 
 Mautic provides a feature which allows monitoring of IMAP accounts to detect bounced Emails and unsubscribe requests.
 
@@ -284,7 +284,7 @@ Elastic Email, SparkPost, Mandrill, Mailjet, SendGrid and Amazon SES support Web
 .. vale off
 
 Monitored inbox configuration
-*****************************
+=============================
 
 .. vale on
 
@@ -309,7 +309,7 @@ If sending mail through GMail, the Return Path of the Email is automatically rew
 If you select an Unsubscribe folder, Mautic also appends the Email as part of the "List-Unsubscribe" header. It then parses messages it finds in that folder and automatically unsubscribe the Contact.
 
 Webhook bounce management
-*************************
+=========================
 
 Since Mautic 5 all the Email transports use the same Webhook - sometimes called callback - URL: ``https://mautic.example.com/mailer/callback``. Please follow the documentation for the specific Email transport you've installed to get more information about the Webhook configuration.
 
@@ -317,7 +317,7 @@ Since Mautic 5 all the Email transports use the same Webhook - sometimes called
 .. vale off
 
 Create a Segment with bounced Emails
-************************************
+=====================================
 
 .. vale on
 

From a830a9b755410dfc219924adb55f0aef342f0de5 Mon Sep 17 00:00:00 2001
From: Ruth Cheesley <ruth@ruthcheesley.co.uk>
Date: Tue, 16 Apr 2024 10:04:38 +0100
Subject: [PATCH 2/2] Add text about using tokens in from fields

---
 docs/channels/emails.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/channels/emails.rst b/docs/channels/emails.rst
index b3c58025..574d079f 100644
--- a/docs/channels/emails.rst
+++ b/docs/channels/emails.rst
@@ -83,6 +83,8 @@ Tokens
 
 Mautic allows the use of tokens in Emails which gives the marketer the possibility to integrate a number of Contact fields in your Emails. These can be easily placed within your Emails and are automatically replaced with the appropriate text once sent.
 
+It's also possible to override the 'from' field in an Email with a token from your :doc:`/contacts/custom_fields` since Mautic 5.1. 
+
 Check the :doc:`/configuration/variables` documentation for a list of all the available default fields.
 
 Default value