diff --git a/mozilla/extensions/help/resources/locale/en-US/search-db.rdf b/mozilla/extensions/help/resources/locale/en-US/search-db.rdf
index f043bc24252..564e3f4956d 100644
--- a/mozilla/extensions/help/resources/locale/en-US/search-db.rdf
+++ b/mozilla/extensions/help/resources/locale/en-US/search-db.rdf
@@ -2,16 +2,6 @@
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="account_settings"
-         nc:name="account settings"
-	 nc:link="chrome://help/locale/mail_help.html#account_settingsSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -32,6 +22,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="add_email_account"
+         nc:name="add email account"
+	 nc:link="chrome://help/locale/mail_help.html#add_email_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="add_IMAP_account"
+         nc:name="add IMAP account"
+	 nc:link="chrome://help/locale/mail_help.html#add_IMAP_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -95,9 +105,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="address_mail"
-         nc:name="address mail"
-	 nc:link="chrome://help/locale/mail_help.html#address_mailSDX"/>
+       <rdf:Description ID="address_autocompletion"
+         nc:name="address autocompletion"
+	 nc:link="chrome://help/locale/mail_help.html#address_autocompletionSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -182,6 +192,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="attachments"
+         nc:name="attachments"
+	 nc:link="chrome://help/locale/mail_help.html#attachmentsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -222,6 +242,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="biff"
+         nc:name="biff"
+	 nc:link="chrome://help/locale/mail_help.html#biffSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -242,6 +272,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="BMP"
+         nc:name="BMP"
+	 nc:link="chrome://help/locale/composer_help.html#BMPSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -462,16 +502,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="color_codes"
-         nc:name="color codes"
-	 nc:link="chrome://help/locale/composer_help.html#color_codesSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -492,6 +522,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="Composer_settings"
+         nc:name="Composer settings"
+	 nc:link="chrome://help/locale/composer_help.html#Composer_settingsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -582,6 +622,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="csv_export"
+         nc:name="csv export"
+	 nc:link="chrome://help/locale/mail_help.html#csv_exportSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="csv_import"
+         nc:name="csv import"
+	 nc:link="chrome://help/locale/mail_help.html#csv_importSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -595,9 +655,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="default_SMTP_server"
-         nc:name="default SMTP server"
-	 nc:link="chrome://help/locale/mail_help.html#default_SMTP_serverSDX"/>
+       <rdf:Description ID="default_font_for_mail_messages"
+         nc:name="default font for mail messages"
+	 nc:link="chrome://help/locale/mail_help.html#default_font_for_mail_messagesSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -605,9 +665,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="delete_account"
-         nc:name="delete account"
-	 nc:link="chrome://help/locale/mail_help.html#delete_accountSDX"/>
+       <rdf:Description ID="default_or_multiple_SMTP_servers"
+         nc:name="default or multiple SMTP servers"
+	 nc:link="chrome://help/locale/mail_help.html#default_or_multiple_SMTP_serversSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -622,6 +682,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="delete_LDAP_directory"
+         nc:name="delete LDAP directory"
+	 nc:link="chrome://help/locale/mail_help.html#delete_LDAP_directorySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -645,9 +715,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="delete_messages"
-         nc:name="delete messages"
-	 nc:link="chrome://help/locale/mail_help.html#delete_messagesSDX"/>
+       <rdf:Description ID="delete_published_pages"
+         nc:name="delete published pages"
+	 nc:link="chrome://help/locale/composer_help.html#delete_published_pagesSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -662,6 +732,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="directory_server_properties"
+         nc:name="directory server properties"
+	 nc:link="chrome://help/locale/mail_help.html#directory_server_propertiesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -682,6 +762,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="disconnect"
+         nc:name="disconnect"
+	 nc:link="chrome://help/locale/mail_help.html#disconnectSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -712,12 +802,22 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="distribution_list"
+         nc:name="distribution list"
+	 nc:link="chrome://help/locale/mail_help.html#distribution_listSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="download"
          nc:name="download"
