[kde-doc-english] [kdepim] doc/kmail: Documentation: Menus.docbook Composer menu Message and correcct formatting.

[Scarlett Clark]

Git commit 092ab3ae827efe56733a5520ce9d63d6bd8f1349 by Scarlett Clark.
Committed on 08/08/2013 at 20:07.
Pushed by scarlettclark into branch 'master'.

Documentation: Menus.docbook Composer menu Message and correcct formatting.

REVIEW:111900

M  +1254 -1063 doc/kmail/menus.docbook

http://commits.kde.org/kdepim/092ab3ae827efe56733a5520ce9d63d6bd8f1349

diff --git a/doc/kmail/menus.docbook b/doc/kmail/menus.docbook
index 07ea108..381b23a 100644
--- a/doc/kmail/menus.docbook
+++ b/doc/kmail/menus.docbook
@@ -44,7 +44,7 @@
 <releaseinfo>&kde; 4.11</releaseinfo>
 </chapterinfo>
 
-<title>Menu Entries</title>
+<title>Command and Menu Reference</title>
 <para>
   &kmail; has common &kde; <guimenu>Edit</guimenu>, <guimenu>Settings</guimenu>, and
 <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-edit">Edit Menu</ulink>, <ulink
@@ -55,133 +55,186 @@ of the &kde; Fundamentals.
 performs a menu item function, the default shortcut is listed with the menu item.</para>
 
 <sect1 id="main-mail-reader-window">
-<title>The Main Window</title>
+<title>The Main &kmail; Reader Window</title>
 
 <sect2 id="reader-file-menu">
-  <title>File Menu</title>
+<title>File Menu</title>
 <variablelist>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu></menuchoice></term>
-    <listitem>
-      <para>The main file menu to work with the current message/folder.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>Here you can create several new items as follows:</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>New Message...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Compose a new message.</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guisubmenu>Message from Template</guisubmenu></menuchoice></term>
-    <listitem>
-      <para> If you have any saved templates, they will be listed on the submenu, select the one you wish to use. To save messages to a template, select
-        <menuchoice><shortcut><keycap>T</keycap></shortcut><guimenu>Message</guimenu><guimenuitem>Edit Message</guimenuitem></menuchoice>,
-        and in the message edit window, select  <menuchoice><guimenu>Message</guimenu><guimenuitem>Save as Template</guimenuitem></menuchoice></para>
-      <para>If you do not have any templates saved, you will see <menuchoice><guimenu>Message</guimenu><guisubmenu>Message from Template</guisubmenu><guimenuitem>(no templates)</guimenuitem></menuchoice></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Add Folder...</guimenuitem></menuchoice></term>
-    <listitem>
-    <para><action>Create a new folder</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>New AddressBook Contact...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Brings up the new contact dialog</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Open...</guimenuitem></menuchoice></term>
-    <listitem><para><action>Open email messages or mailboxes.</action></para></listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Recent</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Opens recently used messages.</action> Only messages that have been saved and then opened will show up on this list.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Saves the currently displayed message to a <filename class="extension">.mbox</filename> file.</action> This includes all the headers and attachments.</para>
-      <para>If you would like to save it to a different format ⪚ text, deselect <guilabel>Automatically select filename extension (.mbox)</guilabel>
-        and be sure to change the file extension.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Import Messages...</guimenuitem></menuchoice></term>
-    <listitem><para><action>Starts up <application>kmailcvt</application></action>. This application lets you import
-        messages from several email clients into &kmail;.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Print Preview...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Display a dialog which shows how your email will be printed. Note: This will only be available if a printer is available.</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Print...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Display a dialog that lets you print the currently displayed message.</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Expire All Folders</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Delete old messages from all folders, according to the rules in each folder's
-        <link linkend="folders-properties-window">Properties dialog</link> (the default is not to delete old messages at all).</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Empty All Trash Folders</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Use this to empty all trash folders, &ie; the local trash folder and
-        all trash folders that you might have on &imap; servers.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Work Offline</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Sets &kmail; to offline mode.</action> This turns off all network jobs. This is
-        useful when working with messages without a network connection. This selection will become
-        <menuchoice><guimenu>File</guimenu><guimenuitem>Work Online</guimenuitem></menuchoice>, which needs to be selected to go back online (required to send and receive).</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Checks for new messages in all your accounts.</action></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guisubmenu>Check Mail In</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>Submenu that lets you check for new messages from a particular account.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>F5</keycap></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Update Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Checks whether new mail arrived in the currently selected folder. This is only available for &imap; folders.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Update This Folder and All Its Subfolders</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Checks whether new mail arrived in the currently selected folder and all of its subfolders. This is only available for &imap; folders.
-        You can also select multiple folders and the menu item will turn into <menuchoice><guimenu>File</guimenu><guimenuitem>Update These Folders and All Their Subfolders</guimenuitem></menuchoice></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Sends the messages that are in your outbox.</action>
-        Messages can end up in your outbox by selecting Queue in the composer menu, Composing a message in offline mode, and sending while you have no Internet connection.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages via</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Sends the messages that are in your outbox via a specific outgoing account.</action>
-        This allows you to choose which server to send your queued messages from. They must be configured in <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> in the <menuchoice><guiicon>Accounts</guiicon><guilabel>Sending</guilabel></menuchoice> tab to show up here.</para>
-    </listitem>
-  </varlistentry>
+<varlistentry id="file-new">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>New</guisubmenu>
+</menuchoice></term>
+<listitem><para>Here you can create several new items as follows:</para></listitem>
+</varlistentry>
+<varlistentry id="file-new-newmessage">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>New</guisubmenu>
+<guimenuitem>New Message...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Compose a new message.</action></para></listitem>
+</varlistentry>
+<varlistentry id="file-new-message-from-template">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>New</guisubmenu>
+<guisubmenu>Message from Template</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Creates a new message from a selected template.</action> Please see <link linkend="new-compose-from-templates">Compose From Templates</link> for additional information on creating templates.</para>
+<para>If you do not have any templates saved, you will see <menuchoice><guimenu>Message</guimenu><guisubmenu>Message from Template</guisubmenu><guimenuitem>(no templates)</guimenuitem></menuchoice></para></listitem>
+</varlistentry>
+<varlistentry id="add-folder">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>New</guisubmenu>
+<guimenuitem>Add Folder...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Create a new folder</action></para></listitem>
+</varlistentry>
+<varlistentry id="new-addressbook-contact">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>New</guisubmenu>
+<guimenuitem>New AddressBook Contact...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the new contact dialog</action></para></listitem>
+</varlistentry>
+<varlistentry id="file-open">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Open...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Open email messages or mailboxes.</action></para></listitem>
+</varlistentry>
+<varlistentry id="open-recent">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Open Recent</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens recently used messages.</action> Only messages that have been saved and then opened will show up on this list.</para></listitem>
+</varlistentry>
+<varlistentry id="file-save-as">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Save As...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Saves the currently displayed message to a .mbox file.</action> This includes all the headers and attachments.</para>
+<para>If you would like to save it to a different format ⪚ <filename role="extension">.txt</filename>, deselect <guilabel>Automatically select filename extension (.mbox)</guilabel>, and be sure to change the file extension while naming the file.</para></listitem>
+</varlistentry>
+<varlistentry id="file-import-messages">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Import Messages...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Starts up <application>kmailcvt</application></action>. This application lets you import messages from several email clients into &kmail;.</para></listitem>
+</varlistentry>
+<varlistentry id="file-print-preview">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Print Preview...</guimenuitem></menuchoice></term>
+<listitem>
+<para><action>Display a dialog which shows how your email will be printed.</action></para>
+<note><para>This will only be enabled if a printer is available.</para></note></listitem>
+</varlistentry>
+<varlistentry id="file-print">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Print...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Display a dialog that lets you print the currently displayed message.</action></para></listitem>
+</varlistentry>
+<varlistentry id="file-expire-all-folders">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Expire All Folders</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Delete old messages from all folders.</action> Deletion will occur according to the rules in each folder's
+<link linkend="folders-properties-window">Properties dialog</link> (the default is not to delete old messages at all).</para>
+</listitem>
+</varlistentry>
+<varlistentry id="empty-all-trash-folders">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Empty All Trash Folders</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Use this to empty all trash folders,</action> &ie; the local trash folder and all trash folders that you might have on &imap; servers.</para></listitem>
+</varlistentry>
+<varlistentry id="work-offline">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Work Offline</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Sets &kmail; to offline mode.</action>
+This turns off all network jobs. This is useful when working with messages without a network connection.
+This selection will become <menuchoice><guimenu>File</guimenu><guimenuitem>Work Online</guimenuitem></menuchoice>,
+which needs to be selected to go back online (required to send and receive).</para></listitem>
+</varlistentry>
+<varlistentry id="check-mail">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Check Mail</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Checks for new messages in all your accounts.</action></para></listitem>
+</varlistentry>
+<varlistentry id="file-check-mail-in">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guisubmenu>Check Mail In</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Check for new messages from a particular account,</action> these accounts will be listed in the submenu.</para></listitem>
+</varlistentry>
+<varlistentry id="update-folder">
+<term><menuchoice>
+<shortcut>
+<keycap>F5</keycap>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Update Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
+<note><para> This is only available for &imap; folders.</para></note></listitem>
+</varlistentry>
+<varlistentry id="update-this-folder-and-all-subfolders">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Update This Folder and All Its Subfolders</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Checks whether new mail arrived in the currently selected folder and all of its subfolders.</action></para>
+<para>You can also select multiple folders and the menu item will turn into <menuchoice><guimenu>File</guimenu><guimenuitem>Update These Folders and All Their Subfolders</guimenuitem></menuchoice></para>
+<note><para> This is only available for &imap; folders.</para></note></listitem>
+</varlistentry>
+<varlistentry id="send-queued-messages">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Send Queued Messages</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Sends the messages that are in your outbox.</action> Messages can end up in your outbox by selecting <guibutton>Queue</guibutton> in the composer menu,
+composing a message in offline mode, and sending while you have no Internet connection.</para></listitem>
+</varlistentry>
+<varlistentry id="send-queued-messages-via">
+<term><menuchoice>
+<guimenu>File</guimenu>
+<guimenuitem>Send Queued Messages Via</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Sends the messages that are in your outbox via a specific outgoing account.</action>
+This allows you to choose which server to send your queued messages from. They must be configured in Configure &kmail; dialog, under the <menuchoice><guiicon>Accounts</guiicon><guilabel>Sending</guilabel></menuchoice> tab to show up here.</para></listitem>
+</varlistentry>
   <!-- Exists, however this seems misplaced or mislabeled, per sgclark & blueck 2013.
   <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
         <guimenu>File</guimenu><guimenuitem>New Message</guimenuitem></menuchoice></term>
