13 files changed, 209 insertions, 33 deletions
diff --git a/help/C/mail-receiving-options-evolution-exchange.page b/help/C/mail-receiving-options-evolution-exchange.page
index cc92cf44d8..5f52565db6 100644
--- a/help/C/mail-receiving-options-evolution-exchange.page
+++ b/help/C/mail-receiving-options-evolution-exchange.page
@@ -22,6 +22,9 @@
 
   <title>Evolution Exchange receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
 <list>
@@ -33,17 +36,25 @@
 <item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
-
 <item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
-
 <item><p>In the section <gui>Global Address List/Active Directory</gui>, specify the name of the Global Catalog server. The Global Catalog Server contains the user information for users.</p></item>
 <item><p>Select if you want to limit the number of Global Address List (GAL) responses as this may increase speed. The GAL contains a list of all email addresses.</p></item>
 <item><p>You also have to define the Authentication type, and whether you want groups of contacts in GAL to be represented in the Evolution address book by <link xref="contacts-using-contact-lists">contact lists</link>.</p></item>
 </list>
+
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-exchange-ews.page b/help/C/mail-receiving-options-exchange-ews.page
index 9564537885..e7a5cf079c 100644
--- a/help/C/mail-receiving-options-exchange-ews.page
+++ b/help/C/mail-receiving-options-exchange-ews.page
@@ -19,6 +19,9 @@
 
   <title>Exchange Web Services receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
 <list>
@@ -28,14 +31,25 @@
 <item><p>Select your authentication type in the Authentication list, or click <gui style="button">Check for Supported Types</gui> to have Evolution check for supported authentication mechanisms. Some servers do not announce the authentication mechanisms they support, so clicking this button is not a guarantee that available mechanisms actually work.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
 <item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
 <item><p>If you would like to have a copy of the address book on the server for offline access to it, enable <gui>Cache offline address book</gui> and click <gui style="button">Fetch list</gui>. Afterwards, select the address book from the available options.</p></item>
-<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX on this server</gui>.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in Inbox on this server</gui>.</p>
 </list>
+
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
+</section>
 
 </page>
diff --git a/help/C/mail-receiving-options-exchange-mapi.page b/help/C/mail-receiving-options-exchange-mapi.page
index b68a13f928..1e34af4ddd 100644
--- a/help/C/mail-receiving-options-exchange-mapi.page
+++ b/help/C/mail-receiving-options-exchange-mapi.page
@@ -19,6 +19,9 @@
 
   <title>Exchange MAPI receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
 <list>
@@ -30,13 +33,22 @@
 <item><p>Click <gui style="button">Authenticate</gui> and enter your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
-
 <item><p>You can also define if Evolution checks for new messages in all folders.</p></item>
 </list>
+
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-imap-plus.page b/help/C/mail-receiving-options-imap-plus.page
index f3b8de883f..a4a407d704 100644
--- a/help/C/mail-receiving-options-imap-plus.page
+++ b/help/C/mail-receiving-options-imap-plus.page
@@ -22,7 +22,11 @@
 
   <title>IMAP+ receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
 <item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
@@ -31,7 +35,13 @@
 <item><p>Select if you want Evolution to remember your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
 <item><p>Select "Use Quick Resync" if the IMAP server supports <link href="http://tools.ietf.org/html/rfc5162">IMAP4 Extensions for Quick Mailbox Resynchronization</link>.</p></item>
@@ -41,7 +51,10 @@
 <item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
 </list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-imap.page b/help/C/mail-receiving-options-imap.page
index 33ee9bb975..ed7e0936aa 100644
--- a/help/C/mail-receiving-options-imap.page
+++ b/help/C/mail-receiving-options-imap.page
@@ -22,7 +22,11 @@
 
   <title>IMAP receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
 <item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
@@ -31,6 +35,11 @@
 <item><p>Select if you want Evolution to remember your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
 <list>
@@ -41,7 +50,10 @@
 <item><p>Select if you want Evolution to override server-supplied folder namespaces.</p></item>
 </list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-local-delivery.page b/help/C/mail-receiving-options-local-delivery.page
index 00ffe4c2e0..6bb6f10205 100644
--- a/help/C/mail-receiving-options-local-delivery.page
+++ b/help/C/mail-receiving-options-local-delivery.page
@@ -19,15 +19,30 @@
 
   <title>Local delivery receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
-<p>Choose the file by clicking on the button next to <gui>File</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<list>
+<item><p>Choose the file by clicking on the button next to <gui>File</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p></item>
+</list>
+
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+</list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-maildir-format-directories.page b/help/C/mail-receiving-options-maildir-format-directories.page
index 135e437526..bc2c261aa2 100644
--- a/help/C/mail-receiving-options-maildir-format-directories.page
+++ b/help/C/mail-receiving-options-maildir-format-directories.page
@@ -19,16 +19,31 @@
 
   <title>Maildir-format mail directories receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
-<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+<list>
+<item><p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p></item>
+</list>
+
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
-<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p></item>
+</list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-mh-format-directories.page b/help/C/mail-receiving-options-mh-format-directories.page
index 56e878e3e0..cd99520130 100644
--- a/help/C/mail-receiving-options-mh-format-directories.page
+++ b/help/C/mail-receiving-options-mh-format-directories.page
@@ -19,15 +19,30 @@
 
   <title>MH-format mail directories receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
