more email cleanup

4 files changed, 38 insertions, 24 deletions

diff --git a/pages/common/_email.md b/pages/common/_email.md
index 5286bdb..976fe3d 100644
--- a/pages/common/_email.md
+++ b/pages/common/_email.md
@@ -2,16 +2,16 @@
 
 To get encrypted email to work, you have two options:
 
-1. The [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended).
-2. Configure your email client manually.
+1. [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended)
+2. Manual email client configuration
 
-Bitmask Thunderbird Extension:
+### Bitmask Thunderbird Extension
 
 1. Install Bitmask app and register for an account.
-2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/)
-3. Select the menu item `File` > `New` > `Bitmask Account...`
+2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/).
+3. Select the Thunderbird menu item `File` > `New` > `Bitmask Account...`
 
-Manual email client configuration:
+### Manual email client configuration
 
 * IMAP -- `localhost:1984`
   * username: the full email address you use with the Bitmask app.
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index dfe27b7..7ac9d61 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -34,6 +34,10 @@
    <li><a href="#Other.options">Other options</a></li>
   </ul></li>
   <li><a href="#Configuring.email">Configuring email</a></li>
+  <li><ul>
+   <li><a href="#Bitmask.Thunderbird.Extension">Bitmask Thunderbird Extension</a></li>
+   <li><a href="#Manual.email.client.configuration">Manual email client configuration</a></li>
+  </ul></li>
  </ul></li>
 </ul>
 
@@ -177,21 +181,23 @@
 <p>To get encrypted email to work, you have two options:</p>
 
 <ol>
-<li>The <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended).</li>
-<li>Configure your email client manually.</li>
+<li><a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended)</li>
+<li>Manual email client configuration</li>
 </ol>
 
 
-<p>Bitmask Thunderbird Extension:</p>
+<a name="Bitmask.Thunderbird.Extension"></a>
+<h3>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
-<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a></li>
-<li>Select the menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
+<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a>.</li>
+<li>Select the Thunderbird menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
 </ol>
 
 
-<p>Manual email client configuration:</p>
+<a name="Manual.email.client.configuration"></a>
+<h3>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &mdash; <code>localhost:1984</code>
diff --git a/public/mac/index.en.html b/public/mac/index.en.html
index 868a07e..4cdb9e6 100644
--- a/public/mac/index.en.html
+++ b/public/mac/index.en.html
@@ -23,6 +23,10 @@
   <li><a href="#Download.latest.version">Download latest version</a></li>
   <li><a href="#Download.other.versions">Download other versions</a></li>
   <li><a href="#Configuring.email">Configuring email</a></li>
+  <li><ul>
+   <li><a href="#Bitmask.Thunderbird.Extension">Bitmask Thunderbird Extension</a></li>
+   <li><a href="#Manual.email.client.configuration">Manual email client configuration</a></li>
+  </ul></li>
  </ul></li>
 </ul>
 
@@ -51,21 +55,23 @@
 <p>To get encrypted email to work, you have two options:</p>
 
 <ol>
-<li>The <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended).</li>
-<li>Configure your email client manually.</li>
+<li><a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended)</li>
+<li>Manual email client configuration</li>
 </ol>
 
 
-<p>Bitmask Thunderbird Extension:</p>
+<a name="Bitmask.Thunderbird.Extension"></a>
+<h3>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
-<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a></li>
-<li>Select the menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
+<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a>.</li>
+<li>Select the Thunderbird menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
 </ol>
 
 
-<p>Manual email client configuration:</p>
+<a name="Manual.email.client.configuration"></a>
+<h3>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &mdash; <code>localhost:1984</code>
diff --git a/public/windows/index.en.html b/public/windows/index.en.html
index d1d0981..f22c2b6 100644
--- a/public/windows/index.en.html
+++ b/public/windows/index.en.html
@@ -38,21 +38,23 @@
 <p>To get encrypted email to work, you have two options:</p>
 
 <ol>
-<li>The <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended).</li>
-<li>Configure your email client manually.</li>
+<li><a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a> (recommended)</li>
+<li>Manual email client configuration</li>
 </ol>
 
 
-<p>Bitmask Thunderbird Extension:</p>
+<a name="Bitmask.Thunderbird.Extension"></a>
+<h3>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
-<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a></li>
-<li>Select the menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
+<li>Install the <a href="https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/">Bitmask Thunderbird Extension</a>.</li>
+<li>Select the Thunderbird menu item <code>File</code> > <code>New</code> > <code>Bitmask Account...</code></li>
 </ol>
 
 
-<p>Manual email client configuration:</p>
+<a name="Manual.email.client.configuration"></a>
+<h3>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &mdash; <code>localhost:1984</code>