diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_help.html b/mozilla/extensions/help/resources/locale/en-US/mail_help.html
index 27a8a634822..43ccebc40a6 100644
--- a/mozilla/extensions/help/resources/locale/en-US/mail_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.html
@@ -129,6 +129,10 @@ To modify information for the outgoing mail server, click the Outgoing Server (S
 Click OK to save your changes.</li>
 </ol>
 
+<p>
+[&nbsp;<a href="#mail_start">Return to beginning of section</a>&nbsp;]</p>
+
+<p>&nbsp;</p>
 <a NAME="account_settings_change"></a>
 <h2>Changing the Settings for an Account</h2>
 
@@ -933,11 +937,11 @@ In the composition window, click Save, or open the File menu and choose Save as
   <li>Edit the message as necessary.</li>
   <li>Click Send to send the message or click Save to save the message so you 
     can complete it later.</li>
+</ol>
   <p> [&nbsp;<a href="#SENDING_MESSAGES">Return to beginning of section</a>&nbsp;] 
   </p>
   <p>&nbsp;</p>
   <a NAME="mail_template"></a> 
-</ol>
 <h2>Creating and Using Templates</h2>
 
   <p>Templates are useful for formatting messages that you send regularly, such 
@@ -1346,6 +1350,8 @@ In the composition window, click Save, or open the File menu and choose Save as
       Address Book.</li>
     <li> Type the name of the new address book, and click OK.</li>
   </ol>
+  <p> [&nbsp;<a href="#use_add_book">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="ADD_USER_PROPERTIES"></a> 
   <h2>Creating a New Address Book Card</h2>
@@ -1421,6 +1427,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li> Click OK. 
     <li>The list appears in the left and right sides of the Address Book window. 
   </ol>
+  <p> [&nbsp;<a href="#use_add_book">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="EDIT_LIST_MAILING_LIST"></a> 
   <h2>Editing a Mailing List</h2>
@@ -1435,7 +1443,7 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li>Click the entry you wish to delete. 
     <li>Click the Delete button. 
   </ol>
-  To add members to a mailing list: 
+  <p>To add members to a mailing list: 
   <ol>
     <li>In the Address Book window, in the list of address books, select the address 
       book that contains the mailing list you want to edit. 
@@ -1563,6 +1571,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     the destination folder. If you recreate the destination folder, you must also 
     turn the filter back on to activate filtering again. Until then, incoming 
     messages that match the filter criteria will remain in your Inbox. 
+  <p> [&nbsp;<a href="#ORGANIZING_MAIL">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="copy_folder"></a> 
   <h2>Moving or Copying a Folder</h2>
@@ -1655,7 +1665,7 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li>Click OK when you are done managing your filters. If you created a new 
       filter, it begins filtering incoming messages as soon as you click OK. 
   </ol>
-  <b>Note</b>: If you move, delete, or rename a folder that you've been using 
+  <p> <b>Note</b>: If you move, delete, or rename a folder that you've been using 
   to store filtered messages, the filter will no longer work. You can either edit 
   the filter to point to a different folder (or to the folder's new location if 
   you've moved it), or else you can turn the filter off or delete it. You can 
@@ -1812,6 +1822,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li> Click Reply and choose "Followup-To" from the Recipient type pop-up menu. 
       Subsequent responses will be posted to the newsgroup you specified.</li>
   </ul>
+  <p> [&nbsp;<a href="#STARTING_NEWSGROUPS">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="MONITORING"></a> 
   <h2>Monitoring Threads</h2>
@@ -1861,6 +1873,8 @@ In the composition window, click Save, or open the File menu and choose Save as
   <p>Once you've set up access to the new server, you can <a href="#SUBSCRIBE">subscribe</a> 
     to newsgroups on that server. In the Mail window, open the File menu and choose 
     Subscribe. 
+  <p> [&nbsp;<a href="#STARTING_NEWSGROUPS">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="WORKING_OFFLINE"></a> 
   <hr>
@@ -1966,7 +1980,7 @@ In the composition window, click Save, or open the File menu and choose Save as
       to go offline, proceed to the next step. 
     <li>From the File menu, choose Offline, and then choose Work Offline. 
   </ol>
-  Netscape Mail automatically downloads all messages in the selected folder so 
+  <p> Netscape Mail automatically downloads all messages in the selected folder so 
   you can read and respond to them while working offline. After disconnecting, 
   Netscape Mail remains open so you can continue to work with your messages. 
   <p><b>Note:</b> Message headers that have been downloaded for reading offline 
diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml
index 27a8a634822..43ccebc40a6 100644
--- a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml
@@ -129,6 +129,10 @@ To modify information for the outgoing mail server, click the Outgoing Server (S
 Click OK to save your changes.</li>
 </ol>
 
+<p>
+[&nbsp;<a href="#mail_start">Return to beginning of section</a>&nbsp;]</p>
+
+<p>&nbsp;</p>
 <a NAME="account_settings_change"></a>
 <h2>Changing the Settings for an Account</h2>
 
@@ -933,11 +937,11 @@ In the composition window, click Save, or open the File menu and choose Save as
   <li>Edit the message as necessary.</li>
   <li>Click Send to send the message or click Save to save the message so you 
     can complete it later.</li>
+</ol>
   <p> [&nbsp;<a href="#SENDING_MESSAGES">Return to beginning of section</a>&nbsp;] 
   </p>
   <p>&nbsp;</p>
   <a NAME="mail_template"></a> 
-</ol>
 <h2>Creating and Using Templates</h2>
 
   <p>Templates are useful for formatting messages that you send regularly, such 
@@ -1346,6 +1350,8 @@ In the composition window, click Save, or open the File menu and choose Save as
       Address Book.</li>
     <li> Type the name of the new address book, and click OK.</li>
   </ol>
+  <p> [&nbsp;<a href="#use_add_book">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="ADD_USER_PROPERTIES"></a> 
   <h2>Creating a New Address Book Card</h2>
@@ -1421,6 +1427,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li> Click OK. 
     <li>The list appears in the left and right sides of the Address Book window. 
   </ol>
+  <p> [&nbsp;<a href="#use_add_book">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="EDIT_LIST_MAILING_LIST"></a> 
   <h2>Editing a Mailing List</h2>
@@ -1435,7 +1443,7 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li>Click the entry you wish to delete. 
     <li>Click the Delete button. 
   </ol>
-  To add members to a mailing list: 
+  <p>To add members to a mailing list: 
   <ol>
     <li>In the Address Book window, in the list of address books, select the address 
       book that contains the mailing list you want to edit. 
@@ -1563,6 +1571,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     the destination folder. If you recreate the destination folder, you must also 
     turn the filter back on to activate filtering again. Until then, incoming 
     messages that match the filter criteria will remain in your Inbox. 
+  <p> [&nbsp;<a href="#ORGANIZING_MAIL">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="copy_folder"></a> 
   <h2>Moving or Copying a Folder</h2>
@@ -1655,7 +1665,7 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li>Click OK when you are done managing your filters. If you created a new 
       filter, it begins filtering incoming messages as soon as you click OK. 
   </ol>
-  <b>Note</b>: If you move, delete, or rename a folder that you've been using 
+  <p> <b>Note</b>: If you move, delete, or rename a folder that you've been using 
   to store filtered messages, the filter will no longer work. You can either edit 
   the filter to point to a different folder (or to the folder's new location if 
   you've moved it), or else you can turn the filter off or delete it. You can 
@@ -1812,6 +1822,8 @@ In the composition window, click Save, or open the File menu and choose Save as
     <li> Click Reply and choose "Followup-To" from the Recipient type pop-up menu. 
       Subsequent responses will be posted to the newsgroup you specified.</li>
   </ul>
+  <p> [&nbsp;<a href="#STARTING_NEWSGROUPS">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="MONITORING"></a> 
   <h2>Monitoring Threads</h2>
@@ -1861,6 +1873,8 @@ In the composition window, click Save, or open the File menu and choose Save as
   <p>Once you've set up access to the new server, you can <a href="#SUBSCRIBE">subscribe</a> 
     to newsgroups on that server. In the Mail window, open the File menu and choose 
     Subscribe. 
+  <p> [&nbsp;<a href="#STARTING_NEWSGROUPS">Return to beginning of section</a>&nbsp;] 
+  </p>
   <p>&nbsp;</p>
   <a NAME="WORKING_OFFLINE"></a> 
   <hr>
@@ -1966,7 +1980,7 @@ In the composition window, click Save, or open the File menu and choose Save as
       to go offline, proceed to the next step. 
     <li>From the File menu, choose Offline, and then choose Work Offline. 
   </ol>
-  Netscape Mail automatically downloads all messages in the selected folder so 
+  <p> Netscape Mail automatically downloads all messages in the selected folder so 
   you can read and respond to them while working offline. After disconnecting, 
   Netscape Mail remains open so you can continue to work with your messages. 
   <p><b>Note:</b> Message headers that have been downloaded for reading offline