@@ -189,12 +242,16 @@ performs a menu item function, the default shortcut is listed with the menu item
       <para>The shortcut will open up the New Message compose window. The submenu contains menu entries and shortcuts for various &kontact; tasks.</para>
     </listitem>
   </varlistentry>-->
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></shortcut>
-        <guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice></term>
-    <listitem>
-      <para><action>Exits &kmail;</action></para>
-    </listitem>
-  </varlistentry>
+<varlistentry id="file-quit">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
+</shortcut>
+<guimenu>File</guimenu>
+<guimenuitem>Quit</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Exits &kmail;</action></para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect2>
@@ -204,42 +261,68 @@ performs a menu item function, the default shortcut is listed with the menu item
 <title>Edit Menu</title>
 
 <variablelist>
-  <varlistentry><term><menuchoice><shortcut><keycap>Del</keycap></shortcut><guimenu>Edit</guimenu><guimenuitem>Move to Trash</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Moves the selected messages to the trash folder. If the selected
-        messages are already in the trash folder, they will be permanently deleted.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Del</keycap></keycombo></shortcut><guimenu>Edit</guimenu><guimenuitem>Move Thread to Trash</guimenuitem></menuchoice></term>
-      <listitem>
-      <para>Moves the selected thread to the trash folder, ⪚ a conversation in a mailing list.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>S</keycap></shortcut><guimenu>Edit</guimenu><guimenuitem>Find Messages...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up a search window that lets you search for messages with
-        certain characteristics, ⪚ a certain subject. Start the search by entering
-        some values and press <guibutton>Search</guibutton>.</para>
-      <para>Your search results will display in the text area, at which point you can open
-        the <guibutton>Open Search Folder</guibutton> or highlight the desired message and select <guibutton>Open Message</guibutton>.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut><guimenu>Edit</guimenu><guimenuitem>Find in Message...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Lets you search for a string in the currently displayed message.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo></shortcut><guimenu>Edit</guimenu><guimenuitem>Select All Messages</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects all messages in the current folder.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo></shortcut><guimenu>Edit</guimenu><guimenuitem>Select All Text</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects the text of the currently displayed message.</para>
-    </listitem>
-  </varlistentry>
+<varlistentry id="move-to-trash">
+<term><menuchoice>
+<shortcut>
+<keycap>Del</keycap>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move to Trash</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Moves the selected messages to the trash folder.</action>
+If the selected messages are already in the trash folder, they will be permanently deleted.</para></listitem>
+</varlistentry>
+<varlistentry id="move-thread-to-trash">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>Del</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Move Thread to Trash</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Moves the selected thread to the trash folder,</action> ⪚ a conversation in a mailing list.</para></listitem>
+</varlistentry>
+<varlistentry id="edit-find-messages">
+<term><menuchoice>
+<shortcut>
+<keycap>S</keycap></shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Find Messages...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up a search window</action> that lets you search for messages with certain characteristics,
+⪚ a certain subject. Please see <link linkend="filter-criteria">Filter Criteria</link> for details on search options.</para>
+<para>Your search results will display in the text area, at which point you can open the <guibutton>Open Search Folder</guibutton> or highlight the desired message and select <guibutton>Open Message</guibutton>.</para></listitem>
+</varlistentry>
+<varlistentry id="edit-find-in-message">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Find in Message...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Searches the current message text for a string entered into the <guilabel>Find:</guilabel> textbox.</action></para></listitem>
+</varlistentry>
+<varlistentry id="edit-select-all-messages">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>A</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Select All Messages</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects all messages in the current folder.</action></para></listitem>
+</varlistentry>
+<varlistentry id="edit-select-all-text">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>T</keycap></keycombo>
+</shortcut>
+<guimenu>Edit</guimenu>
+<guimenuitem>Select All Text</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects the text of the currently displayed message.</action></para></listitem>
+</varlistentry>
 </variablelist>
 </sect2>
 
@@ -248,177 +331,184 @@ performs a menu item function, the default shortcut is listed with the menu item
 <title>View Menu</title>
 
 <variablelist>
