[pim/kmail] doc/kmail2: Updates to menus.docbook (first half of Chapter 5).
David Bryant
null at kde.org
Mon Mar 29 00:38:44 BST 2021
Git commit 7605d4fa85f40feb14ee1627c7a222d59f5dc3c7 by David Bryant.
Committed on 28/03/2021 at 23:38.
Pushed by davidbryant into branch 'master'.
Updates to menus.docbook (first half of Chapter 5).
Added illustrations, deleted obsolete material, brought menus up to date.
Fixed one typo, which Yuri spotted.
M +15 -7 doc/kmail2/configure.docbook
M +- -- doc/kmail2/mail-mark-important.png
M +- -- doc/kmail2/mail-mark-read.png
M +- -- doc/kmail2/mail-mark-task.png
M +- -- doc/kmail2/mail-thread-ignored.png
M +- -- doc/kmail2/mail-thread-watch.png
M +1044 -924 doc/kmail2/menus.docbook
M +- -- doc/kmail2/plugin02.png
A +- -- doc/kmail2/readeredit.png
A +- -- doc/kmail2/readerfile.png
A +- -- doc/kmail2/readerfolder.png
A +- -- doc/kmail2/readergo.png
A +- -- doc/kmail2/readerhelp.png
A +- -- doc/kmail2/readermessage.png
A +- -- doc/kmail2/readersettings.png
A +- -- doc/kmail2/readertools.png
A +- -- doc/kmail2/readerview.png
A +- -- doc/kmail2/view-filter.png
https://invent.kde.org/pim/kmail/commit/7605d4fa85f40feb14ee1627c7a222d59f5dc3c7
diff --git a/doc/kmail2/configure.docbook b/doc/kmail2/configure.docbook
index 3786e1bfd..ba6390378 100644
--- a/doc/kmail2/configure.docbook
+++ b/doc/kmail2/configure.docbook
@@ -3818,12 +3818,19 @@ modifying it by hand.</para>
<para>
This dialog allows you to control DomainKeys Identified Mail (DKIM)
processing. DKIM is a cryptographic protocol that can assure you
- that a particular message originated from the internet domain
+ a particular message originated from the internet domain
it claims to be from. If the sender has set up DKIM properly and
- DKIM is enabled here, you will see a message "DKIM valid" and
- the name of the entity that signed the message in the status bar
+ DKIM is enabled here, you will see a message "DKIM valid", and sometimes
+ the name of the entity that signed the message, in the status bar
at the bottom of the message preview window.
</para>
+ <note><para>
+ If you enable this option, be sure to change the default value
+ ("Nothing") in the spin box labeled "Save Record Key" to some
+ other value. The DKIM Checker does not work correctly if that
+ variable is set to "Nothing".
+ </para></note>
+ <para> </para><!-- add whitespace -->
</listitem>
</varlistentry>
@@ -3927,10 +3934,11 @@ modifying it by hand.</para>
<term><guilabel>Log Activities</guilabel></term>
<listitem>
<para>
- Select this option to enable <link linkend="filter-logging">mail
- filter logging</link>. This plugin is disabled by default. This
- &kmail; feature appears to be a built-in function; my testing shows
- that mail filter logging will work both with and without this "plugin".
+ Select this option to enable the Activity Log function, which is disabled
+ by default. This plugin adds a new entry <guilabel>Log Activities</guilabel>
+ to the <guilabel>Tools</guilabel> menu. Primarily for use by program developers --
+ the default log function does not provide much information (just a time stamp
+ and "Ready", for most "events").
</para>
</listitem>
</varlistentry>
diff --git a/doc/kmail2/mail-mark-important.png b/doc/kmail2/mail-mark-important.png
index b1cb389e8..443f72791 100644
Binary files a/doc/kmail2/mail-mark-important.png and b/doc/kmail2/mail-mark-important.png differ
diff --git a/doc/kmail2/mail-mark-read.png b/doc/kmail2/mail-mark-read.png
index b09a3e598..ac34972b4 100644
Binary files a/doc/kmail2/mail-mark-read.png and b/doc/kmail2/mail-mark-read.png differ
diff --git a/doc/kmail2/mail-mark-task.png b/doc/kmail2/mail-mark-task.png
index 2b5c86201..4678f48cd 100644
Binary files a/doc/kmail2/mail-mark-task.png and b/doc/kmail2/mail-mark-task.png differ
diff --git a/doc/kmail2/mail-thread-ignored.png b/doc/kmail2/mail-thread-ignored.png
index 0b3b46ab1..a1eaa948c 100644
Binary files a/doc/kmail2/mail-thread-ignored.png and b/doc/kmail2/mail-thread-ignored.png differ
diff --git a/doc/kmail2/mail-thread-watch.png b/doc/kmail2/mail-thread-watch.png
index 3357ccf03..ad4ace89c 100644
Binary files a/doc/kmail2/mail-thread-watch.png and b/doc/kmail2/mail-thread-watch.png differ
diff --git a/doc/kmail2/menus.docbook b/doc/kmail2/menus.docbook
index a02300cac..ae7c45600 100644
--- a/doc/kmail2/menus.docbook
+++ b/doc/kmail2/menus.docbook
@@ -11,8 +11,7 @@
&David.Rugge.mail;
</author>
<author>
-<firstname>Michel</firstname>
-<surname>Boyer de la Giroday</surname>
+&Michel.Boyer;
<email>michel at klaralvdalens-datakonsult.se</email>
</author>
<author>
@@ -23,12 +22,16 @@
&Scarlett.Clark;
&Scarlett.Clark.mail;
</author>
+<author>
+&David.Bryant;
+&David.Bryant.mail;
+</author>
<!-- TRANS:ROLES_OF_TRANSLATORS -->
</authorgroup>
-<date>2013-11-25</date>
-<releaseinfo>&kde; 4.11</releaseinfo>
+<date>2021-03-19</date>
+<releaseinfo>5.14.2 (Applications 20.04.2)</releaseinfo>
</chapterinfo>
<title>Command and Menu Reference</title>
@@ -40,428 +43,481 @@ performs a menu item function, the default shortcut is listed with the menu item
<sect2 id="reader-file-menu">
<title>File Menu</title>
+<screenshot>
+<screeninfo>The File Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readerfile.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The File Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The File Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
<variablelist>
<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="reader-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="reader-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="reader-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="reader-new-addressbook-contact">
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guisubmenu>New</guisubmenu>
-<guimenuitem>New AddressBook Contact...</guimenuitem>
-</menuchoice></term>
-<listitem><para><action>Brings up the <guilabel>New Contact</guilabel> dialog.</action></para></listitem>
+ <term><menuchoice><guimenu>File</guimenu><guisubmenu>New ></guisubmenu></menuchoice></term>
+ <listitem><para>Here you can choose to create one of four new items, as follows:</para>
+
+ <variablelist>
+ <varlistentry id="reader-file-new-newmessage">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+ <guimenuitem>New Message...</guimenuitem></menuchoice></term>
+ <listitem><para>Compose a new message. This will open a Composer window, where you can write a new
+ message.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-file-new-message-from-template">
+ <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+ <guisubmenu>Message from Template ></guisubmenu></menuchoice></term>
+ <listitem><para>Creates a new message from a selected template. Please see
+ <link linkend="new-compose-from-templates">Compose From Templates</link> for additional information on
+ creating templates. 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="reader-add-folder">
+ <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Add
+ Folder...</guimenuitem></menuchoice></term>
+ <listitem><para>Creates a new folder. The ensuing dialog will ask you to give the new folder
+ a name. The new folder will be created as a subfolder of the currently selected folder.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-new-addressbook-contact">
+ <term><menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
+ <guimenuitem>New AddressBook Contact...</guimenuitem></menuchoice></term>
+ <listitem><para>Launches the <ulink
+ url="help:/kaddressbook/how-to-add-a-new-contact.html">New Contact</ulink>
+ dialog, permitting you to add a new entry in &kaddressbook;.</para></listitem>
+ </varlistentry>
+ </variablelist>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>O</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>Open...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens saved email messages (.mbox files).</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Open Recent</guimenuitem></menuchoice></term>
+ <listitem><para>Displays a list of recently opened messages. Only those messages that have been saved as
+ .mbox files and subsequently opened will appear on this list. If no such files exist, this menu item
+ will be grayed out.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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 <filename role="extension">.mbox</filename>.</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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice></term>
+ <listitem><para>Saves the currently displayed message to a <filename role="extension">.mbox</filename> file.
+ This file includes all the headers and attachments, in &MIME; format. If you want to save it as a different
+ format (⪚, as a <filename role="extension">.txt</filename> file), uncheck the <guilabel>Automatically select
+ filename extension (.mbox)</guilabel> box, and add the filename extension before saving the file.</para></listitem>
</varlistentry>
+
+<varlistentry id="reader-file-export-pdf">
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Export to PDF...</guimenuitem></menuchoice></term>
+ <listitem><para>Exports the currently displayed message as a .pdf file.</para></listitem>
+</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Import Messages...</guimenuitem></menuchoice></term>
+ <listitem><para>Starts up the <application>KMailCVT</application> program (aka the Email Import Wizard).
+ This application lets you import messages from several email clients into &kmail;.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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 has been configured and is online available for use.</para></note></listitem>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Print Preview...</guimenuitem></menuchoice></term>
+ <listitem><para><action>Shows how your email will appear when printed.</action></para>
+ <note><para>This will only be enabled if a printer has been configured, is online, and is
+ available for use.</para></note>
+ <para> </para><!-- add whitespace --></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 id="reader-file-print">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>Print...</guimenuitem></menuchoice></term>
+ <listitem><para>Displays a dialog that lets you print the currently displayed message.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Expire All Folders</guimenuitem></menuchoice></term>
+ <listitem><para>Deletes old messages from all folders. 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="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Empty All Trash Folders</guimenuitem></menuchoice></term>
+ <listitem><para>Use this item to empty all trash folders, &ie;, the local trash folder and all trash folders that
+ may exist on &IMAP; servers. Messages in Trash will be permanently deleted, and cannot be retrieved.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Work Offline</guimenuitem></menuchoice></term>
+ <listitem><para>Sets &kmail; to offline mode.
+ This turns off all network jobs. This is useful when working without a network connection.
+ When selected, this item will become <menuchoice><guimenu>File</guimenu><guimenuitem>Work
+ Online</guimenuitem></menuchoice>, which must be selected to go back online (required to send
+ and receive email).</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>Check Mail</guimenuitem></menuchoice></term>
+ <listitem><para>Checks for new messages in all your accounts.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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="reader-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="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guisubmenu>Check Mail In ></guisubmenu></menuchoice></term>
+ <listitem><para>Checks for new messages from a particular account; your accounts will be listed in a
+ submenu.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages</guimenuitem></menuchoice></term>
+ <listitem><para>Sends the messages that are in your outbox. Messages can end up in your outbox because
+ of transmission errors, or because you composed and attempted to send a message while offline. If there
+ are no messages in your outbox, this menu item will be grayed out.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Send Queued Messages Via ></guimenuitem></menuchoice></term>
+ <listitem><para>Sends the messages that are in your outbox via a specific outgoing account.
+ This allows you to choose which server to use to send your queued messages. Servers must be configured in
+ the Configure &kmail; dialog, under the <menuchoice><guiicon>Accounts</guiicon><guilabel>Sending</guilabel>
+ </menuchoice> tab, to be listed here. If there are no messages in the outbox folder, this menu item
+ will be grayed out.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-file-delayed">
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Delayed Messages...</guimenuitem></menuchoice></term>
+ <listitem><para>Starts the <ulink url="help:/akonadi_sendlater_agent">Akonadi Send Later
+ Agent</ulink> dialog. Any messages queued for later delivery by the composer's <menuchoice>
+ <guimenu>Message</guimenu><guimenuitem>Send Later</guimenuitem></menuchoice> option will appear in
+ this dialog box. You can modify and / or delete them. Note that delayed messages are stored in the
+ drafts folder, not in the outbox folder.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-file-followup">
+ <term><menuchoice><guimenu>File</guimenu><guimenuitem>Followup Reminder Messages...</guimenuitem></menuchoice></term>
+ <listitem><para>Starts the <ulink url="help:/akonadi_followupreminder_agent">Akonadi Followup Reminder
+ Agent</ulink> dialog. Any followup reminder messages ("todos") created via the composer's <menuchoice>
+ <guimenu>Options</guimenu><guimenuitem>Create Followup Reminder...</guimenuitem></menuchoice> function will
+ appear in this dialog box. You can delete those messages with the &RMB; context menu.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo></shortcut>
+ <guimenu>File</guimenu><guimenuitem>Quit</guimenuitem></menuchoice></term>
+ <listitem><para>Exits &kmail;.</para></listitem>
</varlistentry>
</variablelist>
-
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="reader-edit-menu">
<title>Edit Menu</title>
-<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/menus.html#menus-edit">Edit Menu</ulink> of the &kde; Fundamentals.
+<screenshot>
+<screeninfo>The Edit Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readeredit.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Edit Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Edit Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
+<para>If the menu item you are looking for is missing, please see <ulink
+ url="help:/fundamentals/menus.html#menus-edit">Edit Menu</ulink> in &kde; Fundamentals.
The items listed here are &kmail; specific.</para>
+
<variablelist>
+
+<varlistentry id="reader-edit-copy-folder">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>C</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Copy Folder</guimenuitem></menuchoice></term>
+ <listitem><para>Creates an "Akonadi" pointer to the entire contents of the currently selected folder, and
+ copies that pointer to the clipboard. A subsequent paste operation in a text editor will simply paste the
+ pointer text. A subsequent paste operation in a &kmail; folder (or in the &dolphin; file manager) will
+ create a second copy of the folder and its contents.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-edit-cut-folder">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Cut Folder</guimenuitem></menuchoice></term>
+ <listitem><para>Creates an "Akonadi" pointer to the currently selected folder, and copies that pointer
+ to the clipboard. A subsequent "paste" operation in a text editor or in &dolphin; will behave exactly like the
+ preceding <guimenuitem>Copy Folder</guimenuitem> operation. A subsequent paste operation in &kmail; will move
+ the folder and its contents to a different location (if pasted in some folder other than the originating
+ folder).</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-edit-copy-message">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>C</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Copy Message</guimenuitem></menuchoice></term>
+ <listitem><para>Creates an "Akonadi" pointer to the currently selected message(s), and copies that pointer
+ to the clipboard. A subsequent paste operation in a text editor will simply paste the pointer text. A
+ subsequent paste operation in a &kmail; folder (or in the &dolphin; file manager) will create a copy of
+ the message(s), headers and all.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-edit-cut-message">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>X</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Cut Message</guimenuitem></menuchoice></term>
+ <listitem><para>Creates an "Akonadi" pointer to the currently selected message(s), and copies that pointer
+ to the clipboard. A subsequent "paste" operation in a text editor or in &dolphin; will behave exactly like the
+ preceding <guimenuitem>Copy Message</guimenuitem> operation. A subsequent paste operation in &kmail; will either
+ create a second copy of the message(s) (if pasted in the originating folder) or move the message(s) to a different
+ folder (if pasted in some folder other than the originating folder).</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-edit-paste">
+ <term><menuchoice><shortcut>&Ctrl;<keycap>V</keycap></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>
+ <listitem><para>Pastes either the entire contents of a folder, or the contents of selected messages, depending
+ on the operation that preceded the "paste". This operation cannot be used to paste selected text inside the
+ reader window. If no copy / cut operation is pending, this option will be grayed out.</para></listitem>
+</varlistentry>
+
<varlistentry id="reader-edit-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>
+ <term><menuchoice><shortcut>∇</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 id="reader-edit-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="reader-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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;∇</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 id="reader-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>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F</keycap></keycombo></shortcut>
+ <guimenu>Edit</guimenu><guimenuitem>Find in Message...</guimenuitem></menuchoice></term>
+ <listitem><para>Searches the current message text for a string entered in
+ the <guilabel>Find:</guilabel> textbox.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 id="reader-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>
+ <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>
+
</variablelist>
+<para> </para><!-- add whitespace -->
</sect2>
<sect2 id="reader-view-menu">
<title>View Menu</title>
+<screenshot>
+<screeninfo>The View Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readerview.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The View Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The View Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
<variablelist>
<varlistentry id="reader-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="reader-view-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>By 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="reader-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 messages/groups 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="reader-view-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="reader-view-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="reader-view-messagelist-create-new-tab">
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;&Shift;<keycap>O</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="reader-view-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>
+ <term><menuchoice><guimenu>View</guimenu><guisubmenu>Message List ></guisubmenu></menuchoice></term>
+ <listitem><para>This submenu has the following options to change the appearance of the message list.</para>
+
+ <variablelist>
+ <varlistentry id="reader-view-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 of which are self-explanatory.
+ The following options may not be immediately obvious, and deserve an explanation.</para>
+ <itemizedlist>
+ <listitem><para><guilabel>By Smart Sender/Receiver</guilabel> will display the receiver when you are
+ viewing the sent-mail folder, and will display the sender when you are viewing the inbox.</para></listitem>
+
+ <listitem><para><guilabel>By Action Item Status</guilabel> and <guilabel>By Important Status</guilabel>.
+ These flags need to be set before they can be sorted. Please see <link linkend="reader-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 in which your messages/groups will be sorted, respectively. Note
+ that the "Group" options are only available when messages are aggregated into groups.</para></listitem>
+ <listitem><para><guilabel>Folder always Uses this Sort Order</guilabel> allows you to specify different
+ sort settings for each folder.</para></listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-aggregation">
+ <term><menuchoice><guisubmenu>Aggregation ></guisubmenu></menuchoice></term>
+ <listitem><para>Lets you select an aggregation option. Please see the <link
+ linkend="configure-appearance-message-list">Message List Appearance</link> tab (under <menuchoice>
+ <guimenu>Settings</guimenu><guisubmenu>Configure &kmail;...</guisubmenu></menuchoice>) for more
+ information on aggregation.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-theme">
+ <term><menuchoice><guisubmenu>Theme ></guisubmenu></menuchoice></term>
+ <listitem><para>Lets you select a theme. Please see the <link
+ linkend="configure-appearance-message-list">Message List Appearance</link> tab (under <menuchoice>
+ <guimenu>Settings</guimenu><guisubmenu>Configure &kmail;...</guisubmenu></menuchoice>) for more
+ information on themes.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-create-new-tab">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>O</keycap></keycombo></shortcut>
+ <guisubmenu>Create New Tab</guisubmenu></menuchoice></term>
+ <listitem><para>Creates a new tab on the tabbing toolbar. This tab will point to the folder you
+ are viewing when the option is selected. If the tabbing toolbar is not yet visible, selecting this
+ option will create it. The tabbing toolbar can be handy if you have many folders, but only a few of
+ them are regularly accessed.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-activate-next-tab">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&PgDn;</keycombo></shortcut>
+ <guisubmenu>Activate Next Tab</guisubmenu></menuchoice></term>
+ <listitem><para>Opens the folder associated with the next tab on the tabbing toolbar.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-activate-previous-tab">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&PgUp;</keycombo></shortcut>
+ <guisubmenu>Activate Previous Tab</guisubmenu></menuchoice></term>
+ <listitem><para>Opens the folder associated with the previous tab on the tabbing toolbar.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-move-tab-left">
+ <term><menuchoice><guisubmenu>Move Tab Left</guisubmenu></menuchoice></term>
+ <listitem><para>Reorders the tabs on the tabbing toolbar by shifting the active tab to the left.
+ If that tab is already at the extreme left end, it will be moved to the right hand end position.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-messagelist-move-tab-right">
+ <term><menuchoice><guisubmenu>Move Tab Right</guisubmenu></menuchoice></term>
+ <listitem><para>Reorders the tabs on the tabbing toolbar by shifting the active tab to the right.
+ If that tab is already at the extreme right end, it will be moved to the left hand end position.</para></listitem>
+ </varlistentry>
+
+ <varlistentry id="reader-view-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>
+ <para> </para><!-- add whitespace -->
+ </listitem>
</varlistentry>
+
<varlistentry id="reader-view-headers">
-<term><menuchoice>
-<guimenu>View</guimenu>
-<guisubmenu>Headers</guisubmenu>
-</menuchoice></term>
-<listitem><para><action>Select your headers view.</action> Please see <link linkend="using-header-options">Header Options</link> for details on headers.</para></listitem>
+ <term><menuchoice><guimenu>View</guimenu><guisubmenu>Headers ></guisubmenu></menuchoice></term>
+ <listitem><para>Selects your headers view. Please see <link linkend="using-header-options">Header
+ Options</link> for details on the available header views.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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). Please see <link linkend="using-attachment-view-options">Attachment Options</link> for details on attachments.</para></listitem>
+ <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). Please see <link linkend="using-attachment-view-options">Attachment
+ Options</link> for details on viewing attachments.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-view-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>
+ <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 id="reader-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>
+ <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 id="reader-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>
+ <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 id="reader-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>
+ <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 id="reader-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 id="reader-view-save-display-format">
+ <term><menuchoice><guimenu>View</guimenu><guimenuitem>Save Display Format</guimenuitem></menuchoice></term>
+ <listitem><para>This option is apparently supposed to save something somewhere, but it's not
+ yet working correctly.</para></listitem>
</varlistentry>
-<varlistentry id="reader-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 id="reader-view-restore-display-format">
+ <term><menuchoice><guimenu>View</guimenu><guimenuitem>Restore Display Format</guimenuitem></menuchoice></term>
+ <listitem><para>This option is apparently supposed to restore whatever the preceding "Save" option
+ is supposed to save, but it's not yet working correctly, either.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-view-disable-emoticon">
+ <term><menuchoice><guimenu>View</guimenu><guimenuitem>Disable Emoticon</guimenuitem></menuchoice></term>
+ <listitem><para>Select this option to stop &kmail; from transforming <literal>:-)</literal>
+ into <inlinemediaobject><imageobject><imagedata fileref="smile.png" format="PNG"/></imageobject>
+ </inlinemediaobject>.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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">Fonts</link> tab on the <guilabel>Appearance</guilabel> page of the &kmail; configuration dialog.</para></listitem>
+ <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 <link linkend="configure-appearance-fonts">Fonts</link>
+ tab on the <guilabel>Appearance</guilabel> page of the &kmail; configuration dialog.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 every case.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>View</guimenu><guisubmenu>Zoom ></guisubmenu></menuchoice></term>
+ <listitem><para>This option lets you zoom in or out on every message displayed in the preview pane.</para>
+ <para> </para><!-- add whitespace -->
+ </listitem>
</varlistentry>
</variablelist>
@@ -470,92 +526,77 @@ servers have been used to send the message by looking at the <literal>Received:<
<sect2 id="reader-go-menu">
<title>Go Menu</title>
+<screenshot>
+<screeninfo>The Go Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readergo.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Go Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Go Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
<variablelist>
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycap>J</keycap></shortcut>
+ <guimenu>Go</guimenu><guimenuitem>Jump to Folder...</guimenuitem></menuchoice></term>
+ <listitem><para>Shows a dialog box with a list of all your folders. Click on the folder
+ you wish to view, and that folder will be opened for display in the message preview pane.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 &Right; also performs this function.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 no unread messages below the currently selected message, the behavior depends
+ on the value of the <xref linkend="configure-misc-folders-go-unread"/> option.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 id="reader-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>
+ <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 no 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="reader-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>
+ <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 id="reader-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>
+ <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 id="reader-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>
+ <term><menuchoice><shortcut>&Space;</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>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
</variablelist>
@@ -563,125 +604,145 @@ servers have been used to send the message by looking at the <literal>Received:<
<sect2 id="reader-folder-menu">
<title>Folder Menu</title>
+<screenshot>
+<screeninfo>The Folder Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readerfolder.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Folder Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Folder Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
<variablelist>
+<varlistentry id="reader-folder-properties">
+ <term><guimenu>Folder Properties</guimenu></term>
+ <listitem><para>Opens the <link linkend="folders-properties-window">Folder Properties</link>
+ dialog that lets you modify the properties of the current folder.</para></listitem>
+</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Add Folder...</guimenuitem></menuchoice></term>
+ <listitem><para>Prompts you for a name, then creates a new folder as a subfolder of the current folder.
+ This is exactly like <xref linkend="reader-add-folder" />.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mark All Messages as Read</guimenuitem></menuchoice></term>
+ <listitem><para>Sets the status of all unread messages in the current folder to "read".</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-folder-mark-all-messages-as-read-subfolder">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mark All Messages as Read
+ in This Folder and All its Subfolders</guimenuitem></menuchoice></term>
+ <listitem><para>Sets the status of all unread messages in the current folder (and all its
+ subfolders) to "read".</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycap>F5</keycap></shortcut>
+ <guimenu>Folder</guimenu><guimenuitem>Update Folder</guimenuitem></menuchoice></term>
+ <listitem><para>Checks whether new mail has arrived in the currently selected folder.</para>
+ <note><para>This option only works in &IMAP; folders.</para></note>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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 subfolders.</action></para>
-<note><para>This is only available for &IMAP; folders.</para></note></listitem>
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;<keycap>F5</keycap></keycombo></shortcut>
+ <guimenu>Folder</guimenu><guimenuitem>Update This Folder and All Its Subfolders</guimenuitem></menuchoice></term>
+ <listitem><para>Checks whether new mail has arrived in the currently selected folder, or in any
+ of its subfolders.</para>
+ <note><para>This option only works in &IMAP; folders.</para></note>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-folder-move-all-messages-to-trash">
-<term><menuchoice>
-<guimenu>Folder</guimenu>
-<guimenuitem>Move All 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>
+ <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.</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>, instead. Selecting
+ that option will empty the trash by permanently deleting the messages in the trash folder.</para></note>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
-<varlistentry id="reader-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 id="reader-folder-delete-folder">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Delete Folder</guimenuitem></menuchoice></term>
+ <listitem><para>Deletes the selected folder and all its contents. A warning message will be displayed.
+ If the current folder is one of &kmail;'s pre-defined folders (inbox, &etc;), this menu item will
+ be grayed out.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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> Please see
- <link linkend="folder-archive">Folder Archive</link> for details.</para>
- </listitem>
-</varlistentry>
-<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Archive Folder...</guimenuitem></menuchoice></term>
+ <listitem><para>Brings up a dialog so you can create an archive of the currently selected folder. Please see
+ the <xref linkend="folder-archive" /> section of "Using &kmail;" for details.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 them.</para></listitem>
</varlistentry>
-<varlistentry id="reader-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 id="reader-folder-remove-duplicate-messages-subfolder">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Remove Duplicates in This Folder and
+ All its Subfolder</guimenuitem></menuchoice></term>
+ <listitem><para>Searches the folder, and its subfolders, for duplicate messages, then deletes the
+ duplicates.</para></listitem>
</varlistentry>
-<varlistentry id="reader-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 id="reader-folder-apply-filters-on-folder">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Apply Filters On Folder ></guimenuitem></menuchoice></term>
+ <listitem><para>Applies selected filters (All, Spam, or Not Spam) to the currently selected folder.
+ Please see the <link linkend="filter-dialog-id">Filter dialog</link> for more information on filters.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-folder-apply-filters-on-subfolders">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Apply Filters On Folder and All its
+ Subfolders ></guimenuitem></menuchoice></term>
+ <listitem><para>Applies selected filters (All, Spam, or Not Spam) to the currently selected folder, and to its subfolders.
+ Please see the <link linkend="filter-dialog-id">Filter dialog</link> for more information on filters.</para></listitem>
+</varlistentry>
+
+<varlistentry id="reader-folder-message-default-format">
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Message Default Format ></guimenuitem></menuchoice></term>
+ <listitem><para>Here you may select one of three options: <guilabel>Prefer &HTML; to Plain Text</guilabel>,
+ <guilabel>Prefer Plain Text to &HTML;</guilabel>, or <guilabel>Use Global Setting</guilabel>.</para>
+ <warning><para>For security reasons, we recommend you only select <guilabel>Prefer &HTML; to Plain Text</guilabel>
+ in folders which can never contain untrusted messages.</para></warning>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Load External References</guimenuitem></menuchoice></term>
+ <listitem><para>If you have &HTML; messages enabled (see above), then you will also have the option to have
+ images and other resources linked from the web downloaded automatically.</para>
+ <warning><para>This option is only available if <guilabel>Prefer &HTML; to Plain Text</guilabel>
+ has been selected. If you turn this option on, and later decide to change <guimenuitem>Message Default
+ Format</guimenuitem>, be sure to clear this checkbox before making the switch. There is a bug in &kmail;
+ -- if the checkbox on this item has not been cleared, and this option has been grayed out, results are
+ unpredictable.</para></warning>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Mailing List Management...</guimenuitem></menuchoice></term>
+ <listitem><para>This opens the mailing list management dialog. This option is only available if
+ the current folder contains messages from a mailing list. Please see the <link
+ linkend="folders-properties-mailinglist">Mailing List dialog</link> for more
+ information on mailing lists.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Folder</guimenu><guimenuitem>Assign Shortcut...</guimenuitem></menuchoice></term>
+ <listitem><para>This lets you assign a keyboard shortcut to the currently selected folder.</para>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
</variablelist>
@@ -689,472 +750,482 @@ Please see next section for details.</para></note></listitem>
<sect2 id="reader-message-menu">
<title>Message Menu</title>
+<screenshot>
+<screeninfo>The Message Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readermessage.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Message Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Message Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
<variablelist>
<varlistentry id="reader-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>
+ <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 id="reader-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>
+ <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 message.
+ If the current folder holds a mailing list and has a posting address defined,
+ that posting address will automatically be entered as the <guilabel>To:</guilabel> address
+ when the composer window is opened. If the current folder does not contain a mailing list,
+ this item will be grayed out.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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="reader-message-reply-special">Reply Special</link>.
- Your identity will automatically be set to the identity this message was originally sent to.</para></listitem>
+ <term><menuchoice><shortcut><keycap>R</keycap></shortcut>
+ <guimenu>Message</guimenu><guimenuitem>Reply...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens the composer window, inserts quoted text from the currently selected message, and sets the
+ <guilabel>To:</guilabel> field to either the mailing-list address (if you reply to a mailing-list message),
+ or to the preferred reply-to address of the sender. If you want to control which address is set in the
+ <guilabel>To:</guilabel> field, you should use <link linkend="reader-message-reply-special">Reply Special</link>.
+ The sending identity will automatically be set to the identity to which this message was addressed.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycap>A</keycap></shortcut>
+ <guimenu>Message</guimenu><guimenuitem>Reply to All...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens the composer window, inserts the quoted text of the currently
+ selected message, and sets the <guilabel>To:</guilabel> field to either the
+ mailing-list address (when replying to a mailing-list message), or to the
+ preferred reply-to address of the sender. The <guilabel>Copy to (CC):</guilabel>
+ field is filled with the addresses of all the other recipients of the currently
+ selected message, excluding your own address. The sending identity will automatically
+ be set to the identity to which this message was addressed.</para>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 the composer window, inserts the quoted text from the currently
+ selected message, and sets the <guilabel>To:</guilabel> field to the
+ preferred reply-to address of the sender. The sending identity will automatically be set
+ to the identity to which this message was addressed.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 the composer window, inserts the quoted text of the currently
+ selected message, and sets the <guilabel>To:</guilabel> field to 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, the <guilabel>To:</guilabel>
+ field will be empty. The sending identity will automatically be set to the identity to which this
+ message was addressed.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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="reader-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>
+ <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 an added option: you may select a custom
+ template configured via <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 an added option: you may select a custom
+ template configured via <link linkend="configure-composer-custom-templates">Custom Templates</link>.</para>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 be attached to the
+ new message. The original message headers will be included in the forwarded message.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 where the forwarded part begins. Attachments will be attached to the new message.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <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 identified by
+ special header fields (<literal>Redirect-From</literal>, <literal>Redirect-Date</literal>,
+ <literal>Redirect-To</literal>, &etc;).</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Forward ></guisubmenu>
+ <guimenuitem>With Custom Template</guimenuitem></menuchoice></term>
+ <listitem><para>Works just like "Forward", but gives you the option to select a
+ custom template configured via the composer custom templates tab in <link
+ linkend="configure-composer-custom-templates">Custom Templates</link>.</para>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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="reader-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>
+ <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.</para>
+ <note><para>This menu item is only available for messages which you have sent or, more precisely, for messages
+ which have the <guilabel>sent</guilabel> status. If you wish to resend some other message, double-click its
+ entry in the message list. Or view the message and use the <keycap>T</keycap> shortcut. You may also do this
+ by adding an <guibutton>Edit as New</guibutton> button to the toolbar.</para></note>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
+<!-- <varlistentry id="reader-message-edit-message">
+<term><menuchoice><shortcut><keycap>T</keycap></shortcut>
+<guimenu>Message</guimenu><guimenuitem>Edit Message</guimenuitem></menuchoice></term>
+<listitem><para>Opens the selected message in a composer window.</para></listitem>
+</varlistentry> -->
+
<varlistentry id="reader-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 <literal>help</literal> word 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 <literal>subscribe</literal> word in the <guilabel>Subject:</guilabel> field.</para></listitem>
- <listitem><para><guimenuitem>Unsubscribe from List(web)</guimenuitem> will open your default web browser to the unsubscribe website of the configured mailing list.</para></listitem>
- <listitem><para><guimenuitem>Unsubscribe from List(email)</guimenuitem> will presets the <guilabel>To:</guilabel> with the mailing list subscription address and <literal>unsubscribe</literal> word in the <guilabel>Subject:</guilabel> field.</para></listitem>
-</itemizedlist></listitem>
+ <term><menuchoice><guimenu>Message</guimenu><guimenuitem>Mailing List Name: ></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
+ option to be available. Please see <link linkend="folders-properties-mailinglist">Folder
+ Properties Mailing List</link> to learn about setting up mailing lists.</para></note>
+ <para> </para><!-- add whitespace -->
+ <para>The following options are available in mailing list folders:</para>
+
+ <itemizedlist>
+ <listitem><para><guimenuitem>Post New Message(email)</guimenuitem> will set the
+ <guilabel>To:</guilabel> address to the address configured as "Post to List".</para></listitem>
+ <listitem><para><guimenuitem>Request Help(email)</guimenuitem> will set the
+ <guilabel>To:</guilabel> address to the address configured in "Post to List" and will place
+ the word <literal>help</literal> in the <guilabel>Subject:</guilabel> field.</para></listitem>
+ <listitem><para><guimenuitem>Subscribe to List(web)</guimenuitem> will point your default web browser
+ to the "subscribe" web site of the configured mailing list.</para></listitem>
+ <listitem><para><guimenuitem>Subscribe to List(email)</guimenuitem> will set the
+ <guilabel>To:</guilabel> address to the mailing list subscription address, and place
+ the word <literal>subscribe</literal> in the <guilabel>Subject:</guilabel> field.</para></listitem>
+ <listitem><para><guimenuitem>Unsubscribe from List(web)</guimenuitem> will point your default web
+ browser to the "unsubscribe" web site of the configured mailing list.</para></listitem>
+ <listitem><para><guimenuitem>Unsubscribe from List(email)</guimenuitem> will set the
+ <guilabel>To:</guilabel> address to the mailing list subscription address, and place the
+ word <literal>unsubscribe</literal> in the <guilabel>Subject:</guilabel> field.</para></listitem>
+ </itemizedlist>
+
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Copy Message To ></guisubmenu></menuchoice></term>
+ <listitem><para>Copies the selected message(s) to a specified folder. You may choose from recent folders,
+ local folders, or a specific &IMAP; account folder.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Move Message To ></guisubmenu></menuchoice></term>
+ <listitem><para>The same as "Copy Message To", above, except this option will permanently move the
+ selected message(s) to the chosen folder.</para>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Mark Message ></guisubmenu></menuchoice></term>
+ <listitem><para>Lets you change the status of the selected message to one of the following values:</para>
+ <informaltable><tgroup cols="3">
+ <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>Removes 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; ⪚, a 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>Removes a previously set action item mark from the message.</entry></row>
+ </tbody>
+
+ </tgroup></informaltable>
+ <para> </para><!-- add whitespace --></listitem>
</varlistentry>
+
<varlistentry id="reader-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 <guimenu>Watched</guimenu> status in the drop down box found into Quick Search 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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Mark Thread</guisubmenu></menuchoice></term>
+ <listitem><para>Lets you change the status of all messages in a thread as follows:</para>
+ <informaltable><tgroup cols="3">
+ <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>Removes 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 (⪚, a 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>Removes 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>Sets the watched thread status, which lets you easily view threads you're interested in by
+ selecting the <guimenu>Watched</guimenu> status in the drop down box found in the Quick Search Bar.
+ (Click on the <inlinemediaobject><imageobject><imagedata fileref="view-filter.png" format="PNG"/>
+ </imageobject></inlinemediaobject> icon to display the filterable categories.)</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>
+ <para> </para><!-- add whitespace --></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>
+ <term><menuchoice><guimenu>Message</guimenu><guisubmenu>Create Filter</guisubmenu></menuchoice></term>
+ <listitem><para>Opens the <link linkend="filter-dialog-id">Filter dialog</link> with a new filter added.
+ This new filter is based on fields in the current message, depending on the submenu item you select:</para>
+ <simplelist>
+ <member>Filter on Subject...</member>
+ <member>Filter on From...</member>
+ <member>Filter on To...</member>
+ <member>Filter on Mailing-List...(currently selected message must be a mailing list for this to be available).</member>
+ </simplelist></listitem>
</varlistentry>
+
<varlistentry id="reader-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>Classify as Spam</guimenuitem> and <guimenuitem>Classify as NOT Spam</guimenuitem> will be available for spam filtering.</para></listitem>
+ <term><menuchoice><guimenu>Message</guimenu><guimenuitem>Apply Filter</guimenuitem></menuchoice></term>
+ <listitem><para>Lets you <guimenuitem>Apply all Filters</guimenuitem>. If you have spam filtering set up via
+ the <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link>, the options <guimenuitem>Classify as
+ Spam</guimenuitem> and <guimenuitem>Classify as NOT Spam</guimenuitem> will also be available here.</para></listitem>
</varlistentry>
-<varlistentry id="reader-message-create-to-do-reminder">
+
+<!-- <varlistentry id="reader-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="reader-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> These items have been moved to "Plugins", and can now only be invoked via the Toolbar. @dcb2021086 -->
+
+<varlistentry id="reader-message-viewsource">
+ <term><menuchoice><shortcut><keycap>V</keycap></shortcut>
+ <guimenu>Message</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 help you figure out where a message really came from. </para>
+ <note><para>You should be aware that it is easy to fake, or spoof, the <literal>From:</literal>
+ header in a message. You can always find out which mail servers were used to send the message by
+ examining the <literal>Received:</literal> lines in the message headers.</para></note>
+ <para> </para></listitem>
</varlistentry>
-</variablelist>
-</sect2>
+<varlistentry id="reader-show-message-structure">
+ <term><menuchoice><shortcut><keycombo action="simul">&Ctrl;&Alt;<keycap>D</keycap></keycombo></shortcut>
+ <guimenu>Message</guimenu><guimenuitem>Show Message Structure</guimenuitem></menuchoice></term>
+ <listitem><para>Displays the structure viewer, an area below the preview pane that lets you
+ view each &MIME; component of a message separately. This item will only be present if the <link
+ linkend="configure-plugins-tools">Expert Plugin</link> has been activated.</para>
+ <para> </para></listitem>
+</varlistentry>
+</variablelist>
+</sect2>
<sect2 id="reader-tools-menu">
<title>Tools Menu</title>
+<screenshot>
+<screeninfo>The Tools Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readertools.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Tools Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Tools Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
<variablelist>
+
<varlistentry id="reader-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>
+ <term><menuchoice><shortcut><keycap>S</keycap></shortcut>
+ <guimenu>Tools</guimenu><guimenuitem>Find Messages...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens a search window 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 be displayed in the text area; you may either <guibutton>Open Search
+ Folder</guibutton> to see a folder containing the messages that were located, or highlight the desired
+ message and select <guibutton>Open Message</guibutton>. Additional actions are available via a context
+ menu, which can be activated by clicking the &RMB;.</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 id="reader-tools-addressbook">
+ <term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Address Book</guimenuitem></menuchoice></term>
+ <listitem><para>Starts <ulink url="help:kaddressbook">&kaddressbook;</ulink>, the &kde; email
+ address / personal contact information management program.</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 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-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>
+ <term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Edit "Out of Office" Replies...</guisubmenu></menuchoice></term>
+ <listitem><para>Launches 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 use it
+ you must configure the <link linkend="receiving-mail">Filtering tab</link> (see options relevant to a &kolab; server)
+ of your &IMAP; account set-up.</para></note>
+ <para> </para></listitem>
</varlistentry>
-<varlistentry id="reader-tools-debug-sieve">
+
+<!-- <varlistentry id="reader-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> -->
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Filter Log Viewer...</guisubmenu></menuchoice></term>
+ <listitem><para>Opens the viewer window for the filter log; there you will find some options to
+ control the logging of the filtering process. In the log you will find valuable
+ information about the filter rules used, the result of evaluating those rules, and which
+ filter actions were applied to a particular message.</para></listitem>
</varlistentry>
-<varlistentry id="reader-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 <ulink url="help:/importwizard">Import Wizard</ulink> for details.</para></listitem>
+
+<varlistentry id="reader-tools-import-messages">
+ <term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Import from another Email Client...</guisubmenu>
+ </menuchoice></term>
+ <listitem><para>Launches the Akonadi Import Wizard dialog, which assists in importing settings and email
+ from a wide variety of email clients. Please see the <ulink url="help:/importwizard">Import Wizard</ulink>
+ documentation for details.</para>
+ <note><para>Close &kmail; before importing data. The wizard may modify &kmail;'s configuration file, and
+ can cause unpredictable results if you attempt to import data while &kmail; is running.</para></note>
+ <para> </para></listitem>
</varlistentry>
+
<varlistentry id="reader-tools-export-data">
-<term><menuchoice>
-<guimenu>Tools</guimenu>
-<guisubmenu>Export &kmail; Data...</guisubmenu>
-</menuchoice></term>
-<listitem><para><action>Brings up the PIM Setting Exporter dialog</action> which assists in easily exporting your settings and email.
- Please see <ulink url="help:/pimsettingexporter">pimsettingexporter</ulink> for details.</para></listitem>
+ <term><menuchoice><guimenu>Tools</guimenu><guisubmenu>Import/Export &kmail; Data...</guisubmenu></menuchoice></term>
+ <listitem><para>Launches the PIM Data Exporter dialog, which assists in exporting your settings and email, or
+ restoring them from a back up copy. Please see <ulink url="help:/pimdataexporter">Pim Data Exporter</ulink>
+ for details.</para></listitem>
</varlistentry>
-<varlistentry id="reader-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">Account Wizard</link> for details.</para></listitem>
+
+<varlistentry id="reader-tools-activity-log">
+ <term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Log Activities...</guimenuitem></menuchoice></term>
+ <listitem><para>Starts the Activity Logger, which logs certain activities. This option is only available
+ when the <guilabel>Log Activities</guilabel> plugin has been loaded. Primarily for developers.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Anti-Spam Wizard...</guimenuitem></menuchoice></term>
+ <listitem><para>Launches the Anti-Spam Wizard, which can help you set up spam filtering. Please
+ see <link linkend="the-anti-spam-wizard">Anti-Spam Wizard</link> for details. This option is
+ only available when the <guilabel>Antispam</guilabel> plugin has been loaded.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Tools</guimenu><guimenuitem>Anti-Virus Wizard...</guimenuitem></menuchoice></term>
+ <listitem><para>Launches the Anti-Virus Wizard, which can help you set up anti-virus scanning. Please
+ see <link linkend="the-anti-virus-wizard">Anti-Virus Wizard</link> for details. This option is only
+ available when the <guilabel>Antivirus</guilabel> plugin has been loaded.</para>
+ <para> </para></listitem>
</varlistentry>
</variablelist>
</sect2>
@@ -1162,42 +1233,59 @@ Please see next section for details.</para></note></listitem>
<sect2 id="reader-settings-menu">
<title>Settings Menu</title>
-<para>If the menu item you are looking for is missing, please see <ulink url="help:/fundamentals/menus.html#menus-settings">Settings Menu</ulink> of the &kde; Fundamentals.
- The items listed here are &kmail; specific.</para>
+<screenshot>
+<screeninfo>The Settings Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readersettings.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Settings Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Settings Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
+<para>If the menu item you are looking for is missing, please see <ulink
+url="help:/fundamentals/menus.html#menus-settings">Settings Menu</ulink> in &kde;
+Fundamentals. The items listed here are &kmail; specific.</para>
<variablelist>
+
<varlistentry id="reader-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>
+<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>Enables the Quick Search bar, which lets you quickly search for messages matching
+your criteria.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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>
+ <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Filters...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens the <link linkend="filters">Message Filters</link> dialog.</para></listitem>
</varlistentry>
-<!--FIXME http://www.aegiap.eu/kdeblog/2013/08/new-in-kdepim-4-12-sieve-12/ -->
+
<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>
+ <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Manage Sieve Scripts...</guimenuitem></menuchoice></term>
+ <listitem><para>If your mail server supports sieves (server side filtering), you may
+ configure those scripts here.</para></listitem>
+</varlistentry>
+
+<varlistentry id="settings-add-account">
+ <term><menuchoice><guimenu>Settings</guimenu><guisubmenu>Add Account...</guisubmenu></menuchoice></term>
+ <listitem><para>Starts the Account Wizard dialog, which assists in setting up new or additional accounts.
+ Please see <link linkend="account-wizard">Account Wizard</link> for details.</para></listitem>
</varlistentry>
+
<varlistentry id="reader-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 <ulink url="help:/akonadi_archivemail_agent">Automatic Archiving</ulink> for details.</para></listitem>
+ <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Automatic
+ Archiving...</guimenuitem></menuchoice></term>
+ <listitem><para>Initiates a dialog to set up automatic archiving. See <ulink
+ url="help:/akonadi_archivemail_agent">Automatic Archiving</ulink> for details.</para></listitem>
</varlistentry>
-<varlistentry id="reader-settings-configure-send-later-agent">
+
+<!-- <varlistentry id="reader-settings-configure-send-later-agent">
<term><menuchoice>
<guimenu>Settings</guimenu>
<guimenuitem>Configure Send Later Agent...</guimenuitem>
@@ -1219,13 +1307,45 @@ Please see next section for details.</para></note></listitem>
<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, &etc;</para></listitem>
+</varlistentry> These three options have been moved to the Plugins Configuration tab. @dcb2021086. -->
+
+<varlistentry id="reader-settings-configure-kmail">
+ <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kmail;...</guimenuitem></menuchoice></term>
+ <listitem><para>Opens the <link linkend="configure">Configure &kmail;</link> dialog. There are
+ hundreds of variables to play with. Have fun!</para>
+ <para> </para></listitem>
</varlistentry>
+
</variablelist>
</sect2>
+
<sect2>
<title>Help Menu</title>
-<para><ulink url="help:/fundamentals/menus.html#menus-help">
-Help Menu</ulink> of the &kde; Fundamentals.</para>
+<screenshot>
+<screeninfo>The Help Menu</screeninfo>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="readerhelp.png" format="PNG"/>
+ </imageobject>
+ <textobject>
+ <phrase>The Help Menu</phrase>
+ </textobject>
+ <caption>
+ <para>The Help Menu</para>
+ </caption>
+ </mediaobject>
+</screenshot>
+<para> </para><!-- add whitespace -->
+
+<para>This is the <ulink url="help:/fundamentals/menus.html#menus-help">Help
+Menu</ulink> of the &kde; Fundamentals, with one additional item.</para>
+
+<variablelist>
+<varlistentry id="reader-help-intro">
+ <term><menuchoice><guimenu>Help</guimenu><guimenuitem>&kmail;Introduction</guimenuitem></menuchoice></term>
+ <listitem><para>Opens the <link linkend="intro">Introduction</link> welcome screen.</para></listitem>
+</varlistentry>
+</variablelist>
</sect2>
</sect1>
diff --git a/doc/kmail2/plugin02.png b/doc/kmail2/plugin02.png
index 79fcd7ead..10746997c 100644
Binary files a/doc/kmail2/plugin02.png and b/doc/kmail2/plugin02.png differ
diff --git a/doc/kmail2/readeredit.png b/doc/kmail2/readeredit.png
new file mode 100644
index 000000000..d31befa03
Binary files /dev/null and b/doc/kmail2/readeredit.png differ
diff --git a/doc/kmail2/readerfile.png b/doc/kmail2/readerfile.png
new file mode 100644
index 000000000..39326d838
Binary files /dev/null and b/doc/kmail2/readerfile.png differ
diff --git a/doc/kmail2/readerfolder.png b/doc/kmail2/readerfolder.png
new file mode 100644
index 000000000..4eb7b2f05
Binary files /dev/null and b/doc/kmail2/readerfolder.png differ
diff --git a/doc/kmail2/readergo.png b/doc/kmail2/readergo.png
new file mode 100644
index 000000000..11f8aae36
Binary files /dev/null and b/doc/kmail2/readergo.png differ
diff --git a/doc/kmail2/readerhelp.png b/doc/kmail2/readerhelp.png
new file mode 100644
index 000000000..562db5095
Binary files /dev/null and b/doc/kmail2/readerhelp.png differ
diff --git a/doc/kmail2/readermessage.png b/doc/kmail2/readermessage.png
new file mode 100644
index 000000000..25bbd3e8b
Binary files /dev/null and b/doc/kmail2/readermessage.png differ
diff --git a/doc/kmail2/readersettings.png b/doc/kmail2/readersettings.png
new file mode 100644
index 000000000..30b2b0d95
Binary files /dev/null and b/doc/kmail2/readersettings.png differ
diff --git a/doc/kmail2/readertools.png b/doc/kmail2/readertools.png
new file mode 100644
index 000000000..bbb3ece7a
Binary files /dev/null and b/doc/kmail2/readertools.png differ
diff --git a/doc/kmail2/readerview.png b/doc/kmail2/readerview.png
new file mode 100644
index 000000000..27f907fbe
Binary files /dev/null and b/doc/kmail2/readerview.png differ
diff --git a/doc/kmail2/view-filter.png b/doc/kmail2/view-filter.png
new file mode 100644
index 000000000..b3b00a765
Binary files /dev/null and b/doc/kmail2/view-filter.png differ
More information about the kde-doc-english
mailing list