-	 nc:link="chrome://help/locale/mail_help.html#downloadSDX"/>
+	 nc:link="chrome://help/locale/cs_nav_prefs_navigator.html#downloadSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -755,9 +855,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="draft"
-         nc:name="draft"
-	 nc:link="chrome://help/locale/mail_help.html#draftSDX"/>
+       <rdf:Description ID="downloading_messages"
+         nc:name="downloading messages"
+	 nc:link="chrome://help/locale/mail_help.html#downloading_messagesSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -785,9 +885,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="email_account"
-         nc:name="email account"
-	 nc:link="chrome://help/locale/mail_help.html#email_accountSDX"/>
+       <rdf:Description ID="editing_web_pages"
+         nc:name="editing web pages"
+	 nc:link="chrome://help/locale/composer_help.html#editing_web_pagesSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -802,6 +902,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="eml_file_format"
+         nc:name="eml file format"
+	 nc:link="chrome://help/locale/mail_help.html#eml_file_formatSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -842,6 +952,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="encryption_technologies"
+         nc:name="encryption technologies"
+	 nc:link="chrome://help/locale/ssl_help.html#encryption_technologiesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -852,6 +972,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="Eudora_messages"
+         nc:name="Eudora messages"
+	 nc:link="chrome://help/locale/mail_help.html#Eudora_messagesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -885,9 +1015,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="file"
-         nc:name="file"
-	 nc:link="chrome://help/locale/mail_help.html#fileSDX"/>
+       <rdf:Description ID="File_Bookmark"
+         nc:name="File Bookmark"
+	 nc:link="chrome://help/locale/customize_help.html#File_BookmarkSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -895,9 +1025,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="File_Bookmark"
-         nc:name="File Bookmark"
-	 nc:link="chrome://help/locale/customize_help.html#File_BookmarkSDX"/>
+       <rdf:Description ID="filing_mail"
+         nc:name="filing mail"
+	 nc:link="chrome://help/locale/mail_help.html#filing_mailSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -922,6 +1052,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="folder_permissions"
+         nc:name="folder permissions"
+	 nc:link="chrome://help/locale/mail_help.html#folder_permissionsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -932,6 +1072,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="folder_properties"
+         nc:name="folder properties"
+	 nc:link="chrome://help/locale/mail_help.html#folder_propertiesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -962,16 +1112,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="general_tab"
-         nc:name="general tab"
-	 nc:link="chrome://help/locale/mail_help.html#general_tabSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -985,9 +1125,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="get_mail"
-         nc:name="get mail"
-	 nc:link="chrome://help/locale/mail_help.html#get_mailSDX"/>
+       <rdf:Description ID="get_a_map"
+         nc:name="get a map"
+	 nc:link="chrome://help/locale/mail_help.html#get_a_mapSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -995,9 +1135,19 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="get_map"
-         nc:name="get map"
-	 nc:link="chrome://help/locale/mail_help.html#get_mapSDX"/>
+       <rdf:Description ID="get_directions"
+         nc:name="get directions"
+	 nc:link="chrome://help/locale/mail_help.html#get_directionsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="get_mail"
+         nc:name="get mail"
+	 nc:link="chrome://help/locale/mail_help.html#get_mailSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1032,6 +1182,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="global_LDAP_settings"
+         nc:name="global LDAP settings"
+	 nc:link="chrome://help/locale/mail_help.html#global_LDAP_settingsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1142,6 +1302,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="HTTP_address"
+         nc:name="HTTP address"
+	 nc:link="chrome://help/locale/composer_help.html#HTTP_addressSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1242,16 +1412,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="IMAP_shared_folders"
-         nc:name="IMAP shared folders"
-	 nc:link="chrome://help/locale/mail_help.html#IMAP_shared_foldersSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1282,6 +1442,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="importing_Communicator_address_books"
+         nc:name="importing Communicator address books"
+	 nc:link="chrome://help/locale/mail_help.html#importing_Communicator_address_booksSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="importing_Communicator_messages"
+         nc:name="importing Communicator messages"
+	 nc:link="chrome://help/locale/mail_help.html#importing_Communicator_messagesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1292,6 +1472,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="indent"
+         nc:name="indent"
+	 nc:link="chrome://help/locale/composer_help.html#indentSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1332,16 +1522,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="ISP"
-         nc:name="ISP"
-	 nc:link="chrome://help/locale/mail_help.html#ISPSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1412,6 +1592,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="join"
+         nc:name="join"
+	 nc:link="chrome://help/locale/mail_help.html#joinSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1422,6 +1612,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="JPEG"
+         nc:name="JPEG"
+	 nc:link="chrome://help/locale/composer_help.html#JPEGSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="JPG"
+         nc:name="JPG"
+	 nc:link="chrome://help/locale/composer_help.html#JPGSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1452,6 +1662,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="LDAP_update"
+         nc:name="LDAP update"
+	 nc:link="chrome://help/locale/mail_help.html#LDAP_updateSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="LDAP_using_SSL"
+         nc:name="LDAP using SSL"
+	 nc:link="chrome://help/locale/mail_help.html#LDAP_using_SSLSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1482,16 +1712,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="list"
-         nc:name="list"
-	 nc:link="chrome://help/locale/mail_help.html#listSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1532,6 +1752,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="mail_addresses"
+         nc:name="mail addresses"
+	 nc:link="chrome://help/locale/mail_help.html#mail_addressesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1545,9 +1775,59 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="mapi_"
-         nc:name="mapi "
-	 nc:link="chrome://help/locale/mail_help.html#mapi_SDX"/>
+       <rdf:Description ID="mail_draft"
+         nc:name="mail draft"
+	 nc:link="chrome://help/locale/mail_help.html#mail_draftSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="mail_privacy_and_security"
+         nc:name="mail privacy and security"
+	 nc:link="chrome://help/locale/mail_help.html#mail_privacy_and_securitySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="mail_return_receipts_settings"
+         nc:name="mail return receipts settings"
+	 nc:link="chrome://help/locale/mail_help.html#mail_return_receipts_settingsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="mail_security_settings"
+         nc:name="mail security settings"
+	 nc:link="chrome://help/locale/mail_help.html#mail_security_settingsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="map_button_in_address_book"
+         nc:name="map button in address book"
+	 nc:link="chrome://help/locale/mail_help.html#map_button_in_address_bookSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="MAPI"
+         nc:name="MAPI"
+	 nc:link="chrome://help/locale/mail_help.html#MAPISDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1592,6 +1872,36 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="message_confirmation"
+         nc:name="message confirmation"
+	 nc:link="chrome://help/locale/mail_help.html#message_confirmationSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="message_file_format"
+         nc:name="message file format"
+	 nc:link="chrome://help/locale/mail_help.html#message_file_formatSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="message_privacy_and_security"
+         nc:name="message privacy and security"
+	 nc:link="chrome://help/locale/mail_help.html#message_privacy_and_securitySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1622,6 +1932,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="moving_mail"
+         nc:name="moving mail"
+	 nc:link="chrome://help/locale/mail_help.html#moving_mailSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1712,6 +2032,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="new_AOL_account"
+         nc:name="new AOL account"
+	 nc:link="chrome://help/locale/mail_help.html#new_AOL_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="new_email_account"
+         nc:name="new email account"
+	 nc:link="chrome://help/locale/mail_help.html#new_email_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1722,6 +2062,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="new_LDAP_directory"
+         nc:name="new LDAP directory"
+	 nc:link="chrome://help/locale/mail_help.html#new_LDAP_directorySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1752,6 +2102,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="new_newsgroup_account"
+         nc:name="new newsgroup account"
+	 nc:link="chrome://help/locale/mail_help.html#new_newsgroup_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1802,6 +2162,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="news_account"
+         nc:name="news account"
+	 nc:link="chrome://help/locale/mail_help.html#news_accountSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1812,6 +2182,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="newsgroup_security_settings"
+         nc:name="newsgroup security settings"
+	 nc:link="chrome://help/locale/mail_help.html#newsgroup_security_settingsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="offline_directory"
+         nc:name="offline directory"
+	 nc:link="chrome://help/locale/mail_help.html#offline_directorySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1842,6 +2232,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="offline_messages"
+         nc:name="offline messages"
+	 nc:link="chrome://help/locale/mail_help.html#offline_messagesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="offline_replication"
+         nc:name="offline replication"
+	 nc:link="chrome://help/locale/mail_help.html#offline_replicationSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1932,6 +2342,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="Outlook_address_book_import"
+         nc:name="Outlook address book import"
+	 nc:link="chrome://help/locale/mail_help.html#Outlook_address_book_importSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1942,6 +2362,26 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="Outlook_Express_messages"
+         nc:name="Outlook Express messages"
+	 nc:link="chrome://help/locale/mail_help.html#Outlook_Express_messagesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="Outlook_messages"
+         nc:name="Outlook messages"
+	 nc:link="chrome://help/locale/mail_help.html#Outlook_messagesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -1985,9 +2425,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="POP"
-         nc:name="POP"
-	 nc:link="chrome://help/locale/mail_help.html#POPSDX"/>
+       <rdf:Description ID="pop_account"
+         nc:name="pop account"
+	 nc:link="chrome://help/locale/mail_help.html#pop_accountSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1995,9 +2435,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="post"
-         nc:name="post"
-	 nc:link="chrome://help/locale/mail_help.html#postSDX"/>
+       <rdf:Description ID="posting"
+         nc:name="posting"
+	 nc:link="chrome://help/locale/mail_help.html#postingSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2022,6 +2462,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="preventing_spam"
+         nc:name="preventing spam"
+	 nc:link="chrome://help/locale/mail_help.html#preventing_spamSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2082,16 +2532,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="publish_web_pages"
-         nc:name="publish web pages"
-	 nc:link="chrome://help/locale/composer_help.html#publish_web_pagesSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2172,6 +2612,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="read_receipt"
+         nc:name="read receipt"
+	 nc:link="chrome://help/locale/mail_help.html#read_receiptSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2182,6 +2632,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="read_write_and_manage_privileges"
+         nc:name="read write and manage privileges"
+	 nc:link="chrome://help/locale/mail_help.html#read_write_and_manage_privilegesSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2222,16 +2682,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="remove_account"
-         nc:name="remove account"
-	 nc:link="chrome://help/locale/mail_help.html#remove_accountSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2265,9 +2715,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="replicate"
-         nc:name="replicate"
-	 nc:link="chrome://help/locale/mail_help.html#replicateSDX"/>
+       <rdf:Description ID="return_receipts"
+         nc:name="return receipts"
+	 nc:link="chrome://help/locale/mail_help.html#return_receiptsSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2345,9 +2795,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="scope"
-         nc:name="scope"
-	 nc:link="chrome://help/locale/mail_help.html#scopeSDX"/>
+       <rdf:Description ID="scope_in_LDAP"
+         nc:name="scope in LDAP"
+	 nc:link="chrome://help/locale/mail_help.html#scope_in_LDAPSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2422,6 +2872,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="security"
+         nc:name="security"
+	 nc:link="chrome://help/locale/mail_help.html#securitySDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2432,6 +2892,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="see_mail"
+         nc:name="see mail"
+	 nc:link="chrome://help/locale/mail_help.html#see_mailSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2442,6 +2912,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="sending_a_message_to_a_group"
+         nc:name="sending a message to a group"
+	 nc:link="chrome://help/locale/mail_help.html#sending_a_message_to_a_groupSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2502,26 +2982,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="settings"
-         nc:name="settings"
-	 nc:link="chrome://help/locale/composer_help.html#settingsSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="sharing"
-         nc:name="sharing"
-	 nc:link="chrome://help/locale/mail_help.html#sharingSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2615,19 +3075,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="source"
-         nc:name="source"
-	 nc:link="chrome://help/locale/mail_help.html#sourceSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="SSL"
-         nc:name="SSL"
-	 nc:link="chrome://help/locale/mail_help.html#SSLSDX"/>
+       <rdf:Description ID="source_code"
+         nc:name="source code"
+	 nc:link="chrome://help/locale/composer_help.html#source_codeSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2642,6 +3092,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="starting_mail"
+         nc:name="starting mail"
+	 nc:link="chrome://help/locale/mail_help.html#starting_mailSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2652,6 +3112,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="style_sheets"
+         nc:name="style sheets"
+	 nc:link="chrome://help/locale/composer_help.html#style_sheetsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2662,6 +3132,36 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="subscribing_to_IMAP_folders"
+         nc:name="subscribing to IMAP folders"
+	 nc:link="chrome://help/locale/mail_help.html#subscribing_to_IMAP_foldersSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="symbols"
+         nc:name="symbols"
+	 nc:link="chrome://help/locale/composer_help.html#symbolsSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="synchronization"
+         nc:name="synchronization"
+	 nc:link="chrome://help/locale/mail_help.html#synchronizationSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2692,6 +3192,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="text_export"
+         nc:name="text export"
+	 nc:link="chrome://help/locale/mail_help.html#text_exportSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -2765,19 +3275,9 @@
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
-       <rdf:Description ID="update"
-         nc:name="update"
-	 nc:link="chrome://help/locale/mail_help.html#updateSDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="urn:root">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="upload"
-         nc:name="upload"
-	 nc:link="chrome://help/locale/composer_help.html#uploadSDX"/>
+       <rdf:Description ID="uploading_web_pages"
+         nc:name="uploading web pages"
+	 nc:link="chrome://help/locale/composer_help.html#uploading_web_pagesSDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2862,6 +3362,16 @@
    </nc:subheadings>
 </rdf:Description>
 