-  <varlistentry><term><menuchoice><guimenu>View</guimenu><guisubmenu>Message List</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>This menu has the following options to change the view of your message list.</para>
-      <variablelist>
-        <varlistentry><term><menuchoice><guimenu>Message List</guimenu><guisubmenu>Sorting</guisubmenu></menuchoice></term>
-          <listitem>
-          <para>Contains options to customize your sort order as follows:</para>
-          <itemizedlist>
-            <listitem>
-              <para><guilabel>Message Sort Order</guilabel> has several options, most are self explanatory. The following options may not be immediately obvious,
-                therefore deserve an explanation.</para>
-                <itemizedlist>
-                  <listitem>
-                    <para><guilabel>Smart Sender/Receiver</guilabel> will display the sender when you are reading in your outbox folder/template folder, and display the receiver when you are
-                      in your inbox/inbox subfolders.</para>
-                  </listitem>
-                  <listitem>
-                    <para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel> need to be set before
-                      they can be sorted. Please see <link linkend="mark-messages">Mark Messages</link> for more information on marking your messages.</para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-              <listitem>
-                <para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel> allow you to
-                  change the direction of your message/group sort respectively.</para>
-              </listitem>
-              <listitem>
-                <para><guilabel>Folder always Uses this Sort Order</guilabel> allows you to keep your sort settings per folder.</para>
-              </listitem>
-          </itemizedlist>
-        </listitem>
-        </varlistentry>
-        <varlistentry><term><menuchoice><guimenu>Message List</guimenu><guisubmenu>Aggregation</guisubmenu></menuchoice></term>
-          <listitem>
-          <para>Allows you to set your aggregation view.</para>
-            <para><guilabel>Configure...</guilabel> Allows you to configure aggregation, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on aggregation.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry><term><menuchoice><guimenu>Message List</guimenu><guisubmenu>Theme</guisubmenu></menuchoice></term>
-          <listitem>
-            <para>Allows you to select a theme.</para>
-            <para><guilabel>Configure...</guilabel> Allows you to configure themes, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on themes.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo></shortcut><guimenu>Message List</guimenu><guisubmenu>Create New Tab</guisubmenu></menuchoice></term>
-          <listitem>
-            <para>Allows you to create a tab, then select the folder you would like to display in the tab.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>W</keycap></keycombo></shortcut><guimenu>Message List</guimenu><guisubmenu>Close Tab</guisubmenu></menuchoice></term>
-          <listitem><para>Closes the currently selected tab.</para></listitem>
-        </varlistentry>
-        </variablelist>
-    </listitem>
-    </varlistentry>
-    <varlistentry id="view-headers"><term><menuchoice><guimenu>View</guimenu><guisubmenu>Headers</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>This allows you to select your headers view. Your choices are as follows:</para>
-        <itemizedlist>
-          <listitem><para><guilabel>Enterprise Headers</guilabel>
-            A minimal header with title, From, and To, with a graphical design.</para>
-          </listitem>
-          <listitem><para><guilabel>Fancy Headers</guilabel>
-            Minimal header with a spam status notification.</para>
-          </listitem>
-          <listitem><para><guilabel>Brief Headers</guilabel>
-            Title, and in parentheses you will find From and the date.</para>
-          </listitem>
-          <listitem><para><guilabel>Standard Headers</guilabel>
-            Title, From, and To.</para>
-          </listitem>
-          <listitem><para><guilabel>Long Headers</guilabel>
-            Title, Date, From, and To.</para>
-          </listitem>
-          <listitem><para><guilabel>All Headers</guilabel>
-            List everything you ever wanted to know about the email, including every server it went through, virus/spam scanners it went through &etc;</para>
-          </listitem>
-          <listitem><para><guilabel>Custom Headers</guilabel>
-            You must configure custom headers first here: <menuchoice><guimenu>Settings</guimenu><guisubmenu>Configure &kmail;...</guisubmenu></menuchoice> and select the <guiicon>Appearance</guiicon> icon. From there
-              you want the <guilabel>Message Window</guilabel> tab, and you will find the settings at the bottom with the label <guilabel>Headers:</guilabel>. See
-              <link linkend="configure-appearance-message-window">Message Window configuration</link> for more information.</para>
-          </listitem>
-          <listitem><para><guilabel>Example</guilabel>
-              An example header from the <guilabel>Download New Themes</guilabel></para>
-          </listitem>
-          <listitem><para><guilabel>Example Fancy</guilabel>
-              An example fancy header from the <guilabel>Download New Themes</guilabel></para>
-          </listitem>
-          <listitem><para><guilabel>Download New Themes</guilabel>
-            Allows you to download custom themes created by other &kmail; users.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </varlistentry>
-    <varlistentry id="view-attachments"><term><menuchoice><guimenu>View</guimenu><guimenuitem>Attachments</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Changes the way attachments appear in the <guilabel>Message Preview Pane</guilabel>
-          (independent of the &MIME; Tree) as follows:</para>
-        <itemizedlist>
-          <listitem><para><guimenuitem>As Icons</guimenuitem>, all attachments appear as icons at the bottom of the message.</para></listitem>
-          <listitem><para><guimenuitem>Smart</guimenuitem> will show attachments as icons, unless the message suggests that they should be displayed inline.
-              You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel>Suggest automatic display</guilabel>
-              in the attachment's properties dialog.</para>
-          </listitem>
-          <listitem><para><guimenuitem>Inline</guimenuitem> shows the contents of the attachments
-              at the bottom of the message. Attachments that cannot be displayed, ⪚ compressed files, will still be shown as an icon.</para>
-          </listitem>
-          <listitem><para><guimenuitem>Hide</guimenuitem> will not show attachments.</para></listitem>
-        </itemizedlist>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>.</keycap></shortcut><guimenu>View</guimenu>
-          <guimenuitem>Expand Thread / Group</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>This will display the thread of the current message, &ie;
-      all messages that are replies to the current message.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>,</keycap></shortcut><guimenu>View</guimenu><guimenuitem>Collapse Thread / Group</guimenuitem></menuchoice></term>
-      <listitem><para>This will hide the thread of the current message, &ie; it will hide all messages that are replies to the current message.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>.</keycap></keycombo></shortcut><guimenu>View</guimenu>
-          <guimenuitem>Expand All Threads</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Expands all threads in the current folder.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo></shortcut>
-          <guimenu>View</guimenu><guimenuitem>Collapse All Threads</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Collapses all threads in the current folder.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>V</keycap></shortcut><guimenu>View</guimenu>
-          <guimenuitem>View Source</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Shows the message and its complete headers in plain text format in a new
-          window. This can be useful to find out the origin of a mail. You should know
-          that it is easy to fake the <literal>From:</literal> header of a mail, but
-          one can still find out which mail servers have been used to send the message by looking
-          at the <literal>Received:</literal> lines in the header.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>View</guimenu>
-          <guimenuitem>Show Message Structure</guimenuitem></menuchoice></term>
-      <listitem>
-        <para> Display the structure viewer, which is a part of the main window that
-          lets you access all parts of a message.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>X</keycap></shortcut><guimenu>View</guimenu>
-          <guimenuitem>Use Fixed Font</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Uses a fixed width (Monospace) font to display the messages
-          in the current folder. The font to be used can be configured in the
-          <guilabel>Appearance</guilabel>/<guilabel>Fonts</guilabel> in the <menuchoice>
-            <guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> dialog.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>View</guimenu><guisubmenu>Set Encoding</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Lets you choose the character encoding to be used in the Message Pane.
-          The default, <guilabel>Auto</guilabel>, should work in almost all cases.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>View</guimenu><guisubmenu>Zoom</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Allows to zoom message in the Message Pane.</para>
-      </listitem>
-    </varlistentry>
+<varlistentry id="view-message-list">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Message List</guisubmenu>
+</menuchoice></term>
+<listitem><para>This menu has the following options to change the view of your message list.</para>
+<variablelist>
+<varlistentry id="messagelist-sorting">
+<term><menuchoice>
+<guisubmenu>Sorting</guisubmenu>
+</menuchoice></term>
+<listitem><para>Contains options to customize your sort order as follows:</para>
+<itemizedlist>
+  <listitem><para><guilabel>Message Sort Order</guilabel> has several options, most are self explanatory.
+The following options may not be immediately obvious, therefore deserve an explanation.</para>
+  <itemizedlist>
+    <listitem><para><guilabel>Smart Sender/Receiver</guilabel> will display the sender when you are reading in your outbox folder/template folder, and display the receiver when you are in your inbox/inbox subfolders.</para></listitem>
+    <listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel> need to be set before they can be sorted. Please see <link linkend="mark-messages">Mark Messages</link> for more information on marking your messages.</para></listitem>
+  </itemizedlist></listitem>
+  <listitem><para><guilabel>Message Sort Direction</guilabel> and <guilabel>Group Sort Direction</guilabel> allow you to change the direction of your message/group sort respectively.</para></listitem>
+  <listitem><para><guilabel>Folder always Uses this Sort Order</guilabel> allows you to keep your sort settings per folder.</para></listitem>
+</itemizedlist></listitem>
+</varlistentry>
+<varlistentry id="messagelist-aggregation">
+<term><menuchoice>
+<guisubmenu>Aggregation</guisubmenu>
+</menuchoice></term>
+<listitem><para>Allows you to set your aggregation view.</para>
+<para><guilabel>Configure...</guilabel> Allows you to configure aggregation, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on aggregation.</para></listitem>
+</varlistentry>
+<varlistentry id="messagelist-theme">
+<term><menuchoice>
+<guisubmenu>Theme</guisubmenu>
+</menuchoice></term>
+<listitem><para>Allows you to select a theme.</para>
+<para><guilabel>Configure...</guilabel> Allows you to configure themes, please see <link linkend="configure-appearance-message-list">Configure Appearance Message List</link> for more information on themes.</para></listitem>
+</varlistentry>
+<varlistentry id="messagelist-create-new-tab">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>T</keycap></keycombo>
+</shortcut>
+<guisubmenu>Create New Tab</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Creates a new tab,</action> then select the folder you would like to display in the tab.</para></listitem>
+</varlistentry>
+<varlistentry id="messagelist-close-tab">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>W</keycap></keycombo>
+</shortcut>
+<guisubmenu>Close Tab</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Closes the currently selected tab.</action></para></listitem>
+</varlistentry>
+</variablelist></listitem>
+</varlistentry>
+<varlistentry id="view-headers">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Headers</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Select your headers view.</action> Your choices are as follows:</para>
+<itemizedlist>
+  <listitem><para><guilabel>Enterprise Headers</guilabel> A minimal header with title, From, and To, with a graphical design.</para></listitem>
+  <listitem><para><guilabel>Fancy Headers</guilabel> Minimal header with a spam status notification.</para></listitem>
+  <listitem><para><guilabel>Brief Headers</guilabel> Title, and in parentheses you will find From and the date.</para></listitem>
+  <listitem><para><guilabel>Standard Headers</guilabel> Title, From, and To.</para></listitem>
+  <listitem><para><guilabel>Long Headers</guilabel> Title, Date, From, and To.</para></listitem>
+  <listitem><para><guilabel>All Headers</guilabel> List everything you ever wanted to know about the email, including every server it went through, virus/spam scanners it went through &etc;</para></listitem>
+  <listitem><para><guilabel>Custom Headers</guilabel> See <link linkend="configure-appearance-message-window">Message Window configuration</link> <guilabel>Headers:</guilabel> to set up custom headers that can be selected here.</para></listitem>
+  <listitem><para><guilabel>Example</guilabel> An example header from the <guilabel>Download New Themes</guilabel></para></listitem>
+  <listitem><para><guilabel>Example Fancy</guilabel> An example fancy header from the <guilabel>Download New Themes</guilabel></para></listitem>
+  <listitem><para><guilabel>Download New Themes</guilabel> Allows you to download custom themes created by other &kmail; users.</para></listitem>
+</itemizedlist></listitem>
+</varlistentry>
+<varlistentry id="view-attachments">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Attachments</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Changes the way attachments appear in the <guilabel>Message Preview Pane</guilabel></action>
+(independent of the &MIME; Tree) as follows:</para>
+<itemizedlist>
+  <listitem><para><guimenuitem>As Icons</guimenuitem>, all attachments appear as icons at the bottom of the message.</para></listitem>
+  <listitem><para><guimenuitem>Smart</guimenuitem> will show attachments as icons, unless the message suggests that they should be displayed inline.
+ You can suggest that certain attachments should be shown inline in your own messages when you select <guilabel>Suggest automatic display</guilabel>
+ in the attachment's properties dialog.</para></listitem>
+  <listitem><para><guimenuitem>Inline</guimenuitem> shows the contents of the attachments at the bottom of the message.
+Attachments that cannot be displayed, ⪚ compressed files, will still be shown as an icon.</para></listitem>
+  <listitem><para><guimenuitem>Hide</guimenuitem> will not show attachments.</para></listitem>
+</itemizedlist></listitem>
+</varlistentry>
+<varlistentry id="expand-thread-or-group">
+<term><menuchoice>
+<shortcut>
+<keycap>.</keycap></shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Expand Thread / Group</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>This will display the thread of the current message,</action> &ie; all messages that are replies to the current message.</para></listitem>
+</varlistentry>
+<varlistentry id="view-collapse-thread-or-group">
+<term><menuchoice>
+<shortcut>
+<keycap>,</keycap>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Collapse Thread / Group</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>This will hide the thread of the current message,</action> &ie; it will hide all messages that are replies to the current message.</para></listitem>
+</varlistentry>
+<varlistentry id="view-expand-all-threads">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>.</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Expand All Threads</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Expands all threads in the current folder.</action></para></listitem>
+</varlistentry>
+<varlistentry id="view-collapse-all-threads">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>,</keycap></keycombo>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Collapse All Threads</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Collapses all threads in the current folder.</action></para></listitem>
+</varlistentry>
+<varlistentry id="view-viewsource">
+<term><menuchoice>
+<shortcut>
+<keycap>V</keycap>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>View Source</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Shows the message and its complete headers in plain text format in a new window.</action>
+This can be useful to find out the origin of a mail. </para>
+<note><para>You should know that it is easy to fake the <literal>From:</literal> header of a mail, but one can still find out which mail
+servers have been used to send the message by looking at the <literal>Received:</literal> lines in the header.</para></note></listitem>
+</varlistentry>
+<varlistentry id="view-show-message-structure">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guimenuitem>Show Message Structure</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Display the structure viewer,</action> which is a part of the main window that lets you access all parts of a message.</para></listitem>
+</varlistentry>
+<varlistentry id="view-use-fixed-font">
+<term><menuchoice>
+<shortcut>
+<keycap>X</keycap>
+</shortcut>
+<guimenu>View</guimenu>
+<guimenuitem>Use Fixed Font</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Uses a fixed width (Monospace) font to display the messages in the current folder.</action>
+ The font to be used can be configured in the <link linkend="configure-appearance-fonts">Configure Appearance Fonts</link> tab of the configuration dialog.</para></listitem>
+</varlistentry>
+<varlistentry id="view-set-encoding">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Set Encoding</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Lets you choose the character encoding to be used in the Message Pane.</action>
+ The default, <guilabel>Auto</guilabel>, should work in almost all cases.</para></listitem>
+</varlistentry>
+<varlistentry id="view-zoom">
+<term><menuchoice>
+<guimenu>View</guimenu>
+<guisubmenu>Zoom</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Allows to zoom message in the Message Pane.</action></para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect2>
@@ -428,524 +518,592 @@ performs a menu item function, the default shortcut is listed with the menu item
 <title>Go Menu</title>
 
 <variablelist>