-<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+<list>
+<item><p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p></item>
+</list>
+
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+</list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-novell-groupwise.page b/help/C/mail-receiving-options-novell-groupwise.page
index 865c7a4992..612d5de63f 100644
--- a/help/C/mail-receiving-options-novell-groupwise.page
+++ b/help/C/mail-receiving-options-novell-groupwise.page
@@ -23,7 +23,11 @@
 
   <title>Novell Groupwise receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
 <item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
@@ -32,14 +36,23 @@
 <item><p>Select if you want Evolution to remember your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
-
 <item><p>Enter the Post Office Agent SOAP port.</p>
 <p>If you are unsure what your Post Office Agent SOAP port is, contact your system administrator.</p></item>
 </list>
+
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-pop.page b/help/C/mail-receiving-options-pop.page
index a53edfa52f..ed0f605d0f 100644
--- a/help/C/mail-receiving-options-pop.page
+++ b/help/C/mail-receiving-options-pop.page
@@ -26,7 +26,11 @@
 
   <title>POP receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
 <item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
@@ -36,15 +40,23 @@
 <item><p>Select if you want Evolution to remember your password.</p></item>
 </list>
 
-<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
-<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
+<p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want the messages to remain on the server for a period of time, click the <gui>Leave messages on server</gui> option and the <gui>Delete after ... days</gui> option and select the number of days to allow messages to remain on the server.</p></item>
+<item><p>The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or misconfigured mail servers. <link href="https://tools.ietf.org/html/rfc2449">POP3 extensions</link> provide enhanced functionality, however only some servers support them. In case of problems with receiving mail, enabling this setting might help.</p></item>
+</list>
 
-<p>The option <gui>Disable support for all POP3 extensions</gui> is only useful when accessing old or misconfigured mail servers. <link href="https://tools.ietf.org/html/rfc2449">POP3 extensions</link> provide enhanced functionality, however only some servers support them. In case of problems with receiving mail, enabling this setting might help.</p>
+</section>
 
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-directory.page b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
index 08874db7c1..42ae490953 100644
--- a/help/C/mail-receiving-options-unix-mbox-spool-directory.page
+++ b/help/C/mail-receiving-options-unix-mbox-spool-directory.page
@@ -19,15 +19,30 @@
 
   <title>Standard Unix mbox spool directory receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
-<p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p>
+<list>
+<item><p>Choose the directory by clicking on the button next to <gui>Path</gui> in the <gui>Configuration</gui> section. Some default folders are available in the list. If the directory is not among those folders, choose the last option <gui>Other...</gui>. This will open a directory chooser window.</p></item>
+</list>
+
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+<list>
+<item><p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p></item>
+</list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-unix-mbox-spool-file.page b/help/C/mail-receiving-options-unix-mbox-spool-file.page
index 717ae53d4d..986cc3d1b8 100644
--- a/help/C/mail-receiving-options-unix-mbox-spool-file.page
+++ b/help/C/mail-receiving-options-unix-mbox-spool-file.page
@@ -19,16 +19,31 @@
 
   <title>Standard Unix mbox spool file receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
 
-<p>Choose the file by clicking on the button next to <gui>File</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p>
+<list>
+<item><p>Choose the file by clicking on the button next to <gui>File</gui> in the <gui>Configuration</gui> section. This will open a file chooser window.</p></item>
+</list>
+
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
 
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
 
-<p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p>
-<p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p>
+<list>
+<item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
+<item><p>If you want <link xref="mail-filters">Filters</link> to be automatically used for new messages in your inbox, enable <gui>Apply filters to new messages in INBOX</gui>.</p></item>
+</list>
 
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>
diff --git a/help/C/mail-receiving-options-usenet-news.page b/help/C/mail-receiving-options-usenet-news.page
index 697e3bf3d1..cc4c10325b 100644
--- a/help/C/mail-receiving-options-usenet-news.page
+++ b/help/C/mail-receiving-options-usenet-news.page
@@ -22,7 +22,11 @@
 
   <title>Usenet news receiving options</title>
 
+<section id="receiving-email">
+<title>Receiving Email</title>
+
 <p>On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Email</gui></guiseq>):</p>
+
 <list>
 <item><p>Enter the address of the email server in the <gui>Server</gui> field and enter your username for that server.</p></item>
 <item><p>Select if you want to use a secure connection (SSL or TLS).</p><p>You should enable this option if your server supports it.</p>
@@ -31,7 +35,13 @@
 <item><p>Select if you want Evolution to remember your password.</p></item>
 </list>
 
+</section>
+
+<section id="receiving-options">
+<title>Receiving Options</title>
+
 <p>On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>):</p>
+
 <list>
 <item><p>If you want Evolution to check automatically for new messages, click the <gui>Check for new messages every ... minutes</gui> option and select the frequency in minutes.</p></item>
 <item><p>Select if you want to show folders in short notation.</p>
@@ -39,7 +49,11 @@
 <item><p>Select if you want to show relative folder names in the <link xref="mail-imap-subscriptions">subscriptions window</link>.</p>
 <p>If you select to show relative folder names, only the name of the folder is displayed. For example the folder evolution.mail would appear as evolution.</p></item>
 </list>
+
+</section>
+
+<section id="return-to-assistant-bottom-link">
 <!-- TODO:XINCLUDE: Maybe later replace this "go back" workaround by doing some content sharing with xinclude and xpointer in intro-first-run.page itself? <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. -->
 <p>If you came to this page from the first-run wizard help page, click <link xref="intro-first-run#sending">here</link> to continue with the next step.</p>
-
+</section>
 </page>