+<rdf:Description about="urn:root">
+   <nc:subheadings>
+     <rdf:Seq><rdf:li>
+       <rdf:Description ID="watch_thread"
+         nc:name="watch thread"
+	 nc:link="chrome://help/locale/mail_help.html#watch_threadSDX"/>
+     </rdf:li></rdf:Seq>
+   </nc:subheadings>
+</rdf:Description>
+
 <rdf:Description about="urn:root">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
diff --git a/mozilla/extensions/help/resources/locale/en-US/ssl_help.html b/mozilla/extensions/help/resources/locale/en-US/ssl_help.html
index 0ba28f4f4c1..82168dabae2 100644
--- a/mozilla/extensions/help/resources/locale/en-US/ssl_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/ssl_help.html
@@ -111,6 +111,8 @@ the warning checkboxes in the SSL preferences panel. Some people find these warn
 <hr>
 <a NAME="cipher_help"></a>
 <a NAME="SSL:ciphersIDX"></a>
+<a NAME="encryption:technologiesIDX"></a>
+<a NAME="encryption_technologiesSDX"></a>
 <h2>Edit Ciphers</h2>
 <p>This section describes how to use the Edit Ciphers dialog box. If you're not already viewing it, follow these steps:
 
@@ -129,13 +131,13 @@ the warning checkboxes in the SSL preferences panel. Some people find these warn
 <ul>
 	<li><a href="http://developer.netscape.com/docs/manuals/security/pkin/index.htm" target="_blank">Introduction to Public-Key Cryptography</a>
 	<li><a href="http://developer.netscape.com/docs/manuals/security/sslin/index.htm" target="_blank">Introduction to SSL</a>