-  <varlistentry><term><menuchoice><shortcut><keycap>J</keycap></shortcut><guimenu>Go</guimenu>
-        <guimenuitem>Jump to Folder...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selecting this menu item with show a dialog box with a list of all your folders. Click on the folder you wish to
-        view and it will display it in the message view pane.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>N</keycap></shortcut><guimenu>Go</guimenu>
-        <guimenuitem>Next Message</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects the next message in the message list. The keyboard shortcut
-        <keycap>Right Arrow</keycap> also performs this action.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>+</keycap></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Next Unread Message</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects the next unread message in the message list. If there are not any unread messages below the currently selected message,
-        then the behavior depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>P</keycap></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Previous Message</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects the previous message in the message list.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>-</keycap></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Previous Unread Message</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Selects the previous unread message in the message list. If there is
-        not an unread message above the currently selected message, then the behavior
-        depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>+</keycap></keycombo></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Next Unread Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Jumps to the next folder with unread messages.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Alt;<keycap>-</keycap></keycombo></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Previous Unread Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Jumps to the previous folder with unread messages.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>Space</keycap></shortcut>
-        <guimenu>Go</guimenu><guimenuitem>Next Unread Text</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Scrolls down if you are not yet at the bottom of a message,
-        otherwise jumps to the next unread message.</para>
-    </listitem>
-  </varlistentry>
-</variablelist>
-
-</sect2>
-
-<sect2 id="reader-folder-menu">
-<title>Folder Menu</title>
-<variablelist>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Add Folder...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens the <link linkend="folders-properties-window">Folder Properties</link>
-        dialog that lets you create a new folder.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mark All Messages as Read</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Sets the status of all new and unread messages in the current folder to read.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>F5</keycap></shortcut>
-        <guimenu>Folder</guimenu><guimenuitem>Update Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Checks whether new mail arrived in the currently selected folder.
-        This is only available for &imap; folders.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo></shortcut>
-        <guimenu>Folder</guimenu><guimenuitem>Update Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Checks whether new mail arrived in the currently selected folder.
-        This is only available for &imap; folders.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu>
-        <guimenuitem>Move All Messages to Trash</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Moves all of the messages in the selected folder into the trash folder.
-        This is only available if the currently selected folder is not a trash
-        folder.</para>
-      <para>If the currently selected folder is a trash folder, you will see <guilabel>Empty Trash</guilabel>. Please see next section for details.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Empty Trash</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Permanently deletes all messages. This is only available if the
-        currently selected folder is a trash folder.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu>
-        <guimenuitem>Archive Folder...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>This option brings up a dialog to allow you to create an archive of the currently selected folder.
-        In the dialog select a format (choices are: zip, tar, tar.bz2, and tar.gz). If you would like to
-        change the default name or location, click the folder at the end of <guilabel>Archive File</guilabel>.
-        Check the <guilabel>Delete folder and subfolders after completion</guilabel> if you would like everything you archived deleted. By default
-        all subfolders will be archived, uncheck <guilabel>Archive all subfolders</guilabel> if you only want to archive the parent folder.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu>
-        <guimenuitem>Delete Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Removes the selected folder and all its contents, including subfolders.</para>
-      <warning><para>Please note that there is no way to access the contents
-          of a folder after it has been removed.</para></warning>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo></shortcut>
-        <guimenu>Folder</guimenu><guimenuitem>Remove Duplicate Messages</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Searches the folder for duplicate messages and deletes the
-        duplicates.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Apply All Filters On Folder</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Applies all configured filters on the currently selected folder. Please see
-        <link linkend="filter-dialog-id">Filter dialog</link> for more information on filters.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Prefer HTML to Plain Text</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>If enabled then &html; messages in this folder will be shown using
-        &html; rendering. For security reasons, we recommend to only
-        activate this for folders which only contain trusted messages.</para>
-    </listitem>
-  </varlistentry>
-   <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Load External References</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>If you have &html; messages enabled (see above), then you have the option to enable this to have images and resources linked from the web will load automatically.
-        For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mailing List Management...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>This opens up the mailing list management dialog. Please see <link linkend="folders-properties-mailinglist">Mailing List dialog</link> for more information on mailing lists.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Assign Shortcut...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>This allows you to assign a keyboard shortcut to the currently selected folder.</para>
-    </listitem>
-  </varlistentry>
+<varlistentry id="go-jump-to-folder">
+<term><menuchoice>
+<shortcut>
+<keycap>J</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Jump to Folder...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Show a dialog box with a list of all your folders.</action>
+ Click on the folder you wish to view and it will display it in the message view pane.</para></listitem>
+</varlistentry>
+<varlistentry id="go-next-message">
+<term><menuchoice>
+<shortcut>
+<keycap>N</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Next Message</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects the next message in the message list.</action>
+ The keyboard shortcut <keycap>Right Arrow</keycap> also performs this action.</para></listitem>
+</varlistentry>
+<varlistentry id="go-next-unread-message">
+<term><menuchoice>
+<shortcut>
+<keycap>+</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Next Unread Message</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects the next unread message in the message list.</action>
+ If there are not any unread messages below the currently selected message, then the behavior depends on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para></listitem>
+</varlistentry>
+<varlistentry id="go-previous-message">
+<term><menuchoice>
+<shortcut>
+<keycap>P</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Previous Message</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects the previous message in the message list.</action></para></listitem>
+</varlistentry>
+<varlistentry id="go-previous-unread">
+<term><menuchoice>
+<shortcut>
+<keycap>-</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Previous Unread Message</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Selects the previous unread message in the message list.</action>
+ If there is not an unread message above the currently selected message, then the behavior depends on the value of the
+<xref linkend="configure-misc-folders-go-unread"/> option.</para></listitem>
+</varlistentry>
+<varlistentry id="go-next-unread-folder">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>+</keycap></keycombo>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Next Unread Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Jumps to the next folder with unread messages.</action></para></listitem>
+</varlistentry>
+<varlistentry id="go-previous-unread-folder">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Alt;<keycap>-</keycap></keycombo>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Previous Unread Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Jumps to the previous folder with unread messages.</action></para></listitem>
+</varlistentry>
+<varlistentry id="go-next-unread-text">
+<term><menuchoice>
+<shortcut>
+<keycap>Space</keycap>
+</shortcut>
+<guimenu>Go</guimenu>
+<guimenuitem>Next Unread Text</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Scrolls down if you are not yet at the bottom of a message, otherwise jumps to the next unread message.</action></para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect2>
 
