diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
index 170d5ac1d4..0fed9c7101 100644
--- a/help/C/mail-account-manage-imap-plus.page
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-common-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,21 +32,30 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (IMAP+ accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (IMAP+ accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
-  <info>
-    <title type="link">IMAP+ defaults</title>
-  </info>
-  <title>Defaults</title>
+<info>
+  <title type="link">Defaults (IMAP+ accounts)</title>
+</info>
+<title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (IMAP+ accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
@@ -55,6 +64,9 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <section id="other-settings">
+<info>
+  <title type="link">Other settings (IMAP+ accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section>
diff --git a/help/C/mail-account-manage-local-delivery.page b/help/C/mail-account-manage-local-delivery.page
index 04e0b92a1e..e5c1099de2 100644
--- a/help/C/mail-account-manage-local-delivery.page
+++ b/help/C/mail-account-manage-local-delivery.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-local-account-types"/>
 
-    <revision pkgversion="3.4" version="0.4" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.5" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Local Delivery accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (Local Delivery accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Local Delivery accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Local Delivery accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Local Delivery accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-maildir-format-directories.page b/help/C/mail-account-manage-maildir-format-directories.page
index d6df7ffd03..906bb7c23a 100644
--- a/help/C/mail-account-manage-maildir-format-directories.page
+++ b/help/C/mail-account-manage-maildir-format-directories.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-local-account-types"/>
 
-    <revision pkgversion="3.4" version="0.4" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.5" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Maildir Format Mail Directories accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (Maildir Format Mail Directories accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Maildir Format Mail Directories accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Maildir Format Mail Directories accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Maildir Format Mail Directories accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-mh-format-directories.page b/help/C/mail-account-manage-mh-format-directories.page
index 20de7d1896..ccfbc17e0f 100644
--- a/help/C/mail-account-manage-mh-format-directories.page
+++ b/help/C/mail-account-manage-mh-format-directories.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-local-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (MH Format Mail Directories accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (MH Format Mail Directories accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (MH Format Mail Directories accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (MH Format Mail Directories accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (MH Format Mail Directories accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
index 0ad06cbc76..1c1310f2fe 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -6,7 +6,7 @@
 
   <link type="guide" xref="mail-account-manage-microsoft-exchange" group="#first"/>
 
-    <revision pkgversion="3.4" version="0.4" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.5" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,20 +32,32 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Exchange Web Services accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Exchange Web Services accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Exchange Web Services accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Exchange Web Services accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
index fe411bca27..212d3ef662 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-manage-microsoft-exchange"/>
 
-    <revision pkgversion="3.7" version="0.6" date="2013-01-22" status="candidate"/>
+    <revision pkgversion="3.7" version="0.7" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,10 +32,16 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Exchange MAPI accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Exchange MAPI accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
@@ -45,12 +51,18 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Exchange MAPI accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Exchange MAPI accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-pop.page b/help/C/mail-account-manage-pop.page
index 5d1c765b6c..77fce0e221 100644
--- a/help/C/mail-account-manage-pop.page
+++ b/help/C/mail-account-manage-pop.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-common-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (POP accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (POP accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (POP accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (POP accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (POP accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-unix-mbox-spool-directory.page b/help/C/mail-account-manage-unix-mbox-spool-directory.page
index 34c0691cae..6959fb5b9f 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-directory.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-directory.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-local-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Standard Unix mbox Spool Directory accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (Standard Unix mbox Spool Directory accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Standard Unix mbox Spool Directory accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Standard Unix mbox Spool Directory accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Standard Unix mbox Spool Directory accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-unix-mbox-spool-file.page b/help/C/mail-account-manage-unix-mbox-spool-file.page
index 4f8d018bf7..5953ae9e72 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-file.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-file.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-local-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Standard Unix mbox Spool File accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (Standard Unix mbox Spool File accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Standard Unix mbox Spool File accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Standard Unix mbox Spool File accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <!-- <section id="other-settings">
+<info>
+  <title type="link">Other settings (Standard Unix mbox Spool File accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section> -->
diff --git a/help/C/mail-account-manage-usenet-news.page b/help/C/mail-account-manage-usenet-news.page
index 5313b10230..0855cd4ec3 100644
--- a/help/C/mail-account-manage-usenet-news.page
+++ b/help/C/mail-account-manage-usenet-news.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-account-management#mail-common-account-types"/>
 
-    <revision pkgversion="3.4" version="0.3" date="2012-02-19" status="candidate"/>
+    <revision pkgversion="3.4" version="0.4" date="2013-06-22" status="candidate"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -32,24 +32,39 @@ via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclu
  xmlns="http://www.w3.org/2001/XInclude"/>
 
 <section id="receiving-email">
+<info>
+  <title type="link">Receiving Email and Receiving options (Usenet News accounts)</title>
+</info>
 <title>Receiving Email and Receiving options</title>
 </section>
 
 <section id="sending-email">
+<info>
+  <title type="link">Sending Email (Usenet News accounts)</title>
+</info>
 <title>Sending Email</title>
 </section>
 
 <section id="defaults">
+<info>
+  <title type="link">Defaults (Usenet News accounts)</title>
+</info>
 <title>Defaults</title>
 </section>
 
 <section id="security">
+<info>
+  <title type="link">Security (Usenet News accounts)</title>
+</info>
 <title>Security</title>
 </section>
 
 </section> <!-- end "account editor" section, now list any account settings stuff related to this account type outside of it -->
 
 <section id="other-settings">
+<info>
+  <title type="link">Other settings (Usenet News accounts)</title>
+</info>
 <title>Other settings</title>
 <p>Other account related settings that are not located in the <gui>Account Editor</gui>:</p>
 </section>