-	<li><a href="http://www.mozilla.org/projects/security/pki/nss/algorithms.html" target="_blank">Encryption Technologies</a>.
+	<li><a href="http://www.mozilla.org/projects/security/pki/nss/nss-3.4/nss-3.4-algorithms.html" target="_blank">Encryption Technologies Available in NSS 3.4</a>.
 </ul>
 
 <p>&nbsp;
 
 <hr>
-<p><i>18 June 2002</i></body>
+<p><i>20 June 2002</i></body>
 <p>Copyright &copy; 1994-2002 Netscape Communications Corporation.</p>
 
 </body>
diff --git a/mozilla/extensions/help/resources/locale/en-US/ssl_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/ssl_help.xhtml
index 0ba28f4f4c1..82168dabae2 100644
--- a/mozilla/extensions/help/resources/locale/en-US/ssl_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/ssl_help.xhtml
@@ -111,6 +111,8 @@ the warning checkboxes in the SSL preferences panel. Some people find these warn
 <hr>
 <a NAME="cipher_help"></a>
 <a NAME="SSL:ciphersIDX"></a>
+<a NAME="encryption:technologiesIDX"></a>
+<a NAME="encryption_technologiesSDX"></a>
 <h2>Edit Ciphers</h2>
 <p>This section describes how to use the Edit Ciphers dialog box. If you're not already viewing it, follow these steps:
 
@@ -129,13 +131,13 @@ the warning checkboxes in the SSL preferences panel. Some people find these warn
 <ul>
 	<li><a href="http://developer.netscape.com/docs/manuals/security/pkin/index.htm" target="_blank">Introduction to Public-Key Cryptography</a>
 	<li><a href="http://developer.netscape.com/docs/manuals/security/sslin/index.htm" target="_blank">Introduction to SSL</a>
-	<li><a href="http://www.mozilla.org/projects/security/pki/nss/algorithms.html" target="_blank">Encryption Technologies</a>.
+	<li><a href="http://www.mozilla.org/projects/security/pki/nss/nss-3.4/nss-3.4-algorithms.html" target="_blank">Encryption Technologies Available in NSS 3.4</a>.
 </ul>
 
 <p>&nbsp;
 
 <hr>
-<p><i>18 June 2002</i></body>
+<p><i>20 June 2002</i></body>
 <p>Copyright &copy; 1994-2002 Netscape Communications Corporation.</p>
 
 </body>