-<sect2 id="reader-message-menu">
-<title>Message Menu</title>
-
-<variablelist>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
-        <guimenu>Message</guimenu><guimenuitem>New Message...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens the <link linkend="the-composer-window">composer window</link> so you can
-        write a new message.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo></shortcut>
-        <guimenu>Message</guimenu><guimenuitem>New Message to Mailing-List...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens the composer window so you can write a new mail.
-        If the current folder holds a mailing list and has a posting
-        address defined, this address will be the default <guilabel>To:</guilabel>
-        address.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>R</keycap></shortcut>
-        <guimenu>Message</guimenu><guimenuitem>Reply...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up the composer window, inserts the quoted text of the currently
-        selected message and presets the <guilabel>To:</guilabel> field either with
-        the mailing-list address (if you reply to a mailing-list message) or with the
-        preferred reply address of the sender. If you want to control which address
-        the <guilabel>To:</guilabel> field is preset with then you should use
-        <menuchoice><guimenu>Message</guimenu><guimenuitem>Reply Special</guimenuitem></menuchoice>.
-        Please see <link linkend="reply-special">Reply Special</link> for more information.
-        Your identity will automatically be set to the identity this message was
-        sent to.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>A</keycap></shortcut>
-        <guimenu>Message</guimenu><guimenuitem>Reply to All...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up the composer window, inserts the quoted text of the currently
-        selected message and presets the <guilabel>To:</guilabel> field either with
-        the mailing-list address (if you reply to a mailing-list message) or with the
-        preferred reply address of the sender. The <guilabel>Copy to (CC):</guilabel>
-        field is preset with the addresses of all other recipients of the currently
-        selected message excluding your own addresses.
-        Your identity will automatically be set to the identity this message was
-        sent to.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry id="reply-special"><term><menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>A</keycap></keycombo></shortcut>
-        <guimenu>Message</guimenu><guisubmenu>Reply Special</guisubmenu><guimenuitem>Reply to Author...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up the composer window, inserts the quoted text of the currently
-        selected message and presets the <guilabel>To:</guilabel> field with the
-        preferred reply address of the sender.
-        Your identity will automatically be set to the identity this message was
-        sent to.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycap>L</keycap></shortcut><guimenu>Message</guimenu>
-        <guisubmenu>Reply Special</guisubmenu><guimenuitem>Reply to Mailing-List...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up the composer window, inserts the quoted text of the currently
-        selected message and presets the <guilabel>To:</guilabel> field with
-        the mailing-list address. If you did not specify a mailing-list address for
-        the currently selected folder and &kmail; cannot determine the posting address
-        from the currently selected message then the <guilabel>To:</guilabel> field
-        will be empty. Your identity will automatically be set to the identity this message was
-        sent to.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>R</keycap></keycombo></shortcut>
-        <guimenu>Message</guimenu><guisubmenu>Reply Special</guisubmenu><guimenuitem>Reply Without Quote...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Works just like <guimenuitem>Reply...</guimenuitem> except that the text
-        of the currently selected message is not quoted.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Reply Special</guisubmenu><guimenuitem>Reply With Custom Template</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Works just like <guimenuitem>Reply...</guimenuitem> with the option to select a custom template that has
-        been configured in the composer custom templates tab in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>, please
-        see <link linkend="configure-composer-custom-templates">Custom Templates</link> for more information.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Reply Special</guisubmenu><guimenuitem>Reply to All With Custom Template</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Works just like <guimenuitem>Reply to All...</guimenuitem> with the option to select a custom template that has
-        been configured in the composer custom templates tab in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>, please
-        see <link linkend="configure-composer-custom-templates">Custom Templates</link> for more information.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Shift;<keycap>F</keycap></keycombo></shortcut>
-        <guimenu>Message</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>As Attachment</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Forwards the message to a new recipient. The message and its attachments will become an attachment of the new message.
-        The original message headers will be included in the forwarded message as well.</para>
-    </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>F</keycap></shortcut>
-          <guimenu>Message</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>Inline</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>The message's text and some important header fields will be copied to the body of the new message
-          with text marking the forwarded part. Attachments will be forwarded as attachments of the new message.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>E</keycap></shortcut>
-          <guimenu>Message</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>Redirect</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>This works like forward, except that the message stays the same (even the <guilabel>From:</guilabel> field).
-          The user who redirected the message is added in special header fields (<literal>Redirect-From</literal>,
-          <literal>Redirect-Date</literal>, <literal>Redirect-To</literal>, &etc;).</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Forward</guisubmenu><guimenuitem>With Custom Template</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Works just like forward with the option to select a custom template that has
-          been configured in the composer custom templates tab in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice>, please
-          see <link linkend="configure-composer-custom-templates">Custom Templates</link> for more information.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guimenuitem>Send Again...</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Opens a composer window with the currently selected message so it can be
-          sent again. This is only available for messages which you have sent or, more
-          precisely, for messages which have the <guilabel>sent</guilabel> status.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><shortcut><keycap>T</keycap></shortcut>
-          <guimenu>Message</guimenu><guimenuitem>Edit Message</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Edits the selected message if it is editable. Only messages in the
-          <guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guimenuitem>Mailing List</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Offers several options for mailing list messages. The current working folder must be configured as a mailing list for this to be available. Please see
-          <link linkend="folders-properties-mailinglist">Folder Properties Mailing List</link> for information on setting up mailing lists. The following options are available
-          to mailing list folders:</para>
-        <itemizedlist>
-          <listitem>
-            <para><guimenuitem>Post New Message(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with
-              the address configured in Post to List.</para>
-          </listitem>
-          <listitem>
-            <para><guimenuitem>Request Help(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with
-              the address configured in Post to List and help in the <guilabel>Subject:</guilabel> field.</para>
-          </listitem>
-          <listitem>
-            <para><guimenuitem>Subscribe to List(web)</guimenuitem> will open your default web browser to the subscribe website of the configured mailing list.</para>
-          </listitem>
-          <listitem>
-            <para><guimenuitem>Subscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with
-              the mailing list subscription address and subscribe in the <guilabel>Subject:</guilabel> field.</para>
-          </listitem>
-          <listitem>
-            <para><guimenuitem>Unsubscribe to List(web)</guimenuitem> will open your default web browser to the unsubscribe website of the configured mailing list.</para>
-          </listitem>
-          <listitem>
-            <para><guimenuitem>Unsubscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with
-              the mailing list subscription address and unsubscribe in the <guilabel>Subject:</guilabel> field.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Copy Message To</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Copies the selected messages to a specified folder, you can choose from recent folders, local folders, or a specific account folder.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Move Message To</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>The same a <guimenuitem>Copy Message</guimenuitem>, except that it permanently moves the message.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry id="mark-messages"><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Mark Message</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Allows you to change the status of the selected message to one of the following states:</para>
-        <informaltable><tgroup cols="2">
-            <thead>
-              <row><entry>Status</entry><entry>Symbol</entry><entry>Meaning</entry></row>
-            </thead>
-            <tbody>
-              <row>
-                <entry><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo></shortcut><guimenuitem>Mark Message as Read</guimenuitem></menuchoice></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-read.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>The message has been read.</entry>
-              </row>
-              <row>
-                <entry><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></shortcut><guimenuitem>Mark Message as Unread</guimenuitem></menuchoice></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-unread.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>The message has not been read yet.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Mark Message as Important</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>This status will not automatically be set by &kmail;.
-                  You can use it freely to mark messages that are in some way important to you.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Remove Important Mark</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Remove a previously set important flag from the message.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Mark Message as Action Item</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>This status will not automatically be set by &kmail;. Use this to mark
-                  messages that are action items ⪚ To-do list.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Remove Action Item Mark</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Remove a previously set action item mark from the message.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Mark Thread</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Allows you to change the status of all messages in a thread as follows:</para>
-          <informaltable><tgroup cols="2">
-            <thead>
-              <row><entry>Status</entry><entry>Symbol</entry><entry>Meaning</entry></row>
-            </thead>
-            <tbody>
-              <row>
-                <entry><guimenuitem>Mark Thread as Read</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-read.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>The entire thread has been read.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Mark Thread as Unread</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-unread.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>The thread has not been read yet.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Mark Thread as Important</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>This status will not automatically be set by &kmail;.
-                  You can use it freely to mark threads that are in some way important to you.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Remove Important Thread Mark</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Remove a previously set important flag from the thread.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Mark Thread as Action Item</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>This status will not automatically be set by &kmail;. Use this to mark
-                  threads that are action items ⪚ To-do list.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Remove Action Item Thread Mark</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Remove a previously set action item mark from the thread.</entry>
-              </row>
-               <row>
-                <entry><guimenuitem>Watch Thread</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-thread-watch.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Set the watched thread status, which allows you to easily view threads your interested in by selecting Watched in the status sort bar.</entry>
-              </row>
-              <row>
-                <entry><guimenuitem>Ignore Thread</guimenuitem></entry>
-                <entry>
-                  <inlinemediaobject>
-                    <imageobject><imagedata fileref="mail-thread-ignored.png" format="PNG"/></imageobject>
-                  </inlinemediaobject>
-                </entry>
-                <entry>Allows you to ignore entire threads.</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guisubmenu>Create Filter</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Opens up the <link linkend="filter-dialog-id">Filter dialog</link> with a new filter added.
-          This new filter is based on fields of the current mail, depending on which sub menu item you select from:</para>
-        <simplelist>
-          <member>Filter on Subject...</member>
-          <member>Filter on From...</member>
-          <member>Filter on To...</member>
-          <member>Filter on Mailing-List...(currently selected mail must be a mailing list for this to be available)</member>
-        </simplelist>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guimenuitem>Apply Filter</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Allows you to <guimenuitem>Apply all Filters</guimenuitem>. If you have spam filtering set up through <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link>
-          the options <guimenuitem>Filter Classify as Spam</guimenuitem> and <guimenuitem>Filter Classify as NOT Spam</guimenuitem> will be available
-          for spam filtering.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Message</guimenu><guimenuitem>Create To-do/Reminder</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Brings up the &kontact; To-do/Reminder dialog with options to add the selected email as a link, inline, or inline without attachments.</para>
-      </listitem>
-    </varlistentry>
-     <varlistentry><term><menuchoice><guimenu>Message</guimenu><guimenuitem>Add Note...</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Brings up the &kontact; Note dialog to add a note to the selected email.</para>
-      </listitem>
-    </varlistentry>
+<sect2 id="reader-folder-menu">
+<title>Folder Menu</title>
+<variablelist>
+<varlistentry id="folder-add-folder">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Add Folder...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens the <link linkend="folders-properties-window">Folder Properties</link> dialog</action> that lets you create a new folder.</para></listitem>
+</varlistentry>
+<varlistentry id="folder-mark-all-messages-as-read">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Mark All Messages as Read</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Sets the status of all new and unread messages in the current folder to read.</action></para></listitem>
+</varlistentry>
+<varlistentry id="folder-update-folder">
+<term><menuchoice>
+<shortcut>
+<keycap>F5</keycap>
+</shortcut>
+<guimenu>Folder</guimenu>
+<guimenuitem>Update Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Checks whether new mail arrived in the currently selected folder.</action></para>
+<note><para>This is only available for &imap; folders.</para></note></listitem>
+</varlistentry>
+<varlistentry id="folder-update-folder-and-all-its-subfolders">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo>
+</shortcut>
+<guimenu>Folder</guimenu>
+<guimenuitem>Update Folder and All Its Subfolders</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Checks whether new mail arrived in the currently selected folder and all of its folders.</action></para>
+<note><para>This is only available for &imap; folders.</para></note></listitem>
+</varlistentry>
+<varlistentry id="folder-move-all-messages-to-trash">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Move All Messages to Trash</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Moves all of the messages in the selected folder into the trash folder.</action></para>
+<note><para>This is only available if the currently selected folder is not a trash folder. If the currently selected folder is a trash folder, you will see <guilabel>Empty Trash</guilabel>.
+Please see next section for details.</para></note></listitem>
+</varlistentry>
+<varlistentry id="folder-empty-trash">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Empty Trash</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Permanently deletes all messages.</action></para>
+<note><para>This is only available if the currently selected folder is a trash folder.</para></note></listitem>
+</varlistentry>
+<varlistentry id="folder-archive-folder">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Archive Folder...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up a dialog to allow you to create an archive of the currently selected folder.</action>
+ In the dialog select a format (choices are: zip, tar, tar.bz2, and tar.gz). If you would like to
+ change the default name or location, click the folder at the end of <guilabel>Archive File</guilabel>.
+ Check the <guilabel>Delete folder and subfolders after completion</guilabel> if you would like everything you archived deleted.
+ By default all subfolders will be archived, uncheck <guilabel>Archive all subfolders</guilabel> if you only want to archive the parent folder.</para></listitem>
+</varlistentry>
+<varlistentry id="folder-delete-folder">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Delete Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Removes the selected folder and all its contents, including subfolders.</action></para>
+<warning><para>Please note that there is no way to access the contents of a folder after it has been removed.</para></warning></listitem>
+</varlistentry>
+<varlistentry id="folder-remove-duplicate-messages">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>*</keycap></keycombo>
+</shortcut>
+<guimenu>Folder</guimenu>
+<guimenuitem>Remove Duplicate Messages</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Searches the folder for duplicate messages and deletes them.</action></para></listitem>
+</varlistentry>
+<varlistentry id="folder-apply-all-filters-on-folder">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Apply All Filters On Folder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Applies all configured filters on the currently selected folder.</action>
+ Please see <link linkend="filter-dialog-id">Filter dialog</link> for more information on filters.</para></listitem>
+</varlistentry>
+<varlistentry id="folder-prefer-html-to-plain-text">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Prefer HTML to Plain Text</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>If enabled then &html; messages in this folder will be shown using &html; rendering.</action></para>
+<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
+</varlistentry>
+<varlistentry id="folder-load-external-references">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Load External References</guimenuitem>
+</menuchoice></term>
+<listitem><para>If you have &html; messages enabled (see above), then you have the option to enable this to have <action>images and resources linked from the web will load automatically.</action></para>
+<warning><para>For security reasons, we recommend to only activate this for folders which only contain trusted messages.</para></warning></listitem>
+</varlistentry>
+<varlistentry id="folder-mailing-list-management">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Mailing List Management...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>This opens up the mailing list management dialog.</action>
+ Please see <link linkend="folders-properties-mailinglist">Mailing List dialog</link> for more information on mailing lists.</para></listitem>
+</varlistentry>
+<varlistentry id="folder-assign-shortcut">
+<term><menuchoice>
+<guimenu>Folder</guimenu>
+<guimenuitem>Assign Shortcut...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>This allows you to assign a keyboard shortcut to the currently selected folder.</action></para></listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2 id="reader-message-menu">
+<title>Message Menu</title>
+
+<variablelist>
+<varlistentry id="message-new-message">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
+</shortcut>
+<guimenu>Message</guimenu>
+<guimenuitem>New Message...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens the <link linkend="the-composer-window">composer window</link></action>
+ so you can write a new message.</para></listitem>
+</varlistentry>
+<varlistentry id="message-new-message-to-mailing-list">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;&Shift;<keycap>N</keycap></keycombo>
+</shortcut>
+<guimenu>Message</guimenu>
+<guimenuitem>New Message to Mailing-List...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens the composer window so you can write a new mail.</action>
+ If the current folder holds a mailing list and has a posting address defined,
+ this address will be the default <guilabel>To:</guilabel> address.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply">
+<term><menuchoice>
+<shortcut>
+<keycap>R</keycap></shortcut>
+<guimenu>Message</guimenu>
+<guimenuitem>Reply...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up the composer window, inserts the quoted text of the currently selected message and presets the
+ <guilabel>To:</guilabel> field either with the mailing-list address (if you reply to a mailing-list message) or with the preferred reply address of the sender.</action>
+ If you want to control which address the <guilabel>To:</guilabel> field is preset with then you should use <link linkend="message-reply-special">Reply Special</link>.
+ Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-all">
+<term><menuchoice>
+<shortcut>
+<keycap>A</keycap>
+</shortcut>
+<guimenu>Message</guimenu>
+<guimenuitem>Reply to All...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up the composer window, inserts the quoted text of the currently
+ selected message and presets the <guilabel>To:</guilabel> field either with
+ the mailing-list address (if you reply to a mailing-list message) or with the
+ preferred reply address of the sender. The <guilabel>Copy to (CC):</guilabel>
+ field is preset with the addresses of all other recipients of the currently
+ selected message excluding your own address.</action>
+ Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-special">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Shift;<keycap>A</keycap></keycombo>
+</shortcut><guimenu>Message</guimenu>
+<guisubmenu>Reply Special</guisubmenu>
+<guimenuitem>Reply to Author...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up the composer window, inserts the quoted text of the currently
+ selected message and presets the <guilabel>To:</guilabel> field with the
+ preferred reply address of the sender.</action> Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-special-reply-to-mailinglist">
+<term><menuchoice>
+<shortcut>
+<keycap>L</keycap>
+</shortcut>
+<guimenu>Message</guimenu>
+<guisubmenu>Reply Special</guisubmenu>
+<guimenuitem>Reply to Mailing-List...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up the composer window, inserts the quoted text of the currently
+ selected message and presets the <guilabel>To:</guilabel> field with the mailing-list address.</action>
+ If you did not specify a mailing-list address for the currently selected folder and &kmail; cannot determine the posting address
+ from the currently selected message then the <guilabel>To:</guilabel> field will be empty. Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-special-reply-without-quote">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Shift;<keycap>R</keycap></keycombo>
+</shortcut>
+<guimenu>Message</guimenu>
+<guisubmenu>Reply Special</guisubmenu>
+<guimenuitem>Reply Without Quote...</guimenuitem>
+</menuchoice></term>
+<listitem><para>Works just like <guimenuitem>Reply...</guimenuitem> except that the text of the currently selected message is not quoted.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-special-reply-with-custom-template">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Reply Special</guisubmenu>
+<guimenuitem>Reply With Custom Template</guimenuitem>
+</menuchoice></term>
+<listitem><para>Works just like <guimenuitem>Reply...</guimenuitem> with the option to select a custom template that has been configured in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
+</varlistentry>
+<varlistentry id="message-reply-special-reply-to-all-with-custom-template">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Reply Special</guisubmenu>
+<guimenuitem>Reply to All With Custom Template</guimenuitem>
+</menuchoice></term>
+<listitem><para>Works just like <guimenuitem>Reply to All...</guimenuitem> with the option to select a custom template that has
+ been configured in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
+</varlistentry>
+<varlistentry id="message-forward-as-attachment">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Shift;<keycap>F</keycap></keycombo>
+</shortcut>
+<guimenu>Message</guimenu>
+<guisubmenu>Forward</guisubmenu>
+<guimenuitem>As Attachment</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Forwards the message to a new recipient.</action> The message and its attachments will become an attachment of the new message.
+ The original message headers will be included in the forwarded message as well.</para></listitem>
+</varlistentry>
+<varlistentry id="message-forward-inline">
+<term><menuchoice>
+<shortcut>
+<keycap>F</keycap></shortcut>
+<guimenu>Message</guimenu>
+<guisubmenu>Forward</guisubmenu>
+<guimenuitem>Inline</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>The message's text and some important header fields will be copied to the body of the new message with text marking the forwarded part.</action>
+ Attachments will be forwarded as attachments of the new message.</para></listitem>
+</varlistentry>
+<varlistentry id="message-forward-redirect">
+<term><menuchoice>
+<shortcut>
+<keycap>E</keycap>
+</shortcut>
+<guimenu>Message</guimenu>
+<guisubmenu>Forward</guisubmenu>
+<guimenuitem>Redirect</guimenuitem>
+</menuchoice></term>
+<listitem><para>This works like forward, except that the message stays the same (even the <guilabel>From:</guilabel> field).
+ The user who redirected the message is added in special header fields (<literal>Redirect-From</literal>, <literal>Redirect-Date</literal>, <literal>Redirect-To</literal>, &etc;).</para></listitem>
+</varlistentry>
+<varlistentry id="message-forward-with-custom-template">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Forward</guisubmenu>
+<guimenuitem>With Custom Template</guimenuitem>
+</menuchoice></term>
+<listitem><para>Works just like forward with the option to select a custom template that has been configured in the composer custom templates tab in <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
+</varlistentry>
+<varlistentry id="message-send-again">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Send Again...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens a composer window with the currently selected message so it can be sent again.</action></para>
+<note><para>This is only available for messages which you have sent or, more precisely, for messages which have the <guilabel>sent</guilabel> status.</para></note></listitem>
+</varlistentry>
+<varlistentry id="message-edit-message">
+<term><menuchoice>
+<shortcut>
+<keycap>T</keycap>
+</shortcut>
+<guimenu>Message</guimenu>
+<guimenuitem>Edit Message</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Edits the selected message if it is editable.</action></para>
+<note><para>Only messages in the <guilabel>outbox</guilabel> and <guilabel>drafts</guilabel> folder can be edited.</para></note></listitem>
+</varlistentry>
+<varlistentry id="message-mailing-list">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Mailing List</guimenuitem>
+</menuchoice></term>
+<listitem><para>Offers several options for mailing list messages.</para>
+<note><para>The current working folder must be configured as a mailing list for this to be available. Please see <link linkend="folders-properties-mailinglist">Folder Properties Mailing List</link> for information on setting up mailing lists.</para></note>
+<para>The following options are available to mailing list folders:</para>
+<itemizedlist>
+  <listitem><para><guimenuitem>Post New Message(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the address configured in Post to List.</para></listitem>
+  <listitem><para><guimenuitem>Request Help(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the address configured in Post to List and help in the <guilabel>Subject:</guilabel> field.</para></listitem>
+  <listitem><para><guimenuitem>Subscribe to List(web)</guimenuitem> will open your default web browser to the subscribe website of the configured mailing list.</para></listitem>
+  <listitem><para><guimenuitem>Subscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and subscribe in the <guilabel>Subject:</guilabel> field.</para></listitem>
+  <listitem><para><guimenuitem>Unsubscribe to List(web)</guimenuitem> will open your default web browser to the unsubscribe website of the configured mailing list.</para></listitem>
+  <listitem><para><guimenuitem>Unsubscribe to List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and unsubscribe in the <guilabel>Subject:</guilabel> field.</para></listitem>
+</itemizedlist></listitem>
+</varlistentry>
+<varlistentry id="message-copy-message-to">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Copy Message To</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Copies the selected messages to a specified folder,</action> you can choose from recent folders, local folders, or a specific account folder.</para></listitem>
+</varlistentry>
+<varlistentry id="message-move-message-to">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Move Message To</guisubmenu>
+</menuchoice></term>
+<listitem><para>The same as copy message to, except you <action>permanently move the selected messages to a specified folder.</action>.</para></listitem>
+</varlistentry>
+<varlistentry id="mark-messages">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Mark Message</guisubmenu>
+</menuchoice></term>
+<listitem><para>Allows you to change the status of the selected message to one of the following states:</para>
+<informaltable><tgroup cols="2">
+<thead><row><entry>Status</entry><entry>Symbol</entry><entry>Meaning</entry></row></thead>
+<tbody>
+<row>
+<entry><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
+</shortcut>
+<guimenuitem>Mark Message as Read</guimenuitem>
+</menuchoice></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-read.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>The message has been read.</entry></row>
+<row>
+<entry><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo>
+</shortcut>
+<guimenuitem>Mark Message as Unread</guimenuitem>
+</menuchoice></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-unread.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>The message has not been read yet.</entry></row>
+<row>
+<entry><guimenuitem>Mark Message as Important</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>This status will not automatically be set by &kmail;.
+ You can use it freely to mark messages that are in some way important to you.</entry></row>
+<row>
+<entry><guimenuitem>Remove Important Mark</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Remove a previously set important flag from the message.</entry></row>
+<row>
+<entry><guimenuitem>Mark Message as Action Item</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>This status will not automatically be set by &kmail;. Use this to mark messages that are action items ⪚ To-do list.</entry></row>
+<row><entry><guimenuitem>Remove Action Item Mark</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Remove a previously set action item mark from the message.</entry></row>
+</tbody>
+</tgroup></informaltable></listitem>
+</varlistentry>
+<varlistentry id="mark-thread">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Mark Thread</guisubmenu>
+</menuchoice></term>
+<listitem><para>Allows you to change the status of all messages in a thread as follows:</para>
+<informaltable><tgroup cols="2">
+<thead><row><entry>Status</entry><entry>Symbol</entry><entry>Meaning</entry></row></thead>
+<tbody>
+<row>
+<entry><guimenuitem>Mark Thread as Read</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-read.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>The entire thread has been read.</entry></row>
+<row>
+<entry><guimenuitem>Mark Thread as Unread</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-unread.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>The thread has not been read yet.</entry></row>
+<row>
+<entry><guimenuitem>Mark Thread as Important</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>This status will not automatically be set by &kmail;. You can use it freely to mark threads that are in some way important to you.</entry></row>
+<row>
+<entry><guimenuitem>Remove Important Thread Mark</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-important.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Remove a previously set important flag from the thread.</entry></row>
+<row>
+<entry><guimenuitem>Mark Thread as Action Item</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>This status will not automatically be set by &kmail;. Use this to mark threads that are action items ⪚ To-do list.</entry></row>
+<row>
+<entry><guimenuitem>Remove Action Item Thread Mark</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-mark-task.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Remove a previously set action item mark from the thread.</entry></row>
+<row>
+<entry><guimenuitem>Watch Thread</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-thread-watch.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Set the watched thread status, which allows you to easily view threads your interested in by selecting Watched in the status sort bar.</entry></row>
+<row>
+<entry><guimenuitem>Ignore Thread</guimenuitem></entry>
+<entry><inlinemediaobject>
+  <imageobject>
+    <imagedata fileref="mail-thread-ignored.png" format="PNG"/></imageobject>
+</inlinemediaobject></entry>
+<entry>Allows you to ignore entire threads.</entry></row>
+</tbody></tgroup></informaltable></listitem>
+</varlistentry>
+<varlistentry id="message-create-filter">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guisubmenu>Create Filter</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Opens up the <link linkend="filter-dialog-id">Filter dialog</link> with a new filter added.</action>
+ This new filter is based on fields of the current mail, depending on which sub menu item you select from:</para>
+<simplelist>
+  <member>Filter on Subject...</member>
+  <member>Filter on From...</member>
+  <member>Filter on To...</member>
+  <member>Filter on Mailing-List...(currently selected mail must be a mailing list for this to be available)</member>
+</simplelist></listitem>
+</varlistentry>
+<varlistentry id="message-apply-filter">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Apply Filter</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Allows you to <guimenuitem>Apply all Filters</guimenuitem>.</action> If you have spam filtering set up through
+ <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> the options <guimenuitem>Filter Classify as Spam</guimenuitem> and <guimenuitem>Filter Classify as NOT Spam</guimenuitem> will be available for spam filtering.</para></listitem>
+</varlistentry>
+<varlistentry id="message-create-to-do-reminder">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Create To-do/Reminder</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the &kontact; To-do/Reminder dialog</action> with options to add the selected email as a link, inline, or inline without attachments.</para></listitem>
+</varlistentry>
+<varlistentry id="message-add-note">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Add Note...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the &kontact; Note dialog to add a note to the selected email.</action></para></listitem>
+</varlistentry>
 </variablelist>
 
 </sect2>
@@ -954,81 +1112,99 @@ performs a menu item function, the default shortcut is listed with the menu item
 <sect2 id="reader-tools-menu">
 <title>Tools Menu</title>
 <variablelist>
-  <varlistentry><term><menuchoice><shortcut><keycap>S</keycap></shortcut>
-        <guimenu>Tools</guimenu><guimenuitem>Find Messages...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens up a search window that lets you search for messages with
-        certain characteristics, ⪚ a certain subject. Start the search by entering
-        some values and press <guibutton>Search</guibutton>. Click on one of the
-        resulting messages and it will appear in the <guilabel>Message pane</guilabel>.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry id="reader-tools-certificate-manager"><term><menuchoice><guimenu>Tools</guimenu>
-        <guimenuitem>Certificate Manager...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Starts <ulink url="help:kleopatra">&kleopatra;</ulink>, the &kde; certificate manager.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry id="reader-tools-gnupg-log-viewer"><term><menuchoice><guimenu>Tools</guimenu><guimenuitem>GnuPG Log Viewer</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Starts <ulink url="help:kwatchgnupg"><application>KWatchGnuPG</application></ulink>,
-        a tool to present the debug output of the <application>GnuPG</application> application. If
-        signing, encryption, or verification mysteriously stop working, you might find out why by looking at this log.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Edit "Out of Office" Replies...</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialog, which allows you to set-up vacation notifications.</para>
-      <note><para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering.
-          To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your &imap; account set-up.</para>
-      </note>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Debug Sieve...</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>Launch the <guilabel>Sieve Diagnostics</guilabel> dialog. This is useful to debug sieve if you are having problems with it.</para>
-      <note><para>You must have sieve support on your email server.</para></note>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Filter Log Viewer...</guisubmenu></menuchoice></term>
-    <listitem>
-      <para>Opens up the viewer window for the filter log; there you find some options to
-        control the logging of the filtering process.  In the log you will find valuable
-        information about what filter rules were used, what was the result of the evaluation
-        of those rules, and which filter actions were applied to a message.</para>
-    </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Import Wizard...</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Brings up the Import Wizard dialog which assists in easily importing settings and email.
-          Please see <link linkend="import-wizard">Import Wizard</link> for details.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Export &kmail; Data...</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Brings up the Export Data Wizard dialog which assists in easily exporting your settings and email.
-          Please see <link linkend="export-data-wizard">Export &kmail; Data</link> for details.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Account Wizard...</guisubmenu></menuchoice></term>
-      <listitem>
-        <para>Brings up the Account Wizard dialog which assists in easily setting up accounts.
-          Please see <link linkend="account-wizard">Import Wizard</link> for details.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Anti-Spam Wizard...</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Brings up the Anti-Spam Wizard which can help you to set up spam filtering.
-          Please see <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> for details.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry><term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Anti-Virus Wizard...</guimenuitem></menuchoice></term>
-      <listitem>
-        <para>Brings up the Anti-Virus Wizard which can help you to set up scanning messages for viruses.
-          Please see <link linkend="the-anti-virus-wizard">Anti-Virus Wizard</link> for details.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
+<varlistentry id="tools-find-messages">
+<term><menuchoice>
+<shortcut>
+<keycap>S</keycap>
+</shortcut>
+<guimenu>Tools</guimenu>
+<guimenuitem>Find Messages...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens up a search window</action> that lets you search for messages with certain characteristics,
+⪚ a certain subject. Please see <link linkend="filter-criteria">Filter Criteria</link> for details on search options.</para>
+<para>Your search results will display in the text area, at which point you can open the <guibutton>Open Search Folder</guibutton> or highlight the desired message and select <guibutton>Open Message</guibutton>.</para></listitem>
+</varlistentry>
+<varlistentry id="reader-tools-certificate-manager">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>Certificate Manager...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Starts <ulink url="help:kleopatra">&kleopatra;</ulink>, the &kde; certificate manager.</action></para></listitem>
+</varlistentry>
+<varlistentry id="reader-tools-gnupg-log-viewer">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>GnuPG Log Viewer</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Starts <ulink url="help:kwatchgnupg"><application>KWatchGnuPG</application></ulink>,</action> a tool to present the debug output of the <application>GnuPG</application> application.
+ If signing, encryption, or verification mysteriously stop working, you might find out why by looking at this log.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-edit-out-of-office-replies">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Edit "Out of Office" Replies...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Launch the <guilabel>Configure "Out of Office" Replies</guilabel> dialog,</action> which allows you to set-up vacation notifications.</para>
+<note><para><guilabel>Out of Office reply</guilabel> functionality relies on server-side filtering. To be able to use it you need to configure the <link linkend="receiving-mail">Filtering tab</link> (see option relevant to kolab server) of your &imap; account set-up.</para></note></listitem>
+</varlistentry>
+<varlistentry id="tools-debug-sieve">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Debug Sieve...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Launch the <guilabel>Sieve Diagnostics</guilabel> dialog.</action> This is useful to debug sieve if you are having problems with it.</para>
+<note><para>You must have sieve support on your email server.</para></note></listitem>
+</varlistentry>
+<varlistentry id="tools-filter-log-viewer">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Filter Log Viewer...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Opens up the viewer window for the filter log;</action> there you find some options to
+ control the logging of the filtering process.  In the log you will find valuable
+ information about what filter rules were used, what was the result of the evaluation of those rules, and which filter actions were applied to a message.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-import-wizard">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Import Wizard...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Brings up the Import Wizard dialog</action> which assists in easily importing settings and email.
+ Please see <link linkend="import-wizard">Import Wizard</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-export-data">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Export &kmail; Data...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Brings up the Export Data Wizard dialog</action> which assists in easily exporting your settings and email.
+ Please see <link linkend="export-data-wizard">Export &kmail; Data</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-account-wizard">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guisubmenu>Account Wizard...</guisubmenu>
+</menuchoice></term>
+<listitem><para><action>Brings up the Account Wizard dialog</action> which assists in easily setting up accounts.
+ Please see <link linkend="account-wizard">Import Wizard</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-anti-spam-wizard">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>Anti-Spam Wizard...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the Anti-Spam Wizard</action> which can help you to set up spam filtering.
+ Please see <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="tools-anti-virus-wizard">
+<term><menuchoice>
+<guimenu>Tools</guimenu>
+<guimenuitem>Anti-Virus Wizard...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the Anti-Virus Wizard</action> which can help you to set up scanning messages for viruses.
+ Please see <link linkend="the-anti-virus-wizard">Anti-Virus Wizard</link> for details.</para></listitem>
+</varlistentry>
+</variablelist>
 </sect2>
 
 
@@ -1036,176 +1212,191 @@ performs a menu item function, the default shortcut is listed with the menu item
 <title>Settings Menu</title>
 
 <variablelist>
-  <varlistentry><term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo></shortcut>
-        <guimenu>Settings</guimenu><guimenuitem>Show Quick Search bar</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>If enabled, the Quick Search bar which allows you to quickly search
-        for messages matching a search text, is visible.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens the <link linkend="filters">Message Filters</link> window.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Manage Sieve Scripts...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>If your mail server supports sieve (server side filtering), you would configure your scripts here.</para>
-    </listitem>
-  </varlistentry>
-   <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Automatic Archiving...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Allows you to set up automatic archiving. Please see <link linkend="auto-archive">Automatic Archiving</link> for details.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Send Later Agent...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>A dialog that allows you to modify and remove emails that have been sent using the send later feature. Please see <link linkend="send-later">Send Later</link> for details.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Folder Archive Agent...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Allows you to configure archive folders. Please see <link linkend="archive-folder">Folder Archive Agent</link> for details.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry><term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Notifications...</guimenuitem></menuchoice></term>
-    <listitem>
-      <para>Opens a window that lets you configure what happens when new mail arrives, ⪚ play a sound, display a popup.</para>
-    </listitem>
-  </varlistentry>
+<varlistentry id="settings-show-quick-search-bar">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>H</keycap></keycombo>
+</shortcut>
+<guimenu>Settings</guimenu>
+<guimenuitem>Show Quick Search bar</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Allows you to enable the Quick Search bar,</action> which allows you to quickly search for messages matching a search text, is visible.</para></listitem>
+</varlistentry>
+<varlistentry id="settings-configure-filters">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Filters...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens the <link linkend="filters">Message Filters</link> window.</action></para></listitem>
+</varlistentry>
+<varlistentry id="settings-manage-sieve-scripts">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Manage Sieve Scripts...</guimenuitem>
+</menuchoice></term>
+<listitem><para>If your mail server supports sieve (server side filtering), you would <action>configure your scripts here</action>.</para></listitem>
+</varlistentry>
+<varlistentry id="settings-configure-automatic-archiving">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Automatic Archiving...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the dialog to set up automatic archiving.</action> Please see <link linkend="auto-archive">Automatic Archiving</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="settings-configure-send-later-agent">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Send Later Agent...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up a dialog that allows you to modify and remove emails that have been sent using the send later feature.</action>
+ Please see <link linkend="send-later">Send Later</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="settings-configure-folder-archive-agent">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Folder Archive Agent...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Brings up a dialog that allows you to configure archive folders.</action>
+ Please see <link linkend="archive-folder">Folder Archive Agent</link> for details.</para></listitem>
+</varlistentry>
+<varlistentry id="settings-configure-notifications">
+<term><menuchoice>
+<guimenu>Settings</guimenu>
+<guimenuitem>Configure Notifications...</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Opens a dialog that lets you configure what happens when new mail arrives,</action> ⪚ play a sound, display a popup.</para></listitem>
+</varlistentry>
 </variablelist>
 </sect2>
+<sect2>
+<title>Help Menu</title>
+&help.menu.documentation;
+</sect2>
 </sect1>
 
 <sect1 id="composer-window-menus">
-<title>The Composer Window</title>
+<title>The &kmail; Composer Window</title>
 
 <sect2 id="composer-file-menu">
-<title><guimenu>Message</guimenu> Menu</title>
-
+<title>Message Menu</title>
 <variablelist>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
+<varlistentry id="message-new-composer">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
+</shortcut>
 <guimenu>Message</guimenu>
 <guimenuitem>New Composer</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Opens up a new composer window.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Opens up a new composer window.</action></para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="message-new-main-window">
+<term><menuchoice>
 <guimenu>Message</guimenu>
 <guimenuitem>New Main Window</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Creates a new main window.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Creates a new main window.</action></para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="message-new-addressbook-contact">
+<term><menuchoice>
 <guimenu>Message</guimenu>
 <guimenuitem>New AddressBook Contact</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Creates a new address book contact.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the &kontact; New Contact Dialog</action> to add a new contact your addressbook.</para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo></shortcut>
+<varlistentry id="message-send-mail">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>Return</keycap></keycombo>
+</shortcut>
 <guimenu>Message</guimenu>
 <guimenuitem>Send Mail</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Sends the message immediately. If you use SMTP to send your
-messages and the &SMTP; server is not reachable, the message will be put
-into the outbox and you will get an error message. You can then later send
-the messages in the outbox using <menuchoice><guimenu>File</guimenu><guimenuitem>Send
-Queued Messages</guimenuitem></menuchoice>.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Sends the message immediately.</action> If you use &SMTP; to send your
+ messages and the &SMTP; server is not reachable, the message will be put into the outbox and you will get an error message.
+ After the connection issues are resolved, you can send the messages in the outbox using <menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice>.</para></listitem>
 </varlistentry>
-<!-- missing Send Mail Via -->
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="message-send-mail-via">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Send Mail Via</guimenuitem>
+</menuchoice></term>
+<listitem><para>Allows you to select which outgoing mail server you wish to use to send the message.</para></listitem>
+</varlistentry>
+<varlistentry id="message-send-later">
+<term><menuchoice>
 <guimenu>Message</guimenu>
 <guimenuitem>Send Later</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Queues the message in the outbox for sending it later using
-<menuchoice><guimenu>File</guimenu><guimenuitem>Send
-Queued Messages</guimenuitem></menuchoice>.
-</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Brings up the send later dialog.</action>
+ Please see <link linkend="send-later">Send Later</link> for details.</para></listitem>
 </varlistentry>
-<!-- missing Send Later Via -->
-<varlistentry>
-<term>
-<menuchoice>
+<varlistentry id="message-send-later-via">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Send Later Via</guimenuitem>
+</menuchoice></term>
+<listitem><para>Allows you to choose which outgoing account to send your send later configured message.</para></listitem>
+</varlistentry>
+<varlistentry id="message-save-as-file">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Save as File</guimenuitem>
+</menuchoice></term>
+<listitem><para><action>Saves the message as a text document.</action></para></listitem>
+</varlistentry>
+<varlistentry id="message-save-as-draft">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
+</shortcut>
 <guimenu>Message</guimenu>
 <guimenuitem>Save as Draft</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Save the message in the <guilabel>drafts</guilabel> folder so you can
-later edit and send it.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Save the message in the <guilabel>drafts</guilabel> folder</action> so you can later edit and send it.</para></listitem>
 </varlistentry>
-<!-- missing: Save as Template -->
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Messages</guimenu>
+<varlistentry id="message-save-as-template">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Save as Template</guimenuitem>
+</menuchoice></term>
+<listitem><para>Allows you to <action>save your message as a template.</action>
+ Please see <link linkend="new-compose-from-templates">Compose from templates</link> for details on templates.</para></listitem>
+</varlistentry>
+<varlistentry id="message-insert-text-file">
+<term><menuchoice>
+<guimenu>Message</guimenu>
 <guimenuitem>Insert Text File...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Inserts a text file into the message text, starting at the cursor
-position.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Inserts a text file into the message text,</action> starting at the cursor position.</para></listitem>
 </varlistentry>
-<!-- missing: Insert Recent Text File -->
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut>
+<varlistentry id="message-insert-recent-text-file">
+<term><menuchoice>
+<guimenu>Message</guimenu>
+<guimenuitem>Insert Recent Text File...</guimenuitem>
+</menuchoice></term>
+<listitem><para>Allows you to choose from a list of recently inserted text files to insert into your message. Select <guimenuitem>Clear List</guimenuitem> to clear the list.</para></listitem>
+</varlistentry>
+<varlistentry id="message-print">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
+</shortcut>
 <guimenu>Message</guimenu>
 <guimenuitem>Print...</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Prints the current text.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Prints the current text.</action></para></listitem>
 </varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo></shortcut>
+<varlistentry id="message-close">
+<term><menuchoice>
+<shortcut>
+<keycombo action="simul">&Ctrl;<keycap>W</keycap></keycombo>
+</shortcut>
 <guimenu>Message</guimenu>
 <guimenuitem>Close</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para>Closes this composer window.</para>
-</listitem>
+</menuchoice></term>
+<listitem><para><action>Closes this composer window.</action></para></listitem>
 </varlistentry>
-
 </variablelist>
 
 </sect2>